Skip to content

Commit

Permalink
Bonus armor fix from SoD
Browse files Browse the repository at this point in the history
  • Loading branch information
@sanguinerarogue
sanguinerarogue committed Dec 28, 2024
1 parent 7d4c0a0 commit f150294
Show file tree
Hide file tree
Showing 7 changed files with 360 additions and 368 deletions.
Binary file modified assets/database/db.bin
View file
Binary file not shown.
690 changes: 345 additions & 345 deletions assets/database/db.json
View file

Large diffs are not rendered by default.

Binary file modified assets/database/leftover_db.bin
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions assets/database/leftover_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@
{"id":3332,"name":"Perrine's Boots","icon":"inv_boots_01","type":10,"armorType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":9,"phase":1,"quality":1,"sources":[{"drop":{"npcId":1662,"zoneId":85}}]},
{"id":3334,"name":"Farmer's Shovel","icon":"inv_misc_shovel_01","type":13,"weaponType":4,"handType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":11,"weaponDamageMax":17,"weaponSpeed":3.7,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":7,"phase":1,"quality":1,"sources":[{"drop":{"zoneId":85}},{"quest":{"id":79192,"name":"Stepping Stones"}}]},
{"id":3335,"name":"Farmer's Broom","icon":"inv_staff_08","type":13,"weaponType":8,"handType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":9,"weaponDamageMax":14,"weaponSpeed":3.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":6,"phase":1,"quality":1,"sources":[{"drop":{"zoneId":85}}]},
{"id":3360,"name":"Stitches' Femur","icon":"inv_misc_bone_01","type":13,"weaponType":5,"handType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":30,"phase":1,"quality":1,"unique":true,"sources":[{"drop":{"npcId":412,"zoneId":10}}]},
{"id":3360,"name":"Stitches' Femur","icon":"inv_misc_bone_01","type":13,"weaponType":5,"handType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":30,"phase":1,"quality":1,"unique":true,"sources":[{"drop":{"npcId":412,"zoneId":10}}]},
{"id":3363,"name":"Frayed Belt","icon":"inv_belt_04","type":8,"armorType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":3,"phase":1},
{"id":3365,"name":"Frayed Bracers","icon":"inv_bracer_10","type":6,"armorType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":5,"phase":1},
{"id":3370,"name":"Patchwork Belt","icon":"inv_belt_03","type":8,"armorType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":8,"phase":1},
Expand Down Expand Up @@ -1049,7 +1049,7 @@
{"id":6365,"name":"Strong Fishing Pole","icon":"inv_fishingpole_02","type":13,"handType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":13,"weaponDamageMax":21,"weaponSpeed":3,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":10,"phase":1,"quality":1},
{"id":6366,"name":"Darkwood Fishing Pole","icon":"inv_fishingpole_02","type":13,"handType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":28,"weaponDamageMax":43,"weaponSpeed":3,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":20,"phase":1,"quality":1},
{"id":6367,"name":"Big Iron Fishing Pole","icon":"inv_fishingpole_01","type":13,"handType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":45,"weaponDamageMax":69,"weaponSpeed":3,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":30,"phase":1,"quality":1,"sources":[{"drop":{"npcId":176582,"zoneId":405}}]},
{"id":6447,"name":"Worn Turtle Shell Shield","icon":"inv_shield_21","type":13,"weaponType":7,"handType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,382,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":20,"phase":1,"quality":1,"expansion":1,"sources":[{"drop":{"npcId":3653,"zoneId":718}},{"drop":{"difficulty":1,"npcId":3653,"zoneId":718}}]},
{"id":6447,"name":"Worn Turtle Shell Shield","icon":"inv_shield_21","type":13,"weaponType":7,"handType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,412,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":20,"phase":1,"quality":1,"expansion":1,"sources":[{"drop":{"npcId":3653,"zoneId":718}},{"drop":{"difficulty":1,"npcId":3653,"zoneId":718}}]},
{"id":6506,"name":"Infantry Boots","icon":"inv_boots_plate_01","type":10,"armorType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":11,"phase":1,"quality":1},
{"id":6507,"name":"Infantry Bracers","icon":"inv_bracer_14","type":6,"armorType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":10,"phase":1,"quality":1},
{"id":6508,"name":"Infantry Cloak","icon":"inv_misc_cape_11","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":9,"phase":1,"quality":1},
Expand Down Expand Up @@ -1108,7 +1108,7 @@
{"id":7350,"name":"Disciple's Bracers","icon":"inv_bracer_12","type":6,"armorType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":10,"phase":1,"quality":1},
{"id":7351,"name":"Disciple's Boots","icon":"inv_boots_09","type":10,"armorType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":11,"phase":1,"quality":1},
{"id":7683,"name":"Bloody Brass Knuckles","icon":"inv_gauntlets_11","type":13,"weaponType":3,"handType":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":18,"weaponDamageMax":35,"weaponSpeed":1.6,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":34,"phase":1,"quality":1,"expansion":1,"sources":[{"drop":{"npcId":3983,"zoneId":796}},{"drop":{"difficulty":1,"npcId":3983,"zoneId":796}}]},
{"id":7922,"name":"Steel Plate Helm","icon":"inv_helmet_03","type":1,"armorType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,295,0,0,0,0,0,0,0,0,0,0,0,0,0,60,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":43,"phase":1,"quality":1,"expansion":1,"sources":[{"crafted":{"profession":2,"spellId":9935}}]},
{"id":7922,"name":"Steel Plate Helm","icon":"inv_helmet_03","type":1,"armorType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,355,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":43,"phase":1,"quality":1,"expansion":1,"sources":[{"crafted":{"profession":2,"spellId":9935}}]},
{"id":7955,"name":"Copper Claymore","icon":"inv_sword_21","type":13,"weaponType":9,"handType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":15,"weaponDamageMax":23,"weaponSpeed":3,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":11,"phase":1,"quality":1,"expansion":1,"sources":[{"crafted":{"profession":2,"spellId":9983}}]},
{"id":7956,"name":"Bronze Warhammer","icon":"inv_hammer_18","type":13,"weaponType":4,"handType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":37,"weaponDamageMax":57,"weaponSpeed":3.1,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":25,"phase":1,"quality":1,"expansion":1,"sources":[{"crafted":{"profession":2,"spellId":9985}}]},
{"id":7957,"name":"Bronze Greatsword","icon":"inv_sword_20","type":13,"weaponType":9,"handType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":38,"weaponDamageMax":58,"weaponSpeed":3,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":26,"phase":1,"quality":1,"expansion":1,"sources":[{"crafted":{"profession":2,"spellId":9986}}]},
Expand Down Expand Up @@ -1435,8 +1435,8 @@
{"effectId":63,"spellId":13538,"name":"Enchant Chest - Lesser Absorption","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":66,"spellId":7457,"name":"Enchant Bracer - Minor Stamina","type":6,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":66,"spellId":7863,"name":"Enchant Boots - Minor Stamina","type":10,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":242,"spellId":7748,"name":"Enchant Chest - Lesser Health","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":243,"spellId":7766,"name":"Enchant Bracer - Minor Spirit","type":6,"stats":[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":246,"spellId":7776,"name":"Enchant Chest - Lesser Mana","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
Expand Down Expand Up @@ -1511,8 +1511,8 @@
{"effectId":929,"itemId":16217,"spellId":20069,"name":"Enchant Shield - Greater Stamina","type":13,"enchantType":2,"stats":[0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":930,"spellId":13947,"name":"Enchant Gloves - Riding Skill","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":931,"spellId":13948,"name":"Enchant Gloves - Minor Haste","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":1483,"itemId":11622,"spellId":15340,"name":"Lesser Arcanum of Rumination","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1503,"itemId":11642,"spellId":15389,"name":"Lesser Arcanum of Constitution","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0],"quality":2},
Expand Down
13 changes: 6 additions & 7 deletions sim/core/character.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,12 @@ func (character *Character) addUniversalStatDependencies() {
character.AddStat(stats.Health, 20-10*20)
character.AddStatDependency(stats.Stamina, stats.Health, 10)
character.AddStatDependency(stats.Agility, stats.Armor, 2)
character.AddStatDependency(stats.Defense, stats.Dodge, MissDodgeParryBlockCritChancePerDefense)
character.AddStatDependency(stats.Defense, stats.Parry, MissDodgeParryBlockCritChancePerDefense)
character.AddStatDependency(stats.Defense, stats.Block, MissDodgeParryBlockCritChancePerDefense)

character.AddStat(stats.Parry, 5*ParryRatingPerParryChance)
character.AddStat(stats.Block, 5*BlockRatingPerBlockChance)
}

func (character *Character) applyWeaponSkills() {
Expand Down Expand Up @@ -294,13 +300,6 @@ func (character *Character) applyAllEffects(agent Agent, raidBuffs *proto.RaidBu
}
}

character.AddStatDependency(stats.Defense, stats.Dodge, MissDodgeParryBlockCritChancePerDefense)
character.AddStatDependency(stats.Defense, stats.Parry, MissDodgeParryBlockCritChancePerDefense)
character.AddStatDependency(stats.Defense, stats.Block, MissDodgeParryBlockCritChancePerDefense)

character.AddStat(stats.Parry, 5*ParryRatingPerParryChance)
character.AddStat(stats.Block, 5*BlockRatingPerBlockChance)

applyRaceEffects(agent)
character.applyBuildPhaseAuras(CharacterBuildPhaseBase)
playerStats.BaseStats = measureStats()
Expand Down
2 changes: 1 addition & 1 deletion sim/rogue/dps_rogue/TestCombatSinisterStrike.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ character_stats_results: {
final_stats: 60
final_stats: 60
final_stats: 60
final_stats: 484
final_stats: 384
final_stats: 0
final_stats: 0
final_stats: 0
Expand Down
13 changes: 3 additions & 10 deletions tools/database/wowhead_tooltips.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,19 +513,12 @@ func (item WowheadItemResponse) IsScalableArmorSlot() bool {
}
return true
}

// In Vanilla and TBC, both Armor and Bonus Armor scale with gear armor multipliers on all equipment.
func (item WowheadItemResponse) GetArmorValues() (int, int) {
armorValue := item.GetIntValue(armorRegex)
bonusArmorValue := item.GetIntValue(bonusArmorRegex)

if item.IsScalableArmorSlot() {
armorValue = armorValue - bonusArmorValue
} else {
bonusArmorValue = armorValue
armorValue = 0
}
//bonusArmorValue := item.GetIntValue(bonusArmorRegex)

return armorValue, bonusArmorValue
return armorValue, 0
}

var armorTypePatterns = map[proto.ArmorType]*regexp.Regexp{
Expand Down

0 comments on commit f150294

Please sign in to comment.