mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-08-22 09:57:25 +02:00
Several improvements to the Shield
changes: 1. removed the limitation to block while pointing a node wielding an item 2. check whether the player is pointing to a node defined with right-click Formspec (to avoid the formspec bug while blocking) and whether the player is wielding a node (to avoid continous node placing not functioning) before blocking 3. decreased the interval between right click and block
This commit is contained in:
parent
3b1c55c234
commit
50fda3e844
@ -251,6 +251,15 @@ local function remove_shield_entity(player, i)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local function is_node_stack(itemstack)
|
||||||
|
return itemstack:get_definition().drawtype -- only node's definition table contains element "drawtype"
|
||||||
|
end
|
||||||
|
|
||||||
|
local function is_rmb_conflicting_node(nodename)
|
||||||
|
nodedef = minetest.registered_nodes[nodename]
|
||||||
|
return nodedef.on_rightclick
|
||||||
|
end
|
||||||
|
|
||||||
local function handle_blocking(player)
|
local function handle_blocking(player)
|
||||||
local player_shield = mcl_shields.players[player]
|
local player_shield = mcl_shields.players[player]
|
||||||
local rmb = player:get_player_control().RMB
|
local rmb = player:get_player_control().RMB
|
||||||
@ -266,7 +275,7 @@ local function handle_blocking(player)
|
|||||||
local pos = player:get_pos()
|
local pos = player:get_pos()
|
||||||
if shield_in_hand then
|
if shield_in_hand then
|
||||||
if not_blocking then
|
if not_blocking then
|
||||||
minetest.after(0.25, function()
|
minetest.after(0.05, function()
|
||||||
if (not_blocking or not shield_in_offhand) and shield_in_hand and rmb then
|
if (not_blocking or not shield_in_offhand) and shield_in_hand and rmb then
|
||||||
player_shield.blocking = 2
|
player_shield.blocking = 2
|
||||||
set_shield(player, true, 2)
|
set_shield(player, true, 2)
|
||||||
@ -277,11 +286,16 @@ local function handle_blocking(player)
|
|||||||
end
|
end
|
||||||
elseif shield_in_offhand then
|
elseif shield_in_offhand then
|
||||||
local pointed_thing = mcl_util.get_pointed_thing(player, true)
|
local pointed_thing = mcl_util.get_pointed_thing(player, true)
|
||||||
local offhand_can_block = (wielded_item(player) == "" or not pointed_thing)
|
local wielded_stack = player:get_wielded_item()
|
||||||
and (minetest.get_item_group(wielded_item(player), "bow") ~= 1 and minetest.get_item_group(wielded_item(player), "crossbow") ~= 1)
|
local offhand_can_block = (minetest.get_item_group(wielded_item(player), "bow") ~= 1
|
||||||
|
and minetest.get_item_group(wielded_item(player), "crossbow") ~= 1)
|
||||||
|
|
||||||
if pointed_thing and pointed_thing.type == "node" then
|
if pointed_thing and pointed_thing.type == "node" then
|
||||||
if minetest.get_item_group(minetest.get_node(pointed_thing.under).name, "container") > 1 then
|
local pointed_node = minetest.get_node(pointed_thing.under)
|
||||||
|
if minetest.get_item_group(pointed_node.name, "container") > 1
|
||||||
|
or is_rmb_conflicting_node(pointed_node.name)
|
||||||
|
or is_node_stack(wielded_stack)
|
||||||
|
then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -290,7 +304,7 @@ local function handle_blocking(player)
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
if not_blocking then
|
if not_blocking then
|
||||||
minetest.after(0.25, function()
|
minetest.after(0.05, function()
|
||||||
if (not_blocking or not shield_in_hand) and shield_in_offhand and rmb and offhand_can_block then
|
if (not_blocking or not shield_in_hand) and shield_in_offhand and rmb and offhand_can_block then
|
||||||
player_shield.blocking = 1
|
player_shield.blocking = 1
|
||||||
set_shield(player, true, 1)
|
set_shield(player, true, 1)
|
||||||
|
Loading…
Reference in New Issue
Block a user