diff --git a/res/content/base/modules/util.lua b/res/content/base/modules/util.lua index 57bc6ccb6..6d5a77705 100644 --- a/res/content/base/modules/util.lua +++ b/res/content/base/modules/util.lua @@ -2,6 +2,30 @@ local util = {} local DROP_FORCE = 8 local DROP_INIT_VEL = { 0, 3, 0 } +local DROP_MAX_ITEM_DIR_SHIFT_DEGREES = 65 + +local function calculate_item_drop_dir(pid) + local yaw, pitch = player.get_rot(pid) + local vp = gui.get_viewport() + local mpos = table.map(input.get_mouse_pos(), function(i, v) + return v / vp[i] - 0.5 + end) + if not hud.is_inventory_open() and not hud.is_player_inventory_open() then + mpos = { 0, 0 } + end + + local q_yaw = quat.from_euler({ 0, yaw, 0 }) + local q_pitch = quat.from_euler({ pitch, 0, 0 }) + local q_rotation = quat.mul(q_yaw, q_pitch) + + local q_shift = quat.from_euler({ + -mpos[2] * DROP_MAX_ITEM_DIR_SHIFT_DEGREES * 2, + -mpos[1] * DROP_MAX_ITEM_DIR_SHIFT_DEGREES * 2, + 0, + }) + quat.mul(q_rotation, q_shift, q_rotation) + return quat.mul_vec3(q_rotation, { 0, 0, -1 }) +end --- Create a drop from slot, set it velocity, and return it ---@param mode integer 0 - whole stack, 1 - single item, 2 - dupe whole stack @@ -31,7 +55,8 @@ function util.drop_from_slot(pid, invid, slot, mode) local data = inventory.get_all_data(invid, slot) local pvel = { player.get_vel(pid) } local ppos = vec3.add({ player.get_pos(pid) }, { 0, 0.7, 0 }) - local throw_force = vec3.mul(player.get_dir(pid), DROP_FORCE) + local dir = calculate_item_drop_dir(pid) + local throw_force = vec3.mul(dir, DROP_FORCE) local drop, err = util.drop(ppos, itemid, drop_itemcount, data, 1.5) if not drop then return nil, err