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

Rebased. (+1 squashed commits)

Browse Source 
Squashed commits:

[43010a0] Fixes. (+1 squashed commits)

Squashed commits:

[94ee90e] Fixes. (+1 squashed commits)

Squashed commits:

[ef827c7] Style cop updates. Updates to LevelUp, Cloak, and UnitUpgrade to allow multiple units within range, plus maximum extra unit limit. (+1 squashed commits)

Squashed commits:

[2103b01] Dupe crate action updates and fixes. (+2 squashed commit)

Squashed commit:

[0f4df4a] Added DuplicateUnitCrateAction.

[2787fa1] Clarity update. (+1 squashed commits)

Squashed commits:

[93ddc3b] Crate updates.
+Multiple units per crate allowed.
+Allow time delay on crate actions.
This commit is contained in:
UberWaffe
2014-07-10 20:55:02 +02:00
parent 582c1016e9
commit 94b1f53ebf
16 changed files with 374 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs
View File

@@ -16,36 +16,40 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Crates
{
[Desc("Spawns units when collected.")]
class GiveUnitCrateActionInfo : CrateActionInfo
{
[Desc("The list of units to spawn.")]
[ActorReference]
[Desc("Unit to give")]
public readonly string Unit = null;
[Desc("Override the owner of the newly spawned unit: e.g Creeps or Neutral")]
public readonly string Owner = null;
public readonly string[] Units = { };
[Desc("Races that are allowed to trigger this action")]
public readonly string[] Race = null;
public readonly string[] Race = { };
[Desc("Override the owner of the newly spawned unit: e.g. Creeps or Neutral")]
public readonly string Owner = null;
public override object Create(ActorInitializer init) { return new GiveUnitCrateAction(init.self, this); }
}
class GiveUnitCrateAction : CrateAction
{
GiveUnitCrateActionInfo Info;
public readonly GiveUnitCrateActionInfo Info;
readonly List<CPos> usedCells = new List<CPos>();
public GiveUnitCrateAction(Actor self, GiveUnitCrateActionInfo info)
: base(self, info) { Info = info; }
public bool CanGiveTo(Actor collector)
{
if (Info.Race != null && !Info.Race.Contains(collector.Owner.Country.Race))
if (Info.Race.Any() && !Info.Race.Contains(collector.Owner.Country.Race))
return false;
// avoid dumping tanks in the sea, and ships on dry land.
if (!GetSuitableCells(collector.Location).Any())
return false;
foreach (string unit in Info.Units)
{
// avoid dumping tanks in the sea, and ships on dry land.
if (!GetSuitableCells(collector.Location, unit).Any()) return false;
}
return true;
}
@@ -58,21 +62,28 @@ namespace OpenRA.Mods.RA.Crates
public override void Activate(Actor collector)
{
var location = ChooseEmptyCellNear(collector);
if (location != null)
collector.World.AddFrameEndTask(
w => w.CreateActor(Info.Unit, new TypeDictionary
foreach (var u in Info.Units)
{
var unit = u; // avoiding access to modified closure
var location = ChooseEmptyCellNear(collector, unit);
if (location != null)
{
usedCells.Add(location.Value);
collector.World.AddFrameEndTask(
w => w.CreateActor(unit, new TypeDictionary
{
new LocationInit(location.Value ),
new LocationInit(location.Value),
new OwnerInit(Info.Owner ?? collector.Owner.InternalName)
}));
}
}
base.Activate(collector);
}
IEnumerable<CPos> GetSuitableCells(CPos near)
IEnumerable<CPos> GetSuitableCells(CPos near, string unitName)
{
var mi = self.World.Map.Rules.Actors[Info.Unit].Traits.Get<MobileInfo>();
var mi = self.World.Map.Rules.Actors[unitName].Traits.Get<MobileInfo>();
for (var i = -1; i < 2; i++)
for (var j = -1; j < 2; j++)
@@ -80,9 +91,9 @@ namespace OpenRA.Mods.RA.Crates
yield return near + new CVec(i, j);
}
CPos? ChooseEmptyCellNear(Actor a)
CPos? ChooseEmptyCellNear(Actor a, string unit)
{
var possibleCells = GetSuitableCells(a.Location).ToArray();
var possibleCells = GetSuitableCells(a.Location, unit).Where(c => !usedCells.Contains(c)).ToArray();
if (possibleCells.Length == 0)
return null;