From 989f29fae64627a7865d87d1872c59b54142d5a6 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 1 Feb 2017 15:29:43 +0100 Subject: [PATCH] Add clownfish, pufferfish, salmon --- mods/mcl_fishing/init.lua | 55 +++++++++++++++--- .../textures/mcl_fishing_clownfish_raw.png | Bin 0 -> 3507 bytes .../textures/mcl_fishing_pufferfish_raw.png | Bin 0 -> 1211 bytes .../textures/mcl_fishing_salmon_cooked.png | Bin 0 -> 598 bytes .../textures/mcl_fishing_salmon_raw.png | Bin 0 -> 588 bytes 5 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 mods/mcl_fishing/textures/mcl_fishing_clownfish_raw.png create mode 100644 mods/mcl_fishing/textures/mcl_fishing_pufferfish_raw.png create mode 100644 mods/mcl_fishing/textures/mcl_fishing_salmon_cooked.png create mode 100644 mods/mcl_fishing/textures/mcl_fishing_salmon_raw.png diff --git a/mods/mcl_fishing/init.lua b/mods/mcl_fishing/init.lua index a6b80c6d..a3342119 100644 --- a/mods/mcl_fishing/init.lua +++ b/mods/mcl_fishing/init.lua @@ -18,20 +18,17 @@ minetest.register_tool("mcl_fishing:fishing_rod", { if r <= 60 then itemname = "mcl_fishing:fish_raw" elseif r <= 85 then - itemname = "mcl_fishing:fish_raw" - --itemname = "mcl_core:salmon" + itemname = "mcl_fishing:salmon_raw" elseif r <= 87 then - itemname = "mcl_fishing:fish_raw" - --itemname = "mcl_core:clownfish" + itemname = "mcl_fishing:clownfish_raw" else - itemname = "mcl_fishing:fish_raw" - --itemname = "mcl_core:pufferfish" + itemname = "mcl_fishing:pufferfish_raw" end elseif r <= 95 then -- Junk r = math.random(1, 83) if r <= 10 then - itemname = "mcl_fishing:bowl" + itemname = "mcl_core:bowl" elseif r <= 12 then -- TODO: Damaged itemname = "mcl_fishing:fishing_rod" @@ -62,7 +59,7 @@ minetest.register_tool("mcl_fishing:fishing_rod", { r = math.random(1, 6) if r == 1 then -- TODO: Enchanted and damaged - itemname = "throwing:bow" + itemname = "mcl_throwing:bow" elseif r == 2 then -- TODO: Enchanted book itemname = "mcl_core:book" @@ -137,3 +134,45 @@ minetest.register_craft({ cooktime = 10, }) +-- Salmon +minetest.register_craftitem("mcl_fishing:salmon_raw", { + description = "Raw Salmon", + inventory_image = "mcl_fishing_salmon_raw.png", + on_use = minetest.item_eat(2), + stack_max = 64, + groups = { food=2, eatable = 2 }, +}) + +minetest.register_craftitem("mcl_fishing:salmon_cooked", { + description = "Cooked Salmon", + inventory_image = "mcl_fishing_salmon_cooked.png", + on_use = minetest.item_eat(6), + stack_max = 64, + groups = { food=2, eatable=6 }, +}) + +minetest.register_craft({ + type = "cooking", + output = "mcl_fishing:salmon_cooked", + recipe = "mcl_fishing:salmon_raw", + cooktime = 10, +}) + +-- Clownfish +minetest.register_craftitem("mcl_fishing:clownfish_raw", { + description = "Clownfish", + inventory_image = "mcl_fishing_clownfish_raw.png", + on_use = minetest.item_eat(1), + stack_max = 64, + groups = { food=2, eatable = 1 }, +}) + +-- Pufferfish +minetest.register_craftitem("mcl_fishing:pufferfish_raw", { + description = "Pufferfish", + inventory_image = "mcl_fishing_pufferfish_raw.png", + on_use = minetest.item_eat(1), + stack_max = 64, + groups = { food=2, eatable=1 }, +}) + diff --git a/mods/mcl_fishing/textures/mcl_fishing_clownfish_raw.png b/mods/mcl_fishing/textures/mcl_fishing_clownfish_raw.png new file mode 100644 index 0000000000000000000000000000000000000000..ee88dffed59bed888f5aeccfba2fe339b2de1913 GIT binary patch literal 3507 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9GG!XV7ZFl&wk z0|S?Trn7TEKt_H^esM;Afr6*AvqC{pep+TuDg#5st+~PJA;B-jY`@?8;^f`YFvUAR zNR&e%$f>(QWTKjuBBy{?hvLGUqJakmU0qqEPb}zQ?(1vl5e?Mg>EgP<{zP$6U-ROQ zu2a7sRxi%Jw&(k^v;VeUw|lQz`~GlIyvbvLx3(rf_nY4%M1;3f6T0AWQd-kD9X5C zB7=f(YKIF$hBd>Q^I=`C3=swlB5B@7EE#U-G8lMT#JFBV&*2Bohp{DjnN#sh3w(sdU6`)JjJy| z%o3RrXF2E{s+=il)M�PV*|l=S%D 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 W8HR-(Cm0wQ7(8A5T-G@yGywqpW)|}R literal 0 HcmV?d00001 diff --git a/mods/mcl_fishing/textures/mcl_fishing_salmon_cooked.png b/mods/mcl_fishing/textures/mcl_fishing_salmon_cooked.png new file mode 100644 index 0000000000000000000000000000000000000000..aed273f35313e36adb30066c62e24cd6059e7d4c GIT binary patch literal 598 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFCb2`N02WALzOB6LqjtI!_WT= z3=Jfq{Xuz$3Dlfq`29gc;W=?=59uV2~L%U1_~opphYVSO!^!GhiH zZHhmw_hdL6-g&IPDAMBP$7~Dc>YZEW%;SG{_Vl-w#C=hnxpw)-{^ps=Wbd7BbhKo? zPqc*b!xMY2?J#v*pugnGdzOy%#kP&_K1JMTu`YA=dM4iW|H@A8{4;%3U=IH)nVFA| zN9F12i^yNG{PZ~LPcBnYwdKN!dFL42)nu|Y17kGiZ7&v&t76i4_gdz?`QyiChWXQH ze+$VLZsnUbZGAECwGZu^!%82kU%761(5_kKcWgU;a0efq{X+)78&qol`;+0L=9A`2YX_ literal 0 HcmV?d00001 diff --git a/mods/mcl_fishing/textures/mcl_fishing_salmon_raw.png b/mods/mcl_fishing/textures/mcl_fishing_salmon_raw.png new file mode 100644 index 0000000000000000000000000000000000000000..c5b7ca1b944a4548456c68ee06c4d88b6e19a09e GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFCb2`N02WALzOB6LqjtI!_WT= z3=Jfq{Xuz$3Dlfq`29gc;W=?=59uV2~A5G*|2?ngnRGTU7mfR;L1fm`?Z|83?H6EH!#kXlWlwQ z^2Z`Z-sh6%Po93{xjz1IK z)n}{8jFTUJWZQ8VlpVS_|F&*+lS6!@!_-p`8h%WA&HKPd*yqi(gi}wO!&TMiNJqrx zS9%-NUG?nqvp8p@6;nEC^XsptcN83S$SC^eX4dd!;mOz^PSOrlJYQ9xi%*$7>;C3@Ap#iIP1OK_pRk_dNH+gu$%0kwRCE#^@a3Bffh@GpNB`AJeZXs!zb8s$YF|E zYq5#N65buG7Fk7A66}1LHy-~u@^8-t#?tJy*SD(X=eqq7J#qD)^r0hP9<4DDVvSMz ptL~g3WU%DnrwjX)G*8zt_{7*U2j6>ogMop8!PC{xWt~$(69Bg}|0e(d literal 0 HcmV?d00001