Mirrorlandia_minetest/boost_cart
1
0
Fork 0
mirror of https://github.com/SmallJoker/boost_cart.git synced 2024-11-24 07:33:44 +01:00
Code Issues Projects Releases Wiki Activity

I hopeit's fixed now.

Browse Source
This commit is contained in:
SmallJoker 2014-08-01 17:45:07 +02:00
parent 007037c633
commit 4652679f7d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
init.lua
View File

@ -95,7 +95,7 @@ function boost_cart.cart:on_punch(puncher, time_from_last_punch, tool_capabiliti
end end
local dir = boost_cart:get_rail_direction(self.object:getpos(), cart_dir) local dir = boost_cart:get_rail_direction(self.object:getpos(), cart_dir)
local f = 3 * (time_from_last_punch / tool_capabilities.full_punch_interval) local f = 4 * (time_from_last_punch / tool_capabilities.full_punch_interval)
vel.x = dir.x * f vel.x = dir.x * f
vel.y = dir.y * f vel.y = dir.y * f
vel.z = dir.z * f vel.z = dir.z * f
@ -109,31 +109,31 @@ function boost_cart.cart:on_step(dtime)
if self.punch then if self.punch then
vel = vector.add(vel, self.velocity) vel = vector.add(vel, self.velocity)
self.velocity = {x=0, y=0, z=0} self.velocity = {x=0, y=0, z=0}
for _,v in ipairs({"x","y","z"}) do
if math.abs(vel[v]) > boost_cart.speed_max then
vel[v] = boost_cart:get_sign(vel[v]) * boost_cart.speed_max
end
end
elseif vector.equals(vel, {x=0, y=0, z=0}) then elseif vector.equals(vel, {x=0, y=0, z=0}) then
return return
end end
local pos = self.object:getpos() local pos = self.object:getpos()
local flo_pos = vector.floor(pos)
if self.old_pos and not self.punch then if self.old_pos and not self.punch then
if vector.equals(flo_pos, self.old_pos) then local flo_pos = vector.floor(pos)
local flo_old = vector.floor(self.old_pos)
if vector.equals(flo_pos, flo_old) then
return return
end end
local expected_pos = vector.add(self.old_pos, self.old_dir) local expected_pos = vector.add(self.old_pos, self.old_dir)
local diff = vector.subtract(pos, expected_pos) local diff = vector.subtract(expected_pos, pos)
diff = { diff = {
x = math.abs(diff.x), x = math.abs(diff.x),
y = math.abs(diff.y), y = math.abs(diff.y),
z = math.abs(diff.z) z = math.abs(diff.z)
} }
if diff.x > 1 or diff.y > 1 or diff.z > 1 then print(minetest.pos_to_string(diff))
pos = vector.new(self.old_pos) if diff.x > math.abs(self.old_dir.x) or
diff.y > math.abs(self.old_dir.y) or
diff.z > math.abs(self.old_dir.z) then
pos = vector.new(expected_pos)
minetest.log("action", "Cart moving too fast at "..minetest.pos_to_string(pos))
self.punch = true self.punch = true
end end
end end
@ -181,7 +181,7 @@ function boost_cart.cart:on_step(dtime)
self.object:setacceleration(new_acc) self.object:setacceleration(new_acc)
end end
self.old_pos = vector.floor(pos) self.old_pos = vector.new(pos)
self.old_dir = vector.new(dir) self.old_dir = vector.new(dir)
-- Limits -- Limits