From ae0b967001b64f704c903810f5aa17aa08ec316b Mon Sep 17 00:00:00 2001 From: LoneWolfHT Date: Sat, 31 Oct 2020 09:44:50 -0700 Subject: [PATCH] Slightly buff shooter class and knight melee dmg --- mods/ctf/ctf_classes/classes.lua | 2 +- mods/ctf/ctf_classes/melee.lua | 6 ++++-- mods/pvp/shooter | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mods/ctf/ctf_classes/classes.lua b/mods/ctf/ctf_classes/classes.lua index c8332e4..480c6ed 100644 --- a/mods/ctf/ctf_classes/classes.lua +++ b/mods/ctf/ctf_classes/classes.lua @@ -28,7 +28,7 @@ ctf_classes.register("shooter", { color = "#c60", properties = { allow_grapples = true, - max_hp = 15, + max_hp = 16, initial_stuff = { "shooter_guns:rifle_loaded", diff --git a/mods/ctf/ctf_classes/melee.lua b/mods/ctf/ctf_classes/melee.lua index 2fd523c..914f932 100644 --- a/mods/ctf/ctf_classes/melee.lua +++ b/mods/ctf/ctf_classes/melee.lua @@ -3,8 +3,10 @@ minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, local class = ctf_classes.get(hitter) if class.properties.melee_bonus and hitter:get_wielded_item():get_name():find("sword") then - if time_from_last_punch > 0.75 then - time_from_last_punch = 0.75 + if time_from_last_punch > 1 then + time_from_last_punch = 1 + elseif time_from_last_punch < 0.5 then + time_from_last_punch = 0.5 end player:punch(hitter, 1, {damage_groups = {fleshy = time_from_last_punch*2, nopunch = 1}}, dir) diff --git a/mods/pvp/shooter b/mods/pvp/shooter index e58d27d..f74ea4e 160000 --- a/mods/pvp/shooter +++ b/mods/pvp/shooter @@ -1 +1 @@ -Subproject commit e58d27dd79b17971e009dc6e474b7ceefd71d17d +Subproject commit f74ea4e0be201c2b5837122fe73852375e19f5cc