From 4e4bb27c14dcee770b47680a7dc9da9a629c706a Mon Sep 17 00:00:00 2001 From: b-r-a-n Date: Mon, 31 Oct 2022 19:36:43 -0700 Subject: [PATCH 1/2] [Rogue] Change pooling option to be total energy (rather than additional) --- proto/rogue.proto | 2 ++ sim/rogue/assassination_rotation.go | 3 ++- ui/rogue/inputs.ts | 6 +++--- ui/rogue/presets.ts | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/proto/rogue.proto b/proto/rogue.proto index bd1608d9a1..a458f55aec 100644 --- a/proto/rogue.proto +++ b/proto/rogue.proto @@ -187,6 +187,8 @@ message Rogue { bool open_with_garrote = 14; bool rupture_for_bleed = 15; + + int32 envenom_energy_threshold = 16; } Rotation rotation = 1; diff --git a/sim/rogue/assassination_rotation.go b/sim/rogue/assassination_rotation.go index c3372dd92c..12aced1979 100644 --- a/sim/rogue/assassination_rotation.go +++ b/sim/rogue/assassination_rotation.go @@ -238,7 +238,8 @@ func (rogue *Rogue) setupAssassinationRotation(sim *core.Simulation) { return Cast } } - energyNeeded := core.MinFloat(r.maxEnergy, r.Envenom[1].DefaultCast.Cost+float64(rogue.Rotation.EnvenomPoolAmount)) + energyNeeded := core.MinFloat(r.maxEnergy, float64(rogue.Rotation.EnvenomEnergyThreshold)) + energyNeeded = core.MaxFloat(r.Envenom[1].DefaultCast.Cost, energyNeeded) minimumCP := int32(4) if rogue.Rotation.AllowCpOvercap { eps := r.getExpectedEnergyPerSecond() diff --git a/ui/rogue/inputs.ts b/ui/rogue/inputs.ts index 4d73713682..c670a66774 100644 --- a/ui/rogue/inputs.ts +++ b/ui/rogue/inputs.ts @@ -76,9 +76,9 @@ export const RogueRotationConfig = { ], }), InputHelpers.makeRotationNumberInput({ - fieldName: 'envenomPoolAmount', - label: 'Energy Pooled (Envenom)', - labelTooltip: 'Amount of energy to pool before casting Envenom (beyond the cost).', + fieldName: 'envenomEnergyThreshold', + label: 'Energy Threshold (Envenom)', + labelTooltip: 'Amount of total energy to pool before casting Envenom.', showWhen: (player: Player) => player.getTalents().mutilate }), InputHelpers.makeRotationEnumInput({ diff --git a/ui/rogue/presets.ts b/ui/rogue/presets.ts index 00b46484b1..d1428b2d04 100644 --- a/ui/rogue/presets.ts +++ b/ui/rogue/presets.ts @@ -54,6 +54,7 @@ export const DefaultRotation = RogueRotation.create({ combatFinisherPriority: Rogue_Rotation_CombatPriority.RuptureEviscerate, minimumComboPointsPrimaryFinisher: 3, minimumComboPointsSecondaryFinisher: 2, + envenomEnergyThreshold: 60, }); export const DefaultOptions = RogueOptions.create({ From 921fe123145073acbadf684ce208b2fb8ae069a2 Mon Sep 17 00:00:00 2001 From: b-r-a-n Date: Sun, 6 Nov 2022 11:53:30 -0800 Subject: [PATCH 2/2] [Rogue] Fix base stats --- sim/rogue/TestAssassination.results | 96 ++++++++++++++--------------- sim/rogue/TestCombat.results | 96 ++++++++++++++--------------- sim/rogue/rogue.go | 70 ++++++++++----------- 3 files changed, 131 insertions(+), 131 deletions(-) diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results index 6447d1e6cc..1778ddc7f4 100644 --- a/sim/rogue/TestAssassination.results +++ b/sim/rogue/TestAssassination.results @@ -703,169 +703,169 @@ dps_results: { dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-FullBuffs-LongMultiTarget" value: { - dps: 25979.2738 - tps: 18445.2844 + dps: 25898.28481 + tps: 18387.78222 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-FullBuffs-LongSingleTarget" value: { - dps: 7380.45216 - tps: 5240.12103 + dps: 7354.50065 + tps: 5221.69546 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-FullBuffs-ShortSingleTarget" value: { - dps: 8438.08658 - tps: 5991.04147 + dps: 8399.89156 + tps: 5963.92301 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-NoBuffs-LongMultiTarget" value: { - dps: 15296.32687 - tps: 10860.39208 + dps: 15205.91725 + tps: 10796.20125 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-NoBuffs-LongSingleTarget" value: { - dps: 3611.54197 - tps: 2564.1948 + dps: 3593.47658 + tps: 2551.36837 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-Assassination-NoBuffs-ShortSingleTarget" value: { - dps: 3670.62279 - tps: 2606.14218 + dps: 3658.1772 + tps: 2597.30582 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 15836.39737 - tps: 11243.84213 + dps: 15724.5945 + tps: 11164.46209 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 5789.42919 - tps: 4110.49472 + dps: 5754.18595 + tps: 4085.47202 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 6767.46268 - tps: 4804.8985 + dps: 6743.1691 + tps: 4787.65006 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 9048.10936 - tps: 6424.15765 + dps: 8986.50027 + tps: 6380.41519 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 2615.23733 - tps: 1856.8185 + dps: 2604.49323 + tps: 1849.19019 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 2686.97275 - tps: 1907.75065 + dps: 2674.73251 + tps: 1899.06008 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 25979.2738 - tps: 18445.2844 + dps: 25898.28481 + tps: 18387.78222 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 7380.45216 - tps: 5240.12103 + dps: 7354.50065 + tps: 5221.69546 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 8438.08658 - tps: 5991.04147 + dps: 8399.89156 + tps: 5963.92301 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 15296.32687 - tps: 10860.39208 + dps: 15205.91725 + tps: 10796.20125 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 3611.54197 - tps: 2564.1948 + dps: 3593.47658 + tps: 2551.36837 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 3670.62279 - tps: 2606.14218 + dps: 3658.1772 + tps: 2597.30582 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 20159.26911 - tps: 14313.08107 + dps: 20074.104 + tps: 14252.61384 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 4835.77536 - tps: 3433.40051 + dps: 4811.21581 + tps: 3415.96322 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 5516.60017 - tps: 3916.78612 + dps: 5487.76247 + tps: 3896.31135 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 13047.95882 - tps: 9264.05076 + dps: 12998.42063 + tps: 9228.87865 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 2403.60421 - tps: 1706.55899 + dps: 2393.07882 + tps: 1699.08597 } } dps_results: { key: "TestAssassination-Settings-Orc-P1 Assassination-MH Instant OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 2518.09528 - tps: 1787.84765 + dps: 2506.56783 + tps: 1779.66316 } } dps_results: { diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results index 51695d0996..c25c3696c0 100644 --- a/sim/rogue/TestCombat.results +++ b/sim/rogue/TestCombat.results @@ -710,169 +710,169 @@ dps_results: { dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 14245.6554 - tps: 10114.41534 + dps: 14198.56846 + tps: 10080.98361 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 5489.55154 - tps: 3897.5816 + dps: 5468.03493 + tps: 3882.3048 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 6474.36541 - tps: 4596.79944 + dps: 6455.92861 + tps: 4583.70931 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 8684.94277 - tps: 6166.30936 + dps: 8656.12443 + tps: 6145.84835 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 2560.65955 - tps: 1818.06828 + dps: 2550.15243 + tps: 1810.60823 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 2696.2549 - tps: 1914.34098 + dps: 2684.90841 + tps: 1906.28497 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 19476.14167 - tps: 13828.06059 + dps: 19416.87364 + tps: 13785.98028 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 6477.77633 - tps: 4599.22119 + dps: 6454.04401 + tps: 4582.37125 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 7463.48416 - tps: 5299.07376 + dps: 7442.80504 + tps: 5284.39158 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 12178.86307 - tps: 8646.99278 + dps: 12141.18604 + tps: 8620.24209 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 3206.204 - tps: 2276.40484 + dps: 3193.9535 + tps: 2267.70699 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Deadly OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 3288.83103 - tps: 2335.07003 + dps: 3276.30892 + tps: 2326.17934 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-FullBuffs-LongMultiTarget" value: { - dps: 19476.14167 - tps: 13828.06059 + dps: 19416.87364 + tps: 13785.98028 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-FullBuffs-LongSingleTarget" value: { - dps: 6477.77633 - tps: 4599.22119 + dps: 6454.04401 + tps: 4582.37125 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-FullBuffs-ShortSingleTarget" value: { - dps: 7463.48416 - tps: 5299.07376 + dps: 7442.80504 + tps: 5284.39158 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-NoBuffs-LongMultiTarget" value: { - dps: 12178.86307 - tps: 8646.99278 + dps: 12141.18604 + tps: 8620.24209 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-NoBuffs-LongSingleTarget" value: { - dps: 3206.204 - tps: 2276.40484 + dps: 3193.9535 + tps: 2267.70699 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Deadly-NoBuffs-ShortSingleTarget" value: { - dps: 3288.83103 - tps: 2335.07003 + dps: 3276.30892 + tps: 2326.17934 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-FullBuffs-LongMultiTarget" value: { - dps: 18214.37035 - tps: 12932.20295 + dps: 18157.58509 + tps: 12891.88541 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-FullBuffs-LongSingleTarget" value: { - dps: 4772.55777 - tps: 3388.51602 + dps: 4752.67765 + tps: 3374.40113 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-FullBuffs-ShortSingleTarget" value: { - dps: 5474.3063 - tps: 3886.75748 + dps: 5458.00258 + tps: 3875.18183 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-NoBuffs-LongMultiTarget" value: { - dps: 11954.86824 - tps: 8487.95645 + dps: 11918.01222 + tps: 8461.78868 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-NoBuffs-LongSingleTarget" value: { - dps: 2385.54888 - tps: 1693.73971 + dps: 2375.44834 + tps: 1686.56832 } } dps_results: { key: "TestCombat-Settings-Orc-P1-MH Instant OH Instant-NoBuffs-ShortSingleTarget" value: { - dps: 2484.90499 - tps: 1764.28254 + dps: 2474.19604 + tps: 1756.67919 } } dps_results: { diff --git a/sim/rogue/rogue.go b/sim/rogue/rogue.go index 5e26d4e8e9..9c4b23421d 100644 --- a/sim/rogue/rogue.go +++ b/sim/rogue/rogue.go @@ -275,11 +275,11 @@ func (rogue *Rogue) CanMutilate() bool { func init() { core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceBloodElf, Class: proto.Class_ClassRogue}] = stats.Stats{ stats.Health: 3524, - stats.Strength: 112, - stats.Agility: 206, - stats.Stamina: 88, - stats.Intellect: 43, - stats.Spirit: 57, + stats.Strength: 110, + stats.Agility: 191, + stats.Stamina: 105, + stats.Intellect: 46, + stats.Spirit: 65, stats.AttackPower: 140, stats.MeleeCrit: -0.3 * core.CritRatingPerCritChance, @@ -287,11 +287,11 @@ func init() { } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceDwarf, Class: proto.Class_ClassRogue}] = stats.Stats{ stats.Health: 3524, - stats.Strength: 120, - stats.Agility: 200, - stats.Stamina: 92, - stats.Intellect: 38, - stats.Spirit: 57, + stats.Strength: 118, + stats.Agility: 185, + stats.Stamina: 106, + stats.Intellect: 42, + stats.Spirit: 66, stats.AttackPower: 140, stats.MeleeCrit: -0.3 * core.CritRatingPerCritChance, @@ -299,11 +299,11 @@ func init() { } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceGnome, Class: proto.Class_ClassRogue}] = stats.Stats{ stats.Health: 3524, - stats.Strength: 110, - stats.Agility: 206, - stats.Stamina: 88, - stats.Intellect: 45, - stats.Spirit: 58, + stats.Strength: 108, + stats.Agility: 191, + stats.Stamina: 105, + stats.Intellect: 48, + stats.Spirit: 67, stats.AttackPower: 140, stats.MeleeCrit: -0.3 * core.CritRatingPerCritChance, @@ -323,11 +323,11 @@ func init() { } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceNightElf, Class: proto.Class_ClassRogue}] = stats.Stats{ stats.Health: 3524, - stats.Strength: 111, - stats.Agility: 208, - stats.Stamina: 88, - stats.Intellect: 39, - stats.Spirit: 58, + stats.Strength: 109, + stats.Agility: 193, + stats.Stamina: 105, + stats.Intellect: 43, + stats.Spirit: 67, stats.AttackPower: 140, stats.MeleeCrit: -0.3 * core.CritRatingPerCritChance, @@ -335,11 +335,11 @@ func init() { } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceOrc, Class: proto.Class_ClassRogue}] = stats.Stats{ stats.Health: 3524, - stats.Strength: 118, - stats.Agility: 201, - stats.Stamina: 91, - stats.Intellect: 36, - stats.Spirit: 61, + stats.Strength: 116, + stats.Agility: 186, + stats.Stamina: 106, + stats.Intellect: 40, + stats.Spirit: 69, stats.AttackPower: 140, stats.MeleeCrit: -0.3 * core.CritRatingPerCritChance, @@ -347,11 +347,11 @@ func init() { } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceTroll, Class: proto.Class_ClassRogue}] = stats.Stats{ stats.Health: 3524, - stats.Strength: 116, - stats.Agility: 206, - stats.Stamina: 90, - stats.Intellect: 35, - stats.Spirit: 59, + stats.Strength: 114, + stats.Agility: 191, + stats.Stamina: 105, + stats.Intellect: 39, + stats.Spirit: 68, stats.AttackPower: 140, stats.MeleeCrit: -0.3 * core.CritRatingPerCritChance, @@ -359,11 +359,11 @@ func init() { } core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceUndead, Class: proto.Class_ClassRogue}] = stats.Stats{ stats.Health: 3524, - stats.Strength: 114, - stats.Agility: 202, - stats.Stamina: 90, - stats.Intellect: 37, - stats.Spirit: 63, + stats.Strength: 112, + stats.Agility: 187, + stats.Stamina: 105, + stats.Intellect: 41, + stats.Spirit: 72, stats.AttackPower: 140, stats.MeleeCrit: -0.3 * core.CritRatingPerCritChance,