wmlindent pass on mainline

This commit is contained in:
Ignacio R. Morelle 2013-12-21 23:04:34 -03:00
parent 81bb3f8b0f
commit 060c35d82c
3 changed files with 155 additions and 157 deletions

View File

@ -201,7 +201,7 @@
[era]
id=era_khalifate
name= _ "Default + Khalifate"
description= _ "An era featuring an additional faction besides the six factions from Default Era. Khalifate units use no magic, but instead rely on careful use of terrain and coordinated strikes around dusk or dawn.
description= _ "An era featuring an additional faction besides the six factions from Default Era. Khalifate units use no magic, but instead rely on careful use of terrain and coordinated strikes around dusk or dawn.
This era is still under development, so please be sure to report any problems that arise."

View File

@ -231,7 +231,6 @@ Xu , Xu , Qxu , Qxu , Ql , Ql
range=ranged
[/effect]
[/object]
[/modifications]
[abilities]
{ABILITY_SKIRMISHER}
@ -1469,8 +1468,8 @@ My best advancement costs $next_cost gold and Im $experience|% there."
y=13-20
[/time_area]
[label]
x,y=8,11
text="Filter Area"
x,y=8,11
text="Filter Area"
[/label]
[time_area]
x,y=8,11
@ -3130,20 +3129,20 @@ Ww, Ww, Ww, Ww
[/label]
[/event]
[event]
name=moveto
[filter]
[filter_location]
area="test_area"
[/filter_location]
[/filter]
[message]
speaker=unit
message="You entered a different time Zone"
[/message]
[/event]
[event]
name=moveto
[filter]
[filter_location]
area="test_area"
[/filter_location]
[/filter]
[message]
speaker=unit
message="You entered a different time Zone"
[/message]
[/event]
[event]
name=start

View File

