resolve mergeconflicts

mods/tnt/README.txt

@@ -9,8 +9,8 @@ ShadowNinja (MIT)
 sofar (sofar@foo-projects.org) (MIT)
 Various Minetest developers and contributors (MIT)
 
-Authors of media (textures)
----------------------------
+Authors of media
+----------------
 BlockMen (CC BY-SA 3.0):
 All textures not mentioned below.
 
@@ -26,6 +26,23 @@ 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

mods/tnt/depends.txt

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

mods/tnt/init.lua

@@ -1,6 +1,12 @@
+-- tnt/init.lua
+
 tnt = {}
 core.register_privilege("trusted_player", "special grantings, used for tnt for example")
 
+-- Load support for MT game translation.
+local S = minetest.get_translator("tnt")
+
+
 -- Default to enabled when in singleplayer
 local enable_tnt = minetest.settings:get_bool("enable_tnt")
 if enable_tnt == nil then
@@ -17,7 +23,7 @@ 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 = {}
-minetest.after(0, function()
+minetest.register_on_mods_loaded(function()
 	for name, def in pairs(minetest.registered_nodes) do
 		cid_data[minetest.get_content_id(name)] = {
 			name = name,
@@ -158,42 +164,41 @@ local function entity_physics(pos, radius, drops)
 
 		local damage = (4 / dist) * radius
 		if obj:is_player() then
-			-- currently the engine has no method to set
-			-- player velocity. See #2960
-			-- instead, we knock the player back 1.0 node, and slightly upwards
 			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)
+			local moveoff = vector.multiply(dir, 2 / dist * radius)
+			obj:add_player_velocity(moveoff)
 
 			obj:set_hp(obj:get_hp() - damage)
 		else
-			local do_damage = true
-			local do_knockback = true
-			local entity_drops = {}
 			local luaobj = obj:get_luaentity()
-			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
+			-- 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 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)
+				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
-			for _, item in pairs(entity_drops) do
-				add_drop(drops, item)
 			end
 		end
 	end
@@ -230,12 +235,16 @@ local function add_effects(pos, radius, drops)
 	-- 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 node
 	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 then
+				node = { name = name }
+			end
 			if def and def.tiles and def.tiles[1] then
 				texture = def.tiles[1]
 			end
@@ -253,9 +262,11 @@ local function add_effects(pos, radius, drops)
 		maxacc = {x = 0, y = -10, z = 0},
 		minexptime = 0.8,
 		maxexptime = 2.0,
-		minsize = radius * 0.66,
-		maxsize = radius * 2,
+		minsize = radius * 0.33,
+		maxsize = radius,
 		texture = texture,
+		-- ^ only as fallback for clients without support for `node` parameter
+		node = node,
 		collisiondetection = true,
 	})
 end
@@ -269,7 +280,7 @@ function tnt.burn(pos, nodename)
 		def.on_ignite(pos)
 	elseif minetest.get_item_group(name, "tnt") > 0 then
 		minetest.swap_node(pos, {name = name .. "_burning"})
-		minetest.sound_play("tnt_ignite", {pos = pos})
+		minetest.sound_play("tnt_ignite", {pos = pos}, true)
 		minetest.get_node_timer(pos):start(1)
 	end
 end
@@ -284,10 +295,15 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, owne
 	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
 	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")
+	if enable_tnt then
+		c_tnt = minetest.get_content_id("tnt:tnt")
+	else
+		c_tnt = c_tnt_burning -- tnt is not registered if disabled
+	end
 	-- make sure we still have explosion even when centre node isnt tnt related
 	if explode_center then
 		count = 1
@@ -393,12 +409,12 @@ function tnt.boom(pos, def)
 	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
+	if not def.explode_center and def.ignore_protection ~= true then
 		minetest.set_node(pos, {name = "tnt:boom"})
 	end
 	local sound = def.sound or "tnt_explode"
-	minetest.sound_play(sound, {pos = pos, gain = 1.5,
-			max_hear_distance = math.min(def.radius * 20, 128)})
+	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
@@ -423,7 +439,7 @@ minetest.register_node("tnt:boom", {
 })
 
 minetest.register_node("tnt:gunpowder", {
-	description = "Gun Powder",
+	description = S("Gun Powder"),
 	drawtype = "raillike",
 	paramtype = "light",
 	is_ground_content = false,
@@ -540,7 +556,8 @@ minetest.register_node("tnt:gunpowder_burning", {
 	-- unaffected by explosions
 	on_blast = function() end,
 	on_construct = function(pos)
-		minetest.sound_play("tnt_gunpowder_burning", {pos = pos, gain = 2})
+		minetest.sound_play("tnt_gunpowder_burning", {pos = pos,
+			gain = 2}, true)
 		minetest.get_node_timer(pos):start(1)
 	end,
 })
@@ -552,7 +569,7 @@ minetest.register_craft({
 })
 
 minetest.register_craftitem("tnt:tnt_stick", {
-	description = "TNT Stick",
+	description = S("TNT Stick"),
 	inventory_image = "tnt_tnt_stick.png",
 	groups = {flammable = 5},
 })
@@ -671,7 +688,7 @@ function tnt.register_tnt(def)
 		-- unaffected by explosions
 		on_blast = function() end,
 		on_construct = function(pos)
-			minetest.sound_play("tnt_ignite", {pos = pos})
+			minetest.sound_play("tnt_ignite", {pos = pos}, true)
 			minetest.get_node_timer(pos):start(4)
 			minetest.check_for_falling(pos)
 		end,
@@ -680,6 +697,6 @@ end
 
 tnt.register_tnt({
 	name = "tnt:tnt",
-	description = "TNT",
+	description = S("TNT"),
 	radius = tnt_radius,
 })

mods/tnt/license.txt

@@ -26,9 +26,10 @@ DEALINGS IN THE SOFTWARE.
 For more details:
 https://opensource.org/licenses/MIT
 
+===================================
 
-Licenses of media (textures)
-----------------------------
+Licenses of media
+-----------------
 
 Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
 Copyright (C) 2014-2016 BlockMen
@@ -64,3 +65,36 @@ 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/
+

mods/tnt/locale/template.txt

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

mods/tnt/locale/tnt.de.tr

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

mods/tnt/locale/tnt.es.tr

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

mods/tnt/locale/tnt.fr.tr

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

mods/tnt/locale/tnt.id.tr

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

mods/tnt/locale/tnt.it.tr

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

mods/tnt/locale/tnt.ms.tr

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

mods/tnt/locale/tnt.ru.tr

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

mods/tnt/locale/tnt.se.tr

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

mods/tnt/locale/tnt.zh_CN.tr

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

mods/tnt/locale/tnt.zh_TW.tr

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

mods/tnt/mod.conf

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