From 399ed8571725e34bbd361f744f2e3c2be56ca1ef Mon Sep 17 00:00:00 2001 From: epCode Date: Tue, 13 Apr 2021 16:14:37 -0700 Subject: [PATCH] Make flying w elytra use pitch and not sneak --- mods/PLAYER/mcl_playerplus/init.lua | 31 +++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua index b1b9946131..3084474f38 100644 --- a/mods/PLAYER/mcl_playerplus/init.lua +++ b/mods/PLAYER/mcl_playerplus/init.lua @@ -24,6 +24,7 @@ local mcl_playerplus_internal = {} local def = {} local time = 0 +local look_pitch = 0 local player_collision = function(player) @@ -194,18 +195,27 @@ minetest.register_globalstep(function(dtime) player_vel_yaws[name] = player_vel_yaw if minetest.get_node_or_nil({x=player:get_pos().x, y=player:get_pos().y - 0.5, z=player:get_pos().z}) then - node_stand_return = minetest.get_node_or_nil({x=player:get_pos().x, y=player:get_pos().y - 0.5, z=player:get_pos().z}).name + node_stand_return = minetest.get_node_or_nil({x=player:get_pos().x, y=player:get_pos().y - 0.1, z=player:get_pos().z}).name else minetest.log("action", "somehow player got of loaded areas") end controls.register_on_press(function(player, key) - if key~="jump" then return end - if player:get_inventory():get_stack("armor", 3):get_name() == "mcl_armor:elytra" and player_velocity.y < -6 and elytra[player] ~= true then - elytra[player] = true + if key~="jump" and key~="RMB" then return end + if key=="jump" then + if player:get_inventory():get_stack("armor", 3):get_name() == "mcl_armor:elytra" and player_velocity.y < -6 and elytra[player] ~= true then + elytra[player] = true + elseif key=="RMB" then + if wielded:get_name() == "mcl_tools:rocket" then + local item = wielded:take_item() + player:set_wielded_item(wielded) + end + end end end) + local chestplate = player:get_inventory():get_stack("armor", 3) + if elytra[player] == true and node_stand_return ~= "air" or elytra[player] == true and player:get_inventory():get_stack("armor", 3):get_name() ~= "mcl_armor:elytra" or player:get_attach() ~= nil then elytra[player] = false end @@ -216,6 +226,8 @@ minetest.register_globalstep(function(dtime) elytra[player] = false end]] + minetest.chat_send_all(degrees(player:get_look_vertical()) * -.01) + if elytra[player] == true then mcl_player.player_set_animation(player, "fly") playerphysics.add_physics_factor(player, "gravity", "mcl_playerplus:elytra", 0.1) @@ -224,13 +236,12 @@ minetest.register_globalstep(function(dtime) end if math.abs(player_velocity.x) + math.abs(player_velocity.z) < 20 then local dir = minetest.yaw_to_dir(player:get_look_horizontal()) - local pitch = 1 * player:get_look_vertical() * -.1 - player:add_velocity({x=dir.x, y=pitch, z=dir.z}) - end - if control.sneak then - if player_velocity.y > -5 then - player:add_velocity({x=0, y=-2, z=0}) + if degrees(player:get_look_vertical()) * -.01 < .1 then + look_pitch = degrees(player:get_look_vertical()) * -.01 + else + look_pitch = .1 end + player:add_velocity({x=dir.x, y=look_pitch, z=dir.z}) end else playerphysics.remove_physics_factor(player, "gravity", "mcl_playerplus:elytra")