Split NukePower MissileImage from MissileWeapon.
This commit is contained in:
committed by
Matthias Mailänder
parent
0260884369
commit
60b123c641
@@ -25,18 +25,20 @@ namespace OpenRA.Mods.Common.Traits
|
||||
{
|
||||
[WeaponReference]
|
||||
[FieldLoader.Require]
|
||||
[Desc("Weapon to use for the impact.",
|
||||
"Also image to use for the missile.")]
|
||||
[Desc("Weapon to use for the impact.")]
|
||||
public readonly string MissileWeapon = "";
|
||||
|
||||
[Desc("Delay (in ticks) after launch until the missile is spawned.")]
|
||||
public readonly int MissileDelay = 0;
|
||||
|
||||
[SequenceReference(nameof(MissileWeapon))]
|
||||
[Desc("Image to use for the missile.")]
|
||||
public readonly string MissileImage = null;
|
||||
|
||||
[SequenceReference(nameof(MissileImage))]
|
||||
[Desc("Sprite sequence for the ascending missile.")]
|
||||
public readonly string MissileUp = "up";
|
||||
|
||||
[SequenceReference(nameof(MissileWeapon))]
|
||||
[SequenceReference(nameof(MissileImage))]
|
||||
[Desc("Sprite sequence for the descending missile.")]
|
||||
public readonly string MissileDown = "down";
|
||||
|
||||
@@ -168,7 +170,7 @@ namespace OpenRA.Mods.Common.Traits
|
||||
var skipAscent = info.SkipAscent || body == null;
|
||||
var launchPos = skipAscent ? WPos.Zero : self.CenterPosition + body.LocalToWorld(info.SpawnOffset);
|
||||
|
||||
var missile = new NukeLaunch(self.Owner, info.MissileWeapon, info.WeaponInfo, palette, info.MissileUp, info.MissileDown,
|
||||
var missile = new NukeLaunch(self.Owner, info.MissileImage, info.WeaponInfo, palette, info.MissileUp, info.MissileDown,
|
||||
launchPos,
|
||||
targetPosition, info.DetonationAltitude, info.RemoveMissileOnDetonation,
|
||||
info.FlightVelocity, info.MissileDelay, info.FlightDelay, skipAscent,
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
#region Copyright & License Information
|
||||
/*
|
||||
* Copyright 2007-2022 The OpenRA Developers (see AUTHORS)
|
||||
* This file is part of OpenRA, which is free software. It is made
|
||||
* available to you under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version. For more
|
||||
* information, see COPYING.
|
||||
*/
|
||||
#endregion
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace OpenRA.Mods.Common.UpdateRules.Rules
|
||||
{
|
||||
public class SplitNukePowerMissileImage : UpdateRule
|
||||
{
|
||||
public override string Name => "NukePower now defines the image for the missile with MissileImage.";
|
||||
|
||||
public override string Description =>
|
||||
"NukePower used MissileWeapon field for as the name for missile image too.\n" +
|
||||
"This function has been moved to its own MissileImage field.";
|
||||
|
||||
public override IEnumerable<string> UpdateActorNode(ModData modData, MiniYamlNode actorNode)
|
||||
{
|
||||
foreach (var nukePowerNode in actorNode.ChildrenMatching("NukePower"))
|
||||
{
|
||||
var missileWeaponNode = nukePowerNode.ChildrenMatching("MissileWeapon").FirstOrDefault();
|
||||
if (missileWeaponNode != null)
|
||||
{
|
||||
var weapon = missileWeaponNode.NodeValue<string>();
|
||||
nukePowerNode.AddNode(new MiniYamlNode("MissileImage", weapon));
|
||||
}
|
||||
}
|
||||
|
||||
yield break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -92,6 +92,7 @@ namespace OpenRA.Mods.Common.UpdateRules
|
||||
new AttackBomberFacingTolerance(),
|
||||
new AttackFrontalFacingTolerance(),
|
||||
new RenameCloakTypes(),
|
||||
new SplitNukePowerMissileImage(),
|
||||
})
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user