1
0
Fork 0

Clean up and optimise falling

This commit is contained in:
ancientmarinerdev 2023-05-12 20:17:13 +01:00
parent 519b237ba8
commit 3d1fb8cf4a
1 changed files with 13 additions and 24 deletions

View File

@ -903,47 +903,36 @@ function mob_class:falling(pos)
-- floating in water (or falling) -- floating in water (or falling)
local v = self.object:get_velocity() local v = self.object:get_velocity()
if v then if v then
local new_acceleration
if v.y > 0 then if v.y > 0 then
-- apply gravity when moving up -- apply gravity when moving up
self.object:set_acceleration({ new_acceleration = vector.new(0, DEFAULT_FALL_SPEED, 0)
x = 0,
y = DEFAULT_FALL_SPEED,
z = 0
})
elseif v.y <= 0 and v.y > self.fall_speed then elseif v.y <= 0 and v.y > self.fall_speed then
-- fall downwards at set speed -- fall downwards at set speed
self.object:set_acceleration({ new_acceleration = vector.new(0, self.fall_speed, 0)
x = 0,
y = self.fall_speed,
z = 0
})
else else
-- stop accelerating once max fall speed hit -- stop accelerating once max fall speed hit
self.object:set_acceleration({x = 0, y = 0, z = 0}) new_acceleration =vector.zero()
end end
self.object:set_acceleration(new_acceleration)
end end
local acc = self.object:get_acceleration() local acc = self.object:get_acceleration()
if minetest.registered_nodes[node_ok(pos).name].groups.lava then local registered_node = minetest.registered_nodes[node_ok(pos).name]
if registered_node.groups.lava then
if acc and self.floats_on_lava == 1 then if acc and self.floats_on_lava == 1 then
self.object:set_acceleration({ self.object:set_acceleration(vector.new(0, -self.fall_speed / (math.max(1, v.y) ^ 2), 0))
x = 0,
y = -self.fall_speed / (math.max(1, v.y) ^ 2),
z = 0
})
end end
end end
-- in water then float up -- in water then float up
if minetest.registered_nodes[node_ok(pos).name].groups.water then if registered_node.groups.water then
if acc and self.floats == 1 then if acc and self.floats == 1 then
self.object:set_acceleration({ self.object:set_acceleration(vector.new(0, -self.fall_speed / (math.max(1, v.y) ^ 2), 0))
x = 0,
y = -self.fall_speed / (math.max(1, v.y) ^ 2),
z = 0
})
end end
else else
-- fall damage onto solid ground -- fall damage onto solid ground