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

Merge pull request #3463 from pchote/harv-force-move

Browse Source 
Allow force-move to disable the harvest activity.
This commit is contained in:
Matthias Mailänder
2013-06-23 02:26:25 -07:00
parent b93e9a5945 efc494b859
commit 2b84dbfccf
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/Harvester.cs
View File

@@ -426,14 +426,19 @@ namespace OpenRA.Mods.RA
public bool CanTargetLocation(Actor self, CPos location, List<Actor> actorsAtLocation, TargetModifiers modifiers, ref string cursor) public bool CanTargetLocation(Actor self, CPos location, List<Actor> actorsAtLocation, TargetModifiers modifiers, ref string cursor)
{ {
if (modifiers.HasModifier(TargetModifiers.ForceMove))
return false;
// Don't leak info about resources under the shroud // Don't leak info about resources under the shroud
if (!self.Owner.Shroud.IsExplored(location)) return false; if (!self.Owner.Shroud.IsExplored(location))
return false;
var res = self.World.WorldActor.Trait<ResourceLayer>().GetResource(location); var res = self.World.WorldActor.Trait<ResourceLayer>().GetResource(location);
var info = self.Info.Traits.Get<HarvesterInfo>(); var info = self.Info.Traits.Get<HarvesterInfo>();
if (res == null) return false; if (res == null || !info.Resources.Contains(res.info.Name))
if (!info.Resources.Contains(res.info.Name)) return false; return false;
cursor = "harvest"; cursor = "harvest";
IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue); IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue);