chmodsayshello
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge beacon-branch into fork beacon branch #7

Merged
chmodsayshello merged 453 commits from VoxeLibre/VoxeLibre:beacons into beacon-"fork" 2022-07-23 11:30:49 +02:00
Conversation 0 Commits 453 Files Changed 366 +11
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eb72bb81da - Show all commits

7
mods/HUD/mcl_achievements/init.lua
View File

@ -201,6 +201,13 @@ awards.register_achievement("mcl:whatAdeal", {
icon = "mcl_core_emerald.png", icon = "mcl_core_emerald.png",
}) })
-- Triggered in mcl_fishing
awards.register_achievement("mcl:fishyBusiness", {
title = S("Fishy Business"),
description = S("Catch a fish. \nHint: Catch a fish, salmon, clownfish, or pufferfish."),
icon = "mcl_fishing_fishing_rod.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

4
mods/ITEMS/mcl_fishing/init.lua
View File

@ -75,6 +75,7 @@ local fish = function(itemstack, player, pointed_thing)
stacks_min = 1, stacks_min = 1,
stacks_max = 1, stacks_max = 1,
}, pr) }, pr)
awards.unlock(player:get_player_name(), "mcl:fishyBusiness")
elseif r <= junk_value then elseif r <= junk_value then
-- Junk -- Junk
items = mcl_loot.get_loot({ items = mcl_loot.get_loot({
@ -124,6 +125,9 @@ local fish = function(itemstack, player, pointed_thing)
local inv = player:get_inventory() local inv = player:get_inventory()
if inv:room_for_item("main", item) then if inv:room_for_item("main", item) then
inv:add_item("main", item) inv:add_item("main", item)
if item:get_name() == "mcl_mobitems:leather" then
awards.unlock(player:get_player_name(), "mcl:killCow")
end
else else
minetest.add_item(pos, item) minetest.add_item(pos, item)
end end