From 899acaab0e1b4727e4c6a853550ae72cac132c75 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 20 Nov 2017 07:52:24 +0100 Subject: [PATCH] Hide WIP items from craft guide, more cleanup - Make fishing rod uncraftable (too overpowered) - Lift WIP status from golden apple - Lift Experimental status from lookup tool --- mods/ENTITIES/mobs_mc_gameconfig/init.lua | 3 ++- mods/ITEMS/mcl_fishing/init.lua | 7 +++++++ mods/ITEMS/mcl_mobitems/init.lua | 5 ++++- mods/MISC/mcl_temp_helper_recipes/init.lua | 19 +++++++++++++++++++ mods/MISC/mcl_wip/init.lua | 10 ++++------ 5 files changed, 36 insertions(+), 8 deletions(-) diff --git a/mods/ENTITIES/mobs_mc_gameconfig/init.lua b/mods/ENTITIES/mobs_mc_gameconfig/init.lua index 7b2d346bbb..ddbd205021 100644 --- a/mods/ENTITIES/mobs_mc_gameconfig/init.lua +++ b/mods/ENTITIES/mobs_mc_gameconfig/init.lua @@ -86,7 +86,8 @@ mobs_mc.override.items = { mycelium = "mcl_core:mycelium", carrot = "mcl_farming:carrot_item", golden_carrot = "mcl_farming:carrot_item_gold", - fishing_rod = "mcl_fishing:fishing_rod", + fishing_rod = "mcl_core:stick", + --TODO: Re-enable: fishing_rod = "mcl_fishing:fishing_rod", fish_raw = "mcl_fishing:fish_raw", salmon_raw = "mcl_fishing:salmon_raw", clownfish_raw = "mcl_fishing:clownfish_raw", diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index 09c56c1510..f1723d1ee6 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -94,6 +94,12 @@ minetest.register_tool("mcl_fishing:fishing_rod", { sound = { breaks = "default_tool_breaks" }, }) +--[[ + +Temporarily removed from crafting as the fishing rod is massively overpowered atm. + +TODO: Re-enable crafting when fishing rod has been improved. + minetest.register_craft({ output = "mcl_fishing:fishing_rod", recipe = { @@ -110,6 +116,7 @@ minetest.register_craft({ {'mcl_mobitems:string','','mcl_core:stick'}, } }) +]] minetest.register_craft({ type = "fuel", diff --git a/mods/ITEMS/mcl_mobitems/init.lua b/mods/ITEMS/mcl_mobitems/init.lua index 4dcd47307c..332520e364 100644 --- a/mods/ITEMS/mcl_mobitems/init.lua +++ b/mods/ITEMS/mcl_mobitems/init.lua @@ -311,7 +311,7 @@ minetest.register_craftitem("mcl_mobitems:gunpowder", { minetest.register_tool("mcl_mobitems:carrot_on_a_stick", { description = "Carrot on a Stick", _doc_items_longdesc = "A carrot on a stick can be used on saddled pigs to ride them.", - _doc_items_usagehelp = "Rightclick a saddled pig with the carrot on a stick to mount it. You can now ride it like a horse (TODO). Pigs will also walk towards you when you just wield the carrot on a stick.", + _doc_items_usagehelp = "Rightclick a saddled pig with the carrot on a stick to mount it. You can now ride it like a horse. Pigs will also walk towards you when you just wield the carrot on a stick.", wield_image = "mcl_mobitems_carrot_on_a_stick.png", inventory_image = "mcl_mobitems_carrot_on_a_stick.png", groups = { transport = 1 }, @@ -353,6 +353,8 @@ minetest.register_craft({ }, }) +--[[ +TODO: Re-enable this when fishing rod is available again minetest.register_craft({ output = "mcl_mobitems:carrot_on_a_stick", recipe = { @@ -368,6 +370,7 @@ minetest.register_craft({ { "mcl_farming:carrot_item", "" }, }, }) +]] minetest.register_craft({ type = "shapeless", diff --git a/mods/MISC/mcl_temp_helper_recipes/init.lua b/mods/MISC/mcl_temp_helper_recipes/init.lua index 32a76e183c..f2422509f2 100644 --- a/mods/MISC/mcl_temp_helper_recipes/init.lua +++ b/mods/MISC/mcl_temp_helper_recipes/init.lua @@ -91,6 +91,24 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "mcl_mobitems:carrot_on_a_stick", + recipe = { + { "", "", "mcl_core:stick", }, + { "", "mcl_core:stick", "mcl_mobitems:string", }, + { "mcl_core:stick", "", "mcl_farming:carrot_item" }, + }, +}) + +minetest.register_craft({ + output = "mcl_mobitems:carrot_on_a_stick", + recipe = { + { "mcl_core:stick", "", "" }, + { "mcl_mobitems:string", "mcl_core:stick", "", }, + { "mcl_farming:carrot_item", "", "mcl_core:stick" }, + }, +}) + minetest.register_craft({ output = "mcl_jukebox:record_2", recipe = { @@ -115,6 +133,7 @@ minetest.register_craft({ { "mcl_core:glass_black", "mcl_core:glass_black", "mcl_core:glass_black", }, } }) + -- 2 discs are dropped by creeper -- 1 disc is droppd by zombie -- TODO: Remove/fix these drops when creeper drops music discs properly diff --git a/mods/MISC/mcl_wip/init.lua b/mods/MISC/mcl_wip/init.lua index 4d46989495..7a4a774ef8 100644 --- a/mods/MISC/mcl_wip/init.lua +++ b/mods/MISC/mcl_wip/init.lua @@ -2,7 +2,6 @@ local wip_items = { "mcl_anvils:anvil", "mcl_anvils:anvil_damage_1", "mcl_anvils:anvil_damage_2", - "mcl_core:apple_gold", "mcl_end:chorus_fruit", "mcl_end:chorus_flower", "mcl_end:chorus_flower_dead", @@ -23,6 +22,7 @@ local wip_items = { "mcl_portals:end_portal_frame", "mcl_portals:end_portal_frame_eye", } +local experimental_items = {} for i=1,#wip_items do local def = minetest.registered_items[wip_items[i]] @@ -31,14 +31,12 @@ for i=1,#wip_items do break end local new_description = def.description + local new_groups = table.copy(def.groups) new_description = new_description .. "\n"..core.colorize("#FF0000", "(WIP)") - minetest.override_item(wip_items[i], { description = new_description }) + new_groups.not_in_craft_guide = 1 + minetest.override_item(wip_items[i], { description = new_description, groups = new_groups }) end -local experimental_items = { - "doc_identifier:identifier_solid", - "doc_identifier:identifier_liquid", -} for i=1,#experimental_items do local def = minetest.registered_items[experimental_items[i]] if not def then