Quantcast

Tag some spells with "offgcd=1" and add some missing "interrupt=1".

Johnny C. Lam [01-01-15 - 11:12]
Tag some spells with "offgcd=1" and add some missing "interrupt=1".
Filename
scripts/ovale_deathknight_spells.lua
scripts/ovale_druid_spells.lua
scripts/ovale_mage_spells.lua
scripts/ovale_monk_spells.lua
scripts/ovale_paladin_spells.lua
scripts/ovale_rogue_spells.lua
scripts/ovale_shaman_spells.lua
scripts/ovale_warrior_spells.lua
diff --git a/scripts/ovale_deathknight_spells.lua b/scripts/ovale_deathknight_spells.lua
index 88a467c..793b1f2 100644
--- a/scripts/ovale_deathknight_spells.lua
+++ b/scripts/ovale_deathknight_spells.lua
@@ -20,7 +20,7 @@ Define(scent_of_blood 49509)
 	SpellInfo(scent_of_blood learn=1 specialization=blood)

 Define(antimagic_shell 48707)
-	SpellInfo(antimagic_shell cd=45 gcd=0)
+	SpellInfo(antimagic_shell cd=45 gcd=0 offgcd=1)
 	SpellInfo(antimagic_shell buff_cdr=cooldown_reduction_strength_buff specialization=frost)
 	SpellInfo(antimagic_shell buff_cdr=cooldown_reduction_strength_buff specialization=unholy)
 	SpellInfo(antimagic_shell buff_cdr=cooldown_reduction_tank_buff specialization=blood)
@@ -50,11 +50,11 @@ Define(blood_presence 48263)
 Define(blood_shield_buff 77535)
 	SpellInfo(blood_shield_buff duration=10)
 Define(blood_tap 45529)
-	SpellInfo(blood_tap gcd=0)
+	SpellInfo(blood_tap gcd=0 offgcd=1)
 	SpellAddBuff(blood_tap blood_charge_buff=-5)
 Define(blood_tap_talent 10)
 Define(bone_shield 49222)
-	SpellInfo(bone_shield cd=60 gcd=0)
+	SpellInfo(bone_shield cd=60 gcd=0 offgcd=1)
 	SpellInfo(bone_shield buff_cdr=cooldown_reduction_tank_buff specialization=blood)
 	SpellAddBuff(bone_shield bone_shield_buff=1)
 Define(bone_shield_buff 49222)
@@ -105,7 +105,7 @@ Define(death_grip 49576)
 	SpellInfo(death_grip cd=25)
 	SpellInfo(death_grip addcd=-5 if_spell=enhanced_death_grip)
 Define(death_pact 48743)
-	SpellInfo(death_pact cd=120 gcd=0)
+	SpellInfo(death_pact cd=120 gcd=0 offgcd=1)
 Define(death_siphon 108196)
 	SpellInfo(death_siphon death=1)
 Define(death_strike 49998)
@@ -118,7 +118,7 @@ Define(death_strike 49998)
 	SpellAddBuff(death_strike dark_succor_buff=0 if_spell=dark_succor if_stance=deathknight_frost_presence)
 	SpellAddBuff(death_strike dark_succor_buff=0 if_spell=dark_succor if_stance=deathknight_unholy_presence)
 Define(deaths_advance 96268)
-	SpellInfo(deaths_advance cd=30 gcd=0)
+	SpellInfo(deaths_advance cd=30 gcd=0 offgcd=1)
 Define(defile 152280)
 	SpellInfo(defile unholy=1 cd=30)
 	SpellRequire(defile unholy 0=buff,crimson_scourge_buff if_spell=crimson_scourge)
@@ -160,7 +160,7 @@ Define(howling_blast 49184)
 	SpellAddTargetDebuff(howling_blast frost_fever_debuff=1 if_spell=!necrotic_plague)
 	SpellAddTargetDebuff(howling_blast necrotic_plague_debuff=1 if_spell=necrotic_plague)
 Define(icebound_fortitude 48792)
