From ffcdcc2831391cfa0e815a327fc1c29ae1d8ca10 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Mon, 11 Jul 2016 18:00:09 +0200 Subject: [PATCH 1/3] Add a warning about tanya not auto-targeting in allies01 --- mods/ra/maps/allies-01/allies01.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/ra/maps/allies-01/allies01.lua b/mods/ra/maps/allies-01/allies01.lua index f21db88470..21f06a9c22 100644 --- a/mods/ra/maps/allies-01/allies01.lua +++ b/mods/ra/maps/allies-01/allies01.lua @@ -14,6 +14,9 @@ SendInsertionHelicopter = function() local tanya = passengers[1] Trigger.OnKilled(tanya, TanyaKilledInAction) tanya.Stance = "HoldFire" + Trigger.AfterDelay(DateTime.Seconds(4), function() + Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya") + end) end SendJeeps = function() From aec6bb295a4e97e479626819799f7a7a777b4a21 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Tue, 12 Jul 2016 19:33:36 +0200 Subject: [PATCH 2/3] Remove AutoTarget but keep AttackMove (and Guard) on E7.noautotarget --- mods/ra/rules/campaign-rules.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mods/ra/rules/campaign-rules.yaml b/mods/ra/rules/campaign-rules.yaml index 51b59ec8d3..5ec659d5dc 100644 --- a/mods/ra/rules/campaign-rules.yaml +++ b/mods/ra/rules/campaign-rules.yaml @@ -29,9 +29,7 @@ World: E7.noautotarget: Inherits: E7 - AutoTarget: - EnableStances: false - -AttackMove: + -AutoTarget: RenderSprites: Image: E7 From 21f504fed91282cf30be7e1167ae356b97a7b459 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Tue, 12 Jul 2016 19:38:09 +0200 Subject: [PATCH 3/3] Remove the setting of tanya's stance to "HoldFire" in all missions --- mods/ra/maps/allies-01/allies01.lua | 1 - mods/ra/maps/allies-03a/allies03a.lua | 4 +--- mods/ra/maps/allies-03b/allies03b.lua | 4 +--- mods/ra/maps/allies-05a/allies05a.lua | 5 +---- mods/ra/maps/evacuation/evacuation.lua | 7 ++----- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/mods/ra/maps/allies-01/allies01.lua b/mods/ra/maps/allies-01/allies01.lua index 21f06a9c22..bf8fedbe50 100644 --- a/mods/ra/maps/allies-01/allies01.lua +++ b/mods/ra/maps/allies-01/allies01.lua @@ -13,7 +13,6 @@ SendInsertionHelicopter = function() TanyaReinforcements, InsertionPath, { InsertionEntry.Location })[2] local tanya = passengers[1] Trigger.OnKilled(tanya, TanyaKilledInAction) - tanya.Stance = "HoldFire" Trigger.AfterDelay(DateTime.Seconds(4), function() Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya") end) diff --git a/mods/ra/maps/allies-03a/allies03a.lua b/mods/ra/maps/allies-03a/allies03a.lua index 3c26514cca..c0b4930cc3 100644 --- a/mods/ra/maps/allies-03a/allies03a.lua +++ b/mods/ra/maps/allies-03a/allies03a.lua @@ -13,7 +13,6 @@ if Map.LobbyOption("difficulty") == "easy" then TanyaType = "e7" else TanyaType = "e7.noautotarget" - ChangeStance = true end IdleHunt = function(actor) @@ -50,8 +49,7 @@ SendAlliedUnits = function() local Artillery = Actor.Create("arty", true, { Owner = player, Location = AlliedUnitsEntry.Location }) local Tanya = Actor.Create(TanyaType, true, { Owner = player, Location = AlliedUnitsEntry.Location }) - if ChangeStance then - Tanya.Stance = "HoldFire" + if TanyaType == "e7.noautotarget" then Trigger.AfterDelay(DateTime.Seconds(2), function() Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya") end) diff --git a/mods/ra/maps/allies-03b/allies03b.lua b/mods/ra/maps/allies-03b/allies03b.lua index 0b1ab0cca8..fe6515ecb4 100644 --- a/mods/ra/maps/allies-03b/allies03b.lua +++ b/mods/ra/maps/allies-03b/allies03b.lua @@ -24,7 +24,6 @@ if Map.LobbyOption("difficulty") == "easy" then TanyaType = "e7" else TanyaType = "e7.noautotarget" - ChangeStance = true end IdleHunt = function(actor) @@ -63,8 +62,7 @@ end SetupAlliedUnits = function() Tanya = Actor.Create(TanyaType, true, { Owner = player, Location = TanyaWaypoint.Location, Facing = 128 }) - if ChangeStance then - Tanya.Stance = "HoldFire" + if TanyaType == "e7.noautotarget" then Trigger.AfterDelay(DateTime.Seconds(2), function() Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya") end) diff --git a/mods/ra/maps/allies-05a/allies05a.lua b/mods/ra/maps/allies-05a/allies05a.lua index c89c33169b..983f47ec80 100644 --- a/mods/ra/maps/allies-05a/allies05a.lua +++ b/mods/ra/maps/allies-05a/allies05a.lua @@ -5,13 +5,11 @@ if Map.LobbyOption("difficulty") == "easy" then SpecialCameras = true elseif Map.LobbyOption("difficulty") == "normal" then TanyaType = "e7.noautotarget" - ChangeStance = true ReinforceCash = 2250 HoldAITime = DateTime.Minutes(2) SpecialCameras = true else TanyaType = "e7.noautotarget" - ChangeStance = true ReinforceCash = 1500 HoldAITime = DateTime.Minutes(1) + DateTime.Seconds(30) SendWaterTransports = true @@ -177,8 +175,7 @@ FreeTanya = function() Tanya.Demolish(Prison) Tanya.Move(Tanya.Location + CVec.New(Utils.RandomInteger(-1, 2), 1)) - if ChangeStance then - Tanya.Stance = "HoldFire" + if TanyaType == "e7.noautotarget" then Trigger.AfterDelay(DateTime.Seconds(1), function() Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya") end) diff --git a/mods/ra/maps/evacuation/evacuation.lua b/mods/ra/maps/evacuation/evacuation.lua index f82257cbb1..0c0772ebba 100644 --- a/mods/ra/maps/evacuation/evacuation.lua +++ b/mods/ra/maps/evacuation/evacuation.lua @@ -5,10 +5,8 @@ DeathThreshold = } TanyaType = "e7" -TanyaStance = "AttackAnything" if Map.LobbyOption("difficulty") ~= "easy" then TanyaType = "e7.noautotarget" - TanyaStance = "HoldFire" end RepairTriggerThreshold = @@ -25,7 +23,7 @@ TownUnits = TownUnit08, TownUnit09, TownUnit10, TownUnit11, TownUnit12, TownUnit13, TownUnit14, } -ParabombDelay = DateTime.Seconds(30) +ParabombDelay = DateTime.Seconds(30) ParatroopersDelay = DateTime.Minutes(5) Paratroopers = { @@ -281,7 +279,6 @@ end SpawnTanya = function() Tanya = Actor.Create(TanyaType, true, { Owner = allies1, Location = TanyaLocation.Location }) - Tanya.Stance = TanyaStance if Map.LobbyOption("difficulty") ~= "easy" and allies1.IsLocalPlayer then Trigger.AfterDelay(DateTime.Seconds(2), function() @@ -360,4 +357,4 @@ WorldLoaded = function() SetupTriggers() SetupSoviets() -end \ No newline at end of file +end