From f441d7daa5730580978b83de5f76080790b01bbe Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Sat, 24 Sep 2022 11:01:30 +0200 Subject: [PATCH] built on 24/09/2022 11:01:30 --- README.md | 6 + lcdlib/mod.conf | 2 +- networks/README.md | 5 +- networks/init.lua | 2 +- networks/liquid.lua | 28 ++ signs_bot/README.md | 31 +- signs_bot/basis.lua | 34 +- signs_bot/bot_flap.lua | 4 +- signs_bot/bot_sensor.lua | 18 +- signs_bot/cart_sensor.lua | 16 +- signs_bot/changer.lua | 12 +- signs_bot/chest.lua | 22 +- signs_bot/cmd_farming.lua | 22 +- signs_bot/cmd_flowers.lua | 14 +- signs_bot/cmd_item.lua | 130 +++++--- signs_bot/cmd_move.lua | 80 +++-- signs_bot/cmd_pattern.lua | 32 +- signs_bot/cmd_place.lua | 50 +-- signs_bot/cmd_sign.lua | 28 +- signs_bot/cmd_soup.lua | 2 +- signs_bot/cmd_trees.lua | 4 +- signs_bot/commands.lua | 41 +-- signs_bot/compost.lua | 8 +- signs_bot/crop_sensor.lua | 16 +- signs_bot/delayer.lua | 20 +- signs_bot/doc.lua | 4 +- signs_bot/duplicator.lua | 28 +- signs_bot/extender.lua | 20 +- signs_bot/i18n.py | 0 signs_bot/init.lua | 4 +- signs_bot/interpreter.lua | 38 ++- signs_bot/legacy.lua | 6 +- signs_bot/lib.lua | 22 +- signs_bot/locale/signs_bot.de.tr | 80 ++--- signs_bot/locale/template.txt | 79 ++--- signs_bot/logic_and.lua | 22 +- signs_bot/node_sensor.lua | 24 +- signs_bot/nodes.lua | 4 +- signs_bot/random.lua | 8 +- signs_bot/robot.lua | 8 +- signs_bot/signal.lua | 6 +- signs_bot/signs.lua | 66 ++-- signs_bot/techage.lua | 71 ++-- signs_bot/timer.lua | 20 +- signs_bot/tool.lua | 8 +- ta4_paraglider/init.lua | 96 +++--- techage/README.md | 24 +- techage/basic_machines/consumer.lua | 4 + techage/basic_machines/distributor.lua | 13 +- techage/basic_machines/itemsource.lua | 14 +- techage/basic_machines/pusher.lua | 140 ++++++-- techage/basic_machines/ta4_chest.lua | 15 +- techage/basis/command.lua | 69 ++-- techage/basis/conf_inv.lua | 12 +- techage/basis/fly_lib.lua | 33 +- techage/basis/lib.lua | 2 +- techage/basis/node_store.lua | 4 +- techage/basis/nodedata_meta.lua | 1 + techage/basis/nodedata_sqlite.lua | 2 +- techage/basis/recipe_lib.lua | 8 + techage/basis/submenu.lua | 35 +- techage/chemistry/ta4_doser.lua | 7 +- techage/chemistry/ta4_reactor.lua | 22 ++ techage/coal_power_station/firebox.lua | 2 +- techage/coal_power_station/oilfirebox.lua | 2 +- techage/doc/manual_DE.lua | 35 +- techage/doc/manual_EN.lua | 51 ++- techage/furnace/firebox.lua | 2 +- techage/init.lua | 4 +- techage/iron_age/gravelsieve.lua | 4 +- techage/iron_age/hopper.lua | 4 +- techage/items/registered_nodes.lua | 2 +- techage/liquids/pump.lua | 114 ++++++- techage/locale/techage.de.tr | 45 ++- techage/locale/template.txt | 38 ++- techage/logic/button.lua | 89 ++++- techage/logic/button_2x.lua | 2 + techage/logic/button_4x.lua | 4 + techage/logic/detector.lua | 23 +- techage/logic/sequencer2.lua | 33 +- techage/logic/signallamp.lua | 314 +++++++++++------- techage/manuals/manual_ta3_DE.md | 6 +- techage/manuals/manual_ta3_EN.md | 19 +- techage/manuals/manual_ta4_DE.md | 31 +- techage/manuals/manual_ta4_EN.md | 36 +- techage/manuals/markdown2formspec.py | 2 +- techage/manuals/ta4_lua_controller_EN.md | 6 +- techage/manuals/ta4_lua_controller_EN.pdf | Bin 391891 -> 405494 bytes techage/manuals/toc_DE.md | 1 + techage/manuals/toc_EN.md | 2 + techage/mod.conf | 2 +- techage/move_controller/flycontroller.lua | 7 +- techage/move_controller/movecontroller.lua | 10 +- techage/power/power_line.lua | 2 +- techage/ta2_energy_storage/ta2_winch.lua | 2 +- techage/teleport/teleport_tube.lua | 5 +- techage/textures/generate.py | 40 +++ techage/textures/techage_palette256.png | Bin 0 -> 133 bytes techage/textures/techage_signallamp2.png | Bin 0 -> 94 bytes techage/tools/repairkit.lua | 10 + unified_inventory/bags.lua | 71 ++-- .../locale/unified_inventory.de.tr | 28 +- unified_inventory/register.lua | 7 +- 103 files changed, 1752 insertions(+), 949 deletions(-) mode change 100644 => 100755 signs_bot/i18n.py create mode 100755 techage/textures/generate.py create mode 100644 techage/textures/techage_palette256.png create mode 100644 techage/textures/techage_signallamp2.png diff --git a/README.md b/README.md index 5982022..fe32a39 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,12 @@ ta4_jetpack requires the modpack 3d_armor. 3d_armor is itself a modpack and can' ### History +#### 2022-08-17 + +Updated Mods: +- techage (fix "Invalid field use_texture_alpha" errors) + + #### 2022-08-06 Updated Mods: diff --git a/lcdlib/mod.conf b/lcdlib/mod.conf index 4e0f72f..602f95a 100644 --- a/lcdlib/mod.conf +++ b/lcdlib/mod.conf @@ -1 +1 @@ -name = lcdlib \ No newline at end of file +name = lcdlib diff --git a/networks/README.md b/networks/README.md index 2628d3f..5a197dd 100644 --- a/networks/README.md +++ b/networks/README.md @@ -80,7 +80,7 @@ All this testing nodes can be enabled via mod settings `networks_test_enabled = ### License -Copyright (C) 2021 Joachim Stolberg +Copyright (C) 2021-2022 Joachim Stolberg Code: Licensed under the GNU AGPL version 3 or later. See LICENSE.txt Textures: CC BY-SA 3.0 @@ -128,3 +128,6 @@ Required: tubelib2 **2022-01-06 V0.11** - Support for junction rotation added + +**2022-09-10 V0.12** +- New API function `networks.liquid.get_liquids` added diff --git a/networks/init.lua b/networks/init.lua index 82786b5..8810e7b 100644 --- a/networks/init.lua +++ b/networks/init.lua @@ -13,7 +13,7 @@ networks = {} -- Version for compatibility checks, see readme.md/history -networks.version = 0.11 +networks.version = 0.12 if not minetest.global_exists("tubelib2") or tubelib2.version < 2.2 then minetest.log("error", "[networks] Networks requires tubelib2 version 2.2 or newer!") diff --git a/networks/liquid.lua b/networks/liquid.lua index 1082cc9..3b1b262 100644 --- a/networks/liquid.lua +++ b/networks/liquid.lua @@ -265,3 +265,31 @@ function networks.liquid.turn_valve_off(pos, tlib2, name_off, name_on) return true end end + +------------------------------------------------------------------------------- +-- Info/Tools +------------------------------------------------------------------------------- +-- Return list of liquids of connected tanks +-- Node at pos must be a pump +function networks.liquid.get_liquids(pos, tlib2) + local tbl = {} + for _, dir in ipairs(networks.get_node_connection_dirs(pos, tlib2.tube_type)) do + for _,item in ipairs(get_network_table(pos, tlib2, dir, "tank")) do + local liq = LQD(item.pos) + if liq and liq.peek then + local liq_name = liq.peek(item.pos, item.indir) + if liq_name then + local def = minetest.registered_items[liq_name] or minetest.registered_craftitems[liq_name] + if def then + tbl[def.description] = true + end + end + end + end + end + local out = {} + for k,v in pairs(tbl) do + out[#out + 1] = k + end + return out +end \ No newline at end of file diff --git a/signs_bot/README.md b/signs_bot/README.md index 377bfd1..18b2082 100644 --- a/signs_bot/README.md +++ b/signs_bot/README.md @@ -57,7 +57,8 @@ The mod has an in-game help to all blocks and signs. Therefore, it is highly rec The commands are also all described as help in the "Sign command" node. All blocks or signs that are set are taken from the bot inventory. Any blocks or signs removed will be added back to the Bot Inventory. -For all Inventory commands applies: If the inventory stack specified by is full, so that nothing more can be done, or just empty, so that nothing more can be removed, the next slot will automatically be used. +`` is always the bot internal inventory stack (1..8). +For all Inventory commands applies: If the bot inventory stack specified by `` is full, so that nothing more can be done, or just empty, so that nothing more can be removed, the next slot will automatically be used. move - to follow one or more steps forward without signs cond_move - walk to the next sign and work it off @@ -69,6 +70,7 @@ For all Inventory commands applies: If the inventory stack specified by i pause - wait one or more seconds move_up - move up (maximum 2 times) move_down - move down + fall_down - fall into a hole/chasm (up to 10 blocks) take_item - take one or more items from a box add_item - put one or more items in a box add_fuel - for furnaces or similar @@ -106,6 +108,20 @@ For all Inventory commands applies: If the inventory stack specified by i flame_on - Make fire flame_off - Put out the fire +#### Techage specific commands + + ignite - Ignite the techage charcoal lighter + low_batt - Turn the bot off if the battery power is below the + given value in percent (1..99) + jump_low_batt