From 9503163eb3a7e12c4cc71cc83163547ebdee592d Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Sat, 20 Mar 2021 10:44:13 +0000
Subject: [PATCH] Added new fish (angler, jelly, trout, seahorse, piranha)

---
 fishing.lua                          |  30 +++++++++++++++++++++------
 license.txt                          |   5 +++++
 textures/ethereal_fish_angler.png    | Bin 0 -> 387 bytes
 textures/ethereal_fish_jellyfish.png | Bin 0 -> 209 bytes
 textures/ethereal_fish_piranha.png   | Bin 0 -> 248 bytes
 textures/ethereal_fish_seahorse.png  | Bin 0 -> 184 bytes
 textures/ethereal_fish_trout.png     | Bin 0 -> 279 bytes
 7 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 textures/ethereal_fish_angler.png
 create mode 100644 textures/ethereal_fish_jellyfish.png
 create mode 100644 textures/ethereal_fish_piranha.png
 create mode 100644 textures/ethereal_fish_seahorse.png
 create mode 100644 textures/ethereal_fish_trout.png

diff --git a/fishing.lua b/fishing.lua
index f52777a..f5e643c 100644
--- a/fishing.lua
+++ b/fishing.lua
@@ -10,14 +10,19 @@ local fish_items = {
 	"ethereal:fish_bluefin",
 	"ethereal:fish_blueram",
 	"ethereal:fish_catfish",
+	"ethereal:fish_plaice",
+	"ethereal:fish_salmon",
 	{"ethereal:fish_clownfish", "savanna"},
 	{"ethereal:fish_pike", "grassy"},
 	{"ethereal:fish_flathead", "jungle"},
-	"ethereal:fish_plaice",
 	{"ethereal:fish_pufferfish", "desert_ocean"},
-	"ethereal:fish_salmon",
 	{"ethereal:fish_chichlid", "junglee_ocean"},
-	{"ethereal:fish_coy", "sakura"}
+	{"ethereal:fish_coy", "sakura"},
+	{"ethereal:fish_angler", "ocean"},
+	{"ethereal:fish_jellyfish", "ocean"},
+	{"ethereal:fish_seahorse", "ocean"},
+	{"ethereal:fish_piranha", "jungle"},
+	{"ethereal:fish_trout", "ocean"}
 }
 
 local junk_items = {
@@ -479,16 +484,29 @@ local fish = {
 	{"Pufferfish", "pufferfish", -2},
 	{"Coy", "coy", 2},
 	{"Salmon", "salmon", 2},
-	{"Chichlid", "chichlid", 2}
+	{"Chichlid", "chichlid", 2},
+	{"Angler", "angler", 2},
+	{"Jellyfish", "jellyfish", 0},
+	{"Seahorse", "seahorse", 0},
+	{"Piranha", "piranha", 2},
+	{"Trout", "trout", 2}
 }
 
 for n = 1, #fish do
 
+	local usage
+	local groups
+
+	if fish[n][3] > 0 then
+		usage = minetest.item_eat(fish[n][3])
+		groups = {food_fish_raw = 1, ethereal_fish = 1}
+	end
+
 	minetest.register_craftitem("ethereal:fish_" .. fish[n][2], {
 		description = S(fish[n][1]),
 		inventory_image = "ethereal_fish_" .. fish[n][2] .. ".png",
-		on_use = minetest.item_eat(fish[n][3]),
-		groups = {food_fish_raw = 1, ethereal_fish = 1}
+		on_use = usage,
+		groups = groups
 	})
 end
 
diff --git a/license.txt b/license.txt
index a4b1f3a..2160fbd 100644
--- a/license.txt
+++ b/license.txt
@@ -43,6 +43,11 @@ Free textures from epicwannehz on DeviantArt
   ethereal_fish_pufferfish.png
   ethereal_fish_redsnapper.png
   ethereal_fish_salmon.png
+  ethereal_fish_trout.png
+  ethereal_fish_piranha.png
+  ethereal_fish_angler.png
+  ethereal_fish_jellyfish.png
+  ethereal_fish_seahorse.png
 
 Notice: Most texture authors are written inside code as comments, anything with no name
 I have more than likely created myself :)
