Merge pull request #906 from sigurdfdragon/Tutorial_Improvenments

Tutorial improvenments
wesnoth · Dec 29, 2016 · b352ed3 · b352ed3
2 parents 8ed3444 + e6f833c
commit b352ed3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 82 deletions.
diff --git a/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg b/data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
@@ -8,7 +8,6 @@
     id=tutorial
     name= _ "Wesnoth Tutorial — Part I"
     map_data="{campaigns/tutorial/maps/01_Tutorial_part_1.map}"
-    turns=12
     next_scenario=2_Tutorial
     victory_when_enemies_defeated=no
     experience_modifier=100
@@ -44,6 +43,7 @@
         controller=ai
         no_leader=yes
         hidden=yes
+        defeat_condition=never
 
         [ai]
             {AI_SIMPLE_ALWAYS_ASPECT caution 0}
@@ -865,6 +865,11 @@
             side=2
         [/unit]
 
+        [modify_side]
+            side=2
+            defeat_condition=no_units_left
+        [/modify_side]
+
         [sound]
             name=lightning.ogg
         [/sound]
@@ -898,86 +903,10 @@
             image=wesnoth-icon.png
             message= _ "These dummies only attack if you are a single tile away. With care, you should be able to kill them one at a time."
         [/message]
-
-        [event]
-            name=new turn
-            first_time_only=yes
-
-            [set_menu_item]
-                description= _ "End Scenario"
-                id=skip_item
-                [command]
-                    [endlevel]
-                        result=victory
-                        carryover_report=no
-                        carryover_add=yes
-                        carryover_percentage=0
-                    [/endlevel]
-                [/command]
-            [/set_menu_item]
-
-            [message]
-                speaker=narrator
-                image=wesnoth-icon.png
-                message= _ "Do you want to keep practicing? You can end this scenario at any time by using the <b>End Scenario</b> item in the context menu to move on to the next phase of your training."
-                [option]
-                    [show_if]
-                        [have_unit]
-                            id=student
-                            gender=male
-                        [/have_unit]
-                    [/show_if]
-                    label= _ "Yes, I’m still figuring it out."
-                [/option]
-                [option]
-                    [show_if]
-                        [have_unit]
-                            id=student
-                            gender=female
-                        [/have_unit]
-                    [/show_if]
-                    label= _ "female^Yes, I’m still figuring it out."
-                [/option]
-                [option]
-                    [show_if]
-                        [have_unit]
-                            id=student
-                            gender=male
-                        [/have_unit]
-                    [/show_if]
-                    label= _ "No, I think I’ve got it."
-                    [command]
-                        [endlevel]
-                            result=victory
-                            carryover_report=no
-                            carryover_add=yes
-                            carryover_percentage=0
-                        [/endlevel]
-                    [/command]
-                [/option]
-                [option]
-                    [show_if]
-                        [have_unit]
-                            id=student
-                            gender=female
-                        [/have_unit]
-                    [/show_if]
-                    label= _ "female^No, I think I’ve got it."
-                    [command]
-                        [endlevel]
-                            result=victory
-                            carryover_report=no
-                            carryover_add=yes
-                            carryover_percentage=0
-                        [/endlevel]
-                    [/command]
-                [/option]
-            [/message]
-        [/event]
     [/event]
 
     [event]
-        name=time over
+        name=enemies defeated
 
         [message]
             speaker=student
@@ -1003,10 +932,6 @@
             message= _ "After your victory notice, the map will be grayed out to indicate that the scenario is over; this is called <i>linger mode</i>. You will still be able to examine the final positions and state of your troops and any surviving enemies. When you’re finished, click the <b>End Scenario</b> button to go on to the next scenario in the campaign."
         [/message]
 
-        [clear_menu_item]
-            id=skip_item
-        [/clear_menu_item]
-
         {CLEAR_VARIABLE trying_to_be_a_wiseguy,description_num}
     [/event]
 

diff --git a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
@@ -643,6 +643,15 @@ A full list of abilities and weapons specials, along with traits, may be found i
         [/message]
     [/event]
 
+    [event]
+        name=turn 18
+
+        [message]
+            speaker=Galdrad
+            message= _ "Hurry up and defeat the orcs before they become entrenched!"
+        [/message]
+    [/event]
+
     [event]
         name=check_income
         [filter_condition]