From ebcadc415d2b9fabf2df16ad5c62acac412a1791 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Wed, 8 Jun 2022 13:07:01 -0600 Subject: [PATCH 1/4] Buckets of Fish --- mods/ENTITIES/extra_mobs/cod.lua | 9 ++++++- mods/ENTITIES/extra_mobs/salmon.lua | 7 ++++++ .../{cod_bucket.png => cod_bucket1.png} | Bin mods/HUD/mcl_achievements/init.lua | 7 ++++++ mods/ITEMS/mcl_fishing/init.lua | 22 ++++++++++++++++++ .../ITEMS/mcl_fishing/textures/cod_bucket.png | Bin 0 -> 14810 bytes .../textures/pufferfish_bucket.png | Bin 0 -> 14766 bytes .../mcl_fishing/textures/salmon_bucket.png | Bin 0 -> 14792 bytes .../textures/tropical_fish_bucket.png | Bin 0 -> 14788 bytes 9 files changed, 44 insertions(+), 1 deletion(-) rename mods/ENTITIES/extra_mobs/textures/{cod_bucket.png => cod_bucket1.png} (100%) create mode 100644 mods/ITEMS/mcl_fishing/textures/cod_bucket.png create mode 100644 mods/ITEMS/mcl_fishing/textures/pufferfish_bucket.png create mode 100644 mods/ITEMS/mcl_fishing/textures/salmon_bucket.png create mode 100644 mods/ITEMS/mcl_fishing/textures/tropical_fish_bucket.png diff --git a/mods/ENTITIES/extra_mobs/cod.lua b/mods/ENTITIES/extra_mobs/cod.lua index fd0a40621..b9c5bf5e3 100644 --- a/mods/ENTITIES/extra_mobs/cod.lua +++ b/mods/ENTITIES/extra_mobs/cod.lua @@ -95,7 +95,14 @@ local cod = { self.object:set_rotation({x=0,y=(atan(vec.z / vec.x) + 3 * pi / 2) - self.rotate,z=0}) end end - end + end, + 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_cod") + awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing") + end + end } mobs:register_mob("extra_mobs:cod", cod) diff --git a/mods/ENTITIES/extra_mobs/salmon.lua b/mods/ENTITIES/extra_mobs/salmon.lua index ba3503b60..fba81e4db 100644 --- a/mods/ENTITIES/extra_mobs/salmon.lua +++ b/mods/ENTITIES/extra_mobs/salmon.lua @@ -55,6 +55,13 @@ local salmon = { view_range = 16, runaway = true, fear_height = 4, + 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_salmon") + awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing") + end + end } mobs:register_mob("extra_mobs:salmon", salmon) diff --git a/mods/ENTITIES/extra_mobs/textures/cod_bucket.png b/mods/ENTITIES/extra_mobs/textures/cod_bucket1.png similarity index 100% rename from mods/ENTITIES/extra_mobs/textures/cod_bucket.png rename to mods/ENTITIES/extra_mobs/textures/cod_bucket1.png diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 7b3b2fc1c..761888d16 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -253,6 +253,13 @@ awards.register_achievement("mcl:fishyBusiness", { icon = "mcl_armor_inv_chestplate_netherite.png", })]]-- +-- Triggered in extra_mobs +awards.register_achievement("mcl:tacticalFishing", { + title = S("Tactical Fishing"), + description = S("Catch a fish... without a fishing rod!"), + icon = "pufferfish_bucket.png", +}) + -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) if non_pc_achievements then diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index 2c2ba6982..39919dbd3 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -512,3 +512,25 @@ minetest.register_on_item_eat(function (hp_change, replace_with_item, itemstack, end end ) + +-- Fish Buckets +fish_names = {"cod", "salmon"} + +for _, fish in ipairs(fish_names) do + mcl_buckets.register_liquid({ + bucketname = "mcl_fishing:bucket_" .. fish, + source_place = function(pos) + minetest.add_entity(pos, "extra_mobs:" .. fish) + return "mcl_core:water_source" + end, + source_take = {"extra_mobs:" .. fish}, + inventory_image = fish .. "_bucket.png", + name = S("Bucket of " .. fish), + longdesc = S("This bucket is filled with water and " .. fish .. "."), + usagehelp = S("Place it to empty the bucket and place a " .. fish .. ". Obtain by right clicking on a " .. fish .. " fish with a bucket of water."), + tt_help = S("Places a water source and " .. fish .. "."), + extra_check = function(pos, placer) + return true, true + end, + }) +end diff --git a/mods/ITEMS/mcl_fishing/textures/cod_bucket.png b/mods/ITEMS/mcl_fishing/textures/cod_bucket.png new file mode 100644 index 0000000000000000000000000000000000000000..582207cb0d10d0c223942037ab66da32163b06b7 GIT binary patch literal 14810 zcmeI3e{2(F7{_mbFou|ssWS%TQdGp)-d($H?RhPZb)$QS;U0|1BxLeIufGz;}5}M0>c0y5Pu~^G-?!rQ9=S@7BmX@UfZ>AyN(wOf4-Og zc>2EI=Xvfv&-1>$e{NIT;)TQ_&NK}>mvM`nhdTqC~8`b z^{$}a+;Ja8c^*{49cD*p5ie;8hbU_i;7BKuP)$+7{B%;3)&P@^fKEmA*)AS9XrmR` zXItS8v7uxWh$+Ed9W3o#9F}_5NM6}C-(Mx9c^Du8Op#6};;O-?eYQ+o9@^G0W1}+? zbB)i|XeFdOLTz-DrUTmTsJBZT$I%U52j}*?UVm87X?Ds9CTBU+c~v)Qaf`6G8-iDW*JYUJ2KicDHeGMs~D$~nnW-Y40m$1|rU zOALsE1W-)_`f+9bk}=KHjF>h~%KY@WiD6Abp?vPL=bK2BO>LOX-4H-=M zJ212^T>{PB@KWZKyLwZJ7K&38$(kAW+(B9y$IY6_x@B4+TOk2nE8nC8(bV*?rp5i) zE^8Y_NH;ZQx{7{eg`&z@%9tlGr7nef7ovfHXaYa%M~~fV#)dHLM>og2ESqOpBuG|S z5+kI^O0=gqh9~S~dA5$PbE7d3WoZn!eq_-UZz>9^MdHX3AJz1PX!@0e*a?`V+9@!F zK}4DFD!xgJYdSnF;CBg3xnaaB(`kIGYM7!bf!2T@4mcD==A-TgZv=Qec2|_GvqxNY zF1uJ?=e5_@JLPDDC`a7hx(vin2z4J5I-p5i)@sRxmTxgM;yxzy5?z5ioft;-sUVx|V1z>FCyWX|e4teVEVGWrH5 z3lI3$2alX9I$i3z^2V;{bg65>bD64`erGOQ$uQz&?Y!A-VJW;x0RDQn+vOIR(&18% zHYE+>9RUTdU&HE3u0H2eI#Jef<#>+BM9wi=D&+4xQ_1Woyjg(vDNO!GrMSrXg>ajV z!WG@-z-Ty<1f_ws2`(%mR6uZ{G_W?og++u42riTc)+V^Hh)@B+h0?&<1Q!+&Dj>K} z8d#g)!XiQi1Q$vJYZF{pM5ut^LTO-af(wfX6%bq~4XjOYVG*GMf(xaAwFxdPB2++d zp){~I!G%SH3J5Ng2G%CHu!v9r!G+Sm+5{IC5h@_KP#Rd9;KCw81q2sL18WmpSVX9R z;6iC&ZGsDn2o(@qC=IMlaA6Ul0)h*rfwc)PEFx4uaG^A?Ho=8OgbD~Qlm^x&xUh&& z0l|gRz}h#&RaJQO52)~YzZ871@9in=r{F_@v=nR)QB?0k6xFwZqW-=PzkjEwE|#Ls zuc9b^8%5P>Tb@7CLQxfLYoIZl{{Ee>5B6_h@1An$N~ec^^1>PO*~_)^j3M*4GwHVE zfMd9El08_P+NW;4Hnmx;+gNt+5f7o|+p=al2`1)$k#2GVczPT%QYWUpL zJI`F6B&dhZPVQeeS^IS3@>%coEuZz-xqCOyhLbbrA3ipCcxd%Ud!M?re|Tv1FZO+D zzq;*?Z3E2le@@&3UxHfw3jEo9=wxi*$fKV}wvKGwK5(^iWY>-fBfBotj=cE8!@HJ! zJ9ll%Tk{5XKYqIU{h@2M=bJVOKYmy7bnW1tilfJC=q0I(69@Y_Hoo)K!M>iE-Q0?+ uOIGdg=bkuttm^c@AHR04yMFXbYQY2VZsb1x>kI4Y%hu+_fxQb>t^W_;Lo%KK literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fishing/textures/pufferfish_bucket.png b/mods/ITEMS/mcl_fishing/textures/pufferfish_bucket.png new file mode 100644 index 0000000000000000000000000000000000000000..2c88bac3531fadc761233627591552f5e9280b88 GIT binary patch literal 14766 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 literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_fishing/textures/tropical_fish_bucket.png b/mods/ITEMS/mcl_fishing/textures/tropical_fish_bucket.png new file mode 100644 index 0000000000000000000000000000000000000000..edf7dd2447e9a8c7ef57b45e5921ba24f519219f GIT binary patch literal 14788 zcmeI3e{2(F7{?DZ1GW%}kbvm)C>Vv%-d#(#_R@BYcDMyQno(gW3BBFDTMyb^?Oka% zkiZr-U}Ay^Y6Q(d0?|ZNh?+9XCEnF5~ zEw(%tSqF%|9LG@!$^u8m&s&o8HY_v^>BjQ?dEtpXSZ9i!m9Ts3@K|(=nL~f z#^VH#E~nI_p=t@%j4O3%X~S!=n2Cy4;lAR@VxojzV23GkSt-d0HlC~Iq{u~|WI7eg zElrU*6hm>8Fm&uERP{?nHAB;*+9WB9(~~B~H39c$)-=FI$_R)1}LeVn%Vh>m8QmS_;8VX1T^5K4TS*;bkG8!^2e@241;N6WbEHAthwg7VzN#o2n|JgXbHShDKy{^A6eC zEiG%Xc6ITR)zPK!c2}2MaW%Md5Q9PJJ|T2KlhfvIDTG#TGc<6Y5PEe=#V4H<0~&Mn zx0|9$mESAe zD?LJL7R5RPD&D`k*_A>=!KZSfs^j{}9Kl4vF<&b1b)KtaeiT0};O7*s_@Gi=ljjwXRLh&IJVL<9vC7on3(_Fk6c-T@6i{4{2GORth=`zo;(|1YHpN9m1O*fq zq(QVPE+Qf*ptv9nqD^rT5kUdP1!)j%ii?N{3Mei}gJ@G+L_|q$sK>@`D zX%Ow3;;JpZ`iBzueZLHTvG1?XmcN2u3S{Nhjv&MIJ0=~90CGlNI!4-NBsHtv}7Ky7G-ZR>ODU}V?3U(RSf z^;64RzGb5e4(}W}*5kUqR-CzN+x{1)ouAsg;p)IQ%Z1SeU!B<7e(&jL?+Z) zvGw_1`d+|4tZleu@uA`9zM-0-!`}~x_4ll8JC(li!{~Q4Z`%jz_VmAbq`q(HKzvge zjn-^f{Ovon{66d8lH>nO+57q3M}NMseUanLm1|>DFCFK1Hk~|HCp^+rcjd_+?_w@| W_(uN@7e8XYXW7=$9yq!p(*GaK^Ce0E literal 0 HcmV?d00001 From f17f51cce3665f85d33621f102655e6ec5ea79a5 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Wed, 8 Jun 2022 16:37:38 -0600 Subject: [PATCH 2/4] Fixed formatting whitespace issues on cod.lua and salmon.lua --- mods/ENTITIES/extra_mobs/cod.lua | 94 ++++++++++++++--------------- mods/ENTITIES/extra_mobs/salmon.lua | 66 ++++++++++---------- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/mods/ENTITIES/extra_mobs/cod.lua b/mods/ENTITIES/extra_mobs/cod.lua index b9c5bf5e3..b9f52fbaa 100644 --- a/mods/ENTITIES/extra_mobs/cod.lua +++ b/mods/ENTITIES/extra_mobs/cod.lua @@ -30,26 +30,26 @@ local S = minetest.get_translator("extra_mobs") --################### local cod = { - type = "animal", - spawn_class = "water", - can_despawn = true, - passive = true, - hp_min = 3, - hp_max = 3, - xp_min = 1, - xp_max = 3, - armor = 100, + type = "animal", + spawn_class = "water", + can_despawn = true, + passive = true, + hp_min = 3, + hp_max = 3, + xp_min = 1, + xp_max = 3, + armor = 100, rotate = 270, - tilt_swim = true, - collisionbox = {-0.3, 0.0, -0.3, 0.3, 0.79, 0.3}, - visual = "mesh", - mesh = "extra_mobs_cod.b3d", - textures = { - {"extra_mobs_cod.png"} - }, - sounds = { - }, - animation = { + tilt_swim = true, + collisionbox = {-0.3, 0.0, -0.3, 0.3, 0.79, 0.3}, + visual = "mesh", + mesh = "extra_mobs_cod.b3d", + textures = { + {"extra_mobs_cod.png"} + }, + sounds = { + }, + animation = { stand_start = 1, stand_end = 20, walk_start = 1, @@ -57,44 +57,44 @@ local cod = { run_start = 1, run_end = 20, }, - drops = { + drops = { {name = "mcl_fishing:fish_raw", chance = 1, min = 1, max = 1,}, - {name = "mcl_dye:white", + {name = "mcl_dye:white", chance = 20, min = 1, max = 1,}, }, - visual_size = {x=3, y=3}, - makes_footstep_sound = false, - swim = true, - breathes_in_water = true, - jump = false, - view_range = 16, - runaway = true, - fear_height = 4, - do_custom = function(self) - self.object:set_bone_position("body", vector.new(0,1,0), vector.new(degrees(dir_to_pitch(self.object:get_velocity())) * -1 + 90,0,0)) - if minetest.get_item_group(self.standing_in, "water") ~= 0 then + visual_size = {x=3, y=3}, + makes_footstep_sound = false, + swim = true, + breathes_in_water = true, + jump = false, + view_range = 16, + runaway = true, + fear_height = 4, + do_custom = function(self) + self.object:set_bone_position("body", vector.new(0,1,0), vector.new(degrees(dir_to_pitch(self.object:get_velocity())) * -1 + 90,0,0)) + if minetest.get_item_group(self.standing_in, "water") ~= 0 then if self.object:get_velocity().y < 2.5 then - self.object:add_velocity({ x = 0 , y = math.random(-.002, .002) , z = 0 }) + self.object:add_velocity({ x = 0 , y = math.random(-.002, .002) , z = 0 }) end - end - for _,object in pairs(minetest.get_objects_inside_radius(self.object:get_pos(), 10)) do - local lp = object:get_pos() - local s = self.object:get_pos() - local vec = { - x = lp.x - s.x, - y = lp.y - s.y, - z = lp.z - s.z - } - if object and not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "extra_mobs:cod" then - self.state = "runaway" - self.object:set_rotation({x=0,y=(atan(vec.z / vec.x) + 3 * pi / 2) - self.rotate,z=0}) - end - end + end + for _,object in pairs(minetest.get_objects_inside_radius(self.object:get_pos(), 10)) do + local lp = object:get_pos() + local s = self.object:get_pos() + local vec = { + x = lp.x - s.x, + y = lp.y - s.y, + z = lp.z - s.z + } + if object and not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "extra_mobs:cod" then + self.state = "runaway" + self.object:set_rotation({x=0,y=(atan(vec.z / vec.x) + 3 * pi / 2) - self.rotate,z=0}) + end + end end, on_rightclick = function(self, clicker) if clicker:get_wielded_item():get_name() == "mcl_buckets:bucket_water" then diff --git a/mods/ENTITIES/extra_mobs/salmon.lua b/mods/ENTITIES/extra_mobs/salmon.lua index fba81e4db..7ef9a8d36 100644 --- a/mods/ENTITIES/extra_mobs/salmon.lua +++ b/mods/ENTITIES/extra_mobs/salmon.lua @@ -10,26 +10,26 @@ local S = minetest.get_translator("extra_mobs") --################### local salmon = { - type = "animal", - spawn_class = "water", - can_despawn = true, - passive = true, - hp_min = 3, - hp_max = 3, - xp_min = 1, - xp_max = 3, - armor = 100, - rotate = 270, - tilt_swim = true, - collisionbox = {-0.4, 0.0, -0.4, 0.4, 0.79, 0.4}, - visual = "mesh", - mesh = "extra_mobs_salmon.b3d", - textures = { - {"extra_mobs_salmon.png"} - }, - sounds = { - }, - animation = { + type = "animal", + spawn_class = "water", + can_despawn = true, + passive = true, + hp_min = 3, + hp_max = 3, + xp_min = 1, + xp_max = 3, + armor = 100, + rotate = 270, + tilt_swim = true, + collisionbox = {-0.4, 0.0, -0.4, 0.4, 0.79, 0.4}, + visual = "mesh", + mesh = "extra_mobs_salmon.b3d", + textures = { + {"extra_mobs_salmon.png"} + }, + sounds = { + }, + animation = { stand_start = 1, stand_end = 20, walk_start = 1, @@ -37,29 +37,29 @@ local salmon = { run_start = 1, run_end = 20, }, - drops = { + drops = { {name = "mcl_fishing:salmon_raw", chance = 1, min = 1, max = 1,}, - {name = "mcl_dye:white", + {name = "mcl_dye:white", chance = 20, min = 1, max = 1,}, }, - visual_size = {x=3, y=3}, - makes_footstep_sound = false, - swim = true, - breathes_in_water = true, - jump = false, - view_range = 16, - runaway = true, - fear_height = 4, + visual_size = {x=3, y=3}, + makes_footstep_sound = false, + swim = true, + breathes_in_water = true, + jump = false, + view_range = 16, + runaway = true, + fear_height = 4, 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_salmon") - awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing") + self.object:remove() + clicker:set_wielded_item("mcl_fishing:bucket_salmon") + awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing") end end } From 43e73e2856ea1e10a7c1f8edf285f7e6678f813a Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Thu, 9 Jun 2022 09:47:24 -0600 Subject: [PATCH 3/4] Updated Translate Template and fixed the fish bucket definitions to work with the translation --- mods/ITEMS/mcl_fishing/init.lua | 8 ++++---- mods/ITEMS/mcl_fishing/locale/template.txt | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index 39919dbd3..7a5c7d701 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -525,10 +525,10 @@ for _, fish in ipairs(fish_names) do end, source_take = {"extra_mobs:" .. fish}, inventory_image = fish .. "_bucket.png", - name = S("Bucket of " .. fish), - longdesc = S("This bucket is filled with water and " .. fish .. "."), - usagehelp = S("Place it to empty the bucket and place a " .. fish .. ". Obtain by right clicking on a " .. fish .. " fish with a bucket of water."), - tt_help = S("Places a water source and " .. fish .. "."), + name = S("Bucket of @1", S(fish)), + longdesc = S("This bucket is filled with water and @1.", S(fish)), + usagehelp = S("Place it to empty the bucket and place a @1. Obtain by right clicking on a @2 fish with a bucket of water.", S(fish), S(fish)), + tt_help = S("Places a water source and a @1 fish.", S(fish)), extra_check = function(pos, placer) return true, true end, diff --git a/mods/ITEMS/mcl_fishing/locale/template.txt b/mods/ITEMS/mcl_fishing/locale/template.txt index a1544666b..200f5e145 100644 --- a/mods/ITEMS/mcl_fishing/locale/template.txt +++ b/mods/ITEMS/mcl_fishing/locale/template.txt @@ -16,3 +16,9 @@ Pufferfish= Pufferfish are a common species of fish and can be obtained by fishing. They can technically be eaten, but they are very bad for humans. Eating a pufferfish only restores 1 hunger point and will poison you very badly (which drains your health non-fatally) and causes serious food poisoning (which increases your hunger).= Catches fish in water= Very poisonous= +cod= +salmon= +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.= From 977a77f871d35e105ede4af90beca0a73e2e0594 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Thu, 9 Jun 2022 13:04:36 -0600 Subject: [PATCH 4/4] Fixed some more white space formating in cod.lua --- mods/ENTITIES/extra_mobs/cod.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/ENTITIES/extra_mobs/cod.lua b/mods/ENTITIES/extra_mobs/cod.lua index b9f52fbaa..9813d67e7 100644 --- a/mods/ENTITIES/extra_mobs/cod.lua +++ b/mods/ENTITIES/extra_mobs/cod.lua @@ -78,10 +78,10 @@ local cod = { do_custom = function(self) self.object:set_bone_position("body", vector.new(0,1,0), vector.new(degrees(dir_to_pitch(self.object:get_velocity())) * -1 + 90,0,0)) if minetest.get_item_group(self.standing_in, "water") ~= 0 then - if self.object:get_velocity().y < 2.5 then - self.object:add_velocity({ x = 0 , y = math.random(-.002, .002) , z = 0 }) - end - end + if self.object:get_velocity().y < 2.5 then + self.object:add_velocity({ x = 0 , y = math.random(-.002, .002) , z = 0 }) + end + end for _,object in pairs(minetest.get_objects_inside_radius(self.object:get_pos(), 10)) do local lp = object:get_pos() local s = self.object:get_pos()