diff --git a/mods/cnc/maps/gdi03/gdi03.lua b/mods/cnc/maps/gdi03/gdi03.lua index a8ac4579f6..5dfb23f22c 100644 --- a/mods/cnc/maps/gdi03/gdi03.lua +++ b/mods/cnc/maps/gdi03/gdi03.lua @@ -1,6 +1,7 @@ SamSites = { Sam1, Sam2, Sam3, Sam4 } Sam4Guards = { Sam4Guard0, Sam4Guard1, Sam4Guard2, Sam4Guard3, Sam4Guard4, HiddenBuggy } NodInfantrySquad = { "e1", "e1", "e1", "e1", "e1" } +NodAttackRoutes = { { AttackWaypoint }, { AttackWaypoint }, { AttackRallypoint1, AttackRallypoint2, AttackWaypoint } } InfantryReinforcements = { "e1", "e1", "e1", "e1", "e1", "e2", "e2", "e2", "e2", "e2" } JeepReinforcements = { "jeep", "jeep", "jeep" } @@ -10,9 +11,23 @@ AttackPlayer = function() end local after = function(team) + local count = 1 + local route = Utils.Random(NodAttackRoutes) Utils.Do(team, function(actor) - actor.AttackMove(AttackWaypoint.Location) - Trigger.OnIdle(actor, actor.Hunt) + Trigger.OnIdle(actor, function() + if actor.Location == route[count].Location then + if not count == #route then + count = count + 1 + else + Trigger.ClearAll(actor) + Trigger.AfterDelay(0, function() + Trigger.OnIdle(actor, actor.Hunt) + end) + end + else + actor.AttackMove(route[count].Location) + end + end) end) Trigger.OnAllKilled(team, function() Trigger.AfterDelay(DateTime.Seconds(15), AttackPlayer) end) end diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index 897bfd57d4..4ec7a782a9 100644 --- a/mods/cnc/maps/gdi03/map.yaml +++ b/mods/cnc/maps/gdi03/map.yaml @@ -455,14 +455,6 @@ Actors: Location: 22,29 Owner: Nod Facing: 128 - MCVwaypoint: waypoint - Location: 9,60 - Owner: GDI - Health: 1 - Facing: 0 - VehicleStop: waypoint - Location: 10,55 - Owner: GDI Actor134: bggy Location: 21,29 Owner: Nod @@ -633,9 +625,6 @@ Actors: Owner: Nod Facing: 96 SubCell: 4 - InfantryStop: waypoint - Location: 14,57 - Owner: GDI Actor177: e3 Location: 14,32 Owner: Nod @@ -713,13 +702,28 @@ Actors: SubCell: 1 InfantryStart: waypoint Location: 14,61 - Owner: GDI + Owner: Neutral VehicleStart: waypoint Location: 9,61 - Owner: GDI + Owner: Neutral AttackWaypoint: waypoint Location: 6,52 Owner: Neutral + MCVwaypoint: waypoint + Location: 9,60 + Owner: Neutral + VehicleStop: waypoint + Location: 10,55 + Owner: Neutral + InfantryStop: waypoint + Location: 14,57 + Owner: Neutral + AttackRallypoint1: waypoint + Location: 43,36 + Owner: Neutral + AttackRallypoint2: waypoint + Location: 37,51 + Owner: Neutral Smudges: