Mercurial > wow > reaction

diff classes/Bar.lua @ 176:d32c65d94009

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update state driver details for 4.01 add shadow dance and demon form states (drycoded)
author Flick <flickerstreak@gmail.com>
date Wed, 20 Oct 2010 17:44:01 +0000
parents df68b5a40490
children 2e2abdaad2e5
line wrap: on
line diff
--- a/classes/Bar.lua	Wed Oct 20 17:11:50 2010 +0000
+++ b/classes/Bar.lua	Wed Oct 20 17:44:01 2010 +0000
@@ -734,21 +734,23 @@
   cat           = { format = "form:3",         filter = ClassFilter("DRUID") },
   tree          = { format = "form:5",         filter = ClassFilter("DRUID") },
   moonkin       = { format = "form:5",         filter = ClassFilter("DRUID") },
+  demon         = { format = "bonusbar:1",     filter = ClassFilter("WARLOCK") },
+  nodemon       = { format = "nobonusbar:1",   filter = ClassFilter("WARLOCK") },
   pet           = { format = "pet" },
   nopet         = { format = "nopet" },
-  harm          = { format = "target=target,harm" },
-  help          = { format = "target=target,help" },
-  notarget      = { format = "target=target,noexists" },
-  focusharm     = { format = "target=focus,harm" },
-  focushelp     = { format = "target=focus,help" },
-  nofocus       = { format = "target=focus,noexists" },
+  harm          = { format = "@target,harm" },
+  help          = { format = "@target,help" },
+  notarget      = { format = "@target,noexists" },
+  focusharm     = { format = "@focus,harm" },
+  focushelp     = { format = "@focus,help" },
+  nofocus       = { format = "@focus,noexists" },
   raid          = { format = "group:raid" },
   party         = { format = "group:party" },
   solo          = { format = "nogroup" },
   combat        = { format = "combat" },
   nocombat      = { format = "nocombat" },
-  possess       = { format = "target=vehicle,noexists,bonusbar:5" },
-  vehicle       = { format = "target=vehicle,exists,bonusbar:5" },
+  possess       = { format = "@vehicle,noexists,bonusbar:5" },
+  vehicle       = { format = "@vehicle,exists,bonusbar:5" },
 }
 
 function Bar.InitRuleFormats()
@@ -760,7 +762,7 @@
     -- use 9 if not found since 9 is never a valid stance/form
   local defensive = forms[GetSpellInfo(71)] or 9
   local berserker = forms[GetSpellInfo(2458)] or 9
-  local bear      = forms[GetSpellInfo(9634)] or forms[GetSpellInfo(5487)] or 9
+  local bear      = forms[GetSpellInfo(5487)] or 9
   local aquatic   = forms[GetSpellInfo(1066)] or 9
   local cat       = forms[GetSpellInfo(768)] or 9
   local travel    = forms[GetSpellInfo(783)] or 9