Author: esr
Date: Tue Mar 25 03:00:09 2008
New Revision: 25088
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25088&view=rev
Log:
Backport zookeeper's recent revisions from the development branch:
24663 24708 24976 24996 25028 25058 25059 25071 25073
Modified:
branches/1.4/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
branches/1.4/data/core/macros/abilities.cfg
branches/1.4/data/core/terrain-graphics/_final.cfg
branches/1.4/data/core/terrain-graphics/base.cfg
branches/1.4/data/themes/default.cfg
branches/1.4/data/themes/macros.cfg
branches/1.4/doc/manual/manual.txt
Modified:
branches/1.4/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg?rev=25088&r1=25087&r2=25088&view=diff
==============================================================================
---
branches/1.4/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
(original)
+++
branches/1.4/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
Tue Mar 25 03:00:09 2008
@@ -108,7 +108,7 @@
[/event]
# Generate a random number of guards between 0 and 2 around X,Y
-#define RANDOM_GUARDS TYPE DESCRIPTION USER_DESCRIPTION SIDE X Y
+#define RANDOM_GUARDS TYPE ID_STRING NAME_STRING SIDE X Y
{VARIABLE_OP number_of_guards random 0..2}
{REPEAT $number_of_guards (
@@ -137,8 +137,8 @@
[/move_unit_fake]
[unit]
- description={DESCRIPTION}
- user_description={USER_DESCRIPTION} # wmllint: ignore
+ description={ID_STRING}
+ user_description={NAME_STRING} # wmllint: ignore
type={TYPE}
side={SIDE}
x,y=$possible_guard_locations[$random_location_index].x,$possible_guard_locations[$random_location_index].y
@@ -170,11 +170,11 @@
side=1
[/filter]
- {IF_VAR village_$x1,$y1|_cleared not_equals yes (
+ {IF_VAR village_$x1|_$y1|_cleared not_equals yes (
[then]
- {RANDOM_GUARDS (Goblin Spearman) Villager (_ "Villager") 2 $x1 $y1}
-
- {VARIABLE village_$x1,$y1|_cleared yes}
+ {RANDOM_GUARDS (Goblin Spearman) (_ "Villager") 2 $x1 $y1}
+
+ {VARIABLE village_$x1|_,$y1|_cleared yes}
[/then]
[else]
@@ -261,7 +261,7 @@
[/store_villages]
{FOREACH villages i}
- {VARIABLE_OP village_var format
"village_$villages[$i].x,$villages[$i].y|_cleared"}
+ {VARIABLE_OP village_var format
"village_$villages[$i].x|_$villages[$i].y|_cleared"}
{CLEAR_VARIABLE $village_var}
{NEXT i}
Modified: branches/1.4/data/core/macros/abilities.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/core/macros/abilities.cfg?rev=25088&r1=25087&r2=25088&view=diff
==============================================================================
--- branches/1.4/data/core/macros/abilities.cfg (original)
+++ branches/1.4/data/core/macros/abilities.cfg Tue Mar 25 03:00:09 2008
@@ -541,7 +541,7 @@
id=backstab
name= _ "backstab"
description= _ "Backstab:
-This attack deals double damage if there is an enemy of the target on the
opposite side of the target, and that unit is not incapacitated (e.g. turned to
stone)."
+When used offensively, this attack deals double damage if there is an enemy of
the target on the opposite side of the target, and that unit is not
incapacitated (e.g. turned to stone)."
multiply=2
backstab=yes
active_on=offense
@@ -639,7 +639,7 @@
id=charge
name= _ "charge"
description= _ "Charge:
-This attack deals double damage to the target. It also causes this unit to
take double damage from the target's counterattack."
+When used offensively, this attack deals double damage to the target. It also
causes this unit to take double damage from the target's counterattack."
multiply=2
apply_to=both
active_on=offense
Modified: branches/1.4/data/core/terrain-graphics/_final.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/core/terrain-graphics/_final.cfg?rev=25088&r1=25087&r2=25088&view=diff
==============================================================================
--- branches/1.4/data/core/terrain-graphics/_final.cfg (original)
+++ branches/1.4/data/core/terrain-graphics/_final.cfg Tue Mar 25 03:00:09 2008
@@ -44,8 +44,10 @@
{FORESTADJCASTLE *^Ft (C*,K*,Xu,Ql,Qxu,Gv*) 100 forest/tropical-castle}
{FORESTADJCASTLE *^Uf (C*,K*,Xu,Ql,Qxu,Gv*) 100 mushrooms-castle}
-{MOUNTAINADJCASTLEA Mm (C*,K*,Xu,Ql,Qxu) 100 mountains-castle}
-{FORESTADJCASTLE Mm (C*,K*,Xu,Ql,Qxu) 100 mountains-castle}
+{FORESTADJCASTLES Mm (C*,K*,Xu,Ql,Qx*) 100 mountains-castle-n}
+{FORESTADJCASTLEO Mm (C*,K*,Xu,Ql,Qx*) 100 mountains-castle-n}
+{MOUNTAINADJCASTLEA Mm (C*,K*,Xu,Ql,Qx*) 100 mountains-castle}
+{FORESTADJCASTLE Mm (C*,K*,Xu,Ql,Qx*) 100 mountains-castle}
#33% 17% 5% 45%
{FORESTADJ *^Fp (W*,M*,Hd,*^V*,Xu,Ql,Qxu,Gv*) 33 forest/pine_small}
@@ -622,9 +624,10 @@
{DISABLE_TRANSITIONS Cv}
{TERRAIN_BASE (Ch,Kh*) castle/cobbles}
+{KEEP_BASE Kh castle/cobbles}
{TERRAIN_BASE Cv castle/elven/grounds}
-{TERRAIN_BASE Kv castle/elven/keep}
+{KEEP_BASE Kv castle/elven/keep}
{TERRAIN_BASE_PROB Cud castle/dwarven-castle-floor3 33}
{TERRAIN_BASE_PROB Cud castle/dwarven-castle-floor2 50}
@@ -888,9 +891,9 @@
{TERRAIN_ADJACENT -171 Ha (W*,Ss)
snow-hills-to-water}
{TERRAIN_ADJACENT -172 Ha (!,Ha,Qxu,Mm,Md,W*,Ss)
snow-hills}
-{TERRAIN_ADJACENT -180 Hd (!,Hd,Qxu)
desert-hills}
-{TERRAIN_ADJACENT -190 (Mm,Hh) (!,Hh,W*,Ss)
hills}
-{TERRAIN_ADJACENT_CUSTOM -191 (Mm,Hh) (W*,Ss)
hills transition2}
+{TERRAIN_ADJACENT -180 (Mm,Hh) (!,Hh,W*,Ss)
hills}
+{TERRAIN_ADJACENT_CUSTOM -181 (Mm,Hh) (W*,Ss)
hills transition2}
+{TERRAIN_ADJACENT -190 Hd (!,Hd,Qxu)
desert-hills}
{TERRAIN_ADJACENT -200 Uh (!,Uh)
cave/hills}
{TERRAIN_ADJACENT -210 Qlf (!,Ql,Qlf,Qxu,Xu)
lava}
@@ -911,7 +914,8 @@
# These two work in conjunction with the mountain and hill transitions to
create
# a smooth coastline between grassland, hills and mountains.
-{TERRAIN_ADJACENT -270 (Gg*,Qxu) (!,Gg,Qxu,Mm,Hh,W*,Ss)
flat/grass}
+{TERRAIN_ADJACENT -270 (Gg*,Qxu) (!,Gg*,Qxu,Mm,Hh,W*)
flat/grass}
+{TERRAIN_ADJACENT_CUSTOM -271 (!,Ggf) Ggf
flat/grass flower-transit
{TERRAIN_ADJACENT -319 (Gg*,Qxu,Mm,Hh) W*
flat/grass-to-water}
{TERRAIN_ADJACENT -280 Gs (!,Gs,Qxu)
flat/savanna}
Modified: branches/1.4/data/core/terrain-graphics/base.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/core/terrain-graphics/base.cfg?rev=25088&r1=25087&r2=25088&view=diff
==============================================================================
--- branches/1.4/data/core/terrain-graphics/base.cfg (original)
+++ branches/1.4/data/core/terrain-graphics/base.cfg Tue Mar 25 03:00:09 2008
@@ -59,3 +59,21 @@
precedence=9999
[/terrain_graphics]
#enddef
+
+#define KEEP_BASE TERRAIN_PATTERN IMAGESTEM
+# this draws keep floor as a single-hex overlay, which will hide some things
+# that happen to be erroneously drawn inside the walls.
+ [terrain_graphics]
+ [tile]
+ x=0
+ y=0
+ type={TERRAIN_PATTERN}
+ no_flag=overlay
+ set_flag=overlay
+ [image]
+ name={IMAGESTEM}
+ base=36,30
+ [/image]
+ [/tile]
+ [/terrain_graphics]
+#enddef
Modified: branches/1.4/data/themes/default.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/themes/default.cfg?rev=25088&r1=25087&r2=25088&view=diff
==============================================================================
--- branches/1.4/data/themes/default.cfg (original)
+++ branches/1.4/data/themes/default.cfg Tue Mar 25 03:00:09 2008
@@ -164,42 +164,42 @@
image=themes/status-bg.png
ref=actions-menu
rect="+5,=+1,+80,+19"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=gold-panel
image=themes/status-bg.png
rect="+5,=,+71,="
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=villages-panel
image=themes/status-bg.png
rect="+5,=,+71,="
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=units-panel
image=themes/status-bg.png
rect="+5,=,+71,="
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=upkeep-panel
image=themes/status-bg.png
rect="+5,=,+80,="
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/panel]
[panel]
id=income-panel
image=themes/status-bg.png
rect="+5,=,+80,="
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/panel]
@@ -231,7 +231,7 @@
text= _ "gold"
ref=gold-panel
rect="=+5,=+1,+17,+17"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/label]
[label]
@@ -240,7 +240,7 @@
text= _ "villages"
ref=villages-panel
rect="=+5,=+1,+17,+17"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/label]
[label]
@@ -249,7 +249,7 @@
text= _ "units"
ref=units-panel
rect="=+5,=+1,+17,+17"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/label]
[label]
@@ -258,7 +258,7 @@
text= _ "upkeep"
ref=upkeep-panel
rect="=+5,=+1,+25,+17"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/label]
[label]
@@ -267,7 +267,7 @@
text= _ "income"
ref=income-panel
rect="=+5,=+1,+25,+17"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/label]
@@ -286,7 +286,7 @@
id=icon-sideplaying
ref=turn-panel
rect="=+3,=+2,+25,+17"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/side_playing]
@@ -295,7 +295,7 @@
id=turn
font_size={DEFAULT_FONT_SMALL}
rect="+4,=,+55,+16"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@@ -305,7 +305,7 @@
font_size={DEFAULT_FONT_SMALL}
ref=gold-icon
rect="+4,=,+55,+16"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@@ -315,7 +315,7 @@
font_size={DEFAULT_FONT_SMALL}
ref=villages-icon
rect="+4,=,+55,+16"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@@ -325,7 +325,7 @@
font_size={DEFAULT_FONT_SMALL}
ref=units-icon
rect="+4,=,+55,+16"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@@ -335,7 +335,7 @@
font_size={DEFAULT_FONT_SMALL}
ref=upkeep-icon
rect="+4,=,+40,+16"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@@ -345,7 +345,7 @@
font_size={DEFAULT_FONT_SMALL}
ref=income-icon
rect="+4,=,+40,+16"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
prefix=
prefix_literal=""
@@ -353,28 +353,40 @@
{COUNTDOWN_THEME_STATUS {DEFAULT_FONT_SMALL}}
+ # This panel encloses the location information displays and the
+ # observer icon. This separate container is used so that we can
+ # make the terrain name display stretch to fill all available space
+ # so that the long strings don't get cut off as easily.
+ [panel]
+ id=terrain-panel
+ rect="+0,=,1024,="
+ 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}
- rect="+10,=,+115,+16"
- xanchor=proportional
+ ref=terrain-panel
+ rect="=+115,=,=-24,="
+ xanchor=left
yanchor=fixed
[/terrain]
- [position]
- id=status-position
- font_size={DEFAULT_FONT_SMALL}
- rect="+5,=,+95,+16"
- xanchor=proportional
- yanchor=fixed
- [/position]
-
[observers]
id=observers
font_size={DEFAULT_FONT_SMALL}
- rect="+4,=-1,+16,+16"
+ rect="+4,=,+16,+16"
xanchor=right
yanchor=fixed
[/observers]
@@ -562,34 +574,71 @@
# fix top pane at 800x600
[change]
id=turn-panel
- rect="+65,=+1,+100,+19"
+ rect="+5,=+1,+80,+19"
+ [/change]
+ [change]
+ id=gold-panel
+ rect="+5,=,+61,="
+ [/change]
+ [change]
+ id=villages-panel
+ rect="+5,=,+61,="
+ [/change]
+ [change]
+ id=units-panel
+ rect="+5,=,+55,="
[/change]
[change]
id=upkeep-panel
- rect="+5,=,+100,="
+ rect="+5,=,+80,="
[/change]
[change]
id=income-panel
- rect="+5,=,+89,="
+ rect="+5,=,+55,="
+ [/change]
+ [change]
+ id=turn
+ rect="+4,=,+55,+16"
+ font_size={DEFAULT_FONT_TINY}
+ [/change]
+ [change]
+ id=gold
+ rect="+4,=,+45,+16"
+ font_size={DEFAULT_FONT_TINY}
+ [/change]
+ [change]
+ id=villages
+ rect="+4,=,+45,+16"
+ font_size={DEFAULT_FONT_TINY}
+ [/change]
+ [change]
+ id=num-units
+ rect="+4,=,+45,+16"
+ font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=status-upkeep
- rect="+4,=,+55,+17"
+ rect="+4,=,+40,+16"
+ font_size={DEFAULT_FONT_TINY}
[/change]
[change]
id=status-income
- rect="+3,=,+45,+17"
- [/change]
- [remove]
- id=status-terrain
- [/remove]
+ rect="+4,=,+30,+16"
+ font_size={DEFAULT_FONT_TINY}
+ [/change]
+ [change]
+ id=timeout-panel
+ rect="+5,=,+55,="
+ [/change]
+ [change]
+ id=report_timeout
+ font_size={DEFAULT_FONT_TINY}
+ rect="+0,=,+35,+20"
+ [/change]
[change]
id=status-position
- rect="+3,=,+125,+16"
- [/change]
- [change]
- id=observers
- rect="+6,=-1,+16,+16"
+ rect="=+5,=,+80,="
+ font_size={DEFAULT_FONT_TINY}
[/change]
[/partialresolution]
Modified: branches/1.4/data/themes/macros.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/data/themes/macros.cfg?rev=25088&r1=25087&r2=25088&view=diff
==============================================================================
--- branches/1.4/data/themes/macros.cfg (original)
+++ branches/1.4/data/themes/macros.cfg Tue Mar 25 03:00:09 2008
@@ -4,7 +4,7 @@
id=timeout-panel
image=themes/status-bg.png
rect="+5,=,+70,="
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/panel]
[label]
@@ -13,7 +13,7 @@
icon=themes/sand-clock.png
ref=timeout-panel
rect="=+5,=+1,+17,+17"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/label]
#enddef
@@ -24,7 +24,7 @@
font_size={FONT_SMALL_SIZE}
ref=time-icon
rect="+0,=,+50,+20"
- xanchor=proportional
+ xanchor=fixed
yanchor=fixed
[/report_countdown]
#enddef
Modified: branches/1.4/doc/manual/manual.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/doc/manual/manual.txt?rev=25088&r1=25087&r2=25088&view=diff
==============================================================================
--- branches/1.4/doc/manual/manual.txt (original)
+++ branches/1.4/doc/manual/manual.txt Tue Mar 25 03:00:09 2008
@@ -638,16 +638,16 @@
Certain units have special attacks. These are listed below:
Backstab::
- This attack deals double damage if there is an enemy of the target on the
- opposite side of the target, and that unit is not incapacitated (e.g.
- turned to stone).
+ When used offensively, this attack deals double damage if there is an enemy
+ of the target on the opposite side of the target, and that unit is not
+ incapacitated (e.g. turned to stone).
Berserk::
Whether used offensively or defensively, this attack presses the
engagement until one of the combatants is slain, or 30 rounds of attacks
have occurred.
Charge::
- This attack deals double damage to the target. It also causes this unit to
- take double damage from the target's counterattack.
+ When used offensively, this attack deals double damage to the target. It also
+ causes this unit to take double damage from the target's counterattack.
Drain::
This unit drains health from living units, healing itself for half the amount
of damage it deals (rounded down).
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
