Skip to content

Commit 3431ee8

Browse files
Blitz54Blitz54
committed
Change "Ward" mods to use "RunicWard"
1 parent 1d77c52 commit 3431ee8

18 files changed

Lines changed: 143 additions & 149 deletions

‎src/Classes/CompareBuySimilar.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ local function buildURL(item, slotName, controls, modEntries, defenceEntries, is
134134
filter.value = { min = entry.value, max = entry.value }
135135
elseif entry.value then
136136
local minVal = tonumber(controls[prefix .. "Min"].buf)
137-
137+
138138
local maxVal = tonumber(controls[prefix .. "Max"].buf)
139139
local value = {}
140140
if minVal then
@@ -259,7 +259,7 @@ function M.openPopup(item, slotName, primaryBuild)
259259
{ key = "Armour", label = "Armour", tradeKey = "ar" },
260260
{ key = "Evasion", label = "Evasion", tradeKey = "ev" },
261261
{ key = "EnergyShield", label = "Energy Shield", tradeKey = "es" },
262-
{ key = "Ward", label = "Ward", tradeKey = "ward" },
262+
{ key = "RunicWard", label = "Ward", tradeKey = "ward" },
263263
}
264264
for _, def in ipairs(defences) do
265265
local val = item.armourData[def.key]
@@ -434,7 +434,7 @@ function M.openPopup(item, slotName, primaryBuild)
434434
end
435435
displayTexts[index] = displayText
436436
end
437-
437+
438438

439439
local displayText = table.concat(displayTexts, "\n")
440440
-- labels anchor based on the first row instead of the middle row, so adjust upwards

