|
|
@@ -1999,10 +1999,20 @@ local function RelationshipsDashboard_GetSpellPower()
|
|
|
|
if text then
|
|
|
|
if text then
|
|
|
|
local _, _, val = strfind(text, "%+(%d+) Spell Damage");
|
|
|
|
local _, _, val = strfind(text, "%+(%d+) Spell Damage");
|
|
|
|
if val then spellPower = spellPower + tonumber(val); end
|
|
|
|
if val then spellPower = spellPower + tonumber(val); end
|
|
|
|
|
|
|
|
local _, _, val1b = strfind(text, "%+(%d+) Spell Damage and Healing");
|
|
|
|
|
|
|
|
if val1b then spellPower = spellPower + tonumber(val1b); end
|
|
|
|
|
|
|
|
local _, _, val1c = strfind(text, "%+(%d+) damage and healing");
|
|
|
|
|
|
|
|
if val1c then spellPower = spellPower + tonumber(val1c); end
|
|
|
|
|
|
|
|
local _, _, val1d = strfind(text, "%+(%d+) to Healing Spells");
|
|
|
|
|
|
|
|
if val1d then spellPower = spellPower + tonumber(val1d); end
|
|
|
|
local _, _, val2 = strfind(text, "up to (%d+) additional spell damage");
|
|
|
|
local _, _, val2 = strfind(text, "up to (%d+) additional spell damage");
|
|
|
|
if val2 then spellPower = spellPower + tonumber(val2); end
|
|
|
|
if val2 then spellPower = spellPower + tonumber(val2); end
|
|
|
|
local _, _, val3 = strfind(text, "Increases damage done by magical spells and effects by up to (%d+)");
|
|
|
|
local _, _, val3 = strfind(text, "Increases damage done by magical spells and effects by up to (%d+)");
|
|
|
|
if val3 then spellPower = spellPower + tonumber(val3); end
|
|
|
|
if val3 then spellPower = spellPower + tonumber(val3); end
|
|
|
|
|
|
|
|
local _, _, val3b = strfind(text, "damage done by magical spells and effects by up to (%d+)");
|
|
|
|
|
|
|
|
if val3b then spellPower = spellPower + tonumber(val3b); end
|
|
|
|
|
|
|
|
local _, _, val3c = strfind(text, "Damage Bonus: (%d+)");
|
|
|
|
|
|
|
|
if val3c then spellPower = spellPower + tonumber(val3c); end
|
|
|
|
local _, _, val4 = strfind(text, "%+(%d+) Fire Damage");
|
|
|
|
local _, _, val4 = strfind(text, "%+(%d+) Fire Damage");
|
|
|
|
if val4 then spellPower = spellPower + tonumber(val4); end
|
|
|
|
if val4 then spellPower = spellPower + tonumber(val4); end
|
|
|
|
local _, _, val5 = strfind(text, "%+(%d+) Frost Damage");
|
|
|
|
local _, _, val5 = strfind(text, "%+(%d+) Frost Damage");
|
|
|
@@ -2052,10 +2062,20 @@ local function RelationshipsDashboard_GetHealingPower()
|
|
|
|
if text then
|
|
|
|
if text then
|
|
|
|
local _, _, val = strfind(text, "healing spells by up to (%d+)");
|
|
|
|
local _, _, val = strfind(text, "healing spells by up to (%d+)");
|
|
|
|
if val then healingPower = healingPower + tonumber(val); end
|
|
|
|
if val then healingPower = healingPower + tonumber(val); end
|
|
|
|
|
|
|
|
local _, _, val1b = strfind(text, "%+(%d+) to Healing Spells");
|
|
|
|
|
|
|
|
if val1b then healingPower = healingPower + tonumber(val1b); end
|
|
|
|
|
|
|
|
local _, _, val1c = strfind(text, "%+(%d+) to Healing");
|
|
|
|
|
|
|
|
if val1c then healingPower = healingPower + tonumber(val1c); end
|
|
|
|
local _, _, val2 = strfind(text, "%+(%d+) Healing");
|
|
|
|
local _, _, val2 = strfind(text, "%+(%d+) Healing");
|
|
|
|
if val2 then healingPower = healingPower + tonumber(val2); end
|
|
|
|
if val2 then healingPower = healingPower + tonumber(val2); end
|
|
|
|
|
|
|
|
local _, _, val2b = strfind(text, "%+(%d+) Spell Damage and Healing");
|
|
|
|
|
|
|
|
if val2b then healingPower = healingPower + tonumber(val2b); end
|
|
|
|
|
|
|
|
local _, _, val2c = strfind(text, "%+(%d+) Spell Power");
|
|
|
|
|
|
|
|
if val2c then healingPower = healingPower + tonumber(val2c); end
|
|
|
|
local _, _, val3 = strfind(text, "Increases healing done by spells and effects by up to (%d+)");
|
|
|
|
local _, _, val3 = strfind(text, "Increases healing done by spells and effects by up to (%d+)");
|
|
|
|
if val3 then healingPower = healingPower + tonumber(val3); end
|
|
|
|
if val3 then healingPower = healingPower + tonumber(val3); end
|
|
|
|
|
|
|
|
local _, _, val3b = strfind(text, "healing done by spells and effects by up to (%d+)");
|
|
|
|
|
|
|
|
if val3b then healingPower = healingPower + tonumber(val3b); end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
@@ -2392,15 +2412,27 @@ local function RD_ParseBuffLineInto(est, text)
|
|
|
|
if v and not strfind(text, "ranged") then est.ap = est.ap + v; end
|
|
|
|
if v and not strfind(text, "ranged") then est.ap = est.ap + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Attack Power"); if v then est.ap = est.ap + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Attack Power"); if v then est.ap = est.ap + v; end
|
|
|
|
|
|
|
|
|
|
|
|
-- Spell power / healing (Arcane Brilliance variants, Blessing of Wisdom, etc.
|
|
|
|
-- Spell power / healing (Arcane Brilliance variants, Blessing of Wisdom, world buffs, etc.
|
|
|
|
-- typical is "+X Spell Damage" or "+X Healing")
|
|
|
|
-- typical is "+X Spell Damage" or "+X Healing")
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Spell Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Spell Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Spell Power"); if v then est.spellDmg = est.spellDmg + v; est.healing = est.healing + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Spell Power"); if v then est.spellDmg = est.spellDmg + v; est.healing = est.healing + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Spell Damage and Healing"); if v then est.spellDmg = est.spellDmg + v; est.healing = est.healing + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "%+(%d+) damage and healing"); if v then est.spellDmg = est.spellDmg + v; est.healing = est.healing + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Healing"); if v then est.healing = est.healing + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Healing"); if v then est.healing = est.healing + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "%+(%d+) to Healing Spells"); if v then est.healing = est.healing + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "%+(%d+) to Healing"); if v then est.healing = est.healing + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "[Ii]ncreases healing done by spells and effects by up to (%d+)"); if v then est.healing = est.healing + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "healing done by spells and effects by up to (%d+)"); if v then est.healing = est.healing + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "[Ii]ncreases damage done by magical spells and effects by up to (%d+)"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "damage done by magical spells and effects by up to (%d+)"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
|
|
|
|
|
|
|
|
-- Crit % (Rallying Cry, Moonkin Aura, etc.)
|
|
|
|
-- Crit % (Rallying Cry, Moonkin Aura, world buffs, etc.)
|
|
|
|
_,_,v = strfind(text, "critical strike with spells by (%d+)%%");
|
|
|
|
_,_,v = strfind(text, "critical strike with spells by (%d+)%%");
|
|
|
|
if v then est.critSpell = est.critSpell + v; end
|
|
|
|
if v then est.critSpell = est.critSpell + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "[Ii]ncreases spell critical chance by (%d+)%%");
|
|
|
|
|
|
|
|
if v then est.critSpell = est.critSpell + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "[Ii]ncreases critical strike chance by (%d+)%%");
|
|
|
|
|
|
|
|
if v then est.critMelee = est.critMelee + v; est.critSpell = est.critSpell + v; end
|
|
|
|
_,_,v = strfind(text, "critical strike by (%d+)%%");
|
|
|
|
_,_,v = strfind(text, "critical strike by (%d+)%%");
|
|
|
|
if v then est.critMelee = est.critMelee + v; end
|
|
|
|
if v then est.critMelee = est.critMelee + v; end
|
|
|
|
_,_,v = strfind(text, "critical hit chance by (%d+)%%");
|
|
|
|
_,_,v = strfind(text, "critical hit chance by (%d+)%%");
|
|
|
@@ -2535,7 +2567,11 @@ local function RelationshipsDashboard_ScanInspectGear()
|
|
|
|
_,_,v = strfind(text, "healing spells by up to (%d+)");
|
|
|
|
_,_,v = strfind(text, "healing spells by up to (%d+)");
|
|
|
|
if v then est.healing = est.healing + v; end
|
|
|
|
if v then est.healing = est.healing + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Healing"); if v then est.healing = est.healing + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Healing"); if v then est.healing = est.healing + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "%+(%d+) to Healing Spells"); if v then est.healing = est.healing + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "%+(%d+) to Healing"); if v then est.healing = est.healing + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Spell Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Spell Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Spell Damage and Healing"); if v then est.spellDmg = est.spellDmg + v; est.healing = est.healing + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "%+(%d+) damage and healing"); if v then est.spellDmg = est.spellDmg + v; est.healing = est.healing + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Spell Power"); if v then est.spellDmg = est.spellDmg + v; est.healing = est.healing + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Spell Power"); if v then est.spellDmg = est.spellDmg + v; est.healing = est.healing + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Fire Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Fire Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Frost Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Frost Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
@@ -2543,6 +2579,7 @@ local function RelationshipsDashboard_ScanInspectGear()
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Shadow Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Shadow Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Nature Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Nature Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Holy Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
_,_,v = strfind(text, "%+(%d+) Holy Damage"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
|
|
|
|
_,_,v = strfind(text, "Damage Bonus: (%d+)"); if v then est.spellDmg = est.spellDmg + v; end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
-- Defense
|
|
|
|
-- Defense
|
|
|
|