From a143cc6e1141cb568b68f4d5234f02c8676b4463 Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Fri, 31 Aug 2018 20:00:55 +0300 Subject: [PATCH] Recipe changes --- elepower_dynamics/components.lua | 1 + elepower_dynamics/conduits.lua | 19 +++++++++--------- elepower_dynamics/crafting.lua | 9 +++++++++ elepower_dynamics/gas_container.lua | 3 +++ .../textures/elepower_fluid_transporter.png | Bin 4825 -> 5264 bytes elepower_machines/crafting.lua | 11 +++++++--- elepower_nuclear/crafting.lua | 11 ++++++++++ elepower_nuclear/craftitems.lua | 2 +- elepower_nuclear/nodes.lua | 2 +- 9 files changed, 43 insertions(+), 15 deletions(-) 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 92617c740ab69e69e1b765141cccd7fde846b562..271b72538d2d2fc59be0c5235dda521ae396ff42 100644 GIT binary patch delta 3916 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 delta 3329 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