Merge branch 'master' into p4/general

wowsims · Jul 7, 2024 · 6e749fa · 6e749fa
2 parents 70fc107 + 82fdae1
commit 6e749fa
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 37 deletions.
diff --git a/sim/core/base_stats.go b/sim/core/base_stats.go
@@ -142,6 +142,18 @@ var APPerStrength = map[proto.Class]float64{
 	proto.Class_ClassDruid:   2,
 }
 
+var APPerAgility = map[proto.Class]float64{
+	proto.Class_ClassWarrior: 0,
+	proto.Class_ClassPaladin: 0,
+	proto.Class_ClassHunter:  0,
+	proto.Class_ClassRogue:   1,
+	proto.Class_ClassPriest:  0,
+	proto.Class_ClassShaman:  0,
+	proto.Class_ClassMage:    0,
+	proto.Class_ClassWarlock: 0,
+	proto.Class_ClassDruid:   1,
+}
+
 // 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},

diff --git a/sim/core/racials.go b/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) * APPerStrength[character.Class])) * 0.25
+				bloodFuryAP = (character.GetBaseStats()[stats.AttackPower] + (character.GetStat(stats.Strength) * APPerStrength[character.Class]) + (character.GetStat(stats.Agility) * APPerAgility[character.Class])) * 0.25
 				character.AddStatDynamic(sim, stats.AttackPower, bloodFuryAP)
 			},
 

diff --git a/sim/rogue/dps_rogue/TestAssassination.results b/sim/rogue/dps_rogue/TestAssassination.results
@@ -253,43 +253,43 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-FullBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 131.16598
-  tps: 93.12785
+  dps: 131.95123
+  tps: 93.68537
  }
 }
 dps_results: {
  key: "TestAssassination-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-FullBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 131.16598
-  tps: 93.12785
+  dps: 131.95123
+  tps: 93.68537
  }
 }
 dps_results: {
  key: "TestAssassination-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 140.20728
-  tps: 99.54717
+  dps: 141.76517
+  tps: 100.65327
  }
 }
 dps_results: {
  key: "TestAssassination-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-NoBuffs-Phase 1 Consumes-LongMultiTarget"
  value: {
-  dps: 61.31141
-  tps: 43.5311
+  dps: 61.76212
+  tps: 43.85111
  }
 }
 dps_results: {
  key: "TestAssassination-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-NoBuffs-Phase 1 Consumes-LongSingleTarget"
  value: {
-  dps: 61.31141
-  tps: 43.5311
+  dps: 61.76212
+  tps: 43.85111
  }
 }
 dps_results: {
  key: "TestAssassination-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
  value: {
-  dps: 64.90476
-  tps: 46.08238
+  dps: 65.8156
+  tps: 46.72908
  }
 }
 dps_results: {
@@ -358,43 +358,43 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 294.21124
-  tps: 208.88998
+  dps: 295.98151
+  tps: 210.14687
  }
 }
 dps_results: {
  key: "TestAssassination-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 294.21124
-  tps: 208.88998
+  dps: 295.98151
+  tps: 210.14687
  }
 }
 dps_results: {
  key: "TestAssassination-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 317.15897
-  tps: 225.18287
+  dps: 321.00439
+  tps: 227.91312
  }
 }
 dps_results: {
  key: "TestAssassination-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 155.90753
-  tps: 110.69434
+  dps: 157.00571
+  tps: 111.47406
  }
 }
 dps_results: {
  key: "TestAssassination-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 155.90753
-  tps: 110.69434
+  dps: 157.00571
+  tps: 111.47406
  }
 }
 dps_results: {
  key: "TestAssassination-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 166.41612
-  tps: 118.15545
+  dps: 168.8095
+  tps: 119.85474
  }
 }
 dps_results: {

diff --git a/sim/rogue/dps_rogue/TestCombat.results b/sim/rogue/dps_rogue/TestCombat.results
@@ -358,43 +358,43 @@ dps_results: {
 dps_results: {
  key: "TestCombat-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 221.66081
-  tps: 157.37918
+  dps: 223.6725
+  tps: 158.80747
  }
 }
 dps_results: {
  key: "TestCombat-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 192.32796
-  tps: 136.55285
+  dps: 193.46249
+  tps: 137.35836
  }
 }
 dps_results: {
  key: "TestCombat-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 252.34822
-  tps: 179.16724
+  dps: 255.55287
+  tps: 181.44254
  }
 }
 dps_results: {
  key: "TestCombat-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 116.66216
-  tps: 82.83013
+  dps: 117.87582
+  tps: 83.69183
  }
 }
 dps_results: {
  key: "TestCombat-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 101.66278
-  tps: 72.18058
+  dps: 102.35573
+  tps: 72.67257
  }
 }
 dps_results: {
  key: "TestCombat-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 132.8841
-  tps: 94.34771
+  dps: 134.85715
+  tps: 95.74857
  }
 }
 dps_results: {