Author: zookeeper
Date: Sat Jul  5 00:04:42 2008
New Revision: 27731

URL: http://svn.gna.org/viewcvs/wesnoth?rev=27731&view=rev
Log:
Assorted fixed and cleanups.

Modified:
    trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
    trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
    trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg
    
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg

Modified: 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg?rev=27731&r1=27730&r2=27731&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg 
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg 
Sat Jul  5 00:04:42 2008
@@ -235,6 +235,10 @@
                 description= _ "Death of Kapou'e"
                 condition=lose
             [/objective]
+            [objective]
+                description= _ "Turns run out"
+                condition=lose
+            [/objective]
         [/objectives]
     [/event]
 

Modified: 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg?rev=27731&r1=27730&r2=27731&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg 
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg 
Sat Jul  5 00:04:42 2008
@@ -32,7 +32,7 @@
                 condition=lose
             [/objective]
             [objective]
-                description= _ "Time Runs Out"
+                description= _ "Turns run out"
                 condition=lose
             [/objective]
         [/objectives]
@@ -269,7 +269,6 @@
             [effect]
                 apply_to=status
                 add=poisoned
-                duration=level
             [/effect]
         [/object]
 
@@ -384,22 +383,5 @@
         [/message]
     [/event]
 
-    [event]
-        name=victory
-
-        [object]
-            silent=yes
-            [filter]
-                id=Grüü
-            [/filter]
-
-            [effect]
-                apply_to=status
-                remove=poisoned
-                duration=level
-            [/effect]
-        [/object]
-    [/event]
-
     [EMAIL PROTECTED]/Son_Of_The_Black_Eye/utils/deaths.cfg}
 [/scenario]

Modified: 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg?rev=27731&r1=27730&r2=27731&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg 
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/08_Silent_Forest.cfg 
Sat Jul  5 00:04:42 2008
@@ -97,7 +97,6 @@
         [/ai]
         recruit=Elvish Fighter, Elvish Captain, Elvish Scout, Elvish Shaman, 
Elvish Archer
         {GOLD 70 90 110}
-        {INCOME 0 2 4}
     [/side]
 
     [side]
@@ -211,7 +210,7 @@
     [/event]
 
     [event]
-        name=die
+        name=last breath
         [filter_second]
             side=1
         [/filter_second]
@@ -238,7 +237,7 @@
         [/message]
 
         [message]
-            speaker=seccond_unit
+            speaker=second_unit
             message= _ "So you elves have set up an enclave here have you. Why 
is that?"
         [/message]
 
@@ -327,6 +326,7 @@
 
         [move_unit_fake]
             type=Elvish Scout
+            side=3
             x=36,36,36,36,36,36,36
             y=24,25,26,27,28,29,30
         [/move_unit_fake]

Modified: 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg?rev=27731&r1=27730&r2=27731&view=diff
==============================================================================
--- 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg 
(original)
+++ 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg 
Sat Jul  5 00:04:42 2008
@@ -18,6 +18,10 @@
             side=1
             [objective]
                 description= _ "Survive the Shan Taum menace for 20 turns"
+                condition=win
+            [/objective]
+            [objective]
+                description= _ "Defeat Shan Taum (bonus)"
                 condition=win
             [/objective]
             [objective]
@@ -146,7 +150,8 @@
     [/event]
 
     [event]
-        name=time over
+        name=victory cutscene
+
         {OLD_ORCISH_SHAMAN 32 30 Fabstep _"Fabstep"}
         {OLD_ORCISH_SHAMAN 32 30 Klebar _"Klebar"}
         {OLD_ORCISH_SHAMAN 32 30 Echarp _"Echarp"}
@@ -206,6 +211,24 @@
         [kill]
             id="Vraurk"
         [/kill]
+        [kill]
+            id="Fabstep"
+        [/kill]
+        [kill]
+            id="Klebar"
+        [/kill]
+        [kill]
+            id="Echarp"
+        [/kill]
+    [/event]
+
+    [event]
+        name=time over
+
+        [fire_event]
+            name=victory cutscene
+        [/fire_event]
+
         [endlevel]
             result=victory
             bonus=no
@@ -213,84 +236,20 @@
     [/event]
 
     [event]
-        name=die
+        name=last breath
+
         [filter]
             id="Shan Taum"
         [/filter]
+
         [message]
             speaker="Shan Taum"
             message= _ "Nooo! Don't kill me, I surrender to you little 
earthworm."
         [/message]
 
-        {OLD_ORCISH_SHAMAN 32 30 Fabstep _"Fabstep"}
-        {OLD_ORCISH_SHAMAN 32 30 Klebar _"Klebar"}
-        {OLD_ORCISH_SHAMAN 32 30 Echarp _"Echarp"}
-        # wmllint: recognize Fabstep
-        # wmllint: recognize Klebar
-        # wmllint: recognize Echarp
-        [message]
-            speaker="Echarp"
-            message= _ "What is this? Are you mad!? Humans are to besiege our 
fortress at Prestim and you are fighting each other!?"
-        [/message]
-        [message]
-            speaker="Kapou'e"
-            message= _ "Well, ermmm..."
-        [/message]
-        [message]
-            speaker="Echarp"
-            message= _ "Kapou'e, rumors tell you made a long trip to seek 
assistance from us, and escorting Pirk, Gork and Vraurk. The council is 
grateful for that."
-        [/message]
-        [message]
-            speaker="Fabstep"
-            message= _ "I know what you want from us but I'm afraid we can't 
help you."
-        [/message]
-        [message]
-            speaker="Kapou'e"
-            message= _ "Really? But my people..."
-        [/message]
-        [message]
-            speaker="Echarp"
-            message= _ "You don't understand. Orcs have been divided for ages. 
The only one who gave us some unity was your father, Black-Eye Karun. Hearing 
rumors from your exploits, we understood you are a worthy son of your father."
-        [/message]
-        [message]
-            speaker="Vraurk"
-            message= _ "This is true. Now we are pressured from all sides by 
humans and elves; we need a leader that can unite all banners. This one is YOU!"
-        [/message]
-        [message]
-            speaker="Kapou'e"
-            message= _ "Well, I'm not sure I deserve that..."
-        [/message]
-        [message]
-            speaker="Grüü"
-            message= _ "Did you hear? There is a battle waiting for us at 
Prestim!"
-        [/message]
-        [message]
-            speaker="Echarp"
-            message= _ "Kapou'e, if Prestim falls, humans will have a strong 
bridgehead on this side of the river and your people won't be safe. You are the 
only one that can help us defend Prestim!"
-        [/message]
-        [message]
-            speaker="Pirk"
-            message= _ "Go defend Prestim Kapou'e. In the meantime, now that 
the council is complete again, we will decide. We may have to form the Great 
Horde again, and give you the leadership on it."
-        [/message]
-        [kill]
-            id="Pirk"
-        [/kill]
-        [kill]
-            id="Gork"
-        [/kill]
-        [kill]
-            id="Vraurk"
-        [/kill]
-
-        [kill]
-            id=Fabstep
-        [/kill]
-        [kill]
-            id=Klebar
-        [/kill]
-        [kill]
-            id=Echarp
-        [/kill]
+        [fire_event]
+            name=victory cutscene
+        [/fire_event]
 
         [endlevel]
             result=victory


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

Reply via email to