Merge pull request #3963 from nemaara/tutorial

[Tutorial] Small fixes

changelog.md

@@ -125,6 +125,11 @@
      * S17c: Modified Burin's description of trolls
    * The South Guard:
      * Fixed various typos
+   * Tutorial:
+     * Remove swamp from map for part 2
+     * Warn player about water when stepping on any shallow water hex
+     * Change quintain to level 0
+     * Allow Konrad and Li'sar to level up and add corresponding dialogue for part 2
  ### Multiplayer server
    * Forum user handler ban durations are now reported back to banned players.
 

data/campaigns/tutorial/maps/02_Tutorial_part_2.map

@@ -7,9 +7,9 @@ Gs^Fms, Gll^Fp, Gs^Fms, Gll^Fp, Gs^Fms, Gs^Fms, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds,
 Gs^Fms, Gs^Fms, Gs^Fms, Gs^Fms, Gll^Fp, Gll^Fp, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Rp, Gg^Es, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp, Gll^Fp
 Gs^Fds, Gs^Fms, Gll^Fp, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp, Gs^Fds, Gs^Fds, Gs^Fds, Rp, Rp, Gg^Efm, Gs^Fds, Gll^Fp, Gll^Fp, Gs^Fms, Gll^Fp, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp
 Gs^Fds, Gs^Fds, Gll^Fp, Gll^Fp, Gs^Fds, Gs^Fms, Gs^Fds, Gs^Fds, Gs^Fds, Rp, Gs^Fds, Gg^Fet, Gg^Efm, Gs^Fds, Gll^Fp, Gs^Fds, Gs^Fds, Gs^Fms, Gs^Fms, Gs^Fms, Gs^Fms, Gll^Fp
-Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Ss, Gs^Fds, Rp, Ss, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gll^Fp, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp
-Gs^Fds, Gs^Fds, Gs^Fds, Ss, Gs^Fds, Gs^Fds, Gg^Ve, Gs^Fds, Ww, Ww^Bw|, Ww, Gg^Ve, Gs^Fds, Gs^Fds, Ww, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp
-Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww^Bw|, Wo, Ww, Ww, Ww, Gg, Ss, Gs^Fds, Gs^Fds, Gs^Fds, Gll^Fp, Gs^Fds, Gs^Fds
+Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gll^Fp, Gs^Fds, Rp, Ww, Gs^Fds, Gg, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gll^Fp, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp
+Ww, Gs^Fds, Gs^Fds, Ww, Ww, Gs^Fds, Gg^Ve, Gs^Fds, Ww, Ww^Bw|, Ww, Gg^Ve, Gs^Fds, Gs^Fds, Ww, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fms, Gll^Fp, Gll^Fp, Gll^Fp
+Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Ww^Bw|, Wo, Ww, Ww, Ww, Gg, Ww, Gs^Fds, Gs^Fds, Gs^Fds, Gll^Fp, Gs^Fds, Gs^Fds
 Ds, Ds, Ds, Ds, Ww, Wo, Wo, Wo, Ww, Ww^Bw|, Ww, Wo, Wo, Ww, Ww, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds, Gs^Fds
 Ww, Ww, Ww, Ww, Wo, Wo, Ww, Wo, Gs^Fds, Re, Gg^Efm, Ww, Wo, Wo, Wo, Ww, Wo, Wo, Gg^Ve, Gs^Fds, Gs^Fds, Gs^Fds
 Wo, Wo, Wo, Wo, Wo, Wo, Wo, Gs^Fds, Ww, Re, Gs^Fds, Gg^Ve, Wo, Wo, Wo, Wo, Wo, Ww, Wwf, Gs^Fds, Ww, Ww

data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg

@@ -634,8 +634,7 @@ A full list of abilities and weapons specials, along with traits, may be found i
     [event]
         name=moveto
         [filter]
-            x=8,8,8,8,10,11,17,19,20
-            y=10,11,12,14,15,15,14,16,14
+            terrain=Ww
             side=1
         [/filter]
 
@@ -1099,6 +1098,20 @@ A full list of abilities and weapons specials, along with traits, may be found i
         [/message]
     [/event]
 
+    # If you advance Konrad or Li'sar
+    [event]
+        name=post_advance
+        [filter]
+            id=student
+        [/filter]
+
+        [message]
+            speaker=unit
+            message= _ "Advancing a level has fully healed me! I have become better at using the sword, dealing 9 damage in 4 attacks. Although I do not have any special abilities, my fighting skills will allow me to beat the orcs by dealing more damage!"
+            female_message= _ "female^Advancing a level has fully healed me! I have become better at using the sword, dealing 9 damage in 4 attacks. Although I do not have any special abilities, my fighting skills will allow me to beat the orcs by dealing more damage!"
+        [/message]
+    [/event]
+
     [event]
         name=time over
 

data/campaigns/tutorial/units/Fighter.cfg

@@ -9,9 +9,8 @@
     hitpoints=32
     movement_type=smallfoot
     movement=6
-    experience=28
-    advances_to=null
-    {AMLA_DEFAULT}
+    experience=33
+    advances_to=Warrior
     level=1
     alignment=lawful
     cost=18

data/campaigns/tutorial/units/Fighteress.cfg

@@ -11,9 +11,8 @@
     hitpoints=32
     movement_type=smallfoot
     movement=6
-    experience=28
-    advances_to=null
-    {AMLA_DEFAULT}
+    experience=33
+    advances_to=Warrioress
     level=1
     alignment=lawful
     cost=18

data/campaigns/tutorial/units/Quintain.cfg

@@ -8,7 +8,7 @@
     hitpoints=58
     advances_to=null
     {AMLA_DEFAULT}
-    level=1
+    level=0
     cost=10
     usage=fighter
     movement_type=treefolk

data/campaigns/tutorial/units/Warrior.cfg

@@ -0,0 +1,49 @@
+#textdomain wesnoth-tutorial
+[unit_type]
+    id=Warrior
+    name= _ "Warrior"
+    race=human
+    num_traits=0
+    image="units/konrad-fighter.png"
+    profile=portraits/konrad.png
+    hitpoints=50
+    movement_type=smallfoot
+    movement=6
+    experience=100
+    advances_to=null
+    {AMLA_DEFAULT}
+    level=2
+    alignment=lawful
+    cost=32
+    usage=mixed fighter
+    description= _ "With more experience, Fighters have honed their skills with the sword and become powerful Warriors."
+    die_sound={SOUND_LIST:HUMAN_DIE}
+    {DEFENSE_ANIM "units/konrad-fighter-defend.png" "units/konrad-fighter.png" {SOUND_LIST:HUMAN_HIT} }
+    [attack]
+        name=sword
+        #textdomain wesnoth-units
+        description= _"sword"
+        #textdomain wesnoth-tutorial
+        icon=attacks/sword-human.png
+        type=blade
+        range=melee
+        damage=9
+        number=4
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            name=sword
+        [/filter_attack]
+        start_time=-125
+        [frame]
+            image="units/konrad-fighter.png:50"
+        [/frame]
+        {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -75}
+        [frame]
+            image="units/konrad-fighter-attack-[1~2].png:[150,100]"
+        [/frame]
+        [frame]
+            image="units/konrad-fighter.png:50"
+        [/frame]
+    [/attack_anim]
+[/unit_type]

data/campaigns/tutorial/units/Warrioress.cfg

@@ -0,0 +1,51 @@
+#textdomain wesnoth-tutorial
+[unit_type]
+    id=Warrioress
+    name= _ "female^Warrior"
+    gender=female
+    race=human
+    num_traits=0
+    image="units/human-princess.png"
+    {DEFENSE_ANIM "units/human-princess-defend-2.png" "units/human-princess-defend-1.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
+    profile=portraits/lisar.png
+    hitpoints=50
+    movement_type=smallfoot
+    movement=6
+    experience=100
+    advances_to=null
+    {AMLA_DEFAULT}
+    level=2
+    alignment=lawful
+    cost=32
+    usage=mixed fighter
+    description= _ "With more experience, Fighters have honed their skills with the sword and become powerful Warriors."
+    die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
+    [attack]
+        name=sword
+        #textdomain wesnoth-units
+        description= _"sword"
+        #textdomain wesnoth-tutorial
+        icon=attacks/saber-human.png
+        type=blade
+        range=melee
+        damage=9
+        number=4
+    [/attack]
+    [attack_anim]
+        [filter_attack]
+            range=melee
+        [/filter_attack]
+
+        start_time=-360
+        offset=0.0:120,0.0~0.6:170,0.6:70,0.6~0.0:300
+
+        [frame]
+            image="units/human-princess-attack-[1~6].png:[95,95,95,75,75,125]"
+        [/frame]
+        [frame]
+            image="units/human-princess.png:100"
+        [/frame]
+
+        {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -75}
+    [/attack_anim]
+[/unit_type]