From a8ac807f7592db2870437b5afe8c2ff27a3e3c6d Mon Sep 17 00:00:00 2001 From: Gunter Labes Date: Thu, 2 Feb 2006 01:19:37 +0000 Subject: [PATCH] removed Island of the Horatii (1v1v1Hex will be renamed to it) revised all multiplayer scenarios: * removed useless keys (enemies=, gold=100, fog=yes) * added/changed the team_name --- data/maps/multiplayer/3p_1v1v1Hex | 9 +++-- .../maps/multiplayer/3p_Island_of_the_Horatii | 21 ------------ data/scenarios/multiplayer/2p_Blitz.cfg | 5 +-- data/scenarios/multiplayer/2p_Charge.cfg | 5 +-- .../multiplayer/2p_Cynsaun_Battlefield.cfg | 5 +-- data/scenarios/multiplayer/2p_Den_of_Onis.cfg | 7 ++-- .../multiplayer/2p_Divide_and_Conquer.cfg | 7 ++-- data/scenarios/multiplayer/2p_Hamlets.cfg | 7 ++-- .../multiplayer/2p_Hornshark_Island.cfg | 7 ++-- data/scenarios/multiplayer/2p_Meteor_Lake.cfg | 7 ++-- .../multiplayer/2p_Sablestone_Delta.cfg | 7 ++-- .../multiplayer/2p_Silverhead_Crossing.cfg | 7 ++-- .../scenarios/multiplayer/2p_Sullas_Ruins.cfg | 7 ++-- data/scenarios/multiplayer/2p_Wesbowl.cfg | 5 +-- data/scenarios/multiplayer/3p_1v1v1Hex.cfg | 17 +++++----- .../multiplayer/3p_Island_of_the_Horatii.cfg | 33 ------------------- data/scenarios/multiplayer/3p_Morituri.cfg | 9 +++-- .../scenarios/multiplayer/3p_Triple_Blitz.cfg | 9 +++-- .../multiplayer/4p_Bluewater_Province.cfg | 5 --- .../multiplayer/4p_CastleHoppingIsle.cfg | 7 ++-- data/scenarios/multiplayer/4p_Clash.cfg | 15 +++------ .../multiplayer/4p_King_of_the_Hill.cfg | 19 +++-------- data/scenarios/multiplayer/4p_Lagoon.cfg | 7 +--- data/scenarios/multiplayer/4p_Loris_River.cfg | 21 ++++-------- data/scenarios/multiplayer/4p_Morituri.cfg | 15 +++------ .../multiplayer/4p_Paths_of_Daggers.cfg | 19 +++-------- .../multiplayer/4p_Siege_Castles.cfg | 3 +- .../multiplayer/4p_The_Wilderlands.cfg | 7 +--- .../scenarios/multiplayer/5p_ForestOfFear.cfg | 8 +++-- .../multiplayer/6p_Crusaders_Field.cfg | 21 ++++-------- data/scenarios/multiplayer/6p_Hexcake.cfg | 21 ++++-------- data/scenarios/multiplayer/6p_Smallolof.cfg | 21 ++++-------- .../scenarios/multiplayer/Random_Scenario.cfg | 2 -- .../multiplayer/Random_Scenario_Desert.cfg | 2 -- .../multiplayer/Random_Scenario_Marsh.cfg | 2 -- .../multiplayer/Random_Scenario_Winter.cfg | 2 -- 36 files changed, 118 insertions(+), 253 deletions(-) delete mode 100644 data/maps/multiplayer/3p_Island_of_the_Horatii delete mode 100644 data/scenarios/multiplayer/3p_Island_of_the_Horatii.cfg diff --git a/data/maps/multiplayer/3p_1v1v1Hex b/data/maps/multiplayer/3p_1v1v1Hex index 67d0f67c9be..95d798cb754 100644 --- a/data/maps/multiplayer/3p_1v1v1Hex +++ b/data/maps/multiplayer/3p_1v1v1Hex @@ -6,11 +6,11 @@ cZcdc/Ectk|kvcE\cTTZc cThGGwchkgrgkmwwGGhcc ccTGwYffhgrghfwYwGdcc -ccc|wwhmgvrvgmhfw|ccc +ccc|wwhmgtrvgmhfw|ccc ddcEwmfggnnnggfhcEchc -hmhEckhgvnnnvghkcEfhm -fhfEvkgrrvnvrrgktEmfh -vRmEg/rgggggggr\gEfRa +hmhEckhgvnnntghkcEfhm +fhfEvkgrrtnvrrgktEmfh +tRmEg/rgggggggr\gEfRa RCRRrgkkhfmfhkkgrRRCR C3CREEtchfhwmcvEERC2C CCCRfmEEcwYwwEEfmRCCC @@ -19,4 +19,3 @@ CCCRfmEEcwYwwEEfmRCCC cccchTccd ccZcc c - diff --git a/data/maps/multiplayer/3p_Island_of_the_Horatii b/data/maps/multiplayer/3p_Island_of_the_Horatii deleted file mode 100644 index 95d798cb754..00000000000 --- a/data/maps/multiplayer/3p_Island_of_the_Horatii +++ /dev/null @@ -1,21 +0,0 @@ - CCC - aRC1CRt - mhfRRCRRhfh - cchhmfEREmfmddc - cccccfEEgrgEEhccccc -cZcdc/Ectk|kvcE\cTTZc -cThGGwchkgrgkmwwGGhcc -ccTGwYffhgrghfwYwGdcc -ccc|wwhmgtrvgmhfw|ccc -ddcEwmfggnnnggfhcEchc -hmhEckhgvnnntghkcEfhm -fhfEvkgrrtnvrrgktEmfh -tRmEg/rgggggggr\gEfRa -RCRRrgkkhfmfhkkgrRRCR -C3CREEtchfhwmcvEERC2C -CCCRfmEEcwYwwEEfmRCCC - Rafhfc\GwG/chmhtR - hmhccdGTccdhf - cccchTccd - ccZcc - c diff --git a/data/scenarios/multiplayer/2p_Blitz.cfg b/data/scenarios/multiplayer/2p_Blitz.cfg index 916868de2fa..12219f68b39 100644 --- a/data/scenarios/multiplayer/2p_Blitz.cfg +++ b/data/scenarios/multiplayer/2p_Blitz.cfg @@ -6,8 +6,7 @@ id=multiplayer_Blitz name= _ "2p - Blitz" map_data="{maps/multiplayer/2p_Blitz}" - description= _ "A duel map for super fast play. Recommended setting of 2g per village." - turns=90 + description= _ "A duel map for super fast play. Recommended setting of 2 gold per village." {DEFAULT_SCHEDULE} @@ -15,11 +14,13 @@ side=1 canrecruit=1 controller=human + team_name=north [/side] [side] side=2 canrecruit=1 controller=human + team_name=south [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/2p_Charge.cfg b/data/scenarios/multiplayer/2p_Charge.cfg index a5421a7fdae..4796cae5df3 100644 --- a/data/scenarios/multiplayer/2p_Charge.cfg +++ b/data/scenarios/multiplayer/2p_Charge.cfg @@ -6,8 +6,7 @@ id=multiplayer_Charge name= _ "2p - Charge" map_data="{maps/multiplayer/2p_Charge}" - description= _ "A duel map for super fast play. Recommended setting of 2g per village." - turns=90 + description= _ "A duel map for super fast play. Recommended setting of 2 gold per village." {DEFAULT_SCHEDULE} @@ -15,11 +14,13 @@ side=1 canrecruit=1 controller=human + team_name=north [/side] [side] side=2 canrecruit=1 controller=human + team_name=south [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/2p_Cynsaun_Battlefield.cfg b/data/scenarios/multiplayer/2p_Cynsaun_Battlefield.cfg index 28177b846e9..0b298ba1909 100644 --- a/data/scenarios/multiplayer/2p_Cynsaun_Battlefield.cfg +++ b/data/scenarios/multiplayer/2p_Cynsaun_Battlefield.cfg @@ -6,8 +6,7 @@ id=multiplayerCynsaunBattlefield name= _ "2p - Cynsaun Battlefield" map_data="{maps/multiplayer/2p_Cynsaun_Battlefield}" - description= _ "There is much to explore in this vast battlefront, designed for players who favor epic, large-scale duel matches. Recommended settings of 150 G; 1G per village." - turns=90 + description= _ "There is much to explore in this vast battlefront, designed for players who favor epic, large-scale duel matches. Recommended settings of 150 gold and 1 gold per village." {DEFAULT_SCHEDULE} @@ -15,12 +14,14 @@ side=1 canrecruit=1 controller=human + team_name=north gold=150 [/side] [side] side=2 canrecruit=1 controller=human + team_name=south gold=150 [/side] diff --git a/data/scenarios/multiplayer/2p_Den_of_Onis.cfg b/data/scenarios/multiplayer/2p_Den_of_Onis.cfg index c89bb6eb294..5e6b791c8e4 100644 --- a/data/scenarios/multiplayer/2p_Den_of_Onis.cfg +++ b/data/scenarios/multiplayer/2p_Den_of_Onis.cfg @@ -1,9 +1,8 @@ [multiplayer] id=multiplayerDenofOnis name= _ "2p - Den of Onis" - description= _ "Danger lurks around every corner in this underground battlefield, a duel map where force and subterfuge meet. Recommended settings of 2G per village." + description= _ "Danger lurks around every corner in this underground battlefield, a duel map where force and subterfuge meet. Recommended setting of 2 gold per village." map_data="{maps/multiplayer/2p_Den_of_Onis}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,12 +10,12 @@ side=1 canrecruit=1 controller=human - gold=100 + team_name=south [/side] [side] side=2 canrecruit=1 controller=human - gold=100 + team_name=north [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/2p_Divide_and_Conquer.cfg b/data/scenarios/multiplayer/2p_Divide_and_Conquer.cfg index a22c1799116..08eea2293c3 100644 --- a/data/scenarios/multiplayer/2p_Divide_and_Conquer.cfg +++ b/data/scenarios/multiplayer/2p_Divide_and_Conquer.cfg @@ -1,10 +1,9 @@ [multiplayer] id=multiplayerDivideandConquer name= _ "2p - Divide and Conquer" - description= _ "This small duel map divides the field of battle into three segments. Recommended settings of 2G per village." + description= _ "This small duel map divides the field of battle into three segments. Recommended setting of 2 goldper village." map_data="{maps/multiplayer/2p_Divide_and_Conquer}" - turns=90 {DEFAULT_SCHEDULE} @@ -12,12 +11,12 @@ side=1 canrecruit=1 controller=human - gold=100 + team_name=north [/side] [side] side=2 canrecruit=1 controller=human - gold=100 + team_name=south [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/2p_Hamlets.cfg b/data/scenarios/multiplayer/2p_Hamlets.cfg index 95e71539185..d549730fe8f 100644 --- a/data/scenarios/multiplayer/2p_Hamlets.cfg +++ b/data/scenarios/multiplayer/2p_Hamlets.cfg @@ -1,9 +1,8 @@ [multiplayer] id=multiplayerHamlets name= _ "2p - Hamlets" - description= _ "Warfare transforms the simple farms and villages of a peaceful region into a subtly parceled battlefield. Recommended settings of 2G per village." + description= _ "Warfare transforms the simple farms and villages of a peaceful region into a subtly parceled battlefield. Recommended setting of 2 gold per village." map_data="{maps/multiplayer/2p_Hamlets}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,12 +10,12 @@ side=1 canrecruit=1 controller=human - gold=100 + team_name=north [/side] [side] side=2 canrecruit=1 controller=human - gold=100 + team_name=south [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/2p_Hornshark_Island.cfg b/data/scenarios/multiplayer/2p_Hornshark_Island.cfg index d9d68ab1855..f29730ee63d 100644 --- a/data/scenarios/multiplayer/2p_Hornshark_Island.cfg +++ b/data/scenarios/multiplayer/2p_Hornshark_Island.cfg @@ -1,9 +1,8 @@ [multiplayer] id=multiplayerHornsharkIsland name= _ "2p - Hornshark Island" - description= _ "Players must navigate the dispersive terrain of this small but topographically dense island. Recommended settings of 2G per village." + description= _ "Players must navigate the dispersive terrain of this small but topographically dense island. Recommended setting of 2 gold per village." map_data="{maps/multiplayer/2p_Hornshark_Island}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,12 +10,12 @@ side=1 canrecruit=1 controller=human - gold=100 + team_name=north [/side] [side] side=2 canrecruit=1 controller=human - gold=100 + team_name=south [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/2p_Meteor_Lake.cfg b/data/scenarios/multiplayer/2p_Meteor_Lake.cfg index 589f2537484..4d8ab761492 100644 --- a/data/scenarios/multiplayer/2p_Meteor_Lake.cfg +++ b/data/scenarios/multiplayer/2p_Meteor_Lake.cfg @@ -1,9 +1,8 @@ [multiplayer] id=multiplayerMeteorLake name= _ "2p - Meteor Lake" - description= _ "Long ago, a great meteor fell from the heavens, leaving its mark on this coniferous region. Recommended settings of 2G per village." + description= _ "Long ago, a great meteor fell from the heavens, leaving its mark on this coniferous region. Recommended settings of 2 gold per village." map_data="{maps/multiplayer/2p_Meteor_Lake}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,12 +10,12 @@ side=1 canrecruit=1 controller=human - gold=100 + team_name=west [/side] [side] side=2 canrecruit=1 controller=human - gold=100 + team_name=east [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/2p_Sablestone_Delta.cfg b/data/scenarios/multiplayer/2p_Sablestone_Delta.cfg index 24bdf556d25..d68b4606f1b 100644 --- a/data/scenarios/multiplayer/2p_Sablestone_Delta.cfg +++ b/data/scenarios/multiplayer/2p_Sablestone_Delta.cfg @@ -1,9 +1,8 @@ [multiplayer] id=multiplayerSablestoneDelta name= _ "2p - Sablestone Delta" - description= _ "Two armies collide on this disjointed coastal landscape of hidden caves and jagged rivers. Recommended settings of 2G per village." + description= _ "Two armies collide on this disjointed coastal landscape of hidden caves and jagged rivers. Recommended setting of 2 gold per village." map_data="{maps/multiplayer/2p_Sablestone_Delta}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,12 +10,12 @@ side=1 canrecruit=1 controller=human - gold=100 + team_name=north [/side] [side] side=2 canrecruit=1 controller=human - gold=100 + team_name=south [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/2p_Silverhead_Crossing.cfg b/data/scenarios/multiplayer/2p_Silverhead_Crossing.cfg index 7c5f1aa2c2e..7d41980bcee 100644 --- a/data/scenarios/multiplayer/2p_Silverhead_Crossing.cfg +++ b/data/scenarios/multiplayer/2p_Silverhead_Crossing.cfg @@ -1,9 +1,8 @@ [multiplayer] id=multiplayerSilverheadCrossing name= _ "2p - Silverhead Crossing" - description= _ "Players must traverse all manner of terrain in pursuit of victory on this multi-fronted duel map. Recommended settings of 2G per village." + description= _ "Players must traverse all manner of terrain in pursuit of victory on this multi-fronted duel map. Recommended setting of 2 gold per village." map_data="{maps/multiplayer/2p_Silverhead_Crossing}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,12 +10,12 @@ side=1 canrecruit=1 controller=human - gold=100 + team_name=west [/side] [side] side=2 canrecruit=1 controller=human - gold=100 + team_name=east [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/2p_Sullas_Ruins.cfg b/data/scenarios/multiplayer/2p_Sullas_Ruins.cfg index 15312c9d74d..377c055550a 100644 --- a/data/scenarios/multiplayer/2p_Sullas_Ruins.cfg +++ b/data/scenarios/multiplayer/2p_Sullas_Ruins.cfg @@ -1,9 +1,8 @@ [multiplayer] id=multiplayerSullasRuins name= _ "2p - Sullas Ruins" - description= _ "Flooded by the seas and battered by the winter elements, only ruins, water and ice now remain in the shadow of this once mighty empire. Recommended settings of 2G per village." + description= _ "Flooded by the seas and battered by the winter elements, only ruins, water and ice now remain in the shadow of this once mighty empire. Recommended setting of 2 gold per village." map_data="{maps/multiplayer/2p_Sullas_Ruins}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,12 +10,12 @@ side=1 canrecruit=1 controller=human - gold=100 + team_name=south [/side] [side] side=2 canrecruit=1 controller=human - gold=100 + team_name=north [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/2p_Wesbowl.cfg b/data/scenarios/multiplayer/2p_Wesbowl.cfg index 25733c9a28b..e3f9800df65 100644 --- a/data/scenarios/multiplayer/2p_Wesbowl.cfg +++ b/data/scenarios/multiplayer/2p_Wesbowl.cfg @@ -1,8 +1,7 @@ [multiplayer] - id=wesbowl + id=multiplayerWesbowl name= _ "2p - Wesbowl" map_data="{maps/multiplayer/2p_Wesbowl}" - turns=20 description= _ "In Wesbowl, a player has to get any of the balls to the other player's end zone as often as possible. However, the other player can attack your units. Wesbowl is played with blunt weapons, and healers are on hand, so when units are killed, they return to that player's end zone with an injury." objectives= _ " Victory: @@ -16,11 +15,13 @@ Defeat: side=1 canrecruit=1 controller=human + team_name=west [/side] [side] side=2 canrecruit=1 controller=human + team_name=east [/side] #define WESBOWL_UNIT SIDE FACING TYPE X Y diff --git a/data/scenarios/multiplayer/3p_1v1v1Hex.cfg b/data/scenarios/multiplayer/3p_1v1v1Hex.cfg index e7cef604e5c..8271d812105 100644 --- a/data/scenarios/multiplayer/3p_1v1v1Hex.cfg +++ b/data/scenarios/multiplayer/3p_1v1v1Hex.cfg @@ -1,9 +1,10 @@ +# no idea who created this (1v1v1hex) or when, revised by Becephalus 01/06 + [multiplayer] - id=multiplayer1v1v1Hex - name= _ "3p - 1v1v1Hex" - description= _ "Three players do battle in this small, enclosed region. Recommended settings of 2G per village." - map_data="{maps/multiplayer/3p_1v1v1Hex}" - turns=90 + id=multiplayerIsland_of_the_Horatii + name= _ "3p - Island of the Horatii" + description= _ "Controlling the central island is often the key to victory in this 21x21hex 3 player free for all map. Recommended setting of 2 gold per village." + map_data="{maps/multiplayer/Island_of_the_Horatii}" {DEFAULT_SCHEDULE} @@ -11,18 +12,18 @@ side=1 canrecruit=1 controller=human - gold=100 + team_name=north [/side] [side] side=2 canrecruit=1 controller=human - gold=100 + team_name=east [/side] [side] side=3 canrecruit=1 controller=human - gold=100 + team_name=west [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/3p_Island_of_the_Horatii.cfg b/data/scenarios/multiplayer/3p_Island_of_the_Horatii.cfg deleted file mode 100644 index d8fe43ffd1a..00000000000 --- a/data/scenarios/multiplayer/3p_Island_of_the_Horatii.cfg +++ /dev/null @@ -1,33 +0,0 @@ -# no idea who created this (1v1v1hex) or when, revised by Becephalus 01/06 - -[multiplayer] - id=multiplayerIsland_of_the_Horatii - name= _ "3p - Island of the Horatii" - description= _ "Controlling the central island is often the key to victory in this 21x21hex 3p FFA map. 2gpv. 24villages." - map_data="{maps/multiplayer/3p_Island_of_the_Horatii}" - turns=90 - - {DEFAULT_SCHEDULE} - - [side] - side=1 - canrecruit=1 - controller=human - gold=100 - fog=yes - [/side] - [side] - side=2 - canrecruit=1 - controller=human - gold=100 - fog=yes - [/side] - [side] - side=3 - canrecruit=1 - controller=human - gold=100 - fog=yes - [/side] -[/multiplayer] diff --git a/data/scenarios/multiplayer/3p_Morituri.cfg b/data/scenarios/multiplayer/3p_Morituri.cfg index 1e2dd21c3e4..f98115f93e8 100644 --- a/data/scenarios/multiplayer/3p_Morituri.cfg +++ b/data/scenarios/multiplayer/3p_Morituri.cfg @@ -1,9 +1,8 @@ [multiplayer] id=multiplayer3pMorituri name= _ "3p - Morituri" - description= _ "Only one faction will emerge victorious from this tightly bordered three-player map. Recommended settings of 2G per village." + description= _ "Only one faction will emerge victorious from this tightly bordered three-player map. Recommended setting of 2 gold per village." map_data="{maps/multiplayer/3p_Morituri}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,18 +10,18 @@ side=1 canrecruit=1 controller=human - gold=100 + team_name=north [/side] [side] side=2 canrecruit=1 controller=human - gold=100 + team_name=east [/side] [side] side=3 canrecruit=1 controller=human - gold=100 + team_name=west [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/3p_Triple_Blitz.cfg b/data/scenarios/multiplayer/3p_Triple_Blitz.cfg index e8fe689a23e..9631a58c20b 100644 --- a/data/scenarios/multiplayer/3p_Triple_Blitz.cfg +++ b/data/scenarios/multiplayer/3p_Triple_Blitz.cfg @@ -1,9 +1,8 @@ [multiplayer] id=multiplayer3pTripleBlitz name= _ "3p - Triple Blitz" - description= _ "Three players come head to head on this water-cut battlefield. Recommended settings of 2G per village." + description= _ "Three players come head to head on this water-cut battlefield. Recommended setting of 2 gold per village." map_data="{maps/multiplayer/3p_Triple_Blitz}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,18 +10,18 @@ side=1 canrecruit=1 controller=human - gold=100 + team_name=north [/side] [side] side=2 canrecruit=1 controller=human - gold=100 + team_name=east [/side] [side] side=3 canrecruit=1 controller=human - gold=100 + team_name=west [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/4p_Bluewater_Province.cfg b/data/scenarios/multiplayer/4p_Bluewater_Province.cfg index 10e2c1ea5aa..9302d13335b 100644 --- a/data/scenarios/multiplayer/4p_Bluewater_Province.cfg +++ b/data/scenarios/multiplayer/4p_Bluewater_Province.cfg @@ -3,7 +3,6 @@ name= _ "4p - Blue Water Province" description= _ "It has been said that Bluewater Province has been destroyed and rebuilt some twenty times. Now, as armies once again converge on the rocky streams and snowcapped mountains of this small province, its villagers hardly seem to take notice. Recommended settings of 2 gold per village." map_data="{maps/multiplayer/4p_Bluewater_Province}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,24 +10,20 @@ side=1 canrecruit=1 controller=human - gold=100 [/side] [side] side=2 canrecruit=1 controller=human - gold=100 [/side] [side] side=3 canrecruit=1 controller=human - gold=100 [/side] [side] side=4 canrecruit=1 controller=human - gold=100 [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/4p_CastleHoppingIsle.cfg b/data/scenarios/multiplayer/4p_CastleHoppingIsle.cfg index 780f2f98410..ead108dab5e 100644 --- a/data/scenarios/multiplayer/4p_CastleHoppingIsle.cfg +++ b/data/scenarios/multiplayer/4p_CastleHoppingIsle.cfg @@ -8,8 +8,7 @@ id=multiplayer_castles name= _ "4p - Castle Hopping Isle" map_data="{maps/multiplayer/4p_CastleHoppingIsle}" - description= _ "Many closely placed and strategically located castles. Small map for fast play. Recommended setting of 2 gold per village, and players 1, 3 vs players 2, 4 for 2v2." - turns=90 + description= _ "Many closely placed and strategically located castles. Which one will you hop to? Small map for fast play. Recommended setting of 2 gold per village." {DEFAULT_SCHEDULE} @@ -17,21 +16,25 @@ side=1 canrecruit=1 controller=human + team_name=Team 1 [/side] [side] side=2 canrecruit=1 controller=human + team_name=Team 2 [/side] [side] side=3 canrecruit=1 controller=human + team_name=Team 1 [/side] [side] side=4 canrecruit=1 controller=human + team_name=Team 2 [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/4p_Clash.cfg b/data/scenarios/multiplayer/4p_Clash.cfg index 932e3133bd1..27a7920c0af 100644 --- a/data/scenarios/multiplayer/4p_Clash.cfg +++ b/data/scenarios/multiplayer/4p_Clash.cfg @@ -2,38 +2,33 @@ id=multiplayer_clash name= _ "4p - Clash" map_data="{maps/multiplayer/4p_Clash}" - description= _ "Small map for 2v2. Teams should be player 1 and 3, vs player 2 and 4. Recommended setting of 2 gold per village." - turns=90 + description= _ "Small map for 2 vs 2. Recommended setting of 2 gold per village." {DEFAULT_SCHEDULE} [side] side=1 - team_name=1 + team_name=west canrecruit=1 controller=human - fog=yes [/side] [side] side=2 - team_name=2 + team_name=east canrecruit=1 controller=human - fog=yes [/side] [side] side=3 - team_name=1 + team_name=west canrecruit=1 controller=human - fog=yes [/side] [side] side=4 - team_name=2 + team_name=east canrecruit=1 controller=human - fog=yes [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/4p_King_of_the_Hill.cfg b/data/scenarios/multiplayer/4p_King_of_the_Hill.cfg index a9a92088e3d..5c0c9e10822 100644 --- a/data/scenarios/multiplayer/4p_King_of_the_Hill.cfg +++ b/data/scenarios/multiplayer/4p_King_of_the_Hill.cfg @@ -4,42 +4,33 @@ id=multiplayerKing_of_the_Hill name= _ "4p - King of the Hill" map_data="{maps/multiplayer/4p_King_of_the_Hill}" - description= _ "Controlling the area around the central keep is very lucrative in this 36X36 4p FFA map. Can be played with teams as well. 2gpv. 36villages." - turns=90 + description= _ "Controlling the area around the central keep is very lucrative in this 36X36 4 player "free for all" map. Can be played with teams as well. There are 36 villages. Recommended setting of 2 gold per village." {DEFAULT_SCHEDULE} [side] side=1 - team_name=1 + team_name=south-west canrecruit=1 controller=human - gold=100 - fog=yes [/side] [side] side=2 - team_name=2 + team_name=south-east canrecruit=1 controller=human - gold=100 - fog=yes [/side] [side] side=3 - team_name=3 + team_name=north-east canrecruit=1 controller=human - gold=100 - fog=yes [/side] [side] side=4 - team_name=4 + team_name=north-west canrecruit=1 controller=human - gold=100 - fog=yes [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/4p_Lagoon.cfg b/data/scenarios/multiplayer/4p_Lagoon.cfg index 1237b13549d..6dd35b39a00 100644 --- a/data/scenarios/multiplayer/4p_Lagoon.cfg +++ b/data/scenarios/multiplayer/4p_Lagoon.cfg @@ -1,9 +1,8 @@ [multiplayer] id=multiplayerLagoon name= _ "4p - Lagoon" - description= _ "Four factions contend for dominance over this watery settlement. Recommended settings of 1G per village." + description= _ "Four factions contend for dominance over this watery settlement. Recommended setting of 1 gold per village." map_data="{maps/multiplayer/4p_Lagoon}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,24 +10,20 @@ side=1 canrecruit=1 controller=human - gold=100 [/side] [side] side=2 canrecruit=1 controller=human - gold=100 [/side] [side] side=3 canrecruit=1 controller=human - gold=100 [/side] [side] side=4 canrecruit=1 controller=human - gold=100 [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/4p_Loris_River.cfg b/data/scenarios/multiplayer/4p_Loris_River.cfg index 708f4d3d850..10a83f6c6a7 100644 --- a/data/scenarios/multiplayer/4p_Loris_River.cfg +++ b/data/scenarios/multiplayer/4p_Loris_River.cfg @@ -3,9 +3,8 @@ [multiplayer] id=multiplayerLoris_River name= _ "4p - Loris River" - map_data="{maps/multiplayer/Loris_River}" - description= _ "A 25x25 2v2 map centered around a river with a pair of keeps in opposite corners. Designed for 1&3 vs 2&4. 2gpv. 28villages." - turns=90 + map_data="{maps/multiplayer/4p_Loris_River}" + description= _ "A 25x25 2v2 map centered around a river with a pair of keeps in opposite corners. Designed for 1&3 vs 2&4. There are 28 villages. Recommended setting of 2 gold per village." {SECOND_WATCH} {DAWN} @@ -16,35 +15,27 @@ [side] side=1 - team_name=1 + team_name=north-west canrecruit=1 - gold=100 controller=human - fog=yes [/side] [side] side=2 - team_name=2 + team_name=south-east canrecruit=1 - gold=100 controller=human - fog=yes [/side] [side] side=3 - team_name=1 + team_name=north-west canrecruit=1 - gold=100 controller=human - fog=yes [/side] [side] side=4 - team_name=2 + team_name=south-east canrecruit=1 - gold=100 controller=human - fog=yes [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/4p_Morituri.cfg b/data/scenarios/multiplayer/4p_Morituri.cfg index dfeff2d41c0..4996430bd28 100644 --- a/data/scenarios/multiplayer/4p_Morituri.cfg +++ b/data/scenarios/multiplayer/4p_Morituri.cfg @@ -2,38 +2,33 @@ id=multiplayer_morituri name= _ "4p - Morituri" map_data="{maps/multiplayer/4p_Morituri}" - description= _ "Who will emerge from the confines of this perilous battlefield? Recommended settings of 2G per village." - turns=90 + description= _ "Who will emerge from the confines of this perilous battlefield? Recommended settings of 2 gold per village." {DEFAULT_SCHEDULE} [side] side=1 - team_name=1 + team_name=north canrecruit=1 controller=human - fog=yes [/side] [side] side=2 - team_name=2 + team_name=south canrecruit=1 controller=human - fog=yes [/side] [side] side=3 - team_name=2 + team_name=south canrecruit=1 controller=human - fog=yes [/side] [side] side=4 - team_name=1 + team_name=north canrecruit=1 controller=human - fog=yes [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/4p_Paths_of_Daggers.cfg b/data/scenarios/multiplayer/4p_Paths_of_Daggers.cfg index 82fea07e62c..9893725b00d 100644 --- a/data/scenarios/multiplayer/4p_Paths_of_Daggers.cfg +++ b/data/scenarios/multiplayer/4p_Paths_of_Daggers.cfg @@ -4,42 +4,33 @@ id=multiplayerPaths_of_Daggers name= _ "4p - Paths of Daggers" map_data="{maps/multiplayer/Paths_of_Daggers}" - description= _ "A 35X27 2v2 map with five separate paths of engagement. Balanced to be played east vs west (1&3 vs 2&4), but works well with any teams or FFA. 2gpv. 28villages." - turns=90 + description= _ "A 35X27 2 vs. 2 map with five separate paths of engagement. Balanced to be played east vs west (1&3 vs 2&4), but works well with any teams or FFA. 2gpv. 28villages." {DEFAULT_SCHEDULE} [side] side=1 - team_name=1 + team_name=east canrecruit=1 controller=human - gold=100 - fog=yes [/side] [side] side=2 - team_name=2 + team_name=west canrecruit=1 controller=human - gold=100 - fog=yes [/side] [side] side=3 - team_name=1 + team_name=east canrecruit=1 controller=human - gold=100 - fog=yes [/side] [side] side=4 - team_name=2 + team_name=west canrecruit=1 controller=human - gold=100 - fog=yes [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/4p_Siege_Castles.cfg b/data/scenarios/multiplayer/4p_Siege_Castles.cfg index dee1f57a77a..b874e501f54 100644 --- a/data/scenarios/multiplayer/4p_Siege_Castles.cfg +++ b/data/scenarios/multiplayer/4p_Siege_Castles.cfg @@ -6,8 +6,7 @@ id=multiplayer_castles name= _ "4p - Siege Castles" map_data="{maps/multiplayer/4p_Siege_Castles}" - description= _ "Take control of this huge river delta." - turns=90 + description= _ "Take control of this huge river delta in a team battle or in a free for all." {DEFAULT_SCHEDULE} diff --git a/data/scenarios/multiplayer/4p_The_Wilderlands.cfg b/data/scenarios/multiplayer/4p_The_Wilderlands.cfg index 7377324e8bc..78b9d86ee20 100644 --- a/data/scenarios/multiplayer/4p_The_Wilderlands.cfg +++ b/data/scenarios/multiplayer/4p_The_Wilderlands.cfg @@ -1,9 +1,8 @@ [multiplayer] id=multiplayerTheWilderlands name= _ "4p - The Wilderlands" - description= _ "A vast region of wild, untamed wilderness, its terrain dotted with forests, caves, rivers, and the ruins of ancient fortresses. Recommended settings of 1G per village." + description= _ "A vast region of wild, untamed wilderness, its terrain dotted with forests, caves, rivers, and the ruins of ancient fortresses. Recommended setting of 1 gold per village." map_data="{maps/multiplayer/4p_The_Wilderlands}" - turns=90 {DEFAULT_SCHEDULE} @@ -11,24 +10,20 @@ side=1 canrecruit=1 controller=human - gold=100 [/side] [side] side=2 canrecruit=1 controller=human - gold=100 [/side] [side] side=3 canrecruit=1 controller=human - gold=100 [/side] [side] side=4 canrecruit=1 controller=human - gold=100 [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/5p_ForestOfFear.cfg b/data/scenarios/multiplayer/5p_ForestOfFear.cfg index 13423c50c57..45bea4d4f8d 100644 --- a/data/scenarios/multiplayer/5p_ForestOfFear.cfg +++ b/data/scenarios/multiplayer/5p_ForestOfFear.cfg @@ -1,9 +1,8 @@ [multiplayer] - id=forest_fear + id=multiplayerForestofFear name= _ "5p - Forest of Fear" map_data="{maps/multiplayer/5p_ForestofFear}" description= _ "In this mixed landscape, five armies battle for supremacy." - turns=90 {DEFAULT_SCHEDULE} @@ -11,26 +10,31 @@ side=1 canrecruit=1 controller=human + team_name=north [/side] [side] side=2 canrecruit=1 controller=human + team_name=west [/side] [side] side=3 canrecruit=1 controller=human + team_name=south-east [/side] [side] side=4 canrecruit=1 controller=human + team_name=north-east [/side] [side] side=5 canrecruit=1 controller=human + team_name=south [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/6p_Crusaders_Field.cfg b/data/scenarios/multiplayer/6p_Crusaders_Field.cfg index cfe117835ec..cd01398fd16 100644 --- a/data/scenarios/multiplayer/6p_Crusaders_Field.cfg +++ b/data/scenarios/multiplayer/6p_Crusaders_Field.cfg @@ -2,52 +2,45 @@ id=multiplayerCrusadersField name= _ "6p - Crusaders' Field" map_data="{maps/multiplayer/6p_Crusaders_Field}" - description= _ "The rallying cries of battle can once again be heard on this time-worn field of war, where the ghosts of thousands of brave warriors float invisibly through the mountains, trees and rivers. Recommended settings of 1G per village." - turns=90 + description= _ "The rallying cries of battle can once again be heard on this time-worn field of war, where the ghosts of thousands of brave warriors float invisibly through the mountains, trees and rivers. Recommended setting of 1 gold per village." {DEFAULT_SCHEDULE} [side] side=1 - team_name=1 + team_name=Team 1 canrecruit=1 controller=human - fog=yes [/side] [side] side=2 - team_name=2 + team_name=Team 2 canrecruit=1 controller=human - fog=yes [/side] [side] side=3 - team_name=1 + team_name=Team 1 canrecruit=1 controller=human - fog=yes [/side] [side] side=4 - team_name=2 + team_name=Team 2 canrecruit=1 controller=human - fog=yes [/side] [side] side=5 - team_name=1 + team_name=Team 1 canrecruit=1 controller=human - fog=yes [/side] [side] side=6 - team_name=2 + team_name=Team 2 canrecruit=1 controller=human - fog=yes [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/6p_Hexcake.cfg b/data/scenarios/multiplayer/6p_Hexcake.cfg index 504c6e70321..93a2c1cceac 100644 --- a/data/scenarios/multiplayer/6p_Hexcake.cfg +++ b/data/scenarios/multiplayer/6p_Hexcake.cfg @@ -1,53 +1,46 @@ [multiplayer] - id=Hexcake + id=multiplayerHexcake name= _ "6p - Hexcake" map_data="{maps/multiplayer/6p_Hexcake}" description= _ "2 vs. 2 or 3 vs. 3 team game." - turns=90 {DEFAULT_SCHEDULE} [side] side=1 - team_name=1 + team_name=north-east canrecruit=1 controller=human - fog=yes [/side] [side] side=2 - team_name=2 + team_name=south-west canrecruit=1 controller=human - fog=yes [/side] [side] side=3 - team_name=1 + team_name=north-east canrecruit=1 controller=human - fog=yes [/side] [side] side=4 - team_name=2 + team_name=south-west canrecruit=1 controller=human - fog=yes [/side] [side] side=5 - team_name=1 + team_name=north-east canrecruit=1 controller=human - fog=yes [/side] [side] side=6 - team_name=2 + team_name=south-west canrecruit=1 controller=human - fog=yes [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/6p_Smallolof.cfg b/data/scenarios/multiplayer/6p_Smallolof.cfg index 3a832db593c..aafaaf2a5b3 100644 --- a/data/scenarios/multiplayer/6p_Smallolof.cfg +++ b/data/scenarios/multiplayer/6p_Smallolof.cfg @@ -1,53 +1,46 @@ [multiplayer] id=Smallolof name= _ "6p - Smallolof" - description= _ "Only a true tactician will survive in this deadly and confining battlefield, where six boxed-in armies come to a head. Recommended settings of 2 gold per village." + description= _ "Only a true tactician will survive in this deadly and confining battlefield, where six boxed-in armies come to a head. Recommended setting of 2 gold per village." map_data="{maps/multiplayer/6p_Smallolof}" - turns=90 {DEFAULT_SCHEDULE} [side] side=1 - team_name=1 + team_name=Team 1 canrecruit=1 controller=human - fog=yes [/side] [side] side=2 - team_name=2 + team_name=Team 2 canrecruit=1 controller=human - fog=yes [/side] [side] side=3 - team_name=1 + team_name=Team 1 canrecruit=1 controller=human - fog=yes [/side] [side] side=4 - team_name=2 + team_name=Team 2 canrecruit=1 controller=human - fog=yes [/side] [side] side=5 - team_name=1 + team_name=Team 1 canrecruit=1 controller=human - fog=yes [/side] [side] side=6 - team_name=2 + team_name=Team 2 canrecruit=1 controller=human - fog=yes [/side] [/multiplayer] diff --git a/data/scenarios/multiplayer/Random_Scenario.cfg b/data/scenarios/multiplayer/Random_Scenario.cfg index 7683b82562c..05c1a099895 100644 --- a/data/scenarios/multiplayer/Random_Scenario.cfg +++ b/data/scenarios/multiplayer/Random_Scenario.cfg @@ -2,7 +2,6 @@ id=ranmap name= _ "Random map" description= _ "Randomly generated map. Note: random maps are often unbalanced, but if you have time, you can regenerate them until you get a good one." - turns=90 {DEFAULT_SCHEDULE} @@ -10,7 +9,6 @@ [generator] [scenario] name= _ "Random map" - turns=90 id=ranmap {DEFAULT_SCHEDULE} diff --git a/data/scenarios/multiplayer/Random_Scenario_Desert.cfg b/data/scenarios/multiplayer/Random_Scenario_Desert.cfg index 09da71841ef..3c3c869e0cd 100644 --- a/data/scenarios/multiplayer/Random_Scenario_Desert.cfg +++ b/data/scenarios/multiplayer/Random_Scenario_Desert.cfg @@ -1,7 +1,6 @@ [multiplayer] id=ranmap2 name= _ "Random map (Desert)" - turns=50 description= _ "A random map with sand as the primary terrain. Note: random maps are often unbalanced, but if you have time, you can regenerate them until you get a good one." {DEFAULT_SCHEDULE} @@ -10,7 +9,6 @@ [generator] [scenario] name= _ "Random map (Desert)" - turns=50 id=ranmap2 {DEFAULT_SCHEDULE} diff --git a/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg b/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg index c6aa745ac44..9eaeedf67d0 100644 --- a/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg +++ b/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg @@ -1,7 +1,6 @@ [multiplayer] id=ranmap4 name= _ "Random map (Marsh)" - turns=90 description= _ "A random map with swamp as the primary terrain. Note: random maps are often unbalanced, but if you have time, you can regenerate them until you get a good one." {DEFAULT_SCHEDULE} @@ -10,7 +9,6 @@ [generator] [scenario] name= _ "Random map (Marsh)" - turns=90 id=ranmap4 {DEFAULT_SCHEDULE} diff --git a/data/scenarios/multiplayer/Random_Scenario_Winter.cfg b/data/scenarios/multiplayer/Random_Scenario_Winter.cfg index 0e04f0fd60a..3a7d971d7c7 100644 --- a/data/scenarios/multiplayer/Random_Scenario_Winter.cfg +++ b/data/scenarios/multiplayer/Random_Scenario_Winter.cfg @@ -2,7 +2,6 @@ id=ranmap3 name= _ "Random map (Winter)" description= _ "A random map set in the break between spring and winter, mainly with snowy terrains. Note: random maps are often unbalanced, but if you have time, you can regenerate them until you get a good one." - turns=90 {DEFAULT_SCHEDULE} @@ -10,7 +9,6 @@ [generator] [scenario] name= _ "Random map (Winter)" - turns=90 id=ranmap3 {DEFAULT_SCHEDULE}