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

Merge pull request #9054 from penev92/bleed_aircraft

Browse Source 
Merge Plane and Helicopter traits
This commit is contained in:
reaperrr
2015-10-03 01:52:30 +02:00
parent 22183fd5c7 0ee38de4bb
commit 2ae0694385
39 changed files with 527 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1832,9 +1832,9 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (inftraits != null)
{
node.Value.Nodes.Add(new MiniYamlNode("QuantizeFacingsFromSequence", null, new List<MiniYamlNode>
{
new MiniYamlNode("Sequence", "stand"),
}));
{
new MiniYamlNode("Sequence", "stand"),
}));
}
var other = node.Value.Nodes.FirstOrDefault(x =>
@@ -2030,7 +2030,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
else
cloakedTargetTypes = new MiniYamlNode("TargetTypes", "");
node.Value.Nodes.Add(new MiniYamlNode("Targetable@UNDERWATER", "", new List<MiniYamlNode> {
node.Value.Nodes.Add(new MiniYamlNode("Targetable@UNDERWATER", "", new List<MiniYamlNode>
{
cloakedTargetTypes,
new MiniYamlNode("UpgradeTypes", "underwater"),
new MiniYamlNode("UpgradeMinEnabledLevel", "1")
@@ -2067,7 +2068,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
else
groundTargetTypes = new MiniYamlNode("TargetTypes", "");
node.Value.Nodes.Add(new MiniYamlNode("Targetable@GROUND", "", new List<MiniYamlNode> {
node.Value.Nodes.Add(new MiniYamlNode("Targetable@GROUND", "", new List<MiniYamlNode>
{
groundTargetTypes,
new MiniYamlNode("UpgradeTypes", "airborne"),
new MiniYamlNode("UpgradeMaxEnabledLevel", "0")
@@ -2175,6 +2177,18 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
}
if (engineVersion < 20150927)
{
if (depth == 1 && node.Key == "Plane")
node.Key = "Aircraft";
if (depth == 1 && node.Key == "Helicopter")
{
node.Key = "Aircraft";
node.Value.Nodes.Add(new MiniYamlNode("CanHover", "True"));
}
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
}
}