0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:wesnoth/wesnoth-old

Browse source
This commit is contained in:
Alexander van Gessel 2013-12-22 04:16:09 +01:00
commit c825dd0e72
6 changed files with 316 additions and 324 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg
View file

@ -33,6 +33,13 @@
user_team_name= _ "team_name^Quenoth Elves"
[/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:
[event]

3
data/multiplayer/eras.cfg
View file

@ -201,6 +201,9 @@
[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.
This era is still under development, so please be sure to report any problems that arise."
{ERA_DEFAULT}
{multiplayer/factions/khalifate.cfg}

1
data/scenario-test.cfg
View file

@ -231,7 +231,6 @@ Xu , Xu , Qxu , Qxu , Ql , Ql
range=ranged
[/effect]
[/object]
[/modifications]
[abilities]
{ABILITY_SKIRMISHER}

54
data/themes/default.cfg
View file

@ -61,7 +61,7 @@
[panel]
id=minimap-panel
# ref=terrain-description-box-botleft
#ref=terrain-description-box-botleft
image=themes/classic/minimap.png
rect="=+3,=+6,+181,+214"
xanchor=right
@ -69,7 +69,7 @@
[/panel]
{STATUS_BOX =+4 +25 +165 +15 terrain-info minimap-panel right fixed}
# [label]
#[label]
# id=terrain-icon
# icon=icons/terrain/terrain_type_info.png
# text= _ "terrain"
@ -77,7 +77,7 @@
# rect="=-1,=-1,+20,+16"
# xanchor=right
# yanchor=fixed
# [/label]
#[/label]
{STATUS_BOX =+0 -2 +165 +15 terrain-description terrain-info-box-botleft right fixed}
[terrain]
id=terrain-description
@ -254,7 +254,6 @@
yanchor=fixed
[/label]
[label]
id=gold-icon
icon=themes/gold.png
@ -302,7 +301,6 @@
[/label]
[status]
[zoom_level]
id=zoom-level
ref=map-zoom-slider
@ -337,7 +335,6 @@
yanchor=fixed
[/terrain]
# the time of day image
[time_of_day]
id=image-tod
@ -493,14 +490,14 @@
xanchor=right
yanchor=fixed
[/unit_level]
# [unit_race]
#[unit_race]
# id=unit-race
# font_size={DEFAULT_FONT_SMALL}
# rect="=,+0,=,+16"
# prefix= " "
# xanchor=right
# yanchor=fixed
# [/unit_race]
#[/unit_race]
[unit_traits]
ref=unit-type
id=unit-traits
@ -584,7 +581,6 @@
xanchor=right
yanchor=top
[/unit_weapons]
[/status]
{REPLAY_THEME {DEFAULT_FONT_SMALL}}
@ -602,9 +598,9 @@
image=themes/editor/classic/minimap-800.png
rect="843,=+2,+181,+155"
[/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]
id=mini-map
rect="=+51,=+10,=-14,+131"
@ -623,7 +619,6 @@
#id=zoom_in_button_editor
#ref=zoom_default_button_editor
rect="=,+20,+25,+25"
[/change]
[change]
id=minimap_button_3
@ -633,17 +628,15 @@
[/change]
[change]
id=minimap_button_4
# id=resize_button_editor
# id=resize_button_editor
rect="=,+2,+25,+25"
[/change]
[change]
id=minimap_button_5
# id=flip_map_button_editor
# id=flip_map_button_editor
rect="=,+2,+25,+25"
[/change]
# {CHANGE_STATUS_BOX =+9 +1 +122 +36 tod}
# {CHANGE_STATUS_BOX =-125 +2 +72 +72 unit}
@ -696,9 +689,6 @@
# rect="=,+0,=,+11"
# [/change]
# # [change]
# # id=unit-description
# # rect="=+3,+2,+200,+18"
@ -783,11 +773,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]
@ -795,9 +785,9 @@
inherits=800x600
width=800
height=480
# [remove]
#[remove]
# id=unit-race
# [/remove]
#[/remove]
{REMOVE_STATUS_BOX tod}
{CHANGE_STATUS_BOX =+5 +5 +72 +72 unit top-right-panel}
@ -847,12 +837,12 @@
[remove]
id=unit-weapons
[/remove]
# [change]
# id=unit-weapons
# ref=unit-moves
# font_size={DEFAULT_FONT_REALLYTINY}
# rect="=+0,+0,=,504"
# [/change]
#[change]
# id=unit-weapons
# ref=unit-moves
# font_size={DEFAULT_FONT_REALLYTINY}
# rect="=+0,+0,=,504"
#[/change]
[/partialresolution]
[/theme]

5
data/themes/macros.cfg
View file

@ -179,7 +179,6 @@
[/change]
#enddef
#define COUNTDOWN_THEME
{STATUS_BOX +5 =+0 +90 +15 timeout income-box-topright fixed fixed}
[label]
@ -226,7 +225,7 @@
text= _ "Replay"
ref=replay-panel
rect="=+3,=+10,+60,=-4"
# font_size={FONT_NORMAL_SIZE}
#font_size={FONT_NORMAL_SIZE}
font_rgb=160,160,160
xanchor=fixed
yanchor=fixed
@ -273,7 +272,7 @@
title= _ "Reset"
tooltip= _ "reset to beginning"
items=resetreplay
# rect="+4,=,+23,="
#rect="+4,=,+23,="
rect="+4,=+0,+30,+30"
xanchor=fixed
yanchor=fixed

54
data/themes/pandora.cfg
View file

@ -7,13 +7,13 @@
# http://www.wesnoth.org/forum/viewtopic.php?p=213708#213708
#define DEFAULT_FONT_NORMAL
14 #enddef
14 #enddef
#define DEFAULT_FONT_SMALL
12 #enddef
12 #enddef
#define DEFAULT_FONT_TINY
10 #enddef
10 #enddef
#define DEFAULT_FONT_REALLYTINY
9 #enddef
9 #enddef
{themes/macros.cfg}
@ -60,8 +60,6 @@
# rightside panel
{STATUS_BOX =+1 =+3 794 271 minimap sidebar-panel fixed fixed}
[mini_map]
@ -72,7 +70,7 @@
yanchor=fixed
[/mini_map]
# [slider]
#[slider]
# image=buttons/sliders/slider_arrow_gold@2x
# id=map-zoom-slider
# black_line=yes
@ -80,7 +78,7 @@
# rect="=+32,+1,+117,+18"
# xanchor=fixed
# yanchor=fixed
# [/slider]
#[/slider]
[action]
ref=minimap-box-botright
@ -113,8 +111,8 @@
id=menu-main
title= _ "Menu"
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
#,endturn
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
ref=sidebar-panel
font_size=30
rect="=+2,-62,+60,+60"
@ -124,7 +122,6 @@
{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 = =+1 +57 +15 income gold-box-botleft fixed fixed}
{STATUS_BOX = =+1 +57 +15 countdown income-box-botleft fixed fixed}
@ -160,7 +157,7 @@ Turn"
auto_tooltip=yes
[/action]
# [menu]
#[menu]
# id=actions-menu
# title= _ "Actions"
# image=button_menu/menu_button_copper_H20
@ -168,9 +165,9 @@ Turn"
# rect="+2,=,+100,="
# xanchor=fixed
# yanchor=fixed
# [/menu]
#[/menu]
# {COUNTDOWN_THEME}
#{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
@ -187,7 +184,6 @@ Turn"
[/label]
[status]
## The size of these rectangles only accommodates hex coordinates
## up to 999.
[position]
@ -222,7 +218,7 @@ Turn"
yanchor=fixed
[/tod_stats]
# #put the side playing indicator next to the turn indicator
#put the side playing indicator next to the turn indicator
[side_playing]
id=icon-sideplaying
ref=turn-box-center
@ -232,7 +228,7 @@ Turn"
yanchor=fixed
[/side_playing]
# # the game status
# the game status
[turn]
id=turn
font_size={DEFAULT_FONT_SMALL}
@ -245,7 +241,7 @@ Turn"
[gold]
id=gold
font_size={DEFAULT_FONT_SMALL}
# font_size={DEFAULT_FONT_SMALL}
#font_size={DEFAULT_FONT_SMALL}
ref=gold-icon
rect="+1,=0,+40,+14"
xanchor=fixed
@ -273,13 +269,13 @@ Turn"
yanchor=fixed
[/report_countdown]
# [observers]
#[observers]
# id=observers
# font_size={DEFAULT_FONT_SMALL}
# rect="+4,=,+16,+16"
# xanchor=right
# yanchor=fixed
# [/observers]
#[/observers]
## unit stats here
[unit_image]
@ -289,13 +285,13 @@ Turn"
xanchor=fixed
yanchor=fixed
[/unit_image]
# [unit_traits]
#[unit_traits]
# id=unit-traits
# font_size={DEFAULT_FONT_SMALL}
# rect="=+0,+0,+170,+16"
# xanchor=fixed
# yanchor=fixed
# [/unit_traits]
#[/unit_traits]
[unit_name]
id=unit-description
font_size={DEFAULT_FONT_NORMAL}
@ -306,7 +302,7 @@ Turn"
[/unit_name]
[unit_hp]
id=unit-hp
# font_size={DEFAULT_FONT_NORMAL}
#font_size={DEFAULT_FONT_NORMAL}
font_size={DEFAULT_FONT_SMALL}
rect="=,+3,+60,+18"
#prefix="HP "
@ -317,7 +313,7 @@ Turn"
[unit_xp]
id=unit-xp
font_size={DEFAULT_FONT_SMALL}
# font_size={DEFAULT_FONT_NORMAL}
#font_size={DEFAULT_FONT_NORMAL}
rect="=,+0,+60,+18"
#prefix="XP "
#prefix_literal=" "
@ -327,7 +323,7 @@ Turn"
[unit_moves]
id=unit-moves
font_size={DEFAULT_FONT_SMALL}
# font_size={DEFAULT_FONT_NORMAL}
#font_size={DEFAULT_FONT_NORMAL}
rect="=,+0,+45,+18"
#prefix="MP "
#prefix= _ "statuspanel^moves"
@ -350,7 +346,7 @@ Turn"
xanchor=fixed
yanchor=fixed
[/unit_alignment]
# [unit_defense]
#[unit_defense]
# id=unit-defense
# font_size=16
# rect="=,+0,=,+18"
@ -359,13 +355,11 @@ Turn"
# prefix_literal=": "
# xanchor=fixed
# yanchor=fixed
# [/unit_defense]
#[/unit_defense]
[/status]
# {REPLAY_THEME {DEFAULT_FONT_SMALL}}
#{REPLAY_THEME {DEFAULT_FONT_SMALL}}
[/resolution]
[/theme]
#undef DEFAULT_FONT_NORMAL