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

WithAttackOverlay: support specifc Armament to play animation.

Browse Source
This commit is contained in:
dnqbob
2024-04-27 23:01:16 +08:00
committed by Gustas
parent 78fdfbfb09
commit f24a966f53
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/Render/WithAttackOverlay.cs
View File

@@ -17,6 +17,9 @@ namespace OpenRA.Mods.Common.Traits.Render
[Desc("Rendered together with an attack.")] [Desc("Rendered together with an attack.")]
public class WithAttackOverlayInfo : TraitInfo, Requires<RenderSpritesInfo> public class WithAttackOverlayInfo : TraitInfo, Requires<RenderSpritesInfo>
{ {
[Desc("Armament that will play the animation. Set to null to allow all armaments.")]
public readonly string Armament = null;
[SequenceReference] [SequenceReference]
[FieldLoader.Require] [FieldLoader.Require]
[Desc("Sequence name to use")] [Desc("Sequence name to use")]
@@ -69,7 +72,7 @@ namespace OpenRA.Mods.Common.Traits.Render
void INotifyAttack.Attacking(Actor self, in Target target, Armament a, Barrel barrel) void INotifyAttack.Attacking(Actor self, in Target target, Armament a, Barrel barrel)
{ {
if (info.DelayRelativeTo == AttackDelayType.Attack) if (info.DelayRelativeTo == AttackDelayType.Attack && (string.IsNullOrEmpty(info.Armament) || info.Armament == a.Info.Name))
{ {
if (info.Delay > 0) if (info.Delay > 0)
tick = info.Delay; tick = info.Delay;
@@ -80,7 +83,7 @@ namespace OpenRA.Mods.Common.Traits.Render
void INotifyAttack.PreparingAttack(Actor self, in Target target, Armament a, Barrel barrel) void INotifyAttack.PreparingAttack(Actor self, in Target target, Armament a, Barrel barrel)
{ {
if (info.DelayRelativeTo == AttackDelayType.Preparation) if (info.DelayRelativeTo == AttackDelayType.Preparation && (string.IsNullOrEmpty(info.Armament) || info.Armament == a.Info.Name))
{ {
if (info.Delay > 0) if (info.Delay > 0)
tick = info.Delay; tick = info.Delay;