New default terrain using the new artwork. 800x480 still broken.

This commit is contained in:
fendrin 2013-11-19 00:55:12 +01:00
parent 77321c56c6
commit 6fe2267f80

View file

@ -33,7 +33,7 @@
[panel]
id=top-panel
image=themes/top-bg.png
image=themes/editor/classic/menubar.png
ref=screen
rect="=,=,=,+26"
xanchor=top
@ -42,7 +42,7 @@
[main_map]
id=main-map
rect="=,+0,+882,768"
rect="=,+0,+842,768"
xanchor=left
yanchor=top
[/main_map]
@ -78,28 +78,41 @@
[/main_map_border]
# rightside panel
[panel]
id=top-right-panel
image=themes/rightside.png
rect="+0,=+0,1024,+284"
xanchor=right
yanchor=fixed
[/panel]
[panel]
id=middle-right-panel
image=themes/rightside-bg.png
rect="=,+0,=,+421"
id=sidebar-panel
image=themes/editor/classic/sidebar.png
rect="+0,0,1024,768"
xanchor=right
yanchor=top
[/panel]
[panel]
id=bottom-right-panel
image=themes/rightside-bottom.png
rect="=,+0,=,768"
{STATUS_BOX =+6, =+1, +165, +15 terrain-info sidebar-panel right fixed}
[label]
id=terrain-icon
icon=icons/terrain/terrain_type_info.png
text= _ "terrain"
ref=terrain-info-box-center
rect="=-1,=-1,+20,+16"
xanchor=right
yanchor=bottom
yanchor=fixed
[/label]
[panel]
id=top-right-panel
ref=sidebar-panel
image=themes/classic/minimap.png
rect="=+0,=+24,+184,+190"
xanchor=right
yanchor=fixed
[/panel]
{STATUS_BOX =+9 +3 +122 +36 tod top-right-panel right fixed}
{STATUS_BOX =+0 +5 +72 +72 unit tod-box-botleft right fixed}
[menu]
id=menu-main
title= _ "Menu"
@ -120,7 +133,13 @@
xanchor=fixed
yanchor=fixed
[/menu]
{STATUS_BOX +5 =+0 +80 +15 turn actions-menu fixed fixed}
{STATUS_BOX +3 =+0 +76 +15 gold turn-box-topright fixed fixed}
{STATUS_BOX +3 =+0 +71 +15 villages gold-box-topright fixed fixed}
{STATUS_BOX +3 =+0 +71 +15 units villages-box-topright fixed fixed}
{STATUS_BOX +3 =+0 +90 +15 upkeep units-box-topright fixed fixed}
{STATUS_BOX +3 =+0 +85 +15 income upkeep-box-topright fixed fixed}
{COUNTDOWN_THEME}
[menu]
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
@ -128,10 +147,71 @@
[mini_map]
id=mini-map
ref=top-right-panel
rect="=+10,=+7,=-7,+143"
rect="=+51,=+9,=-16,+158"
xanchor=right
yanchor=fixed
[/mini_map]
[action]
id=zoom_default_button_editor
items=zoomdefault
type=checkbox
image=button_square/button_square_30
auto_tooltip=yes
rect="=-33,=-1,+30,+30"
xanchor=right
yanchor=fixed
[/action]
[action]
id=zoom_in_button_editor
items=zoomin
type=turbo
image=button_square/button_square_30
auto_tooltip=yes
rect="=,+2,+30,+30"
xanchor=right
yanchor=fixed
[/action]
[action]
id=zoom_out_button_editor
items=zoomout
type=turbo
image=button_square/button_square_30
auto_tooltip=yes
rect="=,+2,+30,+30"
xanchor=right
yanchor=fixed
[/action]
[action]
id=resize_button_editor
items=editor-map-resize
#type=press
image=button_square/button_square_30
tooltip_name_prepend=yes
rect="=,+2,+30,+30"
xanchor=right
yanchor=fixed
[/action]
[action]
id=flip_map_button_editor
type=checkbox
image=button_square/button_square_30
items=editor-map-flip
tooltip= _ "Not implemented yet."
tooltip_name_prepend=yes
rect="=,+2,+30,+30"
xanchor=right
yanchor=fixed
[/action]
[slider]
image=buttons/sliders/slider_arrow_gold
id=map-zoom-slider
black_line=yes
ref=mini-map
rect="=,+1,+117,+18"
xanchor=right
yanchor=fixed
[/slider]
[action]
id=button-endturn
@ -139,65 +219,19 @@
title= _ "End Turn"
title2= _ "End Scenario"
items=endturn
ref=bottom-right-panel
rect="=+17,=+3,+80,+20"
ref=sidebar-panel
rect="-145,-32,+114,+31"
xanchor=right
yanchor=bottom
[/action]
[panel]
id=turn-panel
image=themes/status-bg.png
ref=actions-menu
rect="+5,=+1,+80,+19"
xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=gold-panel
image=themes/status-bg.png
rect="+5,=,+76,="
xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=villages-panel
image=themes/status-bg.png
rect="+5,=,+71,="
xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=units-panel
image=themes/status-bg.png
rect="+5,=,+71,="
xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=upkeep-panel
image=themes/status-bg.png
rect="+5,=,+90,="
xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=income-panel
image=themes/status-bg.png
rect="+5,=,+85,="
xanchor=fixed
yanchor=fixed
[/panel]
{COUNTDOWN_THEME}
# HP/XP
[label]
id=label-hp
font_size={DEFAULT_FONT_TINY}
text= _ "HP"
ref=top-right-panel
rect="=+84,=+209,+54,+12"
ref=unit-box-topright
rect="+4,=+2,+54,+12"
xanchor=right
yanchor=fixed
[/label]
@ -215,8 +249,8 @@
id=gold-icon
icon=themes/gold.png
text= _ "gold"
ref=gold-panel
rect="=+5,=+1,+17,+17"
ref=gold-box-center
rect="=+1,=-1,+17,+17"
xanchor=fixed
yanchor=fixed
[/label]
@ -224,8 +258,8 @@
id=villages-icon
icon=themes/villages.png
text= _ "villages"
ref=villages-panel
rect="=+5,=+1,+17,+17"
ref=villages-box-center
rect="=+1,=-1,+17,+17"
xanchor=fixed
yanchor=fixed
[/label]
@ -233,8 +267,8 @@
id=units-icon
icon=themes/units.png
text= _ "units"
ref=units-panel
rect="=+5,=+1,+17,+17"
ref=units-box-center
rect="=+1,=-1,+17,+17"
xanchor=fixed
yanchor=fixed
[/label]
@ -242,8 +276,8 @@
id=upkeep-icon
icon=themes/upkeep.png
text= _ "upkeep"
ref=upkeep-panel
rect="=+5,=+1,+25,+17"
ref=upkeep-box-center
rect="=+1,=-1,+25,+17"
xanchor=fixed
yanchor=fixed
[/label]
@ -251,18 +285,37 @@
id=income-icon
icon=themes/income.png
text= _ "income"
ref=income-panel
rect="=+5,=+1,+25,+17"
ref=income-box-center
rect="=+1,=-1,+25,+17"
xanchor=fixed
yanchor=fixed
[/label]
[status]
# The size of these rectangles only accommodates hex coordinates
# up to 999.
[position]
id=status-position
font_size=11
ref=terrain-icon
rect="+1,=+1,+95,+16"
xanchor=right
yanchor=fixed
[/position]
[terrain_info]
id=status-terrain
rect="+2,=-1,+70,+16"
xanchor=right
yanchor=fixed
[/terrain_info]
# the time of day image
[time_of_day]
id=image-tod
ref=top-right-panel
rect="=+10,=+159,=-7,+39"
ref=tod-box-center
rect="=-1,=-2,+125,+39"
xanchor=right
yanchor=fixed
[/time_of_day]
@ -270,8 +323,8 @@
#put the side playing indicator next to the turn indicator
[side_playing]
id=icon-sideplaying
ref=turn-panel
rect="=+3,=+2,+25,+17"
ref=turn-box-center
rect="=+1,=-1,+25,+17"
xanchor=fixed
yanchor=fixed
[/side_playing]
@ -349,26 +402,7 @@
xanchor=left
yanchor=fixed
[/panel]
# The size of these rectangles only accommodates hex coordinates
# up to 99. If either is over that maximum the movement cost will
# be pushed off the right end.
[position]
id=status-position
font_size={DEFAULT_FONT_SMALL}
ref=terrain-panel
rect="=+15,=,+95,="
xanchor=fixed
yanchor=fixed
[/position]
[terrain]
id=status-terrain
font_size={DEFAULT_FONT_SMALL}
ref=terrain-panel
rect="=+115,=,=-24,="
xanchor=left
yanchor=fixed
[/terrain]
[observers]
id=observers
font_size={DEFAULT_FONT_SMALL}
@ -380,16 +414,16 @@
#unit stats here
[unit_image]
id=unit-image
ref=top-right-panel
rect="=+9,=+215,+72,+72"
ref=unit-box-center
rect="=+0,=+0,+72,+72"
xanchor=right
yanchor=fixed
[/unit_image]
[unit_name]
id=unit-description
font_size={DEFAULT_FONT_NORMAL}
ref=middle-right-panel
rect="=+9,=+3,=-2,+18"
ref=unit-box-botleft
rect="=+3,+5,+200,+18"
xanchor=right
yanchor=fixed
[/unit_name]
@ -499,7 +533,7 @@
id=unit-weapons
font_size={DEFAULT_FONT_SMALL}
ref=unit-vision
rect="=+0,+0,=,730"
rect="=+0,+0,=,734"
xanchor=right
yanchor=top
[/unit_weapons]
@ -522,49 +556,118 @@
width=1024
height=600
# use right pane with a 40px smaller minimap
[change]
id=unit-description
font_size={DEFAULT_FONT_SMALL}
rect="=+9,=+3,=-2,+16"
[/change]
[change]
id=unit-type
font_size={DEFAULT_FONT_TINY}
rect="=,+0,=,+11"
[/change]
# placing the unit level right of the alignment
# doing it the other way around leads to a strange problem sometimes having the alingment not being displayed
# this does not happen with this order
[change]
id=unit-level
font_size={DEFAULT_FONT_TINY}
rect="=+72,+0,=,+11"
[/change]
[change]
id=unit-alignment
font_size={DEFAULT_FONT_TINY}
rect="=-72,=,=,+11"
[/change]
[change]
id=unit-traits
font_size={DEFAULT_FONT_TINY}
rect="=,+0,=,+11"
[/change]
[change]
id=unit-abilities
font_size={DEFAULT_FONT_TINY}
rect="=,+0,=,+11"
[/change]
[change]
id=unit-moves
font_size={DEFAULT_FONT_TINY}
rect="=,+0,=,+11"
[/change]
[change]
id=unit-defense
font_size={DEFAULT_FONT_TINY}
rect="=,+0,=,+11"
[/change]
[change]
id=unit-race
font_size={DEFAULT_FONT_TINY}
rect="=,+0,=,+11"
[/change]
# use right pane with a smaller minimap
[change]
id=top-right-panel
image=themes/rightside-small.png
rect="+0,=+0,1024,+244"
image=themes/editor/classic/minimap-800.png
rect="843,=+25,+181,+155"
[/change]
# increase size in middle panel since minimap is 40px smaller
# give it additional 10px and move the end-turn button down
# increase size in middle panel since minimap is smaller
# {CHANGE_STATUS_BOX =+9 +1 +122 +36 tod}
# {CHANGE_STATUS_BOX =-125 +2 +72 +72 unit}
[change]
id=middle-right-panel
rect="=,+0,=,+471"
id=unit-description
rect="=+3,+2,+200,+18"
[/change]
# reduce vertical size of minimap by 40px
# reduce size of minimap
[change]
id=mini-map
rect="=+10,=+7,=-7,+103"
rect="=+51,=+10,=-14,+131"
[/change]
# shift tod image up by 40px rel to 768px
[remove]
id=map-zoom-slider
[/remove]
[change]
id=image-tod
rect="=+10,=+119,=-7,+39"
id=zoom_default_button_editor
rect="=-33,=+0,+25,+25"
image=button_square/button_square_25
[/change]
# fixing this one fixes HP/XP/unit status
[change]
id=label-hp
font_size={DEFAULT_FONT_TINY}
rect="=+84,=+169,+54,+12"
id=zoom_in_button_editor
rect="=,+2,+25,+25"
image=button_square/button_square_25
[/change]
# shift unit image up by 40px rel to 768px
[change]
id=unit-image
rect="=+9,=+175,+72,+72"
id=zoom_out_button_editor
rect="=,+2,+25,+25"
image=button_square/button_square_25
[/change]
[change]
id=resize_button_editor
rect="=,+2,+25,+25"
image=button_square/button_square_25
[/change]
[change]
id=flip_map_button_editor
rect="=,+2,+25,+25"
image=button_square/button_square_25
[/change]
[change]
id=button-endturn
image=button_normal/button_H22
rect="=+17,=+3,+80,+20"
rect="-140,-24,+80,+20"
[/change]
# adjust allowed heigth for displaying weapon stuff
[change]
id=unit-weapons
ref=unit-defense
font_size={DEFAULT_FONT_SMALL}
font_size={DEFAULT_FONT_TINY}
rect="=+0,+0,=,738"
[/change]
[/partialresolution]
@ -576,58 +679,53 @@
height=600
# fix top pane at 800x600
{CHANGE_STATUS_BOX +3 =+0 +55 +15 turn actions-menu}
{CHANGE_STATUS_BOX +1 =+0 +56 +15 gold turn-box-topright}
{CHANGE_STATUS_BOX +1 =+0 +51 +15 villages gold-box-topright}
{CHANGE_STATUS_BOX +1 =+0 +45 +15 units villages-box-topright}
{CHANGE_STATUS_BOX +1 =+0 +60 +15 upkeep units-box-topright}
{CHANGE_STATUS_BOX +1 =+0 +55 +15 income upkeep-box-topright}
[change]
id=turn-panel
rect="+5,=+1,+80,+19"
id=menu-main
image=button_menu/menu_button_small_copper_H20
rect="=+3,=+1,+55,=-4"
[/change]
[change]
id=gold-panel
rect="+5,=,+66,="
[/change]
[change]
id=villages-panel
rect="+5,=,+61,="
[/change]
[change]
id=units-panel
rect="+5,=,+55,="
[/change]
[change]
id=upkeep-panel
rect="+5,=,+80,="
[/change]
[change]
id=income-panel
rect="+5,=,+55,="
id=actions-menu
image=button_menu/menu_button_small_copper_H20
rect="+2,=,+55,="
[/change]
[change]
id=turn
rect="+4,=,+55,+16"
rect="+4,=+1,+55,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=gold
rect="+4,=,+45,+16"
rect="+4,=+1,+45,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=villages
rect="+4,=,+45,+16"
rect="+4,=+1,+45,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=num-units
rect="+4,=,+45,+16"
rect="+4,=+1,+45,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=status-upkeep
rect="+4,=,+40,+16"
rect="+4,=+1,+40,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=status-income
rect="+4,=,+50,+16"
rect="+4,=+1,+50,+16"
font_size={DEFAULT_FONT_TINY}
[/change]
[change]
@ -639,11 +737,11 @@
font_size={DEFAULT_FONT_TINY}
rect="+0,=,+55,+20"
[/change]
[change]
id=status-position
rect="=+5,=,+80,="
font_size={DEFAULT_FONT_TINY}
[/change]
# [change]
# id=status-position
# rect="=+5,=,+80,="
# font_size={DEFAULT_FONT_TINY}
# [/change]
[/partialresolution]
[partialresolution]
@ -651,9 +749,13 @@
inherits=800x600
width=800
height=480
[remove]
id=unit-race
[/remove]
# [remove]
# id=unit-race
# [/remove]
{REMOVE_STATUS_BOX tod}
{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
[change]
id=unit-description
@ -696,11 +798,15 @@
[remove]
id=unit-defense
[/remove]
[change]
[remove]
id=unit-weapons
ref=unit-moves
font_size={DEFAULT_FONT_REALLYTINY}
[/change]
[/remove]
# [change]
# id=unit-weapons
# ref=unit-moves
# font_size={DEFAULT_FONT_REALLYTINY}
# rect="=+0,+0,=,504"
# [/change]
[/partialresolution]
[/theme]