Pushed LOOT macro from LoW, TRoW and THoT in core, file utils.cfg.

wmlindent also reindented other two macro files
This commit is contained in:
Elvish_Hunter 2012-04-22 09:12:48 +00:00
parent 006f6d2f33
commit 993861aff4
7 changed files with 24 additions and 66 deletions

View file

@ -201,6 +201,7 @@ Version 1.11.0-svn:
* Fix $owner_side in capture events fired due to unit movement
* Introduce [item]redraw=yes|no (def yes) parameter
* Added [object]duration=turn
* Pushed LOOT macro from LoW, THoT and TRoW in core
* Miscellaneous and bug fixes:
* Fix wrong preferences path suffix (1.1 instead of 1.10) on Linux and other
platforms using XDG layout (no compiled-in preferences path override,

View file

@ -34,27 +34,6 @@
{CLEAR_VARIABLE loyals}
#enddef
#define LOOT AMOUNT SIDE
{VARIABLE amount_gold {AMOUNT}}
#TODO add message for the other players!
[message]
side_for={SIDE}
speaker=narrator
message= _ "You retrieve $amount_gold pieces of gold."
image=wesnoth-icon.png
[/message]
{CLEAR_VARIABLE amount_gold}
[sound]
name=gold.ogg
[/sound]
[gold]
side={SIDE}
amount={AMOUNT}
[/gold]
#enddef
#define ELVES_SCOUTS
Elvish Scout, Elvish Rider, Elvish Outrider#enddef

View file

@ -1,26 +1,5 @@
#textdomain wesnoth-thot
#define LOOT AMOUNT SIDE
[sound]
name=gold.ogg
[/sound]
{VARIABLE amount_gold {AMOUNT}}
[message]
speaker=narrator
message= _ "You retrieve $amount_gold pieces of gold."
image=wesnoth-icon.png
[/message]
{CLEAR_VARIABLE amount_gold}
[gold]
side={SIDE}
amount={AMOUNT}
[/gold]
#enddef
#define MAGES
Mage,Red Mage,White Mage,Arch Mage,Great Mage,Mage of Light,Silver Mage #enddef

View file

@ -9,27 +9,6 @@
#UNDEAD_INTEL
#RISE_UP_RISE_UP
#define LOOT AMOUNT SIDE
[sound]
name=gold.ogg
[/sound]
{VARIABLE amount_gold {AMOUNT}}
[message]
speaker=narrator
message= _ "You retrieve $amount_gold pieces of gold."
image=wesnoth-icon.png
[/message]
{CLEAR_VARIABLE amount_gold}
[gold]
side={SIDE}
amount={AMOUNT}
[/gold]
#enddef
#define HERO TYPE ID_STRING NAME_STRING SIDE X Y PROFILE
[unit]
type={TYPE}

View file

@ -526,7 +526,7 @@ Enemy units cannot see this unit while it is in deep water, except if they have
description=_ "Feeding:
This unit gains 1 hitpoint added to its maximum whenever it kills a living unit."
[/dummy]
# wmlxgettext: [abilities]
# wmlxgettext: [abilities]
[/abilities]
[event]
id=ability_feeding_die
@ -570,7 +570,7 @@ This unit gains 1 hitpoint added to its maximum whenever it kills a living unit.
[/object]
[/event]
[+abilities]
# wmlxgettext: [/abilities]
# wmlxgettext: [/abilities]
#enddef
# wmllint: unbalanced-off

View file

@ -28,7 +28,7 @@
# a unit which belongs both to the current side as well as {SIDES}.
[have_unit]
side=$side_number
[and]
side={SIDES}
[/and]

View file

@ -773,3 +773,23 @@
[/if]
[/event]
#enddef
#define LOOT AMOUNT SIDE
{VARIABLE amount_gold {AMOUNT}}
#TODO add message for the other players!
[message]
side_for={SIDE}
speaker=narrator
message= _ "You retrieve $amount_gold pieces of gold."
image=wesnoth-icon.png
sound=gold.ogg
[/message]
{CLEAR_VARIABLE amount_gold}
[gold]
side={SIDE}
amount={AMOUNT}
[/gold]
#enddef