12 Commits
5.1.0 ... 5.3.0

Author SHA1 Message Date
Muhammad Rifqi Priyo Susanto
3d1444b6f8 Add Indonesian translations (#2693) 2020-06-29 18:41:50 +02:00
tenplus1
d7cbf76a0a TNT centre node adheres to protection
Make sure tnt.boom() doesnt replace centre node when explode_centre is true and ignore_protection is false.

Fixes: https://github.com/minetest/minetest_game/issues/2663
2020-06-28 15:50:46 +02:00
sfan5
7963340553 Use node particles for TNT explosions (#2695) 2020-06-02 12:48:56 +02:00
sfan5
52ece86a66 Switch TNT explosions to use add_player_velocity (#2674) 2020-05-10 14:10:29 +02:00
sfan5
b6f17ce9ce Fix crash on TNT explosions if tnt is disabled 2020-04-08 17:24:10 +02:00
sfan5
329b088d1c Fix TNT mod crash when entities disappear during explosion (#2616) 2020-03-06 21:51:19 +01:00
IFRFSX
0c4c6d79c3 Update Chinese Translation, Add Traditional Chinese Translation (#2596) 2020-03-02 21:53:12 +01:00
sfan5
b008c3d819 Convert minetest.sound_play uses to ephemeral 2020-02-05 22:24:23 +01:00
Zaoqi
95ebd6ab85 Add zh_CN translation 2020-01-22 19:09:38 +01:00
Muhammad Nur Hidayat Yasuyoshi (MNH48)
aa71d13511 Add Malay translation 2019-11-30 17:31:40 +01:00
Aresiel
8e3fc0a7ed Add Swedish translation 2019-11-30 17:31:29 +01:00
Andrey2470T
bda65b0c4b Add Russian translation (#2525) 2019-10-24 21:54:20 +02:00
7 changed files with 72 additions and 37 deletions

View File

@@ -22,7 +22,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 -- Fill a list with data for content IDs, after all nodes are registered
local cid_data = {} local cid_data = {}
minetest.after(0, function() minetest.register_on_mods_loaded(function()
for name, def in pairs(minetest.registered_nodes) do for name, def in pairs(minetest.registered_nodes) do
cid_data[minetest.get_content_id(name)] = { cid_data[minetest.get_content_id(name)] = {
name = name, name = name,
@@ -163,42 +163,41 @@ local function entity_physics(pos, radius, drops)
local damage = (4 / dist) * radius local damage = (4 / dist) * radius
if obj:is_player() then 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 dir = vector.normalize(vector.subtract(obj_pos, pos))
local moveoff = vector.multiply(dir, dist + 1.0) local moveoff = vector.multiply(dir, 2 / dist * radius)
local newpos = vector.add(pos, moveoff) obj:add_player_velocity(moveoff)
newpos = vector.add(newpos, {x = 0, y = 0.2, z = 0})
obj:set_pos(newpos)
obj:set_hp(obj:get_hp() - damage) obj:set_hp(obj:get_hp() - damage)
else else
local do_damage = true
local do_knockback = true
local entity_drops = {}
local luaobj = obj:get_luaentity() local luaobj = obj:get_luaentity()
local objdef = minetest.registered_entities[luaobj.name]
if objdef and objdef.on_blast then -- object might have disappeared somehow
do_damage, do_knockback, entity_drops = objdef.on_blast(luaobj, damage) if luaobj then
end local do_damage = true
local do_knockback = true
local entity_drops = {}
local objdef = minetest.registered_entities[luaobj.name]
if do_knockback then if objdef and objdef.on_blast then
local obj_vel = obj:get_velocity() do_damage, do_knockback, entity_drops = objdef.on_blast(luaobj, damage)
obj:set_velocity(calc_velocity(pos, obj_pos, end
obj_vel, radius * 10))
end if do_knockback then
if do_damage then local obj_vel = obj:get_velocity()
if not obj:get_armor_groups().immortal then obj:set_velocity(calc_velocity(pos, obj_pos,
obj:punch(obj, 1.0, { obj_vel, radius * 10))
full_punch_interval = 1.0, end
damage_groups = {fleshy = damage}, if do_damage then
}, nil) 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
for _, item in pairs(entity_drops) do
add_drop(drops, item)
end end
end end
end end
@@ -235,12 +234,16 @@ local function add_effects(pos, radius, drops)
-- we just dropped some items. Look at the items entities and pick -- we just dropped some items. Look at the items entities and pick
-- one of them to use as texture -- one of them to use as texture
local texture = "tnt_blast.png" --fallback texture local texture = "tnt_blast.png" --fallback texture
local node
local most = 0 local most = 0
for name, stack in pairs(drops) do for name, stack in pairs(drops) do
local count = stack:get_count() local count = stack:get_count()
if count > most then if count > most then
most = count most = count
local def = minetest.registered_nodes[name] local def = minetest.registered_nodes[name]
if def then
node = { name = name }
end
if def and def.tiles and def.tiles[1] then if def and def.tiles and def.tiles[1] then
texture = def.tiles[1] texture = def.tiles[1]
end end
@@ -258,9 +261,11 @@ local function add_effects(pos, radius, drops)
maxacc = {x = 0, y = -10, z = 0}, maxacc = {x = 0, y = -10, z = 0},
minexptime = 0.8, minexptime = 0.8,
maxexptime = 2.0, maxexptime = 2.0,
minsize = radius * 0.66, minsize = radius * 0.33,
maxsize = radius * 2, maxsize = radius,
texture = texture, texture = texture,
-- ^ only as fallback for clients without support for `node` parameter
node = node,
collisiondetection = true, collisiondetection = true,
}) })
end end
@@ -274,7 +279,7 @@ function tnt.burn(pos, nodename)
def.on_ignite(pos) def.on_ignite(pos)
elseif minetest.get_item_group(name, "tnt") > 0 then elseif minetest.get_item_group(name, "tnt") > 0 then
minetest.swap_node(pos, {name = name .. "_burning"}) 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) minetest.get_node_timer(pos):start(1)
end end
end end
@@ -289,10 +294,15 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, owne
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp}) local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
local data = vm1:get_data() local data = vm1:get_data()
local count = 0 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_burning = minetest.get_content_id("tnt:tnt_burning")
local c_tnt_boom = minetest.get_content_id("tnt:boom") local c_tnt_boom = minetest.get_content_id("tnt:boom")
local c_air = minetest.get_content_id("air") 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 -- make sure we still have explosion even when centre node isnt tnt related
if explode_center then if explode_center then
count = 1 count = 1
@@ -398,12 +408,12 @@ function tnt.boom(pos, def)
def.damage_radius = def.damage_radius or def.radius * 2 def.damage_radius = def.damage_radius or def.radius * 2
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local owner = meta:get_string("owner") 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"}) minetest.set_node(pos, {name = "tnt:boom"})
end end
local sound = def.sound or "tnt_explode" local sound = def.sound or "tnt_explode"
minetest.sound_play(sound, {pos = pos, gain = 2.5, minetest.sound_play(sound, {pos = pos, gain = 2.5,
max_hear_distance = math.min(def.radius * 20, 128)}) max_hear_distance = math.min(def.radius * 20, 128)}, true)
local drops, radius = tnt_explode(pos, def.radius, def.ignore_protection, local drops, radius = tnt_explode(pos, def.radius, def.ignore_protection,
def.ignore_on_blast, owner, def.explode_center) def.ignore_on_blast, owner, def.explode_center)
-- append entity drops -- append entity drops
@@ -541,7 +551,8 @@ minetest.register_node("tnt:gunpowder_burning", {
-- unaffected by explosions -- unaffected by explosions
on_blast = function() end, on_blast = function() end,
on_construct = function(pos) 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) minetest.get_node_timer(pos):start(1)
end, end,
}) })
@@ -672,7 +683,7 @@ function tnt.register_tnt(def)
-- unaffected by explosions -- unaffected by explosions
on_blast = function() end, on_blast = function() end,
on_construct = function(pos) 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.get_node_timer(pos):start(4)
minetest.check_for_falling(pos) minetest.check_for_falling(pos)
end, end,

4
locale/tnt.id.tr Normal file
View File

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

4
locale/tnt.ms.tr Normal file
View File

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

4
locale/tnt.ru.tr Normal file
View File

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

4
locale/tnt.se.tr Normal file
View File

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

4
locale/tnt.zh_CN.tr Normal file
View File

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

4
locale/tnt.zh_TW.tr Normal file
View File

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