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

invuln moved to mod

Browse Source
This commit is contained in:
Chris Forbes
2010-01-29 19:48:51 +13:00
parent 84d2a01a69
commit d043f6690d
8 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenRa.Game/Effects/InvulnEffect.cs
View File

@@ -1,30 +0,0 @@
using System.Collections.Generic;
using OpenRa.Graphics;
using OpenRa.Traits;
namespace OpenRa.Effects
{
class InvulnEffect : IEffect
{
Actor a;
IronCurtainable b;
public InvulnEffect(Actor a)
{
this.a = a;
this.b = a.traits.Get<IronCurtainable>();
}
public void Tick( World world )
{
if (a.IsDead || b.GetDamageModifier() > 0)
world.AddFrameEndTask(w => w.Remove(this));
}
public IEnumerable<Renderable> Render()
{
foreach (var r in a.Render())
yield return r.WithPalette(PaletteType.Invuln);
}
}
}

3
OpenRa.Game/OpenRa.Game.csproj
View File

@@ -81,7 +81,6 @@
<Compile Include="Effects\DelayedAction.cs" />
<Compile Include="Effects\FlashTarget.cs" />
<Compile Include="Effects\GpsSatellite.cs" />
<Compile Include="Effects\InvulnEffect.cs" />
<Compile Include="Effects\MoveFlash.cs" />
<Compile Include="Effects\RepairIndicator.cs" />
<Compile Include="Effects\SatelliteLaunch.cs" />
@@ -218,8 +217,6 @@
<Compile Include="Traits\Helicopter.cs" />
<Compile Include="Traits\InvisibleToOthers.cs" />
<Compile Include="Traits\ConstructionYard.cs" />
<Compile Include="Traits\IronCurtainable.cs" />
<Compile Include="Traits\IronCurtainPower.cs" />
<Compile Include="Traits\JamsRadar.cs" />
<Compile Include="Traits\LightPaletteRotator.cs" />
<Compile Include="Traits\LimitedAmmo.cs" />

100
OpenRa.Game/Traits/IronCurtainPower.cs
View File

@@ -1,100 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenRa.Orders;
namespace OpenRa.Traits
{
class IronCurtainPowerInfo : SupportPowerInfo
{
public readonly float Duration = 0f;
public override object Create(Actor self) { return new IronCurtainPower(self, this); }
}
class IronCurtainPower : SupportPower, IResolveOrder
{
public IronCurtainPower(Actor self, IronCurtainPowerInfo info) : base(self, info) { }
protected override void OnBeginCharging() { Sound.PlayToPlayer(Owner, "ironchg1.aud"); }
protected override void OnFinishCharging() { Sound.PlayToPlayer(Owner, "ironrdy1.aud"); }
protected override void OnActivate()
{
Game.controller.orderGenerator = new SelectTarget();
Sound.Play("slcttgt1.aud");
}
public void ResolveOrder(Actor self, Order order)
{
if (order.OrderString == "IronCurtain")
{
if (self.Owner == self.World.LocalPlayer)
Game.controller.CancelInputMode();
var curtain = self.World.Actors.Where(a => a.Owner != null
&& a.traits.Contains<IronCurtain>()).FirstOrDefault();
if (curtain != null)
curtain.traits.Get<RenderBuilding>().PlayCustomAnim(curtain, "active");
Sound.Play("ironcur9.aud");
order.TargetActor.traits.Get<IronCurtainable>().Activate(order.TargetActor,
(int)((Info as IronCurtainPowerInfo).Duration * 25 * 60));
FinishActivate();
}
}
class SelectTarget : IOrderGenerator
{
public SelectTarget() { }
public IEnumerable<Order> Order(World world, int2 xy, MouseInput mi)
{
if (mi.Button == MouseButton.Right)
Game.controller.CancelInputMode();
return OrderInner(world, xy, mi);
}
IEnumerable<Order> OrderInner(World world, int2 xy, MouseInput mi)
{
if (mi.Button == MouseButton.Left)
{
var loc = mi.Location + Game.viewport.Location;
var underCursor = world.FindUnits(loc, loc)
.Where(a => a.Owner == world.LocalPlayer
&& a.traits.Contains<IronCurtainable>()
&& a.traits.Contains<Selectable>()).FirstOrDefault();
if (underCursor != null)
yield return new Order("IronCurtain", underCursor.Owner.PlayerActor, underCursor);
}
yield break;
}
public void Tick(World world)
{
var hasStructure = world.Actors
.Any(a => a.Owner == world.LocalPlayer && a.traits.Contains<IronCurtain>());
if (!hasStructure)
Game.controller.CancelInputMode();
}
public void Render(World world) { }
public Cursor GetCursor(World world, int2 xy, MouseInput mi)
{
mi.Button = MouseButton.Left;
return OrderInner(world, xy, mi).Any()
? Cursor.Ability : Cursor.MoveBlocked;
}
}
}
// tag trait for the building
class IronCurtainInfo : StatelessTraitInfo<IronCurtain> { }
class IronCurtain { }
}

33
OpenRa.Game/Traits/IronCurtainable.cs
View File

@@ -1,33 +0,0 @@
using System.Linq;
using OpenRa.Effects;
namespace OpenRa.Traits
{
class IronCurtainableInfo : ITraitInfo
{
public object Create(Actor self) { return new IronCurtainable(); }
}
class IronCurtainable : IDamageModifier, ITick
{
[Sync]
int RemainingTicks = 0;
public void Tick(Actor self)
{
if (RemainingTicks > 0)
RemainingTicks--;
}
public float GetDamageModifier()
{
return (RemainingTicks > 0) ? 0.0f : 1.0f;
}
public void Activate(Actor self, int duration)
{
self.World.AddFrameEndTask(w => w.Add(new InvulnEffect(self)));
RemainingTicks = duration;
}
}
}

4
OpenRa.Game/Traits/RenderBuilding.cs
View File

@@ -3,12 +3,12 @@ using OpenRa.Effects;
namespace OpenRa.Traits
{
class RenderBuildingInfo : RenderSimpleInfo
public class RenderBuildingInfo : RenderSimpleInfo
{
public override object Create(Actor self) { return new RenderBuilding(self); }
}
class RenderBuilding : RenderSimple, INotifyDamage, INotifySold
public class RenderBuilding : RenderSimple, INotifyDamage, INotifySold
{
const int SmallBibStart = 1;
const int LargeBibStart = 5;

4
OpenRa.Game/Traits/Selectable.cs
View File

@@ -5,12 +5,12 @@ using System.Text;
namespace OpenRa.Traits
{
class SelectableInfo : StatelessTraitInfo<Selectable>
public class SelectableInfo : StatelessTraitInfo<Selectable>
{
public readonly int Priority = 10;
public readonly int[] Bounds = null;
public readonly string Voice = "GenericVoice";
}
class Selectable {}
public class Selectable {}
}

6
OpenRa.Game/WorldUtils.cs
View File

@@ -52,6 +52,12 @@ namespace OpenRa
world.TileSet.GetWalkability(world.Map.MapTiles[a.X, a.Y])) < double.PositiveInfinity;
}
public static IEnumerable<Actor> FindUnitsAtMouse(this World world, int2 mouseLocation)
{
var loc = mouseLocation + Game.viewport.Location;
return FindUnits(world, loc, loc);
}
public static IEnumerable<Actor> FindUnits(this World world, float2 a, float2 b)
{
var min = float2.Min(a, b);