Fix TNT mod crash when entities disappear during explosion (#2616)

rebased #2368

README.txt

@@ -1,36 +1,74 @@
-=== TNT mod for Minetest ===
+Minetest Game mod: tnt
-by PilzAdam and ShadowNinja
+======================
+See license.txt for license information.
 
-Introduction:
+Authors of source code
+----------------------
+PilzAdam (MIT)
+ShadowNinja (MIT)
+sofar (sofar@foo-projects.org) (MIT)
+Various Minetest developers and contributors (MIT)
+
+Authors of media
+----------------
+BlockMen (CC BY-SA 3.0):
+All textures not mentioned below.
+
+ShadowNinja (CC BY-SA 3.0):
+tnt_smoke.png
+
+Wuzzy (CC BY-SA 3.0):
+All gunpowder textures except tnt_gunpowder_inventory.png.
+
+sofar (sofar@foo-projects.org) (CC BY-SA 3.0):
+tnt_blast.png
+
+paramat (CC BY-SA 3.0)
+tnt_tnt_stick.png - Derived from a texture by benrob0329.
+
+TumeniNodes (CC0 1.0)
+tnt_explode.ogg
+renamed, edited, and converted to .ogg from Explosion2.wav
+by steveygos93 (CC0 1.0)
+<https://freesound.org/s/80401/>
+
+tnt_ignite.ogg
+renamed, edited, and converted to .ogg from sparkler_fuse_nm.wav
+by theneedle.tv (CC0 1.0)
+<https://freesound.org/s/316682/>
+
+tnt_gunpowder_burning.ogg
+renamed, edited, and converted to .ogg from road flare ignite burns.wav
+by frankelmedico (CC0 1.0)
+<https://freesound.org/s/348767/>
+
+
+Introduction
+------------
 This mod adds TNT to Minetest. TNT is a tool to help the player
 in mining.
 
 How to use the mod:
-Craft gunpowder by placing coal and gravel in the crafting area. The
+
-gunpowder can be used to craft TNT or as fuze for TNT. To craft TNT
+Craft gunpowder by placing coal and gravel in the crafting area.
-surround gunpowder with 4 wood in a + shape.
+The gunpowder can be used to craft TNT sticks or as a fuse trail for TNT.
-There are different ways to blow up TNT:
+
+To craft 2 TNT sticks:
+G_G
+GPG
+G_G
+G = gunpowder
+P = paper
+The sticks are not usable as an explosive.
+
+Craft TNT from 9 TNT sticks.
+
+There are different ways to ignite TNT:
   1. Hit it with a torch.
-  2. Hit a gunpowder fuze that leads to a TNT block with a torch.
+  2. Hit a gunpowder fuse trail that leads to TNT with a torch or
-  3. Activate it with mesecons (fastest way)
+     flint-and-steel.
-Be aware of the damage radius of 7 blocks!
+  3. Activate it with mesecons (fastest way).
 
-License:
+For 1 TNT:
-WTFPL (see below)
+Node destruction radius is 3 nodes.
-
+Player and object damage radius is 6 nodes.
-See also:
-http://minetest.net/
-
-         DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.

depends.txt

@@ -1,3 +0,0 @@
-default
-fire
-

init.lua

@@ -1,10 +1,15 @@
+-- tnt/init.lua
 
--- Default to enabled in singleplayer and disabled in multiplayer
+tnt = {}
-local singleplayer = minetest.is_singleplayer()
+
-local setting = minetest.setting_getbool("enable_tnt")
+-- Load support for MT game translation.
-if (not singleplayer and setting ~= true) or
+local S = minetest.get_translator("tnt")
-		(singleplayer and setting == false) then
+
-	return
+
+-- Default to enabled when in singleplayer
+local enable_tnt = minetest.settings:get_bool("enable_tnt")
+if enable_tnt == nil then
+	enable_tnt = minetest.is_singleplayer()
 end
 
 -- loss probabilities array (one in X will be lost)
@@ -13,7 +18,7 @@ local loss_prob = {}
 loss_prob["default:cobble"] = 3
 loss_prob["default:dirt"] = 4
 
-local radius = tonumber(minetest.setting_get("tnt_radius") or 3)
+local tnt_radius = tonumber(minetest.settings:get("tnt_radius") or 3)
 
 -- Fill a list with data for content IDs, after all nodes are registered
 local cid_data = {}
@@ -29,31 +34,42 @@ minetest.after(0, function()
 end)
 
 local function rand_pos(center, pos, radius)
-	pos.x = center.x + math.random(-radius, radius)
+	local def
-	pos.z = center.z + math.random(-radius, radius)
+	local reg_nodes = minetest.registered_nodes
+	local i = 0
+	repeat
+		-- Give up and use the center if this takes too long
+		if i > 4 then
+			pos.x, pos.z = center.x, center.z
+			break
+		end
+		pos.x = center.x + math.random(-radius, radius)
+		pos.z = center.z + math.random(-radius, radius)
+		def = reg_nodes[minetest.get_node(pos).name]
+		i = i + 1
+	until def and not def.walkable
 end
 
 local function eject_drops(drops, pos, radius)
 	local drop_pos = vector.new(pos)
 	for _, item in pairs(drops) do
-		local count = item:get_count()
+		local count = math.min(item:get_count(), item:get_stack_max())
-		local max = item:get_stack_max()
-		if count > max then
-			item:set_count(max)
-		end
 		while count > 0 do
-			if count < max then
+			local take = math.max(1,math.min(radius * radius,
-				item:set_count(count)
+					count,
-			end
+					item:get_stack_max()))
 			rand_pos(pos, drop_pos, radius)
-			local obj = minetest.add_item(drop_pos, item)
+			local dropitem = ItemStack(item)
+			dropitem:set_count(take)
+			local obj = minetest.add_item(drop_pos, dropitem)
 			if obj then
 				obj:get_luaentity().collect = true
-				obj:setacceleration({x=0, y=-10, z=0})
+				obj:set_acceleration({x = 0, y = -10, z = 0})
-				obj:setvelocity({x=math.random(-3, 3), y=10,
+				obj:set_velocity({x = math.random(-3, 3),
-						z=math.random(-3, 3)})
+						y = math.random(0, 10),
+						z = math.random(-3, 3)})
 			end
-			count = count - max
+			count = count - take
 		end
 	end
 end
@@ -73,32 +89,45 @@ local function add_drop(drops, item)
 	end
 end
 
-local fire_node = {name="fire:basic_flame"}
+local basic_flame_on_construct -- cached value
+local function destroy(drops, npos, cid, c_air, c_fire,
+		on_blast_queue, on_construct_queue,
+		ignore_protection, ignore_on_blast, owner)
+	if not ignore_protection and minetest.is_protected(npos, owner) then
+		return cid
+	end
 
-local function destroy(drops, pos, cid)
-	if minetest.is_protected(pos, "") then
-		return
-	end
 	local def = cid_data[cid]
-	if def and def.on_blast then
+
-		def.on_blast(vector.new(pos), 1)
+	if not def then
-		return
+		return c_air
-	end
+	elseif not ignore_on_blast and def.on_blast then
-	if def and def.flammable then
+		on_blast_queue[#on_blast_queue + 1] = {
-		minetest.set_node(pos, fire_node)
+			pos = vector.new(npos),
+			on_blast = def.on_blast
+		}
+		return cid
+	elseif def.flammable then
+		on_construct_queue[#on_construct_queue + 1] = {
+			fn = basic_flame_on_construct,
+			pos = vector.new(npos)
+		}
+		return c_fire
 	else
-		minetest.remove_node(pos)
+		local node_drops = minetest.get_node_drops(def.name, "")
-		if def then
+		for _, item in pairs(node_drops) do
-			local node_drops = minetest.get_node_drops(def.name, "")
+			add_drop(drops, item)
-			for _, item in ipairs(node_drops) do
-				add_drop(drops, item)
-			end
 		end
+		return c_air
 	end
 end
 
-
 local function calc_velocity(pos1, pos2, old_vel, power)
+	-- Avoid errors caused by a vector of zero length
+	if vector.equals(pos1, pos2) then
+		return old_vel
+	end
+
 	local vel = vector.direction(pos1, pos2)
 	vel = vector.normalize(vel)
 	vel = vector.multiply(vel, power)
@@ -110,86 +139,215 @@ local function calc_velocity(pos1, pos2, old_vel, power)
 
 	-- Add old velocity
 	vel = vector.add(vel, old_vel)
+
+	-- randomize it a bit
+	vel = vector.add(vel, {
+		x = math.random() - 0.5,
+		y = math.random() - 0.5,
+		z = math.random() - 0.5,
+	})
+
+	-- Limit to terminal velocity
+	dist = vector.length(vel)
+	if dist > 250 then
+		vel = vector.divide(vel, dist / 250)
+	end
 	return vel
 end
 
-local function entity_physics(pos, radius)
+local function entity_physics(pos, radius, drops)
-	-- Make the damage radius larger than the destruction radius
-	radius = radius * 2
 	local objs = minetest.get_objects_inside_radius(pos, radius)
 	for _, obj in pairs(objs) do
-		local obj_pos = obj:getpos()
+		local obj_pos = obj:get_pos()
-		local obj_vel = obj:getvelocity()
 		local dist = math.max(1, vector.distance(pos, obj_pos))
 
-		if obj_vel ~= nil then
-			obj:setvelocity(calc_velocity(pos, obj_pos,
-					obj_vel, radius * 10))
-		end
-
 		local damage = (4 / dist) * radius
-		obj:set_hp(obj:get_hp() - damage)
+		if obj:is_player() then
+			-- we knock the player back 1.0 node, and slightly upwards
+			-- TODO: switch to add_player_velocity() introduced in 5.1
+			local dir = vector.normalize(vector.subtract(obj_pos, pos))
+			local moveoff = vector.multiply(dir, dist + 1.0)
+			local newpos = vector.add(pos, moveoff)
+			newpos = vector.add(newpos, {x = 0, y = 0.2, z = 0})
+			obj:set_pos(newpos)
+
+			obj:set_hp(obj:get_hp() - damage)
+		else
+			local luaobj = obj:get_luaentity()
+
+			-- object might have disappeared somehow
+			if luaobj then
+				local do_damage = true
+				local do_knockback = true
+				local entity_drops = {}
+				local objdef = minetest.registered_entities[luaobj.name]
+
+				if objdef and objdef.on_blast then
+					do_damage, do_knockback, entity_drops = objdef.on_blast(luaobj, damage)
+				end
+
+				if do_knockback then
+					local obj_vel = obj:get_velocity()
+					obj:set_velocity(calc_velocity(pos, obj_pos,
+							obj_vel, radius * 10))
+				end
+				if do_damage then
+					if not obj:get_armor_groups().immortal then
+						obj:punch(obj, 1.0, {
+							full_punch_interval = 1.0,
+							damage_groups = {fleshy = damage},
+						}, nil)
+					end
+				end
+				for _, item in pairs(entity_drops) do
+					add_drop(drops, item)
+				end
+			end
+		end
 	end
 end
 
-local function add_effects(pos, radius)
+local function add_effects(pos, radius, drops)
+	minetest.add_particle({
+		pos = pos,
+		velocity = vector.new(),
+		acceleration = vector.new(),
+		expirationtime = 0.4,
+		size = radius * 10,
+		collisiondetection = false,
+		vertical = false,
+		texture = "tnt_boom.png",
+		glow = 15,
+	})
 	minetest.add_particlespawner({
-		amount = 128,
+		amount = 64,
-		time = 1,
+		time = 0.5,
 		minpos = vector.subtract(pos, radius / 2),
 		maxpos = vector.add(pos, radius / 2),
-		minvel = {x=-20, y=-20, z=-20},
+		minvel = {x = -10, y = -10, z = -10},
-		maxvel = {x=20,  y=20,  z=20},
+		maxvel = {x = 10, y = 10, z = 10},
 		minacc = vector.new(),
 		maxacc = vector.new(),
 		minexptime = 1,
-		maxexptime = 3,
+		maxexptime = 2.5,
-		minsize = 8,
+		minsize = radius * 3,
-		maxsize = 16,
+		maxsize = radius * 5,
 		texture = "tnt_smoke.png",
 	})
+
+	-- we just dropped some items. Look at the items entities and pick
+	-- one of them to use as texture
+	local texture = "tnt_blast.png" --fallback texture
+	local most = 0
+	for name, stack in pairs(drops) do
+		local count = stack:get_count()
+		if count > most then
+			most = count
+			local def = minetest.registered_nodes[name]
+			if def and def.tiles and def.tiles[1] then
+				texture = def.tiles[1]
+			end
+		end
+	end
+
+	minetest.add_particlespawner({
+		amount = 64,
+		time = 0.1,
+		minpos = vector.subtract(pos, radius / 2),
+		maxpos = vector.add(pos, radius / 2),
+		minvel = {x = -3, y = 0, z = -3},
+		maxvel = {x = 3, y = 5,  z = 3},
+		minacc = {x = 0, y = -10, z = 0},
+		maxacc = {x = 0, y = -10, z = 0},
+		minexptime = 0.8,
+		maxexptime = 2.0,
+		minsize = radius * 0.66,
+		maxsize = radius * 2,
+		texture = texture,
+		collisiondetection = true,
+	})
 end
 
-local function burn(pos)
+function tnt.burn(pos, nodename)
-	local name = minetest.get_node(pos).name
+	local name = nodename or minetest.get_node(pos).name
-	if name == "tnt:tnt" then
+	local def = minetest.registered_nodes[name]
-		minetest.sound_play("tnt_ignite", {pos=pos})
+	if not def then
-		minetest.set_node(pos, {name="tnt:tnt_burning"})
+		return
-		minetest.get_node_timer(pos):start(1)
+	elseif def.on_ignite then
-	elseif name == "tnt:gunpowder" then
+		def.on_ignite(pos)
-		minetest.sound_play("tnt_gunpowder_burning", {pos=pos, gain=2})
+	elseif minetest.get_item_group(name, "tnt") > 0 then
-		minetest.set_node(pos, {name="tnt:gunpowder_burning"})
+		minetest.swap_node(pos, {name = name .. "_burning"})
+		minetest.sound_play("tnt_ignite", {pos = pos}, true)
 		minetest.get_node_timer(pos):start(1)
 	end
 end
 
-local function explode(pos, radius)
+local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, owner, explode_center)
-	local pos = vector.round(pos)
+	pos = vector.round(pos)
+	-- scan for adjacent TNT nodes first, and enlarge the explosion
+	local vm1 = VoxelManip()
+	local p1 = vector.subtract(pos, 2)
+	local p2 = vector.add(pos, 2)
+	local minp, maxp = vm1:read_from_map(p1, p2)
+	local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
+	local data = vm1:get_data()
+	local count = 0
+	local c_tnt = minetest.get_content_id("tnt:tnt")
+	local c_tnt_burning = minetest.get_content_id("tnt:tnt_burning")
+	local c_tnt_boom = minetest.get_content_id("tnt:boom")
+	local c_air = minetest.get_content_id("air")
+	-- make sure we still have explosion even when centre node isnt tnt related
+	if explode_center then
+		count = 1
+	end
+
+	for z = pos.z - 2, pos.z + 2 do
+	for y = pos.y - 2, pos.y + 2 do
+		local vi = a:index(pos.x - 2, y, z)
+		for x = pos.x - 2, pos.x + 2 do
+			local cid = data[vi]
+			if cid == c_tnt or cid == c_tnt_boom or cid == c_tnt_burning then
+				count = count + 1
+				data[vi] = c_air
+			end
+			vi = vi + 1
+		end
+	end
+	end
+
+	vm1:set_data(data)
+	vm1:write_to_map()
+
+	-- recalculate new radius
+	radius = math.floor(radius * math.pow(count, 1/3))
+
+	-- perform the explosion
 	local vm = VoxelManip()
 	local pr = PseudoRandom(os.time())
-	local p1 = vector.subtract(pos, radius)
+	p1 = vector.subtract(pos, radius)
-	local p2 = vector.add(pos, radius)
+	p2 = vector.add(pos, radius)
-	local minp, maxp = vm:read_from_map(p1, p2)
+	minp, maxp = vm:read_from_map(p1, p2)
-	local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
+	a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
-	local data = vm:get_data()
+	data = vm:get_data()
 
 	local drops = {}
-	local p = {}
+	local on_blast_queue = {}
-
+	local on_construct_queue = {}
-	local c_air = minetest.get_content_id("air")
+	basic_flame_on_construct = minetest.registered_nodes["fire:basic_flame"].on_construct
 
+	local c_fire = minetest.get_content_id("fire:basic_flame")
 	for z = -radius, radius do
 	for y = -radius, radius do
 	local vi = a:index(pos.x + (-radius), pos.y + y, pos.z + z)
 	for x = -radius, radius do
-		if (x * x) + (y * y) + (z * z) <=
+		local r = vector.length(vector.new(x, y, z))
-				(radius * radius) + pr:next(-radius, radius) then
+		if (radius * radius) / (r * r) >= (pr:next(80, 125) / 100) then
 			local cid = data[vi]
-			p.x = pos.x + x
+			local p = {x = pos.x + x, y = pos.y + y, z = pos.z + z}
-			p.y = pos.y + y
-			p.z = pos.z + z
 			if cid ~= c_air then
