Skip to content

Enabling prot and ret paladin classic sims #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaveAlessi wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Enabling prot and ret paladin classic sims #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58d717f
started work to finish sod paladin migration. remove sod abilities fr…
DaveAlessi Jan 24, 2026
937a182
made a lot of changes to the protection paladin APls, UI, and tests. …
DaveAlessi Jan 25, 2026
f098581
Was able to get ret working, removed all the old sod APLs and wrote a…
DaveAlessi Jan 26, 2026
9f8dba8
found a few more sod leftovers like divine storm and crusader strike …
DaveAlessi Jan 26, 2026
a1d1df4
Deleted avenging_wrath.go it doesn't exist in classic. made changes t…
DaveAlessi Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions proto/paladin.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,12 @@ enum PaladinSeal {
NoSeal = 0;
Righteousness = 1;
Command = 2;
Martyrdom = 3;
}

message PaladinOptions {
PaladinSeal primarySeal = 1;
PaladinAura aura = 2;
bool IsUsingDivineStormStopAttack = 4;
bool IsUsingJudgementStopAttack = 5;
bool IsUsingCrusaderStrikeStopAttack = 6;

bool righteousFury = 8;
Blessings personalBlessing = 9;
Expand Down
47 changes: 0 additions & 47 deletions sim/paladin/avenging_wrath.go
View file
Open in desktop

This file was deleted.

23 changes: 10 additions & 13 deletions sim/paladin/exorcism.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ func (paladin *Paladin) registerExorcism() {
maxDamage float64
scale float64
}{
{level: 20, spellID: 415068, manaCost: 85, scaleLevel: 25, minDamage: 84, maxDamage: 96, scale: 1.2},
{level: 28, spellID: 415069, manaCost: 135, scaleLevel: 33, minDamage: 152, maxDamage: 172, scale: 1.6},
{level: 36, spellID: 415070, manaCost: 180, scaleLevel: 41, minDamage: 217, maxDamage: 245, scale: 2.0},
{level: 44, spellID: 415071, manaCost: 235, scaleLevel: 49, minDamage: 304, maxDamage: 342, scale: 2.4},
{level: 52, spellID: 415072, manaCost: 285, scaleLevel: 57, minDamage: 393, maxDamage: 439, scale: 2.8},
{level: 60, spellID: 415073, manaCost: 345, scaleLevel: 60, minDamage: 505, maxDamage: 563, scale: 3.2},
{level: 20, spellID: 879, manaCost: 85, scaleLevel: 25, minDamage: 84, maxDamage: 96, scale: 1.2},
{level: 28, spellID: 5614, manaCost: 135, scaleLevel: 33, minDamage: 152, maxDamage: 172, scale: 1.6},
{level: 36, spellID: 5615, manaCost: 180, scaleLevel: 41, minDamage: 217, maxDamage: 245, scale: 2.0},
{level: 44, spellID: 10312, manaCost: 235, scaleLevel: 49, minDamage: 304, maxDamage: 342, scale: 2.4},
{level: 52, spellID: 10313, manaCost: 285, scaleLevel: 57, minDamage: 393, maxDamage: 439, scale: 2.8},
{level: 60, spellID: 10314, manaCost: 345, scaleLevel: 60, minDamage: 505, maxDamage: 563, scale: 3.2},
}

for i, rank := range ranks {
Expand Down Expand Up @@ -64,15 +64,12 @@ func (paladin *Paladin) registerExorcism() {

BonusCoefficient: 0.429,

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
bonusCrit := 0.0
if target.MobType == proto.MobType_MobTypeDemon || target.MobType == proto.MobType_MobTypeUndead {
bonusCrit += 100 * core.CritRatingPerCritChance
}
ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
return target.MobType == proto.MobType_MobTypeDemon || target.MobType == proto.MobType_MobTypeUndead
},

spell.BonusCritRating += bonusCrit
ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
spell.CalcAndDealDamage(sim, target, sim.Roll(minDamage, maxDamage), spell.OutcomeMagicHitAndCrit)
spell.BonusCritRating -= bonusCrit
},
})

