Skip to content

Commit

Permalink
Merge pull request #969 from wowsims/guardian
Browse files Browse the repository at this point in the history 
Tank Fixes
  • Loading branch information
@NerdEgghead
NerdEgghead authored Aug 23, 2024
2 parents c2b5945 + 06f086e commit e70fadf
Show file tree
Hide file tree
Showing 13 changed files with 108 additions and 140 deletions.
Binary file modified assets/database/db.bin
View file
Binary file not shown.
22 changes: 0 additions & 22 deletions assets/database/db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6635,11 +6635,6 @@
{"effectId":3370,"spellId":53343,"name":"Rune of Razorice","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"phase":1,"classAllowlist":[10]},
{"effectId":3594,"spellId":54446,"name":"Rune of Swordbreaking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"phase":1,"classAllowlist":[10]},
{"effectId":3595,"spellId":54447,"name":"Rune of Spellbreaking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"phase":1,"classAllowlist":[10]},
{"effectId":3599,"spellId":54736,"name":"Personal Electromagnetic Pulse Generator","type":8,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3601,"spellId":54793,"name":"Frag Belt","type":8,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3603,"spellId":54998,"name":"Hand-Mounted Pyro Rocket","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3604,"spellId":54999,"name":"Hyperspeed Accelerators","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3605,"spellId":55002,"name":"Flexweave Underlay","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3607,"itemId":41146,"spellId":55076,"name":"Sun Scope","type":14,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":3608,"itemId":41167,"spellId":55135,"name":"Heartseeker Scope","type":14,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":3718,"itemId":41601,"spellId":55630,"name":"Shining Spellthread","type":9,"stats":[0,0,0,0,12,0,0,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
Expand Down Expand Up @@ -6711,8 +6706,6 @@
{"effectId":3852,"itemId":44957,"spellId":62384,"name":"Greater Inscription of the Gladiator","type":3,"stats":[0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0],"quality":4},
{"effectId":3853,"itemId":44963,"spellId":62447,"name":"Earthen Leg Armor","type":9,"stats":[0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,40,0,0,0,0,0,0,0,0,0,0],"quality":4},
{"effectId":3854,"itemId":45059,"spellId":62948,"name":"Staff - Greater Spellpower","type":13,"enchantType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,81,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":3859,"spellId":63765,"name":"Springy Arachnoweave","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3860,"spellId":63770,"name":"Reticulated Armor Webbing","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,885,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3870,"itemId":46348,"spellId":64579,"name":"Blood Draining","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4},
{"effectId":3872,"spellId":56039,"name":"Sanctified Spellthread","type":9,"stats":[0,0,0,0,20,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":11},
{"effectId":3873,"spellId":56034,"name":"Master's Spellthread","type":9,"stats":[0,0,30,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":11},
Expand Down Expand Up @@ -6809,8 +6802,6 @@
{"effectId":4215,"itemId":55055,"spellId":92433,"name":"Elementium Shield Spike","type":13,"enchantType":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":4216,"itemId":55056,"spellId":92437,"name":"Pyrium Shield Spike","type":13,"enchantType":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":4217,"itemId":55057,"spellId":93448,"name":"Pyrium Weapon Chain","type":13,"stats":[0,0,0,0,0,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":4222,"spellId":67839,"name":"Mind Amplification Dish","type":1,"stats":[0,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":4223,"spellId":55016,"name":"Nitro Boosts","type":10,"stats":[0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":4227,"spellId":95471,"name":"Enchant 2H Weapon - Mighty Agility","type":13,"enchantType":1,"stats":[0,130,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":4245,"itemId":68770,"spellId":96245,"name":"Arcanum of Vicious Intellect","type":1,"stats":[0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":4246,"itemId":68769,"spellId":96246,"name":"Arcanum of Vicious Agility","type":1,"stats":[0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0],"quality":3},
Expand Down Expand Up @@ -8864,7 +8855,6 @@
{"id":47899,"name":"Enchant Cloak - Wisdom","icon":"inv_enchant_formulagood_01"},
{"id":47900,"name":"Enchant Chest - Super Health","icon":"trade_engraving"},
{"id":47901,"name":"Enchant Boots - Tuskarr's Vitality","icon":"inv_enchant_formulagood_01"},
{"id":47960,"name":"Shadowflame","icon":"ability_warlock_shadowflame","hasBuff":true},
{"id":48045,"name":"Mind Sear","icon":"spell_shadow_mindshear","hasBuff":true},
{"id":48108,"name":"Hot Streak","icon":"ability_mage_hotstreak","hasBuff":true},
{"id":48181,"name":"Haunt","icon":"ability_warlock_haunt","hasBuff":true},
Expand Down Expand Up @@ -9191,15 +9181,9 @@
{"id":54646,"name":"Focus Magic","icon":"spell_arcane_studentofmagic","hasBuff":true},
{"id":54648,"name":"Focus Magic","icon":"spell_arcane_studentofmagic","hasBuff":true},
{"id":54734,"name":"Fire Power","icon":"spell_fire_immolation"},
{"id":54736,"name":"Personal Electromagnetic Pulse Generator","icon":"trade_engineering"},
{"id":54758,"name":"Hyperspeed Acceleration","icon":"spell_shaman_elementaloath","hasBuff":true},
{"id":54787,"name":"Shattered Barrier","icon":"ability_mage_coldasice"},
{"id":54793,"name":"Frag Belt","icon":"trade_engineering"},
{"id":54845,"name":"Glyph of Starfire","icon":"spell_arcane_starfire"},
{"id":54998,"name":"Hand-Mounted Pyro Rocket","icon":"trade_engineering"},
{"id":54999,"name":"Hyperspeed Accelerators","icon":"trade_engineering"},
{"id":55002,"name":"Flexweave Underlay","icon":"trade_engineering"},
{"id":55016,"name":"Nitro Boosts","icon":"trade_engineering"},
{"id":55050,"name":"Heart Strike","icon":"inv_weapon_shortblade_40"},
{"id":55061,"name":"Icy Reach","icon":"spell_frost_manarecharge"},
{"id":55062,"name":"Icy Reach","icon":"spell_frost_manarecharge"},
Expand Down Expand Up @@ -9389,8 +9373,6 @@
{"id":63648,"name":"Divinity","icon":"spell_holy_blindingheal"},
{"id":63730,"name":"Serendipity","icon":"spell_holy_serendipity"},
{"id":63733,"name":"Serendipity","icon":"spell_holy_serendipity"},
{"id":63765,"name":"Springy Arachnoweave","icon":"trade_engineering"},
{"id":63770,"name":"Reticulated Armor Webbing","icon":"trade_engineering"},
{"id":63900,"name":"Thunderstomp","icon":"ability_golemthunderclap"},
{"id":64044,"name":"Psychic Horror","icon":"spell_shadow_psychichorrors","hasBuff":true},
{"id":64127,"name":"Body and Soul","icon":"spell_holy_symbolofhope"},
Expand All @@ -9406,7 +9388,6 @@
{"id":66191,"name":"Threat of Thassarian","icon":"ability_dualwieldspecialization"},
{"id":66192,"name":"Threat of Thassarian","icon":"ability_dualwieldspecialization"},
{"id":66235,"name":"Ardent Defender","icon":"spell_holy_holybolt"},
{"id":67839,"name":"Mind Amplification Dish","icon":"trade_engineering"},
{"id":70164,"name":"Rune of the Nerubian Carapace","icon":"inv_sword_61"},
{"id":70940,"name":"Divine Guardian","icon":"spell_holy_powerwordbarrier","hasBuff":true},
{"id":71165,"name":"Molten Core","icon":"ability_warlock_moltencore","hasBuff":true},
Expand Down Expand Up @@ -9981,11 +9962,8 @@
{"id":86652,"name":"Tattooed Eyeball","icon":"inv_misc_eye_02"},
{"id":86653,"name":"Silver Inlaid Leaf","icon":"inv_relics_idolofrejuvenation"},
{"id":86655,"name":"Improved Slam","icon":"ability_warrior_decisivestrike"},
{"id":86659,"name":"Guardian of Ancient Kings","icon":"spell_holy_heroism","hasBuff":true},
{"id":86664,"name":"Soulburn: Seed of Corruption","icon":"spell_shadow_seedofdestruction"},
{"id":86667,"name":"Siphon Life","icon":"spell_shadow_requiem"},
{"id":86669,"name":"Guardian of Ancient Kings","icon":"spell_holy_heroism","hasBuff":true},
{"id":86698,"name":"Guardian of Ancient Kings","icon":"spell_holy_heroism","hasBuff":true},
{"id":86700,"name":"Ancient Power","icon":"ability_paladin_blessedhands","hasBuff":true},
{"id":86704,"name":"Ancient Fury","icon":"ability_paladin_sanctifiedwrath"},
{"id":86847,"name":"Inscription of Unbreakable Quartz","icon":"trade_engineering"},
Expand Down
Binary file modified assets/database/leftover_db.bin
View file
Binary file not shown.
9 changes: 0 additions & 9 deletions assets/database/leftover_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28563,11 +28563,6 @@
{"effectId":3370,"spellId":53343,"name":"Rune of Razorice","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"phase":1,"classAllowlist":[10]},
{"effectId":3594,"spellId":54446,"name":"Rune of Swordbreaking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"phase":1,"classAllowlist":[10]},
{"effectId":3595,"spellId":54447,"name":"Rune of Spellbreaking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"phase":1,"classAllowlist":[10]},
{"effectId":3599,"spellId":54736,"name":"Personal Electromagnetic Pulse Generator","type":8,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3601,"spellId":54793,"name":"Frag Belt","type":8,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3603,"spellId":54998,"name":"Hand-Mounted Pyro Rocket","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3604,"spellId":54999,"name":"Hyperspeed Accelerators","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3605,"spellId":55002,"name":"Flexweave Underlay","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3607,"itemId":41146,"spellId":55076,"name":"Sun Scope","type":14,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":3608,"itemId":41167,"spellId":55135,"name":"Heartseeker Scope","type":14,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":3718,"itemId":41601,"spellId":55630,"name":"Shining Spellthread","type":9,"stats":[0,0,0,0,12,0,0,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
Expand Down Expand Up @@ -28639,8 +28634,6 @@
{"effectId":3852,"itemId":44957,"spellId":62384,"name":"Greater Inscription of the Gladiator","type":3,"stats":[0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0],"quality":4},
{"effectId":3853,"itemId":44963,"spellId":62447,"name":"Earthen Leg Armor","type":9,"stats":[0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,40,0,0,0,0,0,0,0,0,0,0],"quality":4},
{"effectId":3854,"itemId":45059,"spellId":62948,"name":"Staff - Greater Spellpower","type":13,"enchantType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,81,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":3859,"spellId":63765,"name":"Springy Arachnoweave","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3860,"spellId":63770,"name":"Reticulated Armor Webbing","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,885,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":3870,"itemId":46348,"spellId":64579,"name":"Blood Draining","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4},
{"effectId":3872,"spellId":56039,"name":"Sanctified Spellthread","type":9,"stats":[0,0,0,0,20,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":11},
{"effectId":3873,"spellId":56034,"name":"Master's Spellthread","type":9,"stats":[0,0,30,0,0,0,0,0,0,0,0,0,0,0,50,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":11},
Expand Down Expand Up @@ -28737,8 +28730,6 @@
{"effectId":4215,"itemId":55055,"spellId":92433,"name":"Elementium Shield Spike","type":13,"enchantType":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":4216,"itemId":55056,"spellId":92437,"name":"Pyrium Shield Spike","type":13,"enchantType":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":4217,"itemId":55057,"spellId":93448,"name":"Pyrium Weapon Chain","type":13,"stats":[0,0,0,0,0,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":4222,"spellId":67839,"name":"Mind Amplification Dish","type":1,"stats":[0,0,45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":4223,"spellId":55016,"name":"Nitro Boosts","type":10,"stats":[0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":4},
{"effectId":4227,"spellId":95471,"name":"Enchant 2H Weapon - Mighty Agility","type":13,"enchantType":1,"stats":[0,130,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":4245,"itemId":68770,"spellId":96245,"name":"Arcanum of Vicious Intellect","type":1,"stats":[0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":4246,"itemId":68769,"spellId":96246,"name":"Arcanum of Vicious Agility","type":1,"stats":[0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,35,0,0,0,0,0,0,0,0,0,0],"quality":3},
Expand Down
148 changes: 74 additions & 74 deletions sim/common/wotlk/enchant_effects.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,80 +268,80 @@ func init() {
w.BaseDamageMax += 15
})

core.NewEnchantEffect(3603, func(agent core.Agent) {
character := agent.GetCharacter()
actionID := core.ActionID{SpellID: 54757}

spell := character.GetOrRegisterSpell(core.SpellConfig{
ActionID: actionID,
SpellSchool: core.SpellSchoolFire,
ProcMask: core.ProcMaskEmpty,
Flags: core.SpellFlagNoOnCastComplete,

Cast: core.CastConfig{
CD: core.Cooldown{
Timer: character.NewTimer(),
Duration: time.Second * 45,
},
SharedCD: core.Cooldown{
Timer: character.GetOffensiveTrinketCD(),
Duration: time.Second * 10,
},
},

DamageMultiplier: 1,
CritMultiplier: character.DefaultSpellCritMultiplier(),
ThreatMultiplier: 1,

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
spell.CalcAndDealDamage(sim, target, sim.Roll(1654, 2020), spell.OutcomeMagicCrit)
},
})

character.AddMajorCooldown(core.MajorCooldown{
Spell: spell,
Priority: core.CooldownPriorityLow, // Use low prio so other actives get used first.
Type: core.CooldownTypeDPS,
})
})

core.NewEnchantEffect(3604, func(agent core.Agent) {
character := agent.GetCharacter()
actionID := core.ActionID{SpellID: 54758}

procAura := character.NewTemporaryStatsAura("Hyperspeed Acceleration", actionID, stats.Stats{stats.HasteRating: 340}, time.Second*12)

spell := character.GetOrRegisterSpell(core.SpellConfig{
ActionID: actionID,
SpellSchool: core.SpellSchoolPhysical,
Flags: core.SpellFlagNoOnCastComplete,

Cast: core.CastConfig{
CD: core.Cooldown{
Timer: character.NewTimer(),
Duration: time.Second * 60,
},
// Shared CD with Offensive trinkets has been removed.
// https://twitter.com/AggrendWoW/status/1579664462843633664
// Change possibly temporary, but developers have confirmed it was intended.

// SharedCD: core.Cooldown{
// Timer: character.GetOffensiveTrinketCD(),
// Duration: time.Second * 12,
// },
},

ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) {
procAura.Activate(sim)
},
})

character.AddMajorCooldown(core.MajorCooldown{
Spell: spell,
Priority: core.CooldownPriorityLow, // Use low prio so other actives get used first.
Type: core.CooldownTypeDPS,
})
})
//core.NewEnchantEffect(3603, func(agent core.Agent) {
// character := agent.GetCharacter()
// actionID := core.ActionID{SpellID: 54757}

// spell := character.GetOrRegisterSpell(core.SpellConfig{
// ActionID: actionID,
// SpellSchool: core.SpellSchoolFire,
// ProcMask: core.ProcMaskEmpty,
// Flags: core.SpellFlagNoOnCastComplete,

// Cast: core.CastConfig{
// CD: core.Cooldown{
// Timer: character.NewTimer(),
// Duration: time.Second * 45,
// },
// SharedCD: core.Cooldown{
// Timer: character.GetOffensiveTrinketCD(),
// Duration: time.Second * 10,
// },
// },

// DamageMultiplier: 1,
// CritMultiplier: character.DefaultSpellCritMultiplier(),
// ThreatMultiplier: 1,

// ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
// spell.CalcAndDealDamage(sim, target, sim.Roll(1654, 2020), spell.OutcomeMagicCrit)
// },
// })

// character.AddMajorCooldown(core.MajorCooldown{
// Spell: spell,
// Priority: core.CooldownPriorityLow, // Use low prio so other actives get used first.
// Type: core.CooldownTypeDPS,
// })
//})

//core.NewEnchantEffect(3604, func(agent core.Agent) {
// character := agent.GetCharacter()
// actionID := core.ActionID{SpellID: 54758}

// procAura := character.NewTemporaryStatsAura("Hyperspeed Acceleration", actionID, stats.Stats{stats.HasteRating: 340}, time.Second*12)

// spell := character.GetOrRegisterSpell(core.SpellConfig{
// ActionID: actionID,
// SpellSchool: core.SpellSchoolPhysical,
// Flags: core.SpellFlagNoOnCastComplete,

// Cast: core.CastConfig{
// CD: core.Cooldown{
// Timer: character.NewTimer(),
// Duration: time.Second * 60,
// },
// // Shared CD with Offensive trinkets has been removed.
// // https://twitter.com/AggrendWoW/status/1579664462843633664
// // Change possibly temporary, but developers have confirmed it was intended.

// // SharedCD: core.Cooldown{
// // Timer: character.GetOffensiveTrinketCD(),
// // Duration: time.Second * 12,
// // },
// },

// ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) {
// procAura.Activate(sim)
// },
// })

// character.AddMajorCooldown(core.MajorCooldown{
// Spell: spell,
// Priority: core.CooldownPriorityLow, // Use low prio so other actives get used first.
// Type: core.CooldownTypeDPS,
// })
//})

core.NewEnchantEffect(3722, func(agent core.Agent) {
character := agent.GetCharacter()
Expand Down
8 changes: 7 additions & 1 deletion sim/core/consumes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,10 +788,16 @@ func registerConjuredCD(agent Agent, consumes *proto.Consumes) {
ActionID: actionID,
Flags: SpellFlagNoOnCastComplete,
Cast: CastConfig{
CD: Cooldown{
SharedCD: Cooldown{
Timer: character.GetConjuredCD(),
Duration: time.Minute * 2,
},

// Enforce only one HS per fight
CD: Cooldown{
Timer: character.NewTimer(),
Duration: time.Minute * 60,
},
},
ApplyEffects: func(sim *Simulation, _ *Unit, _ *Spell) {
character.GainHealth(sim, 0.45*character.baseStats[stats.Health], healthMetrics)
Expand Down
12 changes: 6 additions & 6 deletions sim/core/test_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ var DefaultTargetProto = &proto.Target{
Level: CharacterLevel + 3,
Stats: stats.Stats{
stats.Armor: 11977,
stats.AttackPower: 805,
stats.AttackPower: 650,
}.ToProtoArray(),
MobType: proto.MobType_MobTypeGiant,
MobType: proto.MobType_MobTypeMechanical,

SwingSpeed: 1.5,
MinBaseDamage: 65000,
ParryHaste: true,
DamageSpread: 0,
SwingSpeed: 2.5,
MinBaseDamage: 210000,
ParryHaste: false,
DamageSpread: 0.4,
}

var FullRaidBuffs = &proto.RaidBuffs{
Expand Down
12 changes: 6 additions & 6 deletions sim/druid/guardian/TestGuardian.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1439,9 +1439,9 @@ dps_results: {
dps_results: {
key: "TestGuardian-Average-Default"
value: {
dps: 12737.14414
tps: 63763.44676
dtps: 6117.26228
dps: 14149.11293
tps: 70821.40961
dtps: 14337.1455
}
}
dps_results: {
Expand Down Expand Up @@ -1531,8 +1531,8 @@ dps_results: {
dps_results: {
key: "TestGuardian-SwitchInFrontOfTarget-Default"
value: {
dps: 14363.69744
tps: 71902.49649
dtps: 5432.96711
dps: 16846.35708
tps: 84315.01135
dtps: 14270.94119
}
}
Loading

0 comments on commit e70fadf

Please sign in to comment.