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

Move disguise into Spy from RenderSpy

Browse Source
This commit is contained in:
alzeih
2011-03-13 11:47:11 +13:00
parent b5efc97996
commit 544befb553
2 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
OpenRA.Mods.RA/Render/RenderSpy.cs
View File

@@ -20,59 +20,33 @@ namespace OpenRA.Mods.RA.Render
public override object Create(ActorInitializer init) { return new RenderSpy(init.self, this); }
}
class RenderSpy : RenderInfantryProne, IRenderModifier, IIssueOrder, IResolveOrder, IOrderVoice
class RenderSpy : RenderInfantryProne, IRenderModifier
{
Player disguisedAsPlayer;
string disguisedAsSprite;
Spy spy;
public RenderSpy(Actor self, RenderSpyInfo info) : base(self, info) { }
public RenderSpy(Actor self, RenderSpyInfo info) : base(self, info)
{
spy = self.Trait<Spy>();
disguisedAsSprite = spy.disguisedAsSprite;
}
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
{
return disguisedAsPlayer != null ? r.Select(a => a.WithPalette(disguisedAsPlayer.Palette)) : r;
return spy.disguisedAsPlayer != null ? r.Select(a => a.WithPalette(spy.disguisedAsPlayer.Palette)) : r;
}
public override void Tick(Actor self)
{
base.Tick(self);
}
public void ResolveOrder(Actor self, Order order)
if (spy.disguisedAsSprite != disguisedAsSprite)
{
if (order.OrderString == "Disguise")
{
var target = order.TargetActor == self ? null : order.TargetActor;
if (target != null && target.IsInWorld)
{
disguisedAsPlayer = target.Owner;
disguisedAsSprite = target.Trait<RenderSimple>().GetImage(target);
disguisedAsSprite = spy.disguisedAsSprite;
if (disguisedAsSprite != null)
anim.ChangeImage(disguisedAsSprite, "stand");
}
else
{
disguisedAsPlayer = null;
disguisedAsSprite = null;
anim.ChangeImage(GetImage(self), "stand");
}
}
}
public IEnumerable<IOrderTargeter> Orders
{
get { yield return new UnitTraitOrderTargeter<RenderInfantry>( "Disguise", 5, "ability", true, true ); }
}
public Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued )
{
if( order.OrderID == "Disguise" )
return new Order(order.OrderID, self, queued) { TargetActor = target.Actor };
return null;
}
public string VoicePhraseForOrder(Actor self, Order order)
{
return order.OrderString == "Disguise" ? "Attack" : null;
base.Tick(self);
}
}
}

35
OpenRA.Mods.RA/Spy.cs
View File

@@ -9,28 +9,38 @@
#endregion
using System.Drawing;
using System.Linq;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Orders;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using System.Collections.Generic;
using OpenRA.Mods.RA.Render;
namespace OpenRA.Mods.RA
{
class SpyInfo : TraitInfo<Spy> { }
class Spy : IIssueOrder, IResolveOrder
class Spy : IIssueOrder, IResolveOrder, IOrderVoice
{
public Player disguisedAsPlayer;
public string disguisedAsSprite;
public IEnumerable<IOrderTargeter> Orders
{
get { yield return new UnitTraitOrderTargeter<IAcceptSpy>( "SpyInfiltrate", 5, "enter", true, false ); }
get
{
yield return new UnitTraitOrderTargeter<IAcceptSpy>( "SpyInfiltrate", 5, "enter", true, false );
yield return new UnitTraitOrderTargeter<RenderInfantry>( "Disguise", 5, "ability", true, true );
}
}
public Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued )
{
if( order.OrderID == "SpyInfiltrate" )
return new Order(order.OrderID, self, queued) { TargetActor = target.Actor };
if( order.OrderID == "Disguise" )
return new Order(order.OrderID, self, queued) { TargetActor = target.Actor };
return null;
}
@@ -44,6 +54,25 @@ namespace OpenRA.Mods.RA
self.QueueActivity(new Enter(order.TargetActor));
self.QueueActivity(new Infiltrate(order.TargetActor));
}
if (order.OrderString == "Disguise")
{
var target = order.TargetActor == self ? null : order.TargetActor;
if (target != null && target.IsInWorld)
{
disguisedAsPlayer = target.Owner;
disguisedAsSprite = target.Trait<RenderSimple>().GetImage(target);
}
else
{
disguisedAsPlayer = null;
disguisedAsSprite = null;
}
}
}
public string VoicePhraseForOrder(Actor self, Order order)
{
return order.OrderString == "Disguise" ? "Attack" : null;
}
}
}