# HG changeset patch # User Farmbuyer of US-Kilrogg # Date 1420751035 18000 # Node ID 63bda09d88fe300639945fac2970e2b1193e1351 # Parent df0ca8ed1affc2609c6cadcf765ed668c15ac8df Add 'on5', 'ver[sion]' command arguments, and an on5 dropdown entry. diff -r df0ca8ed1aff -r 63bda09d88fe core.lua --- a/core.lua Thu Jan 08 15:22:27 2015 -0500 +++ b/core.lua Thu Jan 08 16:03:55 2015 -0500 @@ -1863,7 +1863,7 @@ txt = strtrim(txt:lower()) local cmd, arg = "" do - local s,e = txt:find("^%a+") + local s,e = txt:find("^%w+") if s then cmd = txt:sub(s,e) s = txt:find("%S", e+2) @@ -1884,6 +1884,7 @@ elseif cmd == "on" then self:Activate("cmdon",arg) elseif cmd == "off" then self:Deactivate() elseif cmd == "broadcast" or cmd == "bcast" then self:Activate("cmdbcast",nil,true) + elseif cmd == "on5" then self.debug.notraid = true self:Activate("cmdon5",arg) elseif cmd == "toggle" then if self.display then @@ -1922,6 +1923,8 @@ elseif cmd == "delete" and arg and arg:len() > 0 then self:save_delete(tonumber(arg)) + elseif cmd:find("^ver") then + self:Print(self.status_text) elseif cmd == "help" then self:BuildMainDisplay('help') elseif cmd == "ping" then diff -r df0ca8ed1aff -r 63bda09d88fe gui.lua --- a/gui.lua Thu Jan 08 15:22:27 2015 -0500 +++ b/gui.lua Thu Jan 08 16:03:55 2015 -0500 @@ -2191,12 +2191,20 @@ [[Enable full tracking, only rebroadcasting, or disable activity altogether.]]) b:SetFullWidth(true) b:SetLabel("On/Off:") - b:SetList{"Full Tracking", "Broadcasting", "Disabled"} - b:SetValue(self.enabled and 1 or (self.rebroadcast and 2 or 3)) + b:SetList{"Full Tracking", "Full Tracking (solo/party)", "Broadcasting", "Disabled"} + local v = 4 + if self.enabled then + v = self.debug.notraid and 2 or 1 + elseif self.rebroadcast then + v = 3 + end + b:SetValue(v) b:SetCallback("OnValueChanged", function(_w,event,choice) - if choice == 1 then self:Activate("dropdown") - elseif choice == 2 then self:Activate("dropdownbc",nil,true) - else self:Deactivate() + if choice == 1 then self:Activate("dropdown") + elseif choice == 2 then + self.debug.notraid = true self:Activate("dropdown5") + elseif choice == 3 then self:Activate("dropdownbc",nil,true) + else self:Deactivate() end _w = display:GetUserData('comm_ident') if _w and _w:IsVisible() then diff -r df0ca8ed1aff -r 63bda09d88fe verbage.lua --- a/verbage.lua Thu Jan 08 15:22:27 2015 -0500 +++ b/verbage.lua Thu Jan 08 16:03:55 2015 -0500 @@ -498,6 +498,8 @@ +on [T]>: turns on full tracking, optionally setting threshold to T|r ++on5 [T]>: same, but also toggles "notraid" (see Tips for this)|r + +off>: turns off everything|r +thre[shold] T>: sets tracking threshold to T|r