Skip to content

Commit

Permalink
Merge branch 'master' into vigo/extra-attacks
Browse files Browse the repository at this point in the history
  • Loading branch information
vigo2 authored Apr 20, 2024
2 parents f771a25 + 8923c01 commit 4590b07
Show file tree
Hide file tree
Showing 42 changed files with 1,339 additions and 35,982 deletions.
Binary file modified assets/database/db.bin
Binary file not shown.
771 changes: 396 additions & 375 deletions assets/database/db.json

Large diffs are not rendered by default.

Binary file modified assets/database/leftover_db.bin
Binary file not shown.
22 changes: 12 additions & 10 deletions assets/database/leftover_db.json

Large diffs are not rendered by default.

629 changes: 325 additions & 304 deletions assets/db_inputs/atlasloot_db.json

Large diffs are not rendered by default.

146 changes: 146 additions & 0 deletions assets/db_inputs/factions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
[
{
"id": 21,
"name": "Booty Bay"
},
{
"id": 47,
"name": "Ironforge"
},
{
"id": 54,
"name": "Gnomeregan"
},
{
"id": 59,
"name": "Thorium Brotherhood"
},
{
"id": 68,
"name": "Undercity"
},
{
"id": 69,
"name": "Darnassus"
},
{
"id": 70,
"name": "Syndicate"
},
{
"id": 72,
"name": "Stormwind"
},
{
"id": 76,
"name": "Orgrimmar"
},
{
"id": 81,
"name": "Thunder Bluff"
},
{
"id": 87,
"name": "Bloodsail Buccaneers"
},
{
"id": 92,
"name": "Gelkis Clan Centaur"
},
{
"id": 93,
"name": "Magram Clan Centaur"
},
{
"id": 270,
"name": "Zandalar Tribe"
},
{
"id": 349,
"name": "Ravenholdt"
},
{
"id": 369,
"name": "Gadgetzan"
},
{
"id": 470,
"name": "Ratchet"
},
{
"id": 509,
"name": "The League of Arathor"
},
{
"id": 510,
"name": "The Defilers"
},
{
"id": 529,
"name": "Argent Dawn"
},
{
"id": 530,
"name": "Darkspear Trolls"
},
{
"id": 576,
"name": "Timbermaw Hold"
},
{
"id": 577,
"name": "Everlook"
},
{
"id": 589,
"name": "Wintersaber Trainers"
},
{
"id": 609,
"name": "Cenarion Circle"
},
{
"id": 729,
"name": "Frostwolf Clan"
},
{
"id": 730,
"name": "Stormpike Guard"
},
{
"id": 749,
"name": "Hydraxian Waterlords"
},
{
"id": 809,
"name": "Shen'dralar"
},
{
"id": 889,
"name": "Silverwing Sentinels"
},
{
"id": 890,
"name": "Warsong Outriders"
},
{
"id": 909,
"name": "Darkmoon Faire"
},
{
"id": 910,
"name": "Brood of Nozdormu"
},
{
"id": 2586,
"name": "Azeroth Commerce Authority"
},
{
"id": 2587,
"name": "Durotar Supply and Logistics"
},
{
"id": 2641,
"name": "Emerald Wardens"
}
]
25,513 changes: 0 additions & 25,513 deletions assets/db_inputs/wowhead_gearplannerdb_wrath.txt

This file was deleted.

