Merge branch 'master' of github.com:wesnoth/wesnoth-old
This commit is contained in:
Alexander van Gessel
commit
c825dd0e72
6 changed files with 316 additions and 324 deletions
|
|
@ -33,6 +33,13 @@
|
||||||
user_team_name= _ "team_name^Quenoth Elves"
|
user_team_name= _ "team_name^Quenoth Elves"
|
||||||
[/side]
|
[/side]
|
||||||
|
|
||||||
|
# These two are referred to for searching the recall list, but wmllint
|
||||||
|
# will still complain about "unknown '<NAME>' referred to by id" without
|
||||||
|
# these comments.
|
||||||
|
#
|
||||||
|
# wmllint: recognize Nym
|
||||||
|
# wmllint: recognize Zhul
|
||||||
|
|
||||||
# Prestart functions:
|
# Prestart functions:
|
||||||
|
|
||||||
[event]
|
[event]
|
||||||
|
|
|
||||||
|
|
@ -201,6 +201,9 @@
|
||||||
[era]
|
[era]
|
||||||
id=era_khalifate
|
id=era_khalifate
|
||||||
name= _ "Default + 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.
|
||||||
|
|
||||||
|
This era is still under development, so please be sure to report any problems that arise."
|
||||||
|
|
||||||
{ERA_DEFAULT}
|
{ERA_DEFAULT}
|
||||||
{multiplayer/factions/khalifate.cfg}
|
{multiplayer/factions/khalifate.cfg}
|
||||||
|
|
|
||||||
|
|
@ -231,7 +231,6 @@ Xu , Xu , Qxu , Qxu , Ql , Ql
|
||||||
range=ranged
|
range=ranged
|
||||||
[/effect]
|
[/effect]
|
||||||
[/object]
|
[/object]
|
||||||
|
|
||||||
[/modifications]
|
[/modifications]
|
||||||
[abilities]
|
[abilities]
|
||||||
{ABILITY_SKIRMISHER}
|
{ABILITY_SKIRMISHER}
|
||||||
|
|
@ -1469,8 +1468,8 @@ My best advancement costs $next_cost gold and I’m $experience|% there."
|
||||||
y=13-20
|
y=13-20
|
||||||
[/time_area]
|
[/time_area]
|
||||||
[label]
|
[label]
|
||||||
x,y=8,11
|
x,y=8,11
|
||||||
text="Filter Area"
|
text="Filter Area"
|
||||||
[/label]
|
[/label]
|
||||||
[time_area]
|
[time_area]
|
||||||
x,y=8,11
|
x,y=8,11
|
||||||
|
|
@ -3130,20 +3129,20 @@ Ww, Ww, Ww, Ww
|
||||||
[/label]
|
[/label]
|
||||||
[/event]
|
[/event]
|
||||||
|
|
||||||
[event]
|
[event]
|
||||||
name=moveto
|
name=moveto
|
||||||
|
|
||||||
[filter]
|
[filter]
|
||||||
[filter_location]
|
[filter_location]
|
||||||
area="test_area"
|
area="test_area"
|
||||||
[/filter_location]
|
[/filter_location]
|
||||||
[/filter]
|
[/filter]
|
||||||
|
|
||||||
[message]
|
[message]
|
||||||
speaker=unit
|
speaker=unit
|
||||||
message="You entered a different time Zone"
|
message="You entered a different time Zone"
|
||||||
[/message]
|
[/message]
|
||||||
[/event]
|
[/event]
|
||||||
|
|
||||||
[event]
|
[event]
|
||||||
name=start
|
name=start
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
{MAIN_MAP_BORDER}
|
{MAIN_MAP_BORDER}
|
||||||
|
|
||||||
# rightside panel
|
# rightside panel
|
||||||
|
|
||||||
[panel]
|
[panel]
|
||||||
id=sidebar-panel
|
id=sidebar-panel
|
||||||
image=themes/editor/classic/sidebar.png
|
image=themes/editor/classic/sidebar.png
|
||||||
|
|
@ -61,7 +61,7 @@
|
||||||
|
|
||||||
[panel]
|
[panel]
|
||||||
id=minimap-panel
|
id=minimap-panel
|
||||||
# ref=terrain-description-box-botleft
|
#ref=terrain-description-box-botleft
|
||||||
image=themes/classic/minimap.png
|
image=themes/classic/minimap.png
|
||||||
rect="=+3,=+6,+181,+214"
|
rect="=+3,=+6,+181,+214"
|
||||||
xanchor=right
|
xanchor=right
|
||||||
|
|
@ -69,15 +69,15 @@
|
||||||
[/panel]
|
[/panel]
|
||||||
|
|
||||||
{STATUS_BOX =+4 +25 +165 +15 terrain-info minimap-panel right fixed}
|
{STATUS_BOX =+4 +25 +165 +15 terrain-info minimap-panel right fixed}
|
||||||
# [label]
|
#[label]
|
||||||
# id=terrain-icon
|
# id=terrain-icon
|
||||||
# icon=icons/terrain/terrain_type_info.png
|
# icon=icons/terrain/terrain_type_info.png
|
||||||
# text= _ "terrain"
|
# text= _ "terrain"
|
||||||
# ref=terrain-info-box-center
|
# ref=terrain-info-box-center
|
||||||
# rect="=-1,=-1,+20,+16"
|
# rect="=-1,=-1,+20,+16"
|
||||||
# xanchor=right
|
# xanchor=right
|
||||||
# yanchor=fixed
|
# yanchor=fixed
|
||||||
# [/label]
|
#[/label]
|
||||||
{STATUS_BOX =+0 -2 +165 +15 terrain-description terrain-info-box-botleft right fixed}
|
{STATUS_BOX =+0 -2 +165 +15 terrain-description terrain-info-box-botleft right fixed}
|
||||||
[terrain]
|
[terrain]
|
||||||
id=terrain-description
|
id=terrain-description
|
||||||
|
|
@ -89,7 +89,7 @@
|
||||||
|
|
||||||
{STATUS_BOX =+3 +3 +122 +36 tod terrain-description-box-botleft right fixed}
|
{STATUS_BOX =+3 +3 +122 +36 tod terrain-description-box-botleft right fixed}
|
||||||
|
|
||||||
{STATUS_BOX =+0 +5 +72 +72 unit tod-box-botleft right fixed}
|
{STATUS_BOX =+0 +5 +72 +72 unit tod-box-botleft right fixed}
|
||||||
|
|
||||||
[menu]
|
[menu]
|
||||||
id=menu-main
|
id=menu-main
|
||||||
|
|
@ -254,7 +254,6 @@
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/label]
|
[/label]
|
||||||
|
|
||||||
|
|
||||||
[label]
|
[label]
|
||||||
id=gold-icon
|
id=gold-icon
|
||||||
icon=themes/gold.png
|
icon=themes/gold.png
|
||||||
|
|
@ -302,7 +301,6 @@
|
||||||
[/label]
|
[/label]
|
||||||
|
|
||||||
[status]
|
[status]
|
||||||
|
|
||||||
[zoom_level]
|
[zoom_level]
|
||||||
id=zoom-level
|
id=zoom-level
|
||||||
ref=map-zoom-slider
|
ref=map-zoom-slider
|
||||||
|
|
@ -337,7 +335,6 @@
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/terrain]
|
[/terrain]
|
||||||
|
|
||||||
|
|
||||||
# the time of day image
|
# the time of day image
|
||||||
[time_of_day]
|
[time_of_day]
|
||||||
id=image-tod
|
id=image-tod
|
||||||
|
|
@ -452,7 +449,7 @@
|
||||||
xanchor=left
|
xanchor=left
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/panel]
|
[/panel]
|
||||||
|
|
||||||
[observers]
|
[observers]
|
||||||
id=observers
|
id=observers
|
||||||
font_size={DEFAULT_FONT_SMALL}
|
font_size={DEFAULT_FONT_SMALL}
|
||||||
|
|
@ -493,14 +490,14 @@
|
||||||
xanchor=right
|
xanchor=right
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/unit_level]
|
[/unit_level]
|
||||||
# [unit_race]
|
#[unit_race]
|
||||||
# id=unit-race
|
# id=unit-race
|
||||||
# font_size={DEFAULT_FONT_SMALL}
|
# font_size={DEFAULT_FONT_SMALL}
|
||||||
# rect="=,+0,=,+16"
|
# rect="=,+0,=,+16"
|
||||||
# prefix= " "
|
# prefix= " "
|
||||||
# xanchor=right
|
# xanchor=right
|
||||||
# yanchor=fixed
|
# yanchor=fixed
|
||||||
# [/unit_race]
|
#[/unit_race]
|
||||||
[unit_traits]
|
[unit_traits]
|
||||||
ref=unit-type
|
ref=unit-type
|
||||||
id=unit-traits
|
id=unit-traits
|
||||||
|
|
@ -568,14 +565,14 @@
|
||||||
|
|
||||||
# current position not usable, overlays with the status indication (like slow)
|
# current position not usable, overlays with the status indication (like slow)
|
||||||
# please find a better place (yes, I know that this is barely possible...)
|
# please find a better place (yes, I know that this is barely possible...)
|
||||||
# [unit_side]
|
# [unit_side]
|
||||||
# id=unit-side
|
# id=unit-side
|
||||||
# font_size={DEFAULT_FONT_SMALL}
|
# font_size={DEFAULT_FONT_SMALL}
|
||||||
# ref=unit-xp
|
# ref=unit-xp
|
||||||
# rect="=,+0,=,+16"
|
# rect="=,+0,=,+16"
|
||||||
# xanchor=right
|
# xanchor=right
|
||||||
# yanchor=fixed
|
# yanchor=fixed
|
||||||
# [/unit_side]
|
# [/unit_side]
|
||||||
[unit_weapons]
|
[unit_weapons]
|
||||||
id=unit-weapons
|
id=unit-weapons
|
||||||
font_size={DEFAULT_FONT_SMALL}
|
font_size={DEFAULT_FONT_SMALL}
|
||||||
|
|
@ -584,7 +581,6 @@
|
||||||
xanchor=right
|
xanchor=right
|
||||||
yanchor=top
|
yanchor=top
|
||||||
[/unit_weapons]
|
[/unit_weapons]
|
||||||
|
|
||||||
[/status]
|
[/status]
|
||||||
|
|
||||||
{REPLAY_THEME {DEFAULT_FONT_SMALL}}
|
{REPLAY_THEME {DEFAULT_FONT_SMALL}}
|
||||||
|
|
@ -597,55 +593,52 @@
|
||||||
height=600
|
height=600
|
||||||
|
|
||||||
# use right pane with a smaller minimap
|
# use right pane with a smaller minimap
|
||||||
[change]
|
[change]
|
||||||
id=minimap-panel
|
id=minimap-panel
|
||||||
image=themes/editor/classic/minimap-800.png
|
image=themes/editor/classic/minimap-800.png
|
||||||
rect="843,=+2,+181,+155"
|
rect="843,=+2,+181,+155"
|
||||||
[/change]
|
[/change]
|
||||||
# # increase size in middle panel since minimap is smaller
|
# increase size in middle panel since minimap is smaller
|
||||||
|
|
||||||
# # reduce size of minimap
|
# reduce size of minimap
|
||||||
[change]
|
[change]
|
||||||
id=mini-map
|
id=mini-map
|
||||||
rect="=+51,=+10,=-14,+131"
|
rect="=+51,=+10,=-14,+131"
|
||||||
[/change]
|
[/change]
|
||||||
[remove]
|
[remove]
|
||||||
id=map-zoom-slider
|
id=map-zoom-slider
|
||||||
[/remove]
|
[/remove]
|
||||||
[change]
|
[change]
|
||||||
id=minimapbutton-1
|
id=minimapbutton-1
|
||||||
#id=minimap_button_1
|
#id=minimap_button_1
|
||||||
ref=sidebar-panel
|
ref=sidebar-panel
|
||||||
rect="=+30,=+60,+25,+25"
|
rect="=+30,=+60,+25,+25"
|
||||||
[/change]
|
[/change]
|
||||||
[change]
|
[change]
|
||||||
id=minimap_button_2
|
id=minimap_button_2
|
||||||
#id=zoom_in_button_editor
|
#id=zoom_in_button_editor
|
||||||
#ref=zoom_default_button_editor
|
#ref=zoom_default_button_editor
|
||||||
rect="=,+20,+25,+25"
|
rect="=,+20,+25,+25"
|
||||||
|
[/change]
|
||||||
[/change]
|
[change]
|
||||||
[change]
|
id=minimap_button_3
|
||||||
id=minimap_button_3
|
#id=zoom_out_button_editor
|
||||||
#id=zoom_out_button_editor
|
#ref=zoom_in_button_editor
|
||||||
#ref=zoom_in_button_editor
|
rect="=,+2,+25,+25"
|
||||||
rect="=,+2,+25,+25"
|
[/change]
|
||||||
[/change]
|
[change]
|
||||||
[change]
|
id=minimap_button_4
|
||||||
id=minimap_button_4
|
# id=resize_button_editor
|
||||||
# id=resize_button_editor
|
rect="=,+2,+25,+25"
|
||||||
rect="=,+2,+25,+25"
|
[/change]
|
||||||
[/change]
|
[change]
|
||||||
[change]
|
id=minimap_button_5
|
||||||
id=minimap_button_5
|
# id=flip_map_button_editor
|
||||||
# id=flip_map_button_editor
|
rect="=,+2,+25,+25"
|
||||||
rect="=,+2,+25,+25"
|
[/change]
|
||||||
[/change]
|
|
||||||
|
|
||||||
|
# {CHANGE_STATUS_BOX =+9 +1 +122 +36 tod}
|
||||||
|
# {CHANGE_STATUS_BOX =-125 +2 +72 +72 unit}
|
||||||
# {CHANGE_STATUS_BOX =+9 +1 +122 +36 tod}
|
|
||||||
# {CHANGE_STATUS_BOX =-125 +2 +72 +72 unit}
|
|
||||||
|
|
||||||
# [change]
|
# [change]
|
||||||
# id=unit-description
|
# id=unit-description
|
||||||
|
|
@ -696,9 +689,6 @@
|
||||||
# rect="=,+0,=,+11"
|
# rect="=,+0,=,+11"
|
||||||
# [/change]
|
# [/change]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# # [change]
|
# # [change]
|
||||||
# # id=unit-description
|
# # id=unit-description
|
||||||
# # rect="=+3,+2,+200,+18"
|
# # rect="=+3,+2,+200,+18"
|
||||||
|
|
@ -783,11 +773,11 @@
|
||||||
font_size={DEFAULT_FONT_TINY}
|
font_size={DEFAULT_FONT_TINY}
|
||||||
rect="+0,=,+55,+20"
|
rect="+0,=,+55,+20"
|
||||||
[/change]
|
[/change]
|
||||||
# [change]
|
#[change]
|
||||||
# id=status-position
|
# id=status-position
|
||||||
# rect="=+5,=,+80,="
|
# rect="=+5,=,+80,="
|
||||||
# font_size={DEFAULT_FONT_TINY}
|
# font_size={DEFAULT_FONT_TINY}
|
||||||
# [/change]
|
#[/change]
|
||||||
[/partialresolution]
|
[/partialresolution]
|
||||||
|
|
||||||
[partialresolution]
|
[partialresolution]
|
||||||
|
|
@ -795,12 +785,12 @@
|
||||||
inherits=800x600
|
inherits=800x600
|
||||||
width=800
|
width=800
|
||||||
height=480
|
height=480
|
||||||
# [remove]
|
#[remove]
|
||||||
# id=unit-race
|
# id=unit-race
|
||||||
# [/remove]
|
#[/remove]
|
||||||
|
|
||||||
{REMOVE_STATUS_BOX tod}
|
{REMOVE_STATUS_BOX tod}
|
||||||
{CHANGE_STATUS_BOX =+5 +5 +72 +72 unit top-right-panel}
|
{CHANGE_STATUS_BOX =+5 +5 +72 +72 unit top-right-panel}
|
||||||
|
|
||||||
# use smaller fonts to display things correctly when using a vertical resolution smaller than 600px
|
# use smaller fonts to display things correctly when using a vertical resolution smaller than 600px
|
||||||
[change]
|
[change]
|
||||||
|
|
@ -847,12 +837,12 @@
|
||||||
[remove]
|
[remove]
|
||||||
id=unit-weapons
|
id=unit-weapons
|
||||||
[/remove]
|
[/remove]
|
||||||
# [change]
|
#[change]
|
||||||
# id=unit-weapons
|
# id=unit-weapons
|
||||||
# ref=unit-moves
|
# ref=unit-moves
|
||||||
# font_size={DEFAULT_FONT_REALLYTINY}
|
# font_size={DEFAULT_FONT_REALLYTINY}
|
||||||
# rect="=+0,+0,=,504"
|
# rect="=+0,+0,=,504"
|
||||||
# [/change]
|
#[/change]
|
||||||
[/partialresolution]
|
[/partialresolution]
|
||||||
[/theme]
|
[/theme]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
[main_map_border]
|
[main_map_border]
|
||||||
border_size = 0.5
|
border_size = 0.5
|
||||||
background_image = "terrain/off-map/background.png"
|
background_image = "terrain/off-map/background.png"
|
||||||
|
|
||||||
# this image is processed by the terrain matching code so should be
|
# this image is processed by the terrain matching code so should be
|
||||||
# in the terrains directory and should ommit the 'terrain/' prefix
|
# in the terrains directory and should ommit the 'terrain/' prefix
|
||||||
# and the '.png' suffix
|
# and the '.png' suffix
|
||||||
|
|
@ -12,174 +12,173 @@
|
||||||
|
|
||||||
corner_image_top_left = "terrain/off-map/fade_corner_top_left.png"
|
corner_image_top_left = "terrain/off-map/fade_corner_top_left.png"
|
||||||
corner_image_bottom_left = "terrain/off-map/fade_corner_bottom_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,
|
# odd means the corner is on a tile with an odd x value,
|
||||||
# the tile is the ingame tile not the odd in C++
|
# 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_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_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_odd = "terrain/off-map/fade_corner_bottom_right_odd.png"
|
||||||
corner_image_bottom_right_even = "terrain/off-map/fade_corner_bottom_right_even.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_left = "terrain/off-map/fade_border_left.png"
|
||||||
border_image_right = "terrain/off-map/fade_border_right.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_odd = "terrain/off-map/fade_border_top_odd.png"
|
||||||
border_image_top_even = "terrain/off-map/fade_border_top_even.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_odd = "terrain/off-map/fade_border_bottom_odd.png"
|
||||||
border_image_bottom_even = "terrain/off-map/fade_border_bottom_even.png"
|
border_image_bottom_even = "terrain/off-map/fade_border_bottom_even.png"
|
||||||
[/main_map_border]
|
[/main_map_border]
|
||||||
#enddef
|
#enddef
|
||||||
|
|
||||||
#define STATUS_BOX X1 Y1 X2 Y2 ID REF XANCHOR YANCHOR
|
#define STATUS_BOX X1 Y1 X2 Y2 ID REF XANCHOR YANCHOR
|
||||||
[panel]
|
[panel]
|
||||||
id={ID}-box-topleft
|
id={ID}-box-topleft
|
||||||
image=themes/status_box/status_box-border-topleft.png
|
image=themes/status_box/status_box-border-topleft.png
|
||||||
rect="{X1},{Y1},+3,+3"
|
rect="{X1},{Y1},+3,+3"
|
||||||
xanchor={XANCHOR}
|
xanchor={XANCHOR}
|
||||||
ref={REF}
|
ref={REF}
|
||||||
yanchor={YANCHOR}
|
yanchor={YANCHOR}
|
||||||
[/panel]
|
[/panel]
|
||||||
[panel]
|
[panel]
|
||||||
id={ID}-box-top
|
id={ID}-box-top
|
||||||
image=themes/status_box/status_box-border-top.png
|
image=themes/status_box/status_box-border-top.png
|
||||||
rect="+0,=+0,{X2},+3"
|
rect="+0,=+0,{X2},+3"
|
||||||
xanchor={XANCHOR}
|
xanchor={XANCHOR}
|
||||||
yanchor={YANCHOR}
|
yanchor={YANCHOR}
|
||||||
[/panel]
|
[/panel]
|
||||||
[panel]
|
[panel]
|
||||||
id={ID}-box-topright
|
id={ID}-box-topright
|
||||||
image=themes/status_box/status_box-border-topright.png
|
image=themes/status_box/status_box-border-topright.png
|
||||||
rect="+0,=+0,+3,+3"
|
rect="+0,=+0,+3,+3"
|
||||||
xanchor={XANCHOR}
|
xanchor={XANCHOR}
|
||||||
yanchor={YANCHOR}
|
yanchor={YANCHOR}
|
||||||
[/panel]
|
[/panel]
|
||||||
|
|
||||||
[panel]
|
[panel]
|
||||||
id={ID}-box-left
|
id={ID}-box-left
|
||||||
image=themes/status_box/status_box-border-left.png
|
image=themes/status_box/status_box-border-left.png
|
||||||
ref={ID}-box-topleft
|
ref={ID}-box-topleft
|
||||||
rect="=+0,+0,+3,{Y2}"
|
rect="=+0,+0,+3,{Y2}"
|
||||||
xanchor={XANCHOR}
|
xanchor={XANCHOR}
|
||||||
yanchor={YANCHOR}
|
yanchor={YANCHOR}
|
||||||
[/panel]
|
[/panel]
|
||||||
[panel]
|
[panel]
|
||||||
id={ID}-box-center
|
id={ID}-box-center
|
||||||
image=themes/status_box/status_box-background.png
|
image=themes/status_box/status_box-background.png
|
||||||
rect="+0,=+0,{X2},{Y2}"
|
rect="+0,=+0,{X2},{Y2}"
|
||||||
xanchor={XANCHOR}
|
xanchor={XANCHOR}
|
||||||
yanchor={YANCHOR}
|
yanchor={YANCHOR}
|
||||||
[/panel]
|
[/panel]
|
||||||
[panel]
|
[panel]
|
||||||
id={ID}-box-right
|
id={ID}-box-right
|
||||||
image=themes/status_box/status_box-border-right.png
|
image=themes/status_box/status_box-border-right.png
|
||||||
rect="+0,=+0,+3,{Y2}"
|
rect="+0,=+0,+3,{Y2}"
|
||||||
xanchor={XANCHOR}
|
xanchor={XANCHOR}
|
||||||
yanchor={YANCHOR}
|
yanchor={YANCHOR}
|
||||||
[/panel]
|
[/panel]
|
||||||
|
|
||||||
[panel]
|
[panel]
|
||||||
id={ID}-box-botleft
|
id={ID}-box-botleft
|
||||||
image=themes/status_box/status_box-border-botleft.png
|
image=themes/status_box/status_box-border-botleft.png
|
||||||
ref={ID}-box-left
|
ref={ID}-box-left
|
||||||
rect="=+0,+0,+3,+3"
|
rect="=+0,+0,+3,+3"
|
||||||
xanchor={XANCHOR}
|
xanchor={XANCHOR}
|
||||||
yanchor={YANCHOR}
|
yanchor={YANCHOR}
|
||||||
[/panel]
|
[/panel]
|
||||||
[panel]
|
[panel]
|
||||||
id={ID}-box-bottom
|
id={ID}-box-bottom
|
||||||
image=themes/status_box/status_box-border-bottom.png
|
image=themes/status_box/status_box-border-bottom.png
|
||||||
rect="+0,=+0,{X2},+3"
|
rect="+0,=+0,{X2},+3"
|
||||||
xanchor={XANCHOR}
|
xanchor={XANCHOR}
|
||||||
yanchor={YANCHOR}
|
yanchor={YANCHOR}
|
||||||
[/panel]
|
[/panel]
|
||||||
[panel]
|
[panel]
|
||||||
id={ID}-box-botright
|
id={ID}-box-botright
|
||||||
image=themes/status_box/status_box-border-botright.png
|
image=themes/status_box/status_box-border-botright.png
|
||||||
rect="+0,=+0,+3,+3"
|
rect="+0,=+0,+3,+3"
|
||||||
xanchor={XANCHOR}
|
xanchor={XANCHOR}
|
||||||
yanchor={YANCHOR}
|
yanchor={YANCHOR}
|
||||||
[/panel]
|
[/panel]
|
||||||
#enddef
|
#enddef
|
||||||
|
|
||||||
#define REMOVE_STATUS_BOX ID
|
#define REMOVE_STATUS_BOX ID
|
||||||
[remove]
|
[remove]
|
||||||
id={ID}-box-topleft
|
id={ID}-box-topleft
|
||||||
[/remove]
|
[/remove]
|
||||||
[remove]
|
[remove]
|
||||||
id={ID}-box-top
|
id={ID}-box-top
|
||||||
[/remove]
|
[/remove]
|
||||||
[remove]
|
[remove]
|
||||||
id={ID}-box-topright
|
id={ID}-box-topright
|
||||||
[/remove]
|
[/remove]
|
||||||
|
|
||||||
[remove]
|
[remove]
|
||||||
id={ID}-box-left
|
id={ID}-box-left
|
||||||
[/remove]
|
[/remove]
|
||||||
[remove]
|
[remove]
|
||||||
id={ID}-box-center
|
id={ID}-box-center
|
||||||
[/remove]
|
[/remove]
|
||||||
[remove]
|
[remove]
|
||||||
id={ID}-box-right
|
id={ID}-box-right
|
||||||
[/remove]
|
[/remove]
|
||||||
|
|
||||||
[remove]
|
[remove]
|
||||||
id={ID}-box-botleft
|
id={ID}-box-botleft
|
||||||
[/remove]
|
[/remove]
|
||||||
[remove]
|
[remove]
|
||||||
id={ID}-box-bottom
|
id={ID}-box-bottom
|
||||||
[/remove]
|
[/remove]
|
||||||
[remove]
|
[remove]
|
||||||
id={ID}-box-botright
|
id={ID}-box-botright
|
||||||
[/remove]
|
[/remove]
|
||||||
#enddef
|
#enddef
|
||||||
|
|
||||||
#define CHANGE_STATUS_BOX X1 Y1 X2 Y2 ID REF
|
#define CHANGE_STATUS_BOX X1 Y1 X2 Y2 ID REF
|
||||||
[change]
|
[change]
|
||||||
id={ID}-box-topleft
|
id={ID}-box-topleft
|
||||||
rect="{X1},{Y1},+3,+3"
|
rect="{X1},{Y1},+3,+3"
|
||||||
ref={REF}
|
ref={REF}
|
||||||
[/change]
|
[/change]
|
||||||
[change]
|
[change]
|
||||||
id={ID}-box-top
|
id={ID}-box-top
|
||||||
rect="+0,=+0,{X2},+3"
|
rect="+0,=+0,{X2},+3"
|
||||||
[/change]
|
[/change]
|
||||||
[change]
|
[change]
|
||||||
id={ID}-box-topright
|
id={ID}-box-topright
|
||||||
rect="+0,=+0,+3,+3"
|
rect="+0,=+0,+3,+3"
|
||||||
[/change]
|
[/change]
|
||||||
|
|
||||||
[change]
|
[change]
|
||||||
id={ID}-box-left
|
id={ID}-box-left
|
||||||
ref={ID}-box-topleft
|
ref={ID}-box-topleft
|
||||||
rect="=+0,+0,+3,{Y2}"
|
rect="=+0,+0,+3,{Y2}"
|
||||||
[/change]
|
[/change]
|
||||||
[change]
|
[change]
|
||||||
id={ID}-box-center
|
id={ID}-box-center
|
||||||
rect="+0,=+0,{X2},{Y2}"
|
rect="+0,=+0,{X2},{Y2}"
|
||||||
[/change]
|
[/change]
|
||||||
[change]
|
[change]
|
||||||
id={ID}-box-right
|
id={ID}-box-right
|
||||||
rect="+0,=+0,+3,{Y2}"
|
rect="+0,=+0,+3,{Y2}"
|
||||||
[/change]
|
[/change]
|
||||||
|
|
||||||
[change]
|
[change]
|
||||||
id={ID}-box-botleft
|
id={ID}-box-botleft
|
||||||
ref={ID}-box-left
|
ref={ID}-box-left
|
||||||
rect="=+0,+0,+3,+3"
|
rect="=+0,+0,+3,+3"
|
||||||
[/change]
|
[/change]
|
||||||
[change]
|
[change]
|
||||||
id={ID}-box-bottom
|
id={ID}-box-bottom
|
||||||
rect="+0,=+0,{X2},+3"
|
rect="+0,=+0,{X2},+3"
|
||||||
[/change]
|
[/change]
|
||||||
[change]
|
[change]
|
||||||
id={ID}-box-botright
|
id={ID}-box-botright
|
||||||
rect="+0,=+0,+3,+3"
|
rect="+0,=+0,+3,+3"
|
||||||
[/change]
|
[/change]
|
||||||
#enddef
|
#enddef
|
||||||
|
|
||||||
|
|
||||||
#define COUNTDOWN_THEME
|
#define COUNTDOWN_THEME
|
||||||
{STATUS_BOX +5 =+0 +90 +15 timeout income-box-topright fixed fixed}
|
{STATUS_BOX +5 =+0 +90 +15 timeout income-box-topright fixed fixed}
|
||||||
[label]
|
[label]
|
||||||
|
|
@ -226,7 +225,7 @@
|
||||||
text= _ "Replay"
|
text= _ "Replay"
|
||||||
ref=replay-panel
|
ref=replay-panel
|
||||||
rect="=+3,=+10,+60,=-4"
|
rect="=+3,=+10,+60,=-4"
|
||||||
# font_size={FONT_NORMAL_SIZE}
|
#font_size={FONT_NORMAL_SIZE}
|
||||||
font_rgb=160,160,160
|
font_rgb=160,160,160
|
||||||
xanchor=fixed
|
xanchor=fixed
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
|
|
@ -273,7 +272,7 @@
|
||||||
title= _ "Reset"
|
title= _ "Reset"
|
||||||
tooltip= _ "reset to beginning"
|
tooltip= _ "reset to beginning"
|
||||||
items=resetreplay
|
items=resetreplay
|
||||||
# rect="+4,=,+23,="
|
#rect="+4,=,+23,="
|
||||||
rect="+4,=+0,+30,+30"
|
rect="+4,=+0,+30,+30"
|
||||||
xanchor=fixed
|
xanchor=fixed
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,13 @@
|
||||||
# http://www.wesnoth.org/forum/viewtopic.php?p=213708#213708
|
# http://www.wesnoth.org/forum/viewtopic.php?p=213708#213708
|
||||||
|
|
||||||
#define DEFAULT_FONT_NORMAL
|
#define DEFAULT_FONT_NORMAL
|
||||||
14 #enddef
|
14 #enddef
|
||||||
#define DEFAULT_FONT_SMALL
|
#define DEFAULT_FONT_SMALL
|
||||||
12 #enddef
|
12 #enddef
|
||||||
#define DEFAULT_FONT_TINY
|
#define DEFAULT_FONT_TINY
|
||||||
10 #enddef
|
10 #enddef
|
||||||
#define DEFAULT_FONT_REALLYTINY
|
#define DEFAULT_FONT_REALLYTINY
|
||||||
9 #enddef
|
9 #enddef
|
||||||
|
|
||||||
{themes/macros.cfg}
|
{themes/macros.cfg}
|
||||||
|
|
||||||
|
|
@ -60,8 +60,6 @@
|
||||||
|
|
||||||
# rightside panel
|
# rightside panel
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
{STATUS_BOX =+1 =+3 794 271 minimap sidebar-panel fixed fixed}
|
{STATUS_BOX =+1 =+3 794 271 minimap sidebar-panel fixed fixed}
|
||||||
|
|
||||||
[mini_map]
|
[mini_map]
|
||||||
|
|
@ -72,15 +70,15 @@
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/mini_map]
|
[/mini_map]
|
||||||
|
|
||||||
# [slider]
|
#[slider]
|
||||||
# image=buttons/sliders/slider_arrow_gold@2x
|
# image=buttons/sliders/slider_arrow_gold@2x
|
||||||
# id=map-zoom-slider
|
# id=map-zoom-slider
|
||||||
# black_line=yes
|
# black_line=yes
|
||||||
# ref=mini-map
|
# ref=mini-map
|
||||||
# rect="=+32,+1,+117,+18"
|
# rect="=+32,+1,+117,+18"
|
||||||
# xanchor=fixed
|
# xanchor=fixed
|
||||||
# yanchor=fixed
|
# yanchor=fixed
|
||||||
# [/slider]
|
#[/slider]
|
||||||
|
|
||||||
[action]
|
[action]
|
||||||
ref=minimap-box-botright
|
ref=minimap-box-botright
|
||||||
|
|
@ -107,14 +105,14 @@
|
||||||
|
|
||||||
{STATUS_BOX +2 =+0 +127 +30 terrain-info cycle-button fixed fixed}
|
{STATUS_BOX +2 =+0 +127 +30 terrain-info cycle-button fixed fixed}
|
||||||
{STATUS_BOX = +0 +127 +18 terrain-position terrain-info-box-botleft fixed fixed}
|
{STATUS_BOX = +0 +127 +18 terrain-position terrain-info-box-botleft fixed fixed}
|
||||||
{STATUS_BOX =+2 +2 +72 +72 unit cycle-button fixed fixed}
|
{STATUS_BOX =+2 +2 +72 +72 unit cycle-button fixed fixed}
|
||||||
|
|
||||||
[menu]
|
[menu]
|
||||||
id=menu-main
|
id=menu-main
|
||||||
title= _ "Menu"
|
title= _ "Menu"
|
||||||
image=button_square/button_square_60
|
image=button_square/button_square_60
|
||||||
items=objectives,statistics,unitlist,statustable,save,savereplay,load,preferences,chatlog,AUTOSAVES,help,stopnetwork,startnetwork,quit, undo,redo,wbexecuteallactions,wbexecuteaction,wbdeleteaction,speak,recruit,recall,showenemymoves,bestenemymoves,wbtoggle,delayshroud,updateshroud
|
items=objectives,statistics,unitlist,statustable,save,savereplay,load,preferences,chatlog,AUTOSAVES,help,stopnetwork,startnetwork,quit,undo,redo,wbexecuteallactions,wbexecuteaction,wbdeleteaction,speak,recruit,recall,showenemymoves,bestenemymoves,wbtoggle,delayshroud,updateshroud
|
||||||
#,endturn
|
#,endturn
|
||||||
ref=sidebar-panel
|
ref=sidebar-panel
|
||||||
font_size=30
|
font_size=30
|
||||||
rect="=+2,-62,+60,+60"
|
rect="=+2,-62,+60,+60"
|
||||||
|
|
@ -123,7 +121,6 @@
|
||||||
[/menu]
|
[/menu]
|
||||||
|
|
||||||
{STATUS_BOX +4 =+15 +122 +36 tod menu-main fixed fixed}
|
{STATUS_BOX +4 =+15 +122 +36 tod menu-main fixed fixed}
|
||||||
|
|
||||||
|
|
||||||
{STATUS_BOX =-2 +2 +57 +15 gold zoom-default-button fixed fixed}
|
{STATUS_BOX =-2 +2 +57 +15 gold zoom-default-button fixed fixed}
|
||||||
{STATUS_BOX = =+1 +57 +15 income gold-box-botleft fixed fixed}
|
{STATUS_BOX = =+1 +57 +15 income gold-box-botleft fixed fixed}
|
||||||
|
|
@ -160,17 +157,17 @@ Turn"
|
||||||
auto_tooltip=yes
|
auto_tooltip=yes
|
||||||
[/action]
|
[/action]
|
||||||
|
|
||||||
# [menu]
|
#[menu]
|
||||||
# id=actions-menu
|
# id=actions-menu
|
||||||
# title= _ "Actions"
|
# title= _ "Actions"
|
||||||
# image=button_menu/menu_button_copper_H20
|
# image=button_menu/menu_button_copper_H20
|
||||||
# items=undo,redo,wbexecuteallactions,wbexecuteaction,wbdeleteaction,cycle,speak,recruit,recall,showenemymoves,bestenemymoves,wbtoggle,delayshroud,updateshroud,endturn
|
# items=undo,redo,wbexecuteallactions,wbexecuteaction,wbdeleteaction,cycle,speak,recruit,recall,showenemymoves,bestenemymoves,wbtoggle,delayshroud,updateshroud,endturn
|
||||||
# rect="+2,=,+100,="
|
# rect="+2,=,+100,="
|
||||||
# xanchor=fixed
|
# xanchor=fixed
|
||||||
# yanchor=fixed
|
# yanchor=fixed
|
||||||
# [/menu]
|
#[/menu]
|
||||||
|
|
||||||
# {COUNTDOWN_THEME}
|
#{COUNTDOWN_THEME}
|
||||||
[menu]
|
[menu]
|
||||||
is_context_menu=true
|
is_context_menu=true
|
||||||
items=wml,undo,redo,wbexecuteaction,wbdeleteaction,wbbumpupaction,wbbumpdownaction,wbsupposedead,describeterrain,describeunit,renameunit,createunit,changeside,killunit,labelteamterrain,labelterrain,clearlabels,speak,continue,recruit,recall,wbtoggle,delayshroud,updateshroud,cycle,endturn
|
items=wml,undo,redo,wbexecuteaction,wbdeleteaction,wbbumpupaction,wbbumpdownaction,wbsupposedead,describeterrain,describeunit,renameunit,createunit,changeside,killunit,labelteamterrain,labelterrain,clearlabels,speak,continue,recruit,recall,wbtoggle,delayshroud,updateshroud,cycle,endturn
|
||||||
|
|
@ -185,9 +182,8 @@ Turn"
|
||||||
xanchor=fixed
|
xanchor=fixed
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/label]
|
[/label]
|
||||||
|
|
||||||
[status]
|
|
||||||
|
|
||||||
|
[status]
|
||||||
## The size of these rectangles only accommodates hex coordinates
|
## The size of these rectangles only accommodates hex coordinates
|
||||||
## up to 999.
|
## up to 999.
|
||||||
[position]
|
[position]
|
||||||
|
|
@ -222,7 +218,7 @@ Turn"
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/tod_stats]
|
[/tod_stats]
|
||||||
|
|
||||||
# #put the side playing indicator next to the turn indicator
|
#put the side playing indicator next to the turn indicator
|
||||||
[side_playing]
|
[side_playing]
|
||||||
id=icon-sideplaying
|
id=icon-sideplaying
|
||||||
ref=turn-box-center
|
ref=turn-box-center
|
||||||
|
|
@ -232,7 +228,7 @@ Turn"
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/side_playing]
|
[/side_playing]
|
||||||
|
|
||||||
# # the game status
|
# the game status
|
||||||
[turn]
|
[turn]
|
||||||
id=turn
|
id=turn
|
||||||
font_size={DEFAULT_FONT_SMALL}
|
font_size={DEFAULT_FONT_SMALL}
|
||||||
|
|
@ -245,7 +241,7 @@ Turn"
|
||||||
[gold]
|
[gold]
|
||||||
id=gold
|
id=gold
|
||||||
font_size={DEFAULT_FONT_SMALL}
|
font_size={DEFAULT_FONT_SMALL}
|
||||||
# font_size={DEFAULT_FONT_SMALL}
|
#font_size={DEFAULT_FONT_SMALL}
|
||||||
ref=gold-icon
|
ref=gold-icon
|
||||||
rect="+1,=0,+40,+14"
|
rect="+1,=0,+40,+14"
|
||||||
xanchor=fixed
|
xanchor=fixed
|
||||||
|
|
@ -273,13 +269,13 @@ Turn"
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/report_countdown]
|
[/report_countdown]
|
||||||
|
|
||||||
# [observers]
|
#[observers]
|
||||||
# id=observers
|
# id=observers
|
||||||
# font_size={DEFAULT_FONT_SMALL}
|
# font_size={DEFAULT_FONT_SMALL}
|
||||||
# rect="+4,=,+16,+16"
|
# rect="+4,=,+16,+16"
|
||||||
# xanchor=right
|
# xanchor=right
|
||||||
# yanchor=fixed
|
# yanchor=fixed
|
||||||
# [/observers]
|
#[/observers]
|
||||||
|
|
||||||
## unit stats here
|
## unit stats here
|
||||||
[unit_image]
|
[unit_image]
|
||||||
|
|
@ -289,13 +285,13 @@ Turn"
|
||||||
xanchor=fixed
|
xanchor=fixed
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/unit_image]
|
[/unit_image]
|
||||||
# [unit_traits]
|
#[unit_traits]
|
||||||
# id=unit-traits
|
# id=unit-traits
|
||||||
# font_size={DEFAULT_FONT_SMALL}
|
# font_size={DEFAULT_FONT_SMALL}
|
||||||
# rect="=+0,+0,+170,+16"
|
# rect="=+0,+0,+170,+16"
|
||||||
# xanchor=fixed
|
# xanchor=fixed
|
||||||
# yanchor=fixed
|
# yanchor=fixed
|
||||||
# [/unit_traits]
|
#[/unit_traits]
|
||||||
[unit_name]
|
[unit_name]
|
||||||
id=unit-description
|
id=unit-description
|
||||||
font_size={DEFAULT_FONT_NORMAL}
|
font_size={DEFAULT_FONT_NORMAL}
|
||||||
|
|
@ -306,7 +302,7 @@ Turn"
|
||||||
[/unit_name]
|
[/unit_name]
|
||||||
[unit_hp]
|
[unit_hp]
|
||||||
id=unit-hp
|
id=unit-hp
|
||||||
# font_size={DEFAULT_FONT_NORMAL}
|
#font_size={DEFAULT_FONT_NORMAL}
|
||||||
font_size={DEFAULT_FONT_SMALL}
|
font_size={DEFAULT_FONT_SMALL}
|
||||||
rect="=,+3,+60,+18"
|
rect="=,+3,+60,+18"
|
||||||
#prefix="HP "
|
#prefix="HP "
|
||||||
|
|
@ -316,8 +312,8 @@ Turn"
|
||||||
[/unit_hp]
|
[/unit_hp]
|
||||||
[unit_xp]
|
[unit_xp]
|
||||||
id=unit-xp
|
id=unit-xp
|
||||||
font_size={DEFAULT_FONT_SMALL}
|
font_size={DEFAULT_FONT_SMALL}
|
||||||
# font_size={DEFAULT_FONT_NORMAL}
|
#font_size={DEFAULT_FONT_NORMAL}
|
||||||
rect="=,+0,+60,+18"
|
rect="=,+0,+60,+18"
|
||||||
#prefix="XP "
|
#prefix="XP "
|
||||||
#prefix_literal=" "
|
#prefix_literal=" "
|
||||||
|
|
@ -326,8 +322,8 @@ Turn"
|
||||||
[/unit_xp]
|
[/unit_xp]
|
||||||
[unit_moves]
|
[unit_moves]
|
||||||
id=unit-moves
|
id=unit-moves
|
||||||
font_size={DEFAULT_FONT_SMALL}
|
font_size={DEFAULT_FONT_SMALL}
|
||||||
# font_size={DEFAULT_FONT_NORMAL}
|
#font_size={DEFAULT_FONT_NORMAL}
|
||||||
rect="=,+0,+45,+18"
|
rect="=,+0,+45,+18"
|
||||||
#prefix="MP "
|
#prefix="MP "
|
||||||
#prefix= _ "statuspanel^moves"
|
#prefix= _ "statuspanel^moves"
|
||||||
|
|
@ -343,29 +339,27 @@ Turn"
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/unit_status]
|
[/unit_status]
|
||||||
[unit_alignment]
|
[unit_alignment]
|
||||||
font_size={DEFAULT_FONT_SMALL}
|
font_size={DEFAULT_FONT_SMALL}
|
||||||
ref=unit-moves
|
ref=unit-moves
|
||||||
id=unit-alignment
|
id=unit-alignment
|
||||||
rect="=-10,+0,+45,+18"
|
rect="=-10,+0,+45,+18"
|
||||||
xanchor=fixed
|
xanchor=fixed
|
||||||
yanchor=fixed
|
yanchor=fixed
|
||||||
[/unit_alignment]
|
[/unit_alignment]
|
||||||
# [unit_defense]
|
#[unit_defense]
|
||||||
# id=unit-defense
|
# id=unit-defense
|
||||||
# font_size=16
|
# font_size=16
|
||||||
# rect="=,+0,=,+18"
|
# rect="=,+0,=,+18"
|
||||||
# prefix="def"
|
# prefix="def"
|
||||||
# # prefix= _ "statuspanel^terrain def."
|
# # prefix= _ "statuspanel^terrain def."
|
||||||
# prefix_literal=": "
|
# prefix_literal=": "
|
||||||
# xanchor=fixed
|
# xanchor=fixed
|
||||||
# yanchor=fixed
|
# yanchor=fixed
|
||||||
# [/unit_defense]
|
#[/unit_defense]
|
||||||
|
|
||||||
[/status]
|
[/status]
|
||||||
|
|
||||||
# {REPLAY_THEME {DEFAULT_FONT_SMALL}}
|
#{REPLAY_THEME {DEFAULT_FONT_SMALL}}
|
||||||
[/resolution]
|
[/resolution]
|
||||||
|
|
||||||
[/theme]
|
[/theme]
|
||||||
|
|
||||||
#undef DEFAULT_FONT_NORMAL
|
#undef DEFAULT_FONT_NORMAL
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue