Author: shadowmaster
Date: Tue Nov 6 16:20:45 2007
New Revision: 21524
URL: http://svn.gna.org/viewcvs/wesnoth?rev=21524&view=rev
Log:
* Fixed a bad macro structure that caused some unit user_descriptions not to be
translatable, or at least, not to be caught by pot-updates.
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
trunk/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg?rev=21524&r1=21523&r2=21524&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
Tue Nov 6 16:20:45 2007
@@ -476,24 +476,24 @@
{ADD rescued_elves 1}
- {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 24 25 "Vecnu" ()}
- {RANDOM_TRAIT_UNIT 1 "Desert Archer" 24 27 "Eranor" ()}
- {RANDOM_TRAIT_UNIT 1 "Desert Archer" 21 25 "Seela" (gender="female")}
-
- {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 20 24 "Mudcrawler1" ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 24 25 "Vecnu" ( _ "Vecnu") ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Archer" 24 27 "Eranor" ( _ "Eranor") ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Archer" 21 25 "Seela" ( _ "Seela")
(gender="female")}
+
+ {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 20 24 "Mudcrawler1" () ()}
#ifdef HARD
- {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 20 25 "Mudcrawler2" ()}
+ {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 20 25 "Mudcrawler2" () ()}
#else
- {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 20 25 "Mudcrawler3" ()}
+ {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 20 25 "Mudcrawler3" () ()}
#endif
#ifdef EASY
- {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 23 27 "Mudcrawler4" ()}
- {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 25 28 "Mudcrawler5" ()}
+ {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 23 27 "Mudcrawler4" () ()}
+ {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 25 28 "Mudcrawler5" () ()}
#else
- {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 23 27 "Mudcrawler6" ()}
- {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 24 28 "Mudcrawler7" ()}
+ {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 23 27 "Mudcrawler6" () ()}
+ {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 24 28 "Mudcrawler7" () ()}
#endif
{MUDCRAWLER_ROUTINE Vecnu}
@@ -517,23 +517,23 @@
add=1
[/set_variable]
- {RANDOM_TRAIT_UNIT 1 "Desert Hunter" 24 34 "Eloshi" ()}
- {RANDOM_TRAIT_UNIT 1 "Desert Archer" 19 33 "Illuvia" (gender="female")}
- {RANDOM_TRAIT_UNIT 1 "Desert Hunter" 21 35 "Raynor" ()}
-
- {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 25 34 "Mudcrawler8" ()}
- {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 21 36 "Mudcrawler9" ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Hunter" 24 34 "Eloshi" ( _ "Eloshi") ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Archer" 19 33 "Illuvia" ( _ "Illuvia")
(gender="female")}
+ {RANDOM_TRAIT_UNIT 1 "Desert Hunter" 21 35 "Raynor" ( _ "Raynor") ()}
+
+ {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 25 34 "Mudcrawler8" () ()}
+ {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 21 36 "Mudcrawler9" () ()}
#ifdef HARD
- {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 24 35 "Mudcrawler10" ()}
+ {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 24 35 "Mudcrawler10" () ()}
#else
- {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 24 35 "Mudcrawler11" ()}
+ {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 24 35 "Mudcrawler11" () ()}
#endif
#ifdef EASY
- {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 20 34 "Mudcrawler12" ()}
+ {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 20 34 "Mudcrawler12" () ()}
#else
- {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 20 34 "Mudcrawler13" ()}
+ {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 20 34 "Mudcrawler13" () ()}
#endif
{MUDCRAWLER_ROUTINE Eloshi}
@@ -558,20 +558,20 @@
{ADD rescued_elves 1}
- {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 34 33 "Rocky Horror1"
(role="Rocky Horror")}
- {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 34 34 "Rocky Horror2"
(role="Rocky Horror")}
- {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 34 35 "Rocky Horror3"
(role="Rocky Horror")}
+ {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 34 33 "Rocky Horror1" ( _
"Rocky Horror") (role="Rocky Horror")}
+ {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 34 34 "Rocky Horror2" ( _
"Rocky Horror") (role="Rocky Horror")}
+ {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 34 35 "Rocky Horror3" ( _
"Rocky Horror") (role="Rocky Horror")}
#ifdef HARD
- {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 35 33 "Rocky Horror4"
(role="Rocky Horror")}
+ {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 35 33 "Rocky Horror4" ( _
"Rocky Horror") (role="Rocky Horror")}
#else
- {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 35 33 "Rocky Horror5"
(role="Rocky Horror")}
+ {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 35 33 "Rocky Horror5" ( _
"Rocky Horror") (role="Rocky Horror")}
#endif
#ifdef EASY
- {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 36 32 "Rocky Horror6"
(role="Rocky Horror")}
+ {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 36 32 "Rocky Horror6" ( _
"Rocky Horror") (role="Rocky Horror")}
#else
- {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 36 32 "Rocky Horror7"
(role="Rocky Horror")}
+ {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 36 32 "Rocky Horror7" ( _
"Rocky Horror") (role="Rocky Horror")}
#endif
[unit]
@@ -601,8 +601,8 @@
{IS_HERO}
[/unit]
- {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 36 33 "Jorazan" ()}
- {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 35 35 "Zyara" (gender="female")}
+ {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 36 33 "Jorazan" ( _ "Jorazan")
()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 35 35 "Zyara" ( _ "Zyara")
(gender="female")}
[message]
speaker=unit
@@ -721,8 +721,8 @@
{IS_HERO}
[/unit]
- {RANDOM_TRAIT_UNIT 1 "Desert Shaman" 30 27 "Ryoko" ()}
- {RANDOM_TRAIT_UNIT 1 "Desert Shaman" 32 27 "Yuni" ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Shaman" 30 27 "Ryoko" ( _ "Ryoko") ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Shaman" 32 27 "Yuni" ( _ "Yuni") ()}
[message]
speaker=Zhul
@@ -906,7 +906,7 @@
[then]
# first stable encounter
{VARIABLE grasslands_dialogue 2}
- {RANDOM_TRAIT_UNIT 1 "Desert Scout" $x1 $y1 "Naru" ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Scout" $x1 $y1 "Naru" ( _ "Naru")
()}
[message]
description=Naru
message= _ "Is it safe to come out? I was so scared."
@@ -934,7 +934,7 @@
description=Naru
message= _ "Hey Nisa, the rocks have stopped falling. You
can come out now!"
[/message]
- {RANDOM_TRAIT_UNIT 1 "Desert Scout" 43 31 "Nisa"
(gender="female")}
+ {RANDOM_TRAIT_UNIT 1 "Desert Scout" 43 31 "Nisa" ( _ "Nisa")
(gender="female")}
[message]
description=Nisa
message= _ "Oh, thank Eloh, I thought they would never stop."
@@ -1184,11 +1184,11 @@
y=1-6
[/remove_shroud]
- {RANDOM_TRAIT_UNIT 1 "Desert Hunter" 29 2 "Pythos" ()}
- {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 28 2 "Shea" ()}
- {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 29 1 "Narn" ()}
- {RANDOM_TRAIT_UNIT 1 "Desert Scout" 27 2 "Jokli" ()}
- {RANDOM_TRAIT_UNIT 1 "Desert Archer" 28 1 "Lyia" (gender="female")}
+ {RANDOM_TRAIT_UNIT 1 "Desert Hunter" 29 2 "Pythos" ( _ "Python") ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 28 2 "Shea" ( _ "Shea") ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 29 1 "Narn" ( _ "Narn") ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Scout" 27 2 "Jokli" ( _ "Jokli") ()}
+ {RANDOM_TRAIT_UNIT 1 "Desert Archer" 28 1 "Lyia" ( _ "Lyia")
(gender="female")}
[message]
description=Pythos
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg?rev=21524&r1=21523&r2=21524&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
Tue Nov 6 16:20:45 2007
@@ -636,7 +636,7 @@
{VARIABLE number_of_scorpions 8}
#endif
- {PLACE_UNITS_RANDOMLY $number_of_scorpions 3 "Giant Scorpion" "Scorpion"
(ai_special="guardian")}
+ {PLACE_UNITS_RANDOMLY $number_of_scorpions 3 "Giant Scorpion" "Scorpion" (
_ "Scorpion") (ai_special="guardian")}
{CLEAR_VARIABLE number_of_scorpions}
@@ -808,9 +808,9 @@
{RANDOM_PLACEMENT_AREA 17 49 2}
- {PLACE_UNITS_RANDOMLY 3 3 "Young Ogre" "Hunting Ogre"
(ai_special="guardian"
+ {PLACE_UNITS_RANDOMLY 3 3 "Young Ogre" "Hunting Ogre" ( _ "Hunting Ogre")
(ai_special="guardian"
random_traits="no")}
- {PLACE_UNITS_RANDOMLY 2 3 "Ogre" "Hunting Ogre"
(ai_special="guardian"
+ {PLACE_UNITS_RANDOMLY 2 3 "Ogre" "Hunting Ogre" ( _ "Hunting Ogre")
(ai_special="guardian"
random_traits="no")}
{CLEAR_PLACEMENT_AREA}
@@ -1068,10 +1068,10 @@
{VARIABLE bandits 2}
#endif
- {PLACE_UNITS_RANDOMLY $trappers 2 "Trapper" "Black Lieutenant"
(ai_special="guardian")}
- {PLACE_UNITS_RANDOMLY $thugs 2 "Thug" "Black Hand Bandit"
(ai_special="guardian")}
- {PLACE_UNITS_RANDOMLY $poachers 2 "Poacher" "Black Hand Bandit"
(ai_special="guardian")}
- {PLACE_UNITS_RANDOMLY $bandits 2 "Bandit" "Black Hand Bandit"
(ai_special="guardian")}
+ {PLACE_UNITS_RANDOMLY $trappers 2 "Trapper" "Black Lieutenant" ( _
"Black Lieutenant") (ai_special="guardian")}
+ {PLACE_UNITS_RANDOMLY $thugs 2 "Thug" "Black Hand Bandit" ( _
"Black Hand Bandit") (ai_special="guardian")}
+ {PLACE_UNITS_RANDOMLY $poachers 2 "Poacher" "Black Hand Bandit" ( _
"Black Hand Bandit") (ai_special="guardian")}
+ {PLACE_UNITS_RANDOMLY $bandits 2 "Bandit" "Black Hand Bandit" ( _
"Black Hand Bandit") (ai_special="guardian")}
{CLEAR_VARIABLE trappers}
{CLEAR_VARIABLE thugs}
@@ -1375,11 +1375,11 @@
{VARIABLE revenants 1}
#endif
- {PLACE_UNITS_RANDOMLY 1 4 "Revenant" "Go'hag"
(role="ElyssaUndead")}
- {PLACE_UNITS_RANDOMLY $skeletons 4 "Skeleton" "Undead Raider"
(role="ElyssaUndead")}
- {PLACE_UNITS_RANDOMLY $archers 4 "Skeleton Archer" "Undead Raider"
(role="ElyssaUndead")}
- {PLACE_UNITS_RANDOMLY $revenants 4 "Revenant" "Undead Raider"
(role="ElyssaUndead")}
- {PLACE_UNITS_RANDOMLY $shooters 4 "Bone Shooter" "Undead Raider"
(role="ElyssaUndead")}
+ {PLACE_UNITS_RANDOMLY 1 4 "Revenant" "Go'hag"
( _ "Go'hag") (role="ElyssaUndead")}
+ {PLACE_UNITS_RANDOMLY $skeletons 4 "Skeleton" "Undead Raider"
( _ "Undead Raider") (role="ElyssaUndead")}
+ {PLACE_UNITS_RANDOMLY $archers 4 "Skeleton Archer" "Undead Raider"
( _ "Undead Raider") (role="ElyssaUndead")}
+ {PLACE_UNITS_RANDOMLY $revenants 4 "Revenant" "Undead Raider"
( _ "Undead Raider") (role="ElyssaUndead")}
+ {PLACE_UNITS_RANDOMLY $shooters 4 "Bone Shooter" "Undead Raider"
( _ "Undead Raider") (role="ElyssaUndead")}
{CLEAR_VARIABLE skeletons}
{CLEAR_VARIABLE archers}
@@ -1547,13 +1547,13 @@
{CLEAR_FOG 1 34 26 3}
- {RANDOM_TRAIT_UNIT 4 "Ghost" 33 25 "Honor Guard" (role=Wraith)}
- {RANDOM_TRAIT_UNIT 4 "Ghost" 35 25 "Honor Guard" (role=Wraith)}
+ {RANDOM_TRAIT_UNIT 4 "Ghost" 33 25 "Honor Guard" ( _ "Honor
Guard") (role=Wraith)}
+ {RANDOM_TRAIT_UNIT 4 "Ghost" 35 25 "Honor Guard" ( _ "Honor
Guard") (role=Wraith)}
#ifdef EASY
#else
- {RANDOM_TRAIT_UNIT 4 "Ghost" 33 26 "Honor Guard" (role=Wraith)}
- {RANDOM_TRAIT_UNIT 4 "Ghost" 35 26 "Honor Guard" (role=Wraith)}
+ {RANDOM_TRAIT_UNIT 4 "Ghost" 33 26 "Honor Guard" ( _ "Honor
Guard") (role=Wraith)}
+ {RANDOM_TRAIT_UNIT 4 "Ghost" 35 26 "Honor Guard" ( _ "Honor
Guard") (role=Wraith)}
#endif
[message]
@@ -1628,8 +1628,8 @@
{VARIABLE ogres 3}
{VARIABLE young_ogres 1}
#endif
- {PLACE_UNITS_RANDOMLY $ogres 3 "Ogre" "Ogre
Nomad" (random_traits="no")}
- {PLACE_UNITS_RANDOMLY $young_ogres 3 "Young Ogre" "Ogre
Nomad" (random_traits="no")}
+ {PLACE_UNITS_RANDOMLY $ogres 3 "Ogre" "Ogre
Nomad" ( _ "Ogre Nomad") (random_traits="no")}
+ {PLACE_UNITS_RANDOMLY $young_ogres 3 "Young Ogre" "Ogre
Nomad" ( _ "Ogre Nomad") (random_traits="no")}
{CLEAR_VARIABLE ogres}
{CLEAR_VARIABLE young_ogres}
@@ -2398,7 +2398,7 @@
[/filter_adjacent_location]
[/have_location]
[else]
- {RANDOM_TRAIT_UNIT 4 "Ghost" $spawn[$random].x
$spawn[$random].y "Lost Soul" (role="LostSoul")}
+ {RANDOM_TRAIT_UNIT 4 "Ghost" $spawn[$random].x
$spawn[$random].y "Lost Soul" ( _ "Lost Soul") (role="LostSoul")}
{VARIABLE_OP ghosts_already_spawned add 1}
[/else]
[/if]
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg?rev=21524&r1=21523&r2=21524&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/09_Blood_is_Thicker_Than_Water.cfg
Tue Nov 6 16:20:45 2007
@@ -802,8 +802,8 @@
y=39
[/scroll_to]
- {RANDOM_TRAIT_UNIT 2 "Spearman" 45 42 "Human Scout" ()}
- {RANDOM_TRAIT_UNIT 2 "Javelineer" 47 42 "Human Scout" ()}
+ {RANDOM_TRAIT_UNIT 2 "Spearman" 45 42 "Human Scout" ( _ "Human
Scout") ()}
+ {RANDOM_TRAIT_UNIT 2 "Javelineer" 47 42 "Human Scout" ( _ "Human
Scout") ()}
[redraw]
[/redraw]
@@ -3150,7 +3150,7 @@
{RANDOM_PLACEMENT_AREA 50 28 3}
- {PLACE_UNITS_RANDOMLY 3 7 "Crab Man" "Angry Crab" ()}
+ {PLACE_UNITS_RANDOMLY 3 7 "Crab Man" "Angry Crab" ( _ "Angry Crab") ()}
{CLEAR_PLACEMENT_AREA}
@@ -3176,7 +3176,7 @@
{RANDOM_PLACEMENT_AREA 41 23 3}
- {PLACE_UNITS_RANDOMLY 3 7 "Crab Man" "Angry Crab" ()}
+ {PLACE_UNITS_RANDOMLY 3 7 "Crab Man" "Angry Crab" ( _ "Angry Crab") ()}
{CLEAR_PLACEMENT_AREA}
Modified: trunk/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg?rev=21524&r1=21523&r2=21524&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg Tue Nov 6
16:20:45 2007
@@ -1,14 +1,14 @@
#textdomain wesnoth-utbs
# The file contains useful macros I use within the campaign
-#define RANDOM_TRAIT_UNIT SIDE TYPE X Y NAME OTHER
- [unit]
- side={SIDE}
- type={TYPE}
- x={X}
- y={Y}
- description={NAME}
- user_description=_{NAME}
+#define RANDOM_TRAIT_UNIT SIDE TYPE X Y DESC UDESC OTHER
+ [unit]
+ side={SIDE}
+ type={TYPE}
+ x={X}
+ y={Y}
+ description={DESC}
+ user_description={UDESC}
upkeep=full
animate=yes
{OTHER}
@@ -25,7 +25,7 @@
{VARIABLE_OP random_string format "0..$random_placement_locations.length"}
#enddef
-#define PLACE_UNITS_RANDOMLY NUM SIDE TYPE NAME OTHER
+#define PLACE_UNITS_RANDOMLY NUM SIDE TYPE DESC UDESC OTHER
{VARIABLE number {NUM}}
{VARIABLE i 0}
[while]
@@ -43,14 +43,13 @@
type={TYPE}
x=$random_placement_x
y=$random_placement_y
- description={NAME}
- role={NAME}
- user_description=_{NAME}
+ description={DESC}
+ role={DESC}
+ user_description={UDESC}
upkeep=full
animate=yes
{OTHER}
[/unit]
-
{VARIABLE_OP i add 1}
[/do]
[/while]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