-	SpellInfo(icebound_fortitude cd=180 gcd=0)
+	SpellInfo(icebound_fortitude cd=180 gcd=0 offgcd=1)
 	SpellInfo(icebound_fortitude cd=90 glyph=glyph_of_icebound_fortitude)
 	SpellInfo(icebound_fortitude buff_cdr=cooldown_reduction_strength_buff specialization=frost)
 	SpellInfo(icebound_fortitude buff_cdr=cooldown_reduction_strength_buff specialization=unholy)
@@ -181,7 +181,7 @@ Define(killing_machine_buff 51124)
 Define(lichborne 49039)
 	SpellInfo(lichborne cd=120 gcd=0)
 Define(mind_freeze 47528)
-	SpellInfo(mind_freeze cd=15 gcd=0)
+	SpellInfo(mind_freeze cd=15 gcd=0 interrupt=1 offgcd=1)
 	SpellInfo(mind_freeze addcd=-1 runicpower=10 glyph=glyph_of_mind_freeze)
 Define(necrotic_plague 152281)
 Define(necrotic_plague_debuff 155159)
@@ -222,12 +222,12 @@ Define(raise_dead 46584)
 Define(rime_buff 59052)
 	SpellInfo(rime_buff duration=15)
 Define(rune_tap 48982)
-	SpellInfo(rune_tap blood=1 gcd=0)
+	SpellInfo(rune_tap blood=1 gcd=0 offgcd=1)
 	SpellInfo(rune_tap blood=0 itemset=T15_tank itemcount=2)
 Define(rune_tap_buff 171049)
 	SpellInfo(rune_tap_buff duration=3)
 Define(rune_tap_will_of_the_necropolis 171049)
-	SpellInfo(rune_tap_will_of_the_necropolis gcd=0)
+	SpellInfo(rune_tap_will_of_the_necropolis gcd=0 offgcd=1)
 Define(runic_corruption_buff 51460)
 	SpellInfo(runic_corruption_buff duration=3)
 Define(runic_corruption_talent 12)
@@ -259,7 +259,7 @@ Define(unholy_presence 48265)
 	SpellInfo(unholy_presence to_stance=deathknight_unholy_presence)
 	SpellInfo(unholy_presence unusable=1 if_stance=deathknight_unholy_presence)
 Define(vampiric_blood 55233)
-	SpellInfo(vampiric_blood cd=60 gcd=0)
+	SpellInfo(vampiric_blood cd=60 gcd=0 offgcd=1)
 	SpellInfo(vampiric_blood addcd=-20 itemset=T14_tank itemcount=2)
 	SpellInfo(vampiric_blood buff_cdr=cooldown_reduction_tank_buff specialization=blood)
 	SpellAddBuff(vampiric_blood vampiric_blood_buff=1)
diff --git a/scripts/ovale_druid_spells.lua b/scripts/ovale_druid_spells.lua
index 0153474..2d23d81 100644
--- a/scripts/ovale_druid_spells.lua
+++ b/scripts/ovale_druid_spells.lua
@@ -14,7 +14,7 @@ Define(harmony 77495)
 Define(astral_showers 33605)
 Define(balance_of_power 152220)
 Define(barkskin 22812)
-	SpellInfo(barkskin cd=60 gcd=0)
+	SpellInfo(barkskin cd=60 gcd=0 offgcd=1)
 	SpellInfo(barkskin buff_cdr=cooldown_reduction_tank_buff specialization=guardian)
 	SpellAddBuff(barkskin barkskin_buff=1)
 Define(barkskin_buff 22812)
@@ -40,7 +40,7 @@ Define(bloodtalons_buff 145152)
 	SpellInfo(bloodtalons_buff duration=30 max_stacks=2)
 Define(bloodtalons_talent 20)
 Define(bristling_fur 155835)
-	SpellInfo(bristling_fur cd=60 gcd=0)
+	SpellInfo(bristling_fur cd=60 gcd=0 offgcd=1)
 	SpellAddBuff(bristling_fur bristling_fur_buff=1)
 Define(bristling_fur_buff 155835)
 	SpellInfo(bristling_fur_buff duration=3)
