wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/data/scenarios/tutorial tutorial1.cfg t...


From: James Spencer
Subject: [Wesnoth-cvs-commits] wesnoth/data/scenarios/tutorial tutorial1.cfg t...
Date: Fri, 27 Aug 2004 11:39:34 -0400

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  04/08/27 15:34:51

Modified files:
        data/scenarios/tutorial: tutorial1.cfg tutorial2.cfg utils.cfg 

Log message:
        Update by way of Dacyn

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/tutorial/tutorial1.cfg.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/tutorial/tutorial2.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/tutorial/utils.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/tutorial/tutorial1.cfg
diff -u wesnoth/data/scenarios/tutorial/tutorial1.cfg:1.2 
wesnoth/data/scenarios/tutorial/tutorial1.cfg:1.3
--- wesnoth/data/scenarios/tutorial/tutorial1.cfg:1.2   Sat Aug 14 14:09:38 2004
+++ wesnoth/data/scenarios/tutorial/tutorial1.cfg       Fri Aug 27 15:34:51 2004
@@ -9,8 +9,8 @@
 fffhhhhcccccffftfgfffff
 gffhhhhccffcccccfgffftf
 gffhhcccffffffccc|ccfcc
-gcccccfffffffCCC2gtcccf
-ccggfgfffffftC1CCgfffff
+gcccccfffffffCCCCgtcccf
+ccggfgfffffftC21Cgfffff
 cfffgfggfffffffCCgfffff
 ffffffffggggffftggfffff
 ffffhhffffffgggggffffff
@@ -34,18 +34,16 @@
        type=Fighter
        description=Konrad
        side=1
-       gold=14
        canrecruit=1
        recruit=Elvish Fighter
        controller=human
-       team_name=goodguys
        [/side]
        [side]
        type=Elder Mage
        description=Delfador
        canrecruit=1
        side=2
-       team_name=goodguys
+       team_name=1
                [ai]
                passive_leader=yes
                [/ai]
@@ -56,6 +54,10 @@
                [ai]
                passive_leader=yes
                aggression=1
+                       [target]
+                       type=Elvish Fighter
+                       value=1
+                       [/target]
                [/ai]
        [/side]
        [event]
@@ -68,28 +70,20 @@
                description=Delfador
                message= _ "Before entering any battle, you need to recruit 
units. To recruit a unit, right click on the castle tile on which you wish to 
recruit the unit. Then select Recruit, and select 'Ok'. You can only recruit 
units on castle tiles connected to the keep your leader is on."
                [/message]
+               {SET_OBJECTIVE (Recruit a unit)}
        [/event]
-objectives= _ "@Skills covered:
-Recruiting units
-Moving units
-Attacking enemy units
-Gaining experience
-Winning scenarios
address@hidden:
address@hidden:
-Defeat Merle"
        [event]
        name=recruit
                [message]
                description=Delfador
                message= _ "Excellent! You have recruited an Elvish Fighter."
                [/message]
-               {QUESTION_OPTIONS_START ("What do I do next?")}
+               {QUESTION_OPTIONS_START (What do I do next?)}
 #define RECRUIT_QUESTIONS
-{QUESTION_OPTION ("How do I recruit units?") ("To recruit a unit, right click 
on the castle tile on which you wish to recruit the unit. Then select Recruit, 
or just hold your cursor over the tile and press 'Ctrl-R'. Next, select the 
type of unit that you want to recruit, and select 'Ok'. In order to recruit 
faster, you can use 'Ctrl-Shift-R' to re-recruit the last type of unit you 
recruited.")}
-{QUESTION_OPTION ("What's a leader?") ("A leader is a unit that can recruit. 
This means that when the leader is on a keep, he can recruit units on the 
surrounding castle tiles. Leaders are usually powerful units that each side 
only controls one of. Also, your leader is usually the first unit that your 
side controls, and starts on a keep. You can select your leader quickly by 
pressing 'l'. If your leader dies, you lose the game. You can win most 
scenarios by defeating all enemy leaders.")}
-{QUESTION_OPTION ("How should I choose what kind of units to recruit?") ("You 
have to carefully review their skills, which are displayed to the left of the 
unit selection box,  and cost, which is displayed after the name of the unit. 
You will learn more about these statistics throughout the tutorial.")}
-{QUESTION_OPTION ("What happens when I recruit a unit?") ("When you recruit a 
unit, it appears at full health on a castle tile of your choice. It also 
receives two traits, which will be discussed later. It cannot move or attack 
until you end your turn.")}
+{QUESTION_OPTION (How do I recruit units?) (To recruit a unit, right click on 
the castle tile on which you wish to recruit the unit. Then select Recruit, or 
just hold your cursor over the tile and press 'Ctrl-R'. Next, select the type 
of unit that you want to recruit, and select 'Ok'. In order to recruit faster, 
you can use 'Ctrl-Shift-R' to re-recruit the last type of unit you recruited.)}
+{QUESTION_OPTION (What's a leader?) (A leader is a unit that can recruit. This 
means that when the leader is on a keep, he can recruit units on the 
surrounding castle tiles. Leaders are usually powerful units that each side 
only controls one of. Also, your leader is usually the first unit that your 
side controls, and starts on a keep. You can select your leader quickly by 
pressing 'l'. If your leader dies, you lose the game. You can win most 
scenarios by defeating all enemy leaders.)}
+{QUESTION_OPTION (How should I choose what kind of units to recruit?) (You 
have to carefully review their skills, which are displayed to the left of the 
unit selection box,  and cost, which is displayed after the name of the unit. 
You will learn more about these statistics throughout the tutorial.)}
+{QUESTION_OPTION (What happens when I recruit a unit?) (When you recruit a 
unit, it appears at full health on a castle tile of your choice. It also 
receives two traits, which will be discussed later. It cannot move or attack 
until you end your turn.)}
 #enddef
                                {RECRUIT_QUESTIONS}
                {QUESTION_OPTIONS_END}
@@ -97,23 +91,25 @@
                description=Delfador
                message= _ "Since units cannot move on the turn they are 
recruited, you must end your turn. To do this, simply click the 'End Turn' 
button in the lower-right hand corner."
                [/message]
+               {SET_OBJECTIVE (End your turn)}
                [event]
                name=new turn
                [message]
                description=Delfador
                message= _ "You have successfully ended your turn."
                [/message]
-               {QUESTION_OPTIONS_START ("What do I do next?")}
+               {QUESTION_OPTIONS_START (What do I do next?)}
 #define TURN_QUESTIONS
-{QUESTION_OPTION ("How do I end my turn?") ("One way to end your turn is to 
press 'Alt-E'. Alternatively, you can right-click and select End Turn, or 
select the End Turn button in the lower-right hand corner.")}
-{QUESTION_OPTION ("What happens when I end my turn?") ("When you end your 
turn, it becomes another side's turn and only that side has the right to move, 
until that side ends its turn. After all sides end their turns, the next turn 
begins. This has various effects, including causing all units to regain their 
full movement potential. The number of the current turn is displayed on the 
status bar next to the image of a flag. When this number exceeds the maximum 
number of turns, you lose the game.")}
+{QUESTION_OPTION (How do I end my turn?) (One way to end your turn is to press 
'Alt-E'. Alternatively, you can right-click and select End Turn, or select the 
End Turn button in the lower-right hand corner.)}
+{QUESTION_OPTION (What happens when I end my turn?) (When you end your turn, 
it becomes another side's turn and only that side has the right to move, until 
that side ends its turn. After all sides end their turns, the next turn begins. 
This has various effects, including causing all units to regain their full 
movement potential. The number of the current turn is displayed on the status 
bar next to the image of a flag. When this number exceeds the maximum number of 
turns, you lose the game.)}
 #enddef
                                {TURN_QUESTIONS}
                {QUESTION_OPTIONS_END}
                [message]
                description=Delfador
-               message= _ "Your next task is to move your Elvish Fighter. To 
move a unit, first select it, then select his destination. In this case, his 
destination is the signpost next to the Elvish Shaman."
+               message= _ "Your next task is to move your Elvish Fighter. To 
move a unit, first select it, then select his destination. In this case, his 
destination is the forest next to the Elvish Shaman, Merle."
                [/message]
+               {SET_OBJECTIVE (Move your Elvish Fighter next to Merle)}
                [move_unit_fake]
                x=09,10,10,11,11
                y=04,04,05,06,07
@@ -126,25 +122,22 @@
                side=3
                canrecruit=1
                [/unit]
-               [item]
-               x,y=12,7
-               image=items/signpost.png
-               [/item]
                [event]
                name=moveto
                [filter]
-               x,y=12,7
+               x=10,10,11,11,12,12
+               y=06,07,06,08,06,07
                type=Elvish Fighter
                [/filter]
                [message]
                description=Delfador
-               message= _ "Excellent! You have succesfully moved your Elvish 
Fighter. However, since he moved next to an enemy unit, he has lost all his 
movement for this turn; this is called the 'zone of control'."
+               message= _ "Excellent! You have successfully moved your Elvish 
Fighter. However, since he moved next to an enemy unit, he has lost all his 
movement for this turn; this is called the 'zone of control'."
                [/message]
-               {QUESTION_OPTIONS_START ("What do I do next?")}
+               {QUESTION_OPTIONS_START (What do I do next?)}
 #define MOVE_QUESTIONS
-{QUESTION_OPTION ("How far can my Elvish Fighter move?") ("Your Elvish Fighter 
begins with a certain number of move points each turn; this is called his 
speed. When your Elvish Fighter moves along a path, each hex he goes through 
costs him move points; this includes his destination. When you select your 
Elvish Fighter, all hexes he can't move onto within one turn will be shaded. If 
the destination is far enough away that he needs more than one turn to reach 
it, a number will appear showing how many turns it will take him. Clicking on a 
far-away space will set the unit on a course for that space, which means it 
automatically moves as far as it can towards that space every turn. If you 
accidentally set a unit on a course, select it twice to remove the course.")}
-{QUESTION_OPTION ("What's the zone of control?") ("A unit's zone of control is 
the location consisting of all hexes the unit is adjacent to. Units cannot move 
through opponent's zones of control; they can only move into it. When they do 
this, they lose all of their remaining movement. Zones of control can be used 
to block enemies from reaching your weak and wounded units.")}
-{QUESTION_OPTION ("How do I tell who is allied and who is an enemy?") ("Units 
you control have a green, yellow, or red energy circle above their health bar, 
the green vertical bar next to them. Units with full movement have green: ones 
with some movement yellow, ones with no movement red. Units controlled by the 
enemy do not have an energy circle. Allied units you do not control, like me, 
have a blue energy circle. Also, the color of a unit's controller is displayed 
as a disc below the unit.")}
+{QUESTION_OPTION (How far can my Elvish Fighter move?) (Your Elvish Fighter 
begins with a certain number of move points each turn; this is called his 
speed. When your Elvish Fighter moves along a path, each hex he goes through 
costs him move points; this includes his destination. When you select your 
Elvish Fighter, all hexes he can't move onto within one turn will be shaded. If 
the destination is far enough away that he needs more than one turn to reach 
it, a number will appear showing how many turns it will take him. Clicking on a 
far-away space will set the unit on a course for that space, which means it 
automatically moves as far as it can towards that space every turn. If you 
accidentally set a unit on a course, select it twice to remove the course.)}
+{QUESTION_OPTION (What's the zone of control?) (A unit's zone of control is 
the location consisting of all hexes the unit is adjacent to. Units cannot move 
through opponent's zones of control; they can only move into it. When they do 
this, they lose all of their remaining movement. Zones of control can be used 
to block enemies from reaching your weak and wounded units.)}
+{QUESTION_OPTION (How do I tell who is allied and who is an enemy?) (Units you 
control have a green, yellow, or red energy circle above their health bar, the 
green vertical bar next to them. Units with full movement have green: ones with 
some movement yellow, ones with no movement red. Units controlled by the enemy 
do not have an energy circle. Allied units you do not control, like me, have a 
blue energy circle. Also, the option 'Show Team Colors', in Preferences, causes 
the color of a unit's controller is displayed as a disc below the unit.)}
 #enddef
                                {MOVE_QUESTIONS}
                {QUESTION_OPTIONS_END}
@@ -152,13 +145,12 @@
                description=Delfador
                message= _ "Now, you need to attack with your fighter. To 
attack, first select a unit, then select its target, which must be next to the 
attacking unit. You will then see the attack options box, where you must select 
an attack to use."
                [/message]
+               {SET_OBJECTIVE (Attack Merle)}
                [event]
                name=attack
                [kill]
                description=Merle
                [/kill]
-               #XXX This needs fixing - Merle gains all her HP back by miracle
-               #confusing for a new player
                [unit]
                type=Elvish Shaman
                description=Merle
@@ -169,11 +161,11 @@
                description=Delfador
                message= _ "You have successfully attacked Merle."
                [/message]
-               {QUESTION_OPTIONS_START ("What do I do next?")}
+               {QUESTION_OPTIONS_START (What do I do next?)}
 #define ATTACK_QUESTIONS
-{QUESTION_OPTION ("Can Merle retaliate from my attack?") ("Whenever a unit in 
Wesnoth is attacked, it retaliates with one of their own weapons. This means 
that after each blow from the attacker, the defender retaliates with one blow. 
This continues until one side runs out of blows, in which case the other unit 
continues attacking until its blows are depleted as well. However, any unit can 
only retaliate by using a weapon of the same range as the one used to attack. 
This means that a ranged attack can only be countered by a ranged attack and a 
melee attack can only be countered by a melee attack. Most units have more 
powerful melee attacks than ranged, so units with ranged attacks are useful in 
that retaliation against them is less powerful; often there is no retaliation. 
However ranged units cannot shoot across multiple hexes; this is one of the 
distinctive features of Wesnoth.")}
-{QUESTION_OPTION ("How can you tell how powerful a unit's attacks are?") 
("Every attack does a certain amount of damage per hit, and can be used a 
certain number of times per battle. These numbers, called the attack's damage 
and strike numbers, are displayed in order under the name of the attack on the 
unit's status table and next to it on the attack options menu. To quickly find 
the maximum damage an attack can inflict, multiply the damage by the number of 
strikes. For example, my lightning attack does 14 damage per blow and has 4 
blows, so it can deal up to 56 damage in a single combat.")}
-{QUESTION_OPTION ("Will my fighter hit every time when he attacks?") ("Units 
in Wesnoth have the ability to block blows. The chance that a unit has to hit 
is based on the defender's skill at defending blows, and is listed on the 
attack options menu after the damage and strike numbers for the bow attack.")}
+{QUESTION_OPTION (Can Merle retaliate from my attack?) (Whenever a unit is 
attacked, it retaliates with one of their own weapons. This means that after 
each blow from the attacker, the defender retaliates with one blow. This 
continues until one side runs out of blows, in which case the other unit 
continues attacking until its blows are depleted as well. However, any unit can 
only retaliate by using a weapon of the same range as the one used to attack. 
This means that a ranged attack can only be countered by a ranged attack and a 
melee attack can only be countered by a melee attack. Most units have more 
powerful melee attacks than ranged, so units with ranged attacks are useful in 
that retaliation against them is less powerful; often there is no retaliation. 
However ranged units cannot shoot across multiple hexes; this is one of the 
distinctive features of Wesnoth.)}
+{QUESTION_OPTION (How can you tell how powerful a unit's attacks are?) (Every 
attack does a certain amount of damage per hit, and can be used a certain 
number of times per battle. These numbers, called the attack's damage and 
strike numbers, are displayed in order under the name of the attack on the 
unit's status table and next to it on the attack options menu. To quickly find 
the maximum damage an attack can inflict, multiply the damage by the number of 
strikes. For example, my lightning attack does 14 damage per blow and has 4 
blows, so it can deal up to 56 damage in a single combat.)}
+{QUESTION_OPTION (Will my fighter hit every time when he attacks?) (Units have 
the ability to block blows. The chance that a unit has to hit is based on the 
defender's skill at defending blows, and is listed on the attack options menu 
after the damage and strike numbers for the bow attack.)}
 #enddef
                                {ATTACK_QUESTIONS}
                {QUESTION_OPTIONS_END}
@@ -187,10 +179,10 @@
                description=Delfador
                message= _ "Your fighter has survived Merle's attack. Whenever 
a unit survives a battle, it gets experience from the combat. Once a unit gains 
enough experience, it advances to the next level, and becomes more powerful."
                [/message]
-               {QUESTION_OPTIONS_START ("What do I do next?")}
+               {QUESTION_OPTIONS_START (What do I do next?)}
 #define XP_QUESTIONS
-{QUESTION_OPTION ("What's experience?") ("When a unit fights another unit, it 
gains experience, denoted 'XP', from the combat. The amount of experience 
gained is equal to the opponent's level, which is usually a representation of 
that unit's power. However, much more experience is gained from defeating an 
enemy unit. The amount of XP gained from killing an enemy is equal to 8 times 
the enemy's level.")}
-{QUESTION_OPTION ("What happens when a unit advances?") ("When a unit 
advances, it transforms into a different unit type. This unit type is dependent 
on what the unit was originally, but occasionally there will be more than one 
choice of what to advance into. Advanced units are usually more powerful and 1 
level higher than they were originally. Also, when a unit advances, it is 
healed completely and any handicaps that have been cast on it are removed. This 
is known as 'advance-heal', and is one of the features which makes Wesnoth 
unique.")}
+{QUESTION_OPTION (What's experience?) (When a unit fights another unit, it 
gains experience, denoted 'XP', from the combat. The amount of experience 
gained is equal to the opponent's level, which is usually a representation of 
that unit's power. However, much more experience is gained from defeating an 
enemy unit. The amount of XP gained from killing an enemy is equal to 8 times 
the enemy's level.)}
+{QUESTION_OPTION (What happens when a unit advances?) (When a unit advances, 
it transforms into a different unit type. This unit type is dependent on what 
the unit was originally, but occasionally there will be more than one choice of 
what to advance into. Advanced units are usually more powerful and 1 level 
higher than they were originally. Also, when a unit advances, it is healed 
completely and any handicaps that have been cast on it are removed. This is 
known as 'advance-heal'.)}
 #enddef
                                {XP_QUESTIONS}
                {QUESTION_OPTIONS_END}
@@ -198,26 +190,31 @@
                description=Delfador
                message= _ "Move your fighter onto a village."
                [/message]
-               #XXX This needs fixing
-               #If the player already has captured that village, the event
-               #won't be triggered and the lesson skipped
+               {SET_OBJECTIVE (Move your fighter onto a village)}
                [event]
-               name=capture
+               name=moveto
+               [filter]
+#              terrain=v
+               x=01,09,16,22,19,13,16,21,06
+               y=01,04,05,06,08,09,11,15,20
+               type=Elvish Fighter
+               [/filter]
                [message]
                description=Delfador
                message= _ "Villages heal the units on them."
                [/message]
-               {QUESTION_OPTIONS_START ("What do I do next?")}
+               {QUESTION_OPTIONS_START (What do I do next?)}
 #define VILLAGE_QUESTIONS
-{QUESTION_OPTION ("What happens when a unit moves onto a village?") ("Whenever 
a unit moves onto a village, he flags the village for his side. This action 
takes all of the unit's remaining movement. Villages flagged for a side give 
the side several benefits, including giving the side a extra gold coin every 
turn, and reducing the total upkeep cost of that side's units by one. The total 
number of villages you control is also displayed on the status bar after the 
picture of a house. In addition to the economic benefit of villages, villages 
can be used in battle. Villages heal the units on them 8 HP per turn.")}
-{QUESTION_OPTION ("How do I heal when there aren't any villages nearby?") 
("There are ways to heal even without villages. If a unit does not move or 
attack for 1 turn, he heals 2 HP from resting. However if an enemy attacks him 
he cannot receive rest-heal. Also, there are some units which heal the units 
surrounding them. The Elvish Shaman is one such unit; units next to an Elvish 
Shaman are healed 4 HP per turn. Finally, whenever you win a level all your 
units are healed fully.")}
+{QUESTION_OPTION (What happens when a unit moves onto a village?) (Whenever a 
unit moves onto a village, he flags the village for his side. This action takes 
all of the unit's remaining movement. Villages flagged for a side give the side 
several benefits, including giving the side a extra gold coin every turn, and 
reducing the total upkeep cost of that side's units by one. The total number of 
villages you control is also displayed on the status bar after the picture of a 
house. In addition to the economic benefit of villages, villages can be used in 
battle. Villages heal the units on them 8 HP per turn.)}
+{QUESTION_OPTION (How do I heal when there aren't any villages nearby?) (There 
are ways to heal even without villages. If a unit does not move or attack for 1 
turn, he heals 2 HP from resting. However if an enemy attacks him he cannot 
receive rest-heal. Also, there are some units which heal the units surrounding 
them. The Elvish Shaman is one such unit; units next to an Elvish Shaman are 
healed 4 HP per turn. Finally, whenever you win a level all your units are 
healed fully.)}
 #enddef
                                {VILLAGE_QUESTIONS}
                {QUESTION_OPTIONS_END}
                [message]
                description=Delfador
-               message= _ "Now, you must defeat Merle by reducing him to 0 HP 
or lower. Just attack repeatedly."
+               message= _ "Now, you must defeat Merle by reducing her to 0 HP 
or lower. Just attack repeatedly."
                [/message]
+               {SET_OBJECTIVE (Defeat Merle)}
                [/event]
                [/event]
                [/event]
@@ -225,6 +222,23 @@
                [/event]
        [/event]
        [event]
+       name=moveto
+       first_time_only=no
+               [filter]
+               description=Konrad
+               [/filter]
+               [message]
+               description=Delfador
+               message=Oops! You moved your leader off of the keep. Remember, 
when your leader is not on a keep, you cannot recruit. Also remember that if 
your leader dies, you lose. In order to continue the tutorial, I will have to 
teleport you back onto your keep.
+               [/message]
+               [teleport]
+                       [filter]
+                       description=Konrad
+                       [/filter]
+               x,y=16,9
+               [/teleport]
+       [/event]
+       [event]
        name=die
                [filter]
                description=Konrad
@@ -250,10 +264,10 @@
                description=Delfador
                message= _ "You have successfully completed the first training 
scenario."
                [/message]
-               {QUESTION_OPTIONS_START ("Hooray!")}
+               {QUESTION_OPTIONS_START (Hooray!)}
 #define VICTORY_QUESTIONS
-{QUESTION_OPTION ("How do I know how to complete a scenario? Will you always 
tell me?") ("Sometimes it is not clear how to win a scenario just by listening 
to the dialog. In this case you need to look at the scenario objectives, which 
appear after the opening dialog. It can also be accessed by clicking 
'Objectives' on the menu. The scenario objectives are a list of victory 
conditions and defeat conditions, and if any of the conditions are met, the 
level is over. Hopefully, it was a victory condition that was met.")}
-{QUESTION_OPTION ("What happens when I win a scenario?") ("When you win a 
scenario, all of your units survive and are revived to full health, and you do 
not have to pay them for the remaining turns. Also, if your army remains in the 
area after you win, all villages surrender to you immediately after you win. 
However between scenarios, 20% of your gold is lost.")}
+{QUESTION_OPTION (How do I know how to complete a scenario? Will you always 
tell me?) (Sometimes it is not clear how to win a scenario just by listening to 
the dialog. In this case you need to look at the scenario objectives, which 
appear after the opening dialog. It can also be accessed by clicking 
'Objectives' on the menu. The scenario objectives are a list of victory 
conditions and defeat conditions, and if any of the conditions are met, the 
level is over. Hopefully, it was a victory condition that was met.)}
+{QUESTION_OPTION (What happens when I win a scenario?) (When you win a 
scenario, all of your units survive and are revived to full health, and you do 
not have to pay them for the remaining turns. Also, if your army remains in the 
area after you win, all villages surrender to you immediately after you win. 
However between scenarios, 20% of your gold is lost.)}
 #enddef
                                {VICTORY_QUESTIONS}
                {QUESTION_OPTIONS_END}
@@ -263,7 +277,7 @@
                        [option]
                        message= _ "Yes"
                        [command]
-                               {QUESTION_OPTIONS_START ("I'm done reviewing 
skills!")}
+                               {QUESTION_OPTIONS_START (I'm done reviewing 
skills!)}
                                                {RECRUIT_QUESTIONS}
                                                {TURN_QUESTIONS}
                                                {MOVE_QUESTIONS}
Index: wesnoth/data/scenarios/tutorial/tutorial2.cfg
diff -u wesnoth/data/scenarios/tutorial/tutorial2.cfg:1.1 
wesnoth/data/scenarios/tutorial/tutorial2.cfg:1.2
--- wesnoth/data/scenarios/tutorial/tutorial2.cfg:1.1   Fri Aug 13 18:51:44 2004
+++ wesnoth/data/scenarios/tutorial/tutorial2.cfg       Fri Aug 27 15:34:51 2004
@@ -40,17 +40,19 @@
        recruit=Elvish Archer,Elvish Fighter,Elvish Shaman,Elvish Scout
        controller=human
        [/side]
+       {STARTING_VILLAGES 1 6}
        [side]
        type=Elder Mage
        description=Delfador
        canrecruit=1
        side=2
        recruit=Elvish Archer,Elvish Fighter,Elvish Shaman,Elvish Scout
-       gold=11
+       gold=20
                [ai]
                passive_leader=yes
                [/ai]
        [/side]
+       {STARTING_VILLAGES 2 6}
        [event]
        name=start
                [message]
@@ -61,46 +63,61 @@
                description=Delfador
                message= _ "You can win most scenarios simply by defeating all 
enemy leaders. Win this scenario by defeating me. Your fighter from the 
previous scenario can help you in this battle. To recall him, right-click on a 
castle tile, select Recall, select your fighter, then select 'Ok'. You should 
also recruit Elvish Fighters and Elvish Archers."
                [/message]
-       [/event]
-objectives= _ "@Skills covered:
+               [objectives]
+               message= _ "@Skills covered:
 Recalling
 Traits
 Gold
 Time of day
 Terrains
+Resistance
+Specialties
 Objects
 Playing Wesnoth
 @Objectives
 @Victory
 Defeat Delfador"
+               [/objectives]
+       [/event]
+       [event]
+       name=recall
+               [message]
+               description=Delfador
+               message= _ "You have successfully recalled your Elvish Fighter."
+               [/message]
+               {QUESTION_OPTIONS_START (En guarde!)}
+#define RECALL_QUESTIONS
+{QUESTION_OPTION (What happens when I recall a unit?) (First, you must pay 20 
pieces of gold for each unit you recall, regardless of the type of unit. Other 
than that, recalled units are basically like recruited units, except that 
instead of a new unit appearing, a unit from a previous scenario will appear.)}
+{QUESTION_OPTION (How should I decide which units to recall?) (You should 
usually recall units that have already advanced to the next level. However, you 
may also want to recall units that have high experience, and are thus likely to 
advance. You should recall units that will be useful for the scenario you are 
in; for example in a forest scenario, recall elves.)}
+#enddef
+                               {RECALL_QUESTIONS}
+               {QUESTION_OPTIONS_END}
+       [/event]
        [event]
        name=turn 2
                [message]
                description=Delfador
-               message= _ "You may notice that your units have slightly 
different statistics than the statistics shown before you recruited them. This 
is because they have been assigned two traits."
+               message= _ "You may notice that your units have slightly 
different statistics than the statistics shown before you recruited them. This 
is because they have been assigned traits."
                [/message]
-               {QUESTION_OPTIONS_START ("En garde!")}
+               {QUESTION_OPTIONS_START (En guarde!)}
 #define TRAIT_QUESTIONS
-{QUESTION_OPTION ("What traits can my units get?") ("There are five traits. 
Any unit has an equal chance to get any two different traits when it is 
recruited. These are the five traits:
address@hidden: The unit never has a upkeep cost above 1.
address@hidden: The unit does extra damage in close combat, and has a few more 
hitpoints.
address@hidden: The unit has one extra movement point, but a few less hitpoints.
address@hidden: The unit has more hitpoints.
address@hidden: The unit requires less experience to advance a level.")}
+{QUESTION_OPTION (What do traits do?) (The function of traits is add variety 
by making units of the same type different from each other. This is done by 
randomly assigning each unit traits when they are recruited. The traits that a 
unit has are displayed on the Status Table, and the function of a specific 
trait can be found by putting your cursor over that trait.)}
+{QUESTION_OPTION (What kind of traits can my units get?) (There are five 
distinct traits, which have effects ranging from increasing a unit's hit points 
to decreasing the amount of XP required to advance. However all traits are 
designed to improve unit's power; there are no 'negative' traits. Most units 
have an equal chance to get any two different traits when they are recruited.)}
 #enddef
                                {TRAIT_QUESTIONS}
                {QUESTION_OPTIONS_END}
        [/event]
        [event]
        name=turn 3
+
                [message]
                description=Delfador
                message= _ "When you recruit and recall units, you lose gold. 
If this would cause you to have less than 0 gold, you cannot recruit or recall."
                [/message]
-               {QUESTION_OPTIONS_START ("En garde!")}
+               {QUESTION_OPTIONS_START (En guarde!)}
 #define GOLD_QUESTIONS
-{QUESTION_OPTION ("How much gold do my units cost?") ("You need to pay each 
unit you recruit or recall gold when you recruit it. The cost of recruiting a 
unit is displayed under the unit's name. The cost of recalling a unit is always 
20 gold. A unit also costs gold for each turn it is under your control. This 
cost, called 'upkeep', is equal to the level of the unit. However, units you do 
not recruit or recall such as your leader do not cost any gold at all. The 
total upkeep cost of your units is displayed on the status bar at the top after 
a picture of gold and then a red arrow.")}
-{QUESTION_OPTION ("How do I get gold?") ("You begin each level with a 
percentage of gold from the previous level. If this is less than 100 gold, you 
begin with 100 gold instead. The amount of gold you have is displayed on the 
status bar after the picture of gold. After the start of a scenario, you 
receive 2 gold every turn. Since you usually need more gold than that, you 
should flag villages, which give you 1 gold per turn.")}
+{QUESTION_OPTION (How much gold do my units cost?) (You need to pay each unit 
you recruit or recall gold when you recruit it. The cost of recruiting a unit 
is displayed under the unit's name. The cost of recalling a unit is always 20 
gold. A unit also costs gold for each turn it is under your control. This cost, 
called 'upkeep', is equal to the level of the unit. However, units you do not 
recruit or recall such as your leader do not cost any gold at all. The total 
upkeep cost of your units is displayed on the status bar at the top after a 
picture of gold and then a red arrow.)}
+{QUESTION_OPTION (How do I get gold?) (You begin each level with a percentage 
of gold from the previous level. If this is less than 100 gold, you begin with 
100 gold instead. The amount of gold you have is displayed on the status bar 
after the picture of gold. After the start of a scenario, you receive 2 gold 
every turn. Since you usually need more gold than that, you should flag 
villages, which give you 1 gold per turn.)}
 #enddef
                                {GOLD_QUESTIONS}
                {QUESTION_OPTIONS_END}
@@ -111,10 +128,10 @@
                description=Delfador
                message= _ "The sun is setting over Wesnoth. The time of day 
affects how much damage units of different alignments can inflict upon each 
other."
                [/message]
-               {QUESTION_OPTIONS_START ("En garde!")}
+               {QUESTION_OPTIONS_START (En guarde!)}
 #define TIME_QUESTIONS
-{QUESTION_OPTION ("What are the different alignments and times of day?") 
("There are 3 alignments: Lawful, Neutral, and Chaotic. There are also 3 times 
of day: day, twilight, and night. During day, units of the alignment Lawful, 
such as humans, do 25% more damage, while Chaotic units such as undead do 25% 
less. At night it is reversed. During twilight, all units do their normal 
damage. Neutral units such as elves are unaffected by day and night.")}
-{QUESTION_OPTION ("How do I know what time of day it is?") ("The times of day 
usually progress in a sequence: twilight, day, day, twilight, night, night, 
then repeat. However some scenarios have a different sequence, such as 
underground where it is perpetually night. You can find out the current time of 
day by looking at the Status Table.")}
+{QUESTION_OPTION (What are the different alignments and times of day?) (There 
are 3 alignments: Lawful, Neutral, and Chaotic. There are also 3 times of day: 
day, twilight, and night. During day, units of the alignment Lawful, such as 
humans, do 25% more damage, while Chaotic units such as undead do 25% less. At 
night it is reversed. During twilight, all units do their normal damage. 
Neutral units such as elves are unaffected by day and night.)}
+{QUESTION_OPTION (How do I know what time of day it is?) (The times of day 
usually progress in a sequence: dawn- identical to twilight, morning- day, 
evening- day, dusk- twilight, first-watch- night, second-watch- night, then 
repeat. This is represented by the sun and moon which each rise in the east and 
set in the west. However some scenarios have a different sequence, such as 
underground where it is perpetually night. You can find out the current time of 
day by looking at the Status Table.)}
 #enddef
                                {TIME_QUESTIONS}
                {QUESTION_OPTIONS_END}
@@ -123,16 +140,46 @@
        name=turn 5
                [message]
                description=Delfador
-               message= _ "In Wesnoth, each hex has a terrain, which gives the 
hex distinctive properties."
+               message= _ "Each hex has a terrain, which gives the hex 
distinctive properties."
                [/message]
-               {QUESTION_OPTIONS_START ("En garde!")}
+               {QUESTION_OPTIONS_START (En guarde!)}
 #define TERRAIN_QUESTIONS
-{QUESTION_OPTION ("What are the different properties that terrains have?") 
("Two terrains have properties which have already been described; namely 
villages and castle. However the properties of most terrains are more subtle, 
and have to do with the advantages and disadvantages different units have when 
they move onto them. The first property of a terrain is the number of move 
points it takes each unit to move through the hex. The second property is the 
defense that the terrain gives units standing on it.")}
-{QUESTION_OPTION ("How do I find out the properties of a specific terrain?") 
("To find out the properties of a terrain with respect to a specific unit, 
right-click on the unit, select Unit Description, then select Terrain 
Modifiers. To find out which terrain is on a particular hex, move your cursor 
over that hex and look in the upper-right hand corner of the screen. This will 
display, in order, the name of the terrain, then the coordinates of the hex, 
then the selected unit's defense, then the number of move points it will cost 
the selected unit to move through that hex.")}
+{QUESTION_OPTION (What are the different properties that terrains have?) (Two 
terrains have properties which have already been described; namely villages and 
castle. However the properties of most terrains are more subtle, and have to do 
with the advantages and disadvantages different units have when they move onto 
them. The first property of a terrain is the number of move points it takes 
each unit to move through the hex. The second property is the defense that the 
terrain gives units standing on it. This is a percentage which determines the 
unit's chance to be hit on that terrain. For example; elves have 70% defense on 
grass, and are therefore hit 30% of the time.)}
+{QUESTION_OPTION (How do I find out the properties of a specific terrain?) (To 
find out the properties of a terrain with respect to a specific unit, 
right-click on the unit, select Unit Description, then select Terrain 
Modifiers. To find out which terrain is on a particular hex, move your cursor 
over that hex and look in the upper-right hand corner of the screen. This will 
display, in order, the name of the terrain, then the coordinates of the hex, 
then the selected unit's defense, then the number of move points it will cost 
the selected unit to move through that hex.)}
 #enddef
                                {TERRAIN_QUESTIONS}
                {QUESTION_OPTIONS_END}
        [/event]
+       [event]
+       name=turn 6
+               [message]
+               description=Delfador
+               message= _ "Each attack has a damage type which affects how 
much damage different units take from that attack."
+               [/message]
+               {QUESTION_OPTIONS_START (En guarde!)}
+#define RESISTANCE_QUESTIONS
+{QUESTION_OPTION (How does resistance affect attack damage?) (Each unit has a 
certain resistance against each attack type. This resistance is a percentage 
which is subtracted from the damage of opponent's weapons of that type. For 
example, if an Elvish Scout is attacked by an Elvish Archer, the archer does 
20% more damage than normal, since Elvish Scouts have -20% resistance to 
pierce. This bonus/penalty is calculated additively with other 
bonuses/penalties like time of day, so two -50% penalties would add up to 
-100%.)}
+{QUESTION_OPTION (What are the different damage types?) (There are 6 different 
damage types: blade, pierce, impact, fire, cold, and holy. Heavily armored 
units have high resistance to the physical types: blade, pierce, and impact, 
but low resistance to the magical types: fire and cold. All living units have 
resistance to holy while undead are extremely weak to it. To find out a 
specific unit's resistance, right-click on the unit, select Unit Description, 
then select Resistance.)}
+#enddef
+                               {RESISTANCE_QUESTIONS}
+               {QUESTION_OPTIONS_END}
+       [/event]
+       [event]
+       name=turn 7
+               [message]
+               description=Delfador
+               message= _ "Many units have a specialty which changes the rules 
of play in some way."
+               [/message]
+               {QUESTION_OPTIONS_START (En guarde!)}
+#define SPECIALTIES_QUESTIONS
+{QUESTION_OPTION (What do specialties do?) (Each specialty does something 
different; that's the whole point of a specialty. To find a description of a 
unit's specialty, put your cursor over the name of the specialty.)}
+{QUESTION_OPTION (Which units get specialties?) (The specialties a unit gets 
are determined by the unit type; for example all generals have the specialty 
leadership. There are two kinds of specialties: abilities, and attack specials. 
Abilities apply to units while attack specials only apply to one of the unit's 
attacks.)}
+{QUESTION_OPTION (What kinds of specialties can my units get?) (There are many 
different specialties, and learning about them is one of the interesting parts 
of playing Wesnoth. The two most common specialties are called 'magical' and 
'leadership'. Magical attacks have a 70% chance of hitting enemies regardless 
of what terrain they are on. Units do more damage while next to a unit of 
higher level with leadership.)}
+{QUESTION_OPTION (How do I use specialties?) (To use a specialty, you just 
have to move and/or attack with your units in a way which triggers the 
specialty. For example, in order to use leadership, you must move a unit with 
leadership next to another unit, then attack with the other unit.)}
+#enddef
+                               {SPECIALTIES_QUESTIONS}
+               {QUESTION_OPTIONS_END}
+       [/event]
        [item]
        x,y=12,9
        image=items/potion-red.png
@@ -156,10 +203,10 @@
                name=Strength Potion
                image=items/potion-red.png
                [/object]
-               {QUESTION_OPTIONS_START ("En garde!")}
+               {QUESTION_OPTIONS_START (En guarde!)}
 #define OBJECT_QUESTIONS
-{QUESTION_OPTION ("What kind of objects am I likely to encounter?") ("The 
objects you encounter are put in by the scenario designer, so they vary from 
campaign to campaign. In Heir to the Throne, most objects give the unit who 
picks them up a new weapon. However one of the principles of Wesnoth is to 
avoid being a *get-the-powerups* game, so there are usually not that many 
objects in a campaign.")}
-{QUESTION_OPTION ("How long do these objects last?") ("Most objects are 
permanent changes to the unit that receives them. However a few objects, such 
as holywater, last only until the remainder of the level.")}
+{QUESTION_OPTION (What kind of objects am I likely to encounter?) (The objects 
you encounter are put in by the scenario designer, so they vary from campaign 
to campaign. In Heir to the Throne, most objects give the unit who picks them 
up a new weapon. However there are usually not that many objects in a 
campaign.)}
+{QUESTION_OPTION (How long do these objects last?) (Most objects are permanent 
changes to the unit that receives them. However a few objects, such as holy 
water, last only until the remainder of the level.)}
 #enddef
                                {OBJECT_QUESTIONS}
                {QUESTION_OPTIONS_END}
@@ -167,6 +214,16 @@
                [/removeitem]
        [/event]
        [event]
+       name=capture
+               [filter]
+               side=2
+               [/filter]
+               [message]
+               description=Delfador
+               message= _ "Remember to try to prevent the enemy from capturing 
villages, and to recapture the ones that they already have. This will cut off 
their gold supply and make them unable to recruit."
+               [/message]
+       [/event]
+       [event]
        name=die
                [filter]
                description=Konrad
@@ -192,10 +249,10 @@
                description=Delfador
                message= _ "Congratulations! You have defeated me, and 
completed the second and final training scenario. Next, you may want to begin a 
campaign, or play multiplayer."
                [/message]
-               {QUESTION_OPTIONS_START ("Hooray!")}
+               {QUESTION_OPTIONS_START (Hooray!)}
 #define WESNOTH_QUESTIONS
-{QUESTION_OPTION ("How do I play a campaign?") ("To begin a campaign, run 
Wesnoth, select 'Campaign', select which campaign to play, then select Easy, 
Normal, or Hard. Heir to the Throne is the suggested for newcomers to 
Wesnoth.")}
-{QUESTION_OPTION ("How do I play multiplayer?") ("To play Wesnoth against 
other people, select 'Multiplayer'. If you have the latest development version 
of Wesnoth, select 'Join Official Server'. However, if you have version 1.0, 
select 'Join Game', then type in 'server.wesnoth.org'. This will connect you to 
the official Wesnoth server, where you can join a game by selecting it, then 
selecting 'Join Game'.")}
+{QUESTION_OPTION (How do I play a campaign?) (To begin a campaign, run 
Wesnoth, select 'Campaign', select which campaign to play, then select Easy, 
Normal, or Hard. Heir to the Throne is the suggested for newcomers to Wesnoth.)}
+{QUESTION_OPTION (How do I play multiplayer?) (To play Wesnoth against other 
people, select 'Multiplayer'. If you have the latest development version of 
Wesnoth, select 'Join Official Server'. However, if you have version 1.0, 
select 'Join Game', then type in 'server.wesnoth.org'. This will connect you to 
the official Wesnoth server, where you can join a game by selecting it, then 
selecting 'Join Game'.)}
 #enddef
                                {WESNOTH_QUESTIONS}
                {QUESTION_OPTIONS_END}
@@ -205,11 +262,14 @@
                        [option]
                        message= _ "Yes"
                        [command]
-                               {QUESTION_OPTIONS_START ("I'm done reviewing 
skills!")}
+                               {QUESTION_OPTIONS_START (I'm done reviewing 
skills!)}
+                                               {RECALL_QUESTIONS}
                                                {TRAIT_QUESTIONS}
                                                {GOLD_QUESTIONS}
                                                {TIME_QUESTIONS}
                                                {TERRAIN_QUESTIONS}
+                                               {RESISTANCE_QUESTIONS}
+                                               {SPECIALTIES_QUESTIONS}
                                                {OBJECT_QUESTIONS}
                                                {WESNOTH_QUESTIONS}
                                {QUESTION_OPTIONS_END}
Index: wesnoth/data/scenarios/tutorial/utils.cfg
diff -u wesnoth/data/scenarios/tutorial/utils.cfg:1.1 
wesnoth/data/scenarios/tutorial/utils.cfg:1.2
--- wesnoth/data/scenarios/tutorial/utils.cfg:1.1       Fri Aug 13 18:51:44 2004
+++ wesnoth/data/scenarios/tutorial/utils.cfg   Fri Aug 27 15:34:51 2004
@@ -10,7 +10,7 @@
        description=Konrad
        message= _ "That was explained well! But.."
                [option]
-               message= _ {END_MESSAGE}
+               message= _ "{END_MESSAGE}"
                [command]
                {CLEAR_VARIABLE still_asking_questions}
                [/command]
@@ -18,11 +18,11 @@
 #enddef
 #define QUESTION_OPTION QUESTION ANSWER
 [option]
-message= _ {QUESTION}
+message= _ "{QUESTION}"
 [command]
        [message]
        description=Delfador
-       message= _ {ANSWER}
+       message= _ "{ANSWER}"
        [/message]
 [/command]
 [/option]
@@ -32,3 +32,15 @@
 [/do]
 [/while]
 #enddef
+#define SET_OBJECTIVE OBJECTIVE
+[objectives]
+message= _ "@Skills covered:
+Recruiting units
+Moving units
+Attacking enemy units
+Gaining experience
+Winning scenarios
address@hidden objective:
+{OBJECTIVE}"
+[/objectives]
+#enddef




reply via email to

[Prev in Thread] Current Thread [Next in Thread]