diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg index 43ddef61af3..c59a465c4f3 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg @@ -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] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg index 85f07b3c45a..f3b03869f3a 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg @@ -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 diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg index 40bcb60329f..5c6bf609867 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg @@ -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] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg index 6059addda8c..b1606af59d0 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg @@ -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 diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg index 429226ba37e..11fd0559214 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg @@ -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] diff --git a/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg b/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg index 47f71ac9716..faa582cadb5 100644 --- a/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg +++ b/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg @@ -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