@@ -88,14 +88,14 @@ Define(ferocious_bite 22568)
 	SpellAddBuff(ferocious_bite omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee)
 	SpellAddTargetBuff(ferocious_bite rip_debuff=refresh_keep_snapshot,target_health_pct,25 if_spell=rip)
 Define(force_of_nature_caster 33831)
-	SpellInfo(force_of_nature_heal gcd=0)
+	SpellInfo(force_of_nature_caster gcd=0 offgcd=1)
 Define(force_of_nature_heal 102693)
-	SpellInfo(force_of_nature_heal gcd=0)
+	SpellInfo(force_of_nature_heal gcd=0 offgcd=1)
 Define(force_of_nature_melee 102703)
-	SpellInfo(force_of_nature_melee gcd=0)
+	SpellInfo(force_of_nature_melee gcd=0 offgcd=1)
 Define(force_of_nature_talent 12)
 Define(force_of_nature_tank 102706)
-	SpellInfo(force_of_nature_tank gcd=0)
+	SpellInfo(force_of_nature_tank gcd=0 offgcd=1)
 Define(frenzied_regeneration 22842)
 	SpellInfo(frenzied_regeneration cd=1.5 cd_haste=melee gcd=0 max_rage=60 rage=finisher stance=druid_bear_form)
 Define(genesis 145518)
@@ -265,7 +265,7 @@ Define(rejuvenation 774)
 Define(rejuvenation_buff 774)
 	SpellInfo(rejuvenation_buff haste=spell duration=12 tick=3)
 Define(renewal 108238)
-	SpellInfo(renewal cd=120 gcd=0)
+	SpellInfo(renewal cd=120 gcd=0 offgcd=1)
 Define(rip 1079)
 	SpellInfo(rip combo=finisher energy=30 stance=druid_cat_form if_spell=!claws_of_shirvallah)
 	SpellInfo(rip combo=finisher energy=30 stance=druid_claws_of_shirvallah if_spell=claws_of_shirvallah)
@@ -308,7 +308,7 @@ Define(shred 5221)
 	SpellAddBuff(shred omen_of_clarity_melee_buff=0 if_spell=omen_of_clarity_melee)
 	SpellAddBuff(shred savage_roar_glyph_of_savage_roar_buff=1,buff,glyph_of_savage_roar_buff glyph=glyph_of_savage_roar)
 Define(skull_bash 106839)
-	SpellInfo(skull_bash cd=15 gcd=0)
+	SpellInfo(skull_bash cd=15 gcd=0 interrupt=1 offgcd=1)
 	SpellInfo(skull_bash addcd=5 glyph=glyph_of_skull_bash)
 Define(solar_beam 78675)
 	SpellInfo(solar_beam cd=60 interrupt=1)
@@ -341,7 +341,7 @@ Define(sunfire 93402)
 Define(sunfire_debuff 164815)
 	SpellInfo(sunfire_debuff duration=24 haste=spell tick=2)
 Define(survival_instincts 61336)
-	SpellInfo(survival_instincts cd=180 gcd=0)
+	SpellInfo(survival_instincts cd=180 gcd=0 offgcd=1)
 Define(swiftmend 18562)
 	SpellInfo(swiftmend cd=15)
 	SpellAddBuff(swiftmend harmony_buff=1 if_spell=harmony)
diff --git a/scripts/ovale_mage_spells.lua b/scripts/ovale_mage_spells.lua
index 3c79a29..a214eae 100644
--- a/scripts/ovale_mage_spells.lua
+++ b/scripts/ovale_mage_spells.lua
@@ -46,7 +46,7 @@ Define(arcane_power_buff 12042)
 	SpellInfo(arcane_power_buff addduration=15 glyph=glyph_of_arcane_power)
 Define(blast_wave 157981)
 Define(blazing_speed 108843)
-	SpellInfo(blazing_speed cd=25 gcd=0)
+	SpellInfo(blazing_speed cd=25 gcd=0 offgcd=1)
 Define(blink 1953)
 	SpellInfo(blink cd=15 glyph=!glyph_of_rapid_displacement)
 Define(blizzard 10)
@@ -56,7 +56,7 @@ Define(brain_freeze 44549)
 Define(brain_freeze_buff 57761)
 	SpellInfo(brain_freeze_buff duration=15)
 Define(cold_snap 11958)
-	SpellInfo(cold_snap cd=180 gcd=0)
+	SpellInfo(cold_snap cd=180 gcd=0 offgcd=1)
 Define(combustion 11129)
 	SpellInfo(combustion cd=45 gcd=0)
 	SpellInfo(combustion cd=90 glyph=glyph_of_combustion)
diff --git a/scripts/ovale_monk_spells.lua b/scripts/ovale_monk_spells.lua
index 095356a..ffe20d2 100644
--- a/scripts/ovale_monk_spells.lua
+++ b/scripts/ovale_monk_spells.lua
@@ -27,7 +27,7 @@ Define(crackling_jade_lightning 117952)
 Define(cranes_zeal_buff 127722)
 	SpellInfo(cranes_zeal_buff duration=20)
 Define(chi_brew 115399)
-	SpellInfo(chi_brew chi=-2 gcd=0)
+	SpellInfo(chi_brew chi=-2 gcd=0 offgcd=1)
 	SpellAddBuff(chi_brew elusive_brew_stacks_buff=5 if_spell=elusive_brew)
 	SpellAddBuff(chi_brew mana_tea_buff=1 if_spell=mana_tea glyph=!glyph_of_mana_tea)
 	SpellAddBuff(chi_brew mana_tea_buff=1 if_spell=mana_tea_glyphed glyph=glyph_of_mana_tea)
@@ -55,7 +55,7 @@ Define(combo_breaker_ce_buff 159407)
 Define(combo_breaker_tp_buff 118864)
 	SpellInfo(combo_breaker_tp_buff duration=15)
 Define(dampen_harm 122278)
-	SpellInfo(dampen_harm cd=90 gcd=0)
+	SpellInfo(dampen_harm cd=90 gcd=0 offgcd=1)
 	SpellAddBuff(dampen_harm dampen_harm_buff=3)
 Define(dampen_harm_buff 122278)
 	SpellInfo(dampen_harm_buff duration=45)
@@ -64,14 +64,14 @@ Define(death_note_buff 121125)
 Define(detonate_chi 115460)
 	SpellInfo(detonate_chi cd=10)
 Define(diffuse_magic 122783)
-	SpellInfo(diffuse_magic cd=90 gcd=0)
+	SpellInfo(diffuse_magic cd=90 gcd=0 offgcd=1)
 Define(diffuse_magic_buff 122783)
 	SpellInfo(diffuse_magic_buff duration=6)
 Define(diffuse_magic_talent 15)
 Define(dizzying_haze_debuff 116330)
 	SpellInfo(dizzying_haze_debuff duration=15)
 Define(elusive_brew 115308)
-	SpellInfo(elusive_brew cd=9 gcd=0)
+	SpellInfo(elusive_brew cd=9 gcd=0 offgcd=1)
 	SpellAddBuff(elusive_brew elusive_brew_activated_buff=1 elusive_brew_stacks_buff=0)
 Define(elusive_brew_activated_buff 115308)
 	SpellInfo(elusive_brew_activated_buff duration=1)
@@ -112,7 +112,7 @@ Define(focus_and_harmony 154555)
 Define(focus_of_xuen_buff 145024)
 	SpellInfo(focus_of_xuen_buff duration=10)
 Define(fortifying_brew 115203)
-	SpellInfo(fortifying_brew cd=180 gcd=0)
+	SpellInfo(fortifying_brew cd=180 gcd=0 offgcd=1)
 	SpellInfo(fortifying_brew buff_cdr=cooldown_reduction_agility_buff specialization=windwalker)
 	SpellInfo(fortifying_brew buff_cdr=cooldown_reduction_tank_buff specialization=brewmaster)
 	SpellAddBuff(fortifying_brew fortifying_brew_buff=1)
@@ -181,7 +181,7 @@ Define(mana_tea_glyphed 123761)
 Define(moderate_stagger_debuff 124274)
 	SpellInfo(moderate_stagger_debuff duration=10 tick=1)
 Define(nimble_brew 137562)
-	SpellInfo(nimble_brew cd=120 gcd=0)
+	SpellInfo(nimble_brew cd=120 gcd=0 offgcd=1)
 Define(paralysis 115078)
 	SpellInfo(paralysis cd=15 interrupt=1)
 Define(power_strikes_buff 129914)
@@ -189,7 +189,7 @@ Define(power_strikes_talent 7)
 Define(purifier_buff 138237) # tier15_4pc_tank bonus
 	SpellInfo(purifier_buff duration=15)
 Define(purifying_brew 119582)
-	SpellInfo(purifying_brew cd=1 chi=1 gcd=0)
+	SpellInfo(purifying_brew cd=1 chi=1 gcd=0 offgcd=1)
 	SpellRequire(purifying_brew chi 0=buff,purifier_buff itemset=T15_tank itemcount=2)
 	SpellRequire(purifying_brew chi 0=buff,serenity_buff if_spell=serenity)
 	SpellAddDebuff(purifying_brew heavy_stagger_debuff=0 light_stagger_debuff=0 moderate_stagger_debuff=0)
@@ -226,7 +226,7 @@ Define(soothing_mist 115175)
 Define(soothing_mist_buff 115175)
 	SpellInfo(soothing_mist_buff duration=8 haste=spell tick=1)
 Define(spear_hand_strike 116705)
-	SpellInfo(spear_hand_strike cd=15 gcd=0 interrupt=1)
+	SpellInfo(spear_hand_strike cd=15 gcd=0 interrupt=1 offgcd=1)
 Define(spinning_crane_kick 101546)
 	SpellInfo(spinning_crane_kick chi=-1 duration=2 haste=melee tick=0.75)
 	SpellInfo(spinning_crane_kick addduration=-1 if_spell=empowered_spinning_crane_kick)
@@ -290,7 +290,7 @@ Define(uplift 116670)
 Define(vital_mists_buff 118674)
 	SpellInfo(vital_mists_buff duration=30)
 Define(zen_meditation 115176)
-	SpellInfo(zen_meditation cd=180 gcd=0)
+	SpellInfo(zen_meditation cd=180 gcd=0 offgcd=1)
 	SpellInfo(zen_meditation buff_cdr=cooldown_reduction_agility_buff specialization=windwalker)
 	SpellInfo(zen_meditation buff_cdr=cooldown_reduction_tank_buff specialization=brewmaster)
 Define(zen_sphere 124081)
diff --git a/scripts/ovale_paladin_spells.lua b/scripts/ovale_paladin_spells.lua
index 98cc764..d4b5ef6 100644
--- a/scripts/ovale_paladin_spells.lua
+++ b/scripts/ovale_paladin_spells.lua
@@ -14,7 +14,7 @@ Define(sanctity_of_battle 25956)
 	SpellInfo(sanctity_of_battle learn=1 level=58)

 Define(ardent_defender 31850)
-	SpellInfo(ardent_defender cd=180 gcd=0)
+	SpellInfo(ardent_defender cd=180 gcd=0 offgcd=1)
 	SpellInfo(ardent_defender addcd=-60 itemset=T14_tank itemcount=2)
 	SpellInfo(ardent_defender buff_cdr=cooldown_reduction_tank_buff)
 	SpellAddBuff(ardent_defender ardent_defender_buff=1)
@@ -43,7 +43,7 @@ Define(bastion_of_power_buff 144569)
 	SpellInfo(bastion_of_power_buff duration=20)
 Define(beacon_of_light 53563)
 	SpellInfo(beacon_of_light cd=3)
-	SpellInfo(beacon_of_light gcd=0 glyph=glyph_of_beacon_of_light)
+	SpellInfo(beacon_of_light gcd=0 glyph=glyph_of_beacon_of_light offgcd=1)
 	SpellAddTargetBuff(beacon_of_light beacon_of_light_buff=1)
 Define(beacon_of_light_buff 53563)
 Define(blazing_contempt_buff 166831)
