mail[Wesnoth-commits] r43887 - in /branches/1.8/data/campaigns: Liberty/scenarios/ Son_Of_The_Black_Eye/scenarios/ The_Rise_Of_Wesnoth/scenarios/


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

Header


Content

Posted by lari . nieminen on July 04, 2010 - 13:29:
Author: zookeeper
Date: Sun Jul  4 13:29:50 2010
New Revision: 43887

URL: http://svn.gna.org/viewcvs/wesnoth?rev=43887&view=rev
Log:
Ported r43882-43885 to 1.8.

Modified:
    branches/1.8/data/campaigns/Liberty/scenarios/08_Glory.cfg
    
branches/1.8/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
    branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
    
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
    
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
    
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg
    
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
    
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
    
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
    
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
    
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg

Modified: branches/1.8/data/campaigns/Liberty/scenarios/08_Glory.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/data/campaigns/Liberty/scenarios/08_Glory.cfg?rev=43887&r1=43886&r2=43887&view=diff
==============================================================================
--- branches/1.8/data/campaigns/Liberty/scenarios/08_Glory.cfg (original)
+++ branches/1.8/data/campaigns/Liberty/scenarios/08_Glory.cfg Sun Jul  4 
13:29:50 2010
@@ -950,29 +950,49 @@
     #
     # Deaths - Dommel
     #
+
+    # If either the orcs or Helicrom's guys happen to kill Dommel, we pretend
+    # that Baldras killed him so that the dialogue makes more sense
     [event]
         name=die
+
         [filter]
             id=Dommel
         [/filter]
-        [if]
-            [variable]
-                name=second_unit.id
-                equals=Dommel
-            [/variable]
-            [then]
-                [message]
-                    speaker=Baldras
-                    message= _ "Your reign of terror is over, General."
-                [/message]
-            [/then]
-            [else]
-                [message]
-                    speaker=second_unit
-                    message= _ "Your reign of terror is over, General."
-                [/message]
-            [/else]
-        [/if]
+
+        [filter_second]
+            side=4,5
+        [/filter_second]
+
+        [fire_event]
+            name=last breath
+
+            [primary_unit]
+                id=Dommel
+            [/primary_unit]
+
+            [secondary_unit]
+                id=Baldras
+            [/secondary_unit]
+        [/fire_event]
+    [/event]
+
+    [event]
+        name=last breath
+
+        [filter]
+            id=Dommel
+        [/filter]
+
+        [filter_second]
+            side=1,6
+        [/filter_second]
+
+        [message]
+            speaker=second_unit
+            message= _ "Your reign of terror is over, General."
+        [/message]
+
         [message]
             speaker=Dommel
             message= _ "You will never successfully oppose Asheviere. Her 
power is too great... This small victory today is but a reprieve from the 
unimaginable pain you will suffer when the full force of her wrath descends 
upon you."

Modified: 
branches/1.8/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg?rev=43887&r1=43886&r2=43887&view=diff
==============================================================================
--- 
branches/1.8/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg 
(original)
+++ 
branches/1.8/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg 
Sun Jul  4 13:29:50 2010
@@ -25,7 +25,7 @@
     id="Black_Flag"
     name= _ "Black Flag"
     map_data="{campaigns/Son_Of_The_Black_Eye/maps/Black_Flag.map}"
-    {TURNS 30 25 20}
+    {TURNS 30 28 24}
 
     {DEFAULT_SCHEDULE}
 

Modified: 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg?rev=43887&r1=43886&r2=43887&view=diff
==============================================================================
--- branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg 
(original)
+++ branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg 
Sun Jul  4 13:29:50 2010
@@ -60,6 +60,7 @@
         type=Orcish Warlord
         id=Tan-Rarbag
         name= _ "Tan-Rarbag"
+        profile=portraits/orcs/transparent/grunt-3.png
         side=3
         canrecruit=yes
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, 
Goblin Spearman

Modified: 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg?rev=43887&r1=43886&r2=43887&view=diff
==============================================================================
--- 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
 (original)
+++ 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
 Sun Jul  4 13:29:50 2010
@@ -33,6 +33,7 @@
         type=Orcish Warlord
         id=Tan-Schmog
         name= _ "Tan-Schmog"
+        profile=portraits/orcs/transparent/grunt.png
         side=2
         canrecruit=yes
         {GOLD 80 140 200}
@@ -58,6 +59,7 @@
         type=Orcish Warlord
         id=Tan-NauVong
         name= _ "Tan-NauVong"
+        profile=portraits/orcs/transparent/grunt-2.png
         side=3
         canrecruit=yes
         {GOLD 80 140 200}
@@ -360,13 +362,13 @@
                 {LOYAL_UNIT 3 (Orcish Assassin) 26 40}
 
 #endif
-                # wmllint: recognize Hashnak
                 [message]
                     speaker=Tan-NauVong
                     message= _ "Come and get it!"
                 [/message]
                 [message]
-                    speaker=Hashnak
+                    side=2
+                    type=Orcish Slayer
                     message= _ "Die, human."
                 [/message]
                 [message]
@@ -426,7 +428,8 @@
                     message= _ "I'll not go so easily!"
                 [/message]
                 [message]
-                    speaker=Hashnak
+                    side=2
+                    type=Orcish Slayer
                     message= _ "Die, human."
                 [/message]
                 [message]

