From 3e4586837243a099505cd5b11775c1233ee47fb6 Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Mon, 29 Jun 2020 19:09:12 +0200 Subject: [PATCH] v0.14 with several changes (see readme) --- README.md | 66 ++++++++++++++++++++++++++++++++------- basic_machines/quarry.lua | 3 ++ basis/gravel_lib.lua | 21 +++++++------ basis/nodedata_sqlite.lua | 10 ++++-- doc/items.lua | 1 + doc/manual_DE.lua | 17 ++++++++-- doc/manual_EN.lua | 23 ++++++++++---- init.lua | 3 +- items/aluminium.lua | 2 +- items/cement.lua | 52 ++++++++++++++++++++++++++++++ manuals/manual_DE.md | 11 ++++++- manuals/manual_EN.md | 9 ++++++ manuals/manual_ta3_DE.md | 8 ++--- manuals/manual_ta3_EN.md | 12 +++---- manuals/toc_DE.md | 1 + manuals/toc_EN.md | 1 + oil/reboiler.lua | 2 +- 17 files changed, 195 insertions(+), 47 deletions(-) create mode 100644 items/cement.lua diff --git a/README.md b/README.md index 425d757..1b1416b 100644 --- a/README.md +++ b/README.md @@ -79,16 +79,58 @@ to 'lsqlite3' and 'lua-marshal', but there is no way back, so: ### History -- 2019-06-16 V0.01 * First upload -- 2019-09-28 V0.02 * TA3 finished -- 2020-02-29 V0.04 * TA4 ICTA controller added -- 2020-03-14 V0.05 * TA4 Lua controller added -- 2020-04-24 V0.06 * TA4 injector added -- 2020-04-26 V0.07 * English translation added -- 2020-05-22 V0.08 * Support for 'lua-marshal' and 'lsqlite3' added -- 2020-05-31 V0.09 * TA4 tubes upgraded, manuals updated -- 2020-06-04 V0.10 * minor changes and bugfixes -- 2020-06-14 V0.11 * cart commands added for both controllers, support for moreores added -- 2020-06-17 V0.12 * Ethereal support added, manual correction, tin ingot recipe bugfix -- 2020-06-19 V0.13 * Mesecons Converter added + +**2020-06-29 V0.14** +- quarry sound bugfix +- grinder bugfix +- ore probability calculation changed +- lua-marshal deactivated (due to weird server crashes) +- alternative cement recipe added +- aluminum output increased +- reboiler cycle time increased to 16 s (from 6) +- many manual improvements + +**2020-06-19 V0.13** +- Mesecons Converter added + +**2020-06-17 V0.12** +- Ethereal support added +- manual correction +- tin ingot recipe bugfix + +**2020-06-14 V0.11** +- cart commands added for both controllers +- support for moreores added + +**2020-06-04 V0.10** +- minor changes and bugfixes + +**2020-05-31 V0.09** +- TA4 tubes upgraded, manuals updated + +**2020-05-22 V0.08** +- Support for 'lua-marshal' and 'lsqlite3' added + +**2020-04-26 V0.07** +- English translation added + +**2020-04-24 V0.06** +- TA4 injector added + +**2020-03-14 V0.05** +- TA4 Lua controller added + +**2020-02-29 V0.04** +- TA4 ICTA controller added + +**2019-09-28 V0.02** +- TA3 finished + +**2019-06-16 V0.01** +- First upload + +- +- +- +- diff --git a/basic_machines/quarry.lua b/basic_machines/quarry.lua index 73743ee..9250f4e 100644 --- a/basic_machines/quarry.lua +++ b/basic_machines/quarry.lua @@ -234,6 +234,9 @@ local function keep_running(pos, elapsed) if techage.is_activeformspec(pos) then M(pos):set_string("formspec", formspec(crd.State, pos, nvm)) end + if nvm.techage_state ~= techage.RUNNING then + stop_sound(pos) + end end local function on_rightclick(pos, node, clicker) diff --git a/basis/gravel_lib.lua b/basis/gravel_lib.lua index 2cd64b7..8ecacf6 100644 --- a/basis/gravel_lib.lua +++ b/basis/gravel_lib.lua @@ -20,8 +20,8 @@ local ore_probability = { } local ProbabilityCorrections = { - ["default:tin_lump"] = 0.5, -- extensively used - ["default:coal_lump"] = 0.3, -- extensively used + ["default:tin_lump"] = 0.3, -- extensively used + ["default:coal_lump"] = 0.2, -- extensively used ["default:iron_lump"] = 0.5, -- extensively used ["techage:baborium_lump"] = 99999, -- mining required } @@ -39,15 +39,14 @@ local function add_ores() and item.clust_scarcity ~= nil and item.clust_scarcity > 0 and item.clust_num_ores ~= nil and item.clust_num_ores > 0 and item.y_max ~= nil and item.y_min ~= nil then - local probability = (techage.ore_rarity / PROBABILITY_FACTOR) * item.clust_scarcity / - (item.clust_num_ores * ((item.y_max - item.y_min) / 65535)) - if ore_probability[drop] == nil then - ore_probability[drop] = probability - else - -- harmonic sum - ore_probability[drop] = 1.0 / ((1.0 / ore_probability[drop]) + - (1.0 / probability)) + local factor = 0.5 + if item.y_max < -250 then + factor = -250 / item.y_max end + local probability = (techage.ore_rarity / PROBABILITY_FACTOR) * item.clust_scarcity / + (item.clust_num_ores * factor) + -- lower value means higher probability + ore_probability[drop] = math.min(ore_probability[drop] or 100000, probability) end end end @@ -55,6 +54,8 @@ local function add_ores() for key, correction in pairs(ProbabilityCorrections) do if ore_probability[key] then ore_probability[key] = ore_probability[key] * correction + -- consider upper and lower level + ore_probability[key] = techage.in_range(ore_probability[key], 10, 100000) end end local overall_probability = 0.0 diff --git a/basis/nodedata_sqlite.lua b/basis/nodedata_sqlite.lua index c7078c6..7c0a33a 100644 --- a/basis/nodedata_sqlite.lua +++ b/basis/nodedata_sqlite.lua @@ -72,14 +72,20 @@ end local api = {} function api.store_mapblock_data(key, mapblock_data) - local s = marshal.encode(mapblock_data) + -- deactivated due to weird server crashes without error logs + --local s = marshal.encode(mapblock_data) + local s = minetest.serialize(mapblock_data) return set_block(key, s) end function api.get_mapblock_data(key) local s = get_block(key) if s then - return marshal.decode(s) + if s:byte(1) == MAR_MAGIC then + return marshal.decode(s) + else + return minetest.deserialize(s) + end end api.store_mapblock_data(key, {}) return {} diff --git a/doc/items.lua b/doc/items.lua index 4261273..488eac6 100644 --- a/doc/items.lua +++ b/doc/items.lua @@ -23,6 +23,7 @@ techage.Items = { baborium = "techage:stone_with_baborium", bauxite = "techage:bauxite_stone", usmium = "techage:usmium_nuggets", + basalt = "techage:basalt_stone", oil = "techage:oil_source", ta1_hopper = "techage:hopper_ta1", wlanchip = "techage:ta4_wlanchip", diff --git a/doc/manual_DE.lua b/doc/manual_DE.lua index 24000cf..36c0d11 100644 --- a/doc/manual_DE.lua +++ b/doc/manual_DE.lua @@ -9,6 +9,7 @@ techage.manual_DE.aTitel = { "3,Baborium", "3,Erdöl", "3,Bauxit", + "3,Basalt", "2,History", "1,TA1: Eisenzeitalter", "2,Köhler / Coal Pile", @@ -225,6 +226,7 @@ techage.manual_DE.aText = { " - Baborium - ein Metall\\, welches für Rezepte in TA3 benötigt wird\n".. " - Erdöl - wird in TA3 benötigt\n".. " - Bauxit - ein Aluminiumerz\\, was in TA4 zur Herstellung von Aluminium benötigt wird\n".. + " - Basalt - entsteht\\, wenn sich Wasser und Lave berühren\n".. "\n", "Meridium ist eine Legierung aus Stahl und Mesekristallen. Meridium Ingots können mit dem Kohlebrenner aus Stahl und Mesesplitter hergestellt werden. Meridium leuchtet im Dunkeln. Auch Werkzeuge aus Meridium leuchten und sind daher im Untertagebau sehr hilfreich.\n".. "\n".. @@ -248,6 +250,13 @@ techage.manual_DE.aText = { "\n".. "\n".. "\n", + "Basalt entsteht nur\\, wenn Lava und Wasser zusammenkommen.\n".. + "Dazu sollte man am besten eine Anlage aufbauen\\, bei der eine Lava- und eine Wasserquelle zusammenfließen.\n".. + "Dort wo sich beide Flüssigkeiten treffen\\, entsteht Lava.\n".. + "Einen automatisierten Basalt Generator kann man mit dem Sign Bot aufbauen.\n".. + "\n".. + "\n".. + "\n", " - 28.09.2019: Um Solaranlage erweitert\n".. " - 05.10.2019: Daten zur Solaranlage und Beschreibung zum Wechselrichter und zum Power-Terminal geändert\n".. " - 18.11.2019: Kapitel für Erze\\, Reaktor\\, Aluminium\\, Silo\\, Bauxit\\, Ofenheizung\\, Kieswaschanlage hinzugefügt\n".. @@ -796,7 +805,7 @@ techage.manual_DE.aText = { "Der Destillationsturm muss wie im Plan rechts oben aufgebaut werden. \n".. "Über den Basisblock wird das Bitumen abgelassen. Der Ausgang ist auf der Rückseite des Basisblocks (Pfeilrichtung beachten).\n".. "Auf diesen Basisblock kommen die \"Destillationsturm\" Blöcke mit den Nummern: 1\\, 2\\, 3\\, 2\\, 3\\, 2\\, 3\\, 4\n".. - "An den Öffnungen von unten nach oben werden Schweröl\\, Naphtha und Benzin abgeleitet. Ganz oben wird das Gas abgefangen.\n".. + "An den Öffnungen von unten nach oben werden Schweröl\\, Naphtha und Benzin abgeleitet. Ganz oben wird das Propangas abgefangen.\n".. "Es müssen alle Öffnungen am Turm mit Tanks verbunden werden.\n".. "Der Aufkocher (reboiler) muss mit dem Block \"Destillationsturm 1\" verbunden werden.\n".. "\n".. @@ -806,7 +815,7 @@ techage.manual_DE.aText = { "\n", "Der Aufkocher erhitzt das Erdöl auf ca. 400°C. Dabei verdampft es weitgehend und wird in den Destillationsturm zur Abkühlung geleitet.\n".. "\n".. - "Der Aufkocher benötigt 12 Einheiten Strom und produziert alle 6 s jeweils eine Einheit Bitumen\\, Schweröl\\, Naphtha\\, Benzin und Gas.\n".. + "Der Aufkocher benötigt 14 Einheiten Strom und produziert alle 16 s jeweils eine Einheit Bitumen\\, Schweröl\\, Naphtha\\, Benzin und Propangas.\n".. "Dazu muss der Aufkocher über einen Pumpe mit Erdöl versorgt werden.\n".. "\n".. "\n".. @@ -920,7 +929,7 @@ techage.manual_DE.aText = { "\n".. "\n", "Die Signallampe kann mit 'on'/'off' Kommando ein- bzw. ausgeschaltet werden. Diese Lampe braucht keinen Strom und\n".. - "kann mit der Spritzpistole farbig gemacht werden.\n".. + "kann mit der Spritzpistole aus der Mod \"Unified Dyes\" farbig gemacht werden.\n".. "\n".. "\n".. "\n", @@ -1484,6 +1493,7 @@ techage.manual_DE.aItemName = { "baborium", "oil", "bauxite", + "basalt", "", "techage_ta1", "", @@ -1671,6 +1681,7 @@ techage.manual_DE.aPlanTable = { "", "", "", + "", "coalpile", "coalburner", "", diff --git a/doc/manual_EN.lua b/doc/manual_EN.lua index 147d730..8ed08f0 100644 --- a/doc/manual_EN.lua +++ b/doc/manual_EN.lua @@ -9,6 +9,7 @@ techage.manual_EN.aTitel = { "3,Baborium", "3,Petroleum", "3,Bauxite", + "3,Basalt", "2,History", "1,TA1: Iron Age", "2,Charcoal Pile (charcoal burner)", @@ -225,6 +226,7 @@ techage.manual_EN.aText = { " - Baborium - a metal that is needed for recipes in TA3\n".. " - Petroleum - is needed in TA3\n".. " - Bauxite - an aluminum ore that is needed in TA4 to produce aluminum\n".. + " - Basalt - arises when water and lave touch\n".. "\n", "Meridium is an alloy of steel and mesecons crystals. Meridium ingots can be made with the coal burner from steel and mesecons crystals. Meridium glows in the dark. Tools made of Meridium also light up and are therefore very helpful in underground mining.\n".. "\n".. @@ -248,6 +250,13 @@ techage.manual_EN.aText = { "\n".. "\n".. "\n", + "Basalt is only created when lava and water come together.\n".. + "The best thing to do is to set up a system where a lava and a water source flow together.\n".. + "Lava is formed where both liquids meet.\n".. + "You can build an automated basalt generator with the Sign Bot.\n".. + "\n".. + "\n".. + "\n", " - 28.09.2019: Solar system added\n".. " - 05.10.2019: Data on the solar system and description of the inverter and the power terminal changed\n".. " - 18.11.2019: Chapter for ores\\, reactor\\, aluminum\\, silo\\, bauxite\\, furnace heating\\, gravel washing system added\n".. @@ -526,7 +535,7 @@ techage.manual_EN.aText = { "\n", "Part of the power plant.\n".. "\n".. - "The oil burner can be filled with petroleum\\, heavy oil\\, naphtha or petrol. The burning time depends on the power that is requested by the power plant. Under full load\\, petroleum burns 15 s\\, heavy oil 20 s\\, naphtha 22 s and gasoline 25 s.\n".. + "The oil burner can be filled with crude oil\\, fuel oil\\, naphtha or gasoline. The burning time depends on the power that is requested by the power plant. Under full load\\, crude oil burns 15 s\\, fuel oil 20 s\\, naphtha 22 s and gasoline 25 s.\n".. "\n".. "Correspondingly longer under partial load (50% load = double time).\n".. "\n".. @@ -645,7 +654,7 @@ techage.manual_EN.aText = { "\n", "Is part of the TA3 industrial furnace.\n".. "\n".. - "The oil burner can be operated with heavy oil\\, naphtha or gasoline. The burning time is 80 s for heavy oil\\, 90 s for naphtha and 100 s for gasoline.\n".. + "The oil burner can be operated with fuel oil\\, naphtha or gasoline. The burning time is 80 s for fuel oil\\, 90 s for naphtha and 100 s for gasoline.\n".. "\n".. "The oil burner can only hold 50 units of fuel. An additional tank and a pump are therefore advisable.\n".. "\n".. @@ -786,7 +795,7 @@ techage.manual_EN.aText = { "\n".. "\n".. "\n", - "Oil is a mixture of substances and consists of many components. The oil can be broken down into its main components such as bitumen\\, heavy oil\\, naphtha\\, gasoline and gas via a distillation tower.\n".. + "Oil is a mixture of substances and consists of many components. The oil can be broken down into its main components such as bitumen\\, fuel oil\\, naphtha\\, gasoline and propane gas via a distillation tower.\n".. "Further processing to end products takes place in the chemical reactor.\n".. "\n".. "\n".. @@ -794,7 +803,7 @@ techage.manual_EN.aText = { "The distillation tower must be set up as in the plan at the top right.\n".. "The bitumen is drained off via the base block. The exit is on the back of the base block (note the direction of the arrow).\n".. "The \"distillation tower\" blocks with the numbers: 1\\, 2\\, 3\\, 2\\, 3\\, 2\\, 3\\, 4 are placed on this basic block\n".. - "Heavy oil\\, naphtha and gasoline are drained from the openings from bottom to top. The gas is caught at the top.\n".. + "Fuel oil\\, naphtha and gasoline are drained from the openings from bottom to top. The propane gas is caught at the top.\n".. "All openings on the tower must be connected to tanks.\n".. "The reboiler must be connected to the \"distillation tower 1\" block.\n".. "\n".. @@ -804,7 +813,7 @@ techage.manual_EN.aText = { "\n", "The reboiler heats the oil to approx. 400 ° C. It largely evaporates and is fed into the distillation tower for cooling.\n".. "\n".. - "The reboiler requires 12 units of electricity and produces one unit of bitumen\\, heavy oil\\, naphtha\\, gasoline and gas every 6 s.\n".. + "The reboiler requires 14 units of electricity and produces one unit of bitumen\\, fuel oil\\, naphtha\\, gasoline and propane every 16 s.\n".. "To do this\\, the reboiler must be supplied with oil via a pump.\n".. "\n".. "\n".. @@ -918,7 +927,7 @@ techage.manual_EN.aText = { "\n".. "\n", "The signal lamp can be switched on or off with the 'on' / 'off' command. This lamp does not need electricity and\n".. - "can be colored with the spray gun.\n".. + "can be colored with the airbrush tool of the mod Unified Dyes.\n".. "\n".. "\n".. "\n", @@ -1474,6 +1483,7 @@ techage.manual_EN.aItemName = { "baborium", "oil", "bauxite", + "basalt", "", "techage_ta1", "", @@ -1661,6 +1671,7 @@ techage.manual_EN.aPlanTable = { "", "", "", + "", "coalpile", "coalburner", "", diff --git a/init.lua b/init.lua index 22fac07..4b08c3b 100644 --- a/init.lua +++ b/init.lua @@ -13,7 +13,7 @@ techage = {} -- Version for compatibility checks, see readme.md/history -techage.version = 0.13 +techage.version = 0.14 if minetest.global_exists("tubelib") then minetest.log("error", "[techage] Techage can't be used together with the mod tubelib!") @@ -298,6 +298,7 @@ dofile(MP.."/items/plastic.lua") dofile(MP.."/items/hydrogen.lua") dofile(MP.."/items/electronic.lua") dofile(MP.."/items/redstone.lua") +dofile(MP.."/items/cement.lua") if techage.basalt_stone_enabled then dofile(MP.."/items/basalt.lua") diff --git a/items/aluminium.lua b/items/aluminium.lua index 60a6613..a837e12 100644 --- a/items/aluminium.lua +++ b/items/aluminium.lua @@ -55,7 +55,7 @@ techage.recipes.add("ta4_doser", { }) techage.furnace.register_recipe({ - output = "techage:aluminum", + output = "techage:aluminum 2", recipe = {"techage:gibbsite_powder", "techage:gibbsite_powder", "techage:gibbsite_powder", "techage:gibbsite_powder"}, time = 16, diff --git a/items/cement.lua b/items/cement.lua new file mode 100644 index 0000000..92a7d97 --- /dev/null +++ b/items/cement.lua @@ -0,0 +1,52 @@ +--[[ + + TechAge + ======= + + Copyright (C) 2020 Joachim Stolberg + + GPL v3 + See LICENSE.txt for more information + + Cement as ingredient and alternative recipe for basic_materials:wet_cement + Cement is cooked and grinded clay + +]]-- + +local S = techage.S + + +if not minetest.global_exists("bakedclay") then + minetest.register_node("techage:cement_block", { + description = S("Cement Block"), + tiles = {"default_clay.png^[colorize:#FFFFFF:160"}, + is_ground_content = false, + groups = {cracky = 2, stone = 1}, + sounds = default.node_sound_stone_defaults(), + }) + + minetest.register_craft({ + type = "cooking", + output = "techage:cement_block", + recipe = "default:clay", + }) + + techage.add_grinder_recipe({input="techage:cement_block", output="techage:cement_powder"}) +else + techage.add_grinder_recipe({input="bakedclay:white", output="techage:cement_powder"}) +end + +minetest.register_craftitem("techage:cement_powder", { + description = S("Cement Powder"), + inventory_image = "techage_powder_inv.png^[colorize:#FFFFFF:240", + groups = {powder = 1}, +}) + +minetest.register_craft({ + output = "basic_materials:wet_cement 3", + recipe = { + {"bucket:bucket_water", "techage:cement_powder"}, + {"group:sand", "default:gravel"}, + } +}) + diff --git a/manuals/manual_DE.md b/manuals/manual_DE.md index cd50c95..c6bd734 100644 --- a/manuals/manual_DE.md +++ b/manuals/manual_DE.md @@ -46,7 +46,7 @@ Techage fügt dem Spiel einige neue Items hinzu: - Baborium - ein Metall, welches für Rezepte in TA3 benötigt wird - Erdöl - wird in TA3 benötigt - Bauxit - ein Aluminiumerz, was in TA4 zur Herstellung von Aluminium benötigt wird - +- Basalt - entsteht, wenn sich Wasser und Lave berühren ### Meridium @@ -85,6 +85,15 @@ Es wird zur Herstellung von Aluminium benötigt, was vor allem in TA4 Verwendung [bauxite|image] +### Basalt + +Basalt entsteht nur, wenn Lava und Wasser zusammenkommen. +Dazu sollte man am besten eine Anlage aufbauen, bei der eine Lava- und eine Wasserquelle zusammenfließen. +Dort wo sich beide Flüssigkeiten treffen, entsteht Lava. +Einen automatisierten Basalt Generator kann man mit dem Sign Bot aufbauen. + +[basalt|image] + ## History diff --git a/manuals/manual_EN.md b/manuals/manual_EN.md index f7848e3..c10363e 100644 --- a/manuals/manual_EN.md +++ b/manuals/manual_EN.md @@ -46,6 +46,7 @@ Techage adds some new items to the game: - Baborium - a metal that is needed for recipes in TA3 - Petroleum - is needed in TA3 - Bauxite - an aluminum ore that is needed in TA4 to produce aluminum +- Basalt - arises when water and lave touch ### Meridium @@ -86,6 +87,14 @@ It is required for the production of aluminum, which is mainly used in TA4. [bauxite|image] +### Basalt + +Basalt is only created when lava and water come together. +The best thing to do is to set up a system where a lava and a water source flow together. +Lava is formed where both liquids meet. +You can build an automated basalt generator with the Sign Bot. + +[basalt|image] ## History diff --git a/manuals/manual_ta3_DE.md b/manuals/manual_ta3_DE.md index 87f98bf..1c65dac 100644 --- a/manuals/manual_ta3_DE.md +++ b/manuals/manual_ta3_DE.md @@ -422,7 +422,7 @@ Die weitere Verarbeitung zu Endprodukten erfolgt im Chemischen Reaktor. Der Destillationsturm muss wie im Plan rechts oben aufgebaut werden. Über den Basisblock wird das Bitumen abgelassen. Der Ausgang ist auf der Rückseite des Basisblocks (Pfeilrichtung beachten). Auf diesen Basisblock kommen die "Destillationsturm" Blöcke mit den Nummern: 1, 2, 3, 2, 3, 2, 3, 4 -An den Öffnungen von unten nach oben werden Schweröl, Naphtha und Benzin abgeleitet. Ganz oben wird das Gas abgefangen. +An den Öffnungen von unten nach oben werden Schweröl, Naphtha und Benzin abgeleitet. Ganz oben wird das Propangas abgefangen. Es müssen alle Öffnungen am Turm mit Tanks verbunden werden. Der Aufkocher (reboiler) muss mit dem Block "Destillationsturm 1" verbunden werden. @@ -435,7 +435,7 @@ Der Aufkocher benötigt Strom (nicht im Plan zu sehen)! Der Aufkocher erhitzt das Erdöl auf ca. 400°C. Dabei verdampft es weitgehend und wird in den Destillationsturm zur Abkühlung geleitet. -Der Aufkocher benötigt 12 Einheiten Strom und produziert alle 6 s jeweils eine Einheit Bitumen, Schweröl, Naphtha, Benzin und Gas. +Der Aufkocher benötigt 14 Einheiten Strom und produziert alle 16 s jeweils eine Einheit Bitumen, Schweröl, Naphtha, Benzin und Propangas. Dazu muss der Aufkocher über einen Pumpe mit Erdöl versorgt werden. [reboiler|image] @@ -570,7 +570,7 @@ Im privaten Modul kann nur der Besitzer selbst Kommandos eingeben oder Tasten nu ### TechAge Signallampe / Signal Lamp Die Signallampe kann mit `on`/`off` Kommando ein- bzw. ausgeschaltet werden. Diese Lampe braucht keinen Strom und -kann mit der Spritzpistole farbig gemacht werden. +kann mit der Spritzpistole aus der Mod "Unified Dyes" farbig gemacht werden. [ta3_signallamp|image] @@ -763,4 +763,4 @@ Die Kelle dient zum Verputzen von Stromkabel. Siehe dazu "TA Stromkabel". Mit diesem Werkzeug lassen sich die Bohrgestängezange Blöcke wieder entfernen, wenn dort bspw. ein Tunnel durch soll. -[ta3_drill_pipe_wrench|image] \ No newline at end of file +[ta3_drill_pipe_wrench|image] diff --git a/manuals/manual_ta3_EN.md b/manuals/manual_ta3_EN.md index e3610e3..6dbfa20 100644 --- a/manuals/manual_ta3_EN.md +++ b/manuals/manual_ta3_EN.md @@ -37,7 +37,7 @@ The fire box must be filled with coal or charcoal. The burning time depends on t Part of the power plant. -The oil burner can be filled with petroleum, heavy oil, naphtha or petrol. The burning time depends on the power that is requested by the power plant. Under full load, petroleum burns 15 s, heavy oil 20 s, naphtha 22 s and gasoline 25 s. +The oil burner can be filled with crude oil, fuel oil, naphtha or gasoline. The burning time depends on the power that is requested by the power plant. Under full load, crude oil burns 15 s, fuel oil 20 s, naphtha 22 s and gasoline 25 s. Correspondingly longer under partial load (50% load = double time). @@ -214,7 +214,7 @@ See also TA4 heater. Is part of the TA3 industrial furnace. -The oil burner can be operated with heavy oil, naphtha or gasoline. The burning time is 80 s for heavy oil, 90 s for naphtha and 100 s for gasoline. +The oil burner can be operated with fuel oil, naphtha or gasoline. The burning time is 80 s for fuel oil, 90 s for naphtha and 100 s for gasoline. The oil burner can only hold 50 units of fuel. An additional tank and a pump are therefore advisable. @@ -409,7 +409,7 @@ The chest cart is used to transport items. Like chests, it can be filled or empt ## Oil Processing -Oil is a mixture of substances and consists of many components. The oil can be broken down into its main components such as bitumen, heavy oil, naphtha, gasoline and gas via a distillation tower. +Oil is a mixture of substances and consists of many components. The oil can be broken down into its main components such as bitumen, fuel oil, naphtha, gasoline and propane gas via a distillation tower. Further processing to end products takes place in the chemical reactor. [techage_ta31|image] @@ -420,7 +420,7 @@ Further processing to end products takes place in the chemical reactor. The distillation tower must be set up as in the plan at the top right. The bitumen is drained off via the base block. The exit is on the back of the base block (note the direction of the arrow). The "distillation tower" blocks with the numbers: 1, 2, 3, 2, 3, 2, 3, 4 are placed on this basic block -Heavy oil, naphtha and gasoline are drained from the openings from bottom to top. The gas is caught at the top. +Fuel oil, naphtha and gasoline are drained from the openings from bottom to top. The propane gas is caught at the top. All openings on the tower must be connected to tanks. The reboiler must be connected to the "distillation tower 1" block. @@ -433,7 +433,7 @@ The reboiler needs electricity (not shown in the plan)! The reboiler heats the oil to approx. 400 ° C. It largely evaporates and is fed into the distillation tower for cooling. -The reboiler requires 12 units of electricity and produces one unit of bitumen, heavy oil, naphtha, gasoline and gas every 6 s. +The reboiler requires 14 units of electricity and produces one unit of bitumen, fuel oil, naphtha, gasoline and propane every 16 s. To do this, the reboiler must be supplied with oil via a pump. [reboiler|image] @@ -567,7 +567,7 @@ In the private mode, only the owner can enter commands himself or use keys. ### TechAge Signal Lamp The signal lamp can be switched on or off with the `on` / `off` command. This lamp does not need electricity and -can be colored with the spray gun. +can be colored with the airbrush tool of the mod Unified Dyes. [ta3_signallamp|image] diff --git a/manuals/toc_DE.md b/manuals/toc_DE.md index f348fd5..a78fa08 100644 --- a/manuals/toc_DE.md +++ b/manuals/toc_DE.md @@ -8,6 +8,7 @@ - [Baborium](./manual_DE.md#baborium) - [Erdöl](./manual_DE.md#erdöl) - [Bauxit](./manual_DE.md#bauxit) + - [Basalt](./manual_DE.md#basalt) - [History](./manual_DE.md#history) - [TA1: Eisenzeitalter](./manual_ta1_DE.md#ta1:-eisenzeitalter) - [Köhler / Coal Pile](./manual_ta1_DE.md#köhler--coal-pile) diff --git a/manuals/toc_EN.md b/manuals/toc_EN.md index 03c2002..e708383 100644 --- a/manuals/toc_EN.md +++ b/manuals/toc_EN.md @@ -8,6 +8,7 @@ - [Baborium](./manual_EN.md#baborium) - [Petroleum](./manual_EN.md#petroleum) - [Bauxite](./manual_EN.md#bauxite) + - [Basalt](./manual_EN.md#basalt) - [History](./manual_EN.md#history) - [TA1: Iron Age](./manual_ta1_EN.md#ta1:-iron-age) - [Charcoal Pile (charcoal burner)](./manual_ta1_EN.md#charcoal-pile-(charcoal-burner)) diff --git a/oil/reboiler.lua b/oil/reboiler.lua index 81f4d24..29dc4bf 100644 --- a/oil/reboiler.lua +++ b/oil/reboiler.lua @@ -23,7 +23,7 @@ local Flip = techage.networks.Flip local Cable = techage.ElectricCable local power = techage.power -local CYCLE_TIME = 6 +local CYCLE_TIME = 16 local CAPA = 12 local PWR_NEEDED = 14