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

Refactor cash code in Allies campaign. Adjust starting cash to 10000 in SP Allies 03

Browse Source
This commit is contained in:
Scott_NZ
2013-01-27 17:53:14 +13:00
parent 0b65735d86
commit b6b4b89008
4 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenRA.Mods.RA/Missions/Allies01Script.cs
View File

@@ -190,27 +190,15 @@ namespace OpenRA.Mods.RA.Missions
void ManageSovietUnits()
{
foreach (var unit in world.Actors.Where(a => a != world.WorldActor && a.IsInWorld && a.Owner == soviets && !a.IsDead() && a.IsIdle
foreach (var unit in world.Actors.Where(a => a.IsInWorld && a.Owner == soviets && !a.IsDead() && a.IsIdle
&& a.HasTrait<Mobile>() && a.HasTrait<AttackBase>()))
{
Activity innerActivity;
if (einstein != null)
{
if (einstein.IsInWorld)
innerActivity = new Attack(Target.FromActor(einstein), 3);
else
{
var container = world.UnitContaining(einstein);
if (container != null && !container.HasTrait<Aircraft>() && container.HasTrait<Mobile>())
innerActivity = new Attack(Target.FromActor(container), 3);
else
innerActivity = new Move.Move(extractionLZ.Location, 3);
}
unit.QueueActivity(new AttackMove.AttackMoveActivity(unit, innerActivity));
}
Activity inner;
if (einstein != null && einstein.IsInWorld)
inner = new Attack(Target.FromActor(einstein), 3);
else
inner = new Move.Move(extractionLZ.Location, 3);
unit.QueueActivity(new AttackMove.AttackMoveActivity(unit, inner));
}
}
@@ -290,6 +278,8 @@ namespace OpenRA.Mods.RA.Missions
allies = w.Players.Single(p => p.InternalName == "Allies");
soviets = w.Players.Single(p => p.InternalName == "Soviets");
allies.PlayerActor.Trait<PlayerResources>().Cash = 0;
var actors = w.WorldActor.Trait<SpawnMapActors>().Actors;
insertionLZ = actors["InsertionLZ"];
extractionLZ = actors["ExtractionLZ"];
@@ -303,10 +293,6 @@ namespace OpenRA.Mods.RA.Missions
attackEntryPoint2 = actors["SovietAttackEntryPoint2"];
SetAlliedUnitsToDefensiveStance();
var alliesRes = allies.PlayerActor.Trait<PlayerResources>();
alliesRes.TakeCash(alliesRes.Cash);
alliesRes.TakeOre(alliesRes.Ore);
Game.MoveViewport(insertionLZ.Location.ToFloat2());
if (MissionUtils.IsSingleClient(world))