diff --git a/goblin.lua b/goblin.lua index 6238f6a..99b12a9 100644 --- a/goblin.lua +++ b/goblin.lua @@ -453,6 +453,27 @@ minetest.register_abm({ end }) +local singleplayer = minetest.is_singleplayer() +local setting = minetest.setting_getbool("enable_tnt") +local diamond_trap +if (not singleplayer and setting ~= true) or (singleplayer and setting == false) then + -- wimpier trap for non-tnt settings + diamond_trap = function(pos, player) + minetest.set_node(pos, {name="default:lava_source"}) + if player:get_hp() > 0 then + player:set_hp(player:get_hp()-2) + minetest.sound_play("default_dig_crumbly", {pos = pos, gain = 0.5, max_hear_distance = 10}) + end + end +else + -- 5... 4... 3... 2... 1... + diamond_trap = function(pos, player) + minetest.set_node(pos, {name="tnt:tnt_burning"}) + minetest.get_node_timer(pos):start(5) + minetest.sound_play("default_dig_crumbly", {pos = pos, gain = 0.5, max_hear_distance = 10}) + end +end + minetest.register_node("fun_caves:stone_with_diamond_trap", { description = "Diamond Trap", tiles = {"default_cobble.png^default_mineral_diamond.png"}, @@ -461,46 +482,27 @@ minetest.register_node("fun_caves:stone_with_diamond_trap", { is_ground_content = false, sounds = default.node_sound_stone_defaults(), on_dig = function(pos, node, digger) - digger:set_hp(digger:get_hp() - 1) - minetest.node_dig(pos, node, digger) + if math.random(3) == 1 then + diamond_trap(pos, digger) + else + minetest.node_dig(pos, node, digger) + end end }) -local singleplayer = minetest.is_singleplayer() -local setting = minetest.setting_getbool("enable_tnt") -if (not singleplayer and setting ~= true) or (singleplayer and setting == false) then - -- wimpier trap for non-tnt settings - minetest.register_abm({ - nodenames = {"fun_caves:stone_with_diamond_trap"}, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - for _,object in ipairs(minetest.get_objects_inside_radius(pos, 3)) do - if object:is_player() then - minetest.set_node(pos, {name="default:lava_source"}) - if object:get_hp() > 0 then - object:set_hp(object:get_hp()-2) - minetest.sound_play("default_dig_crumbly", {pos = pos, gain = 0.5, max_hear_distance = 10}) - end - end +minetest.register_abm({ + nodenames = {"fun_caves:stone_with_diamond_trap"}, + interval = 1, + chance = 1, + action = function(pos) + for _,object in ipairs(minetest.get_objects_inside_radius(pos, 3)) do + if object:is_player() then + diamond_trap(pos, object) end - end}) -else - -- 5... 4... 3... 2... 1... - minetest.register_abm({ - nodenames = {"fun_caves:stone_with_diamond_trap"}, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - for _,object in ipairs(minetest.get_objects_inside_radius(pos, 3)) do - if object:is_player() then - minetest.set_node(pos, {name="tnt:tnt_burning"}) - minetest.get_node_timer(pos):start(5) - minetest.sound_play("default_dig_crumbly", {pos = pos, gain = 0.5, max_hear_distance = 10}) - end - end - end}) -end + end + end, +}) + newnode = fun_caves.clone_node("default:lava_source") newnode.description = "Molten Gold Source" @@ -533,6 +535,11 @@ bucket.register_liquid( {} ) +local gold_trap = function(pos, player) + minetest.set_node(pos, {name="fun_caves:molten_gold_source"}) + minetest.sound_play("default_dig_crumbly", {pos = pos, gain = 0.5, max_hear_distance = 10}) +end + minetest.register_node("fun_caves:stone_with_gold_trap", { description = "Gold Trap", tiles = {"default_cobble.png^default_mineral_gold.png"}, @@ -541,8 +548,11 @@ minetest.register_node("fun_caves:stone_with_gold_trap", { is_ground_content = false, sounds = default.node_sound_stone_defaults(), on_dig = function(pos, node, digger) - digger:set_hp(digger:get_hp() - 1) - minetest.node_dig(pos, node, digger) + if math.random(3) == 1 then + gold_trap(pos, digger) + else + minetest.node_dig(pos, node, digger) + end end }) @@ -550,17 +560,29 @@ minetest.register_abm({ nodenames = {"fun_caves:stone_with_gold_trap"}, interval = 1, chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) + action = function(pos) for _,object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do if object:is_player() then - minetest.set_node(pos, {name="fun_caves:molten_gold_source"}) - if object:get_hp() > 0 then - object:set_hp(object:get_hp()-2) - minetest.sound_play("default_dig_crumbly", {pos = pos, gain = 0.5, max_hear_distance = 10}) - end + gold_trap(pos, object) end end - end}) + end +}) + + +local ice_trap = function(pos, player) + local ppos = player:getpos() + if ppos then + ppos.y = ppos.y + 1 + local p1 = vector.subtract(ppos, 2) + local p2 = vector.add(ppos, 2) + local nodes = minetest.find_nodes_in_area(p1, p2, 'air') + for _, npos in pairs(nodes) do + minetest.set_node(npos, {name="default:ice"}) + end + minetest.set_node(pos, {name="default:ice"}) + end +end minetest.register_node("fun_caves:ice_trap", { description = "Ice Trap", @@ -569,77 +591,28 @@ minetest.register_node("fun_caves:ice_trap", { drop = 'default:ice', is_ground_content = false, sounds = default.node_sound_stone_defaults(), + on_dig = function(pos, node, digger) + if math.random(3) == 1 then + ice_trap(pos, digger) + else + minetest.node_dig(pos, node, digger) + end + end }) minetest.register_abm({ nodenames = {"fun_caves:ice_trap"}, interval = 1, chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) + action = function(pos) for _,object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do if object:is_player() then - local ppos = object:getpos() - if ppos then - ppos.y = ppos.y + 1 - local p1 = vector.subtract(ppos, 2) - local p2 = vector.add(ppos, 2) - local nodes = minetest.find_nodes_in_area(p1, p2, 'air') - for _, npos in pairs(nodes) do - minetest.set_node(npos, {name="default:ice"}) - minetest.set_node(pos, {name="default:ice"}) - end - - if object:get_hp() > 0 then - object:set_hp(object:get_hp()-2) - end - end + ice_trap(pos, object) end end end }) -minetest.register_node("fun_caves:stone_with_iron_trap", { - description = "Iron Trap", - tiles = {"default_cobble.png^default_mineral_iron.png"}, - groups = {cracky = 3}, - drop = 'default:iron_lump', - is_ground_content = false, - sounds = default.node_sound_stone_defaults(), - on_dig = function(pos, node, digger) - digger:set_hp(digger:get_hp() - 1) - minetest.node_dig(pos, node, digger) - end -}) - --- summon a metallic goblin? --- pit of iron razors? -minetest.register_abm({ - nodenames = {"fun_caves:stone_with_iron_trap"}, - interval = 2, - chance = 2, - action = function(pos, node, active_object_count, active_object_count_wider) - for _,object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do - if object:is_player() then - if object:get_hp() > 0 then - object:set_hp(object:get_hp()-1) - minetest.sound_play("default_dig_crumbly", {pos = pos, gain = 0.5, max_hear_distance = 10}) - end - end - end - end}) - -minetest.register_node("fun_caves:stone_with_copper_trap", { - description = "Copper Trap", - tiles = {"default_cobble.png^default_mineral_copper.png"}, - groups = {cracky = 3}, - drop = 'default:copper_lump', - is_ground_content = false, - sounds = default.node_sound_stone_defaults(), - on_dig = function(pos, node, digger) - digger:set_hp(digger:get_hp() - 1) - minetest.node_dig(pos, node, digger) - end -}) local function lightning_effects(pos, radius) minetest.add_particlespawner({ @@ -659,20 +632,72 @@ local function lightning_effects(pos, radius) }) end +local copper_trap = function(pos, player) + if player:get_hp() > 0 then + player:set_hp(player:get_hp()-1) + lightning_effects(pos, 3) + minetest.sound_play("default_dig_crumbly", {pos = pos, gain = 0.5, max_hear_distance = 10}) + end +end + +minetest.register_node("fun_caves:stone_with_copper_trap", { + description = "Copper Trap", + tiles = {"default_cobble.png^default_mineral_copper.png"}, + groups = {cracky = 3}, + drop = 'default:copper_lump', + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + on_dig = function(pos, node, digger) + if math.random(3) == 1 then + copper_trap(pos, digger) + else + minetest.node_dig(pos, node, digger) + end + end +}) + --[[ based on dwarves cactus]] minetest.register_abm({ nodenames = {"fun_caves:stone_with_copper_trap"}, interval = 1, chance = 2, - action = function(pos, node, active_object_count, active_object_count_wider) + action = function(pos) for _,object in ipairs(minetest.get_objects_inside_radius(pos, 3)) do if object:is_player() then - if object:get_hp() > 0 then - object:set_hp(object:get_hp()-1) - -- sprite - lightning_effects(pos, 3) - minetest.sound_play("default_dig_crumbly", {pos = pos, gain = 0.5, max_hear_distance = 10}) - end + copper_trap(pos, object) end end - end}) + end +}) + + +-- summon a metallic goblin? +-- pit of iron razors? +minetest.register_node("fun_caves:stone_with_iron_trap", { + description = "Iron Trap", + tiles = {"default_cobble.png^default_mineral_iron.png"}, + groups = {cracky = 3}, + drop = 'default:iron_lump', + is_ground_content = false, + sounds = default.node_sound_stone_defaults(), + on_dig = function(pos, node, digger) + if math.random(3) == 1 then + copper_trap(pos, digger) + else + minetest.node_dig(pos, node, digger) + end + end +}) + +minetest.register_abm({ + nodenames = {"fun_caves:stone_with_iron_trap"}, + interval = 2, + chance = 2, + action = function(pos, node, active_object_count, active_object_count_wider) + for _,object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do + if object:is_player() then + copper_trap(pos, object) + end + end + end +}) diff --git a/spec_bomb.lua b/spec_bomb.lua index 466427a..a6d36f5 100644 --- a/spec_bomb.lua +++ b/spec_bomb.lua @@ -231,6 +231,9 @@ for _, node in pairs(mass_nodes) do local maxp = vector.add(pos, maxr) if pos.y >= player_pos.y then minp.y = player_pos.y + if pos.y - player_pos.y < 3 then + maxp.y = player_pos.y + 3 + end end local air = minetest.get_content_id('air')