diff --git a/ball.lua b/ball.lua index 013a9e5..6a39f56 100644 --- a/ball.lua +++ b/ball.lua @@ -82,7 +82,7 @@ minetest.register_entity("basic_machines:ball", { _speed = ball_default.speed, -- velocity when punched _energy = ball_default.energy, -- if negative it will deactivate stuff, positive will activate, 0 wont do anything - _bounce = ball_default.bounce, -- 0: absorbs in block, 1: proper bounce=lag buggy, to do: line of sight bounce + _bounce = ball_default.bounce, -- 0: absorbs in block, 1: proper bounce = lag buggy, to do: line of sight bounce _punchable = ball_default.punchable, -- can be punched by players in protection _hurt = ball_default.hurt, -- how much damage it does to target entity, if 0 damage disabled _lifetime = ball_default.lifetime, -- how long it exists before disappearing @@ -252,9 +252,10 @@ minetest.register_entity("basic_machines:ball", { if lua_entity then if lua_entity.itemstring == "robot" then self.object:remove(); break - elseif lua_entity.protected ~= 2 then -- if protection (mobs_redo) is on level 2 then don't let ball harm mobs + -- if protection (mobs_redo) is on level 2 then don't let ball harm mobs + elseif lua_entity.protected ~= 2 and obj:get_armor_groups().fleshy then local hp = obj:get_hp() - local newhp = hp - self._hurt + local newhp = math.min(obj:get_properties().hp_max, hp - self._hurt) if newhp > 0 then obj:set_hp(newhp) if newhp < hp then diff --git a/common.lua b/common.lua index 452bb06..cab1418 100644 --- a/common.lua +++ b/common.lua @@ -7,7 +7,7 @@ local S = minetest.get_translator("basic_machines") basic_machines = { F = minetest.formspec_escape, S = S, - version = "12/31/2024 (fork)", + version = "01/03/2025 (fork)", properties = { no_clock = false, -- if true all continuously running activities (clockgen/keypad) are disabled machines_TTL = 16, -- time to live for signals, how many hops before signal dissipates diff --git a/mover.lua b/mover.lua index 05a961c..893be06 100644 --- a/mover.lua +++ b/mover.lua @@ -60,6 +60,7 @@ local mover = { ["gloopblocks:obsidian_cooled"] = 20, ["gloopblocks:pumice_cooled"] = 2, ["itemframes:frame"] = 999999, + ["itemframes:frame_invi"] = 999999, ["itemframes:pedestal"] = 999999, ["painting:canvasnode"] = 999999, ["painting:pic"] = 999999,