Author: espreon
Date: Sun Mar 6 23:45:43 2011
New Revision: 48807
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48807&view=rev
Log:
Added TAKE_IT_STRING and LEAVE_IT_STRING arguments to PICKUPPABLE_ITEM to
ensure the possibility of accurate translatability.
Modified:
trunk/data/campaigns/Eastern_Invasion/scenarios/02_The_Escape_Tunnel.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg
trunk/data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
trunk/data/core/macros/items.cfg
Modified:
trunk/data/campaigns/Eastern_Invasion/scenarios/02_The_Escape_Tunnel.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/02_The_Escape_Tunnel.cfg?rev=48807&r1=48806&r2=48807&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/02_The_Escape_Tunnel.cfg
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/02_The_Escape_Tunnel.cfg
Sun Mar 6 23:45:43 2011
@@ -209,6 +209,8 @@
{PICKUPPABLE_ITEM holy_amulet 12 2 side=1 items/ankh-necklace.png
_"Wearing this amulet will cause every blow you deal to inflict
<i>arcane</i> damage!"
+ _"holy amulet^Take it"
+ _"holy amulet^Leave it"
_"I am not suited to using this item! Let another take it." (
[object]
name= _ "Holy Amulet"
Modified:
trunk/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg?rev=48807&r1=48806&r2=48807&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg
(original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg Sun
Mar 6 23:45:43 2011
@@ -779,6 +779,8 @@
{PICKUPPABLE_ITEM holy_amulet 2 25 side=1 items/ankh-necklace.png
_"Wearing this amulet will cause every blow you deal to inflict
<i>arcane</i> damage!"
+ _"holy amulet^Take it"
+ _"holy amulet^Leave it"
_"I am not suited to using this item! Let another take it." (
[object]
name= _ "Holy Amulet"
Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg?rev=48807&r1=48806&r2=48807&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/09_Xenophobia.cfg Sun Mar
6 23:45:43 2011
@@ -326,6 +326,8 @@
{PICKUPPABLE_ITEM holy_amulet 20 12 side=1 items/ankh-necklace.png
_"Wearing this amulet will cause every blow you deal to inflict
<i>arcane</i> damage!"
+ _"holy amulet^Take it"
+ _"holy amulet^Leave it"
_"I am not suited to using this item! Let another take it." (
[object]
name= _ "Holy Amulet"
Modified: trunk/data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg?rev=48807&r1=48806&r2=48807&view=diff
==============================================================================
--- trunk/data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg (original)
+++ trunk/data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg Sun Mar 6
23:45:43 2011
@@ -530,6 +530,8 @@
{PICKUPPABLE_ITEM holy_amulet 22 38 side=1 items/ankh-necklace.png
_"Wearing this amulet will cause every blow you deal to inflict
<i>arcane</i> damage!"
+ _"holy amulet^Take it"
+ _"holy amulet^Leave it"
_"I am not suited to using this item! Let another take it." (
[object]
name= _ "Holy Amulet"
Modified: trunk/data/core/macros/items.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/items.cfg?rev=48807&r1=48806&r2=48807&view=diff
==============================================================================
--- trunk/data/core/macros/items.cfg (original)
+++ trunk/data/core/macros/items.cfg Sun Mar 6 23:45:43 2011
@@ -68,7 +68,7 @@
[/event]
#enddef
-#define PICKUPPABLE_ITEM ID X Y CAN_TAKE_FILTER_WML IMAGE TEXT
CANNOT_TAKE_TEXT OBJECT_WML
+#define PICKUPPABLE_ITEM ID X Y CAN_TAKE_FILTER_WML IMAGE TEXT TAKE_IT_STRING
LEAVE_IT_STRING CANNOT_TAKE_TEXT OBJECT_WML
# This places an item on the map which can be picked up once, but allows
the
# player to choose whether the unit stepping on it should take it or not.
# The "object" doesn't necessarily need to be an [object], any action
works.
@@ -76,6 +76,8 @@
# An example which shows the:
# ! {PICKUPPABLE_ITEM ring_of_hp 8 12 race=human items/ring-red.png
# ! _"$unit.name finds a pretty ring. Should he pick it up?"
+ # ! _"ring of HP^Take it"
+ # ! _"ring of HP^Leave it"
# ! _"$unit.name finds a pretty ring. But only a human can take it!" (
# ! [object]
# ! name= _ "Ring of HP"
@@ -120,7 +122,7 @@
image={IMAGE}
[option]
- message= _ "Take it"
+ message={TAKE_IT_STRING}
[command]
{OBJECT_WML}
@@ -138,7 +140,7 @@
[/option]
[option]
- message= _ "Leave it"
+ message={LEAVE_IT_STRING}
[command]
[allow_undo]
@@ -260,6 +262,8 @@
#define OBJ_POTION_HOLY X Y ID
{PICKUPPABLE_ITEM {ID} {X} {Y} side=1 items/holy-water.png
_"Sprinkling this water on melee weapons grants them the <i>arcane</i>
damage type until the end of the current scenario. Should $unit.name use it?"
+ _"holy water^Take it"
+ _"holy water^Leave it"
_"I am not suited to the use of this item! Let another take it." (
[object]
name= _ "Holy Water"
@@ -504,7 +508,7 @@
#enddef
#define OBJ_TRIDENT_STORM X Y ID
- {PICKUPPABLE_ITEM {ID} {X} {Y} race=merman items/storm-trident.png
_"Should $unit.name pick up the trident?" _"Only the mermen can use this item!"
(
+ {PICKUPPABLE_ITEM {ID} {X} {Y} race=merman items/storm-trident.png
_"Should $unit.name pick up the trident?" _"storm trident^Take it" _"storm
trident^Leave it" _"Only the mermen can use this item!" (
[object]
name= _ "Storm Trident"
image=items/storm-trident.png
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
