diff --git a/df_achievements/dig.lua b/df_achievements/dig.lua index 02c88f1..906e44c 100644 --- a/df_achievements/dig.lua +++ b/df_achievements/dig.lua @@ -14,7 +14,7 @@ awards.register_achievement("dfcaverns_destroyed_gas_seep", { awards.register_achievement("dfcaverns_giant_web", { title = S("Collect Giant Webbing"), description = S(""), - --icon =, + icon ="dfcaverns_awards_backgroundx32.png^big_webs_item.png^dfcaverns_awards_foregroundx32.png", trigger = { type = "dig", node = "big_webs:webbing", @@ -22,23 +22,24 @@ awards.register_achievement("dfcaverns_giant_web", { }, }) -awards.register_achievement("dfcaverns_glow_worms", { - title = S("Collect Glow Worms"), - description = S(""), - --icon =, - trigger = { - type = "dig", - node = "df_mapitems:glow_worm", - target = 1 - }, -}) +-- too common +--awards.register_achievement("dfcaverns_glow_worms", { +-- title = S("Collect Glow Worms"), +-- description = S(""), +-- icon =, +-- trigger = { +-- type = "dig", +-- node = "df_mapitems:glow_worm", +-- target = 1 +-- }, +--}) --------------------------------------------------------------- awards.register_achievement("dfcaverns_cave_pearls", { title = S("Collect Cave Pearls"), description = S(""), - --icon =, + icon = "dfcaverns_awards_backgroundx32.png^dfcaverns_cave_pearls_achievement.png^dfcaverns_awards_foregroundx32.png", trigger = { type = "dig", node = "df_mapitems:cave_pearls", @@ -49,7 +50,7 @@ awards.register_achievement("dfcaverns_cave_pearls", { awards.register_achievement("dfcaverns_castle_coral", { title = S("Collect Castle Coral"), description = S(""), - --icon =, + icon ="dfcaverns_awards_backgroundx32.png^dfcaverns_castle_coral_achievement.png^dfcaverns_awards_foregroundx32.png", trigger = { type = "dig", node = "df_mapitems:castle_coral", @@ -71,7 +72,7 @@ awards.register_achievement("dfcaverns_ruby_crystals", { awards.register_achievement("dfcaverns_cave_coral", { title = S("Collect Cave Coral"), description = S(""), - --icon =, + icon ="dfcaverns_awards_backgroundx32.png^dfcaverns_cave_coral_achievement.png^dfcaverns_awards_foregroundx32.png", trigger = { type = "dig", node = "group:dfcaverns_cave_coral", @@ -82,7 +83,7 @@ awards.register_achievement("dfcaverns_cave_coral", { awards.register_achievement("dfcaverns_flawless_mese", { title = S("Collect Flawless Mese Crystal Block"), description = S(""), - --icon =, + icon ="dfcaverns_awards_backgroundx32.png^dfcaverns_glowmese_achievement.png^dfcaverns_awards_foregroundx32.png", trigger = { type = "dig", node = "df_mapitems:glow_mese", @@ -93,7 +94,7 @@ awards.register_achievement("dfcaverns_flawless_mese", { awards.register_achievement("dfcaverns_luminous_salt", { title = S("Collect Luminous Salt Crystal"), description = S(""), - --icon =, + icon ="dfcaverns_awards_backgroundx32.png^dfcaverns_salt_achievement.png^dfcaverns_awards_foregroundx32.png", trigger = { type = "dig", node = "df_mapitems:salt_crystal", @@ -104,7 +105,7 @@ awards.register_achievement("dfcaverns_luminous_salt", { awards.register_achievement("dfcaverns_glow_amethyst", { title = S("Collect Glowing Amethyst"), description = S(""), - --icon =, + icon ="dfcaverns_awards_backgroundx32.png^dfcaverns_amethyst_achievement.png^dfcaverns_awards_foregroundx32.png", trigger = { type = "dig", node = "df_underworld_items:glow_amethyst", @@ -113,9 +114,9 @@ awards.register_achievement("dfcaverns_glow_amethyst", { }) awards.register_achievement("dfcaverns_glow_stone", { - title = S('"Collect" Glow Stone'), + title = S('"Collect" Lightseam Stone'), description = S(""), - --icon =, + icon ="dfcaverns_awards_backgroundx32.png^dfcaverns_glowstone_achievement.png^dfcaverns_awards_foregroundx32.png", trigger = { type = "dig", node = "df_underworld_items:glowstone", diff --git a/df_achievements/farming.lua b/df_achievements/farming.lua index 9c0f9a7..17e13c2 100644 --- a/df_achievements/farming.lua +++ b/df_achievements/farming.lua @@ -8,7 +8,6 @@ local coal_ore = "(".. df_dependencies.texture_stone .."^".. df_dependencies.tex local make_texture = function(plant_texture, bg_tex) bg_tex = bg_tex or soil_texture - plant_texture = plant_texture or "dfcaverns_black_cap_sapling.png" return "dfcaverns_awards_backgroundx32.png^[combine:32x32:3,4="..bg_tex.."^[combine:32x32:3,2="..plant_texture.."^[combine:32x32:14,13="..hoe_texture.."^dfcaverns_awards_foregroundx32.png" end @@ -23,7 +22,7 @@ local plant_node_achievements = ["df_trees:spore_tree_sapling"] = {achievement="dfcaverns_plant_spore_tree", title=S("Plant Spore Tree"), desc=S(""), icon=make_texture("dfcaverns_spore_tree_sapling.png")}, ["df_trees:tower_cap_sapling"] = {achievement="dfcaverns_plant_tower_cap", title=S("Plant Tower Cap"), desc=S(""), icon=make_texture("dfcaverns_tower_cap_sapling.png")}, ["df_trees:tunnel_tube_sapling"] = {achievement="dfcaverns_plant_tunnel_tube", title=S("Plant Tunnel Tube"), desc=S(""), icon=make_texture("dfcaverns_tunnel_tube_sapling.png")}, - ["df_trees:torchspine_ember"] = {achievement="dfcaverns_plant_torchspine", title=S("Plant Torchspine"), desc=S(""), icon=make_texture("dfcaverns_torchspine_achievement.png")}, + ["df_trees:torchspine_ember"] = {achievement="dfcaverns_plant_torchspine", title=S("Plant Torchspine"), desc=S(""), icon=make_texture("dfcaverns_torchspine_achievement.png", coal_ore)}, ["df_trees:spindlestem_seedling"] = {achievement="dfcaverns_plant_spindlestem", title=S("Plant Spindlestem"), desc=S(""), icon=make_texture("dfcaverns_spindlestem_achievement.png")}, ["df_trees:blood_thorn"] = {achievement="dfcaverns_plant_bloodthorn", title=S("Plant Bloodthorn"), desc=S(""), icon=make_texture("dfcaverns_bloodthorn_achievement.png")}, ["df_primordial_items:giant_hypha_apical_meristem"] = {achievement="dfcaverns_plant_giant_mycelium", title=S("Plant Primordial Mycelium"), desc=S(""), icon=make_texture("dfcaverns_mush_soil.png")}, diff --git a/df_achievements/food.lua b/df_achievements/food.lua index 0c7a87d..b52fa39 100644 --- a/df_achievements/food.lua +++ b/df_achievements/food.lua @@ -64,10 +64,11 @@ if minetest.get_modpath("df_primordial_items") then }, }) +-- too mundane compared to the other achievements -- awards.register_achievement("dfcaverns_diced_mushroom", { -- title = S("Eat Diced Mushroom"), -- description = S(""), --- --icon =, +-- icon =, -- trigger = { -- type = "eat", -- item = "df_primordial_items:diced_mushroom", diff --git a/df_achievements/misc.lua b/df_achievements/misc.lua index bdefcd9..25a85dc 100644 --- a/df_achievements/misc.lua +++ b/df_achievements/misc.lua @@ -5,7 +5,7 @@ if df_dependencies.node_name_glass_bottle then awards.register_achievement("dfcaverns_captured_ice_sprite", { title = S("Capture an Ice Sprite"), description = S("You've captured an ice sprite and placed it in a bottle. It dances and sparkles and sheds light through the frosted glass while making a faint tinkling sound. Pretty."), - --icon =, + icon = "dfcaverns_awards_backgroundx32.png^ice_sprites_bottle.png^dfcaverns_awards_foregroundx32.png", trigger = { type = "craft", item = "ice_sprites:ice_sprite_bottle", @@ -20,7 +20,7 @@ end awards.register_achievement("dfcaverns_punched_veinstone", { title = S("Punch Veinstone"), description = S(""), - --icon =, + icon = "dfcaverns_awards_backgroundx32.png^((".. df_dependencies.texture_stone .. "^dfcaverns_veins.png)^[resize:32x32)^dfcaverns_awards_foregroundx32.png", }) if minetest.get_modpath("df_underworld_items") then @@ -33,7 +33,8 @@ if minetest.get_modpath("df_underworld_items") then awards.register_achievement("dfcaverns_attacked_by_guardian_statue", { title = S("Get Attacked by an Underworld Guardian"), description = S(""), - --icon =, + icon = "dfcaverns_awards_backgroundx32.png^dfcaverns_guardian_achievement.png^dfcaverns_awards_foregroundx32.png", + secret=true, }) end @@ -44,7 +45,7 @@ if minetest.get_modpath("df_underworld_items") then awards.register_achievement("dfcaverns_solved_puzzle_seal", { title = S("Solve a Puzzle Seal"), description = S(""), - --icon =, + icon = "dfcaverns_puzzle_seal_solvedx32.png^dfcaverns_awards_foregroundx32.png", }) df_underworld_items.slade_breacher_triggered = function(pos, player) @@ -53,7 +54,7 @@ if minetest.get_modpath("df_underworld_items") then awards.register_achievement("dfcaverns_triggered_slade_breacher", { title = S("Trigger a Slade Breacher"), description = S(""), - --icon =, + icon = "dfcaverns_puzzle_seal_activex32.png^dfcaverns_awards_foregroundx32.png", secret=true, }) @@ -63,13 +64,14 @@ if minetest.get_modpath("df_underworld_items") then awards.register_achievement("dfcaverns_repaired_lantern", { title = S("Repair an Ancient Lantern"), description = S(""), - --icon =, + icon = "dfcaverns_awards_backgroundx32.png^((dfcaverns_slade_brick.png^(" .. df_dependencies.texture_meselamp .. "^[mask:dfcaverns_lantern_mask.png))^[resize:32x32)^dfcaverns_awards_foregroundx32.png", + secret=true, }) -- awards.register_achievement("dfcaverns_repaired_100_lanterns", { -- title = S("Repair 100 Ancient Lanterns"), -- description = S(""), --- --icon =, +-- icon =, -- }) end @@ -79,17 +81,17 @@ end --awards.register_achievement("dfcaverns_torch_detonated_mine_gas", { -- title = S("Detonate Mine Gas"), -- description = S(""), --- --icon =, +-- icon =, --}) --awards.register_achievement("dfcaverns_looted_underworld_bones", { -- title = S("Loot Ancient Warrior Bones"), -- description = S(""), --- --icon =, +-- icon =, --}) -- --awards.register_achievement("dfcaverns_looted_100_underworld_bones", { -- title = S("Loot 100 Ancient Warrior Bones"), -- description = S(""), --- --icon =, +-- icon =, --}) diff --git a/df_achievements/textures/dfcaverns_amethyst_achievement.png b/df_achievements/textures/dfcaverns_amethyst_achievement.png new file mode 100644 index 0000000..c5b2ac5 Binary files /dev/null and b/df_achievements/textures/dfcaverns_amethyst_achievement.png differ diff --git a/df_achievements/textures/dfcaverns_awards_foregroundx32.png b/df_achievements/textures/dfcaverns_awards_foregroundx32.png index df60df8..fbebb9d 100644 Binary files a/df_achievements/textures/dfcaverns_awards_foregroundx32.png and b/df_achievements/textures/dfcaverns_awards_foregroundx32.png differ diff --git a/df_achievements/textures/dfcaverns_bloodthorn_achievement.png b/df_achievements/textures/dfcaverns_bloodthorn_achievement.png index 99214e4..6abee2f 100644 Binary files a/df_achievements/textures/dfcaverns_bloodthorn_achievement.png and b/df_achievements/textures/dfcaverns_bloodthorn_achievement.png differ diff --git a/df_achievements/textures/dfcaverns_castle_coral_achievement.png b/df_achievements/textures/dfcaverns_castle_coral_achievement.png new file mode 100644 index 0000000..9edf90d Binary files /dev/null and b/df_achievements/textures/dfcaverns_castle_coral_achievement.png differ diff --git a/df_achievements/textures/dfcaverns_cave_coral_achievement.png b/df_achievements/textures/dfcaverns_cave_coral_achievement.png new file mode 100644 index 0000000..d54fe3e Binary files /dev/null and b/df_achievements/textures/dfcaverns_cave_coral_achievement.png differ diff --git a/df_achievements/textures/dfcaverns_cave_pearls_achievement.png b/df_achievements/textures/dfcaverns_cave_pearls_achievement.png new file mode 100644 index 0000000..f062fe8 Binary files /dev/null and b/df_achievements/textures/dfcaverns_cave_pearls_achievement.png differ diff --git a/df_achievements/textures/dfcaverns_glowmese_achievement.png b/df_achievements/textures/dfcaverns_glowmese_achievement.png new file mode 100644 index 0000000..74fbb33 Binary files /dev/null and b/df_achievements/textures/dfcaverns_glowmese_achievement.png differ diff --git a/df_achievements/textures/dfcaverns_glowstone_achievement.png b/df_achievements/textures/dfcaverns_glowstone_achievement.png new file mode 100644 index 0000000..4286351 Binary files /dev/null and b/df_achievements/textures/dfcaverns_glowstone_achievement.png differ diff --git a/df_achievements/textures/dfcaverns_guardian_achievement.png b/df_achievements/textures/dfcaverns_guardian_achievement.png new file mode 100644 index 0000000..e2e987f Binary files /dev/null and b/df_achievements/textures/dfcaverns_guardian_achievement.png differ diff --git a/df_achievements/textures/dfcaverns_plump_helmet_achievement.png b/df_achievements/textures/dfcaverns_plump_helmet_achievement.png index a82307c..50cadfc 100644 Binary files a/df_achievements/textures/dfcaverns_plump_helmet_achievement.png and b/df_achievements/textures/dfcaverns_plump_helmet_achievement.png differ diff --git a/df_achievements/textures/dfcaverns_puzzle_seal_activex32.png b/df_achievements/textures/dfcaverns_puzzle_seal_activex32.png new file mode 100644 index 0000000..33f93e2 Binary files /dev/null and b/df_achievements/textures/dfcaverns_puzzle_seal_activex32.png differ diff --git a/df_achievements/textures/dfcaverns_puzzle_seal_solvedx32.png b/df_achievements/textures/dfcaverns_puzzle_seal_solvedx32.png new file mode 100644 index 0000000..9405611 Binary files /dev/null and b/df_achievements/textures/dfcaverns_puzzle_seal_solvedx32.png differ diff --git a/df_achievements/textures/dfcaverns_salt_achievement.png b/df_achievements/textures/dfcaverns_salt_achievement.png new file mode 100644 index 0000000..da33b96 Binary files /dev/null and b/df_achievements/textures/dfcaverns_salt_achievement.png differ diff --git a/df_achievements/textures/dfcaverns_spindlestem_achievement.png b/df_achievements/textures/dfcaverns_spindlestem_achievement.png index f767e34..433a7f3 100644 Binary files a/df_achievements/textures/dfcaverns_spindlestem_achievement.png and b/df_achievements/textures/dfcaverns_spindlestem_achievement.png differ diff --git a/df_underworld_items/ancient_lanterns.lua b/df_underworld_items/ancient_lanterns.lua index 8944bc8..faa4335 100644 --- a/df_underworld_items/ancient_lanterns.lua +++ b/df_underworld_items/ancient_lanterns.lua @@ -51,6 +51,7 @@ local punch_fix = function(pos, node, puncher, pointed_thing) wielded:take_item() puncher:set_wielded_item(wielded) end + df_underworld_items.ancient_lantern_fixed(pos, puncher) return end minetest.node_punch(pos, node, puncher, pointed_thing)