temp fix tnt bug with creep

This commit is contained in:
maikerumine 2016-01-12 02:22:04 -05:00
parent fcc3383036
commit 96875a3c08
3 changed files with 23 additions and 591 deletions

View File

@ -264,8 +264,8 @@ function bp:register_mob(name, def)
inv:set_stack("main", self.driver:get_wield_index(), stack)
return
end
end
end
if self.type == "monster" and peaceful_only then
self.object:remove()
return
@ -782,11 +782,11 @@ function bp:register_mob(name, def)
end
self.object:remove()
--bp:explosion(pos, 2, 0, 1, "tnt_explode", self.sounds.explode) --removed fugly
esmobs:explode(pos, 2, 0, 1, "tnt_explode", self.sounds.explode)
--bp:explode(pos, 2, 0, 1, "tnt_explode", self.sounds.explode)
minetest.sound_play("tnt_explode", {pos=pos, gain=1.5, max_hear_distance=2*64})
end
end
--dogfight attack
elseif self.state == "attack" and self.attack_type == "dogfight" then
if not self.attack.player or not self.attack.player:getpos() then
@ -848,7 +848,7 @@ function bp:register_mob(name, def)
end
end
end
--FROM MCMOBS API HACK WORKS
elseif self.state == "attack" and self.attack_type == "shoot" then
if not self.attack.player or not self.attack.player:is_player() then
@ -913,7 +913,7 @@ function bp:register_mob(name, def)
end
end,
--BEGIN ON_ACTIVATE
on_activate = function(self, staticdata, dtime_s)
local pos = self.object:getpos()
@ -1113,7 +1113,7 @@ function bp:register_mob(name, def)
--deathanimation WIP
--END ORIG ON PUNCH CODE
--ADDING LAGS MOBS BONES HERE
--on_punch = function(self, hitter)
--mob killed
@ -1121,13 +1121,13 @@ function bp:register_mob(name, def)
if hitter and hitter:is_player() and hitter:get_inventory() then
for _,drop in ipairs(self.drops) do
--THIS CODE GIVES YOU THE DROP INSTANT ON DEATH
--removed to place drops in bones.
-- if math.random(1, drop.chance) == 1 then
-- hitter:get_inventory():add_item("main", ItemStack(drop.name.." "..math.random(drop.min, drop.max)))
-- end
end
--mob bones, like player bones added by Andrei modified by maikerumine
@ -1187,7 +1187,7 @@ function bp:register_mob(name, def)
end
--end, --use if using original punch code.
end,
--END ON PUNCH FULL CODE
})
end
@ -1287,7 +1287,7 @@ function bp:register_mob(name, def)
return false -- beyond limits
end
--BEGIN DROPS GO TO BONES
-- on mob death drop items
function check_for_death(self)
@ -1392,7 +1392,7 @@ function bp:register_mob(name, def)
end
end
--OLDARROW DM SHOOTS
--OLDARROW DM SHOOTS
-- register arrow for shoot attack
function bp:register_arrow(name, def)
if not name or not def then return end -- errorcheck
@ -1517,7 +1517,7 @@ function bp:register_mob(name, def)
self.order = "follow"
end
end
--TODO TWEAK CODE, AS TOOLS WEAR OUT TOO FAST
function process_weapon(player, time_from_last_punch, tool_capabilities)
local weapon = player:get_wielded_item()
@ -1548,4 +1548,4 @@ function bp:register_mob(name, def)
return itemstack
end,
})
end
end

View File

@ -25,9 +25,7 @@ dofile(minetest.get_modpath("esmobs").."/mcmobs.lua")
dofile(minetest.get_modpath("esmobs").."/spawner.lua")
--MOB SEPCS
--dofile(minetest.get_modpath("esmobs").."/mobspec.lua")
--dofile(minetest.get_modpath("esmobs").."/meta.lua")
--dofile(minetest.get_modpath("esmobs").."/skinlist.lua")
--IF ES IS LOADED YOU WILL SEE OTHER MOBS HOLDING THE SPECIAL TOOLS
@ -56,11 +54,11 @@ dofile(minetest.get_modpath("esmobs").."/spawner.lua")
minetest.register_alias("esmobs:bow", "throwing:bow")
minetest.register_alias("esmobs:arrow", "throwing:arrow")
end
--TNT HACK
dofile(minetest.get_modpath("esmobs").."/tnt.lua")
--dofile(minetest.get_modpath("esmobs").."/tnt.lua")
--MOB SPECS
esmobs = {}
esmobs.type = { SPRITE=0, MODEL=1 }
@ -106,7 +104,7 @@ esmobs.formspec.main = function(name)
.. "image[1,.75;1,2;"..esmobs.esmobs[name].."_preview_back.png]"
.. "label[6,.5;Raw texture:]"
.. "image[6,1;2,1;"..esmobs.esmobs[name]..".png]"
else
formspec = formspec
-- .. "image[0,.75;1,2;"..esmobs.esmobs[name]..".png]"
@ -186,9 +184,9 @@ minetest.register_on_player_receive_fields(function(player,formname,fields)
inventory_plus.set_inventory_formspec(player,esmobs.formspec.main(player:get_player_name()))
end
end
end)
print("[ES-Mobs] Extreme Survival Mobs Loaded!")
end)
print("[ES-Mobs] Extreme Survival Mobs Loaded!")
if minetest.setting_get("log_mods") then
minetest.log("action", "esmobs mobs loaded")
end

View File

@ -1,566 +0,0 @@
--esmobs TNT v0.0.8
--maikerumine
--made for Extreme Survival game for use in mobs
esmobs = {}
-- loss probabilities array (one in X will be lost)
local loss_prob = {}
loss_prob["default:cobble"] = 3
loss_prob["default:dirt"] = 4
loss_prob["esmobs:tnt"] = 1
local radius = tonumber(minetest.setting_get("tnt_radius") or 3)
-- Fill a list with data for content IDs, after all nodes are registered
local cid_data = {}
minetest.after(0, function()
for name, def in pairs(minetest.registered_nodes) do
cid_data[minetest.get_content_id(name)] = {
name = name,
drops = def.drops,
flammable = def.groups.flammable,
groups = def.groups,
}
end
end)
function esmobs:rand_pos(center, pos, radius)
pos.x = center.x + math.random(-radius, radius)
pos.z = center.z + math.random(-radius, radius)
end
function esmobs:eject_drops(drops, pos, radius)
local drop_pos = vector.new(pos)
for _, item in pairs(drops) do
local count = item:get_count()
local max = item:get_stack_max()
if count > max then
item:set_count(max)
end
while count > 0 do
if count < max then
item:set_count(count)
end
esmobs:rand_pos(pos, drop_pos, radius)
local obj = minetest.add_item(drop_pos, item)
if obj then
obj:get_luaentity().collect = true
obj:setacceleration({x=0, y=-10, z=0})
obj:setvelocity({x=math.random(-3, 3), y=10,
z=math.random(-3, 3)})
end
count = count - max
end
end
end
function esmobs:add_drop(drops, item)
item = ItemStack(item)
local name = item:get_name()
if loss_prob[name] ~= nil and math.random(1, loss_prob[name]) == 1 then
return
end
local drop = drops[name]
if drop == nil then
drops[name] = item
else
drop:set_count(drop:get_count() + item:get_count())
end
end
function esmobs:destroy(drops, pos, cid)
if minetest.is_protected(pos, "") then
return
end
local def = cid_data[cid]
-- bedrock
if def and def.groups.immortal ~= nil then
return
end
-- obsidian
if def and def.name == "default:obsidian" then
return
end
minetest.remove_node(pos)
if def then
local node_drops = minetest.get_node_drops(def.name, "")
for _, item in ipairs(node_drops) do
esmobs:add_drop(drops, item)
end
end
end
function esmobs:calc_velocity(pos1, pos2, old_vel, power)
local vel = vector.direction(pos1, pos2)
vel = vector.normalize(vel)
vel = vector.multiply(vel, power)
-- Divide by distance
local dist = vector.distance(pos1, pos2)
dist = math.max(dist, 3)
vel = vector.divide(vel, dist)
-- Add old velocity
vel = vector.add(vel, old_vel)
return vel
end
function esmobs:entity_physics(pos, radius)
-- Make the damage radius larger than the destruction radius
radius = radius * 2
local objs = minetest.get_objects_inside_radius(pos, radius)
for _, obj in pairs(objs) do
local obj_pos = obj:getpos()
local obj_vel = obj:getvelocity()
local dist = math.max(1, vector.distance(pos, obj_pos))
if obj_vel ~= nil then
local vel = esmobs:calc_velocity(pos, obj_pos,
obj_vel, radius * 10)
obj:setvelocity({x=vel.x, y=vel.y, z=vel.z})
obj:setacceleration({x=-vel.x/5, y=-10, z=-vel.z/5})
end
local damage = (4 / dist) * radius
obj:set_hp(obj:get_hp() - damage)
end
end
function esmobs:add_effects(pos, radius)
minetest.add_particlespawner({
amount = 128,
time = 1,
minpos = vector.subtract(pos, radius / 2),
maxpos = vector.add(pos, radius / 2),
minvel = {x=-20, y=-20, z=-20},
maxvel = {x=20, y=20, z=20},
minacc = vector.new(),
maxacc = vector.new(),
minexptime = 1,
maxexptime = 3,
minsize = 8,
maxsize = 16,
texture = "tnt_smoke.png",
})
end
--[[
function esmobs:burn(pos)
local name = minetest.get_node(pos).name
if name == "esmobs:tnt" then
minetest.sound_play("tnt_ignite", {pos=pos})
esmobs:lit(pos, name)
elseif name == "esmobs:gunpowder" then
minetest.sound_play("tnt_gunpowder_burning", {pos=pos, gain=2})
minetest.set_node(pos, {name="esmobs:gunpowder_burning"})
minetest.get_node_timer(pos):start(1)
end
end
]]
function esmobs:explode(pos, radius)
local pos = vector.round(pos)
local vm = VoxelManip()
local pr = PseudoRandom(os.time())
local p1 = vector.subtract(pos, radius)
local p2 = vector.add(pos, radius)
local minp, maxp = vm:read_from_map(p1, p2)
local a = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
local data = vm:get_data()
local drops = {}
local p = {}
local c_air = minetest.get_content_id("air")
local c_tnt = minetest.get_content_id("esmobs:tnt")
local c_bomb = minetest.get_content_id("esmobs:bomb")
local c_tnt_burning = minetest.get_content_id("esmobs:tnt_burning")
local c_gunpowder = minetest.get_content_id("esmobs:gunpowder")
local c_gunpowder_burning = minetest.get_content_id("esmobs:gunpowder_burning")
local c_boom = minetest.get_content_id("esmobs:boom")
local c_fire = minetest.get_content_id("fire:basic_flame")
-- if area protected or near map limits then no blast damage
if minetest.is_protected(pos, "")
or not within_limits(pos, radius) then
return
end
--DON'R DESTROY NODES
pos = vector.round(pos) -- voxelmanip doesn't work properly unless pos is rounded ?!?!
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 = {}
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
and data[vi] ~= c_chest then
local n = node_ok(p).name
if minetest.get_item_group(n, "unbreakable") ~= 1 then
-- if chest then drop items inside
if n == "default:chest"
or n == "3dchest:chest"
or n == "default:chest_locked"
or n == "esmobs:bones"
or n == "bones:bones" then
local meta = minetest.get_meta(p)
local inv = meta:get_inventory()
for i = 1, inv:get_size("main") do
local m_stack = inv:get_stack("main", i)
local obj = minetest.add_item(p, m_stack)
if obj then
obj:setvelocity({
x = math.random(-2, 2),
y = 7,
z = math.random(-2, 2)
})
end
end
end
end
end
vi = vi + 1
end
end
end
-- don't destroy any blocks when in water
local p0 = {x=pos.x-1, y=pos.y, z=pos.z-1}
local p1 = {x=pos.x+1, y=pos.y, z=pos.z+1}
if #minetest.find_nodes_in_area(p0, p1, {"group:water"}) > 0 then return {} end
for z = -radius, radius do
for y = -radius, radius do
local vi = a:index(pos.x + (-radius), pos.y + y, pos.z + z)
local ntnt = 1
for x = -radius, radius do
if (x * x) + (y * y) + (z * z) <=
(radius * radius) + pr:next(-radius, radius) then
local cid = data[vi]
p.x = pos.x + x
p.y = pos.y + y
p.z = pos.z + z
if cid == c_tnt or cid == c_bomb then
minetest.after(ntnt+math.random(1,9)/10, function()
esmobs:boom(p)
end)
ntnt = ntnt + 1
end
if cid == c_gunpowder then
esmobs:burn(p)
elseif cid ~= c_tnt_burning and
cid ~= c_gunpowder_burning and
cid ~= c_air and
cid ~= c_fire and
cid ~= c_boom then
esmobs:destroy(drops, p, cid)
end
end
vi = vi + 1
end
end
end
return drops
end
function esmobs:lit( p, n )
minetest.remove_node( p )
minetest.add_entity( p, 'esmobs:tnt_ent' )
end
function esmobs:lit2( p, n )
minetest.remove_node( p )
minetest.add_entity( p, 'esmobs:tnt2_ent' )
end
function esmobs:boom(pos)
minetest.sound_play("tnt_explode", {pos=pos, gain=1.5, max_hear_distance=2*64})
local drops = esmobs:explode(pos, radius)
esmobs:entity_physics(pos, radius)
esmobs:eject_drops(drops, pos, radius)
esmobs:add_effects(pos, radius)
end
local function meseboom(pos)
minetest.remove_node(pos)
esmobs:boom(pos)
end
local function lavaboom(pos)
local name = minetest.get_node(pos).name
esmobs:lit(pos, name)
end
--[[
minetest.register_node("esmobs:tnt", {
description = "esmobsTNT",
tiles = {"tnt_top.png", "tnt_bottom.png", "tnt_side.png"},
groups = {dig_immediate=2, mesecon=2},
sounds = default.node_sound_wood_defaults(),
on_punch = function(pos, node, puncher)
if puncher:get_wielded_item():get_name() == "default:mese" then
minetest.sound_play("tnt_ignite", {pos=pos})
esmobs:lit(pos, node)
end
end,
mesecons = {effector = {action_on = meseboom}},
})
minetest.register_node("esmobs:bomb", {
description = "esmobsTNT Air Drop Bomb",
tiles = {"tnt2_top.png", "tnt2_top.png", "tnt2_side.png"},
groups = {dig_immediate=2, mesecon=2},
sounds = default.node_sound_wood_defaults(),
on_punch = function(pos, node, puncher)
if puncher:get_wielded_item():get_name() == "default:mese" then
minetest.sound_play("tnt_ignite", {pos=pos})
esmobs:lit2(pos, node)
end
end,
mesecons = {effector = {action_on = meseboom}},
})
minetest.register_node("esmobs:gunpowder", {
description = "Gun Powder",
drawtype = "raillike",
paramtype = "light",
sunlight_propagates = true,
walkable = false,
tiles = {"tnt_gunpowder.png",},
inventory_image = "tnt_gunpowder_inventory.png",
wield_image = "tnt_gunpowder_inventory.png",
selection_box = {
type = "fixed",
fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
},
groups = {dig_immediate=2,attached_node=1},
sounds = default.node_sound_leaves_defaults(),
on_punch = function(pos, node, puncher)
if puncher:get_wielded_item():get_name() == "default:torch" then
esmobs:burn(pos)
end
end,
})
minetest.register_node("esmobs:gunpowder_burning", {
drawtype = "raillike",
paramtype = "light",
sunlight_propagates = true,
walkable = false,
light_source = 5,
tiles = {{
name = "tnt_gunpowder_burning_animated.png",
animation = {
type = "vertical_frames",
aspect_w = 16,
aspect_h = 16,
length = 1,
}
}},
selection_box = {
type = "fixed",
fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
},
drop = "",
groups = {dig_immediate=2,attached_node=1},
sounds = default.node_sound_leaves_defaults(),
on_timer = function(pos, elapsed)
for dx = -1, 1 do
for dz = -1, 1 do
for dy = -1, 1 do
if not (dx == 0 and dz == 0) then
esmobs:burn({
x = pos.x + dx,
y = pos.y + dy,
z = pos.z + dz,
})
end
end
end
end
minetest.remove_node(pos)
end
})
minetest.register_abm({
nodenames = {"esmobs:tnt", "esmobs:bomb","esmobs:gunpowder"},
neighbors = {"fire:basic_flame", "default:lava_source", "default:lava_flowing"},
interval = 1,
chance = 1,
action = lavaboom,
})
minetest.register_craft({
output = "esmobs:gunpowder",
type = "shapeless",
recipe = {"default:coal_lump", "default:gravel"}
})
minetest.register_craft({
output = "esmobs:tnt",
recipe = {
{"", "group:wood", ""},
{"group:wood", "tnt:gunpowder", "group:wood"},
{"", "group:wood", ""}
}
})
]]
--------------------------------------------------------------------------------
-- esmobsTNT
--------------------------------------------------------------------------------
-- A simple TNT mod which damages both terrain and entities.
-- Barely based on bcmpinc's pull request.
--
-- (c)2012 Fernando Zapata (ZLovesPancakes, Franz.ZPT)
-- Code licensed under GNU GPLv2
-- http://www.gnu.org/licenses/gpl-2.0.html
-- Content licensed under CC BY-SA 3.0
-- http://creativecommons.org/licenses/by-sa/3.0/
--------------------------------------------------------------------------------
-------------------------------------------------------------- Entities --------
esmobs.ent_proto = {
hp_max = 1000,
physical = true,
collisionbox = { -1/2, -1/2, -1/2, 1/2, 1/2, 1/2 },
visual = 'cube',
textures = { 'tnt_top.png', 'tnt_bottom.png', 'tnt_side.png',
'tnt_side.png', 'tnt_side.png', 'tnt_side.png' },
timer = 0,
btimer = 0,
bstatus = true,
physical_state = true,
on_activate = function( sf, sd )
sf.object:set_armor_groups( { immortal=1 } )
sf.object:setvelocity({x=math.random(-40,40)/40, y=4, z=math.random(-40,40)/40})
sf.object:setacceleration({x=0, y=-10, z=0})
sf.object:settexturemod('^[brighten')
end,
on_step = function( sf, dt )
sf.timer = sf.timer + dt
sf.btimer = sf.btimer + dt
if sf.btimer > 0.5 then
sf.btimer = sf.btimer - 0.5
if sf.bstatus then
sf.object:settexturemod('')
else
sf.object:settexturemod('^[brighten')
end
sf.bstatus = not sf.bstatus
end
if sf.timer > 0.5 then
local p = sf.object:getpos()
p.y = p.y - 0.501
local nn = minetest.get_node(p).name
if not minetest.registered_nodes[nn] or
minetest.registered_nodes[nn].walkable then
sf.object:setvelocity({x=0,y=0,z=0})
sf.object:setacceleration({x=0, y=0, z=0})
end
end
if sf.timer > 4 then
local pos = sf.object:getpos()
local pos2 = {x=math.floor(pos.x+0.5), y=math.floor(pos.y+0.5),
z=math.floor(pos.z+0.5)}
esmobs:boom(pos2)
sf.object:remove()
end
end,
}
minetest.register_entity( 'esmobs:tnt_ent', esmobs.ent_proto )
esmobs.ent_proto2 = {
hp_max = 1000,
physical = true,
collisionbox = { -1/2, -1/2, -1/2, 1/2, 1/2, 1/2 },
visual = 'cube',
textures = { 'tnt2_top.png', 'tnt2_top.png', 'tnt2_side.png',
'tnt2_side.png', 'tnt2_side.png', 'tnt2_side.png' },
timer = 0,
btimer = 0,
bstatus = true,
physical_state = true,
on_activate = function( sf, sd )
sf.object:set_armor_groups( { immortal=1 } )
sf.object:setvelocity({x=math.random(-40,40)/40, y=4, z=math.random(-40,40)/40})
sf.object:setacceleration({x=0, y=-10, z=0})
sf.object:settexturemod('^[brighten')
end,
on_step = function( sf, dt )
sf.timer = sf.timer + dt
sf.btimer = sf.btimer + dt
if sf.btimer > 0.5 then
sf.btimer = sf.btimer - 0.5
if sf.bstatus then
sf.object:settexturemod('')
else
sf.object:settexturemod('^[brighten')
end
sf.bstatus = not sf.bstatus
end
if sf.timer > 0.5 then
local p = sf.object:getpos()
p.y = p.y - 0.501
local nn = minetest.get_node(p).name
if not minetest.registered_nodes[nn] or
minetest.registered_nodes[nn].walkable then
sf.object:setvelocity({x=0,y=0,z=0})
sf.object:setacceleration({x=0, y=0, z=0})
end
end
if sf.timer > 4 then
local pos = sf.object:getpos()
local pos2 = {x=math.floor(pos.x+0.5), y=math.floor(pos.y+0.5),
z=math.floor(pos.z+0.5)}
esmobs:boom(pos2)
sf.object:remove()
end
end,
}
--minetest.register_entity( 'esmobs:tnt2_ent', esmobs.ent_proto2 )
if minetest.setting_get("log_mods") then
minetest.debug("[esmobsTNT] Loaded!")
end