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

Make Harvester conditional.

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2021-04-24 21:01:14 +03:00
committed by abcdefg30
parent cd90c70cdf
commit dcb70d12e3
6 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Activities/DeliverResources.cs
View File

@@ -43,6 +43,9 @@ namespace OpenRA.Mods.Common.Activities
public override bool Tick(Actor self)
{
if (harv.IsTraitDisabled)
Cancel(self, true);
if (IsCanceling)
return true;

2
OpenRA.Mods.Common/Activities/FindAndDeliverResources.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.Activities
public override bool Tick(Actor self)
{
if (IsCanceling)
if (IsCanceling || harv.IsTraitDisabled)
return true;
if (NextActivity != null)

3
OpenRA.Mods.Common/Activities/HarvestResource.cs
View File

@@ -53,6 +53,9 @@ namespace OpenRA.Mods.Common.Activities
public override bool Tick(Actor self)
{
if (harv.IsTraitDisabled)
Cancel(self, true);
if (IsCanceling || harv.IsFull)
return true;

6
OpenRA.Mods.Common/Activities/HarvesterDockSequence.cs
View File

@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Common.Activities
return false;
case DockingState.Drag:
if (IsCanceling || !Refinery.IsInWorld || Refinery.IsDead)
if (IsCanceling || !Refinery.IsInWorld || Refinery.IsDead || Harv.IsTraitDisabled)
return true;
dockingState = DockingState.Dock;
@@ -69,7 +69,7 @@ namespace OpenRA.Mods.Common.Activities
return false;
case DockingState.Dock:
if (!IsCanceling && Refinery.IsInWorld && !Refinery.IsDead)
if (!IsCanceling && Refinery.IsInWorld && !Refinery.IsDead && !Harv.IsTraitDisabled)
OnStateDock(self);
else
dockingState = DockingState.Undock;
@@ -77,7 +77,7 @@ namespace OpenRA.Mods.Common.Activities
return false;
case DockingState.Loop:
if (IsCanceling || !Refinery.IsInWorld || Refinery.IsDead || Harv.TickUnload(self, Refinery))
if (IsCanceling || !Refinery.IsInWorld || Refinery.IsDead || Harv.IsTraitDisabled || Harv.TickUnload(self, Refinery))
dockingState = DockingState.Undock;
return false;