Merge branch 'master' into p4/general

wowsims · Jul 7, 2024 · 70fc107 · 70fc107
2 parents 06323e7 + e3a937e
commit 70fc107
Show file tree

Hide file tree

Showing 9 changed files with 302 additions and 182 deletions.
diff --git a/proto/paladin.proto b/proto/paladin.proto
@@ -64,6 +64,7 @@ enum PaladinRune {
 
 	RuneCloakShieldOfRighteousness	= 440658;
 	RuneCloakVindicator				= 440666;
+	RuneCloakShockAndAwe   		    = 462834;
 	RuneCloakRighteousVengeance		= 440672;
 
 	RuneChestDivineStorm			= 407778;

diff --git a/sim/paladin/avenging_wrath.go b/sim/paladin/avenging_wrath.go
@@ -0,0 +1,49 @@
+package paladin
+
+import (
+	"time"
+
+	"github.com/wowsims/sod/sim/core"
+)
+
+func (paladin *Paladin) registerAvengingWrath() {
+	actionID := core.ActionID{SpellID: 407788}
+
+	AvengingWrathAura := paladin.RegisterAura(core.Aura{
+		Label:    "Avenging Wrath",
+		ActionID: actionID,
+		Duration: time.Second * 20,
+		OnGain: func(aura *core.Aura, sim *core.Simulation) {
+			aura.Unit.PseudoStats.DamageDealtMultiplier *= 1.2
+		},
+		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
+			aura.Unit.PseudoStats.DamageDealtMultiplier /= 1.2
+		},
+	})
+	core.RegisterPercentDamageModifierEffect(AvengingWrathAura, 1.2)
+
+	AvengingWrath := paladin.RegisterSpell(core.SpellConfig{
+		ActionID: actionID,
+		Flags:    core.SpellFlagNoOnCastComplete | core.SpellFlagAPL,
+
+		ManaCost: core.ManaCostOptions{
+			BaseCost: 0.08,
+		},
+		Cast: core.CastConfig{
+			CD: core.Cooldown{
+				Timer:    paladin.NewTimer(),
+				Duration: time.Minute*3,
+			},
+
+		},
+		ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) {
+			AvengingWrathAura.Activate(sim)
+		},
+	})
+
+	paladin.AddMajorCooldown(core.MajorCooldown{
+		Spell: AvengingWrath,
+		Type:  core.CooldownTypeDPS,
+
+	})
+}
diff --git a/sim/paladin/holy_shock.go b/sim/paladin/holy_shock.go
@@ -9,9 +9,18 @@ import (
 )
 
 func (paladin *Paladin) registerHolyShock() {
+
+	hasInfusionOfLight := paladin.hasRune(proto.PaladinRune_RuneWaistInfusionOfLight)
+
+	cdTime := time.Second * 30
+	if hasInfusionOfLight {
+		cdTime = time.Second * 6
+	}
+
+
 	paladin.holyShockCooldown = &core.Cooldown{
 		Timer:    paladin.NewTimer(),
-		Duration: time.Second * 15,
+		Duration: cdTime,
 	}
 
 	if !paladin.Talents.HolyShock {
@@ -30,11 +39,11 @@ func (paladin *Paladin) registerHolyShock() {
 		{level: 56, spellID: 20930, manaCost: 325, minDamage: 365, maxDamage: 395},
 	}
 
-	hasInfusionOfLight := paladin.hasRune(proto.PaladinRune_RuneWaistInfusionOfLight)
-	damageMultiplier := core.TernaryFloat64(hasInfusionOfLight, 1.2, 1.0)
+
+	damageMultiplier := core.TernaryFloat64(hasInfusionOfLight, 1.5, 1.0)
 
-	hasArtOfWar := paladin.hasRune(proto.PaladinRune_RuneFeetTheArtOfWar)
-	manaCostMultiplier := core.TernaryFloat64(hasArtOfWar, 0.2, 1.0)
+	//hasArtOfWar := paladin.hasRune(proto.PaladinRune_RuneFeetTheArtOfWar)
+	manaCostMultiplier := 1.0//core.TernaryFloat64(hasArtOfWar, 0.2, 1.0)
 
 	hasWrath := paladin.hasRune(proto.PaladinRune_RuneHeadWrath)
 
@@ -88,7 +97,7 @@ func (paladin *Paladin) registerHolyShock() {
 				if hasInfusionOfLight && result.Outcome.Matches(core.OutcomeCrit) {
 					paladin.AddMana(sim, rank.manaCost, manaMetrics)
 					paladin.holyShockCooldown.Reset()
-					paladin.exorcismCooldown.Reset()
+					//paladin.exorcismCooldown.Reset()
 				}
 			},
 		})

diff --git a/sim/paladin/paladin.go b/sim/paladin/paladin.go
@@ -76,6 +76,7 @@ func (paladin *Paladin) Initialize() {
 	paladin.registerDivineFavor()
 	paladin.registerHammerOfWrath()
 	paladin.registerHolyWrath()
+	paladin.registerAvengingWrath()
 }
 
 func (paladin *Paladin) Reset(_ *core.Simulation) {