From 7934995a8fbbbc5c9c0e913a0c2bd470000d819b Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 2 Jan 2016 16:31:01 +0100 Subject: [PATCH] Let Tanya try to attack the flame turrets in soviet07 --- mods/ra/maps/soviet-07/map.yaml | 2 +- mods/ra/maps/soviet-07/soviet07.lua | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mods/ra/maps/soviet-07/map.yaml b/mods/ra/maps/soviet-07/map.yaml index ba19361181..d1ab60dbc1 100644 --- a/mods/ra/maps/soviet-07/map.yaml +++ b/mods/ra/maps/soviet-07/map.yaml @@ -668,7 +668,7 @@ Actors: Location: 99,56 Owner: Greece SubCell: 3 - GoalGuard5: e7 + Tanya: e7 Location: 75,54 Owner: Greece Facing: 128 diff --git a/mods/ra/maps/soviet-07/soviet07.lua b/mods/ra/maps/soviet-07/soviet07.lua index 5d8343e2a5..bfab5395ae 100644 --- a/mods/ra/maps/soviet-07/soviet07.lua +++ b/mods/ra/maps/soviet-07/soviet07.lua @@ -10,7 +10,7 @@ Dogs = { Dog1, Dog2, Dog3, Dog4, Dog5, Dog6, Dog7, Dog8, Dog9, Dog10, Dog11, Dog Engineers = { Prisoner1, Prisoner2, Prisoner3, Prisoner4, Prisoner5 } PrisonerGuards = { PrisonerGuard1, PrisonerGuard2, PrisonerGuard3 } EntranceGuards = { EntranceGuard1, EntranceGuard2, EntranceGuard3, EntranceGuard4, EntranceGuard5, EntranceGuard6, EntranceGuard7, EntranceGuard8, EntranceGuard9, EntranceGuard10 } -GoalGuards = { GoalGuard1, GoalGuard2, GoalGuard3, GoalGuard4, GoalGuard5 } +GoalGuards = { GoalGuard1, GoalGuard2, GoalGuard3, GoalGuard4 } CCGuards = { CCGuard1, CCGuard2, CCGuard3, CCGuard4 } StartingUnitsReinforcements = { "e1", "e1", "e1", "e1" } @@ -79,8 +79,8 @@ end) Trigger.OnEnteredFootprint(ControlCenterEngineerTrigger, function(a, id) if not controlCenterEngineerTrigger and a.Owner == player and a.Type == "e6" then controlCenterEngineerTrigger = true - Actor.Create("ftur", true, { Owner = player, Location = FTur1Goal.Location}) - Actor.Create("ftur", true, { Owner = player, Location = FTur2Goal.Location}) + local fturA = Actor.Create("ftur", true, { Owner = player, Location = FTur1Goal.Location}) + local fturB = Actor.Create("ftur", true, { Owner = player, Location = FTur2Goal.Location}) Camera.Position = CameraGoalCenter1.CenterPosition if not cameraGoalRightTrigger then @@ -95,6 +95,11 @@ Trigger.OnEnteredFootprint(ControlCenterEngineerTrigger, function(a, id) end end) + if not Tanya.IsDead then + Tanya.Demolish(fturA) + Tanya.Demolish(fturB) + end + player.MarkCompletedObjective(sovietObjective4) end end)