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

fix clash between harv deliver and repair

Browse Source
This commit is contained in:
Chris Forbes
2010-01-02 21:10:10 +13:00
parent a1528c6484
commit a7b5b05e2c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRa.Game/Controller.cs
View File

@@ -178,6 +178,7 @@ namespace OpenRa.Game
else else
return Cursor.MoveBlocked; return Cursor.MoveBlocked;
case "Enter": return Cursor.Enter; case "Enter": return Cursor.Enter;
case "Deliver": return Cursor.Enter;
case "Infiltrate": return Cursor.Enter; case "Infiltrate": return Cursor.Enter;
case "Capture": return Cursor.Capture; case "Capture": return Cursor.Capture;
case "Harvest": return Cursor.Attack; // TODO: special harvest cursor? case "Harvest": return Cursor.Attack; // TODO: special harvest cursor?

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

@@ -34,7 +34,7 @@ namespace OpenRa.Game.Traits
if (underCursor != null if (underCursor != null
&& underCursor.Owner == self.Owner && underCursor.Owner == self.Owner
&& underCursor.traits.Contains<AcceptsOre>() && !IsEmpty) && underCursor.traits.Contains<AcceptsOre>() && !IsEmpty)
return new Order("Enter", self, underCursor, int2.Zero, null); return new Order("Deliver", self, underCursor, int2.Zero, null);
if (underCursor == null && Rules.Map.ContainsResource(xy)) if (underCursor == null && Rules.Map.ContainsResource(xy))
return new Order("Harvest", self, null, xy, null); return new Order("Harvest", self, null, xy, null);
@@ -50,7 +50,7 @@ namespace OpenRa.Game.Traits
self.QueueActivity(new Move(order.TargetLocation, 0)); self.QueueActivity(new Move(order.TargetLocation, 0));
self.QueueActivity(new Harvest()); self.QueueActivity(new Harvest());
} }
else if (order.OrderString == "Enter") else if (order.OrderString == "Deliver")
{ {
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new DeliverOre(order.TargetActor)); self.QueueActivity(new DeliverOre(order.TargetActor));