From 37bd7c9c540af52363e1bbd2bb1375c964fa5dc5 Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Fri, 3 Aug 2018 21:16:48 +0300 Subject: [PATCH] More crafting, crafting, crafting and craftitems! --- elepower_dynamics/crafting.lua | 17 +++++++++ elepower_dynamics/craftitems.lua | 12 ++++++ .../textures/elepower_battery.png | Bin 0 -> 292 bytes .../textures/elepower_tin_can.png | Bin 0 -> 289 bytes elepower_machines/crafting.lua | 16 +++++++- .../machines/canning_machine.lua | 15 ++++++++ elepower_machines/machines/init.lua | 1 + .../textures/elepower_canning_machine.png | Bin 0 -> 6718 bytes elepower_nuclear/crafting.lua | 35 +++++++++++++++--- elepower_tools/crafting.lua | 2 +- elepower_wireless/crafting.lua | 2 +- 11 files changed, 92 insertions(+), 8 deletions(-) create mode 100644 elepower_dynamics/textures/elepower_battery.png create mode 100644 elepower_dynamics/textures/elepower_tin_can.png create mode 100644 elepower_machines/machines/canning_machine.lua create mode 100644 elepower_machines/textures/elepower_canning_machine.png diff --git a/elepower_dynamics/crafting.lua b/elepower_dynamics/crafting.lua index c6b27fa..6dc2ff3 100644 --- a/elepower_dynamics/crafting.lua +++ b/elepower_dynamics/crafting.lua @@ -253,6 +253,23 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "elepower_dynamics:battery 2", + recipe = { + {"elepower_dynamics:zinc_dust", "elepower_dynamics:wound_copper_coil", "elepower_dynamics:lead_dust"}, + {"elepower_dynamics:tin_plate", "default:mese_crystal", "elepower_dynamics:tin_plate"}, + {"elepower_dynamics:tin_plate", "default:mese_crystal", "elepower_dynamics:tin_plate"}, + } +}) + +minetest.register_craft({ + output = "elepower_dynamics:tin_can 8", + recipe = { + {"elepower_dynamics:tin_plate", ""}, + {"", "elepower_dynamics:tin_plate"} + } +}) + -------------- -- Smelting -- -------------- diff --git a/elepower_dynamics/craftitems.lua b/elepower_dynamics/craftitems.lua index d973e45..f3bdc4f 100644 --- a/elepower_dynamics/craftitems.lua +++ b/elepower_dynamics/craftitems.lua @@ -123,6 +123,12 @@ minetest.register_craftitem("elepower_dynamics:tree_tap", { groups = {treetap = 1, static_component = 1} }) +minetest.register_craftitem("elepower_dynamics:tin_can", { + description = "Tin Can", + inventory_image = "elepower_tin_can.png", + groups = {can = 1, food_grade = 1} +}) + minetest.register_craftitem("elepower_dynamics:pcb_blank", { description = "Printed Circuit Board (PCB) Blank\nUse Etching Acid to etch", inventory_image = "elepower_blank_pcb.png", @@ -220,6 +226,12 @@ minetest.register_craftitem("elepower_dynamics:motor", { groups = {motor = 1, component = 1} }) +minetest.register_craftitem("elepower_dynamics:battery", { + description = "Battery", + inventory_image = "elepower_battery.png", + groups = {battery = 1, component = 1} +}) + minetest.register_craftitem("elepower_dynamics:servo_valve", { description = "Servo Valve", inventory_image = "elepower_servo_valve.png", diff --git a/elepower_dynamics/textures/elepower_battery.png b/elepower_dynamics/textures/elepower_battery.png new file mode 100644 index 0000000000000000000000000000000000000000..306b0603c4b1d4d5dc753678bcca949599c7c1a2 GIT binary patch literal 292 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 RqsTR+2nB)OyT(U;`!5Ka#rpsN literal 0 HcmV?d00001 diff --git a/elepower_nuclear/crafting.lua b/elepower_nuclear/crafting.lua index 435545b..ff49960 100644 --- a/elepower_nuclear/crafting.lua +++ b/elepower_nuclear/crafting.lua @@ -69,6 +69,28 @@ minetest.register_craft({ } }) +-- Empty Fuel Rod +minetest.register_craft({ + output = "elepower_nuclear:fuel_rod_empty", + recipe = { + {"elepower_dynamics:graphite_ingot", "", "elepower_dynamics:graphite_ingot"}, + {"elepower_dynamics:graphite_ingot", "", "elepower_dynamics:graphite_ingot"}, + {"elepower_dynamics:graphite_ingot", "elepower_dynamics:graphite_ingot", "elepower_dynamics:graphite_ingot"}, + } +}) + +-- Graphite Rod +elepm.register_craft({ + type = "grind", + recipe = { "elepower_dynamics:graphite_ingot" }, + output = "elepower_nuclear:graphite_rod 3", + time = 6, +}) + +------------------------ +-- Enrichment recipes -- +------------------------ + elepm.register_craft({ type = "enrichment", output = { "elepower_nuclear:uranium_dust", "elepower_nuclear:depleted_uranium_dust 3"}, @@ -90,10 +112,13 @@ elepm.register_craft({ time = 50, }) --- Graphite rods +----------- +-- Other -- +----------- + elepm.register_craft({ - type = "grind", - recipe = { "elepower_dynamics:graphite_ingot" }, - output = "elepower_nuclear:graphite_rod 3", - time = 6, + type = "can", + recipe = {"elepower_nuclear:uranium_dust 8", "elepower_nuclear:fuel_rod_empty"}, + output = "elepower_nuclear:fuel_rod_fissile", + time = 16 }) diff --git a/elepower_tools/crafting.lua b/elepower_tools/crafting.lua index 9a6828e..fbc83b3 100644 --- a/elepower_tools/crafting.lua +++ b/elepower_tools/crafting.lua @@ -11,7 +11,7 @@ minetest.register_craft({ output = "elepower_tools:hand_drill", recipe = { {"", "elepower_dynamics:wound_copper_coil", "elepower_tools:drill_bit"}, - {"default:steel_ingot", "elepower_dynamics:wound_copper_coil", "default:steel_ingot"}, + {"default:steel_ingot", "elepower_dynamics:battery", "default:steel_ingot"}, {"elepower_dynamics:motor", "elepower_dynamics:capacitor", ""}, } }) diff --git a/elepower_wireless/crafting.lua b/elepower_wireless/crafting.lua index 7d67bad..6f67722 100644 --- a/elepower_wireless/crafting.lua +++ b/elepower_wireless/crafting.lua @@ -35,6 +35,6 @@ minetest.register_craft({ recipe = { {"elepower_dynamics:wound_silver_coil", "elepower_dynamics:xycrone_lump", "elepower_dynamics:wound_silver_coil"}, {"elepower_dynamics:xycrone_lump", "elepower_dynamics:copper_wire", "elepower_dynamics:xycrone_lump"}, - {"elepower_dynamics:wound_silver_coil", "elepower_dynamics:xycrone_lump", "elepower_dynamics:wound_silver_coil"}, + {"elepower_dynamics:wound_silver_coil", "elepower_dynamics:battery", "elepower_dynamics:wound_silver_coil"}, } })