diff Bar.lua @ 305:0211bcdfab70 stable

Merge 1.1 beta 12 to stable
author Flick
date Wed, 14 Nov 2012 16:47:27 -0800
parents 8598e779819a
children
line wrap: on
line diff
--- a/Bar.lua	Fri Aug 05 16:28:13 2011 -0700
+++ b/Bar.lua	Wed Nov 14 16:47:27 2012 -0800
@@ -750,7 +750,7 @@
 local ruleformats = { 
   stealth       = { format = "stealth",        filter = ClassFilter("ROGUE","DRUID") },
   nostealth     = { format = "nostealth",      filter = ClassFilter("ROGUE","DRUID") },
-  shadowdance   = { format = "bonusbar:2",     filter = ClassFilter("ROGUE") },
+  shadowdance   = { format = "stance:3",       filter = ClassFilter("ROGUE") },
   shadowform    = { format = "form:1",         filter = ClassFilter("PRIEST") },
   noshadowform  = { format = "noform",         filter = ClassFilter("PRIEST") },
   battle        = { format = "stance:1",       filter = ClassFilter("WARRIOR") },
@@ -761,7 +761,7 @@
   cat           = { format = "form:3",         filter = ClassFilter("DRUID") },
   tree          = { format = "form:5",         filter = ClassFilter("DRUID") },
   moonkin       = { format = "form:5",         filter = ClassFilter("DRUID") },
-  demon         = { format = "form:2",         filter = ClassFilter("WARLOCK") },
+  demon         = { format = "form:1",         filter = ClassFilter("WARLOCK") },
   nodemon       = { format = "noform",         filter = ClassFilter("WARLOCK") },
   pet           = { format = "pet" },
   nopet         = { format = "nopet" },
@@ -776,8 +776,9 @@
   solo          = { format = "nogroup" },
   combat        = { format = "combat" },
   nocombat      = { format = "nocombat" },
-  possess       = { format = "@vehicle,noexists,bonusbar:5" },
-  vehicle       = { format = "@vehicle,exists,bonusbar:5" },
+  possess       = { format = "overridebar" },
+  extrabar      = { format = "extrabar" },
+  vehicle       = { format = "vehicleui" },
 }
 
 function Bar.InitRuleFormats()