Tutorial - minor improvements (#4682)

* Change victory objectives - S1

* S2 - Minor improvements

* Add a macro and add [cancel_action] tag

* Fix dialogue

* Revert objectives
This commit is contained in:
Earth-Cake 2020-01-11 16:18:37 +01:00 committed by gfgtdf
parent e8cc784ac2
commit 1eca8258b1
2 changed files with 128 additions and 30 deletions

View file

@ -520,6 +520,64 @@ If either Shaman advances to become a Druid, then shell be able to heal adjac
{PRINT ( _ "Recruit or recall your troops")}
[/on_undo]
[/event]
[event]
name=moveto
first_time_only=no
[filter]
id=student
x=1-40
y=1-20
[not]
x=5,3,5
y=9,8,13
[/not]
[/filter]
[filter_condition]
[variable]
name=turn_number
numerical_equals=1
[/variable]
[/filter_condition]
[if]
[not]
[have_unit]
side=1
race=elf
count=5
[/have_unit]
[/not]
[then]
{CLEAR_PRINT}
{PRINT ( _ "You forgot to recruit troops! You can press <b>u</b> to undo your last move.")}
[allow_undo] [/allow_undo]
[on_undo]
{CLEAR_PRINT}
{PRINT ( _ "Recruit or recall your troops")}
[/on_undo]
[/then]
[else]
{CLEAR_PRINT}
{PRINT ( _ "You forgot to capture a village! You can press <b>u</b> to undo your last move.")}
[allow_undo] [/allow_undo]
[on_undo]
{CLEAR_PRINT}
{PRINT ( _ "Capture a village")}
[/on_undo]
[/else]
[/if]
[/event]
[event]
name=turn 2
@ -671,7 +729,7 @@ Please report the bug."
message= _ "You can see where an enemy can reach by moving the mouse over them. You can see all possible enemy moves at once with the <b>Show Enemy Moves</b> command from the <b>Actions</b> menu."
[/message]
{TALK_ABOUT Dumbo ( _ "We must occupy that island before the Wolf Riders reach it!")}
{TALK_ABOUT_LOC 15,11 ( _ "We must occupy that island before the Wolf Riders reach it!")}
# Explain Zone of Control
[message]
@ -710,15 +768,34 @@ Please report the bug."
id=Dumbo
[/filter_second]
[message]
speaker=student
message= _ "I hope my units survive the counter-attack if I cant take this grunt out this turn. Id better grab more villages if I can and move everyone closer for next turn."
[/message]
[if]
[variable]
name=unit.id
equals=student
[/variable]
[then]
[message]
speaker=student
message= _ "I hope I will survive the counter-attack if my units cant take this grunt out this turn. I should order them to grab more villages if they can and move everyone closer for next turn."
[/message]
[message]
speaker=Galdrad
message= _ "If one of your Shamans stands just behind your wounded units, she will heal them each 4 hitpoints at the beginning of the next turn."
[/message]
[message]
speaker=Galdrad
message= _ "If one of your Shamans stands just behind you, she will heal you 4 hitpoints at the beginning of the next turn."
[/message]
[/then]
[else]
[message]
speaker=student
message= _ "I hope my units will survive the counter-attack if I cant take this grunt out this turn. Id better grab more villages if I can and move everyone closer for next turn."
[/message]
[message]
speaker=Galdrad
message= _ "If one of your Shamans stands just behind your wounded units, she will heal them each 4 hitpoints at the beginning of the next turn."
[/message]
[/else]
[/if]
[event]
name=attack_end
@ -883,12 +960,28 @@ Please report the bug."
[fire_event]
name=check_income
[/fire_event]
{TALK_ABOUT_LOC 16,9 ( _ "Remember to retreat your wounded units to villages. Shamans can only heal 4 hitpoints per turn, while villages can heal them faster at 8 per turn.
# Just in case the player still hasn't captured 16,9.
[if]
[have_location]
x,y=16,9
owner_side=1
[/have_location]
[then]
{TALK_ABOUT_LOC 16,9 ( _ "Remember to retreat your wounded units to villages. Shamans can only heal 4 hitpoints per turn, while villages can heal them faster at 8 per turn.
Different sources of healing are generally not combined. If a unit starts its turn next to multiple healers, or on a village and next to a healer, it will still be healed only once.
Rest-healing is an exception to the rule — if a unit doesnt do anything for a turn, it will heal 2 hitpoints in addition to any healing it may receive from villages or healers, combining for a total of up to 10 hitpoints per turn.")}
[/then]
[else]
{TALK_ABOUT_LOCS 11,8 9,12 ( _ "Remember to retreat your wounded units to villages. Shamans can only heal 4 hitpoints per turn, while villages can heal them faster at 8 per turn.
Different sources of healing are generally not combined. If a unit starts its turn next to multiple healers, or on a village and next to a healer, it will still be healed only once.
Rest-healing is an exception to the rule — if a unit doesnt do anything for a turn, it will heal 2 hitpoints in addition to any healing it may receive from villages or healers, combining for a total of up to 10 hitpoints per turn.")}
[/else]
[/if]
[/event]
[event]
@ -1352,17 +1445,12 @@ Rest-healing is an exception to the rule — if a unit doesnt do anything for
message= _ "That... was foolish. Next time I should be more careful."
female_message= _ "female^That... was foolish. Next time I should be more careful."
[/message]
[/event]
[event]
name=die
[filter]
id=student
[/filter]
[endlevel]
result=defeat
[/endlevel]
{CLEAR_PRINT}
[/event]
[event]
@ -1373,23 +1461,12 @@ Rest-healing is an exception to the rule — if a unit doesnt do anything for
[message]
speaker=unit
message= _ "Agh! Now who will teach you how to defeat these orcs!"
message= _ "Agh! Who will guide you to victory now?"
[/message]
[/event]
[event]
name=die
[filter]
id=Galdrad
[/filter]
[endlevel]
result=defeat
[/endlevel]
[/event]
[event]
name=defeat
{CLEAR_PRINT}
[/event]

View file

@ -65,6 +65,8 @@
message= _"Dont forget, you can press <b>u</b> to undo most things if you make a mistake."
[/message]
[cancel_action] [/cancel_action]
{CLEAR_VARIABLE undo_option}
[/then]
[/if]
@ -100,6 +102,25 @@
[/message]
#enddef
#define TALK_ABOUT_LOCS POSITION1 POSITION2 MESSAGE_TEXT
[scroll_to]
x,y={POSITION1}
highlight=yes
[/scroll_to]
[scroll_to]
x,y={POSITION2}
highlight=yes
[/scroll_to]
[message]
speaker=Galdrad
scroll=no
highlight=no
message={MESSAGE_TEXT}
[/message]
#enddef
# Note: we would not like the user to "press any key" (for example, Esc)
#define CONTINUE_MSG
_"