Skip to content

Fix stat parsing #49

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
TheBackstabi merged 1 commit into from
Dec 2, 2025
Merged

Fix stat parsing #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified assets/database/db.bin
View file
Open in desktop
Binary file not shown.
2,610 changes: 1,305 additions & 1,305 deletions assets/database/db.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified assets/database/leftover_db.bin
View file
Open in desktop
Binary file not shown.
20 changes: 10 additions & 10 deletions assets/database/leftover_db.json
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions proto/common.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ enum Stat {
StatAgility = 1;
StatStamina = 2;
StatIntellect = 3;
// Unsure if this will be used but including just in case
StatRage = 4;

// Spell Power and Spell Power derivatives
StatSpellPower = 5;
Expand Down Expand Up @@ -231,9 +233,6 @@ enum Stat {
StatNatureResistance = 44;
StatShadowResistance = 45;

// Unsure if this will be used but including just in case
StatRage = 46;

// DO NOT add new stats here without discussing it first; new stats come
// with a performance penalty.

Expand Down
2 changes: 1 addition & 1 deletion sim/core/stats/stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const (
Agility
Stamina
Intellect
Rage
SpellPower
HealingPower
SpellDamage
Expand Down Expand Up @@ -63,7 +64,6 @@ const (
FrostResistance
NatureResistance
ShadowResistance
Rage
// end of Stat enum in proto/common.proto

// The remaining stats below are stored as PseudoStats rather than as
Expand Down
16 changes: 12 additions & 4 deletions tools/database/dbc/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,18 @@ func processEnchantmentEffects(
outStats[proto.Stat_StatRangedAttackPower] = float64(effectPoints[i])
}
// If it's All Hit then boost both
if stat == proto.Stat_StatAllHitRating {
outStats[proto.Stat_StatMeleeHitRating] = float64(effectPoints[i])
outStats[proto.Stat_StatSpellHitRating] = float64(effectPoints[i])
}
// if stat == proto.Stat_StatAllHitRating {
// outStats[proto.Stat_StatMeleeHitRating] = float64(effectPoints[i])
// outStats[proto.Stat_StatSpellHitRating] = float64(effectPoints[i])
// }
// if stat == proto.Stat_StatAllCritRating {
// outStats[proto.Stat_StatMeleeCritRating] = float64(effectPoints[i])
// outStats[proto.Stat_StatSpellCritRating] = float64(effectPoints[i])
// }
// if stat == proto.Stat_StatAllHasteRating {
// outStats[proto.Stat_StatMeleeHasteRating] = float64(effectPoints[i])
// outStats[proto.Stat_StatSpellHasteRating] = float64(effectPoints[i])
// }
}
case ITEM_ENCHANTMENT_EQUIP_SPELL: //Buff
spellEffects := dbcInstance.SpellEffects[effectArgs[i]]
Expand Down
34 changes: 17 additions & 17 deletions tools/database/gen_db/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,23 +352,23 @@ func processItems(instance *dbc.DBC,
}

// If an item has any "All" ratings, add it to Melee and Spell
if len(parsed.ScalingOptions[0].Stats) > 0 {
value := parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatAllHitRating)]
if value > 0 {
parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatMeleeHitRating)] = value
parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatSpellHitRating)] = value
}
value = parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatAllCritRating)]
if value > 0 {
parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatMeleeCritRating)] = value
parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatSpellCritRating)] = value
}
value = parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatAllHasteRating)]
if value > 0 {
parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatMeleeHasteRating)] = value
parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatSpellHasteRating)] = value
}
}
// if len(parsed.ScalingOptions[0].Stats) > 0 {
// value := parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatAllHitRating)]
// if value > 0 {
// parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatMeleeHitRating)] = value
// parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatSpellHitRating)] = value
// }
// value = parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatAllCritRating)]
// if value > 0 {
// parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatMeleeCritRating)] = value
// parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatSpellCritRating)] = value
// }
// value = parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatAllHasteRating)]
// if value > 0 {
// parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatMeleeHasteRating)] = value
// parsed.ScalingOptions[0].Stats[int32(proto.Stat_StatSpellHasteRating)] = value
// }
// }

drops := dropSources[int(item.Id)]
if drops != nil {
Expand Down
Loading