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

Replace WithReloadingSpriteTurret with conditions

Browse Source 
WithReloadingSpriteTurret was bound to run into conflicts with any WithTurret*Animation traits due to overriding the turret sequence constantly via ITick.
Using (stacked) conditions instead avoids that.
This commit is contained in:
reaperrr
2017-09-16 19:45:41 +02:00
parent 55b11d1745
commit d90ff99e74
5 changed files with 33 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
View File

@@ -71,7 +71,6 @@
<Compile Include="Traits\Render\WithEmbeddedTurretSpriteBody.cs" />
<Compile Include="Traits\Render\WithCargo.cs" />
<Compile Include="Traits\Render\WithDeliveryAnimation.cs" />
<Compile Include="Traits\Render\WithReloadingSpriteTurret.cs" />
<Compile Include="Traits\Render\WithRoof.cs" />
<Compile Include="Traits\SupportPowers\IonCannonPower.cs" />
<Compile Include="UtilityCommands\ImportTiberianDawnLegacyMapCommand.cs" />

76
OpenRA.Mods.Cnc/Traits/Render/WithReloadingSpriteTurret.cs
View File

@@ -1,76 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2018 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;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Traits.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits.Render
{
[Desc("Renders ammo-dependent turret graphics for units with the Turreted trait.")]
public class WithReloadingSpriteTurretInfo : WithSpriteTurretInfo, Requires<AmmoPoolInfo>, Requires<ArmamentInfo>
{
[Desc("AmmoPool to use for ammo-dependent sequences.")]
public readonly string AmmoPoolName = null;
[Desc("How many reload stages does this turret have. Defaults to AmmoPool's Ammo.",
"Adds current reload stage to Sequence as suffix when a matching AmmoPool is present.")]
public readonly int ReloadStages = -1;
public override object Create(ActorInitializer init) { return new WithReloadingSpriteTurret(init.Self, this); }
}
public class WithReloadingSpriteTurret : WithSpriteTurret
{
readonly int reloadStages;
readonly AmmoPool ammoPool;
string sequence;
string ammoSuffix;
public WithReloadingSpriteTurret(Actor self, WithReloadingSpriteTurretInfo info)
: base(self, info)
{
ammoPool = self.TraitsImplementing<AmmoPool>().FirstOrDefault(a => a.Info.Name == info.AmmoPoolName);
if (ammoPool == null)
throw new InvalidOperationException("Actor type '" + self.Info.Name + "' does not define a valid ammo pool for its reloading turret.");
sequence = Info.Sequence;
reloadStages = info.ReloadStages;
var initialAmmo = ammoPool.Info.InitialAmmo;
var ammo = ammoPool.Info.Ammo;
var initialAmmoStage = initialAmmo >= 0 && initialAmmo != ammo ? initialAmmo : ammo;
if (ammoPool != null && reloadStages < 0)
ammoSuffix = initialAmmoStage.ToString();
if (ammoPool != null && reloadStages >= 0)
ammoSuffix = (initialAmmoStage * reloadStages / ammo).ToString();
}
protected override void Tick(Actor self)
{
if (Info.AimSequence != null)
sequence = Attack.IsAiming ? Info.AimSequence : Info.Sequence;
var currentAmmo = ammoPool.GetAmmoCount();
if (reloadStages < 0)
ammoSuffix = currentAmmo.ToString();
if (reloadStages >= 0)
ammoSuffix = (currentAmmo * reloadStages / ammoPool.Info.Ammo).ToString();
var newSequence = NormalizeSequence(self, sequence + ammoSuffix);
if (DefaultAnimation.CurrentSequence.Name != newSequence)
DefaultAnimation.ReplaceAnim(newSequence);
}
}
}