From 304f4808132be803da9588dfb818cd0bf9c9044c Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Wed, 26 Jul 2017 16:41:56 +0200 Subject: [PATCH] update mainline for #1846 --- data/multiplayer/scenarios/2p_Clearing_Gushes.cfg | 4 ++-- data/multiplayer/scenarios/2p_Cynsaun_Battlefield.cfg | 4 ++-- data/multiplayer/scenarios/2p_Dark_Forecast.cfg | 10 ++++------ .../scenarios/2p_The_Walls_of_Pyrennis.cfg | 4 ++-- data/multiplayer/scenarios/4p_A_New_Land.cfg | 6 ++---- data/multiplayer/scenarios/5p_The_Wilderlands.cfg | 7 ++----- data/multiplayer/scenarios/6p_Crusaders_Field.cfg | 8 ++------ data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg | 11 ++--------- 8 files changed, 18 insertions(+), 36 deletions(-) diff --git a/data/multiplayer/scenarios/2p_Clearing_Gushes.cfg b/data/multiplayer/scenarios/2p_Clearing_Gushes.cfg index e2387eeae93..aa3924490e9 100644 --- a/data/multiplayer/scenarios/2p_Clearing_Gushes.cfg +++ b/data/multiplayer/scenarios/2p_Clearing_Gushes.cfg @@ -12,6 +12,8 @@ {DEFAULT_SCHEDULE} {DEFAULT_MUSIC_PLAYLIST} + mp_village_gold=2 + [side] [ai] villages_per_scout=8 @@ -22,7 +24,6 @@ team_name=north user_team_name= _ "teamname^North" gold=100 - village_gold=2 fog=yes [/side] [side] @@ -35,7 +36,6 @@ team_name=south user_team_name= _ "teamname^South" gold=100 - village_gold=2 fog=yes [village] x,y=2,10 diff --git a/data/multiplayer/scenarios/2p_Cynsaun_Battlefield.cfg b/data/multiplayer/scenarios/2p_Cynsaun_Battlefield.cfg index 0aa3e646d3a..d2493f31923 100644 --- a/data/multiplayer/scenarios/2p_Cynsaun_Battlefield.cfg +++ b/data/multiplayer/scenarios/2p_Cynsaun_Battlefield.cfg @@ -11,6 +11,8 @@ {DEFAULT_SCHEDULE} {DEFAULT_MUSIC_PLAYLIST} + mp_village_gold=2 + [side] [ai] villages_per_scout=8 @@ -21,7 +23,6 @@ team_name=north user_team_name= _ "teamname^North" gold=150 - village_gold=2 fog=yes [/side] [side] @@ -34,7 +35,6 @@ team_name=south user_team_name= _ "teamname^South" gold=150 - village_gold=2 fog=yes [village] x=5 diff --git a/data/multiplayer/scenarios/2p_Dark_Forecast.cfg b/data/multiplayer/scenarios/2p_Dark_Forecast.cfg index b3a87a40454..e88e395d76b 100644 --- a/data/multiplayer/scenarios/2p_Dark_Forecast.cfg +++ b/data/multiplayer/scenarios/2p_Dark_Forecast.cfg @@ -14,6 +14,8 @@ Note: You need to use the default map settings for the scenario to work right." {DEFAULT_SCHEDULE_DAWN} + mp_village_gold=1 + [side] side=1 team_name="revolt" @@ -22,7 +24,6 @@ Note: You need to use the default map settings for the scenario to work right." disallow_observers=yes no_leader=yes controller="ai" - village_gold=1 defeat_condition=never [/side] @@ -35,7 +36,6 @@ Note: You need to use the default map settings for the scenario to work right." disallow_observers=yes no_leader=yes controller="ai" - village_gold=1 [ai] aggression=-4.0 caution=0.99 @@ -52,7 +52,6 @@ Note: You need to use the default map settings for the scenario to work right." user_team_name= _ "teamname^Human" controller="human" save_id="Player1" - village_gold=1 gold=75 income=0 gold_lock="true" @@ -69,7 +68,6 @@ Note: You need to use the default map settings for the scenario to work right." user_team_name= _ "teamname^Human" controller="human" save_id="Player2" - village_gold=1 gold=75 income=0 gold_lock="true" @@ -80,8 +78,8 @@ Note: You need to use the default map settings for the scenario to work right." [/side] [lua] code = << - wesnoth.dofile("multiplayer/scenarios/2p_Dark_Forecast.lua") - >> + wesnoth.dofile("multiplayer/scenarios/2p_Dark_Forecast.lua") + >> [/lua] [event] name=prestart diff --git a/data/multiplayer/scenarios/2p_The_Walls_of_Pyrennis.cfg b/data/multiplayer/scenarios/2p_The_Walls_of_Pyrennis.cfg index 6c9d22b9c7d..c0e0be99699 100644 --- a/data/multiplayer/scenarios/2p_The_Walls_of_Pyrennis.cfg +++ b/data/multiplayer/scenarios/2p_The_Walls_of_Pyrennis.cfg @@ -12,6 +12,8 @@ {DEFAULT_SCHEDULE} {DEFAULT_MUSIC_PLAYLIST} + mp_village_gold=2 + [side] [ai] villages_per_scout=8 @@ -22,7 +24,6 @@ team_name=north user_team_name= _ "teamname^North" gold=100 - village_gold=2 fog=yes [/side] [side] @@ -35,7 +36,6 @@ team_name=south user_team_name= _ "teamname^South" gold=100 - village_gold=2 fog=yes [village] x,y=5,3 diff --git a/data/multiplayer/scenarios/4p_A_New_Land.cfg b/data/multiplayer/scenarios/4p_A_New_Land.cfg index 739d0e7787b..75cd79620f9 100644 --- a/data/multiplayer/scenarios/4p_A_New_Land.cfg +++ b/data/multiplayer/scenarios/4p_A_New_Land.cfg @@ -47,6 +47,8 @@ # Players + mp_village_gold=2 + [side] side=1 canrecruit=yes @@ -55,7 +57,6 @@ user_team_name= _ "teamname^Team 1" team_lock=yes income_lock=yes - village_gold=2 shroud=no fog=yes recruit=Peasant,Mage @@ -70,7 +71,6 @@ user_team_name= _ "teamname^Team 1" team_lock=yes income_lock=yes - village_gold=2 shroud=no fog=yes recruit=Peasant,Mage @@ -85,7 +85,6 @@ user_team_name= _ "teamname^Team 1" team_lock=yes income_lock=yes - village_gold=2 shroud=no fog=yes recruit=Peasant,Mage @@ -100,7 +99,6 @@ user_team_name= _ "teamname^Team 1" team_lock=yes income_lock=yes - village_gold=2 shroud=no fog=yes recruit=Peasant,Mage diff --git a/data/multiplayer/scenarios/5p_The_Wilderlands.cfg b/data/multiplayer/scenarios/5p_The_Wilderlands.cfg index 0514ed02026..317386b16e7 100644 --- a/data/multiplayer/scenarios/5p_The_Wilderlands.cfg +++ b/data/multiplayer/scenarios/5p_The_Wilderlands.cfg @@ -41,6 +41,8 @@ {DEFAULT_SCHEDULE} {DEFAULT_MUSIC_PLAYLIST} + mp_village_gold=2 + [side] [ai] villages_per_scout=16 @@ -48,7 +50,6 @@ side=1 canrecruit=yes controller=human - village_gold=2 fog=yes [/side] [side] @@ -58,7 +59,6 @@ side=2 canrecruit=yes controller=human - village_gold=2 fog=yes [/side] [side] @@ -68,7 +68,6 @@ side=3 canrecruit=yes controller=human - village_gold=2 fog=yes [/side] [side] @@ -78,7 +77,6 @@ side=4 canrecruit=yes controller=human - village_gold=2 fog=yes [/side] [side] @@ -88,7 +86,6 @@ side=5 canrecruit=yes controller=human - village_gold=2 fog=yes [/side] diff --git a/data/multiplayer/scenarios/6p_Crusaders_Field.cfg b/data/multiplayer/scenarios/6p_Crusaders_Field.cfg index b9b9a25dca8..febbe49116b 100644 --- a/data/multiplayer/scenarios/6p_Crusaders_Field.cfg +++ b/data/multiplayer/scenarios/6p_Crusaders_Field.cfg @@ -9,6 +9,8 @@ {DEFAULT_SCHEDULE} {DEFAULT_MUSIC_PLAYLIST} + mp_village_gold=1 + [side] [ai] villages_per_scout=24 @@ -18,7 +20,6 @@ user_team_name= _ "teamname^Team 1" canrecruit=yes controller=human - village_gold=1 fog=yes [/side] [side] @@ -30,7 +31,6 @@ user_team_name= _ "teamname^Team 2" canrecruit=yes controller=human - village_gold=1 fog=yes [/side] [side] @@ -42,7 +42,6 @@ user_team_name= _ "teamname^Team 1" canrecruit=yes controller=human - village_gold=1 fog=yes [/side] [side] @@ -54,7 +53,6 @@ user_team_name= _ "teamname^Team 2" canrecruit=yes controller=human - village_gold=1 fog=yes [/side] [side] @@ -66,7 +64,6 @@ user_team_name= _ "teamname^Team 1" canrecruit=yes controller=human - village_gold=1 fog=yes [/side] [side] @@ -78,7 +75,6 @@ user_team_name= _ "teamname^Team 2" canrecruit=yes controller=human - village_gold=1 fog=yes [/side] [/multiplayer] diff --git a/data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg b/data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg index 4ace81b3ca3..f50820ad48a 100644 --- a/data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg +++ b/data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg @@ -12,6 +12,8 @@ {DEFAULT_MUSIC_PLAYLIST} + mp_village_gold=3 + [side] [ai] villages_per_scout=36 @@ -21,7 +23,6 @@ user_team_name= _ "teamname^North" canrecruit=yes controller=human - village_gold=3 fog=yes [/side] [side] @@ -33,7 +34,6 @@ user_team_name= _ "teamname^Southeast" canrecruit=yes controller=human - village_gold=3 fog=yes [/side] [side] @@ -45,7 +45,6 @@ user_team_name= _ "teamname^Southwest" canrecruit=yes controller=human - village_gold=3 fog=yes [/side] [side] @@ -57,7 +56,6 @@ user_team_name= _ "teamname^Southwest" canrecruit=yes controller=human - village_gold=3 fog=yes [/side] [side] @@ -69,7 +67,6 @@ user_team_name= _ "teamname^North" canrecruit=yes controller=human - village_gold=3 fog=yes [/side] [side] @@ -81,7 +78,6 @@ user_team_name= _ "teamname^Southeast" canrecruit=yes controller=human - village_gold=3 fog=yes [/side] [side] @@ -93,7 +89,6 @@ user_team_name= _ "teamname^Southeast" canrecruit=yes controller=human - village_gold=3 fog=yes [/side] [side] @@ -105,7 +100,6 @@ user_team_name= _ "teamname^Southwest" canrecruit=yes controller=human - village_gold=3 fog=yes [/side] [side] @@ -117,7 +111,6 @@ user_team_name= _ "teamname^North" canrecruit=yes controller=human - village_gold=3 fog=yes [/side] [/multiplayer]