diff --git a/3d_armor_quests/3d_armor.lua b/3d_armor_quests/3d_armor.lua index cd0b330..6dd59e5 100644 --- a/3d_armor_quests/3d_armor.lua +++ b/3d_armor_quests/3d_armor.lua @@ -17,88 +17,100 @@ local up = sys4_quests.updateQuest local mod = "3d_armor" local quests = sys4_quests.initQuests(mod, S) +----- Quests Groups ----- +local wood = "Wood Age" +local farm = "Farming Age" +local stone = "Stone Age" +local metal = "Metal Age" +local middle = "Middle Age" + ----- Quests with type="dig" ----- local t = "dig" -- cactus_digger ins(quests, { - 'cactus_digger', "Cactus Digger", nil, {'default:cactus'}, 4, {mod..':boots_cactus'}, "more_tools", type = t, custom_level = true + 'cactus_digger', "Cactus Digger", nil, {'default:cactus'}, 4, {mod..':boots_cactus'}, nil, type = t, custom_level = true, group = farm }) -- cactus_protection ins(quests, { - 'cactus_protection', "Cactus Protection", nil, {"default:cactus"}, 1, {mod..":helmet_cactus"}, "cactus_digger", type = t + 'cactus_protection', "Cactus Protection", nil, {"default:cactus"}, 1, {mod..":helmet_cactus"}, "cactus_digger", type = t, group = farm }) -- cactus_protection_lover ins(quests, { - 'cactus_protection_lover', "Cactus Protection Lover", nil, {"default:cactus"}, 1, {mod..":leggings_cactus"}, "cactus_protection", type = t + 'cactus_protection_lover', "Cactus Protection Lover", nil, {"default:cactus"}, 1, {mod..":leggings_cactus"}, "cactus_protection", type = t, group = farm }) -- cactus_protection_pro ins(quests, { - 'cactus_protection_pro', "Cactus Protection Pro", nil, {"default:cactus"}, 1, {mod..":chestplate_cactus"}, "cactus_protection_lover", type = t + 'cactus_protection_pro', "Cactus Protection Pro", nil, {"default:cactus"}, 1, {mod..":chestplate_cactus"}, "cactus_protection_lover", type = t, group = farm }) -- steel_protection ins(quests, { - 'steel_protection', "Steel Protection", nil, {"default:stone_with_iron"}, 1, {mod..":helmet_steel"}, "sword_crafter_lover", type = t + 'steel_protection', "Steel Protection", nil, {"default:stone_with_iron"}, 1, {mod..":helmet_steel"}, "sword_crafter_lover", type = t, group = metal }) -- steel_protection_lover ins(quests, { - 'steel_protection_lover', "Steel Protection Lover", nil, {"default:stone_with_iron"}, 1, {mod..":leggings_steel"}, "steel_protection", type = t + 'steel_protection_lover', "Steel Protection Lover", nil, {"default:stone_with_iron"}, 1, {mod..":leggings_steel"}, "steel_protection", type = t, group = metal }) -- steel_protection_pro ins(quests, { - 'steel_protection_pro', "Steel Protection Pro", nil, {"default:stone_with_iron"}, 1, {mod..":chestplate_steel"}, "steel_protection_lover", type = t + 'steel_protection_pro', "Steel Protection Pro", nil, {"default:stone_with_iron"}, 1, {mod..":chestplate_steel"}, "steel_protection_lover", type = t, group = metal }) -- gold_protection ins(quests, { - 'gold_protection', "Gold Protection", nil, {"default:stone_with_gold"}, 1, {mod..":helmet_gold"}, "sword_crafter_expert", type = t + 'gold_protection', "Gold Protection", nil, {"default:stone_with_gold"}, 4, {mod..":boots_gold"}, nil, type = t, custom_level = true, group = metal }) -- gold_protection_lover ins(quests, { - 'gold_protection_lover', "Gold Protection Lover", nil, {"default:stone_with_gold"}, 1, {mod..":leggings_gold"}, "gold_protection", type = t + 'gold_protection_lover', "Gold Protection Lover", nil, {"default:stone_with_gold"}, 1, {mod..":helmet_gold"}, "gold_protection", type = t, group = metal }) -- gold_protection_pro ins(quests, { - 'gold_protection_pro', "Gold Protection Pro", nil, {"default:stone_with_gold"}, 1, {mod..":chestplate_gold"}, "gold_protection_lover", type = t + 'gold_protection_pro', "Gold Protection Pro", nil, {"default:stone_with_gold"}, 1, {mod..":leggings_gold"}, "gold_protection_lover", type = t, group = metal + }) + +-- gold_protection_expert +ins(quests, { + 'gold_protection_expert', "Gold Protection Expert", nil, {"default:stone_with_gold"}, 1, {mod..":chestplate_gold"}, "gold_protection_pro", type = t, group = metal }) -- diamond_protection ins(quests, { - 'diamond_protection', "Diamond Protection", nil, {"default:stone_with_diamond"}, 1, {mod..":helmet_diamond"}, "sword_crafter_master", type = t + 'diamond_protection', "Diamond Protection", nil, {"default:stone_with_diamond"}, 1, {mod..":helmet_diamond"}, "sword_crafter_expert", type = t, group = middle }) -- diamond_protection_lover ins(quests, { - 'diamond_protection_lover', "Diamond Protection Lover", nil, {"default:stone_with_diamond"}, 1, {mod..":leggings_diamond"}, "diamond_protection", type = t + 'diamond_protection_lover', "Diamond Protection Lover", nil, {"default:stone_with_diamond"}, 1, {mod..":leggings_diamond"}, "diamond_protection", type = t, group = middle }) -- diamond_protection_pro ins(quests, { - 'diamond_protection_pro', "Diamond Protection Pro", nil, {"default:stone_with_diamond"}, 1, {mod..":chestplate_diamond"}, "diamond_protection_lover", type = t + 'diamond_protection_pro', "Diamond Protection Pro", nil, {"default:stone_with_diamond"}, 1, {mod..":chestplate_diamond"}, "diamond_protection_lover", type = t, group = middle }) if minetest.get_modpath("moreores") then -- mithril_protection ins(quests, { - 'mithril_protection', "Mithril Protection", nil, {"moreores:mineral_mithril"}, 5, {mod..":helmet_mithril"}, "mithril_sword_crafter", type = t, custom_level = true + 'mithril_protection', "Mithril Protection", nil, {"moreores:mineral_mithril"}, 5, {mod..":helmet_mithril"}, "mithril_sword_crafter", type = t, custom_level = true, group = middle }) -- mithril_protection_lover ins(quests, { - 'mithril_protection_lover', "Mithril Protection Lover", nil, {"moreores:mineral_mithril"}, 7, {mod..":leggings_mithril"}, "mithril_protection", type = t, custom_level = true + 'mithril_protection_lover', "Mithril Protection Lover", nil, {"moreores:mineral_mithril"}, 7, {mod..":leggings_mithril"}, "mithril_protection", type = t, custom_level = true, group = middle }) -- mithril_protection_pro ins(quests, { - 'mithril_protection_pro', "Mithril Protection Pro", nil, {"moreores:mineral_mithril"}, 8, {mod..":chestplate_mithril"}, "mithril_protection_lover", type = t, custom_level = true + 'mithril_protection_pro', "Mithril Protection Pro", nil, {"moreores:mineral_mithril"}, 8, {mod..":chestplate_mithril"}, "mithril_protection_lover", type = t, custom_level = true, group = middle }) end @@ -107,64 +119,59 @@ t = "craft" -- sword_crafter ins(quests, { - 'sword_crafter', "Sword Crafter", nil, {"default:sword_wood"}, 2, {mod..":boots_wood"}, "wood_crafter_lover", type = t, custom_level = true + 'sword_crafter', "Sword Crafter", nil, {"default:sword_wood"}, 1, {mod..":boots_wood"}, "wood_crafter", type = t, custom_level = true, group = wood }) -- wood_protection ins(quests, { - 'wood_protection', "Wood Protection", nil, {"default:wood", "default:junglewood", "default:pine_wood", "default:acacia_wood", "default:aspen_wood"}, 1, {mod..":helmet_wood"}, "sword_crafter", type = t + 'wood_protection', "Wood Protection", nil, {"default:wood", "default:junglewood", "default:pine_wood", "default:acacia_wood", "default:aspen_wood"}, 1, {mod..":helmet_wood"}, "sword_crafter", type = t, group = wood }) -- wood_protection_lover ins(quests, { - 'wood_protection_lover', "Wood Protection Lover", nil, {"default:wood", "default:junglewood", "default:pine_wood", "default:acacia_wood", "default:aspen_wood"}, 1, {mod..":leggings_wood"}, "wood_protection", type = t + 'wood_protection_lover', "Wood Protection Lover", nil, {"default:wood", "default:junglewood", "default:pine_wood", "default:acacia_wood", "default:aspen_wood"}, 1, {mod..":leggings_wood"}, "wood_protection", type = t, group = wood }) -- wood_protection_pro ins(quests, { - 'wood_protection_pro', "Wood Protection Pro", nil, {"default:wood", "default:junglewood", "default:pine_wood", "default:acacia_wood", "default:aspen_wood"}, 1, {mod..":chestplate_wood"}, "wood_protection_lover", type = t + 'wood_protection_pro', "Wood Protection Pro", nil, {"default:wood", "default:junglewood", "default:pine_wood", "default:acacia_wood", "default:aspen_wood"}, 1, {mod..":chestplate_wood"}, "wood_protection_lover", type = t, group = wood }) -- sword_crafter_lover ins(quests, { - 'sword_crafter_lover', "Sword Crafter Lover", nil, {"default:sword_steel"}, 2, {mod..":boots_steel"}, "iron_digger_lover", type = t, custom_level = true + 'sword_crafter_lover', "Sword Crafter Lover", nil, {"default:sword_steel"}, 1, {mod..":boots_steel"}, "iron_digger_lover", type = t, custom_level = true, group = metal }) -- sword_crafter_pro ins(quests, { - 'sword_crafter_pro', "Sword Crafter Pro", nil, {"default:sword_bronze"}, 2, {mod..":boots_bronze"}, "bronze_crafter_lover", type = t, custom_level = true + 'sword_crafter_pro', "Sword Crafter Pro", nil, {"default:sword_bronze"}, 1, {mod..":boots_bronze"}, "bronze_crafter_lover", type = t, custom_level = true, group = metal }) -- bronze_protection ins(quests, { - 'bronze_protection', "Bronze Protection", nil, {"default:bronze_ingot"}, 1, {mod..":helmet_bronze"}, "sword_crafter_pro", type = t + 'bronze_protection', "Bronze Protection", nil, {"default:bronze_ingot"}, 1, {mod..":helmet_bronze"}, "sword_crafter_pro", type = t, group = metal }) -- bronze_protection_lover ins(quests, { - 'bronze_protection_lover', "Bronze Protection Lover", nil, {"default:bronze_ingot"}, 1, {mod..":leggings_bronze"}, "bronze_protection", type = t + 'bronze_protection_lover', "Bronze Protection Lover", nil, {"default:bronze_ingot"}, 1, {mod..":leggings_bronze"}, "bronze_protection", type = t, group = metal }) -- bronze_protection_pro ins(quests, { - 'bronze_protection_pro', "Bronze Protection Pro", nil, {"default:bronze_ingot"}, 1, {mod..":chestplate_bronze"}, "bronze_protection_lover", type = t + 'bronze_protection_pro', "Bronze Protection Pro", nil, {"default:bronze_ingot"}, 1, {mod..":chestplate_bronze"}, "bronze_protection_lover", type = t, group = metal }) -- sword_crafter_expert ins(quests, { - 'sword_crafter_expert', "Sword Crafter Expert", nil, {"default:sword_mese"}, 2, {mod..":boots_gold"}, "mese_digger_lover", type = t, custom_level = true - }) - --- sword_crafter_master -ins(quests, { - 'sword_crafter_master', "Sword Crafter Master", nil, {"default:sword_diamond"}, 2, {mod..":boots_diamond"}, "diamond_digger_lover", type = t, custom_level = true + 'sword_crafter_expert', "Sword Crafter Expert", nil, {"default:sword_diamond"}, 1, {mod..":boots_diamond"}, "diamond_digger_lover", type = t, custom_level = true, group = middle }) if minetest.get_modpath("moreores") then -- mithril_sword_crafter ins(quests, { - 'mithril_sword_crafter', "Mithril Sword Crafter", nil, {"moreores:sword_mithril"}, 2, {mod..":boots_mithril"}, "mithril_digger_lover", type = t, custom_level = true + 'mithril_sword_crafter', "Mithril Sword Crafter", nil, {"moreores:sword_mithril"}, 1, {mod..":boots_mithril"}, "mithril_digger_lover", type = t, custom_level = true, group = middle }) end diff --git a/3d_armor_quests/3d_armor_quests.dia b/3d_armor_quests/3d_armor_quests.dia index c543009..740cbfd 100644 Binary files a/3d_armor_quests/3d_armor_quests.dia and b/3d_armor_quests/3d_armor_quests.dia differ diff --git a/3d_armor_quests/3d_armor_stand.lua b/3d_armor_quests/3d_armor_stand.lua index d17c4a8..5e28d26 100644 --- a/3d_armor_quests/3d_armor_stand.lua +++ b/3d_armor_quests/3d_armor_stand.lua @@ -17,17 +17,6 @@ local up = sys4_quests.updateQuest local mod = "3d_armor_stand" local quests = sys4_quests.initQuests(mod, S) ------ Quests with type="dig" ----- -local t = "craft" +up('iron_digger_pro', nil, {mod..":armor_stand", mod..":locked_armor_stand"}) --- armor_stand -ins(quests, { - 'armor_stand', "Unlock Armor Stand", nil, {"default:fence_wood", "default:fence_junglewood", "default:fence_acacia_wood", "default:fence_pine_wood", "default:fence_aspen_wood"}, 2, {mod..":armor_stand"}, {"wood_architect", "iron_digger_pro"}, type = t - }) --- armor_stand_lover -ins(quests, { - 'armor_stand_lover', "Armor Stand Crafter", nil, {mod..":armor_stand"}, 1, {mod..":locked_armor_stand"}, "armor_stand", type = t, custom_level = true - }) - -sys4_quests.registerQuests() diff --git a/3d_armor_quests/shields.lua b/3d_armor_quests/shields.lua index a6ba659..c4af7a3 100644 --- a/3d_armor_quests/shields.lua +++ b/3d_armor_quests/shields.lua @@ -17,9 +17,6 @@ local up = sys4_quests.updateQuest local mod = "shields" local quests = sys4_quests.initQuests(mod, S) ------ Quests with type="dig" ----- -local t = "dig" - up('cactus_protection_lover', nil, {mod..":shield_cactus"}) up('wood_protection_lover', nil, {mod..":shield_wood"}) @@ -28,7 +25,7 @@ up('steel_protection_lover', nil, {mod..":shield_steel"}) up('bronze_protection_lover', nil, {mod..":shield_bronze"}) -up('gold_protection_lover', nil, {mod..":shield_gold"}) +up('gold_protection_pro', nil, {mod..":shield_gold"}) up('diamond_protection_lover', nil, {mod..":shield_diamond"}) @@ -36,14 +33,6 @@ if minetest.get_modpath("moreores") then up('mithril_protection_lover', nil, {mod..":shield_mithril"}) end --- enhance_cactus_protection -ins(quests, { - 'enhance_cactus_protection', "Enhance Cactus Protection", nil, {"default:stone_with_iron"}, 2, {mod..":shield_enhanced_cactus"}, {"cactus_protection_lover", "furnace_crafter"}, type = t - }) +-- enhance cactus and wood protection +up('iron_digger_lover', nil, {mod..":shield_enhanced_wood", mod..":shield_enhanced_cactus"}) --- enhance_wood_protection -ins(quests, { - 'enhance_wood_protection', "Enhance Wood Protection", nil, {"default:stone_with_iron"}, 2, {mod..":shield_enhanced_wood"}, {"wood_protection_lover", "furnace_crafter"}, type = t - }) - -sys4_quests.registerQuests() diff --git a/minetest_quests/default.lua b/minetest_quests/default.lua index 3e4d2e2..45bd5aa 100644 --- a/minetest_quests/default.lua +++ b/minetest_quests/default.lua @@ -35,7 +35,7 @@ local t = "dig" -- snow_digger ins(quests, { - 'snow_digger', "Snow Digger", nil, {mod..":snow"}, 9, {mod..":snowblock", mod..":snow"}, nil, type = t, group = dark + 'snow_digger', "Snow Digger", nil, {mod..":snow"}, 9, {mod..":snowblock", mod..":snow"}, nil, type = t }) -- clay_digger @@ -45,7 +45,7 @@ ins(quests, { -- papyrus_digger ins(quests, { - 'papyrus_digger', "Papyrus Digger", nil, {mod..":papyrus"}, 3, {mod..":paper"}, nil, type = t, group = dark + 'papyrus_digger', "Papyrus Digger", nil, {mod..":papyrus"}, 3, {mod..":paper"}, nil, type = t, group = farm }) -- sand_digger @@ -204,7 +204,7 @@ ins(quests, { -- sandstonebrick_builder ins(quests, { - 'sandstonebrick_builder', "Sandstone Bricks Builder", nil, {mod..":sandstonebrick"}, 3, {"stairs:slab_sandstonebrick", "stairs:stair_sandstonebrick"}, "sandstone_crafter", type = t + 'sandstonebrick_builder', "Sandstone Bricks Builder", nil, {mod..":sandstonebrick"}, 3, {"stairs:slab_sandstonebrick", "stairs:stair_sandstonebrick"}, "sandstone_crafter", type = t, group = stone }) -- stone_builder @@ -214,7 +214,7 @@ ins(quests, { -- brick_builder ins(quests, { - 'brick_builder', "Brick Builder", nil, {mod..":brick"}, 3, {"stairs:slab_brick", "stairs:stair_brick"}, "furnace_crafter", type = t + 'brick_builder', "Brick Builder", nil, {mod..":brick"}, 3, {"stairs:slab_brick", "stairs:stair_brick"}, "furnace_crafter", type = t, group = stone }) --stonebrick_builder @@ -262,7 +262,7 @@ t = "craft" -- paper_crafter ins(quests, { - 'paper_crafter', "Paper Crafter", nil, {mod..":paper"}, 3, {mod..":book"}, nil, type = t, group = farm + 'paper_crafter', "Paper Crafter", nil, {mod..":paper"}, 3, {mod..":book"}, "papyrus_digger", type = t, group = farm }) -- book_crafter diff --git a/minetest_quests/default_quests.dia b/minetest_quests/default_quests.dia index 2eed50b..dfcab2f 100644 Binary files a/minetest_quests/default_quests.dia and b/minetest_quests/default_quests.dia differ diff --git a/minetest_quests/doors.lua b/minetest_quests/doors.lua index b779838..2d47079 100644 --- a/minetest_quests/doors.lua +++ b/minetest_quests/doors.lua @@ -30,7 +30,7 @@ local t = "place" -- wood_builder_lover ins(quests, { - 'wood_builder_lover', "Wood Builder Lover", nil, {"default:wood", "default:junglewood", "default:acacia_wood", "default:pine_wood", "default:aspen_wood"}, 3, {mod..":door_wood", mod..":trapdoor"}, "wood_builder", type = t, group = wood + 'wood_builder_lover', "Wood Builder Lover", nil, {"default:wood", "stairs:slab_wood", "stairs:stair_wood", "default:junglewood", "stairs:slab_junglewood", "stairs:stair_junglewood", "default:acacia_wood", "stairs:slab_acacia_wood", "stairs:stair_acacia_wood", "default:pine_wood", "stairs:slab_pine_wood", "stairs:stair_pine_wood", "default:aspen_wood", "stairs:slab_aspen_wood", "stairs:stair_aspen_wood"}, 3, {mod..":door_wood", mod..":trapdoor"}, "wood_builder", type = t, group = wood }) -- fence_placer diff --git a/minetest_quests/locale/fr.txt b/minetest_quests/locale/fr.txt index 9746be8..efd7362 100644 --- a/minetest_quests/locale/fr.txt +++ b/minetest_quests/locale/fr.txt @@ -13,7 +13,7 @@ Diamond Digger = Trouve du Diamant Obsidian Digger = Trouve de l'Obsidienne Wood Crafter = Fait des Planches -Sticks Crafter = Fait des Batons +Sticks Crafter = Fait des Bâtons Sandstone Crafter = Fait du gré Papers Crafter = Fait du Papier Books Crafter = Fait des livres @@ -26,7 +26,7 @@ Tools Crafter Master = Outils en Diamant Furnace Builder = Pose de Four Wood Builder = Pose des Planches -Wood Builder Lover = Pose des Dalles en Bois +Wood Builder Lover = Pose des éléments en Bois ### Custom Descriptions ### diff --git a/mobs_quests/init.lua b/mobs_quests/init.lua index 92e8209..bf7dd5a 100644 --- a/mobs_quests/init.lua +++ b/mobs_quests/init.lua @@ -3,7 +3,7 @@ -- This mod add quests based on mobs mod -if minetest.get_modpath("sys4_quests") +if minetest.get_modpath("minetest_quests") and minetest.get_modpath("mobs") then local S @@ -20,48 +20,50 @@ and minetest.get_modpath("mobs") then local mod = "mobs" local quests = sys4_quests.initQuests(mod, S) + ----- Quests Groups ----- + local farm = "Farming Age" + local stone = "Stone Age" + local metal = "Metal Age" + local middle = "Middle Age" + ----- Quests with type="dig" ----- - local t = "dig" + local t = "craft" if minetest.get_modpath("farming") then -- unlock_magic_lasso ins(quests, { - 'unlock_magic_lasso', "Unlock Magic Lasso", nil, {"default:stone_with_gold"}, 4, {mod..":magic_lasso"}, {"stone_digger_pro", "farming_tools", "diamond_digger_expert"}, type = t + 'unlock_magic_lasso', "Unlock Magic Lasso", nil, {"default:diamondblock"}, 1, {mod..":magic_lasso"}, {"diamond_digger_expert"}, type = t, custom_level = true, group = middle }) - t = "craft" - if minetest.get_modpath("dye") then -- unlock_nametag ins(quests, { - 'unlock_nametag', "Unlock Nametag", nil, {"dye:black"}, 1, {mod..":nametag"}, {"coal_digger", "papyrus_digger", "farming_tools"}, type = t + 'unlock_nametag', "Unlock Nametag", nil, {"dye:black"}, 1, {mod..":nametag"}, {"coal_digger"}, type = t, group = stone }) end -- unlock_net ins(quests, { - 'unlock_net', "Unlock Net", nil, {"default:stick"}, 3, {mod..":net", mod..":beehive"}, {"sticks_crafter", "farming_tools"}, type = t + 'unlock_net', "Unlock Net", nil, {"farming:cotton_1","farming:cotton_2","farming:cotton_3","farming:cotton_4","farming:cotton_5","farming:cotton_6","farming:cotton_7","farming:cotton_8"}, 2, {mod..":net", mod..":beehive"}, {"book_crafter"}, type = "dig", group = farming }) -- beehive_crafter ins(quests, { - 'beehive_crafter', "Beehive Crafter", nil, {mod..":beehive"}, 1, {mod..":honey", mod..":honey_block"}, "unlock_net", type = t, custom_level = true + 'beehive_crafter', "Beehive Crafter", nil, {mod..":beehive"}, 1, {mod..":honey", mod..":honey_block"}, "unlock_net", type = t, custom_level = true, group = farming }) end - t = "craft" - if minetest.get_modpath("bucket") then -- bucket_crafter ins(quests, { - 'bucket_crafter', "Bucket Crafter", nil, {"bucket:bucket_empty"}, 1, {mod..":cheese", mod..":cheeseblock"}, "iron_digger_pro", type = t, custom_level = true + 'bucket_crafter', "Bucket Crafter", nil, {"bucket:bucket_empty"}, 1, {mod..":cheese", mod..":cheeseblock"}, "iron_digger_pro", type = t, custom_level = true, group = metal }) end -- unlock_lava_pickaxe ins(quests, { - 'unlock_lava_pickaxe', "Unlock Lava Pickaxe", nil, {"default:obsidian_shard"}, 2, {mod..":pick_lava"}, "obsidian_digger", type = t + 'unlock_lava_pickaxe', "Unlock Lava Pickaxe", nil, {"default:obsidian_shard"}, 2, {mod..":pick_lava"}, "obsidian_digger", type = t, group = middle }) sys4_quests.registerQuests() diff --git a/mobs_quests/mobs_quests.dia b/mobs_quests/mobs_quests.dia index 05b62b9..e4c3fdc 100644 Binary files a/mobs_quests/mobs_quests.dia and b/mobs_quests/mobs_quests.dia differ diff --git a/moreores_quests/init.lua b/moreores_quests/init.lua index 0179d2f..6cfcfdf 100644 --- a/moreores_quests/init.lua +++ b/moreores_quests/init.lua @@ -3,7 +3,7 @@ -- This mod add quests based on moreores mod -if minetest.get_modpath("sys4_quests") +if minetest.get_modpath("minetest_quests") and minetest.get_modpath("moreores") then local S @@ -19,58 +19,62 @@ if minetest.get_modpath("sys4_quests") ---------- Quests for moreores mod ---------- local mod = "moreores" local quests = sys4_quests.initQuests(mod, S) - + + ----- Quests Groups ----- + local metal = "Metal Age" + local middle = "Middle Age" + ----- Quests with type="dig" ----- local t = "dig" -- tin_digger ins(quests, { - 'tin_digger', "Tin Digger", nil, {mod..":mineral_tin"}, 9, {mod..":tin_block", mod..":tin_ingot"}, {"more_tools", "furnace_crafter"}, type = t, custom_level = true + 'tin_digger', "Tin Digger", nil, {mod..":mineral_tin"}, 9, {mod..":tin_block", mod..":tin_ingot"}, nil, type = t, group = metal }) -- silver_digger ins(quests, { - 'silver_digger', "Silver Digger", nil, {mod..":mineral_silver"}, 1, {mod..":shovel_silver"}, {"more_tools", "furnace_crafter"}, type = t + 'silver_digger', "Silver Digger", nil, {mod..":mineral_silver"}, 1, {mod..":shovel_silver"}, nil, type = t, group = metal }) -- silver_digger_lover ins(quests, { - 'silver_digger_lover', "Silver Digger Lover", nil, {mod..":mineral_silver"}, 1, {mod..":sword_silver", mod..":hoe_silver"}, "silver_digger", type = t + 'silver_digger_lover', "Silver Digger Lover", nil, {mod..":mineral_silver"}, 1, {mod..":sword_silver", mod..":hoe_silver"}, "silver_digger", type = t, group = metal }) -- silver_digger_pro ins(quests, { - 'silver_digger_pro', "Silver Digger Pro", nil, {mod..":mineral_silver"}, 1, {mod..":axe_silver", mod..":pick_silver"}, "silver_digger_lover", type = t + 'silver_digger_pro', "Silver Digger Pro", nil, {mod..":mineral_silver"}, 1, {mod..":axe_silver", mod..":pick_silver"}, "silver_digger_lover", type = t, group = metal }) -- silver_digger_expert ins(quests, { - 'silver_digger_expert', "Silver Digger Expert", nil, {mod..":mineral_silver"}, 6, {mod..":silver_block", mod..":silver_ingot"}, "silver_digger_pro", type = t + 'silver_digger_expert', "Silver Digger Expert", nil, {mod..":mineral_silver"}, 6, {mod..":silver_block", mod..":silver_ingot"}, "silver_digger_pro", type = t, group = metal }) -- mithril_digger ins(quests, { - 'mithril_digger', "Mithril Digger", nil, {mod..":mineral_mithril"}, 1, {mod..":shovel_mithril"}, {"more_tools", "furnace_crafter"}, type = t, custom_level = true + 'mithril_digger', "Mithril Digger", nil, {mod..":mineral_mithril"}, 1, {mod..":shovel_mithril"}, nil, type = t, custom_level = true, group = middle }) -- mithril_digger_lover ins(quests, { - 'mithril_digger_lover', "Mithril Digger Lover", nil, {mod..":mineral_mithril"}, 2, {mod..":sword_mithril", mod..":hoe_mithril"}, "mithril_digger", type = t, custom_level = true + 'mithril_digger_lover', "Mithril Digger Lover", nil, {mod..":mineral_mithril"}, 2, {mod..":sword_mithril", mod..":hoe_mithril"}, "mithril_digger", type = t, custom_level = true, group = middle }) -- mithril_digger_pro ins(quests, { - 'mithril_digger_pro', "Mithril Digger Pro", nil, {mod..":mineral_mithril"}, 3, {mod..":axe_mithril", mod..":pick_mithril"}, "mithril_digger_lover", type = t, custom_level = true + 'mithril_digger_pro', "Mithril Digger Pro", nil, {mod..":mineral_mithril"}, 3, {mod..":axe_mithril", mod..":pick_mithril"}, "mithril_digger_lover", type = t, custom_level = true, group = middle }) -- mithril_digger_expert ins(quests, { - 'mithril_digger_expert', "Mithril Digger Expert", nil, {mod..":mineral_mithril"}, 9, {mod..":mithril_block", mod..":mithril_ingot"}, "mithril_digger_pro", type = t, custom_level = true + 'mithril_digger_expert', "Mithril Digger Expert", nil, {mod..":mineral_mithril"}, 9, {mod..":mithril_block", mod..":mithril_ingot"}, "mithril_digger_pro", type = t, custom_level = true, group = middle }) -- unlock_copper_rail ins(quests, { - 'unlock_copper_rail', "Unlock Copper Rail", nil, {"default:stone_with_copper"}, 6, {mod..":copper_rail"}, "furnace_crafter", type = t + 'unlock_copper_rail', "Unlock Copper Rail", nil, {"default:stone_with_copper"}, 6, {mod..":copper_rail"}, nil, type = t, group = metal }) sys4_quests.registerQuests() diff --git a/moreores_quests/moreores_quests.dia b/moreores_quests/moreores_quests.dia index 34f3baa..ff6e441 100644 Binary files a/moreores_quests/moreores_quests.dia and b/moreores_quests/moreores_quests.dia differ diff --git a/sys4_quests/init.lua b/sys4_quests/init.lua index 6904351..149bd84 100644 --- a/sys4_quests/init.lua +++ b/sys4_quests/init.lua @@ -27,7 +27,7 @@ sys4_quests.questGroups['global'] = {order = 1, questsIndex = {}} local lastQuestIndex = 0 --local level = 33 -local level = 1 +local level = 12 function sys4_quests.addQuestGroup(groupName) @@ -141,11 +141,11 @@ local function getActiveQuestGroup(playern) local isFound = false for mod, registeredQuests in pairs(sys4_quests.registeredQuests) do for _, quest in ipairs(registeredQuests.quests) do - print("Quest : "..quest[1]) +-- print("Quest : "..quest[1]) if isQuestActive(quest[1], playern) then - print("is ACTIVE") +-- print("is ACTIVE") groupName = getGroupByQuestIndex(quest.index) - print("GroupName is : "..dump(groupName)) +-- print("GroupName is : "..dump(groupName)) if groupName ~= nil then isFound = true break @@ -155,13 +155,13 @@ local function getActiveQuestGroup(playern) if isFound then break end end - print("Return groupName : "..dump(groupName)) +-- print("Return groupName : "..dump(groupName)) return groupName end local function getFirstQuestGroup() for name, group in pairs(sys4_quests.questGroups) do - print("NAME : "..name..", ORDER : "..group.order) +-- print("NAME : "..name..", ORDER : "..group.order) if group.order == 2 then return name end @@ -251,7 +251,7 @@ function sys4_quests.registerQuests() if not quest.group then table.insert(sys4_quests.questGroups['global'].questsIndex, quest.index) elseif sys4_quests.questGroups[quest.group] ~= nil then - print("Insert New QuestGroup : "..quest.group) +-- print("Insert New QuestGroup : "..quest.group) table.insert(sys4_quests.questGroups[quest.group].questsIndex, quest.index) end @@ -472,7 +472,7 @@ local function isAllQuestsGroupSuccessfull(currentQuestGroup, questname, playern end end - print("Successfull ALL group quest : "..dump(successfull)) +-- print("Successfull ALL group quest : "..dump(successfull)) return successfull end @@ -483,8 +483,8 @@ function sys4_quests.nextQuest(playername, questname) local currentQuestGroup = playerList[playername].activeQuestGroup local nextQuestGroup = getNextQuestGroup(currentQuestGroup) - print("currentQuestGroup : "..currentQuestGroup) - print("NEXt QUEST GROUP : "..dump(nextQuestGroup)) +-- print("currentQuestGroup : "..currentQuestGroup) +-- print("NEXt QUEST GROUP : "..dump(nextQuestGroup)) if nextQuestGroup ~= nil and isAllQuestsGroupSuccessfull(currentQuestGroup, questname, playername) then @@ -656,7 +656,7 @@ minetest.register_on_newplayer( function(player) local playern = player:get_player_name() playerList[playern] = {name = playern, isNew = true, craftMode = true, bookMode = false, activeQuestGroup = getFirstQuestGroup()} - print("ActiveQuestGroup for New Player : "..playerList[playern].activeQuestGroup) +-- print("ActiveQuestGroup for New Player : "..playerList[playern].activeQuestGroup) end) minetest.register_on_joinplayer( diff --git a/sys4_quests/locale/fr.txt b/sys4_quests/locale/fr.txt index a09908e..fe28946 100644 --- a/sys4_quests/locale/fr.txt +++ b/sys4_quests/locale/fr.txt @@ -1,4 +1,4 @@ dig = Récolte place = Pose craft = Fabrique -The end of the Quest Unlock this Items = La fin de la quete débloque les crafts +The end of the Quest Unlock this Items = La fin de la quête débloque les crafts diff --git a/thirsty_quests/init.lua b/thirsty_quests/init.lua index f356ea1..f4eaa17 100644 --- a/thirsty_quests/init.lua +++ b/thirsty_quests/init.lua @@ -19,15 +19,26 @@ and minetest.get_modpath("thirsty") then ---------- Quests for thirsty mod ---------- local mod = "thirsty" local quests = sys4_quests.initQuests(mod, S) - - up('wood_crafter_pro', nil, {mod..":wooden_bowl"}) + ----- Quests Groups ----- + local dark = "Dark Age" + local wood = "Wood Age" + local farm = "Farming Age" + local stone = "Stone Age" + local metal = "Metal Age" + local middle = "Middle Age" + + -- update quests from default + up('wood_crafter', nil, {mod..":wooden_bowl"}) + + up('mese_digger', nil, {mod..":water_fountain"}) + ----- Quests with type="dig" ----- local t = "dig" -- water_drinker ins(quests, { - 'water_drinker', "Water Drinker", nil, {"default:stone_with_iron"}, 1, {mod..":steel_canteen"}, {"wood_crafter_pro", "iron_digger_pro"}, type = t + 'water_drinker', "Water Drinker", nil, {"default:stone_with_iron"}, 1, {mod..":steel_canteen"}, {"iron_digger_pro"}, type = t, group = metal }) t = "craft" @@ -39,31 +50,22 @@ and minetest.get_modpath("thirsty") then -- water_tools_crafter ins(quests, { - 'water_tools_crafter', "Water Tools Crafter", nil, {"bucket:bucket_empty"}, 1, {mod..":drinking_fountain"}, "water_drinker", type = t, custom_level = true + 'water_tools_crafter', "Water Tools Crafter", nil, {"bucket:bucket_empty"}, 1, {mod..":drinking_fountain"}, "water_drinker", type = t, custom_level = true, group = metal }) - t = "dig" - -- water_tools_crafter_lover ins(quests, { - 'water_tools_crafter_lover', "Water Tools Crafter Lover", nil, {"default:stone_with_copper"}, 5, {mod..":water_fountain"}, {"water_tools_crafter", "mese_digger"}, type = t + 'water_tools_crafter_lover', "Water Tools Crafter Lover", nil, {"bucket:bucket_empty"}, 1, {mod..":water_extender"}, "mese_digger", type = t, custom_level = true }) - t = "craft" - -- water_tools_crafter_pro ins(quests, { - 'water_tools_crafter_pro', "Water Tools Crafter Pro", nil, {"bucket:bucket_empty"}, 1, {mod..":water_extender"}, "water_tools_crafter_lover", type = t, custom_level = true + 'water_tools_crafter_pro', "Water Tools Crafter Pro", nil, {"bucket:bucket_empty"}, 1, {mod..":extractor"}, {"water_tools_crafter_lover", "mese_digger_pro", "diamond_digger_pro"}, type = t, custom_level = true }) -- water_tools_crafter_expert ins(quests, { - 'water_tools_crafter_expert', "Water Tools Crafter Expert", nil, {"bucket:bucket_empty"}, 1, {mod..":extractor"}, {"water_tools_crafter_pro", "mese_digger_pro", "diamond_digger_pro"}, type = t, custom_level = true - }) - - -- water_tools_crafter_master - ins(quests, { - 'water_tools_crafter_master', "Water Tools Crafter Master", nil, {mod..":extractor"}, 1, {mod..":injector"}, "water_tools_crafter_expert", type = t, custom_level = true + 'water_tools_crafter_expert', "Water Tools Crafter Master", nil, {mod..":extractor"}, 1, {mod..":injector"}, "water_tools_crafter_pro", type = t, custom_level = true }) sys4_quests.registerQuests() diff --git a/thirsty_quests/thirsty_quests.dia b/thirsty_quests/thirsty_quests.dia index 583d776..6e1368d 100644 Binary files a/thirsty_quests/thirsty_quests.dia and b/thirsty_quests/thirsty_quests.dia differ diff --git a/unified_inventory_quests/init.lua b/unified_inventory_quests/init.lua index a7a9141..4a1c05e 100644 --- a/unified_inventory_quests/init.lua +++ b/unified_inventory_quests/init.lua @@ -3,7 +3,7 @@ -- This mod add quests based on unified_inventory mod -if minetest.get_modpath("sys4_quests") +if minetest.get_modpath("minetest_quests") and minetest.get_modpath("unified_inventory") then local S @@ -23,19 +23,19 @@ if minetest.get_modpath("sys4_quests") ----- Quests with type="dig" ----- local t = "craft" - -- wool_crafter_pro + -- textile_worker ins(quests, { - 'wool_crafter_pro', "Wool Crafter Pro", "wools", {"wool:white", "wool:black", "wool:blue", "wool:orange", "wool:red", "wool:violet", "wool:yellow", "wool:brown", "wool:cyan", "wool:dark_green", "wool:dar_grey", "wool:green", "wool:grey", "wool:magenta", "wool:pink"}, 4, {mod..":bag_small"}, "wool_crafter_lover", type = t + 'textile_worker', "Textile Worker", "wools", {"wool:white", "wool:black", "wool:blue", "wool:orange", "wool:red", "wool:violet", "wool:yellow", "wool:brown", "wool:cyan", "wool:dark_green", "wool:dar_grey", "wool:green", "wool:grey", "wool:magenta", "wool:pink"}, 6, {mod..":bag_small"}, "cotton_digger", type = t }) -- bag_crafter ins(quests, { - 'bag_crafter', "Bag Crafter", nil, {mod..":bag_small"}, 4, {mod..":bag_medium"}, "wool_crafter_pro", type = t, custum_level = true + 'bag_crafter', "Bag Crafter", nil, {mod..":bag_small"}, 2, {mod..":bag_medium"}, "textile_worker", type = t, custom_level = true }) -- bag_crafter_lover ins(quests, { - 'bag_crafter_lover', "Bag Crafter Lover", nil, {mod..":bag_medium"}, 4, {mod..":bag_large"}, "bag_crafter", type = t, custum_level = true + 'bag_crafter_lover', "Bag Crafter Lover", nil, {mod..":bag_medium"}, 2, {mod..":bag_large"}, "bag_crafter", type = t, custom_level = true }) sys4_quests.registerQuests() diff --git a/unified_inventory_quests/unified_inventory_quests.dia b/unified_inventory_quests/unified_inventory_quests.dia index 9fb1231..e91cc56 100644 Binary files a/unified_inventory_quests/unified_inventory_quests.dia and b/unified_inventory_quests/unified_inventory_quests.dia differ