Mercurial > wow > reaction

changeset 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 5c01c0d3bf79
files classes/Bar.lua locale/enUS.lua modules/State.lua
diffstat 3 files changed, 16 insertions(+), 10 deletions(-) [+]
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
--- a/locale/enUS.lua	Wed Oct 20 17:11:50 2010 +0000
+++ b/locale/enUS.lua	Wed Oct 20 17:44:01 2010 +0000
@@ -70,8 +70,11 @@
 "Moonkin Form",
 "Stealth",
 "No Stealth",
+"Shadow Dance",
 "Shadowform",
 "No Shadowform",
+"Demon Form",
+"No Demon Form",
 "With Pet",
 "Without Pet",
 "Hostile Target",
--- a/modules/State.lua	Wed Oct 20 17:11:50 2010 +0000
+++ b/modules/State.lua	Wed Oct 20 17:44:01 2010 +0000
@@ -164,8 +164,9 @@
     --  rule       fields
     { "stance",  { {battle = L["Battle Stance"]}, {defensive = L["Defensive Stance"]}, {berserker = L["Berserker Stance"]} } },
     { "form",    { {caster = L["Caster Form"]}, {bear = L["Bear Form"]}, {cat = L["Cat Form"]}, {tree = L["Tree of Life"]}, {moonkin = L["Moonkin Form"]} } },
-    { "stealth", { {stealth = L["Stealth"]}, {nostealth = L["No Stealth"]} } },
+    { "stealth", { {stealth = L["Stealth"]}, {nostealth = L["No Stealth"]} }, {shadowdance = L["Shadow Dance"]} },
     { "shadow",  { {shadowform = L["Shadowform"]}, {noshadowform = L["No Shadowform"]} } },
+    { "demon",   { {demon = L["Demon Form"]}, {nodemon = L["No Demon Form"]} } },
     { "pet",     { {pet = L["With Pet"]}, {nopet = L["Without Pet"]} } },
     { "target",  { {harm = L["Hostile Target"]}, {help = L["Friendly Target"]}, {notarget = L["No Target"]} } },
     { "focus",   { {focusharm = L["Hostile Focus"]}, {focushelp = L["Friendly Focus"]}, {nofocus = L["No Focus"]} } },