minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix some bugs with knight damage

Browse source
This commit is contained in:
LoneWolfHT 2020-11-08 09:08:14 -08:00
parent 536474adb4
commit d171436b46
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.luacheckrc
View file

@ -16,7 +16,7 @@ globals = {
"ctf_colors", "hudkit", "default", "treasurer", "ChatCmdBuilder", "ctf_map", "ctf_colors", "hudkit", "default", "treasurer", "ChatCmdBuilder", "ctf_map",
"ctf_match", "ctf_stats", "ctf_treasure", "ctf_playertag", "chatplus", "irc", "ctf_match", "ctf_stats", "ctf_treasure", "ctf_playertag", "chatplus", "irc",
"armor", "vote", "give_initial_stuff", "hud_score", "physics", "tsm_chests", "armor", "vote", "give_initial_stuff", "hud_score", "physics", "tsm_chests",
"armor", "shooter", "grenades", "ctf_classes", "ctf_bandages" "armor", "shooter", "grenades", "ctf_classes", "ctf_bandages", "ctf_respawn_immunity"
} }
read_globals = { read_globals = {

5
mods/ctf/ctf_classes/melee.lua
View file

@ -1,5 +1,7 @@
minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage) minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
if tool_capabilities.damage_groups.nopunch then return end if tool_capabilities.damage_groups.nopunch then return end
if ctf_respawn_immunity.is_immune(player) then return true end
local class = ctf_classes.get(hitter) local class = ctf_classes.get(hitter)
if class.properties.melee_bonus and hitter:get_wielded_item():get_name():find("sword") then if class.properties.melee_bonus and hitter:get_wielded_item():get_name():find("sword") then
@ -10,7 +12,10 @@ minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch,
end end
if hitter:get_hp() > 0 then if hitter:get_hp() > 0 then
player:set_hp(player:get_hp() - damage)
player:punch(hitter, 1, {damage_groups = {fleshy = time_from_last_punch*2, nopunch = 1}}, dir) player:punch(hitter, 1, {damage_groups = {fleshy = time_from_last_punch*2, nopunch = 1}}, dir)
return true
end end
end end
end) end)

2
mods/ctf/ctf_classes/mod.conf
View file

@ -1,3 +1,3 @@
name = ctf_classes name = ctf_classes
depends = ctf, ctf_flag, ctf_colors, ctf_map_core, ctf_stats, ctf_bandages, physics, shooter, hpregen, give_initial_stuff, dropondie, crafting, sniper_rifles, grenades, furnace depends = ctf, ctf_flag, ctf_colors, ctf_map_core, ctf_stats, ctf_bandages, physics, shooter, hpregen, give_initial_stuff, dropondie, crafting, sniper_rifles, grenades, furnace, ctf_respawn_immunity
description = Adds classes, including knight, shooter, and medic description = Adds classes, including knight, shooter, and medic