diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua index 4023f38b..86fc9663 100755 --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -1418,13 +1418,13 @@ function entity_physics(pos, radius, self) --/MFF (Crabman|06/23/2015)add self t for _, obj in pairs(objs) do obj_pos = obj:getpos() obj_vel = obj:getvelocity() - dist = math.max(1, vector.distance(pos, obj_pos)) + --dist = math.max(1, vector.distance(pos, obj_pos)) if obj_vel ~= nil then obj:setvelocity(calc_velocity(pos, obj_pos, obj_vel, radius * 10)) end - local damage = (4 / dist) * radius + --local damage = (4 / dist) * radius obj:punch(self.object, 1.0,{full_punch_interval=1.0, damage_groups = {fleshy=self.damage} })--/MFF (Crabman|06/23/2015) use punch - obj:set_hp(obj:get_hp() - damage) + --obj:set_hp(obj:get_hp() - damage) end end diff --git a/mods/mobs/npc.lua b/mods/mobs/npc.lua index 131c9bf1..41b98704 100755 --- a/mods/mobs/npc.lua +++ b/mods/mobs/npc.lua @@ -108,13 +108,6 @@ mobs:register_mob("mobs:npc", { self.owner = clicker:get_player_name() end end - -- pick up npc - elseif item:get_name() == "mobs:magic_lasso" - and clicker:is_player() - and clicker:get_inventory() - and self.child == false - and clicker:get_inventory():room_for_item("main", "mobs:npc") then - else -- if owner switch between follow and stand if self.owner and self.owner == clicker:get_player_name() then @@ -134,4 +127,4 @@ mobs:register_mob("mobs:npc", { -- spawning enable for now mobs:register_spawn("mobs:npc", {"default:dirt_with_grass", "default:dirt", "default:junglegrass", "default:sand"}, 20, -1, 50000, 1, 31000) -- register spawn egg -mobs:register_egg("mobs:npc", "Npc", "default_brick.png", 1) \ No newline at end of file +mobs:register_egg("mobs:npc", "Npc", "default_brick.png", 1)