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

Merge pull request #6303 from obrakmann/fix6263

Browse Source 
Fixed invulnerable infantry
This commit is contained in:
Matthias Mailänder
2014-08-23 10:28:15 +02:00
parent 3ad9144866 5c15fa2631
commit 6bb392be11
3 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenRA.Utility/UpgradeRules.cs
View File

@@ -436,21 +436,34 @@ namespace OpenRA.Utility
ConvertFloatArrayToPercentArray(ref node.Value.Value);
}
// RemoveImmediately was replaced with RemoveOnConditions
if (engineVersion < 20140821)
{
if (depth == 1)
{
if (node.Key == "RemoveImmediately")
node.Key = "RemoveOnConditions";
if (node.Key == "-RemoveImmediately")
node.Key = "-RemoveOnConditions";
}
}
if (engineVersion < 20140823)
{
if (depth == 2 && node.Key == "ArmorUpgrade" && parentKey == "GainsStatUpgrades")
node.Key = "DamageUpgrade";
if (depth == 2 && node.Key == "ArmorModifier" && parentKey == "GainsStatUpgrades")
{
node.Key = "DamageModifier";
node.Value.Value = string.Join(", ", node.Value.Value.Split(',')
.Select(s => ((int)(100 * 100 / float.Parse(s))).ToString()));
}
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
// RemoveImmediately was replaced with RemoveOnConditions
if (engineVersion < 20140821)
{
if (depth == 1)
{
if (node.Key == "RemoveImmediately")
node.Key = "RemoveOnConditions";
if (node.Key == "-RemoveImmediately")
node.Key = "-RemoveOnConditions";
}
}
}
}