X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=mods%2Fredstone%2Fore.lua;h=1195aa95221adfeb8a698303bdaea1c6b7f9e951;hb=2aff6d26b9b15c5171563ca77c178399b4b05f16;hp=bbaf037affb30a8be65e223f0f5766e1d87f5357;hpb=bf9f5e804203859f117bf571eefb1d81ef9025a8;p=Crafter.git

diff --git a/mods/redstone/ore.lua b/mods/redstone/ore.lua
index bbaf037..1195aa9 100644
--- a/mods/redstone/ore.lua
+++ b/mods/redstone/ore.lua
@@ -1,26 +1,28 @@
+local minetest,math = minetest,math
 --create on and off redstone ore
 for i = 0,1 do
 	local light_level = i * 9
 	local groups
 	local on_punch = nil
+	local on_timer
 	if i == 0 then
 		groups = {stone = 1, hard = 1, pickaxe = 1, hand = 4,pathable = 1}
-		on_punch = function(pos, node, puncher, pointed_thing)
-			minetest.set_node(pos, {name="redstone:ore_1"})
-			redstone.collect_info(pos)
-			local timer = minetest.get_node_timer(pos)
-			timer:start(math.random(10,50))
-		end
+		--on_punch = function(pos, node, puncher, pointed_thing)
+		--	minetest.set_node(pos, {name="redstone:ore_1"})
+		--	redstone.collect_info(pos)
+		--	local timer = minetest.get_node_timer(pos)
+		--	timer:start(math.random(10,50))
+		--end
 	else
-		groups = {stone = 1, hard = 1, pickaxe = 1, hand = 4,pathable = 1,redstone=1,redstone_torch=1,redstone_power=9}
-		on_timer = function(pos, elapsed)
-			minetest.set_node(pos, {name="redstone:ore_0"})
-			redstone.collect_info(pos)
-		end
+		groups = {stone = 2, hard = 1, pickaxe = 1, hand = 4,pathable = 1,redstone=1,redstone_torch=1,redstone_power=9,experience=8}
+		--on_timer = function(pos, elapsed)
+		--	minetest.set_node(pos, {name="redstone:ore_0"})
+		--	redstone.collect_info(pos)
+		--end
 	end
 	minetest.register_node("redstone:ore_"..i, {
 		description = "Redstone Ore",
-		tiles = {"redstone_ore.png"},
+		tiles = {"stone.png^redstone_ore.png"},
 		groups = groups,
 		sounds = main.stoneSound(),
 		light_source = light_level,
@@ -29,34 +31,84 @@ for i = 0,1 do
 			items= {
 				{
 					--rarity = 0,
-					tools = {"main:ironpick","main:goldpick","main:diamondpick"},
+					tools = {"main:coalpick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
 					items = {"redstone:dust"},
 				},
 				{
 					--rarity = 0,
-					tools = {"main:ironpick","main:goldpick","main:diamondpick"},
+					tools = {"main:coalpick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
 					items = {"redstone:dust"},
 				},
 				{
 					--rarity = 0,
-					tools = {"main:ironpick","main:goldpick","main:diamondpick"},
+					tools = {"main:coalpick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
 					items = {"redstone:dust"},
 				},
 				{
 					--rarity = 0,
-					tools = {"main:ironpick","main:goldpick","main:diamondpick"},
+					tools = {"main:coalpick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
 					items = {"redstone:dust"},
 				},
 				{
 					rarity = 5,
-					tools = {"main:ironpick","main:goldpick","main:diamondpick"},
+					tools = {"main:coalpick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
 					items = {"redstone:dust"},
 				},
 			},
 		},
 		on_punch = on_punch,
 		on_timer = on_timer,
+		--after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		--	redstone.collect_info(pos)
+		--end,
 	})
+	if i == 0 then
+		minetest.register_node(":nether:redstone_ore", {
+			description = "Nether Redstone Ore",
+			tiles = {"netherrack.png^redstone_ore.png"},
+			groups = {netherrack = 2, hard = 1, pickaxe = 1, hand = 4,pathable = 1},
+			sounds = main.stoneSound(),
+			light_source = 7,
+			after_destruct = function(pos, oldnode)
+				if math.random() > 0.95 then
+					minetest.sound_play("tnt_ignite",{pos=pos,max_hear_distance=64})
+					minetest.after(1.5, function(pos)
+						tnt(pos,5)
+					end,pos)
+				end
+			end,
+			drop = {
+				max_items = 5,
+				items= {
+					{
+						--rarity = 0,
+						tools = {"main:coalpick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
+						items = {"redstone:dust"},
+					},
+					{
+						--rarity = 0,
+						tools = {"main:coalpick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
+						items = {"redstone:dust"},
+					},
+					{
+						--rarity = 0,
+						tools = {"main:coalpick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
+						items = {"redstone:dust"},
+					},
+					{
+						--rarity = 0,
+						tools = {"main:coalpick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
+						items = {"redstone:dust"},
+					},
+					{
+						rarity = 5,
+						tools = {"main:coalpick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
+						items = {"redstone:dust"},
+					},
+				},
+			},
+		})
+	end
 end
 --redstone ore
 minetest.register_ore({