Merge pull request #1009 from wowsims/fix/adjust-vlpc-procrate

[FIX] Adjust VPLC proc rate and add warning
wowsims · Sep 13, 2024 · 32cf1af · 32cf1af
2 parents c82ae38 + cdff057
commit 32cf1af
Show file tree

Hide file tree

Showing 21 changed files with 138 additions and 362 deletions.
diff --git a/sim/common/cata/damage_procs.go b/sim/common/cata/damage_procs.go
@@ -44,7 +44,9 @@ func init() {
 
 	core.NewItemEffect(68925, func(agent core.Agent) {
 		character := agent.GetCharacter()
-		procChance := 0.15 //TODO: simc proc chance, verify when available
+		// Proc chance determined to be p=.48 by video research - Researched by InDebt & Frostbitten
+		// Research: https://github.com/wowsims/cata/pull/1009#issuecomment-2348700653
+		procChance := 0.5
 		dummyAura := character.GetOrRegisterAura(core.Aura{
 			Label:     "Electrical Charge",
 			ActionID:  core.ActionID{SpellID: 96890},
@@ -89,7 +91,9 @@ func init() {
 
 	core.NewItemEffect(69110, func(agent core.Agent) {
 		character := agent.GetCharacter()
-		procChance := 0.15 //TODO: simc proc chance, verify when available
+		// Proc chance determined to be p=.48 by video research - Researched by InDebt & Frostbitten
+		// Research: https://github.com/wowsims/cata/pull/1009#issuecomment-2348700653
+		procChance := 0.5
 		dummyAura := character.GetOrRegisterAura(core.Aura{
 			Label:     "Electrical Charge",
 			ActionID:  core.ActionID{SpellID: 96890},

diff --git a/sim/death_knight/blood/TestBlood.results b/sim/death_knight/blood/TestBlood.results
@@ -1454,16 +1454,16 @@ dps_results: {
 dps_results: {
  key: "TestBlood-AllItems-VariablePulseLightningCapacitor-68925"
  value: {
-  dps: 13867.989
-  tps: 67355.20233
+  dps: 13894.55341
+  tps: 67491.94038
   hps: 3597.80333
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-VariablePulseLightningCapacitor-69110"
  value: {
-  dps: 13994.66585
-  tps: 68006.57714
+  dps: 14072.10466
+  tps: 68453.99466
   hps: 3597.80333
  }
 }

diff --git a/sim/death_knight/frost/TestFrost.results b/sim/death_knight/frost/TestFrost.results
@@ -1454,17 +1454,17 @@ dps_results: {
 dps_results: {
  key: "TestFrost-AllItems-VariablePulseLightningCapacitor-68925"
  value: {
-  dps: 20888.44098
-  tps: 19046.66966
-  hps: 243.15661
+  dps: 20923.14355
+  tps: 19076.10728
+  hps: 245.25883
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-VariablePulseLightningCapacitor-69110"
  value: {
-  dps: 21169.41677
-  tps: 19320.66477
-  hps: 244.55809
+  dps: 21205.37782
+  tps: 19356.3376
+  hps: 243.85735
  }
 }
 dps_results: {

diff --git a/sim/death_knight/unholy/TestUnholy.results b/sim/death_knight/unholy/TestUnholy.results
@@ -1453,16 +1453,16 @@ dps_results: {
 dps_results: {
  key: "TestUnholy-AllItems-VariablePulseLightningCapacitor-68925"
  value: {
-  dps: 30689.34267
-  tps: 22722.60867
+  dps: 30717.84199
+  tps: 22775.15024
   hps: 546.10701
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-VariablePulseLightningCapacitor-69110"
  value: {
-  dps: 30903.73701
-  tps: 22921.83641
+  dps: 31040.44147
+  tps: 23096.88086
   hps: 546.10701
  }
 }

diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results
@@ -1292,15 +1292,15 @@ dps_results: {
 dps_results: {
  key: "TestFeral-AllItems-VariablePulseLightningCapacitor-68925"
  value: {
-  dps: 25440.2205
-  tps: 36365.45089
+  dps: 25442.44906
+  tps: 36368.2953
  }
 }
 dps_results: {
  key: "TestFeral-AllItems-VariablePulseLightningCapacitor-69110"
  value: {
-  dps: 25442.14595
-  tps: 36370.85154
+  dps: 25445.65054
+  tps: 36384.22947
  }
 }
 dps_results: {
@@ -1457,258 +1457,6 @@ dps_results: {
   tps: 38099.78544
  }
 }
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 72482.79527
-  tps: 102452.5317
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 17314.8806
-  tps: 30603.86836
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 20168.86034
-  tps: 27210.30277
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 48860.03087
-  tps: 71806.94005
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 10501.0355
-  tps: 19012.23496
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-aoe-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 10595.61334
-  tps: 18566.7369
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 34147.15539
-  tps: 51467.00617
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 30596.73369
-  tps: 42742.1699
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 37555.94487
-  tps: 38887.67166
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 21423.66892
-  tps: 33129.29656
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 19508.92026
-  tps: 28537.42221
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 20822.92874
-  tps: 23263.7434
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 30294.38525
-  tps: 21511.27417
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29699.93003
-  tps: 21086.95032
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 36710.76641
-  tps: 26064.64415
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 18558.3292
-  tps: 13178.77661
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18714.01678
-  tps: 13287.16207
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-DefaultTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 20431.50102
-  tps: 14506.93372
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 72438.94596
-  tps: 102036.95006
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 17176.04684
-  tps: 30277.02948
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 19996.9155
-  tps: 26249.58074
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 48802.94006
-  tps: 70998.87144
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 10484.79216
-  tps: 19203.81306
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-aoe-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 10478.07646
-  tps: 19082.02287
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 33209.34787
-  tps: 49380.19404
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 29663.76428
-  tps: 40864.36479
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 36353.12147
-  tps: 35915.94927
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 20973.38885
-  tps: 32671.99402
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18937.84517
-  tps: 27531.40002
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-default-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 20127.66711
-  tps: 21995.38784
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 29730.60375
-  tps: 21110.98931
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 28838.33016
-  tps: 20475.21442
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-FullBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 35991.27017
-  tps: 25553.80182
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongMultiTarget"
- value: {
-  dps: 18034.50985
-  tps: 12806.86487
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-LongSingleTarget"
- value: {
-  dps: 18131.26428
-  tps: 12873.4078
- }
-}
-dps_results: {
- key: "TestFeral-Settings-Tauren-p1-HybridTalents-ExternalBleed-monocat-NoBuffs-25.0yards-ShortSingleTarget"
- value: {
-  dps: 19777.98396
-  tps: 14042.93661
- }
-}
 dps_results: {
  key: "TestFeral-Settings-Tauren-p3-DefaultTalents-ExternalBleed-aoe-FullBuffs-25.0yards-LongMultiTarget"
  value: {

diff --git a/sim/druid/feral/rotation.go b/sim/druid/feral/rotation.go
@@ -330,21 +330,21 @@ func (cat *FeralDruid) calcBleedRefreshTime(sim *core.Simulation, bleedSpell *dr
 	maxTickCount := core.TernaryInt32(isRip, cat.maxRipTicks, bleedDot.BaseTickCount)
 	maxBleedDur := bleedDot.BaseTickLength * time.Duration(maxTickCount)
 	numCastsCovered := buffRemains / maxBleedDur
-	buffEnd := cat.tempSnapshotAura.ExpiresAt() - numCastsCovered * maxBleedDur
+	buffEnd := cat.tempSnapshotAura.ExpiresAt() - numCastsCovered*maxBleedDur
 
-	if buffEnd > standardRefreshTime + cat.ReactionTime {
+	if buffEnd > standardRefreshTime+cat.ReactionTime {
 		return standardRefreshTime
 	}
 
 	// Potential clips for a buff snapshot should be done as late as possible
-	latestPossibleSnapshot := buffEnd - cat.ReactionTime * time.Duration(2)
+	latestPossibleSnapshot := buffEnd - cat.ReactionTime*time.Duration(2)
 	numClippedTicks := (bleedEnd - latestPossibleSnapshot) / bleedDot.BaseTickLength
-	targetClipTime := standardRefreshTime - numClippedTicks * bleedDot.BaseTickLength
+	targetClipTime := standardRefreshTime - numClippedTicks*bleedDot.BaseTickLength
 
 	// Since the clip can cost us 30-35 Energy, we need to determine whether the damage gain is worth the
 	// spend. First calculate the maximum number of buffed bleed ticks we can get out before the fight
 	// ends.
-	buffedTickCount := min(maxTickCount, int32((sim.Duration - targetClipTime) / bleedDot.BaseTickLength))
+	buffedTickCount := min(maxTickCount, int32((sim.Duration-targetClipTime)/bleedDot.BaseTickLength))
 
 	// Perform a DPE comparison vs. Shred
 	expectedDamageGain := (bleedSpell.NewSnapshotPower - bleedSpell.CurrentSnapshotPower) * float64(buffedTickCount)