From 8a7c950ac27dfd023d1e64a18bed724f7b215e2b Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sun, 27 Mar 2016 15:11:33 -0400 Subject: [PATCH] Suppress end turn confirmation in all interactive test scenarios # Conflicts: # data/ai/scenarios/scenario-formula.cfg # data/ai/scenarios/scenario-lua_ai.cfg # data/ai/scenarios/scenario-lua_ai_old_syntax.cfg # data/ai/scenarios/scenario-poisoning.cfg --- data/ai/micro_ais/scenarios/animals.cfg | 1 + data/ai/micro_ais/scenarios/bottleneck_defense.cfg | 1 + data/ai/micro_ais/scenarios/dragon.cfg | 1 + data/ai/micro_ais/scenarios/goto.cfg | 1 + data/ai/micro_ais/scenarios/guardians.cfg | 1 + data/ai/micro_ais/scenarios/hang_out.cfg | 1 + data/ai/micro_ais/scenarios/lurkers.cfg | 1 + data/ai/micro_ais/scenarios/messenger_escort.cfg | 1 + data/ai/micro_ais/scenarios/patrols.cfg | 1 + data/ai/micro_ais/scenarios/protect_unit.cfg | 2 ++ data/ai/micro_ais/scenarios/scenario_micro_ai.cfg | 1 + data/ai/micro_ais/scenarios/simple_attack.cfg | 1 + data/ai/micro_ais/scenarios/swarm.cfg | 1 + data/ai/micro_ais/scenarios/wolves.cfg | 1 + data/ai/scenarios/scenario-AI_Arena_small.cfg | 1 + data/scenario-leaders.cfg | 1 + data/scenario-movethrough.cfg | 1 + data/scenario-test.cfg | 1 + 18 files changed, 19 insertions(+) diff --git a/data/ai/micro_ais/scenarios/animals.cfg b/data/ai/micro_ais/scenarios/animals.cfg index b84c13945ee2..826e503ef9d8 100644 --- a/data/ai/micro_ais/scenarios/animals.cfg +++ b/data/ai/micro_ais/scenarios/animals.cfg @@ -36,6 +36,7 @@ [side] side=1 controller=human + suppress_end_turn_confirmation=yes hidden=no name= _ "Rutburt" id=Rutburt diff --git a/data/ai/micro_ais/scenarios/bottleneck_defense.cfg b/data/ai/micro_ais/scenarios/bottleneck_defense.cfg index 50b83d4922bf..86e96f0952a2 100644 --- a/data/ai/micro_ais/scenarios/bottleneck_defense.cfg +++ b/data/ai/micro_ais/scenarios/bottleneck_defense.cfg @@ -32,6 +32,7 @@ [side] side=2 controller=ai + suppress_end_turn_confirmation=yes type=Orcish Leader id=Big Bad Orc name= _ "Big Bad Orc" diff --git a/data/ai/micro_ais/scenarios/dragon.cfg b/data/ai/micro_ais/scenarios/dragon.cfg index 3dbd5f6022c7..9dcd7194100a 100644 --- a/data/ai/micro_ais/scenarios/dragon.cfg +++ b/data/ai/micro_ais/scenarios/dragon.cfg @@ -28,6 +28,7 @@ side=2 type=Dread Bat controller=human + suppress_end_turn_confirmation=yes id=Dreadful Bat name= _ "Dreadful Bat" diff --git a/data/ai/micro_ais/scenarios/goto.cfg b/data/ai/micro_ais/scenarios/goto.cfg index e8591376c40c..247271aae09a 100644 --- a/data/ai/micro_ais/scenarios/goto.cfg +++ b/data/ai/micro_ais/scenarios/goto.cfg @@ -16,6 +16,7 @@ [side] side=1 controller=human + suppress_end_turn_confirmation=yes hidden=no name=Vaddan id=Vaddan diff --git a/data/ai/micro_ais/scenarios/guardians.cfg b/data/ai/micro_ais/scenarios/guardians.cfg index 51ec7fc51fe1..d4b992e1c637 100644 --- a/data/ai/micro_ais/scenarios/guardians.cfg +++ b/data/ai/micro_ais/scenarios/guardians.cfg @@ -26,6 +26,7 @@ [side] side=1 controller=human + suppress_end_turn_confirmation=yes id=Kraa name= _ "Kraa" unrenamable=yes diff --git a/data/ai/micro_ais/scenarios/hang_out.cfg b/data/ai/micro_ais/scenarios/hang_out.cfg index e0e9709c5003..9776770480d7 100644 --- a/data/ai/micro_ais/scenarios/hang_out.cfg +++ b/data/ai/micro_ais/scenarios/hang_out.cfg @@ -29,6 +29,7 @@ [side] side=2 controller=human + suppress_end_turn_confirmation=yes id=Good Bandit type=Bandit x,y=16,2 diff --git a/data/ai/micro_ais/scenarios/lurkers.cfg b/data/ai/micro_ais/scenarios/lurkers.cfg index 6b9dcf002844..753f8191dcf8 100644 --- a/data/ai/micro_ais/scenarios/lurkers.cfg +++ b/data/ai/micro_ais/scenarios/lurkers.cfg @@ -181,6 +181,7 @@ [side] side=1 controller=human + suppress_end_turn_confirmation=yes id=Pekzs name= _ "Pekzs" unrenamable=yes diff --git a/data/ai/micro_ais/scenarios/messenger_escort.cfg b/data/ai/micro_ais/scenarios/messenger_escort.cfg index 87b93f5cc9a7..05529455d20f 100644 --- a/data/ai/micro_ais/scenarios/messenger_escort.cfg +++ b/data/ai/micro_ais/scenarios/messenger_escort.cfg @@ -14,6 +14,7 @@ [side] side=1 controller=human + suppress_end_turn_confirmation=yes name= _ "Vanak" id=Vanak type=Orcish Ruler diff --git a/data/ai/micro_ais/scenarios/patrols.cfg b/data/ai/micro_ais/scenarios/patrols.cfg index 7360665bdfcb..38488cbd9712 100644 --- a/data/ai/micro_ais/scenarios/patrols.cfg +++ b/data/ai/micro_ais/scenarios/patrols.cfg @@ -14,6 +14,7 @@ [side] side=1 controller=human + suppress_end_turn_confirmation=yes id=Gertburt name= _ "Gertburt" unrenamable=yes diff --git a/data/ai/micro_ais/scenarios/protect_unit.cfg b/data/ai/micro_ais/scenarios/protect_unit.cfg index 3b3c33b578d6..f5a0fa2bb00b 100644 --- a/data/ai/micro_ais/scenarios/protect_unit.cfg +++ b/data/ai/micro_ais/scenarios/protect_unit.cfg @@ -14,6 +14,7 @@ [side] side=1 controller=ai + suppress_end_turn_confirmation=yes name= _ "Langzhar" id=Langzhar type=Lieutenant @@ -29,6 +30,7 @@ [side] side=2 controller=ai + suppress_end_turn_confirmation=yes name= _ "Koorzhar" id=Koorzhar type=Lieutenant diff --git a/data/ai/micro_ais/scenarios/scenario_micro_ai.cfg b/data/ai/micro_ais/scenarios/scenario_micro_ai.cfg index 83a2e5304e37..73243324fbe0 100644 --- a/data/ai/micro_ais/scenarios/scenario_micro_ai.cfg +++ b/data/ai/micro_ais/scenarios/scenario_micro_ai.cfg @@ -14,6 +14,7 @@ [side] side=1 controller=human + suppress_end_turn_confirmation=yes id=Grnk name= _ "Grnk the Frail" gender=male diff --git a/data/ai/micro_ais/scenarios/simple_attack.cfg b/data/ai/micro_ais/scenarios/simple_attack.cfg index ef64584d5862..2daeb8fad0ad 100644 --- a/data/ai/micro_ais/scenarios/simple_attack.cfg +++ b/data/ai/micro_ais/scenarios/simple_attack.cfg @@ -13,6 +13,7 @@ [side] side=1 controller=human + suppress_end_turn_confirmation=yes id=Grospur name= _ "Grospur" type=General diff --git a/data/ai/micro_ais/scenarios/swarm.cfg b/data/ai/micro_ais/scenarios/swarm.cfg index edb37f8f76c0..0f5b8178875b 100644 --- a/data/ai/micro_ais/scenarios/swarm.cfg +++ b/data/ai/micro_ais/scenarios/swarm.cfg @@ -14,6 +14,7 @@ [side] side=1 controller=human + suppress_end_turn_confirmation=yes hidden=no name= _ "Kraa" id=Kraa diff --git a/data/ai/micro_ais/scenarios/wolves.cfg b/data/ai/micro_ais/scenarios/wolves.cfg index 7c2f9aa1a093..26b611bd1c90 100644 --- a/data/ai/micro_ais/scenarios/wolves.cfg +++ b/data/ai/micro_ais/scenarios/wolves.cfg @@ -14,6 +14,7 @@ [side] side=1 controller=human + suppress_end_turn_confirmation=yes hidden=no name=Rutburt id=Rutburt diff --git a/data/ai/scenarios/scenario-AI_Arena_small.cfg b/data/ai/scenarios/scenario-AI_Arena_small.cfg index f54708bfa5d9..a57c5c817817 100644 --- a/data/ai/scenarios/scenario-AI_Arena_small.cfg +++ b/data/ai/scenarios/scenario-AI_Arena_small.cfg @@ -104,6 +104,7 @@ type=Nightgaunt canrecruit=yes controller=human + suppress_end_turn_confirmation=yes team_name=master user_team_name= _ "team_name^AI Developer" fog=no diff --git a/data/scenario-leaders.cfg b/data/scenario-leaders.cfg index fcd2aae3de18..a66f727b0b0d 100644 --- a/data/scenario-leaders.cfg +++ b/data/scenario-leaders.cfg @@ -35,6 +35,7 @@ Ww , Ww , Ww , Ww , Ww , Ww recruit=Spearman gold=1000 controller=human + suppress_end_turn_confirmation=yes [unit] side=1 x,y=18,1 diff --git a/data/scenario-movethrough.cfg b/data/scenario-movethrough.cfg index d70de3b54bf2..44f02634535b 100644 --- a/data/scenario-movethrough.cfg +++ b/data/scenario-movethrough.cfg @@ -28,6 +28,7 @@ Uu, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Uu, Uu" [side] side=1 controller=human + suppress_end_turn_confirmation=yes fog=yes shroud=yes team_name=us diff --git a/data/scenario-test.cfg b/data/scenario-test.cfg index 614a3519b8ad..6b190616551b 100644 --- a/data/scenario-test.cfg +++ b/data/scenario-test.cfg @@ -81,6 +81,7 @@ Xu, Xu, Qxu, Qxu, Ql, Ql, Ql, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Gg, Gg, Gg, Gg, Gg [/leader] side=1 controller=human + suppress_end_turn_confirmation=yes recruit="Ghost,Troll Whelp,Assassin,Elvish Hero,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish Shaman,Red Mage,Spearman,Swordsman,Duelist,Fencer,Elvish Captain,Elvish Ranger,Elvish Shyde,Thief,Rogue,White Mage,Mage of Light,Elvish Sharpshooter,Silver Mage,Vampire Bat,Blood Bat,Dread Bat,Soulless,Walking Corpse,Fire Dragon" gold=2000 village_support=5