From 39e2d710bddfefb2bce2842b0aefaaf6a171b935 Mon Sep 17 00:00:00 2001 From: "Ignacio R. Morelle" Date: Sat, 15 Nov 2014 06:35:17 -0300 Subject: [PATCH] wmlindent pass --- .../Legend_of_Wesmere/maps/Kalian_map.cfg | 362 +++++++++--------- .../scenarios/chapter1/01_The_Uprooting.cfg | 3 +- .../chapter1/02_Hostile_Mountains.cfg | 2 - .../chapter2/04_The_Elvish_Treasury.cfg | 1 - .../chapter2/05_The_Saurian_Treasury.cfg | 5 +- .../chapter2/06_Acquaintance_in_Need.cfg | 2 +- .../chapter2/07_Elves_Last_Stand.cfg | 4 - .../chapter2/08_Council_of_Hard_Choices.cfg | 2 +- .../chapter4/13_News_from_the_Front.cfg | 6 +- .../scenarios/chapter4/14_Human_Alliance.cfg | 10 +- .../scenarios/chapter5/23_End_of_War.cfg | 6 +- .../Legend_of_Wesmere/utils/characters.cfg | 3 +- .../Legend_of_Wesmere/utils/debug.cfg | 5 +- .../Legend_of_Wesmere/utils/map-utils.cfg | 14 +- 14 files changed, 204 insertions(+), 221 deletions(-) diff --git a/data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg b/data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg index 55c5c3ae0b35..ed3deb16fbe2 100644 --- a/data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg +++ b/data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg @@ -16,237 +16,237 @@ [/event] [label] - immutable=yes - text=_"Essarn" - visible_in_fog=yes - visible_in_shroud=no - x=4 - y=36 + immutable=yes + text=_"Essarn" + visible_in_fog=yes + visible_in_shroud=no + x=4 + y=36 [/label] [label] - immutable=yes - team_name="" - text=_"Valcathra" - visible_in_fog=yes - visible_in_shroud=no - x=7 - y=43 + immutable=yes + team_name="" + text=_"Valcathra" + visible_in_fog=yes + visible_in_shroud=no + x=7 + y=43 [/label] [label] - immutable=yes - team_name="" - text=_"River Telfar" - visible_in_fog=no - visible_in_shroud=yes - x=11 - y=6 + immutable=yes + team_name="" + text=_"River Telfar" + visible_in_fog=no + visible_in_shroud=yes + x=11 + y=6 [/label] [label] - immutable=yes - team_name="" - text=_"Telfar Green" - visible_in_fog=no - visible_in_shroud=yes - x=12 - y=19 + immutable=yes + team_name="" + text=_"Telfar Green" + visible_in_fog=no + visible_in_shroud=yes + x=12 + y=19 [/label] [label] - immutable=yes - team_name="" - text=_"Erethean" - visible_in_fog=yes - visible_in_shroud=no - x=13 - y=47 + immutable=yes + team_name="" + text=_"Erethean" + visible_in_fog=yes + visible_in_shroud=no + x=13 + y=47 [/label] [label] - immutable=yes - team_name="" - text=_"Northern Shallows" - visible_in_fog=no - visible_in_shroud=yes - x=14 - y=15 + immutable=yes + team_name="" + text=_"Northern Shallows" + visible_in_fog=no + visible_in_shroud=yes + x=14 + y=15 [/label] [label] - immutable=yes - team_name="" - text=_"Arthen" - visible_in_fog=yes - visible_in_shroud=no - x=15 - y=26 + immutable=yes + team_name="" + text=_"Arthen" + visible_in_fog=yes + visible_in_shroud=no + x=15 + y=26 [/label] [label] - immutable=yes - team_name="" - text=_"Dancers Green" - visible_in_fog=no - visible_in_shroud=yes - x=17 - y=11 + immutable=yes + team_name="" + text=_"Dancers Green" + visible_in_fog=no + visible_in_shroud=yes + x=17 + y=11 [/label] [label] - immutable=yes - team_name="" - text=_"Illissa" - visible_in_fog=yes - visible_in_shroud=no - x=17 - y=31 + immutable=yes + team_name="" + text=_"Illissa" + visible_in_fog=yes + visible_in_shroud=no + x=17 + y=31 [/label] [label] - immutable=yes - team_name="" - text=_"Brightleaf Wood" - visible_in_fog=yes - visible_in_shroud=no - x=19 - y=36 + immutable=yes + team_name="" + text=_"Brightleaf Wood" + visible_in_fog=yes + visible_in_shroud=no + x=19 + y=36 [/label] [label] - immutable=yes - team_name="" - text=_"Viricon" - visible_in_fog=yes - visible_in_shroud=no - x=21 - y=45 + immutable=yes + team_name="" + text=_"Viricon" + visible_in_fog=yes + visible_in_shroud=no + x=21 + y=45 [/label] [label] - immutable=yes - team_name="" - text=_"Ford of Alyas" - visible_in_fog=yes - visible_in_shroud=no - x=23 - y=25 + immutable=yes + team_name="" + text=_"Ford of Alyas" + visible_in_fog=yes + visible_in_shroud=no + x=23 + y=25 [/label] [label] - immutable=yes - team_name="" - text=_"Elendor" - visible_in_fog=yes - visible_in_shroud=no - x=27 - y=23 + immutable=yes + team_name="" + text=_"Elendor" + visible_in_fog=yes + visible_in_shroud=no + x=27 + y=23 [/label] [label] - immutable=yes - team_name="" - text=_"Telionath" - visible_in_fog=yes - visible_in_shroud=no - x=27 - y=40 + immutable=yes + team_name="" + text=_"Telionath" + visible_in_fog=yes + visible_in_shroud=no + x=27 + y=40 [/label] [label] - immutable=yes - team_name="" - text=_"West Tower" - visible_in_fog=yes - visible_in_shroud=no - x=29 - y=32 + immutable=yes + team_name="" + text=_"West Tower" + visible_in_fog=yes + visible_in_shroud=no + x=29 + y=32 [/label] [label] - immutable=yes - team_name="" - text=_"North Bridge" - visible_in_fog=yes - visible_in_shroud=no - x=31 - y=26 + immutable=yes + team_name="" + text=_"North Bridge" + visible_in_fog=yes + visible_in_shroud=no + x=31 + y=26 [/label] [label] - immutable=yes - team_name="" - text=_"North Tower" - visible_in_fog=yes - visible_in_shroud=no - x=31 - y=30 + immutable=yes + team_name="" + text=_"North Tower" + visible_in_fog=yes + visible_in_shroud=no + x=31 + y=30 [/label] [label] - immutable=yes - team_name="" - text=_"South Bastion" - visible_in_fog=yes - visible_in_shroud=no - x=31 - y=37 + immutable=yes + team_name="" + text=_"South Bastion" + visible_in_fog=yes + visible_in_shroud=no + x=31 + y=37 [/label] [label] - immutable=yes - team_name="" - text=_"Tireas" - visible_in_fog=yes - visible_in_shroud=no - x=33 - y=22 + immutable=yes + team_name="" + text=_"Tireas" + visible_in_fog=yes + visible_in_shroud=no + x=33 + y=22 [/label] [label] - immutable=yes - team_name="" - text=_"East Tower" - visible_in_fog=yes - visible_in_shroud=no - x=33 - y=32 + immutable=yes + team_name="" + text=_"East Tower" + visible_in_fog=yes + visible_in_shroud=no + x=33 + y=32 [/label] [label] - immutable=yes - team_name="" - text=_"Aelion" - visible_in_fog=yes - visible_in_shroud=no - x=33 - y=45 + immutable=yes + team_name="" + text=_"Aelion" + visible_in_fog=yes + visible_in_shroud=no + x=33 + y=45 [/label] [label] - immutable=yes - team_name="" - text=_"Ford of Tifranur" - visible_in_fog=yes - visible_in_shroud=no - x=39 - y=37 + immutable=yes + team_name="" + text=_"Ford of Tifranur" + visible_in_fog=yes + visible_in_shroud=no + x=39 + y=37 [/label] [label] - immutable=yes - team_name="" - text=_"Karmarth Hills" - visible_in_fog=yes - visible_in_shroud=no - x=41 - y=9 + immutable=yes + team_name="" + text=_"Karmarth Hills" + visible_in_fog=yes + visible_in_shroud=no + x=41 + y=9 [/label] [label] - immutable=yes - team_name="" - text=_"Arryn" - visible_in_fog=yes - visible_in_shroud=no - x=41 - y=32 + immutable=yes + team_name="" + text=_"Arryn" + visible_in_fog=yes + visible_in_shroud=no + x=41 + y=32 [/label] [label] - immutable=yes - team_name="" - text=_"Westwind Wood" - visible_in_fog=no - visible_in_shroud=yes - x=42 - y=25 + immutable=yes + team_name="" + text=_"Westwind Wood" + visible_in_fog=no + visible_in_shroud=yes + x=42 + y=25 [/label] [label] - immutable=yes - team_name="" - text=_"Southwind Wood" - visible_in_fog=yes - visible_in_shroud=no - x=42 - y=45 + immutable=yes + team_name="" + text=_"Southwind Wood" + visible_in_fog=yes + visible_in_shroud=no + x=42 + y=45 [/label] ## Sound for the River Telfar diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg index 83cee7b9847a..8dd71942ce0a 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg @@ -457,7 +457,7 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h [filter_side] [has_unit] id=Velon - [/has_unit] + [/has_unit] [/filter_side] [/filter_second] @@ -476,7 +476,6 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h id=Velon message= _ "Kalenz was right and I was wrong. Go; join Kalenz while yet you can. I and the remaining elders will cover your retreat as best we may." [/message] - [/event] [event] diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg index 66c01f9c5dca..a34c9369bec7 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg @@ -102,7 +102,6 @@ #endif [/side] - ### Olurf's Code ### #define OLURFS_LAND x=20-24,19-30,17-30,16-30,14-30,12-30,11-30,10-30,7-30,8-30,10-30,13-30,15-30,18-30,19-30,20-30,22-30,23-30,24-30,23-30,22-30 @@ -479,7 +478,6 @@ ### /Enemy Side ### - #### Objectives and corresponding events #### [event] name=start diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg index dcd7078b27cd..5baefd2760ab 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg @@ -299,7 +299,6 @@ Chapter Two" y=28 [/recall] - #ifdef MULTIPLAYER {UNIT 3 (Elvish Ranger) 23 24 (role=liberator)} #else diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg index 8f926fdf6ac3..6a15d96a73a1 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg @@ -100,7 +100,7 @@ {PLAYER_GOLD} fog=no [unit] - {LANDAR} + {LANDAR} extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout x=4 y=11 @@ -131,7 +131,6 @@ #endif [/side] - #define SAURIAN_AI {ai/aliases/stable_singleplayer.cfg} [ai] @@ -283,8 +282,6 @@ x=4 y=18 [/recall] - - [/event] [event] diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg index e0f1e89fc7ac..b3096d56d35b 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg @@ -46,7 +46,7 @@ no_leader=yes [unit] - {KALENZ} + {KALENZ} extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout x=17 y=38 diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg index 503ccbfb6e40..41e6841201e8 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg @@ -140,7 +140,6 @@ #endif [/side] - [side] side=3 no_leader=yes @@ -168,8 +167,6 @@ #endif [/side] - - ### Allies #### [side] side=4 @@ -251,7 +248,6 @@ #endif [/side] - [event] name=prestart [allow_recruit] diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg index f59092ea22ab..1482e02a38df 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg @@ -17,7 +17,7 @@ [side] no_leader=yes [unit] - {KALENZ} + {KALENZ} [/unit] gold=0 [/side] diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg index dad96950dcf5..b4e5cce9e8b1 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg @@ -41,7 +41,7 @@ [unit] {KALENZ} x=12 - y=1 + y=1 [/unit] #ifndef MULTIPLAYER [unit] @@ -66,7 +66,7 @@ [unit] {LANDAR} x=11 - y=1 + y=1 [/unit] fog=yes share_view=yes @@ -92,7 +92,7 @@ [unit] {CLEODIL} x=11 - y=1 + y=1 [/unit] fog=yes share_view=yes diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg index 7597168e3b4e..7891cbc07274 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg @@ -18,12 +18,12 @@ {DEFAULT_SCHEDULE_AFTERNOON} -# #TODO split the villages instead of leaving them unassigned in MP? + # #TODO split the villages instead of leaving them unassigned in MP? #ifndef MULTIPLAYER - {STARTING_VILLAGES_ELF 1} + {STARTING_VILLAGES_ELF 1} #endif - {STARTING_VILLAGES_HUMAN 2} - {STARTING_VILLAGES_TROLL 3} + {STARTING_VILLAGES_HUMAN 2} + {STARTING_VILLAGES_TROLL 3} {INTRO_AND_SCENARIO_MUSIC revelation.ogg loyalists.ogg} {EXTRA_SCENARIO_MUSIC the_city_falls.ogg} @@ -225,7 +225,6 @@ Chapter Four" extra_recruit=Troll Whelp, Troll, Troll Rocklobber, Troll Warrior #endif [/unit] - [/side] [side] @@ -397,7 +396,6 @@ Chapter Four" id=Kalenz message= _ "No, it is not. But if we do not defeat these orcs here and now our divisions will all be moot. I will take every sword-arm I can get and be glad of them." [/message] - [/event] #ifdef MULTIPLAYER diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg index 83ba8b1b3b97..f0bf62fe2486 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg @@ -34,17 +34,17 @@ [side] side=1 {PLAYABLE} - + {GOLD 200 180 160} save_id=Kalenz - + no_leader=yes [unit] {KALENZ} placement=leader extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout [/unit] - + #ifndef MULTIPLAYER #TODO Let's keep cleodil out of multiplayer, shall we? [unit] diff --git a/data/campaigns/Legend_of_Wesmere/utils/characters.cfg b/data/campaigns/Legend_of_Wesmere/utils/characters.cfg index 269fdb7cc0a1..857a9ac29e6c 100644 --- a/data/campaigns/Legend_of_Wesmere/utils/characters.cfg +++ b/data/campaigns/Legend_of_Wesmere/utils/characters.cfg @@ -52,7 +52,7 @@ #define SCOUT id=scout -# name= _ "Huraldur" + # name= _ "Huraldur" type=Elvish Scout unrenamable=yes [modifications] @@ -63,7 +63,6 @@ {IS_LOYAL} #enddef - #define LANDAR id=Landar name= _ "Landar" diff --git a/data/campaigns/Legend_of_Wesmere/utils/debug.cfg b/data/campaigns/Legend_of_Wesmere/utils/debug.cfg index 82f0990724fc..919a9f0ea81c 100644 --- a/data/campaigns/Legend_of_Wesmere/utils/debug.cfg +++ b/data/campaigns/Legend_of_Wesmere/utils/debug.cfg @@ -2,7 +2,6 @@ name=prestart [set_menu_item] - id=debug_kill description= "Kill Unit" #wmllint: ignore [filter_location] @@ -41,10 +40,8 @@ first_time_only=no {VARIABLE selected_move_unit_x $x1} {VARIABLE selected_move_unit_y $y1} - [/event] + [/event] {MOVE_UNIT x,y=$selected_move_unit_x,$selected_move_unit_y $x1 $y1} [/command] [/set_menu_item] - [/event] - diff --git a/data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg b/data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg index cd4d1548984f..44cc4b4db563 100644 --- a/data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg +++ b/data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg @@ -7,8 +7,8 @@ #define LOAD_SUBMAP X_SPAN Y_SPAN OFFSET_X OFFSET_Y MAP [store_unit] [filter] - x=1-999 - y=1-999 + x=1-999 + y=1-999 [/filter] variable=MOVE_UNIT_store kill=yes @@ -26,7 +26,7 @@ numerical_not_equals=0 [/variable] [then] - {VARIABLE_OP MOVE_UNIT_store[$unit].goto_x add {OFFSET_X}} + {VARIABLE_OP MOVE_UNIT_store[$unit].goto_x add {OFFSET_X}} [/then] [/if] [if] @@ -35,7 +35,7 @@ numerical_not_equals=0 [/variable] [then] - {VARIABLE_OP MOVE_UNIT_store[$unit].goto_y add {OFFSET_Y}} + {VARIABLE_OP MOVE_UNIT_store[$unit].goto_y add {OFFSET_Y}} [/then] [/if] {NEXT unit} @@ -56,9 +56,9 @@ {LOW_MAP {MAP}} [/replace_map] [shift_labels] - x={OFFSET_X} - y={OFFSET_Y} - [/shift_labels] + x={OFFSET_X} + y={OFFSET_Y} + [/shift_labels] {FOREACH MOVE_UNIT_store unit} [unstore_unit]