From 0e8cb14099887162c30a7dab4831bd9e387f83b5 Mon Sep 17 00:00:00 2001 From: Scott_NZ Date: Wed, 2 Jan 2013 17:00:35 +1300 Subject: [PATCH] Allies 04: Give money to players after they receive mcvs --- OpenRA.Mods.RA/Missions/Allies03Script.cs | 8 ++++---- OpenRA.Mods.RA/Missions/Allies04Script.cs | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.RA/Missions/Allies03Script.cs b/OpenRA.Mods.RA/Missions/Allies03Script.cs index 4aa3331167..f806236490 100644 --- a/OpenRA.Mods.RA/Missions/Allies03Script.cs +++ b/OpenRA.Mods.RA/Missions/Allies03Script.cs @@ -168,13 +168,13 @@ namespace OpenRA.Mods.RA.Missions } if (world.FrameNumber >= ReinforcementsTicks1 && currentReinforcement1 < Reinforcements1.Length) { - if (world.FrameNumber == ReinforcementsTicks1) { Sound.Play("reinfor1.aud"); } - if (world.FrameNumber % 25 == 0) { SpawnAlliedUnit(Reinforcements1[currentReinforcement1++]); } + if (world.FrameNumber == ReinforcementsTicks1) Sound.Play("reinfor1.aud"); + if (world.FrameNumber % 25 == 0) SpawnAlliedUnit(Reinforcements1[currentReinforcement1++]); } if (world.FrameNumber >= ReinforcementsTicks2 && currentReinforcement2 < Reinforcements2.Length) { - if (world.FrameNumber == ReinforcementsTicks2) { Sound.Play("reinfor1.aud"); } - if (world.FrameNumber % 25 == 0) { SpawnAlliedUnit(Reinforcements2[currentReinforcement2++]); } + if (world.FrameNumber == ReinforcementsTicks2) Sound.Play("reinfor1.aud"); + if (world.FrameNumber % 25 == 0) SpawnAlliedUnit(Reinforcements2[currentReinforcement2++]); } if (sovietParadrops > 0) { diff --git a/OpenRA.Mods.RA/Missions/Allies04Script.cs b/OpenRA.Mods.RA/Missions/Allies04Script.cs index 9c5c886527..bfa3fec642 100644 --- a/OpenRA.Mods.RA/Missions/Allies04Script.cs +++ b/OpenRA.Mods.RA/Missions/Allies04Script.cs @@ -248,6 +248,14 @@ namespace OpenRA.Mods.RA.Missions } lst.QueueActivity(new Move.Move(reinforcementsUnloadPoint.Location)); lst.QueueActivity(new Wait(10)); + lst.QueueActivity(new CallFunc(() => + { + allies1.PlayerActor.Trait().GiveCash(allies1 == allies2 ? 5000 : 2500); + if (allies1 != allies2) + { + allies2.PlayerActor.Trait().GiveCash(2500); + } + })); lst.QueueActivity(new UnloadCargo(true)); lst.QueueActivity(new Wait(10)); 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"); OnObjectivesUpdated(false); SetupSubStances(); + var res = allies1.PlayerActor.Trait(); + res.TakeOre(res.Ore); + res.TakeCash(res.Cash); + if (allies1 != allies2) + { + res = allies2.PlayerActor.Trait(); + res.TakeOre(res.Ore); + res.TakeCash(res.Cash); + } Game.MoveViewport(lstEntryPoint.Location.ToFloat2()); MissionUtils.PlayMissionMusic(); }