Skip to content

Commit

Permalink
wmlindent pass
Browse files Browse the repository at this point in the history
  • Loading branch information
irydacea committed Nov 15, 2014
1 parent fe8c111 commit 39e2d71
Show file tree
Hide file tree
Showing 14 changed files with 204 additions and 221 deletions.
362 changes: 181 additions & 181 deletions data/campaigns/Legend_of_Wesmere/maps/Kalian_map.cfg

Large diffs are not rendered by default.

Expand Up @@ -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]

Expand All @@ -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]
Expand Down
Expand Up @@ -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
Expand Down Expand Up @@ -479,7 +478,6 @@

### /Enemy Side ###


#### Objectives and corresponding events ####
[event]
name=start
Expand Down
Expand Up @@ -299,7 +299,6 @@ Chapter Two"
y=28
[/recall]


#ifdef MULTIPLAYER
{UNIT 3 (Elvish Ranger) 23 24 (role=liberator)}
#else
Expand Down
Expand Up @@ -100,7 +100,7 @@
{PLAYER_GOLD}
fog=no
[unit]
{LANDAR}
{LANDAR}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=4
y=11
Expand Down Expand Up @@ -131,7 +131,6 @@
#endif
[/side]


#define SAURIAN_AI
{ai/aliases/stable_singleplayer.cfg}
[ai]
Expand Down Expand Up @@ -283,8 +282,6 @@
x=4
y=18
[/recall]


[/event]

[event]
Expand Down
Expand Up @@ -46,7 +46,7 @@

no_leader=yes
[unit]
{KALENZ}
{KALENZ}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=17
y=38
Expand Down
Expand Up @@ -140,7 +140,6 @@
#endif
[/side]


[side]
side=3
no_leader=yes
Expand Down Expand Up @@ -168,8 +167,6 @@
#endif
[/side]



### Allies ####
[side]
side=4
Expand Down Expand Up @@ -251,7 +248,6 @@
#endif
[/side]


[event]
name=prestart
[allow_recruit]
Expand Down
Expand Up @@ -17,7 +17,7 @@
[side]
no_leader=yes
[unit]
{KALENZ}
{KALENZ}
[/unit]
gold=0
[/side]
Expand Down
Expand Up @@ -41,7 +41,7 @@
[unit]
{KALENZ}
x=12
y=1
y=1
[/unit]
#ifndef MULTIPLAYER
[unit]
Expand All @@ -66,7 +66,7 @@
[unit]
{LANDAR}
x=11
y=1
y=1
[/unit]
fog=yes
share_view=yes
Expand All @@ -92,7 +92,7 @@
[unit]
{CLEODIL}
x=11
y=1
y=1
[/unit]
fog=yes
share_view=yes
Expand Down
Expand Up @@ -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}
Expand Down Expand Up @@ -225,7 +225,6 @@ Chapter Four"
extra_recruit=Troll Whelp, Troll, Troll Rocklobber, Troll Warrior
#endif
[/unit]

[/side]

[side]
Expand Down Expand Up @@ -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
Expand Down
Expand Up @@ -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]
Expand Down
3 changes: 1 addition & 2 deletions data/campaigns/Legend_of_Wesmere/utils/characters.cfg
Expand Up @@ -52,7 +52,7 @@

#define SCOUT
id=scout
# name= _ "Huraldur"
# name= _ "Huraldur"
type=Elvish Scout
unrenamable=yes
[modifications]
Expand All @@ -63,7 +63,6 @@
{IS_LOYAL}
#enddef


#define LANDAR
id=Landar
name= _ "Landar"
Expand Down
5 changes: 1 addition & 4 deletions data/campaigns/Legend_of_Wesmere/utils/debug.cfg
Expand Up @@ -2,7 +2,6 @@
name=prestart

[set_menu_item]

id=debug_kill
description= "Kill Unit" #wmllint: ignore
[filter_location]
Expand Down Expand Up @@ -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]

14 changes: 7 additions & 7 deletions data/campaigns/Legend_of_Wesmere/utils/map-utils.cfg
Expand Up @@ -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
Expand All @@ -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]
Expand All @@ -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}
Expand All @@ -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]
Expand Down

0 comments on commit 39e2d71

Please sign in to comment.