From 308cb4da4bf83c89b267dbe5bdef8ca6ae50356e Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Sun, 11 May 2014 08:10:15 +0000 Subject: [PATCH] Hunter: Move traps to a separate icon from AoE rotation. A trap might not be good to drop because mobs are moving. Also show Ice Trap for Survival Hunters since they can get a Lock and Load proc from it. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1417 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- scripts/ovale_hunter.lua | 4 +--- scripts/ovale_hunter_spells.lua | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/ovale_hunter.lua b/scripts/ovale_hunter.lua index 03009dd..5f030da 100644 --- a/scripts/ovale_hunter.lua +++ b/scripts/ovale_hunter.lua @@ -56,7 +56,6 @@ AddFunction BeastMasteryDefaultAoeActions { #auto_shot #explosive_trap,if=active_enemies>1 - if Enemies() > 1 Spell(explosive_trap) #serpent_sting,if=!ticking if not target.DebuffPresent(serpent_sting_debuff) Spell(serpent_sting) #dire_beast,if=enabled @@ -270,7 +269,6 @@ AddFunction MarksmanshipDefaultAoeActions { #auto_shot #explosive_trap,if=active_enemies>1 - if Enemies() > 1 Spell(explosive_trap) #fervor,if=enabled&focus<=50 if TalentPoints(fervor_talent) and Focus() <= 50 Spell(fervor) #dire_beast,if=enabled @@ -466,7 +464,6 @@ AddFunction SurvivalDefaultAoeActions { #auto_shot #explosive_trap,if=active_enemies>1 - if Enemies() > 1 Spell(explosive_trap) #fervor,if=enabled&focus<=50 if TalentPoints(fervor_talent) and Focus() <= 50 Spell(fervor) #explosive_shot,if=buff.lock_and_load.react @@ -602,6 +599,7 @@ AddIcon mastery=survival help=cd AddIcon mastery=survival size=small checkboxon=opt_icons_right { Spell(explosive_trap) + Spell(ice_trap) } AddIcon mastery=survival size=small checkboxon=opt_icons_right diff --git a/scripts/ovale_hunter_spells.lua b/scripts/ovale_hunter_spells.lua index 46031fc..c192c04 100644 --- a/scripts/ovale_hunter_spells.lua +++ b/scripts/ovale_hunter_spells.lua @@ -86,6 +86,9 @@ Define(hunters_mark 1130) Define(hunters_mark_debuff 1130) SpellInfo(hunters_mark_debuff duration=300) SpellAddTargetDebuff(hunters_mark hunters_mark_debuff=1) +Define(ice_trap 13809) + SpellInfo(ice_trap cd=30) + SpellInfo(ice_trap addcd=-6 if_spell=trap_mastery) Define(kill_command 34026) SpellInfo(kill_command cd=6 focus=40) SpellInfo(kill_command buff_focus_half=beast_within_buff) -- 1.7.9.5