@@ -79,7 +79,7 @@ Define(crusader_strike 35395)
 Define(divine_crusader_buff 144595)
 	SpellInfo(divine_crusader_buff duration=12)
 Define(divine_protection 498)
-	SpellInfo(divine_protection cd=60 gcd=0)
+	SpellInfo(divine_protection cd=60 gcd=0 offgcd=1)
 	SpellInfo(divine_protection cd=30 if_spell=unbreakable_spirit)
 	SpellInfo(divine_protection buff_cdr=cooldown_reduction_strength_buff specialization=retribution)
 	SpellInfo(divine_protection buff_cdr=cooldown_reduction_tank_buff specialization=protection)
@@ -154,7 +154,7 @@ Define(grand_crusader 85043)
 Define(grand_crusader_buff 85416)
 	SpellInfo(grand_crusader_buff duration=6)
 Define(guardian_of_ancient_kings 86659)
-	SpellInfo(guardian_of_ancient_kings cd=180 gcd=0)
+	SpellInfo(guardian_of_ancient_kings cd=180 gcd=0 offgcd=1)
 	SpellInfo(guardian_of_ancient_kings buff_cdr=cooldown_reduction_tank_buff)
 	SpellAddBuff(guardian_of_ancient_kings guardian_of_ancient_kings_buff=1)
 Define(guardian_of_ancient_kings_buff 86659)
@@ -228,7 +228,7 @@ Define(lights_hammer 114158)
 Define(maraads_truth_buff 156990)
 	SpellInfo(maraads_truth_buff duration=20)
 Define(rebuke 96231)
-	SpellInfo(rebuke cd=15 gcd=0 interrupt=1)
+	SpellInfo(rebuke cd=15 gcd=0 interrupt=1 offgcd=1)
 	SpellInfo(rebuke addcd=5 glyph=glyph_of_rebuke)
 Define(righteous_fury 25780)
 Define(sacred_shield 20925)
@@ -270,7 +270,7 @@ Define(shield_of_the_righteous 53600)
 Define(shield_of_the_righteous_buff 132403)
 	SpellInfo(shield_of_the_righteous_buff duration=3)
 Define(speed_of_light 85499)
-	SpellInfo(speed_of_light cd=45 gcd=0)
+	SpellInfo(speed_of_light cd=45 gcd=0 offgcd=1)
 Define(templars_verdict 85256)
 	SpellInfo(templars_verdict holy=3)
 	SpellRequire(templars_verdict holy 0=buff,divine_purpose_buff if_spell=divine_purpose)
diff --git a/scripts/ovale_rogue_spells.lua b/scripts/ovale_rogue_spells.lua
index a9b9a7f..8fd040a 100644
--- a/scripts/ovale_rogue_spells.lua
+++ b/scripts/ovale_rogue_spells.lua
@@ -43,7 +43,7 @@ Define(bandits_guile 84654)
 Define(bandits_guile_buff 84654)
 	SpellInfo(bandits_guile_buff duration=15 max_stacks=12)
 Define(blade_flurry 13877)
-	SpellInfo(blade_flurry cd=10 gcd=0)
+	SpellInfo(blade_flurry cd=10 gcd=0 offgcd=1)
 Define(blade_flurry_buff 13877)
 Define(blindside_buff 121153)
 	SpellInfo(blindside_buff duration=10)
@@ -144,7 +144,7 @@ Define(internal_bleeding 154904)
 Define(internal_bleeding_debuff 154953)
 	SpellInfo(internal_bleeding_debuff duration=12 tick=2)
 Define(kick 1766)
-	SpellInfo(kick cd=15 gcd=0 interrupt=1)
+	SpellInfo(kick cd=15 gcd=0 interrupt=1 offgcd=1)
 	SpellInfo(kick addcd=4 glyph=glyph_of_kick)
 Define(kidney_shot 408)
 	SpellInfo(kidney_shot cd=20 combo=finisher energy=25 interrupt=1)
@@ -162,7 +162,7 @@ Define(leeching_poison_buff 108211)
 	SpellInfo(leeching_poison_buff duration=3600)
 SpellList(lethal_poison_buff deadly_poison_buff instant_poison_buff wound_poison_buff)
 Define(marked_for_death 137619)
