Added protection controls and the new hellzone_grenade

This commit is contained in:
npx 2016-04-27 00:04:41 +02:00
parent 3b954ccda4
commit a76bf057d2

View File

@ -23,12 +23,10 @@ local function hit(pos, self)
end end
local function activate_balls(pos) local function activate_balls(pos)
local radius = 50 local radius = 50
local objects = minetest.env:get_objects_inside_radius(pos, radius) local objects = minetest.env:get_objects_inside_radius(pos, radius)
for _,obj in ipairs(objects) do for _,obj in ipairs(objects) do
if (obj:get_luaentity() and obj:get_luaentity().name == "nssm:spirit_ball") then if (obj:get_luaentity() and obj:get_luaentity().name == "nssm:hellzone_grenade") then
obj:get_luaentity().move = 1 obj:get_luaentity().move = 1
end end
end end
@ -208,18 +206,18 @@ local function default_on_step(
local pos = self.object:getpos() local pos = self.object:getpos()
minetest.register_globalstep(function(dtime) self.timer = self.timer + dtime
timer = timer + dtime if self.timer > max_time then
if timer>max_time then local node = nssm:node_ok(pos).name
self.object:remove() self.hit_node(self, pos, node)
end self.object:remove()
end) return
end
--while going around it damages entities --while going around it damages entities
local objects = minetest.env:get_objects_inside_radius(pos, 2) local objects = minetest.env:get_objects_inside_radius(pos, 2)
for _,obj in ipairs(objects) do if self.timer > 1 then
if (obj:is_player()) then for _,obj in ipairs(objects) do
elseif (obj:get_luaentity() and obj:get_luaentity().name ~= "__builtin:item") then
obj:set_hp(obj:get_hp()-damage) obj:set_hp(obj:get_hp()-damage)
if (obj:get_hp() <= 0) then if (obj:get_hp() <= 0) then
if (not obj:is_player()) and obj:get_entity_name() ~= self.object:get_luaentity().name then if (not obj:is_player()) and obj:get_entity_name() ~= self.object:get_luaentity().name then
@ -230,7 +228,7 @@ local function default_on_step(
end end
local n = minetest.env:get_node(pos).name local n = minetest.env:get_node(pos).name
if n ==not_transparent or minetest.get_item_group(n, not_transparent)==1 then if n==not_transparent or minetest.get_item_group(n, not_transparent)==1 then
local node = nssm:node_ok(pos).name local node = nssm:node_ok(pos).name
self.hit_node(self, pos, node) self.hit_node(self, pos, node)
self.object:remove() self.object:remove()
@ -284,7 +282,9 @@ local function default_on_step(
for dy= -j,j do for dy= -j,j do
for dz = -k,k do for dz = -k,k do
local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz} local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
minetest.env:remove_node(p) if not minetest.is_protected(p, "") or not minetest.get_item_group(n, "unbreakable") == 1 then
minetest.env:remove_node(p)
end
end end
end end
end end
@ -309,7 +309,8 @@ local function nssm_register_weapon(name, def)
hit_node = function(self, pos, node) hit_node = function(self, pos, node)
def.hit_node(self, pos, node) def.hit_node(self, pos, node)
end, end,
move = def.move move = def.move,
timer = 0
}) })
minetest.register_tool("nssm:"..name.."_hand", { minetest.register_tool("nssm:"..name.."_hand", {
@ -319,8 +320,7 @@ local function nssm_register_weapon(name, def)
weapons_shot(itemstack, placer, pointed_thing, def.velocity, name) weapons_shot(itemstack, placer, pointed_thing, def.velocity, name)
return itemstack return itemstack
end, end,
on_drop = function(itemstack, user, pointed_thing) on_drop = def.on_drop or function(itemstack, user, pointed_thing)
def.on_drop(itemstack, user, pointed_thing)
end, end,
}) })
@ -339,7 +339,7 @@ end
nssm_register_weapon("kamehameha", { nssm_register_weapon("kamehameha", {
velocity = 25, velocity = 25,
on_step = function(self, dtime) on_step = function(self, dtime)
default_on_step(self, dtime, 10, 20, default_dir, 1, "stone", 25,0) default_on_step(self, dtime, 4, 20, default_dir, 1, "stone", 25,0)
end, end,
hit_node = function(self, pos, node) hit_node = function(self, pos, node)
nssm:explosion(pos, 6, 1) nssm:explosion(pos, 6, 1)
@ -361,6 +361,20 @@ nssm_register_weapon("kienzan", {
}) })
nssm_register_weapon("spirit_ball", { nssm_register_weapon("spirit_ball", {
velocity = 25,
move = 0,
on_step = function(self, dtime)
search_on_step(self, dtime, 25, 30, 25, 0)
end,
hit_node = function(self, pos, node)
nssm:explosion(pos, 4, 0)
end,
material = "nssm:cursed_pumpkin_seed",
description = "Spirit Ball from DragonBall",
})
nssm_register_weapon("hellzone_grenade", {
velocity = 25, velocity = 25,
move = 0, move = 0,
on_step = function(self, dtime) on_step = function(self, dtime)
@ -374,6 +388,6 @@ nssm_register_weapon("spirit_ball", {
local pos = user:getpos() local pos = user:getpos()
activate_balls(pos) activate_balls(pos)
end, end,
material = "nssm:cursed_pumpkin_seed", material = "nssm:snake_scute",
description = "Spirit Ball from DragonBall", description = "Hellzone grenade (Press q to activate)",
}) })