From 67fd1482413698a098af04163051a4a438e7c41f Mon Sep 17 00:00:00 2001 From: Joachim Stolberg Date: Thu, 13 May 2021 17:52:07 +0200 Subject: [PATCH] Add ta2 + ta4 concentrator tubes, add grinder farming recipes --- basic_machines/concentrator.lua | 14 +++++++------- basis/tubes.lua | 5 +++-- basis/tubes_ta4.lua | 5 +++-- doc/items.lua | 2 ++ doc/manual_DE.lua | 7 +++++++ doc/manual_EN.lua | 7 +++++++ locale/techage.de.tr | 13 +++++++++++++ locale/template.txt | 13 +++++++++++++ manuals/manual_ta2_DE.md | 6 ++++++ manuals/manual_ta2_EN.md | 5 +++++ manuals/toc_DE.md | 1 + manuals/toc_EN.md | 1 + 12 files changed, 68 insertions(+), 11 deletions(-) diff --git a/basic_machines/concentrator.lua b/basic_machines/concentrator.lua index 5f5f1cf..2843c57 100644 --- a/basic_machines/concentrator.lua +++ b/basic_machines/concentrator.lua @@ -57,7 +57,7 @@ local names = techage.register_junction("techage:concentrator", 2/8, Boxes, Tube after_dig_node = function(pos, oldnode, oldmetadata, digger) Tube:after_dig_node(pos) end, -}, 2) +}, 27) techage.register_node(names, { on_push_item = function(pos, in_dir, stack) @@ -68,7 +68,7 @@ techage.register_node(names, { }) names = techage.register_junction("techage:ta4_concentrator", 2/8, Boxes, Tube, { - description = S("Tube Concentrator"), + description = S("TA4 Tube Concentrator"), tiles = { "techage_tubeta4_junction.png^techage_appl_arrow2.png^[transformR270", "techage_tubeta4_junction.png^techage_appl_arrow2.png^[transformR270", @@ -95,7 +95,7 @@ names = techage.register_junction("techage:ta4_concentrator", 2/8, Boxes, Tube, after_dig_node = function(pos, oldnode, oldmetadata, digger) Tube:after_dig_node(pos) end, -}, 2) +}, 27) techage.register_node(names, { on_push_item = function(pos, in_dir, stack) @@ -107,7 +107,7 @@ techage.register_node(names, { minetest.register_craft({ - output = "techage:electric_concentrator2", + output = "techage:concentrator27", recipe = { {"", "techage:tubeS", ""}, {"techage:tubeS", "", "techage:tubeS"}, @@ -116,10 +116,10 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "techage:electric_ta4_concentrator2", + output = "techage:ta4_concentrator27", recipe = { {"", "techage:ta4_tubeS", ""}, - {"ta4_techage:tubeS", "", "ta4_techage:tubeS"}, - {"", "ta4_techage:tubeS", ""}, + {"techage:ta4_tubeS", "", "techage:ta4_tubeS"}, + {"", "techage:ta4_tubeS", ""}, }, }) diff --git a/basis/tubes.lua b/basis/tubes.lua index d97a2a6..5f3d440 100644 --- a/basis/tubes.lua +++ b/basis/tubes.lua @@ -12,6 +12,7 @@ ]]-- +local S = techage.S -- used for registered nodes @@ -48,7 +49,7 @@ local Tube = tubelib2.Tube:new({ techage.Tube = Tube minetest.register_node("techage:tubeS", { - description = "TechAge Tube", + description = S("TechAge Tube"), tiles = { -- Top, base, right, left, front, back "techage_tube_tube.png^[transformR90", "techage_tube_tube.png^[transformR90", @@ -96,7 +97,7 @@ minetest.register_node("techage:tubeS", { }) minetest.register_node("techage:tubeA", { - description = "TechAge Tube", + description = S("TechAge Tube"), tiles = { -- Top, base, right, left, front, back "techage_tube_knee2.png", "techage_tube_hole2.png^[transformR180", diff --git a/basis/tubes_ta4.lua b/basis/tubes_ta4.lua index e7a1b45..0902a31 100644 --- a/basis/tubes_ta4.lua +++ b/basis/tubes_ta4.lua @@ -13,9 +13,10 @@ ]]-- local Tube = techage.Tube +local S = techage.S minetest.register_node("techage:ta4_tubeS", { - description = "TA4 Tube", + description = S("TA4 Tube"), tiles = { -- Top, base, right, left, front, back "techage_tubeta4_tube.png^[transformR90", "techage_tubeta4_tube.png^[transformR90", @@ -63,7 +64,7 @@ minetest.register_node("techage:ta4_tubeS", { }) minetest.register_node("techage:ta4_tubeA", { - description = "TA4 Tube", + description = S("TA4 Tube"), tiles = { -- Top, base, right, left, front, back "techage_tubeta4_knee2.png", "techage_tubeta4_hole2.png^[transformR180", diff --git a/doc/items.lua b/doc/items.lua index 5888b87..a0a29d4 100644 --- a/doc/items.lua +++ b/doc/items.lua @@ -28,6 +28,7 @@ techage.Items = { ta1_hopper = "techage:hopper_ta1", wlanchip = "techage:ta4_wlanchip", tube = "techage:tubeS", + concentrator = "techage:concentrator27", ---------------- techage_ta2 = "techage_ta2.png", ta2_firebox = "techage:firebox", @@ -180,6 +181,7 @@ techage.Items = { ta4_recycler = "techage:ta4_recycler_pas", ta4_waterinlet = "techage:ta4_waterinlet", ta4_laser = "techage:ta4_laser_emitter", + ta4_concentrator = "techage:ta4_concentrator27", --ta4_ "", } diff --git a/doc/manual_DE.lua b/doc/manual_DE.lua index e424d33..983829f 100644 --- a/doc/manual_DE.lua +++ b/doc/manual_DE.lua @@ -31,6 +31,7 @@ techage.manual_DE.aTitel = { "3,TA2 Stromgenerator / TA2 Power Generator", "2,Items schieben und sortieren", "3,Röhren / TechAge Tube", + "3,Röhren Konzentrator / Tube Concentrator", "3,TA2 Schieber / Pusher", "3,TA2 Verteiler / Distributor", "2,Kieswaschanlage", @@ -426,6 +427,10 @@ techage.manual_DE.aText = { "\n".. "\n".. "\n", + "Über den Konzentrator können mehrere Röhren zu einer Röhre zusammengeführt werden. Die Richtung\\, in der alle Items weitergegeben werden\\, ist mit einem Pfeil markiert.\n".. + "\n".. + "\n".. + "\n", "Ein Schieber ist in der Lage\\, Items aus Kisten oder Maschinen zu ziehen und in andere Kisten oder Maschinen zu schieben. Oder anders gesagt: Zwischen zwei Blöcken mit Inventar muss ein und genau ein Schieber sein. Mehrere Schieber in Reihe sind nicht möglich.\n".. "In die Gegenrichtung ist ein Schieber für Items aber durchlässig\\, so dass eine Kiste über eine Röhre gefüllt und ebenso geleert werden kann. \n".. "\n".. @@ -1668,6 +1673,7 @@ techage.manual_DE.aItemName = { "ta2_generator", "", "tube", + "concentrator", "ta2_pusher", "ta2_distributor", "", @@ -1869,6 +1875,7 @@ techage.manual_DE.aPlanTable = { "", "", "", + "", "gravelrinser", "", "", diff --git a/doc/manual_EN.lua b/doc/manual_EN.lua index 7d9d463..929623c 100644 --- a/doc/manual_EN.lua +++ b/doc/manual_EN.lua @@ -31,6 +31,7 @@ techage.manual_EN.aTitel = { "3,TA2 Power Generator", "2,Push and sort items", "3,TechAge Tube", + "3,Tube Concentrator", "3,TA2 Pusher", "3,TA2 Distributor", "2,Gravel washer", @@ -425,6 +426,10 @@ techage.manual_EN.aText = { "\n".. "\n".. "\n", + "Several tubes can be combined into one tube via the concentrator. The direction in which all items are passed on is marked with an arrow. \n".. + "\n".. + "\n".. + "\n", "A pusher is able to pull items out of boxes or machines and push them into other boxes or machines. In other words\\, there must be one and exactly one pusher between two blocks with inventory. Multiple pushers in a row are not possible.\n".. "In the opposite direction\\, however\\, a pusher is permeable for items\\, so that a box can be filled via a tube and also taught.\n".. "\n".. @@ -1652,6 +1657,7 @@ techage.manual_EN.aItemName = { "ta2_generator", "", "tube", + "concentrator", "ta2_pusher", "ta2_distributor", "", @@ -1852,6 +1858,7 @@ techage.manual_EN.aPlanTable = { "", "", "", + "", "gravelrinser", "", "", diff --git a/locale/techage.de.tr b/locale/techage.de.tr index b40f19b..fcc2f5c 100644 --- a/locale/techage.de.tr +++ b/locale/techage.de.tr @@ -199,6 +199,11 @@ Node numbers to read the states from=Knotennummern zum Lesen der Zustände Send an event if state is equal or larger than=Senden ein Event wenn Status größer oder gleich als TA4 State Collector=TA4 Zuständesammler +### concentrator.lua ### + +TA4 Tube Concentrator=TA4 Röhren Konzentrator +Tube Concentrator=Röhren Konzentrator + ### cooking.lua ### TA3 Melting=TA3 Schmelzen @@ -1028,6 +1033,14 @@ Use a trowel to remove the node.=Verwende eine Kelle, um den Block zu entfernen. Tube Wall Entry=Tube Wanddurchbruch +### tubes.lua ### + +TechAge Tube=TechAge Röhre + +### tubes_ta4.lua ### + +TA4 Tube=TA4 Röhre + ### turbine.lua ### TA3 Turbine=TA3 Turbine diff --git a/locale/template.txt b/locale/template.txt index eaf28f5..cebbf04 100644 --- a/locale/template.txt +++ b/locale/template.txt @@ -199,6 +199,11 @@ Node numbers to read the states from= Send an event if state is equal or larger than= TA4 State Collector= +### concentrator.lua ### + +TA4 Tube Concentrator= +Tube Concentrator= + ### cooking.lua ### TA3 Melting= @@ -1028,6 +1033,14 @@ Use a trowel to remove the node.= Tube Wall Entry= +### tubes.lua ### + +TechAge Tube= + +### tubes_ta4.lua ### + +TA4 Tube= + ### turbine.lua ### TA3 Turbine= diff --git a/manuals/manual_ta2_DE.md b/manuals/manual_ta2_DE.md index 1a39183..d6dc310 100644 --- a/manuals/manual_ta2_DE.md +++ b/manuals/manual_ta2_DE.md @@ -99,6 +99,12 @@ Die Transportkapazität einer Röhre ist unbegrenzt und nur durch die Schieber b [tube|image] +### Röhren Konzentrator / Tube Concentrator + +Über den Konzentrator können mehrere Röhren zu einer Röhre zusammengeführt werden. Die Richtung, in der alle Items weitergegeben werden, ist mit einem Pfeil markiert. + +[concentrator|image] + ### TA2 Schieber / Pusher diff --git a/manuals/manual_ta2_EN.md b/manuals/manual_ta2_EN.md index 2894652..0d4c30c 100644 --- a/manuals/manual_ta2_EN.md +++ b/manuals/manual_ta2_EN.md @@ -100,6 +100,11 @@ The transport capacity of a tube is unlimited and only limited by the pusher. [tube|image] +### Tube Concentrator + +Several tubes can be combined into one tube via the concentrator. The direction in which all items are passed on is marked with an arrow. + +[concentrator|image] ### TA2 Pusher diff --git a/manuals/toc_DE.md b/manuals/toc_DE.md index 2bd89d9..cbc8c7a 100644 --- a/manuals/toc_DE.md +++ b/manuals/toc_DE.md @@ -30,6 +30,7 @@ - [TA2 Stromgenerator / TA2 Power Generator](./manual_ta2_DE.md#ta2-stromgenerator--ta2-power-generator) - [Items schieben und sortieren](./manual_ta2_DE.md#items-schieben-und-sortieren) - [Röhren / TechAge Tube](./manual_ta2_DE.md#röhren--techage-tube) + - [Röhren Konzentrator / Tube Concentrator](./manual_ta2_DE.md#röhren-konzentrator--tube-concentrator) - [TA2 Schieber / Pusher](./manual_ta2_DE.md#ta2-schieber--pusher) - [TA2 Verteiler / Distributor](./manual_ta2_DE.md#ta2-verteiler--distributor) - [Kieswaschanlage](./manual_ta2_DE.md#kieswaschanlage) diff --git a/manuals/toc_EN.md b/manuals/toc_EN.md index 3dc4098..d3f880f 100644 --- a/manuals/toc_EN.md +++ b/manuals/toc_EN.md @@ -30,6 +30,7 @@ - [TA2 Power Generator](./manual_ta2_EN.md#ta2-power-generator) - [Push and sort items](./manual_ta2_EN.md#push-and-sort-items) - [TechAge Tube](./manual_ta2_EN.md#techage-tube) + - [Tube Concentrator](./manual_ta2_EN.md#tube-concentrator) - [TA2 Pusher](./manual_ta2_EN.md#ta2-pusher) - [TA2 Distributor](./manual_ta2_EN.md#ta2-distributor) - [Gravel washer](./manual_ta2_EN.md#gravel-washer)