Compare commits
6 commits
4b9298c530
...
1419e63743
Author | SHA1 | Date | |
---|---|---|---|
|
1419e63743 | ||
|
aa37d0375d | ||
|
55ab1b46e1 | ||
|
a993113194 | ||
|
c642f49d1a | ||
|
69d5c40c73 |
7 changed files with 13 additions and 11 deletions
|
@ -138,7 +138,7 @@ minetest.override_item("ctf_bandages:bandage", {
|
|||
|
||||
local diggers = {}
|
||||
local DIG_COOLDOWN = 30
|
||||
local DIG_DIST_LIMIT = 30
|
||||
local DIG_DIST_LIMIT = 50
|
||||
local DIG_SPEED = 0.1
|
||||
|
||||
local function isdiggable(name)
|
||||
|
|
|
@ -49,7 +49,7 @@ minetest.register_tool("ctf_classes:sword_bronze", {
|
|||
groupcaps={
|
||||
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,
|
||||
},
|
||||
sound = {breaks = "default_tool_breaks"},
|
||||
|
|
|
@ -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 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
|
||||
type = "grenade"
|
||||
|
|
BIN
mods/ctf/ctf_events/textures/ctf_events_kill_unknown.png
Normal file
BIN
mods/ctf/ctf_events/textures/ctf_events_kill_unknown.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 161 B |
|
@ -8,8 +8,7 @@ local RESPAWN_MESSAGE = "Respawning in "
|
|||
|
||||
minetest.register_on_dieplayer(function(player, reason)
|
||||
local pname = player:get_player_name()
|
||||
if ctf_match.is_in_build_time() or (reason.type == "punch" and reason.object and
|
||||
reason.object:is_player() and reason.object:get_player_name() == pname) then
|
||||
if ctf_match.is_in_build_time() or ctf_respawn_delay.players[pname] then -- what is dead may never die
|
||||
return
|
||||
end
|
||||
|
||||
|
|
|
@ -63,7 +63,10 @@ minetest.register_node("ctf_traps:damage_cobble", {
|
|||
if placerobj then
|
||||
digger:punch(placerobj, 10, {damage_groups = {fleshy = 7}}, vector.new(0, 1, 0))
|
||||
else
|
||||
digger:set_hp(digger:get_hp() - 7)
|
||||
local hp = digger:get_hp()
|
||||
if hp > 0 then
|
||||
digger:set_hp(hp - 7)
|
||||
end
|
||||
end
|
||||
|
||||
minetest.remove_node(pos)
|
||||
|
|
|
@ -257,7 +257,7 @@ minetest.register_tool("default:sword_stone", {
|
|||
groupcaps={
|
||||
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"},
|
||||
})
|
||||
|
@ -271,7 +271,7 @@ minetest.register_tool("default:sword_bronze", {
|
|||
groupcaps={
|
||||
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"},
|
||||
})
|
||||
|
@ -285,7 +285,7 @@ minetest.register_tool("default:sword_steel", {
|
|||
groupcaps={
|
||||
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"},
|
||||
})
|
||||
|
@ -299,7 +299,7 @@ minetest.register_tool("default:sword_mese", {
|
|||
groupcaps={
|
||||
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"},
|
||||
})
|
||||
|
@ -313,7 +313,7 @@ minetest.register_tool("default:sword_diamond", {
|
|||
groupcaps={
|
||||
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"},
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue