Skip to content

Commit 32402f4

Browse files
Blitz54Blitz54
committed
Revert mod names from RunicWard to Ward
1 parent 866475f commit 32402f4

25 files changed

Lines changed: 851 additions & 850 deletions

‎src/Classes/CompareBuySimilar.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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 = "RunicWard", label = "Ward", tradeKey = "ward" },
262+
{ key = "Ward", label = "Ward", tradeKey = "ward" },
263263
}
264264
for _, def in ipairs(defences) do
265265
local val = item.armourData[def.key]

‎src/Classes/CompareTab.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3524,7 +3524,7 @@ function CompareTabClass:DrawItemExpanded(item, x, startY, colWidth, otherModMap
35243524
local armour = item:GetArmourDataValue("Armour", level)
35253525
local evasion = item:GetArmourDataValue("Evasion", level)
35263526
local energyShield = item:GetArmourDataValue("EnergyShield", level)
3527-
local ward = item:GetArmourDataValue("RunicWard", level)
3527+
local ward = item:GetArmourDataValue("Ward", level)
35283528
if armour > 0 then
35293529
DrawString(x, drawY, "LEFT", fontSize, "VAR", s_format("^x7F7F7FArmour: " .. colorCodes.MAGIC .. "%d", armour))
35303530
drawY = drawY + lineHeight

‎src/Classes/Item.lua‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
597597
self.base = data.itemBases[self.baseName]
598598
end
599599
elseif specName == "Runic Ward" then
600-
specName = "RunicWard"
600+
specName = "Ward"
601601
end
602602
self.armourData = self.armourData or { }
603603
self.armourData[specName] = specToNumber(specVal)
@@ -1345,9 +1345,9 @@ function ItemClass:BuildRaw()
13451345
t_insert(rawLines, "Spirit: " .. self.spiritValue)
13461346
end
13471347
if self.armourData then
1348-
for _, type in ipairs({ "Armour", "Evasion", "EnergyShield", "RunicWard" }) do
1348+
for _, type in ipairs({ "Armour", "Evasion", "EnergyShield", "Ward" }) do
13491349
if self.armourData[type] and self.armourData[type] > 0 then
1350-
t_insert(rawLines, type:gsub("EnergyShield", "Energy Shield"):gsub("RunicWard", "Runic Ward") .. ": " .. self.armourData[type])
1350+
t_insert(rawLines, type:gsub("EnergyShield", "Energy Shield"):gsub("Ward", "Runic Ward") .. ": " .. self.armourData[type])
13511351
end
13521352
end
13531353
end
@@ -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, "RunicWard", "BASE", 0) + (self.base.armour.RunicWard or 0)
1886+
local wardBase = calcLocal(modList, "Ward", "BASE", 0) + (self.base.armour.Ward or 0)
18871887
local evasionPerLevel = calcLocal(modList, "EvasionPerLevel", "BASE", 0)
18881888
local energyShieldPerLevel = calcLocal(modList, "EnergyShieldPerLevel", "BASE", 0)
1889-
local wardPerLevel = calcLocal(modList, "RunicWardPerLevel", "BASE", 0)
1889+
local wardPerLevel = calcLocal(modList, "WardPerLevel", "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, "RunicWard", "INC", 0)
1895+
local wardInc = calcLocal(modList, "Ward", "INC", 0)
18961896
local armourEnergyShieldInc = calcLocal(modList, "ArmourAndEnergyShield", "INC", 0)
18971897
local defencesInc = calcLocal(modList, "Defences", "INC", 0)
18981898
local qualityScalar = self.quality
@@ -1903,10 +1903,10 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
19031903
armourData.Armour = round((armourBase + armourEvasionBase + armourEnergyShieldBase) * (1 + (armourInc + armourEvasionInc + armourEnergyShieldInc + defencesInc) / 100) * (1 + (qualityScalar / 100)))
19041904
armourData.Evasion = round((evasionBase + armourEvasionBase + evasionEnergyShieldBase) * (1 + (evasionInc + armourEvasionInc + evasionEnergyShieldInc + defencesInc) / 100) * (1 + (qualityScalar / 100)))
19051905
armourData.EnergyShield = round((energyShieldBase + evasionEnergyShieldBase + armourEnergyShieldBase) * (1 + (energyShieldInc + armourEnergyShieldInc + evasionEnergyShieldInc + defencesInc) / 100) * (1 + (qualityScalar / 100)))
1906-
armourData.RunicWard = round((wardBase) * (1 + (wardInc + defencesInc) / 100) * (1 + (qualityScalar / 100)))
1906+
armourData.Ward = round((wardBase) * (1 + (wardInc + defencesInc) / 100) * (1 + (qualityScalar / 100)))
19071907
armourData.EvasionPerLevel = evasionPerLevel * (1 + (evasionInc + armourEvasionInc + evasionEnergyShieldInc + defencesInc) / 100) * (1 + (qualityScalar / 100))
19081908
armourData.EnergyShieldPerLevel = energyShieldPerLevel * (1 + (energyShieldInc + armourEnergyShieldInc + evasionEnergyShieldInc + defencesInc) / 100) * (1 + (qualityScalar / 100))
1909-
armourData.RunicWardPerLevel = wardPerLevel * (1 + (wardInc + defencesInc) / 100) * (1 + (qualityScalar / 100))
1909+
armourData.WardPerLevel = wardPerLevel * (1 + (wardInc + defencesInc) / 100) * (1 + (qualityScalar / 100))
19101910

19111911
if self.base.armour.BlockChance then
19121912
armourData.BlockChance = m_floor((self.base.armour.BlockChance * (1 + calcLocal(modList, "BlockChance", "INC", 0) / 100) + calcLocal(modList, "BlockChance", "BASE", 0)))

‎src/Classes/ItemsTab.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3379,7 +3379,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode, maxWidth)
33793379
local armour = item:GetArmourDataValue("Armour", level)
33803380
local evasion = item:GetArmourDataValue("Evasion", level)
33813381
local energyShield = item:GetArmourDataValue("EnergyShield", level)
3382-
local ward = item:GetArmourDataValue("RunicWard", level)
3382+
local ward = item:GetArmourDataValue("Ward", level)
33833383
if base.armour.BlockChance and armourData.BlockChance > 0 then
33843384
tooltip:AddLine(fontSizeBig, s_format("^x7F7F7FChance to Block: %s%d%%", main:StatColor(armourData.BlockChance, base.armour.BlockChance), armourData.BlockChance), "FONTIN SC")
33853385
end
@@ -3393,7 +3393,7 @@ function ItemsTabClass:AddItemTooltip(tooltip, item, slot, dbMode, maxWidth)
33933393
tooltip:AddLine(fontSizeBig, s_format("^x7F7F7FEnergy Shield: %s%d", main:StatColor(energyShield, base.armour.EnergyShield), energyShield), "FONTIN SC")
33943394
end
33953395
if ward > 0 then
3396-
tooltip:AddLine(fontSizeBig, s_format("^x7F7F7FRunic Ward: %s%d", main:StatColor(ward, base.armour.RunicWard), ward), "FONTIN SC")
3396+
tooltip:AddLine(fontSizeBig, s_format("^x7F7F7FRunic Ward: %s%d", main:StatColor(ward, base.armour.Ward), ward), "FONTIN SC")
33973397
end
33983398
elseif base.flask then
33993399
-- Flask-specific info

0 commit comments

Comments
 (0)