Author: fendrin
Date: Sun Apr 12 22:22:46 2009
New Revision: 34823

URL: http://svn.gna.org/viewcvs/wesnoth?rev=34823&view=rev
Log:
LoW all: Code cleanups.
Added missing objective notes to every scenario in LoW.

Modified:
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg 
Sun Apr 12 22:22:46 2009
@@ -359,6 +359,9 @@
                 description= _ "Turns run out"
                 condition=lose
             [/objective]
+#ifndef EASY
+            note={NO_EARLY_FINISH_BONUS_NOTE}
+#endif
         [/objectives]
     [/event]
 

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg Sun 
Apr 12 22:22:46 2009
@@ -115,6 +115,7 @@
                 description= _ "Turns run out"
                 condition=lose
             [/objective]
+            note={EARLY_FINISH_BONUS_NOTE}
         [/objectives]
 
         {RECALL_LOYALS}

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg 
Sun Apr 12 22:22:46 2009
@@ -131,6 +131,7 @@
                 description= _ "Turns run out"
                 condition=lose
             [/objective]
+            note={EARLY_FINISH_BONUS_NOTE}
         [/objectives]
 
         {RECALL_LOYALS}
@@ -275,6 +276,7 @@
                 [else]
                     [endlevel]
                         result=victory
+                        bonus=yes
                     [/endlevel]
                 [/else]
             [/if]

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg 
(original)
+++ 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg 
Sun Apr 12 22:22:46 2009
@@ -213,6 +213,8 @@
                 description= _ "Turns run out"
                 condition=lose
             [/objective]
+            note={EARLY_FINISH_BONUS_NOTE}
+            note= _ "Try to save leveled dwarf units"
         [/objectives]
     [/event]
 

Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg Sun 
Apr 12 22:22:46 2009
@@ -146,6 +146,7 @@
                 description= _ "Turns run out"
                 condition=lose
             [/objective]
+            note={EARLY_FINISH_BONUS_NOTE}
         [/objectives]
 
         {RECALL_LOYALS}

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg 
Sun Apr 12 22:22:46 2009
@@ -33,6 +33,22 @@
         fog=yes
     [/side]
     #wmllint: validate-on
+    [event]
+        name=prestart
+
+        {RECALL_LOYALS}
+        # wmllint: recognize Landar
+        # wmllint: recognize Cleodil
+
+        [recall]
+            id=Olurf
+        [/recall]
+
+        {CHECK_LANDAR}
+        {CHECK_CLEODIL}
+        {CHECK_OLURF}
+    [/event]
+
     [side]
         type=Troll Warrior
         id=Tafrul
@@ -128,19 +144,8 @@
                 description= _ "Turns run out"
                 condition=lose
             [/objective]
+            note={EARLY_FINISH_BONUS_NOTE}
         [/objectives]
-
-        {RECALL_LOYALS}
-        # wmllint: recognize Landar
-        # wmllint: recognize Cleodil
-
-        [recall]
-            id=Olurf
-        [/recall]
-
-        {CHECK_LANDAR}
-        {CHECK_CLEODIL}
-        {CHECK_OLURF}
     [/event]
 
     [event]

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg 
Sun Apr 12 22:22:46 2009
@@ -32,6 +32,18 @@
         fog=yes
     [/side]
     #wmllint: validate-on
+    [event]
+        name=prestart
+        {RECALL_LOYALS}
+        # wmllint: recognize Landar
+        [recall]
+            id=Olurf
+        [/recall]
+
+        {CHECK_LANDAR}
+        {CHECK_CLEODIL}
+        {CHECK_OLURF}
+    [/event]
 
     [side]
         type=Arch Mage
@@ -108,17 +120,8 @@
                 description= _ "Turns run out"
                 condition=lose
             [/objective]
+            note={EARLY_FINISH_BONUS_NOTE}
         [/objectives]
-
-        {RECALL_LOYALS}
-        # wmllint: recognize Landar
-        [recall]
-            id=Olurf
-        [/recall]
-
-        {CHECK_LANDAR}
-        {CHECK_CLEODIL}
-        {CHECK_OLURF}
     [/event]
 
     [event]
@@ -136,6 +139,7 @@
             id=Aquagar
             message= _ "Fools! The book will be mine!"
         [/message]
+        #TODO give a hint were the mage is to be protected.
     [/event]
 
     [event]

Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg Sun 
Apr 12 22:22:46 2009
@@ -230,6 +230,7 @@
                 description= _ "Death of Aldar"
                 condition=lose
             [/objective]
+            note={NO_EARLY_FINISH_BONUS_NOTE}
         [/objectives]
 
         {RECALL_LOYALS}

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg 
Sun Apr 12 22:22:46 2009
@@ -81,6 +81,14 @@
         {INCOME -2 -2 -2}
     [/side]
     #wmllint: validate-on
+    [event]
+        name=prestart
+        [recall]
+            id=Landar
+        [/recall]
+
+        {CHECK_LANDAR}
+    [/event]
 
     [side]
         type=Orcish Sovereign
@@ -265,13 +273,8 @@
                 description= _  "Turns run out"
                 condition=lose
             [/objective]
+            note={NO_EARLY_FINISH_BONUS_NOTE}
         [/objectives]
-
-        [recall]
-            id=Landar
-        [/recall]
-
-        {CHECK_LANDAR}
 
         {ORCISH_GUARD}
     [/event]

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg 
Sun Apr 12 22:22:46 2009
@@ -39,6 +39,20 @@
         fog=yes
     [/side]
     {RECALL_KALENZ 46 39}
+    [event]
+        name=prestart
+        {RECALL_LOYALS}
+
+        [recall]
+            id=Olurf
+        [/recall]
+
+        {CHECK_LANDAR}
+        # wmllint: recognize Landar
+        {CHECK_CLEODIL}
+        # wmllint: recognize Cleodil
+        {CHECK_OLURF}
+    [/event]
 
     [side]
         side=2
@@ -197,19 +211,8 @@
                 description= _ "Turns run out"
                 condition=lose
             [/objective]
+            note={EARLY_FINISH_BONUS_NOTE}
         [/objectives]
-
-        {RECALL_LOYALS}
-
-        [recall]
-            id=Olurf
-        [/recall]
-
-        {CHECK_LANDAR}
-        # wmllint: recognize Landar
-        {CHECK_CLEODIL}
-        # wmllint: recognize Cleodil
-        {CHECK_OLURF}
     [/event]
 
     #wmllint: recognize Uradredia

Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg Sun 
Apr 12 22:22:46 2009
@@ -194,6 +194,7 @@
                 description= _ "Turns run out"
                 condition=lose
             [/objective]
+            note={NO_EARLY_FINISH_BONUS_NOTE}
             note={NO_GOLD_CARRYOVER_NOTE}
         [/objectives]
     [/event]

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg 
Sun Apr 12 22:22:46 2009
@@ -223,6 +223,7 @@
                 description= _ "Turns run out"
                 condition=lose
             [/objective]
+            note={EARLY_FINISH_BONUS_NOTE}
         [/objectives]
     [/event]
 

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg?rev=34823&r1=34822&r2=34823&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg 
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg Sun 
Apr 12 22:22:46 2009
@@ -165,6 +165,7 @@
                 description= _ "Death of Uradredia"
                 condition=lose
             [/objective]
+            note={EARLY_FINISH_BONUS_NOTE}
         [/objectives]
 
         {CHECK_LANDAR_STORE ()}
@@ -212,6 +213,7 @@
         [/message]
         [endlevel]
             result=victory
+            bonus=yes
         [/endlevel]
     [/event]
 


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

Reply via email to