better merge item effect (thx mc2)
This commit is contained in:
parent
b9a2e51211
commit
428613a1a6
11
init.lua
11
init.lua
@ -267,10 +267,12 @@ core.register_entity(":__builtin:item", {
|
||||
|
||||
-- Merge the remote stack into this one
|
||||
local pos = object:get_pos()
|
||||
local self_pos = self.object:get_pos()
|
||||
local x_diff = (self_pos.x - pos.x) / 2
|
||||
local z_diff = (self_pos.z - pos.z) / 2
|
||||
local new_pos = vector.offset(pos, x_diff, 0, z_diff)
|
||||
|
||||
pos.y = pos.y + ((total_count - count) / max_count) * 0.15
|
||||
|
||||
self.object:move_to(pos)
|
||||
self.object:move_to(new_pos)
|
||||
self.age = 0 -- Reset age
|
||||
|
||||
-- Merge velocities
|
||||
@ -576,8 +578,7 @@ core.register_entity(":__builtin:item", {
|
||||
local vel = self.object:get_velocity()
|
||||
|
||||
-- apply air drag
|
||||
if self.falling_state
|
||||
or (self.slippery_state and not self.waterflow_state) then
|
||||
if self.falling_state or (self.slippery_state and not self.waterflow_state) then
|
||||
self.accel.x = self.accel.x - vel.x * air_drag
|
||||
self.accel.z = self.accel.z - vel.z * air_drag
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user