From e57177cca3f130a9623f9e7e618887a812adf8db Mon Sep 17 00:00:00 2001 From: ackis Date: Wed, 3 Jun 2009 19:50:47 +0000 Subject: [PATCH] Add a gun flag. --- ARLConfig.lua | 8 ++++++++ ARLDatamine.lua | 3 +++ ARLFrame.lua | 23 +++++++++++++++++------ AckisRecipeList.lua | 26 ++++---------------------- Docs/Documentation.txt | 3 ++- Locals/testenUS.lua | 2 ++ 6 files changed, 36 insertions(+), 29 deletions(-) diff --git a/ARLConfig.lua b/ARLConfig.lua index 42607da..582ab6e 100644 --- a/ARLConfig.lua +++ b/ARLConfig.lua @@ -616,6 +616,14 @@ local function giveFilter() get = function() return addon.db.profile.filters.item.weapon.ammo end, set = function() addon.db.profile.filters.item.weapon.ammo = not addon.db.profile.filters.item.weapon.ammo end, }, + gun = { + order = 17, + type = "toggle", + name = L["Gun"], + desc = L["GUN_DESC"], + get = function() return addon.db.profile.filters.item.weapon.gun end, + set = function() addon.db.profile.filters.item.weapon.gun = not addon.db.profile.filters.item.weapon.gun end, + }, }, }, }, diff --git a/ARLDatamine.lua b/ARLDatamine.lua index 5316e4f..b9aec20 100644 --- a/ARLDatamine.lua +++ b/ARLDatamine.lua @@ -547,6 +547,7 @@ function addon:ScanToolTip(name,recipelist,reverselookup) local Crossbow = false local Ammo = false local Fist = false + local Gun = false local specialty = false local repid = false @@ -768,6 +769,8 @@ function addon:ScanToolTip(name,recipelist,reverselookup) Bow = true elseif (strmatch(strlower(text),"crossbow")) then Crossbow = true + elseif (strmatch(strlower(text),"gun")) then + Gun = true elseif (strmatch(strlower(text),"ammo")) then Ammo = true elseif (strmatch(strlower(text),"fist")) then diff --git a/ARLFrame.lua b/ARLFrame.lua index bee0593..7ce08de 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -2657,11 +2657,13 @@ function addon.setFlyawayState() ARL_WeaponThrownCB:SetChecked(weapondb.thrown) ARL_WeaponAmmoCB:SetChecked(weapondb.ammo) ARL_WeaponFistCB:SetChecked(weapondb.fist) + ARL_WeaponGunCB:SetChecked(weapondb.gun) --[[ --Disable weapon options. Probably don't need to touch these... ARL_WeaponStaffCB ARL_WeaponBowCB - ARL_WeaponCrossbowCB ]]-- + ARL_WeaponCrossbowCB +]]-- -- Player Type Options ARL_PlayerTankCB:SetChecked(filterdb.player.tank) ARL_PlayerMeleeCB:SetChecked(filterdb.player.melee) @@ -2703,7 +2705,8 @@ function addon.setFlyawayState() ARL_WrathCommon2CB:SetChecked(filterdb.rep.wrathcommon2) ARL_WrathCommon3CB:SetChecked(filterdb.rep.wrathcommon3) ARL_WrathCommon4CB:SetChecked(filterdb.rep.wrathcommon4) - ARL_WrathCommon5CB:SetChecked(filterdb.rep.wrathcommon5) ]]-- + ARL_WrathCommon5CB:SetChecked(filterdb.rep.wrathcommon5) +]]-- -- Miscellaneous Options ARL_IgnoreCB:SetChecked(addon.db.profile.ignoreexclusionlist) end @@ -4070,7 +4073,7 @@ function InitializeFrame() -- () Mace () Sword -- () Polearm () Thrown -- () Bow () Crossbow - -- () Staff + -- () Staff () Fist ------------------------------------------------------------------------------- local ARL_WeaponButton = addon:GenericCreateButton("ARL_WeaponButton", addon.Fly_Item, 20, 75, "TOPLEFT", addon.Fly_Item, "TOPLEFT", -2, -122, "GameFontHighlight", @@ -4094,6 +4097,7 @@ function InitializeFrame() weapondb.thrown = true weapondb.ammo = true weapondb.fist = true + weapondb.gun = true elseif button == "RightButton" then -- Reset all weapon to false weapondb.onehand = false @@ -4107,6 +4111,7 @@ function InitializeFrame() weapondb.thrown = false weapondb.ammo = false weapondb.fist = false + weapondb.gun = false end -- Update the checkboxes with the new value ARL_Weapon1HCB:SetChecked(weapondb.onehand) @@ -4120,6 +4125,7 @@ function InitializeFrame() ARL_WeaponThrownCB:SetChecked(weapondb.thrown) ARL_WeaponAmmoCB:SetChecked(weapondb.ammo) ARL_WeaponFistCB:SetChecked(weapondb.fist) + ARL_WeaponGunCB:SetChecked(weapondb.gun) -- Reset our title addon.resetTitle() -- Use new filters @@ -4188,6 +4194,10 @@ function InitializeFrame() addon:GenericMakeCB(ARL_WeaponAmmoCB, addon.Fly_Item, L["AMMO_DESC"], 38, 15, 2, 0) ARL_WeaponAmmoCBText:SetText(L["Ammo"]) + local ARL_WeaponGunCB = CreateFrame("CheckButton", "ARL_WeaponGunCB", addon.Fly_Item, "UICheckButtonTemplate") + addon:GenericMakeCB(ARL_WeaponGunCB, addon.Fly_Item, L["GUN_DESC"], 92, 16, 1, 0) + ARL_WeaponPolearmCBText:SetText(L["Gun"]) + addon.Fly_Player = CreateFrame("Frame", "addon.Fly_Player", addon.Flyaway) addon.Fly_Player:SetWidth(112) addon.Fly_Player:SetHeight(280) @@ -4724,12 +4734,13 @@ function InitializeFrame() [32] = { cb = ARL_WeaponSwordCB, svroot = filterdb.item.weapon, svval = "sword" }, [33] = { cb = ARL_WeaponPolearmCB, svroot = filterdb.item.weapon, svval = "polearm" }, [84] = { cb = ARL_WeaponFistCB, svroot = filterdb.item.weapon, svval = "fist" }, - [34] = { cb = ARL_WeaponStaffCB, svroot = "disabled", svval = "" }, + [34] = { cb = ARL_WeaponStaffCB, svroot = "disabled", svval = "" }, [68] = { cb = ARL_WeaponWandCB, svroot = filterdb.item.weapon, svval = "wand" }, [35] = { cb = ARL_WeaponThrownCB, svroot = filterdb.item.weapon, svval = "thrown" }, - [36] = { cb = ARL_WeaponBowCB, svroot = "disabled", svval = "" }, - [37] = { cb = ARL_WeaponCrossbowCB, svroot = "disabled", svval = "" }, + [36] = { cb = ARL_WeaponBowCB, svroot = "disabled", svval = "" }, + [37] = { cb = ARL_WeaponCrossbowCB, svroot = "disabled", svval = "" }, [38] = { cb = ARL_WeaponAmmoCB, svroot = filterdb.item.weapon, svval = "ammo" }, + [92] = { cb = ARL_WeaponGunCB, svroot = filterdb.item.weapon, svval = "gun" }, ------------------------------------------------------------------------------------------------------------------------------ -- Player Type Options ------------------------------------------------------------------------------------------------------------------------------ diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua index 6009e33..ae537c2 100644 --- a/AckisRecipeList.lua +++ b/AckisRecipeList.lua @@ -212,6 +212,7 @@ function addon:OnInitialize() bow = true, crossbow = true, ammo = true, + gun = true, }, }, binding = { @@ -1066,93 +1067,74 @@ do if (armordb.cloth == false) and (flags[56] == true) then return false end - if (armordb.leather == false) and (flags[57] == true) then return false end - if (armordb.mail == false) and (flags[58] == true) then return false end - if (armordb.plate == false) and (flags[59] == true) then return false end - if (armordb.trinket == false) and (flags[61] == true) then return false end - if (armordb.cloak == false) and (flags[60] == true) then return false end - if (armordb.ring == false) and (flags[62] == true) then return false end - if (armordb.necklace == false) and (flags[63] == true) then return false end - if (armordb.shield == false) and (flags[64] == true) then return false end local weapondb = filterdb.item.weapon - if (weapondb.onehand == false) and (flags[66] == true) then return false end - if (weapondb.twohand == false) and (flags[67] == true) then return false end - if (weapondb.axe == false) and (flags[68] == true) then return false end - if (weapondb.sword == false) and (flags[69] == true) then return false end - if (weapondb.mace == false) and (flags[70] == true) then return false end - if (weapondb.polearm == false) and (flags[71] == true) then return false end - if (weapondb.dagger == false) and (flags[72] == true) then return false end - if (weapondb.fist == false) and (flags[79] == true) then return false end - + if (weapondb.gun == false) and (flags[80] == true) then + return false + end if (weapondb.staff == false) and (flags[73] == true) then return false end - if (weapondb.wand == false) and (flags[74] == true) then return false end - if (weapondb.thrown == false) and (flags[75] == true) then return false end - if (weapondb.bow == false) and (flags[76] == true) then return false end - if (weapondb.crossbow == false) and (flags[77] == true) then return false end - if (weapondb.ammo == false) and (flags[78] == true) then return false end diff --git a/Docs/Documentation.txt b/Docs/Documentation.txt index 958750c..5fa0ac8 100644 --- a/Docs/Documentation.txt +++ b/Docs/Documentation.txt @@ -408,7 +408,8 @@ These flags are defined as: *77 = Crossbow *78 = Ammo *79 = Fist -*80-95 = Reserved for future use +*80 = Gun +*81-95 = Reserved for future use ====Reputation==== =====Original===== *96 = Argent Dawn diff --git a/Locals/testenUS.lua b/Locals/testenUS.lua index a22e598..3a192c7 100644 --- a/Locals/testenUS.lua +++ b/Locals/testenUS.lua @@ -338,6 +338,8 @@ L["Crossbow"] = true L["CROSSBOW_DESC"] = "Recipes that make crossbows should be included in the scan." L["Ammo"] = true L["AMMO_DESC"] = "Recipes that make ammunition should be included in the scan." +L["Gun"] = true +L["GUN_DESC"] = "Recipes that make guns should be included in the scan." -- Player Type Filtering UI Elements and their associated descriptions L["Melee DPS"] = true -- 1.7.9.5