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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 literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_spawn_icon_tropical_fish.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_spawn_icon_tropical_fish.png new file mode 100644 index 0000000000000000000000000000000000000000..48dd8f9866224cd914f4e8aaeccbe058dbbd1d71 GIT binary patch literal 353 zcmV-n0iOPeP)K0pa_2^qEtq6AYhfdbhS zHB$_)xprllfWLZqclX}^{qDhk$~jl%!(p}V&Q`~x8{pc{J-%L50J|TjJL+Qc<)8K1 z1(Y!pi3g)O0O5EBz~|m`*}mWFaJ8?DsUM4qETYIFaab#m;NkvmyA1kEWz4Vh=1EME zMQE*qh6Cr^VHxz70I9X4)@}^C2cWfn8;s_>zdWsU^a~0L=iF^4gM;I90ZE?3bu7;E zBo;PD>wclpO>)W@!tsnEivZ5d^zx(u(O;O=dua}Tba zb5K>R>zbZrSq=$jojVtibPJ+OW(EK>O|#P;c|DEm@!p60H~I4dYz+UM0n3457=~e7 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!ia0y~yU{C;I4rT@h2A3sW#~2ux83KGlTp7S%;>3y5rcIkO zXU?)^%eHOXcJScAYuBzpq(;Fg7{=hbQAIri0|R48kY6x^!?PP{3=9kno-U3d7N_4% z3gm7v;Avi-J?Y>7_#Cwpch6eR|MHTlHE^Ha!YxyFUi);tdsQLxkL1|#DAKS!1U&5J_ZH`#*!evUp7D@J;K1UBnUd{X zX-r}Ui=!IvvZST7FUV+Go!F-365j93xQsKPd12pychR?)({5=m*emURa04U5lrDxN TvQ>&FK*8zh>gTe~DWM4f|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!ia0y~yU{C;I4rT@h2A3sW#~2ux83KGlTp7UN!-o%l|Ni~| z|38E~3P!;Q0XC}2VGIlmj3q&S!3+-1Zlp0VFhqK~IEGl9e%l|&bwGi~dGX1==l85r zk~U7ZzwKZU8g)w9En)fst)8IxdyEwfDY7Z|tq$9rVSK=4katp8d2RKst_7+}vD#X* q%TK&ITYuAKS!1U&5J_ZH`#*!evUuabb4gx8|^B%J=ARn#jW7 XeUoAR;|+bmpdj^h^>bP0l+XkKH)%BQ literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_5.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_a_5.png new file mode 100644 index 0000000000000000000000000000000000000000..0f81fbb7220417bcb40e8ac06af39c9b950f17e0 GIT binary patch literal 153 zcmV;K0A~M*P)TVkp-sq6&KakkQ( z?9AKS!1U&5J_ZH`#*!evUTMvsQ6$yy38!q{ef4G`PK$s)?b=1?te$hSw>?O*~U YgQq3Ksx!|%dw~Mg)78&qol`;+0G{kIeE_V~n1iR90^<-SuF`sMd%tv$T*E~{6QwY6kek#*mkyLTBow=k@Ja+_x+D6BnQ L{an^LB{Ts5JFHB9 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!ia0y~yU{C;I4rT@h2A3sW#~2ux83KGlT>t+4%fP_!;lqdj z|Nk?Lf>AKSfTMlIBL)Tr#*!evUXLQScygt2ax)8(l1@9YUm)xw=Xx!5L#)aj9^_}0H6MVW_?FVdQ&MBb@0L=b1SpWb4 literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_4.png b/mods/ENTITIES/mobs_mc/textures/extra_mobs_tropical_fish_pattern_b_4.png new file mode 100644 index 0000000000000000000000000000000000000000..cab054aacce3f3ce89fd2fa000eea477ed9baf28 GIT binary patch literal 932 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2ux83KGlT<_k!%fP_!;lqb- z-@g6*`}hC<{|uvG6pR>P!RZ*rz`(#*666=m;PC858Uq7Ekf)1dh{fsT1PRt=4g*8M zAOns&4&3eyIhao9GIq8EOe_vQEqs4sy8p>~L!3>}?eL pWAJ*$j152JBIh(PSvX8*XPBGJaQw&;2RTrz}_<) oK?gX(j`f^BeB>(Vr>mdKI;Vst02=^CX#fBK 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!ia0y~yU{C;I4rT@h2A3sW#~2ux83KGlTp1V`?%uuo;lqc& zfB*jf|DRzLjDnE_tnS(FV_;xlED7=pW^j0RBaMN9A;8ncF~s8Z+X=V17!)|1pZ@vp z?#`8%D*oZ>MdwYv$6dHuO&%P49c_Egly@Vi;!LM`(qTuRJDr<8^`TzEvz_5jD}H}X ldUIx8RPSQTCT2f@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,},