Skip to content

Commit

Permalink
Allow Apparatus of Khaz'goroth to be used at any stack size
Browse files Browse the repository at this point in the history
  • Loading branch information
@hillerstorm
hillerstorm committed Aug 6, 2024
1 parent 99a678f commit ceefca1
Show file tree
Hide file tree
Showing 13 changed files with 183 additions and 194 deletions.
281 changes: 135 additions & 146 deletions sim/common/cata/other_effects.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,154 +525,17 @@ func init() {
})
})

core.NewItemEffect(68972, func(agent core.Agent) {
character := agent.GetCharacter()

dummyAura := character.RegisterAura(core.Aura{
Label: "Titanic Power",
ActionID: core.ActionID{SpellID: 96923},
Duration: time.Second * 30,
MaxStacks: 5,
})

core.MakePermanent(core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
Name: "Titanic Power Aura",
ActionID: core.ActionID{ItemID: 68972},
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskMelee,
ProcChance: 1,
Outcome: core.OutcomeCrit,
Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
dummyAura.Activate(sim)
dummyAura.AddStack(sim)
},
}))

statBonus := float64(508 * dummyAura.MaxStacks)
buffAuraCrit := character.NewTemporaryStatsAura("Blessing of the Shaper Crit", core.ActionID{SpellID: 96928}, stats.Stats{stats.MeleeCrit: statBonus, stats.SpellCrit: statBonus}, time.Second*15)
buffAuraHaste := character.NewTemporaryStatsAura("Blessing of the Shaper Haste", core.ActionID{SpellID: 96927}, stats.Stats{stats.MeleeHaste: statBonus, stats.SpellHaste: statBonus}, time.Second*15)
buffAuraMastery := character.NewTemporaryStatsAura("Blessing of the Shaper Mastery", core.ActionID{SpellID: 96929}, stats.Stats{stats.Mastery: statBonus}, time.Second*15)

sharedCD := character.GetOffensiveTrinketCD()
trinketSpell := character.RegisterSpell(core.SpellConfig{
ActionID: core.ActionID{ItemID: 68972},
SpellSchool: core.SpellSchoolPhysical,
ProcMask: core.ProcMaskEmpty,
Flags: core.SpellFlagNoOnCastComplete,
Cast: core.CastConfig{
SharedCD: core.Cooldown{
Timer: sharedCD,
Duration: time.Second * 15,
},
CD: core.Cooldown{
Timer: character.NewTimer(),
Duration: time.Minute * 2,
},
},

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
statType := character.GetHighestStat([]stats.Stat{stats.MeleeCrit, stats.SpellCrit, stats.MeleeHaste, stats.SpellHaste, stats.Mastery})
switch statType {
case stats.MeleeCrit, stats.SpellCrit:
buffAuraCrit.Activate(sim)
case stats.MeleeHaste, stats.SpellHaste:
buffAuraHaste.Activate(sim)
case stats.Mastery:
buffAuraMastery.Activate(sim)
default:
panic("unexpected statType")
}
dummyAura.Deactivate(sim)
},
ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
return dummyAura.GetStacks() == 5
},
})

character.AddMajorCooldown(core.MajorCooldown{
Spell: trinketSpell,
Priority: core.CooldownPriorityDefault,
Type: core.CooldownTypeDPS,
ShouldActivate: func(s *core.Simulation, c *core.Character) bool {
return dummyAura.GetStacks() == 5
},
})
// Normal
registerApparatusOfKhazGoroth(apparatusConfig{
ItemID: 68972,
StatBonus: 508,
})

core.NewItemEffect(69113, func(agent core.Agent) {
character := agent.GetCharacter()

dummyAura := character.RegisterAura(core.Aura{
Label: "Titanic Power (Heroic)",
ActionID: core.ActionID{SpellID: 96923},
Duration: time.Second * 30,
MaxStacks: 5,
})

core.MakePermanent(core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
Name: "Titanic Power Aura (Heroic)",
ActionID: core.ActionID{ItemID: 69113},
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskMelee,
ProcChance: 1,
Outcome: core.OutcomeCrit,
Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
dummyAura.Activate(sim)
dummyAura.AddStack(sim)
},
}))

// TODO: discuss the following scenario:
// the trinket should allow to activate at any number of stacks, should we allow this behaviour at all to the users?
// would also mean that we need the temporary aura to be created on the fly after an environment is finalized
statBonus := float64(575 * dummyAura.MaxStacks)
buffAuraCrit := character.NewTemporaryStatsAura("Blessing of the Shaper Crit (Heroic)", core.ActionID{SpellID: 96928}, stats.Stats{stats.MeleeCrit: statBonus, stats.SpellCrit: statBonus}, time.Second*15)
buffAuraHaste := character.NewTemporaryStatsAura("Blessing of the Shaper Haste (Heroic)", core.ActionID{SpellID: 96927}, stats.Stats{stats.MeleeHaste: statBonus, stats.SpellHaste: statBonus}, time.Second*15)
buffAuraMastery := character.NewTemporaryStatsAura("Blessing of the Shaper Mastery (Heroic)", core.ActionID{SpellID: 96929}, stats.Stats{stats.Mastery: statBonus}, time.Second*15)

