diff --git a/Locales/enUS/patterns-cooldown-use-effects.lua b/Locales/enUS/patterns-cooldown-use-effects.lua index 1102c83..83681e2 100644 --- a/Locales/enUS/patterns-cooldown-use-effects.lua +++ b/Locales/enUS/patterns-cooldown-use-effects.lua @@ -22,13 +22,7 @@ local CooldownUseUnweightedLines = { local CooldownUsePreprocessLines = { {" (arcane spell) power ", " %1 damage "}, - {" (fire spell) power ", " %1 damage "}, - {" (frost spell) power ", " %1 damage "}, - {" (holy spell) power ", " %1 damage "}, - {" (nature spell) power ", " %1 damage "}, - {" (shadow spell) power ", " %1 damage "}, {" your stats ", " all stats "}, - {" the block value of your shield ", " block value "}, {" resistances to all schools of magic ", " all resistances "}, {" by up t?o? ?", " by "}, {"%. +effect lasts ", " "}, @@ -40,12 +34,6 @@ local CooldownUsePreprocessLines = { {" melee and ranged attack power ", " attack power "}, -- item 12450 {" spell, ranged,? and melee haste ", " haste "}, - -- item 66879 - --Should be obsolete (the item appears to be updated) - --{" crit ", " critical strike "}, - -- item 70144 - --Should be obsolete (the item appears to be updated) - --{" critical ", " critical strike "}, } local CooldownUseAffixes = { diff --git a/Locales/enUS/patterns-elixirs.lua b/Locales/enUS/patterns-elixirs.lua index 2c70c9d..44108c1 100644 --- a/Locales/enUS/patterns-elixirs.lua +++ b/Locales/enUS/patterns-elixirs.lua @@ -10,20 +10,14 @@ local ElixirMatchLines = { local ElixirUnweightedLines = { " walk across water ", - " of your spell targets ", } local ElixirPreprocessLines = { {" and your ", " and "}, {" and restores ", " and "}, - {" and grants ", " and "}, - -- Should be obsolete (item 40212 appears to have been updated) - --{" critical ", " critical strike "}, {" maximum health ", " health "}, {" the chance that the player will reflect hostile spells cast on them by (%d+)%% for %d+ hrs%. +will automatically reflect the first offensive spell cast against the user", " %1%% spell reflect"}, {" is increased by ", " by "}, - {" resistance to all schools of magic ", " all resistances "}, - {" resistance to magic ", " all resistances "}, } local ElixirAffixes = { @@ -34,7 +28,6 @@ local ElixirAffixes = { "^the player's +", "^the target's +", "^maximum +", - "^mana regeneration by +", "^regenerate +", " +%(1 sec cooldown%)$", " +%([12] min cooldown%)$", diff --git a/Locales/enUS/patterns-enchants.lua b/Locales/enUS/patterns-enchants.lua index a72f2fa..97a00b8 100644 --- a/Locales/enUS/patterns-enchants.lua +++ b/Locales/enUS/patterns-enchants.lua @@ -29,24 +29,13 @@ local EnchantPreprocessLines = { {" melee weapon to do (%d+) additional points? of damage", " %1 melee damage"}, {" armor value ", " armor "}, {" additional ", " "}, - {" a slight movement speed increase", " minor run speed increase"}, {"^use: attaches a permanent scope to a bow or gun that increases its damage by ", "increases ranged damage by "}, - {" resistance to (%a+) by ", " %1 resistance by "}, - {" resistance to all schools of magic by ", " all resistances by "}, -- items 18182 and 29187 {" resistance to all magic schools ", " all resistances "}, - {" to all ", " all "}, {" skill by ", " by "}, - -- item 19782 - {" shield block ", " block "}, - {" resist ", " resistance "}, - -- item 23548 - {" attacker power ", " attack power "}, -- item 20076 {" adds to a shoulder slot item increased ", " "}, {" mounted movement speed ", " mount speed "}, - {" stealth slightly ", " effective stealth level by 1 "}, - {" stealth%.$", " effective stealth level by 1"}, {" decrease threat from all attacks and spells ", " reduced threat "}, {" from all attacks and spells ", " caused "}, {" reduce threat slightly ", " 2%% reduced threat "}, @@ -55,8 +44,6 @@ local EnchantPreprocessLines = { {" reduce?s?i?n?g? the duration of disarm effects by ", " disarm duration reduced by "}, {" resilience ", " pvp resilience "}, {" pvp pvp resilience ", " pvp resilience "}, - -- item 22023 - {" to add (%d+) to ", " +%1 "}, -- item 23530 {" (deals %d+)-(%d+ damage) ", " %1 to %2 "}, -- item 55055 @@ -115,21 +102,14 @@ local EnchantAffixes = { "^[st]o +", "^that +", - "^they +", "^it +", "^increases? +", - "^provides? +", - "^adds? +", "^gives? +", "^grants? +", --- "^regenerates? +", --- "^restores? +", "^your +", "^the +", - "^[bw]earer's +", - " of the [bw]earer", "^both +", "^its +", @@ -142,8 +122,6 @@ local EnchantAffixes = { "[\r\n]+%a+ing [%a ]+ causes [%a ]+ to become soulbound%.$", "[\r\n]+can only be attached to [%a ]+ in your inventory%.$", " +only the enchanter's rings can be enchanted,? and enchanting a ring will cause it to become soulbound%.$", - " +fur lining requires at least %d+ skill in leatherworking to remain active%.$", - "[\r\n]+can only be used on the leatherworker's bracers, and doing so will cause them to become soulbound%.$", -- TODO: flag these somehow and handle it in scoring " +disarm duration reduction does not stack with other similar effects%.", " +does not stack with other similar effects%.", @@ -162,7 +140,6 @@ local EnchantAffixes = { " +t?on? a %a[%a ,]+ slot item%.?$", " +on a pair of gloves", "points of +", - "^mana regeneration by +", " +to a sha%-touched weapon or armament of the thunder king%.$", diff --git a/Locales/enUS/patterns-equip-stats.lua b/Locales/enUS/patterns-equip-stats.lua index 5ed928d..a2ace63 100644 --- a/Locales/enUS/patterns-equip-stats.lua +++ b/Locales/enUS/patterns-equip-stats.lua @@ -15,7 +15,6 @@ local EquipStatsUnweightedLines = { " you kill a target ", " against ", " while ", - " periodic damage done by ", " you use ", } diff --git a/Locales/enUS/patterns-food.lua b/Locales/enUS/patterns-food.lua index 4a3aa1e..9d63cca 100644 --- a/Locales/enUS/patterns-food.lua +++ b/Locales/enUS/patterns-food.lua @@ -15,15 +15,12 @@ local FoodMatchLines = { local FoodIgnoreLines = { " must remain seated while %a+ing%.$", - " usable only inside %a[%a ]+%.$", " %(%d+ min cooldown%)$", " nearby party members ", - "can only be consumed underwater%.", } local FoodUnweightedLines = { " you will become well fed and can track ", - " you are likely to grow in size%.", " discover the fortune hidden in your meal!$", } @@ -34,7 +31,6 @@ local FoodPreprocessLines = { {" reduces ", " decreases "}, {", but decreases ", " and decreases "}, {" all stats are reduced by ", " decreases all stats by "}, - {" resistance to all schools of magic ", " all resistances "}, } local FoodAffixes = { diff --git a/Locales/enUS/patterns-generic.lua b/Locales/enUS/patterns-generic.lua index db49338..d74c3db 100644 --- a/Locales/enUS/patterns-generic.lua +++ b/Locales/enUS/patterns-generic.lua @@ -8,18 +8,12 @@ local GenericMatchLines = { } local GenericPreprocessLines = { - -- items 31864 and 31872 - {" & ", " and "}, -- items 95346 and 95347 {", and ", " and "}, - -- item 28363 - {"^([^,]+), ([^,]+)$", "%1 and %2"}, {" resist all$", " all resistances"}, {" block$", " block value"}, -- random enchant id 1470 {" resist shadow$", " shadow resistance"}, - -- random enchant id -55 --- {"^%+(%d+) shadow damage$", "%1 shadow spell damage"}, {" to all ", " all "}, {" (%d+%%) stun resistance$", " chance to resist stun effects by %1"}, {" reduces snare/root duration by ", " snare/root duration reduced by "}, @@ -29,8 +23,7 @@ local GenericPreprocessLines = { } local GenericAffixes = { - "^adds +", - " +%(reforged from [^)]+%)$", + " +%(reforged from [^)]+%)$", --Keep for reforged items (only happens in game) } ww_generic = {GenericMatchLines, {}, {}, GenericPreprocessLines, GenericAffixes, WeightsWatcher.parseStats, "generic"} diff --git a/Locales/enUS/patterns-use-effects.lua b/Locales/enUS/patterns-use-effects.lua index e1b5117..8c6b232 100644 --- a/Locales/enUS/patterns-use-effects.lua +++ b/Locales/enUS/patterns-use-effects.lua @@ -18,9 +18,6 @@ local UseEffectIgnoreLines = { "^use: reduces ", "^use: combines? ", "^use: inflicts? ", - "^use: increases the range ", - "^use: increases the radius ", - "^use: increases the duration ", "^use: summons? ", "^use: turns? ", "^use: unlocks? ", @@ -37,7 +34,6 @@ local UseEffectPreprocessLines = { {" all magical resistances ", " all resistances "}, {" additional ", " "}, {" maximum health ", " health "}, - {" all attributes ", " all stats "}, } local UseEffectAffixes = { @@ -45,13 +41,9 @@ local UseEffectAffixes = { -- item 4952 "^a powerful ale that +", "^increases +", - "^the target's +", "^the player's +", "^your +", "^restores +", - "^gives the gift of the wild to all party and raid members, increasing +", - " +%([14] sec cooldown%)$", - " +only one scroll effect can be active at a time%.$", " +for 5 min%.$", " +30 mins?%.$", " +1 hour%.$", diff --git a/Locales/enUS/patterns.lua b/Locales/enUS/patterns.lua index 91c36e3..45cbba6 100644 --- a/Locales/enUS/patterns.lua +++ b/Locales/enUS/patterns.lua @@ -70,7 +70,6 @@ ww_Preprocess = { } ww_ignoredInvalidStats = { - "requires level", "all stats", "all resistances", } @@ -90,7 +89,6 @@ ww_IgnoredLines = { "^use: right click to ", "^this item begins a quest$", "^already known$", - "^prime glyph$", "^major glyph$", "^minor glyph$", "^cogwheel$", @@ -98,7 +96,6 @@ ww_IgnoredLines = { "^mount$", "^ammo$", "^projectile$", - "^relic$", "^thrown$", "^crystal of fear$", @@ -112,12 +109,10 @@ ww_IgnoredLines = { "^ahn'kahet: the old kingdom$", "^ahn'qiraj$", "^alterac valley$", - "^assault on zan'vess$", "^black temple$", "^blackrock depths$", "^blade's edge mountains$", "^coilfang: serpentshrine cavern$", - "^crypt of forgotten kings$", "^dire maul$", "^drak'tharon keep$", "^ebon hold$", @@ -163,11 +158,7 @@ ww_IgnoredLines = { } ww_TempIgnoredLines = { - "^use: restores %d+ to %d+ %a+ over ", "^use: restores %d+ to %d+ %a+ and ", - "^use: restores %d+ to %d+ %a+ every .* for ", --- "^use: restores %d+ to %d+ %a+.[^0-9]*$", - "^use: teaches .* %(rank %d+%)%.$", "^use: heals %d+ damage over %d+ sec%.$", } @@ -179,7 +170,6 @@ ww_UnweightedLines = { "chance t?on? ", "^use: .*enchants? ", "^equip: you", - "^equip: causes your ", " at the cost of ", } @@ -272,20 +262,6 @@ ww_MultipleStatLines = { end, {"cooldownUseEffect"}, }, - {"^(%a+), (%a+), and (%a+) by (%d+)$", - function(text, pattern) - local start, _, stat1, stat2, stat3, value = string.find(text, pattern) - if start then - value = tonumber(value) - local stats = WeightsWatcher.newStatTable() - stats[stat1] = value - stats[stat2] = value - stats[stat3] = value - return stats - end - end, - {"enchant"}, - }, -- item 38960 {"^(%a+), (%a+), and (%a+) skills by (%d+)$", function(text, pattern) @@ -347,13 +323,6 @@ ww_SingleStatLines = { end, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "socketBonus", "stackingEquipEffect"}, }, - -- druid only - {"^increases attack power by (%d+) in cat, bear, dire bear, and moonkin forms only%.$", - function(text, pattern) - return WeightsWatcher.singleStatValueOnly(text, pattern, "feral attack power") - end, - {"generic"}, - }, {"^([+-]?%d+) (%a+ resistances?)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "elixir", "enchant", "equipEffect", "food", "generic", "useEffect"}}, {"^([+-]?%d+) (block value)$", WeightsWatcher.statNumFirst, {"cooldownUseEffect", "enchant", "equipEffect", "generic", "socketBonus"}}, -- random suffix enchants @@ -364,16 +333,6 @@ ww_SingleStatLines = { end, {"cooldownUseEffect", "elixir", "equipEffect", "food", "generic", "useEffect"}, }, - -- item 20130 - {"^([+-]?%d+) to ([+-]?%d+) health [ep]v?ery? 5 seco?n?d?s?%.?$", - function(text, pattern) - local start, _, minVal, maxVal = string.find(text, pattern) - if start then - return WeightsWatcher.newStatTable({["hp5"] = tonumber((minVal + maxVal) / 2)}) - end - end, - {"cooldownUseEffect"}, - }, {"^minor run speed increase$", function(text, pattern) return WeightsWatcher.newStatTable({["minor run speed"] = 1}) @@ -544,12 +503,6 @@ ww_SingleStatLines = { end, {"enchant", "equipEffect", "generic"}, }, - {"^([+-]?%d+)%% intellect$", - function(text, pattern) - return WeightsWatcher.singleStatValueOnly(text, pattern, "intellect (percent)") - end, - {"generic"}, - }, {"^([+-]?%d+)%% mana$", function(text, pattern) return WeightsWatcher.singleStatValueOnly(text, pattern, "mana (percent)")