From 46394e7e1f82856c9c9de262857bb08c2d8ea820 Mon Sep 17 00:00:00 2001
From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Wed, 17 Nov 2021 18:03:45 +0100
Subject: [PATCH] Add obsidian boat that always sinks

---
 mods/ENTITIES/mcl_boats/init.lua                  |  11 ++++++-----
 .../textures/mcl_boats_obsidian_boat.png          | Bin 0 -> 264 bytes
 .../textures/mcl_boats_texture_obsidian_boat.png  | Bin 0 -> 535 bytes
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 mods/ENTITIES/mcl_boats/textures/mcl_boats_obsidian_boat.png
 create mode 100644 mods/ENTITIES/mcl_boats/textures/mcl_boats_texture_obsidian_boat.png

diff --git a/mods/ENTITIES/mcl_boats/init.lua b/mods/ENTITIES/mcl_boats/init.lua
index f46c14d46..beff5fb52 100644
--- a/mods/ENTITIES/mcl_boats/init.lua
+++ b/mods/ENTITIES/mcl_boats/init.lua
@@ -342,7 +342,8 @@ function boat.on_step(self, dtime, moveresult)
 			self.object:get_velocity().y)
 	else
 		p.y = p.y + 1
-		if is_water(p) then
+		local is_obsidian_boat = self.object:get_luaentity()._itemstring == "mcl_boats:boat_obsidian"
+		if is_water(p) or is_obsidian_boat then
 			-- Inside water: Slowly sink
 			local y = self.object:get_velocity().y
 			y = y - 0.01
@@ -382,13 +383,13 @@ end
 -- Register one entity for all boat types
 minetest.register_entity("mcl_boats:boat", boat)
 
-local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak" }
-local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat") }
+local boat_ids = { "boat", "boat_spruce", "boat_birch", "boat_jungle", "boat_acacia", "boat_dark_oak", "boat_obsidian" }
+local names = { S("Oak Boat"), S("Spruce Boat"), S("Birch Boat"), S("Jungle Boat"), S("Acacia Boat"), S("Dark Oak Boat"), S("Obsidian Boat") }
 local craftstuffs = {}
 if minetest.get_modpath("mcl_core") then
-	craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood" }
+	craftstuffs = { "mcl_core:wood", "mcl_core:sprucewood", "mcl_core:birchwood", "mcl_core:junglewood", "mcl_core:acaciawood", "mcl_core:darkwood", "mcl_core:obsidian" }
 end
-local images = { "oak", "spruce", "birch", "jungle", "acacia", "dark_oak" }
+local images = { "oak", "spruce", "birch", "jungle", "acacia", "dark_oak", "obsidian" }
 
 for b=1, #boat_ids do
 	local itemstring = "mcl_boats:"..boat_ids[b]
diff --git a/mods/ENTITIES/mcl_boats/textures/mcl_boats_obsidian_boat.png b/mods/ENTITIES/mcl_boats/textures/mcl_boats_obsidian_boat.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ae10c0c4b4dfd9e13a5008aa3a60c15d85b2930
GIT binary patch
literal 264
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmW!d_r7Vn7P<kcsbcc`1!;{
z`3%&hLQCW3Z|!{v5r+%v=;%Pi*Qb<uGB7Z3lmz(&GeE)i=Rpe@7#Qk3T^vI=WJM2d
z<YY3GV101?#`Df;?-DHhHVC{sASg1ukmK^xg^~{*IOycJ=_GX3Gq)T3v@3bO?q%VQ
z33qz3zpQyD&wk$P;KBE2rkr`uz3RHSx~b-&GgH>MoQb@Y-&yfo$yU_x<fbL;&s=*C
sFHy7b;ZoVo-1n$dMfO|7UA7B<8Pi)VqV~9HmxEm8>FVdQ&MBb@0P{jy^8f$<

literal 0
HcmV?d00001

diff --git a/mods/ENTITIES/mcl_boats/textures/mcl_boats_texture_obsidian_boat.png b/mods/ENTITIES/mcl_boats/textures/mcl_boats_texture_obsidian_boat.png
new file mode 100644
index 0000000000000000000000000000000000000000..af3c24b30e5fa0fa9937cf9f874aa43651924013
GIT binary patch
literal 535
zcmeAS@N?(olHy`uVBq!ia0y~yU}#`qU~phzW?*1Y_>ttpz`$S-;1lA?!pz0S!pq4n
z!p|or%4eW16<QiMe{1hcT;g&(bF3H`7&uCT{DK*vVEgl+g$xXgeV#6kArXh)Uf=6=
zI6>st$K#jz{DKySD{%P<RlIz1L(FPN)T0-+B^DQWWW9cK#5FB;Hfz^&I`JZ<J+47a
zX0Fu>m8(`uoPSN^$j@E5?Q*}$1jUDcEZ5K2tiaKvz_Y9P&5S0^xn(_utqZby43{N%
zP4-f|{{DOXw|Ti!134ZD#c%W4%=lngyW+Eo*XQ=j2RE!?PLYXbmH5^mdqa!in0Of%
zPlM6~1xb^#pC^_)pOC|MU>|d|E5n0z?Ai8CA|E+#XhpIsGThMmcHh3}kMw50rhThc
zt(yMjjv#}ode!`?MpAoDXE5B*ntAEu<=K`Nn@V5WW^6sJ5`R;wb>dqi_3D7xbBnLm
zxMr_f_4Cvr+Yh0$kFP3~|4?&vm;B#L5&Ra`&)-FTec=AznSakq%kNtSc0c=C`?&Fm
zQ1yYAmg!mYW*ga`mxisr+I>yvd-F}X2{t7+RZdRf`*W}Ez?RDAk8BG(C*|yNP&s+^
zn}hADS5xK7-&PBRhi{ZO$i27o?ZK>b+>dP?p5MMbPuwiUKH~T1L-H>Un#bQYRlT6u
Qa~Tv#p00i_>zopr058tt4FCWD

literal 0
HcmV?d00001