Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "merge upstream commit: TNT: When disabled leave some useful functionality enabled"

Browse source 
This reverts commit c80473afe6.
This commit is contained in:
tchncs 2016-07-16 13:59:46 +02:00
parent c80473afe6
commit 6bafa46283
1 changed files with 17 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

72
mods/tnt/init.lua
View file

@ -1,13 +1,5 @@
tnt = {}
<<<<<<< HEAD
core.register_privilege("trusted_player", "special grantings, used for tnt for example")
=======
-- Default to enabled when in singleplayer
local enable_tnt = minetest.setting_getbool("enable_tnt")
if enable_tnt == nil
enable_tnt = minetest.is_singleplayer()
end
>>>>>>> 497e6f6... TNT: When disabled leave some useful functionality enabled
-- loss probabilities array (one in X will be lost)
local loss_prob = {}
@ -496,30 +488,28 @@ minetest.register_node("tnt:gunpowder_burning", {
end,
})
minetest.register_abm({
nodenames = {"group:tnt", "tnt:gunpowder"},
neighbors = {"fire:basic_flame", "default:lava_source", "default:lava_flowing"},
interval = 4,
chance = 1,
action = tnt.burn,
})
minetest.register_craft({
output = "tnt:gunpowder",
type = "shapeless",
recipe = {"default:coal_lump", "default:gravel"}
})
if enable_tnt then
minetest.register_craft({
output = "tnt:tnt",
recipe = {
{"", "group:wood", ""},
{"group:wood", "tnt:gunpowder", "group:wood"},
{"", "group:wood", ""}
}
})
minetest.register_abm({
nodenames = {"group:tnt", "tnt:gunpowder"},
neighbors = {"fire:basic_flame", "default:lava_source", "default:lava_flowing"},
interval = 4,
chance = 1,
action = tnt.burn,
})
end
minetest.register_craft({
output = "tnt:tnt",
recipe = {
{"", "group:wood", ""},
{"group:wood", "tnt:gunpowder", "group:wood"},
{"", "group:wood", ""}
}
})
function tnt.register_tnt(def)
local name = ""
@ -536,7 +526,6 @@ function tnt.register_tnt(def)
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
<<<<<<< HEAD
minetest.register_node(":" .. name, {
description = def.description,
tiles = {tnt_top, tnt_bottom, tnt_side},
@ -563,34 +552,6 @@ function tnt.register_tnt(def)
-- }
--},
})
=======
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},
sounds = default.node_sound_wood_defaults(),
on_punch = function(pos, node, puncher)
if puncher:get_wielded_item():get_name() == "default:torch" then
minetest.set_node(pos, {name = name .. "_burning"})
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
}
},
})
end
>>>>>>> 497e6f6... TNT: When disabled leave some useful functionality enabled
minetest.register_node(":" .. name .. "_burning", {
tiles = {
@ -627,3 +588,4 @@ tnt.register_tnt({
description = "TNT",
radius = radius,
})