-				destroy(drops, p, cid)
+				data[vi] = destroy(drops, p, cid, c_air, c_fire,
+					on_blast_queue, on_construct_queue,
+					ignore_protection, ignore_on_blast, owner)
 			end
 		end
 		vi = vi + 1
@@ -197,98 +355,120 @@ local function explode(pos, radius)
 	end
 	end
 
-	return drops
+	vm:set_data(data)
-end
+	vm:write_to_map()
+	vm:update_map()
+	vm:update_liquids()
 
-
+	-- call check_single_for_falling for everything within 1.5x blast radius
-local function boom(pos)
+	for y = -radius * 1.5, radius * 1.5 do
-	minetest.sound_play("tnt_explode", {pos=pos, gain=1.5, max_hear_distance=2*64})
+	for z = -radius * 1.5, radius * 1.5 do
-	minetest.set_node(pos, {name="tnt:boom"})
+	for x = -radius * 1.5, radius * 1.5 do
-	minetest.get_node_timer(pos):start(0.5)
+		local rad = {x = x, y = y, z = z}
-
+		local s = vector.add(pos, rad)
-	local drops = explode(pos, radius)
+		local r = vector.length(rad)
-	entity_physics(pos, radius)
+		if r / radius < 1.4 then
-	eject_drops(drops, pos, radius)
+			minetest.check_single_for_falling(s)
-	add_effects(pos, radius)
-end
-
-minetest.register_node("tnt:tnt", {
-	description = "TNT",
-	tiles = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png"},
-	is_ground_content = false,
-	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
-			minetest.sound_play("tnt_ignite", {pos=pos})
-			minetest.set_node(pos, {name="tnt:tnt_burning"})
-			minetest.get_node_timer(pos):start(4)
 		end
-	end,
+	end
-	on_blast = function(pos, intensity)
+	end
-		burn(pos)
+	end
-	end,
-	mesecons = {effector = {action_on = boom}},
-})
 
