1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-07-21 17:10:25 +02: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
2015-04-21 11:54:43 +02:00
parent deeaa98c16
commit 8b8fdfa131
6 changed files with 207 additions and 246 deletions

View File

@ -633,7 +633,7 @@ lifetimer = def.lifetimer or 600,
self.timer = self.timer + dtime
self.blinktimer = (self.blinktimer or 0) + dtime
if self.blinktimer > 0.2 then
self.blinktimer = 0 -- self.blinktimer - 0.2
self.blinktimer = self.blinktimer - 0.2
if self.blinkstatus then
self.object:settexturemod("")
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.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 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
-- do NOT destroy protection nodes but DO destroy nodes in protected area
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
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