diff --git a/Locales/enUS/patterns-cooldown-use-effects.lua b/Locales/enUS/patterns-cooldown-use-effects.lua index 83681e2..10db367 100644 --- a/Locales/enUS/patterns-cooldown-use-effects.lua +++ b/Locales/enUS/patterns-cooldown-use-effects.lua @@ -6,8 +6,8 @@ end ww_localization["IDEAL_USE_UPTIME"] = "Percent of ideal use effect uptime:" local CooldownUseMatchLines = { - "^use: grants? .* cooldown%)$", "^use: increases? .* cooldown%)$", + "^use: grants? .* cooldown%)$", "^use: restores .* every .* cooldown%)$", -- item 70142 "^use: a small moonwell .* cooldown%)$", diff --git a/Locales/enUS/patterns-enchants.lua b/Locales/enUS/patterns-enchants.lua index 97a00b8..236aa8f 100644 --- a/Locales/enUS/patterns-enchants.lua +++ b/Locales/enUS/patterns-enchants.lua @@ -8,8 +8,8 @@ local EnchantMatchLines = { "^use: teaches you how to permanently enchant ", "^use: attaches ", "^use: enchants? ", - "^use: removes the safety mechanism from ", "^use: add a prismatic socket ", + "^use: removes the safety mechanism from ", } local EnchantUnweightedLines = { @@ -71,6 +71,7 @@ local EnchantAffixes = { "^chain to your weapon, +", "^counterweight to a two%-handed sword, mace, axe or polearm increasing the wielder's +", "^permanent scope to a bow or gun +", + "^lightweight titanium plating to a shield, +", "weapon to increase its +", "^spurs to +", "^your +", @@ -96,7 +97,6 @@ local EnchantAffixes = { "^%a+ l?e?g? ?armor +", "^onto pants +", "^embroiders spellthread into pants, +", - "^lightweight titanium plating to a shield, +", "^increasing +", diff --git a/Locales/enUS/patterns-equip-stats.lua b/Locales/enUS/patterns-equip-stats.lua index a2ace63..eb434b9 100644 --- a/Locales/enUS/patterns-equip-stats.lua +++ b/Locales/enUS/patterns-equip-stats.lua @@ -9,12 +9,12 @@ local EquipStatsMatchLines = { local EquipStatsUnweightedLines = { "^equip: reduces ", + " while ", " when fighting ", - " spell power of ", - " pet[' ]", " you kill a target ", + " pet[' ]", " against ", - " while ", + " spell power of ", " you use ", } diff --git a/Locales/enUS/patterns-generic.lua b/Locales/enUS/patterns-generic.lua index d74c3db..10fb2c1 100644 --- a/Locales/enUS/patterns-generic.lua +++ b/Locales/enUS/patterns-generic.lua @@ -8,8 +8,6 @@ local GenericMatchLines = { } local GenericPreprocessLines = { - -- items 95346 and 95347 - {", and ", " and "}, {" resist all$", " all resistances"}, {" block$", " block value"}, -- random enchant id 1470 @@ -20,6 +18,8 @@ local GenericPreprocessLines = { {" maximum mana$", " mana"}, -- Items 7348 and 30318 {" critical strike %(ranged%)", " ranged critical strike"}, + -- items 95346 and 95347 + {", and ", " and "}, } local GenericAffixes = { diff --git a/Locales/enUS/patterns-stacking-equip-effects.lua b/Locales/enUS/patterns-stacking-equip-effects.lua index 55b7ddf..a4ab2b6 100644 --- a/Locales/enUS/patterns-stacking-equip-effects.lua +++ b/Locales/enUS/patterns-stacking-equip-effects.lua @@ -26,17 +26,17 @@ local triggerGroups = { local StackingEquipMatchLines = { "^equip: each .* stack", - "^equip: your %a* ?spells grant .* stack", "^equip: your .*attacks grant .* stack", + "^equip: your %a* ?spells grant .* stack", } local stackingEquipPreprocessLines = { - {"%. +each time you ", " SPLIT "}, {"%. +lasts ", " for "}, {"%. +stacks ", ", stacking "}, {" and stacking ", ", stacking "}, {" grant heart's revelation, increasing ", " grant "}, {" grant inner eye, increasing ", " grant "}, + {"%. +each time you ", " SPLIT "}, } local StackingEquipAffixes = { diff --git a/Locales/enUS/patterns-use-effects.lua b/Locales/enUS/patterns-use-effects.lua index 8c6b232..21b1e6e 100644 --- a/Locales/enUS/patterns-use-effects.lua +++ b/Locales/enUS/patterns-use-effects.lua @@ -8,19 +8,19 @@ local UseEffectMatchLines = { } local UseEffectIgnoreLines = { - "^use: heal", + "^use: combines? ", + "^use: summons? ", "^use: a %a* ?%a* ?alcohol", + "^use: unlocks? ", + "^use: heal", + "^use: turns? ", + "^use: inflicts? ", "^use: transform", - "^use: a sample of ", - " if they have free room ", "^use: throw into ", - "^use: instantly restores ", + "^use: a sample of ", "^use: reduces ", - "^use: combines? ", - "^use: inflicts? ", - "^use: summons? ", - "^use: turns? ", - "^use: unlocks? ", + "^use: instantly restores ", + " if they have free room ", } local UseEffectUnweightedLines = { @@ -30,10 +30,10 @@ local UseEffectUnweightedLines = { } local UseEffectPreprocessLines = { - {" decreases your ", " decreases "}, - {" all magical resistances ", " all resistances "}, {" additional ", " "}, + {" decreases your ", " decreases "}, {" maximum health ", " health "}, + {" all magical resistances ", " all resistances "}, } local UseEffectAffixes = { diff --git a/Locales/enUS/patterns.lua b/Locales/enUS/patterns.lua index 32c17a7..3566829 100644 --- a/Locales/enUS/patterns.lua +++ b/Locales/enUS/patterns.lua @@ -75,29 +75,32 @@ ww_ignoredInvalidStats = { } ww_IgnoredLines = { - "^$", - "^upgrade level:", "^requires ", -- Reputation and materials requirements + "^$", "^ [^ ]", - "^%a[%a' -]+ %(%d/%d%)$", "^classes: ", - "^\n", + "^%a[%a' -]+ %(%d/%d%)$", -- Set names "^\".+\"$", + "^\n", + "^use: teaches you how to [a-oq-z]%a+ ", -- Profession items "^races: ", - "^duration: ", - "^conjured item$", - "^use: right click to ", "^this item begins a quest$", - "^already known$", - "^major glyph$", - "^minor glyph$", - "^cogwheel$", "^<.*>$", "^mount$", - "^ammo$", - "^projectile$", + "^major glyph$", + "^duration: ", + "^%d+ slot ", -- Bags "^thrown$", + "^conjured item$", + "^minor glyph$", + "^use: right click to ", + "^upgrade level:", + "^ammo$", + "^use: teaches you how to p[a-df-z]%a+ ", -- Profession items + "^cogwheel$", "^crystal of fear$", + "^projectile$", + "^already known$", -- TODO: add these for ALL professions "^cooking ingredient$", @@ -149,12 +152,6 @@ ww_IgnoredLines = { "^zul'aman$", "^zul'drak$", "^zul'gurub$", - - --Promoted from temp ignore list - "^%d+ slot ", - -- Profession items - "^use: teaches you how to [a-oq-z]%a+ ", - "^use: teaches you how to p[a-df-z]%a+ ", } ww_TempIgnoredLines = { @@ -164,12 +161,11 @@ ww_TempIgnoredLines = { ww_UnweightedLines = { "^%(%d%) set: ", - "^set: ", -- In-game only? - -- Use effects that have a cooldown - "cooldown", + "^set: ", -- In-game only (set bonus that you have enough pieces for) "chance t?on? ", - "^use: .*enchants? ", + "cooldown", -- Use effects that have a cooldown "^equip: you", + "^use: .*enchants? ", " at the cost of ", } @@ -587,8 +583,8 @@ ww_ItemInfoLines = { "^binds ", "^unique", "^soulbound$", - "^heroic", "^quest item$", + "^heroic", "^season ", "^raid finder$", "^thunderforged$", @@ -596,26 +592,26 @@ ww_ItemInfoLines = { } ww_DoubleSlotLines = { - "^head$", - "^shoulder$", "^chest$", - "^wrist$", - "^hands$", - "^waist$", "^legs$", + "^hands$", + "^head$", + "^shoulder$", "^feet$", - "^two%-hand$", + "^waist$", + "^wrist$", "^one%-hand$", - "^main hand$", - "^off hand$", + "^two%-hand$", "^ranged$", + "^off hand$", + "^main hand$", } ww_SingleSlotLines = { "^finger$", "^back$", - "^neck$", "^trinket$", + "^neck$", "^held in off%-hand$", "^shirt$", "^tabard$",