-minetest.register_node("tnt:tnt_burning", {
+	for _, queued_data in pairs(on_blast_queue) do
-	tiles = {
+		local dist = math.max(1, vector.distance(queued_data.pos, pos))
-		{
+		local intensity = (radius * radius) / (dist * dist)
-			name = "tnt_top_burning_animated.png",
+		local node_drops = queued_data.on_blast(queued_data.pos, intensity)
-			animation = {
+		if node_drops then
-				type = "vertical_frames",
+			for _, item in pairs(node_drops) do
-				aspect_w = 16,
+				add_drop(drops, item)
-				aspect_h = 16,
+			end
-				length = 1,
+		end
-			}
+	end
-		},
+
-		"tnt_bottom.png", "tnt_side.png"},
+	for _, queued_data in pairs(on_construct_queue) do
-	light_source = 5,
+		queued_data.fn(queued_data.pos)
-	drop = "",
+	end
-	sounds = default.node_sound_wood_defaults(),
+
-	on_timer = boom,
+	minetest.log("action", "TNT owned by " .. owner .. " detonated at " ..
-	-- unaffected by explosions
+		minetest.pos_to_string(pos) .. " with radius " .. radius)
-	on_blast = function() end,
+
-})
+	return drops, radius
+end
+
+function tnt.boom(pos, def)
+	def = def or {}
+	def.radius = def.radius or 1
+	def.damage_radius = def.damage_radius or def.radius * 2
+	local meta = minetest.get_meta(pos)
+	local owner = meta:get_string("owner")
+	if not def.explode_center then
+		minetest.set_node(pos, {name = "tnt:boom"})
+	end
+	local sound = def.sound or "tnt_explode"
+	minetest.sound_play(sound, {pos = pos, gain = 2.5,
+			max_hear_distance = math.min(def.radius * 20, 128)}, true)
+	local drops, radius = tnt_explode(pos, def.radius, def.ignore_protection,
+			def.ignore_on_blast, owner, def.explode_center)
+	-- append entity drops
+	local damage_radius = (radius / math.max(1, def.radius)) * def.damage_radius
+	entity_physics(pos, damage_radius, drops)
+	if not def.disable_drops then
+		eject_drops(drops, pos, radius)
+	end
+	add_effects(pos, radius, drops)
+	minetest.log("action", "A TNT explosion occurred at " .. minetest.pos_to_string(pos) ..
+		" with radius " .. radius)
+end
 
 minetest.register_node("tnt:boom", {
-	drawtype = "plantlike",
+	drawtype = "airlike",
-	tiles = {"tnt_boom.png"},
 	light_source = default.LIGHT_MAX,
 	walkable = false,
 	drop = "",
-	groups = {dig_immediate=3},
+	groups = {dig_immediate = 3},
-	on_timer = function(pos, elapsed)
-		minetest.remove_node(pos)
-	end,
 	-- unaffected by explosions
 	on_blast = function() end,
 })
 
 minetest.register_node("tnt:gunpowder", {
-	description = "Gun Powder",
+	description = S("Gun Powder"),
 	drawtype = "raillike",
 	paramtype = "light",
 	is_ground_content = false,
 	sunlight_propagates = true,
 	walkable = false,
-	tiles = {"tnt_gunpowder_straight.png", "tnt_gunpowder_curved.png", "tnt_gunpowder_t_junction.png", "tnt_gunpowder_crossing.png"},
+	tiles = {
+		"tnt_gunpowder_straight.png",
+		"tnt_gunpowder_curved.png",
+		"tnt_gunpowder_t_junction.png",
+		"tnt_gunpowder_crossing.png"
+	},
 	inventory_image = "tnt_gunpowder_inventory.png",
 	wield_image = "tnt_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,connect_to_raillike=minetest.raillike_group("gunpowder")},
+	groups = {dig_immediate = 2, attached_node = 1, flammable = 5,
+		connect_to_raillike = minetest.raillike_group("gunpowder")},
 	sounds = default.node_sound_leaves_defaults(),
-	
+
 	on_punch = function(pos, node, puncher)
 		if puncher:get_wielded_item():get_name() == "default:torch" then
-			burn(pos)
+			minetest.set_node(pos, {name = "tnt:gunpowder_burning"})
+			minetest.log("action", puncher:get_player_name() ..
+				" ignites tnt:gunpowder at " ..
+				minetest.pos_to_string(pos))
 		end
 	end,
 	on_blast = function(pos, intensity)
-		burn(pos)
+		minetest.set_node(pos, {name = "tnt:gunpowder_burning"})
+	end,
+	on_burn = function(pos)
+		minetest.set_node(pos, {name = "tnt:gunpowder_burning"})
+	end,
+	on_ignite = function(pos, igniter)
+		minetest.set_node(pos, {name = "tnt:gunpowder_burning"})
 	end,
 })
 
