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

Use the new functions in already existing rules

Browse Source
This commit is contained in:
abcdefg30
2018-05-03 16:11:41 +02:00
committed by reaperrr
parent 9a8e50e82f
commit 6b10895c50
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/UpdateRules/Rules/DefineLocomotors.cs
View File

@@ -128,8 +128,8 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
{ {
if (node != null) if (node != null)
{ {
grantNode.Value.Nodes.Add(node); grantNode.AddNode(node);
mobileNode.Value.Nodes.Remove(node); mobileNode.RemoveNode(node);
} }
} }
@@ -155,7 +155,7 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
} }
foreach (var node in addNodes) foreach (var node in addNodes)
actorNode.Value.Nodes.Add(node); actorNode.AddNode(node);
yield break; yield break;
} }

22
OpenRA.Mods.Common/UpdateRules/Rules/SplitTurretAimAnimation.cs
View File

@@ -49,39 +49,39 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
{ {
var turretAim = new MiniYamlNode("WithTurretAimAnimation", ""); var turretAim = new MiniYamlNode("WithTurretAimAnimation", "");
aimSequence.RenameKeyPreservingSuffix("Sequence"); aimSequence.RenameKeyPreservingSuffix("Sequence");
turretAim.Value.Nodes.Add(aimSequence); turretAim.AddNode(aimSequence);
turretAttack.Value.Nodes.Remove(aimSequence); turretAttack.RemoveNode(aimSequence);
var reloadPrefix = turretAttack.LastChildMatching("ReloadPrefix"); var reloadPrefix = turretAttack.LastChildMatching("ReloadPrefix");
var turret = turretAttack.LastChildMatching("Turret"); var turret = turretAttack.LastChildMatching("Turret");
var armament = turretAttack.LastChildMatching("Armament"); var armament = turretAttack.LastChildMatching("Armament");
if (reloadPrefix != null) if (reloadPrefix != null)
{ {
turretAim.Value.Nodes.Add(reloadPrefix); turretAim.AddNode(reloadPrefix);
turretAttack.Value.Nodes.Remove(reloadPrefix); turretAttack.RemoveNode(reloadPrefix);
} }
if (turret != null) if (turret != null)
turretAim.Value.Nodes.Add(turret); turretAim.AddNode(turret);
if (armament != null) if (armament != null)
turretAim.Value.Nodes.Add(armament); turretAim.AddNode(armament);
attackSequence.RenameKeyPreservingSuffix("Sequence"); attackSequence.RenameKeyPreservingSuffix("Sequence");
actorNode.Value.Nodes.Add(turretAim); actorNode.AddNode(turretAim);
} }
} }
var spriteTurret = actorNode.LastChildMatching("WithSpriteTurret"); var spriteTurret = actorNode.LastChildMatching("WithSpriteTurret");
if (spriteTurret != null) if (spriteTurret != null)
{ {
var aimSequence = spriteTurret.Value.Nodes.FirstOrDefault(n => n.Key == "AimSequence"); var aimSequence = spriteTurret.LastChildMatching("AimSequence");
if (aimSequence != null) if (aimSequence != null)
{ {
var aimAnim = new MiniYamlNode("WithTurretAimAnimation", ""); var aimAnim = new MiniYamlNode("WithTurretAimAnimation", "");
aimSequence.RenameKeyPreservingSuffix("Sequence"); aimSequence.RenameKeyPreservingSuffix("Sequence");
aimAnim.Value.Nodes.Add(aimSequence); aimAnim.AddNode(aimSequence);
spriteTurret.Value.Nodes.Remove(aimSequence); spriteTurret.RemoveNode(aimSequence);
actorNode.Value.Nodes.Add(aimAnim); actorNode.AddNode(aimAnim);
} }
} }