370 changes: 185 additions & 185 deletions assets/db_inputs/wowhead_rune_tooltips.csv

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/db_inputs/wowhead_spell_tooltips.csv
Original file line number Diff line number Diff line change
Expand Up @@ -21531,6 +21531,7 @@
438040,{"name":"Redirect","icon":"inv_throwingknife_01","tooltip":"<table><tr><td><a class=\"whtt-name\" href=\"/classic/spell=438040/redirect\"><b class=\"whtt-name\">Redirect</b></a><br />Melee Range<table width=\"100%\"><tr><td>Instant</td><th>10 sec cooldown</th></tr></table><div class=\"wowhead-tooltip-requirements\">Requires Rogue</div><span class=\"wowhead-tooltip-requirements\">Requires level 1</span><br /></td></tr></table><table><tr><td><div class=\"q\">Removes all your existing combo points from your target and stores them for up to 15 sec. These stored combat points will be transferred to the next non-player enemy you hit with a melee or ranged ability.</div></td></tr></table>","tooltip2":"","buff":"<table><tr><td><b class=\"q\">Redirect</b></td></tr></table><table><tr><td>Combo points will be transferred to the next target hit by this Rogue's abilities.<br><span class=\"q\">15 seconds remaining</span></td></tr></table>","quality":-1,"spells":{},"buffspells":{},"completion_category":"7"}
439085,{"name":"Crimson Silk Robe","icon":"inv_chest_cloth_25","tooltip":"<table><tr><td><a class=\"whtt-name q2\" href=\"/classic/spell=439085/crimson-silk-robe\"><b class=\"whtt-name q2\">Crimson Silk Robe</b></a><br />1 min cast</td></tr></table><table><tr><td>Reagents:<br /><div class=\"indent q1\"><a href=\"/classic/item=4305/bolt-of-silk-cloth\">Bolt of Silk Cloth</a>&nbsp;(8), <a href=\"/classic/item=7068/elemental-fire\">Elemental Fire</a>&nbsp;(4), <a href=\"/classic/item=3827/mana-potion\">Mana Potion</a>&nbsp;(2), <a href=\"/classic/item=2604/red-dye\">Red Dye</a>&nbsp;(4), <a href=\"/classic/item=4291/silken-thread\">Silken Thread</a></div><br /><span class=\"q2\"><a href=\"/classic/item=217245/crimson-silk-robe\">Crimson Silk Robe</a></span><!--ndstart--><!--ndend--><span class=\"q\"><br>Item Level <!--ilvl-->41</span><!--bo--><br>Binds when equipped<!--ue--><table width=\"100%\"><tr><td>Chest</td><th><!--scstart4:1--><span class=\"q1\">Cloth</span><!--scend--></th></tr></table><span><!--amr-->54 Armor</span><br><span><!--stat5-->+15 Intellect</span><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--><!--e--><!--ps--><br>Durability 70 / 70<br>Requires Level <!--rlvl-->36<br><span class=\"q2\">Equip: <a href=\"/classic/spell=7688/increase-fire-dam-9\" class=\"q2\">Increases damage done by Fire spells and effects by up to 9.</a></span><!--itemEffects:1--><div class=\"whtt-sellprice\">Sell Price: <span class=\"moneysilver\">47</span> <span class=\"moneycopper\">41</span></div></td></tr></table>","tooltip2":"","buff":"","quality":2,"spells":{},"buffspells":{},"completion_category":"11"}
439086,{"name":"Black Mageweave Vest","icon":"inv_chest_leather_03","tooltip":"<table><tr><td><a class=\"whtt-name q2\" href=\"/classic/spell=439086/black-mageweave-vest\"><b class=\"whtt-name q2\">Black Mageweave Vest</b></a><br />1 min cast</td></tr></table><table><tr><td>Reagents:<br /><div class=\"indent q1\"><a href=\"/classic/item=4339/bolt-of-mageweave\">Bolt of Mageweave</a>&nbsp;(2), <a href=\"/classic/item=4291/silken-thread\">Silken Thread</a>&nbsp;(3)</div><br /><span class=\"q2\"><a href=\"/classic/item=217246/black-mageweave-vest\">Black Mageweave Vest</a></span><!--ndstart--><!--ndend--><span class=\"q\"><br>Item Level <!--ilvl-->41</span><!--bo--><br>Binds when equipped<!--ue--><table width=\"100%\"><tr><td>Chest</td><th><!--scstart4:1--><span class=\"q1\">Cloth</span><!--scend--></th></tr></table><span><!--amr-->54 Armor</span><br><span><!--stat6-->+12 Spirit</span><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--><!--e--><!--ps--><br>Durability 70 / 70<br>Requires Level <!--rlvl-->36<br><span class=\"q2\">Equip: <a href=\"/classic/spell=9342/increase-spell-dam-13\" class=\"q2\">Increases damage and healing done by magical spells and effects by up to 13.</a></span><!--itemEffects:1--><div class=\"whtt-sellprice\">Sell Price: <span class=\"moneysilver\">48</span> <span class=\"moneycopper\">15</span></div></td></tr></table>","tooltip2":"","buff":"","quality":2,"spells":{},"buffspells":{},"completion_category":"11"}
439094,{"name":"Long Silken Cloak","icon":"inv_misc_cape_02","tooltip":"<table><tr><td><a class=\"whtt-name q2\" href=\"/classic/spell=439094/long-silken-cloak\"><b class=\"whtt-name q2\">Long Silken Cloak</b></a><br />45 sec cast</td></tr></table><table><tr><td>Reagents:<br /><div class=\"indent q1\"><a href=\"/classic/item=4305/bolt-of-silk-cloth\">Bolt of Silk Cloth</a>&nbsp;(4), <a href=\"/classic/item=3827/mana-potion\">Mana Potion</a>, <a href=\"/classic/item=4291/silken-thread\">Silken Thread</a></div><br /><span class=\"q2\"><a href=\"/classic/item=217252/long-silken-cloak\">Long Silken Cloak</a></span><!--ndstart--><!--ndend--><span class=\"q\"><br>Item Level <!--ilvl-->37</span><!--bo--><br>Binds when equipped<!--ue--><table width=\"100%\"><tr><td>Back</td></tr></table><span><!--amr-->24 Armor</span><br><span><!--stat5-->+5 Intellect</span><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--><!--e--><!--ps--><br>Requires Level <!--rlvl-->32<br><span class=\"q2\">Equip: <a href=\"/classic/spell=9397/increase-spell-dam-7\" class=\"q2\">Increases damage and healing done by magical spells and effects by up to 7.</a></span><!--itemEffects:1--><div class=\"whtt-sellprice\">Sell Price: <span class=\"moneysilver\">24</span> <span class=\"moneycopper\">96</span></div></td></tr></table>","tooltip2":"","buff":"","quality":2,"spells":{},"buffspells":{},"completion_category":"11"}
439102,{"name":"Enchanter's Cowl","icon":"inv_helmet_31","tooltip":"<table><tr><td><a class=\"whtt-name q2\" href=\"/classic/spell=439102/enchanters-cowl\"><b class=\"whtt-name q2\">Enchanter's Cowl</b></a><br />45 sec cast</td></tr></table><table><tr><td>Reagents:<br /><div class=\"indent q1\"><a href=\"/classic/item=4305/bolt-of-silk-cloth\">Bolt of Silk Cloth</a>&nbsp;(3), <a href=\"/classic/item=2321/fine-thread\">Fine Thread</a>&nbsp;(2), <a href=\"/classic/item=4337/thick-spiders-silk\">Thick Spider's Silk</a>&nbsp;(2)</div><br /><span class=\"q2\"><a href=\"/classic/item=217257/enchanters-cowl\">Enchanter's Cowl</a></span><!--ndstart--><!--ndend--><span class=\"q\"><br>Item Level <!--ilvl-->33</span><!--bo--><br>Binds when equipped<!--ue--><table width=\"100%\"><tr><td>Head</td><th><!--scstart4:1--><span class=\"q1\">Cloth</span><!--scend--></th></tr></table><span><!--amr-->37 Armor</span><br><span><!--stat5-->+10 Intellect</span><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--><!--e--><!--ps--><br>Durability 45 / 45<br>Requires Level <!--rlvl-->28<br><span class=\"q2\">Equip: <a href=\"/classic/spell=9397/increase-spell-dam-7\" class=\"q2\">Increases damage and healing done by magical spells and effects by up to 7.</a></span><!--itemEffects:1--><div class=\"whtt-sellprice\">Sell Price: <span class=\"moneysilver\">18</span> <span class=\"moneycopper\">10</span></div></td></tr></table>","tooltip2":"","buff":"","quality":2,"spells":{},"buffspells":{},"completion_category":"11"}
439105,{"name":"Big Voodoo Mask","icon":"inv_banner_01","tooltip":"<table><tr><td><a class=\"whtt-name q2\" href=\"/classic/spell=439105/big-voodoo-mask\"><b class=\"whtt-name q2\">Big Voodoo Mask</b></a><br />1 min cast</td></tr></table><table><tr><td>Reagents:<br /><div class=\"indent q1\"><a href=\"/classic/item=4304/thick-leather\">Thick Leather</a>&nbsp;(8), <a href=\"/classic/item=8151/flask-of-mojo\">Flask of Mojo</a>&nbsp;(6), <a href=\"/classic/item=8343/heavy-silken-thread\">Heavy Silken Thread</a></div><br /><span class=\"q2\"><a href=\"/classic/item=217259/big-voodoo-mask\">Big Voodoo Mask</a></span><!--ndstart--><!--ndend--><span class=\"q\"><br>Item Level <!--ilvl-->44</span><!--bo--><br>Binds when equipped<!--ue--><table width=\"100%\"><tr><td>Head</td><th><!--scstart4:2--><span class=\"q1\">Leather</span><!--scend--></th></tr></table><span><!--amr-->97 Armor</span><br><span><!--stat5-->+14 Intellect</span><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--><!--e--><!--ps--><br>Durability 50 / 50<br>Requires Level <!--rlvl-->39<br><span class=\"q2\">Equip: <a href=\"/classic/spell=9416/increase-spell-dam-11\" class=\"q2\">Increases damage and healing done by magical spells and effects by up to 11.</a></span><!--itemEffects:1--><div class=\"whtt-sellprice\">Sell Price: <span class=\"moneysilver\">53</span> <span class=\"moneycopper\">50</span></div></td></tr></table>","tooltip2":"","buff":"","quality":2,"spells":{},"buffspells":{},"completion_category":"11"}
439108,{"name":"Big Voodoo Robe","icon":"inv_chest_cloth_25","tooltip":"<table><tr><td><a class=\"whtt-name q2\" href=\"/classic/spell=439108/big-voodoo-robe\"><b class=\"whtt-name q2\">Big Voodoo Robe</b></a><br />1 min cast</td></tr></table><table><tr><td>Reagents:<br /><div class=\"indent q1\"><a href=\"/classic/item=4304/thick-leather\">Thick Leather</a>&nbsp;(10), <a href=\"/classic/item=8151/flask-of-mojo\">Flask of Mojo</a>&nbsp;(4), <a href=\"/classic/item=8343/heavy-silken-thread\">Heavy Silken Thread</a></div><br /><span class=\"q2\"><a href=\"/classic/item=217261/big-voodoo-robe\">Big Voodoo Robe</a></span><!--ndstart--><!--ndend--><span class=\"q\"><br>Item Level <!--ilvl-->43</span><!--bo--><br>Binds when equipped<!--ue--><table width=\"100%\"><tr><td>Chest</td><th><!--scstart4:2--><span class=\"q1\">Leather</span><!--scend--></th></tr></table><span><!--amr-->117 Armor</span><br><span><!--stat5-->+14 Intellect</span><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--><!--e--><!--ps--><br>Durability 85 / 85<br>Requires Level <!--rlvl-->38<br><span class=\"q2\">Equip: <a href=\"/classic/spell=9416/increase-spell-dam-11\" class=\"q2\">Increases damage and healing done by magical spells and effects by up to 11.</a></span><!--itemEffects:1--><div class=\"whtt-sellprice\">Sell Price: <span class=\"moneysilver\">72</span> <span class=\"moneycopper\">75</span></div></td></tr></table>","tooltip2":"","buff":"","quality":2,"spells":{},"buffspells":{},"completion_category":"11"}
Expand Down
Binary file removed assets/img/wotlk.jpg
Binary file not shown.
1 change: 0 additions & 1 deletion proto/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,6 @@ message SimItem {
RangedWeaponType ranged_weapon_type = 7;

repeated double stats = 8;
repeated double socketBonus = 10;

double weapon_damage_min = 11;
double weapon_damage_max = 12;
Expand Down
4 changes: 2 additions & 2 deletions proto/druid.proto
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ enum DruidRune {
RuneBracersElunesFires = 414719;
RuneBracersImpFrenziedRegen = 431389;

RuneHandsLacerate = 414644;
RuneHandsMangle = 407995;
RuneHandsSunfire = 414684;
RuneHandsWildGrowth = 408120;
RuneHandsSkullBash = 410176;

RuneBeltBerserk = 417141;
RuneBeltEclipse = 408248;
Expand All @@ -88,7 +88,7 @@ enum DruidRune {
RuneLegsStarsurge = 417157;
RuneLegsSavageRoar = 407988;
RuneLegsLifebloom = 409824;
RuneLegsSkullBash = 410176;
RuneLegsLacerate = 414644;

RuneFeetDreamstate = 408258;
RuneFeetKingOfTheJungle = 417046;
Expand Down
1 change: 1 addition & 0 deletions proto/paladin.proto
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ enum PaladinRune {
RuneWristHammerOfTheRighteous = 407632;
RuneWristImprovedHammerOfWrath = 429152;
RuneWristPurifyingPower = 429144;
RuneWristLightsGrace = 428909;

RuneChestSealOfMartyrdom = 407798;
RuneChestHornOfLordaeron = 425600;
Expand Down
50 changes: 13 additions & 37 deletions proto/ui.proto
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ message UIDatabase {

repeated UIZone zones = 8;
repeated UINPC npcs = 9;
repeated UIFaction factions = 12;

// Entities for which we just need a name/icon.
repeated IconData item_icons = 4;
Expand All @@ -34,6 +35,11 @@ message UINPC {
string name = 2;
int32 zone_id = 3;
}
message UIFaction {
int32 id = 1;
string name = 2;
Expansion expansion = 3;
}

// Contains all information about an Item needed by the UI.
// Generally this will include everything needed by the sim, plus some
Expand All @@ -52,7 +58,6 @@ message UIItem {
int32 requires_level = 9;

repeated double stats = 10;
repeated double socketBonus = 12;
repeated int32 random_suffix_options = 27;

// Weapon stats, needed for computing proper EP for melee weapons
Expand Down Expand Up @@ -110,37 +115,6 @@ enum RepLevel {
RepLevelExalted = 8;
}

enum RepFaction {
RepFactionUnknown = 0;

// Vanilla PVP Factions
// Warsong Gulch
RepFactionSilverwingSentinels = 890;
RepFactionWarsongOutriders = 889;
// Arathi Basin
RepFactionLeagueOfArathor = 509;
RepFactionTheDefilers = 510;
// Alterac Valley
RepFactionStormpikeGuard = 730;
RepFactionFrostwolfClan = 729;

// Vanilla Factions
RepFactionArgentDawn = 529;
RepFactionBloodsailBuccaneers = 87;
RepFactionBroodOfNozdormu = 910;
RepFactionCenarionCircle = 609;
RepFactionHydraxianWaterlords = 749;
RepFactionTimbermawHold = 576;
RepFactionThoriumBrotherhood = 59;
RepFactionWintersaberTrainers = 589;
RepFactionZandalarTribe = 270;

// SoD Factions
RepFactionAzerothCommerceAuthority = 2586;
RepFactionDurotarSupplyAndLogistics = 2587;
RepFactionEmeraldWardens = 2641;
}

message UIItemSource {
oneof source {
CraftedSource crafted = 1;
Expand Down Expand Up @@ -171,9 +145,9 @@ message SoldBySource {
int32 zone_id = 3;
}
message RepSource {
RepFaction rep_faction_id = 1;
int32 rep_faction_id = 1;
RepLevel rep_level = 2;
Faction faction_id = 3;
Faction player_faction = 3;
}

message UIEnchant {
Expand Down Expand Up @@ -227,6 +201,7 @@ enum SourceFilterOption {
SourceRaid = 4;
// SourceWorldBoss = 5;
SourceWorldBOE = 6;
SourceReputation = 7;
}

enum DungeonFilterOption {
Expand All @@ -244,7 +219,7 @@ enum DungeonFilterOption {
DungeonUldaman = 1337;
DungeonZulFarrak = 1176;
DungeonMaraudon = 2100;
DungeonSunkenTemple = 1477;
// DungeonSunkenTemple = 1477;
DungeonBlackrockDepths = 1584;
DungeonScholomance = 2057;
DungeonStratholme = 2017;
Expand All @@ -256,9 +231,10 @@ enum RaidFilterOption {
RaidUnknown = 0;
RaidBlackfathomDeeps = 719;
RaidGnomeregan = 721;
RaidMoltenCore = 2717;
RaidBlackwingLair = 2677;
RaidSunkenTemple = 1477;
RaidZulGurub = 1977;
RaidBlackwingLair = 2677;
RaidMoltenCore = 2717;
RaidRuinsOfAQ = 3428;
RaidTempleOfAQ = 3429;
RaidNaxxramas = 3456;
Expand Down
41 changes: 41 additions & 0 deletions sim/common/vanilla/item_effects.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const (
JoonhosMercy = 17054
ThrashBlade = 17705
SatyrsLash = 17752
MarkOfTheChosen = 17774
FiendishMachete = 18310
Thunderfury = 19019
ScarabBrooch = 21625
Expand Down Expand Up @@ -616,5 +617,45 @@ func init() {
}
})

core.NewItemEffect(MarkOfTheChosen, func(agent core.Agent) {
character := agent.GetCharacter()
statIncrease := float64(25)
markProcChance := 0.02

procAura := character.RegisterAura(core.Aura{
Label: "Mark of the Chosen Effect",
ActionID: core.ActionID{SpellID: 21970},
Duration: time.Minute,
OnGain: func(aura *core.Aura, sim *core.Simulation) {
character.AddStatsDynamic(sim, stats.Stats{
stats.Stamina: statIncrease,
stats.Agility: statIncrease,
stats.Strength: statIncrease,
stats.Intellect: statIncrease,
stats.Spirit: statIncrease,
})
},
OnExpire: func(aura *core.Aura, sim *core.Simulation) {
character.AddStatsDynamic(sim, stats.Stats{
stats.Stamina: -statIncrease,
stats.Agility: -statIncrease,
stats.Strength: -statIncrease,
stats.Intellect: -statIncrease,
stats.Spirit: -statIncrease,
})
},
})

core.MakePermanent(character.RegisterAura(core.Aura{
Label: "Mark of the Chosen",
ActionID: core.ActionID{SpellID: 21969},
OnSpellHitTaken: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
if result.Landed() && spell.ProcMask.Matches(core.ProcMaskMelee) && sim.RandomFloat("Mark of the Chosen") < markProcChance {
procAura.Activate(sim)
}
},
}))
})

core.AddEffectsToTest = true
}
3 changes: 3 additions & 0 deletions sim/druid/runes.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,9 @@ func (druid *Druid) tryElunesFiresMoonfireExtension(sim *core.Simulation, unit *
}

func (druid *Druid) tryElunesFiresSunfireExtension(sim *core.Simulation, unit *core.Unit) {
if druid.Sunfire == nil {
return
}
if dot := druid.Sunfire.Dot(unit); dot.IsActive() && dot.NumberOfTicks < ElunesFires_MaxSunfireTicks {
dot.NumberOfTicks += ElunesFires_BonusSunfireTicks
dot.RecomputeAuraDuration()
Expand Down
2 changes: 1 addition & 1 deletion sim/mage/blizzard.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (mage *Mage) newBlizzardSpellConfig(rank int) core.SpellConfig {

var improvedBlizzardProcApplication *core.Spell
if mage.Talents.ImprovedBlizzard > 0 {
impId := []int32{11185, 12487, 12488}[mage.Talents.ImprovedBlizzard]
impId := []int32{0, 11185, 12487, 12488}[mage.Talents.ImprovedBlizzard]
auras := mage.NewEnemyAuraArray(func(unit *core.Unit, playerLevel int32) *core.Aura {
return unit.GetOrRegisterAura(core.Aura{
ActionID: core.ActionID{SpellID: impId},
Expand Down
3 changes: 2 additions & 1 deletion sim/shaman/lightning_shield.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (shaman *Shaman) newLightningShieldSpellConfig(rank int) core.SpellConfig {
// TODO: Does vanilla have an ICD?
icd := core.Cooldown{
Timer: shaman.NewTimer(),
Duration: core.Ternary(hasOverchargedRune, time.Second*1, time.Millisecond*3500),
Duration: core.Ternary(hasOverchargedRune, time.Second*3, time.Millisecond*3500),
}

manaMetrics := shaman.NewManaMetrics(core.ActionID{SpellID: procSpellId})
Expand Down Expand Up @@ -140,6 +140,7 @@ func (shaman *Shaman) newLightningShieldSpellConfig(rank int) core.SpellConfig {
}
} else {
aura.RemoveStack(sim)
procSpell.Cast(sim, spell.Unit)
}
},
})
Expand Down
Loading

0 comments on commit 4590b07

Please sign in to comment.