tekKonfig/tekKonfigButton.lua tekKonfig/tekKonfigTopTab.lua @@ -6,7 +6,10 @@ KENNELFRAME = nil local frame = CreateFrame("Frame", nil, InterfaceOptionsFramePanelContainer) frame.name = "Kennel" +frame:Hide() frame:SetScript("OnShow", function(frame) + local tektab = LibStub("tekKonfig-TopTab") + local title, subtitle = LibStub("tekKonfig-Heading").new(frame, "Kennel", "This panel allows you to select which pets Kennel will put out.") @@ -20,25 +23,49 @@ frame:SetScript("OnShow", function(frame) mountdismiss:SetChecked(KennelDBPC.dismissonmount) - local group = LibStub("tekKonfig-Group").new(frame, "Furry bastards", "TOP", mountdismiss, "BOTTOM", 0, -GAP-14) + local group = LibStub("tekKonfig-Group").new(frame, nil, "TOP", mountdismiss, "BOTTOM", 0, -GAP-14) group:SetPoint("LEFT", EDGEGAP, 0) group:SetPoint("BOTTOMRIGHT", -EDGEGAP, EDGEGAP) - local scrollbar = LibStub("tekKonfig-Scroll").new(group, 6, 1) - group:EnableMouseWheel() - group:SetScript("OnMouseWheel", function(self, val) scrollbar:SetValue(scrollbar:GetValue() - val) end) + local randoms, zones + local tab1 = tektab.new(frame, "Random", "BOTTOMLEFT", group, "TOPLEFT", 0, -4) + local tab2 = tektab.new(frame, "Zone", "LEFT", tab1, "RIGHT", -15, 0) + tab2:Deactivate() + tab1:SetScript("OnClick", function(self) + self:Activate() + tab2:Deactivate() + randoms:Show() + zones:Hide() + end) + tab2:SetScript("OnClick", function(self) + self:Activate() + tab1:Deactivate() + randoms:Hide() + zones:Show() + end) + + + ---------------------------- + -- Random panel -- + ---------------------------- + + randoms = CreateFrame("Frame", nil, group) + randoms:SetAllPoints() + local scrollbar = LibStub("tekKonfig-Scroll").new(randoms, 6, 1) - local grouptext = group:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") - grouptext:SetHeight(32) - grouptext:SetPoint("TOPLEFT", group, "TOPLEFT", EDGEGAP, -EDGEGAP) - grouptext:SetPoint("RIGHT", group, -EDGEGAP-16, 0) - grouptext:SetNonSpaceWrap(true) - grouptext:SetJustifyH("LEFT") - grouptext:SetJustifyV("TOP") - grouptext:SetText("These pets will be used at random. Solid blue highlighted pets will be used more often.") + randoms:EnableMouseWheel() + randoms:SetScript("OnMouseWheel", function(self, val) scrollbar:SetValue(scrollbar:GetValue() - val) end) + local randomstext = randoms:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") + randomstext:SetHeight(32) + randomstext:SetPoint("TOPLEFT", randoms, "TOPLEFT", EDGEGAP, -EDGEGAP) + randomstext:SetPoint("RIGHT", randoms, -EDGEGAP-16, 0) + randomstext:SetNonSpaceWrap(true) + randomstext:SetJustifyH("LEFT") + randomstext:SetJustifyV("TOP") + randomstext:SetText("These pets will be used at random. Solid blue highlighted pets will be used more often.") local function OnClick(self) local v = kennel.randomdb[self.id] + 1 @@ -64,9 +91,9 @@ frame:SetScript("OnShow", function(frame) local function HideTooltip() GameTooltip:Hide() end for i=1,NUMROWS do - local row = CreateFrame("Frame", nil, group) + local row = CreateFrame("Frame", nil, randoms) row:SetHeight(ICONSIZE) - if i == 1 then row:SetPoint("TOPLEFT", group, EDGEGAP, -EDGEGAP-ICONSIZE-6) + if i == 1 then row:SetPoint("TOPLEFT", randoms, EDGEGAP, -EDGEGAP-ICONSIZE-6) else row:SetPoint("TOPLEFT", rows[i-1], "BOTTOMLEFT", 0, -6) end row:SetPoint("RIGHT", -EDGEGAP, 0) row.buttons = {} @@ -125,7 +152,146 @@ frame:SetScript("OnShow", function(frame) Update() scrollbar:SetValue(0) - frame:SetScript("OnShow", Update) + randoms:SetScript("OnShow", Update) + + + -------------------------- + -- Zone panel -- + -------------------------- + + zones = CreateFrame("Frame", nil, group) + zones:SetAllPoints() + zones:Hide() + + local scrollbar = LibStub("tekKonfig-Scroll").new(zones, 6, 1) + + zones:EnableMouseWheel() + zones:SetScript("OnMouseWheel", function(self, val) scrollbar:SetValue(scrollbar:GetValue() - val) end) + + local zonestext = zones:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") + zonestext:SetHeight(34) + zonestext:SetPoint("TOPLEFT", zones, "TOPLEFT", EDGEGAP, -EDGEGAP) + zonestext:SetPoint("RIGHT", zones, -EDGEGAP-16, 0) + zonestext:SetNonSpaceWrap(true) + zonestext:SetJustifyH("LEFT") + zonestext:SetJustifyV("TOP") + zonestext:SetText("These pets will be used when you are in the corresponding zone or subzone. Summon the desired pet and click an 'add' button to set that pet for the current zone or subzone.") + + + local NUMROWS = 10 + local ROWHEIGHT = 15 + local rows, Update, selectedzone = {} + local function OnClick(self) + selectedzone = self.zone:GetText() + Update() + end + for i=1,NUMROWS do + local row = CreateFrame("CheckButton", nil, zones) + row:SetHeight(ROWHEIGHT) + if i == 1 then row:SetPoint("TOP", zonestext, "BOTTOM", 0, -8) + else row:SetPoint("TOP", rows[i-1], "BOTTOM") end + row:SetPoint("LEFT", 4, 0) + row:SetPoint("RIGHT", scrollbar, "LEFT", -4, 0) + + local highlight = row:CreateTexture() + highlight:SetTexture("Interface\\HelpFrame\\HelpFrameButton-Highlight") + highlight:SetTexCoord(0, 1, 0, 0.578125) + highlight:SetAllPoints() + row:SetHighlightTexture(highlight) + row:SetCheckedTexture(highlight) + + local textzone = row:CreateFontString(nil, nil, "GameFontNormalSmall") + textzone:SetPoint("LEFT", EDGEGAP + GAP, 0) + local textpet = row:CreateFontString(nil, nil, "GameFontHighlightSmall") + textpet:SetPoint("LEFT", textzone, "RIGHT", GAP, 0) + textpet:SetPoint("RIGHT", -GAP, 0) + textpet:SetJustifyH("RIGHT") + + row:SetScript("OnClick", OnClick) + + row.zone = textzone + row.pet = textpet + textzone:SetText("Testing zone") + textpet:SetText("Test pet") + rows[i] = row + end + + local offset, deletebutt, sortedzones = 0 + function Update() + if not sortedzones then + sortedzones = {} + for i in pairs(KennelDBPC.zone) do table.insert(sortedzones, i) end + table.sort(sortedzones) + end + + scrollbar:SetMinMaxValues(0, math.max(0, #sortedzones - NUMROWS)) + + local selectedvisible + for i,row in pairs(rows) do + local zone = sortedzones[i + offset] + local pet = zone and KennelDBPC.zone[zone] + if pet then + row.zone:SetText(zone) + row.pet:SetText(pet) + row:SetChecked(zone == selectedzone) + selectedvisible = selectedvisible or zone == selectedzone + row:Show() + else + row:Hide() + end + end + + if selectedvisible then deletebutt:Enable() else deletebutt:Disable() end + end + + local function GetCurrentPet() + for i=1,GetNumCompanions("CRITTER") do + local _, name, _, _, summoned = GetCompanionInfo("CRITTER", i) + if summoned then return name end + end + end + + local addzone = LibStub("tekKonfig-Button").new(zones, "BOTTOMLEFT", zones, "BOTTOMLEFT", EDGEGAP, EDGEGAP):MakeSmall() + addzone.tiptext = "Click to set the currently summoned pet to be used in the current zone." + addzone:SetText("Add zone") + addzone:SetScript("OnClick", function() + KennelDBPC.zone[GetZoneText()] = GetCurrentPet() + sortedzones, selectedzone = nil + Update() + end) + + local addsubzone = LibStub("tekKonfig-Button").new(zones, "LEFT", addzone, "RIGHT", GAP/2, 0):MakeSmall() + addsubzone.tiptext = "Click to set the currently summoned pet to be used in the current subzone." + addsubzone:SetText("Add subzone") + addsubzone:SetScript("OnShow", function(self) if GetSubZoneText() == "" then self:Disable() else self:Enable() end end) + addsubzone:SetScript("OnClick", function() + KennelDBPC.zone[GetZoneText() .." - "..GetSubZoneText()] = GetCurrentPet() + sortedzones, selectedzone = nil + Update() + end) + + deletebutt = LibStub("tekKonfig-Button").new(zones, "BOTTOM", zones, "BOTTOM", 0, EDGEGAP):MakeSmall():MakeGrey() + deletebutt:SetPoint("RIGHT", scrollbar, "LEFT", -EDGEGAP, 0) + deletebutt.tiptext = "Remove the currently selected zone-pet setting." + deletebutt:SetText("Delete") + deletebutt:SetScript("OnClick", function() + KennelDBPC.zone[selectedzone], sortedzones, selectedzone = nil + Update() + end) + + local f = scrollbar:GetScript("OnValueChanged") + scrollbar:SetScript("OnValueChanged", function(self, value, ...) + offset = math.floor(value) + Update() + return f(self, value, ...) + end) + + Update() + scrollbar:SetValue(0) + zones:SetScript("OnShow", Update) + + + frame:SetScript("OnShow", nil) end) Config.lua @@ -15,18 +15,14 @@ f:SetScript("OnEvent", function(self, event, ...) if self[event] then return sel f:Hide() -local numpets = 0 -local function PutTheCatOut(self, event) - Debug(event or "nil", HasFullControl() and "In control" or "Not in control", InCombatLockdown() and "In combat" or "Not in combat") - - if InCombatLockdown() then return self:RegisterEvent("PLAYER_REGEN_ENABLED") end - if not HasFullControl() then return self:RegisterEvent("PLAYER_CONTROL_GAINED") end - self:UnregisterEvent("PLAYER_REGEN_ENABLED") - - for i=1,GetNumCompanions("CRITTER") do if select(5, GetCompanionInfo("CRITTER", i)) then return end end - - Debug("Queueing pet to be put out") - self:Show() +local function GetZonePet() + local z, sz = GetZoneText(), GetSubZoneText() + local name = sz and sz ~= "" and KennelDBPC.zone[z .." - "..sz] or KennelDBPC.zone[z] + if not name then return end + for i=1,GetNumCompanions("CRITTER") do + local _, pname, id = GetCompanionInfo("CRITTER", i) + if pname == name then return i, pname end + end end @@ -47,6 +43,30 @@ local function GetRandomPet() end +local function SummonedPet() + for i=1,GetNumCompanions("CRITTER") do + local _, name, _, _, summoned = GetCompanionInfo("CRITTER", i) + if summoned then return name end + end +end + + +local numpets = 0 +local function PutTheCatOut(self, event) + Debug(event or "nil", HasFullControl() and "In control" or "Not in control", InCombatLockdown() and "In combat" or "Not in combat") + + if InCombatLockdown() then return self:RegisterEvent("PLAYER_REGEN_ENABLED") end + if not HasFullControl() then return self:RegisterEvent("PLAYER_CONTROL_GAINED") end + self:UnregisterEvent("PLAYER_REGEN_ENABLED") + + local summ, _, zonepet = SummonedPet(), GetZonePet() + if (not zonepet and summ) or (zonepet and zonepet == summ) then return end + + Debug("Queueing pet to be put out") + self:Show() +end + + local elapsed f:SetScript("OnShow", function() elapsed = 0 end) f:SetScript("OnUpdate", function(self, elap) @@ -64,7 +84,8 @@ f:SetScript("OnUpdate", function(self, elap) return end - local peti, name = GetRandomPet() + local peti, name = GetZonePet() + if not peti then peti, name = GetRandomPet() end if peti then local numpets = GetNumCompanions("CRITTER") Debug("Putting out pet", name) @@ -80,12 +101,13 @@ f:RegisterEvent("ADDON_LOADED") function f:ADDON_LOADED(event, addon) if addon:lower() ~= "kennel" then return end - KennelDBPC = KennelDBPC or {random = {}} + KennelDBPC = KennelDBPC or {random = {}, zone = {}} if not KennelDBPC.random then for i,v in pairs(KennelDBPC) do KennelDBPC[i] = 0 end KennelDBPC = {random = KennelDBPC} KennelDBPC.disabled, KennelDBPC.random.disabled = KennelDBPC.random.disabled end + if not KennelDBPC.zone then KennelDBPC.zone = {} end db = setmetatable(KennelDBPC.random, {__index = function() return 2 end}) self.randomdb = db @@ -107,12 +129,9 @@ f.PLAYER_REGEN_ENABLED = PutTheCatOut f.PLAYER_CONTROL_GAINED = PutTheCatOut f.PLAYER_LOGIN = PutTheCatOut f.PLAYER_UNGHOST = PutTheCatOut - - -function f:ZONE_CHANGED_NEW_AREA() - SetMapToCurrentZone() - PutTheCatOut(self, "ZONE_CHANGED_NEW_AREA") -end +f.ZONE_CHANGED = PutTheCatOut +f.ZONE_CHANGED_INDOORS = PutTheCatOut +f.ZONE_CHANGED_NEW_AREA = PutTheCatOut function f:COMPANION_UPDATE(event, comptype) @@ -129,6 +148,8 @@ end f:RegisterEvent("COMPANION_UPDATE") f:RegisterEvent("PLAYER_UNGHOST") +f:RegisterEvent("ZONE_CHANGED") +f:RegisterEvent("ZONE_CHANGED_INDOORS") f:RegisterEvent("ZONE_CHANGED_NEW_AREA") Kennel.lua @@ -1,8 +1,10 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/"> <Script file="LibStub.lua"/> + <Script file="tekKonfigButton.lua"/> <Script file="tekKonfigCheckbox.lua"/> <Script file="tekKonfigHeading.lua"/> <Script file="tekKonfigScroll.lua"/> <Script file="tekKonfigAboutPanel.lua"/> <Script file="tekKonfigGroup.lua"/> + <Script file="tekKonfigTopTab.lua"/> </Ui> tekKonfig/tekKonfig.xml a32467cc35c2be2fd6a9e5fd73f6de855f53b4dd Tekkub tekkub@gmail.com http://github.com/tekkub/kennel/commit/3e73da9b8ae9d78cbee78685cf5286df1922e53b 3e73da9b8ae9d78cbee78685cf5286df1922e53b 2009-06-20T15:43:10-07:00 2009-06-20T15:43:10-07:00 Add per-zone pet options 4210c473b1b6678715a44861d59c917825ba481e Tekkub tekkub@gmail.com