Michieal
/
MineClone2
mirror of https://git.minetest.land/MineClone2/MineClone2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'Make boats unsinkable in river water' (#2510) from riverwater_boats into master 

Reviewed-on: MineClone2/MineClone2#2510
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
This commit is contained in:
cora 2022-08-01 09:46:30 +00:00
parent 2d97817991 eb7171fd51
commit a687d9069c
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mods/ENTITIES/mcl_boats/init.lua
View File

@ -13,6 +13,12 @@ local function is_group(pos, group)
end end
local is_water = flowlib.is_water local is_water = flowlib.is_water
local function is_river_water(p)
local n = minetest.get_node(p).name
if n == "mclx_core:river_water_source" or n == "mclx_core:river_water_flowing" then
return true
end
end
local function is_ice(pos) local function is_ice(pos)
return is_group(pos, "ice") return is_group(pos, "ice")
@ -204,6 +210,7 @@ function boat.on_step(self, dtime, moveresult)
local on_water = true local on_water = true
local on_ice = false local on_ice = false
local in_water = is_water({x=p.x, y=p.y-boat_y_offset+1, z=p.z}) local in_water = is_water({x=p.x, y=p.y-boat_y_offset+1, z=p.z})
local in_river_water = is_river_water({x=p.x, y=p.y-boat_y_offset+1, z=p.z})
local waterp = {x=p.x, y=p.y-boat_y_offset - 0.1, z=p.z} local waterp = {x=p.x, y=p.y-boat_y_offset - 0.1, z=p.z}
if not is_water(waterp) then if not is_water(waterp) then
on_water = false on_water = false
@ -213,7 +220,7 @@ function boat.on_step(self, dtime, moveresult)
v_slowdown = 0.04 v_slowdown = 0.04
v_factor = 0.5 v_factor = 0.5
end end
elseif in_water then elseif in_water and not in_river_water then
on_water = false on_water = false
in_water = true in_water = true
v_factor = 0.75 v_factor = 0.75
@ -345,7 +352,18 @@ function boat.on_step(self, dtime, moveresult)
else else
p.y = p.y + 1 p.y = p.y + 1
local is_obsidian_boat = self.object:get_luaentity()._itemstring == "mcl_boats:boat_obsidian" local is_obsidian_boat = self.object:get_luaentity()._itemstring == "mcl_boats:boat_obsidian"
if is_water(p) or is_obsidian_boat then if is_river_water(p) then
local y = self.object:get_velocity().y
if y >= 5 then
y = 5
elseif y < 0 then
new_acce = {x = 0, y = 10, z = 0}
else
new_acce = {x = 0, y = 2, z = 0}
end
new_velo = get_velocity(self._v, self.object:get_yaw(), y)
self.object:set_pos(self.object:get_pos())
elseif is_water(p) and not is_river_water(p) or is_obsidian_boat then
-- Inside water: Slowly sink -- Inside water: Slowly sink
local y = self.object:get_velocity().y local y = self.object:get_velocity().y
y = y - 0.01 y = y - 0.01