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

Add sword group to sword damage_groups (#879)

Browse source 
* Add sword marker to damage_groups

* Update init.lua

Co-authored-by: LoneWolfHT <lonewolf04361@gmail.com>
This commit is contained in:
savilli 2021-05-08 17:49:53 +02:00 committed by GitHub
parent 0f5f921c0d
commit 69d5c40c73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@ minetest.register_tool("ctf_classes:sword_bronze", {
groupcaps={ groupcaps={
snappy={times={[1]=2.5, [2]=1.20, [3]=0.35}, uses=0, maxlevel=2}, snappy={times={[1]=2.5, [2]=1.20, [3]=0.35}, uses=0, maxlevel=2},
}, },
damage_groups = {fleshy=6}, damage_groups = {fleshy=6, sword=1},
punch_attack_uses = 0, punch_attack_uses = 0,
}, },
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"},

2
mods/ctf/ctf_events/init.lua
View file

@ -124,7 +124,7 @@ ctf.register_on_killedplayer(function(victim, killer, stack, tool_caps)
local victim_color = ctf_colors.get_color(ctf.player(victim)) local victim_color = ctf_colors.get_color(ctf.player(victim))
local killer_color = ctf_colors.get_color(ctf.player(killer)) local killer_color = ctf_colors.get_color(ctf.player(killer))
local type = "sword" local type = "sword" -- Also used for unknown attacks
if tool_caps.damage_groups.grenade then if tool_caps.damage_groups.grenade then
type = "grenade" type = "grenade"

BIN
mods/ctf/ctf_events/textures/ctf_events_kill_unknown.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 161 B

10
mods/mtg/default/tools.lua
View file

@ -257,7 +257,7 @@ minetest.register_tool("default:sword_stone", {
groupcaps={ groupcaps={
snappy={times={[2]=1.4, [3]=0.40}, uses=20, maxlevel=1}, snappy={times={[2]=1.4, [3]=0.40}, uses=20, maxlevel=1},
}, },
damage_groups = {fleshy=4}, damage_groups = {fleshy=4, sword=1},
}, },
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"},
}) })
@ -271,7 +271,7 @@ minetest.register_tool("default:sword_bronze", {
groupcaps={ groupcaps={
snappy={times={[1]=2.75, [2]=1.30, [3]=0.375}, uses=25, maxlevel=2}, snappy={times={[1]=2.75, [2]=1.30, [3]=0.375}, uses=25, maxlevel=2},
}, },
damage_groups = {fleshy=6}, damage_groups = {fleshy=6, sword=1},
}, },
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"},
}) })
@ -285,7 +285,7 @@ minetest.register_tool("default:sword_steel", {
groupcaps={ groupcaps={
snappy={times={[1]=2.5, [2]=1.20, [3]=0.35}, uses=30, maxlevel=2}, snappy={times={[1]=2.5, [2]=1.20, [3]=0.35}, uses=30, maxlevel=2},
}, },
damage_groups = {fleshy=6}, damage_groups = {fleshy=6, sword=1},
}, },
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"},
}) })
@ -299,7 +299,7 @@ minetest.register_tool("default:sword_mese", {
groupcaps={ groupcaps={
snappy={times={[1]=2.0, [2]=1.00, [3]=0.35}, uses=30, maxlevel=3}, snappy={times={[1]=2.0, [2]=1.00, [3]=0.35}, uses=30, maxlevel=3},
}, },
damage_groups = {fleshy=7}, damage_groups = {fleshy=7, sword=1},
}, },
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"},
}) })
@ -313,7 +313,7 @@ minetest.register_tool("default:sword_diamond", {
groupcaps={ groupcaps={
snappy={times={[1]=1.90, [2]=0.90, [3]=0.30}, uses=40, maxlevel=3}, snappy={times={[1]=1.90, [2]=0.90, [3]=0.30}, uses=40, maxlevel=3},
}, },
damage_groups = {fleshy=8}, damage_groups = {fleshy=8, sword=1},
}, },
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"},
}) })