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 a6b80c6da7..a3342119f5 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 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 literal 0 HcmV?d00001 diff --git a/mods/mcl_fishing/textures/mcl_fishing_pufferfish_raw.png b/mods/mcl_fishing/textures/mcl_fishing_pufferfish_raw.png new file mode 100644 index 0000000000000000000000000000000000000000..7453d68d57bce04ccee303d8f9e5335b23dcfca7 GIT binary patch literal 1211 zcmV;s1VsCZP)H;LN@>a1SCmBK~z{rt(H${TvZgtABb5P zaHSX*u~^Vi6mg>v7e=}W2tpSF{#m&Yf>ZmlVG#p{7&03b z2`(xK(b}#eC=_89-E`yX_59Ae-_3n@-b_pBgO7LTzI*TYJLjJJ-V|k7x*pVZq`Tvq zTR81{?9KOFy5tvqW8(o_<*nKBz5(v0^ulPcKNEgc7r+1ituTPT0rVrl>uWnczBsmA zpf^r+A4WFjA=GFVWfRrbMO$W}%P;!=-s17Wd;k~+#Qg!7Sb)Xn*S1~i$L!3<6E*$u z4UZ1y-u|^H4==40h^(Mj7SBy0jfsOtNs(c`_~B$JVfNj{$D_8^pYwYP#5@7Kd+svZ zQ_d~-%6kHM^@C$BGjrqIaOZO2`g60=?v=V2FA$l}u538K?9%!2?N3h?sBWC>c>>^z zV0yi8+p$~tT@parmnt>)yO|&P?2{1yChfT*$9%o>NV)sHMP>q^rmK&ZgS|u5eSfAB zZPUL$`>Ci!{@OK3N8isVq(G3O)h{OE zUJ788(S|KZANOdELKXxffcDWTH;(`+67~uZ25w(408B_{0LhL1yZ(~v=3dKHGe;`Q z0FXmqUIAF-ImFuMlNA6`CNcxe+wG~S{J8*RJ`#XE!Z;omy943o95=GSVwnM^wm?*b zP~-v+fvkUZ@V%f0C_+C46bKL;70k&9?YIqEa122EohRx5GH(DF$^gZXLLh!e0ExvC z5COP(3Lr5y97*PPPE;?pMt~H8JA4MHi+ zjdEqih&4LLD*#?{w!Xg!(GUOyLZOVzLX&AK%tP8`o&uyrSOcIUy)vy$iU43jZ@GeC zlJw6n)z{9Au00dfs``Np=09DskJ*=%^l>A*sb>VRubs=zs|yGw0nh~D00{)<4v?6W zLCi5m1QpGLV&jJ^Pq|172HFOZ_c|3s-xd~x8-_}k`Sz-%+(gl-@Q~J%pELxZy|K!! zZ-oJ*5Xy)mmoXyp)SNXCF5hVhumSU$O8 zV;lerWwqfiE979Ijk;%x0%^`Y1B{YVrdOw=V=FKj>v>!wNq3VPJDZf6BLQGA7GSK( Z;tulP*O)PJNXP&H002ovPDHLkV1oT-7V`iA 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 zcmV-c0;&CpP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XR000XR0j(pw zbpQYW8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^7j^FlWO00Fj1L_t(oN9~k9 zOT<7B#q$YlMMVe*{woeGL=X=SITRI?h#)p1SZEA7Gh&*DSn_e zZ<%+DOV*1?Hih_LnBBW%es3n5M1NYJcO8R}ZM`D={d&v1UaZ$|LcG5kg1ADo&oSqNn&CB+LVZK_4Z9Z?t{cbfJYrU5; z#dM!cTNpFp$i3FMH9?>+q}1;Oh_7=!f$s8H-vm2$LrUfsivQHP3vbMhdP7R)7m5$+ z9GTCW5yiq zG;C-%GY_2a;1%xPg&*(D*{B5$5e{g&H6z1AwjfOeg+sdQbZdhKToaYUA%YMnh|s36 z4hDy`0XG0g+#D{3fkPVBJ!zV!PTOWc-B?t`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 zcmV-S0<-;zP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XR000XR0j(pw zbpQYW8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^7j^FlWO00FE?L_t(oN9~lo zN&`U@h4&S##Kuxcu!tBTMNklegjgyf3I-G*poLo4X%h)aMaOGKdlLE0Py5nfB~Hz z9fsuT_@V&~=NZq*%i>9|U&C3r%S(SJxMqFLo{BfmM?>?uwQ1OIyB*ulI~zq>4aZsE zWlXg+n91$`l;7k)t?3Q54<%3rxC!8BtU2l0y zFn-lZj!rnvGAdkklC$ge%eZjCKxlIIMmB)-p~+qNLK{GO4D}`F7nGZt-``lnfa))x zj0+cr`I2j}hQC~0HnV<+P+xL_eei|S_Xd4~D*Mdcm6yTMWmLET-rnCegM*