tweaks and such, nod01

This commit is contained in:
Dan9550
2013-07-24 23:46:16 +10:00
parent f88c62e363
commit d59a1af272

View File

@@ -38,7 +38,6 @@ namespace OpenRA.Mods.Cnc.Missions
const string KillNikoombaText = "Find Nikoomba. Once found he must be assasinated."; const string KillNikoombaText = "Find Nikoomba. Once found he must be assasinated.";
const string LevelVillageText = "Nikoomba has met his demise, now level the village."; const string LevelVillageText = "Nikoomba has met his demise, now level the village.";
Player gdi;
Player nod; Player nod;
Actor nikoomba; Actor nikoomba;
@@ -123,7 +122,7 @@ namespace OpenRA.Mods.Cnc.Missions
} }
} }
if (!world.Actors.Any(a => (a.Owner == nod))) if (!world.Actors.Any(a => (a.Owner == nod) && a.IsInWorld && !a.IsDead()))
{ {
Action afterFMV = () => Action afterFMV = () =>
{ {
@@ -163,7 +162,6 @@ namespace OpenRA.Mods.Cnc.Missions
public void WorldLoaded(World w) public void WorldLoaded(World w)
{ {
world = w; world = w;
gdi = w.Players.Single(p => p.InternalName == "GDI");
nod = w.Players.Single(p => p.InternalName == "NOD"); nod = w.Players.Single(p => p.InternalName == "NOD");
nod.PlayerActor.Trait<PlayerResources>().Cash = 0; nod.PlayerActor.Trait<PlayerResources>().Cash = 0;
var actors = w.WorldActor.Trait<SpawnMapActors>().Actors; var actors = w.WorldActor.Trait<SpawnMapActors>().Actors;