comparison 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
comparison
equal deleted inserted replaced
294:30c9bdaad7a3 305:0211bcdfab70
748 end 748 end
749 749
750 local ruleformats = { 750 local ruleformats = {
751 stealth = { format = "stealth", filter = ClassFilter("ROGUE","DRUID") }, 751 stealth = { format = "stealth", filter = ClassFilter("ROGUE","DRUID") },
752 nostealth = { format = "nostealth", filter = ClassFilter("ROGUE","DRUID") }, 752 nostealth = { format = "nostealth", filter = ClassFilter("ROGUE","DRUID") },
753 shadowdance = { format = "bonusbar:2", filter = ClassFilter("ROGUE") }, 753 shadowdance = { format = "stance:3", filter = ClassFilter("ROGUE") },
754 shadowform = { format = "form:1", filter = ClassFilter("PRIEST") }, 754 shadowform = { format = "form:1", filter = ClassFilter("PRIEST") },
755 noshadowform = { format = "noform", filter = ClassFilter("PRIEST") }, 755 noshadowform = { format = "noform", filter = ClassFilter("PRIEST") },
756 battle = { format = "stance:1", filter = ClassFilter("WARRIOR") }, 756 battle = { format = "stance:1", filter = ClassFilter("WARRIOR") },
757 defensive = { format = "stance:2", filter = ClassFilter("WARRIOR") }, 757 defensive = { format = "stance:2", filter = ClassFilter("WARRIOR") },
758 berserker = { format = "stance:3", filter = ClassFilter("WARRIOR") }, 758 berserker = { format = "stance:3", filter = ClassFilter("WARRIOR") },
759 caster = { format = "form:0/2/4/5/6", filter = ClassFilter("DRUID") }, 759 caster = { format = "form:0/2/4/5/6", filter = ClassFilter("DRUID") },
760 bear = { format = "form:1", filter = ClassFilter("DRUID") }, 760 bear = { format = "form:1", filter = ClassFilter("DRUID") },
761 cat = { format = "form:3", filter = ClassFilter("DRUID") }, 761 cat = { format = "form:3", filter = ClassFilter("DRUID") },
762 tree = { format = "form:5", filter = ClassFilter("DRUID") }, 762 tree = { format = "form:5", filter = ClassFilter("DRUID") },
763 moonkin = { format = "form:5", filter = ClassFilter("DRUID") }, 763 moonkin = { format = "form:5", filter = ClassFilter("DRUID") },
764 demon = { format = "form:2", filter = ClassFilter("WARLOCK") }, 764 demon = { format = "form:1", filter = ClassFilter("WARLOCK") },
765 nodemon = { format = "noform", filter = ClassFilter("WARLOCK") }, 765 nodemon = { format = "noform", filter = ClassFilter("WARLOCK") },
766 pet = { format = "pet" }, 766 pet = { format = "pet" },
767 nopet = { format = "nopet" }, 767 nopet = { format = "nopet" },
768 harm = { format = "@target,harm" }, 768 harm = { format = "@target,harm" },
769 help = { format = "@target,help" }, 769 help = { format = "@target,help" },
774 raid = { format = "group:raid" }, 774 raid = { format = "group:raid" },
775 party = { format = "group:party" }, 775 party = { format = "group:party" },
776 solo = { format = "nogroup" }, 776 solo = { format = "nogroup" },
777 combat = { format = "combat" }, 777 combat = { format = "combat" },
778 nocombat = { format = "nocombat" }, 778 nocombat = { format = "nocombat" },
779 possess = { format = "@vehicle,noexists,bonusbar:5" }, 779 possess = { format = "overridebar" },
780 vehicle = { format = "@vehicle,exists,bonusbar:5" }, 780 extrabar = { format = "extrabar" },
781 vehicle = { format = "vehicleui" },
781 } 782 }
782 783
783 function Bar.InitRuleFormats() 784 function Bar.InitRuleFormats()
784 local forms = { } 785 local forms = { }
785 for i = 1, GetNumShapeshiftForms() do 786 for i = 1, GetNumShapeshiftForms() do