zughy-friends-minetest/block_league-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent zoom whilst reloading or whilst waiting to respawn (fixes #88)

Browse Source
This commit is contained in:
Zughy 2023-06-22 10:29:38 +02:00
parent dd8f736c2c
commit b4de6bb19b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/weapons/weapons.lua
View File

@ -373,6 +373,8 @@ end
-- TODO: per held e charged, weapon_state dovrebbe essere 2 dall'inizio. Nell'if
-- can_use delle due funzioni azzerare weapon_state se false
function wait_for_held_action(weapon, held_key, player, countdown) function wait_for_held_action(weapon, held_key, player, countdown)
minetest.after(0.1, function() minetest.after(0.1, function()
if not can_use_weapon(player, weapon, {}) then return end if not can_use_weapon(player, weapon, {}) then return end
@ -417,10 +419,17 @@ function can_use_weapon(player, weapon, action)
if not arena_lib.is_player_in_arena(p_name) or player:get_hp() <= 0 then return end if not arena_lib.is_player_in_arena(p_name) or player:get_hp() <= 0 then return end
if action.type == "zoom" then return true end local p_meta = player:get_meta()
if action.type == "zoom" then
if p_meta:get_int("bl_weapon_state") == 4 or
p_meta:get_int("bl_death_delay") == 1 then
return
else return true end
end
local arena = arena_lib.get_arena_by_player(p_name) local arena = arena_lib.get_arena_by_player(p_name)
local p_meta = player:get_meta()
local w_magazine = arena.players[p_name].weapons_magazine[weapon.name] local w_magazine = arena.players[p_name].weapons_magazine[weapon.name]
if p_meta:get_int("bl_weapon_state") ~= 0 or if p_meta:get_int("bl_weapon_state") ~= 0 or