Skip to content
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

Jump to bottom

rime -> freezing fog #3341

Merged
merged 1 commit into from
Jul 18, 2023
Merged

rime -> freezing fog #3341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sim/deathknight/deathknight.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ type Deathknight struct {
BloodCakedBladeAura *core.Aura
ButcheryAura *core.Aura
ButcheryPA *core.PendingAction
RimeAura *core.Aura
FreezingFogAura *core.Aura
BladeBarrierAura *core.Aura
ScentOfBloodAura *core.Aura
WillOfTheNecropolis *core.Aura
Expand Down
2 changes: 1 addition & 1 deletion sim/deathknight/dps/rotation_frost.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (dk *DpsDeathknight) RotationActionCallback_UA_Frost(sim *core.Simulation,
}

func (dk *DpsDeathknight) RotationActionCallback_Frost_FS_HB(sim *core.Simulation, target *core.Unit, s *deathknight.Sequence) time.Duration {
if dk.RimeAura.IsActive() && dk.Talents.HowlingBlast {
if dk.FreezingFogAura.IsActive() && dk.Talents.HowlingBlast {
dk.HowlingBlast.Cast(sim, target)
} else if dk.Talents.FrostStrike {
dk.FrostStrike.Cast(sim, target)
Expand Down
2 changes: 1 addition & 1 deletion sim/deathknight/dps/rotation_frost_aoe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (dk *DpsDeathknight) makeCustomRotation() *common.CustomRotation {
return dk.HowlingBlast.Cast(sim, target), cost
},
Condition: func(sim *core.Simulation) bool {
return dk.HowlingBlast.CanCast(sim, nil) && dk.RimeAura.IsActive()
return dk.HowlingBlast.CanCast(sim, nil) && dk.FreezingFogAura.IsActive()
},
},
int32(proto.Deathknight_Rotation_CustomBloodBoil): {
Expand Down
4 changes: 2 additions & 2 deletions sim/deathknight/dps/rotation_frost_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (dk *DpsDeathknight) RegularPrioPickSpell(sim *core.Simulation, target *cor
canCastSpell := sim.CurrentTime+spGcd <= untilTime

km := dk.KillingMachineAura.IsActive()
rime := dk.RimeAura.IsActive()
rime := dk.FreezingFogAura.IsActive()
if canCastSpell && dk.RaiseDead.CanCast(sim, nil) && sim.GetRemainingDuration() >= time.Second*30 {
return dk.RaiseDead
} else if canCastSpell && dk.HowlingBlast.CanCast(sim, nil) && rime {
Expand Down Expand Up @@ -100,7 +100,7 @@ func (dk *DpsDeathknight) RotationActionCallback_EndOfFightPrio(sim *core.Simula
obAt := core.MaxDuration(frAt, uhAt)
fsCost := float64(core.RuneCost(dk.FrostStrike.CurCast.Cost).RunicPower())
bothblAt := dk.BloodDeathRuneBothReadyAt()
hasRime := dk.RimeAura.IsActive() && dk.Talents.HowlingBlast
hasRime := dk.FreezingFogAura.IsActive() && dk.Talents.HowlingBlast

if bothblAt == core.NeverExpires {
bothblAt = 1
Expand Down
4 changes: 2 additions & 2 deletions sim/deathknight/howling_blast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ func (dk *Deathknight) registerHowlingBlastSpell() {
spell.DealDamage(sim, result)
}

if dk.RimeAura.IsActive() {
dk.RimeAura.Deactivate(sim)
if dk.FreezingFogAura.IsActive() {
dk.FreezingFogAura.Deactivate(sim)
}
if dk.KillingMachineAura.IsActive() {
dk.KillingMachineAura.Deactivate(sim)
Expand Down
2 changes: 1 addition & 1 deletion sim/deathknight/obliterate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (dk *Deathknight) newObliterateHitSpell(isMH bool) *core.Spell {
}

if sim.RandomFloat("Rime") < dk.rimeHbChanceProc() {
dk.RimeAura.Activate(sim)
dk.FreezingFogAura.Activate(sim)
}
}

Expand Down
6 changes: 3 additions & 3 deletions sim/deathknight/talents_frost.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ func (dk *Deathknight) applyRime() {
return
}

dk.RimeAura = dk.RegisterAura(core.Aura{
Label: "Rime",
ActionID: core.ActionID{SpellID: 59057},
dk.FreezingFogAura = dk.RegisterAura(core.Aura{
Label: "Freezing Fog",
ActionID: core.ActionID{SpellID: 59052},
Duration: time.Second * 15,
OnGain: func(aura *core.Aura, sim *core.Simulation) {
if dk.HowlingBlast != nil {
Expand Down
2 changes: 1 addition & 1 deletion sim/deathknight/tank/rotation_shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (dk *TankDeathknight) DoFrostCast(sim *core.Simulation, target *core.Unit,
return true
}

if dk.Talents.HowlingBlast && dk.RimeAura.IsActive() && dk.HowlingBlast.CanCast(sim, target) {
if dk.Talents.HowlingBlast && dk.FreezingFogAura.IsActive() && dk.HowlingBlast.CanCast(sim, target) {
dk.HowlingBlast.Cast(sim, target)
return true
}
Expand Down
4 changes: 2 additions & 2 deletions ui/deathknight/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ export const FROST_BL_PESTI_ROTATION_PRESET_DEFAULT = {
{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":51271}}},{"spellCanCast":{"spellId":{"spellId":51271}}}]}},"castSpell":{"spellId":{"itemId":40211}}}},
{"action":{"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":51271}}},{"castSpell":{"spellId":{"spellId":45529}}}]}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"4s"}}}},{"dotIsActive":{"spellId":{"spellId":55095}}}]}},"castSpell":{"spellId":{"spellId":50842}}}},
{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":59057}}},"castSpell":{"spellId":{"spellId":51411}}}},
{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":59052}}},"castSpell":{"spellId":{"spellId":51411}}}},
{"action":{"castSpell":{"spellId":{"tag":1,"spellId":51425}}}},
{"action":{"castSpell":{"spellId":{"spellId":46584}}}},
{"action":{"castSpell":{"spellId":{"tag":1,"spellId":49930}}}},
Expand Down Expand Up @@ -359,7 +359,7 @@ export const FROST_UH_PESTI_ROTATION_PRESET_DEFAULT = {
{"action":{"condition":{"and":{"vals":[{"spellIsReady":{"spellId":{"spellId":51271}}},{"spellCanCast":{"spellId":{"spellId":51271}}}]}},"castSpell":{"spellId":{"itemId":40211}}}},
{"action":{"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":51271}}},{"castSpell":{"spellId":{"spellId":45529}}}]}}},
{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":55095}}},"rhs":{"const":{"val":"8.5s"}}}},{"dotIsActive":{"spellId":{"spellId":55095}}}]}},"castSpell":{"spellId":{"spellId":50842}}}},
{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":59057}}},"castSpell":{"spellId":{"spellId":51411}}}},
{"action":{"condition":{"auraIsActive":{"auraId":{"spellId":59052}}},"castSpell":{"spellId":{"spellId":51411}}}},
{"action":{"castSpell":{"spellId":{"tag":1,"spellId":51425}}}},
{"action":{"castSpell":{"spellId":{"spellId":46584}}}},
{"action":{"castSpell":{"spellId":{"tag":1,"spellId":49930}}}},
Expand Down