diff --git a/textures/ethereal_fish_angler.png b/textures/ethereal_fish_angler.png
new file mode 100644
index 0000000000000000000000000000000000000000..5da9e4d13d1c0c461882d1374cb28a6fe242158d
GIT binary patch
literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0001@P)t-s0DyM@
z000pe7ZMp65*ip28X6TH9TgrP86zVdDJdQ*DjzE=AT2E+E-oT3FC#KCBr-B3GczSL
zG$u7QCN?%OGejsjI5k8>JxokQQc_G%Yf)ZaU}lJ9Z*OLCac6ULX>@dQd7*rRuYicP
zi<82Pl){mi#h{>|u&}VOwbiw{*uK8Lz{TFe#^1xo-^<S9*4gRU+Unoo?&Rq5`TP6-
z|Nm%w_@)2=00DGTPE!Ct=GbNc0056kL_t&-(|wNX62U+Wg%g+RvVyuq1?x`huKND3
zX4fdz51C9d-^rXa0r*$x{6{#g55BNkj{0^9*^#6WaX8*AEW1w5tb_tY1aNmcG6_k|
z`LcTkOal@fcS_GB%PJzNUoXAz6&@KS`qt=H3xQk4Iws{N7DAkx_O$Y5;NdLa1|J5%
h{Z1o(|BOC*^#DIS352_uFg5@H002ovPDHLkV1jornlJzW

literal 0
HcmV?d00001

diff --git a/textures/ethereal_fish_jellyfish.png b/textures/ethereal_fish_jellyfish.png
new file mode 100644
index 0000000000000000000000000000000000000000..93d5213f9289a9ed679e5be1fca1ddfbade92265
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWWysHIC^)cS!ixhNe%v_m
z<HL&|R^5EhfU=AwL4Lsu4$p3+0XeyzE{-7_*L`~r3N|S4u<*<L?+{^dV(f}y2>f@h
z<L~yQ1O4Am`sHn6Y)EwIu9k~ke#3j8=wS(_i-!ba^==hAyX!><2&}%}x5H?{cf(I?
zL4K3Be%<GtmUrl>&2hCoKCf0^xZz;5)o=HE&6Y#@`oEod*aR65R{<?%@O1TaS?83{
F1OQJXQ91ws

literal 0
HcmV?d00001

diff --git a/textures/ethereal_fish_piranha.png b/textures/ethereal_fish_piranha.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7a34f237767ebb2edde7641df723d8eab35d90d
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!cYsfbYa@`sz~JL2;o}op9V};;
zVOp4`HYHihqspP8qOrG5H@ZJ?SG`I8ytL`_EoRPG)VR88<vOb^+m7x%5_jrs&G8dA
zZ`^wQ{MpA3@4or$l9~=Qi?JlgFPOpM*^M+HC)(4+F+}3>)ILYP1_d6L=&fB&fi4UF
z*RTB85UO`<@7X1jMIIbKb&uoZCo#*je`{k8L_`&@(wTO{-DS<!qcU5}e3TLc)r7bf
sbGhv=<=fhE+{8xmg5{Cx-n?~hSRS8cb`fID+Ya)8r>mdKI;Vst0JJk-=Kufz

literal 0
HcmV?d00001

diff --git a/textures/ethereal_fish_seahorse.png b/textures/ethereal_fish_seahorse.png
new file mode 100644
index 0000000000000000000000000000000000000000..803a26ea66c7013b7e0249c7faaa29733295e90c
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ%`eIYG8+UGZWuUxh{*WS
zFya6I|9%|3i-DqyB|(0{3=Yq3qyagBo-U3d9M_W*9N4%7x;h;>PX#m?%$RX!&H<j(
zr$<sYD5)izr*~wjsw%I@Tb8h*E;U(|!~3d+$eDm3GcKmp9K1~{5{*KQ+B5>qOq*`9
b3NbK<7jT?CuYS!6XgGtXtDnm{r-UW|gC;rc

literal 0
HcmV?d00001

diff --git a/textures/ethereal_fish_trout.png b/textures/ethereal_fish_trout.png
new file mode 100644
index 0000000000000000000000000000000000000000..745e005a62f1280b4e2eeb8a12ad9c7961177ea9
GIT binary patch
literal 279
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!cYsfbt0R!Xz~F4?>}ld_@8Iv_
z6Ym-j5b2YY5L;XjSCpUKlwa0gThUoqTie|+YwCh|E7l(Qwsi51y}NE4JAdHZnIDG^
z-MxJC+N1l=-oMLZ*kb@Ri?JlgFPOpM*^M+Hr^?gCF+}2W==ngQLk1iy0V@)OgfF)(
zJM`Co)m4$`fA`M4VPIHp*vNhG$~m*k|Mu)wSkjsHwq01&%<YIEi(byDd;Kv-N|s%#
z+gCWL^smV_!GMX=HI5z*p6era%7SNM+3D&B&$=Hretmtmd6&z%eT)pnXFAsYz5l8C
adnI#!8=HTe`SqJ1|9QIlxvX<aXaWGt!*==r

literal 0
HcmV?d00001