Skip to content

Commit

Permalink
Merge pull request #880 from wowsims/p4/general
Browse files Browse the repository at this point in the history 
update shaman/warlock defender's resolve, fix warlock demonic sacrifice
  • Loading branch information
@kayla-glick
kayla-glick authored Jul 8, 2024
2 parents 000ba45 + 3c70b2c commit 486886f
Show file tree
Hide file tree
Showing 21 changed files with 162 additions and 112 deletions.
Binary file modified assets/database/db.bin
View file
Binary file not shown.
25 changes: 13 additions & 12 deletions assets/database/db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9544,8 +9544,8 @@
{"effectId":63,"spellId":13538,"name":"Enchant Chest - Lesser Absorption","type":5,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":66,"spellId":7457,"name":"Enchant Bracer - Minor Stamina","type":6,"stats":[0,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":66,"spellId":7863,"name":"Enchant Boots - Minor Stamina","type":10,"stats":[0,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":242,"spellId":7748,"name":"Enchant Chest - Lesser Health","type":5,"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,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":243,"spellId":7766,"name":"Enchant Bracer - Minor Spirit","type":6,"stats":[0,0,0,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":246,"spellId":7776,"name":"Enchant Chest - Lesser Mana","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
Expand Down Expand Up @@ -9646,8 +9646,8 @@
{"effectId":1893,"spellId":20028,"name":"Enchant Chest - Major Mana","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1894,"spellId":20029,"name":"Enchant Weapon - Icy Chill","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1896,"spellId":20030,"name":"Enchant 2H Weapon - Superior Impact","type":13,"enchantType":1,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1897,"spellId":13695,"name":"Enchant 2H Weapon - Impact","type":13,"enchantType":1,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":1897,"spellId":20031,"name":"Enchant Weapon - Superior Striking","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1897,"spellId":13695,"name":"Enchant 2H Weapon - Impact","type":13,"enchantType":1,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":1898,"spellId":20032,"name":"Enchant Weapon - Lifestealing","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":1899,"spellId":20033,"name":"Enchant Weapon - Unholy Weapon","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1900,"spellId":20034,"name":"Enchant Weapon - Crusader","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
Expand Down Expand Up @@ -14003,16 +14003,16 @@
{"id":403689,"name":"Drain Life","icon":"spell_shadow_lifedrain02","requiresLevel":54,"hasBuff":true},
{"id":403789,"name":"Metamorphosis","icon":"spell_shadow_demonform","requiresLevel":1,"hasBuff":true},
{"id":403828,"name":"Menace","icon":"spell_shadow_soulleech_3","requiresLevel":1,"hasBuff":true},
{"id":403835,"name":"Shadow Cleave","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":1},
{"id":403839,"name":"Shadow Cleave","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":6},
{"id":403840,"name":"Shadow Cleave","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":12},
{"id":403841,"name":"Shadow Cleave","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":20},
{"id":403842,"name":"Shadow Cleave","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":28},
{"id":403843,"name":"Shadow Cleave","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":36},
{"id":403844,"name":"Shadow Cleave","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":44},
{"id":403848,"name":"Shadow Cleave","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":52},
{"id":403851,"name":"Shadow Cleave","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":60},
{"id":403852,"name":"Shadow Cleave","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":60},
{"id":403835,"name":"Shadow Cleave (Rank 1)","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":1},
{"id":403839,"name":"Shadow Cleave (Rank 2)","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":6},
{"id":403840,"name":"Shadow Cleave (Rank 3)","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":12},
{"id":403841,"name":"Shadow Cleave (Rank 4)","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":20},
{"id":403842,"name":"Shadow Cleave (Rank 5)","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":28},
{"id":403843,"name":"Shadow Cleave (Rank 6)","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":36},
{"id":403844,"name":"Shadow Cleave (Rank 7)","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":44},
{"id":403848,"name":"Shadow Cleave (Rank 8)","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":52},
{"id":403851,"name":"Shadow Cleave (Rank 9)","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":60},
{"id":403852,"name":"Shadow Cleave (Rank 10)","icon":"inv_mace_1h_stratholme_d_02","requiresLevel":60},
{"id":403919,"name":"Engrave Gloves - Haunt","icon":"inv_misc_desecrated_leatherglove","requiresLevel":1},
{"id":403920,"name":"Engrave Chest - Soul Siphon","icon":"inv_misc_desecrated_leatherchest","requiresLevel":1},
{"id":403925,"name":"Engrave Gloves - Chaos Bolt","icon":"inv_misc_desecrated_leatherglove","requiresLevel":1},
Expand All @@ -14028,6 +14028,7 @@
{"id":407676,"name":"Crusader Strike","icon":"spell_holy_crusaderstrike","requiresLevel":1},
{"id":407778,"name":"Divine Storm","icon":"ability_paladin_divinestorm","requiresLevel":1},
{"id":407784,"name":"Divine Storm","icon":"ability_paladin_divinestorm","requiresLevel":1},
{"id":407788,"name":"Avenging Wrath","icon":"spell_holy_avenginewrath","requiresLevel":1,"hasBuff":true},
{"id":407798,"name":"Seal of Martyrdom","icon":"spell_holy_sealofblood","requiresLevel":1,"hasBuff":true},
{"id":407799,"name":"Seal of Martyrdom","icon":"spell_holy_sealofblood"},
{"id":407803,"name":"Judgement of Martyrdom","icon":"spell_holy_sealofblood","requiresLevel":1},
Expand Down
Binary file modified assets/database/leftover_db.bin
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions assets/database/leftover_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1479,8 +1479,8 @@
{"effectId":63,"spellId":13538,"name":"Enchant Chest - Lesser Absorption","type":5,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":66,"spellId":7457,"name":"Enchant Bracer - Minor Stamina","type":6,"stats":[0,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":66,"spellId":7863,"name":"Enchant Boots - Minor Stamina","type":10,"stats":[0,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":242,"spellId":7748,"name":"Enchant Chest - Lesser Health","type":5,"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,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":243,"spellId":7766,"name":"Enchant Bracer - Minor Spirit","type":6,"stats":[0,0,0,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":246,"spellId":7776,"name":"Enchant Chest - Lesser Mana","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
Expand Down Expand Up @@ -1554,8 +1554,8 @@
{"effectId":929,"itemId":16217,"spellId":20069,"name":"Enchant Shield - Greater Stamina","type":13,"enchantType":2,"stats":[0,0,7,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":930,"spellId":13947,"name":"Enchant Gloves - Riding Skill","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":931,"spellId":13948,"name":"Enchant Gloves - Minor Haste","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","type":13,"enchantType":1,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":1483,"itemId":11622,"spellId":15340,"name":"Lesser Arcanum of Rumination","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":1503,"itemId":11642,"spellId":15389,"name":"Lesser Arcanum of Constitution","type":1,"extraTypes":[9],"enchantType":3,"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,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0],"quality":2},
Expand Down
1 change: 1 addition & 0 deletions assets/db_inputs/wowhead_spell_tooltips.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21122,6 +21122,7 @@
407676,{"name":"Crusader Strike","icon":"spell_holy_crusaderstrike","tooltip":"<table><tr><td><a class=\"whtt-name\" href=\"/classic/spell=407676/crusader-strike\"><b class=\"whtt-name\">Crusader Strike</b></a><br />Melee Range<table width=\"100%\"><tr><td>Instant</td><th>6 sec cooldown</th></tr></table><div class=\"wowhead-tooltip-requirements\">Requires Paladin</div><span class=\"wowhead-tooltip-requirements\">Requires level 1</span><br /></td></tr></table><table><tr><td><span class=\"wowhead-tooltip-requirements\">Requires Melee Weapon</span><div class=\"q\">An instant strike that causes 75% weapon damage as Holy and regenerates 5% of your maximum mana.</div></td></tr></table>","tooltip2":"","buff":"","quality":-1,"spells":{},"buffspells":{},"completion_category":"7"}
407778,{"name":"Divine Storm","icon":"ability_paladin_divinestorm","tooltip":"<table><tr><td><a class=\"whtt-name\" href=\"/classic/spell=407778/divine-storm\"><b class=\"whtt-name\">Divine Storm</b></a><br />12% of base mana<table width=\"100%\"><tr><td>Instant</td><th>10 sec cooldown</th></tr></table><div class=\"wowhead-tooltip-requirements\">Requires Paladin</div><span class=\"wowhead-tooltip-requirements\">Requires level 1</span><br /></td></tr></table><table><tr><td><span class=\"wowhead-tooltip-requirements\">Requires Melee Weapon</span><div class=\"q\">An instant weapon attack that causes 110% of weapon damage to up to 4 enemies within 8 yards. &nbsp;The Divine Storm heals up to 3 party or raid members totaling 25% of the damage caused.</div></td></tr></table>","tooltip2":"","buff":"","quality":-1,"spells":{},"buffspells":{},"completion_category":"7"}
407784,{"name":"Divine Storm","icon":"ability_paladin_divinestorm","tooltip":"<table><tr><td><a class=\"whtt-name\" href=\"/classic/spell=407784/divine-storm\"><b class=\"whtt-name\">Divine Storm</b></a><br />Unlimited range<br />Instant<div class=\"wowhead-tooltip-requirements\">Requires Paladin</div><span class=\"wowhead-tooltip-requirements\">Requires level 1</span><br /></td></tr></table><table><tr><td><div class=\"q\">Divine Storm damage dealt heals nearby friendly targets.</div></td></tr></table>","tooltip2":"","buff":"","quality":-1,"spells":{},"buffspells":{},"completion_category":"7"}
407788,{"name":"Avenging Wrath","icon":"spell_holy_avenginewrath","tooltip":"<table><tr><td><a class=\"whtt-name\" href=\"/classic/spell=407788/avenging-wrath\"><b class=\"whtt-name\">Avenging Wrath</b></a><br />8% of base mana<table width=\"100%\"><tr><td>Instant</td><th>3 min cooldown</th></tr></table><div class=\"wowhead-tooltip-requirements\">Requires Paladin</div><span class=\"wowhead-tooltip-requirements\">Requires level 1</span><br /></td></tr></table><table><tr><td><div class=\"q\">Increases all damage and healing caused by 20% for 20 sec. &nbsp;Causes Forbearance and cannot be used while Forebearance is active.</div></td></tr></table>","tooltip2":"","buff":"<table><tr><td><table width=\"100%\"><tr><td><b class=\"q\">Avenging Wrath</b></td><th class=\"q\"><b class=\"q\">Magic</b></th></tr></table></td></tr></table><table><tr><td>All damage and healing caused increased by 20%.<br><span class=\"q\">20 seconds remaining</span></td></tr></table>","quality":-1,"spells":{},"buffspells":{},"completion_category":7}
407798,{"name":"Seal of Martyrdom","icon":"spell_holy_sealofblood","tooltip":"<table><tr><td><a class=\"whtt-name\" href=\"/classic/spell=407798/seal-of-martyrdom\"><b class=\"whtt-name\">Seal of Martyrdom</b></a><br />4% of base mana<br />Instant<div class=\"wowhead-tooltip-requirements\">Requires Paladin</div><span class=\"wowhead-tooltip-requirements\">Requires level 1</span><br /></td></tr></table><table><tr><td><div class=\"q\">Fills you with holy spirit for 30 sec, causing each of your melee attacks to deal 50% weapon damage to your target, but you lose health equal to 10% of the damage inflicted. While this seal is active, your party and raid members within 40 yards each gain mana equal to 20% of damage you take from this seal.<br /><br />Unleashing this Seal's energy will judge an enemy, instantly causing 85% weapon damage at the cost of health equal to 10% of the damage inflicted.<br /><br />This ability's Seal and Judgement benefit from talents and effects that modify the Seal or Judgement of Seal of Righteousness.</div></td></tr></table>","tooltip2":"","buff":"<table><tr><td><table width=\"100%\"><tr><td><b class=\"q\">Seal of Martyrdom</b></td><th class=\"q\"><b class=\"q\">Magic</b></th></tr></table></td></tr></table><table><tr><td>Melee attacks deal additional damage to your target, but also damage you and generate mana for your party and raid.<br><span class=\"q\">30 seconds remaining</span></td></tr></table>","quality":-1,"spells":{},"buffspells":{},"completion_category":"7"}
407799,{"name":"Seal of Martyrdom","icon":"spell_holy_sealofblood","tooltip":"<a class=\"whtt-name\" href=\"/classic/spell=407799/seal-of-martyrdom\"><b class=\"whtt-name\">Seal of Martyrdom</b></a><br />100 yd range<br />Instant<div class=\"wowhead-tooltip-requirements\">Requires Paladin</div>","tooltip2":"","buff":"","quality":-1,"spells":{},"buffspells":{},"completion_category":"7"}
407803,{"name":"Judgement of Martyrdom","icon":"spell_holy_sealofblood","tooltip":"<a class=\"whtt-name\" href=\"/classic/spell=407803/judgement-of-martyrdom\"><b class=\"whtt-name\">Judgement of Martyrdom</b></a><br />Unlimited range<br />Instant<div class=\"wowhead-tooltip-requirements\">Requires Paladin</div><span class=\"wowhead-tooltip-requirements\">Requires level 1</span><br />","tooltip2":"","buff":"","quality":-1,"spells":{},"buffspells":{},"completion_category":"7"}
Expand Down
18 changes: 18 additions & 0 deletions sim/core/buffs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2372,3 +2372,21 @@ func ApplyAshenvaleRallyingCry(character *Character) *Aura {
},
})
}

///////////////////////////////////////////////////////////////////////////
// Misc Other Buffs
///////////////////////////////////////////////////////////////////////////

func DefendersResolveSpellDamage(character *Character) *Aura {
return character.GetOrRegisterAura(Aura{
ActionID: ActionID{SpellID: 460200},
Label: "Defender's Resolve (Spell Damage)",
Duration: time.Second * 15,
// Each stack corresponds to 2 SP. Handles a max of 500 Defense
MaxStacks: 200,
OnStacksChange: func(aura *Aura, sim *Simulation, oldStacks int32, newStacks int32) {
aura.Unit.AddStatDynamic(sim, stats.SpellDamage, float64(-2*oldStacks))
aura.Unit.AddStatDynamic(sim, stats.SpellDamage, float64(2*newStacks))
},
})
}
4 changes: 1 addition & 3 deletions sim/paladin/avenging_wrath.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ func (paladin *Paladin) registerAvengingWrath() {
Cast: core.CastConfig{
CD: core.Cooldown{
Timer: paladin.NewTimer(),
Duration: time.Minute*3,
Duration: time.Minute * 3,
},

},
ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) {
AvengingWrathAura.Activate(sim)
Expand All @@ -44,6 +43,5 @@ func (paladin *Paladin) registerAvengingWrath() {
paladin.AddMajorCooldown(core.MajorCooldown{
Spell: AvengingWrath,
Type: core.CooldownTypeDPS,

})
}
6 changes: 2 additions & 4 deletions sim/paladin/holy_shock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@ import (
func (paladin *Paladin) registerHolyShock() {

hasInfusionOfLight := paladin.hasRune(proto.PaladinRune_RuneWaistInfusionOfLight)

cdTime := time.Second * 30
if hasInfusionOfLight {
cdTime = time.Second * 6
}


paladin.holyShockCooldown = &core.Cooldown{
Timer: paladin.NewTimer(),
Duration: cdTime,
Expand All @@ -39,11 +38,10 @@ func (paladin *Paladin) registerHolyShock() {
{level: 56, spellID: 20930, manaCost: 325, minDamage: 365, maxDamage: 395},
}


damageMultiplier := core.TernaryFloat64(hasInfusionOfLight, 1.5, 1.0)

//hasArtOfWar := paladin.hasRune(proto.PaladinRune_RuneFeetTheArtOfWar)
manaCostMultiplier := 1.0//core.TernaryFloat64(hasArtOfWar, 0.2, 1.0)
manaCostMultiplier := 1.0 //core.TernaryFloat64(hasArtOfWar, 0.2, 1.0)

hasWrath := paladin.hasRune(proto.PaladinRune_RuneHeadWrath)

Expand Down
8 changes: 4 additions & 4 deletions sim/paladin/runes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func (paladin *Paladin) registerTheArtOfWar() {

paladin.RegisterAura(core.Aura{
Label: "The Art of War",
Duration: core.NeverExpires,
Duration: core.NeverExpires,
OnReset: func(aura *core.Aura, sim *core.Simulation) {
aura.Activate(sim)
},
Expand All @@ -42,7 +42,7 @@ func (paladin *Paladin) registerTheArtOfWar() {
return
}
//paladin.holyShockCooldown.Reset()
paladin.exorcismCooldown.Set(sim.CurrentTime + max(0, paladin.exorcismCooldown.TimeToReady(sim) - (time.Second * 2)))
paladin.exorcismCooldown.Set(sim.CurrentTime + max(0, paladin.exorcismCooldown.TimeToReady(sim)-(time.Second*2)))
},
})
}
Expand Down Expand Up @@ -70,7 +70,7 @@ func (paladin *Paladin) registerSheathOfLight() {
})
paladin.RegisterAura(core.Aura{
Label: "Sheath of Light (rune)",
Duration: core.NeverExpires,
Duration: core.NeverExpires,
OnReset: func(aura *core.Aura, sim *core.Simulation) {
aura.Activate(sim)
},
Expand Down Expand Up @@ -106,7 +106,7 @@ func (paladin *Paladin) registerShockAndAwe() {
})
paladin.RegisterAura(core.Aura{
Label: "Shock and Awe (rune)",
Duration: core.NeverExpires,
Duration: core.NeverExpires,
OnReset: func(aura *core.Aura, sim *core.Simulation) {
aura.Activate(sim)
},
Expand Down
Loading

0 comments on commit 486886f

Please sign in to comment.