Merge branch 'master' into p4/warlock

assets/database/db.json

@@ -7211,6 +7211,14 @@
 {"id":224006,"name":"Emerald Ring","icon":"inv_jewelry_ring_37","type":11,"requiresLevel":45,"stats":[0,0,12,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,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":50,"phase":3,"quality":3,"unique":true,"sources":[{"rep":{"repFactionId":2641,"repLevel":6}}]},
 {"id":224409,"name":"Serpent's Striker","icon":"inv_weapon_hand_01","type":13,"weaponType":3,"handType":3,"requiresLevel":50,"stats":[0,9,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],"weaponDamageMin":73,"weaponDamageMax":136,"weaponSpeed":2.6,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":55,"phase":3,"quality":4,"setName":"Serpent's Ascension","sources":[{"soldBy":{"npcId":222413,"npcName":"Zalgo the Explorer","zoneId":33}}]},
 {"id":225893,"name":"Epoch's End","icon":"inv_sword_50","type":13,"weaponType":9,"handType":4,"requiresLevel":125,"stats":[333,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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":649,"weaponDamageMax":764,"weaponSpeed":4.2,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":100,"phase":4,"quality":4,"unique":true},
+{"id":226440,"name":"Nightslayer Belt","icon":"inv_belt_23","type":8,"armorType":2,"requiresLevel":60,"stats":[9,20,14,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,113,0,0,0,0,0,0,0,0,0,7,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":66,"phase":4,"quality":4,"classAllowlist":[6],"setName":"Nightslayer Thrill"},
+{"id":226441,"name":"Nightslayer Gloves","icon":"inv_gauntlets_21","type":7,"armorType":2,"requiresLevel":60,"stats":[12,20,16,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,125,0,0,0,0,0,0,0,0,0,7,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":66,"phase":4,"quality":4,"classAllowlist":[6],"setName":"Nightslayer Thrill"},
+{"id":226442,"name":"Nightslayer Bracelets","icon":"inv_bracer_02","type":6,"armorType":2,"requiresLevel":60,"stats":[8,17,10,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,88,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":66,"phase":4,"quality":4,"classAllowlist":[6],"setName":"Nightslayer Thrill"},
+{"id":226443,"name":"Nightslayer Boots","icon":"inv_boots_08","type":10,"armorType":2,"requiresLevel":60,"stats":[8,26,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,138,0,0,0,0,0,0,0,0,0,7,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":66,"phase":4,"quality":4,"classAllowlist":[6],"setName":"Nightslayer Thrill"},
+{"id":226444,"name":"Nightslayer Shoulder Pads","icon":"inv_shoulder_25","type":3,"armorType":2,"requiresLevel":60,"stats":[6,26,12,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,7,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":66,"phase":4,"quality":4,"classAllowlist":[6],"setName":"Nightslayer Thrill"},
+{"id":226445,"name":"Nightslayer Pants","icon":"inv_pants_06","type":9,"armorType":2,"requiresLevel":60,"stats":[15,33,11,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,175,0,0,0,0,0,0,0,0,0,10,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":66,"phase":4,"quality":4,"classAllowlist":[6],"setName":"Nightslayer Thrill"},
+{"id":226446,"name":"Nightslayer Cover","icon":"inv_helmet_41","type":1,"armorType":2,"requiresLevel":60,"stats":[12,20,14,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,2,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,10,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":66,"phase":4,"quality":4,"classAllowlist":[6],"setName":"Nightslayer Thrill"},
+{"id":226447,"name":"Nightslayer Chestpiece","icon":"inv_chest_cloth_07","type":5,"armorType":2,"requiresLevel":60,"stats":[12,29,14,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,1,0,0,0,0,0,0,200,0,0,0,0,0,0,0,0,0,10,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":66,"phase":4,"quality":4,"classAllowlist":[6],"setName":"Nightslayer Thrill"},
 {"id":226500,"name":"Chipped Drakefire Amulet","icon":"inv_jewelry_talisman_11","type":2,"requiresLevel":50,"stats":[0,0,10,0,0,0,0,0,0,0,0,0,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],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":63,"phase":4,"quality":7,"unique":true},
 {"id":226547,"name":"Felheart Pants","icon":"inv_pants_cloth_14","type":9,"armorType":1,"requiresLevel":60,"stats":[0,0,20,19,10,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":66,"phase":4,"quality":4,"classAllowlist":[8],"setName":"Corrupted Felheart"},
 {"id":226548,"name":"Felheart Robes","icon":"inv_chest_cloth_09","type":5,"armorType":1,"requiresLevel":60,"stats":[0,0,31,20,0,13,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,102,0,0,0,0,0,0,0,0,0,10,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":66,"phase":4,"quality":4,"classAllowlist":[8],"setName":"Corrupted Felheart"},

assets/database/leftover_db.json

@@ -1554,8 +1554,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":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":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":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},

sim/core/base_stats.go

@@ -130,6 +130,18 @@ var ClassBaseCrit = map[proto.Class]stats.Stats{
 	},
 }
 
+var APPerStrength = map[proto.Class]float64{
+	proto.Class_ClassWarrior: 2,
+	proto.Class_ClassPaladin: 2,
+	proto.Class_ClassHunter:  1,
+	proto.Class_ClassRogue:   1,
+	proto.Class_ClassPriest:  1,
+	proto.Class_ClassShaman:  2,
+	proto.Class_ClassMage:    1,
+	proto.Class_ClassWarlock: 1,
+	proto.Class_ClassDruid:   2,
+}
+
 // Melee/Ranged crit agi scaling
 var CritPerAgiAtLevel = map[proto.Class]map[int]float64{
 	proto.Class_ClassUnknown: {25: 0.0, 40: 0.0, 50: 0.0, 60: 0.0},

sim/core/flags.go

@@ -192,6 +192,7 @@ const (
 	SpellFlagAgentReserved2
 	SpellFlagAgentReserved3
 	SpellFlagAgentReserved4
+	SpellFlagAgentReserved5
 
 	SpellFlagIgnoreModifiers = SpellFlagIgnoreAttackerModifiers | SpellFlagIgnoreTargetModifiers
 )

sim/core/racials.go

@@ -78,7 +78,7 @@ func applyRaceEffects(agent Agent) {
 			Duration: time.Second * 15,
 			// Tooltip is misleading; ap bonus is base AP plus AP from current strength, does not include +attackpower on items/buffs
 			OnGain: func(aura *Aura, sim *Simulation) {
-				bloodFuryAP = (character.GetBaseStats()[stats.AttackPower] + (character.GetStat(stats.Strength) * 2)) * 0.25
+				bloodFuryAP = (character.GetBaseStats()[stats.AttackPower] + (character.GetStat(stats.Strength) * APPerStrength[character.Class])) * 0.25
 				character.AddStatDynamic(sim, stats.AttackPower, bloodFuryAP)
 			},
 

sim/druid/druid.go

@@ -256,7 +256,7 @@ func New(character *core.Character, form DruidForm, selfBuffs SelfBuffs, talents
 	druid.EnableManaBar()
 
 	// TODO: Class druid physical stats
-	druid.AddStatDependency(stats.Strength, stats.AttackPower, 2)
+	druid.AddStatDependency(stats.Strength, stats.AttackPower, core.APPerStrength[character.Class])
 	druid.AddStatDependency(stats.BonusArmor, stats.Armor, 1)
 	druid.AddStatDependency(stats.Agility, stats.MeleeCrit, core.CritPerAgiAtLevel[character.Class][int(druid.Level)]*core.CritRatingPerCritChance)
 	druid.AddStatDependency(stats.Intellect, stats.SpellCrit, core.CritPerIntAtLevel[character.Class][int(druid.Level)]*core.SpellCritRatingPerCritChance)

sim/hunter/TestBM.results

@@ -149,7 +149,7 @@ stat_weights_results: {
  key: "TestBM-Lvl40-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.8085
+  weights: 0.8079
   weights: 0
   weights: 0
   weights: 0
@@ -166,8 +166,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0.31124
-  weights: 8.46821
-  weights: 7.64026
+  weights: 8.44271
+  weights: 7.62158
   weights: 0
   weights: 0
   weights: 0
@@ -302,22 +302,22 @@ dps_results: {
 dps_results: {
  key: "TestBM-Lvl40-AllItems-BeastmasterArmor"
  value: {
-  dps: 527.83604
-  tps: 239.75095
+  dps: 527.06296
+  tps: 238.97786
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-AllItems-SignetofBeasts-209823"
  value: {
-  dps: 838.59889
-  tps: 321.29786
+  dps: 836.59954
+  tps: 320.1109
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Average-Default"
  value: {
-  dps: 849.12016
-  tps: 328.13556
+  dps: 847.09336
+  tps: 326.90583
  }
 }
 dps_results: {
@@ -491,43 +491,43 @@ dps_results: {
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 1635.24911
-  tps: 992.4943
+  dps: 1630.77885
+  tps: 990.55107
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 745.63236
-  tps: 236.04306
+  dps: 744.69965
+  tps: 235.90031
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 788.82445
-  tps: 249.1845
+  dps: 787.53742
+  tps: 249.04312
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 865.15225
-  tps: 634.09869
+  dps: 863.26146
+  tps: 633.2562
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 373.97251
-  tps: 129.19582
+  dps: 373.62562
+  tps: 129.14291
  }
 }
 dps_results: {
  key: "TestBM-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 407.26555
-  tps: 135.24739
+  dps: 406.77043
+  tps: 135.17851
  }
 }
 dps_results: {
@@ -659,7 +659,7 @@ dps_results: {
 dps_results: {
  key: "TestBM-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 805.77815
-  tps: 300.9746
+  dps: 803.96822
+  tps: 299.90694
  }
 }

sim/hunter/TestSV.results

@@ -166,8 +166,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0.35631
-  weights: 0.43666
-  weights: 6.71901
+  weights: 0.36455
+  weights: 6.70309
   weights: 0
   weights: 0
   weights: 0
@@ -302,22 +302,22 @@ dps_results: {
 dps_results: {
  key: "TestSV-Lvl40-AllItems-BeastmasterArmor"
  value: {
-  dps: 435.22146
-  tps: 272.1554
+  dps: 434.39369
+  tps: 271.32762
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-AllItems-SignetofBeasts-209823"
  value: {
-  dps: 792.67024
-  tps: 356.36949
+  dps: 790.46674
+  tps: 355.09957
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Average-Default"
  value: {
-  dps: 801.81039
-  tps: 362.65002
+  dps: 799.53008
+  tps: 361.30319
  }
 }
 dps_results: {
@@ -365,49 +365,49 @@ dps_results: {
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 1622.39123
-  tps: 1026.15453
+  dps: 1617.31294
+  tps: 1023.9301
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 663.99075
-  tps: 245.00558
+  dps: 662.87964
+  tps: 244.83736
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 682.32512
-  tps: 258.2862
+  dps: 680.75712
+  tps: 258.06929
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 859.13143
-  tps: 636.55664
+  dps: 856.99433
+  tps: 635.62351
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 338.27763
-  tps: 134.99062
+  dps: 337.85046
+  tps: 134.93215
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 360.65389
-  tps: 138.63798
+  dps: 359.98879
+  tps: 138.54583
  }
 }
 dps_results: {
  key: "TestSV-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 758.75605
-  tps: 337.89003
+  dps: 756.63543
+  tps: 336.64431
  }
 }

sim/hunter/hunter.go

@@ -260,7 +260,7 @@ func NewHunter(character *core.Character, options *proto.Player) *Hunter {
 
 	hunter.pet = hunter.NewHunterPet()
 
-	hunter.AddStatDependency(stats.Strength, stats.AttackPower, 1)
+	hunter.AddStatDependency(stats.Strength, stats.AttackPower, core.APPerStrength[character.Class])
 	hunter.AddStatDependency(stats.Agility, stats.AttackPower, 1)
 	hunter.AddStatDependency(stats.Agility, stats.RangedAttackPower, 2)
 	hunter.AddStatDependency(stats.Agility, stats.MeleeCrit, core.CritPerAgiAtLevel[character.Class][int(character.Level)]*core.CritRatingPerCritChance)

sim/mage/TestArcane.results

@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 30.39344
   final_stats: 0
   final_stats: 0
-  final_stats: 328
+  final_stats: 406.4
   final_stats: 2
   final_stats: 8.2
   final_stats: 0
@@ -67,7 +67,7 @@ character_stats_results: {
   final_stats: 50.2224
   final_stats: 0
   final_stats: 0
-  final_stats: 1042
+  final_stats: 1201.5
   final_stats: 2
   final_stats: 18.2
   final_stats: 0

sim/mage/TestFire.results

@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 30.39344
   final_stats: 0
   final_stats: 0
-  final_stats: 328
+  final_stats: 406.4
   final_stats: 2
   final_stats: 8.2
   final_stats: 0
@@ -67,7 +67,7 @@ character_stats_results: {
   final_stats: 42.9179
   final_stats: 0
   final_stats: 0
-  final_stats: 460
+  final_stats: 572.28
   final_stats: 0
   final_stats: 19.2
   final_stats: 0
@@ -116,7 +116,7 @@ character_stats_results: {
   final_stats: 50.25936
   final_stats: 0
   final_stats: 0
-  final_stats: 1042
+  final_stats: 1201.5
   final_stats: 2
   final_stats: 18.2
   final_stats: 0

sim/mage/TestFrost.results

@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 23.04324
   final_stats: 0
   final_stats: 0
-  final_stats: 460
+  final_stats: 572.28
   final_stats: 0
   final_stats: 19.2
   final_stats: 0
@@ -67,7 +67,7 @@ character_stats_results: {
   final_stats: 13.1808
   final_stats: 0
   final_stats: 0
-  final_stats: -10
+  final_stats: 24
   final_stats: 2
   final_stats: 5.2
   final_stats: 0

sim/mage/mage.go

@@ -153,6 +153,7 @@ func NewMage(character *core.Character, options *proto.Player) *Mage {
 
 	mage.EnableManaBar()
 
+	mage.AddStatDependency(stats.Strength, stats.AttackPower, core.APPerStrength[character.Class])
 	mage.AddStatDependency(stats.Intellect, stats.SpellCrit, core.CritPerIntAtLevel[mage.Class][int(mage.Level)]*core.SpellCritRatingPerCritChance)
 
 	switch mage.Options.Armor {

sim/paladin/paladin.go

@@ -91,7 +91,7 @@ func NewPaladin(character *core.Character, talentsStr string) *Paladin {
 
 	paladin.PseudoStats.CanParry = true
 	paladin.EnableManaBar()
-	paladin.AddStatDependency(stats.Strength, stats.AttackPower, 2.0)
+	paladin.AddStatDependency(stats.Strength, stats.AttackPower, core.APPerStrength[character.Class])
 	paladin.AddStatDependency(stats.Agility, stats.MeleeCrit, core.CritPerAgiAtLevel[character.Class][int(paladin.Level)]*core.CritRatingPerCritChance)
 	paladin.AddStatDependency(stats.Intellect, stats.SpellCrit, core.CritPerIntAtLevel[character.Class][int(paladin.Level)]*core.SpellCritRatingPerCritChance)
 

sim/priest/priest.go

@@ -133,6 +133,7 @@ func New(character *core.Character, talents string) *Priest {
 
 	priest.EnableManaBar()
 
+	priest.AddStatDependency(stats.Strength, stats.AttackPower, core.APPerStrength[character.Class])
 	priest.AddStatDependency(stats.Intellect, stats.SpellCrit, core.CritPerIntAtLevel[priest.Class][int(priest.Level)]*core.SpellCritRatingPerCritChance)
 
 	// Set mana regen to 12.5 + Spirit/4 each 2s tick