From 687bc0456055b561494de8f1f8c075b91b2e387a Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Fri, 1 Jul 2022 12:39:10 -0600 Subject: [PATCH 01/10] Who is Cutting Onions? Advancement --- mods/ENTITIES/mcl_item_entity/init.lua | 1 + mods/HUD/mcl_achievements/init.lua | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/mods/ENTITIES/mcl_item_entity/init.lua b/mods/ENTITIES/mcl_item_entity/init.lua index c0fbf4b15..b31500fc4 100644 --- a/mods/ENTITIES/mcl_item_entity/init.lua +++ b/mods/ENTITIES/mcl_item_entity/init.lua @@ -59,6 +59,7 @@ mcl_item_entity.register_pickup_achievement("tree", "mcl:mineWood") mcl_item_entity.register_pickup_achievement("mcl_mobitems:blaze_rod", "mcl:blazeRod") mcl_item_entity.register_pickup_achievement("mcl_mobitems:leather", "mcl:killCow") mcl_item_entity.register_pickup_achievement("mcl_core:diamond", "mcl:diamonds") +mcl_item_entity.register_pickup_achievement("mcl_core:crying_obsidian", "mcl:whosCuttingOnions") local function check_pickup_achievements(object, player) if has_awards then diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 91764b3e5..a89dc9381 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -136,6 +136,12 @@ awards.register_achievement("mcl:mineWood", { icon = "default_tree.png", }) +awards.register_achievement("mcl:whosCuttingOnions", { + title = S("Who is Cutting Onions?"), + description = S("Pick up a crying obsidian from the floor."), + icon = "default_obsidian.png^mcl_core_crying_obsidian.png", +}) + -- Smelting achivements: These are awarded when picking up an item from a furnace -- output. They are given in mcl_furnaces. awards.register_achievement("mcl:acquireIron", { From 40a421ddd0def347e10f0d20e25675f3ac4dbc0f Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Fri, 1 Jul 2022 12:41:01 -0600 Subject: [PATCH 02/10] Hidden in the Depths Advancement --- mods/ENTITIES/mcl_item_entity/init.lua | 1 + mods/HUD/mcl_achievements/init.lua | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/mods/ENTITIES/mcl_item_entity/init.lua b/mods/ENTITIES/mcl_item_entity/init.lua index b31500fc4..fdf5489ff 100644 --- a/mods/ENTITIES/mcl_item_entity/init.lua +++ b/mods/ENTITIES/mcl_item_entity/init.lua @@ -60,6 +60,7 @@ mcl_item_entity.register_pickup_achievement("mcl_mobitems:blaze_rod", "mcl:blaze mcl_item_entity.register_pickup_achievement("mcl_mobitems:leather", "mcl:killCow") mcl_item_entity.register_pickup_achievement("mcl_core:diamond", "mcl:diamonds") mcl_item_entity.register_pickup_achievement("mcl_core:crying_obsidian", "mcl:whosCuttingOnions") +mcl_item_entity.register_pickup_achievement("mcl_nether:ancient_debris", "mcl:hiddenInTheDepths") local function check_pickup_achievements(object, player) if has_awards then diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index a89dc9381..84ef88243 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -142,6 +142,12 @@ awards.register_achievement("mcl:whosCuttingOnions", { icon = "default_obsidian.png^mcl_core_crying_obsidian.png", }) +awards.register_achievement("mcl:hiddenInTheDepths", { + title = S("Hidden in the Depths"), + description = S("Pick up an Ancient Debris from the floor."), + icon = "mcl_nether_ancient_debris_side.png", +}) + -- Smelting achivements: These are awarded when picking up an item from a furnace -- output. They are given in mcl_furnaces. awards.register_achievement("mcl:acquireIron", { From 8f7ac1e5a26c0cdd4c4bbf51dc18b74fe0e5920d Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Fri, 1 Jul 2022 13:11:26 -0600 Subject: [PATCH 03/10] Not Quite 'Nine' Lives Advancement --- mods/HUD/mcl_achievements/init.lua | 6 ++++++ mods/ITEMS/mcl_beds/respawn_anchor.lua | 3 +++ 2 files changed, 9 insertions(+) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 84ef88243..53b3a453a 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -206,6 +206,12 @@ awards.register_achievement("mcl:sweetDreams", { icon = "mcl_beds_bed_red.png", }) +awards.register_achievement("mcl:notQuiteNineLives", { + title = S('Not Quite "Nine" Lives'), + description = S("Charge a Respawn Anchor to the maximum."), + icon = "respawn_anchor_side4.png", +}) + -- Triggered in mobs_mc awards.register_achievement("mcl:whatAdeal", { title = S("What A Deal!"), diff --git a/mods/ITEMS/mcl_beds/respawn_anchor.lua b/mods/ITEMS/mcl_beds/respawn_anchor.lua index a19a986ce..bb36fe9d0 100644 --- a/mods/ITEMS/mcl_beds/respawn_anchor.lua +++ b/mods/ITEMS/mcl_beds/respawn_anchor.lua @@ -39,6 +39,9 @@ for i=0,4 do elseif string.match(node.name, "mcl_beds:respawn_anchor_charged_") then minetest.chat_send_player(player.get_player_name(player), S"New respawn position set!") mcl_spawn.set_spawn_pos(player, pos, nil) + if i == 4 then + awards.unlock(player:get_player_name(), "mcl:notQuiteNineLives") + end end end From 6757b8f9000ff90b6fbbe22d410f4b14b74feed8 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Fri, 1 Jul 2022 13:41:21 -0600 Subject: [PATCH 04/10] The Nether Advancement --- mods/HUD/mcl_achievements/init.lua | 6 ++++++ mods/ITEMS/mcl_portals/portal_nether.lua | 3 +++ 2 files changed, 9 insertions(+) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 53b3a453a..babd66aa3 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -192,6 +192,12 @@ awards.register_achievement("mcl:enterEndPortal", { icon = "mcl_end_end_stone.png", }) +awards.register_achievement("mcl:theNether", { + title = S("The Nether"), + description = S("Bring summer clothes.\nHint: Enter the Nether."), + icon = "mcl_nether_netherrack.png", +}) + -- Triggered in mcl_totems awards.register_achievement("mcl:postMortal", { title = S("Postmortal"), diff --git a/mods/ITEMS/mcl_portals/portal_nether.lua b/mods/ITEMS/mcl_portals/portal_nether.lua index 0d93e11d1..1dd34d007 100644 --- a/mods/ITEMS/mcl_portals/portal_nether.lua +++ b/mods/ITEMS/mcl_portals/portal_nether.lua @@ -427,6 +427,9 @@ local function finalize_teleport(obj, exit) mcl_worlds.dimension_change(obj, dim) minetest.sound_play("mcl_portals_teleport", {pos=exit, gain=0.5, max_hear_distance = 16}, true) log("action", "[mcl_portals] player "..name.." teleported to Nether portal at "..pos_to_string(exit)..".") + if dim == "nether" then + awards.unlock(obj:get_player_name(), "mcl:theNether") + end else log("action", "[mcl_portals] entity teleported to Nether portal at "..pos_to_string(exit)..".") end From acff3e525c6c4ce5cf889233ddb887a065101ab6 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Fri, 1 Jul 2022 13:45:07 -0600 Subject: [PATCH 05/10] Changed the Into the Nether achievement to the We Need to Go Deeper Advancement --- mods/HUD/mcl_achievements/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index babd66aa3..5fa43544c 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -181,9 +181,9 @@ awards.register_achievement("mcl:snipeSkeleton", { -- Triggered in mcl_portals awards.register_achievement("mcl:buildNetherPortal", { - title = S("Into the Nether"), + title = S("We Need to Go Deeper"), description = S("Use obsidian and a fire starter to construct a Nether portal."), - icon = "default_obsidian.png", + icon = "mcl_fire_flint_and_steel.png", }) awards.register_achievement("mcl:enterEndPortal", { From f998f3bc0520be3815368d3577c77638c377a2b7 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Fri, 1 Jul 2022 13:56:44 -0600 Subject: [PATCH 06/10] Updated Advancements Translation Template --- mods/HUD/mcl_achievements/locale/template.txt | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/mods/HUD/mcl_achievements/locale/template.txt b/mods/HUD/mcl_achievements/locale/template.txt index ecdba2672..80105f1f9 100644 --- a/mods/HUD/mcl_achievements/locale/template.txt +++ b/mods/HUD/mcl_achievements/locale/template.txt @@ -19,7 +19,7 @@ Getting an Upgrade= Hit a skeleton, wither skeleton or stray by bow and arrow from a distance of at least 20 meters.= Hot Topic= Into Fire= -Into the Nether= +We Need to Go Deeper= Iron Belly= Librarian= Mine emerald ore.= @@ -47,3 +47,25 @@ Use a crafting table to craft a wooden hoe from wooden planks and sticks.= Use a crafting table to craft a wooden pickaxe from wooden planks and sticks.= Use obsidian and a fire starter to construct a Nether portal.= Use wheat to craft a bread.= +Who is Cutting Onions?= +Pick up a crying obsidian from the floor.= +Hidden in the Depths= +Pick up an Ancient Debris from the floor.= +The Nether= +Bring summer clothes.@nHint: Enter the Nether.= +Isn't It Iron Pick= +Craft a iron pickaxe using sticks and iron.= +Postmortal= +Use a Totem of Undying to cheat death.= +Sweet Dreams= +Sleep in a bed to change your respawn point.= +Not Quite "Nine" Lives= +Charge a Respawn Anchor to the maximum.= +What A Deal!= +Successfully trade with a Villager.= +Fishy Business= +Catch a fish. @nHint: Catch a fish, salmon, clownfish, or pufferfish.= +Country Lode,@nTake Me Home= +Use a compass on a Lodestone.= +Serious Dedication= +Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices= From 4bfadffadc0884063b48f87f778c6ea345992565 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Fri, 1 Jul 2022 14:04:33 -0600 Subject: [PATCH 07/10] Fixed Minor Formating in Advancement Definitions --- mods/HUD/mcl_achievements/init.lua | 8 ++++---- mods/HUD/mcl_achievements/locale/template.txt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 5fa43544c..c6235963a 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -228,7 +228,7 @@ awards.register_achievement("mcl:whatAdeal", { -- 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."), + description = S("Catch a fish.\nHint: Catch a fish, salmon, clownfish, or pufferfish."), icon = "mcl_fishing_fishing_rod.png", }) @@ -241,9 +241,9 @@ awards.register_achievement("mcl:countryLode", { -- Triggered in mcl_smithing_table awards.register_achievement("mcl:seriousDedication", { - title = S("Serious Dedication"), - description = S("Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices"), - icon = "farming_tool_netheritehoe.png", + title = S("Serious Dedication"), + description = S("Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices."), + icon = "farming_tool_netheritehoe.png", }) -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) diff --git a/mods/HUD/mcl_achievements/locale/template.txt b/mods/HUD/mcl_achievements/locale/template.txt index 80105f1f9..240d97a28 100644 --- a/mods/HUD/mcl_achievements/locale/template.txt +++ b/mods/HUD/mcl_achievements/locale/template.txt @@ -64,8 +64,8 @@ Charge a Respawn Anchor to the maximum.= What A Deal!= Successfully trade with a Villager.= Fishy Business= -Catch a fish. @nHint: Catch a fish, salmon, clownfish, or pufferfish.= +Catch a fish.@nHint: Catch a fish, salmon, clownfish, or pufferfish.= Country Lode,@nTake Me Home= Use a compass on a Lodestone.= Serious Dedication= -Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices= +Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices.= From 2845cd79b7cd8427efd0a4f69e62fd522ba01e56 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Fri, 1 Jul 2022 14:37:02 -0600 Subject: [PATCH 08/10] Local Brewery Advancement --- mods/HUD/mcl_achievements/init.lua | 7 +++++++ mods/HUD/mcl_achievements/locale/template.txt | 2 ++ mods/ITEMS/mcl_brewing/init.lua | 3 +++ 3 files changed, 12 insertions(+) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index c6235963a..424cc1364 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -246,6 +246,13 @@ awards.register_achievement("mcl:seriousDedication", { icon = "farming_tool_netheritehoe.png", }) +-- Triggered in mcl_brewing +awards.register_achievement("mcl:localBrewery", { + title = S("Local Brewery"), + description = S("Brew a Potion.\nHint: Take a potion or glass bottle out of the brewing stand."), + icon = "mcl_potions_potion_overlay.png^[colorize:#F82423:"..tostring(127).."^mcl_potions_potion_bottle.png", +}) + -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) if non_pc_achievements then diff --git a/mods/HUD/mcl_achievements/locale/template.txt b/mods/HUD/mcl_achievements/locale/template.txt index 240d97a28..1fd4bc718 100644 --- a/mods/HUD/mcl_achievements/locale/template.txt +++ b/mods/HUD/mcl_achievements/locale/template.txt @@ -69,3 +69,5 @@ Country Lode,@nTake Me Home= Use a compass on a Lodestone.= Serious Dedication= Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices.= +Local Brewery= +Brew a Potion.@nHint: Take a potion or glass bottle out of the brewing stand.= diff --git a/mods/ITEMS/mcl_brewing/init.lua b/mods/ITEMS/mcl_brewing/init.lua index 2ff2a806f..9c6879430 100644 --- a/mods/ITEMS/mcl_brewing/init.lua +++ b/mods/ITEMS/mcl_brewing/init.lua @@ -369,6 +369,9 @@ local function allow_take(pos, listname, index, stack, player) minetest.record_protection_violation(pos, name) return 0 else + if listname == "stand" then + awards.unlock(name, "mcl:localBrewery") + end return stack:get_count() end end From 1abeccfaaba57bcdfd6cd88b4e907943dd08f957 Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Fri, 1 Jul 2022 14:50:56 -0600 Subject: [PATCH 09/10] Enchanter Advancement --- mods/HUD/mcl_achievements/init.lua | 7 +++++++ mods/ITEMS/mcl_enchanting/engine.lua | 1 + 2 files changed, 8 insertions(+) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index 424cc1364..987694310 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -253,6 +253,13 @@ awards.register_achievement("mcl:localBrewery", { icon = "mcl_potions_potion_overlay.png^[colorize:#F82423:"..tostring(127).."^mcl_potions_potion_bottle.png", }) +-- Triggered in mcl_enchanting +awards.register_achievement("mcl:enchanter", { + title = S("Enchanter"), + description = S("Enchant an item using an Enchantment Table."), + icon = "mcl_enchanting_book_enchanted.png", +}) + -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.) if non_pc_achievements then diff --git a/mods/ITEMS/mcl_enchanting/engine.lua b/mods/ITEMS/mcl_enchanting/engine.lua index 34fb55698..46a05abf9 100644 --- a/mods/ITEMS/mcl_enchanting/engine.lua +++ b/mods/ITEMS/mcl_enchanting/engine.lua @@ -576,6 +576,7 @@ function mcl_enchanting.handle_formspec_fields(player, formname, fields) minetest.sound_play("mcl_enchanting_enchant", {to_player = name, gain = 5.0}) mcl_enchanting.reset_table_slots(player) mcl_enchanting.show_enchanting_formspec(player) + awards.unlock(player:get_player_name(), "mcl:enchanter") end end From 9c3a4f3436180e937e4e7a0fd85f612dd0a8e96f Mon Sep 17 00:00:00 2001 From: PrairieAstronomer Date: Fri, 1 Jul 2022 14:54:44 -0600 Subject: [PATCH 10/10] Updated the Advancements translation template...again --- mods/HUD/mcl_achievements/locale/template.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/HUD/mcl_achievements/locale/template.txt b/mods/HUD/mcl_achievements/locale/template.txt index 1fd4bc718..cb97e5d00 100644 --- a/mods/HUD/mcl_achievements/locale/template.txt +++ b/mods/HUD/mcl_achievements/locale/template.txt @@ -71,3 +71,5 @@ Serious Dedication= Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices.= Local Brewery= Brew a Potion.@nHint: Take a potion or glass bottle out of the brewing stand.= +Enchanter= +Enchant an item using an Enchantment Table.=