From 5e4a87b92599aa0fc9a56081209c930d08a2c3bd Mon Sep 17 00:00:00 2001 From: Zefram Date: Mon, 7 Jul 2014 21:48:38 +0100 Subject: [PATCH] Rework some recipes to use more varied ingredients --- technic/crafts.lua | 10 +++++----- technic/depends.txt | 3 +++ technic/machines/HV/generator.lua | 2 +- technic/machines/HV/nuclear_reactor.lua | 6 +++--- technic/machines/HV/quarry.lua | 2 +- technic/machines/HV/solar_array.lua | 2 +- technic/machines/LV/compressor.lua | 6 +++--- technic/machines/LV/generator.lua | 2 +- technic/machines/LV/geothermal.lua | 6 +++--- technic/machines/LV/grinder.lua | 2 +- technic/machines/LV/music_player.lua | 6 +++--- technic/machines/LV/solar_panel.lua | 2 +- technic/machines/LV/water_mill.lua | 6 +++--- technic/machines/MV/tool_workshop.lua | 6 +++--- technic/machines/supply_converter.lua | 2 +- technic/tools/chainsaw.lua | 6 +++--- technic/tools/mining_drill.lua | 2 +- technic/tools/mining_lasers.lua | 4 ++-- technic/tools/sonic_screwdriver.lua | 6 +++--- 19 files changed, 42 insertions(+), 39 deletions(-) diff --git a/technic/crafts.lua b/technic/crafts.lua index 63792f4..8bf477b 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -100,7 +100,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:lv_transformer', recipe = { - {'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot'}, + {'mesecons_materials:fiber', 'technic:wrought_iron_ingot', 'mesecons_materials:fiber'}, {'technic:copper_coil', 'technic:wrought_iron_ingot', 'technic:copper_coil'}, {'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot', 'technic:wrought_iron_ingot'}, } @@ -109,7 +109,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:mv_transformer', recipe = { - {'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot'}, + {'mesecons_materials:fiber', 'technic:carbon_steel_ingot', 'mesecons_materials:fiber'}, {'technic:copper_coil', 'technic:carbon_steel_ingot', 'technic:copper_coil'}, {'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot'}, } @@ -118,7 +118,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:hv_transformer', recipe = { - {'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'}, + {'mesecons_materials:fiber', 'technic:stainless_steel_ingot', 'mesecons_materials:fiber'}, {'technic:copper_coil', 'technic:stainless_steel_ingot', 'technic:copper_coil'}, {'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'}, } @@ -127,9 +127,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:control_logic_unit', recipe = { - {'', 'default:gold_ingot', ''}, + {'', 'technic:fine_gold_wire', ''}, {'default:copper_ingot', 'technic:silicon_wafer', 'default:copper_ingot'}, - {'', 'default:copper_ingot', ''}, + {'', 'technic:chromium_ingot', ''}, } }) diff --git a/technic/depends.txt b/technic/depends.txt index 2b3310e..86b75bb 100644 --- a/technic/depends.txt +++ b/technic/depends.txt @@ -2,6 +2,9 @@ default moreores pipeworks mesecons +mesecons_button +mesecons_materials mesecons_mvps? +mesecons_pistons intllib? unified_inventory? diff --git a/technic/machines/HV/generator.lua b/technic/machines/HV/generator.lua index 86f8577..aa83590 100644 --- a/technic/machines/HV/generator.lua +++ b/technic/machines/HV/generator.lua @@ -3,7 +3,7 @@ minetest.register_alias("hv_generator", "technic:hv_generator") minetest.register_craft({ output = 'technic:hv_generator', recipe = { - {'technic:stainless_steel_ingot', 'technic:mv_generator', 'technic:stainless_steel_ingot'}, + {'technic:carbon_plate', 'technic:mv_generator', 'technic:composite_plate'}, {'pipeworks:tube_1', 'technic:hv_transformer', 'pipeworks:tube_1'}, {'technic:stainless_steel_ingot', 'technic:hv_cable0', 'technic:stainless_steel_ingot'}, } diff --git a/technic/machines/HV/nuclear_reactor.lua b/technic/machines/HV/nuclear_reactor.lua index 8cdeb97..56dd7a4 100644 --- a/technic/machines/HV/nuclear_reactor.lua +++ b/technic/machines/HV/nuclear_reactor.lua @@ -16,9 +16,9 @@ local S = technic.getter minetest.register_craft({ output = 'technic:hv_nuclear_reactor_core', recipe = { - {'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot', 'technic:stainless_steel_ingot'}, - {'technic:stainless_steel_ingot', 'technic:machine_casing', 'technic:stainless_steel_ingot'}, - {'technic:stainless_steel_ingot', 'technic:hv_cable0', 'technic:stainless_steel_ingot'}, + {'technic:carbon_plate', 'default:obsidian_glass', 'technic:carbon_plate'}, + {'technic:composite_plate', 'technic:machine_casing', 'technic:composite_plate'}, + {'technic:stainless_steel_ingot', 'technic:hv_cable0', 'technic:stainless_steel_ingot'}, } }) diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua index c10a558..a8c37bc 100644 --- a/technic/machines/HV/quarry.lua +++ b/technic/machines/HV/quarry.lua @@ -3,7 +3,7 @@ local S = technic.getter minetest.register_craft({ recipe = { - {"technic:carbon_steel_block", "pipeworks:filter", "technic:carbon_steel_block"}, + {"technic:carbon_plate", "pipeworks:filter", "technic:composite_plate"}, {"technic:motor", "technic:machine_casing", "technic:diamond_drill_head"}, {"technic:carbon_steel_block", "technic:hv_cable0", "technic:carbon_steel_block"}}, output = "technic:quarry", diff --git a/technic/machines/HV/solar_array.lua b/technic/machines/HV/solar_array.lua index ceea77a..414291a 100644 --- a/technic/machines/HV/solar_array.lua +++ b/technic/machines/HV/solar_array.lua @@ -5,7 +5,7 @@ minetest.register_craft({ output = 'technic:solar_array_hv 1', recipe = { {'technic:solar_array_mv', 'technic:solar_array_mv', 'technic:solar_array_mv'}, - {'technic:carbon_steel_ingot', 'technic:hv_transformer', 'technic:carbon_steel_ingot'}, + {'technic:carbon_plate', 'technic:hv_transformer', 'technic:composite_plate'}, {'', 'technic:hv_cable0', ''}, } }) diff --git a/technic/machines/LV/compressor.lua b/technic/machines/LV/compressor.lua index 2b9752f..e2bde40 100644 --- a/technic/machines/LV/compressor.lua +++ b/technic/machines/LV/compressor.lua @@ -4,9 +4,9 @@ minetest.register_alias("compressor", "technic:lv_compressor") minetest.register_craft({ output = 'technic:lv_compressor', recipe = { - {'default:stone', 'technic:motor', 'default:stone'}, - {'mesecons:piston', 'technic:machine_casing', 'mesecons:piston'}, - {'default:stone', 'technic:lv_cable0', 'default:stone'}, + {'default:stone', 'technic:motor', 'default:stone'}, + {'mesecons:piston', 'technic:machine_casing', 'mesecons:piston'}, + {'technic:fine_silver_wire', 'technic:lv_cable0', 'technic:fine_silver_wire'}, } }) diff --git a/technic/machines/LV/generator.lua b/technic/machines/LV/generator.lua index 0be8506..999dbc5 100644 --- a/technic/machines/LV/generator.lua +++ b/technic/machines/LV/generator.lua @@ -8,7 +8,7 @@ minetest.register_alias("lv_generator", "technic:lv_generator") minetest.register_craft({ output = 'technic:lv_generator', recipe = { - {'default:stone', 'default:stone', 'default:stone'}, + {'default:stone', 'default:furnace', 'default:stone'}, {'default:stone', 'technic:machine_casing', 'default:stone'}, {'default:stone', 'technic:lv_cable0', 'default:stone'}, } diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua index 489d764..c253c6c 100644 --- a/technic/machines/LV/geothermal.lua +++ b/technic/machines/LV/geothermal.lua @@ -10,9 +10,9 @@ local S = technic.getter minetest.register_craft({ output = 'technic:geothermal', recipe = { - {'default:stone', 'default:diamond', 'default:stone'}, - {'default:copper_ingot', 'technic:machine_casing', 'default:copper_ingot'}, - {'default:stone', 'technic:lv_cable0', 'default:stone'}, + {'technic:granite', 'default:diamond', 'technic:granite'}, + {'technic:fine_copper_wire', 'technic:machine_casing', 'technic:fine_copper_wire'}, + {'technic:granite', 'technic:lv_cable0', 'technic:granite'}, } }) diff --git a/technic/machines/LV/grinder.lua b/technic/machines/LV/grinder.lua index ae4a659..0ea8aeb 100644 --- a/technic/machines/LV/grinder.lua +++ b/technic/machines/LV/grinder.lua @@ -5,7 +5,7 @@ minetest.register_craft({ recipe = { {'default:desert_stone', 'default:diamond', 'default:desert_stone'}, {'default:desert_stone', 'technic:machine_casing', 'default:desert_stone'}, - {'default:stone', 'technic:lv_cable0', 'default:stone'}, + {'technic:granite', 'technic:lv_cable0', 'technic:granite'}, } }) diff --git a/technic/machines/LV/music_player.lua b/technic/machines/LV/music_player.lua index 9ab88f2..38c542a 100644 --- a/technic/machines/LV/music_player.lua +++ b/technic/machines/LV/music_player.lua @@ -7,9 +7,9 @@ minetest.register_alias("music_player", "technic:music_player") minetest.register_craft({ output = 'technic:music_player', recipe = { - {'group:wood', 'default:diamond', 'group:wood'}, - {'default:diamond', 'technic:machine_casing', 'default:diamond'}, - {'default:stone', 'technic:lv_cable0', 'default:stone'}, + {'technic:chromium_ingot', 'default:diamond', 'technic:chromium_ingot'}, + {'default:diamond', 'technic:machine_casing', 'default:diamond'}, + {'default:mossycobble', 'technic:lv_cable0', 'default:mossycobble'}, } }) diff --git a/technic/machines/LV/solar_panel.lua b/technic/machines/LV/solar_panel.lua index b10a3f1..6fc7c02 100644 --- a/technic/machines/LV/solar_panel.lua +++ b/technic/machines/LV/solar_panel.lua @@ -29,7 +29,7 @@ minetest.register_craft({ output = 'technic:solar_panel', recipe = { {'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer'}, - {'technic:wrought_iron_ingot', 'technic:lv_cable0', 'technic:wrought_iron_ingot'}, + {'technic:fine_silver_wire', 'technic:lv_cable0', 'mesecons_materials:glue'}, } }) diff --git a/technic/machines/LV/water_mill.lua b/technic/machines/LV/water_mill.lua index 771a588..2a8bb8d 100644 --- a/technic/machines/LV/water_mill.lua +++ b/technic/machines/LV/water_mill.lua @@ -9,9 +9,9 @@ minetest.register_alias("water_mill", "technic:water_mill") minetest.register_craft({ output = 'technic:water_mill', recipe = { - {'default:stone', 'default:diamond', 'default:stone'}, - {'group:wood', 'technic:machine_casing', 'group:wood'}, - {'default:stone', 'technic:lv_cable0', 'default:stone'}, + {'technic:marble', 'default:diamond', 'technic:marble'}, + {'group:wood', 'technic:machine_casing', 'group:wood'}, + {'technic:marble', 'technic:lv_cable0', 'technic:marble'}, } }) diff --git a/technic/machines/MV/tool_workshop.lua b/technic/machines/MV/tool_workshop.lua index 1255931..0cf5e72 100644 --- a/technic/machines/MV/tool_workshop.lua +++ b/technic/machines/MV/tool_workshop.lua @@ -8,9 +8,9 @@ local S = technic.getter minetest.register_craft({ output = 'technic:tool_workshop', recipe = { - {'group:wood', 'default:diamond', 'group:wood'}, - {'group:wood', 'technic:machine_casing', 'group:wood'}, - {'default:stone', 'technic:mv_cable0', 'default:stone'}, + {'group:wood', 'default:diamond', 'group:wood'}, + {'mesecons_pistons:piston_sticky_off', 'technic:machine_casing', 'technic:carbon_cloth'}, + {'default:obsidian', 'technic:mv_cable0', 'default:obsidian'}, } }) diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua index fd59401..4ea7854 100644 --- a/technic/machines/supply_converter.lua +++ b/technic/machines/supply_converter.lua @@ -32,7 +32,7 @@ minetest.register_node("technic:supply_converter", { minetest.register_craft({ output = 'technic:supply_converter 1', recipe = { - {'technic:stainless_steel_ingot', 'technic:rubber', 'technic:stainless_steel_ingot'}, + {'technic:fine_gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'}, {'technic:mv_transformer', 'technic:machine_casing', 'technic:lv_transformer'}, {'technic:mv_cable0', 'technic:rubber', 'technic:lv_cable0'}, } diff --git a/technic/tools/chainsaw.lua b/technic/tools/chainsaw.lua index 503c010..eaa33bf 100644 --- a/technic/tools/chainsaw.lua +++ b/technic/tools/chainsaw.lua @@ -307,9 +307,9 @@ minetest.register_tool("technic:chainsaw", { minetest.register_craft({ output = "technic:chainsaw", recipe = { - {"technic:stainless_steel_ingot", "technic:stainless_steel_ingot", "technic:battery"}, - {"technic:stainless_steel_ingot", "technic:motor", "technic:battery"}, - {"", "", "default:copper_ingot"}, + {"technic:stainless_steel_ingot", "mesecons_button:button_off", "technic:battery"}, + {"technic:fine_copper_wire", "technic:motor", "technic:battery"}, + {"", "", "technic:stainless_steel_ingot"}, } }) diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua index ac22098..0750c8d 100644 --- a/technic/tools/mining_drill.lua +++ b/technic/tools/mining_drill.lua @@ -6,7 +6,7 @@ local S = technic.getter minetest.register_craft({ output = 'technic:mining_drill', recipe = { - {'technic:stainless_steel_ingot', 'technic:diamond_drill_head', 'technic:stainless_steel_ingot'}, + {'moreores:tin_ingot', 'technic:diamond_drill_head', 'moreores:tin_ingot'}, {'technic:stainless_steel_ingot', 'technic:motor', 'technic:stainless_steel_ingot'}, {'', 'technic:red_energy_crystal', 'moreores:copper_ingot'}, } diff --git a/technic/tools/mining_lasers.lua b/technic/tools/mining_lasers.lua index 8f32a5a..a6c8682 100644 --- a/technic/tools/mining_lasers.lua +++ b/technic/tools/mining_lasers.lua @@ -16,8 +16,8 @@ local S = technic.getter minetest.register_craft({ output = 'technic:laser_mk1', recipe = { - {'default:diamond', 'technic:carbon_steel_ingot', 'technic:red_energy_crystal'}, - {'', 'technic:carbon_steel_ingot', 'technic:carbon_steel_ingot'}, + {'default:diamond', 'technic:brass_ingot', 'default:obsidian_glass'}, + {'', 'technic:brass_ingot', 'technic:red_energy_crystal'}, {'', '', 'default:copper_ingot'}, } }) diff --git a/technic/tools/sonic_screwdriver.lua b/technic/tools/sonic_screwdriver.lua index 0a9b3a9..7d8957f 100644 --- a/technic/tools/sonic_screwdriver.lua +++ b/technic/tools/sonic_screwdriver.lua @@ -65,9 +65,9 @@ minetest.register_tool("technic:sonic_screwdriver", { minetest.register_craft({ output = "technic:sonic_screwdriver", recipe = { - {"default:diamond"}, - {"technic:battery"}, - {"technic:stainless_steel_ingot"} + {"", "default:diamond", ""}, + {"mesecons_materials:fiber", "technic:battery", "mesecons_materials:fiber"}, + {"mesecons_materials:fiber", "moreores:mithril_ingot", "mesecons_materials:fiber"} } })