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

oops; forgot about the mouse buttons

Browse Source
This commit is contained in:
Chris Forbes
2009-12-28 20:06:10 +13:00
parent 8054292e17
commit e80d59e851
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRa.Game/Traits/Activities/CaptureBuilding.cs
View File

@@ -16,14 +16,21 @@ namespace OpenRa.Game.Traits.Activities
public IActivity Tick(Actor self) public IActivity Tick(Actor self)
{ {
if (target == null || target.IsDead) return NextActivity; if (target == null || target.IsDead) return NextActivity;
// todo: don't waste engineers on things that have been captured
// between order issue time and the time we hit the building.
target.Health -= EngineerCapture.EngineerDamage; if (target.Owner == self.Owner)
if (target.Health <= 0)
{ {
target.Owner = self.Owner; if (target.Health == target.Info.Strength)
target.Health = EngineerCapture.EngineerDamage; return NextActivity;
target.Health += EngineerCapture.EngineerDamage;
}
else
{
target.Health -= EngineerCapture.EngineerDamage;
if (target.Health <= 0)
{
target.Owner = self.Owner;
target.Health = EngineerCapture.EngineerDamage;
}
} }
// the engineer is sacrificed. // the engineer is sacrificed.

1
OpenRa.Game/Traits/C4Demolition.cs
View File

@@ -12,6 +12,7 @@ namespace OpenRa.Game.Traits
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{ {
if (mi.Button != MouseButton.Right) return null;
if (underCursor == null) return null; if (underCursor == null) return null;
if (underCursor.Owner == self.Owner && !mi.Modifiers.HasModifier(Modifiers.Ctrl)) return null; if (underCursor.Owner == self.Owner && !mi.Modifiers.HasModifier(Modifiers.Ctrl)) return null;
if (!underCursor.traits.Contains<Building>()) return null; if (!underCursor.traits.Contains<Building>()) return null;

7
OpenRa.Game/Traits/EngineerCapture.cs
View File

@@ -8,10 +8,13 @@ namespace OpenRa.Game.Traits
{ {
class EngineerCapture : IOrder class EngineerCapture : IOrder
{ {
public const int EngineerDamage = 300; public const int EngineerDamage = 300; // todo: push into rules, as a weapon
public EngineerCapture(Actor self) { }
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{ {
if (mi.Button != MouseButton.Right) return null;
if (underCursor == null) return null; if (underCursor == null) return null;
if (!underCursor.traits.Contains<Building>()) return null; if (!underCursor.traits.Contains<Building>()) return null;
@@ -26,7 +29,7 @@ namespace OpenRa.Game.Traits
if (order.OrderString == "Enter" || order.OrderString == "Capture") if (order.OrderString == "Enter" || order.OrderString == "Capture")
{ {
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Move(order.TargetActor, 2)); self.QueueActivity(new Move(order.TargetActor, 1));
self.QueueActivity(new CaptureBuilding(order.TargetActor)); self.QueueActivity(new CaptureBuilding(order.TargetActor));
} }
} }