Tutorial S02: Show "recruit the right units" when the player has gold

It's confusing when it pops up on turn 12, regardless of the game state. My
leader is normally on the other side of the river from my keep, and I always
wonder "what about my play triggered that?"

Move the message to be part of the "I now have enough gold to recruit more
units" hint.

(cherry picked from commit 80a2ace28c)
This commit is contained in:
Steve Cotton 2019-10-06 10:20:07 +02:00
parent ed611f9438
commit c5df7c4558

View file

@ -188,7 +188,7 @@
caption= _ "Welcome to Wesnoth!"
image=wesnoth-icon.png
message= _ "Welcome back! This is second part of the two-part tutorial. Part 2 will teach you about recalling units, abilities and weapon specials, income and upkeep, long-distance movement, zone of control, and time of day." +
{CONTINUE_MSG}
{CONTINUE_MSG}
[/message]
[message]
@ -554,7 +554,7 @@ A full list of abilities and weapons specials, along with traits, may be found i
caption= _ "The tutorial isnt meant to be this difficult"
image=wesnoth-icon.png
message= _ "The orc on the island was supposed to move over the bridge, so that he could be attacked by several elves at once. Somethings broken the scripted event, which will make the scenario harder by leaving him in a defensive position.
Please report the bug."
[/message]
[/then]
@ -817,17 +817,6 @@ Please report the bug."
[/message]
[/event]
[event]
name=turn 12
[message]
speaker=narrator
caption= _ "Recruit the Right Units"
image=wesnoth-icon.png
message= _ "Remember to recruit troops useful for the situation. Archers are particularly effective against Grunts, Wolf Riders and the orcish leader."
[/message]
[/event]
[event]
name=turn 18
@ -869,6 +858,13 @@ Please report the bug."
speaker=Galdrad
message= _ "Good idea!"
[/message]
[message]
speaker=narrator
caption= _ "Recruit the Right Units"
image=wesnoth-icon.png
message= _ "Remember to recruit troops useful for the situation. Archers are particularly effective against Grunts, Wolf Riders and the orcish leader."
[/message]
[/then]
[/if]