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 0000000..306b060 Binary files /dev/null and b/elepower_dynamics/textures/elepower_battery.png differ diff --git a/elepower_dynamics/textures/elepower_tin_can.png b/elepower_dynamics/textures/elepower_tin_can.png new file mode 100644 index 0000000..d85bafa Binary files /dev/null and b/elepower_dynamics/textures/elepower_tin_can.png differ diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua index 2f2c9c3..2dc1d46 100644 --- a/elepower_machines/crafting.lua +++ b/elepower_machines/crafting.lua @@ -232,6 +232,10 @@ for _,i in pairs(soldering_recipes) do }) end +------------- +-- Canning -- +------------- + --******************-- -- CRAFTING RECIPES -- --******************-- @@ -345,7 +349,7 @@ minetest.register_craft({ recipe = { {"elepower_dynamics:lead_ingot", "elepower_dynamics:control_circuit", "elepower_dynamics:lead_ingot"}, {"elepower_dynamics:wound_copper_coil", "elepower_machines:machine_block", "elepower_dynamics:wound_copper_coil"}, - {"elepower_dynamics:lead_ingot", "elepower_dynamics:diamond_gear", "elepower_dynamics:lead_ingot"}, + {"elepower_dynamics:lead_ingot", "elepower_dynamics:battery", "elepower_dynamics:lead_ingot"}, } }) @@ -431,3 +435,13 @@ minetest.register_craft({ {"elepower_dynamics:invar_gear", "elepower_machines:turbine_blades", "elepower_dynamics:invar_gear"}, } }) + +-- Canning Machine +minetest.register_craft({ + output = "elepower_machines:canning_machine", + recipe = { + {"elepower_dynamics:wound_copper_coil", "elepower_dynamics:tree_tap", "elepower_dynamics:wound_copper_coil"}, + {"elepower_dynamics:tin_can", "elepower_machines:machine_block", "elepower_dynamics:tin_can"}, + {"elepower_dynamics:steel_gear", "elepower_dynamics:tin_gear", "elepower_dynamics:steel_gear"}, + } +}) diff --git a/elepower_machines/machines/canning_machine.lua b/elepower_machines/machines/canning_machine.lua new file mode 100644 index 0000000..9fe9caa --- /dev/null +++ b/elepower_machines/machines/canning_machine.lua @@ -0,0 +1,15 @@ + +elepm.register_craft_type("can", { + description = "Canning", + inputs = 2, +}) + +elepm.register_crafter("elepower_machines:canning_machine", { + description = "Canning Machine", + craft_type = "can", + tiles = { + "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_canning_machine.png", + }, + groups = {ele_user = 1, oddly_breakable_by_hand = 1}, +}) diff --git a/elepower_machines/machines/init.lua b/elepower_machines/machines/init.lua index 62387fa..bbfac65 100644 --- a/elepower_machines/machines/init.lua +++ b/elepower_machines/machines/init.lua @@ -23,6 +23,7 @@ dofile(mp .. "alloy_furnace.lua") dofile(mp .. "coal_alloy_furnace.lua") dofile(mp .. "solderer.lua") dofile(mp .. "compressor.lua") +dofile(mp .. "canning_machine.lua") -- Other dofile(mp .. "accumulator.lua") diff --git a/elepower_machines/textures/elepower_canning_machine.png b/elepower_machines/textures/elepower_canning_machine.png new file mode 100644 index 0000000..426840f Binary files /dev/null and b/elepower_machines/textures/elepower_canning_machine.png differ 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"}, } })