From 8cacb3fb3e9c303c690bc0c2277e723f58bc82f1 Mon Sep 17 00:00:00 2001 From: Kevin Lyles Date: Mon, 30 May 2011 21:43:05 -0500 Subject: [PATCH] Started fixing a few issues with the new scan (fishing, 9-10 hp5, elixiers, etc) --- Locales/enUS/patterns-elixirs.lua | 4 ++-- Locales/enUS/patterns-enchants.lua | 2 ++ Locales/enUS/patterns-fishing.lua | 4 +++- Locales/enUS/patterns.lua | 16 +++++++++++++++- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Locales/enUS/patterns-elixirs.lua b/Locales/enUS/patterns-elixirs.lua index ff7e914..a65585a 100644 --- a/Locales/enUS/patterns-elixirs.lua +++ b/Locales/enUS/patterns-elixirs.lua @@ -19,7 +19,7 @@ local ElixirPreprocessLines = { {" critical rating ", " critical strike rating "}, {" 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"}, --- {" goes up by ", " by "}, + {" is increased by ", " by "}, {" resistance to all schools of magic ", " all resistances "}, {" resistance to magic ", " all resistances "}, } @@ -27,7 +27,7 @@ local ElixirPreprocessLines = { local ElixirAffixes = { "^use: +", "^increases +", --- "^your size is increased and +", + "^you grow larger and +", "^your +", "^the player's +", "^the target's +", diff --git a/Locales/enUS/patterns-enchants.lua b/Locales/enUS/patterns-enchants.lua index edfcdda..48afb5e 100644 --- a/Locales/enUS/patterns-enchants.lua +++ b/Locales/enUS/patterns-enchants.lua @@ -53,6 +53,8 @@ local EnchantPreprocessLines = { {" reduce threat slightly ", " 2%% reduced threat "}, {" a minor movement speed ", " minor run speed "}, {" reducing the duration of disarm effects by ", " disarm duration reduced by "}, + -- item 22023 + {" to add (%d+) to ", " +%1 "}, } local EnchantAffixes = { diff --git a/Locales/enUS/patterns-fishing.lua b/Locales/enUS/patterns-fishing.lua index bb3b090..7c370f9 100644 --- a/Locales/enUS/patterns-fishing.lua +++ b/Locales/enUS/patterns-fishing.lua @@ -15,7 +15,9 @@ local FishingPreProcessLines = { local FishingAffixes = { "^use: +", "^equip: +", - "^replaces the fishing line on your fishing pole with a %a[%a ]+%a line, increasing +", + "^replaces the fishing line on your fishing pole with %a[%a ]+%a, +", + "^permanently +", + "^increasing +", "^when applied to your fishing pole, increases +", "^makes you slightly tipsy and increases your skill in +", "^attach a lure to your equipped fishing pole, increasing +", diff --git a/Locales/enUS/patterns.lua b/Locales/enUS/patterns.lua index 59600e0..be37061 100644 --- a/Locales/enUS/patterns.lua +++ b/Locales/enUS/patterns.lua @@ -133,7 +133,10 @@ ww_IgnoredLines = { } ww_TempIgnoredLines = { - "^use: restores %d+ to %d+ %a+", + "^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+%)%.$", "^%d+ slot ", "^use: heals %d+ damage over %d+ sec%.$", @@ -171,6 +174,7 @@ ww_UnweightedLines = { "^use: .*enchants? ", "^equip: you", "^equip: causes your ", + " at the cost of ", } ww_MultipleStatLines = { @@ -403,6 +407,16 @@ 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}) -- 1.7.9.5