mail[Wesnoth-commits] r52605 - /trunk/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg


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

Header


Content

Posted by fabianmueller5 on January 15, 2012 - 07:24:
Author: fendrin
Date: Sun Jan 15 07:24:16 2012
New Revision: 52605

URL: http://svn.gna.org/viewcvs/wesnoth?rev=52605&view=rev
Log:
LoW 03:
Gave the controll over Galtrid to the player, even after Kalenz has arrived.
This fixes bug #19067.

Modified:
    
trunk/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg

Modified: 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg?rev=52605&r1=52604&r2=52605&view=diff
==============================================================================
--- 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
 (original)
+++ 
trunk/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
 Sun Jan 15 07:24:16 2012
@@ -19,25 +19,14 @@
     allow_new_game=no
 #endif
 
-#ifdef EASY
-    id=03_Kalian_under_Attack_EASY
-#endif
-#ifdef NORMAL
-    id=03_Kalian_under_Attack_NORMAL
-#endif
-#ifdef HARD
-    id=03_Kalian_under_Attack_HARD
-#endif
-
 #else
     [scenario]
+#endif
         next_scenario=04_The_Elvish_Treasury
         id=03_Kalian_under_Attack
-#endif
+
         experience_modifier=100
         name= _ "Ka’lian under Attack"
-
-        #        {LOW_PRESTART}
 
         #### Map setup ####
         {LOW_MAP  Kalian.map}
@@ -48,7 +37,6 @@
 
             [replace_map]
                 x=11-42
-                #    x=11-45
                 y=5-38
                 {LOW_MAP  Kalian.map}
             [/replace_map]
@@ -114,7 +102,36 @@
             save_id=Kalenz
             fog=yes
             share_view=yes
+            {GOLD 160 100 50}
+        [/side]
+        {STARTING_VILLAGES_ALL 2}
+
+#ifdef MULTIPLAYER
+        [event]
+            name=prestart
+            [capture_village]
+                side=6
+                x=26-999
+                y=1-999
+            [/capture_village]
+        [/event]
+#endif
+
+        [side]
+            fog=yes
+            side=2
+            share_view=yes
+            hidden=no
+            allow_player=yes
+            no_leader=yes
+            controller=human
+            persistent=yes
+            save_id=Galtrid
+            team_name=player
+            user_team_name= _ "Player"
+            recruit=Elvish Fighter, Elvish Archer
             {GOLD 300 200 100}
+
             [unit]
                 {GALTRID}
                 extra_recruit=Elvish Fighter, Elvish Archer
@@ -138,38 +155,6 @@
             [/unit]
             # wmllint: recognize Eradion
             # wmllint: recognize Galtrid
-        [/side]
-        {STARTING_VILLAGES_ALL 1}
-
-#ifdef MULTIPLAYER
-        [event]
-            name=prestart
-            [capture_village]
-                side=6
-                x=26-999
-                y=1-999
-            [/capture_village]
-        [/event]
-#endif
-
-        [side]
-            side=2
-            share_view=yes
-            hidden=yes
-            allow_player=no
-            no_leader=yes
-            controller=ai
-            persistent=yes
-            save_id=Galtrid
-            team_name=player
-            user_team_name= _ "Player"
-            recruit=Elvish Fighter, Elvish Archer
-            gold=0
-            {ai/aliases/stable_singleplayer.cfg}  #note that this MUST be 
given OUTSIDE the 'ai' tag
-            [ai]
-                {AI_NO_SCOUTS}
-                {AI_SIMPLE_ALWAYS_ASPECT recruitment_pattern 
"healer,archer,fighter,archer,fighter,archer,healer,scout"}
-            [/ai]
         [/side]
 
         #### Side3 code ####
@@ -683,59 +668,6 @@
 
         #### /Orc AI ####
 
-        #### Player's code ####
-        [event]
-            name=prestart
-
-            [store_unit]
-                variable=elves
-                kill=yes
-                [filter]
-                    side=1,6
-                    x,y=recall,recall
-                [/filter]
-            [/store_unit]
-
-            [store_gold]
-                side=1
-                variable=kalenz_gold
-            [/store_gold]
-#ifdef MULTIPLAYER
-            [store_gold]
-                side=6
-                variable=landar_gold
-            [/store_gold]
-#endif
-
-            [modify_side]
-                side=1
-#ifdef EASY
-                gold=160
-#endif
-#ifdef NORMAL
-                gold=100
-#endif
-#ifdef HARD
-                gold=50
-#endif
-            [/modify_side]
-
-#ifdef MULTIPLAYER
-            [modify_side]
-                side=6
-#ifdef EASY
-                gold=160
-#endif
-#ifdef NORMAL
-                gold=100
-#endif
-#ifdef HARD
-                gold=50
-#endif
-            [/modify_side]
-#endif
-        [/event]
-        #### /Player's code ####
 
         #### Kalenz arrives ####
 
@@ -776,35 +708,6 @@
 #endif
             [/modify_turns]
 
-            {MODIFY_UNIT (side=1,6
-            x=1-99
-            y=1-99) side 2}
-
-            [store_villages]
-                variable=villages
-                owner_side=1
-            [/store_villages]
-
-            {FOREACH villages village}
-                [capture_village]
-                    side=2
-                    x=$villages[$village].x
-                    y=$villages[$village].y
-                [/capture_village]
-            {NEXT village}
-
-            {CLEAR_VARIABLE villages}
-
-            {FOREACH elves elf}
-                [unstore_unit]
-                    variable=elves[$elf]
-                    x=recall
-                    y=recall
-                [/unstore_unit]
-            {NEXT elf}
-
-            {CLEAR_VARIABLE kalenz}
-
             [unit]
                 {KALENZ}
                 side=1
@@ -825,35 +728,26 @@
 
             {RECALL_LOYALS}
 
-            [store_gold]
-                variable=galdrid_gold
-                side=1
-            [/store_gold]
-
             [modify_side]
                 side=1
-                gold=$kalenz_gold
                 fog=no
             [/modify_side]
 
             [modify_side]
                 side=2
-                gold=$galdrid_gold
                 fog=no
-                hidden=no
             [/modify_side]
 
 #ifdef MULTIPLAYER
             [modify_side]
                 side=6
-                gold=$landar_gold
                 fog=no
             [/modify_side]
-            {CLEAR_VARIABLE landar_gold}
-#endif
-
-            {CLEAR_VARIABLE kalenz_gold}
-            {CLEAR_VARIABLE galdrid_gold}
+#endif
+        [/event]
+
+        [event]
+            name=time over
 
             [objectives]
                 side=0
@@ -887,6 +781,13 @@
                 {TURNS_RUN_OUT}
             [/objectives]
 
+            [redraw]
+            [/redraw]
+
+            [scroll_to_unit]
+                id=Kalenz
+            [/scroll_to_unit]
+
             [message]
                 speaker=narrator
                 image=wesnoth-icon.png
@@ -912,8 +813,6 @@
                 id=Landar
                 message= _ "How dare they break the treaty!"
             [/message]
-
-            {AI_CONTROLLER_ALLOW_LEADER_CONTROL 1 2}
 
             [fire_event]
                 name=orcs_select_strategy
@@ -1061,33 +960,33 @@
             [/scroll_to]
 
             #Soldiers
-            {UNIT 1 "Elvish Archer"  22 17 (facing=ne
-            animate=yes)}
-            {UNIT 1 "Elvish Archer"  24 19 (facing=ne
-            animate=yes)}
-            {UNIT 1 "Elvish Fighter" 25 21 (facing=ne
-            animate=yes)}
-            {UNIT 1 "Elvish Archer"  25 23 (facing=se
-            animate=yes)}
-
-            {UNIT 1 "Elvish Fighter" 22 24 (facing=sw
-            animate=yes)}
-            {UNIT 1 "Elvish Archer"  23 25 (facing=se
+            {UNIT 2 "Elvish Archer"  22 17 (facing=ne
+            animate=yes)}
+            {UNIT 2 "Elvish Archer"  24 19 (facing=ne
+            animate=yes)}
+            {UNIT 2 "Elvish Fighter" 25 21 (facing=ne
+            animate=yes)}
+            {UNIT 2 "Elvish Archer"  25 23 (facing=se
+            animate=yes)}
+
+            {UNIT 2 "Elvish Fighter" 22 24 (facing=sw
+            animate=yes)}
+            {UNIT 2 "Elvish Archer"  23 25 (facing=se
             animate=yes)}
 
 #ifndef MULTIPLAYER
-            {UNIT 1 "Elvish Archer"  20 17 (facing=nw
-            animate=yes)}
-            {UNIT 1 "Elvish Archer"  18 19 (facing=nw
-            animate=yes)}
-            {UNIT 1 "Elvish Fighter" 17 21 (facing=nw
-            animate=yes)}
-            {UNIT 1 "Elvish Archer"  17 23 (facing=sw
-            animate=yes)}
-
-            {UNIT 1 "Elvish Fighter" 20 24 (facing=se
-            animate=yes)}
-            {UNIT 1 "Elvish Archer"  19 25 (facing=sw
+            {UNIT 2 "Elvish Archer"  20 17 (facing=nw
+            animate=yes)}
+            {UNIT 2 "Elvish Archer"  18 19 (facing=nw
+            animate=yes)}
+            {UNIT 2 "Elvish Fighter" 17 21 (facing=nw
+            animate=yes)}
+            {UNIT 2 "Elvish Archer"  17 23 (facing=sw
+            animate=yes)}
+
+            {UNIT 2 "Elvish Fighter" 20 24 (facing=se
+            animate=yes)}
+            {UNIT 2 "Elvish Archer"  19 25 (facing=sw
             animate=yes)}
 #else
             {UNIT 6 "Elvish Archer"  20 17 (facing=nw




Related Messages


Powered by MHonArc, Updated Sun Jan 15 08:00:07 2012