@@ -339,52 +519,172 @@ minetest.register_node("tnt:gunpowder_burning", {
 		fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
 	},
 	drop = "",
-	groups = {dig_immediate=2,attached_node=1,connect_to_raillike=minetest.raillike_group("gunpowder")},
+	groups = {
+		dig_immediate = 2,
+		attached_node = 1,
+		connect_to_raillike = minetest.raillike_group("gunpowder")
+	},
 	sounds = default.node_sound_leaves_defaults(),
 	on_timer = function(pos, elapsed)
 		for dx = -1, 1 do
 		for dz = -1, 1 do
-		for dy = -1, 1 do
+			if math.abs(dx) + math.abs(dz) == 1 then
-			if not (dx == 0 and dz == 0) then
+				for dy = -1, 1 do
-				burn({
+					tnt.burn({
-					x = pos.x + dx,
+						x = pos.x + dx,
-					y = pos.y + dy,
+						y = pos.y + dy,
-					z = pos.z + dz,
+						z = pos.z + dz,
-				})
+					})
+				end
 			end
 		end
 		end
-		end
 		minetest.remove_node(pos)
 	end,
 	-- unaffected by explosions
 	on_blast = function() end,
-})
+	on_construct = function(pos)
-
+		minetest.sound_play("tnt_gunpowder_burning", {pos = pos,
-minetest.register_abm({
+			gain = 2}, true)
-	nodenames = {"tnt:tnt", "tnt:gunpowder"},
+		minetest.get_node_timer(pos):start(1)
-	neighbors = {"fire:basic_flame", "default:lava_source", "default:lava_flowing"},
+	end,
-	interval = 1,
-	chance = 1,
-	action = burn,
 })
 
 minetest.register_craft({
-	output = "tnt:gunpowder",
+	output = "tnt:gunpowder 5",
 	type = "shapeless",
 	recipe = {"default:coal_lump", "default:gravel"}
 })
 
