From a0d08648e1b3055e2050ee5c5e8aaf03fe10185c Mon Sep 17 00:00:00 2001
From: cale <cdqwertz@gmail.com>
Date: Sun, 5 Jun 2016 13:13:09 +0200
Subject: [PATCH] fixed mining system + removed some blocks

---
 mods/default/craft.lua                        |  18 ++++
 mods/default/nodes.lua                        |  66 ++------------
 mods/default/textures/default_pick_copper.png | Bin 0 -> 292 bytes
 .../default/textures/default_pick_diamond.png | Bin 0 -> 354 bytes
 mods/default/tools.lua                        |  83 +++++++++++++-----
 mods/furnace/init.lua                         |  16 ++++
 mods/furnace/textures/furnace_copper_rod.png  | Bin 0 -> 254 bytes
 mods/furnace/textures/furnace_diamond_rod.png | Bin 254 -> 305 bytes
 8 files changed, 105 insertions(+), 78 deletions(-)
 create mode 100644 mods/default/textures/default_pick_copper.png
 create mode 100644 mods/default/textures/default_pick_diamond.png
 create mode 100644 mods/furnace/textures/furnace_copper_rod.png

diff --git a/mods/default/craft.lua b/mods/default/craft.lua
index afa9e4a..452aa16 100644
--- a/mods/default/craft.lua
+++ b/mods/default/craft.lua
@@ -304,6 +304,24 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "default:pick_copper",
+	recipe = {
+		{"", "furnace:copper_rod", ""},
+		{"", "default:string_strong", ""},
+		{"", "default:stick", ""},
+	}
+})
+
+minetest.register_craft({
+	output = "default:pick_diamond",
+	recipe = {
+		{"", "furnace:diamond_rod", ""},
+		{"", "default:string_strong", ""},
+		{"", "default:stick", ""},
+	}
+})
+
 minetest.register_craft({
 	output = "default:axe",
 	recipe = {
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 4ee952f..212bc69 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -190,9 +190,9 @@ minetest.register_node("default:treasure_chest", {
 		inv:set_size("main", 8*4)
 		local items = default.treasure_chest_items
 		local item = items[math.random(#items)]
-		inv:add_item("main", {name = item, count = math.random(2,10)})
+		inv:add_item("main", {name = item, count = math.random(1,3)})
 		local item = items[math.random(#items)]
-		inv:add_item("main", {name = item, count = math.random(2,10)})
+		inv:add_item("main", {name = item, count = math.random(1,3)})
 	end,
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
 		local meta = minetest.get_meta(pos)
@@ -615,24 +615,6 @@ minetest.register_node("default:frame", {
 	groups = {choppy = 3},
 })
 
-minetest.register_node("default:frame_with_wood", {
-	description = "Frame with Wood",
-	tiles = {"default_wood.png^default_frame.png"},
-	groups = {choppy = 3},
-})
-
-minetest.register_node("default:frame_with_stonebrick", {
-	description = "Frame with Stonebrick",
-	tiles = {"default_stonebrick.png^default_frame.png"},
-	groups = {choppy = 3},
-})
-
-minetest.register_node("default:frame_with_log", {
-	description = "Frame with Log",
-	tiles = {"default_log.png^default_frame.png"},
-	groups = {choppy = 3},
-})
-
 -- glass
 
 minetest.register_node("default:glass", {
@@ -644,25 +626,6 @@ minetest.register_node("default:glass", {
 	groups = {crumbly = 3},
 })
 
-minetest.register_node("default:glass_with_wood", {
-	description = "Glass with Wood",
-	tiles = {"default_wood.png^default_glass.png"},
-	groups = {crumbly = 3},
-})
-
-minetest.register_node("default:glass_with_log", {
-	description = "Glass with Log",
-	tiles = {"default_log.png^default_glass.png"},
-	groups = {crumbly = 3},
-})
-
-minetest.register_node("default:glass_with_stonebrick", {
-	description = "Glass with Stonebrick",
-	tiles = {"default_stonebrick.png^default_glass.png"},
-	groups = {crumbly = 3},
-})
-
-
 -- floor
 
 default.register_floor = function(color)
@@ -685,7 +648,7 @@ default.register_floor("black")
 default.register_wool = function(color)
 	minetest.register_node("default:wool_"..color, {
 		description = color.." Wool",
-		tiles = {"default_wool.png^[colorize:"..color..":120"},
+		tiles = {"default_wool.png^[colorize:"..color..":130"},
 		groups = {crumbly=3},
 	})
 end
@@ -707,7 +670,6 @@ minetest.register_node("default:stone", {
 		max_items = 1,
 		items = {
 			{items = {'default:flint'},rarity = 5},
-			{items = {'default:stone_with_silver'},rarity = 60},
 			{items = {"default:stone_item 5"}},
 		}
 	},
@@ -834,21 +796,21 @@ minetest.register_node("default:stone_with_iron", {
 minetest.register_node("default:stone_with_copper", {
 	description = "Stone with Copper",
 	tiles = {"default_stone_with_copper.png"},
-	groups = {cracky = 2},
+	groups = {cracky = 1},
 	sounds = default.sounds.stone(),
 })
 
 minetest.register_node("default:stone_with_zinc", {
 	description = "Stone with Zinc",
 	tiles = {"default_stone_with_zinc.png"},
-	groups = {cracky = 3},
+	groups = {cracky = 1},
 	sounds = default.sounds.stone(),
 })
 
 minetest.register_node("default:stone_with_silver", {
 	description = "Stone with Silver",
 	tiles = {"default_stone_with_silver.png"},
-	groups = {cracky = 3},
+	groups = {hard = 3},
 	sounds = default.sounds.stone(),
 })
 
@@ -862,7 +824,7 @@ minetest.register_node("default:stone_with_gold", {
 minetest.register_node("default:stone_with_diamond", {
 	description = "Stone with Diamond",
 	tiles = {"default_stone_with_diamond.png"},
-	groups = {cracky = 1},
+	groups = {hard = 2},
 	drop = "default:diamond",
 	sounds = default.sounds.stone(),
 })
@@ -870,7 +832,7 @@ minetest.register_node("default:stone_with_diamond", {
 minetest.register_node("default:stone_with_ruby", {
 	description = "Stone with Ruby",
 	tiles = {"default_stone_with_ruby.png"},
-	groups = {cracky = 1},
+	groups = {hard = 1},
 	drop = "default:ruby",
 	sounds = default.sounds.stone(),
 })
@@ -915,15 +877,3 @@ minetest.register_node("default:rail", {
 	walkable = false,
 	groups = {choppy = 1, attached_node = 1},
 })
-
-minetest.register_node("default:wire", {
-	description = "Wire",
-	drawtype = "raillike",
-	tiles = {"default_wire.png", "default_wire_curve.png",
-		"default_wire_t.png", "default_wire_cross.png"},
-	inventory_image = "default_wire.png",
-	wield_image = "default_wire.png",
-	paramtype = "light",
-	walkable = false,
-	groups = {choppy = 1, attached_node = 1},
-})
diff --git a/mods/default/textures/default_pick_copper.png b/mods/default/textures/default_pick_copper.png
new file mode 100644
index 0000000000000000000000000000000000000000..195e1c5073956b90683927dff5a2009011c4f0dc
GIT binary patch
literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPN8!M+Ei)D6(8Bj>F#5JPCIX^cyHLrxhxhOTUBsE2$
zJhLQ2!QIn0AiR-J9H^+r)5S5w;&gJt0s(_0;hO65<MkzmiK+Z+vLZKd{`*nDzk1;f
zo<x;nGyTu|{XTyH2ox8zJQQ+E`rCC{KrP8cfA)<J^{4yT3*IZX3kn;~vakPn45UgS
zch1p{JPzTFvo5dREpd_eU^au<*&7VPs<SpqIdrA<WT=E1cQHQ6Xp?qWmsTM$Vf9Qc
a1_lm><Q8LtE<>QZ7(8A5T-G@yGywpwu482Y

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_pick_diamond.png b/mods/default/textures/default_pick_diamond.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa0fd405a32c1316a19014ded7fddbd483b1f4c2
GIT binary patch
literal 354
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPN8!M-vdE0JI1)z{*iEBiObAE1aYF-J0b5UwyNotBh
zd1gt5g1e`0KzJjcI8f0kPZ!4!i_>c-8S*tb2)O>A<dM&)I{ksrwl?bp=@X8%9XoeU
zxPn32+kZo=VO#>Y&x}I?y{waZt_rDguX&-Z{=4p<AKMSXL@BMM6~?=g{>fb5tiaKe
zFMD}Hhd`=m2S;Hcn_yz0<)+eRwIDAxhV!4JW`8lVd>iR?(o6H*U#H1$t4?0N%g7)g
zp1!Bu!tB%Ae+&#Qi5izK{lC$ftbKmc)C-E8vz1S+ddH>~IeA*$cfMUIzK@<gV~CF2
rE^z<U+IAC{b<Az2zVfx5s(;8@uUF&25zAN)^c91rtDnm{r-UW|unvIm

literal 0
HcmV?d00001

diff --git a/mods/default/tools.lua b/mods/default/tools.lua
index 5b40a2d..a66fe3f 100644
--- a/mods/default/tools.lua
+++ b/mods/default/tools.lua
@@ -14,9 +14,10 @@ minetest.register_item(":", {
 	}
 })
 
+-- wood
 
 minetest.register_tool("default:simple_hammer", {
-	description = "Simple Hammer\n For Level: - \n Damage: 8",
+	description = "Simple Hammer",
 	inventory_image = "default_basic_hammer.png",
 	tool_capabilities = {
 		max_drop_level=3,
@@ -24,12 +25,14 @@ minetest.register_tool("default:simple_hammer", {
 			cracky={times={[2]=2.00, [3]=1.00}, uses=10, maxlevel=1},
 			choppy={times={[2]=1.50, [3]=1.00}, uses=20, maxlevel=1}
 		},
-		damage_groups = {fleshy=8},
+		damage_groups = {fleshy=1},
 	}
 })
 
+-- flint
+
 minetest.register_tool("default:flint_pick", {
-	description = "Flint Pick\n For Level: - \n Damage: 8",
+	description = "Flint Pick",
 	inventory_image = "default_flint_pick.png",
 	tool_capabilities = {
 		max_drop_level=3,
@@ -37,12 +40,14 @@ minetest.register_tool("default:flint_pick", {
 			cracky={times={[2]=1.50, [3]=0.80}, uses=50, maxlevel=1},
 			choppy={times={[2]=1.50, [3]=1.00}, uses=20, maxlevel=1}
 		},
-		damage_groups = {fleshy=8},
+		damage_groups = {fleshy=2},
 	}
 })
 
+-- stone
+
 minetest.register_tool("default:axe_stone", {
-	description = "Stone Axe\n For Level: - \n Damage: 5",
+	description = "Stone Axe",
 	inventory_image = "default_axe_stone.png",
 	tool_capabilities = {
 		max_drop_level=3,
@@ -50,36 +55,38 @@ minetest.register_tool("default:axe_stone", {
 			cracky={times={[3]=1.50}, uses=5, maxlevel=1},
 			choppy={times={[2]=3.50, [3]=1.10}, uses=10, maxlevel=1}
 		},
-		damage_groups = {fleshy=5},
+		damage_groups = {fleshy=1},
 	}
 })
 
+-- iron
+
 minetest.register_tool("default:axe", {
-	description = "Axe\n For Level: - \n Damage: 13",
+	description = "Iron Axe",
 	inventory_image = "default_axe.png",
 	tool_capabilities = {
 		max_drop_level=3,
 		groupcaps= {
 			choppy={times={[1]=1.00, [2]=0.40, [3]=0.30}, uses=70, maxlevel=1}
 		},
-		damage_groups = {fleshy=13},
+		damage_groups = {fleshy=2},
 	}
 })
 
 minetest.register_tool("default:saw", {
-	description = "Saw\n For Level: - \n Damage: 13",
+	description = "Iron Saw",
 	inventory_image = "default_saw.png",
 	tool_capabilities = {
 		max_drop_level=3,
 		groupcaps= {
 			choppy={times={[1]=0.30, [2]=0.20, [3]=0.10}, uses=70, maxlevel=1}
 		},
-		damage_groups = {fleshy=13},
+		damage_groups = {fleshy=1},
 	}
 })
 
 minetest.register_tool("default:pick", {
-	description = "Pick\n For Level: - \n Damage: 20",
+	description = "Iron Pick",
 	inventory_image = "default_pick.png",
 	tool_capabilities = {
 		max_drop_level=3,
@@ -87,36 +94,72 @@ minetest.register_tool("default:pick", {
 			cracky={times={[1]=1.90, [2]=0.50, [3]=0.30}, uses=50, maxlevel=1},
 			choppy={times={[2]=3.50, [3]=1.10}, uses=50, maxlevel=1}
 		},
-		damage_groups = {fleshy=20},
+		damage_groups = {fleshy=2},
 	}
 })
 
 minetest.register_tool("default:shovel", {
-	description = "Shovel\n For Level: - \n Damage: 7",
+	description = "Iron Shovel",
 	inventory_image = "default_shovel.png",
 	tool_capabilities = {
 		max_drop_level=3,
 		groupcaps= {
 			crumbly={times={[1]=0.90, [2]=0.40, [3]=0.20}, uses=100, maxlevel=1}
 		},
-		damage_groups = {fleshy=7},
+		damage_groups = {fleshy=1},
 	}
 })
 
+-- blade
+
 minetest.register_tool("default:blade", {
-	description = "Blade\n Level: - \n Damage: 10",
+	description = "Blade",
 	inventory_image = "default_blade.png",
 	tool_capabilities = {
 		max_drop_level=3,
 		groupcaps= {
 			leaves={times={[1]=0.50}, uses=1000, maxlevel=1}
 		},
-		damage_groups = {fleshy=10},
+		damage_groups = {fleshy=5},
 	}
 })
 
+-- copper
+
+minetest.register_tool("default:pick_copper", {
+	description = "Copper Pick",
+	inventory_image = "default_pick_copper.png",
+	tool_capabilities = {
+		max_drop_level=3,
+		groupcaps= {
+			cracky={times={[1]=1.00, [2]=0.30, [3]=0.20}, uses=150, maxlevel=1},
+			hard={times={[2]=2.30, [3]=1.50}, uses=50, maxlevel=100},
+			choppy={times={[2]=3.50, [3]=1.10}, uses=50, maxlevel=50}
+		},
+		damage_groups = {fleshy=3},
+	}
+})
+
+-- diamond
+
+minetest.register_tool("default:pick_diamond", {
+	description = "Diamond Pick",
+	inventory_image = "default_pick_diamond.png",
+	tool_capabilities = {
+		max_drop_level=3,
+		groupcaps= {
+			cracky={times={[1]=0.40, [2]=0.30, [3]=0.20}, uses=150, maxlevel=1},
+			hard={times={[1]=1.90, [2]=1.00, [3]=0.7}, uses=150, maxlevel=1},
+			choppy={times={[2]=3.50, [3]=1.10}, uses=100, maxlevel=1}
+		},
+		damage_groups = {fleshy=3},
+	}
+})
+
+-- other
+
 minetest.register_tool("default:knife", {
-	description = "Knife\n Level: - \n Damage: 12",
+	description = "Knife",
 	inventory_image = "default_knife.png",
 	tool_capabilities = {
 		max_drop_level=3,
@@ -124,12 +167,12 @@ minetest.register_tool("default:knife", {
 			leaves={times={[1]=0.10}, uses=1000, maxlevel=1},
 			choppy={times={[3]=2.00}, uses=50, maxlevel=1}
 		},
-		damage_groups = {fleshy=12},
+		damage_groups = {fleshy=7},
 	}
 })
 
 minetest.register_tool("default:knife_big", {
-	description = "Knife (big)\n Level: - \n Damage: 15",
+	description = "Knife (big)",
 	inventory_image = "default_knife.png",
 	wield_scale = {x = 1.5, y=1.5, z = 1},
 	tool_capabilities = {
@@ -138,7 +181,7 @@ minetest.register_tool("default:knife_big", {
 			leaves={times={[1]=0.05}, uses=1000, maxlevel=1},
 			choppy={times={[3]=2.00}, uses=50, maxlevel=1}
 		},
-		damage_groups = {fleshy=15},
+		damage_groups = {fleshy=8},
 	}
 })
 
diff --git a/mods/furnace/init.lua b/mods/furnace/init.lua
index fd2e2d9..1b99523 100644
--- a/mods/furnace/init.lua
+++ b/mods/furnace/init.lua
@@ -46,6 +46,9 @@ minetest.register_abm({
 				elseif myinv:contains_item("main", {name = "default:stone_with_gold"}) then
 					minetest.get_meta(patternpos):get_inventory():add_item("main", {name = "furnace:gold_rod"})
 					myinv:remove_item("main", {name = "default:stone_with_gold"})
+				elseif myinv:contains_item("main", {name = "default:stone_with_copper"}) then
+					minetest.get_meta(patternpos):get_inventory():add_item("main", {name = "furnace:copper_rod"})
+					myinv:remove_item("main", {name = "default:stone_with_copper"})
 				end
 			end
 			if pattern == "furnace:pattern_blade" then
@@ -181,6 +184,11 @@ minetest.register_craftitem("furnace:iron_rod", {
 	inventory_image = "furnace_iron_rod.png",
 })
 
+minetest.register_craftitem("furnace:copper_rod", {
+	description = "Copper Rod",
+	inventory_image = "furnace_copper_rod.png",
+})
+
 minetest.register_craftitem("furnace:gold_rod", {
 	description = "Gold Rod",
 	inventory_image = "furnace_gold_rod.png",
@@ -272,3 +280,11 @@ minetest.register_node("furnace:steel_frame", {
 	paramtype = "light",
 	groups = {choppy = 2},
 })
+
+
+minetest.register_craft({
+	output = "furnace:diamond_rod",
+	recipe = {
+		{"furnace:iron_rod", "default:diamond"},
+	}
+})
diff --git a/mods/furnace/textures/furnace_copper_rod.png b/mods/furnace/textures/furnace_copper_rod.png
new file mode 100644
index 0000000000000000000000000000000000000000..b08d588c1a591fafd6da84f122c55c45dc7ab5d8
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPN8!MNxWuNIeexQ(KiEBiObAE1aYF-J0b5UwyNotBh
zd1gt5g1e`0KzJjcI8afVr;B5V#p&b(366r|<7@thUn~2Uo&W?&?w{YUe=k}0|Hr8V
zAmFhs?eGgVw@Ew)md(syF340n#ZWVgQ_8`^IF7mFV$WrUB-3Qm29dK8Y!g;V9%U#p
mIn1jNZfv7JVf9Qc28J!mTDVqkW4H#ik-^i|&t;ucLK6T4*i!-k

literal 0
HcmV?d00001

diff --git a/mods/furnace/textures/furnace_diamond_rod.png b/mods/furnace/textures/furnace_diamond_rod.png
index 96db0fc17461adcb6d99cb2e9695811489afa44d..9e9d18930bc22bd02095b8708197afe7585dae58 100644
GIT binary patch
delta 195
zcmV;!06hQx0kHy*QV9kH3MDTryWH53TPS~-Nkl<ZILpP8F%Ci@5CsQJJc9PtdJnw;
zXYma7o?|O5xP<WnR$ACfwy?m8pGc4oHvjdr`-TlLMZEV>L?VFw2R<y{s44)n9(ez_
z#KrB&`u@T>X8=sk<`4p^I>5~X5`0|EId67fjO}sG;n6oJIp;CG&Ux%u?HXKEXsIv#
xQ=zqXaX{@<wb)cUZSH}Gh)CRCPjQl;`2jPkb|BZM+#Ub`002ovPDHLkV1j_LS_J?A

delta 143
zcmdnU^p9~u5GNzIfDogy%AaKuqcy72JY5_^EKVmUNN`NpU32^Y5mxDc#s)wzaq-X7
z=i_<o>;5MufPhN)=TBDz+$QlHST-|*xgb;R6hqA{PALZu<2dGyi#?Yal1!6L8$`}Z
uuuWJcd6c2Z<S?&7xUr4?gw->(7#J9zHpfrTn)H+b2s~Z=T-G@yGywpb{Wd`W