Expand Down
1 change: 0 additions & 1 deletion sim/paladin/paladin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ func (paladin *Paladin) Initialize() {
paladin.registerDivineFavor()
paladin.registerHammerOfWrath()
paladin.registerHolyWrath()
paladin.registerAvengingWrath()
paladin.registerHolyShield()
paladin.registerBlessingOfSanctuary()
paladin.registerLayOnHands()
Expand Down
132 changes: 66 additions & 66 deletions sim/paladin/protection/TestProtection.results
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.00224
weights: 0
weights: 0.4582
weights: 0.36217
weights: 0
weights: 0
weights: 0
weights: 0.39499
weights: 0.30055
weights: 0
weights: 0
weights: 0
weights: 1.74144
weights: 0.28045
weights: 0.36537
weights: 0.14361
weights: 0
weights: 0
weights: 0.10381
weights: 2.84604
weights: 2.4919
weights: 0.10111
weights: 2.8135
weights: 2.42767
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -99,154 +99,154 @@ stat_weights_results: {
dps_results: {
key: "TestProtection-Phase4-AllItems-Avenger'sBattlegear"
value: {
dps: 513.97134
tps: 936.26213
dps: 391.5737
tps: 624.62765
}
}
dps_results: {
key: "TestProtection-Phase4-AllItems-FieldMarshal'sAegis"
value: {
dps: 497.25906
tps: 902.80481
dps: 377.19605
tps: 597.00885
}
}
dps_results: {
key: "TestProtection-Phase4-AllItems-Freethinker'sArmor"
value: {
dps: 412.51732
tps: 738.66308
dps: 306.21659
tps: 464.10001
}
}
dps_results: {
key: "TestProtection-Phase4-AllItems-JudgementArmor"
value: {
dps: 509.05851
tps: 943.82704
dps: 382.97042
tps: 623.41548
}
}
dps_results: {
key: "TestProtection-Phase4-AllItems-LawbringerArmor"
value: {
dps: 414.88463
tps: 739.77547
dps: 308.15791
tps: 465.12083
}
}
dps_results: {
key: "TestProtection-Phase4-AllItems-LieutenantCommander'sRedoubt"
value: {
dps: 480.81834
tps: 881.47553
dps: 361.49402
tps: 575.82328
}
}
dps_results: {
key: "TestProtection-Phase4-AllItems-RedemptionArmor"
value: {
dps: 394.32849
tps: 717.01314
dps: 287.38323
tps: 443.06167
}
}
dps_results: {
key: "TestProtection-Phase4-AllItems-SanctifiedOrb-20512"
value: {
dps: 392.16572
tps: 716.25616
dps: 286.33778
tps: 441.88629
}
}
dps_results: {
key: "TestProtection-Phase4-Average-Default"
value: {
dps: 392.65413
tps: 715.87402
dps: 286.94723
tps: 442.16304
}
}
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: 12.83424
tps: 38.37384
}
}
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: 12.83424
tps: 31.18076
}
}
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: 13.10718
tps: 31.75223
}
}
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: 7.6828
tps: 18.43872
}
}
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: 7.6828
tps: 18.43872
}
}
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: 7.79446
tps: 18.7067
}
}
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: 12.83424
tps: 38.37384
}
}
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: 12.83424
tps: 31.18076
}
}
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: 13.10718
tps: 31.75223
}
}
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: 7.6828
tps: 18.43872
}
}
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: 7.6828
tps: 18.43872
}
}
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: 7.79446
tps: 18.7067
}
}
dps_results: {
key: "TestProtection-Phase4-SwitchInFrontOfTarget-Default"
value: {
dps: 351.18508
tps: 647.98176
dps: 248.002
tps: 381.02254
}
}
4 changes: 0 additions & 4 deletions sim/paladin/protection/protection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ func NewProtectionPaladin(character *core.Character, options *proto.Player) *Pro
Paladin: pal,
primarySeal: protOptions.PrimarySeal,
righteousFury: protOptions.RighteousFury,
IsUsingDivineStormStopAttack: protOptions.IsUsingDivineStormStopAttack,
IsUsingJudgementStopAttack: protOptions.IsUsingJudgementStopAttack,
IsUsingCrusaderStrikeStopAttack: protOptions.IsUsingCrusaderStrikeStopAttack,
personalBlessing: protOptions.PersonalBlessing,
}

Expand All @@ -51,9 +49,7 @@ type ProtectionPaladin struct {

primarySeal proto.PaladinSeal
righteousFury bool
IsUsingDivineStormStopAttack bool
IsUsingJudgementStopAttack bool
IsUsingCrusaderStrikeStopAttack bool
personalBlessing proto.Blessings
}

Expand Down
Loading