From 1e4fc8eeba7e71f43380a8761f972828760fe0e3 Mon Sep 17 00:00:00 2001
From: cale <cdqwertz@gmail.com>
Date: Wed, 4 May 2016 19:11:53 +0200
Subject: [PATCH] new tutorial quest

---
 mods/default/craft.lua               |  2 +-
 mods/default/craftitems.lua          |  1 +
 mods/default/tools.lua               |  4 ++--
 mods/story/api.lua                   |  1 +
 mods/story/parts/tutorial_1.quest    |  2 +-
 mods/story/parts/tutorial_2.dialog   |  2 ++
 mods/story/parts/tutorial_2.quest    |  6 ++++++
 mods/story/parts/tutorial_2_2.dialog | 11 +++++++++++
 8 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 mods/story/parts/tutorial_2.dialog
 create mode 100644 mods/story/parts/tutorial_2_2.dialog

diff --git a/mods/default/craft.lua b/mods/default/craft.lua
index 124ad06..afa9e4a 100644
--- a/mods/default/craft.lua
+++ b/mods/default/craft.lua
@@ -260,7 +260,7 @@ minetest.register_craft({
 -- tools
 
 minetest.register_craft({
-	output = "default:basic_hammer",
+	output = "default:simple_hammer",
 	recipe = {
 		{"", "default:log_1", ""},
 		{"", "default:string_strong", ""},
diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index b5fed2d..c806066 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -11,6 +11,7 @@ minetest.register_craftitem("default:wood_item", {
 minetest.register_craftitem("default:stone_item", {
 	description = "Stone",
 	inventory_image = "default_stone_item.png",
+	stack_max = 99*9,
 })
 
 minetest.register_craftitem("default:flint", {
diff --git a/mods/default/tools.lua b/mods/default/tools.lua
index ed6a765..5b40a2d 100644
--- a/mods/default/tools.lua
+++ b/mods/default/tools.lua
@@ -15,8 +15,8 @@ minetest.register_item(":", {
 })
 
 
-minetest.register_tool("default:basic_hammer", {
-	description = "Basic Hammer\n For Level: - \n Damage: 8",
+minetest.register_tool("default:simple_hammer", {
+	description = "Simple Hammer\n For Level: - \n Damage: 8",
 	inventory_image = "default_basic_hammer.png",
 	tool_capabilities = {
 		max_drop_level=3,
diff --git a/mods/story/api.lua b/mods/story/api.lua
index 5b6beeb..ce67013 100644
--- a/mods/story/api.lua
+++ b/mods/story/api.lua
@@ -284,6 +284,7 @@ function story.generator.run(part, player, line_pos)
 					else
 						out = {part=cmd[2], wait=false}
 					end
+					return out
 				end
 				if cmd[1] == "$wait" then
 					return {cmd="$wait", param=i, wait=true, param2 = cmd[2] or "talk"}
diff --git a/mods/story/parts/tutorial_1.quest b/mods/story/parts/tutorial_1.quest
index 30dbafa..0aec2ef 100644
--- a/mods/story/parts/tutorial_1.quest
+++ b/mods/story/parts/tutorial_1.quest
@@ -12,4 +12,4 @@ $wait
 $give default:grass 9
 $dialog tutorial_1_4
 $wait
-$quit
+$next tutorial_2
diff --git a/mods/story/parts/tutorial_2.dialog b/mods/story/parts/tutorial_2.dialog
new file mode 100644
index 0000000..0d1d0bb
--- /dev/null
+++ b/mods/story/parts/tutorial_2.dialog
@@ -0,0 +1,2 @@
+Kai : Now, you should get some thick logs to craft a simple hammer.
+
diff --git a/mods/story/parts/tutorial_2.quest b/mods/story/parts/tutorial_2.quest
index 99e8714..11c8f51 100644
--- a/mods/story/parts/tutorial_2.quest
+++ b/mods/story/parts/tutorial_2.quest
@@ -1 +1,7 @@
+$dialog tutorial_2
+$wait
+$quest dignode default:log_1 1 3
+$wait quest
+$dialog tutorial_2_2
+$wait
 $quit
diff --git a/mods/story/parts/tutorial_2_2.dialog b/mods/story/parts/tutorial_2_2.dialog
new file mode 100644
index 0000000..1c23ee5
--- /dev/null
+++ b/mods/story/parts/tutorial_2_2.dialog
@@ -0,0 +1,11 @@
+Kai : To craft a simple hammer, you also need a stick and a string.
+Kai : If you got these items, you need to go to your workbench.
+Kai : Put the items on the workbench (like that) and you will get a simple hammer!
+
+	- A -
+	- B -
+	- C -
+
+	A : Log (Thick)
+	B : String (strong)
+	C : Stick