Author: zookeeper
Date: Sun Oct 17 20:57:10 2010
New Revision: 47076
URL: http://svn.gna.org/viewcvs/wesnoth?rev=47076&view=rev
Log:
Cleaned up some unnecessary macro usage and fixed the walls coming down around
empty player sides.
Modified:
trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg
Modified: trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg?rev=47076&r1=47075&r2=47076&view=diff
==============================================================================
--- trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg (original)
+++ trunk/data/multiplayer/scenarios/6p_Team_Survival.cfg Sun Oct 17 20:57:10
2010
@@ -196,69 +196,6 @@
#enddef
# wmlindent: stop ignoring
-#define TS_SET_LABELS
- [label]
- x,y=24,18
- text= _ "Turn 2: Loyalists"
- [/label]
-
- [label]
- x,y=27,20
- text= _ "Turn 5: Knalgans"
- [/label]
-
- [label]
- x,y=27,23
- text= _ "Turn 8: Rebels"
- [/label]
-
- [label]
- x,y=24,24
- text= _ "Turn 11: Northerners"
- [/label]
-
- [label]
- x,y=21,23
- text= _ "Turn 14: Drakes"
- [/label]
-
- [label]
- x,y=21,20
- text= _ "Turn 17: Undead"
- [/label]
-
- [label]
- x,y=24,21
- text= _ "Tower of Doom"
- [/label]
-#enddef
-
-#define TS_OPEN_WALLS
- {EARTHQUAKE (
- {IF_ALLIED 7 2 ({MODIFY_TERRAIN_MASK 7 13
("{TS_WALL_MASK_NORTH_WEST}") ()} )}
- {IF_ALLIED 2 3 ({MODIFY_TERRAIN_MASK 23 6 ("{TS_WALL_MASK_NORTH}") ()}
)}
- {IF_ALLIED 3 4 ({MODIFY_TERRAIN_MASK 29 13
("{TS_WALL_MASK_NORTH_EAST}") ()} )}
- {IF_ALLIED 4 5 ({MODIFY_TERRAIN_MASK 29 23
("{TS_WALL_MASK_SOUTH_EAST}") ()} )}
- {IF_ALLIED 5 6 ({MODIFY_TERRAIN_MASK 23 26 ("{TS_WALL_MASK_SOUTH}")
()} )}
- {IF_ALLIED 6 7 ({MODIFY_TERRAIN_MASK 7 23
("{TS_WALL_MASK_SOUTH_WEST}") ()} )}
- )}
-#enddef
-
-#define TS_BUILD_CASTLE
- {EARTHQUAKE ({MODIFY_TERRAIN_MASK 17 15 ("{TS_CASTLE_MASK}") ()})}
-#enddef
-
-#define TS_OPEN_CASTLE
- {EARTHQUAKE (
- {IF_ALIVE 2 ({MODIFY_TERRAIN_MASK 19 16 ("{TS_OPEN_MASK_NORTH_WEST}")
()} )}
- {IF_ALIVE 3 ({MODIFY_TERRAIN_MASK 25 17 ("{TS_OPEN_MASK_NORTH_EAST}")
()} )}
- {IF_ALIVE 4 ({MODIFY_TERRAIN_MASK 29 20 ("{TS_OPEN_MASK_EAST}") ()} )}
- {IF_ALIVE 5 ({MODIFY_TERRAIN_MASK 25 23 ("{TS_OPEN_MASK_SOUTH_EAST}")
()} )}
- {IF_ALIVE 6 ({MODIFY_TERRAIN_MASK 19 23 ("{TS_OPEN_MASK_SOUTH_WEST}")
()} )}
- {IF_ALIVE 7 ({MODIFY_TERRAIN_MASK 19 20 ("{TS_OPEN_MASK_WEST}") ()} )}
- )}
-#enddef
-
#define TS_SPAWN1 TYPE
{IF_ALIVE 2 ({NOTRAIT_UNIT 1 ({TYPE}) 12 10})}
{IF_ALIVE 3 ({NOTRAIT_UNIT 1 ({TYPE}) 29 7})}
@@ -349,58 +286,15 @@
)}
#enddef
-# Ends the game with the result RESULT (can be either victory or defeat)
-# For example, we could win:
-# {ENDGAME victory}
-#
-#define ENDGAME VALUE
- [endlevel]
- result={VALUE}
- [/endlevel]
-#enddef
-
[multiplayer]
id=multiplayer_6p_Team_Survival
name= _ "6p â Team Survival"
map_data="{TS_MAP_DATA}"
-
description= _ "Scenario where the objective is to survive for as long as
possible."
experience_modifier=70
turns=32
- turn_at=1
victory_when_enemies_defeated=yes
random_start_time="no"
-
- {ON_PRESTART (
- {SET_OBJECTIVES 0 (_ "Survive for 32 turns.") (_ "Hint: Learning the
enemy spawnpoints and types helps a lot.") (
- {VICTORY_CONDITION (_ "Survive all enemy attacks.")}
- {DEFEAT_CONDITION (_ "Death of your team leaders.")}
- )}
- )}
- {ON_START (
- {TS_SET_LABELS}
- {TS_OPEN_WALLS}
- )}
-
- {TS_SPAWNS}
-
- {ON_TURN 25 {TS_BUILD_CASTLE}}
- {ON_TURN 26 {TS_OPEN_CASTLE}}
- {ON_TURN 32 (
- {IF_ALIVE 2 ({ENDGAME victory})}
- {IF_ALIVE 3 ({ENDGAME victory})}
- {IF_ALIVE 4 ({ENDGAME victory})}
- {IF_ALIVE 5 ({ENDGAME victory})}
- {IF_ALIVE 6 ({ENDGAME victory})}
- {IF_ALIVE 7 ({ENDGAME victory})}
- )}
-
- {ON_VICTORY (
- {MESSAGE narrator (units/elves-wood/shyde.png) (_ "Faery") (_
"Congratulations for surviving the map that so many people claim is impossible.
Frankly, I havenât got a clue as to how you did it, so send me the replay by
mail to: [email protected]. Thank You!")}
- )}
- {ON_DEFEAT (
- {MESSAGE narrator (units/undead/wraith-s.png) (_ "Death") (_ "You have
lost this game, but fear not. You can always try again. And again. And again.
*Muahahaha*")}
- )}
{DEFAULT_MUSIC_PLAYLIST}
{DEFAULT_SCHEDULE}
@@ -440,6 +334,185 @@
villages_per_scout=0
[/ai]
)}
+
+ [event]
+ name=prestart
+
+ [objectives]
+ [objective]
+ description= _ "Survive all enemy attacks"
+ show_turn_counter=yes
+ condition=win
+ [/objective]
+
+ [objective]
+ description= _ "Death of your team leaders"
+ condition=lose
+ [/objective]
+
+ [note]
+ description= _ "Hint: Learning the enemy spawnpoints and types
helps alot."
+ [/note]
+ [/objectives]
+
+ [label]
+ x,y=24,18
+ text= _ "Turn 2: Loyalists"
+ [/label]
+
+ [label]
+ x,y=27,20
+ text= _ "Turn 5: Knalgans"
+ [/label]
+
+ [label]
+ x,y=27,23
+ text= _ "Turn 8: Rebels"
+ [/label]
+
+ [label]
+ x,y=24,24
+ text= _ "Turn 11: Northerners"
+ [/label]
+
+ [label]
+ x,y=21,23
+ text= _ "Turn 14: Drakes"
+ [/label]
+
+ [label]
+ x,y=21,20
+ text= _ "Turn 17: Undead"
+ [/label]
+
+ [label]
+ x,y=24,21
+ text= _ "Tower of Doom"
+ [/label]
+ [/event]
+
+ [event]
+ name=start
+
+ [if]
+ [have_unit]
+ side=7
+ [/have_unit]
+ [have_unit]
+ side=2
+ [/have_unit]
+ [then]
+ {IF_ALLIED 7 2 ({MODIFY_TERRAIN_MASK 7 13
("{TS_WALL_MASK_NORTH_WEST}") ()} )}
+ [/then]
+ [/if]
+
+ [if]
+ [have_unit]
+ side=2
+ [/have_unit]
+ [have_unit]
+ side=3
+ [/have_unit]
+ [then]
+ {IF_ALLIED 2 3 ({MODIFY_TERRAIN_MASK 23 6
("{TS_WALL_MASK_NORTH}") ()} )}
+ [/then]
+ [/if]
+
+ [if]
+ [have_unit]
+ side=3
+ [/have_unit]
+ [have_unit]
+ side=4
+ [/have_unit]
+ [then]
+ {IF_ALLIED 3 4 ({MODIFY_TERRAIN_MASK 29 13
("{TS_WALL_MASK_NORTH_EAST}") ()} )}
+ [/then]
+ [/if]
+
+ [if]
+ [have_unit]
+ side=4
+ [/have_unit]
+ [have_unit]
+ side=5
+ [/have_unit]
+ [then]
+ {IF_ALLIED 4 5 ({MODIFY_TERRAIN_MASK 29 23
("{TS_WALL_MASK_SOUTH_EAST}") ()} )}
+ [/then]
+ [/if]
+
+ [if]
+ [have_unit]
+ side=5
+ [/have_unit]
+ [have_unit]
+ side=6
+ [/have_unit]
+ [then]
+ {IF_ALLIED 5 6 ({MODIFY_TERRAIN_MASK 23 26
("{TS_WALL_MASK_SOUTH}") ()} )}
+ [/then]
+ [/if]
+
+ [if]
+ [have_unit]
+ side=6
+ [/have_unit]
+ [have_unit]
+ side=7
+ [/have_unit]
+ [then]
+ {IF_ALLIED 6 7 ({MODIFY_TERRAIN_MASK 7 23
("{TS_WALL_MASK_SOUTH_WEST}") ()} )}
+ [/then]
+ [/if]
+ [/event]
+
+ {TS_SPAWNS}
+
+ [event]
+ name=turn 25
+
+ {EARTHQUAKE ({MODIFY_TERRAIN_MASK 17 15 ("{TS_CASTLE_MASK}") ()})}
+ [/event]
+
+ [event]
+ name=turn 26
+
+ {EARTHQUAKE (
+ {IF_ALIVE 2 ({MODIFY_TERRAIN_MASK 19 16
("{TS_OPEN_MASK_NORTH_WEST}") ()} )}
+ {IF_ALIVE 3 ({MODIFY_TERRAIN_MASK 25 17
("{TS_OPEN_MASK_NORTH_EAST}") ()} )}
+ {IF_ALIVE 4 ({MODIFY_TERRAIN_MASK 29 20 ("{TS_OPEN_MASK_EAST}")
()} )}
+ {IF_ALIVE 5 ({MODIFY_TERRAIN_MASK 25 23
("{TS_OPEN_MASK_SOUTH_EAST}") ()} )}
+ {IF_ALIVE 6 ({MODIFY_TERRAIN_MASK 19 23
("{TS_OPEN_MASK_SOUTH_WEST}") ()} )}
+ {IF_ALIVE 7 ({MODIFY_TERRAIN_MASK 19 20 ("{TS_OPEN_MASK_WEST}")
()} )}
+ )}
+ [/event]
+
+ [event]
+ name=turn 32
+
+ [message]
+ speaker=narrator
+ caption= _ "Faery"
+ message= _ "Congratulations for surviving the map that so many
people claim is impossible. Frankly, I haven't got a clue as to how you did it,
so send me the replay by mail to: [email protected]. Thank You!"
+ image=portraits/elves/transparent/lady.png
+ [/message]
+
+ [endlevel]
+ result=victory
+ [/endlevel]
+ [/event]
+
+ [event]
+ name=defeat
+
+ [message]
+ speaker=narrator
+ caption= _ "Death"
+ message= _ "You have lost this game, but fear not. You can always
try again. And again. And again. *Muahahaha*"
+ image=portraits/undead/transparent/spectre.png
+ [/message]
+ [/event]
[/multiplayer]
#undef TS_MAP_DATA
@@ -456,10 +529,6 @@
#undef TS_OPEN_MASK_SOUTH_WEST
#undef TS_OPEN_MASK_SOUTH_EAST
#undef TS_OPEN_MASK_WEST
-#undef TS_SET_LABELS
-#undef TS_OPEN_WALLS
-#undef TS_BUILD_CASTLE
-#undef TS_OPEN_CASTLE
#undef TS_SPAWN1
#undef TS_SPAWN2
#undef TS_SWAMP_SPAWN
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits