[[Improving the tutorial.]]

1. removed the quintain in the forest from scenario 1 - terrain
defense isn't part of the lesson, and it's possible to advance a
fighter and level 2 recalls aren't handled in scenario 2

2. fixed the problem with turn 2+ recruits in scenario 2

3. changed the map: moved the recalls to prevent quick recalled units
from dealing a death blow to torc in turn 2 (from the shallow water
hex), and used elf-castle, stone path etc terrains

4. added a check to the scripted moves to see if units are standing in
the path (prevents bug #6745)

5. fixed orc counter attack event/dialog
This commit is contained in:
Jan Rietema 2008-02-11 18:47:21 +00:00
parent 9225c7b79c
commit 031153fb60
4 changed files with 107 additions and 86 deletions

View file

@ -1,31 +1,31 @@
border_size=1
usage=map
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Ve , Ch , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ch , 1 Kh , Ch , Gs^Fp , Gg^Ve , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Ve , Gs^Fp , Ch , Ch , Ch , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Ve , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ww , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ss , Gs^Fp , Gg , Ss , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Ss , Gs^Fp , Gs^Fp , Gg^Ve , Gs^Fp , Ww , Ww^Bw| , Ww , Gg^Ve , Gs^Fp , Gs^Fp , Ww , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Ww ,Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww^Bw| , Wo , Ww , Ww , Ww , Gg , Ss , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Ww , Wo , Wo , Wo , Ww , Ww^Bw| , Ww , Wo , Wo , Ww , Ww , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Ww ,Ww , Ww , Ww , Wo , Wo , Ww , Wo , Gs^Fp , Ww^Bw| , Gg , Ww , Wo , Wo , Wo , Ww , Wo , Wo , Gg^Ve , Gs^Fp , Gs^Fp , Gs^Fp
Wo ,Wo , Wo , Wo , Wo , Wo , Wo , Gs^Fp , Ww , Gg , Gs^Fp , Gg^Ve , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Gs^Fp , Ww , Ww
Wo ,Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Ww^Bw| , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Wo , Wo
Wo ,Wo , Ww , Wo , Ww , Wo , Wo , Wo , Ww , Ww^Bw| , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Wo , Wo
Wo ,Wo , Gs^Fp , Gs^Fp , Gs^Fp , Ww , Gs^Fp , Ww , Ww , Ww^Bw| , Ww , Wo , Ww , Wo , Ww , Ww , Ww , Wo , Ww , Wo , Wo , Wo
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ww^Bw| , Gs^Fp , Ww , Gs^Fp , Ww , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Ww , Ww , Ww
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Ve , Gs^Fp , Gs^Fp , Gg , Gg , Gs^Fp , Gg , Gg , Gs^Fp , Gg^Ve , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gg , Gg , Gs^Fp , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gg , Gs^Fp , Gg , Gs^Fp , Ce , Gg^Ve , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gs^Fp , Gg , Gg , Gs^Fp , Gg , Gs^Fp , Gg , Gs^Fp , Ce , 2 Ke , Ce , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ce , Ce , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Ve , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp ,Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Ve , Cv , Gs^Fp , Kv , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Cv , 1 Kv , Cv , Cv , Gg^Ve , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Ve , Gs^Fp , Cv , Rp , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Rp , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Ve , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Rp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Rp , Rp , Ggf , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ww , Gs^Fp , Gg^Fet , Ggf , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ss , Gs^Fp , Rp , Ss , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Ss , Gs^Fp , Gs^Fp , Gg^Ve , Gs^Fp , Ww , Ww^Bw| , Ww , Gg^Ve , Gs^Fp , Gs^Fp , Ww , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww , Ww^Bw| , Wo , Ww , Ww , Ww , Gg , Ss , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ww , Wo , Wo , Wo , Ww , Ww^Bw| , Ww , Wo , Wo , Ww , Ww , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Ww , Ww , Ww , Ww , Wo , Wo , Ww , Wo , Gs^Fp , Ww^Bw| , Gg , Ww , Wo , Wo , Wo , Ww , Wo , Wo , Gg^Ve , Gs^Fp , Gs^Fp , Gs^Fp
Wo , Wo , Wo , Wo , Wo , Wo , Wo , Gs^Fp , Ww , Gg , Gs^Fp , Gg^Ve , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Gs^Fp , Ww , Ww
Wo , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Ww^Bw| , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Wo , Wo
Wo , Wo , Ww , Wo , Ww , Wo , Wo , Wo , Ww , Ww^Bw| , Ww , Ww , Wo , Wo , Wo , Wo , Wo , Wo , Ww , Ww , Wo , Wo
Wo , Wo , Gs^Fp , Gs^Fp , Gs^Fp , Ww , Gs^Fp , Ww , Ww , Ww^Bw| , Ww , Wo , Ww , Wo , Ww , Ww , Ww , Wo , Ww , Wo , Wo , Wo
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ww^Bw| , Gs^Fp , Ww , Gs^Fp , Ww , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Ww , Ww , Ww
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Ve , Gs^Fp , Gs^Fp , Rp , Rp , Gs^Fp , Gg , Gg , Gs^Fp , Gg^Ve , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gg , Rp , Gs^Fp , Rp , Rp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gg , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ggf , Rp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Rp , Rp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gg , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Rp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg , Gs^Fp , Gg , Gs^Fp , Gg , Gs^Fp , Ce , Gg^Ve , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Rp , Rp , Gs^Fp , Gg , Gg , Gs^Fp , Gg , Gs^Fp , Gg , Gs^Fp , Ce , 2 Ke , Ce , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Rp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ce , Ce , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Ve , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp
Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Rp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp

View file

@ -945,13 +945,6 @@ Once you select a unit, you see percentages for different places: higher means m
x,y=9,11
side=2
[/unit]
[unit]
description=Quintain
type=Quintain
ai_special="guardian"
x,y=4,10
side=2
[/unit]
{MOVE Delfador 14 8 2 1}
[scroll_to_unit]

View file

@ -388,7 +388,7 @@
[unit]
description=Galdrad
type=Elvish Captain
x,y=11,3
x,y=12,2
side=3
[/unit]
@ -528,7 +528,7 @@ One Elvish Shaman")}
{TEACHER (_ "During your tutorial, $recall_name1 gained $recall_xp1 experience points. You should recall that unit now, and recruit a second one (which is cheaper than recalling, anyway).")}
[/else]
[/if]
{LABEL (_"RECALL $recall_name1") 10,4}
{LABEL (_"RECALL $recall_name1") 11,3}
{PRINT (_"Right click on the tile south of you and recall $recall_name1")}
[/then]
[else]
@ -544,7 +544,7 @@ One Elvish Shaman")}
{TEACHER (_"If you had any experienced units alive from your last battle we would recall them, instead we must recruit a new Elvish Fighter.")}
[/else]
[/if]
{LABEL (_"Elvish Fighter") 10,4}
{LABEL (_"Elvish Fighter") 11,3}
{PRINT (_"Right click on the tile south of you and recruit an Elvish Fighter")}
[/else]
[/if]
@ -557,15 +557,23 @@ One Elvish Shaman")}
[filter]
side=1
[/filter]
# What did they recruit?
[store_unit]
variable=recruit
kill=yes
[filter]
x,y=$x1,$y1
[/filter]
[/store_unit]
[if]
[variable]
name=recruit_num
less_than=6
[/variable]
[then]
# What did they recruit?
[store_unit]
variable=recruit
kill=yes
[filter]
x,y=$x1,$y1
[/filter]
[/store_unit]
[/then]
[/if]
[if]
{NUMEQ recruit_num 5}
@ -695,7 +703,7 @@ One Elvish Shaman")}
[unstore_unit]
variable=recruit
[/unstore_unit]
{UNLABEL 11,4}
{UNLABEL 12,3}
# wmlindent: start ignoring
{LABEL (_"Archer #1") 9,4}
{LABEL (_"Archer #2") 9,3}
@ -732,7 +740,7 @@ One Elvish Shaman")}
[/unit]
{EXPLAIN_QUICK_RESILIENT (_"Golir")}
{UNLABEL 11,4}
{UNLABEL 12,3}
# wmlindent: start ignoring
{LABEL (_"Archer #1") 9,4}
{LABEL (_"Archer #2") 9,3}
@ -778,7 +786,7 @@ One Elvish Shaman")}
[/then]
[else]
{VARIABLE_OP recruit_num add 1}
{UNLABEL 10,4}
{UNLABEL 11,3}
[unstore_unit]
variable=recruit
[/unstore_unit]
@ -789,10 +797,10 @@ One Elvish Shaman")}
[/variable]
[then]
{PRINT (_"Right click on the tile south-east of you and recall $recall_name2")}
{LABEL (_"RECALL $recall_name2") 11,4}
{LABEL (_"RECALL $recall_name2") 12,3}
[/then]
[else]
{LABEL (_"Elvish Fighter") 11,4}
{LABEL (_"Elvish Fighter") 12,3}
{PRINT (_"Right click on the tile south-east of you and recruit an Elvish Fighter")}
[/else]
[/if]
@ -819,7 +827,7 @@ One Elvish Shaman")}
{TEACHER (_"$recruit.language_name|? I said RECRUIT a new ELVISH FIGHTER. Now try again...")}
[/then]
[else]
{UNLABEL 10,4}
{UNLABEL 11,3}
{VARIABLE_OP recruit_num add 1}
[unit]
description=Elindel
@ -835,7 +843,7 @@ One Elvish Shaman")}
[/modifications]
[/unit]
{EXPLAIN_STRONG_INTELLIGENT (_"Elindel")}
{LABEL (_"Elvish Fighter") 11,4}
{LABEL (_"Elvish Fighter") 12,3}
{PRINT (_"Right click on the tile south-east of you and recruit an Elvish Fighter")}
[/else]
[/if]
@ -976,7 +984,7 @@ One Elvish Shaman")}
[filter]
side=1
[/filter]
{UNLABEL 10,4}
{UNLABEL 11,3}
{VARIABLE_OP num_recruited add 1}
[if]
{NUMEQ num_recruited 2}
@ -1005,8 +1013,8 @@ One Elvish Shaman")}
[event]
name=turn 3
{UNLABEL 10,4}
{UNLABEL 11,4}
{UNLABEL 11,3}
{UNLABEL 12,3}
# Explain: Zone of Control
{TALK_ABOUT Dumbo (_"The Orc is blocking the bridge! We must occupy that island before the wolf riders reach it.")}
@ -1034,20 +1042,25 @@ To move your troops onto that island without wading slowly through the water, yo
name=attack_end
{CLEAR_PRINT}
# This happens before kill event, so we must do this the hard way.
[store_unit]
variable=dumbo
kill=no
[filter]
description=Dumbo
[/filter]
[/store_unit]
# This happens before kill event, so we must do this the hard way.
[if]
{NUMEQ dumbo.hitpoints 0}
[variable]
name=dumbo.hitpoints
less_than=1
[/variable]
[then]
{PRINT (_"Advance other units and capture villages, then End Turn")}
[/then]
[else]
# FIXME: use name of unit doing attack.
# FIXME: use name of unit doing attack - use $unit.type
# Do that after String-Freeze!!
{STUDENT (_"No other units can reach that Orc: I hope my archer survives its counter-attack! I'd better grab more villages, and move everyone closer for next turn.")}
{TEACHER (_"Yes. If your Shaman stands just behind that unit on the bridge, it will heal it at the beginning of next turn, too.")}
{PRINT (_"Move Shaman onto bridge to stand behind unit")}

View file

@ -38,32 +38,47 @@
#enddef
#define MOVE DESCRIPTION STARTX STARTY ENDX ENDY
[scroll_to]
x,y={STARTX},{STARTY}
[/scroll_to]
[store_unit]
[filter]
description={DESCRIPTION}
[/filter]
variable=MOVE_tmp
kill=yes
[/store_unit]
[redraw][/redraw]
[move_unit_fake]
type=$MOVE_tmp.type
side=$MOVE_tmp.side
x={STARTX},{ENDX}
y={STARTY},{ENDY}
[/move_unit_fake]
# Drain moves
{VARIABLE MOVE_tmp.moves 0}
{VARIABLE MOVE_tmp.x {ENDX}}
{VARIABLE MOVE_tmp.y {ENDY}}
[unstore_unit]
variable=MOVE_tmp
[/unstore_unit]
[redraw][/redraw]
{CLEAR_VARIABLE MOVE_tmp}
[if]
[not]
[have_unit]
side=1
x,y={STARTX},{STARTY}
[/have_unit]
[or]
[have_unit]
x,y={ENDX},{ENDY}
[/have_unit]
[/or]
[/not]
[then]
[scroll_to]
x,y={STARTX},{STARTY}
[/scroll_to]
[store_unit]
[filter]
description={DESCRIPTION}
[/filter]
variable=MOVE_tmp
kill=yes
[/store_unit]
[redraw][/redraw]
[move_unit_fake]
type=$MOVE_tmp.type
side=$MOVE_tmp.side
x={STARTX},{ENDX}
y={STARTY},{ENDY}
[/move_unit_fake]
# Drain moves
{VARIABLE MOVE_tmp.moves 0}
{VARIABLE MOVE_tmp.x {ENDX}}
{VARIABLE MOVE_tmp.y {ENDY}}
[unstore_unit]
variable=MOVE_tmp
[/unstore_unit]
[redraw][/redraw]
{CLEAR_VARIABLE MOVE_tmp}
[/then]
[/if]
#enddef
#define NUMEQ VAR VALUE