Tidy and arrow

bettertnt/depends.txt

@@ -1,2 +1,3 @@
 str_helpers
-default
+default
+throwing?

bettertnt/init.lua

@@ -1,30 +1,25 @@
-local tnt_tables = {["bettertnt:tnt1"] = {r=6},
-					["bettertnt:tnt2"] = {r=1},
-					["bettertnt:tnt3"] = {r=2},
+local tnt_tables = {["bettertnt:tnt1"] = {r=1},
+					["bettertnt:tnt2"] = {r=2},
+					["bettertnt:tnt3"] = {r=3},
 					["bettertnt:tnt4"] = {r=4},
-					["bettertnt:tnt5"] = {r=6},
-					["bettertnt:tnt6"] = {r=8},
-					["bettertnt:tnt7"] = {r=10},
-					["bettertnt:tnt8"] = {r=12},
-					["bettertnt:tnt9"] = {r=14},
-					["bettertnt:tnt10"] = {r=16},
-					["bettertnt:tnt11"] = {r=18},
-					["bettertnt:tnt12"] = {r=20},
-					["bettertnt:tnt13"] = {r=22},
-					["bettertnt:tnt14"] = {r=25},
-					["bettertnt:tnt15"] = {r=30},
-					["bettertnt:tnt16"] = {r=35},
-					["bettertnt:tnt17"] = {r=40},
-					["bettertnt:tnt18"] = {r=45},
-					["bettertnt:tnt19"] = {r=50},
-					["bettertnt:tnt20"] = {r=55},
+					["bettertnt:tnt5"] = {r=5},
+					["bettertnt:tnt6"] = {r=7},
+					["bettertnt:tnt7"] = {r=9},
+					["bettertnt:tnt8"] = {r=11},
+					["bettertnt:tnt9"] =  {r=13},
+					["bettertnt:tnt10"] = {r=15},
+					["bettertnt:tnt11"] = {r=20},
+					["bettertnt:tnt12"] = {r=25},
+					["bettertnt:tnt13"] = {r=30},
+					["bettertnt:tnt14"] = {r=35},
+					["bettertnt:tnt15"] = {r=40},
+					["bettertnt:tnt16"] = {r=50},
+					["bettertnt:tnt17"] = {r=60},
+					["bettertnt:tnt18"] = {r=70},
+					["bettertnt:tnt19"] = {r=85},
+					["bettertnt:tnt20"] = {r=100},
 }
 				
-
-tnt = {}
-tnt.force = {}
-tnt.accl = {} 
-
 local function is_tnt(name)
 	if tnt_tables[name]~=nil then return true end
 	return false
@@ -42,20 +37,14 @@ local function combine_texture(texture_size, frame_count, texture, ani_texture)
         return ani_texture.."^[combine:"..texture_size.."x"..texture_size*frame_count..":"..combine_textures.."^"..ani_texture
 end
 
-local animated_tnt_texture = combine_texture(16, 4, "default_tnt_top.png", "bettertnt_top_burning_animated.png")
+local animated_tnt_texture = combine_texture(16, 4, "tnt_top.png", "bettertnt_top_burning_animated.png")
 	
-tnt_c_tnt = {}
-tnt_c_tnt_burning = {}
-tnt_types_int = {}
-
 for name,data in pairs(tnt_tables) do
 	
-	tnt_types_int[#tnt_types_int] = name
-
 	minetest.register_node(name, {
 		description = "TNT ("..name..")",
-		tiles = {"default_tnt_top.png", "default_tnt_bottom.png", "default_tnt_side.png"},
-		groups = {dig_immediate=2, mesecon=2},
+		tiles = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png"},
+		groups = {dig_immediate=2, mesecon=2, not_in_creative_inventory=1},
 		sounds = default.node_sound_wood_defaults(),
 		
 		on_punch = function(pos, node, puncher)
@@ -66,7 +55,7 @@ for name,data in pairs(tnt_tables) do
 					return
 				end
 				minetest.sound_play("bettertnt_ignite", {pos=pos})
-				boom_bettertnt(pos, 4, puncher)
+				boom_bettertnt(pos, 4)
 				minetest.set_node(pos, {name=name.."_burning"})
 			end
 		end,
@@ -82,7 +71,7 @@ for name,data in pairs(tnt_tables) do
 	
 	minetest.register_node(name.."_burning", {
 	        tiles = {{name=animated_tnt_texture, animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1}},
-	        "default_tnt_bottom.png", "default_tnt_side.png"},
+	        "tnt_bottom.png", "tnt_side.png"},
 	        light_source = 5,
 	        drop = "",
 	        sounds = default.node_sound_wood_defaults(),
@@ -100,33 +89,19 @@ for name,data in pairs(tnt_tables) do
 			{"",prev,""},
 		}
 	})
-	
-	tnt_c_tnt[#tnt_c_tnt + 1] = minetest.get_content_id(name)
-	tnt_c_tnt_burning[#tnt_c_tnt_burning + 1] = minetest.get_content_id(name.."_burning")
-
 end
 
-
-local function get_tnt_random(pos)
-        return PseudoRandom(math.abs(pos.x+pos.y*3+pos.z*5)+15)
-end
-
-
-
-
-
-function boom_bettertnt(pos, time, player)
+function boom_bettertnt(pos, time)
 	local id = minetest.get_node(pos).name
-	boom_bettertnt_id(pos, time, player, id)
+	boom_bettertnt_id(pos, time, id)
 end
 
-function boom_bettertnt_id(pos, time, player, id)
+function boom_bettertnt_id(pos, time, id)
 	minetest.after(time, function(pos)
 		
 		local tnt_range = tnt_tables[id].r * 2
 	
 		local t1 = os.clock()
-		pr = get_tnt_random(pos)
 		minetest.sound_play("bettertnt_explode", {pos=pos, gain=1.5, max_hear_distance=tnt_range*64})
 		
 		minetest.remove_node(pos)
@@ -161,181 +136,44 @@ function boom_bettertnt_id(pos, time, player, id)
 		local storedPoses = {}
 		local ts = tnt_range * tnt_range
 		
-		if id~="bettertnt:tnt1" then
-			for dx=-tnt_range,tnt_range do
-				local zm=math.floor((ts-dx*dx)^(1/2.0))
-				for dz=-zm,zm do
-					local ym=math.floor((ts-dx*dx-dz*dz)^(1/2.0))
-					for dy=-ym,ym do
-						local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-						----------------------------------------
-						--local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-						--vector.add(p, dir)
-						----------------------------------------
+		for dx=-tnt_range,tnt_range do
+			local zm=math.floor((ts-dx*dx)^(1/2.0))
+			for dz=-zm,zm do
+				local ym=math.floor((ts-dx*dx-dz*dz)^(1/2.0))
+				for dy=-ym,ym do
+					local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+					----------------------------------------
+					--local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+					--vector.add(p, dir)
+					----------------------------------------
 --							local p_node = area:index(p.x, p.y, p.z)
 --							local d_p_node = nodes[p_node]
-						local node = minetest.get_node(p)
-						local nodename = node.name
-						if is_tnt(nodename)==true then
-							minetest.remove_node(p)
-							boom_bettertnt_id(p, 0.5, player, nodename) -- was {x=p.x, y=p.y, z=p.z}
-						elseif nodename~="air" then
-							--if math.abs(dx)<tnt_range and math.abs(dy)<tnt_range and math.abs(dz)<tnt_range then
-							minetest.remove_node(p)
-							--elseif pr:next(1,5) <= 4 then
-							--	destroy(p, player, ents)
-							--end
-						end
+					local node = minetest.get_node(p)
+					local nodename = node.name
+					
+					if is_tnt(nodename)==true then
+						minetest.remove_node(p)
+						boom_bettertnt_id(p, 0.5, nodename) -- was {x=p.x, y=p.y, z=p.z}
+					elseif nodename~="air" then
+						--if math.abs(dx)<tnt_range and math.abs(dy)<tnt_range and math.abs(dz)<tnt_range then
+						minetest.remove_node(p)
+						--elseif pr:next(1,5) <= 4 then
+						--	destroy(p, player, ents)
+						--end
 					end
 				end
-				
 			end
 		end
 		
-		minetest.add_particlespawner(
-			100, --amount
-			1, --time
-			{x=pos.x-(tnt_range / 2), y=pos.y-(tnt_range / 2), z=pos.z-(tnt_range / 2)}, --minpos
-			{x=pos.x+(tnt_range / 2), y=pos.y+(tnt_range / 2), z=pos.z+(tnt_range / 2)}, --maxpos
-			{x=-0, y=-0, z=-0}, --minvel
-			{x=0, y=0, z=0}, --maxvel
-			{x=-0.5,y=5,z=-0.5}, --minacc
-			{x=0.5,y=5,z=0.5}, --maxacc
-			0.1, --minexptime
-			1, --maxexptime
-			8, --minsize
-			15, --maxsize
-			true, --collisiondetection
-			"bettertnt_smoke.png" --texture
-		)
 		print(string.format("[tnt] exploded in: %.2fs", os.clock() - t1))
 	end, pos)
 end
 
-
-
 ---------------------  GUNPOWDER  -------------------
 
-
-function burn(pos, player)
-        local nodename = minetest.get_node(pos).name
-        if  strs:starts(nodename, "bettertnt:tnt") then
-                minetest.sound_play("bettertnt_ignite", {pos=pos})
-                boom_bettertnt(pos, 1, player)
-                minetest.set_node(pos, {name=minetest.get_node(pos).name.."_burning"})
-                return
-        end
-        if nodename ~= "bettertnt:gunpowder" then
-                return
-        end
-        minetest.sound_play("bettertnt_gunpowder_burning", {pos=pos, gain=2})
-        minetest.set_node(pos, {name="bettertnt:gunpowder_burning"})
-        
-        minetest.after(1, function(pos)
-                if minetest.get_node(pos).name ~= "bettertnt:gunpowder_burning" then
-                        return
-                end
-                minetest.after(0.5, function(pos)
-                        minetest.remove_node(pos)
-                end, {x=pos.x, y=pos.y, z=pos.z})
-                for dx=-1,1 do
-                        for dz=-1,1 do
-                                for dy=-1,1 do
-                                        pos.x = pos.x+dx
-                                        pos.y = pos.y+dy
-                                        pos.z = pos.z+dz
-                                        
-                                        if not (math.abs(dx) == 1 and math.abs(dz) == 1) then
-                                                if dy == 0 then
-                                                        burn({x=pos.x, y=pos.y, z=pos.z}, player)
-                                                else
-                                                        if math.abs(dx) == 1 or math.abs(dz) == 1 then
-                                                                burn({x=pos.x, y=pos.y, z=pos.z}, player)
-                                                        end
-                                                end
-                                        end
-                                        
-                                        pos.x = pos.x-dx
-                                        pos.y = pos.y-dy
-                                        pos.z = pos.z-dz
-                                end
-                        end
-                end
-        end, pos)
-end
-
-
-minetest.register_node("bettertnt:gunpowder", {
+minetest.register_craftitem("bettertnt:gunpowder", {
         description = "Gun Powder",
-        drawtype = "raillike",
-        paramtype = "light",
-        sunlight_propagates = true,
-        walkable = false,
-        tiles = {"bettertnt_gunpowder.png",},
         inventory_image = "bettertnt_gunpowder_inventory.png",
-        wield_image = "bettertnt_gunpowder_inventory.png",
-        selection_box = {
-                type = "fixed",
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-        },
-        groups = {dig_immediate=2,attached_node=1},
-        sounds = default.node_sound_leaves_defaults(),
-        
-        on_punch = function(pos, node, puncher)
-                if puncher:get_wielded_item():get_name() == "default:torch" then
-                        burn(pos, puncher)
-                end
-        end,
-})
-
-minetest.register_node("bettertnt:gunpowder_burning", {
-        drawtype = "raillike",
-        paramtype = "light",
-        sunlight_propagates = true,
-        walkable = false,
-        light_source = 5,
-        tiles = {{name="bettertnt_gunpowder_burning_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1}}},
-        selection_box = {
-                type = "fixed",
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-        },
-        drop = "",
-        groups = {dig_immediate=2,attached_node=1},
-        sounds = default.node_sound_leaves_defaults(),
-})
-
-local tnt_plus_gunpowder = {"bettertnt:gunpowder"}
-for name,data in pairs(tnt_tables) do
-	tnt_plus_gunpowder[#tnt_plus_gunpowder+1] = name
-end
-
-
-minetest.register_abm({
-        nodenames = tnt_plus_gunpowder,
-        neighbors = {"fire:basic_flame"},
-        interval = 2,
-        chance = 10,
-        action = function(pos, node)
-                if tnt_tables[node.name]~=nil then
-                        boom_bettertnt({x=pos.x, y=pos.y, z=pos.z}, 0)
-                else
-                        burn(pos)
-                end
-        end
-})
-
-minetest.register_abm({
-        nodenames = tnt_plus_gunpowder,
-        neighbors = {"tnt:gunpowder"},
-        interval = 2,
-        chance = 10,
-        action = function(pos, node)
-                if tnt_tables[node.name]~=nil then
-                        boom_bettertnt({x=pos.x, y=pos.y, z=pos.z}, 0)
-                else
-                        burn(pos)
-                end
-        end
 })
 
 minetest.register_craft({
@@ -344,7 +182,55 @@ minetest.register_craft({
         recipe = {"default:coal_lump", "default:gravel", "default:dirt"}
 })
 
+-- Arrows
+if minetest.get_modpath("throwing")~=nil then
 
-tnt_c_air = minetest.get_content_id("air")
-tnt_c_fire = minetest.get_content_id("fire:basic_flame")
+	for name,data in pairs(tnt_tables) do
+
+		minetest.register_craftitem(name.."_arrow",{
+			description="TNT Arrow ("..name..")",
+			inventory_image="tnt_side.png^throwing_arrow.png",
+			groups={not_in_creative_inventory=1},
+		})
+		
+		minetest.register_craft({
+			output=name.."_arrow",
+			recipe={
+				{'throwing:arrow',name},
+			}
+		})
+		
+		local THROWING_ARROW_ENTITY={
+			physical=false,
+			timer=0,
+			visual="wielditem",
+			visual_size={x=0.1,y=0.1},
+			textures={"throwing:arrow_box"},
+			lastpos={},
+			collisionbox={0,0,0,0,0,0},
+			TNTNAME=name,
+		}
+
+		THROWING_ARROW_ENTITY.on_step = function(self, dtime)
+			self.timer=self.timer+dtime
+			local pos = self.object:getpos()
+			local node = minetest.env:get_node(pos)
+		
+			if self.lastpos.x~=nil then
+				if node.name ~= "air" then
+					self.object:remove()
+					boom_bettertnt_id(pos,0,self.TNTNAME)
+				end
+			end
+			self.lastpos={x=pos.x, y=pos.y, z=pos.z}
+		end
+
+		minetest.register_entity(name.."_arrow_entity",THROWING_ARROW_ENTITY)
+
+		if arrows~=nil then arrows[#arrows+1]={name.."_arrow",name.."_arrow_entity"} end
+		if throwing_arrows~=nil then throwing_arrows[#throwing_arrows+1]={name.."_arrow",name.."_arrow_entity"} end
+
+	end
+
+end
 

checkertnt/init.lua

@@ -1,333 +1,170 @@
-local tnt_tables = {["checkertnt:tnt1"] = {r=1},
-					["checkertnt:tnt2"] = {r=2},
-					["checkertnt:tnt3"] = {r=4},
-					["checkertnt:tnt4"] = {r=6},
-					["checkertnt:tnt5"] = {r=8},
-					["checkertnt:tnt6"] = {r=10},
-					["checkertnt:tnt7"] = {r=12},
-					["checkertnt:tnt8"] = {r=14},
-					["checkertnt:tnt9"] = {r=16},
-					["checkertnt:tnt10"] = {r=18},
-					["checkertnt:tnt11"] = {r=20},
-					["checkertnt:tnt12"] = {r=22},
-					["checkertnt:tnt13"] = {r=25},
-					["checkertnt:tnt14"] = {r=30},
-					["checkertnt:tnt15"] = {r=35},
-					["checkertnt:tnt16"] = {r=40},
-					["checkertnt:tnt17"] = {r=45},
-					["checkertnt:tnt18"] = {r=50},
-					["checkertnt:tnt19"] = {r=55},
-					["checkertnt:tnt20"] = {r=60},
-}
-				
-
-tnt = {}
-tnt.force = {}
-tnt.accl = {} 
-
-local function is_tnt(name)
-	if tnt_tables[name]~=nil then return true end
-	return false
-end
-
-local function combine_texture(texture_size, frame_count, texture, ani_texture)
-        local l = frame_count
-        local px = 0
-        local combine_textures = ":0,"..px.."="..texture
-        while l ~= 0 do
-                combine_textures = combine_textures..":0,"..px.."="..texture
-                px = px+texture_size
-                l = l-1
-        end
-        return ani_texture.."^[combine:"..texture_size.."x"..texture_size*frame_count..":"..combine_textures.."^"..ani_texture
-end
-
-local animated_tnt_texture = combine_texture(16, 4, "default_tnt_top.png", "checkertnt_top_burning_animated.png")
-	
-tnt_c_tnt = {}
-tnt_c_tnt_burning = {}
-tnt_types_int = {}
-
-for name,data in pairs(tnt_tables) do
-	
-	tnt_types_int[#tnt_types_int] = name
-
-	minetest.register_node(name, {
-		description = "TNT ("..name..")",
-		tiles = {"default_tnt_top.png", "default_tnt_bottom.png", "default_tnt_side.png"},
-		groups = {dig_immediate=2, mesecon=2},
-		sounds = default.node_sound_wood_defaults(),
-		
-		on_punch = function(pos, node, puncher)
-			if puncher:get_wielded_item():get_name() == "default:torch" then
-				if minetest.is_protected(pos, puncher:get_player_name()) then
-					print(puncher:get_player_name() .. " tried to light TNT at " .. minetest.pos_to_string(pos))
-					minetest.record_protection_violation(pos, puncher:get_player_name())
-					return
-				end
-				minetest.sound_play("checkertnt_ignite", {pos=pos})
-				boom_checkertnt(pos, 4, puncher)
-				minetest.set_node(pos, {name=name.."_burning"})
-			end
-		end,
-		
-		mesecons = {
-			effector = {
-				action_on = function(pos, node)
-					boom_checkertnt(pos, 0)
-				end
-			},
-		},
-	})
-	
-	minetest.register_node(name.."_burning", {
-	        tiles = {{name=animated_tnt_texture, animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1}},
-	        "default_tnt_bottom.png", "default_tnt_side.png"},
-	        light_source = 5,
-	        drop = "",
-	        sounds = default.node_sound_wood_defaults(),
-	})
-	
-	local prev = "checkertnt:tnt"..tonumber(strs:rem_from_start(name, "checkertnt:tnt"))-1
-	if prev=="checkertnt:tnt0" then prev="" end
-	--print(name .. " is made from " .. prev)
-	
-	minetest.register_craft({
-		output = name,
-		recipe = {
-			{"",prev,""},
-			{"","checkertnt:gunpowder",""},
-			{"",prev,""},
-		}
-	})
-	
-	tnt_c_tnt[#tnt_c_tnt + 1] = minetest.get_content_id(name)
-	tnt_c_tnt_burning[#tnt_c_tnt_burning + 1] = minetest.get_content_id(name.."_burning")
-
-end
-
-
-local function get_tnt_random(pos)
-        return PseudoRandom(math.abs(pos.x+pos.y*3+pos.z*5)+15)
-end
-
-
-
-
-
-function boom_checkertnt(pos, time, player)
-	local id = minetest.get_node(pos).name
-	boom_checkertnt_id(pos, time, player, id)
-end
-
-function boom_checkertnt_id(pos, time, player, id)
-	minetest.after(time, function(pos)
-		
-		local tnt_range = tnt_tables[id].r * 2
-	
-		local t1 = os.clock()
-		pr = get_tnt_random(pos)
-		minetest.sound_play("checkertnt_explode", {pos=pos, gain=1.5, max_hear_distance=tnt_range*64})
-		
-		minetest.remove_node(pos)
-		
---		local manip = minetest.get_voxel_manip()
---		local width = tnt_range
---		local emerged_pos1, emerged_pos2 = manip:read_from_map({x=pos.x-width, y=pos.y-width, z=pos.z-width},
---		{x=pos.x+width, y=pos.y+width, z=pos.z+width})
---		area = VoxelArea:new{MinEdge=emerged_pos1, MaxEdge=emerged_pos2}
---		nodes = manip:get_data()
---		
---		local p_pos = area:index(pos.x, pos.y, pos.z)
---		nodes[p_pos] = tnt_c_air
-		minetest.add_particle(pos, {x=0,y=0,z=0}, {x=0,y=0,z=0}, 0.5, 16, false, "checkertnt_explode.png")
-		--minetest.set_node(pos, {name="tnt:boom_checkertnt"})
-		
-		local objects = minetest.get_objects_inside_radius(pos, tnt_range/2)
-		for _,obj in ipairs(objects) do
-			if obj:is_player() or (obj:get_luaentity() and obj:get_luaentity().name ~= "__builtin:item") then
-				local obj_p = obj:getpos()
-				local vec = {x=obj_p.x-pos.x, y=obj_p.y-pos.y, z=obj_p.z-pos.z}
-				local dist = (vec.x^2+vec.y^2+vec.z^2)^0.5
-				local damage = 0
-				if dist < tnt_range/3.0 then damage = tnt_range end
-				obj:punch(obj, 1.0, {
-					full_punch_interval=1.0,
-					damage_groups={fleshy=damage},
-				}, vec)
-			end
-		end
-		
-		local storedPoses = {}
-		
-		for dx=-tnt_range,tnt_range do
-			for dz=-tnt_range,tnt_range do
-				for dy=-tnt_range,tnt_range do
-					local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-					local nodename = minetest.get_node(p).name
-					if is_tnt(nodename)==true then
-						minetest.remove_node(p)
-						boom_checkertnt_id(p, 0.5, player, nodename) -- was {x=p.x, y=p.y, z=p.z}
-					elseif (dx+dz+dy) % 2 == 0 then
-						minetest.remove_node(p)
-					end
-				end
-			end
-		end
-		
-		minetest.add_particlespawner(
-			100, --amount
-			1, --time
-			{x=pos.x-(tnt_range / 2), y=pos.y-(tnt_range / 2), z=pos.z-(tnt_range / 2)}, --minpos
-			{x=pos.x+(tnt_range / 2), y=pos.y+(tnt_range / 2), z=pos.z+(tnt_range / 2)}, --maxpos
-			{x=-0, y=-0, z=-0}, --minvel
-			{x=0, y=0, z=0}, --maxvel
-			{x=-0.5,y=5,z=-0.5}, --minacc
-			{x=0.5,y=5,z=0.5}, --maxacc
-			0.1, --minexptime
-			1, --maxexptime
-			8, --minsize
-			15, --maxsize
-			true, --collisiondetection
-			"checkertnt_smoke.png" --texture
-		)
-		print(string.format("[tnt] exploded in: %.2fs", os.clock() - t1))
-	end, pos)
-end
-
-
-
----------------------  GUNPOWDER  -------------------
-
-
-function burn(pos, player)
-        local nodename = minetest.get_node(pos).name
-        if  strs:starts(nodename, "checkertnt:tnt") then
-                minetest.sound_play("checkertnt_ignite", {pos=pos})
-                boom_checkertnt(pos, 1, player)
-                minetest.set_node(pos, {name=minetest.get_node(pos).name.."_burning"})
-                return
-        end
-        if nodename ~= "checkertnt:gunpowder" then
-                return
-        end
-        minetest.sound_play("checkertnt_gunpowder_burning", {pos=pos, gain=2})
-        minetest.set_node(pos, {name="checkertnt:gunpowder_burning"})
-        
-        minetest.after(1, function(pos)
-                if minetest.get_node(pos).name ~= "checkertnt:gunpowder_burning" then
-                        return
-                end
-                minetest.after(0.5, function(pos)
-                        minetest.remove_node(pos)
-                end, {x=pos.x, y=pos.y, z=pos.z})
-                for dx=-1,1 do
-                        for dz=-1,1 do
-                                for dy=-1,1 do
-                                        pos.x = pos.x+dx
-                                        pos.y = pos.y+dy
-                                        pos.z = pos.z+dz
-                                        
-                                        if not (math.abs(dx) == 1 and math.abs(dz) == 1) then
-                                                if dy == 0 then
-                                                        burn({x=pos.x, y=pos.y, z=pos.z}, player)
-                                                else
-                                                        if math.abs(dx) == 1 or math.abs(dz) == 1 then
-                                                                burn({x=pos.x, y=pos.y, z=pos.z}, player)
-                                                        end
-                                                end
-                                        end
-                                        
-                                        pos.x = pos.x-dx
-                                        pos.y = pos.y-dy
-                                        pos.z = pos.z-dz
-                                end
-                        end
-                end
-        end, pos)
-end
-
-
-minetest.register_node("checkertnt:gunpowder", {
-        description = "Gun Powder",
-        drawtype = "raillike",
-        paramtype = "light",
-        sunlight_propagates = true,
-        walkable = false,
-        tiles = {"checkertnt_gunpowder.png",},
-        inventory_image = "checkertnt_gunpowder_inventory.png",
-        wield_image = "checkertnt_gunpowder_inventory.png",
-        selection_box = {
-                type = "fixed",
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-        },
-        groups = {dig_immediate=2,attached_node=1},
-        sounds = default.node_sound_leaves_defaults(),
-        
-        on_punch = function(pos, node, puncher)
-                if puncher:get_wielded_item():get_name() == "default:torch" then
-                        burn(pos, puncher)
-                end
-        end,
-})
-
-minetest.register_node("checkertnt:gunpowder_burning", {
-        drawtype = "raillike",
-        paramtype = "light",
-        sunlight_propagates = true,
-        walkable = false,
-        light_source = 5,
-        tiles = {{name="checkertnt_gunpowder_burning_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1}}},
-        selection_box = {
-                type = "fixed",
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-        },
-        drop = "",
-        groups = {dig_immediate=2,attached_node=1},
-        sounds = default.node_sound_leaves_defaults(),
-})
-
-local tnt_plus_gunpowder = {"checkertnt:gunpowder"}
-for name,data in pairs(tnt_tables) do
-	tnt_plus_gunpowder[#tnt_plus_gunpowder+1] = name
-end
-
-
-minetest.register_abm({
-        nodenames = tnt_plus_gunpowder,
-        neighbors = {"fire:basic_flame"},
-        interval = 2,
-        chance = 10,
-        action = function(pos, node)
-                if tnt_tables[node.name]~=nil then
-                        boom_checkertnt({x=pos.x, y=pos.y, z=pos.z}, 0)
-                else
-                        burn(pos)
-                end
-        end
-})
-
-minetest.register_abm({
-        nodenames = tnt_plus_gunpowder,
-        neighbors = {"tnt:gunpowder"},
-        interval = 2,
-        chance = 10,
-        action = function(pos, node)
-                if tnt_tables[node.name]~=nil then
-                        boom_checkertnt({x=pos.x, y=pos.y, z=pos.z}, 0)
-                else
-                        burn(pos)
-                end
-        end
-})
-
-minetest.register_craft({
-        output = "checkertnt:gunpowder",
-        type = "shapeless",
-        recipe = {"default:coal_lump", "default:gravel", "default:cobble"}
-})
-
-
-tnt_c_air = minetest.get_content_id("air")
-tnt_c_fire = minetest.get_content_id("fire:basic_flame")
-
+local tnt_tables = {["checkertnt:tnt1"] = {r=1},
+					["checkertnt:tnt2"] = {r=2},
+					["checkertnt:tnt3"] = {r=3},
+					["checkertnt:tnt4"] = {r=4},
+					["checkertnt:tnt5"] = {r=5},
+					["checkertnt:tnt6"] = {r=7},
+					["checkertnt:tnt7"] = {r=9},
+					["checkertnt:tnt8"] = {r=11},
+					["checkertnt:tnt9"] = {r=13},
+					["checkertnt:tnt10"] = {r=15},
+					["checkertnt:tnt11"] = {r=20},
+					["checkertnt:tnt12"] = {r=25},
+					["checkertnt:tnt13"] = {r=30},
+					["checkertnt:tnt14"] = {r=35},
+					["checkertnt:tnt15"] = {r=40},
+					["checkertnt:tnt16"] = {r=50},
+					["checkertnt:tnt17"] = {r=60},
+					["checkertnt:tnt18"] = {r=70},
+					["checkertnt:tnt19"] = {r=85},
+					["checkertnt:tnt20"] = {r=100},
+}
+				
+local function is_tnt(name)
+	if tnt_tables[name]~=nil then return true end
+	return false
+end
+
+local function combine_texture(texture_size, frame_count, texture, ani_texture)
+        local l = frame_count
+        local px = 0
+        local combine_textures = ":0,"..px.."="..texture
+        while l ~= 0 do
+                combine_textures = combine_textures..":0,"..px.."="..texture
+                px = px+texture_size
+                l = l-1
+        end
+        return ani_texture.."^[combine:"..texture_size.."x"..texture_size*frame_count..":"..combine_textures.."^"..ani_texture
+end
+
+local animated_tnt_texture = combine_texture(16, 4, "tnt_top.png", "checkertnt_top_burning_animated.png")
+
+for name,data in pairs(tnt_tables) do
+
+	minetest.register_node(name, {
+		description = "TNT ("..name..")",
+		tiles = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png"},
+		groups = {dig_immediate=2, mesecon=2, not_in_creative_inventory=1},
+		sounds = default.node_sound_wood_defaults(),
+		
+		on_punch = function(pos, node, puncher)
+			if puncher:get_wielded_item():get_name() == "default:torch" then
+				if minetest.is_protected(pos, puncher:get_player_name()) then
+					print(puncher:get_player_name() .. " tried to light TNT at " .. minetest.pos_to_string(pos))
+					minetest.record_protection_violation(pos, puncher:get_player_name())
+					return
+				end
+				minetest.sound_play("checkertnt_ignite", {pos=pos})
+				boom_checkertnt(pos, 4)
+				minetest.set_node(pos, {name=name.."_burning"})
+			end
+		end,
+		
+		mesecons = {
+			effector = {
+				action_on = function(pos, node)
+					boom_checkertnt(pos, 0)
+				end
+			},
+		},
+	})
+	
+	minetest.register_node(name.."_burning", {
+	        tiles = {{name=animated_tnt_texture, animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1}},
+	        "tnt_bottom.png", "tnt_side.png"},
+	        light_source = 5,
+	        drop = "",
+	        sounds = default.node_sound_wood_defaults(),
+	})
+	
+	local prev = "checkertnt:tnt"..tonumber(strs:rem_from_start(name, "checkertnt:tnt"))-1
+	if prev=="checkertnt:tnt0" then prev="" end
+	--print(name .. " is made from " .. prev)
+	
+	minetest.register_craft({
+		output = name,
+		recipe = {
+			{"",prev,""},
+			{"","checkertnt:gunpowder",""},
+			{"",prev,""},
+		}
+	})
+	
+end
+
+function boom_checkertnt(pos, time)
+	local id = minetest.get_node(pos).name
+	boom_checkertnt_id(pos, time, id)
+end
+
+function boom_checkertnt_id(pos, time, id)
+	minetest.after(time, function(pos)
+		
+		local tnt_range = tnt_tables[id].r * 2
+	
+		local t1 = os.clock()
+		minetest.sound_play("checkertnt_explode", {pos=pos, gain=1.5, max_hear_distance=tnt_range*64})
+		
+		minetest.remove_node(pos)
+		
+--		local manip = minetest.get_voxel_manip()
+--		local width = tnt_range
+--		local emerged_pos1, emerged_pos2 = manip:read_from_map({x=pos.x-width, y=pos.y-width, z=pos.z-width},
+--		{x=pos.x+width, y=pos.y+width, z=pos.z+width})
+--		area = VoxelArea:new{MinEdge=emerged_pos1, MaxEdge=emerged_pos2}
+--		nodes = manip:get_data()
+--		
+--		local p_pos = area:index(pos.x, pos.y, pos.z)
+--		nodes[p_pos] = tnt_c_air
+		minetest.add_particle(pos, {x=0,y=0,z=0}, {x=0,y=0,z=0}, 0.5, 16, false, "checkertnt_explode.png")
+		--minetest.set_node(pos, {name="tnt:boom_checkertnt"})
+		
+		local objects = minetest.get_objects_inside_radius(pos, tnt_range/2)
+		for _,obj in ipairs(objects) do
+			if obj:is_player() or (obj:get_luaentity() and obj:get_luaentity().name ~= "__builtin:item") then
+				local obj_p = obj:getpos()
+				local vec = {x=obj_p.x-pos.x, y=obj_p.y-pos.y, z=obj_p.z-pos.z}
+				local dist = (vec.x^2+vec.y^2+vec.z^2)^0.5
+				local damage = 0
+				if dist < tnt_range/3.0 then damage = tnt_range end
+				obj:punch(obj, 1.0, {
+					full_punch_interval=1.0,
+					damage_groups={fleshy=damage},
+				}, vec)
+			end
+		end
+		
+		local storedPoses = {}
+		
+		for dx=-tnt_range,tnt_range do
+			for dz=-tnt_range,tnt_range do
+				for dy=-tnt_range,tnt_range do
+					local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+					local nodename = minetest.get_node(p).name
+					if is_tnt(nodename)==true then
+						minetest.remove_node(p)
+						boom_checkertnt_id(p, 0.5, nodename) -- was {x=p.x, y=p.y, z=p.z}
+					elseif (dx+dz+dy) % 2 == 0 then
+						minetest.remove_node(p)
+					end
+				end
+			end
+		end
+		
+		print(string.format("[tnt] exploded in: %.2fs", os.clock() - t1))
+	end, pos)
+end
+
+---------------------  GUNPOWDER  -------------------
+
+minetest.register_craftitem("checkertnt:gunpowder", {
+        description = "Gun Powder",
+        inventory_image = "checkertnt_gunpowder_inventory.png",
+})
+
+minetest.register_craft({
+        output = "checkertnt:gunpowder",
+        type = "shapeless",
+        recipe = {"default:coal_lump", "default:gravel", "default:cobble"}
+})
+

fillertnt/depends.txt

@@ -0,0 +1,2 @@
+str_helpers
+default

fillertnt/init.lua

@@ -0,0 +1,204 @@
+local tnt_tables = {["fillertnt:tnt1"] = {r=1},
+					["fillertnt:tnt2"] = {r=2},
+					["fillertnt:tnt3"] = {r=3},
+					["fillertnt:tnt4"] = {r=4},
+					["fillertnt:tnt5"] = {r=5},
+					["fillertnt:tnt6"] = {r=7},
+					["fillertnt:tnt7"] = {r=9},
+					["fillertnt:tnt8"] = {r=11},
+					["fillertnt:tnt9"] = {r=13},
+					["fillertnt:tnt10"] = {r=15},
+					["fillertnt:tnt11"] = {r=20},
+					["fillertnt:tnt12"] = {r=25},
+					["fillertnt:tnt13"] = {r=30},
+					["fillertnt:tnt14"] = {r=35},
+					["fillertnt:tnt15"] = {r=40},
+					["fillertnt:tnt16"] = {r=50},
+					["fillertnt:tnt17"] = {r=60},
+					["fillertnt:tnt18"] = {r=70},
+					["fillertnt:tnt19"] = {r=85},
+					["fillertnt:tnt20"] = {r=100},
+}
+
+local function is_tnt(name)
+	if tnt_tables[name]~=nil then return true end
+	return false
+end
+
+local function combine_texture(texture_size, frame_count, texture, ani_texture)
+        local l = frame_count
+        local px = 0
+        local combine_textures = ":0,"..px.."="..texture
+        while l ~= 0 do
+                combine_textures = combine_textures..":0,"..px.."="..texture
+                px = px+texture_size
+                l = l-1
+        end
+        return ani_texture.."^[combine:"..texture_size.."x"..texture_size*frame_count..":"..combine_textures.."^"..ani_texture
+end
+
+local animated_tnt_texture = combine_texture(16, 4, "tnt_top.png", "fillertnt_top_burning_animated.png")
+
+for name,data in pairs(tnt_tables) do
+
+	minetest.register_node(name, {
+		description = "TNT ("..name..")",
+		tiles = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png"},
+		groups = {dig_immediate=2, mesecon=2, not_in_creative_inventory=1},
+		sounds = default.node_sound_wood_defaults(),
+
+		on_construct = function(pos)
+			local meta=minetest.get_meta(pos)
+			meta:set_string("formspec","field[text;;${text}]")
+			meta:set_string("filler","air")
+			meta:set_string("infotext","Filling material: air")
+		end,
+
+		on_receive_fields = function(pos,formname,fields,sender)
+			local meta=minetest.get_meta(pos)
+			fields.text=fields.text or ""
+			if fields.text=="" then
+				return
+			end
+			meta:set_string("filler",fields.text)
+			meta:set_string("infotext","Filling material: "..fields.text)
+		end,
+		
+		on_punch = function(pos, node, puncher)
+			local meta=minetest.get_meta(pos)
+			local filler=meta:get_string("filler")
+			if puncher:get_wielded_item():get_name() == "default:torch" then
+				if minetest.is_protected(pos, puncher:get_player_name()) then
+					print(puncher:get_player_name() .. " tried to light TNT at " .. minetest.pos_to_string(pos))
+					minetest.record_protection_violation(pos, puncher:get_player_name())
+					return
+				end
+				minetest.sound_play("fillertnt_ignite", {pos=pos})
+				boom_fillertnt(pos, 4)
+				minetest.set_node(pos, {name=name.."_burning"})
+				meta=minetest.get_meta(pos)
+				meta:set_string("filler",filler)
+			end
+		end,
+		
+		mesecons = {
+			effector = {
+				action_on = function(pos, node)
+					boom_fillertnt(pos, 0)
+				end
+			},
+		},
+	})
+	
+	minetest.register_node(name.."_burning", {
+	        tiles = {{name=animated_tnt_texture, animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1}},
+	        "tnt_bottom.png", "tnt_side.png"},
+	        light_source = 5,
+	        drop = "",
+	        sounds = default.node_sound_wood_defaults(),
+	})
+	
+	local prev = "fillertnt:tnt"..tonumber(strs:rem_from_start(name, "fillertnt:tnt"))-1
+	if prev=="fillertnt:tnt0" then prev="" end
+	--print(name .. " is made from " .. prev)
+	
+	minetest.register_craft({
+		output = name,
+		recipe = {
+			{"",prev,""},
+			{"","fillertnt:gunpowder",""},
+			{"",prev,""},
+		}
+	})
+	
+end
+
+function boom_fillertnt(pos, time)
+	local id = minetest.get_node(pos).name
+	boom_fillertnt_id(pos, time, id)
+end
+
+function boom_fillertnt_id(pos, time, id)
+	minetest.after(time, function(pos)
+		
+		local tnt_range = tnt_tables[id].r * 2
+		local meta=minetest.get_meta(pos)
+		local filler=meta:get_string("filler")
+		print(filler)
+	
+		local t1 = os.clock()
+		minetest.sound_play("fillertnt_explode", {pos=pos, gain=1.5, max_hear_distance=tnt_range*64})
+		
+		minetest.remove_node(pos)
+		
+--		local manip = minetest.get_voxel_manip()
+--		local width = tnt_range
+--		local emerged_pos1, emerged_pos2 = manip:read_from_map({x=pos.x-width, y=pos.y-width, z=pos.z-width},
+--		{x=pos.x+width, y=pos.y+width, z=pos.z+width})
+--		area = VoxelArea:new{MinEdge=emerged_pos1, MaxEdge=emerged_pos2}
+--		nodes = manip:get_data()
+--		
+--		local p_pos = area:index(pos.x, pos.y, pos.z)
+--		nodes[p_pos] = tnt_c_air
+		minetest.add_particle(pos, {x=0,y=0,z=0}, {x=0,y=0,z=0}, 0.5, 16, false, "fillertnt_explode.png")
+		--minetest.set_node(pos, {name="tnt:boom_fillertnt"})
+		
+		local objects = minetest.get_objects_inside_radius(pos, tnt_range/2)
+		for _,obj in ipairs(objects) do
+			if obj:is_player() or (obj:get_luaentity() and obj:get_luaentity().name ~= "__builtin:item") then
+				local obj_p = obj:getpos()
+				local vec = {x=obj_p.x-pos.x, y=obj_p.y-pos.y, z=obj_p.z-pos.z}
+				local dist = (vec.x^2+vec.y^2+vec.z^2)^0.5
+				local damage = 0
+				if dist < tnt_range/3.0 then damage = tnt_range end
+				obj:punch(obj, 1.0, {
+					full_punch_interval=1.0,
+					damage_groups={fleshy=damage},
+				}, vec)
+			end
+		end
+		
+		local storedPoses = {}
+		local ts = tnt_range * tnt_range
+		
+		for dx=-tnt_range,tnt_range do
+			local zm=math.floor((ts-dx*dx)^(1/2.0))
+			for dz=-zm,zm do
+				local ym=math.floor((ts-dx*dx-dz*dz)^(1/2.0))
+				for dy=-ym,ym do
+					local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+					----------------------------------------
+					--local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+					--vector.add(p, dir)
+					----------------------------------------
+--							local p_node = area:index(p.x, p.y, p.z)
+--							local d_p_node = nodes[p_node]
+					local node = minetest.get_node(p)
+					local nodename = node.name
+					
+					--if math.abs(dx)<tnt_range and math.abs(dy)<tnt_range and math.abs(dz)<tnt_range then
+					minetest.add_node(p,{name=filler})
+					--elseif pr:next(1,5) <= 4 then
+					--	destroy(p, player, ents)
+					--end
+				end
+			end
+		end
+		
+		print(string.format("[tnt] exploded in: %.2fs", os.clock() - t1))
+	end, pos)
+end
+
+---------------------  GUNPOWDER  -------------------
+
+minetest.register_craftitem("fillertnt:gunpowder", {
+        description = "Gun Powder",
+        inventory_image = "fillertnt_gunpowder_inventory.png",
+})
+
+minetest.register_craft({
+        output = "fillertnt:gunpowder",
+        type = "shapeless",
+        recipe = {"default:coal_lump", "default:gravel", "default:dirt"}
+})
+

miningtnt/depends.txt

@@ -0,0 +1,2 @@
+str_helpers
+default

miningtnt/init.lua

@@ -0,0 +1,261 @@
+local tnt_tables = {["miningtnt:tnt1"] = {r=1},
+					["miningtnt:tnt2"] = {r=2},
+					["miningtnt:tnt3"] = {r=3},
+					["miningtnt:tnt4"] = {r=4},
+					["miningtnt:tnt5"] = {r=5},
+					["miningtnt:tnt6"] = {r=7},
+					["miningtnt:tnt7"] = {r=9},
+					["miningtnt:tnt8"] = {r=11},
+					["miningtnt:tnt9"] = {r=13},
+					["miningtnt:tnt10"] = {r=15},
+					["miningtnt:tnt11"] = {r=20},
+					["miningtnt:tnt12"] = {r=25},
+					["miningtnt:tnt13"] = {r=30},
+					["miningtnt:tnt14"] = {r=35},
+					["miningtnt:tnt15"] = {r=40},
+					["miningtnt:tnt16"] = {r=50},
+					["miningtnt:tnt17"] = {r=60},
+					["miningtnt:tnt18"] = {r=70},
+					["miningtnt:tnt19"] = {r=85},
+					["miningtnt:tnt20"] = {r=100},
+}
+
+local function is_tnt(name)
+	if tnt_tables[name]~=nil then return true end
+	return false
+end
+
+local function combine_texture(texture_size, frame_count, texture, ani_texture)
+        local l = frame_count
+        local px = 0
+        local combine_textures = ":0,"..px.."="..texture
+        while l ~= 0 do
+                combine_textures = combine_textures..":0,"..px.."="..texture
+                px = px+texture_size
+                l = l-1
+        end
+        return ani_texture.."^[combine:"..texture_size.."x"..texture_size*frame_count..":"..combine_textures.."^"..ani_texture
+end
+
+local animated_tnt_texture = combine_texture(16, 4, "tnt_top.png", "miningtnt_top_burning_animated.png")
+
+function miningtnt_storage_dump(pos)
+	--Add dump
+	local meta=minetest.get_meta(pos)
+	local dumpitem=meta:get_string("dump_item")
+	local i=0
+	while true do 
+		local item=meta:get_string('item_name'..i)
+		local candump=true
+		if item=="" then
+			break
+		elseif dumpitem~="" and item~=dumpitem then
+			i=i+1
+		else
+			local num=meta:get_int('item_num'..i)
+			if num==0 then
+				i=i+1
+			else
+				local itemstack=ItemStack(item)
+				local maxstack=itemstack:get_stack_max()
+				local dropcount=math.min(num,maxstack)
+				minetest.add_item({x=pos.x,y=pos.y+1,z=pos.z},item..' '..dropcount)
+				meta:set_int('item_num'..i,num-dropcount)
+				break
+			end
+		end
+	end
+end
+
+minetest.register_node("miningtnt:storage", {
+	description = "Mining Storage",
+	tiles = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png"},
+	groups = {cracky=1, level=2, not_in_creative_inventory=1},
+	sounds = default.node_sound_wood_defaults(),
+	metadata_name = "generic",
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_string("formspec","field[text;;${text}]")
+		meta:set_string("dump_item","")
+		meta:set_string("infotext","Now trying to dump some random items")
+	end,
+	on_punch = function(pos, node, puncher)
+		miningtnt_storage_dump(pos)
+	end,
+	on_receive_fields = function(pos, formname, fields, sender)
+		local meta = minetest.get_meta(pos)
+		fields.text = fields.text or ""
+		meta:set_string("dump_item", fields.text)
+		if fields.text~="" then
+			meta:set_string("infotext","Now trying to dump "..fields.text)
+		else
+			meta:set_string("infotext","Now trying to dump some random items")
+		end
+	end,
+	mesecons={
+		effector={
+			action_on=function(pos,node)
+				miningtnt_storage_dump(pos)
+			end
+		}
+	}
+})
+
+
+
+for name,data in pairs(tnt_tables) do
+	
+	minetest.register_node(name, {
+		description = "TNT ("..name..")",
+		tiles = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png"},
+		groups = {dig_immediate=2, mesecon=2, not_in_creative_inventory=1},
+		sounds = default.node_sound_wood_defaults(),
+		
+		on_punch = function(pos, node, puncher)
+			if puncher:get_wielded_item():get_name() == "default:torch" then
+				if minetest.is_protected(pos, puncher:get_player_name()) then
+					print(puncher:get_player_name() .. " tried to light TNT at " .. minetest.pos_to_string(pos))
+					minetest.record_protection_violation(pos, puncher:get_player_name())
+					return
+				end
+				minetest.sound_play("miningtnt_ignite", {pos=pos})
+				boom_miningtnt(pos, 4)
+				minetest.set_node(pos, {name=name.."_burning"})
+			end
+		end,
+		
+		mesecons = {
+			effector = {
+				action_on = function(pos, node)
+					boom_miningtnt(pos, 0)
+				end
+			},
+		},
+	})
+	
+	minetest.register_node(name.."_burning", {
+	        tiles = {{name=animated_tnt_texture, animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1}},
+	        "tnt_bottom.png", "tnt_side.png"},
+	        light_source = 5,
+	        drop = "",
+	        sounds = default.node_sound_wood_defaults(),
+	})
+	
+	local prev = "miningtnt:tnt"..tonumber(strs:rem_from_start(name, "miningtnt:tnt"))-1
+	if prev=="miningtnt:tnt0" then prev="" end
+	--print(name .. " is made from " .. prev)
+	
+	minetest.register_craft({
+		output = name,
+		recipe = {
+			{"",prev,""},
+			{"","miningtnt:gunpowder",""},
+			{"",prev,""},
+		}
+	})
+	
+end
+
+function boom_miningtnt(pos, time)
+	local id = minetest.get_node(pos).name
+	boom_miningtnt_id(pos, time, id)
+end
+
+function boom_miningtnt_id(pos, time, id)
+	minetest.after(time, function(pos)
+		
+		local tnt_range = tnt_tables[id].r * 2
+	
+		local t1 = os.clock()
+		minetest.sound_play("miningtnt_explode", {pos=pos, gain=1.5, max_hear_distance=tnt_range*64})
+		
+		minetest.remove_node(pos)
+		
+--		local manip = minetest.get_voxel_manip()
+--		local width = tnt_range
+--		local emerged_pos1, emerged_pos2 = manip:read_from_map({x=pos.x-width, y=pos.y-width, z=pos.z-width},
+--		{x=pos.x+width, y=pos.y+width, z=pos.z+width})
+--		area = VoxelArea:new{MinEdge=emerged_pos1, MaxEdge=emerged_pos2}
+--		nodes = manip:get_data()
+--		
+--		local p_pos = area:index(pos.x, pos.y, pos.z)
+--		nodes[p_pos] = tnt_c_air
+		minetest.add_particle(pos, {x=0,y=0,z=0}, {x=0,y=0,z=0}, 0.5, 16, false, "miningtnt_explode.png")
+		--minetest.set_node(pos, {name="tnt:boom_miningtnt"})
+		
+		local objects = minetest.get_objects_inside_radius(pos, tnt_range/2)
+		for _,obj in ipairs(objects) do
+			if obj:is_player() or (obj:get_luaentity() and obj:get_luaentity().name ~= "__builtin:item") then
+				local obj_p = obj:getpos()
+				local vec = {x=obj_p.x-pos.x, y=obj_p.y-pos.y, z=obj_p.z-pos.z}
+				local dist = (vec.x^2+vec.y^2+vec.z^2)^0.5
+				local damage = 0
+				if dist < tnt_range/3.0 then damage = tnt_range end
+				obj:punch(obj, 1.0, {
+					full_punch_interval=1.0,
+					damage_groups={fleshy=damage},
+				}, vec)
+			end
+		end
+		
+		local storedPoses = {}
+		local ts = tnt_range * tnt_range
+
+		local mined_items = {}
+
+		for dx=-tnt_range,tnt_range do
+			local zm=math.floor((ts-dx*dx)^(1/2.0))
+			for dz=-zm,zm do
+				local ym=math.floor((ts-dx*dx-dz*dz)^(1/2.0))
+				for dy=-ym,ym do
+					local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+					----------------------------------------
+					--local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+					--vector.add(p, dir)
+					----------------------------------------
+--							local p_node = area:index(p.x, p.y, p.z)
+--							local d_p_node = nodes[p_node]
+					local node = minetest.get_node(p)
+					local nodename = node.name
+					if nodename~="air" then
+						--if math.abs(dx)<tnt_range and math.abs(dy)<tnt_range and math.abs(dz)<tnt_range then
+						if mined_items[nodename]==nil then
+							mined_items[nodename]=1
+						else
+							mined_items[nodename]=mined_items[nodename]+1
+						end
+						minetest.remove_node(p)
+						--elseif pr:next(1,5) <= 4 then
+						--	destroy(p, player, ents)
+						--end
+					end
+				end
+			end
+		end
+
+		minetest.add_node({x=pos.x,y=pos.y-tnt_range,z=pos.z},{name="miningtnt:storage"})
+		local meta=minetest.get_meta({x=pos.x,y=pos.y-tnt_range,z=pos.z})
+		local i=0
+		for name in pairs(mined_items) do
+			meta:set_string("item_name"..i,name)
+			meta:set_int("item_num"..i,mined_items[name])
+			i=i+1
+		end
+		
+		print(string.format("[tnt] exploded in: %.2fs", os.clock() - t1))
+	end, pos)
+end
+
+---------------------  GUNPOWDER  -------------------
+
+minetest.register_craftitem("miningtnt:gunpowder", {
+        description = "Gun Powder",
+        inventory_image = "miningtnt_gunpowder_inventory.png",
+})
+
+minetest.register_craft({
+        output = "miningtnt:gunpowder",
+        type = "shapeless",
+        recipe = {"default:coal_lump", "default:gravel", "default:pick_stone"}
+})
+

napalmtnt/init.lua

@@ -1,30 +1,25 @@
 local tnt_tables = {["napalmtnt:tnt1"] = {r=1},
 					["napalmtnt:tnt2"] = {r=2},
-					["napalmtnt:tnt3"] = {r=4},
-					["napalmtnt:tnt4"] = {r=6},
-					["napalmtnt:tnt5"] = {r=8},
-					["napalmtnt:tnt6"] = {r=10},
-					["napalmtnt:tnt7"] = {r=12},
-					["napalmtnt:tnt8"] = {r=14},
-					["napalmtnt:tnt9"] = {r=16},
-					["napalmtnt:tnt10"] = {r=18},
+					["napalmtnt:tnt3"] = {r=3},
+					["napalmtnt:tnt4"] = {r=4},
+					["napalmtnt:tnt5"] = {r=5},
+					["napalmtnt:tnt6"] = {r=7},
+					["napalmtnt:tnt7"] = {r=9},
+					["napalmtnt:tnt8"] = {r=11},
+					["napalmtnt:tnt9"] = {r=13},
+					["napalmtnt:tnt10"] = {r=15},
 					["napalmtnt:tnt11"] = {r=20},
-					["napalmtnt:tnt12"] = {r=22},
-					["napalmtnt:tnt13"] = {r=25},
-					["napalmtnt:tnt14"] = {r=30},
-					["napalmtnt:tnt15"] = {r=35},
-					["napalmtnt:tnt16"] = {r=40},
-					["napalmtnt:tnt17"] = {r=45},
-					["napalmtnt:tnt18"] = {r=50},
-					["napalmtnt:tnt19"] = {r=55},
-					["napalmtnt:tnt20"] = {r=60},
+					["napalmtnt:tnt12"] = {r=25},
+					["napalmtnt:tnt13"] = {r=30},
+					["napalmtnt:tnt14"] = {r=35},
+					["napalmtnt:tnt15"] = {r=40},
+					["napalmtnt:tnt16"] = {r=50},
+					["napalmtnt:tnt17"] = {r=60},
+					["napalmtnt:tnt18"] = {r=70},
+					["napalmtnt:tnt19"] = {r=85},
+					["napalmtnt:tnt20"] = {r=100},
 }
 				
-
-tnt = {}
-tnt.force = {}
-tnt.accl = {} 
-
 local function is_tnt(name)
 	if tnt_tables[name]~=nil then return true end
 	return false
@@ -42,20 +37,14 @@ local function combine_texture(texture_size, frame_count, texture, ani_texture)
         return ani_texture.."^[combine:"..texture_size.."x"..texture_size*frame_count..":"..combine_textures.."^"..ani_texture
 end
 
-local animated_tnt_texture = combine_texture(16, 4, "default_tnt_top.png", "napalmtnt_top_burning_animated.png")
-	
-tnt_c_tnt = {}
-tnt_c_tnt_burning = {}
-tnt_types_int = {}
+local animated_tnt_texture = combine_texture(16, 4, "tnt_top.png", "napalmtnt_top_burning_animated.png")
 
 for name,data in pairs(tnt_tables) do
 	
-	tnt_types_int[#tnt_types_int] = name
-
 	minetest.register_node(name, {
 		description = "TNT ("..name..")",
-		tiles = {"default_tnt_top.png", "default_tnt_bottom.png", "default_tnt_side.png"},
-		groups = {dig_immediate=2, mesecon=2},
+		tiles = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png"},
+		groups = {dig_immediate=2, mesecon=2, not_in_creative_inventory=1},
 		sounds = default.node_sound_wood_defaults(),
 		
 		on_punch = function(pos, node, puncher)
@@ -66,7 +55,7 @@ for name,data in pairs(tnt_tables) do
 					return
 				end
 				minetest.sound_play("napalmtnt_ignite", {pos=pos})
-				boom_napalmtnt(pos, 4, puncher)
+				boom_napalmtnt(pos, 4)
 				minetest.set_node(pos, {name=name.."_burning"})
 			end
 		end,
@@ -82,7 +71,7 @@ for name,data in pairs(tnt_tables) do
 	
 	minetest.register_node(name.."_burning", {
 	        tiles = {{name=animated_tnt_texture, animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1}},
-	        "default_tnt_bottom.png", "default_tnt_side.png"},
+	        "tnt_bottom.png", "tnt_side.png"},
 	        light_source = 5,
 	        drop = "",
 	        sounds = default.node_sound_wood_defaults(),
@@ -101,32 +90,19 @@ for name,data in pairs(tnt_tables) do
 		}
 	})
 	
-	tnt_c_tnt[#tnt_c_tnt + 1] = minetest.get_content_id(name)
-	tnt_c_tnt_burning[#tnt_c_tnt_burning + 1] = minetest.get_content_id(name.."_burning")
-
 end
 
-
-local function get_tnt_random(pos)
-        return PseudoRandom(math.abs(pos.x+pos.y*3+pos.z*5)+15)
-end
-
-
-
-
-
-function boom_napalmtnt(pos, time, player)
+function boom_napalmtnt(pos, time)
 	local id = minetest.get_node(pos).name
-	boom_napalmtnt_id(pos, time, player, id)
+	boom_napalmtnt_id(pos, time, id)
 end
 
-function boom_napalmtnt_id(pos, time, player, id)
+function boom_napalmtnt_id(pos, time, id)
 	minetest.after(time, function(pos)
 		
 		local tnt_range = tnt_tables[id].r * 2
 	
 		local t1 = os.clock()
-		pr = get_tnt_random(pos)
 		minetest.sound_play("napalmtnt_explode", {pos=pos, gain=1.5, max_hear_distance=tnt_range*64})
 		
 		minetest.remove_node(pos)
@@ -154,157 +130,22 @@ function boom_napalmtnt_id(pos, time, player, id)
 				local nodename = minetest.get_node(p).name
 				if is_tnt(nodename)==true then
 					minetest.set_node(p,{name="fire:basic_flame"})
-					boom_napalmtnt_id(p, 0.5, player, nodename) -- was {x=p.x, y=p.y, z=p.z}
+					boom_napalmtnt_id(p, 0.5, nodename) -- was {x=p.x, y=p.y, z=p.z}
 				else
 					minetest.set_node(p,{name="fire:basic_flame"})
 				end
 			end
 		end
 		
-		minetest.add_particlespawner(
-			100, --amount
-			1, --time
-			{x=pos.x-(tnt_range / 2), y=pos.y-(tnt_range / 2), z=pos.z-(tnt_range / 2)}, --minpos
-			{x=pos.x+(tnt_range / 2), y=pos.y+(tnt_range / 2), z=pos.z+(tnt_range / 2)}, --maxpos
-			{x=-0, y=-0, z=-0}, --minvel
-			{x=0, y=0, z=0}, --maxvel
-			{x=-0.5,y=5,z=-0.5}, --minacc
-			{x=0.5,y=5,z=0.5}, --maxacc
-			0.1, --minexptime
-			1, --maxexptime
-			8, --minsize
-			15, --maxsize
-			true, --collisiondetection
-			"napalmtnt_smoke.png" --texture
-		)
 		print(string.format("[tnt] exploded in: %.2fs", os.clock() - t1))
 	end, pos)
 end
 
-
-
 ---------------------  GUNPOWDER  -------------------
 
-
-function burn(pos, player)
-        local nodename = minetest.get_node(pos).name
-        if  strs:starts(nodename, "napalmtnt:tnt") then
-                minetest.sound_play("napalmtnt_ignite", {pos=pos})
-                boom_napalmtnt(pos, 1, player)
-                minetest.set_node(pos, {name=minetest.get_node(pos).name.."_burning"})
-                return
-        end
-        if nodename ~= "napalmtnt:gunpowder" then
-                return
-        end
-        minetest.sound_play("napalmtnt_gunpowder_burning", {pos=pos, gain=2})
-        minetest.set_node(pos, {name="napalmtnt:gunpowder_burning"})
-        
-        minetest.after(1, function(pos)
-                if minetest.get_node(pos).name ~= "napalmtnt:gunpowder_burning" then
-                        return
-                end
-                minetest.after(0.5, function(pos)
-                        minetest.remove_node(pos)
-                end, {x=pos.x, y=pos.y, z=pos.z})
-                for dx=-1,1 do
-                        for dz=-1,1 do
-                                for dy=-1,1 do
-                                        pos.x = pos.x+dx
-                                        pos.y = pos.y+dy
-                                        pos.z = pos.z+dz
-                                        
-                                        if not (math.abs(dx) == 1 and math.abs(dz) == 1) then
-                                                if dy == 0 then
-                                                        burn({x=pos.x, y=pos.y, z=pos.z}, player)
-                                                else
-                                                        if math.abs(dx) == 1 or math.abs(dz) == 1 then
-                                                                burn({x=pos.x, y=pos.y, z=pos.z}, player)
-                                                        end
-                                                end
-                                        end
-                                        
-                                        pos.x = pos.x-dx
-                                        pos.y = pos.y-dy
-                                        pos.z = pos.z-dz
-                                end
-                        end
-                end
-        end, pos)
-end
-
-
-minetest.register_node("napalmtnt:gunpowder", {
+minetest.register_craftitem("napalmtnt:gunpowder", {
         description = "Gun Powder",
-        drawtype = "raillike",
-        paramtype = "light",
-        sunlight_propagates = true,
-        walkable = false,
-        tiles = {"napalmtnt_gunpowder.png",},
         inventory_image = "napalmtnt_gunpowder_inventory.png",
-        wield_image = "napalmtnt_gunpowder_inventory.png",
-        selection_box = {
-                type = "fixed",
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-        },
-        groups = {dig_immediate=2,attached_node=1},
-        sounds = default.node_sound_leaves_defaults(),
-        
-        on_punch = function(pos, node, puncher)
-                if puncher:get_wielded_item():get_name() == "default:torch" then
-                        burn(pos, puncher)
-                end
-        end,
-})
-
-minetest.register_node("napalmtnt:gunpowder_burning", {
-        drawtype = "raillike",
-        paramtype = "light",
-        sunlight_propagates = true,
-        walkable = false,
-        light_source = 5,
-        tiles = {{name="napalmtnt_gunpowder_burning_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1}}},
-        selection_box = {
-                type = "fixed",
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-        },
-        drop = "",
-        groups = {dig_immediate=2,attached_node=1},
-        sounds = default.node_sound_leaves_defaults(),
-})
-
-local tnt_plus_gunpowder = {"napalmtnt:gunpowder"}
-for name,data in pairs(tnt_tables) do
-	tnt_plus_gunpowder[#tnt_plus_gunpowder+1] = name
-end
-
-
-minetest.register_abm({
-        nodenames = tnt_plus_gunpowder,
-        neighbors = {"fire:basic_flame"},
-        interval = 2,
-        chance = 10,
-        action = function(pos, node)
-                if tnt_tables[node.name]~=nil then
-                        boom_napalmtnt({x=pos.x, y=pos.y, z=pos.z}, 0)
-                else
-                        burn(pos)
-                end
-        end
-})
-
-minetest.register_abm({
-        nodenames = tnt_plus_gunpowder,
-        neighbors = {"tnt:gunpowder"},
-        interval = 2,
-        chance = 10,
-        action = function(pos, node)
-                if tnt_tables[node.name]~=nil then
-                        boom_napalmtnt({x=pos.x, y=pos.y, z=pos.z}, 0)
-                else
-                        burn(pos)
-                end
-        end
 })
 
 minetest.register_craft({
@@ -313,7 +154,3 @@ minetest.register_craft({
         recipe = {"default:coal_lump", "default:coal_lump", "default:dirt"}
 })
 
-
-tnt_c_air = minetest.get_content_id("air")
-tnt_c_fire = minetest.get_content_id("fire:basic_flame")
-

neutrontnt/depends.txt

@@ -0,0 +1,2 @@
+str_helpers
+default

neutrontnt/init.lua

@@ -0,0 +1,155 @@
+local tnt_tables = {["neutrontnt:tnt1"] = {r=1},
+					["neutrontnt:tnt2"] = {r=2},
+					["neutrontnt:tnt3"] = {r=3},
+					["neutrontnt:tnt4"] = {r=4},
+					["neutrontnt:tnt5"] = {r=5},
+					["neutrontnt:tnt6"] = {r=7},
+					["neutrontnt:tnt7"] = {r=9},
+					["neutrontnt:tnt8"] = {r=11},
+					["neutrontnt:tnt9"] = {r=13},
+					["neutrontnt:tnt10"] = {r=15},
+					["neutrontnt:tnt11"] = {r=20},
+					["neutrontnt:tnt12"] = {r=25},
+					["neutrontnt:tnt13"] = {r=30},
+					["neutrontnt:tnt14"] = {r=35},
+					["neutrontnt:tnt15"] = {r=40},
+					["neutrontnt:tnt16"] = {r=50},
+					["neutrontnt:tnt17"] = {r=60},
+					["neutrontnt:tnt18"] = {r=70},
+					["neutrontnt:tnt19"] = {r=85},
+					["neutrontnt:tnt20"] = {r=100},
+}
+				
+local function is_tnt(name)
+	if tnt_tables[name]~=nil then return true end
+	return false
+end
+
+local function combine_texture(texture_size, frame_count, texture, ani_texture)
+        local l = frame_count
+        local px = 0
+        local combine_textures = ":0,"..px.."="..texture
+        while l ~= 0 do
+                combine_textures = combine_textures..":0,"..px.."="..texture
+                px = px+texture_size
+                l = l-1
+        end
+        return ani_texture.."^[combine:"..texture_size.."x"..texture_size*frame_count..":"..combine_textures.."^"..ani_texture
+end
+
+local animated_tnt_texture = combine_texture(16, 4, "tnt_top.png", "neutrontnt_top_burning_animated.png")
+
+for name,data in pairs(tnt_tables) do
+	
+	minetest.register_node(name, {
+		description = "TNT ("..name..")",
+		tiles = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png"},
+		groups = {dig_immediate=2, mesecon=2, not_in_creative_inventory=1},
+		sounds = default.node_sound_wood_defaults(),
+		
+		on_punch = function(pos, node, puncher)
+			if puncher:get_wielded_item():get_name() == "default:torch" then
+				if minetest.is_protected(pos, puncher:get_player_name()) then
+					print(puncher:get_player_name() .. " tried to light TNT at " .. minetest.pos_to_string(pos))
+					minetest.record_protection_violation(pos, puncher:get_player_name())
+					return
+				end
+				minetest.sound_play("neutrontnt_ignite", {pos=pos})
+				boom_neutrontnt(pos, 4)
+				minetest.set_node(pos, {name=name.."_burning"})
+			end
+		end,
+		
+		mesecons = {
+			effector = {
+				action_on = function(pos, node)
+					boom_neutrontnt(pos, 0)
+				end
+			},
+		},
+	})
+	
+	minetest.register_node(name.."_burning", {
+	        tiles = {{name=animated_tnt_texture, animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1}},
+	        "tnt_bottom.png", "tnt_side.png"},
+	        light_source = 5,
+	        drop = "",
+	        sounds = default.node_sound_wood_defaults(),
+	})
+	
+	local prev = "neutrontnt:tnt"..tonumber(strs:rem_from_start(name, "neutrontnt:tnt"))-1
+	if prev=="neutrontnt:tnt0" then prev="" end
+	--print(name .. " is made from " .. prev)
+	
+	minetest.register_craft({
+		output = name,
+		recipe = {
+			{"",prev,""},
+			{"","neutrontnt:gunpowder",""},
+			{"",prev,""},
+		}
+	})
+	
+end
+
+function boom_neutrontnt(pos, time)
+	local id = minetest.get_node(pos).name
+	boom_neutrontnt_id(pos, time, id)
+end
+
+function boom_neutrontnt_id(pos, time, id)
+	minetest.after(time, function(pos)
+		
+		local tnt_range = tnt_tables[id].r * 2
+	
+		local t1 = os.clock()
+		minetest.sound_play("neutrontnt_explode", {pos=pos, gain=1.5, max_hear_distance=tnt_range*64})
+		
+		minetest.remove_node(pos)
+		
+--		local manip = minetest.get_voxel_manip()
+--		local width = tnt_range
+--		local emerged_pos1, emerged_pos2 = manip:read_from_map({x=pos.x-width, y=pos.y-width, z=pos.z-width},
+--		{x=pos.x+width, y=pos.y+width, z=pos.z+width})
+--		area = VoxelArea:new{MinEdge=emerged_pos1, MaxEdge=emerged_pos2}
+--		nodes = manip:get_data()
+--		
+--		local p_pos = area:index(pos.x, pos.y, pos.z)
+--		nodes[p_pos] = tnt_c_air
+		minetest.add_particle(pos, {x=0,y=0,z=0}, {x=0,y=0,z=0}, 0.5, 16, false, "neutrontnt_explode.png")
+		--minetest.set_node(pos, {name="tnt:boom_neutrontnt"})
+		
+		local objects = minetest.get_objects_inside_radius(pos, tnt_range/2)
+		for _,obj in ipairs(objects) do
+			if obj:is_player() or (obj:get_luaentity() and obj:get_luaentity().name ~= "__builtin:item") then
+				local obj_p = obj:getpos()
+				local vec = {x=obj_p.x-pos.x, y=obj_p.y-pos.y, z=obj_p.z-pos.z}
+				local dist = (vec.x^2+vec.y^2+vec.z^2)^0.5
+				local damage = 0
+				if dist < tnt_range/3.0 then damage = tnt_range end
+				obj:punch(obj, 1.0, {
+					full_punch_interval=1.0,
+					damage_groups={fleshy=damage},
+				}, vec)
+			end
+		end
+		
+		local storedPoses = {}
+		
+		print(string.format("[tnt] exploded in: %.2fs", os.clock() - t1))
+	end, pos)
+end
+
+---------------------  GUNPOWDER  -------------------
+
+minetest.register_craftitem("neutrontnt:gunpowder", {
+        description = "Gun Powder",
+        inventory_image = "neutrontnt_gunpowder_inventory.png",
+})
+
+minetest.register_craft({
+        output = "neutrontnt:gunpowder",
+        type = "shapeless",
+        recipe = {"default:coal_lump", "default:gravel", "default:glass"}
+})
+