mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2025-01-07 07:39:32 +01:00
Actually working spear aiming animation
This commit is contained in:
parent
9cd807d5c5
commit
bd7524d712
2 changed files with 7 additions and 3 deletions
|
@ -14,6 +14,7 @@ local function get_mouse_button(player)
|
|||
local get_wielded_item_name = player:get_wielded_item():get_name()
|
||||
if controls.RMB and not string.find(get_wielded_item_name, "mcl_bows:bow") and
|
||||
not string.find(get_wielded_item_name, "mcl_bows:crossbow") and
|
||||
core.get_item_group(get_wielded_item_name, "spear") == 0 and
|
||||
not mcl_shields.wielding_shield(player, 1) and not mcl_shields.wielding_shield(player, 2) or controls.LMB then
|
||||
return true
|
||||
else
|
||||
|
@ -263,7 +264,8 @@ minetest.register_globalstep(function(dtime)
|
|||
local wielded_itemname = player:get_wielded_item():get_name()
|
||||
local no_arm_moving = string.find(wielded_itemname, "mcl_bows:bow") or
|
||||
mcl_shields.wielding_shield(player, 1) or
|
||||
mcl_shields.wielding_shield(player, 2)
|
||||
mcl_shields.wielding_shield(player, 2) or
|
||||
core.get_item_group(wielded_itemname, "spear") > 0
|
||||
if player_sneak[name] ~= controls.sneak then
|
||||
player_anim[name] = nil
|
||||
player_sneak[name] = controls.sneak
|
||||
|
|
|
@ -284,7 +284,9 @@ minetest.register_globalstep(function(dtime)
|
|||
playerphysics.remove_physics_factor(player, "gravity", "mcl_playerplus:elytra")
|
||||
end
|
||||
|
||||
if wielded_def and wielded_def._mcl_toollike_wield then
|
||||
if control.RMB and core.get_item_group(wielded:get_name(), "spear") > 0 then
|
||||
set_bone_pos(player, "Wield_Item", vector.new(0, 5.2, 1.2), vector.new(-1.57, 5.7, 1.57))
|
||||
elseif wielded_def and wielded_def._mcl_toollike_wield then
|
||||
set_bone_pos(player, "Wield_Item", vector.new(0, 4.7, 3.1), vector.new(-1.57, 3.93, 1.57))
|
||||
elseif string.find(wielded:get_name(), "mcl_bows:bow") then
|
||||
set_bone_pos(player, "Wield_Item", vector.new(1, 4, 0), vector.new(1.57, 2.27, 2.01))
|
||||
|
@ -316,7 +318,7 @@ minetest.register_globalstep(function(dtime)
|
|||
set_bone_pos(player, "Arm_Left_Pitch_Control", nil, left_arm_rot)
|
||||
-- controls arm for spear throwing
|
||||
elseif core.get_item_group(wielded:get_name(), "spear") > 0 and control.RMB then
|
||||
local right_arm_rot = vector.new(pitch + 1.57, 0, pitch * -1 * .35)
|
||||
local right_arm_rot = vector.new(pitch + 1.8, 0, pitch * -1 * .35)
|
||||
set_bone_pos(player, "Arm_Right_Pitch_Control", nil, right_arm_rot)
|
||||
-- controls right and left arms pitch when loading a crossbow
|
||||
elseif string.find(wielded:get_name(), "mcl_bows:crossbow_") then
|
||||
|
|
Loading…
Reference in a new issue