sharedCD := character.GetOffensiveTrinketCD()
trinketSpell := character.RegisterSpell(core.SpellConfig{
ActionID: core.ActionID{ItemID: 69113},
SpellSchool: core.SpellSchoolPhysical,
ProcMask: core.ProcMaskEmpty,
Flags: core.SpellFlagNoOnCastComplete,
Cast: core.CastConfig{
SharedCD: core.Cooldown{
Timer: sharedCD,
Duration: time.Second * 15,
},
CD: core.Cooldown{
Timer: character.NewTimer(),
Duration: time.Minute * 2,
},
},
ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
statType := character.GetHighestStat([]stats.Stat{stats.MeleeCrit, stats.SpellCrit, stats.MeleeHaste, stats.SpellHaste, stats.Mastery})
switch statType {
case stats.MeleeCrit, stats.SpellCrit:
buffAuraCrit.Activate(sim)
case stats.MeleeHaste, stats.SpellHaste:
buffAuraHaste.Activate(sim)
case stats.Mastery:
buffAuraMastery.Activate(sim)
default:
panic("unexpected statType")
}
dummyAura.Deactivate(sim)
},
ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
return dummyAura.GetStacks() == 5
},
})

character.AddMajorCooldown(core.MajorCooldown{
Spell: trinketSpell,
Priority: core.CooldownPriorityDefault,
Type: core.CooldownTypeDPS,
ShouldActivate: func(s *core.Simulation, c *core.Character) bool {
return dummyAura.GetStacks() == 5
},
})
// Heroic
registerApparatusOfKhazGoroth(apparatusConfig{
ItemID: 69113,
StatBonus: 575,
Heroic: true,
})

core.NewItemEffect(68994, func(agent core.Agent) {
Expand Down Expand Up @@ -761,3 +624,129 @@ func init() {
})
})
}

type apparatusConfig struct {
ItemID int32
StatBonus float64
Heroic bool
}

func registerApparatusOfKhazGoroth(config apparatusConfig) {
core.NewItemEffect(config.ItemID, func(agent core.Agent) {
character := agent.GetCharacter()

var stacks int32
var buffs stats.Stats

labelSuffix := core.Ternary(config.Heroic, " (Heroic)", "")
buffDuration := time.Second * 15
buffAuraOnGain := func(aura *core.Aura, sim *core.Simulation) {
aura.SetStacks(sim, stacks)
character.AddStatsDynamic(sim, buffs)
}
buffAuraOnExpire := func(aura *core.Aura, sim *core.Simulation) {
character.AddStatsDynamic(sim, buffs.Invert())
}

buffAuraCrit := character.GetOrRegisterAura(core.Aura{
Label: "Blessing of the Shaper Crit" + labelSuffix,
ActionID: core.ActionID{SpellID: 96928},
MaxStacks: 5,
Duration: buffDuration,
OnGain: buffAuraOnGain,
OnExpire: buffAuraOnExpire,
})

buffAuraHaste := character.GetOrRegisterAura(core.Aura{
Label: "Blessing of the Shaper Haste" + labelSuffix,
ActionID: core.ActionID{SpellID: 96927},
MaxStacks: 5,
Duration: buffDuration,
OnGain: buffAuraOnGain,
OnExpire: buffAuraOnExpire,
})

buffAuraMastery := character.GetOrRegisterAura(core.Aura{
Label: "Blessing of the Shaper Mastery" + labelSuffix,
ActionID: core.ActionID{SpellID: 96929},
MaxStacks: 5,
Duration: buffDuration,
OnGain: buffAuraOnGain,
OnExpire: buffAuraOnExpire,
})

titanicPower := character.RegisterAura(core.Aura{
Label: "Titanic Power" + labelSuffix,
ActionID: core.ActionID{SpellID: 96923},
Duration: time.Second * 30,
MaxStacks: 5,
})

core.MakePermanent(core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
Name: "Titanic Power Aura" + labelSuffix,
ActionID: core.ActionID{SpellID: 96924},
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskMelee,
ProcChance: 1,
Outcome: core.OutcomeCrit,
Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
if buffAuraCrit.IsActive() || buffAuraHaste.IsActive() || buffAuraMastery.IsActive() {
return
}

titanicPower.Activate(sim)
titanicPower.AddStack(sim)
},
}))

