mirror of
https://github.com/sys4-fr/server-nalc.git
synced 2024-11-15 23:10:31 +01:00
Completed proper merge of mobs mod
- Merged api : - little tweaks on yaw computing system and position handling when blasting - Centralisation of the explosion function used by both dungeon masters and creepers : checks are made differently but still present in the function - Merged dungeon masters - Changed type of creepers from kamikaze to explode - Tweaked a bit rebase script
This commit is contained in:
LeMagnesium
parent
deeaa98c16
commit
8b8fdfa131
|
|
@ -633,7 +633,7 @@ lifetimer = def.lifetimer or 600,
|
||||||
self.timer = self.timer + dtime
|
self.timer = self.timer + dtime
|
||||||
self.blinktimer = (self.blinktimer or 0) + dtime
|
self.blinktimer = (self.blinktimer or 0) + dtime
|
||||||
if self.blinktimer > 0.2 then
|
if self.blinktimer > 0.2 then
|
||||||
self.blinktimer = 0 -- self.blinktimer - 0.2
|
self.blinktimer = self.blinktimer - 0.2
|
||||||
if self.blinkstatus then
|
if self.blinkstatus then
|
||||||
self.object:settexturemod("")
|
self.object:settexturemod("")
|
||||||
else
|
else
|
||||||
|
|
@ -1024,7 +1024,14 @@ if sound and sound ~= "" then minetest.sound_play(sound, {pos = pos, gain = 1.0,
|
||||||
p.x = pos.x + x
|
p.x = pos.x + x
|
||||||
p.y = pos.y + y
|
p.y = pos.y + y
|
||||||
p.z = pos.z + z
|
p.z = pos.z + z
|
||||||
if data[vi] ~= c_air and data[vi] ~= c_ignore and data[vi] ~= c_obsidian and data[vi] ~= c_brick and data[vi] ~= c_chest then
|
if data[vi] ~= c_air and data[vi] ~= c_ignore n.name ~= "doors:door_steel_b_1" and n.name ~= "doors:door_steel_t_1"
|
||||||
|
and n.name ~= "doors:door_steel_b_2" and n.name ~= "doors:door_steel_t_2"
|
||||||
|
and data[vi] ~= c_chest and data[vi] ~= c_obsidian and n.name ~= "default:obsidian_cooled"
|
||||||
|
and n.name ~= "default:obsidianbrick" and n.name ~= "default:bedrock"
|
||||||
|
and n.name ~= "more_chests:cobble" and n.name ~= "more_chests:shared" and n.name ~= "more_chests:secret"
|
||||||
|
and n.name ~= "more_chests:dropbox" and n.name ~= "chesttools:shared_chest"
|
||||||
|
and minetest.get_item_group(n.name, "unbreakable") ~= 1 and next(areas:getAreasAtPos(np)) == nil
|
||||||
|
and and data[vi] ~= c_brick and then
|
||||||
local n = minetest.get_node(p).name
|
local n = minetest.get_node(p).name
|
||||||
-- do NOT destroy protection nodes but DO destroy nodes in protected area
|
-- do NOT destroy protection nodes but DO destroy nodes in protected area
|
||||||
if not n:find("protector:")
|
if not n:find("protector:")
|
||||||
|
|
@ -1042,6 +1049,11 @@ if sound and sound ~= "" then minetest.sound_play(sound, {pos = pos, gain = 1.0,
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if n.name == "doors:door_wood_b_1" then
|
||||||
|
minetest.remove_node({x=np.x,y=np.y+1,z=np.z})
|
||||||
|
elseif n.name == "doors:door_wood_t_1" then
|
||||||
|
minetest.remove_node({x=np.x,y=np.y-1,z=np.z})
|
||||||
|
end
|
||||||
if fire > 0 and (minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <= 30) then
|
if fire > 0 and (minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <= 30) then
|
||||||
minetest.set_node(p, {name="fire:basic_flame"})
|
minetest.set_node(p, {name="fire:basic_flame"})
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -580,7 +580,7 @@ lifetimer = def.lifetimer or 600,
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Modif MFF "attack type kamicaze" des creepers /DEBUT
|
-- Modif MFF "attack type kamicaze" des creepers /DEBUT
|
||||||
elseif self.state == "attack" and self.attack_type == "kamicaze" then
|
elseif self.state == "attack" and self.attack_type == "explode" then
|
||||||
if not self.attack.player or not self.attack.player:is_player() then
|
if not self.attack.player or not self.attack.player:is_player() then
|
||||||
self.state = "stand"
|
self.state = "stand"
|
||||||
self:set_animation("stand")
|
self:set_animation("stand")
|
||||||
|
|
@ -606,10 +606,7 @@ lifetimer = def.lifetimer or 600,
|
||||||
end
|
end
|
||||||
|
|
||||||
local vec = {x = p.x -s.x, y = p.y -s.y, z = p.z -s.z}
|
local vec = {x = p.x -s.x, y = p.y -s.y, z = p.z -s.z}
|
||||||
local yaw = math.atan(vec.z/vec.x)+math.pi/2
|
local yaw = math.atan(vec.z/vec.x)+math.pi/2 + self.rotate
|
||||||
if self.drawtype == "side" then
|
|
||||||
yaw = yaw+(math.pi/2)
|
|
||||||
end
|
|
||||||
if p.x > s.x then
|
if p.x > s.x then
|
||||||
yaw = yaw+math.pi
|
yaw = yaw+math.pi
|
||||||
end
|
end
|
||||||
|
|
@ -623,7 +620,7 @@ lifetimer = def.lifetimer or 600,
|
||||||
else
|
else
|
||||||
self.timer = 0
|
self.timer = 0
|
||||||
self.blinktimer = 0
|
self.blinktimer = 0
|
||||||
if self.get_velocity(self) <= 1.58 and self.object:getvelocity().y == 0 then
|
if self.get_velocity(self) <= 0.5 and self.object:getvelocity().y == 0 then
|
||||||
local v = self.object:getvelocity()
|
local v = self.object:getvelocity()
|
||||||
v.y = 5
|
v.y = 5
|
||||||
self.object:setvelocity(v)
|
self.object:setvelocity(v)
|
||||||
|
|
@ -645,65 +642,19 @@ lifetimer = def.lifetimer or 600,
|
||||||
self.blinkstatus = not self.blinkstatus
|
self.blinkstatus = not self.blinkstatus
|
||||||
end
|
end
|
||||||
if self.timer > 3 then
|
if self.timer > 3 then
|
||||||
local pos = self.object:getpos()
|
local pos = vector.round(self.object:getpos())
|
||||||
pos.x = math.floor(pos.x+0.5)
|
do_tnt_physics(pos, 3, self) -- hurt player/mobs in blast area
|
||||||
pos.y = math.floor(pos.y+0.5)
|
if minetest.find_node_near(pos, 1, {"group:water"})
|
||||||
pos.z = math.floor(pos.z+0.5)
|
or minetest.is_protected(pos, "") then
|
||||||
do_tnt_physics(pos, 3, self) -- on applique le principe le la tnt
|
|
||||||
local meta = minetest.get_meta(pos)
|
|
||||||
minetest.sound_play("tnt_explode", {pos = pos,gain = 1.0,max_hear_distance = 16,})
|
|
||||||
if minetest.get_node(pos).name == "default:water_source" or minetest.get_node(pos).name == "default:water_flowing" or minetest.is_protected(pos, "tnt") then
|
|
||||||
self.object:remove()
|
self.object:remove()
|
||||||
|
if self.sounds.explode ~= "" then
|
||||||
|
minetest.sound_play(self.sounds.explode, {pos = pos, gain = 1.0, max_hear_distance = 16})
|
||||||
|
end
|
||||||
|
effect(pos, 10, "tnt_smoke.png")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
for x=-3,3 do
|
|
||||||
for y=-3,3 do
|
|
||||||
for z=-3,3 do
|
|
||||||
if x*x+y*y+z*z <= 3 * 3 + 3 then
|
|
||||||
local np={x=pos.x+x,y=pos.y+y,z=pos.z+z}
|
|
||||||
local n = minetest.get_node(np)
|
|
||||||
if n.name ~= "air" and n.name ~= "doors:door_steel_b_1" and n.name ~= "doors:door_steel_t_1"
|
|
||||||
and n.name ~= "doors:door_steel_b_2" and n.name ~= "doors:door_steel_t_2"
|
|
||||||
and n.name ~= "default:chest_locked" and n.name ~= "default:obsidian" and n.name ~= "default:obsidian_cooled"
|
|
||||||
and n.name ~= "default:obsidianbrick" and n.name ~= "default:bedrock"
|
|
||||||
and n.name ~= "more_chests:cobble" and n.name ~= "more_chests:shared" and n.name ~= "more_chests:secret"
|
|
||||||
and n.name ~= "more_chests:dropbox" and n.name ~= "chesttools:shared_chest"
|
|
||||||
and minetest.get_item_group(n.name, "unbreakable") ~= 1 and next(areas:getAreasAtPos(np)) == nil then
|
|
||||||
--activate_if_tnt(n.name, np, pos, 3) -- Pas de module TNT sur le serveur donc inutile
|
|
||||||
if n.name == "default:chest" then
|
|
||||||
meta = minetest.get_meta(np)
|
|
||||||
local inv = meta:get_inventory()
|
|
||||||
for i = 1,32 do
|
|
||||||
local m_stack = inv:get_stack("main",i)
|
|
||||||
local obj = minetest.add_item(pos,m_stack)
|
|
||||||
if obj then
|
|
||||||
obj:setvelocity({x=math.random(-2,2), y=7, z=math.random(-2,2)})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if n.name == "doors:door_wood_b_1" then
|
|
||||||
minetest.remove_node({x=np.x,y=np.y+1,z=np.z})
|
|
||||||
elseif n.name == "doors:door_wood_t_1" then
|
|
||||||
minetest.remove_node({x=np.x,y=np.y-1,z=np.z})
|
|
||||||
end
|
|
||||||
minetest.remove_node(np)
|
|
||||||
nodeupdate(np)
|
|
||||||
--[[ if n.name ~= "tnt:tnt" and math.random() > 0.9 then
|
|
||||||
local drop = minetest.get_node_drops(n.name, "")
|
|
||||||
for _,item in ipairs(drop) do
|
|
||||||
if type(item) == "string" then
|
|
||||||
if math.random(1,100) > 40 then
|
|
||||||
local obj = minetest.add_item(np, item)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end ]]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
self.object:remove()
|
self.object:remove()
|
||||||
end
|
mobs:explosion(pos, 2, 1, 1, "tnt_explode", self.sounds.explode)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- Modif MFF "attack type kamicaze" des creepers /FIN
|
-- Modif MFF "attack type kamicaze" des creepers /FIN
|
||||||
|
|
@ -1048,6 +999,88 @@ function effect(pos, amount, texture)
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- explosion
|
||||||
|
function mobs:explosion(pos, radius, fire, smoke, sound)
|
||||||
|
-- node hit, bursts into flame (cannot blast through obsidian or protection redo mod items)
|
||||||
|
if not fire then fire = 0 end
|
||||||
|
if not smoke then smoke = 0 end
|
||||||
|
local pos = vector.round(pos)
|
||||||
|
local radius = 1
|
||||||
|
local vm = VoxelManip()
|
||||||
|
local minp, maxp = vm:read_from_map(vector.subtract(pos, radius), vector.add(pos, radius))
|
||||||
|
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
|
||||||
|
local data = vm:get_data()
|
||||||
|
local p = {}
|
||||||
|
local undestroyed = {
|
||||||
|
minetest.get_content_id("air"),
|
||||||
|
minetest.get_content_id("ignore"),
|
||||||
|
minetest.get_content_id("default:obsidian"),
|
||||||
|
minetest.get_content_id("default:obsidianbrick"),
|
||||||
|
minetest.get_content_id("default:chest_locked"),
|
||||||
|
minetest.get_content_id("doors:door_steel_b_1"),
|
||||||
|
minetest.get_content_id("doors:door_steel_t_1"),
|
||||||
|
minetest.get_content_id("doors:door_steel_b_2"),
|
||||||
|
minetest.get_content_id("doors:door_steel_t_2"),
|
||||||
|
minetest.get_content_id("default:bedrock"),
|
||||||
|
minetest.get_content_id("default:obsidian_cooled"),
|
||||||
|
minetest.get_content_id("more_chests:cobble"),
|
||||||
|
minetest.get_content_id("more_chests:shared"),
|
||||||
|
minetest.get_content_id("more_chests:secret"),
|
||||||
|
minetest.get_content_id("more_chests:dropbox"),
|
||||||
|
minetest.get_content_id("more_chests:shared_chest")
|
||||||
|
}
|
||||||
|
if sound and sound ~= "" then minetest.sound_play(sound, {pos = pos, gain = 1.0, max_hear_distance = 16}) end
|
||||||
|
for z = -radius, radius do
|
||||||
|
for y = -radius, radius do
|
||||||
|
local vi = a:index(pos.x + (-radius), pos.y + y, pos.z + z)
|
||||||
|
for x = -radius, radius do
|
||||||
|
p.x = pos.x + x
|
||||||
|
p.y = pos.y + y
|
||||||
|
p.z = pos.z + z
|
||||||
|
local is_destroyed = true
|
||||||
|
for _,value in pairs(undestroyed) do
|
||||||
|
if data[vi] == value then
|
||||||
|
is_destroyed = false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if is_destroyed then
|
||||||
|
local n = minetest.get_node(p).name
|
||||||
|
-- do NOT destroy protection nodes but DO destroy nodes in protected area
|
||||||
|
if not n:find("protector:")
|
||||||
|
--and not minetest.is_protected(p, "")
|
||||||
|
and minetest.get_item_group(n, "unbreakable") == 0
|
||||||
|
and next(areas:getAreasAtPos(p)) == nil then
|
||||||
|
-- if chest then drop items inside
|
||||||
|
if n == "default:chest" then
|
||||||
|
local meta = minetest.get_meta(p)
|
||||||
|
local inv = meta:get_inventory()
|
||||||
|
for i = 1,32 do
|
||||||
|
local m_stack = inv:get_stack("main",i)
|
||||||
|
local obj = minetest.add_item(pos,m_stack)
|
||||||
|
if obj then
|
||||||
|
obj:setvelocity({x=math.random(-2,2), y=7, z=math.random(-2,2)})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if n.name == "doors:door_wood_b_1" then
|
||||||
|
minetest.remove_node({x=np.x,y=np.y+1,z=np.z})
|
||||||
|
elseif n.name == "doors:door_wood_t_1" then
|
||||||
|
minetest.remove_node({x=np.x,y=np.y-1,z=np.z})
|
||||||
|
end
|
||||||
|
if fire > 0 and (minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <= 30) then
|
||||||
|
minetest.set_node(p, {name="fire:basic_flame"})
|
||||||
|
else
|
||||||
|
minetest.remove_node(p)
|
||||||
|
end
|
||||||
|
if smoke > 0 then effect(p, 1, "tnt_smoke.png") end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
vi = vi + 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- on mob death drop items
|
-- on mob death drop items
|
||||||
function check_for_death(self)
|
function check_for_death(self)
|
||||||
local hp = self.object:get_hp()
|
local hp = self.object:get_hp()
|
||||||
|
|
|
||||||
|
|
@ -96,65 +96,6 @@ mobs:register_arrow("mobs:fireball", {
|
||||||
|
|
||||||
-- node hit, bursts into flame (cannot blast through obsidian or protection redo mod items)
|
-- node hit, bursts into flame (cannot blast through obsidian or protection redo mod items)
|
||||||
hit_node = function(self, pos, node)
|
hit_node = function(self, pos, node)
|
||||||
local pos = vector.round(pos)
|
mobs:explosion(pos, 1, 1, 0)
|
||||||
local radius = 1
|
|
||||||
local vm = VoxelManip()
|
|
||||||
local minp, maxp = vm:read_from_map(vector.subtract(pos, radius), vector.add(pos, radius))
|
|
||||||
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
|
|
||||||
local data = vm:get_data()
|
|
||||||
local p = {}
|
|
||||||
local c_air = minetest.get_content_id("air")
|
|
||||||
local c_ignore = minetest.get_content_id("ignore")
|
|
||||||
local c_obsidian = minetest.get_content_id("default:obsidian")
|
|
||||||
local c_brick = minetest.get_content_id("default:obsidianbrick")
|
|
||||||
|
|
||||||
for z = -radius, radius do
|
|
||||||
for y = -radius, radius do
|
|
||||||
local vi = a:index(pos.x + (-radius), pos.y + y, pos.z + z)
|
|
||||||
for x = -radius, radius do
|
|
||||||
p.x = pos.x + x
|
|
||||||
p.y = pos.y + y
|
|
||||||
p.z = pos.z + z
|
|
||||||
if data[vi] ~= c_air and data[vi] ~= c_ignore and data[vi] ~= c_obsidian and data[vi] ~= c_brick then
|
|
||||||
local n = minetest.get_node(p).name
|
|
||||||
-- do NOT destroy protection nodes but DO destroy nodes in protected area
|
|
||||||
if not n:find("protector:") then -- and not minetest.is_protected(p, "") then
|
|
||||||
local excluding = minetest.get_item_group(n, "unbreakable") == 1
|
|
||||||
or n:split(":")[1] == "nether"
|
|
||||||
or next(areas:getAreasAtPos(p)) ~= nil
|
|
||||||
for _,i in ipairs(excluded) do
|
|
||||||
if i == n then excluding = true end
|
|
||||||
end
|
|
||||||
--if p.y < -19600 and including and n:split(":")[1] == "nether" then
|
|
||||||
if excluding then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
if n == "default:chest" then
|
|
||||||
meta = minetest.get_meta(p)
|
|
||||||
inv = meta:get_inventory()
|
|
||||||
for i = 1,32 do
|
|
||||||
m_stack = inv:get_stack("main",i)
|
|
||||||
obj = minetest.add_item(pos,m_stack)
|
|
||||||
if obj then
|
|
||||||
obj:setvelocity({x=math.random(-2,1), y=7, z=math.random(-2,1)})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <= 30 then
|
|
||||||
minetest.set_node(p, {name="fire:basic_flame"})
|
|
||||||
else
|
|
||||||
minetest.remove_node(p)
|
|
||||||
end
|
|
||||||
if n == "doors:door_wood_b_1" then
|
|
||||||
minetest.remove_node({x=p.x,y=p.y+1,z=p.z})
|
|
||||||
elseif n == "doors:door_wood_t_1" then
|
|
||||||
minetest.remove_node({x=p.x,y=p.y-1,z=p.z})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
vi = vi + 1
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -580,7 +580,7 @@ lifetimer = def.lifetimer or 600,
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Modif MFF "attack type kamicaze" des creepers /DEBUT
|
-- Modif MFF "attack type kamicaze" des creepers /DEBUT
|
||||||
elseif self.state == "attack" and self.attack_type == "kamicaze" then
|
elseif self.state == "attack" and self.attack_type == "explode" then
|
||||||
if not self.attack.player or not self.attack.player:is_player() then
|
if not self.attack.player or not self.attack.player:is_player() then
|
||||||
self.state = "stand"
|
self.state = "stand"
|
||||||
self:set_animation("stand")
|
self:set_animation("stand")
|
||||||
|
|
@ -606,10 +606,7 @@ lifetimer = def.lifetimer or 600,
|
||||||
end
|
end
|
||||||
|
|
||||||
local vec = {x = p.x -s.x, y = p.y -s.y, z = p.z -s.z}
|
local vec = {x = p.x -s.x, y = p.y -s.y, z = p.z -s.z}
|
||||||
local yaw = math.atan(vec.z/vec.x)+math.pi/2
|
local yaw = math.atan(vec.z/vec.x)+math.pi/2 + self.rotate
|
||||||
if self.drawtype == "side" then
|
|
||||||
yaw = yaw+(math.pi/2)
|
|
||||||
end
|
|
||||||
if p.x > s.x then
|
if p.x > s.x then
|
||||||
yaw = yaw+math.pi
|
yaw = yaw+math.pi
|
||||||
end
|
end
|
||||||
|
|
@ -623,7 +620,7 @@ lifetimer = def.lifetimer or 600,
|
||||||
else
|
else
|
||||||
self.timer = 0
|
self.timer = 0
|
||||||
self.blinktimer = 0
|
self.blinktimer = 0
|
||||||
if self.get_velocity(self) <= 1.58 and self.object:getvelocity().y == 0 then
|
if self.get_velocity(self) <= 0.5 and self.object:getvelocity().y == 0 then
|
||||||
local v = self.object:getvelocity()
|
local v = self.object:getvelocity()
|
||||||
v.y = 5
|
v.y = 5
|
||||||
self.object:setvelocity(v)
|
self.object:setvelocity(v)
|
||||||
|
|
@ -645,65 +642,19 @@ lifetimer = def.lifetimer or 600,
|
||||||
self.blinkstatus = not self.blinkstatus
|
self.blinkstatus = not self.blinkstatus
|
||||||
end
|
end
|
||||||
if self.timer > 3 then
|
if self.timer > 3 then
|
||||||
local pos = self.object:getpos()
|
local pos = vector.round(self.object:getpos())
|
||||||
pos.x = math.floor(pos.x+0.5)
|
do_tnt_physics(pos, 3, self) -- hurt player/mobs in blast area
|
||||||
pos.y = math.floor(pos.y+0.5)
|
if minetest.find_node_near(pos, 1, {"group:water"})
|
||||||
pos.z = math.floor(pos.z+0.5)
|
or minetest.is_protected(pos, "") then
|
||||||
do_tnt_physics(pos, 3, self) -- on applique le principe le la tnt
|
|
||||||
local meta = minetest.get_meta(pos)
|
|
||||||
minetest.sound_play("tnt_explode", {pos = pos,gain = 1.0,max_hear_distance = 16,})
|
|
||||||
if minetest.get_node(pos).name == "default:water_source" or minetest.get_node(pos).name == "default:water_flowing" or minetest.is_protected(pos, "tnt") then
|
|
||||||
self.object:remove()
|
self.object:remove()
|
||||||
|
if self.sounds.explode ~= "" then
|
||||||
|
minetest.sound_play(self.sounds.explode, {pos = pos, gain = 1.0, max_hear_distance = 16})
|
||||||
|
end
|
||||||
|
effect(pos, 10, "tnt_smoke.png")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
for x=-3,3 do
|
|
||||||
for y=-3,3 do
|
|
||||||
for z=-3,3 do
|
|
||||||
if x*x+y*y+z*z <= 3 * 3 + 3 then
|
|
||||||
local np={x=pos.x+x,y=pos.y+y,z=pos.z+z}
|
|
||||||
local n = minetest.get_node(np)
|
|
||||||
if n.name ~= "air" and n.name ~= "doors:door_steel_b_1" and n.name ~= "doors:door_steel_t_1"
|
|
||||||
and n.name ~= "doors:door_steel_b_2" and n.name ~= "doors:door_steel_t_2"
|
|
||||||
and n.name ~= "default:chest_locked" and n.name ~= "default:obsidian" and n.name ~= "default:obsidian_cooled"
|
|
||||||
and n.name ~= "default:obsidianbrick" and n.name ~= "default:bedrock"
|
|
||||||
and n.name ~= "more_chests:cobble" and n.name ~= "more_chests:shared" and n.name ~= "more_chests:secret"
|
|
||||||
and n.name ~= "more_chests:dropbox" and n.name ~= "chesttools:shared_chest"
|
|
||||||
and minetest.get_item_group(n.name, "unbreakable") ~= 1 and next(areas:getAreasAtPos(np)) == nil then
|
|
||||||
--activate_if_tnt(n.name, np, pos, 3) -- Pas de module TNT sur le serveur donc inutile
|
|
||||||
if n.name == "default:chest" then
|
|
||||||
meta = minetest.get_meta(np)
|
|
||||||
local inv = meta:get_inventory()
|
|
||||||
for i = 1,32 do
|
|
||||||
local m_stack = inv:get_stack("main",i)
|
|
||||||
local obj = minetest.add_item(pos,m_stack)
|
|
||||||
if obj then
|
|
||||||
obj:setvelocity({x=math.random(-2,2), y=7, z=math.random(-2,2)})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if n.name == "doors:door_wood_b_1" then
|
|
||||||
minetest.remove_node({x=np.x,y=np.y+1,z=np.z})
|
|
||||||
elseif n.name == "doors:door_wood_t_1" then
|
|
||||||
minetest.remove_node({x=np.x,y=np.y-1,z=np.z})
|
|
||||||
end
|
|
||||||
minetest.remove_node(np)
|
|
||||||
nodeupdate(np)
|
|
||||||
--[[ if n.name ~= "tnt:tnt" and math.random() > 0.9 then
|
|
||||||
local drop = minetest.get_node_drops(n.name, "")
|
|
||||||
for _,item in ipairs(drop) do
|
|
||||||
if type(item) == "string" then
|
|
||||||
if math.random(1,100) > 40 then
|
|
||||||
local obj = minetest.add_item(np, item)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end ]]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
self.object:remove()
|
self.object:remove()
|
||||||
end
|
mobs:explosion(pos, 2, 1, 1, "tnt_explode", self.sounds.explode)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- Modif MFF "attack type kamicaze" des creepers /FIN
|
-- Modif MFF "attack type kamicaze" des creepers /FIN
|
||||||
|
|
@ -1048,6 +999,88 @@ function effect(pos, amount, texture)
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- explosion
|
||||||
|
function mobs:explosion(pos, radius, fire, smoke, sound)
|
||||||
|
-- node hit, bursts into flame (cannot blast through obsidian or protection redo mod items)
|
||||||
|
if not fire then fire = 0 end
|
||||||
|
if not smoke then smoke = 0 end
|
||||||
|
local pos = vector.round(pos)
|
||||||
|
local radius = 1
|
||||||
|
local vm = VoxelManip()
|
||||||
|
local minp, maxp = vm:read_from_map(vector.subtract(pos, radius), vector.add(pos, radius))
|
||||||
|
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
|
||||||
|
local data = vm:get_data()
|
||||||
|
local p = {}
|
||||||
|
local undestroyed = {
|
||||||
|
minetest.get_content_id("air"),
|
||||||
|
minetest.get_content_id("ignore"),
|
||||||
|
minetest.get_content_id("default:obsidian"),
|
||||||
|
minetest.get_content_id("default:obsidianbrick"),
|
||||||
|
minetest.get_content_id("default:chest_locked"),
|
||||||
|
minetest.get_content_id("doors:door_steel_b_1"),
|
||||||
|
minetest.get_content_id("doors:door_steel_t_1"),
|
||||||
|
minetest.get_content_id("doors:door_steel_b_2"),
|
||||||
|
minetest.get_content_id("doors:door_steel_t_2"),
|
||||||
|
minetest.get_content_id("default:bedrock"),
|
||||||
|
minetest.get_content_id("default:obsidian_cooled"),
|
||||||
|
minetest.get_content_id("more_chests:cobble"),
|
||||||
|
minetest.get_content_id("more_chests:shared"),
|
||||||
|
minetest.get_content_id("more_chests:secret"),
|
||||||
|
minetest.get_content_id("more_chests:dropbox"),
|
||||||
|
minetest.get_content_id("more_chests:shared_chest")
|
||||||
|
}
|
||||||
|
if sound and sound ~= "" then minetest.sound_play(sound, {pos = pos, gain = 1.0, max_hear_distance = 16}) end
|
||||||
|
for z = -radius, radius do
|
||||||
|
for y = -radius, radius do
|
||||||
|
local vi = a:index(pos.x + (-radius), pos.y + y, pos.z + z)
|
||||||
|
for x = -radius, radius do
|
||||||
|
p.x = pos.x + x
|
||||||
|
p.y = pos.y + y
|
||||||
|
p.z = pos.z + z
|
||||||
|
local is_destroyed = true
|
||||||
|
for _,value in pairs(undestroyed) do
|
||||||
|
if data[vi] == value then
|
||||||
|
is_destroyed = false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if is_destroyed then
|
||||||
|
local n = minetest.get_node(p).name
|
||||||
|
-- do NOT destroy protection nodes but DO destroy nodes in protected area
|
||||||
|
if not n:find("protector:")
|
||||||
|
--and not minetest.is_protected(p, "")
|
||||||
|
and minetest.get_item_group(n, "unbreakable") == 0
|
||||||
|
and next(areas:getAreasAtPos(p)) == nil then
|
||||||
|
-- if chest then drop items inside
|
||||||
|
if n == "default:chest" then
|
||||||
|
local meta = minetest.get_meta(p)
|
||||||
|
local inv = meta:get_inventory()
|
||||||
|
for i = 1,32 do
|
||||||
|
local m_stack = inv:get_stack("main",i)
|
||||||
|
local obj = minetest.add_item(pos,m_stack)
|
||||||
|
if obj then
|
||||||
|
obj:setvelocity({x=math.random(-2,2), y=7, z=math.random(-2,2)})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if n.name == "doors:door_wood_b_1" then
|
||||||
|
minetest.remove_node({x=np.x,y=np.y+1,z=np.z})
|
||||||
|
elseif n.name == "doors:door_wood_t_1" then
|
||||||
|
minetest.remove_node({x=np.x,y=np.y-1,z=np.z})
|
||||||
|
end
|
||||||
|
if fire > 0 and (minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <= 30) then
|
||||||
|
minetest.set_node(p, {name="fire:basic_flame"})
|
||||||
|
else
|
||||||
|
minetest.remove_node(p)
|
||||||
|
end
|
||||||
|
if smoke > 0 then effect(p, 1, "tnt_smoke.png") end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
vi = vi + 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- on mob death drop items
|
-- on mob death drop items
|
||||||
function check_for_death(self)
|
function check_for_death(self)
|
||||||
local hp = self.object:get_hp()
|
local hp = self.object:get_hp()
|
||||||
|
|
|
||||||
|
|
@ -96,65 +96,6 @@ mobs:register_arrow("mobs:fireball", {
|
||||||
|
|
||||||
-- node hit, bursts into flame (cannot blast through obsidian or protection redo mod items)
|
-- node hit, bursts into flame (cannot blast through obsidian or protection redo mod items)
|
||||||
hit_node = function(self, pos, node)
|
hit_node = function(self, pos, node)
|
||||||
local pos = vector.round(pos)
|
mobs:explosion(pos, 1, 1, 0)
|
||||||
local radius = 1
|
|
||||||
local vm = VoxelManip()
|
|
||||||
local minp, maxp = vm:read_from_map(vector.subtract(pos, radius), vector.add(pos, radius))
|
|
||||||
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
|
|
||||||
local data = vm:get_data()
|
|
||||||
local p = {}
|
|
||||||
local c_air = minetest.get_content_id("air")
|
|
||||||
local c_ignore = minetest.get_content_id("ignore")
|
|
||||||
local c_obsidian = minetest.get_content_id("default:obsidian")
|
|
||||||
local c_brick = minetest.get_content_id("default:obsidianbrick")
|
|
||||||
|
|
||||||
for z = -radius, radius do
|
|
||||||
for y = -radius, radius do
|
|
||||||
local vi = a:index(pos.x + (-radius), pos.y + y, pos.z + z)
|
|
||||||
for x = -radius, radius do
|
|
||||||
p.x = pos.x + x
|
|
||||||
p.y = pos.y + y
|
|
||||||
p.z = pos.z + z
|
|
||||||
if data[vi] ~= c_air and data[vi] ~= c_ignore and data[vi] ~= c_obsidian and data[vi] ~= c_brick then
|
|
||||||
local n = minetest.get_node(p).name
|
|
||||||
-- do NOT destroy protection nodes but DO destroy nodes in protected area
|
|
||||||
if not n:find("protector:") then -- and not minetest.is_protected(p, "") then
|
|
||||||
local excluding = minetest.get_item_group(n, "unbreakable") == 1
|
|
||||||
or n:split(":")[1] == "nether"
|
|
||||||
or next(areas:getAreasAtPos(p)) ~= nil
|
|
||||||
for _,i in ipairs(excluded) do
|
|
||||||
if i == n then excluding = true end
|
|
||||||
end
|
|
||||||
--if p.y < -19600 and including and n:split(":")[1] == "nether" then
|
|
||||||
if excluding then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
if n == "default:chest" then
|
|
||||||
meta = minetest.get_meta(p)
|
|
||||||
inv = meta:get_inventory()
|
|
||||||
for i = 1,32 do
|
|
||||||
m_stack = inv:get_stack("main",i)
|
|
||||||
obj = minetest.add_item(pos,m_stack)
|
|
||||||
if obj then
|
|
||||||
obj:setvelocity({x=math.random(-2,1), y=7, z=math.random(-2,1)})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
if minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <= 30 then
|
|
||||||
minetest.set_node(p, {name="fire:basic_flame"})
|
|
||||||
else
|
|
||||||
minetest.remove_node(p)
|
|
||||||
end
|
|
||||||
if n == "doors:door_wood_b_1" then
|
|
||||||
minetest.remove_node({x=p.x,y=p.y+1,z=p.z})
|
|
||||||
elseif n == "doors:door_wood_t_1" then
|
|
||||||
minetest.remove_node({x=p.x,y=p.y-1,z=p.z})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
vi = vi + 1
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ for branch in $( git branch ); do
|
||||||
if [ branch != "master" ];
|
if [ branch != "master" ];
|
||||||
then
|
then
|
||||||
git checkout $branch
|
git checkout $branch
|
||||||
|
git pull origin $branch
|
||||||
git rebase master
|
git rebase master
|
||||||
git push -f origin $branch
|
git push -f origin $branch
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user