0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly show narrator messages in the tutorial.

Browse source 
This breaks the string-freeze, so not ported to 1.10.

A better fix for bug #19316.
This commit is contained in:
Mark de Wever 2012-01-30 18:35:13 +00:00
parent 7cc38ccc25
commit 3b71fb3f64
2 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/campaigns/tutorial/scenarios/2_Speaking.cfg
View file

@ -16,9 +16,10 @@
[/message]
#enddef
#define NARRATOR MESSAGE_TEXT
#define NARRATOR CAPTION_TEXT MESSAGE_TEXT
[message]
speaker=narrator
caption={CAPTION_TEXT}
message={MESSAGE_TEXT}
image=wesnoth-icon.png
[/message]

28
data/campaigns/tutorial/scenarios/2_Tutorial.cfg
View file

@ -980,9 +980,7 @@ one Elvish Shaman")}
{TALK_ABOUT Dumbo (_"Orcish Grunts have no ranged attacks, so use your archers against them.")}
{PRINT (_"Attack the orc with an Archer")}
{NARRATOR ("<span color='#bcb088'><b>" + _"<big>Unit Summaries</big>" + "</b></span>" + "<span size='5120'>
</span>" + _"
To review the capabilities of any unit—including an enemy—hover the mouse over it, and you will see a unit summary on the right of the screen")}
{NARRATOR _"Unit Summaries" _"To review the capabilities of any unit—including an enemy—hover the mouse over it, and you will see a unit summary on the right of the screen"}
[event]
name=moveto
@ -1019,9 +1017,7 @@ To review the capabilities of any unit—including an enemy—hover the mouse ov
{UNLABEL 14,3}
{LABEL (_"Fighter to HERE") 19,5}
{TALK_ABOUT_LOC 19,5 (_"Your other units cannot reach the orc this turn. Send a Fighter to the village in the far east of the map. It will take two turns to reach it.")}
{NARRATOR ("<span color='#bcb088'><b>" + _"<big>Long-distance Movement</big>" + "</b></span>" + "<span size='5120'>
</span>" + _"
You can order a unit to move for multiple turns by selecting the unit and clicking on the destination. A number will indicate how many turns it will take to get there.")}
{NARRATOR _"Long-distance Movement" _"You can order a unit to move for multiple turns by selecting the unit and clicking on the destination. A number will indicate how many turns it will take to get there."}
{PRINT (_"Tell a Fighter to move to the far east village")}
[event]
@ -1226,9 +1222,7 @@ To move your troops onto that island without wading slowly through the water, yo
{DEFEND_ISLAND}
{TALK_ABOUT_LOC 11,14 (_"Careful! It is now nighttime. Orcs are <i>chaotic</i>, which means their attacks are now 25% stronger. By day, their attacks are 25% weaker, which is a noticeable difference. You are <i>lawful</i>: stronger by day and weaker at night. Your elvish warriors are <i>neutral</i>: unaffected by the time of day.")}
{NARRATOR ("<span color='#bcb088'><b>" + _"<big>Time of Day</big>" + "</b></span>" + "<span size='5120'>
</span>" + _"
After this dialog, hold the mouse over the landscape image below the minimap on the right. This brings up a description of the time of day, showing who has the advantage.")}
{NARRATOR _"Time of Day" _"After this dialog, hold the mouse over the landscape image below the minimap on the right. This brings up a description of the time of day, showing who has the advantage."}
[/event]
[event]
@ -1249,23 +1243,17 @@ After this dialog, hold the mouse over the landscape image below the minimap on
[event]
name=turn 9
{UNLABEL 19,14}
{NARRATOR ("<span color='#bcb088'><b>" + _"<big>Tracking Unused Units</big>" + "</b></span>" + "<span size='5120'>
</span>" + _"
You can ensure you use all your troops by pressing <b>n</b> to step from one unit to the next. If you press <b>space</b>, you can mark the currently selected unit as having finished its turn, which stops you moving it by accident later on. When <b>n</b> no longer selects a new unit, it’s safe to end your turn.")}
{NARRATOR _"Tracking Unused Units" _"You can ensure you use all your troops by pressing <b>n</b> to step from one unit to the next. If you press <b>space</b>, you can mark the currently selected unit as having finished its turn, which stops you moving it by accident later on. When <b>n</b> no longer selects a new unit, it’s safe to end your turn."}
[/event]
[event]
name=turn 10
{NARRATOR ("<span color='#bcb088'><b>" + _"<big>Victory Conditions</big>" + "</b></span>" + "<span size='5120'>
</span>" + _"
In this scenario, you only need to defeat the orc leader to win. (Victory conditions for a scenario are given under <b>Scenario Objectives</b> in the <b>Main Menu</b>).")}
{NARRATOR _"Victory Conditions" _"In this scenario, you only need to defeat the orc leader to win. (Victory conditions for a scenario are given under <b>Scenario Objectives</b> in the <b>Main Menu</b>)."}
[/event]
[event]
name=turn 12
{NARRATOR ("<span color='#bcb088'><b>" + _"<big>Recruit the Right Unit Types</big>" + "</b></span>" + "<span size='5120'>
</span>" + _"
Remember to recruit troops useful for the situation. Archers are particularly effective against Grunts, Wolf Riders and the orcish leader.")}
{NARRATOR _"Recruit the Right Unit Types" _"Remember to recruit troops useful for the situation. Archers are particularly effective against Grunts, Wolf Riders and the orcish leader.")}
[/event]
# Remind them to keep back
@ -1460,9 +1448,7 @@ Remember to recruit troops useful for the situation. Archers are particularly ef
[/variable]
[then]
{TEACHER (_"Losing a healer hurts all the troops! Keep them out of the enemy’s reach!")}
{NARRATOR ("<span color='#bcb088'><b>" + _"<big>Tracking Enemy Movement</big>" + "</b></span>" + "<span size='5120'>
</span>" + _"
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.")}
{NARRATOR _"Tracking Enemy Movement" _"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."}
[/then]
[else]
# Must be level 2 unit.