Skip to content

Commit fe3702f

Browse files
NumynumNumynum
committed
Fix [overridebar] condition (closes #82) and add [house] condition
1 parent 265e61a commit fe3702f

File tree

1 file changed

+86
-84
lines changed

1 file changed

+86
-84
lines changed

‎MacroToolkit/modules/initialise.lua‎

Lines changed: 86 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -16,51 +16,51 @@ MT.frame:RegisterEvent("ADDON_LOADED")
1616
MT.frame:RegisterEvent("PLAYER_LOGIN")
1717
MT.frame:SetScript("OnEvent", function(...) MT:eventHandler(...) end)
1818
MT.commands = {
19-
cancelmacro = {"stopmacro", 0},
19+
cancelmacro = { "stopmacro", 0 },
2020
}
2121

2222
MT.scripts = {
23-
{L["Clear UI errors"],"mtce"},
24-
{L["Disable UI errors"],"mtex"},
25-
{L["Enable UI errors"],"mteo"},
26-
{L["Random non-combat pet"],"mtrp"},
27-
{L["Enable sound effects"],"mtso"},
28-
{L["Disable sound effects"],"mtsx"},
29-
{L["Set raid target"],"mtrt","raidtarget"},
30-
{L["Exit vehicle"],"mtev"},
31-
{L["Print map coordinates"],"mtmc"},
32-
{L["Toggle cloak"],"mttc"},
33-
{L["Toggle helm"],"mtth"},
34-
{L["Eject passenger"],"mtep"},
35-
{L["Sell grey items"],"mtsg"},
36-
{L["Destroy grey items"],"mtdg"},
37-
{L["No food buff"],"mtnb","buff"},
38-
{L["No flask"],"mtnf","buff"},
39-
{L["Summon random favourite mount"],"mtfm"},
40-
{L["Print a message"],"mtp"},
41-
{L["Conditional execution"], "mtc"},
23+
{ L["Clear UI errors"], "mtce" },
24+
{ L["Disable UI errors"], "mtex" },
25+
{ L["Enable UI errors"], "mteo" },
26+
{ L["Random non-combat pet"], "mtrp" },
27+
{ L["Enable sound effects"], "mtso" },
28+
{ L["Disable sound effects"], "mtsx" },
29+
{ L["Set raid target"], "mtrt", "raidtarget" },
30+
{ L["Exit vehicle"], "mtev" },
31+
{ L["Print map coordinates"], "mtmc" },
32+
{ L["Toggle cloak"], "mttc" },
33+
{ L["Toggle helm"], "mtth" },
34+
{ L["Eject passenger"], "mtep" },
35+
{ L["Sell grey items"], "mtsg" },
36+
{ L["Destroy grey items"], "mtdg" },
37+
{ L["No food buff"], "mtnb", "buff" },
38+
{ L["No flask"], "mtnf", "buff" },
39+
{ L["Summon random favourite mount"], "mtfm" },
40+
{ L["Print a message"], "mtp" },
41+
{ L["Conditional execution"], "mtc" },
4242
}
4343

4444
MT.slots = {
45-
[1]=_G.INVTYPE_HEAD,
46-
[2]=_G.INVTYPE_NECK,
47-
[3]=_G.INVTYPE_SHOULDER,
48-
[4]=_G.INVTYPE_BODY,
49-
[5]=_G.INVTYPE_CHEST,
50-
[6]=_G.INVTYPE_WAIST,
51-
[7]=_G.INVTYPE_LEGS,
52-
[8]=_G.INVTYPE_FEET,
53-
[9]=_G.INVTYPE_WRIST,
54-
[10]=_G.INVTYPE_HAND,
55-
[11]=format("%s 1",_G.INVTYPE_FINGER),
56-
[12]=format("%s 2",_G.INVTYPE_FINGER),
57-
[13]=format("%s 1",_G.INVTYPE_TRINKET),
58-
[14]=format("%s 2",_G.INVTYPE_TRINKET),
59-
[15]=_G.INVTYPE_BACK,
60-
[16]=_G.INVTYPE_WEAPONMAINHAND,
61-
[17]=_G.INVTYPE_WEAPONOFFHAND,
62-
[18]=_G.INVTYPE_RANGED,
63-
[19]=_G.INVTYPE_TABARD,
45+
[1] = _G.INVTYPE_HEAD,
46+
[2] = _G.INVTYPE_NECK,
47+
[3] = _G.INVTYPE_SHOULDER,
48+
[4] = _G.INVTYPE_BODY,
49+
[5] = _G.INVTYPE_CHEST,
50+
[6] = _G.INVTYPE_WAIST,
51+
[7] = _G.INVTYPE_LEGS,
52+
[8] = _G.INVTYPE_FEET,
53+
[9] = _G.INVTYPE_WRIST,
54+
[10] = _G.INVTYPE_HAND,
55+
[11] = format("%s 1", _G.INVTYPE_FINGER),
56+
[12] = format("%s 2", _G.INVTYPE_FINGER),
57+
[13] = format("%s 1", _G.INVTYPE_TRINKET),
58+
[14] = format("%s 2", _G.INVTYPE_TRINKET),
59+
[15] = _G.INVTYPE_CLOAK,
60+
[16] = _G.INVTYPE_WEAPONMAINHAND,
61+
[17] = _G.INVTYPE_WEAPONOFFHAND,
62+
[18] = _G.INVTYPE_RANGED,
63+
[19] = _G.INVTYPE_TABARD,
6464
}
6565

6666
MT.CONDITION_TYPE_NONE = 0
@@ -73,58 +73,60 @@ MT.CONDITION_TYPE_MOUSEBUTTONS = 6
7373
MT.CONDITION_TYPE_NUMERIC_WITH_SLASH = 7
7474
MT.CONDITION_TYPE_ALPHANUMERIC_WITH_SPACES = 8
7575
MT.conditions = {
76-
["actionbar"] = MT.CONDITION_TYPE_NUMERIC,
77-
["advflyable"] = MT.CONDITION_TYPE_NONE,
78-
["bar"] = MT.CONDITION_TYPE_NUMERIC,
79-
["bonusbar"] = MT.CONDITION_TYPE_NUMERIC,
80-
["btn"] = MT.CONDITION_TYPE_MOUSEBUTTONS,
81-
["button"] = MT.CONDITION_TYPE_MOUSEBUTTONS,
82-
["canexitvehicle"] = MT.CONDITION_TYPE_NONE,
83-
["channeling"] = MT.CONDITION_TYPE_ALPHANUMERIC,
84-
["channelling"] = MT.CONDITION_TYPE_ALPHANUMERIC,
85-
["combat"] = MT.CONDITION_TYPE_NONE,
86-
["cursor"] = MT.CONDITION_TYPE_TEXTUAL,
87-
["dead"] = MT.CONDITION_TYPE_NONE,
88-
["equipped"] = MT.CONDITION_TYPE_TEXTUAL,
89-
["exists"] = MT.CONDITION_TYPE_NONE,
90-
["extrabar"] = MT.CONDITION_TYPE_NUMERIC,
91-
["flyable"] = MT.CONDITION_TYPE_NONE,
92-
["flying"] = MT.CONDITION_TYPE_NONE,
93-
["form"] = MT.CONDITION_TYPE_NUMERIC,
94-
["group"] = MT.CONDITION_TYPE_PARTY_RAID,
95-
["harm"] = MT.CONDITION_TYPE_NONE,
96-
["help"] = MT.CONDITION_TYPE_NONE,
97-
["indoors"] = MT.CONDITION_TYPE_NONE,
98-
["known"] = MT.CONDITION_TYPE_ALPHANUMERIC_WITH_SPACES,
99-
["mod"] = MT.CONDITION_TYPE_MOD_KEYS,
100-
["modifier"] = MT.CONDITION_TYPE_MOD_KEYS,
101-
["mounted"] = MT.CONDITION_TYPE_NONE,
102-
["none"] = MT.CONDITION_TYPE_NONE,
103-
["outdoors"] = MT.CONDITION_TYPE_NONE,
104-
["overridebar"] = MT.CONDITION_TYPE_NUMERIC,
105-
["party"] = MT.CONDITION_TYPE_NONE,
106-
["pet"] = MT.CONDITION_TYPE_TEXTUAL,
107-
["petbattle"] = MT.CONDITION_TYPE_NONE,
108-
["possessbar"] = MT.CONDITION_TYPE_NUMERIC,
109-
["pvptalent"] = MT.CONDITION_TYPE_NUMERIC_WITH_SLASH,
110-
["raid"] = MT.CONDITION_TYPE_NONE,
111-
["spec"] = MT.CONDITION_TYPE_NUMERIC,
112-
["stance"] = MT.CONDITION_TYPE_NUMERIC,
113-
["stealth"] = MT.CONDITION_TYPE_NONE,
114-
["swimming"] = MT.CONDITION_TYPE_NONE,
115-
["talent"] = MT.CONDITION_TYPE_NUMERIC_WITH_SLASH,
116-
["unithasvehicleui"] = MT.CONDITION_TYPE_NONE,
117-
["vehicleui"] = MT.CONDITION_TYPE_NONE,
118-
["worn"] = MT.CONDITION_TYPE_TEXTUAL,
76+
actionbar = MT.CONDITION_TYPE_NUMERIC,
77+
advflyable = MT.CONDITION_TYPE_NONE,
78+
bar = MT.CONDITION_TYPE_NUMERIC,
79+
bonusbar = MT.CONDITION_TYPE_NUMERIC,
80+
btn = MT.CONDITION_TYPE_MOUSEBUTTONS,
81+
button = MT.CONDITION_TYPE_MOUSEBUTTONS,
82+
canexitvehicle = MT.CONDITION_TYPE_NONE,
83+
channeling = MT.CONDITION_TYPE_ALPHANUMERIC,
84+
channelling = MT.CONDITION_TYPE_ALPHANUMERIC,
85+
combat = MT.CONDITION_TYPE_NONE,
86+
cursor = MT.CONDITION_TYPE_TEXTUAL,
87+
dead = MT.CONDITION_TYPE_NONE,
88+
equipped = MT.CONDITION_TYPE_TEXTUAL,
89+
exists = MT.CONDITION_TYPE_NONE,
90+
extrabar = MT.CONDITION_TYPE_NUMERIC,
91+
flyable = MT.CONDITION_TYPE_NONE,
92+
flying = MT.CONDITION_TYPE_NONE,
93+
form = MT.CONDITION_TYPE_NUMERIC,
94+
group = MT.CONDITION_TYPE_PARTY_RAID,
95+
harm = MT.CONDITION_TYPE_NONE,
96+
help = MT.CONDITION_TYPE_NONE,
97+
house = MT.CONDITION_TYPE_TEXTUAL,
98+
indoors = MT.CONDITION_TYPE_NONE,
99+
known = MT.CONDITION_TYPE_ALPHANUMERIC_WITH_SPACES,
100+
mod = MT.CONDITION_TYPE_MOD_KEYS,
101+
modifier = MT.CONDITION_TYPE_MOD_KEYS,
102+
mounted = MT.CONDITION_TYPE_NONE,
103+
none = MT.CONDITION_TYPE_NONE,
104+
outdoors = MT.CONDITION_TYPE_NONE,
105+
overridebar = MT.CONDITION_TYPE_NONE,
106+
party = MT.CONDITION_TYPE_NONE,
107+
pet = MT.CONDITION_TYPE_TEXTUAL,
108+
petbattle = MT.CONDITION_TYPE_NONE,
109+
possessbar = MT.CONDITION_TYPE_NUMERIC,
110+
pvptalent = MT.CONDITION_TYPE_NUMERIC_WITH_SLASH,
111+
raid = MT.CONDITION_TYPE_NONE,
112+
spec = MT.CONDITION_TYPE_NUMERIC,
113+
stance = MT.CONDITION_TYPE_NUMERIC,
114+
stealth = MT.CONDITION_TYPE_NONE,
115+
swimming = MT.CONDITION_TYPE_NONE,
116+
talent = MT.CONDITION_TYPE_NUMERIC_WITH_SLASH,
117+
unithasvehicleui = MT.CONDITION_TYPE_NONE,
118+
vehicleui = MT.CONDITION_TYPE_NONE,
119+
worn = MT.CONDITION_TYPE_TEXTUAL,
119120
}
120121

121122
MT.optionalConditions = {
123+
channeling = true,
124+
channelling = true,
122125
group = true,
126+
house = true,
123127
mod = true,
124128
modifier = true,
125129
pet = true,
126-
channeling = true,
127-
channelling = true,
128130
}
129131

130132
-- creates a table that mixes all the possible combinations of the mods

0 commit comments

Comments
 (0)