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

Aircraft/Helicopter move/dock flashing and cursor fixes

Browse Source
This commit is contained in:
Paul Chote
2010-07-23 19:10:10 +12:00
parent 55e59e0b53
commit c90317fb35
4 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/Effects/MoveFlash.cs
View File

@@ -14,11 +14,20 @@ using OpenRA.Traits;
namespace OpenRA.Effects
{
class MoveFlash : IEffect
public class MoveFlash : IEffect
{
Animation anim = new Animation("moveflsh");
float2 pos;
public MoveFlash( World world, int2 cell )
{
this.pos = Game.CellSize * (cell + new float2(0.5f, 0.5f));
anim.PlayThen( "idle",
() => world.AddFrameEndTask(
w => w.Remove( this ) ) );
}
public MoveFlash( World world, float2 pos )
{
this.pos = pos;

8
OpenRA.Game/Traits/Mobile.cs
View File

@@ -11,6 +11,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects;
using OpenRA.Traits.Activities;
using OpenRA.FileFormats;
@@ -97,6 +98,7 @@ namespace OpenRA.Traits
}
if (MovementSpeedForCell(self, self.Location) == 0) return null; /* allow disabling move orders from modifiers */
if (xy == toCell) return null;
return new Order("Move", self, xy, mi.Modifiers.HasModifier(Modifiers.Shift));
}
@@ -106,11 +108,11 @@ namespace OpenRA.Traits
{
if (self.traits.GetOrDefault<IMove>().CanEnterCell(order.TargetLocation))
{
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w => w.Add(new MoveFlash(self.World, order.TargetLocation)));
if( !order.Queued ) self.CancelActivity();
self.QueueActivity(new Activities.Move(order.TargetLocation, 8));
if (self.Owner == self.World.LocalPlayer)
self.World.Add(new Effects.MoveFlash(self.World, Game.CellSize * (order.TargetLocation + new float2(0.5f, 0.5f))));
}
}
}

20
OpenRA.Mods.RA/Helicopter.cs
View File

@@ -11,6 +11,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
@@ -38,14 +39,11 @@ namespace OpenRA.Mods.RA
if (mi.Button == MouseButton.Left) return null;
if (underCursor == null)
{
if (self.traits.GetOrDefault<IMove>().CanEnterCell(xy))
return new Order("Move", self, xy);
}
if (AircraftCanEnter(self, underCursor)
&& underCursor.Owner == self.Owner
&& !Reservable.IsReserved(underCursor))
&& underCursor.Owner == self.Owner)
return new Order("Enter", self, underCursor);
return null;
@@ -53,12 +51,16 @@ namespace OpenRA.Mods.RA
public string CursorForOrder(Actor self, Order order)
{
return (order.OrderString == "Enter") ? "enter" : null;
if (order.OrderString == "Move") return "move";
if (order.OrderString == "Enter")
return Reservable.IsReserved(order.TargetActor) ? "enter-blocked" : "enter";
return null;
}
public string VoicePhraseForOrder(Actor self, Order order)
{
return (order.OrderString == "Move") ? "Move" : null;
return (order.OrderString == "Move" || order.OrderString == "Enter") ? "Move" : null;
}
public void ResolveOrder(Actor self, Order order)
@@ -71,6 +73,9 @@ namespace OpenRA.Mods.RA
if (order.OrderString == "Move")
{
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w => w.Add(new MoveFlash(self.World, order.TargetLocation)));
self.CancelActivity();
self.QueueActivity(new HeliFly(Util.CenterOfCell(order.TargetLocation)));
@@ -92,6 +97,9 @@ namespace OpenRA.Mods.RA
var offset = productionInfo != null ? productionInfo.SpawnOffset : null;
var offsetVec = offset != null ? new float2(offset[0], offset[1]) : float2.Zero;
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w => w.Add(new FlashTarget(order.TargetActor)));
self.CancelActivity();
self.QueueActivity(new HeliFly(order.TargetActor.CenterLocation + offsetVec));
self.QueueActivity(new Turn(self.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing));

18
OpenRA.Mods.RA/Plane.cs
View File

@@ -10,6 +10,7 @@
using System;
using System.Linq;
using OpenRA.Effects;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
@@ -34,8 +35,7 @@ namespace OpenRA.Mods.RA
return new Order("Move", self, xy);
if (AircraftCanEnter(self, underCursor)
&& underCursor.Owner == self.Owner
&& !Reservable.IsReserved(underCursor))
&& underCursor.Owner == self.Owner)
return new Order("Enter", self, underCursor);
return null;
@@ -43,12 +43,16 @@ namespace OpenRA.Mods.RA
public string CursorForOrder(Actor self, Order order)
{
return (order.OrderString == "Enter") ? "enter" : null;
if (order.OrderString == "Move") return "move";
if (order.OrderString == "Enter")
return Reservable.IsReserved(order.TargetActor) ? "enter-blocked" : "enter";
return null;
}
public string VoicePhraseForOrder(Actor self, Order order)
{
return (order.OrderString == "Move") ? "Move" : null;
return (order.OrderString == "Move" || order.OrderString == "Enter") ? "Move" : null;
}
public void ResolveOrder(Actor self, Order order)
@@ -61,6 +65,9 @@ namespace OpenRA.Mods.RA
if (order.OrderString == "Move")
{
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w => w.Add(new MoveFlash(self.World, order.TargetLocation)));
self.CancelActivity();
self.QueueActivity(new Fly(Util.CenterOfCell(order.TargetLocation)));
}
@@ -74,6 +81,9 @@ namespace OpenRA.Mods.RA
var info = self.Info.Traits.Get<PlaneInfo>();
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w => w.Add(new FlashTarget(order.TargetActor)));
self.CancelActivity();
self.QueueActivity(new ReturnToBase(self, order.TargetActor));
self.QueueActivity(