-	SpellInfo(marked_for_death cd=60 combo=5 gcd=0 temp_combo=1)
+	SpellInfo(marked_for_death cd=60 combo=5 gcd=0 offgcd=1 temp_combo=1)
 Define(marked_for_death_talent 17)
 Define(master_of_subtlety_buff 31665)
 Define(mutilate 1329)
@@ -173,7 +173,7 @@ Define(mutilate 1329)
 	SpellAddBuff(mutilate enhanced_vendetta_buff=0 if_spell=enhanced_vendetta)
 SpellList(non_lethal_poison_buff crippling_poison_buff leeching_poison_buff)
 Define(premeditation 14183)
-	SpellInfo(premeditation cd=20 combo=2 gcd=0 stealthed=1 temp_combo=1)
+	SpellInfo(premeditation cd=20 combo=2 gcd=0 offgcd=1 stealthed=1 temp_combo=1)
 Define(preparation 14185)
 	SpellInfo(preparation cd=300)
 Define(revealing_strike 84617)
@@ -206,7 +206,7 @@ Define(shadow_reflection_buff 152151)
 	SpellInfo(shadow_reflection_buff duration=16)
 Define(shadow_reflection_talent 20)
 Define(shadowstep 36554)
-	SpellInfo(shadowstep cd=20 gcd=0)
+	SpellInfo(shadowstep cd=20 gcd=0 offgcd=1)
 Define(shiv 5938)
 	SpellInfo(shiv cd=10 energy=20)
 	SpellInfo(shiv buff_energy_less75=stealthed_buff if_spell=shadow_focus)
diff --git a/scripts/ovale_shaman_spells.lua b/scripts/ovale_shaman_spells.lua
index 3d83d40..7883f04 100644
--- a/scripts/ovale_shaman_spells.lua
+++ b/scripts/ovale_shaman_spells.lua
@@ -278,12 +278,12 @@ Define(windwalk_totem 108273)

 # Pet spells (Primal Elementalist Talent)
 Define(pet_empower 118350)
-	SpellInfo(pet_empower gcd=0)
+	SpellInfo(pet_empower gcd=0 offgcd=1)
 	SpellAddBuff(pet_empower pet_empower_buff=1)
 Define(pet_empower_buff 118350)
 	SpellInfo(pet_empower_buff duration=60)
 Define(pet_reinforce 118347)
-	SpellInfo(pet_reinforce gcd=0)
+	SpellInfo(pet_reinforce gcd=0 offgcd=1)
 	SpellAddBuff(pet_reinforce pet_reinforce_buff=1)
 Define(pet_reinforce_buff 118347)
 	SpellInfo(pet_reinforce_buff duration=60)
diff --git a/scripts/ovale_warrior_spells.lua b/scripts/ovale_warrior_spells.lua
index 31af293..e489599 100644
--- a/scripts/ovale_warrior_spells.lua
+++ b/scripts/ovale_warrior_spells.lua
@@ -61,7 +61,7 @@ Define(bloodthirst 23881)
 	SpellInfo(bloodthirst cd_haste=melee if_spell=headlong_rush)
 	SpellAddTargetDebuff(bloodthirst deep_wounds_debuff=1 if_spell=deep_wounds)
 Define(charge 100)
-	SpellInfo(charge cd=20 gcd=0 rage=-20)
+	SpellInfo(charge cd=20 gcd=0 offgcd=1 rage=-20)
 	SpellInfo(charge addcd=-8 if_spell=juggernaut)
 	SpellInfo(charge rage=-35 glyph=glyph_of_bull_rush)
 Define(colossus_smash 167105)
@@ -84,7 +84,7 @@ Define(defensive_stance 71)
 	SpellInfo(defensive_stance cd=1.5 to_stance=warrior_defensive_stance)
 	SpellInfo(defensive_stance unusable=1 if_stance=warrior_defensive_stance)
 Define(demoralizing_shout 1160)
