Merge pull request #11636 from abcdefg30/noGuard

Don't allow tanya to automatically target, but allow her to move within a attack-moving/guarding group

mods/ra/maps/allies-01/allies01.lua

@@ -13,7 +13,9 @@ 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)
 end
 
 SendJeeps = function()

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
+	if TanyaType == "e7.noautotarget" then
-		Tanya.Stance = "HoldFire"
 		Trigger.AfterDelay(DateTime.Seconds(2), function()
 			Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya")
 		end)

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
+	if TanyaType == "e7.noautotarget" then
-		Tanya.Stance = "HoldFire"
 		Trigger.AfterDelay(DateTime.Seconds(2), function()
 			Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya")
 		end)

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
+	if TanyaType == "e7.noautotarget" then
-		Tanya.Stance = "HoldFire"
 		Trigger.AfterDelay(DateTime.Seconds(1), function()
 			Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya")
 		end)

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 =
@@ -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()

mods/ra/rules/campaign-rules.yaml

@@ -29,9 +29,7 @@ World:
 
 E7.noautotarget:
 	Inherits: E7
-	AutoTarget:
+	-AutoTarget:
-		EnableStances: false
-	-AttackMove:
 	RenderSprites:
 		Image: E7