Merge pull request 'Buckets of Fish' (#335) from PrairieAstronomer/MineClone5:fish_bucket into master

Reviewed-on: MineClone5/MineClone5#335
This commit is contained in:
commit 6aef455fbc
10 changed files with 129 additions and 80 deletions

View File

@ -95,6 +95,13 @@ local cod = {
self.object:set_rotation({x=0,y=(atan(vec.z / vec.x) + 3 * pi / 2) - self.rotate,z=0}) self.object:set_rotation({x=0,y=(atan(vec.z / vec.x) + 3 * pi / 2) - self.rotate,z=0})
end 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 end
} }

View File

@ -55,6 +55,13 @@ local salmon = {
view_range = 16, view_range = 16,
runaway = true, runaway = true,
fear_height = 4, 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) mobs:register_mob("extra_mobs:salmon", salmon)

View File

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

View File

@ -253,6 +253,13 @@ awards.register_achievement("mcl:fishyBusiness", {
icon = "mcl_armor_inv_chestplate_netherite.png", 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.) -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.)
if non_pc_achievements then if non_pc_achievements then

View File

@ -512,3 +512,25 @@ minetest.register_on_item_eat(function (hp_change, replace_with_item, itemstack,
end end
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 @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,
})
end

View File

@ -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).= 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= Catches fish in water=
Very poisonous= 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.=

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB