From be366af5237d65a71035a535dd133d2e2313585d Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Wed, 18 Jun 2014 17:24:42 -0500 Subject: [PATCH] Implemented defines for largest mainline scenarios --- data/multiplayer/scenarios/2p_Dark_Forecast.cfg | 7 +++++++ data/multiplayer/scenarios/2p_Hornshark_Island.cfg | 7 +++++++ data/multiplayer/scenarios/4p_A_New_Land.cfg | 13 +++++++++++++ data/multiplayer/scenarios/6p_Team_Survival.cfg | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/data/multiplayer/scenarios/2p_Dark_Forecast.cfg b/data/multiplayer/scenarios/2p_Dark_Forecast.cfg index f0d75317c628..8ed0619d3412 100644 --- a/data/multiplayer/scenarios/2p_Dark_Forecast.cfg +++ b/data/multiplayer/scenarios/2p_Dark_Forecast.cfg @@ -10,7 +10,9 @@ Note: You need to use the default map settings for the scenario to work right." experience_modifier="100" map_data="{multiplayer/maps/Dark_Forecast.map}" victory_when_enemies_defeated=no + define=MULTIPLAYER_2P_DARK_FORECAST_LOAD +#ifdef MULTIPLAYER_2P_DARK_FORECAST_LOAD #define RANDOMIZE NUMBER {VARIABLE_OP random rand 1..{NUMBER}} #enddef @@ -1006,6 +1008,7 @@ Note: You need to use the default map settings for the scenario to work right." {FIRST_WATCH} {SECOND_WATCH} +#endif [side] side=1 team_name="revolt" @@ -1015,6 +1018,7 @@ Note: You need to use the default map settings for the scenario to work right." no_leader=yes controller="ai" village_gold=1 +#ifdef MULTIPLAYER_2P_DARK_FORECAST_LOAD [unit] type=Ancient Lich canrecruit=yes @@ -1033,6 +1037,7 @@ Note: You need to use the default map settings for the scenario to work right." [/object] [/modifications] [/unit] +#endif [/side] [side] @@ -1088,6 +1093,7 @@ Note: You need to use the default map settings for the scenario to work right." share_view="yes" [/side] +#ifdef MULTIPLAYER_2P_DARK_FORECAST_LOAD [event] name=prestart {SET_TIMID_AI_AND_BOLD_AI 2 1} @@ -1406,4 +1412,5 @@ The weather will also change randomly, affecting the layout of the map. #undef WEATHER_ALERT #undef ADJUST_WEATHER #undef INIT_WEATHER +#endif [/multiplayer] diff --git a/data/multiplayer/scenarios/2p_Hornshark_Island.cfg b/data/multiplayer/scenarios/2p_Hornshark_Island.cfg index 61d2839200c3..680fe9904c83 100644 --- a/data/multiplayer/scenarios/2p_Hornshark_Island.cfg +++ b/data/multiplayer/scenarios/2p_Hornshark_Island.cfg @@ -1,5 +1,6 @@ #textdomain wesnoth-multiplayer +#ifdef MULTIPLAYER_HORNSHARK_ISLAND_LOAD #define MODIFY_BOWMAN X Y [object] silent=yes @@ -18,6 +19,7 @@ [/effect] [/object] #enddef +#endif [multiplayer] id=multiplayer_Hornshark_Island @@ -26,10 +28,13 @@ description= _ "Players must forge strange alliances with the local inhabitants, in order to survive on this most unusual of islands. Designed by Doc Paterson." map_data="{multiplayer/maps/2p_Hornshark_Island.map}" random_start_time="no" + define=MULTIPLAYER_HORNSHARK_ISLAND_LOAD +#ifdef MULTIPLAYER_HORNSHARK_ISLAND_LOAD {DEFAULT_SCHEDULE_MORNING} {DEFAULT_MUSIC_PLAYLIST} +#endif [side] [ai] @@ -56,6 +61,7 @@ fog=yes [/side] +#ifdef MULTIPLAYER_HORNSHARK_ISLAND_LOAD [event] name=prestart @@ -1011,4 +1017,5 @@ {MODIFY_BOWMAN 1 1} {MODIFY_BOWMAN 28 24} [/event] +#endif [/multiplayer] diff --git a/data/multiplayer/scenarios/4p_A_New_Land.cfg b/data/multiplayer/scenarios/4p_A_New_Land.cfg index b3fb1a57780b..76978e8770c3 100644 --- a/data/multiplayer/scenarios/4p_A_New_Land.cfg +++ b/data/multiplayer/scenarios/4p_A_New_Land.cfg @@ -6,7 +6,9 @@ description= _ "This 4p survival scenario allows you to construct buildings and terraform the land. Use map settings. The recommended starting gold is 100." experience_modifier=70% turns=unlimited + define=MULTIPLAYER_A_NEW_LAND_LOAD +#ifdef MULTIPLAYER_A_NEW_LAND_LOAD {DEFAULT_SCHEDULE} {DEFAULT_MUSIC_PLAYLIST} # ------------------------------------------------------ @@ -36,6 +38,7 @@ [/objective] [/objectives] [/event] +#endif # ------------------------------------------------------ # Side Definitions @@ -120,6 +123,7 @@ income_lock=yes type=Death Knight allow_player=no +#ifdef MULTIPLAYER_A_NEW_LAND_LOAD [modifications] {MOVEMENT_RESTRICTION flat shallow_water} [/modifications] @@ -130,6 +134,7 @@ [village] x,y=10,25 [/village] +#endif [/side] [side] @@ -147,6 +152,7 @@ income_lock=yes type=Orcish Sovereign allow_player=no +#ifdef MULTIPLAYER_A_NEW_LAND_LOAD [modifications] {MOVEMENT_RESTRICTION flat shallow_water} [/modifications] @@ -157,6 +163,7 @@ [village] x,y=50,25 [/village] +#endif [/side] [side] @@ -174,6 +181,7 @@ income_lock=yes type=Orcish Sovereign allow_player=no +#ifdef MULTIPLAYER_A_NEW_LAND_LOAD [modifications] {MOVEMENT_RESTRICTION flat shallow_water} [/modifications] @@ -184,6 +192,7 @@ [village] x,y=10,30 [/village] +#endif [/side] [side] @@ -201,6 +210,7 @@ income_lock=yes type=Death Knight allow_player=no +#ifdef MULTIPLAYER_A_NEW_LAND_LOAD [modifications] {MOVEMENT_RESTRICTION flat shallow_water} [/modifications] @@ -211,6 +221,7 @@ [village] x,y=50,30 [/village] +#endif [/side] # This side is for trapped units. It is allied to the AI so they don't attack it. @@ -233,6 +244,7 @@ [/ai] [/side] +#ifdef MULTIPLAYER_A_NEW_LAND_LOAD # ------------------------------------------------------ # ANL Building Logic # ------------------------------------------------------ @@ -840,4 +852,5 @@ type=Necrophage,Bone Shooter,Revenant [/allow_recruit] [/event] +#endif [/multiplayer] diff --git a/data/multiplayer/scenarios/6p_Team_Survival.cfg b/data/multiplayer/scenarios/6p_Team_Survival.cfg index b34b4f271269..30e8afd31623 100644 --- a/data/multiplayer/scenarios/6p_Team_Survival.cfg +++ b/data/multiplayer/scenarios/6p_Team_Survival.cfg @@ -49,6 +49,7 @@ _s , _s , _s , _s , _s , _s _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s , _s #enddef +#ifdef 6P_TEAM_SURVIVAL_LOAD #define TS_WALL_MASK_NORTH usage=mask @@ -311,6 +312,7 @@ usage=mask {TS_SPAWN2 "Goblin Rouser"}{TS_SPAWN2 "Goblin Spearman"}{TS_SPAWN2 "Goblin Spearman"}{TS_SPAWN2 "Goblin Spearman"}{TS_SPAWN2 "Goblin Spearman"}{TS_SPAWN2 "Goblin Spearman"}{TS_SPAWN2 "Goblin Spearman"} [/event] #enddef +#endif [multiplayer] id=multiplayer_6p_Team_Survival @@ -321,9 +323,12 @@ usage=mask turns=32 victory_when_enemies_defeated=yes random_start_time="no" + define=6P_TEAM_SURVIVAL_LOAD +#ifdef 6P_TEAM_SURVIVAL_LOAD {DEFAULT_MUSIC_PLAYLIST} {DEFAULT_SCHEDULE} +#endif [side] user_team_name=_ "Attacker" @@ -420,6 +425,7 @@ usage=mask [/ai] [/side] +#ifdef 6P_TEAM_SURVIVAL_LOAD [event] name=prestart @@ -600,9 +606,11 @@ usage=mask image=portraits/undead/transparent/spectre.png [/message] [/event] +#endif [/multiplayer] #undef TS_MAP_DATA +#ifdef 6P_TEAM_SURVIVAL_LOAD #undef TS_WALL_MASK_NORTH #undef TS_WALL_MASK_NORTH_EAST #undef TS_WALL_MASK_NORTH_WEST @@ -622,3 +630,4 @@ usage=mask #undef TS_LAKE_SPAWN #undef TS_HOME_SPAWN #undef TS_SPAWNS +#endif