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

Introduce INotifyAttack.PreparingAttack

Browse Source 
And use it to allow triggering attack animations/overlays at a different point
than the actual weapon firing.
This commit is contained in:
reaperrr
2016-06-10 17:40:50 +02:00
parent 87537d9669
commit 75c49620d1
12 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/AmmoPool.cs
View File

@@ -98,12 +98,14 @@ namespace OpenRA.Mods.Common.Traits
return true;
}
public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel)
{
if (a != null && a.Info.AmmoPoolName == Info.Name)
TakeAmmo();
}
void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel) { }
public void Tick(Actor self)
{
if (!Info.SelfReloads)

3
OpenRA.Mods.Common/Traits/Armament.cs
View File

@@ -223,6 +223,9 @@ namespace OpenRA.Mods.Common.Traits
GuidedTarget = target
};
foreach (var na in self.TraitsImplementing<INotifyAttack>())
na.PreparingAttack(self, target, this, barrel);
ScheduleDelayedAction(Info.FireDelay, () =>
{
if (args.Weapon.Projectile != null)

4
OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs
View File

@@ -64,12 +64,14 @@ namespace OpenRA.Mods.Common.Traits
return base.CanAttack(self, target);
}
public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel)
{
--charges;
timeToRecharge = info.ReloadDelay;
}
void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel) { }
public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove, bool forceAttack)
{
return new ChargeAttack(this, newTarget);

2
OpenRA.Mods.Common/Traits/Cloak.cs
View File

@@ -98,6 +98,8 @@ namespace OpenRA.Mods.Common.Traits
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel) { if (Info.UncloakOn.HasFlag(UncloakType.Attack)) Uncloak(); }
void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel) { }
void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{
damageDisabled = e.DamageState >= DamageState.Critical;

4
OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs
View File

@@ -82,12 +82,14 @@ namespace OpenRA.Mods.Common.Traits
Panic();
}
public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel)
{
if (self.World.SharedRandom.Next(100 / info.AttackPanicChance) == 0)
Panic();
}
void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel) { }
public int GetSpeedModifier()
{
return Panicking ? info.PanicSpeedModifier : 100;

6
OpenRA.Mods.Common/Traits/Render/WithAttackAnimation.cs
View File

@@ -47,13 +47,15 @@ namespace OpenRA.Mods.Common.Traits.Render
wsb = init.Self.Trait<WithSpriteBody>();
}
public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel) { }
void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel)
{
if (!string.IsNullOrEmpty(info.AttackSequence))
wsb.PlayCustomAnimation(self, info.AttackSequence, () => wsb.CancelCustomAnimation(self));
}
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
if (string.IsNullOrEmpty(info.AimSequence) && string.IsNullOrEmpty(info.ReloadPrefix))
return;

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

@@ -50,7 +50,9 @@ namespace OpenRA.Mods.Common.Traits.Render
info.Palette, info.IsPlayerPalette);
}
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel)
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel) { }
void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel)
{
attacking = true;
overlay.PlayThen(info.Sequence, () => attacking = false);

4
OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs
View File

@@ -105,11 +105,13 @@ namespace OpenRA.Mods.Common.Traits.Render
}
}
public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel)
{
Attacking(self, target);
}
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel) { }
public virtual void Tick(Actor self)
{
if (rsm != null)

4
OpenRA.Mods.Common/Traits/Render/WithMuzzleOverlay.cs
View File

@@ -75,7 +75,7 @@ namespace OpenRA.Mods.Common.Traits.Render
}
}
public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel)
{
if (a == null)
return;
@@ -94,6 +94,8 @@ namespace OpenRA.Mods.Common.Traits.Render
anims[barrel].Animation.PlayThen(sequence, () => visible[barrel] = false);
}
void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel) { }
public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr)
{
foreach (var arm in armaments)

8
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -34,7 +34,13 @@ namespace OpenRA.Mods.Common.Traits
IEnumerable<IRenderable> Render(WorldRenderer wr, World w, ActorInfo ai, WPos centerPosition);
}
public interface INotifyAttack { void Attacking(Actor self, Target target, Armament a, Barrel barrel); }
[RequireExplicitImplementation]
public interface INotifyAttack
{
void Attacking(Actor self, Target target, Armament a, Barrel barrel);
void PreparingAttack(Actor self, Target target, Armament a, Barrel barrel);
}
public interface INotifyBurstComplete { void FiredBurst(Actor self, Target target, Armament a); }
public interface INotifyCharging { void Charging(Actor self, Target target); }
public interface INotifyChat { bool OnChat(string from, string message); }

3
OpenRA.Mods.D2k/Activities/SwallowActor.cs
View File

@@ -92,7 +92,10 @@ namespace OpenRA.Mods.D2k.Activities
});
foreach (var notify in self.TraitsImplementing<INotifyAttack>())
{
notify.PreparingAttack(self, target, null, null);
notify.Attacking(self, target, null, null);
}
return true;
}

4
OpenRA.Mods.RA/Traits/Disguise.cs
View File

@@ -197,6 +197,8 @@ namespace OpenRA.Mods.RA.Traits
}
}
public void Attacking(Actor self, Target target, Armament a, Barrel barrel) { DisguiseAs(null); }
void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel) { }
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel) { DisguiseAs(null); }
}
}