From 58d717feedf884d20d75f41c1d5d02f48802a9a1 Mon Sep 17 00:00:00 2001 From: DaveAlessi Date: Fri, 23 Jan 2026 19:01:12 -0500 Subject: [PATCH 1/5] started work to finish sod paladin migration. remove sod abilities from apl, inputs.ts, presets.ts, and paladin.proto --- .vscode/settings.json | 4 +- proto/paladin.proto | 1 - ui/protection_paladin/apls/p4prot.apl.json | 53 ---------------------- ui/protection_paladin/apls/p5prot.apl.json | 27 +---------- ui/protection_paladin/inputs.ts | 4 -- ui/protection_paladin/presets.ts | 3 +- 6 files changed, 6 insertions(+), 86 deletions(-) delete mode 100644 ui/protection_paladin/apls/p4prot.apl.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 7f94fc83f2..6bd75cc913 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -101,5 +101,7 @@ ], "[go]": { "editor.defaultFormatter": "golang.go" - } + }, + "snyk.advanced.organization": "0dadbb81-a14c-4c1c-b28d-a0950f65996d", + "snyk.advanced.autoSelectOrganization": true } diff --git a/proto/paladin.proto b/proto/paladin.proto index 1325ab8b89..3921c0b145 100644 --- a/proto/paladin.proto +++ b/proto/paladin.proto @@ -80,7 +80,6 @@ enum PaladinSeal { NoSeal = 0; Righteousness = 1; Command = 2; - Martyrdom = 3; } message PaladinOptions { diff --git a/ui/protection_paladin/apls/p4prot.apl.json b/ui/protection_paladin/apls/p4prot.apl.json deleted file mode 100644 index 3bfe3b9387..0000000000 --- a/ui/protection_paladin/apls/p4prot.apl.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "type": "TypeAPL", - "prepullActions": [ - { "action": { "castPaladinPrimarySeal": {} }, "doAtValue": { "const": { "val": "-3.0s" } } }, - { "action": { "castSpell": { "spellId": { "spellId": 20928, "rank": 3 } } }, "doAtValue": { "const": { "val": "-1.5s" } } }, - { "action": { "castSpell": { "spellId": { "itemId": 18641 } } }, "doAtValue": { "const": { "val": "-1s" } } } - ], - "priorityList": [ - { - "action": { - "condition": { "cmp": { "op": "OpLt", "lhs": { "currentHealthPercent": {} }, "rhs": { "const": { "val": "10%" } } } }, - "castSpell": { "spellId": { "spellId": 10310, "rank": 3 } } - } - }, - { - "action": { - "condition": { "cmp": { "op": "OpLt", "lhs": { "currentHealthPercent": {} }, "rhs": { "const": { "val": "40%" } } } }, - "castSpell": { "spellId": { "spellId": 458371 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { - "cmp": { - "op": "OpGe", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 458371 } } }, - "rhs": { "const": { "val": "1m" } } - } - }, - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 25771 } } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 407788 } } - } - }, - { - "action": { - "condition": { "cmp": { "op": "OpLe", "lhs": { "currentSealRemainingTime": {} }, "rhs": { "const": { "val": "1.5s" } } } }, - "castPaladinPrimarySeal": {} - } - }, - { "action": { "castSpell": { "spellId": { "spellId": 20928, "rank": 3 } } } }, - { "action": { "castSpell": { "spellId": { "spellId": 407669 } } } }, - { "action": { "castSpell": { "spellId": { "spellId": 407632 } } } }, - { "action": { "castSpell": { "spellId": { "spellId": 440658 } } } }, - { "action": { "castSpell": { "spellId": { "spellId": 415073 } } } }, - { "action": { "strictSequence": { "actions": [{ "castSpell": { "spellId": { "spellId": 20271 } } }, { "castPaladinPrimarySeal": {} }] } } } - ] -} diff --git a/ui/protection_paladin/apls/p5prot.apl.json b/ui/protection_paladin/apls/p5prot.apl.json index eb636f2316..fccae752d2 100644 --- a/ui/protection_paladin/apls/p5prot.apl.json +++ b/ui/protection_paladin/apls/p5prot.apl.json @@ -15,26 +15,7 @@ { "action": { "condition": { "cmp": { "op": "OpLt", "lhs": { "currentHealthPercent": {} }, "rhs": { "const": { "val": "40%" } } } }, - "castSpell": { "spellId": { "spellId": 458371 } } - } - }, - { - "action": { - "condition": { - "and": { - "vals": [ - { - "cmp": { - "op": "OpGe", - "lhs": { "spellTimeToReady": { "spellId": { "spellId": 458371 } } }, - "rhs": { "const": { "val": "1m" } } - } - }, - { "not": { "val": { "auraIsActive": { "auraId": { "spellId": 25771 } } } } } - ] - } - }, - "castSpell": { "spellId": { "spellId": 407788 } } + "castSpell": { "spellId": { "spellId": 10278, "rank": 3 } } } }, { @@ -49,10 +30,6 @@ "castPaladinPrimarySeal": {} } }, - { "action": { "castSpell": { "spellId": { "spellId": 20928, "rank": 3 } } } }, - { "action": { "castSpell": { "spellId": { "spellId": 407669 } } } }, - { "action": { "castSpell": { "spellId": { "spellId": 407632 } } } }, - { "action": { "castSpell": { "spellId": { "spellId": 415073 } } } }, - { "action": { "castSpell": { "spellId": { "spellId": 440658 } } } } + { "action": { "castSpell": { "spellId": { "spellId": 20928, "rank": 3 } } } } ] } diff --git a/ui/protection_paladin/inputs.ts b/ui/protection_paladin/inputs.ts index 4c9c2a60e7..aadf6dfff2 100644 --- a/ui/protection_paladin/inputs.ts +++ b/ui/protection_paladin/inputs.ts @@ -53,10 +53,6 @@ export const PrimarySealSelection = InputHelpers.makeSpecOptionsEnumIconInput) => player.getTalents().sealOfCommand, }, - { - actionId: () => ActionId.fromSpellId(407798), - value: PaladinSeal.Martyrdom, - }, ], changeEmitter: (player: Player) => TypedEvent.onAny([player.gearChangeEmitter, player.talentsChangeEmitter, player.specOptionsChangeEmitter]), diff --git a/ui/protection_paladin/presets.ts b/ui/protection_paladin/presets.ts index 4c4488596e..1cd43bd629 100644 --- a/ui/protection_paladin/presets.ts +++ b/ui/protection_paladin/presets.ts @@ -26,7 +26,6 @@ import { } from '../core/proto/common.js'; import { Blessings, PaladinAura, PaladinOptions as ProtectionPaladinOptions,PaladinSeal } from '../core/proto/paladin.js'; import { SavedTalents } from '../core/proto/ui.js'; -import APLP4ProtJson from './apls/p4prot.apl.json'; import APLP5ProtJson from './apls/p5prot.apl.json'; import BlankGear from './gear_sets/blank.gear.json'; @@ -98,7 +97,7 @@ export const DefaultTalents = TalentPresets[Phase.Phase5][0]; export const DefaultOptions = ProtectionPaladinOptions.create({ aura: PaladinAura.SanctityAura, - primarySeal: PaladinSeal.Martyrdom, + primarySeal: PaladinSeal.Righteousness, personalBlessing: Blessings.BlessingOfSanctuary, righteousFury: true, }); From 937a1823acbef89db10c0fab3b798c3adfb2554a Mon Sep 17 00:00:00 2001 From: DaveAlessi Date: Sun, 25 Jan 2026 16:31:43 -0500 Subject: [PATCH 2/5] made a lot of changes to the protection paladin APls, UI, and tests. Fixed a few things with retribution as well but still a ways to go there. Was able to get the build running and did several end to end manual tests and everything looks pretty good as far as I can tell. --- .vscode/settings.json | 4 +- package-lock.json | 3 + sim/paladin/protection/TestProtection.results | 156 +++----- sim/paladin/protection/protection_test.go | 15 +- sim/paladin/retribution/TestExodin.results | 252 ------------- .../retribution/TestRetribution.results | 332 ------------------ sim/paladin/retribution/TestShockadin.results | 252 ------------- sim/paladin/retribution/retribution_test.go | 4 +- ui/index.html | 2 +- .../apls/basic_prot.apl.json | 35 ++ ui/protection_paladin/presets.ts | 7 +- ui/retribution_paladin/inputs.ts | 16 - ui/retribution_paladin/presets.ts | 2 +- ui/retribution_paladin/sim.ts | 2 - 14 files changed, 99 insertions(+), 983 deletions(-) delete mode 100644 sim/paladin/retribution/TestExodin.results delete mode 100644 sim/paladin/retribution/TestRetribution.results delete mode 100644 sim/paladin/retribution/TestShockadin.results create mode 100644 ui/protection_paladin/apls/basic_prot.apl.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 6bd75cc913..7f94fc83f2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -101,7 +101,5 @@ ], "[go]": { "editor.defaultFormatter": "golang.go" - }, - "snyk.advanced.organization": "0dadbb81-a14c-4c1c-b28d-a0950f65996d", - "snyk.advanced.autoSelectOrganization": true + } } diff --git a/package-lock.json b/package-lock.json index d28cfc3f8b..674b04c706 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,6 +52,9 @@ "typescript-formatter": "^7.2.2", "vite": "^5.0.0", "vite-plugin-checker": "^0.6.4" + }, + "engines": { + "node": ">=20" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results index 1070fdc6ac..25a8bcf376 100644 --- a/sim/paladin/protection/TestProtection.results +++ b/sim/paladin/protection/TestProtection.results @@ -50,26 +50,26 @@ character_stats_results: { stat_weights_results: { key: "TestProtection-Phase4-StatWeights-Default" value: { - weights: 0.26263 - weights: 0.15662 + weights: 0.25582 + weights: 0.15088 weights: 0 - weights: 0.00227 + weights: 0.00189 weights: 0 - weights: 0.4582 + weights: 0.40239 weights: 0 weights: 0 weights: 0 - weights: 0.39499 + weights: 0.34136 weights: 0 weights: 0 weights: 0 - weights: 1.74144 - weights: 0.28045 + weights: 0.79404 + weights: 0.26972 weights: 0 weights: 0 - weights: 0.10381 - weights: 2.84604 - weights: 2.4919 + weights: 0.10111 + weights: 2.81823 + weights: 2.42982 weights: 0 weights: 0 weights: 0 @@ -96,157 +96,101 @@ stat_weights_results: { weights: 0 } } -dps_results: { - key: "TestProtection-Phase4-AllItems-Avenger'sBattlegear" - value: { - dps: 513.97134 - tps: 936.26213 - } -} -dps_results: { - key: "TestProtection-Phase4-AllItems-FieldMarshal'sAegis" - value: { - dps: 497.25906 - tps: 902.80481 - } -} -dps_results: { - key: "TestProtection-Phase4-AllItems-Freethinker'sArmor" - value: { - dps: 412.51732 - tps: 738.66308 - } -} -dps_results: { - key: "TestProtection-Phase4-AllItems-JudgementArmor" - value: { - dps: 509.05851 - tps: 943.82704 - } -} -dps_results: { - key: "TestProtection-Phase4-AllItems-LawbringerArmor" - value: { - dps: 414.88463 - tps: 739.77547 - } -} -dps_results: { - key: "TestProtection-Phase4-AllItems-LieutenantCommander'sRedoubt" - value: { - dps: 480.81834 - tps: 881.47553 - } -} -dps_results: { - key: "TestProtection-Phase4-AllItems-RedemptionArmor" - value: { - dps: 394.32849 - tps: 717.01314 - } -} -dps_results: { - key: "TestProtection-Phase4-AllItems-SanctifiedOrb-20512" - value: { - dps: 392.16572 - tps: 716.25616 - } -} dps_results: { key: "TestProtection-Phase4-Average-Default" value: { - dps: 392.65413 - tps: 715.87402 + dps: 313.5675 + tps: 522.21632 } } dps_results: { - key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 48.66928 - tps: 141.78293 + dps: 35.27545 + tps: 107.96607 } } dps_results: { - key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 48.66928 - tps: 118.0551 + dps: 35.27545 + tps: 85.82632 } } dps_results: { - key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 113.55847 - tps: 274.43324 + dps: 45.08057 + tps: 109.44712 } } dps_results: { - key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 16.2396 - tps: 38.97504 + dps: 11.63838 + tps: 27.93212 } } dps_results: { - key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 16.2396 - tps: 38.97504 + dps: 11.63838 + tps: 27.93212 } } dps_results: { - key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestProtection-Phase4-Settings-Dwarf-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 45.93992 - tps: 110.25581 + dps: 22.93383 + tps: 55.0412 } } dps_results: { - key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget" + key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 48.87083 - tps: 142.46333 + dps: 35.68393 + tps: 109.24143 } } dps_results: { - key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget" + key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 48.87083 - tps: 118.54867 + dps: 35.68393 + tps: 86.82143 } } dps_results: { - key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget" + key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-FullBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 113.55847 - tps: 274.43324 + dps: 45.08057 + tps: 109.44712 } } dps_results: { - key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongMultiTarget" + key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-LongMultiTarget" value: { - dps: 16.98458 - tps: 40.76299 + dps: 12.38336 + tps: 29.72007 } } dps_results: { - key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-LongSingleTarget" + key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-LongSingleTarget" value: { - dps: 16.98458 - tps: 40.76299 + dps: 12.38336 + tps: 29.72007 } } dps_results: { - key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-NoBuffs-P4-Consumes-ShortSingleTarget" + key: "TestProtection-Phase4-Settings-Human-blank-Basic Prot Rotation-basic_prot-NoBuffs-P4-Consumes-ShortSingleTarget" value: { - dps: 45.93992 - tps: 110.25581 + dps: 22.93383 + tps: 55.0412 } } dps_results: { key: "TestProtection-Phase4-SwitchInFrontOfTarget-Default" value: { - dps: 351.18508 - tps: 647.98176 + dps: 274.08376 + tps: 459.70059 } } diff --git a/sim/paladin/protection/protection_test.go b/sim/paladin/protection/protection_test.go index 945932df84..71153ec712 100644 --- a/sim/paladin/protection/protection_test.go +++ b/sim/paladin/protection/protection_test.go @@ -21,10 +21,10 @@ func TestProtection(t *testing.T) { Talents: Phase4ProtTalents, GearSet: core.GetGearSet("../../../ui/protection_paladin/gear_sets", "blank"), - Rotation: core.GetAplRotation("../../../ui/protection_paladin/apls", "p4prot"), + Rotation: core.GetAplRotation("../../../ui/protection_paladin/apls", "basic_prot"), Buffs: core.FullBuffs, Consumes: Phase4Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "P4 Prot", SpecOptions: PlayerOptionsSealofMartyrdom}, + SpecOptions: core.SpecOptionsCombo{Label: "Basic Prot Rotation", SpecOptions: PlayerOptionsSealofRighteousness}, ItemFilter: ItemFilters, EPReferenceStat: proto.Stat_StatAttackPower, @@ -57,12 +57,6 @@ var PlayerOptionsSealofCommand = &proto.Player_ProtectionPaladin{ }, } -var PlayerOptionsSealofMartyrdom = &proto.Player_ProtectionPaladin{ - ProtectionPaladin: &proto.ProtectionPaladin{ - Options: optionsSealOfMartyrdom, - }, -} - var PlayerOptionsSealofRighteousness = &proto.Player_ProtectionPaladin{ ProtectionPaladin: &proto.ProtectionPaladin{ Options: optionsSealOfRighteousness, @@ -74,11 +68,6 @@ var optionsSealOfCommand = &proto.PaladinOptions{ RighteousFury: true, } -var optionsSealOfMartyrdom = &proto.PaladinOptions{ - PrimarySeal: proto.PaladinSeal_Martyrdom, - RighteousFury: true, -} - var optionsSealOfRighteousness = &proto.PaladinOptions{ PrimarySeal: proto.PaladinSeal_Righteousness, RighteousFury: true, diff --git a/sim/paladin/retribution/TestExodin.results b/sim/paladin/retribution/TestExodin.results deleted file mode 100644 index 5f6ef07d0d..0000000000 --- a/sim/paladin/retribution/TestExodin.results +++ /dev/null @@ -1,252 +0,0 @@ -character_stats_results: { - key: "TestExodin-Phase5-CharacterStats-Default" - value: { - final_stats: 258.819 - final_stats: 153.065 - final_stats: 370.96125 - final_stats: 166.98 - final_stats: 193.9245 - final_stats: 150 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 49.6 - final_stats: 0 - final_stats: 27.28857 - final_stats: 0 - final_stats: 0 - final_stats: 1669.638 - final_stats: 3 - final_stats: 28.44509 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3736.7 - final_stats: 0 - final_stats: 0 - final_stats: 690.13 - final_stats: 480 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 8.44509 - final_stats: 5 - final_stats: 0 - final_stats: 5210.6125 - final_stats: 27 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 384 - final_stats: 0 - final_stats: 35 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestExodin-Phase5-StatWeights-Default" - value: { - weights: 0.33174 - weights: 0.1846 - weights: 0 - weights: 0 - weights: 0 - weights: 0.53084 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 2.46935 - weights: 0.32631 - weights: 0 - weights: 0 - weights: 0.1192 - weights: 3.34305 - weights: 2.92051 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestExodin-Phase5-AllItems-Avenger'sBattlegear" - value: { - dps: 651.83708 - tps: 694.36061 - } -} -dps_results: { - key: "TestExodin-Phase5-AllItems-FieldMarshal'sAegis" - value: { - dps: 634.38782 - tps: 677.00108 - } -} -dps_results: { - key: "TestExodin-Phase5-AllItems-Freethinker'sArmor" - value: { - dps: 522.37642 - tps: 564.55189 - } -} -dps_results: { - key: "TestExodin-Phase5-AllItems-JudgementArmor" - value: { - dps: 648.92824 - tps: 691.45791 - } -} -dps_results: { - key: "TestExodin-Phase5-AllItems-LawbringerArmor" - value: { - dps: 532.81709 - tps: 575.25335 - } -} -dps_results: { - key: "TestExodin-Phase5-AllItems-LieutenantCommander'sRedoubt" - value: { - dps: 603.08544 - tps: 645.14198 - } -} -dps_results: { - key: "TestExodin-Phase5-AllItems-RedemptionArmor" - value: { - dps: 527.02852 - tps: 569.5573 - } -} -dps_results: { - key: "TestExodin-Phase5-AllItems-SanctifiedOrb-20512" - value: { - dps: 492.03494 - tps: 533.94399 - } -} -dps_results: { - key: "TestExodin-Phase5-Average-Default" - value: { - dps: 493.00659 - tps: 535.02427 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 351.21526 - tps: 560.87209 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 79.37861 - tps: 89.89587 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 172.34152 - tps: 189.59028 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 157.63726 - tps: 323.56962 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 35.24239 - tps: 43.53901 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 86.4435 - tps: 101.62726 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 350.89921 - tps: 561.3427 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 80.30935 - tps: 90.85119 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 171.69148 - tps: 188.94024 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 190.3591 - tps: 371.10593 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 36.43544 - tps: 45.47278 - } -} -dps_results: { - key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 84.08524 - tps: 99.26899 - } -} -dps_results: { - key: "TestExodin-Phase5-SwitchInFrontOfTarget-Default" - value: { - dps: 442.45264 - tps: 482.01151 - } -} diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results deleted file mode 100644 index 1b2a43711c..0000000000 --- a/sim/paladin/retribution/TestRetribution.results +++ /dev/null @@ -1,332 +0,0 @@ -character_stats_results: { - key: "TestRetribution-Phase5-CharacterStats-Default" - value: { - final_stats: 258.819 - final_stats: 153.065 - final_stats: 370.96125 - final_stats: 166.98 - final_stats: 193.9245 - final_stats: 150 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 49.6 - final_stats: 0 - final_stats: 27.28857 - final_stats: 0 - final_stats: 0 - final_stats: 1669.638 - final_stats: 3 - final_stats: 28.44509 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3736.7 - final_stats: 0 - final_stats: 0 - final_stats: 690.13 - final_stats: 480 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 8.44509 - final_stats: 5 - final_stats: 0 - final_stats: 5210.6125 - final_stats: 27 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 384 - final_stats: 0 - final_stats: 35 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestRetribution-Phase5-StatWeights-Default" - value: { - weights: 0.34188 - weights: 0.21827 - weights: 0 - weights: 0 - weights: 0 - weights: 0.14211 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0.90904 - weights: 0.06575 - weights: 0 - weights: 0 - weights: 0.12285 - weights: 2.39141 - weights: 2.98999 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestRetribution-Phase5-AllItems-Avenger'sBattlegear" - value: { - dps: 366.46918 - tps: 394.86836 - } -} -dps_results: { - key: "TestRetribution-Phase5-AllItems-FieldMarshal'sAegis" - value: { - dps: 356.49427 - tps: 384.90328 - } -} -dps_results: { - key: "TestRetribution-Phase5-AllItems-Freethinker'sArmor" - value: { - dps: 311.07533 - tps: 339.48926 - } -} -dps_results: { - key: "TestRetribution-Phase5-AllItems-JudgementArmor" - value: { - dps: 346.20663 - tps: 374.64022 - } -} -dps_results: { - key: "TestRetribution-Phase5-AllItems-LawbringerArmor" - value: { - dps: 315.56124 - tps: 343.97517 - } -} -dps_results: { - key: "TestRetribution-Phase5-AllItems-LieutenantCommander'sRedoubt" - value: { - dps: 337.9715 - tps: 366.38543 - } -} -dps_results: { - key: "TestRetribution-Phase5-AllItems-RedemptionArmor" - value: { - dps: 286.91702 - tps: 315.41945 - } -} -dps_results: { - key: "TestRetribution-Phase5-AllItems-SanctifiedOrb-20512" - value: { - dps: 287.71966 - tps: 316.09917 - } -} -dps_results: { - key: "TestRetribution-Phase5-Average-Default" - value: { - dps: 286.51324 - tps: 314.77694 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 52.84577 - tps: 255.1276 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 37.59587 - tps: 47.75913 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 46.77168 - tps: 63.13544 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 22.14 - tps: 197.93187 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 15.16236 - tps: 23.95195 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 19.30788 - tps: 34.49164 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 7.55154 - tps: 190.06837 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 6.56804 - tps: 15.69388 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - tps: 15.18376 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 2.43419 - tps: 147.02991 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 2.43419 - tps: 9.66397 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - tps: 15.18376 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 53.52148 - tps: 256.3933 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 37.49478 - tps: 47.66296 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 48.07929 - tps: 64.41847 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 22.6547 - tps: 203.40152 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 13.94671 - tps: 22.98405 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 20.11592 - tps: 35.29968 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 7.38453 - tps: 189.80302 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 6.40102 - tps: 15.52195 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - tps: 15.18376 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 5.67317 - tps: 186.42 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 4.95067 - tps: 13.98801 - } -} -dps_results: { - key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - tps: 15.18376 - } -} -dps_results: { - key: "TestRetribution-Phase5-SwitchInFrontOfTarget-Default" - value: { - dps: 254.6428 - tps: 282.74206 - } -} diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results deleted file mode 100644 index 6e119adb93..0000000000 --- a/sim/paladin/retribution/TestShockadin.results +++ /dev/null @@ -1,252 +0,0 @@ -character_stats_results: { - key: "TestShockadin-Phase5-CharacterStats-Default" - value: { - final_stats: 258.819 - final_stats: 153.065 - final_stats: 370.96125 - final_stats: 183.678 - final_stats: 193.9245 - final_stats: 150 - final_stats: 0 - final_stats: 10 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 49.6 - final_stats: 0 - final_stats: 27.56742 - final_stats: 0 - final_stats: 0 - final_stats: 1669.638 - final_stats: 0 - final_stats: 28.44509 - final_stats: 0 - final_stats: 0 - final_stats: 0 - final_stats: 3987.17 - final_stats: 0 - final_stats: 0 - final_stats: 690.13 - final_stats: 480 - final_stats: 0 - final_stats: 5 - final_stats: 0 - final_stats: 8.44509 - final_stats: 5 - final_stats: 0 - final_stats: 5210.6125 - final_stats: 27 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 60 - final_stats: 384 - final_stats: 0 - final_stats: 35 - final_stats: 0 - } -} -stat_weights_results: { - key: "TestShockadin-Phase5-StatWeights-Default" - value: { - weights: 0.28168 - weights: 0.14833 - weights: 0 - weights: 0 - weights: 0 - weights: 0.48361 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 2.02814 - weights: 0.38293 - weights: 0 - weights: 0 - weights: 0.10121 - weights: 0 - weights: 2.55349 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - weights: 0 - } -} -dps_results: { - key: "TestShockadin-Phase5-AllItems-Avenger'sBattlegear" - value: { - dps: 593.17776 - tps: 635.5796 - } -} -dps_results: { - key: "TestShockadin-Phase5-AllItems-FieldMarshal'sAegis" - value: { - dps: 577.97317 - tps: 620.32585 - } -} -dps_results: { - key: "TestShockadin-Phase5-AllItems-Freethinker'sArmor" - value: { - dps: 481.15317 - tps: 523.45668 - } -} -dps_results: { - key: "TestShockadin-Phase5-AllItems-JudgementArmor" - value: { - dps: 599.19454 - tps: 641.77338 - } -} -dps_results: { - key: "TestShockadin-Phase5-AllItems-LawbringerArmor" - value: { - dps: 493.02691 - tps: 535.56641 - } -} -dps_results: { - key: "TestShockadin-Phase5-AllItems-LieutenantCommander'sRedoubt" - value: { - dps: 553.96189 - tps: 596.28998 - } -} -dps_results: { - key: "TestShockadin-Phase5-AllItems-RedemptionArmor" - value: { - dps: 487.30607 - tps: 530.25857 - } -} -dps_results: { - key: "TestShockadin-Phase5-AllItems-SanctifiedOrb-20512" - value: { - dps: 452.41975 - tps: 494.39876 - } -} -dps_results: { - key: "TestShockadin-Phase5-Average-Default" - value: { - dps: 451.16907 - tps: 493.15815 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 289.43751 - tps: 505.781 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 88.68912 - tps: 99.46696 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 182.51076 - tps: 200.00536 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 118.24052 - tps: 298.98735 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 41.8665 - tps: 50.90384 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Dwarf-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 94.349 - tps: 109.53276 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 289.17688 - tps: 506.50371 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 88.89921 - tps: 99.68197 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-FullBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 183.03576 - tps: 200.55493 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongMultiTarget" - value: { - dps: 120.05059 - tps: 300.79741 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-LongSingleTarget" - value: { - dps: 42.23114 - tps: 51.26848 - } -} -dps_results: { - key: "TestShockadin-Phase5-Settings-Human-blank-P5 Seal of Righteousness Shockadin-p5Shockadin-NoBuffs-P5-Consumes-ShortSingleTarget" - value: { - dps: 94.96835 - tps: 110.1521 - } -} -dps_results: { - key: "TestShockadin-Phase5-SwitchInFrontOfTarget-Default" - value: { - dps: 405.621 - tps: 445.08759 - } -} diff --git a/sim/paladin/retribution/retribution_test.go b/sim/paladin/retribution/retribution_test.go index aec9718a06..229b1931ab 100644 --- a/sim/paladin/retribution/retribution_test.go +++ b/sim/paladin/retribution/retribution_test.go @@ -25,7 +25,7 @@ func TestRetribution(t *testing.T) { OtherRotations: []core.RotationCombo{core.GetAplRotation("../../../ui/retribution_paladin/apls", "p5ret-twist-4DR-3.7-4.0")}, Buffs: core.FullBuffs, Consumes: Phase5Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "P5 Seal of Martyrdom Ret", SpecOptions: PlayerOptionsSealofMartyrdom}, + SpecOptions: core.SpecOptionsCombo{Label: "P5 Seal of Righteousness Ret", SpecOptions: PlayerOptionsSealofRighteousness}, ItemFilter: ItemFilters, EPReferenceStat: proto.Stat_StatAttackPower, @@ -47,7 +47,7 @@ func TestExodin(t *testing.T) { Rotation: core.GetAplRotation("../../../ui/retribution_paladin/apls", "p5ret-exodin-6CF2DR"), Buffs: core.FullBuffs, Consumes: Phase5Consumes, - SpecOptions: core.SpecOptionsCombo{Label: "P5 Seal of Martyrdom Ret", SpecOptions: PlayerOptionsSealofMartyrdom}, + SpecOptions: core.SpecOptionsCombo{Label: "P5 Seal of Righteousness Ret", SpecOptions: PlayerOptionsSealofRighteousness}, ItemFilter: ItemFilters, EPReferenceStat: proto.Stat_StatAttackPower, diff --git a/ui/index.html b/ui/index.html index 03bb3da0d9..8c1ce86031 100644 --- a/ui/index.html +++ b/ui/index.html @@ -250,7 +250,7 @@

Classic