mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-26 12:31:05 +01:00
Boats: Can place properly at all sides
This commit is contained in:
parent
b6c3cc0ed7
commit
df7acfc8ae
1 changed files with 11 additions and 5 deletions
|
@ -35,6 +35,7 @@ local driver_visual_size = { x = 1/boat_visual_size.x, y = 1/boat_visual_size.y
|
||||||
local paddling_speed = 22
|
local paddling_speed = 22
|
||||||
local boat_y_offset = 0.35
|
local boat_y_offset = 0.35
|
||||||
local boat_y_offset_ground = boat_y_offset + 0.6
|
local boat_y_offset_ground = boat_y_offset + 0.6
|
||||||
|
local boat_side_offset = 1.001
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Boat entity
|
-- Boat entity
|
||||||
|
@ -298,7 +299,7 @@ for b=1, #boat_ids do
|
||||||
stack_max = 1,
|
stack_max = 1,
|
||||||
on_place = function(itemstack, placer, pointed_thing)
|
on_place = function(itemstack, placer, pointed_thing)
|
||||||
if pointed_thing.type ~= "node" then
|
if pointed_thing.type ~= "node" then
|
||||||
return
|
return itemstack
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Call on_rightclick if the pointed node defines it
|
-- Call on_rightclick if the pointed node defines it
|
||||||
|
@ -309,12 +310,17 @@ for b=1, #boat_ids do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if is_water(pointed_thing.under) then
|
local pos = table.copy(pointed_thing.under)
|
||||||
pointed_thing.under.y = pointed_thing.under.y + boat_y_offset
|
local dir = vector.subtract(pointed_thing.above, pointed_thing.under)
|
||||||
|
|
||||||
|
if math.abs(dir.x) > 0.9 or math.abs(dir.z) > 0.9 then
|
||||||
|
pos = vector.add(pos, vector.multiply(dir, boat_side_offset))
|
||||||
|
elseif is_water(pos) then
|
||||||
|
pos = vector.add(pos, vector.multiply(dir, boat_y_offset))
|
||||||
else
|
else
|
||||||
pointed_thing.under.y = pointed_thing.under.y + boat_y_offset_ground
|
pos = vector.add(pos, vector.multiply(dir, boat_y_offset_ground))
|
||||||
end
|
end
|
||||||
local boat = minetest.add_entity(pointed_thing.under, "mcl_boats:boat")
|
local boat = minetest.add_entity(pos, "mcl_boats:boat")
|
||||||
boat:get_luaentity()._itemstring = itemstring
|
boat:get_luaentity()._itemstring = itemstring
|
||||||
boat:set_properties({textures = { "mcl_boats_texture_"..images[b].."_boat.png" }})
|
boat:set_properties({textures = { "mcl_boats_texture_"..images[b].."_boat.png" }})
|
||||||
boat:set_yaw(placer:get_look_horizontal())
|
boat:set_yaw(placer:get_look_horizontal())
|
||||||
|
|
Loading…
Reference in a new issue