Updated tutorial texts

git-svn-id: http://svn.net-core.org/repos/t-engine4@2300 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/data/general/objects/gem.lua

@@ -104,7 +104,7 @@ newGem("Lapis Lazuli",	"object/lapis_lazuli.png",3,	12,	"blue",		20,	30, 3, 50,
 	{ combat_def=6 },
 	{ mana=30 }
 )
-newGem("Garnets",	"object/garnet.png",3,	12,	"red",		20,	30, 3, 50,
+newGem("Garnet",	"object/garnet.png",3,	12,	"red",		20,	30, 3, 50,
 	{ inc_damage = {all=6} },
 	{ leech=5 }
 )

game/modules/tome/data/talents/spells/golem.lua

@@ -238,7 +238,7 @@ newTalent{
 	type = {"golem/arcane", 1},
 	require = spells_req1,
 	points = 5,
-	cooldown = 10,
+	cooldown = 3,
 	range = 10,
 	mana = 10,
 	requires_target = true,
@@ -276,7 +276,7 @@ newTalent{
 			local _ _, x, y = self:canProject(tg, x, y)
 			game.level.map:particleEmitter(self.x, self.y, tg.radius, "flamebeam", {tx=x-self.x, ty=y-self.y})
 		elseif typ == 2 then
-			self:project(tg, x, y, DamageType.LIGHTNING, rng.avg(dam / 3, dam, 3))
+			self:project(tg, x, y, DamageType.LIGHTNING, self:spellCrit(t.getDamage(self, t)))
 			local _ _, x, y = self:canProject(tg, x, y)
 			game.level.map:particleEmitter(self.x, self.y, math.max(math.abs(x-self.x), math.abs(y-self.y)), "lightning", {tx=x-self.x, ty=y-self.y})
 		else

game/modules/tome/data/talents/spells/golemancy.lua

@@ -45,6 +45,7 @@ local function makeGolem()
 			[Talents.T_MASSIVE_ARMOUR_TRAINING]=1,
 			[Talents.T_HEAVY_ARMOUR_TRAINING]=1,
 			[Talents.T_WEAPON_COMBAT]=2,
+			[Talents.T_MANA_POOL]=1,
 			[Talents.T_STAMINA_POOL]=1,
 			[Talents.T_GOLEM_KNOCKBACK]=1,
 		},

game/modules/tome/data/texts/intro-tutorial.lua

@@ -24,10 +24,10 @@ This tutorial will present you with a short quest to familiarise yourself with t
 You are a Human adventurer sent into the forest by the local village to dispose of the "Lone Wolf".
 
 This tutorial character is more powerful than a normal starting character and has infinite lives.
-A normal character normally only has one life, and once you die, you stay dead (unless you found or accomplished things that allow you to resurrect).
+A normal character has limited lives, and once you run out, you stay dead (unless you found or accomplished things that allow you to resurrect).
 
 During this tutorial you will be guided by dialog boxes such as this one, explaining how things work.
-Dialog boxes such as this one can be dismissed by either pressing Escape or clicking outside of their zone (or on the title bar).
+Dialog boxes can be dismissed by pressing Escape or clicking outside of their zone (or on the title bar).
 
 Now close this dialog to proceed.
 ]]

game/modules/tome/data/texts/tutorial/done.lua

@@ -19,10 +19,10 @@
 
 return [[#GOLD#Congratulations !#WHITE#
 
-You have completed this small tutorial, you should now know the basics of ToME4. You are ready to step forward into the world to find glory, treasures and be mercilessly slaughtered by hordes of creatures you thought you could handle!
-During this tutorial you met some creatures that were adjusted to the need of the teachings, beware, in the real world trolls are not usually this nice!
+You have completed this small tutorial, and should now know the basics of ToME4. You are ready to step forward into the world to find glory, treasures and be mercilessly slaughtered by hordes of creatures you thought you could handle!
+During this tutorial some creatures were adjusted to the need of the teachings, beware, in the real world trolls are not usually this nice!
 
-If you need a reminder of which key does what you can always access the game menu by pressing #GOLD#Escape#WHITE# and checking the key binds (you can also adjust them to your needs).
+If you need a reminder of which key does what, you can access the game menu by pressing #GOLD#Escape#WHITE# and checking the key binds (you can also adjust them to your needs).
 
 As this is probably your first time with the game you will find there is a limited number of races and classes available to play, many many more do exist but you will unlock them while playing.
 

game/modules/tome/data/texts/tutorial/levelup.lua

@@ -19,16 +19,17 @@
 
 game.player:forceLevelup(2)
 
-return [[In ToME4 a character power depends on her/his level: players can get up to level 50.
-Each level brings some more amount of life and resources (like stamina, mana, ...) and different kind of points that can be used to improve your character in various ways:
-* #GOLD#Stat points#WHITE#: They allow you to raise the six main stats: Strength, Dexterity, Magic, Willpower, Cunning and Constitution. You get 3 points per levels.
-* #GOLD#Class talent points#WHITE#: They allow you to improve a class talent (denoted as such in the talent interface). Class talents define the core functions of your class. You get 1 point per level except every 5 levels where you gain 2.
-* #GOLD#Generic talent points#WHITE#: They allow you to improve a generic talent (denoted as such in the talent interface). Generic talents provide utility/more power but are not always specific to your class. You get 1 point per level except every 5 levels where you gain 0.
-* #GOLD#Category talent points#WHITE#: They allow you to improve your mastery of a talent category (thus improving the power of all talents inside) or to learn a new talent category.
+return [[In ToME4 a character's power depends on her/his level: players can get up to level 50.
 
-Levels are gained by accumulating experience, the most classic form of experience gain is to kill an hostile creature whose level is not too low compared to yours.
+Each level brings more life and resources (like stamina, mana, etc.) and different kinds of points that can improve your character:
+* #GOLD#Stat points#WHITE#: They allow you to raise the six main stats: Strength, Dexterity, Magic, Willpower, Cunning and Constitution. You get 3 points per level.
+* #GOLD#Class talent points#WHITE#: Class talents define the core functions of your class. You gain 1 point every level, plus 1 extra point on multiples of 5.
+* #GOLD#Generic talent points#WHITE#: Generic talents provide utility and/or more power, but are not always specific to your class. You gain 1 point on levels that aren't multiples of 5.
+* #GOLD#Category talent points#WHITE#: They allow you to improve your mastery of a talent category (increasing the power of all talents inside) or to learn a new talent category.
 
-To get to the character levelup screen either press 'G' or right-click on yourself.
+Levels are gained when experience reaches 100%. You gain experience from killing a hostile creature whose level is similar to yours.
+
+To open the character levelup screen either press 'shift+G' or right-click on yourself.
 
 Now open the levelup screen and assign your points.
 ]]

game/modules/tome/data/texts/tutorial/melee.lua

@@ -17,19 +17,18 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-return [[Melee attacks are very easy to do, you simply move in the direction of your foe and if it is hostile you will attack it.
-If it is not hostile you will either talk to it or switch places with it.
+return [[Melee attacks work like movement. Just move in your foe's direction, or click it, to attack it.
+If it is not hostile you will talk to it, or switch places with it.
 
-Attacks thus work just like movement, using the keyboard or the mouse.
-Melee combat depends on various stats:
-* #GOLD#Attack#WHITE#: Your chance to hit
-* #GOLD#Defense#WHITE#: Your chance to avoid attacks
-* #GOLD#Armour#WHITE#: Flat reduction to damage done
-* #GOLD#Damage#WHITE#: How much damage you do per blow
-* #GOLD#Armour Penetration#WHITE#: How much of the target's armour you can ignore
+Melee combat mainly uses five stats:
+* #GOLD#Attack#WHITE#: Your chance to hit.
+* #GOLD#Damage#WHITE#: How much damage you do per blow.
+* #GOLD#Defense#WHITE#: Your chance to avoid attacks.
+* #GOLD#Armour#WHITE#: Flat reduction to damage done.
+* #GOLD#Armour Penetration#WHITE#: How much of the target's armour you can ignore.
 
-You can see those stats, along many others, in the character sheet.
-Either press 'C' or right-click on your character to see the character sheet.
+You can view those stats, and many others, in the character sheet.
+Press 'C' or right-click your character to open the character sheet.
 
 You have spotted some hostile jellies guarding an item.
 Attack them!

game/modules/tome/data/texts/tutorial/move.lua

@@ -17,21 +17,21 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-return [[Moving in ToME4 can be done using either the keyboard, the mouse or both.
+return [[Movement is simple. You can use the keyboard, the mouse, or both.
 
 #GOLD#Keyboard:#WHITE#
-- Press the arrow keys or the keypad to move in the given direction.
-- Press shift + the arrow keys or the keypad to run in the given direction.
-- Press 5 on the keypad to stay put for a turn (doing nothing)
+- Press the arrow keys or keypad to move in the given direction.
+- Press shift + the arrow keys or keypad to run in the given direction.
+- Press 5 on the keypad to stay put for a turn (doing nothing).
 
 #GOLD#Mouse:#WHITE#
-- Click on a spot on the map to move there
-- If there are no monsters and the way is known you will run there
-- If there are unknown or interesting grids along the way you may stop
-- If there is a hostile creature in sight you will only move one grid per click, to prevent stupid deaths
-- Clicking on yourself will make you stay put for a turn (doing nothing)
+- Click on a spot on the map to move there.
+- If there are no monsters and the way is known you will run there.
+- If there are unknown or interesting grids along the way you may stop.
+- If there is a hostile creature in sight you will only move one grid per click, to prevent stupid deaths.
+- Clicking on yourself will make you stay put for a turn (doing nothing).
 
-You can also scroll the map by shift+dragging with your mouse, this is very useful if you have a small resolution, seeing far away can prevent many deaths.
+You can scroll the map by pressing shift and click+dragging with your mouse, or pressing "L" and using shift+the movement keys.
 
-Now close this dialog and go to the west (left) until you arrive in a bigger area.
-]]
+Now close this dialog and go west (left) until you arrive in a bigger area.
+]]
\ No newline at end of file

game/modules/tome/data/texts/tutorial/objects.lua

@@ -17,16 +17,17 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-return [[During your adventures in the world you will find items.
-You can only carry a certain amount of items, depending on your Strength: this is your maximum encumberance.
-You can see your inventory by pressing 'i' or by right-clicking on yourself.
-You can pickup items from the ground by pressing ',' or right clicking on yourself while you are over items.
+return [[During your adventures you will find items.
+Each item has a weight. How much you can carry depends on your Strength: this is your maximum encumberance.
+To pickup an item, press ',' or right click on yourself while standing over it.
+To view your inventory, press 'I' or right-click on yourself.
 
-Your inventory is split in two zones: your equipped items and your backpack.
+Your inventory is split in two panels: your equipped items and your backpack.
+To select an item, use the movement keys and press enter, click it with the mouse, or press the key next to it's name.
 
-Now pickup the infusion you have found. Infusions and Runes are special items that allow you to bind a power on your own body.
-Infusions come from the powers of nature while runes from the powers of magic.
-Simply use the infusion from your inventory, it will inscribe your skin and allow you to regenerate your life at will.
-You can only have a finite number of inscriptions on your body, but they can easily be replaced.
-Then move on to the west.
-]]
+The item you've found is an infusion. Infusions and runes allow you to bind a power to your body, gaining new abilities. 
+Infusions come from the powers of nature while runes use magic.
+This infusion inscribes you with the power to regenerate your life at will. You can only have a finite number of inscriptions, but they can easily be replaced.
+
+Now move on to the west.
+]]
\ No newline at end of file

game/modules/tome/data/texts/tutorial/quests.lua

@@ -17,13 +17,13 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-return [[During your adventures in the world you will find quests.
-A quest can come either automatically from an action, from finding an item, from speaking to somebody, ...
+return [[During your adventures you will find quests.
+A quest can come from performing an action, finding an item, speaking to somebody, and more.
 
-You can view your current quests either by pressing 'j' or right-clicking on yourself.
+You can view your current quests by pressing 'j' or right-clicking yourself.
 
-Once a quest is finished or failed it will disappear from the quest log. A lot of quests in ToME are optional, if you do not think you can survive one, do not do it.
+Once a quest is finished or failed it will disappear from the quest log. Most quests in ToME are optional, if you don't think you can survive one, don't do it.
 
-When this tutorial started you where tasked to kill the Lone Wolf, you are nearing its position.
+When this tutorial started you were tasked to kill the Lone Wolf, you are nearing its position.
 #GOLD#Beware and fight with honour!#WHITE#
 ]]

game/modules/tome/data/texts/tutorial/ranged.lua

@@ -22,15 +22,16 @@ if not game.player.tutored_levels2 then
 	game.player.tutored_levels2 = true
 end
 
-return [[Ranged combat can take many forms, but most of the time it resolves either around firing arrows or slinging spells.
-Archery requires a bow and some arrows. You must wield the bow (it requires both hands) and put the arrows in your quiver.
-Then you can use the shoot talent to fire an arrow, the target interface will pop-up, just like for any other talents.
-* Open your inventory
-* Click on your sword, take it off
-* Click on your shield, take it off
-* Click on your bow and arrows, wield them
-* Close inventory and shoot!
+return [[Ranged combat typically revolves around firing arrows, slinging stones, or casting spells. 
+You have been given a bow, which you wield with both hands.
+You have infinite normal arrows, but you can add special arrows to your quiver for extra damage and/or effects.
+To fire an arrow, use the shoot talent. The target interface will pop-up, just like for other talents.
 
-You have been given the Shoot talent, that allows to fire a bow (or a sling).
-In front of you lies a bow and some arrows, pick them up, take off your weapon and shield, wield the bow and the arrows and go fight the trolls to the west.
+To equip your bow and arrows:
+* Open your inventory.
+* Select your sword, take it off.
+* Select your shield, take it off.
+* Select your bow and arrows, wield them.
+
+There are trolls to the west. Go use your bow and arrows to kill them!
 ]]

game/modules/tome/data/texts/tutorial/tactics1.lua

@@ -17,14 +17,14 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-return [[You have found a nest of snakes!
-As you fought the previous ones you know they are not very strong individually but if you let them surround you you might be in trouble!
-A basic tactic in ToME4 is to try to never get surrounded, do not hesitate to backtrack a bit to get into a safer spot.
+return [[You have found a nest of snakes! If you let them surround you, you might be in trouble!
+A basic tactic is to never get surrounded, do not hesitate to backtrack a bit to a safer spot.
+
 #GOLD#Always control the fight.#WHITE#
 
 After the combat you will probably be low on health, you can rest for a while to regain lost health and resources.
-Either press 'r' or right-click on yourself to rest. You will rest until fully restored or until a creature disturbs you.
+Either press 'R' or right-click on yourself to rest. You will rest until fully restored or until a creature disturbs you.
 
-Now take a few steps backwards to only have to fight one snake at a time and you should survive.
+Now take a few steps back so you only have to fight one snake at a time, and you should survive.
 Remember to use your talents, infusions and runes to win the fight.
 ]]

game/modules/tome/data/texts/tutorial/tactics2.lua

@@ -18,8 +18,8 @@
 -- darkgod@te4.org
 
 return [[A skeleton mage just fired a spell at you.
-While the fireworks look nice you do not want to let them repeat the operation too much.
-When under the fire of archers or spell casters always try to break line of sight with them, they will be forced to come to you. (Unless they are smart)
+While the fireworks look nice, you don't want to get hit too much.
+When under the fire of archers or spell casters always try to break line of sight with them, they will be forced to come to you (unless they are smart).
 #GOLD#Take cover: Never let them get a clean shot!#WHITE#
 
 Now take cover and wait for the skeleton.

game/modules/tome/data/texts/tutorial/talents.lua

@@ -25,17 +25,18 @@ end
 
 return [[You now possess the Shield Pummel and Shield Wall talents.
 Talents show up in the lower right part of the screen with their assigned hotkey.
-You can right-click on a talent to remove it from the list and you can add talents by pressing 'm' to get the talents list and then pressing a hotkey.
-Hotkeys by default are the 1 to 0 keys and can also be used with items.
+You can right-click on a talent to remove it from the list, or you can add talents by pressing 'M' to get the talents list and then pressing a hotkey.
+Hotkeys by default are the 1 to 0 keys, and can also be assigned to items.
 
-You can use a talent either by pressing its hotkey, selecting it from the talents list, clicking on it in the lower right corner or right-clicking on the map.
-Talents belong to three types:
-* #GOLD#Active#WHITE#: A talent that activated when you use it and has an instantaneous effect.
+You can use a talent by pressing its hotkey, selecting it from the talents list, clicking on it in the lower right corner, or right-clicking on the map.
+
+Talents come in three types:
+* #GOLD#Active#WHITE#: A talent that is activated when you use it and has an instantaneous effect.
 * #GOLD#Sustained#WHITE#: A talent that must be turned on and lasts until it is turned off. Usually this will reduce your maximum resource available (stamina in this case).
 * #GOLD#Passive#WHITE#: A talent that provides an ever-present benefit.
 
-Some talents require a target, when you use them the interface will chance to let you select the target:
-* #GOLD#Using the keyboard#WHITE#: Pressing a direction key will shift between possible targets in the given direction. Pressing shift+direction will move freely to any spot. Enter or space will confirm the target.
+Some talents require a target, when you use them the interface will change to let you select the target:
+* #GOLD#Using the keyboard#WHITE#: Pressing a direction key will shift between possible targets. Pressing shift+direction will move freely to any spot. Enter or space will confirm the target.
 * #GOLD#Using the mouse#WHITE#: Moving your mouse will move the target around. Left-click will confirm it.
 
 Now go forward and try using your talents: