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

Add ore capping to MissionUtils. Add world.CreateActor extension in MissionUtils.

Browse Source
This commit is contained in:
Scott_NZ
2013-02-04 21:38:44 +13:00
parent 9013e8376c
commit 3c5967a623
3 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,7 +147,7 @@ namespace OpenRA.Mods.RA.Missions
else if (einstein != null && einstein.Destroyed) else if (einstein != null && einstein.Destroyed)
MissionFailed("Einstein was killed."); MissionFailed("Einstein was killed.");
ManageSovietOre(); MissionUtils.CapOre(soviets);
} }
void LabSecured() void LabSecured()
@@ -173,14 +173,6 @@ namespace OpenRA.Mods.RA.Missions
} }
} }
void ManageSovietOre()
{
var res = soviets.PlayerActor.Trait<PlayerResources>();
if (res.Ore > res.OreCapacity * 0.8)
res.TakeOre(res.OreCapacity / 10);
}
void SpawnSignalFlare() void SpawnSignalFlare()
{ {
world.CreateActor(SignalFlareName, new TypeDictionary { new OwnerInit(allies), new LocationInit(extractionLZ.Location) }); world.CreateActor(SignalFlareName, new TypeDictionary { new OwnerInit(allies), new LocationInit(extractionLZ.Location) });

9
OpenRA.Mods.RA/Missions/Allies04Script.cs
View File

@@ -167,7 +167,7 @@ namespace OpenRA.Mods.RA.Missions
foreach (var patrol in patrols) foreach (var patrol in patrols)
patrol.DoPatrol(); patrol.DoPatrol();
ManageSovietOre(); MissionUtils.CapOre(soviets);
BaseGuardTick(); BaseGuardTick();
@@ -218,13 +218,6 @@ namespace OpenRA.Mods.RA.Missions
MissionFailed("The Soviet research laboratory was not secured in time."); MissionFailed("The Soviet research laboratory was not secured in time.");
} }
void ManageSovietOre()
{
var res = soviets.PlayerActor.Trait<PlayerResources>();
if (res.Ore > res.OreCapacity * 0.8)
res.TakeOre(res.OreCapacity / 10);
}
void BaseGuardTick() void BaseGuardTick()
{ {
if (baseGuardTicks <= 0 || baseGuard.IsDead() || !baseGuard.IsInWorld) return; if (baseGuardTicks <= 0 || baseGuard.IsDead() || !baseGuard.IsInWorld) return;

28
OpenRA.Mods.RA/Missions/MissionUtils.cs
View File

@@ -205,18 +205,26 @@ namespace OpenRA.Mods.RA.Missions
Sound.Play("misnlst1.aud"); Sound.Play("misnlst1.aud");
} }
public static void SpawnAndMoveActors(World world, Player player, string[] actorNames, CPos entry, CPos move, int facing) public static Actor CreateActor(this World world, bool addToWorld, string name, Player owner, CPos? location, int? facing)
{ {
foreach (var actor in actorNames) var td = new TypeDictionary { new OwnerInit(owner) };
{ if (location.HasValue)
world.CreateActor(actor, new TypeDictionary td.Add(new LocationInit(location.Value));
{ if (facing.HasValue)
new LocationInit(entry), td.Add(new FacingInit(facing.Value));
new OwnerInit(player), return world.CreateActor(addToWorld, name, td);
new FacingInit(facing)
})
.QueueActivity(new Move.Move(move));
} }
public static Actor CreateActor(this World world, string name, Player owner, CPos? location, int? facing)
{
return CreateActor(world, true, name, owner, location, facing);
}
public static void CapOre(Player player)
{
var res = player.PlayerActor.Trait<PlayerResources>();
if (res.Ore > res.OreCapacity * 0.8)
res.Ore = (int)(res.OreCapacity * 0.8);
} }
} }