From 224689f3f2c849fc0b9da120336259434d1c5ffa Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Mon, 17 Jun 2019 21:24:48 +0200 Subject: [PATCH] some bugfixes --- basic_machines/blackhole.lua | 2 +- basic_machines/forceload.lua | 2 +- basis/firebox_lib.lua | 2 +- coal_power_station/boiler_top.lua | 6 ++++-- coal_power_station/generator.lua | 2 +- furnace/furnace_top.lua | 2 +- oil/explore.lua | 4 ++-- oil/pumpjack.lua | 2 +- power/powerswitch.lua | 8 ++++++++ steam_engine/firebox.lua | 2 +- 10 files changed, 21 insertions(+), 11 deletions(-) diff --git a/basic_machines/blackhole.lua b/basic_machines/blackhole.lua index 4babc71..b9e5476 100644 --- a/basic_machines/blackhole.lua +++ b/basic_machines/blackhole.lua @@ -44,7 +44,7 @@ minetest.register_craft({ output = "techage:blackhole", recipe = { {"group:wood", "", "group:wood"}, - {"tubelib:tubeS", "default:coal_lump", ""}, + {"techage:tubeS", "default:coal_lump", ""}, {"group:wood", "techage:iron_ingot", "group:wood"}, }, }) diff --git a/basic_machines/forceload.lua b/basic_machines/forceload.lua index cee6fa8..1d70e3e 100644 --- a/basic_machines/forceload.lua +++ b/basic_machines/forceload.lua @@ -177,7 +177,7 @@ if techage.max_num_forceload_blocks > 0 then output = "techage:forceload", recipe = { {"group:wood", "", "group:wood"}, - {"default:mese_crystal_fragment", "techage:baborium_lump", "default:mese_crystal_fragment"}, + {"default:mese_crystal_fragment", "techage:usmium_nuggets", "default:mese_crystal_fragment"}, {"group:wood", "techage:iron_ingot", "group:wood"}, }, }) diff --git a/basis/firebox_lib.lua b/basis/firebox_lib.lua index a6556f4..137a25d 100644 --- a/basis/firebox_lib.lua +++ b/basis/firebox_lib.lua @@ -76,7 +76,7 @@ end function techage.firebox.can_dig(pos, player) local mem = tubelib2.get_mem(pos) local inv = M(pos):get_inventory() - return inv:is_empty("fuel") and not mem.running + return inv:is_empty("fuel") end function techage.firebox.allow_metadata_inventory(pos, listname, index, stack, player) diff --git a/coal_power_station/boiler_top.lua b/coal_power_station/boiler_top.lua index 3a5b6b7..c8d4635 100644 --- a/coal_power_station/boiler_top.lua +++ b/coal_power_station/boiler_top.lua @@ -276,8 +276,10 @@ techage.register_node({"techage:coalboiler_top"}, { if topic == "trigger" then local mem = tubelib2.get_mem(pos) mem.fire_trigger = true - mem.power_ratio = transfer(pos, topic, payload) - return mem.power_ratio + if mem.running then + mem.power_ratio = transfer(pos, topic, payload) + return mem.power_ratio + end end end }) diff --git a/coal_power_station/generator.lua b/coal_power_station/generator.lua index 967c078..43493f1 100644 --- a/coal_power_station/generator.lua +++ b/coal_power_station/generator.lua @@ -158,7 +158,7 @@ minetest.register_node("techage:generator_on", { }, }, { - image = "techage_filling4_ta3.png^techage_appl_generator4.png^techage_frame4_ta3.png", + image = "techage_filling4_ta3.png^techage_appl_generator4.png^[transformFX]^techage_frame4_ta3.png", backface_culling = false, animation = { type = "vertical_frames", diff --git a/furnace/furnace_top.lua b/furnace/furnace_top.lua index 6eb7a2c..a00b439 100644 --- a/furnace/furnace_top.lua +++ b/furnace/furnace_top.lua @@ -239,7 +239,7 @@ local _, node_name_ta3, _ = minetest.register_craft({ output = node_name_ta3, recipe = { - {"", "techage:baborium_ingot", ""}, + {"", "techage:usmium_nuggets", ""}, {"", "default:furnace", ""}, {"", "techage:vacuum_tube", ""}, }, diff --git a/oil/explore.lua b/oil/explore.lua index 81d1885..0577023 100644 --- a/oil/explore.lua +++ b/oil/explore.lua @@ -8,8 +8,8 @@ local MP = minetest.get_modpath("techage") local I,IS = dofile(MP.."/intllib.lua") -local PROBABILITY = 100 -local OIL_MIN = 1000 +local PROBABILITY = 80 +local OIL_MIN = 2000 local OIL_MAX = 20000 local DEPTH_MIN = 8 local DEPTH_MAX = (16 * 25) + 8 diff --git a/oil/pumpjack.lua b/oil/pumpjack.lua index f46667c..42798fd 100644 --- a/oil/pumpjack.lua +++ b/oil/pumpjack.lua @@ -186,7 +186,7 @@ local _, node_name_ta3, _ = minetest.register_craft({ output = "techage:ta3_pumpjack_pas", recipe = { - {"", "techage:baborium_ingot", ""}, + {"", "techage:usmium_nuggets", ""}, {"dye:red", "techage:ta3_pusher_pas", "dye:red"}, {"", "techage:oil_drillbit", ""}, }, diff --git a/power/powerswitch.lua b/power/powerswitch.lua index 93563e5..ac60aa4 100644 --- a/power/powerswitch.lua +++ b/power/powerswitch.lua @@ -178,3 +178,11 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "techage:powerswitch_box", + recipe = { + {"", "basic_materials:plastic_sheet", ""}, + {"techage:electric_cableS", "basic_materials:copper_wire", "techage:electric_cableS"}, + {"", "basic_materials:plastic_sheet", ""}, + }, +}) diff --git a/steam_engine/firebox.lua b/steam_engine/firebox.lua index c6f4e2c..aa2714a 100644 --- a/steam_engine/firebox.lua +++ b/steam_engine/firebox.lua @@ -27,7 +27,7 @@ local CYCLE_TIME = 2 local function node_timer(pos, elapsed) local mem = tubelib2.get_mem(pos) - print("firebox burn_cycles = "..(mem.burn_cycles or 0)) + --print("firebox burn_cycles = "..(mem.burn_cycles or 0)) if mem.running then local power = techage.transfer( {x=pos.x, y=pos.y+2, z=pos.z},