Skip to content

Commit

Permalink
Merge pull request #1214 from hillerstorm/ret_apl_fix
Browse files Browse the repository at this point in the history 
[Ret] Fix glove usage with on-use strength or double passive trinkets and 4pc t12
  • Loading branch information
@hillerstorm
hillerstorm authored Nov 18, 2024
2 parents b2169a4 + dc70afd commit 2a175ae
Show file tree
Hide file tree
Showing 10 changed files with 503 additions and 17 deletions.
336 changes: 336 additions & 0 deletions sim/paladin/retribution/TestRetribution.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2117,6 +2117,132 @@ dps_results: {
tps: 38708.89482
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_bis-Basic-default-FullBuffs-0.0yards-LongMultiTarget"
value: {
dps: 56294.49686
tps: 58297.63975
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_bis-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 50137.7732
tps: 47476.22789
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_bis-Basic-default-FullBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 66584.97166
tps: 62958.15371
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_bis-Basic-default-NoBuffs-0.0yards-LongMultiTarget"
value: {
dps: 35225.82388
tps: 37430.20198
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_bis-Basic-default-NoBuffs-0.0yards-LongSingleTarget"
value: {
dps: 31723.91751
tps: 29434.09471
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_bis-Basic-default-NoBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 38060.59106
tps: 35255.30591
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_apparatus-Basic-default-FullBuffs-0.0yards-LongMultiTarget"
value: {
dps: 37000.45517
tps: 41287.41173
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_apparatus-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 32126.44572
tps: 32021.36403
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_apparatus-Basic-default-FullBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 43436.65112
tps: 41904.1608
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_apparatus-Basic-default-NoBuffs-0.0yards-LongMultiTarget"
value: {
dps: 20981.50433
tps: 25152.89586
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_apparatus-Basic-default-NoBuffs-0.0yards-LongSingleTarget"
value: {
dps: 19216.58736
tps: 19121.56751
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_apparatus-Basic-default-NoBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 24023.60791
tps: 22624.97009
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_double_passive-Basic-default-FullBuffs-0.0yards-LongMultiTarget"
value: {
dps: 35782.03773
tps: 40057.21238
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_double_passive-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 31331.03004
tps: 31224.31105
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_double_passive-Basic-default-FullBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 43799.08032
tps: 42259.05168
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_double_passive-Basic-default-NoBuffs-0.0yards-LongMultiTarget"
value: {
dps: 21050.4999
tps: 25518.49481
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_double_passive-Basic-default-NoBuffs-0.0yards-LongSingleTarget"
value: {
dps: 18585.46995
tps: 18502.59158
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p2_with_double_passive-Basic-default-NoBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 24070.94381
tps: 22671.798
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_bis-Basic-default-FullBuffs-0.0yards-LongMultiTarget"
value: {
Expand Down Expand Up @@ -2159,6 +2285,216 @@ dps_results: {
tps: 28814.24315
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_double_passive-Basic-default-FullBuffs-0.0yards-LongMultiTarget"
value: {
dps: 42665.0047
tps: 46511.83961
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_double_passive-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 38339.19204
tps: 38209.7214
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_double_passive-Basic-default-FullBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 53745.22899
tps: 52118.66145
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_double_passive-Basic-default-NoBuffs-0.0yards-LongMultiTarget"
value: {
dps: 25454.78803
tps: 29209.40994
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_double_passive-Basic-default-NoBuffs-0.0yards-LongSingleTarget"
value: {
dps: 23365.65951
tps: 23254.64024
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_double_passive-Basic-default-NoBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 30545.92377
tps: 29117.01586
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_on_use-Basic-default-FullBuffs-0.0yards-LongMultiTarget"
value: {
dps: 42665.0047
tps: 46511.83961
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_on_use-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 38339.19204
tps: 38209.7214
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_on_use-Basic-default-FullBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 53745.22899
tps: 52118.66145
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_on_use-Basic-default-NoBuffs-0.0yards-LongMultiTarget"
value: {
dps: 25454.78803
tps: 29209.40994
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_on_use-Basic-default-NoBuffs-0.0yards-LongSingleTarget"
value: {
dps: 23365.65951
tps: 23254.64024
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p3_with_on_use-Basic-default-NoBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 30545.92377
tps: 29117.01586
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_bis-Basic-default-FullBuffs-0.0yards-LongMultiTarget"
value: {
dps: 57194.28304
tps: 59218.60396
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_bis-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 50892.98237
tps: 48216.72862
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_bis-Basic-default-FullBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 67004.16711
tps: 63312.18042
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_bis-Basic-default-NoBuffs-0.0yards-LongMultiTarget"
value: {
dps: 36027.93377
tps: 38326.33376
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_bis-Basic-default-NoBuffs-0.0yards-LongSingleTarget"
value: {
dps: 32369.40246
tps: 30105.43554
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_bis-Basic-default-NoBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 39077.879
tps: 36256.53408
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_apparatus-Basic-default-FullBuffs-0.0yards-LongMultiTarget"
value: {
dps: 57194.28304
tps: 59218.60396
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_apparatus-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 50892.98237
tps: 48216.72862
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_apparatus-Basic-default-FullBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 67004.16711
tps: 63312.18042
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_apparatus-Basic-default-NoBuffs-0.0yards-LongMultiTarget"
value: {
dps: 36027.93377
tps: 38326.33376
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_apparatus-Basic-default-NoBuffs-0.0yards-LongSingleTarget"
value: {
dps: 32369.40246
tps: 30105.43554
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_apparatus-Basic-default-NoBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 39077.879
tps: 36256.53408
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_on_use-Basic-default-FullBuffs-0.0yards-LongMultiTarget"
value: {
dps: 56372.36068
tps: 58426.58816
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_on_use-Basic-default-FullBuffs-0.0yards-LongSingleTarget"
value: {
dps: 50019.54341
tps: 47354.61855
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_on_use-Basic-default-FullBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 67647.40612
tps: 64042.0177
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_on_use-Basic-default-NoBuffs-0.0yards-LongMultiTarget"
value: {
dps: 35490.077
tps: 37698.78406
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_on_use-Basic-default-NoBuffs-0.0yards-LongSingleTarget"
value: {
dps: 32002.01212
tps: 29723.8033
}
}
dps_results: {
key: "TestRetribution-Settings-BloodElf-p4_with_on_use-Basic-default-NoBuffs-0.0yards-ShortSingleTarget"
value: {
dps: 39810.94129
tps: 37011.10527
}
}
dps_results: {
key: "TestRetribution-SwitchInFrontOfTarget-Default"
value: {
Expand Down
12 changes: 11 additions & 1 deletion sim/paladin/retribution/retribution_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,17 @@ func TestRetribution(t *testing.T) {
Class: proto.Class_ClassPaladin,
Race: proto.Race_RaceBloodElf,

GearSet: core.GetGearSet("../../../ui/paladin/retribution/gear_sets", "p3_bis"),
GearSet: core.GetGearSet("../../../ui/paladin/retribution/gear_sets", "p3_bis"),
OtherGearSets: []core.GearSetCombo{
core.GetGearSet("../../../ui/paladin/retribution/gear_sets", "p2_bis"),
core.GetGearSet("../../../ui/paladin/retribution/gear_sets", "p2_with_apparatus"),
core.GetGearSet("../../../ui/paladin/retribution/gear_sets", "p2_with_double_passive"),
core.GetGearSet("../../../ui/paladin/retribution/gear_sets", "p3_with_double_passive"),
core.GetGearSet("../../../ui/paladin/retribution/gear_sets", "p3_with_on_use"),
core.GetGearSet("../../../ui/paladin/retribution/gear_sets", "p4_bis"),
core.GetGearSet("../../../ui/paladin/retribution/gear_sets", "p4_with_apparatus"),
core.GetGearSet("../../../ui/paladin/retribution/gear_sets", "p4_with_on_use"),
},
Talents: StandardTalents,
Glyphs: StandardGlyphs,
Consumes: FullConsumes,
Expand Down
14 changes: 14 additions & 0 deletions ui/paladin/retribution/apls/default.apl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,20 @@
}
]
}
},
{
"and": {
"vals": [
{ "auraIsActive": { "auraId": { "spellId": 85696 } } },
{
"cmp": {
"op": "OpLt",
"lhs": { "spellTimeToReady": { "spellId": { "spellId": 85696 } } },
"rhs": { "const": { "val": "116s" } }
}
}
]
}
}
]
}
Expand Down
Loading

0 comments on commit 2a175ae

Please sign in to comment.