From d08a226a51ed3001e4714f44fce5b2a35849c79a Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Sun, 18 Apr 2021 19:50:48 +0200 Subject: [PATCH] Integrate critical hits --- mods/CORE/mcl_damage/init.lua | 3 ++ mods/PLAYER/mcl_criticals/init.lua | 38 ++++++++++++++++++ mods/PLAYER/mcl_criticals/mod.conf | 2 + .../sounds/mcl_criticals_hit.0.ogg | Bin 0 -> 10932 bytes .../sounds/mcl_criticals_hit.1.ogg | Bin 0 -> 12936 bytes .../sounds/mcl_criticals_hit.2.ogg | Bin 0 -> 10130 bytes mods/PLAYER/mcl_playerplus/init.lua | 31 -------------- 7 files changed, 43 insertions(+), 31 deletions(-) create mode 100644 mods/PLAYER/mcl_criticals/init.lua create mode 100644 mods/PLAYER/mcl_criticals/mod.conf create mode 100644 mods/PLAYER/mcl_criticals/sounds/mcl_criticals_hit.0.ogg create mode 100644 mods/PLAYER/mcl_criticals/sounds/mcl_criticals_hit.1.ogg create mode 100644 mods/PLAYER/mcl_criticals/sounds/mcl_criticals_hit.2.ogg diff --git a/mods/CORE/mcl_damage/init.lua b/mods/CORE/mcl_damage/init.lua index 18cb6cb13..2018ffc19 100644 --- a/mods/CORE/mcl_damage/init.lua +++ b/mods/CORE/mcl_damage/init.lua @@ -102,6 +102,9 @@ old_register_hpchange(function(player, hp_change, mt_reason) for _, modf in ipairs(mcl_damage.modifiers) do hp_change = modf.func(player, hp_change, mt_reason, mcl_reason) or hp_change + if hp_change == 0 then + return 0 + end end return hp_change diff --git a/mods/PLAYER/mcl_criticals/init.lua b/mods/PLAYER/mcl_criticals/init.lua new file mode 100644 index 000000000..6b420e0b8 --- /dev/null +++ b/mods/PLAYER/mcl_criticals/init.lua @@ -0,0 +1,38 @@ +mcl_criticals = {} + +function mcl_criticals.modifier(obj, hp_change, reason) + local damage = -hp_change + if damage > 0 and reason.type == "player" then + local hitter = reason.direct + if mcl_sprint.is_sprinting(hitter) then + obj:add_velocity(hitter:get_velocity()) + elseif (hitter:get_velocity() or hitter:get_player_velocity()).y < 0 then + local pos = mcl_util.get_object_center(obj) + minetest.add_particlespawner({ + amount = 15, + time = 0.1, + minpos = {x=pos.x-0.5, y=pos.y-0.5, z=pos.z-0.5}, + maxpos = {x=pos.x+0.5, y=pos.y+0.5, z=pos.z+0.5}, + minvel = {x=-0.1, y=-0.1, z=-0.1}, + maxvel = {x=0.1, y=0.1, z=0.1}, + minacc = {x=0, y=0, z=0}, + maxacc = {x=0, y=0, z=0}, + minexptime = 1, + maxexptime = 2, + minsize = 1.5, + maxsize = 1.5, + collisiondetection = false, + vertical = false, + texture = "mcl_particles_crit.png^[colorize:#bc7a57:127", + }) + minetest.sound_play("mcl_criticals_hit", {object = obj}) + -- the minecraft wiki is actually wrong about a crit dealing 150% damage, see minecraft source code + damage = damage + math.random(0, math.floor(damage * 1.5 + 2)) + end + end + return -damage +end + +mcl_damage.register_modifier(function(player, hp_change, _, mcl_reason) + return mcl_criticals.modifier(player, hp_change, mcl_reason) +end, -100) diff --git a/mods/PLAYER/mcl_criticals/mod.conf b/mods/PLAYER/mcl_criticals/mod.conf new file mode 100644 index 000000000..5b0b91330 --- /dev/null +++ b/mods/PLAYER/mcl_criticals/mod.conf @@ -0,0 +1,2 @@ +name = mcl_criticals +depends = mcl_damage diff --git a/mods/PLAYER/mcl_criticals/sounds/mcl_criticals_hit.0.ogg b/mods/PLAYER/mcl_criticals/sounds/mcl_criticals_hit.0.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8184d10768996a9faac5fcf83e29dc0f5c7445b9 GIT binary patch literal 10932 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 Kg8`8I*Z4np&^ERJ literal 0 HcmV?d00001 diff --git a/mods/PLAYER/mcl_criticals/sounds/mcl_criticals_hit.2.ogg b/mods/PLAYER/mcl_criticals/sounds/mcl_criticals_hit.2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..6d573b9f2877a7f66b3fe4b758dcfb63d32edac2 GIT binary patch literal 10130 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 literal 0 HcmV?d00001 diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua index 5d74903fb..5cf0253ab 100644 --- a/mods/PLAYER/mcl_playerplus/init.lua +++ b/mods/PLAYER/mcl_playerplus/init.lua @@ -113,37 +113,6 @@ end local node_stand, node_stand_below, node_head, node_feet - -minetest.register_on_punchplayer(function(player, hitter, damage) - if hitter:is_player() then - if hitter:get_player_control().aux1 then - player:add_velocity(hitter:get_velocity()) - end - if hitter:get_velocity().y < -6 then - player:set_hp(player:get_hp() - (damage * math.random(0.50 , 0.75))) - local pos = player:get_pos() - minetest.add_particlespawner({ - amount = 15, - time = 0.1, - minpos = {x=pos.x-0.5, y=pos.y-0.5, z=pos.z-0.5}, - maxpos = {x=pos.x+0.5, y=pos.y+0.5, z=pos.z+0.5}, - minvel = {x=-0.1, y=-0.1, z=-0.1}, - maxvel = {x=0.1, y=0.1, z=0.1}, - minacc = {x=0, y=0, z=0}, - maxacc = {x=0, y=0, z=0}, - minexptime = 1, - maxexptime = 2, - minsize = 1.5, - maxsize = 1.5, - collisiondetection = false, - vertical = false, - texture = "mcl_particles_crit.png^[colorize:#bc7a57:127", - }) - end - end -end) - - minetest.register_globalstep(function(dtime) time = time + dtime