Author: soliton
Date: Mon Apr 27 17:31:12 2009
New Revision: 35266

URL: http://svn.gna.org/viewcvs/wesnoth?rev=35266&view=rev
Log:
macrofied recurring objectives and clarified the village control objective

Modified:
    
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg?rev=35266&r1=35265&r2=35266&view=diff
==============================================================================
--- 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
 (original)
+++ 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
 Mon Apr 27 17:31:12 2009
@@ -171,6 +171,31 @@
     #! -- standart macro
     {STARTING_VILLAGES 1 30}#
 
+#define VILLAGE_CONTROL_OBJECTIVE
+    [objective]
+        description= _ "You lose control (even temporarily) of more than 6 
villages."
+        condition=lose
+    [/objective]
+#enddef
+#define DEFEAT_AZKOTEP_OBJECTIVE
+    [objective]
+        description= _ "Defeat Azkotep"
+        condition=win
+    [/objective]
+#enddef
+#define DEFEAT_YSTARA_OBJECTIVE
+    [objective]
+        description= _ "Defeat Ystara"
+        condition=win
+    [/objective]
+#enddef
+#define HERO_DEATH_OBJECTIVE
+    [objective]
+        description= _ "Death of Kaleh, Nym or Zhul"
+        condition=lose
+    [/objective]
+#enddef
+
     #! -- setting up objectives,variables and map objects sets
     #! -- variables : $ambush_turn, $sneak_up, $elven_camps,
     #! -- $killed_by_azkotep, $killed_by_ystara, $grak_challenged,
@@ -189,10 +214,7 @@
                 description= _ "Defeat all Undead Leaders"
                 condition=win
             [/objective]
-            [objective]
-                description= _ "You Control Less Than 6 Villages"
-                condition=lose
-            [/objective]
+            {VILLAGE_CONTROL_OBJECTIVE}
             [objective]
                 description= _ "Death of Kaleh, Nym, Garak or Zhul"
                 condition=lose
@@ -1221,18 +1243,9 @@
                         [objectives]
                             summary= _ "New Objectives:"
                             show=yes
-                            [objective]
-                                description= _ "Defeat Azkotep"
-                                condition=win
-                            [/objective]
-                            [objective]
-                                description= _ "You Control Less Than 6 
Villages"
-                                condition=lose
-                            [/objective]
-                            [objective]
-                                description= _ "Death of Kaleh, Nym or Zhul"
-                                condition=lose
-                            [/objective]
+                            {DEFEAT_AZKOTEP_OBJECTIVE}
+                            {VILLAGE_CONTROL_OBJECTIVE}
+                            {HERO_DEATH_OBJECTIVE}
 
                             
note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
                         [/objectives]
@@ -1381,18 +1394,9 @@
                                 description=_"Defeat Possessed Garak (or)"
                                 condition=win
                             [/objective]
-                            [objective]
-                                description= _ "Defeat Ystara"
-                                condition=win
-                            [/objective]
-                            [objective]
-                                description= _ "You Control Less Than 6 
Villages"
-                                condition=lose
-                            [/objective]
-                            [objective]
-                                description= _ "Death of Kaleh, Nym or Zhul"
-                                condition=lose
-                            [/objective]
+                            {DEFEAT_YSTARA_OBJECTIVE}
+                            {VILLAGE_CONTROL_OBJECTIVE}
+                            {HERO_DEATH_OBJECTIVE}
 
                             
note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
                         [/objectives]
@@ -1548,18 +1552,9 @@
                                 description=_"Defeat Possessed Garak (or)"
                                 condition=win
                             [/objective]
-                            [objective]
-                                description= _ "Defeat Azkotep"
-                                condition=win
-                            [/objective]
-                            [objective]
-                                description= _ "You Control Less Than 6 
Villages"
-                                condition=lose
-                            [/objective]
-                            [objective]
-                                description= _ "Death of Kaleh, Nym or Zhul"
-                                condition=lose
-                            [/objective]
+                            {DEFEAT_AZKOTEP_OBJECTIVE}
+                            {VILLAGE_CONTROL_OBJECTIVE}
+                            {HERO_DEATH_OBJECTIVE}
 
                             
note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
                         [/objectives]
@@ -1677,18 +1672,9 @@
                         [objectives]
                             summary= _ "New Objectives:"
                             show=yes
-                            [objective]
-                                description= _ "Defeat Azkotep"
-                                condition=win
-                            [/objective]
-                            [objective]
-                                description= _ "You Control Less Than 6 
Villages"
-                                condition=lose
-                            [/objective]
-                            [objective]
-                                description= _ "Death of Kaleh, Nym or Zhul"
-                                condition=lose
-                            [/objective]
+                            {DEFEAT_AZKOTEP_OBJECTIVE}
+                            {VILLAGE_CONTROL_OBJECTIVE}
+                            {HERO_DEATH_OBJECTIVE}
 
                             
note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
                         [/objectives]
@@ -1837,18 +1823,9 @@
                                 description=_"Defeat Possessed Garak (or)"
                                 condition=win
                             [/objective]
-                            [objective]
-                                description= _ "Defeat Azkotep"
-                                condition=win
-                            [/objective]
-                            [objective]
-                                description= _ "You Control Less Than 6 
Villages"
-                                condition=lose
-                            [/objective]
-                            [objective]
-                                description= _ "Death of Kaleh, Nym or Zhul"
-                                condition=lose
-                            [/objective]
+                            {DEFEAT_AZKOTEP_OBJECTIVE}
+                            {VILLAGE_CONTROL_OBJECTIVE}
+                            {HERO_DEATH_OBJECTIVE}
 
                             
note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
                         [/objectives]
@@ -1971,18 +1948,9 @@
                         [objectives]
                             summary= _ "New Objectives:"
                             show=yes
-                            [objective]
-                                description= _ "Defeat Ystara"
-                                condition=win
-                            [/objective]
-                            [objective]
-                                description= _ "You Control Less Than 6 
Villages"
-                                condition=lose
-                            [/objective]
-                            [objective]
-                                description= _ "Death of Kaleh, Nym or Zhul"
-                                condition=lose
-                            [/objective]
+                            {DEFEAT_YSTARA_OBJECTIVE}
+                            {VILLAGE_CONTROL_OBJECTIVE}
+                            {HERO_DEATH_OBJECTIVE}
 
                             
note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
                         [/objectives]
@@ -2131,18 +2099,9 @@
                                 description=_"Defeat Possessed Garak (or)"
                                 condition=win
                             [/objective]
-                            [objective]
-                                description= _ "Defeat Ystara"
-                                condition=win
-                            [/objective]
-                            [objective]
-                                description= _ "You Control Less Than 6 
Villages"
-                                condition=lose
-                            [/objective]
-                            [objective]
-                                description= _ "Death of Kaleh, Nym or Zhul"
-                                condition=lose
-                            [/objective]
+                            {DEFEAT_YSTARA_OBJECTIVE}
+                            {VILLAGE_CONTROL_OBJECTIVE}
+                            {HERO_DEATH_OBJECTIVE}
 
                             
note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40}
                         [/objectives]


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to