From 3a47e8a2f9ffed4e8c166e81b88ea5161c96241e Mon Sep 17 00:00:00 2001 From: cora Date: Fri, 22 Jul 2022 03:14:11 +0200 Subject: [PATCH 1/3] Add tropical fish --- mods/ENTITIES/mobs_mc/init.lua | 1 + .../models/extra_mobs_tropical_fish_a.b3d | Bin 0 -> 13946 bytes .../models/extra_mobs_tropical_fish_b.b3d | Bin 0 -> 16969 bytes .../extra_mobs_spawn_icon_tropical_fish.png | Bin 0 -> 353 bytes .../textures/extra_mobs_tropical_fish_a.png | Bin 0 -> 275 bytes .../textures/extra_mobs_tropical_fish_b.png | Bin 0 -> 978 bytes .../extra_mobs_tropical_fish_pattern_a_1.png | Bin 0 -> 917 bytes .../extra_mobs_tropical_fish_pattern_a_2.png | Bin 0 -> 939 bytes .../extra_mobs_tropical_fish_pattern_a_3.png | Bin 0 -> 919 bytes .../extra_mobs_tropical_fish_pattern_a_4.png | Bin 0 -> 921 bytes .../extra_mobs_tropical_fish_pattern_a_5.png | Bin 0 -> 153 bytes .../extra_mobs_tropical_fish_pattern_a_6.png | Bin 0 -> 923 bytes .../extra_mobs_tropical_fish_pattern_b_1.png | Bin 0 -> 952 bytes .../extra_mobs_tropical_fish_pattern_b_2.png | Bin 0 -> 938 bytes .../extra_mobs_tropical_fish_pattern_b_3.png | Bin 0 -> 904 bytes .../extra_mobs_tropical_fish_pattern_b_4.png | Bin 0 -> 932 bytes .../extra_mobs_tropical_fish_pattern_b_5.png | Bin 0 -> 930 bytes .../extra_mobs_tropical_fish_pattern_b_6.png | Bin 0 -> 930 bytes mods/ENTITIES/mobs_mc/tropical_fish.lua | 186 ++++++++++++++++++ 19 files changed, 187 insertions(+) create mode 100644 mods/ENTITIES/mobs_mc/models/extra_mobs_tropical_fish_a.b3d create mode 100644 mods/ENTITIES/mobs_mc/models/extra_mobs_tropical_fish_b.b3d create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_spawn_icon_tropical_fish.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_a.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_b.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_1.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_2.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_3.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_4.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_5.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_6.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_1.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_2.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_3.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_4.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_5.png create mode 100644 mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_6.png create mode 100644 mods/ENTITIES/mobs_mc/tropical_fish.lua diff --git a/mods/ENTITIES/mobs_mc/init.lua b/mods/ENTITIES/mobs_mc/init.lua index 5be1af71c..120d7be0d 100644 --- a/mods/ENTITIES/mobs_mc/init.lua +++ b/mods/ENTITIES/mobs_mc/init.lua @@ -145,4 +145,5 @@ dofile(path .. "/wither.lua") -- Mesh and animation by toby109tt / https://gith dofile(path .. "/cod.lua") dofile(path .. "/salmon.lua") +dofile(path .. "/tropical_fish.lua") dofile(path .. "/dolphin.lua") diff --git a/mods/ENTITIES/mobs_mc/models/extra_mobs_tropical_fish_a.b3d b/mods/ENTITIES/mobs_mc/models/extra_mobs_tropical_fish_a.b3d new file mode 100644 index 0000000000000000000000000000000000000000..2131319fa7ad12b8154b498c3aec431a16175052 GIT binary patch literal 13946 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 J>9SJZ{tb+UU|9eF literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/models/extra_mobs_tropical_fish_b.b3d b/mods/ENTITIES/mobs_mc/models/extra_mobs_tropical_fish_b.b3d new file mode 100644 index 0000000000000000000000000000000000000000..b97bfb228f31106a722e8bb7959b5507bdc712d5 GIT binary patch literal 16969 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 Z#T|Kwc-t6`ryl?S002ovPDHLkV1nFsaIXLW literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_b.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_b.png new file mode 100644 index 0000000000000000000000000000000000000000..d6471addc23f2cb1be5f386d1516fa6a9c1b4766 GIT binary patch literal 978 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U}gyL32_B-fnegqiPNS{n=@z5 zvSrJ*ZQFM6;K6Ixu0fU~Vh`_|+u zEaGN!{A|C{(qR+xhu4BE%NdSpb1yY|`#|K3j7x3I3ay85}Sb4q9e0PFEwng9R* literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_1.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_1.png new file mode 100644 index 0000000000000000000000000000000000000000..be50aa837be15eb65ce7ce8454bc44cc1ea0a637 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U}gyL32_B-KYaM`_wV2T|NjHo zqhK@yMpOt)Z;s{zdYG{!$S;_|;n|HeAjjF$#WBROzC1cB3q?+ P0u-2@u6{1-oD!M<|B5#D literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_2.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_2.png new file mode 100644 index 0000000000000000000000000000000000000000..05a5558364ee32eb8e2b7e07046d02c1185ac61e GIT binary patch literal 939 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U}gyL32_B-f#Ac34}bsu{r~?z zggZ)(hQJ630UK52FrZf%OM?7@862M7NCR>rJzX3_EKa}e59B(az~j951hP?anYh;4;WNDXhGmdKI;Vst0BR*cH2?qr literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_3.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_3.png new file mode 100644 index 0000000000000000000000000000000000000000..0894fc22608f1e74d8c8b0ade9c878d97c736497 GIT binary patch literal 919 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U}gyL32}Y*?j2C%!-o%l|Ni~| z|38pD3PwX<Tmv~`?Y$V zxXAdbmgCiICeDk2%S!YPt&1p<*Y;dh?XJK#v4}f@L#^&u3fH|2{}1Sh9D4p)iur^R V!`W!F1=~Sk>FMg{vd$@?2>>i2JE;Hw literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_4.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_4.png new file mode 100644 index 0000000000000000000000000000000000000000..c43b4c8fcd1a111a1b950f200dbe5bb80cbec0e0 GIT binary patch literal 921 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U}gyL32_B-KYaM`_wV2T|NjHo zqhK@yMpOt)Z;s{zdYG{!$S;_|;n|HeAjjR)#WBRR2Wo6fMTOgy%_fpI_6452io7#C&-erpbErhJe7rim;J-ZvT6 TKi<$63<^+BS3j3^P6cytN35PFiKM@(s(m!flu4zPWty?n;%f zrn8Q%F+25D#e(bW=k-Ypx4+jN*?(R_f|-Hg!267)AAK+QPb+!=w2Q&h)z4*}Q$iB} DP^mu7 literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_6.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_6.png new file mode 100644 index 0000000000000000000000000000000000000000..f0deaf7c2783221b2a110e60a17bc093e3cd0d2a GIT binary patch literal 923 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U}gyL32_B-KYaM`_wV2T|NjHo zqhK@yMpOt)Z;s{zdYG{!$S;_|;n|HeAji|w#WBRn@+>bnT-qyY71DD zcvTz)x;Ct0cI=Rna0urTYV>HBnyjVpB8+Xu*8s6yoGhX|Y!21phJ1U3-3}%&GI&}t VtUB}Tvll2xJzf1=);T3K0RW!tF?|34 literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_1.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_1.png new file mode 100644 index 0000000000000000000000000000000000000000..783f6b702fe5711a348c851566681b8ed68ba498 GIT binary patch literal 952 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U}gyL32_B-@7%d__wL;fA3ps3 z`}hC<|3HyZFd70QBm{cc_Id-o%2*QQ7tG-B>_!@pljiB-7-Dhy?IcI80}4DWvfuvK z=LN0Udhx|V4%-rcAu;2dOQyuf3+eDA*|)?=n;9fleRGwa7Ix>%p(z|w*Rdu#7s?tH z+8&>nDUtkHx7>H?LcjbTt+j_&-evV_vbL5CE3)pJbN4P|=N5+5Pj2(f1ckJxtDnm{ Hr-UW|JFHB9 literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_2.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_2.png new file mode 100644 index 0000000000000000000000000000000000000000..9137762848f254124f7e0aa0cecb55c38d9d646c GIT binary patch literal 938 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U}gyL332`V_b*W7!-o(5|NjRv zM!{$ZjHnQBw6Ays^e|&dkY6x^!?PP{Ku(0Gi(`nz>9_rcd%HWCVNWtmZ_PzZav`njxgN@xNALV`vD literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_3.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_3.png new file mode 100644 index 0000000000000000000000000000000000000000..bd5f3f2e977ed0284f7056c99eb499e51352fcf7 GIT binary patch literal 904 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U}gyL32_B-&!0d4@ZrPn-@pI( z@#Fvh|3HyZFd70QBm}(VKFFK%g_!@p6X5CM7-DfcIYEN;3-g&XXIQ3Q zxWmi*qp=fS?83{1OOWVMri;5 literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_6.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_6.png new file mode 100644 index 0000000000000000000000000000000000000000..87afb666b57c0d01f2f5aa1ac0f1857c3aab151d GIT binary patch literal 930 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U}gyL32_B-@7}%p;lqc&fB*jf z{~yR51*0J_azeoBp6x!MZy8I1{DK)Ap4~_TasoVE978NlznyTK3z%b^pZ@vp?#`8% zD*oZ>MdwYv$6dHuO&%P49c_Egly@Vi;!LM`(qTuRJDr<8^`TzEvz_5jD}H}XdUIx8 hRPSQTCT2f@BRRQu7 Date: Sat, 23 Jul 2022 20:10:23 -0600 Subject: [PATCH 2/3] Tropical Fish Bucket Adds the bucket of tropical fish. --- mods/ENTITIES/mobs_mc/tropical_fish.lua | 2 +- mods/ITEMS/mcl_fishing/init.lua | 4 ++-- mods/ITEMS/mcl_fishing/locale/template.txt | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/tropical_fish.lua b/mods/ENTITIES/mobs_mc/tropical_fish.lua index d99add3b4..191deca5b 100644 --- a/mods/ENTITIES/mobs_mc/tropical_fish.lua +++ b/mods/ENTITIES/mobs_mc/tropical_fish.lua @@ -105,7 +105,7 @@ local tropical_fish = { on_rightclick = function(self, clicker) if clicker:get_wielded_item():get_name() == "mcl_buckets:bucket_water" then self.object:remove() - --clicker:set_wielded_item("mcl_fishing:bucket_tropical_fish") + clicker:set_wielded_item("mcl_fishing:bucket_tropical_fish") awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing") end end, diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index 08c039bc3..6182b0471 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -520,9 +520,9 @@ end ) -- Fish Buckets fish_names = { { techname = "cod", name = "Cod" }, - { techname = "salmon", name = "Salmon" } + { techname = "salmon", name = "Salmon" }, --{ techname = "pufferfish", name = "Pufferfish" } FIXME: Uncomment when pufferfish mobs are added. - --{ techname = "tropical_fish", name = "Tropical Fish" } FIXME: Uncomment when pufferfish mobs are added. + { techname = "tropical_fish", name = "Tropical Fish" } } for _, fish in pairs(fish_names) do diff --git a/mods/ITEMS/mcl_fishing/locale/template.txt b/mods/ITEMS/mcl_fishing/locale/template.txt index 32e3d8740..a0d3c9d21 100644 --- a/mods/ITEMS/mcl_fishing/locale/template.txt +++ b/mods/ITEMS/mcl_fishing/locale/template.txt @@ -18,7 +18,8 @@ Catches fish in water= Very poisonous= Cod= Salmon= +Tropical Fish= Bucket of @1= This bucket is filled with water and @1.= Place it to empty the bucket and place a @1. Obtain by right clicking on a @2 fish with a bucket of water.= -Places a water source and a @1 fish.= \ No newline at end of file +Places a water source and a @1 fish.= From 0b729d7ada1481d7824ad5eb25d1ddcbe84f1a9c Mon Sep 17 00:00:00 2001 From: cora Date: Sun, 24 Jul 2022 05:56:45 +0200 Subject: [PATCH 3/3] Fix wrong drops itemstring --- mods/ENTITIES/mobs_mc/tropical_fish.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ENTITIES/mobs_mc/tropical_fish.lua b/mods/ENTITIES/mobs_mc/tropical_fish.lua index 191deca5b..7dcc2d5cd 100644 --- a/mods/ENTITIES/mobs_mc/tropical_fish.lua +++ b/mods/ENTITIES/mobs_mc/tropical_fish.lua @@ -83,7 +83,7 @@ local tropical_fish = { run_end = 40, }, drops = { - {name = "mcl_fishing:tropical_fish_raw", + {name = "mcl_fishing:clownfish_raw", chance = 1, min = 1, max = 1,},