Remove the setting of tanya's stance to "HoldFire" in all missions

This commit is contained in:
abcdefg30
2016-07-12 19:38:09 +02:00
parent aec6bb295a
commit 21f504fed9
5 changed files with 5 additions and 16 deletions

View File

@@ -13,7 +13,6 @@ SendInsertionHelicopter = function()
TanyaReinforcements, InsertionPath, { InsertionEntry.Location })[2] TanyaReinforcements, InsertionPath, { InsertionEntry.Location })[2]
local tanya = passengers[1] local tanya = passengers[1]
Trigger.OnKilled(tanya, TanyaKilledInAction) Trigger.OnKilled(tanya, TanyaKilledInAction)
tanya.Stance = "HoldFire"
Trigger.AfterDelay(DateTime.Seconds(4), function() Trigger.AfterDelay(DateTime.Seconds(4), function()
Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya") Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya")
end) end)

View File

@@ -13,7 +13,6 @@ if Map.LobbyOption("difficulty") == "easy" then
TanyaType = "e7" TanyaType = "e7"
else else
TanyaType = "e7.noautotarget" TanyaType = "e7.noautotarget"
ChangeStance = true
end end
IdleHunt = function(actor) IdleHunt = function(actor)
@@ -50,8 +49,7 @@ SendAlliedUnits = function()
local Artillery = Actor.Create("arty", true, { Owner = player, Location = AlliedUnitsEntry.Location }) local Artillery = Actor.Create("arty", true, { Owner = player, Location = AlliedUnitsEntry.Location })
local Tanya = Actor.Create(TanyaType, 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() Trigger.AfterDelay(DateTime.Seconds(2), function()
Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya") Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya")
end) end)

View File

@@ -24,7 +24,6 @@ if Map.LobbyOption("difficulty") == "easy" then
TanyaType = "e7" TanyaType = "e7"
else else
TanyaType = "e7.noautotarget" TanyaType = "e7.noautotarget"
ChangeStance = true
end end
IdleHunt = function(actor) IdleHunt = function(actor)
@@ -63,8 +62,7 @@ end
SetupAlliedUnits = function() SetupAlliedUnits = function()
Tanya = Actor.Create(TanyaType, true, { Owner = player, Location = TanyaWaypoint.Location, Facing = 128 }) 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() Trigger.AfterDelay(DateTime.Seconds(2), function()
Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya") Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya")
end) end)

View File

@@ -5,13 +5,11 @@ if Map.LobbyOption("difficulty") == "easy" then
SpecialCameras = true SpecialCameras = true
elseif Map.LobbyOption("difficulty") == "normal" then elseif Map.LobbyOption("difficulty") == "normal" then
TanyaType = "e7.noautotarget" TanyaType = "e7.noautotarget"
ChangeStance = true
ReinforceCash = 2250 ReinforceCash = 2250
HoldAITime = DateTime.Minutes(2) HoldAITime = DateTime.Minutes(2)
SpecialCameras = true SpecialCameras = true
else else
TanyaType = "e7.noautotarget" TanyaType = "e7.noautotarget"
ChangeStance = true
ReinforceCash = 1500 ReinforceCash = 1500
HoldAITime = DateTime.Minutes(1) + DateTime.Seconds(30) HoldAITime = DateTime.Minutes(1) + DateTime.Seconds(30)
SendWaterTransports = true SendWaterTransports = true
@@ -177,8 +175,7 @@ FreeTanya = function()
Tanya.Demolish(Prison) Tanya.Demolish(Prison)
Tanya.Move(Tanya.Location + CVec.New(Utils.RandomInteger(-1, 2), 1)) 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() Trigger.AfterDelay(DateTime.Seconds(1), function()
Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya") Media.DisplayMessage("According to the rules of engagement I need your explicit orders to fire, Commander!", "Tanya")
end) end)

View File

@@ -5,10 +5,8 @@ DeathThreshold =
} }
TanyaType = "e7" TanyaType = "e7"
TanyaStance = "AttackAnything"
if Map.LobbyOption("difficulty") ~= "easy" then if Map.LobbyOption("difficulty") ~= "easy" then
TanyaType = "e7.noautotarget" TanyaType = "e7.noautotarget"
TanyaStance = "HoldFire"
end end
RepairTriggerThreshold = RepairTriggerThreshold =
@@ -25,7 +23,7 @@ TownUnits =
TownUnit08, TownUnit09, TownUnit10, TownUnit11, TownUnit12, TownUnit13, TownUnit14, TownUnit08, TownUnit09, TownUnit10, TownUnit11, TownUnit12, TownUnit13, TownUnit14,
} }
ParabombDelay = DateTime.Seconds(30) ParabombDelay = DateTime.Seconds(30)
ParatroopersDelay = DateTime.Minutes(5) ParatroopersDelay = DateTime.Minutes(5)
Paratroopers = Paratroopers =
{ {
@@ -281,7 +279,6 @@ end
SpawnTanya = function() SpawnTanya = function()
Tanya = Actor.Create(TanyaType, true, { Owner = allies1, Location = TanyaLocation.Location }) Tanya = Actor.Create(TanyaType, true, { Owner = allies1, Location = TanyaLocation.Location })
Tanya.Stance = TanyaStance
if Map.LobbyOption("difficulty") ~= "easy" and allies1.IsLocalPlayer then if Map.LobbyOption("difficulty") ~= "easy" and allies1.IsLocalPlayer then
Trigger.AfterDelay(DateTime.Seconds(2), function() Trigger.AfterDelay(DateTime.Seconds(2), function()
@@ -360,4 +357,4 @@ WorldLoaded = function()
SetupTriggers() SetupTriggers()
SetupSoviets() SetupSoviets()
end end