epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete ArmorModifier->DamageModifier rename

Browse Source 
PR #6303 neglected to rename the "armor" upgrade to "damage" in all
necessary places, as mentioned in
https://github.com/OpenRA/OpenRA/pull/6303#issuecomment-53312209
This commit is contained in:
Oliver Brakmann
2014-09-03 22:54:51 +02:00
parent 2ccc6f63e0
commit da454de398
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/GainsExperience.cs
View File

@@ -43,10 +43,10 @@ namespace OpenRA.Mods.RA
{ {
return new Dictionary<int, string[]>() return new Dictionary<int, string[]>()
{ {
{ 200, new[] { "firepower", "armor", "speed", "reload", "inaccuracy" } }, { 200, new[] { "firepower", "damage", "speed", "reload", "inaccuracy" } },
{ 400, new[] { "firepower", "armor", "speed", "reload", "inaccuracy" } }, { 400, new[] { "firepower", "damage", "speed", "reload", "inaccuracy" } },
{ 800, new[] { "firepower", "armor", "speed", "reload", "inaccuracy" } }, { 800, new[] { "firepower", "damage", "speed", "reload", "inaccuracy" } },
{ 1600, new[] { "firepower", "armor", "speed", "reload", "inaccuracy" } } { 1600, new[] { "firepower", "damage", "speed", "reload", "inaccuracy" } }
}; };
} }

2
OpenRA.Utility/UpgradeRules.cs
View File

@@ -459,6 +459,8 @@ namespace OpenRA.Utility
node.Value.Value = string.Join(", ", node.Value.Value.Split(',') node.Value.Value = string.Join(", ", node.Value.Value.Split(',')
.Select(s => ((int)(100 * 100 / float.Parse(s))).ToString())); .Select(s => ((int)(100 * 100 / float.Parse(s))).ToString()));
} }
if (depth == 3 && parentKey == "Upgrades")
node.Value.Value = node.Value.Value.Replace("armor", "damage");
} }
// RenderInfantryProne and RenderInfantryPanic was merged into RenderInfantry // RenderInfantryProne and RenderInfantryPanic was merged into RenderInfantry

16
mods/ts/rules/defaults.yaml
View File

@@ -116,8 +116,8 @@
GainsExperience: GainsExperience:
ChevronPalette: ra ChevronPalette: ra
Upgrades: Upgrades:
500: firepower, armor, speed, reload 500: firepower, damage, speed, reload
1000: firepower, armor, speed, reload 1000: firepower, damage, speed, reload
GainsStatUpgrades: GainsStatUpgrades:
FirepowerModifier: 110, 130 FirepowerModifier: 110, 130
DamageModifier: 83, 66 DamageModifier: 83, 66
@@ -205,8 +205,8 @@
GainsExperience: GainsExperience:
ChevronPalette: ra ChevronPalette: ra
Upgrades: Upgrades:
500: firepower, armor, speed, reload 500: firepower, damage, speed, reload
1000: firepower, armor, speed, reload 1000: firepower, damage, speed, reload
GainsStatUpgrades: GainsStatUpgrades:
FirepowerModifier: 110, 130 FirepowerModifier: 110, 130
DamageModifier: 83, 66 DamageModifier: 83, 66
@@ -258,8 +258,8 @@
GainsExperience: GainsExperience:
ChevronPalette: ra ChevronPalette: ra
Upgrades: Upgrades:
500: firepower, armor, speed, reload 500: firepower, damage, speed, reload
1000: firepower, armor, speed, reload 1000: firepower, damage, speed, reload
GainsStatUpgrades: GainsStatUpgrades:
FirepowerModifier: 110, 130 FirepowerModifier: 110, 130
DamageModifier: 83, 66 DamageModifier: 83, 66
@@ -305,8 +305,8 @@
GainsExperience: GainsExperience:
ChevronPalette: ra ChevronPalette: ra
Upgrades: Upgrades:
500: firepower, armor, speed, reload 500: firepower, damage, speed, reload
1000: firepower, armor, speed, reload 1000: firepower, damage, speed, reload
GainsStatUpgrades: GainsStatUpgrades:
FirepowerModifier: 110, 130 FirepowerModifier: 110, 130
DamageModifier: 83, 66 DamageModifier: 83, 66