Ran wmlindent.

This commit is contained in:
Ignacio R. Morelle 2009-02-09 01:56:42 +00:00
parent 23c8843f0c
commit 6635301930
6 changed files with 85 additions and 88 deletions

View File

@ -160,8 +160,8 @@
# At start seen a mudcrawler is false
{VARIABLE seen_mudcrawler "no"}
# Whether Naru (scout hiding in a village) has been rescued yet
{VARIABLE seen_naru "no"}
# Whether Naru (scout hiding in a village) has been rescued yet
{VARIABLE seen_naru "no"}
# Can't end scenario until all elves have been rescued (5 events)
{VARIABLE rescued_elves 0}
@ -770,16 +770,16 @@
[if]
[variable]
name=seen_naru
equals="yes"
equals="yes"
[/variable]
[then]
# If we have Naru, spawn Nisa
# If we have Naru, spawn Nisa
[message]
speaker=unit
message= _ "Hey, Nisa, the rocks have stopped falling. You can come out now!"
[/message]
{NAMED_GENERIC_UNIT 1 "Desert Scout" $x1 $y1 "Nisa" (_"Nisa")}
{ADD rescued_elves 1}
{ADD rescued_elves 1}
[+unit]
gender=female
[/unit]
@ -790,10 +790,10 @@
[/then]
[else]
{NAMED_GENERIC_UNIT 1 "Desert Scout" $x1 $y1 "Naru" (_"Naru")}
[set_variable]
name=seen_naru
value="yes"
[/set_variable]
[set_variable]
name=seen_naru
value="yes"
[/set_variable]
[message]
speaker=Naru
message= _ "Is it safe to come out? I was so scared."
@ -818,7 +818,6 @@
[/if]
[/event]
# The following start and two capture events handle the discovery of
# random elves in the outer villages. If the player captures a village
# before an undead unit does, he has a chance of finding a random elf
@ -1039,8 +1038,8 @@
# Variables cleared :
# $seen_mudcrawler, $rescued_elves
# We're going to use this piece of WML in two different places without
# a change, that's why it's placed within a macro
# We're going to use this piece of WML in two different places without
# a change, that's why it's placed within a macro
#define DARKSORCERER_INTRO
# Place the bad guy, give him proper gold and income
[unit]
@ -1373,7 +1372,7 @@
# Clear variables
{CLEAR_VARIABLE seen_mudcrawler}
{CLEAR_VARIABLE rescued_elves}
{CLEAR_VARIABLE seen_naru}
{CLEAR_VARIABLE seen_naru}
[/event]
[event]

View File

@ -792,7 +792,7 @@
[/if]
[/event]
#undef SCORPION_PLACEMENT
#undef SCORPION_PLACEMENT
[/event]
#Encounter 1.5: Second Oasis, remind player of healing properties
@ -1045,7 +1045,7 @@
[/if]
[/event]
#undef OGRE_PLACEMENT
#undef OGRE_PLACEMENT
[/event]
# These are related to the ogre ambush. A player unit being killed by an ogre,
@ -1956,7 +1956,7 @@
fire_event=no
[/kill]
#undef HOLY_WATER
#undef HOLY_WATER
[/event]
#if Kaleh moves to north edge of map but outlaw leader isn't defeated

View File

@ -591,7 +591,6 @@
#ifdef EASY
{NOTRAIT_UNIT $unit.side (Walking Corpse) $|x1 $|y1}
#endif
[/then]
[/if]
@ -632,8 +631,7 @@
name=event
variable=camp_event
[/insert_tag]
{NEXT camp}
{NEXT camp}
{CLEAR_VARIABLE camps}
{CLEAR_VARIABLE camp_event}
[/event]

View File

@ -1526,72 +1526,72 @@
# allow units around lake to look out over deep water
# artificially increase sight for units walking around lake
# TODO/FIXME: commented out because it invalidates undo on every move there.
# [event]
# name=moveto
# first_time_only=no
#
# [filter]
# x=19-41
# y=3-22
# side=1
# [/filter]
#
# [set_variable]
# name=x_left
# value=$x1
# [/set_variable]
#
# [set_variable]
# name=x_left
# add=-4
# [/set_variable]
#
# [set_variable]
# name=x_right
# value=$x1
# [/set_variable]
#
# [set_variable]
# name=x_right
# add=4
# [/set_variable]
#
# [set_variable]
# name=y_up
# value=$y1
# [/set_variable]
#
# [set_variable]
# name=y_up
# add=-3
# [/set_variable]
#
# [set_variable]
# name=y_down
# value=$y1
# [/set_variable]
#
# [set_variable]
# name=y_down
# add=3
# [/set_variable]
#
# [set_variable]
# name=lake_x
# format=$x_left-$x_right
# [/set_variable]
#
# [set_variable]
# name=lake_y
# format=$y_up-$y_down
# [/set_variable]
#
# [remove_shroud]
# x=$lake_x
# y=$lake_y
# side=1
# [/remove_shroud]
# [/event]
# [event]
# name=moveto
# first_time_only=no
#
# [filter]
# x=19-41
# y=3-22
# side=1
# [/filter]
#
# [set_variable]
# name=x_left
# value=$x1
# [/set_variable]
#
# [set_variable]
# name=x_left
# add=-4
# [/set_variable]
#
# [set_variable]
# name=x_right
# value=$x1
# [/set_variable]
#
# [set_variable]
# name=x_right
# add=4
# [/set_variable]
#
# [set_variable]
# name=y_up
# value=$y1
# [/set_variable]
#
# [set_variable]
# name=y_up
# add=-3
# [/set_variable]
#
# [set_variable]
# name=y_down
# value=$y1
# [/set_variable]
#
# [set_variable]
# name=y_down
# add=3
# [/set_variable]
#
# [set_variable]
# name=lake_x
# format=$x_left-$x_right
# [/set_variable]
#
# [set_variable]
# name=lake_y
# format=$y_up-$y_down
# [/set_variable]
#
# [remove_shroud]
# x=$lake_x
# y=$lake_y
# side=1
# [/remove_shroud]
# [/event]
# Event 6: Tentacles attack

View File

@ -1237,14 +1237,14 @@
equals="female"
[/variable]
[then]
#textdomain wesnoth
#textdomain wesnoth
{VARIABLE slowed_text ( _ "female^slowed")}
[/then]
[else]
{VARIABLE slowed_text ( _ "slowed")}
[/else]
[/if]
#textdomain wesnoth-utbs
#textdomain wesnoth-utbs
[unstore_unit]
variable=elf_list[$victim_i]

View File

@ -25,7 +25,7 @@
[set_variable]
name=random_string
rand="0..$($random_placement_locations.length - 1)"
[/set_variable]
[/set_variable]
#enddef
#define PLACE_UNITS_RANDOMLY NUMBER SIDE TYPE ID_STRING NAME_STRING TRAIT_WML