From 2e2b4d04db1cd9dc400de048592d2f55711b1dd6 Mon Sep 17 00:00:00 2001 From: Scott_NZ Date: Sat, 22 Sep 2012 18:08:43 +1200 Subject: [PATCH] Small map/behaviour adjustments --- OpenRA.Mods.RA/Missions/Allies02Script.cs | 16 ++-- mods/ra/maps/allies-02/map.bin | Bin 81925 -> 81925 bytes mods/ra/maps/allies-02/map.yaml | 96 ++++++++++++++-------- 3 files changed, 69 insertions(+), 43 deletions(-) diff --git a/OpenRA.Mods.RA/Missions/Allies02Script.cs b/OpenRA.Mods.RA/Missions/Allies02Script.cs index b691f9ab43..bfd861485d 100644 --- a/OpenRA.Mods.RA/Missions/Allies02Script.cs +++ b/OpenRA.Mods.RA/Missions/Allies02Script.cs @@ -138,7 +138,7 @@ namespace OpenRA.Mods.RA.Missions const int AlliedTownTransferRange = 15; const int SovietTownAttackGroupRange = 5; - const int SovietTownMoveNearEnough = 5; + const int SovietTownMoveNearEnough = 3; void MissionFailed(string text) { @@ -195,7 +195,7 @@ namespace OpenRA.Mods.RA.Missions } if (world.FrameNumber == HintPowerTicks) { - DisplayHint("Destroy the Soviet power stations to stop enemy attacks."); + DisplayHint("Destroy the Soviet power stations to stop the attacks on the Allied reinforcements."); } reinforcementsTimer.Tick(); if (world.FrameNumber == ParatroopersTicks) @@ -258,12 +258,12 @@ namespace OpenRA.Mods.RA.Missions MissionFailed("Einstein was killed."); } world.AddFrameEndTask(w => + { + if (!world.FindAliveCombatantActorsInCircle(allies2BasePoint.CenterLocation, 20).Any(a => a.HasTrait() && !a.HasTrait() && a.Owner == allies2)) { - if (!world.FindAliveCombatantActorsInCircle(allies2BasePoint.CenterLocation, 20).Any(a => a.HasTrait() && !a.HasTrait() && a.Owner == allies2)) - { - MissionFailed("The Allied reinforcements have been defeated."); - } - }); + MissionFailed("The Allied reinforcements have been defeated."); + } + }); } void AddSovietCashIfRequired() @@ -383,7 +383,7 @@ namespace OpenRA.Mods.RA.Missions void RushSovietFlamers() { - var closestAlliedBuilding = ClosestAlliedBuilding(badgerDropPoint, 10); + var closestAlliedBuilding = ClosestAlliedBuilding(badgerDropPoint, 40); if (closestAlliedBuilding == null) { return; diff --git a/mods/ra/maps/allies-02/map.bin b/mods/ra/maps/allies-02/map.bin index 000ce05f9a9cecd79884d4c31d7be0349b439281..a3b98ef0ee756547fe248430de9e0bbab8855473 100644 GIT binary patch delta 559 zcmYLGT}YE*6h80%?2```n*+Dc+UuAtHq_R1wQ>wKr%h&Bq9|Dxf|m=#y0D;KBwfY$ zcnE{KC>az*>h=z7mET)eK~NDwPzdw3i*CE_U0rl>4u|KQ^PK0LvsQGj6`k7-KL&DP zlWQXGpJb?yM@;S(JAoWSDz9RnNOz1fgfAt<>mv#*PbbBhV4fi|6E(RmcDVwd&i<_& z4xM8-AG>Mt1p32Y;J@O=;TxLCJ$PlhMY>B74fIFF=CL^jnGBpcJeY}Aus^KBziuEi>S<;d zRy1r6=_X&ob3-x4D!4qNW9gw9qC<`~i`Wj{2Ud~p@ZrKO7p``{KqIT;=OfjoA=YEG zN+L;iNiJb_uAqL`hwnW#HQB(k-lHv&m?Vc3pL){_^A8Mk#XA*fljM{lA6H;$wjCQM zBmdPbVs%PKKCuh;oDadi2;L60oBTSu%Nq9kHc^^y!-r)rK94JfF31V>mIdUJ?=*|Z zBD+N{ya^=`e0&EVPgO!&L|eqFL{+j?$zc(*n!ZI46Xe(@TC{?!9#AG_df4Z&*d zAY~yM^x;i(lT-v&ABVYMbsD55ux#>u!?SVF&xR9!x|nAI*$M;0U!53_t&j?%q0w~P zLfFD#3#X>=2kg!m_}{q2g|HM47287EqR`eS@ho$hs7;39Zu`PO9B1G*`TMEDd{czf zCww0DV6b`r$*4;4<~w2wE?lM7Ncr%0%E0LWv&jNy@6D4l&l>Ke~YOl`HVmdOWwGxSY59)!@7Bd_u$vOpFHAsw@GQF*5i I&U@cK0>B)dH~;_u diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml index 94eca838cd..1ac1d2dbeb 100644 --- a/mods/ra/maps/allies-02/map.yaml +++ b/mods/ra/maps/allies-02/map.yaml @@ -128,7 +128,7 @@ Actors: Location: 93,86 Owner: Neutral Actor26: v12 - Location: 74,103 + Location: 79,91 Owner: Neutral Actor31: wood Location: 63,96 @@ -1051,8 +1051,8 @@ Actors: Actor123: apwr Location: 25,55 Owner: Soviets - Actor261: apwr - Location: 45,17 + Actor240: apwr + Location: 46,17 Owner: Soviets Actor124: mine Location: 49,25 @@ -1608,11 +1608,13 @@ Actors: Location: 25,91 Owner: Allies2 Actor534: 1tnk - Location: 35,97 + Location: 37,90 Owner: Allies2 - Actor546: 1tnk - Location: 34,97 + Facing: 0 + Actor398: 1tnk + Location: 36,90 Owner: Allies2 + Facing: 0 Actor457: fenc Location: 42,93 Owner: Allies2 @@ -1673,44 +1675,41 @@ Actors: Actor570: t17 Location: 18,70 Owner: Neutral - Actor572: fenc - Location: 30,78 + Actor447: fenc + Location: 43,76 Owner: Soviets Actor571: t14 Location: 26,79 Owner: Neutral - Actor573: fenc - Location: 29,78 + Actor358: fenc + Location: 30,78 Owner: Soviets - Actor574: fenc - Location: 31,77 + Actor409: fenc + Location: 43,77 Owner: Soviets - Actor575: fenc - Location: 32,77 + Actor572: fenc + Location: 42,76 Owner: Soviets - Actor576: fenc - Location: 31,78 - Owner: Soviets - Actor577: fenc - Location: 32,76 - Owner: Soviets - Actor578: fenc - Location: 33,76 - Owner: Soviets - Actor579: fenc + Actor406: fenc Location: 43,78 Owner: Soviets - Actor580: fenc - Location: 44,78 + Actor405: fenc + Location: 45,79 Owner: Soviets - Actor581: fenc - Location: 42,78 + Actor359: fenc + Location: 30,77 Owner: Soviets - Actor582: fenc - Location: 41,78 + Actor357: fenc + Location: 29,78 Owner: Soviets - Actor583: fenc - Location: 41,77 + Actor360: fenc + Location: 30,76 + Owner: Soviets + Actor361: fenc + Location: 31,76 + Owner: Soviets + Actor261: fenc + Location: 29,79 Owner: Soviets Actor584: tc04 Location: 52,70 @@ -2128,9 +2127,6 @@ Actors: Actor702: e1 Location: 74,109 Owner: Soviets - Actor703: e1 - Location: 77,110 - Owner: Soviets Actor704: e1 Location: 73,110 Owner: Soviets @@ -2248,6 +2244,36 @@ Actors: Actor40: tran.husk1 Location: 69,87 Owner: Allies1 + Actor400: fenc + Location: 44,78 + Owner: Soviets + Actor399: fenc + Location: 44,79 + Owner: Soviets + Actor575: tc05 + Location: 17,88 + Owner: Neutral + Actor573: 2tnk + Location: 34,92 + Owner: Allies2 + Facing: 0 + Actor577: v06 + Location: 75,83 + Owner: Neutral + Actor576: tc04 + Location: 15,89 + Owner: Neutral + Actor574: 2tnk + Location: 35,92 + Owner: Allies2 + Facing: 0 + Actor578: v11 + Location: 64,84 + Owner: Neutral + Actor546: 1tnk + Location: 38,90 + Owner: Allies2 + Facing: 0 Smudges: