From e35dd34462e7106ece87b5c0f3a99d0eca30e150 Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Tue, 8 Aug 2017 01:38:12 -0700 Subject: [PATCH] Add 'mobs_redo' compatibility (WIP) --- depends.txt | 1 + init.lua | 601 ++++++++++++++++++++++++++-------------------------- spawn.lua | 144 ++++++++----- 3 files changed, 401 insertions(+), 345 deletions(-) diff --git a/depends.txt b/depends.txt index 7710c3f..34ee7c1 100644 --- a/depends.txt +++ b/depends.txt @@ -1,3 +1,4 @@ default +mobs? spawneggs? tnt? diff --git a/init.lua b/init.lua index f6febe6..3d81baf 100644 --- a/init.lua +++ b/init.lua @@ -26,348 +26,359 @@ for I in pairs(scripts) do dofile(sneeker.modpath .. '/' .. scripts[I] .. '.lua') end -local function jump(self,pos,direction) - local velocity = self.object:getvelocity() - if core.registered_nodes[core.get_node(pos).name].climbable then - self.object:setvelocity({x=velocity.x,y=4,z=velocity.z}) - return - end - - local spos = {x=pos.x+direction.x,y=pos.y,z=pos.z+direction.z} - local node = core.get_node_or_nil(spos) - spos.y = spos.y+1 - local node2 = core.get_node_or_nil(spos) - local def,def2 = {} - if node and node.name then - def = core.registered_items[node.name] - end - if node2 and node2.name then - def2 = core.registered_items[node2.name] - end - if def and def.walkable - and def2 and not def2.walkable - and def.drawtype ~= 'fencelike' then - self.object:setvelocity({ - x=velocity.x*2.2, - y=self.jump_height, - z=velocity.z*2.2 - }) - end -end -local function random_turn(self) - if self.turn_timer > math.random(2,5) then - local select_turn = math.random(1,3) - if select_turn == 1 then - self.turn = 'left' - elseif select_turn == 2 then - self.turn = 'right' - elseif select_turn == 3 then - self.turn = 'straight' - end - self.turn_timer = 0 - self.turn_speed = 0.05*math.random() - end -end +local radius = tonumber(core.settings:get('tnt_radius') or 3) + local def = { hp_max = 20, physical = true, - collisionbox = {-0.25,-0.7,-0.25, 0.25,0.8,0.25}, + collisionbox = {-0.25, -0.7, -0.25, 0.25, 0.8, 0.25}, visual = 'mesh', mesh = 'character.b3d', textures = {'sneeker.png'}, makes_footstep_sound = false, + jump_height = 5, +} - -- Original - animation = { + + +if core.global_exists('mobs') then + def.type = 'monster' + def.walk_velocity = 1.5 + def.knock_back = 2 + def.attack_type = 'explode' + def.explosion_radius = radius + --[[ + def.on_blast = function(object, damage) + explode(object) + end + ]] + def.animation = { + stand_start = 0, + stand_end = 79, + stand_speed = 30, + walk_start = 168, + walk_end = 187, + walk_speek = 30, + } + def.sounds = { + explode = 'sneeker_explode', + distance = 128, + } + + mobs:register_mob(sneeker.mob_name, def) + -- TODO: Add alias +else + def.walk_speed = 1.5 + def.knockback_level = 2 + def.animation = { stand_START = 0, stand_END = 79, walk_START = 168, - walk_END = 187 - }, - walk_speed = 1.5, - jump_height = 5, - animation_speed = 30, - knockback_level = 2 -} - -def.on_activate = function(self,staticdata) - self.yaw = 0 - self.anim = 1 - self.timer = 0 - self.visualx = 1 - self.jump_timer = 0 - self.turn_timer = 0 - self.turn_speed = 0 - self.powered = false - self.knockback = false - self.state = math.random(1,2) - self.old_y = self.object:getpos().y + walk_END = 187, + } + def.animation_speed = 30 - local data = core.deserialize(staticdata) - if data and type(data) == 'table' then - if data.powered == true then - self.powered = true - self.object:set_properties({textures = {'sneeker_powered.png'}}) + + local function jump(self,pos,direction) + local velocity = self.object:getvelocity() + if core.registered_nodes[core.get_node(pos).name].climbable then + self.object:setvelocity({x=velocity.x,y=4,z=velocity.z}) + return end - else - if math.random(0,20) == 20 then - self.powered = true - self.object:set_properties({textures = {'sneeker_powered.png'}}) + + local spos = {x=pos.x+direction.x,y=pos.y,z=pos.z+direction.z} + local node = core.get_node_or_nil(spos) + spos.y = spos.y+1 + local node2 = core.get_node_or_nil(spos) + local def,def2 = {} + if node and node.name then + def = core.registered_items[node.name] + end + if node2 and node2.name then + def2 = core.registered_items[node2.name] + end + if def and def.walkable + and def2 and not def2.walkable + and def.drawtype ~= 'fencelike' then + self.object:setvelocity({ + x=velocity.x*2.2, + y=self.jump_height, + z=velocity.z*2.2 + }) end end -end - -def.on_step = function(self, dtime) - if self.knockback then - return + + + local function random_turn(self) + if self.turn_timer > math.random(2,5) then + local select_turn = math.random(1,3) + if select_turn == 1 then + self.turn = 'left' + elseif select_turn == 2 then + self.turn = 'right' + elseif select_turn == 3 then + self.turn = 'straight' + end + self.turn_timer = 0 + self.turn_speed = 0.05*math.random() + end end - local ANIM_STAND = 1 - local ANIM_WALK = 2 - local pos = self.object:getpos() - local yaw = self.object:getyaw() - local inside = core.get_objects_inside_radius(pos,10) - local walk_speed = self.walk_speed - local animation = self.animation - local anim_speed = self.animation_speed - local velocity = self.object:getvelocity() - - self.timer = self.timer+0.01 - self.turn_timer = self.turn_timer+0.01 - self.jump_timer = self.jump_timer+0.01 - - if not self.chase - and self.timer > math.random(2,5) then - if math.random() > 0.8 then - self.state = 'stand' - else - self.state = 'walk' - end + def.on_activate = function(self,staticdata) + self.yaw = 0 + self.anim = 1 self.timer = 0 - end - - if self.turn == 'right' then - self.yaw = self.yaw+self.turn_speed - self.object:setyaw(self.yaw) - elseif self.turn == 'left' then - self.yaw = self.yaw-self.turn_speed - self.object:setyaw(self.yaw) + self.visualx = 1 + self.jump_timer = 0 + self.turn_timer = 0 + self.turn_speed = 0 + self.powered = false + self.knockback = false + self.state = math.random(1,2) + self.old_y = self.object:getpos().y + + local data = core.deserialize(staticdata) + if data and type(data) == 'table' then + if data.powered == true then + self.powered = true + self.object:set_properties({textures = {'sneeker_powered.png'}}) + end + else + if math.random(0,20) == 20 then + self.powered = true + self.object:set_properties({textures = {'sneeker_powered.png'}}) + end + end end - if self.chase and self.visualx < 2 then - if self.hiss == false then - core.sound_play('sneeker_hiss',{pos=pos,gain=1.5,max_hear_distance=2*64}) - end - self.visualx = self.visualx+0.05 - self.object:set_properties({ - visual_size = {x=self.visualx,y=1} - }) - self.hiss = true - elseif self.visualx > 1 then - self.visualx = self.visualx-0.05 - self.object:set_properties({ - visual_size = {x=self.visualx,y=1} - }) - self.hiss = false - end - self.chase = false - - for _,object in ipairs(inside) do - if object:is_player() then - self.state = 'chase' - end - end - - if self.state == 'stand' then - if self.anim ~= ANIM_STAND then - self.object:set_animation({x=animation.stand_START,y=animation.stand_END},anim_speed,0) - self.anim = ANIM_STAND + def.on_step = function(self, dtime) + if self.knockback then + return end - random_turn(self) + local ANIM_STAND = 1 + local ANIM_WALK = 2 - if velocity.x ~= 0 - or velocity.z ~= 0 then - self.object:setvelocity({x=0,y=velocity.y,z=0}) - end - end - - if self.state == 'walk' then - if self.anim ~= ANIM_WALK then - self.object:set_animation({x=animation.walk_START,y=animation.walk_END},anim_speed,0) - self.anim = ANIM_WALK - end - - self.direction = {x=math.sin(yaw)*-1,y=-10,z=math.cos(yaw)} - if self.direction then - self.object:setvelocity({x=self.direction.x*walk_speed,y=velocity.y,z=self.direction.z*walk_speed}) - end - - random_turn(self) - + local pos = self.object:getpos() + local yaw = self.object:getyaw() + local inside = core.get_objects_inside_radius(pos,10) + local walk_speed = self.walk_speed + local animation = self.animation + local anim_speed = self.animation_speed local velocity = self.object:getvelocity() - if self.turn_timer > 1 then - local direction = self.direction - local npos = {x=pos.x+direction.x,y=pos.y+0.2,z=pos.z+direction.z} - if velocity.x == 0 or velocity.z == 0 - or core.registered_nodes[core.get_node(npos).name].walkable then - local select_turn = math.random(1,2) - if select_turn == 1 then - self.turn = 'left' - elseif select_turn == 2 then - self.turn = 'right' - end - self.turn_timer = 0 - self.turn_speed = 0.05*math.random() + self.timer = self.timer+0.01 + self.turn_timer = self.turn_timer+0.01 + self.jump_timer = self.jump_timer+0.01 + + if not self.chase + and self.timer > math.random(2,5) then + if math.random() > 0.8 then + self.state = 'stand' + else + self.state = 'walk' + end + self.timer = 0 + end + + if self.turn == 'right' then + self.yaw = self.yaw+self.turn_speed + self.object:setyaw(self.yaw) + elseif self.turn == 'left' then + self.yaw = self.yaw-self.turn_speed + self.object:setyaw(self.yaw) + end + + if self.chase and self.visualx < 2 then + if self.hiss == false then + core.sound_play('sneeker_hiss',{pos=pos,gain=1.5,max_hear_distance=2*64}) + end + self.visualx = self.visualx+0.05 + self.object:set_properties({ + visual_size = {x=self.visualx,y=1} + }) + self.hiss = true + elseif self.visualx > 1 then + self.visualx = self.visualx-0.05 + self.object:set_properties({ + visual_size = {x=self.visualx,y=1} + }) + self.hiss = false + end + + self.chase = false + + for _,object in ipairs(inside) do + if object:is_player() then + self.state = 'chase' end end - -- Jump - if self.jump_timer > 0.2 then - jump(self,pos,self.direction) + if self.state == 'stand' then + if self.anim ~= ANIM_STAND then + self.object:set_animation({x=animation.stand_START,y=animation.stand_END},anim_speed,0) + self.anim = ANIM_STAND + end + + random_turn(self) + + if velocity.x ~= 0 + or velocity.z ~= 0 then + self.object:setvelocity({x=0,y=velocity.y,z=0}) + end end - end + + if self.state == 'walk' then + if self.anim ~= ANIM_WALK then + self.object:set_animation({x=animation.walk_START,y=animation.walk_END},anim_speed,0) + self.anim = ANIM_WALK + end + + self.direction = {x=math.sin(yaw)*-1,y=-10,z=math.cos(yaw)} + if self.direction then + self.object:setvelocity({x=self.direction.x*walk_speed,y=velocity.y,z=self.direction.z*walk_speed}) + end + + random_turn(self) - if self.state == 'chase' then - if self.anim ~= ANIM_WALK then - self.object:set_animation({x=animation.walk_START,y=animation.walk_END},anim_speed,0) - self.anim = ANIM_WALK - end - - self.turn = 'straight' - - local inside_2 = core.get_objects_inside_radius(pos,2) - - -- Boom - if #inside_2 ~= 0 then - for _,object in ipairs(inside_2) do - if object:is_player() and object:get_hp() ~= 0 then - self.chase = true - if self.visualx >= 2 then - self.object:remove() - sneeker.boom(pos,self.powered) - core.sound_play('sneeker_explode',{pos=pos,gain=1.5,max_hear_distance=2*64}) + local velocity = self.object:getvelocity() + + if self.turn_timer > 1 then + local direction = self.direction + local npos = {x=pos.x+direction.x,y=pos.y+0.2,z=pos.z+direction.z} + if velocity.x == 0 or velocity.z == 0 + or core.registered_nodes[core.get_node(npos).name].walkable then + local select_turn = math.random(1,2) + if select_turn == 1 then + self.turn = 'left' + elseif select_turn == 2 then + self.turn = 'right' end + self.turn_timer = 0 + self.turn_speed = 0.05*math.random() end end + + -- Jump + if self.jump_timer > 0.2 then + jump(self,pos,self.direction) + end end - if #inside ~= 0 then - for _,object in ipairs(inside) do - if object:is_player() and object:get_hp() ~= 0 then - if #inside_2 ~= 0 then - for _,object in ipairs(inside_2) do - -- Stop move - if object:is_player() then - if self.anim ~= ANIM_STAND then - self.object:set_animation({x=animation.stand_START,y=animation.stand_END},anim_speed,0) - self.anim = ANIM_STAND - end - self.object:setvelocity({x=0,y=velocity.y,z=0}) - return - end + if self.state == 'chase' then + if self.anim ~= ANIM_WALK then + self.object:set_animation({x=animation.walk_START,y=animation.walk_END},anim_speed,0) + self.anim = ANIM_WALK + end + + self.turn = 'straight' + + local inside_2 = core.get_objects_inside_radius(pos,2) + + -- Boom + if #inside_2 ~= 0 then + for _,object in ipairs(inside_2) do + if object:is_player() and object:get_hp() ~= 0 then + self.chase = true + if self.visualx >= 2 then + self.object:remove() + sneeker.boom(pos,self.powered) + core.sound_play('sneeker_explode',{pos=pos,gain=1.5,max_hear_distance=2*64}) end end - - local ppos = object:getpos() - self.vec = {x=ppos.x-pos.x,y=ppos.y-pos.y,z=ppos.z-pos.z} - self.yaw = math.atan(self.vec.z/self.vec.x)+math.pi^2 - if ppos.x > pos.x then - self.yaw = self.yaw+math.pi - end - self.yaw = self.yaw-2 - self.object:setyaw(self.yaw) - self.direction = {x=math.sin(self.yaw)*-1,y=0,z=math.cos(self.yaw)} - - local direction = self.direction - self.object:setvelocity({x=direction.x*2.5,y=velocity.y,z=direction.z*2.5}) - - -- Jump - if self.jump_timer > 0.2 then - jump(self,pos,direction) - end end end - else - self.state = 'stand' - end - end + + if #inside ~= 0 then + for _,object in ipairs(inside) do + if object:is_player() and object:get_hp() ~= 0 then + if #inside_2 ~= 0 then + for _,object in ipairs(inside_2) do + -- Stop move + if object:is_player() then + if self.anim ~= ANIM_STAND then + self.object:set_animation({x=animation.stand_START,y=animation.stand_END},anim_speed,0) + self.anim = ANIM_STAND + end + self.object:setvelocity({x=0,y=velocity.y,z=0}) + return + end + end + end + + local ppos = object:getpos() + self.vec = {x=ppos.x-pos.x,y=ppos.y-pos.y,z=ppos.z-pos.z} + self.yaw = math.atan(self.vec.z/self.vec.x)+math.pi^2 + if ppos.x > pos.x then + self.yaw = self.yaw+math.pi + end + self.yaw = self.yaw-2 + self.object:setyaw(self.yaw) + self.direction = {x=math.sin(self.yaw)*-1,y=0,z=math.cos(self.yaw)} + + local direction = self.direction + self.object:setvelocity({x=direction.x*2.5,y=velocity.y,z=direction.z*2.5}) - -- Swim - local node = core.get_node(pos) - if core.get_item_group(node.name,'water') ~= 0 then - self.object:setacceleration({x=0,y=1,z=0}) - local velocity = self.object:getvelocity() - if self.object:getvelocity().y > 5 then - self.object:setvelocity({x=0,y=velocity.y-velocity.y/2,z=0}) - else - self.object:setvelocity({x=0,y=velocity.y+1,z=0}) - end - else - self.object:setacceleration({x=0,y=-10,z=0}) - end -end - -def.on_punch = function(self,puncher,time_from_last_punch,tool_capabilities,dir) - if self.knockback == false then - local knockback_level = self.knockback_level - self.object:setvelocity({x=dir.x*knockback_level,y=3,z=dir.z*knockback_level}) - self.knockback = true - core.after(0.6,function() - self.knockback = false - end) - end - if self.object:get_hp() < 1 then - local pos = self.object:getpos() - local x = 1/math.random(1,5)*dir.x - local z = 1/math.random(1,5)*dir.z - local p = {x=pos.x+x,y=pos.y,z=pos.z+z} - local node = core.get_node_or_nil(p) - if node == nil or not node.name or node.name ~= 'air' then - p = pos - end - local obj = core.add_item(p, {name='tnt:gunpowder',count=math.random(0,2)}) - end -end - -def.get_staticdata = function(self) - return core.serialize({ - powered = self.powered - }) -end - -core.register_entity(sneeker.mob_name, def) - -if core.get_modpath('spawneggs') and core.get_modpath('tnt') then - core.register_craftitem(sneeker.spawnegg_name, { - description = 'Sneeker Spawn Egg', - inventory_image = 'sneeker_spawnegg.png', - stack_max = 64, - on_place = function(itemstack, placer, pointed_thing) - if pointed_thing.type == 'node' then - local pos = pointed_thing.above - pos.y = pos.y+1 - core.add_entity(pos, sneeker.mob_name) - if not core.settings:get_bool('creative_mode') then - itemstack:take_item() + -- Jump + if self.jump_timer > 0.2 then + jump(self,pos,direction) + end + end end - return itemstack + else + self.state = 'stand' end end - }) + + -- Swim + local node = core.get_node(pos) + if core.get_item_group(node.name,'water') ~= 0 then + self.object:setacceleration({x=0,y=1,z=0}) + local velocity = self.object:getvelocity() + if self.object:getvelocity().y > 5 then + self.object:setvelocity({x=0,y=velocity.y-velocity.y/2,z=0}) + else + self.object:setvelocity({x=0,y=velocity.y+1,z=0}) + end + else + self.object:setacceleration({x=0,y=-10,z=0}) + end + end - core.register_craft({ - output = sneeker.spawnegg_name, - type = 'shapeless', - recipe = { - 'spawneggs:egg', 'tnt:tnt', - }, - }) - core.register_alias('spawneggs:sneeker', sneeker.spawnegg_name) + def.on_punch = function(self,puncher,time_from_last_punch,tool_capabilities,dir) + if self.knockback == false then + local knockback_level = self.knockback_level + self.object:setvelocity({x=dir.x*knockback_level,y=3,z=dir.z*knockback_level}) + self.knockback = true + core.after(0.6,function() + self.knockback = false + end) + end + if self.object:get_hp() < 1 then + local pos = self.object:getpos() + local x = 1/math.random(1,5)*dir.x + local z = 1/math.random(1,5)*dir.z + local p = {x=pos.x+x,y=pos.y,z=pos.z+z} + local node = core.get_node_or_nil(p) + if node == nil or not node.name or node.name ~= 'air' then + p = pos + end + local obj = core.add_item(p, {name='tnt:gunpowder',count=math.random(0,2)}) + end + end + + + def.get_staticdata = function(self) + return core.serialize({ + powered = self.powered + }) + end + + + core.register_entity(sneeker.mob_name, def) end diff --git a/spawn.lua b/spawn.lua index d48e32d..b06c116 100644 --- a/spawn.lua +++ b/spawn.lua @@ -23,57 +23,101 @@ sneeker.log('Spawn chance: ' .. spawn_chance_percent) sneeker.log('Spawn interval: ' .. tostring(spawn_interval) .. ' (' .. tostring(spawn_interval/60) .. ' minute(s))') sneeker.log('Maximum light value for spawn: ' .. tostring(spawn_maxlight)) -core.register_abm({ - nodenames = {'default:dirt_with_grass', 'default:stone'}, - neighbors = {'air'}, - interval = spawn_interval, - chance = spawn_chance, - action = function(pos, node, _, active_object_count_wider) - if active_object_count_wider > 5 then - return + +if core.global_exists('mobs') then + mobs:spawn({ + name = sneeker.mob_name, + nodes = {'default:dirt_with_grass', 'default:stone'}, + neighbors = {'air'}, + min_light = -1, + max_light = spawn_maxlight, + interval = spawn_interval, + chance = spawn_chance, + }) + + mobs:register_egg(sneeker.mob_name, 'Sneeker Spawn Egg', 'sneeker_spawnegg.png', 0, false) +else + core.register_abm({ + nodenames = {'default:dirt_with_grass', 'default:stone'}, + neighbors = {'air'}, + interval = spawn_interval, + chance = spawn_chance, + action = function(pos, node, _, active_object_count_wider) + if active_object_count_wider > 5 then + return + end + + -- Check light value of node + pos.y = pos.y+1 + local node_light = core.get_node_light(pos) + + -- Debugging spawning + sneeker.log_debug('Node light level at ' .. sneeker.get_pos_string(pos) .. ': ' .. tostring(node_light)) + + if not node_light or node_light > spawn_maxlight or node_light < -1 then + sneeker.log_debug('Node not dark enough for spawn') + return + end + + -- Spawn range + if pos.y > 31000 then + return + end + + -- Node must be touching air + if core.get_node(pos).name ~= 'air' then + return + end + pos.y = pos.y+1 + if core.get_node(pos).name ~= 'air' then + return + end + + -- Get total count of sneekers in world + local count = 0 + for I in pairs(core.luaentities) do + if core.luaentities[I].name == sneeker.mob_name then + count = count + 1 + end + end + + sneeker.log_debug('Current active spawns: ' .. tostring(count) .. '/' .. tostring(spawn_cap)) + + if count >= spawn_cap then + sneeker.log_debug('Max spawns reached') + return + end + + sneeker.spawn(pos) end + }) + + + if core.get_modpath('spawneggs') and core.get_modpath('tnt') then + core.register_craftitem(sneeker.spawnegg_name, { + description = 'Sneeker Spawn Egg', + inventory_image = 'sneeker_spawnegg.png', + on_place = function(itemstack, placer, pointed_thing) + if pointed_thing.type == 'node' then + local pos = pointed_thing.above + pos.y = pos.y+1 + core.add_entity(pos, sneeker.mob_name) + if not core.settings:get_bool('creative_mode') then + itemstack:take_item() + end + return itemstack + end + end + }) - -- Check light value of node - pos.y = pos.y+1 - local node_light = core.get_node_light(pos) + core.register_craft({ + output = sneeker.spawnegg_name, + type = 'shapeless', + recipe = { + 'spawneggs:egg', 'tnt:tnt', + }, + }) - -- Debugging spawning - sneeker.log_debug('Node light level at ' .. sneeker.get_pos_string(pos) .. ': ' .. tostring(node_light)) - - if not node_light or node_light > spawn_maxlight or node_light < -1 then - sneeker.log_debug('Node not dark enough for spawn') - return - end - - -- Spawn range - if pos.y > 31000 then - return - end - - -- Node must be touching air - if core.get_node(pos).name ~= 'air' then - return - end - pos.y = pos.y+1 - if core.get_node(pos).name ~= 'air' then - return - end - - -- Get total count of sneekers in world - local count = 0 - for I in pairs(core.luaentities) do - if core.luaentities[I].name == sneeker.mob_name then - count = count + 1 - end - end - - sneeker.log_debug('Current active spawns: ' .. tostring(count) .. '/' .. tostring(spawn_cap)) - - if count >= spawn_cap then - sneeker.log_debug('Max spawns reached') - return - end - - sneeker.spawn(pos) + core.register_alias('spawneggs:sneeker', sneeker.spawnegg_name) end -}) +end