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

Fix style nits in OrderEffects.

Browse Source
This commit is contained in:
Paul Chote
2021-07-08 19:04:33 +01:00
committed by abcdefg30
parent 2c5fce5e3c
commit 8fc042fed1
1 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
OpenRA.Mods.Common/Traits/World/OrderEffects.cs
View File

@@ -23,14 +23,14 @@ namespace OpenRA.Mods.Common.Traits
{ {
[Desc("The image to use.")] [Desc("The image to use.")]
[FieldLoader.Require] [FieldLoader.Require]
public readonly string TerrainFlashImage; public readonly string TerrainFlashImage = null;
[Desc("The sequence to use.")] [Desc("The sequence to use.")]
[FieldLoader.Require] [FieldLoader.Require]
public readonly string TerrainFlashSequence; public readonly string TerrainFlashSequence = null;
[Desc("The palette to use.")] [Desc("The palette to use.")]
public readonly string TerrainFlashPalette; public readonly string TerrainFlashPalette = null;
[Desc("The type of effect to apply to targeted (frozen) actors. Accepts values Overlay and Tint.")] [Desc("The type of effect to apply to targeted (frozen) actors. Accepts values Overlay and Tint.")]
public readonly ActorFlashType ActorFlashType = ActorFlashType.Overlay; public readonly ActorFlashType ActorFlashType = ActorFlashType.Overlay;
@@ -67,37 +67,41 @@ namespace OpenRA.Mods.Common.Traits
bool INotifyOrderIssued.OrderIssued(World world, Target target) bool INotifyOrderIssued.OrderIssued(World world, Target target)
{ {
if (target.Type == TargetType.Actor) switch (target.Type)
{ {
if (info.ActorFlashType == ActorFlashType.Overlay) case TargetType.Actor:
world.AddFrameEndTask(w => w.Add(new FlashTarget( {
target.Actor, info.ActorFlashOverlayColor, info.ActorFlashOverlayAlpha, if (info.ActorFlashType == ActorFlashType.Overlay)
info.ActorFlashCount, info.ActorFlashInterval))); world.AddFrameEndTask(w => w.Add(new FlashTarget(
else target.Actor, info.ActorFlashOverlayColor, info.ActorFlashOverlayAlpha,
world.AddFrameEndTask(w => w.Add(new FlashTarget( info.ActorFlashCount, info.ActorFlashInterval)));
target.Actor, info.ActorFlashTint, else
info.ActorFlashCount, info.ActorFlashInterval))); world.AddFrameEndTask(w => w.Add(new FlashTarget(
target.Actor, info.ActorFlashTint,
info.ActorFlashCount, info.ActorFlashInterval)));
return true; return true;
}
case TargetType.FrozenActor:
{
if (info.ActorFlashType == ActorFlashType.Overlay)
target.FrozenActor.Flash(info.ActorFlashOverlayColor, info.ActorFlashOverlayAlpha);
else
target.FrozenActor.Flash(info.ActorFlashTint);
return true;
}
case TargetType.Terrain:
{
world.AddFrameEndTask(w => w.Add(new SpriteAnnotation(target.CenterPosition, world, info.TerrainFlashImage, info.TerrainFlashSequence, info.TerrainFlashPalette)));
return true;
}
default:
return false;
} }
if (target.Type == TargetType.FrozenActor)
{
if (info.ActorFlashType == ActorFlashType.Overlay)
target.FrozenActor.Flash(info.ActorFlashOverlayColor, info.ActorFlashOverlayAlpha);
else
target.FrozenActor.Flash(info.ActorFlashTint);
return true;
}
if (target.Type == TargetType.Terrain)
{
world.AddFrameEndTask(w => w.Add(new SpriteAnnotation(target.CenterPosition, world, info.TerrainFlashImage, info.TerrainFlashSequence, info.TerrainFlashPalette)));
return true;
}
return false;
} }
} }
} }