‎src/Classes/ImportTab.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ local ImportTabClass = newClass("ImportTab", "ControlHost", "Control", function(
4848
self.controls.logoutApiButton.shown = function()
4949
return (self.charImportMode == "SELECTCHAR" or self.charImportMode == "GETACCOUNTNAME") and main.api.authToken ~= nil
5050
end
51-
51+
5252
self.controls.characterImportAnchor = new("Control", {"TOPLEFT",self.controls.sectionCharImport,"TOPLEFT"}, {6, 40, 200, 16})
5353
self.controls.sectionCharImport.height = function() return self.charImportMode == "AUTHENTICATION" and 60 or 200 end
5454

@@ -441,7 +441,7 @@ function ImportTabClass:DownloadCharacterList()
441441
return "Standard"
442442
end
443443
end
444-
444+
445445
self.charImportMode = "DOWNLOADCHARLIST"
446446
self.charImportStatus = "Retrieving character list..."
447447
local realm = realmList[self.controls.accountRealm.selIndex]
@@ -953,10 +953,10 @@ function ImportTabClass:ImportItemsAndSkills(charData)
953953
local funcGetGemInstance = function(skillData)
954954
local typeLine = sanitiseText(skillData.typeLine) .. (skillData.support and " Support" or "")
955955
local gemId = self.build.data.gemForBaseName[typeLine:lower()]
956-
956+
957957
if typeLine:match("^Spectre:") then
958958
gemId = "Metadata/Items/Gems/SkillGemSummonSpectre"
959-
end
959+
end
960960
if typeLine:match("^Companion:") then
961961
gemId = "Metadata/Items/Gems/SkillGemSummonBeast"
962962
end
@@ -1060,7 +1060,7 @@ function ImportTabClass:ImportItemsAndSkills(charData)
10601060
end
10611061
for _, skillData in pairs(charData.skills) do
10621062
local gemInstance = funcGetGemInstance(skillData)
1063-
1063+
10641064
if gemInstance then
10651065
local group = { label = "", enabled = true, gemList = { } }
10661066
t_insert(group.gemList, gemInstance )

‎src/Classes/Item.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1883,16 +1883,16 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
18831883
local evasionEnergyShieldBase = calcLocal(modList, "EvasionAndEnergyShield", "BASE", 0)
18841884
local energyShieldBase = calcLocal(modList, "EnergyShield", "BASE", 0) + (self.base.armour.EnergyShield or 0)
18851885
local armourEnergyShieldBase = calcLocal(modList, "ArmourAndEnergyShield", "BASE", 0)
1886-
local wardBase = calcLocal(modList, "Ward", "BASE", 0) + (self.base.armour.RunicWard or 0)
1886+
local wardBase = calcLocal(modList, "RunicWard", "BASE", 0) + (self.base.armour.RunicWard or 0)
18871887
local evasionPerLevel = calcLocal(modList, "EvasionPerLevel", "BASE", 0)
18881888
local energyShieldPerLevel = calcLocal(modList, "EnergyShieldPerLevel", "BASE", 0)
1889-
local wardPerLevel = calcLocal(modList, "WardPerLevel", "BASE", 0)
1889+
local wardPerLevel = calcLocal(modList, "RunicWardPerLevel", "BASE", 0)
18901890
local armourInc = calcLocal(modList, "Armour", "INC", 0)
18911891
local armourEvasionInc = calcLocal(modList, "ArmourAndEvasion", "INC", 0)
18921892
local evasionInc = calcLocal(modList, "Evasion", "INC", 0)
18931893
local evasionEnergyShieldInc = calcLocal(modList, "EvasionAndEnergyShield", "INC", 0)
18941894
local energyShieldInc = calcLocal(modList, "EnergyShield", "INC", 0)
1895-
local wardInc = calcLocal(modList, "Ward", "INC", 0)
1895+
local wardInc = calcLocal(modList, "RunicWard", "INC", 0)
18961896
local armourEnergyShieldInc = calcLocal(modList, "ArmourAndEnergyShield", "INC", 0)
18971897
local defencesInc = calcLocal(modList, "Defences", "INC", 0)
18981898
local qualityScalar = self.quality

‎src/Data/ModCache.lua‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ c["+100 to all Attributes"]={{[1]={flags=0,keywordFlags=0,name="Str",type="BASE"
191191
c["+100 to maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="BASE",value=100}},nil}
192192
c["+100 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=100}},nil}
193193
c["+100 to maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="BASE",value=100}},nil}
194-
c["+100 to maximum Runic Ward"]={{[1]={flags=0,keywordFlags=0,name="Ward",type="BASE",value=100}},nil}
194+
c["+100 to maximum Runic Ward"]={{[1]={flags=0,keywordFlags=0,name="RunicWard",type="BASE",value=100}},nil}
195195
c["+100% of Armour also applies to Elemental Damage"]={{[1]={flags=0,keywordFlags=0,name="ArmourAppliesToFireDamageTaken",type="BASE",value=100},[2]={flags=0,keywordFlags=0,name="ArmourAppliesToColdDamageTaken",type="BASE",value=100},[3]={flags=0,keywordFlags=0,name="ArmourAppliesToLightningDamageTaken",type="BASE",value=100}},nil}
196196
c["+100% of Armour also applies to Lightning Damage"]={{[1]={flags=0,keywordFlags=0,name="ArmourAppliesToLightningDamageTaken",type="BASE",value=100}},nil}
197197
c["+100% of Armour applies to Elemental Damage"]={{[1]={flags=0,keywordFlags=0,name="ArmourAppliesToFireDamageTaken",type="BASE",value=100},[2]={flags=0,keywordFlags=0,name="ArmourAppliesToColdDamageTaken",type="BASE",value=100},[3]={flags=0,keywordFlags=0,name="ArmourAppliesToLightningDamageTaken",type="BASE",value=100}},nil}
@@ -747,7 +747,7 @@ c["+35 to Spirit"]={{[1]={flags=0,keywordFlags=0,name="Spirit",type="BASE",value
747747
c["+35 to Strength"]={{[1]={flags=0,keywordFlags=0,name="Str",type="BASE",value=35}},nil}
748748
c["+35 to maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="BASE",value=35}},nil}
749749
c["+35 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=35}},nil}
750-
c["+35 to maximum Runic Ward"]={{[1]={flags=0,keywordFlags=0,name="Ward",type="BASE",value=35}},nil}
750+
c["+35 to maximum Runic Ward"]={{[1]={flags=0,keywordFlags=0,name="RunicWard",type="BASE",value=35}},nil}
751751
c["+35% to Cold Resistance"]={{[1]={flags=0,keywordFlags=0,name="ColdResist",type="BASE",value=35}},nil}
752752
c["+35% to Fire Resistance"]={{[1]={flags=0,keywordFlags=0,name="FireResist",type="BASE",value=35}},nil}
753753
c["+35% to Lightning Resistance"]={{[1]={flags=0,keywordFlags=0,name="LightningResist",type="BASE",value=35}},nil}
@@ -803,7 +803,7 @@ c["+40 to maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShie
803803
c["+40 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=40}},nil}
804804
c["+40 to maximum Life per Socket filled"]={{[1]={[1]={type="Multiplier",var="RunesSocketedIn{SlotName}"},flags=0,keywordFlags=0,name="Life",type="BASE",value=40}},nil}
805805
c["+40 to maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="BASE",value=40}},nil}
806-
c["+40 to maximum Runic Ward"]={{[1]={flags=0,keywordFlags=0,name="Ward",type="BASE",value=40}},nil}
806+
c["+40 to maximum Runic Ward"]={{[1]={flags=0,keywordFlags=0,name="RunicWard",type="BASE",value=40}},nil}
807807
c["+40% to Cold Resistance"]={{[1]={flags=0,keywordFlags=0,name="ColdResist",type="BASE",value=40}},nil}
808808
c["+40% to Critical Damage Bonus"]={{[1]={flags=0,keywordFlags=0,name="CritMultiplier",type="BASE",value=40}},nil}
809809
c["+40% to Fire Resistance"]={{[1]={flags=0,keywordFlags=0,name="FireResist",type="BASE",value=40}},nil}
@@ -859,7 +859,7 @@ c["+50 to Stun Threshold"]={{[1]={flags=0,keywordFlags=0,name="StunThreshold",ty
859859
c["+50 to maximum Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EnergyShield",type="BASE",value=50}},nil}
860860
c["+50 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=50}},nil}
861861
c["+50 to maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="BASE",value=50}},nil}
862-
c["+50 to maximum Runic Ward"]={{[1]={flags=0,keywordFlags=0,name="Ward",type="BASE",value=50}},nil}
862+
c["+50 to maximum Runic Ward"]={{[1]={flags=0,keywordFlags=0,name="RunicWard",type="BASE",value=50}},nil}
863863
c["+50% Surpassing chance to fire an additional Arrow"]={{[1]={flags=0,keywordFlags=2048,name="SurpassingProjectileChance",type="BASE",value=50}},nil}
864864
c["+50% to Cold Resistance"]={{[1]={flags=0,keywordFlags=0,name="ColdResist",type="BASE",value=50}},nil}
865865
c["+50% to Fire Resistance"]={{[1]={flags=0,keywordFlags=0,name="FireResist",type="BASE",value=50}},nil}
@@ -920,7 +920,7 @@ c["+75 to Spirit"]={{[1]={flags=0,keywordFlags=0,name="Spirit",type="BASE",value
920920
c["+75 to all Attributes"]={{[1]={flags=0,keywordFlags=0,name="Str",type="BASE",value=75},[2]={flags=0,keywordFlags=0,name="Dex",type="BASE",value=75},[3]={flags=0,keywordFlags=0,name="Int",type="BASE",value=75},[4]={flags=0,keywordFlags=0,name="All",type="BASE",value=75}},nil}
921921
c["+75 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=75}},nil}
922922
c["+75 to maximum Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="BASE",value=75}},nil}
923-
c["+75 to maximum Runic Ward"]={{[1]={flags=0,keywordFlags=0,name="Ward",type="BASE",value=75}},nil}
923+
c["+75 to maximum Runic Ward"]={{[1]={flags=0,keywordFlags=0,name="RunicWard",type="BASE",value=75}},nil}
924924
c["+75% to Cold Resistance"]={{[1]={flags=0,keywordFlags=0,name="ColdResist",type="BASE",value=75}},nil}
925925
c["+75% to Lightning Resistance"]={{[1]={flags=0,keywordFlags=0,name="LightningResist",type="BASE",value=75}},nil}
926926
c["+77 to maximum Life"]={{[1]={flags=0,keywordFlags=0,name="Life",type="BASE",value=77}},nil}

‎src/Data/Skills/other.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14670,11 +14670,11 @@ skills["SupportRunicInfusionPlayer"] = {
1467014670
statDescriptionScope = "gem_stat_descriptions",
1467114671
statMap = {
1467214672
["base_ward_cost_+_%_of_maximum_ward"] = {
14673-
mod("WardCostNoMult", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Ward", percent = 1 }),
14673+
mod("WardCostNoMult", "BASE", nil, 0, 0, { type = "PercentStat", stat = "RunicWard", percent = 1 }),
1467414674
},
1467514675
["added_physical_damage_%_ward_cost"] = {
14676-
mod("PhysicalMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "WardCost", percent = 1 }),
14677-
mod("PhysicalMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "WardCost", percent = 1 }),
14676+
mod("PhysicalMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "RunicWardCost", percent = 1 }),
14677+
mod("PhysicalMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "RunicWardCost", percent = 1 }),
1467814678
},
1467914679
},
1468014680
baseFlags = {

‎src/Export/Skills/other.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,11 +1000,11 @@ statMap = {
10001000
#flags
10011001
statMap = {
10021002
["base_ward_cost_+_%_of_maximum_ward"] = {
1003-
mod("WardCostNoMult", "BASE", nil, 0, 0, { type = "PercentStat", stat = "Ward", percent = 1 }),
1003+
mod("WardCostNoMult", "BASE", nil, 0, 0, { type = "PercentStat", stat = "RunicWard", percent = 1 }),
10041004
},
10051005
["added_physical_damage_%_ward_cost"] = {
1006-
mod("PhysicalMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "WardCost", percent = 1 }),
1007-
mod("PhysicalMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "WardCost", percent = 1 }),
1006+
mod("PhysicalMin", "BASE", nil, 0, 0, { type = "PercentStat", stat = "RunicWardCost", percent = 1 }),
1007+
mod("PhysicalMax", "BASE", nil, 0, 0, { type = "PercentStat", stat = "RunicWardCost", percent = 1 }),
10081008
},
10091009
},
10101010
#mods

‎src/Modules/Build.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2164,7 +2164,7 @@ function buildMode:AddDisplayStatList(statList, actor)
21642164
end
21652165
end
21662166
end
2167-
for pool, warningFlag in pairs({["Life"] = "LifeCostWarningList", ["Mana"] = "ManaCostWarningList", ["Runic Ward"] = "WardCostWarningList", ["Rage"] = "RageCostWarningList", ["Energy Shield"] = "ESCostWarningList"}) do
2167+
for pool, warningFlag in pairs({["Life"] = "LifeCostWarningList", ["Mana"] = "ManaCostWarningList", ["Runic Ward"] = "RunicWardCostWarningList", ["Rage"] = "RageCostWarningList", ["Energy Shield"] = "ESCostWarningList"}) do
21682168
if actor.output[warningFlag] then
21692169
local line = "You do not have enough "..(actor.output.EnergyShieldProtectsMana and pool == "Mana" and "Energy Shield and Mana" or pool).." to use: "
21702170
for _, skill in ipairs(actor.output[warningFlag]) do

‎src/Modules/BuildDisplayStats.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ local displayStats = {
8888
{ stat = "ESCost", label = "Energy Shield Cost", fmt = "d", color = colorCodes.ES, pool = "EnergyShield", compPercent = true, lowerIsBetter = true, condFunc = function(v,o) return o.ESHasCost end },
8989
{ stat = "ESPerSecondCost", label = "ES Cost per second", fmt = ".2f", color = colorCodes.ES, pool = "EnergyShield", compPercent = true, lowerIsBetter = true, condFunc = function(v,o) return o.ESPerSecondHasCost end },
9090
{ stat = "ESPercentPerSecondCost", label = "ES Cost per second", fmt = ".2f%%", color = colorCodes.ES, compPercent = true, lowerIsBetter = true, condFunc = function(v,o) return o.ESPercentPerSecondHasCost end },
91-
{ stat = "WardCost", label = "Runic Ward Cost", fmt = "d", color = colorCodes.WARD, pool = "Ward", compPercent = true, lowerIsBetter = true, condFunc = function(v,o) return o.WardHasCost end },
92-
{ stat = "WardPerSecondCost", label = "Ward Cost per second", fmt = ".2f", color = colorCodes.WARD, pool = "Ward", compPercent = true, lowerIsBetter = true, condFunc = function(v,o) return o.WardPerSecondHasCost end },
91+
{ stat = "RunicWardCost", label = "Runic Ward Cost", fmt = "d", color = colorCodes.WARD, pool = "RunicWard", compPercent = true, lowerIsBetter = true, condFunc = function(v,o) return o.RunicWardHasCost end },
92+
{ stat = "RunicWardPerSecondCost", label = "Ward Cost per second", fmt = ".2f", color = colorCodes.WARD, pool = "RunicWard", compPercent = true, lowerIsBetter = true, condFunc = function(v,o) return o.RunicWardPerSecondHasCost end },
9393
{ stat = "RageCost", label = "Rage Cost", fmt = "d", color = colorCodes.RAGE, pool = "Rage", compPercent = true, lowerIsBetter = true, condFunc = function(v,o) return o.RageHasCost end },
9494
{ stat = "RagePerSecondCost", label = "Rage Cost per second", fmt = ".2f", color = colorCodes.RAGE, pool = "Rage", compPercent = true, lowerIsBetter = true, condFunc = function(v,o) return o.RagePerSecondHasCost end },
9595
{ stat = "SoulCost", label = "Soul Cost", fmt = "d", color = colorCodes.RAGE, pool = "Soul", compPercent = true, lowerIsBetter = true, condFunc = function(v,o) return o.SoulHasCost end },
@@ -150,9 +150,9 @@ local displayStats = {
150150
{ stat = "EnergyShieldLeechGainRate", label = "ES Leech/On Hit Rate", color = colorCodes.ES, fmt = ".1f", compPercent = true },
151151
{ stat = "EnergyShieldLeechGainPerHit", label = "ES Leech/Gain per Hit", color = colorCodes.ES, fmt = ".1f", compPercent = true },
152152
{ },
153-
{ stat = "Ward", label = "Runic Ward", fmt = "d", color = colorCodes.WARD, compPercent = true },
154-
{ stat = "WardRegenRecovery", label = "Runic Ward Regen", fmt = ".1f", color = colorCodes.WARD, condFunc = function(v,o) return o.WardRecovery <= 0 and o.WardRegenRecovery ~= 0 end },
155-
{ stat = "WardRegenRecovery", label = "Runic Ward Recovery", fmt = ".1f", color = colorCodes.WARD, condFunc = function(v,o) return o.WardRecovery > 0 and o.WardRegenRecovery ~= 0 end },
153+
{ stat = "RunicWard", label = "Runic Ward", fmt = "d", color = colorCodes.WARD, compPercent = true },
154+
{ stat = "RunicWardRegenRecovery", label = "Runic Ward Regen", fmt = ".1f", color = colorCodes.WARD, condFunc = function(v,o) return o.RunicWardRecovery <= 0 and o.RunicWardRegenRecovery ~= 0 end },
155+
{ stat = "RunicWardRegenRecovery", label = "Runic Ward Recovery", fmt = ".1f", color = colorCodes.WARD, condFunc = function(v,o) return o.RunicWardRecovery > 0 and o.RunicWardRegenRecovery ~= 0 end },
156156
{ },
157157
{ stat = "Rage", label = "Rage", fmt = "d", color = colorCodes.RAGE, compPercent = true },
158158
{ stat = "RageRegenRecovery", label = "Rage Regen", fmt = ".1f", color = colorCodes.RAGE, compPercent = true },
@@ -161,7 +161,7 @@ local displayStats = {
161161
{ stat = "TotalNetRegen", label = "Total Net Recovery", fmt = "+.1f" },
162162
{ stat = "NetLifeRegen", label = "Net Life Recovery", fmt = "+.1f", color = colorCodes.LIFE },
163163
{ stat = "NetManaRegen", label = "Net Mana Recovery", fmt = "+.1f", color = colorCodes.MANA },
164-
{ stat = "NetWardRegen", label = "Net Runic Ward Recovery", fmt = "+.1f", color = colorCodes.WARD },
164+
{ stat = "NetRunicWardRegen", label = "Net Runic Ward Recovery", fmt = "+.1f", color = colorCodes.WARD },
165165
{ stat = "NetEnergyShieldRegen", label = "Net ES Recovery", fmt = "+.1f", color = colorCodes.ES },
166166
{ },
167167
{ stat = "Evasion", label = "Evasion Rating", fmt = "d", color = colorCodes.EVASION, compPercent = true },

0 commit comments

Comments
 (0)