From ef344daed7391e6807b4d4af108f6ec548da8f43 Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Sun, 27 Jan 2019 21:24:12 +0200 Subject: [PATCH] vanity recipe changes, nuclear reactors now mostly use silver instead of graphite --- elepower_dynamics/craftitems.lua | 6 ++ .../textures/elepower_graphite_rod.png | Bin elepower_machines/crafting.lua | 4 + elepower_nuclear/crafting.lua | 74 ++++++++++++------ elepower_nuclear/craftitems.lua | 40 +++++++--- .../textures/elenuclear_control_plate.png | Bin 0 -> 587 bytes .../textures/elenuclear_control_rod.png | Bin 0 -> 440 bytes .../elenuclear_control_rod_assembly.png | Bin 0 -> 610 bytes .../elenuclear_graphite_moderator.png | Bin 419 -> 0 bytes .../textures/elenuclear_pressure_vessel.png | Bin 0 -> 627 bytes 10 files changed, 86 insertions(+), 38 deletions(-) rename elepower_nuclear/textures/elenuclear_graphite_rod.png => elepower_dynamics/textures/elepower_graphite_rod.png (100%) create mode 100644 elepower_nuclear/textures/elenuclear_control_plate.png create mode 100644 elepower_nuclear/textures/elenuclear_control_rod.png create mode 100644 elepower_nuclear/textures/elenuclear_control_rod_assembly.png delete mode 100644 elepower_nuclear/textures/elenuclear_graphite_moderator.png create mode 100644 elepower_nuclear/textures/elenuclear_pressure_vessel.png diff --git a/elepower_dynamics/craftitems.lua b/elepower_dynamics/craftitems.lua index 48bb853..ba06ef6 100644 --- a/elepower_dynamics/craftitems.lua +++ b/elepower_dynamics/craftitems.lua @@ -87,6 +87,12 @@ minetest.register_craftitem("elepower_dynamics:xycrone_lump", { -- Special +minetest.register_craftitem("elepower_dynamics:graphite_rod", { + description = "Graphite Rod", + inventory_image = "elepower_graphite_rod.png", + groups = {graphite = 1, rod = 1} +}) + minetest.register_craftitem("elepower_dynamics:carbon_fiber", { description = "Carbon Fibers", inventory_image = "elepower_carbon_fiber.png", diff --git a/elepower_nuclear/textures/elenuclear_graphite_rod.png b/elepower_dynamics/textures/elepower_graphite_rod.png similarity index 100% rename from elepower_nuclear/textures/elenuclear_graphite_rod.png rename to elepower_dynamics/textures/elepower_graphite_rod.png diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua index 5aad3f0..24d1d45 100644 --- a/elepower_machines/crafting.lua +++ b/elepower_machines/crafting.lua @@ -129,6 +129,10 @@ local grinding_recipes = { { recipe = { "default:mese_crystal" }, output = "default:mese_crystal_fragment 9", + }, + { + recipe = { "elepower_dynamics:graphite_ingot" }, + output = "elepower_dynamics:graphite_rod 3", } } diff --git a/elepower_nuclear/crafting.lua b/elepower_nuclear/crafting.lua index 8a5c19f..4a41de7 100644 --- a/elepower_nuclear/crafting.lua +++ b/elepower_nuclear/crafting.lua @@ -14,28 +14,18 @@ minetest.register_craft({ output = "elepower_nuclear:enrichment_plant", recipe = { {"elepower_dynamics:induction_coil_advanced", "elepower_dynamics:soc", "elepower_dynamics:induction_coil_advanced"}, - {"elepower_nuclear:graphite_rod", "elepower_nuclear:machine_block", "elepower_nuclear:graphite_rod"}, + {"elepower_dynamics:graphite_rod", "elepower_nuclear:machine_block", "elepower_dynamics:graphite_rod"}, {"elepower_dynamics:wound_silver_coil", "elepower_dynamics:electrum_gear", "elepower_dynamics:wound_silver_coil"}, } }) --- Graphite Moderator -minetest.register_craft({ - output = "elepower_nuclear:graphite_moderator", - recipe = { - {"", "elepower_nuclear:graphite_rod", ""}, - {"elepower_nuclear:graphite_rod", "elepower_dynamics:graphite_ingot", "elepower_nuclear:graphite_rod"}, - {"", "elepower_nuclear:graphite_rod", ""}, - } -}) - -- Reactor Controller minetest.register_craft({ output = "elepower_nuclear:fission_controller", recipe = { - {"elepower_dynamics:wound_copper_coil", "elepower_nuclear:graphite_moderator", "elepower_dynamics:wound_copper_coil"}, - {"elepower_nuclear:graphite_moderator", "elepower_nuclear:machine_block", "elepower_nuclear:graphite_moderator"}, - {"elepower_dynamics:electrum_gear", "elepower_nuclear:graphite_moderator", "elepower_dynamics:electrum_gear"}, + {"elepower_dynamics:wound_copper_coil", "elepower_nuclear:control_rod_assembly", "elepower_dynamics:wound_copper_coil"}, + {"basic_materials:motor", "elepower_nuclear:machine_block", "basic_materials:motor"}, + {"elepower_dynamics:electrum_gear", "elepower_nuclear:control_plate", "elepower_dynamics:electrum_gear"}, } }) @@ -43,9 +33,9 @@ minetest.register_craft({ minetest.register_craft({ output = "elepower_nuclear:fission_core", recipe = { - {"elepower_dynamics:induction_coil_advanced", "elepower_dynamics:graphite_ingot", "elepower_dynamics:induction_coil_advanced"}, - {"elepower_nuclear:graphite_moderator", "elepower_nuclear:machine_block", "elepower_nuclear:graphite_moderator"}, - {"elepower_dynamics:electrum_gear", "elepower_dynamics:copper_plate", "elepower_dynamics:electrum_gear"}, + {"elepower_dynamics:induction_coil_advanced", "elepower_nuclear:control_plate", "elepower_dynamics:induction_coil_advanced"}, + {"elepower_dynamics:steel_plate", "elepower_nuclear:pressure_vessel", "elepower_dynamics:steel_plate"}, + {"elepower_dynamics:electrum_gear", "elepower_nuclear:machine_block", "elepower_dynamics:electrum_gear"}, } }) @@ -54,7 +44,7 @@ minetest.register_craft({ output = "elepower_nuclear:reactor_fluid_port", recipe = { {"elepower_dynamics:portable_tank", "elepower_dynamics:copper_plate", "elepower_dynamics:portable_tank"}, - {"elepower_nuclear:graphite_moderator", "elepower_nuclear:machine_block", "elepower_nuclear:graphite_moderator"}, + {"elepower_dynamics:servo_valve", "elepower_nuclear:heat_exchanger", "elepower_dynamics:servo_valve"}, {"elepower_dynamics:electrum_gear", "elepower_dynamics:copper_plate", "elepower_dynamics:electrum_gear"}, } }) @@ -89,14 +79,6 @@ minetest.register_craft({ } }) --- Graphite Rod -elepm.register_craft({ - type = "grind", - recipe = { "elepower_dynamics:graphite_ingot" }, - output = "elepower_nuclear:graphite_rod 3", - time = 6, -}) - -- Cold Coolant minetest.register_craft({ output = "elepower_nuclear:bucket_coolant", @@ -207,3 +189,43 @@ elepm.register_craft({ }, time = 16 }) + +-- Control Rod +minetest.register_craft({ + output = "elepower_nuclear:control_rod", + recipe = { + {"", "elepower_dynamics:silver_plate", "moreores:silver_ingot"}, + {"elepower_dynamics:silver_plate", "moreores:silver_ingot", "elepower_dynamics:silver_plate"}, + {"moreores:silver_ingot", "elepower_dynamics:silver_plate", ""}, + } +}) + +-- Control Rod Assembly +minetest.register_craft({ + output = "elepower_nuclear:control_rod_assembly", + recipe = { + {"elepower_nuclear:control_rod", "elepower_dynamics:steel_plate", "elepower_nuclear:control_rod"}, + {"elepower_dynamics:graphite_ingot", "elepower_dynamics:graphite_ingot", "elepower_dynamics:graphite_ingot"}, + {"elepower_nuclear:control_rod", "elepower_dynamics:steel_plate", "elepower_nuclear:control_rod"}, + } +}) + +-- Pressure Vessel +minetest.register_craft({ + output = "elepower_nuclear:pressure_vessel", + recipe = { + {"elepower_dynamics:steel_plate", "elepower_dynamics:steel_plate", "elepower_dynamics:steel_plate"}, + {"default:steelblock", "elepower_dynamics:portable_tank", "default:steelblock"}, + {"elepower_dynamics:steel_plate", "default:steelblock", "elepower_dynamics:steel_plate"}, + } +}) + +-- Control Plate +minetest.register_craft({ + output = "elepower_nuclear:control_plate", + recipe = { + {"elepower_dynamics:steel_plate", "elepower_dynamics:graphite_rod", "elepower_dynamics:steel_plate"}, + {"elepower_dynamics:silver_plate", "", "elepower_dynamics:silver_plate"}, + {"elepower_dynamics:bronze_plate", "", "elepower_dynamics:bronze_plate"}, + } +}) diff --git a/elepower_nuclear/craftitems.lua b/elepower_nuclear/craftitems.lua index 26104f5..a802806 100644 --- a/elepower_nuclear/craftitems.lua +++ b/elepower_nuclear/craftitems.lua @@ -49,6 +49,34 @@ minetest.register_craftitem("elepower_nuclear:fuel_rod_depleted", { max_stack = 1, }) +-- Control rods + +minetest.register_craftitem("elepower_nuclear:control_rod", { + description = "Control Rod", + inventory_image = "elenuclear_control_rod.png", + max_stack = 4, +}) + +minetest.register_craftitem("elepower_nuclear:control_rod_assembly", { + description = "Control Rod Assembly", + inventory_image = "elenuclear_control_rod_assembly.png", + max_stack = 1, +}) + +minetest.register_craftitem("elepower_nuclear:control_plate", { + description = "Perforated Control Plate", + inventory_image = "elenuclear_control_plate.png", + max_stack = 1, +}) + +-- Pressure vessel + +minetest.register_craftitem("elepower_nuclear:pressure_vessel", { + description = "Reactor Pressure Vessel", + inventory_image = "elenuclear_pressure_vessel.png", + max_stack = 1, +}) + -------------------------- -- Fusion-related items -- -------------------------- @@ -58,15 +86,3 @@ minetest.register_craftitem("elepower_nuclear:fuel_rod_depleted", { ------------------------- -- Crafting components -- ------------------------- - --- Graphite - -minetest.register_craftitem("elepower_nuclear:graphite_rod", { - description = "Graphite Rod", - inventory_image = "elenuclear_graphite_rod.png" -}) - -minetest.register_craftitem("elepower_nuclear:graphite_moderator", { - description = "Graphite Moderator", - inventory_image = "elenuclear_graphite_moderator.png" -}) diff --git a/elepower_nuclear/textures/elenuclear_control_plate.png b/elepower_nuclear/textures/elenuclear_control_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..7585dadf4390c72e7464d1225b64135458731c0c GIT binary patch literal 587 zcmV-R0<`^!P)Px#24YJ`L;yYj000gE>X4rR000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jc-7 z6Aw19KCayW0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0004^ zNklgp?Lnj#W0 z91dBp*KD`j7asuhz)=yR$nx~GqTB6qef^W7D45UZ+}~%22&+}WUjIHIP*oo19LDU7 zQdJs_H}ra+SuU4^5OB`ny*~zcAMoC@Tt3ifG-$Wms45~bo24|HAE>H|vMdigI8Y!W zEEWr<(PEKOdbjD;dAe+2c1siJ_xtpEJ&IzD_nxZS(&==#xcG#%_8@_y7#E8_wY*SoV5s3xmV$`ZA9?OCkUO002ovPDHLkV1lj%_PhW9 literal 0 HcmV?d00001 diff --git a/elepower_nuclear/textures/elenuclear_control_rod.png b/elepower_nuclear/textures/elenuclear_control_rod.png new file mode 100644 index 0000000000000000000000000000000000000000..45b102cd218284d1d1008b3ccbcfc5bac9c0491f GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Q_u zEIx);6XpYH&H|6fVg?31We{epSZZGe6l5>)^mS!_%qT5nW)LR*CKV_on;8;O;+&tG zo0?YwQa?5$O zLF&Wj^Y%NQJv$}j_V>!vo*g=e3?7{RK3`)Nr>lM!qyGIp&Dmj-rl+c?r5Yt(UbAk| z5s#cpX&`%N?5^RB+1$6xN|~9N**Pi1B1X_iTKmNei?{W;)#v}~?*1;gWukPx#24YJ`L;yYj000gE>X4rR000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jc-7 z6BP``AC0sC0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0005G zNkl$N;-+85JDOo8!c=^un|NQ z5o{Gfi0HNC8kU&dbG{jiO^#U`8^NhwIPd(NXBhb3p>y%#^}BF)!UvKP$&83VfJY$d zOoIducJHVac>4Thm>H$kW{fieE3iR`P_8%%4H-tIr&Mgg;Fbbx3>iF>h1ejSy`d)d)C(0sI|7@`8N(nG9UmL zE||KmV>B8;1f^8my}hL-k|BwRz;Z^ZJrO{ymBF24iHJW6Y;0@=17v6At{6?r8IzTrRRV7^6f{sJJacuQY*C-?%lp6fHxmLMv_<^ zjTv7W6Yku&eoaddYpoTT$X?><>&pI!O^i=Zq)bzGB2Y-O#5JPCIX^cyHLrxhxhOTUBsE2$ zJhLQ2!QIn0AiR-JoPmLn+tbA{#NzbXNgMkP83?%CUo^QxdFc@^`Q=9c|Eum$7FwjN zs<6#7qRV$AVk4hR)BbemHwyi&(|+il&@(Asm390&J&4=(oNY>-f9Sas@U$)eX*kvx}To)qo$ zSr;;O-~0Pas@{&D?kOwXd0+0La{G_rDMgm*V>iyk<^0#TVK`t~#;G#7*cljh44$rj JF6*2UngG;rrA+_; diff --git a/elepower_nuclear/textures/elenuclear_pressure_vessel.png b/elepower_nuclear/textures/elenuclear_pressure_vessel.png new file mode 100644 index 0000000000000000000000000000000000000000..5e555bb6b5c61de18e7fb0b559895690f3b2ff5f GIT binary patch literal 627 zcmV-(0*w8MP)Px#24YJ`L;yYj000gE>X4rR000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jc-7 z5;*~YUGR_q0013nR9JLFZ*6U5Zgc_CX>@2HM@dakWG-a~0005X zNklo~n6D!4fSL69^}XA!~G$4~O(`#16-sY&U( zp4DoFh>%huV$fVH7SweOK)qP->+X)1{hsT~(ZOc3iN5b4g!A)vLpB0rFql%Jsw$St z8W2{?B|mR(+3j|c0dmeXO+(I^V0?VCn>*fjq?B-XLv4CAl?h2zF*B0t zh$tu1GYW_Z?uM$4(D@|L}YX-?Ducpf4CC&pss7GYQ}6fqiI{3rlDyX+P0