MultiCraft/MultiCraft_game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Exit the boat and cart with a jump, cleanup furniture mod

Browse Source
This commit is contained in:
MoNTE48 2019-08-22 12:57:43 +02:00
parent c49bd7747b
commit 813a1f05d0
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
files/boats/init.lua
View File

@ -185,7 +185,7 @@ function boat.on_step(self, dtime)
elseif ctrl.up or self.auto then
self.v = self.v + dtime * 2.0
end
if ctrl.left then
if ctrl.left then
if self.v < -0.001 then
self.object:set_yaw(self.object:get_yaw() - dtime * 0.9)
else
@ -198,6 +198,16 @@ function boat.on_step(self, dtime)
self.object:set_yaw(self.object:get_yaw() - dtime * 0.9)
end
end
if ctrl.jump then
player_api.player_attached[self.driver] = false
driver_objref:set_detach()
player_api.set_animation(driver_objref, "stand" , 30)
local pos = driver_objref:get_pos()
pos = {x = pos.x, y = pos.y + 0.2, z = pos.z}
minetest.after(0.1, after_detach, self.driver, pos)
self.driver = nil
self.auto = false
end
else
-- If driver leaves server while driving 'driver' is present
-- but driver objectref is nil. Reset boat properties.
@ -265,7 +275,7 @@ function boat.on_step(self, dtime)
self.object:set_velocity(new_velo)
self.object:set_acceleration(new_acce)
-- if boat comes to sudden stop then destroy boat and drop 3x wood
-- if boat comes to sudden stop, drop it
if (self.v2 or 0) - self.v >= 3 then
if self.driver then
@ -278,7 +288,7 @@ function boat.on_step(self, dtime)
--print ("Crash! no driver")
end
minetest.add_item(self.object:get_pos(), "default:wood 3")
minetest.add_item(self.object:get_pos(), "boats:boat")
self.object:remove()
return
end
@ -337,12 +347,12 @@ minetest.register_craft({
recipe = {
{"", "", ""},
{"group:wood", "", "group:wood"},
{"group:wood", "group:wood", "group:wood"},
},
{"group:wood", "group:wood", "group:wood"}
}
})
minetest.register_craft({
type = "fuel",
recipe = "boats:boat",
burntime = 20,
burntime = 20
})

29
files/carts/cart_entity.lua
View File

@ -176,7 +176,6 @@ end
local v3_len = vector.length
local function rail_on_step(self, dtime)
-- Drop cart if there is no player or items inside.
if not self.driver and #self.attached_items == 0 then
local drop_timer = 300 -- 5 min
@ -195,6 +194,21 @@ local function rail_on_step(self, dtime)
else
self.age = 0
end
local ctrl, player
-- Get player controls
if self.driver then
player = minetest.get_player_by_name(self.driver)
if player then
ctrl = player:get_player_control()
end
end
if ctrl and ctrl.jump then
self.driver = nil
carts:manage_attachment(player, nil)
end
local vel = self.object:get_velocity()
if self.punched then
@ -219,17 +233,8 @@ local function rail_on_step(self, dtime)
end
end
local ctrl, player
local distance = 1
-- Get player controls
if self.driver then
player = minetest.get_player_by_name(self.driver)
if player then
ctrl = player:get_player_control()
end
end
local stop_wiggle = false
if self.old_pos and same_dir then
-- Detection for "skipping" nodes (perhaps use average dtime?)
@ -470,6 +475,6 @@ minetest.register_craft({
output = "carts:cart",
recipe = {
{"default:steel_ingot", "", "default:steel_ingot"},
{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
},
{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}
}
})