Skip to content

Commit

Permalink
temporarily add murder buff permanently for draught of the sands
Browse files Browse the repository at this point in the history
  • Loading branch information
@kayla-glick
kayla-glick committed Dec 5, 2024
1 parent dbca3a0 commit 6cddacb
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 121 deletions.
74 changes: 37 additions & 37 deletions sim/rogue/dps_rogue/TestAssassination.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ stat_weights_results: {
stat_weights_results: {
key: "TestAssassination-Phase5-Lvl60-StatWeights-Default"
value: {
weights: 0.34691
weights: 0.55775
weights: 0.47588
weights: 0.76672
weights: 0
weights: 0
weights: 0
Expand All @@ -263,9 +263,9 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 0.27424
weights: 13.16868
weights: 2.57765
weights: 0.37619
weights: 18.91751
weights: 3.82972
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -505,112 +505,112 @@ dps_results: {
dps_results: {
key: "TestAssassination-Phase5-Lvl60-AllItems-BloodCorruptedLeathers"
value: {
dps: 853.94128
tps: 606.29831
dps: 1160.41592
tps: 823.8953
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-AllItems-DarkmantleArmor"
value: {
dps: 562.93903
tps: 399.68671
dps: 769.9583
tps: 546.67039
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Average-Default"
value: {
dps: 911.93624
tps: 647.47473
dps: 1245.57457
tps: 884.35794
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 192.30395
tps: 136.53581
dps: 257.26862
tps: 182.66072
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 175.94258
tps: 124.91923
dps: 236.35299
tps: 167.81063
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 373.67409
tps: 265.30861
dps: 519.72742
tps: 369.00647
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 87.13977
tps: 61.86924
dps: 111.97628
tps: 79.50316
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 77.85727
tps: 55.27866
dps: 100.64522
tps: 71.45811
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 165.84464
tps: 117.7497
dps: 222.02599
tps: 157.63845
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 197.34631
tps: 140.11588
dps: 264.36746
tps: 187.70089
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 180.98494
tps: 128.4993
dps: 243.45184
tps: 172.8508
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 394.31
tps: 279.9601
dps: 549.02677
tps: 389.80901
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 89.10867
tps: 63.26716
dps: 114.63681
tps: 81.39213
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 79.82617
tps: 56.67658
dps: 103.30575
tps: 73.34708
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 173.7295
tps: 123.34795
dps: 232.86217
tps: 165.33214
}
}
dps_results: {
key: "TestAssassination-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
value: {
dps: 714.46481
tps: 507.27001
dps: 956.05283
tps: 678.79751
}
}
74 changes: 37 additions & 37 deletions sim/rogue/dps_rogue/TestCombat.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ stat_weights_results: {
stat_weights_results: {
key: "TestCombat-Phase5-Lvl60-StatWeights-Default"
value: {
weights: 1.52138
weights: 2.83182
weights: 2.02544
weights: 4.01989
weights: 0
weights: 0
weights: 0
Expand All @@ -263,9 +263,9 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 1.20267
weights: 17.48268
weights: 18.9029
weights: 1.60114
weights: 23.82195
weights: 29.3733
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -505,112 +505,112 @@ dps_results: {
dps_results: {
key: "TestCombat-Phase5-Lvl60-AllItems-BloodCorruptedLeathers"
value: {
dps: 1135.10326
tps: 805.92331
dps: 1530.54971
tps: 1086.69029
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-AllItems-DarkmantleArmor"
value: {
dps: 962.0195
tps: 683.03384
dps: 1315.18358
tps: 933.78034
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Average-Default"
value: {
dps: 4159.99249
tps: 2953.59467
dps: 5560.30418
tps: 3947.81597
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 2665.72406
tps: 1892.66408
dps: 3570.39914
tps: 2534.98339
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 2408.0726
tps: 1709.73155
dps: 3158.52263
tps: 2242.55106
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 2399.73651
tps: 1703.81292
dps: 3152.82443
tps: 2238.50535
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 950.8942
tps: 675.13488
dps: 1213.68492
tps: 861.7163
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 879.09424
tps: 624.15691
dps: 1107.85263
tps: 786.57537
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 877.10321
tps: 622.74328
dps: 1107.72361
tps: 786.48376
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 2784.83545
tps: 1977.23317
dps: 3722.64144
tps: 2643.07542
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 2515.90033
tps: 1786.28923
dps: 3295.19429
tps: 2339.58795
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 2522.74915
tps: 1791.1519
dps: 3311.55157
tps: 2351.20162
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-LongMultiTarget"
value: {
dps: 995.85789
tps: 707.05911
dps: 1270.85925
tps: 902.31006
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-LongSingleTarget"
value: {
dps: 917.42178
tps: 651.36946
dps: 1154.35327
tps: 819.59082
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-ShortSingleTarget"
value: {
dps: 932.93121
tps: 662.38116
dps: 1176.79138
tps: 835.52188
}
}
dps_results: {
key: "TestCombat-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
value: {
dps: 3522.55134
tps: 2501.01145
dps: 4662.93038
tps: 3310.68057
}
}
28 changes: 18 additions & 10 deletions sim/rogue/talents.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,24 @@ func (rogue *Rogue) applyMurder() {

// post finalize, since attack tables need to be setup
rogue.Env.RegisterPostFinalizeEffect(func() {
// TODO: Implement new Draught of the Sands and make this conditional with the real talent
for _, t := range rogue.Env.Encounter.Targets {
switch t.MobType {
case proto.MobType_MobTypeHumanoid, proto.MobType_MobTypeGiant, proto.MobType_MobTypeBeast, proto.MobType_MobTypeDragonkin:
multiplier := []float64{1, 1.01, 1.02}[rogue.Talents.Murder]
for _, at := range rogue.AttackTables[t.UnitIndex] {
at.DamageDealtMultiplier *= multiplier
at.CritMultiplier *= multiplier
}
multiplier := 1.2
for _, at := range rogue.AttackTables[t.UnitIndex] {
at.DamageDealtMultiplier *= multiplier
at.CritMultiplier *= multiplier
}
}
// for _, t := range rogue.Env.Encounter.Targets {
// switch t.MobType {
// case proto.MobType_MobTypeHumanoid, proto.MobType_MobTypeGiant, proto.MobType_MobTypeBeast, proto.MobType_MobTypeDragonkin:
// multiplier := []float64{1, 1.01, 1.02}[rogue.Talents.Murder]
// for _, at := range rogue.AttackTables[t.UnitIndex] {
// at.DamageDealtMultiplier *= multiplier
// at.CritMultiplier *= multiplier
// }
// }
// }
})
}

Expand Down Expand Up @@ -399,9 +407,9 @@ func (rogue *Rogue) registerAdrenalineRushCD() {
})

rogue.AdrenalineRush = rogue.RegisterSpell(core.SpellConfig{
SpellCode: SpellCode_RogueAdrenalineRush,
ActionID: AdrenalineRushActionID,
Cast: core.CastConfig{
SpellCode: SpellCode_RogueAdrenalineRush,
ActionID: AdrenalineRushActionID,
Cast: core.CastConfig{
DefaultCast: core.Cast{
GCD: time.Second,
},
Expand Down
Loading

0 comments on commit 6cddacb

Please sign in to comment.