diff --git a/elepower_dynamics/components.lua b/elepower_dynamics/components.lua index 8bbd0f5..5b14401 100644 --- a/elepower_dynamics/components.lua +++ b/elepower_dynamics/components.lua @@ -15,6 +15,7 @@ local list_def = { {material = "electrum", description = "Electrum", color = "#ebeb90", dust = true, plate = true, gear = true}, {material = "viridisium", description = "Viridisium", color = "#5b9751", dust = true, plate = true, gear = true}, {material = "zinc", description = "Zinc", color = "#598a9e", dust = true, plate = true}, + {material = "coal", description = "Coal", color = "#0d0d0d", dust = true}, {material = "wood", description = "Wood", color = "#847454", dust = "Sawdust", gear = true} } diff --git a/elepower_dynamics/conduits.lua b/elepower_dynamics/conduits.lua index dc7776f..2eb46b5 100644 --- a/elepower_dynamics/conduits.lua +++ b/elepower_dynamics/conduits.lua @@ -6,22 +6,21 @@ ele.register_conduit("elepower_dynamics:conduit", { groups = {oddly_breakable_by_hand = 1, cracky = 1} }) ---[[ Fluids +-- Fluids elefluid.register_transfer_node("elepower_dynamics:fluid_transfer_node", { - description = "Fluid Transfer Node", - tiles = {"elepower_fluid_transporter_side.png", "elepower_fluid_transporter_side.png^[transformR180", - "elepower_fluid_transporter_side.png^[transformR270", "elepower_fluid_transporter_side.png^[transformFXR90", - "elepower_fluid_transporter_back.png", "elepower_fluid_transporter_front.png"}, - groups = {oddly_breakable_by_hand = 1, cracky = 1} -})--]] - -elefluid.register_transfer_node("elepower_dynamics:fluid_transfer_node", { - description = "Fluid Transfer Node", + description = "Fluid Transfer Node\nPunch to start pumping", tiles = {"elepower_fluid_transporter.png"}, drawtype = "mesh", mesh = "elepower_transport_node.obj", groups = {oddly_breakable_by_hand = 1, cracky = 1}, paramtype = "light", + selection_box = { + type = "fixed", + fixed = { + {-0.4375, -0.4375, -0.5000, 0.4375, 0.4375, 0.000}, + {-0.1875, -0.1875, 0.000, 0.1875, 0.1875, 0.5000} + } + } }) elefluid.register_transfer_duct("elepower_dynamics:fluid_duct", { diff --git a/elepower_dynamics/crafting.lua b/elepower_dynamics/crafting.lua index 4d0b527..a3a5854 100644 --- a/elepower_dynamics/crafting.lua +++ b/elepower_dynamics/crafting.lua @@ -298,6 +298,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "elepower_dynamics:pv_cell", + recipe = { + {"group:glass", "group:glass", "group:glass"}, + {"dye:blue", "elepower_dynamics:silicon_wafer_doped", "dye:blue"}, + {"default:mese_crystal_fragment", "elepower_dynamics:wound_copper_coil", "default:mese_crystal_fragment"} + } +}) + minetest.register_craft({ output = "elepower_dynamics:integrated_circuit", recipe = { diff --git a/elepower_dynamics/gas_container.lua b/elepower_dynamics/gas_container.lua index 1bdbe37..2fb9fa4 100644 --- a/elepower_dynamics/gas_container.lua +++ b/elepower_dynamics/gas_container.lua @@ -32,6 +32,8 @@ minetest.register_craftitem("elepower_dynamics:gas_container", { groups = {gas_container = 1} }) +ele.register_gas(nil, "Steam", "elepower_dynamics:steam") + ele.register_gas("elepower_dynamics:hydrogen_container", "Hydrogen", "elepower_dynamics:hydrogen", "elepower_gas_hydrogen.png") @@ -40,3 +42,4 @@ ele.register_gas("elepower_dynamics:oxygen_container", "Oxygen", ele.register_gas("elepower_dynamics:nitrogen_container", "Nitrogen", "elepower_dynamics:nitrogen", "elepower_gas_nitrogen.png") + diff --git a/elepower_dynamics/textures/elepower_fluid_transporter.png b/elepower_dynamics/textures/elepower_fluid_transporter.png index 92617c7..271b725 100644 Binary files a/elepower_dynamics/textures/elepower_fluid_transporter.png and b/elepower_dynamics/textures/elepower_fluid_transporter.png differ diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua index de12959..eb8f578 100644 --- a/elepower_machines/crafting.lua +++ b/elepower_machines/crafting.lua @@ -28,13 +28,18 @@ local alloy_recipes = { output = "elepower_dynamics:electrum_ingot 3", }, { - recipe = { "elepower_dynamics:silicon", "elepower_dynamics:gold_dust 4" }, + recipe = { "elepower_dynamics:silicon", "elepower_dynamics:coal_dust 2" }, output = "elepower_dynamics:silicon_wafer", }, { recipe = { "default:coal_lump", "elepower_dynamics:coal_dust 4" }, output = "elepower_dynamics:graphite_ingot", }, + { + recipe = { "elepower_dynamics:silicon_wafer", "elepower_dynamics:gold_dust 4" }, + output = "elepower_dynamics:silicon_wafer_doped", + time = 8, + }, } -- Register alloy furnace recipes @@ -269,12 +274,12 @@ end local soldering_recipes = { { - recipe = { "elepower_dynamics:silicon_wafer", "elepower_dynamics:chip 4", "elepower_dynamics:lead_ingot 2" }, + recipe = { "elepower_dynamics:silicon_wafer_doped", "elepower_dynamics:chip 4", "elepower_dynamics:lead_ingot 2" }, output = "elepower_dynamics:microcontroller", time = 8, }, { - recipe = { "elepower_dynamics:silicon_wafer", "elepower_dynamics:microcontroller 4", "elepower_dynamics:electrum_ingot 2" }, + recipe = { "default:copper_ingot 4", "elepower_dynamics:microcontroller 4", "elepower_dynamics:electrum_ingot 2" }, output = "elepower_dynamics:soc", time = 28, }, diff --git a/elepower_nuclear/crafting.lua b/elepower_nuclear/crafting.lua index e7bba79..bfcb2bf 100644 --- a/elepower_nuclear/crafting.lua +++ b/elepower_nuclear/crafting.lua @@ -136,3 +136,14 @@ elepm.register_craft({ output = "elepower_nuclear:fuel_rod_fissile", time = 16 }) + +elepm.register_craft({ + type = "grind", + recipe = {"elepower_nuclear:fuel_rod_depleted"}, + output = { + "elepower_nuclear:depleted_uranium_dust 3", + "elepower_nuclear:nuclear_waste 5", + "elepower_nuclear:fuel_rod_empty" + }, + time = 16 +}) diff --git a/elepower_nuclear/craftitems.lua b/elepower_nuclear/craftitems.lua index 554ecf2..26104f5 100644 --- a/elepower_nuclear/craftitems.lua +++ b/elepower_nuclear/craftitems.lua @@ -23,7 +23,7 @@ minetest.register_craftitem("elepower_nuclear:depleted_uranium_dust", { }) minetest.register_craftitem("elepower_nuclear:nuclear_waste", { - description = "Nuclear Waste\nMostly unusable", + description = "Nuclear Waste\nMostly unusable for nuclear fission", inventory_image = "elenuclear_uranium_waste.png" }) diff --git a/elepower_nuclear/nodes.lua b/elepower_nuclear/nodes.lua index 9c5f1be..db924ee 100644 --- a/elepower_nuclear/nodes.lua +++ b/elepower_nuclear/nodes.lua @@ -2,7 +2,7 @@ dofile(elenuclear.modpath.."/machines/init.lua") minetest.register_node("elepower_nuclear:machine_block", { - description = "Radiation-shielded Lead Machine Chassis", + description = "Radiation-shielded Lead Machine Chassis\nContains dangerous ionizing radiation", tiles = { "elenuclear_machine_top.png", "elepower_lead_block.png", "elenuclear_machine_block.png", "elenuclear_machine_block.png", "elenuclear_machine_block.png", "elenuclear_machine_block.png",