diff --git a/Constants.lua b/Constants.lua
index c7bca41..468c595 100644
--- a/Constants.lua
+++ b/Constants.lua
@@ -140,7 +140,7 @@ private.filter_flags = {
["RESERVED_65"] = 65, ["ONE_HAND"] = 66, ["TWO_HAND"] = 67, ["AXE"] = 68,
["SWORD"] = 69, ["MACE"] = 70, ["POLEARM"] = 71, ["DAGGER"] = 72,
["STAFF"] = 73, ["WAND"] = 74, ["THROWN"] = 75, ["BOW"] = 76,
- ["XBOW"] = 77, ["AMMO"] = 78, ["FIST"] = 79, ["GUN"] = 80,
+ ["XBOW"] = 77, ["RESERVED_78"] = 78, ["FIST"] = 79, ["GUN"] = 80,
["RESERVED_81"] = 81, ["RESERVED_82"] = 82, ["RESERVED_83"] = 83, ["RESERVED_84"] = 84,
["RESERVED_85"] = 85, ["RESERVED_86"] = 86, ["RESERVED_87"] = 87, ["RESERVED_88"] = 88,
["RESERVED_89"] = 89, ["RESERVED_90"] = 90, ["RESERVED_91"] = 91, ["RESERVED_92"] = 92,
@@ -177,7 +177,7 @@ private.filter_strings = {
[65] = "RESERVED_65", [66] = "ONE_HAND", [67] = "TWO_HAND", [68] = "AXE",
[69] = "SWORD", [70] = "MACE", [71] = "POLEARM", [72] = "DAGGER",
[73] = "STAFF", [74] = "WAND", [75] = "THROWN", [76] = "BOW",
- [77] = "XBOW", [78] = "AMMO", [79] = "FIST", [80] = "GUN",
+ [77] = "XBOW", [78] = "RESERVED_78", [79] = "FIST", [80] = "GUN",
[81] = "RESERVED_81", [82] = "RESERVED_82", [83] = "RESERVED_83", [84] = "RESERVED_84",
[85] = "RESERVED_85", [86] = "RESERVED_86", [87] = "RESERVED_87", [88] = "RESERVED_88",
[89] = "RESERVED_89", [90] = "RESERVED_90", [91] = "RESERVED_91", [92] = "RESERVED_92",
@@ -316,9 +316,8 @@ private.item_flags_word1 = {
THROWN = 0x00040000, -- 19
BOW = 0x00080000, -- 20
XBOW = 0x00100000, -- 21
- AMMO = 0x00200000, -- 22
- FIST = 0x00400000, -- 23
- GUN = 0x00800000, -- 24
+ FIST = 0x00200000, -- 22
+ GUN = 0x00400000, -- 23
}
-------------------------------------------------------------------------------
diff --git a/Core.lua b/Core.lua
index a83f769..9336a01 100644
--- a/Core.lua
+++ b/Core.lua
@@ -349,7 +349,6 @@ function addon:OnInitialize()
thrown = true,
bow = true,
crossbow = true,
- ammo = true,
gun = true,
},
},
@@ -1269,7 +1268,6 @@ do
[75] = L["Thrown"],
[76] = L["Bow"],
[77] = L["Crossbow"],
- [78] = L["Ammo"],
[79] = L["Fist"],
[80] = L["Gun"],
[96] = BFAC["Argent Dawn"],
diff --git a/Interface/FilterMenus.lua b/Interface/FilterMenus.lua
index 3113068..ac1ece1 100644
--- a/Interface/FilterMenus.lua
+++ b/Interface/FilterMenus.lua
@@ -549,8 +549,7 @@ function private.InitializeFilterPanel()
["thrown"] = { tt = L["THROWN_DESC"], text = L["Thrown"], row = 14, col = 1 },
["bow"] = { tt = L["BOW_DESC"], text = SetTextColor(BASIC_COLORS["grey"], L["Bow"]), row = 14, col = 2 },
["crossbow"] = { tt = L["CROSSBOW_DESC"], text = SetTextColor(BASIC_COLORS["grey"], L["Crossbow"]), row = 15, col = 1 },
- ["ammo"] = { tt = L["AMMO_DESC"], text = L["Ammo"], row = 15, col = 2 },
- ["gun"] = { tt = L["GUN_DESC"], text = L["Gun"], row = 16, col = 1 },
+ ["gun"] = { tt = L["GUN_DESC"], text = L["Gun"], row = 15, col = 2 },
}
GenerateCheckBoxes(item_frame, weapon_buttons)
weapon_buttons = nil
@@ -1255,7 +1254,6 @@ function private.InitializeFilterPanel()
["thrown"] = { cb = FilterPanel.item.thrown, svroot = filterdb.item.weapon },
["bow"] = { cb = FilterPanel.item.bow, svroot = nil },
["crossbow"] = { cb = FilterPanel.item.crossbow, svroot = nil },
- ["ammo"] = { cb = FilterPanel.item.ammo, svroot = filterdb.item.weapon },
["gun"] = { cb = FilterPanel.item.gun, svroot = filterdb.item.weapon },
------------------------------------------------------------------------------------------------
-- Quality Options
diff --git a/Interface/List.lua b/Interface/List.lua
index 2b5a5e0..1f75d93 100644
--- a/Interface/List.lua
+++ b/Interface/List.lua
@@ -486,7 +486,6 @@ function private.InitializeListFrame()
["thrown"] = { flag = ITEM1.THROWN, index = 5, sv_root = weapon_filters },
["bow"] = { flag = ITEM1.BOW, index = 5, sv_root = weapon_filters },
["crossbow"] = { flag = ITEM1.XBOW, index = 5, sv_root = weapon_filters },
- ["ammo"] = { flag = ITEM1.AMMO, index = 5, sv_root = weapon_filters },
}
local SOFT_FILTERS = {
diff --git a/Locales/devel-enUS.lua b/Locales/devel-enUS.lua
index 2d61942..6a668b6 100644
--- a/Locales/devel-enUS.lua
+++ b/Locales/devel-enUS.lua
@@ -28,7 +28,6 @@ L["ALT_CLICK"] = "Alt-Click to add/remove this recipe to your ignore list."
L["ALT_TRADESKILL_DESC"] = [=[This will display a list of alts which have had trade skills scanned.
Clicking on the alt's name will output the tradeskill to chat.
Alt-Clicking on the alt's name will delete the alt from the list.]=]
-L["AMMO_DESC"] = "Recipes that make ammunition should be included in the scan."
L["AQ40_RANDOM_BOP"] = "Random BoP drop off of bosses in AQ40."
L["ARCH_DROP"] = "This recipe is a random drop from a \"Canopic Jar\" while collecting artifacts for Archaeology."
L["ARL_ALLEXCLUDED"] = "Although you have already scanned this profession, your exclusions are currently preventing any recipes from being displayed. Please change your exclusions and try again."
@@ -81,7 +80,6 @@ L["Alurmi"] = "Alurmi"
L["Alys Vol'tyr"] = "Alys Vol'tyr"
L["Amal'thazad"] = "Amal'thazad"
L["Amelia Atherton"] = "Amelia Atherton"
-L["Ammo"] = "Ammo"
L["Amy Davenport"] = "Amy Davenport"
L["Anchorite Ensham"] = "Anchorite Ensham"
L["Anchorite Fateema"] = "Anchorite Fateema"
diff --git a/Scanner.lua b/Scanner.lua
index 8a3d8a8..acd4149 100644
--- a/Scanner.lua
+++ b/Scanner.lua
@@ -1175,7 +1175,7 @@ do
["Sword"] = 69, ["Mace"] = 70, ["Polearm"] = 71,
["Dagger"] = 72, ["Staff"] = 73, ["Wand"] = 74,
["Thrown"] = 75, ["Bow"] = 76, ["CrossBow"] = 77,
- ["Ammo"] = 78, ["Fist Weapon"] = 79, ["Gun"] = 80,
+ ["Fist Weapon"] = 79, ["Gun"] = 80,
}
local ORDERED_ITEM_TYPES = {
@@ -1189,7 +1189,7 @@ do
[14] = "Sword", [15] = "Mace", [16] = "Polearm",
[17] = "Dagger", [18] = "Staff", [19] = "Wand",
[20] = "Thrown", [21] = "Bow", [22] = "CrossBow",
- [23] = "Ammo", [24] = "Fist Weapon", [25] = "Gun",
+ [23] = "Fist Weapon", [24] = "Gun",
}
--- Parses the mining tooltip for certain keywords, comparing them with the database flags
@@ -1331,8 +1331,6 @@ do
scan_data[text_l] = true
elseif text_l == "Held In Off-hand" or text_l == "Off Hand" or text_l == "Main Hand" then -- Special cases.
scan_data["One-Hand"] = true
- elseif text_l == "Projectile" then
- scan_data["Ammo"] = true
end
if text_r and ITEM_TYPES[text_r] then