Allies 04: Give money to players after they receive mcvs

This commit is contained in:
Scott_NZ
2013-01-02 17:00:35 +13:00
parent 1ec3b2ffe2
commit 0e8cb14099
2 changed files with 21 additions and 4 deletions

View File

@@ -168,13 +168,13 @@ namespace OpenRA.Mods.RA.Missions
} }
if (world.FrameNumber >= ReinforcementsTicks1 && currentReinforcement1 < Reinforcements1.Length) if (world.FrameNumber >= ReinforcementsTicks1 && currentReinforcement1 < Reinforcements1.Length)
{ {
if (world.FrameNumber == ReinforcementsTicks1) { Sound.Play("reinfor1.aud"); } if (world.FrameNumber == ReinforcementsTicks1) Sound.Play("reinfor1.aud");
if (world.FrameNumber % 25 == 0) { SpawnAlliedUnit(Reinforcements1[currentReinforcement1++]); } if (world.FrameNumber % 25 == 0) SpawnAlliedUnit(Reinforcements1[currentReinforcement1++]);
} }
if (world.FrameNumber >= ReinforcementsTicks2 && currentReinforcement2 < Reinforcements2.Length) if (world.FrameNumber >= ReinforcementsTicks2 && currentReinforcement2 < Reinforcements2.Length)
{ {
if (world.FrameNumber == ReinforcementsTicks2) { Sound.Play("reinfor1.aud"); } if (world.FrameNumber == ReinforcementsTicks2) Sound.Play("reinfor1.aud");
if (world.FrameNumber % 25 == 0) { SpawnAlliedUnit(Reinforcements2[currentReinforcement2++]); } if (world.FrameNumber % 25 == 0) SpawnAlliedUnit(Reinforcements2[currentReinforcement2++]);
} }
if (sovietParadrops > 0) if (sovietParadrops > 0)
{ {

View File

@@ -248,6 +248,14 @@ namespace OpenRA.Mods.RA.Missions
} }
lst.QueueActivity(new Move.Move(reinforcementsUnloadPoint.Location)); lst.QueueActivity(new Move.Move(reinforcementsUnloadPoint.Location));
lst.QueueActivity(new Wait(10)); lst.QueueActivity(new Wait(10));
lst.QueueActivity(new CallFunc(() =>
{
allies1.PlayerActor.Trait<PlayerResources>().GiveCash(allies1 == allies2 ? 5000 : 2500);
if (allies1 != allies2)
{
allies2.PlayerActor.Trait<PlayerResources>().GiveCash(2500);
}
}));
lst.QueueActivity(new UnloadCargo(true)); lst.QueueActivity(new UnloadCargo(true));
lst.QueueActivity(new Wait(10)); lst.QueueActivity(new Wait(10));
lst.QueueActivity(new Move.Move(reinforcementsEntryPoint.Location)); lst.QueueActivity(new Move.Move(reinforcementsEntryPoint.Location));
@@ -418,6 +426,15 @@ namespace OpenRA.Mods.RA.Missions
objectives[InfiltrateID].Text = Infiltrate.F(allies1 != allies2 ? "spies" : "spy"); objectives[InfiltrateID].Text = Infiltrate.F(allies1 != allies2 ? "spies" : "spy");
OnObjectivesUpdated(false); OnObjectivesUpdated(false);
SetupSubStances(); SetupSubStances();
var res = allies1.PlayerActor.Trait<PlayerResources>();
res.TakeOre(res.Ore);
res.TakeCash(res.Cash);
if (allies1 != allies2)
{
res = allies2.PlayerActor.Trait<PlayerResources>();
res.TakeOre(res.Ore);
res.TakeCash(res.Cash);
}
Game.MoveViewport(lstEntryPoint.Location.ToFloat2()); Game.MoveViewport(lstEntryPoint.Location.ToFloat2());
MissionUtils.PlayMissionMusic(); MissionUtils.PlayMissionMusic();
} }