diff --git a/fusion_reactor/controller.lua b/fusion_reactor/controller.lua index e3790ba..b7f0b0b 100644 --- a/fusion_reactor/controller.lua +++ b/fusion_reactor/controller.lua @@ -33,6 +33,7 @@ local EXPECTED_MAGNET_NUM = 56 local CALL_RATE1 = 16 -- 2s * 16 = 32s local CALL_RATE2 = 8 -- 2s * 8 = 16s local DESCRIPTION = S("TA5 Fusion Reactor Controller") +local EX_POINTS = 80 local function count_trues(t) local cnt = 0 @@ -198,9 +199,11 @@ local function on_receive_fields(pos, formname, fields, player) return end - local nvm = techage.get_nvm(pos) - State:state_button_event(pos, nvm, fields) - --M(pos):set_string("formspec", formspec(State, pos, nvm)) + if techage.get_expoints(player) >= EX_POINTS then + local nvm = techage.get_nvm(pos) + State:state_button_event(pos, nvm, fields) + --M(pos):set_string("formspec", formspec(State, pos, nvm)) + end end minetest.register_node("techage:ta5_fr_controller_pas", { @@ -268,3 +271,11 @@ minetest.register_node("techage:ta5_fr_controller_act", { power.register_nodes({"techage:ta5_fr_controller_pas", "techage:ta5_fr_controller_act"}, Cable, "con", {"L", "R"}) +minetest.register_craft({ + output = "techage:ta5_fr_controller_pas", + recipe = { + {'techage:aluminum', 'basic_materials:gold_wire', 'default:steel_ingot'}, + {'techage:electric_cableS', 'techage:ta5_aichip2', 'techage:electric_cableS'}, + {'default:steel_ingot', 'default:diamond', 'techage:aluminum'}, + }, +}) diff --git a/fusion_reactor/generator.lua b/fusion_reactor/generator.lua index fa21c49..87c06c9 100644 --- a/fusion_reactor/generator.lua +++ b/fusion_reactor/generator.lua @@ -172,11 +172,11 @@ techage.register_node({"techage:ta5_generator", "techage:ta5_generator_on"}, { end, }) ---minetest.register_craft({ --- output = "techage:ta5_generator", --- recipe = { --- {"", "dye:blue", ""}, --- {"", "techage:generator", ""}, --- {"", "techage:ta4_wlanchip", ""}, --- }, ---}) +minetest.register_craft({ + output = "techage:ta5_generator", + recipe = { + {"", "dye:red", ""}, + {"", "techage:ta4_generator", ""}, + {"", "techage:baborium_ingot", ""}, + }, +}) diff --git a/fusion_reactor/heatexchanger1.lua b/fusion_reactor/heatexchanger1.lua index aacd3c4..0a2cb8a 100644 --- a/fusion_reactor/heatexchanger1.lua +++ b/fusion_reactor/heatexchanger1.lua @@ -99,11 +99,11 @@ techage.register_node({"techage:ta5_heatexchanger1"}, { end, }) ---minetest.register_craft({ --- output = "techage:ta5_heatexchanger1", --- recipe = { --- {"default:tin_ingot", "techage:electric_cableS", "default:steel_ingot"}, --- {"techage:ta4_pipeS", "basic_materials:gear_steel", "techage:ta4_pipeS"}, --- {"", "techage:baborium_ingot", ""}, --- }, ---}) +minetest.register_craft({ + output = "techage:ta5_heatexchanger1", + recipe = { + {"default:tin_ingot", "techage:electric_cableS", "default:steel_ingot"}, + {"techage:ta5_pipe1S", "basic_materials:gear_steel", "techage:ta4_pipeS"}, + {"", "techage:baborium_ingot", ""}, + }, +}) diff --git a/fusion_reactor/heatexchanger2.lua b/fusion_reactor/heatexchanger2.lua index 63f9065..0b48a87 100644 --- a/fusion_reactor/heatexchanger2.lua +++ b/fusion_reactor/heatexchanger2.lua @@ -27,11 +27,12 @@ local CYCLE_TIME = 2 local PWR_NEEDED = 5 local COUNTDOWN_TICKS = 1 local DOWN = 5 -- dir -local DESCRIPTION = S("TA5 Heat Exchanger") +local DESCRIPTION = S("TA5 Heat Exchanger 2") local EXPECT_BLUE = 56 local EXPECT_GREEN = 52 local CALL_RATE1 = 16 -- 2s * 16 = 32s local CALL_RATE2 = 8 -- 2s * 8 = 16s +local EX_POINTS = 80 local function heatexchanger1_cmnd(pos, topic, payload) return techage.transfer({x = pos.x, y = pos.y - 1, z = pos.z}, @@ -264,9 +265,11 @@ local function on_receive_fields(pos, formname, fields, player) return end - local nvm = techage.get_nvm(pos) - State:state_button_event(pos, nvm, fields) - --M(pos):set_string("formspec", formspec(State, pos, nvm)) + if techage.get_expoints(player) >= EX_POINTS then + local nvm = techage.get_nvm(pos) + State:state_button_event(pos, nvm, fields) + --M(pos):set_string("formspec", formspec(State, pos, nvm)) + end end -- Middle node with the formspec from the bottom node @@ -359,11 +362,11 @@ control.register_nodes({"techage:ta5_heatexchanger2"}, { } ) ---minetest.register_craft({ --- output = "techage:ta5_heatexchanger2", --- recipe = { --- {"default:tin_ingot", "", "default:steel_ingot"}, --- {"", "techage:ta4_wlanchip", ""}, --- {"", "techage:baborium_ingot", ""}, --- }, ---}) +minetest.register_craft({ + output = "techage:ta5_heatexchanger2", + recipe = { + {"default:tin_ingot", "", "default:steel_ingot"}, + {"", "techage:ta5_aichip2", ""}, + {"", "techage:baborium_ingot", ""}, + }, +}) diff --git a/fusion_reactor/heatexchanger3.lua b/fusion_reactor/heatexchanger3.lua index 1c719a8..dd8ee47 100644 --- a/fusion_reactor/heatexchanger3.lua +++ b/fusion_reactor/heatexchanger3.lua @@ -59,7 +59,7 @@ local function control_cmnd(pos, topic) end minetest.register_node("techage:ta5_heatexchanger3", { - description = S("TA4 Heat Exchanger 3"), + description = S("TA5 Heat Exchanger 3"), tiles = { -- up, down, right, left, back, front "techage_filling_ta4.png^techage_frame_ta5_top.png", @@ -94,13 +94,13 @@ techage.register_node({"techage:ta5_heatexchanger3"}, { end, }) ---minetest.register_craft({ --- output = "techage:ta5_heatexchanger3", --- recipe = { --- {"default:tin_ingot", "dye:blue", "default:steel_ingot"}, --- {"techage:ta4_pipeS", "basic_materials:gear_steel", "techage:ta4_pipeS"}, --- {"", "techage:baborium_ingot", ""}, --- }, ---}) +minetest.register_craft({ + output = "techage:ta5_heatexchanger3", + recipe = { + {"default:tin_ingot", "dye:red", "default:steel_ingot"}, + {"techage:ta5_pipe2S", "basic_materials:gear_steel", "techage:ta4_pipeS"}, + {"", "techage:baborium_ingot", ""}, + }, +}) techage.orientate_node = orientate_node diff --git a/fusion_reactor/magnet.lua b/fusion_reactor/magnet.lua index c423ff6..66889cf 100644 --- a/fusion_reactor/magnet.lua +++ b/fusion_reactor/magnet.lua @@ -232,7 +232,7 @@ minetest.register_craftitem("techage:ta5_magnet_shield", { }) techage.furnace.register_recipe({ - output = "techage:ta5_magnet_shield 1", + output = "techage:ta5_magnet_shield 2", recipe = {"default:steel_ingot", "techage:usmium_powder", "techage:graphite_powder"}, time = 2, diff --git a/fusion_reactor/shell.lua b/fusion_reactor/shell.lua index d4fc26a..c1964ab 100644 --- a/fusion_reactor/shell.lua +++ b/fusion_reactor/shell.lua @@ -45,3 +45,19 @@ minetest.register_node("techage:ta5_fr_nucleus", { is_ground_content = false, sounds = default.node_sound_metal_defaults(), }) + +techage.furnace.register_recipe({ + output = "techage:ta5_fr_shell 3", + recipe = {'techage:ta4_colliderblock', 'techage:ta4_colliderblock', "techage:graphite_powder"}, + time = 24, +}) + +minetest.register_craft({ + output = "techage:ta5_fr_nucleus", + recipe = { + {"", "techage:ta5_aichip2", ""}, + {"techage:electric_cableS", "techage:cylinder_large_hydrogen", "techage:ta3_valve_open"}, + {"", "techage:ta5_fr_shell", ""}, + }, +}) + diff --git a/fusion_reactor/ta5_pump.lua b/fusion_reactor/ta5_pump.lua index a9a9ee1..3ce8edb 100644 --- a/fusion_reactor/ta5_pump.lua +++ b/fusion_reactor/ta5_pump.lua @@ -181,11 +181,11 @@ liquid.register_nodes({ "techage:t5_pump", "techage:t5_pump_on", }, Pipe3, "pump", {"R"}, {}) ---minetest.register_craft({ --- output = "techage:t5_pump", --- recipe = { --- {"default:tin_ingot", "dye:red", "default:steel_ingot"}, --- {"", "techage:t4_pump", ""}, --- {"", "", ""}, --- }, ---}) +minetest.register_craft({ + output = "techage:t5_pump", + recipe = { + {"techage:aluminum", "dye:red", "default:steel_ingot"}, + {"techage:ta4_pipeS", "techage:ta5_ceramic_turbine", "techage:ta5_pipe1S"}, + {"default:steel_ingot", "basic_materials:motor", "techage:aluminum"}, + }, +}) diff --git a/fusion_reactor/turbine.lua b/fusion_reactor/turbine.lua index c1ff988..f3052ad 100644 --- a/fusion_reactor/turbine.lua +++ b/fusion_reactor/turbine.lua @@ -160,11 +160,11 @@ techage.register_node({"techage:ta5_turbine", "techage:ta5_turbine_on"}, { end, }) ---minetest.register_craft({ --- output = "techage:ta5_turbine", --- recipe = { --- {"", "dye:blue", ""}, --- {"", "techage:turbine", ""}, --- {"", "techage:ta4_wlanchip", ""}, --- }, ---}) +minetest.register_craft({ + output = "techage:ta5_turbine", + recipe = { + {"", "dye:red", ""}, + {"", "techage:turbine", ""}, + {"", "techage:ta5_ceramic_turbine", ""}, + }, +}) diff --git a/items/ceramic.lua b/items/ceramic.lua index f2d1dcf..f94e57f 100644 --- a/items/ceramic.lua +++ b/items/ceramic.lua @@ -59,11 +59,18 @@ minetest.register_craftitem("techage:ta4_round_ceramic", { inventory_image = "techage_round_ceramic.png", }) +minetest.register_craftitem("techage:ta5_ceramic_turbine", { + description = S("TA5 Ceramic Turbine"), + inventory_image = "techage_ceramic_turbine.png", +}) + + techage.furnace.register_recipe({ - output = "techage:ta4_round_ceramic 2", + output = "techage:ta5_ceramic_turbine", recipe = { - "techage:ta4_ceramic_material", "techage:ta4_ceramic_material", - "techage:ta4_ceramic_material", "techage:ta4_ceramic_material", + "techage:ta4_ceramic_material", + "techage:ta4_ceramic_material", + "techage:graphite_powder", }, time = 16, }) diff --git a/items/electronic.lua b/items/electronic.lua index ad180ce..1f54551 100644 --- a/items/electronic.lua +++ b/items/electronic.lua @@ -41,7 +41,12 @@ minetest.register_craftitem("techage:ta4_leds", { minetest.register_craftitem("techage:ta5_aichip", { description = S("TA5 AI Chip"), - inventory_image = "techage_aichip.png", + inventory_image = "techage_aichip.png^[colorize:#48b9de:40", +}) + +minetest.register_craftitem("techage:ta5_aichip2", { + description = S("TA5 AI Chip II"), + inventory_image = "techage_aichip.png^[colorize:#de486c:40", }) techage.recipes.add("ta2_electronic_fab", { @@ -84,3 +89,9 @@ techage.recipes.add("ta4_electronic_fab", { input = {"techage:ta4_leds 8", "basic_materials:copper_wire 1", "basic_materials:gold_wire 1", "techage:ta4_silicon_wafer 1"}, ex_points = 10, }) + +techage.recipes.add("ta4_electronic_fab", { + output = "techage:ta5_aichip2 2", + input = {"techage:ta4_leds 8", "basic_materials:copper_wire 1", "basic_materials:gold_wire 1", "techage:ta4_silicon_wafer 1"}, + ex_points = 50, +}) diff --git a/teleport/teleport_tube.lua b/teleport/teleport_tube.lua index 747a018..11517d3 100644 --- a/teleport/teleport_tube.lua +++ b/teleport/teleport_tube.lua @@ -154,16 +154,18 @@ techage.register_node({"techage:ta5_tele_tube"}, { local nvm = techage.get_nvm(pos) if techage.is_operational(nvm) then local rmt_pos = teleport.get_remote_pos(pos) - local rmt_nvm = techage.get_nvm(rmt_pos) - if techage.is_operational(rmt_nvm) then - local tube_dir = M(rmt_pos):get_int("tube_dir") - if techage.push_items(rmt_pos, tube_dir, stack) then - State:keep_running(pos, nvm, COUNTDOWN_TICKS) - State:keep_running(rmt_pos, rmt_nvm, COUNTDOWN_TICKS) - return true + if rmt_pos then + local rmt_nvm = techage.get_nvm(rmt_pos) + if techage.is_operational(rmt_nvm) then + local tube_dir = M(rmt_pos):get_int("tube_dir") + if techage.push_items(rmt_pos, tube_dir, stack) then + State:keep_running(pos, nvm, COUNTDOWN_TICKS) + State:keep_running(rmt_pos, rmt_nvm, COUNTDOWN_TICKS) + return true + end + else + State:blocked(pos, nvm, S("Remote block error")) end - else - State:blocked(pos, nvm, S("Remote block error")) end end return false diff --git a/textures/techage_aichip.png b/textures/techage_aichip.png index 58dfd32..85403ae 100644 Binary files a/textures/techage_aichip.png and b/textures/techage_aichip.png differ diff --git a/textures/techage_ceramic_turbine.png b/textures/techage_ceramic_turbine.png new file mode 100644 index 0000000..d2f55e5 Binary files /dev/null and b/textures/techage_ceramic_turbine.png differ