-minetest.register_craft({
+minetest.register_craftitem("tnt:tnt_stick", {
-	output = "tnt:tnt",
+	description = S("TNT Stick"),
-	recipe = {
+	inventory_image = "tnt_tnt_stick.png",
-		{"",           "group:wood",    ""},
+	groups = {flammable = 5},
-		{"group:wood", "tnt:gunpowder", "group:wood"},
-		{"",           "group:wood",    ""}
-	}
 })
 
-if minetest.setting_get("log_mods") then
+if enable_tnt then
-	minetest.debug("[TNT] Loaded!")
+	minetest.register_craft({
+		output = "tnt:tnt_stick 2",
+		recipe = {
+			{"tnt:gunpowder", "", "tnt:gunpowder"},
+			{"tnt:gunpowder", "default:paper", "tnt:gunpowder"},
+			{"tnt:gunpowder", "", "tnt:gunpowder"},
+		}
+	})
+
+	minetest.register_craft({
+		output = "tnt:tnt",
+		recipe = {
+			{"tnt:tnt_stick", "tnt:tnt_stick", "tnt:tnt_stick"},
+			{"tnt:tnt_stick", "tnt:tnt_stick", "tnt:tnt_stick"},
+			{"tnt:tnt_stick", "tnt:tnt_stick", "tnt:tnt_stick"}
+		}
+	})
+
+	minetest.register_abm({
+		label = "TNT ignition",
+		nodenames = {"group:tnt", "tnt:gunpowder"},
+		neighbors = {"fire:basic_flame", "default:lava_source", "default:lava_flowing"},
+		interval = 4,
+		chance = 1,
+		action = function(pos, node)
+			tnt.burn(pos, node.name)
+		end,
+	})
 end
 
+function tnt.register_tnt(def)
+	local name
+	if not def.name:find(':') then
+		name = "tnt:" .. def.name
+	else
+		name = def.name
+		def.name = def.name:match(":([%w_]+)")
+	end
+	if not def.tiles then def.tiles = {} end
+	local tnt_top = def.tiles.top or def.name .. "_top.png"
+	local tnt_bottom = def.tiles.bottom or def.name .. "_bottom.png"
+	local tnt_side = def.tiles.side or def.name .. "_side.png"
+	local tnt_burning = def.tiles.burning or def.name .. "_top_burning_animated.png"
+	if not def.damage_radius then def.damage_radius = def.radius * 2 end
+
+	if enable_tnt then
+		minetest.register_node(":" .. name, {
+			description = def.description,
+			tiles = {tnt_top, tnt_bottom, tnt_side},
+			is_ground_content = false,
+			groups = {dig_immediate = 2, mesecon = 2, tnt = 1, flammable = 5},
+			sounds = default.node_sound_wood_defaults(),
+			after_place_node = function(pos, placer)
+				if placer:is_player() then
+					local meta = minetest.get_meta(pos)
+					meta:set_string("owner", placer:get_player_name())
+				end
+			end,
+			on_punch = function(pos, node, puncher)
+				if puncher:get_wielded_item():get_name() == "default:torch" then
+					minetest.swap_node(pos, {name = name .. "_burning"})
+					minetest.registered_nodes[name .. "_burning"].on_construct(pos)
+					minetest.log("action", puncher:get_player_name() ..
+						" ignites " .. node.name .. " at " ..
+						minetest.pos_to_string(pos))
+				end
+			end,
+			on_blast = function(pos, intensity)
+				minetest.after(0.1, function()
+					tnt.boom(pos, def)
+				end)
+			end,
+			mesecons = {effector =
+				{action_on =
+					function(pos)
+						tnt.boom(pos, def)
+					end
+				}
+			},
+			on_burn = function(pos)
+				minetest.swap_node(pos, {name = name .. "_burning"})
+				minetest.registered_nodes[name .. "_burning"].on_construct(pos)
+			end,
+			on_ignite = function(pos, igniter)
+				minetest.swap_node(pos, {name = name .. "_burning"})
+				minetest.registered_nodes[name .. "_burning"].on_construct(pos)
+			end,
+		})
+	end
+
+	minetest.register_node(":" .. name .. "_burning", {
+		tiles = {
+			{
+				name = tnt_burning,
+				animation = {
+					type = "vertical_frames",
+					aspect_w = 16,
+					aspect_h = 16,
+					length = 1,
+				}
+			},
+			tnt_bottom, tnt_side
+			},
+		light_source = 5,
+		drop = "",
+		sounds = default.node_sound_wood_defaults(),
+		groups = {falling_node = 1},
+		on_timer = function(pos, elapsed)
+			tnt.boom(pos, def)
+		end,
+		-- unaffected by explosions
+		on_blast = function() end,
+		on_construct = function(pos)
+			minetest.sound_play("tnt_ignite", {pos = pos}, true)
+			minetest.get_node_timer(pos):start(4)
+			minetest.check_for_falling(pos)
+		end,
+	})
+end
+
+tnt.register_tnt({
+	name = "tnt:tnt",
+	description = S("TNT"),
+	radius = tnt_radius,
+})

license.txt

@@ -0,0 +1,100 @@
+License of source code
+----------------------
+
+The MIT License (MIT)
+Copyright (C) 2014-2016 PilzAdam
+Copyright (C) 2014-2016 ShadowNinja
+Copyright (C) 2016 sofar (sofar@foo-projects.org)
+Copyright (C) 2014-2016 Various Minetest developers and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+For more details:
+https://opensource.org/licenses/MIT
+
+===================================
+
+Licenses of media
+-----------------
+
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
+Copyright (C) 2014-2016 BlockMen
+Copyright (C) 2014-2016 ShadowNinja
+Copyright (C) 2015-2016 Wuzzy
+Copyright (C) 2016 sofar (sofar@foo-projects.org)
+Copyright (C) 2018 paramat
+
+You are free to:
+Share — copy and redistribute the material in any medium or format.
+Adapt — remix, transform, and build upon the material for any purpose, even commercially.
+The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+Under the following terms:
+
+Attribution — You must give appropriate credit, provide a link to the license, and
+indicate if changes were made. You may do so in any reasonable manner, but not in any way
+that suggests the licensor endorses you or your use.
+
+ShareAlike — If you remix, transform, or build upon the material, you must distribute
+your contributions under the same license as the original.
+
+No additional restrictions — You may not apply legal terms or technological measures that
+legally restrict others from doing anything the license permits.
+
+Notices:
+
+You do not have to comply with the license for elements of the material in the public
+domain or where your use is permitted by an applicable exception or limitation.
+No warranties are given. The license may not give you all of the permissions necessary
+for your intended use. For example, other rights such as publicity, privacy, or moral
+rights may limit how you use the material.
+
+For more details:
+http://creativecommons.org/licenses/by-sa/3.0/
+
+====================================================
+
+CC0 1.0 Universal (CC0 1.0) Public Domain Dedication 
+for audio files (found in sounds folder)
+TumeniNodes
+steveygos93
+theneedle.tv
+frankelmedico
+
+No Copyright
+
+The person who associated a work with this deed has dedicated the work to the public domain
+by waiving all of his or her rights to the work worldwide under copyright law, including all
+related and neighboring rights, to the extent allowed by law.
+
+You can copy, modify, distribute and perform the work, even for commercial purposes, all
+without asking permission. See Other Information below.
+
+In no way are the patent or trademark rights of any person affected by CC0, nor are the
+rights that other persons may have in the work or in how the work is used, such as publicity
+or privacy rights.
+
+Unless expressly stated otherwise, the person who associated a work with this deed makes no
+warranties about the work, and disclaims liability for all uses of the work, to the fullest
+extent permitted by applicable law.
+
+When using or citing the work, you should not imply endorsement by the author or the affirmer.
+
+This license is acceptable for Free Cultural Works.
+For more Information:
+https://creativecommons.org/publicdomain/zero/1.0/
+

locale/template.txt

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=
+TNT Stick=
+TNT=

locale/tnt.de.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Schießpulver
+TNT Stick=TNT-Stange
+TNT=TNT

locale/tnt.es.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Pólvora
+TNT Stick=Cartucho de TNT
+TNT=TNT

locale/tnt.fr.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Poudre à canon
+TNT Stick=Bâton de TNT
+TNT=TNT

locale/tnt.it.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Polvere da sparo
+TNT Stick=Candelotto di TNT
+TNT=TNT

locale/tnt.ms.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Serbuk Senjata Api
+TNT Stick=Batang TNT
+TNT=TNT

locale/tnt.ru.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Порох
+TNT Stick=Тротиловая Палка
+TNT=Тротил

locale/tnt.se.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Krut
+TNT Stick=Dynamitpinne
+TNT=Dynamit

locale/tnt.zh_CN.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=火药粉
+TNT Stick=炸药棒
+TNT=炸药包

locale/tnt.zh_TW.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=火藥粉
+TNT Stick=炸藥棒
+TNT=炸藥包

mod.conf

@@ -0,0 +1,3 @@
+name = tnt
+description = Minetest Game mod: tnt
+depends = default, fire