trinketSpell := character.RegisterSpell(core.SpellConfig{
ActionID: core.ActionID{ItemID: config.ItemID},
SpellSchool: core.SpellSchoolPhysical,
ProcMask: core.ProcMaskEmpty,
Flags: core.SpellFlagNoOnCastComplete,
Cast: core.CastConfig{
SharedCD: core.Cooldown{
Timer: character.GetOffensiveTrinketCD(),
Duration: time.Second * 15,
},
CD: core.Cooldown{
Timer: character.NewTimer(),
Duration: time.Minute * 2,
},
},
ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
statType := character.GetHighestStat([]stats.Stat{stats.MeleeCrit, stats.SpellCrit, stats.MeleeHaste, stats.SpellHaste, stats.Mastery})
stacks = titanicPower.GetStacks()
statBonus := config.StatBonus * float64(stacks)

switch statType {
case stats.MeleeCrit, stats.SpellCrit:
buffs = stats.Stats{stats.MeleeCrit: statBonus, stats.SpellCrit: statBonus}
buffAuraCrit.Activate(sim)
case stats.MeleeHaste, stats.SpellHaste:
buffs = stats.Stats{stats.MeleeHaste: statBonus, stats.SpellHaste: statBonus}
buffAuraHaste.Activate(sim)
case stats.Mastery:
buffs = stats.Stats{stats.Mastery: statBonus}
buffAuraMastery.Activate(sim)
default:
panic("unexpected statType")
}

titanicPower.Deactivate(sim)
},
ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
return titanicPower.IsActive()
},
})

character.AddMajorCooldown(core.MajorCooldown{
Spell: trinketSpell,
Priority: core.CooldownPriorityDefault,
Type: core.CooldownTypeDPS,
ShouldActivate: func(sim *core.Simulation, character *core.Character) bool {
return titanicPower.IsActive()
},
})
})
}
8 changes: 4 additions & 4 deletions sim/death_knight/frost/TestFrost.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,16 @@ dps_results: {
dps_results: {
key: "TestFrost-AllItems-ApparatusofKhaz'goroth-68972"
value: {
dps: 22036.10262
tps: 20060.543
dps: 21909.90806
tps: 19989.14724
hps: 215.12703
}
}
dps_results: {
key: "TestFrost-AllItems-ApparatusofKhaz'goroth-69113"
value: {
dps: 22201.03467
tps: 20208.76484
dps: 22067.1986
tps: 20136.09603
hps: 215.12703
}
}
Expand Down
8 changes: 4 additions & 4 deletions sim/death_knight/unholy/TestUnholy.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,16 @@ dps_results: {
dps_results: {
key: "TestUnholy-AllItems-ApparatusofKhaz'goroth-68972"
value: {
dps: 31621.40757
tps: 23470.51463
dps: 31463.48524
tps: 23359.66173
hps: 473.88367
}
}
dps_results: {
key: "TestUnholy-AllItems-ApparatusofKhaz'goroth-69113"
value: {
dps: 31871.2664
tps: 23648.71678
dps: 31707.61605
tps: 23538.65395
hps: 473.88367
}
}
Expand Down
8 changes: 4 additions & 4 deletions sim/druid/feral/TestFeral.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ dps_results: {
dps_results: {
key: "TestFeral-AllItems-ApparatusofKhaz'goroth-68972"
value: {
dps: 26010.16289
tps: 36366.3166
dps: 25884.26602
tps: 36625.42619
}
}
dps_results: {
key: "TestFeral-AllItems-ApparatusofKhaz'goroth-69113"
value: {
dps: 26164.81755
tps: 36466.50053
dps: 25984.84193
tps: 36758.48515
}
}
dps_results: {
Expand Down
8 changes: 4 additions & 4 deletions sim/druid/guardian/TestGuardian.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ dps_results: {
dps_results: {
key: "TestGuardian-AllItems-ApparatusofKhaz'goroth-68972"
value: {
dps: 7800.83542
tps: 39070.13604
dps: 7843.78516
tps: 39285.30684
}
}
dps_results: {
key: "TestGuardian-AllItems-ApparatusofKhaz'goroth-69113"
value: {
dps: 7833.11618
tps: 39231.31568
dps: 7887.29914
tps: 39502.63676
}
}
dps_results: {
Expand Down
8 changes: 4 additions & 4 deletions sim/hunter/beast_mastery/TestBM.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ dps_results: {
dps_results: {
key: "TestBM-AllItems-ApparatusofKhaz'goroth-68972"
value: {
dps: 21087.82523
tps: 17814.40527
dps: 21097.03318
tps: 17811.53822
}
}
dps_results: {
key: "TestBM-AllItems-ApparatusofKhaz'goroth-69113"
value: {
dps: 21164.59151
tps: 17896.62613
dps: 21145.32226
tps: 17859.07559
}
}
dps_results: {
Expand Down
Loading

0 comments on commit ceefca1

Please sign in to comment.