Modified: 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg?rev=43887&r1=43886&r2=43887&view=diff
==============================================================================
--- 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
 (original)
+++ 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
 Sun Jul  4 13:29:50 2010
@@ -53,6 +53,7 @@
         type=Orcish Warlord
         id=Tan-Bok
         name= _ "Tan-Bok"
+        profile="portraits/orcs/transparent/grunt-3.png"
         side=3
         canrecruit=yes
         {GOLD 110 150 190}
@@ -87,6 +88,7 @@
         type=Orcish Warlord
         id=Tan-Hogar
         name= _ "Tan-Hogar"
+        profile="portraits/orcs/transparent/grunt-2.png"
         side=4
         canrecruit=yes
         {GOLD 110 150 190}
@@ -180,20 +182,17 @@
 
         [message]
             speaker=Tan-Vrodis
-            image="portraits/orcs/transparent/warlord.png"
             message= _ "HUMANS... I see humans!"
         [/message]
 
         [message]
             speaker=Tan-Bok
-            image="portraits/orcs/transparent/warlord.png"
             # wmllint: local spelling Hogar
             message= _ "Ha, Hogar! You said we wouldn't see any action this 
far back from the front."
         [/message]
 
         [message]
             speaker=Tan-Hogar
-            image="portraits/orcs/transparent/grunt-2.png"
             message= _ "Shut yer mouth! Let's just get 'em."
         [/message]
     [/event]

Modified: 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg?rev=43887&r1=43886&r2=43887&view=diff
==============================================================================
--- 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg 
(original)
+++ 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg 
Sun Jul  4 13:29:50 2010
@@ -35,6 +35,7 @@
         type=Orcish Warlord
         id=Tan-Gralg
         name= _ "Tan-Gralg"
+        profile=portraits/orcs/transparent/grunt-3.png
         side=2
         canrecruit=yes
         {GOLD 160 220 280}

Modified: 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg?rev=43887&r1=43886&r2=43887&view=diff
==============================================================================
--- 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
 (original)
+++ 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
 Sun Jul  4 13:29:50 2010
@@ -139,6 +139,7 @@
         type=Orcish Warlord
         id="Ut'Tan-Vrork"
         name= _ "Ut'Tan-Vrork"
+        profile=portraits/orcs/transparent/grunt-2.png
         side=5
         canrecruit=yes
 #ifdef EASY

Modified: 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg?rev=43887&r1=43886&r2=43887&view=diff
==============================================================================
--- 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
 (original)
+++ 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
 Sun Jul  4 13:29:50 2010
@@ -34,8 +34,8 @@
         type=Orcish Warlord
         id="Ut'Tan-Grilg"
         name= _ "Ut'Tan-Grilg"
+        profile=portraits/orcs/transparent/grunt-3.png
         side=2
-        profile=portraits/orcs/transparent/warlord.png
         canrecruit=yes
 #ifdef EASY
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, 
Orcish Crossbowman, Goblin Pillager, Goblin Knight, Goblin Spearman
@@ -71,7 +71,7 @@
         id=Tan-Pulk
         name= _ "Tan-Pulk"
         side=3
-        profile=portraits/orcs/transparent/grunt-3.png
+        profile=portraits/orcs/transparent/grunt.png
         canrecruit=yes
 #ifdef EASY
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, 
Orcish Crossbowman, Goblin Pillager, Goblin Spearman

Modified: 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg?rev=43887&r1=43886&r2=43887&view=diff
==============================================================================
--- 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg 
(original)
+++ 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg 
Sun Jul  4 13:29:50 2010
@@ -75,6 +75,7 @@
         type=Orcish Warlord
         id=Tan-Gagar
         name= _ "Tan-Gagar"
+        profile=portraits/orcs/transparent/grunt-2.png
         side=3
         canrecruit=yes
 #ifdef EASY

Modified: 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg?rev=43887&r1=43886&r2=43887&view=diff
==============================================================================
--- 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
 (original)
+++ 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
 Sun Jul  4 13:29:50 2010
@@ -114,6 +114,7 @@
         type=Orcish Warlord
         id=Tan-Rinak
         name= _ "Tan-Rinak"
+        profile=portraits/orcs/transparent/grunt.png
         side=4
         canrecruit=yes
 #ifdef EASY

Modified: 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg?rev=43887&r1=43886&r2=43887&view=diff
==============================================================================
--- 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
 (original)
+++ 
branches/1.8/data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
 Sun Jul  4 13:29:50 2010
@@ -107,6 +107,7 @@
         type=Orcish Warlord
         id="Ut'Tan-Grorag"
         name= _ "Ut'Tan-Grorag"
+        profile=portraits/orcs/transparent/grunt.png
         side=4
         canrecruit=yes
 #ifdef EASY
@@ -144,6 +145,7 @@
         type=Orcish Warlord
         id=Tan-Erinak
         name= _ "Tan-Erinak"
+        profile=portraits/orcs/transparent/grunt-2.png
         side=5
         canrecruit=yes
 #ifdef EASY
@@ -182,6 +184,7 @@
         type=Orcish Warlord
         id=Tan-Prodash
         name= _ "Tan-Prodash"
+        profile=portraits/orcs/transparent/grunt-3.png
         side=6
         canrecruit=yes
 #ifdef EASY




Related Messages


Powered by MHonArc, Updated Sun Jul 04 14:20:06 2010