Extra error checking.

This commit is contained in:
Duane 2016-07-15 02:58:33 -05:00
parent aa999e2ed5
commit bf26b8bee1
25 changed files with 897 additions and 314 deletions

View file

@ -61,7 +61,7 @@ local traps = {
local function goblin_do(self)
if not fun_caves.custom_ready(self) then
if not (self and fun_caves.custom_ready(self)) then
return
end
@ -412,7 +412,16 @@ minetest.register_abm({
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, 0.95)) do -- IDKWTF this is but it works
if not pos then
return
end
local objects = minetest.get_objects_inside_radius(pos, 0.95)
if not (objects and type(objects) == 'table') then
return
end
for _, object in ipairs(objects) do -- IDKWTF this is but it works
if object:is_player() then
object:set_physics_override({speed = 0.1})
minetest.after(1, function() -- this effect is temporary
@ -442,7 +451,16 @@ minetest.register_abm({
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, 2)) do
if not pos then
return
end
local objects = minetest.get_objects_inside_radius(pos, 2)
if not (objects and type(objects) == 'table') then
return
end
for _, object in ipairs(objects) do
if object:is_player() then
minetest.set_node(pos, {name="fire:basic_flame"})
if object:get_hp() > 0 then
@ -459,6 +477,10 @@ 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)
if not (pos and player) then
return
end
minetest.set_node(pos, {name="default:lava_source"})
if player:get_hp() > 0 then
player:set_hp(player:get_hp()-2)
@ -468,8 +490,15 @@ if (not singleplayer and setting ~= true) or (singleplayer and setting == false)
else
-- 5... 4... 3... 2... 1...
diamond_trap = function(pos, player)
if not (pos and player) then
return
end
minetest.set_node(pos, {name="tnt:tnt_burning"})
minetest.get_node_timer(pos):start(5)
local timer = minetest.get_node_timer(pos)
if timer then
timer:start(5)
end
minetest.sound_play("default_dig_crumbly", {pos = pos, gain = 0.5, max_hear_distance = 10})
end
end
@ -482,6 +511,10 @@ 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)
if not (pos and digger) then
return
end
if math.random(3) == 1 then
diamond_trap(pos, digger)
else
@ -495,7 +528,16 @@ minetest.register_abm({
interval = 1,
chance = 1,
action = function(pos)
for _,object in ipairs(minetest.get_objects_inside_radius(pos, 3)) do
if not pos then
return
end
local objects = minetest.get_objects_inside_radius(pos, 3)
if not (objects and type(objects) == 'table') then
return
end
for _,object in ipairs(objects) do
if object:is_player() then
diamond_trap(pos, object)
end
@ -536,6 +578,10 @@ bucket.register_liquid(
)
local gold_trap = function(pos, player)
if not (pos and player) then
return
end
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
@ -548,6 +594,10 @@ 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)
if not (pos and digger) then
return
end
if math.random(3) == 1 then
gold_trap(pos, digger)
else
@ -561,7 +611,16 @@ minetest.register_abm({
interval = 1,
chance = 1,
action = function(pos)
for _,object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do
if not pos then
return
end
local objects = minetest.get_objects_inside_radius(pos, 2)
if not (objects and type(objects) == 'table') then
return
end
for _,object in ipairs(objects) do
if object:is_player() then
gold_trap(pos, object)
end
@ -571,15 +630,24 @@ minetest.register_abm({
local ice_trap = function(pos, player)
if not (pos and player) then
return
end
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')
if not (nodes and type(nodes) == 'table') then
return
end
for _, npos in pairs(nodes) do
minetest.set_node(npos, {name="default:ice"})
end
minetest.set_node(pos, {name="default:ice"})
end
end
@ -592,6 +660,10 @@ minetest.register_node("fun_caves:ice_trap", {
is_ground_content = false,
sounds = default.node_sound_stone_defaults(),
on_dig = function(pos, node, digger)
if not (pos and digger) then
return
end
if math.random(3) == 1 then
ice_trap(pos, digger)
else
@ -605,7 +677,16 @@ minetest.register_abm({
interval = 1,
chance = 1,
action = function(pos)
for _,object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do
if not pos then
return
end
local objects = minetest.get_objects_inside_radius(pos, 2)
if not (objects and type(objects) == 'table') then
return
end
for _,object in ipairs(objects) do
if object:is_player() then
ice_trap(pos, object)
end
@ -615,6 +696,10 @@ minetest.register_abm({
local function lightning_effects(pos, radius)
if not (pos and radius) then
return
end
minetest.add_particlespawner({
amount = 30,
time = 1,
@ -633,6 +718,10 @@ local function lightning_effects(pos, radius)
end
local copper_trap = function(pos, player)
if not (pos and player) then
return
end
if player:get_hp() > 0 then
player:set_hp(player:get_hp()-1)
lightning_effects(pos, 3)
@ -648,6 +737,10 @@ minetest.register_node("fun_caves:stone_with_copper_trap", {
is_ground_content = false,
sounds = default.node_sound_stone_defaults(),
on_dig = function(pos, node, digger)
if not (pos and digger) then
return
end
if math.random(3) == 1 then
copper_trap(pos, digger)
else
@ -662,7 +755,16 @@ minetest.register_abm({
interval = 1,
chance = 2,
action = function(pos)
for _,object in ipairs(minetest.get_objects_inside_radius(pos, 3)) do
if not pos then
return
end
local objects = minetest.get_objects_inside_radius(pos, 3)
if not (objects and type(objects) == 'table') then
return
end
for _,object in ipairs(objects) do
if object:is_player() then
copper_trap(pos, object)
end
@ -681,6 +783,10 @@ minetest.register_node("fun_caves:stone_with_iron_trap", {
is_ground_content = false,
sounds = default.node_sound_stone_defaults(),
on_dig = function(pos, node, digger)
if not (pos and digger) then
return
end
if math.random(3) == 1 then
copper_trap(pos, digger)
else
@ -694,7 +800,16 @@ minetest.register_abm({
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 not pos then
return
end
local objects = minetest.get_objects_inside_radius(pos, 3)
if not (objects and type(objects) == 'table') then
return
end
for _, object in ipairs(objects) do
if object:is_player() then
copper_trap(pos, object)
end