mail[Wesnoth-commits] r20580 - /trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_Morning_After.cfg


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by ravanrooke on September 18, 2007 - 23:36:
Author: rhuvaen
Date: Tue Sep 18 23:35:37 2007
New Revision: 20580

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20580&view=rev
Log:
Replaced CREATE_UNIT macro and made sure that all event-placed units have 
translatable user_descriptions.

Modified:
    trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_Morning_After.cfg

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_Morning_After.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_Morning_After.cfg?rev=20580&r1=20579&r2=20580&view=diff
==============================================================================
--- 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_Morning_After.cfg 
(original)
+++ 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/01_Morning_After.cfg 
Tue Sep 18 23:35:37 2007
@@ -193,14 +193,14 @@
         {VARIABLE village_events 0}
         
         # possible village encounters
-        {VILLAGE_EVENT "Desert Scout"   "Lrea"}
-        {VILLAGE_EVENT "Desert Archer"  "Danu"}
-        {VILLAGE_EVENT "Desert Hunter"  "Hamuil"}
-        {VILLAGE_EVENT "Desert Scout"   "Vemuil"}
-        {VILLAGE_EVENT "Desert Archer"  "Frea"}
-        {VILLAGE_EVENT "Desert Fighter" "Piyru"}
-        {VILLAGE_EVENT "Desert Hunter"  "Anioh"}
-        {VILLAGE_EVENT "Desert Scout"   "Taliu"}
+        {VILLAGE_EVENT "Desert Scout"   _"Lrea"}
+        {VILLAGE_EVENT "Desert Archer"  _"Danu"}
+        {VILLAGE_EVENT "Desert Hunter"  _"Hamuil"}
+        {VILLAGE_EVENT "Desert Scout"   _"Vemuil"}
+        {VILLAGE_EVENT "Desert Archer"  _"Frea"}
+        {VILLAGE_EVENT "Desert Fighter" _"Piyru"}
+        {VILLAGE_EVENT "Desert Hunter"  _"Anioh"}
+        {VILLAGE_EVENT "Desert Scout"   _"Taliu"}
     [/event]
 
     # Dialogue at start of scenario
@@ -332,8 +332,16 @@
                 {VARIABLE unit_type $villager[$random].type}
                 {VARIABLE unit_name $villager[$random].name}
                 
-                {CREATE_UNIT 1 $unit_type $x1 $y1 $unit_name 
(user_description=_"$unit_name"
-                  moves=0)}
+                [unit]
+                  side=1
+                  type=$unit_type
+                  x=$x1
+                  y=$y1
+                  user_description=$unit_name
+                  upkeep=full
+                  animate=yes
+                  moves="0"
+                [/unit]
                   
                 {CLEAR_VARIABLE unit_type}
                 {CLEAR_VARIABLE unit_name}
@@ -459,26 +467,24 @@
 
         {ADD rescued_elves 1}
 
