From 222216a882ee4bc277f164c75527f709bd54cacb Mon Sep 17 00:00:00 2001
From: cale <cdqwertz@gmail.com>
Date: Wed, 6 Jan 2016 12:53:30 +0100
Subject: [PATCH] Fixed mapgen, added ores

---
 mods/default/nodes.lua                        |  19 ++++-
 mods/default/nodes.lua~                       |  19 ++++-
 mods/default/textures/default_rail.png        | Bin 0 -> 303 bytes
 mods/default/textures/default_rail_cross.png  | Bin 0 -> 421 bytes
 mods/default/textures/default_rail_curve.png  | Bin 0 -> 436 bytes
 mods/default/textures/default_rail_t.png      | Bin 0 -> 433 bytes
 mods/lava/LICENSE.txt                         |  16 ++++
 mods/lava/init.lua                            |  71 ++++++++++++++++++
 mods/lava/init.lua~                           |  71 ++++++++++++++++++
 mods/lava/textures/lava_basalt.png            | Bin 0 -> 324 bytes
 mods/lava/textures/lava_lava.png              | Bin 0 -> 310 bytes
 mods/legendary_items/init.lua                 |  13 +++-
 mods/legendary_items/init.lua~                |  13 +++-
 .../textures/legendary_items_old_hammer.png   | Bin 0 -> 297 bytes
 mods/quests/init.lua                          |  11 ++-
 mods/quests/init.lua~                         |  11 ++-
 mods/torch/LICENSE.txt                        |  16 ++++
 mods/torch/init.lua                           |  56 ++++++++++++++
 mods/torch/init.lua~                          |  56 ++++++++++++++
 mods/torch/models/torch_torch.mtl             |  10 +++
 mods/torch/models/torch_torch.obj             |  40 ++++++++++
 mods/torch/textures/torch_flame.png           | Bin 0 -> 216 bytes
 mods/torch/textures/torch_smoke.png           | Bin 0 -> 192 bytes
 mods/torch/textures/torch_torch_inv.png       | Bin 0 -> 265 bytes
 mods/torch/textures/torch_wood.png            | Bin 0 -> 286 bytes
 25 files changed, 412 insertions(+), 10 deletions(-)
 create mode 100644 mods/default/textures/default_rail.png
 create mode 100644 mods/default/textures/default_rail_cross.png
 create mode 100644 mods/default/textures/default_rail_curve.png
 create mode 100644 mods/default/textures/default_rail_t.png
 create mode 100644 mods/lava/LICENSE.txt
 create mode 100644 mods/lava/init.lua
 create mode 100644 mods/lava/init.lua~
 create mode 100644 mods/lava/textures/lava_basalt.png
 create mode 100644 mods/lava/textures/lava_lava.png
 create mode 100644 mods/legendary_items/textures/legendary_items_old_hammer.png
 create mode 100644 mods/torch/LICENSE.txt
 create mode 100644 mods/torch/init.lua
 create mode 100644 mods/torch/init.lua~
 create mode 100644 mods/torch/models/torch_torch.mtl
 create mode 100644 mods/torch/models/torch_torch.obj
 create mode 100644 mods/torch/textures/torch_flame.png
 create mode 100644 mods/torch/textures/torch_smoke.png
 create mode 100644 mods/torch/textures/torch_torch_inv.png
 create mode 100644 mods/torch/textures/torch_wood.png

diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index bb4aa22..aaf32d1 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -208,7 +208,7 @@ minetest.register_node("default:water_source", {
 	liquid_alternative_source = "default:water_source",
 	liquid_viscosity = 3,
 	groups = {liquid=3, water = 1},
-	post_effect_color = {a=100, r=0, g=64, b=200},
+	post_effect_color = {a=50, r=0, g=64, b=200},
 })
 
 minetest.register_node("default:water_flowing", {
@@ -435,7 +435,7 @@ default.register_wool("black")
 minetest.register_node("default:stone", {
 	description = "Stone",
 	tiles = {"default_stone.png"},
-	groups = {cracky = 3},
+	groups = {cracky = 3, stone= 1},
 	drop = "default:stone_item 5",
 })
 
@@ -513,3 +513,18 @@ minetest.register_node("default:stone_with_ruby", {
 	groups = {cracky = 1},
 	drop = "default:ruby",
 })
+
+-- rail
+
+
+minetest.register_node("default:rail", {
+	description = "Rail",
+	drawtype = "raillike",
+	tiles = {"default_rail.png", "default_rail_curve.png",
+		"default_rail_t.png", "default_rail_cross.png"},
+	inventory_image = "default_rail.png",
+	wield_image = "default_rail.png",
+	paramtype = "light",
+	walkable = false,
+	groups = {choppy = 1, attached_node = 1},
+})
diff --git a/mods/default/nodes.lua~ b/mods/default/nodes.lua~
index bb4aa22..aaf32d1 100644
--- a/mods/default/nodes.lua~
+++ b/mods/default/nodes.lua~
@@ -208,7 +208,7 @@ minetest.register_node("default:water_source", {
 	liquid_alternative_source = "default:water_source",
 	liquid_viscosity = 3,
 	groups = {liquid=3, water = 1},
-	post_effect_color = {a=100, r=0, g=64, b=200},
+	post_effect_color = {a=50, r=0, g=64, b=200},
 })
 
 minetest.register_node("default:water_flowing", {
@@ -435,7 +435,7 @@ default.register_wool("black")
 minetest.register_node("default:stone", {
 	description = "Stone",
 	tiles = {"default_stone.png"},
-	groups = {cracky = 3},
+	groups = {cracky = 3, stone= 1},
 	drop = "default:stone_item 5",
 })
 
@@ -513,3 +513,18 @@ minetest.register_node("default:stone_with_ruby", {
 	groups = {cracky = 1},
 	drop = "default:ruby",
 })
+
+-- rail
+
+
+minetest.register_node("default:rail", {
+	description = "Rail",
+	drawtype = "raillike",
+	tiles = {"default_rail.png", "default_rail_curve.png",
+		"default_rail_t.png", "default_rail_cross.png"},
+	inventory_image = "default_rail.png",
+	wield_image = "default_rail.png",
+	paramtype = "light",
+	walkable = false,
+	groups = {choppy = 1, attached_node = 1},
+})
diff --git a/mods/default/textures/default_rail.png b/mods/default/textures/default_rail.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca6329fdba2703a8275e6217f15397d02ffa0ca1
GIT binary patch
literal 303
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o
z>Fdh=fRT+`hdJ+?&~BiRWQl7;iF1B#Zfaf$gL6@8Vo7R>LV0FMhJw4NZ$Nk>pEyv_
zN>3NZkch*{DGp58*Vg>}|MIeW+ma<JZfsHwm7kyeeg61yasm+WaB?Ps=!7JR1cvXK
z^^uS2BaQRh{O8*l*6b;qp*HPf_6?&CA3qw}*lnHK2m~89WZN-w`+R!*JfCNiN6st@
zhVGvQ?0^1z?PipoE#`3Ca>~ay-<GZjG)NMDn4u>zb0@>iKNn*RW^ua}9|ZExvM%14
kU?Sf0tO+d0c88IHE$h~W!=G2F0UgcY>FVdQ&MBb@0Kivp3IG5A

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_rail_cross.png b/mods/default/textures/default_rail_cross.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8f7a41d7665411f5260a1594c3faafc806c9707
GIT binary patch
literal 421
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o
z>Fdh=fRT+`k4<M)%Qm2pWQl7;iF1B#Zfaf$gL6@8Vo7R>LV0FMhJw4NZ$Nk>pEv^p
zqr9h!V@Sl|<P-;{>}zX&{(pH{y=}=76*o4ihRV;+{yu;FI5`0bcsMx|L3BcrM8W~4
z<PbIXf5(q4W3|{_`||(4O)kd{t^3K-12n*K<D1LN{dq1VEV4R~W_EhH|NI9sGgLN7
ztd(J6?m2NV?~UZyhIt&nPYX%f)%`p6;q!I<wr@LMOKJ!{zrNw``Qyir7nJ=D0t>Ob
zD#;YEC-gS;oAWK6!n{F2R9Gxwfs2eK*O3-h3GUs`ls75vVl4386B8otKJD<UhWY#J
z6hH1*q1UI=ewFdX%IUWrohVwoGr>f>=ULOm7=u~dZp8;P^dvsS9I(j0x99(fvqe$n
zCojHDICzb7Vd`;~yESV93x2;yn`Pl}_11L8z3~Su9#tP_@NTI*nW9|B1Po6GPgg&e
IbxsLQ0LW6Ve*gdg

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_rail_curve.png b/mods/default/textures/default_rail_curve.png
new file mode 100644
index 0000000000000000000000000000000000000000..55ca3f96b0801b99ed16d1d82b8e5fc2157ac850
GIT binary patch
literal 436
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o
z>Fdh=fRT+`Pdl^p#$lk4WQl7;iF1B#Zfaf$gL6@8Vo7R>LV0FMhJw4NZ$Nk>pEv^p
zqn@XWV@Sl|x8WPTm>mUbmBU$Om>d5zCgf}WWZ>q0XtjDy`~<ZJ;w+b*aBo_9Nq5PH
z6YL$SRR`Cf;BZ<OIs1;~y4$JKy*CEG-M3RZE&bU+n<k@dT^E+nP{mfs<O63I8aC-L
zGKjyp(e>=Zr#~GREL-1h%hp+z?DI@}!q%|gb2_%9cI7U-(b}<P`mvQ8Lpn{|cD>pD
z-T$3Mi|)P|eH;J(I<|0~VRT*rS6!)b(V3pRWxY3xoYM_k=Bf+i9Q^mV_lvu)XM3}q
z-@#Juwq`ruXRG6-elgyfuUCDs@GZAm!HVqC*RIF6>d$Df-@CE!?P;A8NbtoR)|8%$
z**m@WPBQ*Hf9oEO&IwZv9qE_PIr#i{_9T{d@8ur6X8LsHqkW=Kr0nj;uV3a|`N+RL
Xw&e8BRckf^gO|b6)z4*}Q$iB};Lf`+

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_rail_t.png b/mods/default/textures/default_rail_t.png
new file mode 100644
index 0000000000000000000000000000000000000000..cce6e1455779a92b097dc708e3e0e908bc52e694
GIT binary patch
literal 433
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o
z>Fdh=fRT+`Pjca+PG_KyWQl7;iF1B#Zfaf$gL6@8Vo7R>LV0FMhJw4NZ$Nk>pEv^p
zqqe7uV@Sl|x8WPJm>dOah1Ut);b^KC@W_|^#HgvmbbaZkPpoE6`y4iW<c`ta&Dt$e
z*RW)Z_#ZBHfe*8MAJ03yY3}YhNB3oYKYRDioilbf+yxAdHOveQ6%BI8=3Oenut3L~
z;Q(`#+e5MV`R_T_1}E%~O*WKGHi~cTF$`myxid33r=>{z%$=N=fTERLg$ftTtZRN3
zv~PGQe%a7(f4#+Z)3npPc@O31$FB|I`u$dF^V7C>j|8^GITWxgKiv1kdEL_HI{xh+
ziddTK`qe&P4Q;DydbTuA-AX_CAk(>0-Lkna_VloFfAG)Gi95E53mHa*GiI(`yJy<+
zeUpCQ*Kkr(S!($4GrN1ipPzm~2QHuH*r%^>UN-vv441Ow-#&dWF@N_%{<&_+X^$Qg
QP*gB@y85}Sb4q9e01QT}uK)l5

literal 0
HcmV?d00001

diff --git a/mods/lava/LICENSE.txt b/mods/lava/LICENSE.txt
new file mode 100644
index 0000000..6f6a256
--- /dev/null
+++ b/mods/lava/LICENSE.txt
@@ -0,0 +1,16 @@
+License for Code
+----------------
+
+Copyright (C) 2016 cd2 (cdqwertz) <cdqwertz@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+http://www.gnu.org/licenses/lgpl-2.1.html
+
+License for Media
+-----------------
+
+CC-BY-SA 3.0 UNPORTED. Created by cd2 (cdqwertz)
diff --git a/mods/lava/init.lua b/mods/lava/init.lua
new file mode 100644
index 0000000..3939ce0
--- /dev/null
+++ b/mods/lava/init.lua
@@ -0,0 +1,71 @@
+minetest.register_node("lava:lava_source", {
+	description = "Lava Source",
+	drawtype = "liquid",
+	tiles = {"lava_lava.png"},
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable = false,
+	buildable_to = true,
+	paramtype = "light",
+	alpha = 160,
+	drowning = 1,
+	liquidtype = "source",
+	liquid_alternative_flowing = "lava:lava_flowing",
+	liquid_alternative_source = "lava:lava_source",
+	liquid_viscosity = 6,
+	groups = {liquid=3, lava = 1},
+	post_effect_color = {a=100, r=200, g=64, b=0},
+	damage_per_second = 4 * 2,
+	light_source = 10,
+})
+
+minetest.register_node("lava:lava_flowing", {
+	description = "Lava Flowing",
+	tiles = {"lava_lava.png"},
+	special_tiles = {
+		{
+			name = "lava_lava.png",
+			backface_culling = false,
+		},
+		{
+			name = "lava_lava.png",
+			backface_culling = true,
+		},
+	},
+	walkable = false,
+	drawtype = "flowingliquid",
+	pointable = false,
+	diggable = false,
+	buildable = false,
+	buildable_to = true,
+	alpha = 160,
+	drowning = 1,
+	paramtype = "light",
+	liquidtype = "flowing",
+	liquid_alternative_flowing = "lava:lava_flowing",
+	liquid_alternative_source = "lava:lava_source",
+	liquid_viscosity = 6,
+	groups = {liquid=3, not_in_creative_inventory=1, lava = 1},
+	post_effect_color = {a=100, r=200, g=64, b=0},
+	damage_per_second = 4 * 2,
+	light_source = 10,
+})
+
+minetest.register_node("lava:basalt", {
+	description = "Basalt",
+	tiles = {"lava_basalt.png"},
+	groups = {cracky = 3, stone = 1},
+})
+
+minetest.register_abm({
+	nodenames = {"group:lava"},
+	neighbors = {"group:water"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		minetest.set_node(pos, {name = "lava:basalt"})
+	end,
+})
+
+minetest.register_alias("mapgen_lava_source", "lava:lava_source")
diff --git a/mods/lava/init.lua~ b/mods/lava/init.lua~
new file mode 100644
index 0000000..3939ce0
--- /dev/null
+++ b/mods/lava/init.lua~
@@ -0,0 +1,71 @@
+minetest.register_node("lava:lava_source", {
+	description = "Lava Source",
+	drawtype = "liquid",
+	tiles = {"lava_lava.png"},
+	walkable = false,
+	pointable = false,
+	diggable = false,
+	buildable = false,
+	buildable_to = true,
+	paramtype = "light",
+	alpha = 160,
+	drowning = 1,
+	liquidtype = "source",
+	liquid_alternative_flowing = "lava:lava_flowing",
+	liquid_alternative_source = "lava:lava_source",
+	liquid_viscosity = 6,
+	groups = {liquid=3, lava = 1},
+	post_effect_color = {a=100, r=200, g=64, b=0},
+	damage_per_second = 4 * 2,
+	light_source = 10,
+})
+
+minetest.register_node("lava:lava_flowing", {
+	description = "Lava Flowing",
+	tiles = {"lava_lava.png"},
+	special_tiles = {
+		{
+			name = "lava_lava.png",
+			backface_culling = false,
+		},
+		{
+			name = "lava_lava.png",
+			backface_culling = true,
+		},
+	},
+	walkable = false,
+	drawtype = "flowingliquid",
+	pointable = false,
+	diggable = false,
+	buildable = false,
+	buildable_to = true,
+	alpha = 160,
+	drowning = 1,
+	paramtype = "light",
+	liquidtype = "flowing",
+	liquid_alternative_flowing = "lava:lava_flowing",
+	liquid_alternative_source = "lava:lava_source",
+	liquid_viscosity = 6,
+	groups = {liquid=3, not_in_creative_inventory=1, lava = 1},
+	post_effect_color = {a=100, r=200, g=64, b=0},
+	damage_per_second = 4 * 2,
+	light_source = 10,
+})
+
+minetest.register_node("lava:basalt", {
+	description = "Basalt",
+	tiles = {"lava_basalt.png"},
+	groups = {cracky = 3, stone = 1},
+})
+
+minetest.register_abm({
+	nodenames = {"group:lava"},
+	neighbors = {"group:water"},
+	interval = 1.0,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		minetest.set_node(pos, {name = "lava:basalt"})
+	end,
+})
+
+minetest.register_alias("mapgen_lava_source", "lava:lava_source")
diff --git a/mods/lava/textures/lava_basalt.png b/mods/lava/textures/lava_basalt.png
new file mode 100644
index 0000000000000000000000000000000000000000..7451fc0898eb291c3b835fa6104e075d673807b5
GIT binary patch
literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WI14-?iy0WWg+Z8+Vb&Z8pdfpR
zr>`sf14cG3b@6FZrB*;8$r9Iy66gHf+|;}h2Ir#G#FEq$h4Rdj3<Y;j-+=H&K5?L;
zeV#6kAs)xihV2$&R^(8bnfvB%g8hwqW~oB%^A4$$ls|qecbduWm_&%AzZTyL^=EVD
z_wW7wc;mHO-_q8mDm@VBF9>40tzRI2MD>(Y$#n+~?@J%VE^90AIeKP#$LDydM%i~7
zMnYFDx?=3K{w0V-*65h9=&6SFHn_OIVlgk6)1dM7#q5N~;p*+NK1bLl#-54);<#>l
z!Q{H1ZjWuGHm=+w%i6DS*UYMMyZRj#tvRRDCMvm?6&;oNtE92(n&3t5-jtZNz18|Q
QK%X#py85}Sb4q9e09x>Ma{vGU

literal 0
HcmV?d00001

diff --git a/mods/lava/textures/lava_lava.png b/mods/lava/textures/lava_lava.png
new file mode 100644
index 0000000000000000000000000000000000000000..d04f1ca013a074fc6427ba339185c2a9cd3f64d8
GIT binary patch
literal 310
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WI14-?iy0WWg+Z8+Vb&Z8pdfpR
zr>`sf14cG3B?G^76A_@0WQl7;iF1B#Zfaf$gL6@8Vo7R>LV0FMhJw4NZ$Nk>pEyv_
z22U5q5Rc<`!wmTv6nI>Ud3^qyIsYRh{?U^Mj}k6PtX{a)wbSRwiLWoVhVROhaXNdo
z{S^0>)0&s+;==wj=q)%h>B0w|M}55i*Ii3!KcOiXtmQS)tSyRp_bp4;fA&2r{_K{P
zKf?AlpWrRuw4r&6)k3$-f8Ndhu4RS=5nHAjGzjjkFt*s`bbIcfdndjW2LE&kS>AE~
zVvv(KW6M^@#rrF`_DSYneWNq$`=LwgQp>)Xzh)~5ioNkZ-l`Sob_P#ZKbLh*2~7Yn
COn71d

literal 0
HcmV?d00001

diff --git a/mods/legendary_items/init.lua b/mods/legendary_items/init.lua
index fbc1255..52856d8 100644
--- a/mods/legendary_items/init.lua
+++ b/mods/legendary_items/init.lua
@@ -1,7 +1,7 @@
 legendary_items = {}
 legendary_items.register_rare_weapon = function(name, forlevel, def)
 	minetest.register_tool(":legendary_items:"..name, {
-		description = def.description.."\n For Level: ".. tostring(forlevel).. "\n Damage: " .. tostring(def.damage),
+		description = def.description.."\n For Level: ".. tostring(forlevel).. "\n Damage: " .. tostring(def.damage) .. "\n Rare Item",
 		inventory_image = def.inventory_image,
 		wield_scale = def.wield_scale,
 		tool_capabilities = {
@@ -11,6 +11,17 @@ legendary_items.register_rare_weapon = function(name, forlevel, def)
 	})
 end
 
+-- rare
+
+legendary_items.register_rare_weapon("old_hammer", 3, {
+	description = "Old Hammer",
+	inventory_image = "legendary_items_old_hammer.png",
+	wield_scale = {x = 2, y = 2, z =1},
+	damage = 20,
+})
+
+-- super rare
+
 minetest.register_craftitem("legendary_items:paper", {
 	description = "The Legendary Paper",
 	inventory_image = "legendary_items_paper.png",
diff --git a/mods/legendary_items/init.lua~ b/mods/legendary_items/init.lua~
index fbc1255..52856d8 100644
--- a/mods/legendary_items/init.lua~
+++ b/mods/legendary_items/init.lua~
@@ -1,7 +1,7 @@
 legendary_items = {}
 legendary_items.register_rare_weapon = function(name, forlevel, def)
 	minetest.register_tool(":legendary_items:"..name, {
-		description = def.description.."\n For Level: ".. tostring(forlevel).. "\n Damage: " .. tostring(def.damage),
+		description = def.description.."\n For Level: ".. tostring(forlevel).. "\n Damage: " .. tostring(def.damage) .. "\n Rare Item",
 		inventory_image = def.inventory_image,
 		wield_scale = def.wield_scale,
 		tool_capabilities = {
@@ -11,6 +11,17 @@ legendary_items.register_rare_weapon = function(name, forlevel, def)
 	})
 end
 
+-- rare
+
+legendary_items.register_rare_weapon("old_hammer", 3, {
+	description = "Old Hammer",
+	inventory_image = "legendary_items_old_hammer.png",
+	wield_scale = {x = 2, y = 2, z =1},
+	damage = 20,
+})
+
+-- super rare
+
 minetest.register_craftitem("legendary_items:paper", {
 	description = "The Legendary Paper",
 	inventory_image = "legendary_items_paper.png",
diff --git a/mods/legendary_items/textures/legendary_items_old_hammer.png b/mods/legendary_items/textures/legendary_items_old_hammer.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed762a9faf4cae6373ba1e044a09a0b0d7e62220
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#0V5kX6U*<ZeI`I5$r9Iy66gHf+|;}h2Ir#G#FEq$h4Rdj3<Y;j-+=H&K5?L;
z#hxyXAr_~T6Bd}xFwehNU-PM_#iahnhei-sxMBsz>L|4&6JrAd1Cy`M{;A($C^>6z
z;rjLO^EH?!O`5d9>ig;cza{h%RYW>YNL5IPK76#nAo0-hoko@)>_0b~OU#;>+|D^a
zO-_%mP5*wK!4*+|x5AYT4Gec?`?Q#BKOfs4Z0t8Xx>)&txElLEb+tf4p={%WQ#|_8
lb}&B4YGYU0Icp^oLrG42`;Dt%fk5Xnc)I$ztaD0e0sx(IY9s&v

literal 0
HcmV?d00001

diff --git a/mods/quests/init.lua b/mods/quests/init.lua
index 00502aa..b40b62f 100644
--- a/mods/quests/init.lua
+++ b/mods/quests/init.lua
@@ -5,9 +5,16 @@ minetest.register_node("quests:quest_block", {
 	on_punch = function(pos, node, player, pointed_thing)
 		
 		local meta = minetest.get_meta(pos)
+		if meta:get_string("item") ~= "" then
+			return
+		end
 		local items = {"default:dirt", "default:sand", "default:iron_lump", "default:stone_item", "default:string"}
 		local item = items[math.random(5)]
-		meta:set_string("infotext", "Bring me some " .. item .. ", pls :)")
+		if minetest.registered_nodes[item] then
+			meta:set_string("infotext", "Bring me some " .. minetest.registered_nodes[item].description .. ", pls :)")
+		else
+			meta:set_string("infotext", "Bring me some " .. minetest.registered_craftitems[item].description .. ", pls :)")
+		end
 		meta:set_string("item", item)
 	end,
 
@@ -20,7 +27,7 @@ minetest.register_node("quests:quest_block", {
 		end
 		if itemstack:to_table().name == meta:get_string("item") then
 			meta:set_string("infotext", "Thank you!")
-			player:get_inventory():add_item("main", {name = "default:xp"})
+			player:get_inventory():add_item("main", {name = "default:xp",count = math.random(10, 30)})
 			minetest.add_particlespawner({
 				amount = 500,
 				time = 5,
diff --git a/mods/quests/init.lua~ b/mods/quests/init.lua~
index 00502aa..b40b62f 100644
--- a/mods/quests/init.lua~
+++ b/mods/quests/init.lua~
@@ -5,9 +5,16 @@ minetest.register_node("quests:quest_block", {
 	on_punch = function(pos, node, player, pointed_thing)
 		
 		local meta = minetest.get_meta(pos)
+		if meta:get_string("item") ~= "" then
+			return
+		end
 		local items = {"default:dirt", "default:sand", "default:iron_lump", "default:stone_item", "default:string"}
 		local item = items[math.random(5)]
-		meta:set_string("infotext", "Bring me some " .. item .. ", pls :)")
+		if minetest.registered_nodes[item] then
+			meta:set_string("infotext", "Bring me some " .. minetest.registered_nodes[item].description .. ", pls :)")
+		else
+			meta:set_string("infotext", "Bring me some " .. minetest.registered_craftitems[item].description .. ", pls :)")
+		end
 		meta:set_string("item", item)
 	end,
 
@@ -20,7 +27,7 @@ minetest.register_node("quests:quest_block", {
 		end
 		if itemstack:to_table().name == meta:get_string("item") then
 			meta:set_string("infotext", "Thank you!")
-			player:get_inventory():add_item("main", {name = "default:xp"})
+			player:get_inventory():add_item("main", {name = "default:xp",count = math.random(10, 30)})
 			minetest.add_particlespawner({
 				amount = 500,
 				time = 5,
diff --git a/mods/torch/LICENSE.txt b/mods/torch/LICENSE.txt
new file mode 100644
index 0000000..6f6a256
--- /dev/null
+++ b/mods/torch/LICENSE.txt
@@ -0,0 +1,16 @@
+License for Code
+----------------
+
+Copyright (C) 2016 cd2 (cdqwertz) <cdqwertz@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+http://www.gnu.org/licenses/lgpl-2.1.html
+
+License for Media
+-----------------
+
+CC-BY-SA 3.0 UNPORTED. Created by cd2 (cdqwertz)
diff --git a/mods/torch/init.lua b/mods/torch/init.lua
new file mode 100644
index 0000000..1c17888
--- /dev/null
+++ b/mods/torch/init.lua
@@ -0,0 +1,56 @@
+minetest.register_node("torch:torch", {
+	description = "Torch",
+	tiles = {"torch_wood.png"},
+	drawtype = "mesh",
+	mesh = "torch_torch.obj",
+	groups = {crumbly = 3},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	light_source = 14,
+	walkable = false,
+	inventory_image = "torch_torch_inv.png",
+	wield_image = "torch_torch_inv.png",
+})
+
+minetest.register_abm({
+	nodenames = {"torch:torch"},
+	interval = 10.0,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		pos.y = pos.y + 0.2
+		minetest.add_particlespawner({
+			amount = 10,
+			time = 10,
+			minpos = pos,
+			maxpos = pos,
+			minvel = {x=0, y=0.1, z=0},
+			maxvel = {x=0, y=0, z=0},
+			minacc = {x=0, y=0, z=0},
+			maxacc = {x=0, y=0, z=0},
+			minexptime = 1,
+			maxexptime = 1,
+			minsize = 1,
+			maxsize = 1,
+			collisiondetection = false,
+			vertical = false,
+			texture = "torch_flame.png",
+		})
+		minetest.add_particlespawner({
+			amount = 50,
+			time = 10,
+			minpos = pos,
+			maxpos = pos,
+			minvel = {x=0, y=0.5, z=0},
+			maxvel = {x=0, y=0, z=0},
+			minacc = {x=0, y=0, z=0},
+			maxacc = {x=0, y=0, z=0},
+			minexptime = 1,
+			maxexptime = 1,
+			minsize = 3,
+			maxsize = 3,
+			collisiondetection = false,
+			vertical = false,
+			texture = "torch_smoke.png",
+		})
+	end,
+})
diff --git a/mods/torch/init.lua~ b/mods/torch/init.lua~
new file mode 100644
index 0000000..1c17888
--- /dev/null
+++ b/mods/torch/init.lua~
@@ -0,0 +1,56 @@
+minetest.register_node("torch:torch", {
+	description = "Torch",
+	tiles = {"torch_wood.png"},
+	drawtype = "mesh",
+	mesh = "torch_torch.obj",
+	groups = {crumbly = 3},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	light_source = 14,
+	walkable = false,
+	inventory_image = "torch_torch_inv.png",
+	wield_image = "torch_torch_inv.png",
+})
+
+minetest.register_abm({
+	nodenames = {"torch:torch"},
+	interval = 10.0,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		pos.y = pos.y + 0.2
+		minetest.add_particlespawner({
+			amount = 10,
+			time = 10,
+			minpos = pos,
+			maxpos = pos,
+			minvel = {x=0, y=0.1, z=0},
+			maxvel = {x=0, y=0, z=0},
+			minacc = {x=0, y=0, z=0},
+			maxacc = {x=0, y=0, z=0},
+			minexptime = 1,
+			maxexptime = 1,
+			minsize = 1,
+			maxsize = 1,
+			collisiondetection = false,
+			vertical = false,
+			texture = "torch_flame.png",
+		})
+		minetest.add_particlespawner({
+			amount = 50,
+			time = 10,
+			minpos = pos,
+			maxpos = pos,
+			minvel = {x=0, y=0.5, z=0},
+			maxvel = {x=0, y=0, z=0},
+			minacc = {x=0, y=0, z=0},
+			maxacc = {x=0, y=0, z=0},
+			minexptime = 1,
+			maxexptime = 1,
+			minsize = 3,
+			maxsize = 3,
+			collisiondetection = false,
+			vertical = false,
+			texture = "torch_smoke.png",
+		})
+	end,
+})
diff --git a/mods/torch/models/torch_torch.mtl b/mods/torch/models/torch_torch.mtl
new file mode 100644
index 0000000..70d3ba1
--- /dev/null
+++ b/mods/torch/models/torch_torch.mtl
@@ -0,0 +1,10 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl None
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
diff --git a/mods/torch/models/torch_torch.obj b/mods/torch/models/torch_torch.obj
new file mode 100644
index 0000000..0273dd2
--- /dev/null
+++ b/mods/torch/models/torch_torch.obj
@@ -0,0 +1,40 @@
+# Blender v2.69 (sub 0) OBJ File: ''
+# www.blender.org
+mtllib torch_torch.mtl
+o Cube.001
+v -0.075000 -0.555968 1.002726
+v -0.075000 -0.619360 0.866779
+v 0.075000 -0.619360 0.866779
+v 0.075000 -0.555968 1.002726
+v -0.075000 0.220916 0.159460
+v -0.075000 0.157523 0.023513
+v 0.075000 0.157523 0.023513
+v 0.075000 0.220916 0.159460
+vt 0.159707 0.720916
+vt 0.295653 0.657523
+vt -0.366779 -0.119360
+vt -0.502726 -0.055968
+vt 0.425000 0.657523
+vt 0.575000 0.657523
+vt 0.575000 -0.119360
+vt 0.425000 -0.119360
+vt 0.575000 0.720916
+vt 0.425000 0.720916
+vt 0.425000 -0.055968
+vt 0.575000 -0.055968
+vt 0.425000 0.497274
+vt 0.425000 0.633221
+vt 0.575000 0.633221
+vt 0.575000 0.497274
+vt 0.575000 0.159707
+vt 0.575000 0.295653
+vt 0.425000 0.295653
+vt 0.425000 0.159707
+usemtl None
+s off
+f 5/1 6/2 2/3 1/4
+f 6/5 7/6 3/7 2/8
+f 7/2 8/1 4/4 3/3
+f 8/9 5/10 1/11 4/12
+f 1/13 2/14 3/15 4/16
+f 8/17 7/18 6/19 5/20
diff --git a/mods/torch/textures/torch_flame.png b/mods/torch/textures/torch_flame.png
new file mode 100644
index 0000000000000000000000000000000000000000..60ce377d43692a9daee70d1e93e683b5883043c1
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNBO4blM@i+D=RhIJ64!_l=ltB<)VvY~=c3falGGH1
z^30M91$R&1fbd2>aiAgxPZ!4!i_^&o60BQTr~m!)FaF!--~Il)%64aY!~)K7va#Lu
zoxNdI>cQ1FMLl~CzPC4Xo}uwo?P%Nr3judVQ3i$pU#YmAMzJA4vlu*G{an^LB{Ts5
D1;Iez

literal 0
HcmV?d00001

diff --git a/mods/torch/textures/torch_smoke.png b/mods/torch/textures/torch_smoke.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f951cc096d0f5c306a670c6505dc64ddc0dffba
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPNBO8|x%Z91nKt@THxJHyX=jZ08=9Mrw7o{eaq^2m8
zXO?6rxO@5rgg5eu0~Kj_x;TbdoK8-V2wAXj;Y0hQvsNaZxKMagfbU9UshJ~p$3+{1
dKrdqkh99#H-)=No+6>gg;OXk;vd$@?2>=slI2`~0

literal 0
HcmV?d00001

diff --git a/mods/torch/textures/torch_torch_inv.png b/mods/torch/textures/torch_torch_inv.png
new file mode 100644
index 0000000000000000000000000000000000000000..53970287979b1517584619f9c6b5869f18293622
GIT binary patch
literal 265
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#0V5liJZE*+mqkD!$r9Iy66gHf+|;}h2Ir#G#FEq$h4Rdj3<Y;j-+=H&K5?L;
zW=|K#5R22v2?~NSdf$H6@4WHezURDCmm6Cm8(Z6U9v+@U9EEC=*0g6`TYKw>$0Y6t
z+mabwb~<bqPh6aLRn6^*fx@YVYj;lk-@%ij;`VuZzP$tp+<Lz5c))p&&a^#j0*fV=
zGaku0mc^hs%aBJQ)VPcBNk*Hr!@9HzC#7)XPzHu`OM};}Q)QeBbPj{3tDnm{r-UW|
DNTF9Z

literal 0
HcmV?d00001

diff --git a/mods/torch/textures/torch_wood.png b/mods/torch/textures/torch_wood.png
new file mode 100644
index 0000000000000000000000000000000000000000..2980f68e6bfadf9a26be5008ae2254c10e068584
GIT binary patch
literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WI14-?iy0WWg+Z8+Vb&Z8pdfpR
zr>`sf14cG3F@vwZ#~%ZQBuiW)N}Tg^b5rw57@Uhz6H8K46v{J8G8EiBeFMT9`NV;W
zW_Y?dhIkxLesiWjWr1o!(gH(;Q%(Hwbpct7s%{r-I$C~Kve(LRd?=WZqEXafJn>1n
z(W0(S8*`=R?eg~gzbqt5#1z;qgl{%_r_8x*+wsA=tLKQ>6(vdIe4{|^tpS(We{`R3
z>|^%gQZ=e|2x>@pcGhvG&&4^GBCC8pF)X=~sHA*v#RFz7v&kz2Tn=ydYZKw}xw0yv
bfRRB_N_*l)(To*9H!^s-`njxgN@xNAp>1C4

literal 0
HcmV?d00001