upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 15:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

update mainline for #1846

Browse Source
This commit is contained in:
gfgtdf 2017-07-26 16:41:56 +02:00
parent 77638c7b89
commit 304f480813
8 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/multiplayer/scenarios/2p_Clearing_Gushes.cfg
View File

@ -12,6 +12,8 @@
{DEFAULT_SCHEDULE} {DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST} {DEFAULT_MUSIC_PLAYLIST}
mp_village_gold=2
[side] [side]
[ai] [ai]
villages_per_scout=8 villages_per_scout=8
@ -22,7 +24,6 @@
team_name=north team_name=north
user_team_name= _ "teamname^North" user_team_name= _ "teamname^North"
gold=100 gold=100
village_gold=2
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -35,7 +36,6 @@
team_name=south team_name=south
user_team_name= _ "teamname^South" user_team_name= _ "teamname^South"
gold=100 gold=100
village_gold=2
fog=yes fog=yes
[village] [village]
x,y=2,10 x,y=2,10

4
data/multiplayer/scenarios/2p_Cynsaun_Battlefield.cfg
View File

@ -11,6 +11,8 @@
{DEFAULT_SCHEDULE} {DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST} {DEFAULT_MUSIC_PLAYLIST}
mp_village_gold=2
[side] [side]
[ai] [ai]
villages_per_scout=8 villages_per_scout=8
@ -21,7 +23,6 @@
team_name=north team_name=north
user_team_name= _ "teamname^North" user_team_name= _ "teamname^North"
gold=150 gold=150
village_gold=2
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -34,7 +35,6 @@
team_name=south team_name=south
user_team_name= _ "teamname^South" user_team_name= _ "teamname^South"
gold=150 gold=150
village_gold=2
fog=yes fog=yes
[village] [village]
x=5 x=5

10
data/multiplayer/scenarios/2p_Dark_Forecast.cfg
View File

@ -14,6 +14,8 @@ Note: You need to use the default map settings for the scenario to work right."
{DEFAULT_SCHEDULE_DAWN} {DEFAULT_SCHEDULE_DAWN}
mp_village_gold=1
[side] [side]
side=1 side=1
team_name="revolt" 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 disallow_observers=yes
no_leader=yes no_leader=yes
controller="ai" controller="ai"
village_gold=1
defeat_condition=never defeat_condition=never
[/side] [/side]
@ -35,7 +36,6 @@ Note: You need to use the default map settings for the scenario to work right."
disallow_observers=yes disallow_observers=yes
no_leader=yes no_leader=yes
controller="ai" controller="ai"
village_gold=1
[ai] [ai]
aggression=-4.0 aggression=-4.0
caution=0.99 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" user_team_name= _ "teamname^Human"
controller="human" controller="human"
save_id="Player1" save_id="Player1"
village_gold=1
gold=75 gold=75
income=0 income=0
gold_lock="true" 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" user_team_name= _ "teamname^Human"
controller="human" controller="human"
save_id="Player2" save_id="Player2"
village_gold=1
gold=75 gold=75
income=0 income=0
gold_lock="true" gold_lock="true"
@ -80,8 +78,8 @@ Note: You need to use the default map settings for the scenario to work right."
[/side] [/side]
[lua] [lua]
code = << code = <<
wesnoth.dofile("multiplayer/scenarios/2p_Dark_Forecast.lua") wesnoth.dofile("multiplayer/scenarios/2p_Dark_Forecast.lua")
>> >>
[/lua] [/lua]
[event] [event]
name=prestart name=prestart

4
data/multiplayer/scenarios/2p_The_Walls_of_Pyrennis.cfg
View File

@ -12,6 +12,8 @@
{DEFAULT_SCHEDULE} {DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST} {DEFAULT_MUSIC_PLAYLIST}
mp_village_gold=2
[side] [side]
[ai] [ai]
villages_per_scout=8 villages_per_scout=8
@ -22,7 +24,6 @@
team_name=north team_name=north
user_team_name= _ "teamname^North" user_team_name= _ "teamname^North"
gold=100 gold=100
village_gold=2
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -35,7 +36,6 @@
team_name=south team_name=south
user_team_name= _ "teamname^South" user_team_name= _ "teamname^South"
gold=100 gold=100
village_gold=2
fog=yes fog=yes
[village] [village]
x,y=5,3 x,y=5,3

6
data/multiplayer/scenarios/4p_A_New_Land.cfg
View File

@ -47,6 +47,8 @@
# Players # Players
mp_village_gold=2
[side] [side]
side=1 side=1
canrecruit=yes canrecruit=yes
@ -55,7 +57,6 @@
user_team_name= _ "teamname^Team 1" user_team_name= _ "teamname^Team 1"
team_lock=yes team_lock=yes
income_lock=yes income_lock=yes
village_gold=2
shroud=no shroud=no
fog=yes fog=yes
recruit=Peasant,Mage recruit=Peasant,Mage
@ -70,7 +71,6 @@
user_team_name= _ "teamname^Team 1" user_team_name= _ "teamname^Team 1"
team_lock=yes team_lock=yes
income_lock=yes income_lock=yes
village_gold=2
shroud=no shroud=no
fog=yes fog=yes
recruit=Peasant,Mage recruit=Peasant,Mage
@ -85,7 +85,6 @@
user_team_name= _ "teamname^Team 1" user_team_name= _ "teamname^Team 1"
team_lock=yes team_lock=yes
income_lock=yes income_lock=yes
village_gold=2
shroud=no shroud=no
fog=yes fog=yes
recruit=Peasant,Mage recruit=Peasant,Mage
@ -100,7 +99,6 @@
user_team_name= _ "teamname^Team 1" user_team_name= _ "teamname^Team 1"
team_lock=yes team_lock=yes
income_lock=yes income_lock=yes
village_gold=2
shroud=no shroud=no
fog=yes fog=yes
recruit=Peasant,Mage recruit=Peasant,Mage

7
data/multiplayer/scenarios/5p_The_Wilderlands.cfg
View File

@ -41,6 +41,8 @@
{DEFAULT_SCHEDULE} {DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST} {DEFAULT_MUSIC_PLAYLIST}
mp_village_gold=2
[side] [side]
[ai] [ai]
villages_per_scout=16 villages_per_scout=16
@ -48,7 +50,6 @@
side=1 side=1
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=2
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -58,7 +59,6 @@
side=2 side=2
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=2
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -68,7 +68,6 @@
side=3 side=3
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=2
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -78,7 +77,6 @@
side=4 side=4
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=2
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -88,7 +86,6 @@
side=5 side=5
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=2
fog=yes fog=yes
[/side] [/side]

8
data/multiplayer/scenarios/6p_Crusaders_Field.cfg
View File

@ -9,6 +9,8 @@
{DEFAULT_SCHEDULE} {DEFAULT_SCHEDULE}
{DEFAULT_MUSIC_PLAYLIST} {DEFAULT_MUSIC_PLAYLIST}
mp_village_gold=1
[side] [side]
[ai] [ai]
villages_per_scout=24 villages_per_scout=24
@ -18,7 +20,6 @@
user_team_name= _ "teamname^Team 1" user_team_name= _ "teamname^Team 1"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=1
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -30,7 +31,6 @@
user_team_name= _ "teamname^Team 2" user_team_name= _ "teamname^Team 2"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=1
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -42,7 +42,6 @@
user_team_name= _ "teamname^Team 1" user_team_name= _ "teamname^Team 1"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=1
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -54,7 +53,6 @@
user_team_name= _ "teamname^Team 2" user_team_name= _ "teamname^Team 2"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=1
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -66,7 +64,6 @@
user_team_name= _ "teamname^Team 1" user_team_name= _ "teamname^Team 1"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=1
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -78,7 +75,6 @@
user_team_name= _ "teamname^Team 2" user_team_name= _ "teamname^Team 2"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=1
fog=yes fog=yes
[/side] [/side]
[/multiplayer] [/multiplayer]

11
data/multiplayer/scenarios/9p_Merkwuerdigliebe.cfg
View File

@ -12,6 +12,8 @@
{DEFAULT_MUSIC_PLAYLIST} {DEFAULT_MUSIC_PLAYLIST}
mp_village_gold=3
[side] [side]
[ai] [ai]
villages_per_scout=36 villages_per_scout=36
@ -21,7 +23,6 @@
user_team_name= _ "teamname^North" user_team_name= _ "teamname^North"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=3
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -33,7 +34,6 @@
user_team_name= _ "teamname^Southeast" user_team_name= _ "teamname^Southeast"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=3
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -45,7 +45,6 @@
user_team_name= _ "teamname^Southwest" user_team_name= _ "teamname^Southwest"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=3
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -57,7 +56,6 @@
user_team_name= _ "teamname^Southwest" user_team_name= _ "teamname^Southwest"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=3
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -69,7 +67,6 @@
user_team_name= _ "teamname^North" user_team_name= _ "teamname^North"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=3
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -81,7 +78,6 @@
user_team_name= _ "teamname^Southeast" user_team_name= _ "teamname^Southeast"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=3
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -93,7 +89,6 @@
user_team_name= _ "teamname^Southeast" user_team_name= _ "teamname^Southeast"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=3
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -105,7 +100,6 @@
user_team_name= _ "teamname^Southwest" user_team_name= _ "teamname^Southwest"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=3
fog=yes fog=yes
[/side] [/side]
[side] [side]
@ -117,7 +111,6 @@
user_team_name= _ "teamname^North" user_team_name= _ "teamname^North"
canrecruit=yes canrecruit=yes
controller=human controller=human
village_gold=3
fog=yes fog=yes
[/side] [/side]
[/multiplayer] [/multiplayer]