fix sheathe of light to not be fully dynamic

wowsims · Nov 26, 2024 · 7f47be5 · 7f47be5
1 parent 9378701
commit 7f47be5
Show file tree

Hide file tree

Showing 9 changed files with 468 additions and 406 deletions.
diff --git a/sim/common/vanilla/item_effects.go b/sim/common/vanilla/item_effects.go
@@ -1208,8 +1208,8 @@ func init() {
 
 	itemhelpers.CreateWeaponCoHProcDamage(JoonhosMercy, "Joonho's Mercy", 1.0, 20883, core.SpellSchoolArcane, 70, 0, 0, core.DefenseTypeMagic)
 
-	itemhelpers.CreateWeaponCoHProcDamage(KalimdorsRevenge, "Kalimdor's Revenge", 1.25, 1213355, core.SpellSchoolNature, 339, 138, 0, core.DefenseTypeMagic)            // TODO Update PPM/scaling from PTR
-	itemhelpers.CreateWeaponCoHProcDamage(KalimdorsRevengeVoidTouched, "Kalimdor's Revenge", 1.25, 1213355, core.SpellSchoolNature, 339, 138, 0, core.DefenseTypeMagic) // TODO Update PPM/scaling from PTR
+	itemhelpers.CreateWeaponCoHProcDamage(KalimdorsRevenge, "Kalimdor's Revenge", 14, 1213355, core.SpellSchoolNature, 339, 38, 0.25, core.DefenseTypeMagic)
+	itemhelpers.CreateWeaponCoHProcDamage(KalimdorsRevengeVoidTouched, "Kalimdor's Revenge", 14, 1213355, core.SpellSchoolNature, 339, 38, 0.25, core.DefenseTypeMagic)
 
 	itemhelpers.CreateWeaponCoHProcDamage(LinkensSwordOfMastery, "Linken's Sword of Mastery", 1.0, 18089, core.SpellSchoolNature, 45, 30, 0, core.DefenseTypeMagic)
 
@@ -3072,6 +3072,7 @@ func BlazefuryTriggerAura(character *core.Character, spellID int32, spellSchool
 		Flags:            core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell,
 		DamageMultiplier: 1,
 		ThreatMultiplier: 1,
+		//BonusCoefficient: 0.10,
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 			spell.CalcAndDealDamage(sim, target, damage, spell.OutcomeMagicCrit)
 		},

diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go
@@ -456,12 +456,40 @@ var ItemSetAvengersRadiance = core.NewItemSet(core.ItemSet{
 		},
 		4: func(agent core.Agent) {
 			paladin := agent.(PaladinAgent).GetPaladin()
-			paladin.OnSpellRegistered(func(spell *core.Spell) {
-				//"S03 - Item - TAQ - Paladin - Retribution 4P Bonus",
-				if spell.SpellCode == SpellCode_PaladinHolyWrath || spell.SpellCode == SpellCode_PaladinConsecration || spell.SpellCode == SpellCode_PaladinExorcism || spell.SpellCode == SpellCode_PaladinHolyShock || spell.SpellCode == SpellCode_PaladinHammerOfWrath {
-					// 4 Set: Increases the critical strike damage bonus of your Exorcism, Holy Wrath, Holy Shock, Hammer of Wrath, and Consecration by 60%.
-					spell.CritDamageBonus += 0.6
-				}
+
+			taq4pcAura := paladin.GetOrRegisterAura(core.Aura{
+				Label:     "Empower Exorcism",
+				ActionID:  core.ActionID{SpellID: 415073}, // temp id
+				Duration:  time.Second * 20,
+				MaxStacks: 3,
+				OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks int32, newStacks int32) {
+					for _, exorcism := range paladin.exorcism {
+						exorcism.DamageMultiplierAdditive -= 0.4 * float64(oldStacks)
+						exorcism.DamageMultiplierAdditive += 0.4 * float64(newStacks)
+
+						if newStacks == 0 {
+							aura.Activate(sim)
+						}
+					}
+				},
+			})
+
+			paladin.RegisterAura(core.Aura{
+				Label:    "S03 - Item - TAQ - Paladin - Retribution 4P Bonus",
+				Duration: core.NeverExpires,
+				OnReset: func(aura *core.Aura, sim *core.Simulation) {
+					aura.Activate(sim)
+				},
+				OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+					if result.Landed() && spell.ProcMask.Matches(core.ProcMaskMeleeWhiteHit) {
+						if !taq4pcAura.IsActive() {
+							taq4pcAura.Activate(sim)
+						}
+						taq4pcAura.AddStack(sim)
+					} else if spell.SpellCode == SpellCode_PaladinExorcism {
+						taq4pcAura.SetStacks(sim, 0)
+					}
+				},
 			})
 		},
 	},