Author: zookeeper
Date: Sun Jul 13 11:19:13 2008
New Revision: 27974

URL: http://svn.gna.org/viewcvs/wesnoth?rev=27974&view=rev
Log:
Cleaned up the epilogue and removed some obsolete macros.

Modified:
    trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/19_Epilogue.cfg
    trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg

Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/19_Epilogue.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/19_Epilogue.cfg?rev=27974&r1=27973&r2=27974&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/19_Epilogue.cfg 
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/19_Epilogue.cfg Sun Jul 
13 11:19:13 2008
@@ -5,8 +5,6 @@
     map_data="{campaigns/Son_Of_The_Black_Eye/maps/Northern_Alliance.map}"
 
     turns=-1
-
-    victory_when_enemies_defeated="yes"
 
     {DEFAULT_SCHEDULE}
 
@@ -22,71 +20,7 @@
         recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Saurian 
Skirmisher
         team_name=Kapoue
         user_team_name=_ "Kapou'e"
-        {GOLD 800 650 500}
         {BLACK_FLAG}
-    [/side]
-
-    [side]
-        type=Orcish Warlord
-        id="Al'Brock"
-        side=2
-        canrecruit=yes
-        recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish 
Crossbowman, Orcish Warrior, Orcish Assassin
-        team_name=Kapoue
-        user_team_name=_ "Kapou'e"
-        {INCOME 10 7 5}
-        {GOLD 300 250 200}
-    [/side]
-
-    [side]
-        type=Orcish Warlord
-        id="Flar'Tar"
-        side=3
-        canrecruit=yes
-        recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish 
Crossbowman, Orcish Warrior, Orcish Assassin
-        team_name=Kapoue
-        user_team_name=_ "Kapou'e"
-        {INCOME 10 7 5}
-        {GOLD 300 250 200}
-    [/side]
-
-    [side]
-        type=Grand Marshal
-        id="Earl Lanbec'h"
-        side=4
-        canrecruit=yes
-        recruit=Dragoon, Swordsman, Pikeman, Longbowman,Shock 
Trooper,Mage,Duelist,White Mage,Red 
Mage,Lancer,Knight,Spearman,Bowman,Cavalryman,Horseman
-        team_name=villains
-        user_team_name=_"Villains"
-        {GOLD 800 900 1000}
-        {INCOME 10 15 20}
-        recruitment_pattern=scout,scout,fighter,archer,fighter,archer,mixed 
fighter,mixed fighter,healer
-        leader_value=50.0
-    [/side]
-
-    [side]
-        type=Orcish Warlord
-        id=Shan Taum
-        side=5
-        canrecruit=yes
-        recruit= Wolf Rider, Goblin Knight, Orcish Grunt, Ogre, Orcish Archer, 
Orcish Crossbowman, Orcish Warrior, Orcish Assassin, Orcish Slayer
-        team_name=villains
-        user_team_name=_"Villains"
-        {INCOME 15 11 7}
-        {GOLD 400 350 300}
-    [/side]
-
-    [side]
-        type=General
-        id=Howgarth III
-        name= _ "Howgarth III"
-        side=6
-        canrecruit=yes
-        recruit=Gryphon Rider, Gryphon Master, Spearman, Swordsman, 
Javelineer, Pikeman, Dwarvish Steelclad, Dwarvish Fighter, Dwarvish Thunderer, 
Dwarvish Thunderguard, Bowman, Longbowman, Mage, White Mage, Red Mage, Fencer, 
Duelist, Heavy Infantryman, Shock Trooper
-        team_name=Kapoue
-        user_team_name=_ "Kapou'e"
-        {INCOME 15 11 7}
-        {GOLD 400 350 300}
     [/side]
 
     [story]
@@ -122,15 +56,10 @@
     [/story]
 
     [event]
-        name=start
-
-        {RECALL Grüü}
-        {RECALL Inarix}
+        name=prestart
 
         [endlevel]
-            result=victory
+            result=continue_no_save
         [/endlevel]
     [/event]
-
-    [EMAIL PROTECTED]/Son_Of_The_Black_Eye/utils/deaths.cfg}
 [/scenario]

Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg?rev=27974&r1=27973&r2=27974&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg (original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg Sun Jul 13 
11:19:13 2008
@@ -195,12 +195,6 @@
     [/unit]
 #enddef
 
-#define RECALL ID_STRING
-    [recall]
-        id={ID_STRING}
-    [/recall]
-#enddef
-
 #define SAURIAN X Y
     [unit]
         type=Saurian Skirmisher
@@ -249,69 +243,6 @@
 #define BLACK_FLAG
     
flag=flags/black-flag-1.png:100,flags/black-flag-2.png:300,flags/black-flag-1.png:100,flags/black-flag-3.png:300
     flag_icon=flags/black-flag-icon.png
-#enddef
-
-#define TROLLARMY NUMBER
-    [role]
-        role=store{NUMBER}
-        type=Troll Warrior,Troll,Troll Rocklobber,Troll Whelp
-    [/role]
-    [store_unit]
-        [filter]
-            role=store{NUMBER}
-        [/filter]
-        variable=store{NUMBER}
-        kill=yes
-    [/store_unit]
-#enddef
-
-#define TROLLRECALL NUMBER
-    [unstore_unit]
-        variable=store{NUMBER}
-    [/unstore_unit]
-    [recall]
-        role=store{NUMBER}
-    [/recall]
-    [recall]
-        id={NUMBER}
-    [/recall]
-    [clear_variable]
-        name=store{NUMBER}
-    [/clear_variable]
-#enddef
-
-#define TROLLMOVE NUMBER
-    [store_unit]
-        [filter]
-            role=store{NUMBER}
-        [/filter]
-        variable=store{NUMBER}
-        kill=yes
-    [/store_unit]
-    [set_variable]
-        name=store{NUMBER}.side
-        value=4
-    [/set_variable]
-    [set_variable]
-        name=store{NUMBER}.x
-        value=5
-    [/set_variable]
-    [set_variable]
-        name=store{NUMBER}.y
-        value=4
-    [/set_variable]
-
-#enddef
-
-#define TROLLARRIVE NUMBER
-    [unstore_unit]
-        variable=store{NUMBER}
-        find_vacant=yes
-    [/unstore_unit]
-    [clear_variable]
-        name=store{NUMBER}
-    [/clear_variable]
-
 #enddef
 
 #define HUMAN_GUARD X Y
@@ -451,4 +382,4 @@
             find_vacant=no
         [/unstore_unit]
     [/event]
-#enddef
+#enddef


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

Reply via email to