From dbc47614fe097aab80f2757ee280fcc44bb1b933 Mon Sep 17 00:00:00 2001 From: Kevin Lyles Date: Wed, 24 Oct 2012 18:20:07 -0500 Subject: [PATCH] Removed no-longer-used slots --- EnchantIDs.lua | 3 --- Locales/enUS/patterns.lua | 5 ----- Locales/enUS/slots.lua | 22 ---------------------- WeightsWatcher.lua | 3 +-- slots.lua | 14 -------------- 5 files changed, 1 insertion(+), 46 deletions(-) diff --git a/EnchantIDs.lua b/EnchantIDs.lua index cc72a09..79a55b9 100644 --- a/EnchantIDs.lua +++ b/EnchantIDs.lua @@ -13034,13 +13034,10 @@ ww_slotsToCheck = { neck = {"neck"}, ["off hand"] = {"off hand", "one hand", "weapon"}, ["one-hand"] = {"one-hand", "weapon"}, - projectile = {"projectile"}, ranged = {"ranged"}, - relic = {"relic"}, shirt = {"shirt"}, shoulder = {"shoulder"}, tabard = {"tabard"}, - thrown = {"thrown"}, trinket = {"trinket"}, ["two-hand"] = {"two-hand", "weapon"}, waist = {"waist"}, diff --git a/Locales/enUS/patterns.lua b/Locales/enUS/patterns.lua index 4ebb3f1..08b9cd9 100644 --- a/Locales/enUS/patterns.lua +++ b/Locales/enUS/patterns.lua @@ -168,8 +168,6 @@ ww_TempIgnoredLines = { ww_UnweightedLines = { "^%(%d%) set: ", "^set: ", -- In-game only? - -- Some relics that boost stats for certain abilities only - "^equip: increases the %a[%a ]+ of your %a[%a ]+ by ", -- Use effects that have a cooldown "cooldown", "chance t?on? ", @@ -630,9 +628,6 @@ ww_DoubleSlotLines = { "^main hand$", "^off hand$", "^ranged$", - "^relic$", - "^thrown$", - "^projectile$", } ww_SingleSlotLines = { diff --git a/Locales/enUS/slots.lua b/Locales/enUS/slots.lua index a7a7722..52db69c 100644 --- a/Locales/enUS/slots.lua +++ b/Locales/enUS/slots.lua @@ -15,44 +15,31 @@ ww_localizedSlotNames = { ["neck"] = "neck", ["off hand"] = "off hand", ["one-hand"] = "one-hand", - ["projectile"] = "projectile", ["ranged"] = "ranged", - ["relic"] = "relic", ["shirt"] = "shirt", ["shoulder"] = "shoulder", ["tabard"] = "tabard", - ["thrown"] = "thrown", ["trinket"] = "trinket", ["two-hand"] = "two-hand", ["waist"] = "waist", ["wrist"] = "wrist", - ["arrow"] = "arrow", ["axe"] = "axe", ["bow"] = "bow", - ["bullet"] = "bullet", ["cloth"] = "cloth", ["crossbow"] = "crossbow", ["dagger"] = "dagger", ["fishing pole"] = "fishing pole", ["fist weapon"] = "fist weapon", ["gun"] = "gun", - ["idol"] = "idol", ["leather"] = "leather", - ["libram"] = "libram", ["mace"] = "mace", ["mail"] = "mail", ["plate"] = "plate", ["polearm"] = "polearm", - -- It's a slot AND a subslot - -- ["relic"] = "relic", ["shield"] = "shield", - ["sigil"] = "sigil", ["staff"] = "staff", ["sword"] = "sword", - -- It's a slot AND a subslot - -- ["thrown"] = "thrown", - ["totem"] = "totem", ["wand"] = "wand", } @@ -77,10 +64,7 @@ ww_slotDisplayNames = { [ww_localizedSlotNames["off hand"]] = "Off Hand", [ww_localizedSlotNames["one-hand"]] = "One-Hand", [ww_localizedSlotNames["two-hand"]] = "Two-Hand", - [ww_localizedSlotNames["relic"]] = "Relic", [ww_localizedSlotNames["ranged"]] = "Ranged", - [ww_localizedSlotNames["thrown"]] = "Thrown", - [ww_localizedSlotNames["projectile"]] = "Projectile", [ww_localizedSlotNames["neck"]] = "Neck", [ww_localizedSlotNames["back"]] = "Back", [ww_localizedSlotNames["shirt"]] = "Shirt", @@ -93,20 +77,14 @@ ww_slotDisplayNames = { [ww_localizedSlotNames["mail"]] = "Mail", [ww_localizedSlotNames["plate"]] = "Plate", - [ww_localizedSlotNames["arrow"]] = "Arrow", [ww_localizedSlotNames["bow"]] = "Bow", - [ww_localizedSlotNames["bullet"]] = "Bullet", [ww_localizedSlotNames["crossbow"]] = "Crossbow", [ww_localizedSlotNames["dagger"]] = "Dagger", [ww_localizedSlotNames["fishing pole"]] = "Fishing Pole", [ww_localizedSlotNames["fist weapon"]] = "Fist Weapon", [ww_localizedSlotNames["gun"]] = "Gun", - [ww_localizedSlotNames["idol"]] = "Idol", - [ww_localizedSlotNames["libram"]] = "Libram", [ww_localizedSlotNames["polearm"]] = "Polearm", [ww_localizedSlotNames["shield"]] = "Shield", - [ww_localizedSlotNames["sigil"]] = "Sigil", [ww_localizedSlotNames["staff"]] = "Staff", - [ww_localizedSlotNames["totem"]] = "Totem", [ww_localizedSlotNames["wand"]] = "Wand", } diff --git a/WeightsWatcher.lua b/WeightsWatcher.lua index 4be7cf1..bc8f2a4 100644 --- a/WeightsWatcher.lua +++ b/WeightsWatcher.lua @@ -647,7 +647,6 @@ local slotConversion = { [ww_localizedSlotNames["one-hand"]] = {"MainHandSlot", "SecondaryHandSlot"}, [ww_localizedSlotNames["two-hand"]] = {"MainHandSlot", "SecondaryHandSlot"}, [ww_localizedSlotNames["ranged"]] = {"MainHandSlot", "SecondaryHandSlot"}, - [ww_localizedSlotNames["projectile"]] = "AmmoSlot", [ww_localizedSlotNames["neck"]] = "NeckSlot", [ww_localizedSlotNames["back"]] = "BackSlot", [ww_localizedSlotNames["shirt"]] = "ShirtSlot", @@ -1518,7 +1517,7 @@ function WeightsWatcher.getItemStats(link) end end - if nonStats["slot"] == ww_localizedSlotNames["ranged"] or nonStats["slot"] == ww_localizedSlotNames["thrown"] or nonStats["slot"] == ww_localizedSlotNames["projectile"] then + if nonStats["slot"] == ww_localizedSlotNames["ranged"] then for k, v in pairs(rangedConversions) do normalStats[v] = rawget(normalStats, k) normalStats[k] = nil diff --git a/slots.lua b/slots.lua index 69aa735..1edca3f 100644 --- a/slots.lua +++ b/slots.lua @@ -61,23 +61,12 @@ ww_slotsToSubslots = { staff = 1, sword = 461, }, - projectile = { - arrow = 4, - bullet = 2, - }, ranged = { bow = 277, crossbow = 162, gun = 289, wand = 375, }, - relic = { - idol = 1, - libram = 4, - relic = 295, - sigil = 6, - totem = 1, - }, shirt = { }, shoulder = { @@ -88,9 +77,6 @@ ww_slotsToSubslots = { }, tabard = { }, - thrown = { - thrown = 164, - }, trinket = { }, ["two-hand"] = { -- 1.7.9.5