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

Let upgrade rules also account for negated traits

Browse Source 
(this commit affects only "-SpawnViceroid:", "-LeavesHusk:", "-Plane:" and "-Helicopter:")
This commit is contained in:
abcdefg30
2015-11-28 14:52:47 +01:00
parent b8715b0377
commit 1695627ffc
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -1850,6 +1850,12 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (actor != null) if (actor != null)
actor.Key = "Actor"; actor.Key = "Actor";
} }
if (node.Key == "-SpawnViceroid")
node.Key = "-SpawnActorOnDeath";
if (node.Key == "-LeavesHusk")
node.Key = "-SpawnActorOnDeath";
} }
if (engineVersion < 20150920) if (engineVersion < 20150920)
@@ -2273,6 +2279,34 @@ namespace OpenRA.Mods.Common.UtilityCommands
node.Key = "Aircraft"; node.Key = "Aircraft";
node.Value.Nodes.Add(new MiniYamlNode("CanHover", "True")); node.Value.Nodes.Add(new MiniYamlNode("CanHover", "True"));
} }
var mplane = node.Value.Nodes.FirstOrDefault(n => n.Key == "-Plane");
if (mplane != null)
{
// Check if a Helicopter trait was renamed to Aircraft
// In that case, we don't want to straight negate it with -Aircraft again
if (node.Value.Nodes.Any(n => n.Key == "Aircraft" || n.Key == "Helicopter"))
{
Console.WriteLine("Warning: Removed '-Plane:', this can introduce side effects with inherited 'Aircraft' definitions.");
node.Value.Nodes.Remove(mplane);
}
else
mplane.Key = "-Aircraft";
}
var mheli = node.Value.Nodes.FirstOrDefault(n => n.Key == "-Helicopter");
if (mheli != null)
{
// Check if a Plane trait was renamed to Aircraft
// In that case, we don't want to straight negate it with -Aircraft again
if (node.Value.Nodes.Any(n => n.Key == "Aircraft" || n.Key == "Plane"))
{
Console.WriteLine("Warning: Removed '-Helicopter:', this can introduce side effects with inherited 'Aircraft' definitions.");
node.Value.Nodes.Remove(mheli);
}
else
mheli.Key = "-Aircraft";
}
} }
if (engineVersion < 20151004) if (engineVersion < 20151004)