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

Fix a bad merge in UpgradeRules.cs

Browse Source
This commit is contained in:
Oliver Brakmann
2014-08-23 10:15:13 +02:00
parent 774c8121c2
commit 5c15fa2631
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Utility/UpgradeRules.cs
View File

@@ -436,6 +436,19 @@ namespace OpenRA.Utility
ConvertFloatArrayToPercentArray(ref node.Value.Value); 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 (engineVersion < 20140823)
{ {
if (depth == 2 && node.Key == "ArmorUpgrade" && parentKey == "GainsStatUpgrades") if (depth == 2 && node.Key == "ArmorUpgrade" && parentKey == "GainsStatUpgrades")
@@ -451,19 +464,6 @@ namespace OpenRA.Utility
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); 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";
}
}
} }
} }