-        {CREATE_UNIT 1 "Desert Fighter" 24 25 "Vecnu" 
(user_description=_"Vecnu"
-          description="Vecnu")}
-        {CREATE_UNIT 1 "Desert Archer" 24 27 "Eranor" 
(user_description=_"Eranor")}
-        {CREATE_UNIT 1 "Desert Archer" 21 25 "Seela" 
(user_description=_"Seela"
-        gender="female")}
-
-        {CREATE_UNIT 2 "Giant Mudcrawler" 20 24 "" ()}
+        {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" ()}
 
 #ifdef HARD
-        {CREATE_UNIT 2 "Giant Mudcrawler" 20 25 "" ()}
+        {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 20 25 "Mudcrawler2" ()}
 #else
-        {CREATE_UNIT 2 "Small Mudcrawler" 20 25 "" ()}
+        {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 20 25 "Mudcrawler3" ()}
 #endif
 
 #ifdef EASY
-        {CREATE_UNIT 2 "Small Mudcrawler" 23 27 "" ()}
-        {CREATE_UNIT 2 "Small Mudcrawler" 25 28 "" ()}
+        {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 23 27 "Mudcrawler4" ()}
+        {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 25 28 "Mudcrawler5" ()}
 #else
-        {CREATE_UNIT 2 "Giant Mudcrawler" 23 27 "" ()}
-        {CREATE_UNIT 2 "Small Mudcrawler" 24 28 "" ()}
+        {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 23 27 "Mudcrawler6" ()}
+        {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 24 28 "Mudcrawler7" ()}
 #endif
 
         {MUDCRAWLER_ROUTINE Vecnu}
@@ -502,25 +508,23 @@
             add=1
         [/set_variable]
 
-        {CREATE_UNIT 1 "Desert Hunter" 24 34 "Eloshi" 
(user_description=_"Eloshi"
-        description="Eloshi")}
-        {CREATE_UNIT 1 "Desert Archer" 19 33 "Illuvia" 
(user_description=_"Illuvia"
-        gender="female")}
-        {CREATE_UNIT 1 "Desert Hunter" 21 35 "Raynor" 
(user_description=_"Raynor")}
-
-        {CREATE_UNIT 2 "Giant Mudcrawler" 25 34 "" ()}
-        {CREATE_UNIT 2 "Small Mudcrawler" 21 36 "" ()}
+        {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" ()}
 
 #ifdef HARD
-        {CREATE_UNIT 2 "Giant Mudcrawler" 24 35 "" ()}
+        {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 24 35 "Mudcrawler10" ()}
 #else
-        {CREATE_UNIT 2 "Small Mudcrawler" 24 35 "" ()}
+        {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 24 35 "Mudcrawler11" ()}
 #endif
 
 #ifdef EASY
-        {CREATE_UNIT 2 "Small Mudcrawler" 20 34 "" ()}
+        {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 20 34 "Mudcrawler12" ()}
 #else
-        {CREATE_UNIT 2 "Giant Mudcrawler" 20 34 "" ()}
+        {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 20 34 "Mudcrawler13" ()}
 #endif
 
         {MUDCRAWLER_ROUTINE Eloshi}
@@ -545,20 +549,20 @@
 
         {ADD rescued_elves 1}
 
-        {CREATE_UNIT 2 "Giant Mudcrawler" 34 33 "Rocky Horror" 
(user_description=_"Rocky Horror")}
-        {CREATE_UNIT 2 "Giant Mudcrawler" 34 34 "Rocky Horror" 
(user_description=_"Rocky Horror")}
-        {CREATE_UNIT 2 "Small Mudcrawler" 34 35 "Rocky Horror" 
(user_description=_"Rocky Horror")}
+        {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")}
 
 #ifdef HARD
-        {CREATE_UNIT 2 "Giant Mudcrawler" 35 33 "Rocky Horror" 
(user_description=_"Rocky Horror")}
+        {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 35 33 "Rocky Horror4" 
(role="Rocky Horror")}
 #else
-        {CREATE_UNIT 2 "Small Mudcrawler" 35 33 "Rocky Horror" 
(user_description=_"Rocky Horror")}
+        {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 35 33 "Rocky Horror5" 
(role="Rocky Horror")}
 #endif
 
 #ifdef EASY
-        {CREATE_UNIT 2 "Small Mudcrawler" 36 32 "Rocky Horror" 
(user_description=_"Rocky Horror")}
+        {RANDOM_TRAIT_UNIT 2 "Small Mudcrawler" 36 32 "Rocky Horror6" 
(role="Rocky Horror")}
 #else
-        {CREATE_UNIT 2 "Giant Mudcrawler" 36 32 "Rocky Horror" 
(user_description=_"Rocky Horror")}
+        {RANDOM_TRAIT_UNIT 2 "Giant Mudcrawler" 36 32 "Rocky Horror7" 
(role="Rocky Horror")}
 #endif
 
         [unit]
@@ -588,9 +592,8 @@
             {IS_HERO}
         [/unit]
 
-        {CREATE_UNIT 1 "Desert Fighter" 36 33 "Jorazan" 
(user_description=_"Jorazan")}
-        {CREATE_UNIT 1 "Desert Fighter" 35 35 "Zyara" 
(user_description=_"Zyara"
-          gender="female")}
+        {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 36 33 "Jorazan" ()}
+        {RANDOM_TRAIT_UNIT 1 "Desert Fighter" 35 35 "Zyara" 
(gender="female")}
 
         [message]
             speaker=unit
@@ -619,13 +622,13 @@
             first_time_only=no
 
             [filter]
-                description=Rocky Horror
+                role="Rocky Horror"
             [/filter]
 
             [if]
                 [not]
                     [have_unit]
-                        description=Rocky Horror
+                        role="Rocky Horror"
                     [/have_unit]
                 [/not]
                 [then]
@@ -709,8 +712,8 @@
             {IS_HERO}
         [/unit]
 
-        {CREATE_UNIT 1 "Desert Shaman" 30 27 "Ryoko" 
(user_description=_"Ryoko")}
-        {CREATE_UNIT 1 "Desert Shaman" 32 27 "Yuni" 
(user_description=_"Yuni")}
+        {RANDOM_TRAIT_UNIT 1 "Desert Shaman" 30 27 "Ryoko" ()}
+        {RANDOM_TRAIT_UNIT 1 "Desert Shaman" 32 27 "Yuni" ()}
 
         [message]
             speaker=Zhul
@@ -894,8 +897,7 @@
               [then]
                 # first stable encounter
                 {VARIABLE grasslands_dialogue 2}
-                {CREATE_UNIT 1 "Desert Scout" $x1 $y1 "Naru" 
(user_description=_"Naru"
-                  description="Naru")}
+                {RANDOM_TRAIT_UNIT 1 "Desert Scout" $x1 $y1 "Naru" ()}
                 [message]
                   description=Naru
                   message= _ "Is it safe to come out? I was so scared."
@@ -923,9 +925,7 @@
                   description=Naru
                   message= _ "Hey Nisa, the rocks have stopped falling. You 
can come out now!"
                 [/message]
-                {CREATE_UNIT 1 "Desert Scout" 43 31 "Nisa" 
(user_description=_"Nisa"
-                  description="Nisa"
-                  gender="female")}
+                {RANDOM_TRAIT_UNIT 1 "Desert Scout" 43 31 "Nisa" 
(gender="female")}
                 [message]
                   description=Nisa
                   message= _ "Oh, thank Eloh, I thought they would never 
stop."
@@ -1175,13 +1175,11 @@
             y=1-6
         [/remove_shroud]
 
-        {CREATE_UNIT 1 "Desert Hunter" 29 2 "Pythos" 
(user_description=_"Pythos"
-          description="Pythos")}
-        {CREATE_UNIT 1 "Desert Fighter" 28 2 "Shea" 
(user_description=_"Shea")}
-        {CREATE_UNIT 1 "Desert Fighter" 29 1 "Narn" 
(user_description=_"Narn")}
-        {CREATE_UNIT 1 "Desert Scout" 27 2 "Jokli" 
(user_description=_"Jokli")}
-        {CREATE_UNIT 1 "Desert Archer" 28 1 "Lyia" (user_description=_"Lyia"
-          gender="female")}
+        {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")}
 
         [message]
             description=Pythos




Related Messages


Powered by MHonArc, Updated Wed Sep 19 00:00:41 2007