fix: gotw should proc ooc

wowsims · Oct 21, 2023 · 2e17674 · 2e17674
1 parent 7339da9
commit 2e17674
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/sim/druid/fake_gotw.go b/sim/druid/fake_gotw.go
@@ -23,5 +23,8 @@ func (druid *Druid) registerFakeGotw() {
 				GCD: core.GCDDefault,
 			},
 		},
+		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
+			spell.CalcAndDealOutcome(sim, target, spell.OutcomeAlwaysHit)
+		},
 	})
 }
diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results
@@ -1044,15 +1044,15 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--FullBuffs-LongMultiTarget"
  value: {
-  dps: 22991.33879
-  tps: 16642.6613
+  dps: 22998.29379
+  tps: 16645.12872
  }
 }
 dps_results: {
  key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--FullBuffs-LongSingleTarget"
  value: {
-  dps: 4747.33047
-  tps: 3448.80558
+  dps: 4752.57417
+  tps: 3452.55097
  }
 }
 dps_results: {
@@ -1065,15 +1065,15 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--NoBuffs-LongMultiTarget"
  value: {
-  dps: 14733.47866
-  tps: 10879.36617
+  dps: 14726.51057
+  tps: 10871.88145
  }
 }
 dps_results: {
  key: "TestFeral-Settings-Tauren-p1-Flower-Aoe--NoBuffs-LongSingleTarget"
  value: {
-  dps: 2572.3973
-  tps: 1908.02844
+  dps: 2581.1908
+  tps: 1913.92756
  }
 }
 dps_results: {

diff --git a/sim/druid/talents.go b/sim/druid/talents.go
@@ -399,6 +399,7 @@ func (druid *Druid) applyOmenOfClarity() {
 			if !result.Landed() {
 				return
 			}
+
 			// https://github.com/JamminL/wotlk-classic-bugs/issues/66#issuecomment-1182017571
 			if druid.HurricaneTickSpell.IsEqual(spell) {
 				curCastTickSpeed := spell.CurCast.ChannelTime.Seconds() / 10
@@ -424,6 +425,11 @@ func (druid *Druid) applyOmenOfClarity() {
 					chanceToProc *= 0.25
 				} else if druid.Moonfire.IsEqual(spell) { // Add Moonfire
 					chanceToProc *= 0.076
+				} else if druid.GiftOfTheWild.IsEqual(spell) { // Add Gift of the Wild
+					// the above comment says it's 0.0875 * (1-0.924) which apparently is out-dated,
+					// there is no longer an instant suppression factor
+					// we assume 30 targets (25man + pets)
+					chanceToProc = 1 - math.Pow(1-chanceToProc, 30)
 				} else {
 					chanceToProc *= 0.666
 				}

diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results
@@ -13,7 +13,7 @@ character_stats_results: {
   final_stats: 221
   final_stats: 0
   final_stats: 5504.84
-  final_stats: 469.94994
+  final_stats: 469.94995
   final_stats: 2072.9756
   final_stats: 221
   final_stats: 94

diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results
@@ -13,7 +13,7 @@ character_stats_results: {
   final_stats: 264
   final_stats: 0
   final_stats: 5996.3904
-  final_stats: 418.94994
+  final_stats: 418.94995
   final_stats: 2218.9399
   final_stats: 264
   final_stats: 94