mail[Wesnoth-commits] r20071 - in /trunk/data/campaigns/Descent_Into_Darkness: scenarios/ units/ utils/


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

Header


Content

Posted by lari . nieminen on September 03, 2007 - 16:30:
Author: zookeeper
Date: Mon Sep  3 16:30:17 2007
New Revision: 20071

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20071&view=rev
Log:
Hacked around the problem with the Ghast by changing the unit event into a 
normal scenario event included into every scenario.

Added:
    trunk/data/campaigns/Descent_Into_Darkness/utils/
    trunk/data/campaigns/Descent_Into_Darkness/utils/global-events.cfg
Modified:
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Halal.cfg
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Halal.cfg
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg
    trunk/data/campaigns/Descent_Into_Darkness/units/ghast.cfg

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Halal.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Halal.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Halal.cfg 
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Halal.cfg 
Mon Sep  3 16:30:17 2007
@@ -240,4 +240,6 @@
         {DIALOGUE_SH_ENEMIES_DEFEATED}
         {VICTORY}
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg 
(original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg 
Mon Sep  3 16:30:17 2007
@@ -242,4 +242,6 @@
         #{CLEAR_VARIABLE villages_owned}
         {CLEAR_VARIABLE villages}
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
 (original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
 Mon Sep  3 16:30:17 2007
@@ -244,4 +244,6 @@
         {CLEAR_VARIABLE free_ghost_turn}
         {CLEAR_VARIABLE ghost_was_freed}
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
 (original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
 Mon Sep  3 16:30:17 2007
@@ -195,4 +195,6 @@
             result=victory
         [/endlevel]
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg 
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg Mon 
Sep  3 16:30:17 2007
@@ -256,4 +256,6 @@
             kill=yes
         [/store_unit]
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Halal.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Halal.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Halal.cfg 
(original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Halal.cfg 
Mon Sep  3 16:30:17 2007
@@ -241,4 +241,6 @@
             {DIALOGUE_RTH_GUARDDEATH}
         [/event]
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg 
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg 
Mon Sep  3 16:30:17 2007
@@ -306,4 +306,6 @@
             kill=yes
         [/store_unit]
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg 
(original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg 
Mon Sep  3 16:30:17 2007
@@ -263,4 +263,6 @@
             kill=yes
         [/store_unit]
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg 
(original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg 
Mon Sep  3 16:30:17 2007
@@ -335,4 +335,6 @@
             [/then]
         [/if]
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg 
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg 
Mon Sep  3 16:30:17 2007
@@ -381,4 +381,6 @@
         {CLEAR_VARIABLE bookY}
         {MODIFY_UNIT (role=book_carrier) overlays none}
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
 (original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
 Mon Sep  3 16:30:17 2007
@@ -474,4 +474,6 @@
         name=victory
         {VARIABLE timesForever 0}
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg
 (original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Forever_and_Ever_Amen.cfg
 Mon Sep  3 16:30:17 2007
@@ -277,4 +277,6 @@
         {VARIABLE_OP timesForever add 1}
         {CLEAR_VARIABLE randomHero}
     [/event]
+    
+    {@campaigns/Descent_Into_Darkness/utils/global-events.cfg}
 [/scenario]

Modified: trunk/data/campaigns/Descent_Into_Darkness/units/ghast.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/units/ghast.cfg?rev=20071&r1=20070&r2=20071&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/units/ghast.cfg (original)
+++ trunk/data/campaigns/Descent_Into_Darkness/units/ghast.cfg Mon Sep  3 
16:30:17 2007
@@ -111,38 +111,4 @@
             [/frame]
         [/animation]
     [/attack]
-    [event]
-        name=die
-        first_time_only=no
-        [filter]
-            [not]
-                race=undead
-            [/not]
-            [not]
-                race=mechanical
-            [/not]
-        [/filter]
-        [filter_second]
-            type=Ghast
-        [/filter_second]
-        # Unstore to show the hitpoint bonus text
-        [unstore_unit]
-            variable=second_unit
-            red,green,blue=0,0,255
-            text= _ "+1 max HP"
-            find_vacant=no
-        [/unstore_unit]
-        [object]
-            silent=yes
-            duration=forever
-            [filter]
-                x,y=$x2,$y2
-            [/filter]
-            [effect]
-                unit_type=Ghast
-                apply_to=hitpoints
-                increase_total=1
-            [/effect]
-        [/object]
-    [/event]
 [/unit]

Added: trunk/data/campaigns/Descent_Into_Darkness/utils/global-events.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/utils/global-events.cfg?rev=20071&view=auto
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/utils/global-events.cfg (added)
+++ trunk/data/campaigns/Descent_Into_Darkness/utils/global-events.cfg Mon 
Sep  3 16:30:17 2007
@@ -1,0 +1,36 @@
+# The growth ability of Ghast
+
+[event]
+    name=die
+    first_time_only=no
+    [filter]
+        [not]
+            race=undead
+        [/not]
+        [not]
+            race=mechanical
+        [/not]
+    [/filter]
+    [filter_second]
+        type=Ghast
+    [/filter_second]
+    # Unstore to show the hitpoint bonus text
+    [unstore_unit]
+        variable=second_unit
+        red,green,blue=0,0,255
+        text= _ "+1 max HP"
+        find_vacant=no
+    [/unstore_unit]
+    [object]
+        silent=yes
+        duration=forever
+        [filter]
+            x,y=$x2,$y2
+        [/filter]
+        [effect]
+            unit_type=Ghast
+            apply_to=hitpoints
+            increase_total=1
+        [/effect]
+    [/object]
+[/event]




Related Messages


Powered by MHonArc, Updated Mon Sep 03 19:40:14 2007