From 6cc1f75d15b04089865925c5aa3fc06c766bfa27 Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Sat, 1 Oct 2022 15:49:28 +0200 Subject: [PATCH] Improve manual, fix bug in electrolyzer menu description --- doc/plans.lua | 9 +++++---- hydrogen/electrolyzer.lua | 2 +- items/redstone.lua | 6 ++++-- liquids/pump.lua | 2 +- locale/techage.de.tr | 2 +- locale/template.txt | 2 +- manuals/manual_ta1_DE.md | 15 ++++++++++++--- manuals/manual_ta1_EN.md | 18 +++++++++++++----- manuals/manual_ta4_DE.md | 2 ++ manuals/manual_ta4_EN.md | 2 ++ 10 files changed, 42 insertions(+), 18 deletions(-) diff --git a/doc/plans.lua b/doc/plans.lua index 282997c..ad24c67 100644 --- a/doc/plans.lua +++ b/doc/plans.lua @@ -346,7 +346,8 @@ local STAND = {"techage_reactor_stand_side.png", "techage:ta4_reactor_stand"} local REACT = {"techage_reactor_plan.png", "techage:ta4_reactor"} local FILLR = {"techage_reactor_filler_plan.png", "techage:ta4_reactor_fillerpipe"} local DOSER = {"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_pump_up.png", "techage:ta4_doser"} -local SILO = {"techage_filling_ta3.png^techage_frame_ta3.png^techage_appl_silo.png", "techage:ta3_silo"} +local SILO4 = {"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_silo.png", "techage:ta4_silo"} +local TANK4 = {"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_tank.png", "techage:ta4_tank"} techage.ConstructionPlans["ta4_reactor"] = { {false, false, false, false, false, false, SIDEV, false, false, false, false}, @@ -354,9 +355,9 @@ techage.ConstructionPlans["ta4_reactor"] = { {false, false, false, false, PN000, PIPEH, PIPEH, PN270, false, false, false}, {false, false, false, false, PIPEV, false, false, FILLR, false, false, false}, {false, false, false, false, PIPEV, false, false, REACT, false, false, false}, - {false, false, false, false, PIPEV, false, false, STAND, PIPEH, PIPEH, SILO}, - {false, TANK3, PIPEH, PIPEH, DOSER, PN270, false, RBASE, PIPEH, PIPEH, TANK3}, - {false, SILO, PIPEH, PIPEH, PIPEH, PN180, false, false, false, false, false}, + {false, false, false, false, PIPEV, false, false, STAND, PIPEH, PIPEH, SILO4}, + {false, TANK4, PIPEH, PIPEH, DOSER, PN270, false, RBASE, PIPEH, PIPEH, TANK4}, + {false, SILO4, PIPEH, PIPEH, PIPEH, PN180, false, false, false, false, false}, } -- diff --git a/hydrogen/electrolyzer.lua b/hydrogen/electrolyzer.lua index 155091f..599d489 100644 --- a/hydrogen/electrolyzer.lua +++ b/hydrogen/electrolyzer.lua @@ -200,7 +200,7 @@ local tool_config = { choices = "0%,20%,40%,60%,80%,98%", name = "turnoff", label = S("Turnoff point"), - tooltip = S("If the charge of the storage\nsystem exceeds the configured value,\nthe block switches off"), + tooltip = S("If the charge of the storage\nsystem falls below the configured value,\nthe block switches off"), default = "98%", }, } diff --git a/items/redstone.lua b/items/redstone.lua index 2008c0f..202e811 100644 --- a/items/redstone.lua +++ b/items/redstone.lua @@ -58,11 +58,13 @@ minetest.register_craft({ }) techage.furnace.register_recipe({ - output = "techage:red_stone", + output = "techage:red_stone 3", recipe = { "techage:canister_redmud", "default:sand", + "default:sand", + "default:sand", }, waste = "techage:ta3_canister_empty", - time = 4, + time = 10, }) diff --git a/liquids/pump.lua b/liquids/pump.lua index b56cf47..2346099 100644 --- a/liquids/pump.lua +++ b/liquids/pump.lua @@ -60,7 +60,7 @@ local State4 = techage.NodeStates:new({ -- Function returns the number of pumped units local function pump(pos, mem, nvm, state, outdir, units) local taken, name = liquid.take(pos, Pipe, Flip[outdir], nil, units, mem.dbg_cycles > 0) - if taken > 0 then + if taken > 0 and name then local leftover = liquid.put(pos, Pipe, outdir, name, taken, mem.dbg_cycles > 0) if leftover and leftover > 0 then -- air needs no tank diff --git a/locale/techage.de.tr b/locale/techage.de.tr index 22a49a6..648401f 100644 --- a/locale/techage.de.tr +++ b/locale/techage.de.tr @@ -387,7 +387,7 @@ Power=Strom Configurable value@nfor the current limit=Konfigurierbarer Wert@nfür die Strombegrenzung Current limitation=Strombegrenzung Electrolyzer=Eletrolyseur -If the charge of the storage@nsystem exceeds the configured value,@nthe block switches off=Überschreitet die Ladung des@nSpeichersystems den konfigurierten@nWert, schaltet sich der Block ab +If the charge of the storage@nsystem falls below the configured value,@nthe block switches off=unterschreitet die Ladung des@nSpeichersystems den konfigurierten@nWert, schaltet sich der Block ab Maximum possible@ncurrent consumption=Maximal mögliche Stromaufnahme Maximum power consumption [ku]=maximale Stromaufnahme Storage full=Speicher voll diff --git a/locale/template.txt b/locale/template.txt index 4a2676e..30adcb0 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -387,7 +387,7 @@ Power= Configurable value@nfor the current limit= Current limitation= Electrolyzer= -If the charge of the storage@nsystem exceeds the configured value,@nthe block switches off= +If the charge of the storage@nsystem falls below the configured value,@nthe block switches off= Maximum possible@ncurrent consumption= Maximum power consumption [ku]= Storage full= diff --git a/manuals/manual_ta1_DE.md b/manuals/manual_ta1_DE.md index e602081..4811439 100644 --- a/manuals/manual_ta1_DE.md +++ b/manuals/manual_ta1_DE.md @@ -17,13 +17,22 @@ Die Haltbarkeit/Härte bspw. für eine Axt ist: Den Köhler brauchst du, um Holzkohle herzustellen. Holzkohle wird für den Brenner, aber auch bspw. in TA2 für die Dampfmaschine benötigt. +Für den Köhler brauchst du: + +- einen Anzünderblock (`techage:lighter`) +- 26 Hölzblöcke (wood), die zu einem Würfen aufgeschichtet werden. Die Holzsorte spielt keine Rolle +- Erde (dirt) um den Holzhaufen abzudecken +- Flint and Iron (technischer Name: `fire:flint_and_steel`) um den Anzünderblock anzuzünden + + + Bauanleitung (siehe auch Plan): - Baue eine 5x5 große Fläche aus Erde (dirt) - Platziere in die Mitte einen Anzünder (lighter) -- Baue aus Holz (wood) einen 3x3x3 großen Würfel darüber -- Überdecke alles mit einer Schicht Erde zu einem 5x5x5 großen Würfel -- Lasse ein Loch zum Anzünder +- Platziere rund um den Anzünder 7 Holz (wood), aber lasse ein Loch zum Anzünder frei +- Baue weitere 2 Schichten Holz darüber, so dass ein 3x3x3 großen Holzwürfel entsteht +- Überdecke alles mit einer Schicht Erde zu einem 5x5x5 großen Würfel, aber lasse das Loch zum Anzünder frei - Zünde den Anzünder an und verschließe das Loch sofort mit jeweils einem Block Holz und Erde - Wenn du alles richtig gemacht hast, beginnt der Köhler nach wenigen Sekunden an zu rauchen - Öffne den Köhler erst, wenn der Rauch verschwunden ist (ca. 20 min) diff --git a/manuals/manual_ta1_EN.md b/manuals/manual_ta1_EN.md index 79e2ccf..41dada3 100644 --- a/manuals/manual_ta1_EN.md +++ b/manuals/manual_ta1_EN.md @@ -17,13 +17,21 @@ The durability / hardness for an axe, for example: You need the Charcoal Pile to make charcoal. Charcoal is required for the melting furnace, but also, for example, in TA2 for the steam engine. +For the charcoal burner you need: + +- a lighter block (`techage:lighter`) +- 26 wooden blocks that are stacked into a pile of wood. The type of wood is irrelevant +- Dirt to cover the pile of wood +- Flint and Iron (technical name: `fire:flint_and_steel`) to light the lighter block + + + Building instructions (see also plan): -- Build a 5x5 area of ​​dirt -- Place a lighter in the middle -- Build a 3x3x3 cube above it out of wood -- Cover everything with a layer of dirt to form a 5x5x5 cube -- Leave a hole to the lighter +- Build a 5x5 area of dirt +- Place 7 wood around the lighter but leave a hole to the lighter +- Build another 2 layers of wood on top, making a 3x3x3 wooden cube +- Cover everything with a layer of dirt into a 5x5x5 cube, but keep the hole to the lighter open - Light the lighter and immediately close the hole with a block of wood and dirt - If you have done everything correctly, the coal burner will start smoking after a few seconds - Only open the charcoal burner when the smoke has disappeared (approx. 20 min) diff --git a/manuals/manual_ta4_DE.md b/manuals/manual_ta4_DE.md index e12d10c..c534aa7 100644 --- a/manuals/manual_ta4_DE.md +++ b/manuals/manual_ta4_DE.md @@ -258,6 +258,8 @@ In den Elektrolyseur passen 200 Einheiten Wasserstoff. Der Elektrolyseur besitzt ein Schraubenschlüssel-Menü zur Einstellung der Stromaufnahme und des Abschaltpunkts. +Unterschreitet die im Stromnetz gespeicherte Leistung den angegebenen Wert des Abschaltpunkts, so schaltet sich der Elektrolyseur automatisch ab. Damit kann ein Leerlaufen der Speichersysteme verhindert werden. + [ta4_electrolyzer|image] diff --git a/manuals/manual_ta4_EN.md b/manuals/manual_ta4_EN.md index e6ef62b..d15f18f 100644 --- a/manuals/manual_ta4_EN.md +++ b/manuals/manual_ta4_EN.md @@ -251,6 +251,8 @@ The electrolyzer can draw up to 35 ku of electricity and then generates a hydrog The electrolyzer has a wrench menu for setting the current consumption and the switch-off point. +If the power stored in the power grid falls below the specified value of the switch-off point, the electrolyzer switches off automatically. This prevents the storage systems from running empty. + [ta4_electrolyzer|image]