-	SpellInfo(demoralizing_shout cd=60 gcd=0)
+	SpellInfo(demoralizing_shout cd=60 gcd=0 offgcd=1)
 	SpellInfo(demoralizing_shout buff_cdr=cooldown_reduction_tank_buff)
 	SpellAddTargetDebuff(demoralizing_shout demoralizing_shout_debuff=1)
 Define(demoralizing_shout_debuff 1160)
@@ -99,7 +99,7 @@ Define(dragon_roar 118000)
 Define(dragon_roar_talent 12)
 Define(enhanced_whirlwind 157473)
 Define(enraged_regeneration 55694)
-	SpellInfo(enraged_regeneration cd=60 gcd=0)
+	SpellInfo(enraged_regeneration cd=60 gcd=0 offgcd=1)
 Define(enraged_regeneration_buff 55694)
 	SpellInfo(enraged_regeneration_buff duration=5 tick=1)
 Define(execute 5308)
@@ -129,13 +129,13 @@ Define(glyph_of_resonating_power 58356)
 Define(glyph_of_shield_wall 63329)
 Define(glyph_of_spell_reflection 63328)
 Define(heroic_leap 6544)
-	SpellInfo(heroic_leap cd=45 gcd=0)
+	SpellInfo(heroic_leap cd=45 gcd=0 offgcd=1)
 	SpellInfo(heroic_leap addcd=-15 glyph=glyph_of_death_from_above)
 	SpellInfo(heroic_leap buff_cdr=cooldown_reduction_strength_buff specialization=arms)
 	SpellInfo(heroic_leap buff_cdr=cooldown_reduction_strength_buff specialization=fury)
 	SpellInfo(heroic_leap buff_cdr=cooldown_reduction_tank_buff specialization=protection)
 Define(heroic_strike 78)
-	SpellInfo(heroic_strike rage=30 cd=1.5 gcd=0)
+	SpellInfo(heroic_strike cd=1.5 gcd=0 offgcd=1 rage=30)
 	SpellInfo(heroic_strike buff_rage=unyielding_strikes_buff buff_rage_amount=-5 if_spell=unyielding_strikes)
 	SpellRequire(heroic_strike rage 0=buff,ultimatum_buff if_spell=ultimatum)
 	SpellAddBuff(heroic_strike ultimatum_buff=0 if_spell=ultimatum)
@@ -154,7 +154,7 @@ Define(improved_heroic_throw 157479)
 Define(juggernaut 103826)
 Define(juggernaut_talent 1)
 Define(last_stand 12975)
-	SpellInfo(last_stand cd=180 gcd=0)
+	SpellInfo(last_stand cd=180 gcd=0 offgcd=1)
 	SpellInfo(last_stand addcd=-60 itemset=T14_tank itemcount=2)
 	SpellInfo(last_stand buff_cdr=cooldown_reduction_tank_buff)
 	SpellAddBuff(last_stand last_stand_buff=1)
@@ -171,7 +171,7 @@ Define(mortal_strike 12294)
 Define(mortal_wounds_debuff 115804)
 	SpellInfo(mortal_wounds_debuff duration=10)
 Define(pummel 6552)
-	SpellInfo(pummel cd=15 gcd=0)
+	SpellInfo(pummel cd=15 gcd=0 interrupt=1 offgcd=1)
 Define(raging_blow 85288)
 	SpellInfo(raging_blow rage=10)
 	SpellAddBuff(raging_blow raging_blow_buff=-1)
@@ -233,7 +233,7 @@ Define(shield_slam 23922)
 	SpellAddBuff(shield_slam shield_charge_buff=0 if_spell=shield_charge)
 	SpellAddBuff(shield_slam sword_and_board_buff=0 if_spell=sword_and_board)
 Define(shield_wall 871)
-	SpellInfo(shield_wall cd=180 gcd=0)
+	SpellInfo(shield_wall cd=180 gcd=0 offgcd=1)
 	SpellInfo(shield_wall addcd=120 glyph=glyph_of_shield_wall)
 	SpellInfo(shield_wall addcd=-60 if_spell=bastion_of_defense)
 	SpellAddBuff(shield_wall shield_wall_buff=1)