@ -4,7 +4,7 @@
[main_map_border]
border_size = 0.5
background_image = "terrain/off-map/background.png"
# this image is processed by the terrain matching code so should be
# in the terrains directory and should ommit the 'terrain/' prefix
# and the '.png' suffix
@ -12,174 +12,173 @@
corner_image_top_left = "terrain/off-map/fade_corner_top_left.png"
corner_image_bottom_left = "terrain/off-map/fade_corner_bottom_left.png"
# odd means the corner is on a tile with an odd x value,
# the tile is the ingame tile not the odd in C++
corner_image_top_right_odd = "terrain/off-map/fade_corner_top_right_odd.png"
corner_image_top_right_even = "terrain/off-map/fade_corner_top_right_even.png"
corner_image_bottom_right_odd = "terrain/off-map/fade_corner_bottom_right_odd.png"
corner_image_bottom_right_even = "terrain/off-map/fade_corner_bottom_right_even.png"
border_image_left = "terrain/off-map/fade_border_left.png"
border_image_right = "terrain/off-map/fade_border_right.png"
border_image_top_odd = "terrain/off-map/fade_border_top_odd.png"
border_image_top_even = "terrain/off-map/fade_border_top_even.png"
border_image_bottom_odd = "terrain/off-map/fade_border_bottom_odd.png"
border_image_bottom_even = "terrain/off-map/fade_border_bottom_even.png"
[/main_map_border]
#enddef
#define STATUS_BOX X1 Y1 X2 Y2 ID REF XANCHOR YANCHOR
[panel]
id={ID}-box-topleft
image=themes/status_box/status_box-border-topleft.png
rect="{X1},{Y1},+3,+3"
xanchor={XANCHOR}
ref={REF}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-top
image=themes/status_box/status_box-border-top.png
rect="+0,=+0,{X2},+3"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-topright
image=themes/status_box/status_box-border-topright.png
rect="+0,=+0,+3,+3"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-topleft
image=themes/status_box/status_box-border-topleft.png
rect="{X1},{Y1},+3,+3"
xanchor={XANCHOR}
ref={REF}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-top
image=themes/status_box/status_box-border-top.png
rect="+0,=+0,{X2},+3"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-topright
image=themes/status_box/status_box-border-topright.png
rect="+0,=+0,+3,+3"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-left
image=themes/status_box/status_box-border-left.png
ref={ID}-box-topleft
rect="=+0,+0,+3,{Y2}"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-center
image=themes/status_box/status_box-background.png
rect="+0,=+0,{X2},{Y2}"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-right
image=themes/status_box/status_box-border-right.png
rect="+0,=+0,+3,{Y2}"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-left
image=themes/status_box/status_box-border-left.png
ref={ID}-box-topleft
rect="=+0,+0,+3,{Y2}"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-center
image=themes/status_box/status_box-background.png
rect="+0,=+0,{X2},{Y2}"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-right
image=themes/status_box/status_box-border-right.png
rect="+0,=+0,+3,{Y2}"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-botleft
image=themes/status_box/status_box-border-botleft.png
ref={ID}-box-left
rect="=+0,+0,+3,+3"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-bottom
image=themes/status_box/status_box-border-bottom.png
rect="+0,=+0,{X2},+3"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-botright
image=themes/status_box/status_box-border-botright.png
rect="+0,=+0,+3,+3"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-botleft
image=themes/status_box/status_box-border-botleft.png
ref={ID}-box-left
rect="=+0,+0,+3,+3"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-bottom
image=themes/status_box/status_box-border-bottom.png
rect="+0,=+0,{X2},+3"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
[panel]
id={ID}-box-botright
image=themes/status_box/status_box-border-botright.png
rect="+0,=+0,+3,+3"
xanchor={XANCHOR}
yanchor={YANCHOR}
[/panel]
#enddef
#define REMOVE_STATUS_BOX ID
[remove]
id={ID}-box-topleft
[/remove]
[remove]
id={ID}-box-top
[/remove]
[remove]
id={ID}-box-topright
[/remove]
[remove]
id={ID}-box-topleft
[/remove]
[remove]
id={ID}-box-top
[/remove]
[remove]
id={ID}-box-topright
[/remove]
[remove]
id={ID}-box-left
[/remove]
[remove]
id={ID}-box-center
[/remove]
[remove]
id={ID}-box-right
[/remove]
[remove]
id={ID}-box-left
[/remove]
[remove]
id={ID}-box-center
[/remove]
[remove]
id={ID}-box-right
[/remove]
[remove]
id={ID}-box-botleft
[/remove]
[remove]
id={ID}-box-bottom
[/remove]
[remove]
id={ID}-box-botright
[/remove]
[remove]
id={ID}-box-botleft
[/remove]
[remove]
id={ID}-box-bottom
[/remove]
[remove]
id={ID}-box-botright
[/remove]
#enddef
#define CHANGE_STATUS_BOX X1 Y1 X2 Y2 ID REF
[change]
id={ID}-box-topleft
rect="{X1},{Y1},+3,+3"
ref={REF}
[/change]
[change]
id={ID}-box-top
rect="+0,=+0,{X2},+3"
[/change]
[change]
id={ID}-box-topright
rect="+0,=+0,+3,+3"
[/change]
#define CHANGE_STATUS_BOX X1 Y1 X2 Y2 ID REF
[change]
id={ID}-box-topleft
rect="{X1},{Y1},+3,+3"
ref={REF}
[/change]
[change]
id={ID}-box-top
rect="+0,=+0,{X2},+3"
[/change]
[change]
id={ID}-box-topright
rect="+0,=+0,+3,+3"
[/change]
[change]
id={ID}-box-left
ref={ID}-box-topleft
rect="=+0,+0,+3,{Y2}"
[/change]
[change]
id={ID}-box-center
rect="+0,=+0,{X2},{Y2}"
[/change]
[change]
id={ID}-box-right
rect="+0,=+0,+3,{Y2}"
[/change]
[change]
id={ID}-box-left
ref={ID}-box-topleft
rect="=+0,+0,+3,{Y2}"
[/change]
[change]
id={ID}-box-center
rect="+0,=+0,{X2},{Y2}"
[/change]
[change]
id={ID}-box-right
rect="+0,=+0,+3,{Y2}"
[/change]
[change]
id={ID}-box-botleft
ref={ID}-box-left
rect="=+0,+0,+3,+3"
[/change]
[change]
id={ID}-box-bottom
rect="+0,=+0,{X2},+3"
[/change]
[change]
id={ID}-box-botright
rect="+0,=+0,+3,+3"
[/change]
[change]
id={ID}-box-botleft
ref={ID}-box-left
rect="=+0,+0,+3,+3"
[/change]
[change]
id={ID}-box-bottom
rect="+0,=+0,{X2},+3"
[/change]
[change]
id={ID}-box-botright
rect="+0,=+0,+3,+3"
[/change]
#enddef
#define COUNTDOWN_THEME
{STATUS_BOX +5 =+0 +90 +15 timeout income-box-topright fixed fixed}
[label]