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

Implement cnc harv/proc dock sequence and kill unnecessary duplication. Bad things happen if sequence is interrupted by another order (eg invisible harv).

Browse Source 
Still todo: Make sequence non-interruptible; engineer steals harv docked with proc; the "right thing" if proc is sold/destroyed with harv docked.
This commit is contained in:
Paul Chote
2010-06-16 00:30:15 +12:00
parent 5f83f97747
commit 88df9ecaa2
11 changed files with 210 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
OpenRA.Mods.RA/Activities/Drag.cs Normal file
View File

@@ -0,0 +1,55 @@
#region Copyright & License Information
/*
* Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
* This file is part of OpenRA.
*
* OpenRA is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* OpenRA is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with OpenRA. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using System.Linq;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
namespace OpenRA.Mods.RA.Activities
{
public class Drag : IActivity
{
public IActivity NextActivity { get; set; }
float2 endLocation;
float2 startLocation;
int length;
public Drag(float2 start, float2 end, int length)
{
startLocation = start;
endLocation = end;
this.length = length;
}
int ticks = 0;
public IActivity Tick( Actor self )
{
self.CenterLocation = float2.Lerp(startLocation, endLocation, (float)ticks/(length-1));
if (++ticks >= length)
return NextActivity;
return this;
}
public void Cancel(Actor self) { }
}
}

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

@@ -37,9 +37,14 @@ namespace OpenRA.Mods.RA
public object Create(Actor self) { return new Harvester(self, this); }
}
public class Harvester : IIssueOrder, IResolveOrder, INotifyDamage, IPips
public class Harvester : IIssueOrder, IResolveOrder, INotifyDamage, IPips, IRenderModifier
{
Dictionary<ResourceTypeInfo, int> contents = new Dictionary<ResourceTypeInfo, int>();
[Sync]
public bool Visible = true;
[Sync]
public Actor LinkedProc = null;
readonly HarvesterInfo Info;
@@ -180,5 +185,10 @@ namespace OpenRA.Mods.RA
yield return PipType.Transparent;
}
}
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
{
return Visible ? r : new Renderable[] { };
}
}
}

2
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -180,6 +180,8 @@
<Compile Include="GivesExperience.cs" />
<Compile Include="Invulnerable.cs" />
<Compile Include="ReplaceWithActor.cs" />
<Compile Include="OreRefineryDockAction.cs" />
<Compile Include="Activities\Drag.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

36
OpenRA.Mods.RA/OreRefinery.cs
View File

@@ -31,6 +31,7 @@ namespace OpenRA.Mods.RA
{
public readonly int PipCount = 0;
public readonly PipType PipColor = PipType.Red;
public readonly int2 DockOffset = new int2 (1, 2);
public readonly int Capacity = 0;
public readonly int ProcessTick = 25;
public readonly int ProcessAmount = 50;
@@ -41,7 +42,7 @@ namespace OpenRA.Mods.RA
}
}
class OreRefinery : ITick, IAcceptOre, INotifyDamage, INotifySold, INotifyCapture, IPips
class OreRefinery : ITick, IAcceptOre, INotifyDamage, INotifySold, INotifyCapture, IPips, ITraitPrerequisite<IAcceptOreDockAction>
{
readonly Actor self;
readonly OreRefineryInfo Info;
@@ -102,42 +103,31 @@ namespace OpenRA.Mods.RA
}
foreach (var harv in LinkedHarv)
harv.traits.Get<Harvester> ().UnlinkProc (harv, self);
harv.traits.Get<Harvester> ().UnlinkProc(harv, self);
}
}
public int2 DeliverOffset {get{ return new int2 (1, 2); }}
public int2 DeliverOffset {get{ return Info.DockOffset; }}
public void OnDock (Actor harv, DeliverResources dockOrder)
{
var unit = harv.traits.Get<Unit> ();
if (unit.Facing != 64)
harv.QueueActivity (new Turn (64));
harv.QueueActivity (new CallFunc (() =>
{
var renderUnit = harv.traits.Get<RenderUnit> ();
if (renderUnit.anim.CurrentSequence.Name != "empty")
renderUnit.PlayCustomAnimation (harv, "empty", () =>
{
harv.traits.Get<Harvester> ().Deliver (harv, self);
harv.QueueActivity (new Harvest ());
});
}));
self.traits.Get<IAcceptOreDockAction>().OnDock(self, harv, dockOrder);
}
public void OnCapture (Actor self, Actor captor)
{
// Todo: Do the right thing if a harv is docked
// Unlink any other harvs
{
// Unlink any non-docked harvs
foreach (var harv in LinkedHarv)
harv.traits.Get<Harvester> ().UnlinkProc (harv, self);
{
if (harv.Owner == self.Owner)
harv.traits.Get<Harvester>().UnlinkProc (harv, self);
}
}
public void Selling (Actor self) {}
public void Sold (Actor self)
{
foreach (var harv in LinkedHarv)
harv.traits.Get<Harvester> ().UnlinkProc (harv, self);
harv.traits.Get<Harvester>().UnlinkProc (harv, self);
}
public IEnumerable<PipType> GetPips (Actor self)

52
OpenRA.Mods.RA/OreRefineryDockAction.cs Normal file
View File

@@ -0,0 +1,52 @@
#region Copyright & License Information
/*
* Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
* This file is part of OpenRA.
*
* OpenRA is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* OpenRA is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with OpenRA. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using System;
using System.Linq;
using System.Collections.Generic;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
namespace OpenRA.Mods.RA
{
class OreRefineryDockActionInfo : TraitInfo<OreRefineryDockAction> {}
class OreRefineryDockAction : IAcceptOreDockAction
{
public void OnDock(Actor self, Actor harv, DeliverResources dockOrder)
{
var unit = harv.traits.Get<Unit>();
if (unit.Facing != 64)
harv.QueueActivity (new Turn (64));
harv.QueueActivity (new CallFunc (() =>
{
var renderUnit = harv.traits.Get<RenderUnit> ();
if (renderUnit.anim.CurrentSequence.Name != "empty")
renderUnit.PlayCustomAnimation (harv, "empty", () =>
{
harv.traits.Get<Harvester>().Deliver(harv, self);
harv.QueueActivity (new Harvest ());
});
}));
}
}
}

5
OpenRA.Mods.RA/TraitsInterfaces.cs
View File

@@ -30,4 +30,9 @@ namespace OpenRA.Mods.RA
void UnlinkHarvester(Actor self, Actor harv);
int2 DeliverOffset { get; }
}
public interface IAcceptOreDockAction
{
void OnDock(Actor self, Actor harv, DeliverResources dockOrder);
}
}