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

Refactor chronosphere power

Browse Source
This commit is contained in:
Paul Chote
2010-01-24 15:55:28 +13:00
parent da40ab449e
commit c44679cc94
8 changed files with 147 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/OpenRa.Game.csproj
View File

@@ -106,7 +106,6 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Orders\ChronosphereSelectOrderGenerator.cs" />
<Compile Include="Orders\IronCurtainOrderGenerator.cs" />
<Compile Include="Effects\Missile.cs" />
<Compile Include="Network\OrderIO.cs" />
@@ -114,7 +113,6 @@
<Compile Include="Orders\PowerDownOrderGenerator.cs" />
<Compile Include="Orders\RepairOrderGenerator.cs" />
<Compile Include="Orders\SellOrderGenerator.cs" />
<Compile Include="Orders\ChronoshiftDestinationOrderGenerator.cs" />
<Compile Include="Ore.cs" />
<Compile Include="PackageDownloader.cs" />
<Compile Include="PathSearch.cs" />

45
OpenRa.Game/Orders/ChronoshiftDestinationOrderGenerator.cs
View File

@@ -1,45 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Drawing;
using OpenRa.Traits;
namespace OpenRa.Orders
{
class ChronoshiftDestinationOrderGenerator : IOrderGenerator
{
public readonly Actor self;
public ChronoshiftDestinationOrderGenerator(Actor self)
{
this.self = self;
}
public IEnumerable<Order> Order(World world, int2 xy, MouseInput mi)
{
if (mi.Button == MouseButton.Right)
{
Game.controller.CancelInputMode();
yield break;
}
yield return new Order("Chronoshift", self, xy);
yield return new Order("ChronosphereFinish", self.Owner.PlayerActor);
}
public void Tick( World world ) {}
public void Render( World world )
{
world.WorldRenderer.DrawSelectionBox(self, Color.White, true);
}
public Cursor GetCursor(World world, int2 xy, MouseInput mi)
{
if (!world.LocalPlayer.Shroud.IsExplored(xy))
return Cursor.MoveBlocked;
var movement = self.traits.GetOrDefault<IMovement>();
return (movement.CanEnterCell(xy)) ? Cursor.Chronoshift : Cursor.MoveBlocked;
}
}
}

56
OpenRa.Game/Orders/ChronosphereSelectOrderGenerator.cs
View File

@@ -1,56 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRa.GameRules;
using OpenRa.Traits;
namespace OpenRa.Orders
{
class ChronosphereSelectOrderGenerator : IOrderGenerator
{
public ChronosphereSelectOrderGenerator() {}
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<Chronoshiftable>()
&& a.traits.Contains<Selectable>()).FirstOrDefault();
if (underCursor != null)
yield return new Order("ChronosphereSelect", world.LocalPlayer.PlayerActor, underCursor);
}
yield break;
}
public void Tick( World world )
{
var hasChronosphere = world.Actors
.Any(a => a.Owner == world.LocalPlayer && a.traits.Contains<Chronosphere>());
if (!hasChronosphere)
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.ChronoshiftSelect : Cursor.MoveBlocked;
}
}
}

5
OpenRa.Game/Orders/UnitOrderGenerator.cs
View File

@@ -74,11 +74,6 @@ namespace OpenRa.Orders
else
return Cursor.DeployBlocked;
case "Deploy": return Cursor.Deploy;
case "Chronoshift":
if (movement.CanEnterCell(location))
return Cursor.Chronoshift;
else
return Cursor.MoveBlocked;
case "Enter": return Cursor.Enter;
case "EnterTransport": return Cursor.Enter;
case "Deliver": return Cursor.Enter;

