mail[Wesnoth-commits] r37197 - /trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg


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

Header


Content

Posted by soliton . de on July 23, 2009 - 23:01:
Author: soliton
Date: Thu Jul 23 23:01:38 2009
New Revision: 37197

URL: http://svn.gna.org/viewcvs/wesnoth?rev=37197&view=rev
Log:
simplified and improved Grimnir's and Zurg's appearance

Modified:
    
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg?rev=37197&r1=37196&r2=37197&view=diff
==============================================================================
--- 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
 (original)
+++ 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
 Thu Jul 23 23:01:38 2009
@@ -1225,7 +1225,7 @@
         #Western side
         #battling over the castle
         #1 dwarvish fighter, 1 dwarvish thunderer, 1 dwarvish guardsman
-        
+
 #define DEFENDER SIDE TYPE X Y ROLE NAME_STRING
     [unit]
         side={SIDE}
@@ -1314,7 +1314,7 @@
 #endif
         {DEFENDER 3 (Troll Whelp) 42 32 (Troll Defender) ( _ "Troll 
Defender")}
         {DEFENDER 3 (Troll Shaman) 44 31 (Troll Defender) ( _ "Troll 
Defender")}
-        
+
 #undef DEFENDER
 
         # wmllint: recognize Dwarf Leader
@@ -1857,7 +1857,7 @@
                 {TRAIT_QUICK}
             [/modifications]
         [/unit]
-        
+
         [if]
             [variable]
                 name=elvish_ally
@@ -1867,7 +1867,7 @@
             [then]
                 {MODIFY_UNIT (role=Dwarf Defender) name _"Dwarf Skirmisher"}
             [/then]
-            
+
             [else]
                 {MODIFY_UNIT (role=Troll Defender) name _"Troll Skirmisher"}
             [/else]
@@ -2916,6 +2916,27 @@
     #also send in dwarf/troll messenger with victory congratulations
 
 #define ZURG_CONVERSATION
+    [terrain]
+        x=22,21,20,19,19,18,17
+        y=14,14,14,15,16,16,17
+        terrain=Uu
+    [/terrain]
+
+    {NAMED_NOTRAIT_UNIT 2 (Troll Shaman) 20 14 (Zurg) ( _ "Zurg")}
+
+    [remove_shroud]
+        x=19-23
+        y=12-16
+        side=1
+    [/remove_shroud]
+
+    [redraw]
+        side=1
+    [/redraw]
+
+    [delay]
+        time=200
+    [/delay]
 
     # wmllint: recognize Zurg
     # wmllint: recognize Cloaked Figure
@@ -3012,6 +3033,27 @@
 #enddef
 
 #define GRIMNIR_CONVERSATION
+    [terrain]
+        x=24,23,22,21,20,19,18
+        y=44,45,45,46,46,46,45
+        terrain=Uu
+    [/terrain]
+
+    [delay]
+        time=200
+    [/delay]
+
+    {NAMED_NOTRAIT_UNIT 5 (Dwarvish Pathfinder) 21 46 (Grimnir) ( _ 
"Grimnir")}
+
+    [remove_shroud]
+        x=20-26
+        y=43-46
+        side=1
+    [/remove_shroud]
+
+    [redraw]
+        side=1
+    [/redraw]
 
     # wmllint: recognize Grimnir
     [message]
@@ -3134,28 +3176,6 @@
             [/variable]
 
             [then]
-                [terrain]
-                    x=20,19,19,18,17
-                    y=14,15,16,16,17
-                    terrain=Uu
-                [/terrain]
-
-                {NAMED_NOTRAIT_UNIT 2 (Troll Shaman) 20 14 (Zurg) ( _ 
"Zurg")}
-
-                [remove_shroud]
-                    x=19-23
-                    y=12-16
-                    side=1
-                [/remove_shroud]
-
-                [redraw]
-                    side=1
-                [/redraw]
-
-                [delay]
-                    time=200
-                [/delay]
-
                 {ZURG_CONVERSATION}
             [/then]
         [/if]
@@ -3190,28 +3210,6 @@
             [/variable]
 
             [then]
-                [terrain]
-                    x=51,52,53,54,55
-                    y=12,12,13,12,13
-                    terrain=Uu
-                [/terrain]
-
-                {NAMED_NOTRAIT_UNIT 2 (Troll) 51 12 (Zurg) ( _ "Zurg")}
-
-                [remove_shroud]
-                    x=49-52
-                    y=10-13
-                    side=1
-                [/remove_shroud]
-
-                [redraw]
-                    side=1
-                [/redraw]
-
-                [delay]
-                    time=200
-                [/delay]
-
                 {ZURG_CONVERSATION}
             [/then]
         [/if]
@@ -3248,40 +3246,7 @@
             [/variable]
 
             [then]
-                [terrain]
-                    x=52,53,53,52,52
-                    y=41,41,40,39,38
-                    terrain=Uu
-                [/terrain]
-
-                {NAMED_NOTRAIT_UNIT 5 (Dwarvish Pathfinder) 52 41 (Grimnir) 
( _ "Grimnir")}
-
-                [remove_shroud]
-                    x=46-53
-                    y=42-40
-                    side=1
-                [/remove_shroud]
-
-                [redraw]
-                    side=1
-                [/redraw]
-
-                [delay]
-                    time=200
-                [/delay]
-
                 {GRIMNIR_CONVERSATION}
-
-                [kill]
-                    id=Grimnir
-                    animate=no
-                [/kill]
-
-                [terrain]
-                    x=21,20,19,18,17
-                    y=46,46,46,45,44
-                    terrain=Xu
-                [/terrain]
             [/then]
         [/if]
     [/event]
@@ -3315,40 +3280,7 @@
             [/variable]
 
             [then]
-                [terrain]
-                    x=21,20,19,18,17
-                    y=46,46,46,45,44
-                    terrain=Uu
-                [/terrain]
-
-                [delay]
-                    time=200
-                [/delay]
-
-                {NAMED_NOTRAIT_UNIT 5 (Dwarvish Pathfinder) 21 46 (Grimnir) 
( _ "Grimnir")}
-
-                [remove_shroud]
-                    x=20-26
-                    y=43-46
-                    side=1
-                [/remove_shroud]
-
-                [redraw]
-                    side=1
-                [/redraw]
-
                 {GRIMNIR_CONVERSATION}
-
-                [kill]
-                    id=Grimnir
-                    animate=no
-                [/kill]
-
-                [terrain]
-                    x=21,20,19,18,17
-                    y=46,46,46,45,44
-                    terrain=Xu
-                [/terrain]
             [/then]
         [/if]
     [/event]




Related Messages


Powered by MHonArc, Updated Fri Jul 24 01:21:19 2009