mff/boost_cart
1
0
Fork 0
forked from mtcontrib/boost_cart
Code Issues Pull Requests Releases Wiki Activity

Lowered chance to get stuck

Browse Source
This commit is contained in:
SmallJoker 2014-08-07 09:54:25 +02:00
parent fa2f2cb71c
commit c106499bd5
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
init.lua
View File

@ -69,7 +69,7 @@ function boost_cart.cart:on_punch(puncher, time_from_last_punch, tool_capabiliti
local vel = self.velocity local vel = self.velocity
if puncher:get_player_name() == self.driver then if puncher:get_player_name() == self.driver then
if math.abs(vel.x) + math.abs(vel.z) > 6 then if math.abs(vel.x) + math.abs(vel.z) > 4 then
return return
end end
end end
@ -111,6 +111,7 @@ function boost_cart.cart:on_step(dtime)
return return
end end
local dir = false
local pos = self.object:getpos() local pos = self.object:getpos()
if self.old_pos and not self.punch then if self.old_pos and not self.punch then
local flo_pos = vector.floor(pos) local flo_pos = vector.floor(pos)
@ -118,25 +119,45 @@ function boost_cart.cart:on_step(dtime)
if vector.equals(flo_pos, flo_old) then if vector.equals(flo_pos, flo_old) then
return return
end end
end
if self.old_pos then
local diff = vector.subtract(self.old_pos, pos) local diff = vector.subtract(self.old_pos, pos)
for _,v in ipairs({"x","y","z"}) do for _,v in ipairs({"x","y","z"}) do
if math.abs(diff[v]) > 1.4 then if math.abs(diff[v]) > 1.2 then
pos = vector.add(self.old_pos, self.old_dir) local expected_pos = vector.add(self.old_pos, self.old_dir)
dir = boost_cart:get_rail_direction(pos, self.old_dir)
if vector.equals(dir, {x=0, y=0, z=0}) then
dir = false
pos = vector.new(expected_pos)
self.punch = true self.punch = true
--minetest.log("action", "Cart moving too fast at "..minetest.pos_to_string(pos)) --else
-- pos = vector.add(self.old_pos, self.old_dir)
end
--minetest.log("action", "Cart moving too fast at "..minetest.pos_to_string(expected_pos))
break break
end end
end end
end end
local ro_vel = vector.round(vel)
if vel.y == 0 then
for _,v in ipairs({"x", "z"}) do
if vel[v] ~= 0 and math.abs(vel[v]) < 0.9 then
vel[v] = 0
self.punch = true
end
end
end
local cart_dir = { local cart_dir = {
x = boost_cart:get_sign(ro_vel.x), x = boost_cart:get_sign(vel.x),
y = boost_cart:get_sign(ro_vel.y), y = boost_cart:get_sign(vel.y),
z = boost_cart:get_sign(ro_vel.z) z = boost_cart:get_sign(vel.z)
} }
local max_vel = boost_cart.speed_max local max_vel = boost_cart.speed_max
local dir = boost_cart:get_rail_direction(pos, cart_dir) if not dir then
dir = boost_cart:get_rail_direction(pos, cart_dir)
end
if vector.equals(dir, {x=0, y=0, z=0}) then if vector.equals(dir, {x=0, y=0, z=0}) then
vel = {x=0, y=0, z=0} vel = {x=0, y=0, z=0}
self.object:setacceleration({x=0, y=0, z=0}) self.object:setacceleration({x=0, y=0, z=0})