Merge pull request #2818 from vigo2/vigo/rogueRotations

Rogue Rotation
wowsims · Mar 26, 2023 · e85dfd9 · e85dfd9
2 parents 091bb1e + 86d72fb
commit e85dfd9
Show file tree

Hide file tree

Showing 18 changed files with 1,665 additions and 1,362 deletions.
diff --git a/proto/rogue.proto b/proto/rogue.proto
@@ -181,13 +181,10 @@ message Rogue {
 		Frequency MultiTargetSliceFrequency = 9;
 		int32 minimum_combo_points_multi_target_slice = 10;
 
-		reserved 11, 19, 21, 22, 23; // the various envenom pooling parameters
+		reserved 11, 13, 14, 19, 21, 22, 23; // the various envenom pooling parameters
 
 		bool use_feint = 12;
 
-		bool allow_cp_overcap = 13;
-		bool allow_cp_undercap = 14;
-
 		bool open_with_garrote = 15;
 		bool open_with_premeditation = 16;
 		bool open_with_shadowstep = 17;

diff --git a/sim/core/dot.go b/sim/core/dot.go
@@ -30,7 +30,7 @@ type DotConfig struct {
 type Dot struct {
 	Spell *Spell
 
-	// Embed Aura so we can use IsActive/Refresh/etc directly.
+	// Embed Aura, so we can use IsActive/Refresh/etc directly.
 	*Aura
 
 	NumberOfTicks int32         // number of ticks over the whole duration
@@ -55,7 +55,7 @@ type Dot struct {
 	lastTickTime time.Duration
 }
 
-// TickPeriod is how fast the snapshotted dot ticks.
+// TickPeriod is how fast the snapshot dot ticks.
 func (dot *Dot) TickPeriod() time.Duration {
 	return dot.tickPeriod
 }
@@ -72,7 +72,7 @@ func (dot *Dot) NumTicksRemaining(sim *Simulation) int {
 
 // Roll over = gets carried over with everlasting refresh and doesn't get applied if triggered when the spell is already up.
 // - Example: critical strike rating, internal % damage modifiers: buffs or debuffs on player
-// Nevermelting Ice, Shadow Mastery (ISB), Trick of the Trades, Deaths Embrace, Thadius Polarity, Hera Spores, Crit on weapons from swapping
+// Nevermelting Ice, Shadow Mastery (ISB), Trick of the Trades, Deaths Embrace, Thaddius Polarity, Hera Spores, Crit on weapons from swapping
 
 // Snapshot = calculation happens at refresh and application (stays up even if buff falls of, until new refresh or application)
 // - Example: Spell power, Haste rating
@@ -83,8 +83,8 @@ func (dot *Dot) NumTicksRemaining(sim *Simulation) int {
 // Haunt, Curse of Shadow, Shadow Embrace
 
 // Rollover is used to reset the duration of a dot from an external spell (not casting the dot itself)
-// This keeps the snapshotted crit and %dmg modifiers.
-// However sp and haste are recalculated.
+// This keeps the snapshot crit and %dmg modifiers.
+// However, sp and haste are recalculated.
 func (dot *Dot) Rollover(sim *Simulation) {
 	dot.TakeSnapshot(sim, true)
 

diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results
@@ -102,15 +102,15 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-AllItems-BlackBruise-50035"
  value: {
-  dps: 5873.6918
-  tps: 4170.32118
+  dps: 5794.83443
+  tps: 4114.33244
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-BlackBruise-50692"
  value: {
-  dps: 5956.05754
-  tps: 4228.80085
+  dps: 5868.81783
+  tps: 4166.86066
  }
 }
 dps_results: {
@@ -566,8 +566,8 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-AllItems-Shadowblade'sBattlegear"
  value: {
-  dps: 7787.26234
-  tps: 5528.95626
+  dps: 7790.58277
+  tps: 5531.31376
  }
 }
 dps_results: {
@@ -678,8 +678,8 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-AllItems-TheFistsofFury"
  value: {
-  dps: 5100.8384
-  tps: 3621.59526
+  dps: 4991.69544
+  tps: 3544.10376
  }
 }
 dps_results: {