Skip to content

Fix: Item Stats #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AngeloTadeucci merged 2 commits into from
Mar 24, 2025
+25 −10
Merged

Fix: Item Stats #381

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96f4656
Fix: Item Stats
AngeloTadeucci Mar 24, 2025
e27d4a1
Suggestion
AngeloTadeucci Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions Maple2.Server.Game/Util/ItemStatsCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,26 +199,26 @@ public bool RandomizeValues(Item item, ItemOption itemOptionMetadata, ref ItemSt

foreach (BasicAttribute attribute in option.Basic.Keys) {
if (table.Values.TryGetValue(attribute, out ItemEquipVariationTable.Set<int>[]? values)) {
int value = GetValue(item, itemOptionMetadata, attribute, tableValues: values, rollMax: rollMax);
int value = GetValue(attribute, tableValues: values, rollMax: rollMax);
option.Basic[attribute] = new BasicOption((int) (value * option.MultiplyFactor));
} else if (table.Rates.TryGetValue(attribute, out ItemEquipVariationTable.Set<float>[]? rates)) {
int rateInt = GetValue(item, itemOptionMetadata, attribute, tableRates: rates, rollMax: rollMax);
int rateInt = GetValue(attribute, tableRates: rates, rollMax: rollMax);
option.Basic[attribute] = new BasicOption((rateInt / 1000f) * option.MultiplyFactor);
}
Comment thread
AngeloTadeucci marked this conversation as resolved.
}
foreach (SpecialAttribute attribute in option.Special.Keys) {
if (table.SpecialValues.TryGetValue(attribute, out ItemEquipVariationTable.Set<int>[]? values)) {
int value = GetValue(item, itemOptionMetadata, specialAttribute: attribute, tableValues: values, rollMax: rollMax);
int value = GetValue(specialAttribute: attribute, tableValues: values, rollMax: rollMax);
option.Special[attribute] = new SpecialOption(0f, value * option.MultiplyFactor);
} else if (table.SpecialRates.TryGetValue(attribute, out ItemEquipVariationTable.Set<float>[]? rates)) {
int rateInt = GetValue(item, itemOptionMetadata, specialAttribute: attribute, tableRates: rates, rollMax: rollMax);
int rateInt = GetValue(specialAttribute: attribute, tableRates: rates, rollMax: rollMax);
option.Special[attribute] = new SpecialOption((rateInt / 1000f) * option.MultiplyFactor);
}
Comment thread
AngeloTadeucci marked this conversation as resolved.
}

return true;

int GetValue(Item item, ItemOption itemOptionMetadata, BasicAttribute? attribute = null, SpecialAttribute? specialAttribute = null, ItemEquipVariationTable.Set<int>[]? tableValues = null, ItemEquipVariationTable.Set<float>[]? tableRates = null, bool rollMax = false) {
int GetValue(BasicAttribute? attribute = null, SpecialAttribute? specialAttribute = null, ItemEquipVariationTable.Set<int>[]? tableValues = null, ItemEquipVariationTable.Set<float>[]? tableRates = null, bool rollMax = false) {
Comment thread
AngeloTadeucci marked this conversation as resolved.
var weightedValues = new WeightedSet<int>();
var weightedRates = new WeightedSet<float>();
if (item.Type.IsPet) {
Expand Down Expand Up @@ -446,13 +446,21 @@ private int GetItemVariationValue(BasicAttribute? basicAttribute = null, Special
} else if (TableMetadata.ItemVariationTable.Rates.TryGetValue(basicAttribute.Value, out ItemVariationTable.Range<float>[]? rates)) {
foreach (ItemVariationTable.Range<float> range in rates) {
if (rate >= range.Min && rate <= range.Max) {
int convertedVariation = (int) range.Variation * 1000;
int convertedRate = (int) rate * 1000;
int convertedVariation = (int) (range.Variation * 1000);
int convertedRate = (int) (rate * 1000);
return Random.Shared.Next(convertedRate, convertedRate + convertedVariation + 1);
}
}
}
} else if (specialAttribute != null) {

if (value != 0) {
return value;
}

return (int) (rate * 1000);
}

if (specialAttribute != null) {
if (TableMetadata.ItemVariationTable.SpecialValues.TryGetValue(specialAttribute.Value, out ItemVariationTable.Range<int>[]? values)) {
foreach (ItemVariationTable.Range<int> range in values) {
if (value >= range.Min && value <= range.Max) {
Expand All @@ -462,13 +470,20 @@ private int GetItemVariationValue(BasicAttribute? basicAttribute = null, Special
} else if (TableMetadata.ItemVariationTable.SpecialRates.TryGetValue(specialAttribute.Value, out ItemVariationTable.Range<float>[]? rates)) {
foreach (ItemVariationTable.Range<float> range in rates) {
if (rate >= range.Min && rate <= range.Max) {
int convertedVariation = (int) range.Variation * 1000;
int convertedRate = (int) rate * 1000;
int convertedVariation = (int) (range.Variation * 1000);
int convertedRate = (int) (rate * 1000);
return Random.Shared.Next(convertedRate, convertedRate + convertedVariation + 1);
}
}
}

if (value != 0) {
return value;
}

return (int) (rate * 1000);
Comment thread
AngeloTadeucci marked this conversation as resolved.
}

return 0;
}

Expand Down