From e4a13f2f5ac0fd04cf4a28547895e1a7c8d1f266 Mon Sep 17 00:00:00 2001 From: teknomunk Date: Wed, 22 May 2024 20:47:25 +0000 Subject: [PATCH] Finish reworking all items in mcl_throwing --- mods/ITEMS/mcl_throwing/egg.lua | 69 ++++++ mods/ITEMS/mcl_throwing/ender_pearl.lua | 132 ++++++++++ mods/ITEMS/mcl_throwing/register.lua | 314 +----------------------- mods/ITEMS/mcl_throwing/snowball.lua | 79 ++++++ mods/ITEMS/vl_projectile/init.lua | 12 +- 5 files changed, 292 insertions(+), 314 deletions(-) create mode 100644 mods/ITEMS/mcl_throwing/egg.lua create mode 100644 mods/ITEMS/mcl_throwing/ender_pearl.lua create mode 100644 mods/ITEMS/mcl_throwing/snowball.lua diff --git a/mods/ITEMS/mcl_throwing/egg.lua b/mods/ITEMS/mcl_throwing/egg.lua new file mode 100644 index 000000000..ea550b2e7 --- /dev/null +++ b/mods/ITEMS/mcl_throwing/egg.lua @@ -0,0 +1,69 @@ +local modname = minetest.get_current_modname() +local modpath = minetest.get_modpath(modname) +local S = minetest.get_translator(modname) + +local mod_target = minetest.get_modpath("mcl_target") +local how_to_throw = S("Use the punch key to throw.") + +-- Egg +minetest.register_craftitem("mcl_throwing:egg", { + description = S("Egg"), + _tt_help = S("Throwable").."\n"..S("Chance to hatch chicks when broken"), + _doc_items_longdesc = S("Eggs can be thrown or launched from a dispenser and breaks on impact. There is a small chance that 1 or even 4 chicks will pop out of the egg."), + _doc_items_usagehelp = how_to_throw, + inventory_image = "mcl_throwing_egg.png", + stack_max = 16, + on_use = mcl_throwing.get_player_throw_function("mcl_throwing:egg_entity"), + _on_dispense = mcl_throwing.dispense_function, + groups = { craftitem = 1 }, +}) +mcl_throwing.register_throwable_object("mcl_throwing:egg", "mcl_throwing:egg_entity", 22) + +minetest.register_entity("mcl_throwing:egg_entity",{ + physical = false, + timer=0, + textures = {"mcl_throwing_egg.png"}, + visual_size = {x=0.45, y=0.45}, + collisionbox = {0,0,0,0,0,0}, + pointable = false, + + get_staticdata = mcl_throwing.get_staticdata, + on_activate = mcl_throwing.on_activate, + + on_step = vl_projectile.update_projectile, + _lastpos={}, + _thrower = nil, + _vl_projectile = { + behaviors = { + vl_projectile.collides_with_solids, + }, + on_collide_with_solid = function(self, pos, node) + if mod_target and node.name == "mcl_target:target_off" then + mcl_target.hit(vector.round(pos), 0.4) --4 redstone ticks + end + + -- 1/8 chance to spawn a chick + -- FIXME: Chicks have a quite good chance to spawn in walls + if math.random(1,8) ~= 1 then return end + + mcl_mobs.spawn_child(self._lastpos, "mobs_mc:chicken") + + -- BONUS ROUND: 1/32 chance to spawn 3 additional chicks + if math.random(1,32) ~= 1 then return end + + local offsets = { + { x=0.7, y=0, z=0 }, + { x=-0.7, y=0, z=-0.7 }, + { x=-0.7, y=0, z=0.7 }, + } + for o=1, 3 do + local pos = vector.add(self._lastpos, offsets[o]) + mcl_mobs.spawn_child(pos, "mobs_mc:chicken") + end + end, + sounds = { + on_collision = {"mcl_throwing_egg_impact", {max_hear_distance=10, gain=0.5}, true} + }, + }, +}) + diff --git a/mods/ITEMS/mcl_throwing/ender_pearl.lua b/mods/ITEMS/mcl_throwing/ender_pearl.lua new file mode 100644 index 000000000..a3fb42ebe --- /dev/null +++ b/mods/ITEMS/mcl_throwing/ender_pearl.lua @@ -0,0 +1,132 @@ +local modname = minetest.get_current_modname() +local modpath = minetest.get_modpath(modname) +local S = minetest.get_translator(modname) + +local math = math +local vector = vector + +local mod_target = minetest.get_modpath("mcl_target") +local how_to_throw = S("Use the punch key to throw.") + +-- Ender Pearl +minetest.register_craftitem("mcl_throwing:ender_pearl", { + description = S("Ender Pearl"), + _tt_help = S("Throwable").."\n"..minetest.colorize(mcl_colors.YELLOW, S("Teleports you on impact for cost of 5 HP")), + _doc_items_longdesc = S("An ender pearl is an item which can be used for teleportation at the cost of health. It can be thrown and teleport the thrower to its impact location when it hits a solid block or a plant. Each teleportation hurts the user by 5 hit points."), + _doc_items_usagehelp = how_to_throw, + wield_image = "mcl_throwing_ender_pearl.png", + inventory_image = "mcl_throwing_ender_pearl.png", + stack_max = 16, + on_use = mcl_throwing.get_player_throw_function("mcl_throwing:ender_pearl_entity"), + groups = { transport = 1 }, +}) +mcl_throwing.register_throwable_object("mcl_throwing:ender_pearl", "mcl_throwing:ender_pearl_entity", 22) + +-- Ender pearl entity +minetest.register_entity("mcl_throwing:ender_pearl_entity",{ + physical = false, + timer=0, + textures = {"mcl_throwing_ender_pearl.png"}, + visual_size = {x=0.9, y=0.9}, + collisionbox = {0,0,0,0,0,0}, + pointable = false, + + get_staticdata = mcl_throwing.get_staticdata, + on_activate = mcl_throwing.on_activate, + + _lastpos={}, + _thrower = nil, -- Player ObjectRef of the player who threw the ender pearl + _vl_projectile = { + behaviors = { + vl_projectile.collides_with_solids, + }, + collides_with = { + "mcl_core:vine", "mcl_core:deadbush", + "group:flower", "group:sapling", + "group:plant", "group:mushroom", + }, + on_collide_with_solid = function(self, pos, node) + if mod_target and node.name == "mcl_target:target_off" then + mcl_target.hit(vector.round(pos), 0.4) --4 redstone ticks + end + + if node.name == "ignore" then + -- FIXME: This also means the player loses an ender pearl for throwing into unloaded areas + return + end + + -- Make sure we have a reference to the player + local player = self._thrower and minetest.get_player_by_name(self._thrower) + if not player then return end + + -- Teleport and hurt player + + -- First determine good teleport position + local dir = {x=0, y=0, z=0} + + local v = self.object:get_velocity() + if node_def and node_def.walkable then + local vc = table.copy(v) -- vector for calculating + -- Node is walkable, we have to find a place somewhere outside of that node + vc = vector.normalize(vc) + + -- Zero-out the two axes with a lower absolute value than + -- the axis with the strongest force + local lv, ld + lv, ld = math.abs(vc.y), "y" + if math.abs(vc.x) > lv then + lv, ld = math.abs(vc.x), "x" + end + if math.abs(vc.z) > lv then + ld = "z" --math.abs(vc.z) + end + if ld ~= "x" then vc.x = 0 end + if ld ~= "y" then vc.y = 0 end + if ld ~= "z" then vc.z = 0 end + + -- Final tweaks to the teleporting pos, based on direction + -- Impact from the side + dir.x = vc.x * -1 + dir.z = vc.z * -1 + + -- Special case: top or bottom of node + if vc.y > 0 then + -- We need more space when impact is from below + dir.y = -2.3 + elseif vc.y < 0 then + -- Standing on top + dir.y = 0.5 + end + end + -- If node was not walkable, no modification to pos is made. + + -- Final teleportation position + local telepos = vector.add(pos, dir) + local telenode = minetest.get_node(telepos) + + --[[ It may be possible that telepos is walkable due to the algorithm. + Especially when the ender pearl is faster horizontally than vertical. + This applies final fixing, just to be sure we're not in a walkable node ]] + if not minetest.registered_nodes[telenode.name] or minetest.registered_nodes[telenode.name].walkable then + if v.y < 0 then + telepos.y = telepos.y + 0.5 + else + telepos.y = telepos.y - 2.3 + end + end + + local oldpos = player:get_pos() + -- Teleport and hurt player + player:set_pos(telepos) + player:set_hp(player:get_hp() - 5, { type = "fall", from = "mod" }) + + -- 5% chance to spawn endermite at the player's origin + local r = math.random(1,20) + if r == 1 then + minetest.add_entity(oldpos, "mobs_mc:endermite") + end + end + }, + + on_step = vl_projectile.update_projectile, +}) diff --git a/mods/ITEMS/mcl_throwing/register.lua b/mods/ITEMS/mcl_throwing/register.lua index e7e8724be..eac582b4b 100644 --- a/mods/ITEMS/mcl_throwing/register.lua +++ b/mods/ITEMS/mcl_throwing/register.lua @@ -1,311 +1,7 @@ -local S = minetest.get_translator(minetest.get_current_modname()) +local modname = minetest.get_current_modname() +local modpath = minetest.get_modpath(modname) -local math = math -local vector = vector +dofile(modpath.."/snowball.lua") +dofile(modpath.."/egg.lua") +dofile(modpath.."/ender_pearl.lua") -local mod_target = minetest.get_modpath("mcl_target") - --- The snowball entity -local function snowball_particles(pos, vel) - local vel = vector.normalize(vector.multiply(vel, -1)) - minetest.add_particlespawner({ - amount = 20, - time = 0.001, - minpos = pos, - maxpos = pos, - minvel = vector.add({x=-2, y=3, z=-2}, vel), - maxvel = vector.add({x=2, y=5, z=2}, vel), - minacc = {x=0, y=-9.81, z=0}, - maxacc = {x=0, y=-9.81, z=0}, - minexptime = 1, - maxexptime = 3, - minsize = 0.7, - maxsize = 0.7, - collisiondetection = true, - collision_removal = true, - object_collision = false, - texture = "weather_pack_snow_snowflake"..math.random(1,2)..".png", - }) -end -minetest.register_entity("mcl_throwing:snowball_entity", { - physical = false, - timer=0, - textures = {"mcl_throwing_snowball.png"}, - visual_size = {x=0.5, y=0.5}, - collisionbox = {0,0,0,0,0,0}, - pointable = false, - - get_staticdata = mcl_throwing.get_staticdata, - on_activate = mcl_throwing.on_activate, - _thrower = nil, - _lastpos = nil, - - _vl_projectile = { - behaviors = { - vl_projectile.collides_with_solids, - vl_projectile.collides_with_entities, - }, - on_collide_with_solid = function(self, pos, node) - if mod_target and node.name == "mcl_target:target_off" then - mcl_target.hit(vector.round(pos), 0.4) --4 redstone ticks - end - - snowball_particles(self._last_pos or pos, self.object:get_velocity()) - end, - on_collide_with_entity = function(self, pos, entity) - snowball_particles(self._last_pos or pos, self.object:get_velocity()) - end, - sounds = { - on_solid_collision = {"mcl_throwing_snowball_impact_hard", { max_hear_distance=16, gain=0.7 }, true}, - on_entity_collision = {"mcl_throwing_snowball_impact_soft", { max_hear_distance=16, gain=0.7 }, true} - }, - damage_groups = { snowball_vulnerable = 3 }, - }, - on_step = vl_projectile.update_projectile, -}) - -local egg_ENTITY={ - physical = false, - timer=0, - textures = {"mcl_throwing_egg.png"}, - visual_size = {x=0.45, y=0.45}, - collisionbox = {0,0,0,0,0,0}, - pointable = false, - - get_staticdata = mcl_throwing.get_staticdata, - on_activate = mcl_throwing.on_activate, - _thrower = nil, - - _lastpos={}, -} - --- Ender pearl entity -minetest.register_entity("mcl_throwing:ender_pearl_entity",{ - physical = false, - timer=0, - textures = {"mcl_throwing_ender_pearl.png"}, - visual_size = {x=0.9, y=0.9}, - collisionbox = {0,0,0,0,0,0}, - pointable = false, - - get_staticdata = mcl_throwing.get_staticdata, - on_activate = mcl_throwing.on_activate, - - _lastpos={}, - _thrower = nil, -- Player ObjectRef of the player who threw the ender pearl - _vl_projectile = { - behaviors = { - vl_projectile.collides_with_solids, - }, - collides_with = { - "mcl_core:vine", "mcl_core:deadbush", - "group:flower", "group:sapling", - "group:plant", "group:mushroom", - }, - on_collide_with_solid = function(self, pos, node) - if mod_target and node.name == "mcl_target:target_off" then - mcl_target.hit(vector.round(pos), 0.4) --4 redstone ticks - end - - if node.name == "ignore" then - -- FIXME: This also means the player loses an ender pearl for throwing into unloaded areas - return - end - - -- Make sure we have a reference to the player - local player = self._thrower and minetest.get_player_by_name(self._thrower) - if not player then return end - - -- Teleport and hurt player - - -- First determine good teleport position - local dir = {x=0, y=0, z=0} - - local v = self.object:get_velocity() - if node_def and node_def.walkable then - local vc = table.copy(v) -- vector for calculating - -- Node is walkable, we have to find a place somewhere outside of that node - vc = vector.normalize(vc) - - -- Zero-out the two axes with a lower absolute value than - -- the axis with the strongest force - local lv, ld - lv, ld = math.abs(vc.y), "y" - if math.abs(vc.x) > lv then - lv, ld = math.abs(vc.x), "x" - end - if math.abs(vc.z) > lv then - ld = "z" --math.abs(vc.z) - end - if ld ~= "x" then vc.x = 0 end - if ld ~= "y" then vc.y = 0 end - if ld ~= "z" then vc.z = 0 end - - -- Final tweaks to the teleporting pos, based on direction - -- Impact from the side - dir.x = vc.x * -1 - dir.z = vc.z * -1 - - -- Special case: top or bottom of node - if vc.y > 0 then - -- We need more space when impact is from below - dir.y = -2.3 - elseif vc.y < 0 then - -- Standing on top - dir.y = 0.5 - end - end - -- If node was not walkable, no modification to pos is made. - - -- Final teleportation position - local telepos = vector.add(pos, dir) - local telenode = minetest.get_node(telepos) - - --[[ It may be possible that telepos is walkable due to the algorithm. - Especially when the ender pearl is faster horizontally than vertical. - This applies final fixing, just to be sure we're not in a walkable node ]] - if not minetest.registered_nodes[telenode.name] or minetest.registered_nodes[telenode.name].walkable then - if v.y < 0 then - telepos.y = telepos.y + 0.5 - else - telepos.y = telepos.y - 2.3 - end - end - - local oldpos = player:get_pos() - -- Teleport and hurt player - player:set_pos(telepos) - player:set_hp(player:get_hp() - 5, { type = "fall", from = "mod" }) - - -- 5% chance to spawn endermite at the player's origin - local r = math.random(1,20) - if r == 1 then - minetest.add_entity(oldpos, "mobs_mc:endermite") - end - end - }, - - on_step = vl_projectile.update_projectile, -}) - -local function check_object_hit(self, pos, dmg) - for _,object in pairs(minetest.get_objects_inside_radius(pos, 1.5)) do - - local entity = object:get_luaentity() - - if entity - and entity.name ~= self.object:get_luaentity().name then - - if object:is_player() and self._thrower ~= object:get_player_name() then - self.object:remove() - return true - elseif (entity.is_mob == true or entity._hittable_by_projectile) and (self._thrower ~= object) then - object:punch(self.object, 1.0, { - full_punch_interval = 1.0, - damage_groups = dmg, - }, nil) - return true - end - end - end - return false -end - --- Movement function of egg -local function egg_on_step(self, dtime) - self.timer = self.timer + dtime - local pos = self.object:get_pos() - local node = minetest.get_node(pos) - local def = minetest.registered_nodes[node.name] - - -- Destroy when hitting a solid node with chance to spawn chicks - if self._lastpos.x then - if (def and def.walkable) or not def then - -- 1/8 chance to spawn a chick - -- FIXME: Chicks have a quite good chance to spawn in walls - local r = math.random(1,8) - - if r == 1 then - mcl_mobs.spawn_child(self._lastpos, "mobs_mc:chicken") - - -- BONUS ROUND: 1/32 chance to spawn 3 additional chicks - local r = math.random(1,32) - if r == 1 then - local offsets = { - { x=0.7, y=0, z=0 }, - { x=-0.7, y=0, z=-0.7 }, - { x=-0.7, y=0, z=0.7 }, - } - for o=1, 3 do - local pos = vector.add(self._lastpos, offsets[o]) - mcl_mobs.spawn_child(pos, "mobs_mc:chicken") - end - end - end - minetest.sound_play("mcl_throwing_egg_impact", { pos = self.object:get_pos(), max_hear_distance=10, gain=0.5 }, true) - self.object:remove() - if mod_target and node.name == "mcl_target:target_off" then - mcl_target.hit(vector.round(pos), 0.4) --4 redstone ticks - end - return - end - end - - -- Destroy when hitting a mob or player (no chick spawning) - if check_object_hit(self, pos, 0) then - minetest.sound_play("mcl_throwing_egg_impact", { pos = self.object:get_pos(), max_hear_distance=10, gain=0.5 }, true) - self.object:remove() - return - end - - self._lastpos={x=pos.x, y=pos.y, z=pos.z} -- Set lastpos-->Node will be added at last pos outside the node -end - -egg_ENTITY.on_step = egg_on_step - -minetest.register_entity("mcl_throwing:egg_entity", egg_ENTITY) - -local how_to_throw = S("Use the punch key to throw.") - --- Snowball -minetest.register_craftitem("mcl_throwing:snowball", { - description = S("Snowball"), - _tt_help = S("Throwable"), - _doc_items_longdesc = S("Snowballs can be thrown or launched from a dispenser for fun. Hitting something with a snowball does nothing."), - _doc_items_usagehelp = how_to_throw, - inventory_image = "mcl_throwing_snowball.png", - stack_max = 16, - groups = { weapon_ranged = 1 }, - on_use = mcl_throwing.get_player_throw_function("mcl_throwing:snowball_entity"), - _on_dispense = mcl_throwing.dispense_function, -}) - --- Egg -minetest.register_craftitem("mcl_throwing:egg", { - description = S("Egg"), - _tt_help = S("Throwable").."\n"..S("Chance to hatch chicks when broken"), - _doc_items_longdesc = S("Eggs can be thrown or launched from a dispenser and breaks on impact. There is a small chance that 1 or even 4 chicks will pop out of the egg."), - _doc_items_usagehelp = how_to_throw, - inventory_image = "mcl_throwing_egg.png", - stack_max = 16, - on_use = mcl_throwing.get_player_throw_function("mcl_throwing:egg_entity"), - _on_dispense = mcl_throwing.dispense_function, - groups = { craftitem = 1 }, -}) - --- Ender Pearl -minetest.register_craftitem("mcl_throwing:ender_pearl", { - description = S("Ender Pearl"), - _tt_help = S("Throwable").."\n"..minetest.colorize(mcl_colors.YELLOW, S("Teleports you on impact for cost of 5 HP")), - _doc_items_longdesc = S("An ender pearl is an item which can be used for teleportation at the cost of health. It can be thrown and teleport the thrower to its impact location when it hits a solid block or a plant. Each teleportation hurts the user by 5 hit points."), - _doc_items_usagehelp = how_to_throw, - wield_image = "mcl_throwing_ender_pearl.png", - inventory_image = "mcl_throwing_ender_pearl.png", - stack_max = 16, - on_use = mcl_throwing.get_player_throw_function("mcl_throwing:ender_pearl_entity"), - groups = { transport = 1 }, -}) - -mcl_throwing.register_throwable_object("mcl_throwing:snowball", "mcl_throwing:snowball_entity", 22) -mcl_throwing.register_throwable_object("mcl_throwing:egg", "mcl_throwing:egg_entity", 22) -mcl_throwing.register_throwable_object("mcl_throwing:ender_pearl", "mcl_throwing:ender_pearl_entity", 22) diff --git a/mods/ITEMS/mcl_throwing/snowball.lua b/mods/ITEMS/mcl_throwing/snowball.lua new file mode 100644 index 000000000..88f3d32ee --- /dev/null +++ b/mods/ITEMS/mcl_throwing/snowball.lua @@ -0,0 +1,79 @@ +local modname = minetest.get_current_modname() +local modpath = minetest.get_modpath(modname) +local S = minetest.get_translator(modname) + +local how_to_throw = S("Use the punch key to throw.") + +-- Snowball +minetest.register_craftitem("mcl_throwing:snowball", { + description = S("Snowball"), + _tt_help = S("Throwable"), + _doc_items_longdesc = S("Snowballs can be thrown or launched from a dispenser for fun. Hitting something with a snowball does nothing."), + _doc_items_usagehelp = how_to_throw, + inventory_image = "mcl_throwing_snowball.png", + stack_max = 16, + groups = { weapon_ranged = 1 }, + on_use = mcl_throwing.get_player_throw_function("mcl_throwing:snowball_entity"), + _on_dispense = mcl_throwing.dispense_function, +}) +mcl_throwing.register_throwable_object("mcl_throwing:snowball", "mcl_throwing:snowball_entity", 22) + +-- The snowball entity +local function snowball_particles(pos, vel) + local vel = vector.normalize(vector.multiply(vel, -1)) + minetest.add_particlespawner({ + amount = 20, + time = 0.001, + minpos = pos, + maxpos = pos, + minvel = vector.add({x=-2, y=3, z=-2}, vel), + maxvel = vector.add({x=2, y=5, z=2}, vel), + minacc = {x=0, y=-9.81, z=0}, + maxacc = {x=0, y=-9.81, z=0}, + minexptime = 1, + maxexptime = 3, + minsize = 0.7, + maxsize = 0.7, + collisiondetection = true, + collision_removal = true, + object_collision = false, + texture = "weather_pack_snow_snowflake"..math.random(1,2)..".png", + }) +end +minetest.register_entity("mcl_throwing:snowball_entity", { + physical = false, + timer=0, + textures = {"mcl_throwing_snowball.png"}, + visual_size = {x=0.5, y=0.5}, + collisionbox = {0,0,0,0,0,0}, + pointable = false, + + get_staticdata = mcl_throwing.get_staticdata, + on_activate = mcl_throwing.on_activate, + _thrower = nil, + _lastpos = nil, + + _vl_projectile = { + behaviors = { + vl_projectile.collides_with_solids, + vl_projectile.collides_with_entities, + }, + on_collide_with_solid = function(self, pos, node) + if mod_target and node.name == "mcl_target:target_off" then + mcl_target.hit(vector.round(pos), 0.4) --4 redstone ticks + end + + snowball_particles(self._last_pos or pos, self.object:get_velocity()) + end, + on_collide_with_entity = function(self, pos, entity) + snowball_particles(self._last_pos or pos, self.object:get_velocity()) + end, + sounds = { + on_solid_collision = {"mcl_throwing_snowball_impact_hard", { max_hear_distance=16, gain=0.7 }, true}, + on_entity_collision = {"mcl_throwing_snowball_impact_soft", { max_hear_distance=16, gain=0.7 }, true} + }, + damage_groups = { snowball_vulnerable = 3 }, + }, + on_step = vl_projectile.update_projectile, +}) + diff --git a/mods/ITEMS/vl_projectile/init.lua b/mods/ITEMS/vl_projectile/init.lua index 4c223a787..7d82f02fd 100644 --- a/mods/ITEMS/vl_projectile/init.lua +++ b/mods/ITEMS/vl_projectile/init.lua @@ -78,11 +78,6 @@ local function handle_entity_collision(self, entity_def, projectile_def, entity) entity:punch(self.object, 1.0, projectile_def.tool or { full_punch_interval = 1.0, damage_groups = dmg }, dir ) end - -- Normally objects should be removed on collision with entities - if not projectile_def.survive_collision then - self.object:remove() - end - -- Call entity collied hook (projectile_def.on_collide_with_entity or no_op)(self, pos, entity) @@ -100,6 +95,13 @@ local function handle_entity_collision(self, entity_def, projectile_def, entity) arg2.pos = pos minetest.sound_play(sound[1], arg2, sound[3]) end + + -- Normally objects should be removed on collision with entities + if not projectile_def.survive_collision then + self.object:remove() + end + + return true end function mod.collides_with_entities(self, dtime, entity_def, projectile_def)