139
OpenRa.Game/Traits/ChronoshiftPower.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Drawing;
using OpenRa.Orders;
namespace OpenRa.Traits
@@ -14,43 +15,155 @@ namespace OpenRa.Traits
}
class ChronoshiftPower : SupportPower, IResolveOrder
{
{
public ChronoshiftPower(Actor self, ChronoshiftPowerInfo info) : base(self, info) { }
protected override void OnBeginCharging() { Sound.Play("chrochr1.aud"); }
protected override void OnFinishCharging() { Sound.Play("chrordy1.aud"); }
protected override void OnActivate()
{
Game.controller.orderGenerator = new ChronosphereSelectOrderGenerator();
Game.controller.orderGenerator = new SelectTarget();
Sound.Play("slcttgt1.aud");
}
public void ResolveOrder(Actor self, Order order)
{
if (order.OrderString == "ChronosphereSelect" && self.Owner == self.World.LocalPlayer)
Game.controller.orderGenerator = new ChronoshiftDestinationOrderGenerator(order.TargetActor);
{
Game.controller.orderGenerator = new SelectDestination(order.TargetActor);
}
if (order.OrderString == "ChronosphereFinish")
if (order.OrderString == "ChronosphereActivate")
{
if (self.Owner == self.World.LocalPlayer)
Game.controller.CancelInputMode();
// Cannot chronoshift into unexplored location
if (!self.Owner.Shroud.IsExplored(order.TargetLocation))
return;
// Ensure the target cell is valid for the unit
var movement = order.TargetActor.traits.GetOrDefault<IMovement>();
if (!movement.CanEnterCell(order.TargetLocation))
return;
FinishActivate();
Sound.Play("chrono2.aud");
var chronosphere = self.World.Actors.Where(a => a.Owner == self.Owner
&& a.traits.Contains<Chronosphere>()).FirstOrDefault();
if( chronosphere != null )
var chronosphere = self.World.Actors.Where(a => a.Owner == self.Owner
&& a.traits.Contains<Chronosphere>()).FirstOrDefault();
if (chronosphere != null)
chronosphere.traits.Get<RenderBuilding>().PlayCustomAnim( chronosphere, "active" );
// Trigger screen desaturate effect
foreach (var a in self.World.Actors.Where(a => a.traits.Contains<ChronoshiftPaletteEffect>()))
a.traits.Get<ChronoshiftPaletteEffect>().DoChronoshift();
Sound.Play("chrono2.aud");
order.TargetActor.traits.Get<Chronoshiftable>().Activate(order.TargetActor,
order.TargetLocation,
(int)((Info as ChronoshiftPowerInfo).Duration * 25 * 60),
(Info as ChronoshiftPowerInfo).KillCargo,
chronosphere);
Game.controller.CancelInputMode();
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<Chronoshiftable>()
&& a.traits.Contains<Selectable>()).FirstOrDefault();
if (underCursor != null)
yield return new Order("ChronosphereSelect", world.LocalPlayer.PlayerActor, underCursor);
}
yield break;
}
public void Tick( World world )
{
var hasChronosphere = world.Actors
.Any(a => a.Owner == world.LocalPlayer && a.traits.Contains<Chronosphere>());
if (!hasChronosphere)
Game.controller.CancelInputMode();
// TODO: Check if the selected unit is still alive
}
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.ChronoshiftSelect : Cursor.MoveBlocked;
}
}
class SelectDestination : IOrderGenerator
{
Actor self;
public SelectDestination(Actor self)
{
this.self = self;
}
public IEnumerable<Order> Order(World world, int2 xy, MouseInput mi)
{
if (mi.Button == MouseButton.Right)
{
Game.controller.CancelInputMode();
yield break;
}
yield return new Order("ChronosphereActivate", world.LocalPlayer.PlayerActor, self, xy);
}
public void Tick(World world)
{
var hasChronosphere = world.Actors
.Any(a => a.Owner == world.LocalPlayer && a.traits.Contains<Chronosphere>());
if (!hasChronosphere)
Game.controller.CancelInputMode();
// TODO: Check if the selected unit is still alive
}
public void Render(World world)
{
world.WorldRenderer.DrawSelectionBox(self, Color.Red, true);
}
public Cursor GetCursor(World world, int2 xy, MouseInput mi)
{
if (!world.LocalPlayer.Shroud.IsExplored(xy))
return Cursor.MoveBlocked;
var movement = self.traits.GetOrDefault<IMovement>();
return (movement.CanEnterCell(xy)) ? Cursor.Chronoshift : Cursor.MoveBlocked;
}
}
}
// tag trait to identify the building
class ChronosphereInfo : StatelessTraitInfo<Chronosphere> { }
public class Chronosphere { }

43
OpenRa.Game/Traits/Chronoshiftable.cs
View File

@@ -10,7 +10,7 @@ namespace OpenRa.Traits
public object Create(Actor self) { return new Chronoshiftable(self); }
}
public class Chronoshiftable : IResolveOrder, ITick
public class Chronoshiftable : ITick
{
// Return-to-sender logic
[Sync]
@@ -37,37 +37,26 @@ namespace OpenRa.Traits
}
}
public void ResolveOrder(Actor self, Order order)
public virtual void Activate(Actor self, int2 targetLocation, int duration, bool killCargo, Actor chronosphere)
{
var movement = self.traits.GetOrDefault<IMovement>();
if (order.OrderString == "Chronoshift" && movement.CanEnterCell(order.TargetLocation))
/// Set up return-to-sender info
chronoshiftOrigin = self.Location;
chronoshiftReturnTicks = duration;
// Kill cargo
if (killCargo && self.traits.Contains<Cargo>())
{
// Cannot chronoshift into unexplored location
if (!self.Owner.Shroud.IsExplored(order.TargetLocation))
return;
var info = self.Owner.PlayerActor.Info.Traits.Get<ChronoshiftPowerInfo>();
// Set up return-to-sender info
chronoshiftOrigin = self.Location;
chronoshiftReturnTicks = (int)(info.Duration * 60 * 25);
// Kill cargo
if (info.KillCargo && self.traits.Contains<Cargo>())
var cargo = self.traits.Get<Cargo>();
while (!cargo.IsEmpty(self))
{
var cargo = self.traits.Get<Cargo>();
while (!cargo.IsEmpty(self))
{
order.Player.Kills++;
cargo.Unload(self);
}
chronosphere.Owner.Kills++;
cargo.Unload(self);
}
// Set up the teleport
self.CancelActivity();
self.QueueActivity(new Activities.Teleport(order.TargetLocation));
}
// Set up the teleport
self.CancelActivity();
self.QueueActivity(new Activities.Teleport(targetLocation));
}
}
}

16
OpenRa.Mods.Aftermath/DemoTruck.cs
View File

@@ -12,22 +12,14 @@ namespace OpenRa.Mods.Aftermath
public object Create(Actor self) { return new DemoTruck(self); }
}
class DemoTruck : Chronoshiftable, IResolveOrder, INotifyDamage
class DemoTruck : Chronoshiftable, INotifyDamage
{
public DemoTruck(Actor self) : base(self) { }
public new void ResolveOrder(Actor self, Order order)
// Explode on chronoshift
public override void Activate(Actor self, int2 targetLocation, int duration, bool killCargo, Actor chronosphere)
{
// Override chronoshifting action to detonate vehicle
var movement = self.traits.GetOrDefault<IMovement>();
var chronosphere = self.World.Actors.Where(a => a.Owner == order.Subject.Owner && a.traits.Contains<Chronosphere>()).FirstOrDefault();
if (order.OrderString == "Chronoshift" && movement.CanEnterCell(order.TargetLocation))
{
self.InflictDamage(chronosphere, self.Health, Rules.WarheadInfo["Super"]);
return;
}
base.ResolveOrder(self, order);
Detonate(self, chronosphere);
}
// Fire primary on death

1
mods/aftermath/rules.yaml
View File

@@ -71,6 +71,7 @@ DTRK:
AttackBase:
PrimaryWeapon: Democharge
RenderUnit:
-Chronoshiftable:
DemoTruck:
QTNK: