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

fix mergeconflicts

Browse source
This commit is contained in:
Milan* 2017-03-15 11:30:00 +01:00
commit 464fee1dee
79 changed files with 1535 additions and 409 deletions
Download patch file Download diff file Expand all files Collapse all files

49
mods/tnt/init.lua
View file

@ -367,6 +367,8 @@ function tnt.boom(pos, def)
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", {
@ -392,7 +394,12 @@ minetest.register_node("tnt:gunpowder", {
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 = {
@ -408,6 +415,9 @@ minetest.register_node("tnt:gunpowder", {
if(minetest.check_player_privs(puncher:get_player_name(), {trusted_player=true})) then
--tnt.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
end,
@ -469,7 +479,11 @@ 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
@ -496,7 +510,7 @@ minetest.register_node("tnt:gunpowder_burning", {
})
minetest.register_craft({
output = "tnt:gunpowder",
output = "tnt:gunpowder 5",
type = "shapeless",
groups = {gunpowder = 1},
recipe = {"default:coal_lump", "default:gravel"}
@ -505,22 +519,22 @@ minetest.register_craft({
minetest.register_craft({
output = "tnt:tnt",
recipe = {
{"", "group:wood", ""},
{"group:wood", "tnt:gunpowder", "group:wood"},
{"", "group:wood", ""}
{"group:wood", "tnt:gunpowder", "group:wood"},
{"tnt:gunpowder", "tnt:gunpowder", "tnt:gunpowder"},
{"group:wood", "tnt:gunpowder", "group:wood"}
}
})
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,
})
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,
})
function tnt.register_tnt(def)
local name
@ -547,6 +561,9 @@ function tnt.register_tnt(def)
on_punch = function(pos, node, puncher)
if puncher:get_wielded_item():get_name() == "default:torch" then
minetest.set_node(pos, {name = name .. "_burning"})
minetest.log("action", puncher:get_player_name() ..
" ignites " .. node.name .. " at " ..
minetest.pos_to_string(pos))
end
end,
on_blast = function(pos, intensity)