From 40e681a5665d4646d5e1cc553019f06984d30792 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 17 Dec 2019 22:43:35 +0100 Subject: [PATCH] Add kelp and related items --- mods/ITEMS/mcl_ocean/corals.lua | 2 +- mods/ITEMS/mcl_ocean/depends.txt | 1 + mods/ITEMS/mcl_ocean/init.lua | 3 + mods/ITEMS/mcl_ocean/kelp.lua | 185 ++++++++++++++++++ mods/ITEMS/mcl_ocean/seagrass.lua | 2 +- .../textures/mcl_ocean_dried_kelp.png | Bin 0 -> 414 bytes .../textures/mcl_ocean_dried_kelp_bottom.png | Bin 0 -> 364 bytes .../textures/mcl_ocean_dried_kelp_side.png | Bin 0 -> 360 bytes .../textures/mcl_ocean_dried_kelp_top.png | Bin 0 -> 364 bytes .../textures/mcl_ocean_kelp_item.png | Bin 0 -> 396 bytes .../textures/mcl_ocean_kelp_plant.png | Bin 0 -> 2291 bytes 11 files changed, 191 insertions(+), 2 deletions(-) create mode 100644 mods/ITEMS/mcl_ocean/kelp.lua create mode 100644 mods/ITEMS/mcl_ocean/textures/mcl_ocean_dried_kelp.png create mode 100644 mods/ITEMS/mcl_ocean/textures/mcl_ocean_dried_kelp_bottom.png create mode 100644 mods/ITEMS/mcl_ocean/textures/mcl_ocean_dried_kelp_side.png create mode 100644 mods/ITEMS/mcl_ocean/textures/mcl_ocean_dried_kelp_top.png create mode 100644 mods/ITEMS/mcl_ocean/textures/mcl_ocean_kelp_item.png create mode 100644 mods/ITEMS/mcl_ocean/textures/mcl_ocean_kelp_plant.png diff --git a/mods/ITEMS/mcl_ocean/corals.lua b/mods/ITEMS/mcl_ocean/corals.lua index a1a029b7..14546b4b 100644 --- a/mods/ITEMS/mcl_ocean/corals.lua +++ b/mods/ITEMS/mcl_ocean/corals.lua @@ -50,7 +50,7 @@ local function coral_on_place(itemstack, placer, pointed_thing) end node_under.name = itemstack:get_name() - node_under.param2 = minetest.registered_items[itemstack:get_name()].place_param2 or 1 + node_under.param2 = minetest.registered_items[node_under.name].place_param2 or 1 if node_under.param2 < 8 and math.random(1,2) == 1 then -- Random horizontal displacement node_under.param2 = node_under.param2 + 8 diff --git a/mods/ITEMS/mcl_ocean/depends.txt b/mods/ITEMS/mcl_ocean/depends.txt index b214a2f9..d950d607 100644 --- a/mods/ITEMS/mcl_ocean/depends.txt +++ b/mods/ITEMS/mcl_ocean/depends.txt @@ -2,3 +2,4 @@ mcl_core mcl_sounds mcl_dye doc_items +screwdriver? diff --git a/mods/ITEMS/mcl_ocean/init.lua b/mods/ITEMS/mcl_ocean/init.lua index aee7ead1..cf63f98b 100644 --- a/mods/ITEMS/mcl_ocean/init.lua +++ b/mods/ITEMS/mcl_ocean/init.lua @@ -6,3 +6,6 @@ dofile(minetest.get_modpath(minetest.get_current_modname()).."/corals.lua") -- Seagrass dofile(minetest.get_modpath(minetest.get_current_modname()).."/seagrass.lua") + +-- Kelp +dofile(minetest.get_modpath(minetest.get_current_modname()).."/kelp.lua") diff --git a/mods/ITEMS/mcl_ocean/kelp.lua b/mods/ITEMS/mcl_ocean/kelp.lua new file mode 100644 index 00000000..4404d907 --- /dev/null +++ b/mods/ITEMS/mcl_ocean/kelp.lua @@ -0,0 +1,185 @@ +local S = minetest.get_translator("mcl_ocean") + +-- List of supported surfaces for seagrass and kelp +local surfaces = { + { "dirt", "mcl_core:dirt" }, + { "clay", "mcl_core:clay" }, + { "sand", "mcl_core:sand", 1 }, + { "redsand", "mcl_core:redsand", 1 }, + { "gravel", "mcl_core:gravel", 1 }, +} + +local function kelp_on_place(itemstack, placer, pointed_thing) + if pointed_thing.type ~= "node" or not placer then + return itemstack + end + + local player_name = placer:get_player_name() + local pos_under = pointed_thing.under + local pos_above = pointed_thing.above + local node_under = minetest.get_node(pos_under) + local node_above = minetest.get_node(pos_above) + local def_under = minetest.registered_nodes[node_under.name] + local def_above = minetest.registered_nodes[node_above.name] + + if def_under and def_under.on_rightclick and not placer:get_player_control().sneak then + return def_under.on_rightclick(pos_under, node_under, + placer, itemstack, pointed_thing) or itemstack + end + + if pos_under.y >= pos_above.y then + return itemstack + end + + -- Placement rules: + -- Seagrass can only be placed on top of dirt inside water + local g_above_water = minetest.get_item_group(node_above.name, "water") + if not (g_above_water ~= 0 and def_above.liquidtype == "source") then + return itemstack + end + + if minetest.is_protected(pos_under, player_name) or + minetest.is_protected(pos_above, player_name) then + minetest.log("action", player_name + .. " tried to place " .. itemstack:get_name() + .. " at protected position " + .. minetest.pos_to_string(pos_under)) + minetest.record_protection_violation(pos_under, player_name) + return itemstack + end + + -- Select a kelp node + if node_under.name == "mcl_core:dirt" then + node_under.name = "mcl_ocean:kelp_dirt" + elseif node_under.name == "mcl_core:clay" then + node_under.name = "mcl_ocean:kelp_clay" + elseif node_under.name == "mcl_core:sand" then + node_under.name = "mcl_ocean:kelp_sand" + elseif node_under.name == "mcl_core:redsand" then + node_under.name = "mcl_ocean:kelp_redsand" + elseif node_under.name == "mcl_core:gravel" then + node_under.name = "mcl_ocean:kelp_gravel" + else + return itemstack + end + local def_node = minetest.registered_items[node_under.name] + if def_node.sounds then + minetest.sound_play(def_node.sounds.place, { gain = 0.5, pos = pos_under }) + end + node_under.param2 = minetest.registered_items[node_under.name].place_param2 or 16 + minetest.set_node(pos_under, node_under) + if not (minetest.settings:get_bool("creative_mode")) then + itemstack:take_item() + end + + return itemstack +end + +minetest.register_craftitem("mcl_ocean:kelp", { + description = S("Kelp"), + inventory_image = "mcl_ocean_kelp_item.png", + wield_image = "mcl_ocean_kelp_item.png", + on_place = kelp_on_place, +}) + +-- Kelp nodes: kelp on a surface node + +for s=1, #surfaces do + local def = minetest.registered_nodes[surfaces[s][2]] + local alt + if surfaces[s][3] == 1 then + alt = surfaces[s][2] + end + local sounds = table.copy(def.sounds) + local leaf_sounds = mcl_sounds.node_sound_leaves_defaults() + sounds.dig = leaf_sounds.dig + sounds.dug = leaf_sounds.dug + sounds.place = leaf_sounds.place + minetest.register_node("mcl_ocean:kelp_"..surfaces[s][1], { + drawtype = "plantlike_rooted", + paramtype = "light", + paramtype2 = "leveled", + place_param2 = 16, + tiles = def.tiles, + special_tiles = { + { + image = "mcl_ocean_kelp_plant.png", + animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}, + tileable_vertical = true, + } + }, + inventory_image = "("..def.tiles[1]..")^mcl_ocean_kelp_item.png", + wield_image = "mcl_ocean_kelp_item.png", + selection_box = { + type = "fixed", + fixed = { + { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }, + { -0.5, 0.5, -0.5, 0.5, 1.5, 0.5 }, + }, + }, + groups = { dig_immediate = 3, deco_block = 1, plant = 1, kelp = 1, falling_node = surfaces[s][3] }, + sounds = sounds, + node_dig_prediction = surfaces[s][2], + after_dig_node = function(pos) + minetest.set_node(pos, {name=surfaces[s][2]}) + end, + drop = "mcl_ocean:kelp", + _mcl_falling_node_alternative = alt, + _mcl_hardness = 0, + _mcl_blast_resistance = 0, + }) +end + + +-- Dried kelp stuff + +-- TODO: This is supposed to be eaten very fast +minetest.register_craftitem("mcl_ocean:dried_kelp", { + description = S("Dried Kelp"), + inventory_image = "mcl_ocean_dried_kelp.png", + wield_image = "mcl_ocean_dried_kelp.png", + groups = { food = 2, eatable = 1 }, + on_place = minetest.item_eat(1), + on_secondary_use = minetest.item_eat(1), + groups = { food = 2, eatable = 1 }, + _mcl_saturation = 0.6, +}) + +local mod_screwdriver = minetest.get_modpath("screwdriver") ~= nil +local on_rotate +if mod_screwdriver then + on_rotate = screwdriver.rotate_3way +end + + +minetest.register_node("mcl_ocean:dried_kelp_block", { + description = S("Dried Kelp Block"), + tiles = { "mcl_ocean_dried_kelp_top.png", "mcl_ocean_dried_kelp_bottom.png", "mcl_ocean_dried_kelp_side.png" }, + groups = { handy = 1, building_block = 1, flammable = 2 }, + sounds = mcl_sounds.node_sound_leaves_defaults(), + paramtype2 = "facedir", + on_place = mcl_util.rotate_axis, + on_rotate = on_rotate, + _mcl_hardness = 0.5, + _mcl_blast_resistance = 12.5, +}) + +minetest.register_craft({ + type = "cooking", + recipe = "mcl_ocean:kelp", + output = "mcl_ocean:dried_kelp", + cooktime = 10, +}) +minetest.register_craft({ + recipe = { + { "mcl_ocean:dried_kelp","mcl_ocean:dried_kelp","mcl_ocean:dried_kelp" }, + { "mcl_ocean:dried_kelp","mcl_ocean:dried_kelp","mcl_ocean:dried_kelp" }, + { "mcl_ocean:dried_kelp","mcl_ocean:dried_kelp","mcl_ocean:dried_kelp" }, + }, + output = "mcl_ocean:dried_kelp_block", +}) +minetest.register_craft({ + type = "fuel", + recipe = "mcl_ocean:dried_kelp_block", + burntime = 200, +}) diff --git a/mods/ITEMS/mcl_ocean/seagrass.lua b/mods/ITEMS/mcl_ocean/seagrass.lua index adffac5f..74546be2 100644 --- a/mods/ITEMS/mcl_ocean/seagrass.lua +++ b/mods/ITEMS/mcl_ocean/seagrass.lua @@ -62,7 +62,7 @@ local function seagrass_on_place(itemstack, placer, pointed_thing) else return itemstack end - node_under.param2 = minetest.registered_items[itemstack:get_name()].place_param2 or 3 + node_under.param2 = minetest.registered_items[node_under.name].place_param2 or 3 if node_under.param2 < 8 and math.random(1,2) == 1 then -- Random horizontal displacement node_under.param2 = node_under.param2 + 8 diff --git a/mods/ITEMS/mcl_ocean/textures/mcl_ocean_dried_kelp.png b/mods/ITEMS/mcl_ocean/textures/mcl_ocean_dried_kelp.png new file mode 100644 index 0000000000000000000000000000000000000000..2d7879200d038ff90bbdc717d24890037a28a63b GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^PXNr}OT51_lPs z0*}aI1_r*vAk26?e?`sfV;(_KS$3{1ZNUr-jM|UzsSU#&F}8qbs*t+}U66dNa&%&$}M+_v}o*`8EtU?73H} zMl5-EZC5nMs(>FqrCc`@?3z>Sqvow)$IbA7(`J6^r?jRD6ShdNYpVhn1Xv~s+;vj$ zPBgw-Jfq!H=3dhkt|09zb3gvun06rL+yVP*?|k#Wt)Hl#_Um%EbZOV#pO@~#K& zXjRyH=&e=PGV?f5uDrsI*Z=>qr$$%ubsjWZGA$=~&#a}wM^ZM4T$&!Gma=VQcBAKK z1J0G9o94A^Zrd(;!n0DnPP(#ovZKxkmu&*}X2*_SeB5=?a^gppwY_VutPKfB2Zghz LtDnm{r-UW|jufZ@ literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_ocean/textures/mcl_ocean_dried_kelp_bottom.png b/mods/ITEMS/mcl_ocean/textures/mcl_ocean_dried_kelp_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..148ecfd3535223665e8ef08a8416a93c34fcf4c6 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFL7>k44ofy`glX=O&z`&C3 z=qc&osq70%XlyPZ!4!3xD59-ds$MJTAYDb_u!&Opz3sd3R0P^S|pKaqCav z-MDgz-QB?Bo7R6n|G0FI=EtvRqpK+@pL-19@jZbZ2&wW*yp#1s3Ju%thQyupXN@%Z~d49pZr8}P=ai~;u zeN^Kwx#mJ859_t{%jT&l9zPj%BSc~$uUNy@P%A zGY*Ee#hch_ElLFhJtbFd;uQ?kYu3wtA^1IB+4g|`smgB?qrQD*zgW8Cr-BCeV+IBW N22WQ%mvv4FO#qHRiPr!C literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_ocean/textures/mcl_ocean_dried_kelp_side.png b/mods/ITEMS/mcl_ocean/textures/mcl_ocean_dried_kelp_side.png new file mode 100644 index 0000000000000000000000000000000000000000..71d1cb2ad6ab9d0a74fec78e813f508d34658882 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFL7>k44ofy`glX=O&z`&C3 z=qc&osq70%XliPZ!4!3;*0nj$DTfL|m#RSv5P9LPVDCD1LfQx{9@Yo}*2Z z`^Tx`%QkWq&iHf2yDn+=-OBwhcRwu?U2LV1rE%_-<>hB3wlgha`V7^w`ZXEO@U0+-d0t$y@&SE@w!aq`^diem)*pZScaOXJ z<%~1p0-skKKE3p%;gVb5ye(6FD#O(7$oZT2dxpF}9HCP$lf9xL%kZE50S<>nY-f0M zE9W%a7T9$6fR3Pc`3#0x40%1vBJA?}l?8>DE|P56_nRSG=yvG}LAh!M1_lOCS3j3^ HP6k44ofy`glX=O&z`&C3 z=qc&osq70%XlyPZ!4!3xD59-ds$MJTAYDb_u!&Opz3sd3R0P^S|pKaqCav z-MDgz-QB?Bo7R6n|G0FI=EtvRqpK+@pL-19@jZbZ2&wW*yp#1s3Ju%thQyupXN@%Z~d49pZr8}P=ai~;u zeN^Kwx#mJ859_t{%jT&l9zPj%BSc~$uUNy@P%A zGY*Ee#hch_ElLFhJtbFd;uQ?kYu3wtA^1IB+4g|`smgB?qrQD*zgW8Cr-BCeV+IBW N22WQ%mvv4FO#qHRiPr!C literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_ocean/textures/mcl_ocean_kelp_item.png b/mods/ITEMS/mcl_ocean/textures/mcl_ocean_kelp_item.png new file mode 100644 index 0000000000000000000000000000000000000000..396f8b3efbe9409a097966bd185d76c43a263186 GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^PXNr}OT51_lPs z0*}aI1_r*vAk26?e?`sfV;(_KAsxjD$#)nS7$rSj978Nl_f9hGJLJIQ zx?kBSbNOSY%u5cdLJE3h6x|mrUhDJ|S04Z7llN_xrEf)t36R zXmgrgMa{va-AN2TcGfFzXWQhWQ*m8+zI05v`l(}W?Z=Bb90CNs$Cj%zHOy=~^5gYo znLV$Wl~>Np^Jvt$ZM9*B&%ql^$HY7rR7I>wTbb4Y~Kg uNe6$5i~gFB!E^6z!Lm(jBPCuqu8il{u!!xruv;i7R6Sk&T-G@yGywp9xT6LD literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_ocean/textures/mcl_ocean_kelp_plant.png b/mods/ITEMS/mcl_ocean/textures/mcl_ocean_kelp_plant.png new file mode 100644 index 0000000000000000000000000000000000000000..11eaf610a235a19df0abfe05406406b1aaaf835f GIT binary patch literal 2291 zcmeAS@N?(olHy`uVBq!ia0y~yU=UznU{v5>V_;y|`|ooF0|Ns~x}&cn1H;CC?mvmF z3=9mM1s;*b3=DjSL74G){)!X^1_p@|*NBqf{Irtt#G+J&g2c?c61}|C5(N`ILp{?J z_lO_{2982c7srr_xTTX%Pt-Xs$THtx#|NfQM}#%lTo!Qb2rN(78(}9scW&g}4bRh3 zzxJN+KmTXNpU3m)ED>yKwWx%*Njr7kK+J zAAJ|S;|)(-=fXP17haMd7xph-U!cMpRP&~WHL*92_t<^MI?mo0W9GEAjY;}vorE`B z%>2>l9sJd?cTRrZhYF*FvJLqs*_X^!wdq>8?D|)RP5$C0Cp=8Ea=-NYT;;iT^qGbj z$iGp~T1(dTCU4ub*wNQt__zj}+#H^77kf0{y^?MElDY1&q7NnPyT~xR0Ls{o?YAZ7O_w4U*2?t1eU4FFtqhriY!xN|ez90(_pB}Z zRi~MFe7v!TuSIgMCGWDf`*x|OOlRGi_XM0db5E`RX~Dy#fyPz$wlArcdh#GgMSiB) z?_2E?XC=LDyb@P?L1FRL6J62F4hvQ+%WDYKnPuQ}|ICc*i@kic7cYOf>&=T-tJq!_ zG_l*KUbwpAL!eIRftY&c{*dOex0 z$n!v+m|qe>Gm>M=uCOmV8~H7Tg)r>{tDn#P%bv_Vr^XHBWw6tYJsb;+qXv= z>oTt%%iOWOeAg`zo32KXeWsod7e}mW*!ho5ZYA59l&Ldi>)8{YWU)x}vVHX~aqIi4 z5IBde>#eiyQ>SIq1Y?ZtrJg*FxxRVYuLD~wPuul;SgK`0GaX&bSfX|{LDsLtRI5g$Ta9bRXY&tTSqJ7s_U>;y za^h-6*0)8wFKEQxb^GN$ri{)midIwSE>?J3!tQPFmIc#)2)yQ&oE8CiWwq>*Wi_X@5 zd*T$Awq%aGp+?Yz%+2#o?Fk4zBbQNNvXU*q?L$TaCn$&1HCDchzSM9tj^X#L#BQhF zhONo+wZ>PkO1^nJb)_X&U($sJ_sGSE7DxPP`8lK1?4zjU#G5_KjG}vDc+V8sRyDg# zJ2-En-qR_wBKH^>Z2hHiJ()A^#|+EGR@;*vHa6EvO<4F_+0?Z+5|5 zG>n={Kf0Rcdon*;Gq-k{#i9V^gts@`&zG=O|316YlFMyl#(~9a0v`tINZd$eJ+r>f z!PE3a&n~0ro;4HI(oX&om5OAm_SL^}WbfYuF)4w)XC0XJvZuuKvrU+uIjMNo-4BiZ zoARy&&lJzxTL>3?f-9Yh-`Fn7z_) z?!kL;Gk2|ipuxslF~wBNri*o9Y}kQ0zBR6<3Fp=) zlpG|8H&#w<1tq4JsWpf7<4WUt z=D0~2`1{89-Z|}>ek9{)z+BPW?2F{RPqIs1{i(qwS8_;ZPVW=vOXq~-j!sIwB6me@ z>k`H*C;HVmWMW^f-?T#QcSWG_pMcoiFE}ivc~^N#%?Q+Po7|Z6UD@pZp~=HuZ}~K5Bh+%XRyfiwkBgX_VZWbV0$_ zB;ZZml4Uavxo^xkG;8PUqsneR4l6I(CpcJ%xSW}Efqv1?lS!d+6f^4iK+S29ThTfK4uEN)1<>dkcT94n-=6IdIKAx$Vz6$v4k2XII*W z^O3mVmaS0py<-8<=A@Z%flo#MN`TyprBaiIBR!_AF)R=a*}nzA_J)59z6%9<+< zZT!Y{=$CZD-&+nQMSJ=7A6W4_iCbSHZ6W847h!YGxviOKdc!@u=D@8JnMXeCJL+Ct z{nL8+O^@CQY`