Add ta4_waterinlet as replacement for the t4_waterpump
This commit is contained in:
Joachim Stolberg
parent
ae74f90532
commit
abd79a3034
@ -235,7 +235,7 @@ determine_ocean_ids()
|
||||
|
||||
-- check if natural water is on given position (water placed by player has param2 = 1)
|
||||
function techage.is_ocean(pos)
|
||||
if pos.y ~= 1 then return false end
|
||||
if pos.y > 1 then return false end
|
||||
local node = techage.get_node_lvm(pos)
|
||||
if node.name ~= "default:water_source" then return false end
|
||||
if node.param2 == 1 then return false end
|
||||
|
||||
@ -177,6 +177,7 @@ techage.Items = {
|
||||
ta4_injector = "techage:ta4_injector_pas",
|
||||
ta4_liquid_filter = "techage_ta4_filter.png",
|
||||
ta4_recycler = "techage:ta4_recycler_pas",
|
||||
ta4_waterinlet = "techage:ta4_waterinlet",
|
||||
|
||||
--ta4_ "",
|
||||
}
|
||||
|
||||
@ -120,7 +120,6 @@ techage.manual_DE.aTitel = {
|
||||
"3,TA3 Kiessieb / Gravel Sieve",
|
||||
"3,TA3 Kieswaschanlage / Gravel Rinser",
|
||||
"3,TA3 Mühle / Grinder",
|
||||
"3,TA3 Flüssigkeitensammler / Liquid Sampler",
|
||||
"2,Werkzeuge",
|
||||
"3,Techage Info Tool",
|
||||
"3,TechAge Programmer",
|
||||
@ -182,7 +181,8 @@ techage.manual_DE.aTitel = {
|
||||
"3,TA4 Tank / TA4 Tank",
|
||||
"3,TA4 Pumpe / TA4 Pump",
|
||||
"3,TA4 Ofenheizung / furnace heater",
|
||||
"3,TA4 Wasserpumpe / Water Pump",
|
||||
"3,TA4 Wasserpumpe / Water Pump (veraltet)",
|
||||
"3,TA4 Wassereinlass / TA4 Water Inlet",
|
||||
"3,TA4 Röhren / TA4 Tube",
|
||||
"3,TA4 Schieber / Pusher",
|
||||
"3,TA4 Kiste / TA4 Chest",
|
||||
@ -1079,11 +1079,6 @@ techage.manual_DE.aText = {
|
||||
"\n"..
|
||||
"\n"..
|
||||
"\n",
|
||||
"Die Funktion entspricht der von TA2.\n"..
|
||||
"Die Verarbeitungsleistung ist 2 Items alle 8 s. Der Block benötigt 5 ku Strom.\n"..
|
||||
"\n"..
|
||||
"\n"..
|
||||
"\n",
|
||||
"",
|
||||
"Das Techage Info Tool (Schraubenschlüssel) hat verschiedene Funktionen. Er zeigt die Uhrzeit\\, die Position\\, die Temperatur und das Biome an\\, wenn auf einen unbekannten Block geklickt wird.\n"..
|
||||
"Wird auf einen TechAge Block mit Kommandoschnittstelle geklickt\\, werden alle verfügbaren Daten abgerufen (siehe auch \"Logik-/Schalt-Blöcke\").\n"..
|
||||
@ -1490,7 +1485,11 @@ techage.manual_DE.aText = {
|
||||
"\n"..
|
||||
"\n"..
|
||||
"\n",
|
||||
"Mit der Wasserpumpe kann Wasser über Flüssigkeitsleitungen in Tanks gepumpt und so für Rezepte genutzt werden. Die Wasserpumpe muss dazu ins Meer gesetzt werden Ein \"Pool\" aus ein paar Wasserblöcken geht nicht!\n"..
|
||||
"Dieser Block kann nicht mehr gecraftet werden und wird durch den TA4 Wassereinlass Block ersetzt.\n"..
|
||||
"\n",
|
||||
"Für manche Rezepte wird Wasser benötigt. Das Wasser muss mit einer Pumpe aus dem Meer (Wasser auf y = 1) gepumpt werden. Ein \"Pool\" aus ein paar Wasserblöcken ist dafür nicht ausreichend!\n"..
|
||||
"\n"..
|
||||
"Dazu muss der Wassereinlass-Block ins Wasser gesetzt und über Röhren mit der Pumpe verbunden werden. Wird der Block ins Wasser gesetzt\\, so muss darauf geachtet werden\\, dass sich unter dem Block Wasser befindet (Wasser muss mindestens 2 Blöcke tief sein). \n"..
|
||||
"\n"..
|
||||
"\n"..
|
||||
"\n",
|
||||
@ -1715,7 +1714,6 @@ techage.manual_DE.aItemName = {
|
||||
"ta3_gravelsieve",
|
||||
"ta3_gravelrinser",
|
||||
"ta3_grinder",
|
||||
"ta3_liquidsampler",
|
||||
"",
|
||||
"ta3_end_wrench",
|
||||
"ta3_programmer",
|
||||
@ -1777,7 +1775,8 @@ techage.manual_DE.aItemName = {
|
||||
"ta4_tank",
|
||||
"ta4_pump",
|
||||
"ta4_furnaceheater",
|
||||
"ta4_waterpump",
|
||||
"",
|
||||
"ta4_waterinlet",
|
||||
"ta4_tube",
|
||||
"ta4_pusher",
|
||||
"ta4_chest",
|
||||
@ -1918,7 +1917,6 @@ techage.manual_DE.aPlanTable = {
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"ta4_windturbine",
|
||||
"",
|
||||
"",
|
||||
@ -1987,5 +1985,6 @@ techage.manual_DE.aPlanTable = {
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
}
|
||||
|
||||
|
||||
@ -119,7 +119,6 @@ techage.manual_EN.aTitel = {
|
||||
"3,TA3 Gravel Sieve",
|
||||
"3,TA3 Gravel Rinser",
|
||||
"3,TA3 Grinder",
|
||||
"3,TA3 Liquid Sampler",
|
||||
"2,Tools",
|
||||
"3,Techage Info Tool",
|
||||
"3,TechAge Programmer",
|
||||
@ -181,7 +180,8 @@ techage.manual_EN.aTitel = {
|
||||
"3,TA4 Tank",
|
||||
"3,TA4 Pump",
|
||||
"3,TA4 Furnace Heater",
|
||||
"3,TA4 water Pump",
|
||||
"3,TA4 Water Pump (deprecated)",
|
||||
"3,TA4 Water Inlet",
|
||||
"3,TA4 Tube",
|
||||
"3,TA4 Pusher",
|
||||
"3,TA4 Chest",
|
||||
@ -1060,11 +1060,6 @@ techage.manual_EN.aText = {
|
||||
"\n"..
|
||||
"\n"..
|
||||
"\n",
|
||||
"The function corresponds to that of TA2.\n"..
|
||||
"The processing power is 2 items every 8 s. The block requires 5 ku of electricity.\n"..
|
||||
"\n"..
|
||||
"\n"..
|
||||
"\n",
|
||||
"",
|
||||
"The Techage Info Tool (wrench) has several functions. It shows the time\\, position\\, temperature and biome when an unknown block is clicked on.\n"..
|
||||
"If you click on a TechAge block with command interface\\, all available data will be shown (see also \"Logic / switching blocks\").\n"..
|
||||
@ -1472,7 +1467,11 @@ techage.manual_EN.aText = {
|
||||
"\n"..
|
||||
"\n"..
|
||||
"\n",
|
||||
"With the water pump\\, water can be pumped through liquid lines in tanks and thus used for recipes. The water pump has to be placed in the sea. A \"pool\" consisting of a few blocks of water is not possible!\n"..
|
||||
"This block can no longer be crafted and will be replaced by the TA4 water inlet block. \n"..
|
||||
"\n",
|
||||
"Some recipes require water. The water must be pumped from the sea with a pump (water at y = 1). A \"pool\" made up of a few water blocks is not sufficient for this! \n"..
|
||||
"\n"..
|
||||
"To do this\\, the water inlet block must be placed in the water and connected to the pump via pipes. If the block is placed in the water\\, it must be ensured that there is water under the block (water must be at least 2 blocks deep). \n"..
|
||||
"\n"..
|
||||
"\n"..
|
||||
"\n",
|
||||
@ -1697,7 +1696,6 @@ techage.manual_EN.aItemName = {
|
||||
"ta3_gravelsieve",
|
||||
"ta3_gravelrinser",
|
||||
"ta3_grinder",
|
||||
"ta3_liquidsampler",
|
||||
"",
|
||||
"ta3_end_wrench",
|
||||
"ta3_programmer",
|
||||
@ -1759,7 +1757,8 @@ techage.manual_EN.aItemName = {
|
||||
"ta4_tank",
|
||||
"ta4_pump",
|
||||
"ta4_furnaceheater",
|
||||
"ta4_waterpump",
|
||||
"",
|
||||
"ta4_waterinlet",
|
||||
"ta4_tube",
|
||||
"ta4_pusher",
|
||||
"ta4_chest",
|
||||
@ -1899,7 +1898,6 @@ techage.manual_EN.aPlanTable = {
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"ta4_windturbine",
|
||||
"",
|
||||
"",
|
||||
@ -1968,5 +1966,6 @@ techage.manual_EN.aPlanTable = {
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
}
|
||||
|
||||
|
||||
1
init.lua
1
init.lua
@ -168,6 +168,7 @@ dofile(MP.."/liquids/filler.lua")
|
||||
dofile(MP.."/liquids/silo.lua")
|
||||
dofile(MP.."/liquids/pump.lua")
|
||||
dofile(MP.."/liquids/waterpump.lua")
|
||||
dofile(MP.."/liquids/waterinlet.lua")
|
||||
|
||||
-- Coal power station
|
||||
dofile(MP.."/coal_power_station/firebox.lua")
|
||||
|
||||
@ -186,12 +186,12 @@ techage.register_node({"techage:t4_waterpump"}, {
|
||||
end,
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "techage:t4_waterpump",
|
||||
recipe = {
|
||||
{"", "default:mese_crystal", ""},
|
||||
{"", "techage:ta3_liquidsampler_pas", ""},
|
||||
{"", "techage:ta4_wlanchip", ""},
|
||||
},
|
||||
})
|
||||
--minetest.register_craft({
|
||||
-- output = "techage:t4_waterpump",
|
||||
-- recipe = {
|
||||
-- {"", "default:mese_crystal", ""},
|
||||
-- {"", "techage:ta3_liquidsampler_pas", ""},
|
||||
-- {"", "techage:ta4_wlanchip", ""},
|
||||
-- },
|
||||
--})
|
||||
|
||||
|
||||
@ -791,6 +791,10 @@ Flint and Iron=Flint and Iron
|
||||
TA1 Iron Ingot=TA1 Eisenbarren
|
||||
[Bucket] Lava can only be placed below sea level!=Lava kann nur unterhalb der Meerehöhe platziert werden!
|
||||
|
||||
### recycler.lua ###
|
||||
|
||||
Recycler=Recycler
|
||||
|
||||
### redstone.lua ###
|
||||
|
||||
Red Stone=Rotstein
|
||||
@ -1004,6 +1008,13 @@ TA Valve=TA Ventil
|
||||
TA3 Valve closed=TA3 Ventil zu
|
||||
TA3 Valve open=TA3 Ventil offen
|
||||
|
||||
### waterinlet.lua ###
|
||||
|
||||
Error: No natural water!=Fehler: Kein natürliches Wasser!
|
||||
Error: No water available!=Fehler: Kein Wasser verfügbar!
|
||||
Error: Not on sea level!=Fehler: Nicht auf Meereshöhe!
|
||||
TA4 Water Inlet=
|
||||
|
||||
### waterpump.lua ###
|
||||
|
||||
TA4 Water Pump=Wasserpumpe
|
||||
|
||||
@ -791,6 +791,10 @@ Flint and Iron=
|
||||
TA1 Iron Ingot=
|
||||
[Bucket] Lava can only be placed below sea level!=
|
||||
|
||||
### recycler.lua ###
|
||||
|
||||
Recycler=
|
||||
|
||||
### redstone.lua ###
|
||||
|
||||
Red Stone=
|
||||
@ -1004,6 +1008,13 @@ TA Valve=
|
||||
TA3 Valve closed=
|
||||
TA3 Valve open=
|
||||
|
||||
### waterinlet.lua ###
|
||||
|
||||
Error: No natural water!=
|
||||
Error: No water available!=
|
||||
Error: Not on sea level!=
|
||||
TA4 Water Inlet=
|
||||
|
||||
### waterpump.lua ###
|
||||
|
||||
TA4 Water Pump=
|
||||
|
||||
@ -327,6 +327,7 @@ Das Ventil kann auch über on/off Kommandos angesteuert werden.
|
||||
[ta3_valve|image]
|
||||
|
||||
|
||||
|
||||
## Öl-Förderung
|
||||
|
||||
Um deine Generatoren und Öfen mit Öl betreiben zu können, muss du zuerst nach Öl suchen und einen Bohrturm errichten und danach das Öl fördern.
|
||||
@ -762,14 +763,6 @@ Die Verarbeitungsleistung beträgt 2 Items alle 4 s. Der Block benötigt 6 ku St
|
||||
[ta3_grinder|image]
|
||||
|
||||
|
||||
### TA3 Flüssigkeitensammler / Liquid Sampler
|
||||
|
||||
Die Funktion entspricht der von TA2.
|
||||
Die Verarbeitungsleistung ist 2 Items alle 8 s. Der Block benötigt 5 ku Strom.
|
||||
|
||||
[ta3_liquidsampler|image]
|
||||
|
||||
|
||||
## Werkzeuge
|
||||
|
||||
### Techage Info Tool
|
||||
|
||||
@ -308,7 +308,6 @@ The blocks serve as wall openings for tubes, so that no holes remain open.
|
||||
|
||||
[ta3_pipe_wall_entry|image]
|
||||
|
||||
|
||||
### TA Valve
|
||||
|
||||
There is a valve for the yellow pipes, which can be opened and closed with a click of the mouse.
|
||||
@ -743,14 +742,6 @@ The processing power is 2 items every 4 s. The block requires 6 ku of electricit
|
||||
[ta3_grinder|image]
|
||||
|
||||
|
||||
### TA3 Liquid Sampler
|
||||
|
||||
The function corresponds to that of TA2.
|
||||
The processing power is 2 items every 8 s. The block requires 5 ku of electricity.
|
||||
|
||||
[ta3_liquidsampler|image]
|
||||
|
||||
|
||||
## Tools
|
||||
|
||||
### Techage Info Tool
|
||||
|
||||
@ -537,11 +537,17 @@ Die Ofenheizung benötigt 14 ku Strom.
|
||||
|
||||
[ta4_furnaceheater|image]
|
||||
|
||||
### TA4 Wasserpumpe / Water Pump
|
||||
### TA4 Wasserpumpe / Water Pump (veraltet)
|
||||
|
||||
Mit der Wasserpumpe kann Wasser über Flüssigkeitsleitungen in Tanks gepumpt und so für Rezepte genutzt werden. Die Wasserpumpe muss dazu ins Meer gesetzt werden Ein "Pool" aus ein paar Wasserblöcken geht nicht!
|
||||
Dieser Block kann nicht mehr gecraftet werden und wird durch den TA4 Wassereinlass Block ersetzt.
|
||||
|
||||
[ta4_waterpump|image]
|
||||
### TA4 Wassereinlass / TA4 Water Inlet
|
||||
|
||||
Für manche Rezepte wird Wasser benötigt. Das Wasser muss mit einer Pumpe aus dem Meer (Wasser auf y = 1) gepumpt werden. Ein "Pool" aus ein paar Wasserblöcken ist dafür nicht ausreichend!
|
||||
|
||||
Dazu muss der Wassereinlass-Block ins Wasser gesetzt und über Röhren mit der Pumpe verbunden werden. Wird der Block ins Wasser gesetzt, so muss darauf geachtet werden, dass sich unter dem Block Wasser befindet (Wasser muss mindestens 2 Blöcke tief sein).
|
||||
|
||||
[ta4_waterinlet|image]
|
||||
|
||||
### TA4 Röhren / TA4 Tube
|
||||
|
||||
|
||||
@ -538,11 +538,17 @@ The heater requires 14 ku of electricity.
|
||||
|
||||
[ta4_furnaceheater|image]
|
||||
|
||||
### TA4 water Pump
|
||||
### TA4 Water Pump (deprecated)
|
||||
|
||||
With the water pump, water can be pumped through liquid lines in tanks and thus used for recipes. The water pump has to be placed in the sea. A "pool" consisting of a few blocks of water is not possible!
|
||||
This block can no longer be crafted and will be replaced by the TA4 water inlet block.
|
||||
|
||||
[ta4_waterpump|image]
|
||||
### TA4 Water Inlet
|
||||
|
||||
Some recipes require water. The water must be pumped from the sea with a pump (water at y = 1). A "pool" made up of a few water blocks is not sufficient for this!
|
||||
|
||||
To do this, the water inlet block must be placed in the water and connected to the pump via pipes. If the block is placed in the water, it must be ensured that there is water under the block (water must be at least 2 blocks deep).
|
||||
|
||||
[ta4_waterinlet|image]
|
||||
|
||||
### TA4 Tube
|
||||
|
||||
|
||||
@ -119,7 +119,6 @@
|
||||
- [TA3 Kiessieb / Gravel Sieve](./manual_ta3_DE.md#ta3-kiessieb--gravel-sieve)
|
||||
- [TA3 Kieswaschanlage / Gravel Rinser](./manual_ta3_DE.md#ta3-kieswaschanlage--gravel-rinser)
|
||||
- [TA3 Mühle / Grinder](./manual_ta3_DE.md#ta3-mühle--grinder)
|
||||
- [TA3 Flüssigkeitensammler / Liquid Sampler](./manual_ta3_DE.md#ta3-flüssigkeitensammler--liquid-sampler)
|
||||
- [Werkzeuge](./manual_ta3_DE.md#werkzeuge)
|
||||
- [Techage Info Tool](./manual_ta3_DE.md#techage-info-tool)
|
||||
- [TechAge Programmer](./manual_ta3_DE.md#techage-programmer)
|
||||
@ -181,7 +180,8 @@
|
||||
- [TA4 Tank / TA4 Tank](./manual_ta4_DE.md#ta4-tank--ta4-tank)
|
||||
- [TA4 Pumpe / TA4 Pump](./manual_ta4_DE.md#ta4-pumpe--ta4-pump)
|
||||
- [TA4 Ofenheizung / furnace heater](./manual_ta4_DE.md#ta4-ofenheizung--furnace-heater)
|
||||
- [TA4 Wasserpumpe / Water Pump](./manual_ta4_DE.md#ta4-wasserpumpe--water-pump)
|
||||
- [TA4 Wasserpumpe / Water Pump (veraltet)](./manual_ta4_DE.md#ta4-wasserpumpe--water-pump-(veraltet))
|
||||
- [TA4 Wassereinlass / TA4 Water Inlet](./manual_ta4_DE.md#ta4-wassereinlass--ta4-water-inlet)
|
||||
- [TA4 Röhren / TA4 Tube](./manual_ta4_DE.md#ta4-röhren--ta4-tube)
|
||||
- [TA4 Schieber / Pusher](./manual_ta4_DE.md#ta4-schieber--pusher)
|
||||
- [TA4 Kiste / TA4 Chest](./manual_ta4_DE.md#ta4-kiste--ta4-chest)
|
||||
|
||||
@ -118,7 +118,6 @@
|
||||
- [TA3 Gravel Sieve](./manual_ta3_EN.md#ta3-gravel-sieve)
|
||||
- [TA3 Gravel Rinser](./manual_ta3_EN.md#ta3-gravel-rinser)
|
||||
- [TA3 Grinder](./manual_ta3_EN.md#ta3-grinder)
|
||||
- [TA3 Liquid Sampler](./manual_ta3_EN.md#ta3-liquid-sampler)
|
||||
- [Tools](./manual_ta3_EN.md#tools)
|
||||
- [Techage Info Tool](./manual_ta3_EN.md#techage-info-tool)
|
||||
- [TechAge Programmer](./manual_ta3_EN.md#techage-programmer)
|
||||
@ -180,7 +179,8 @@
|
||||
- [TA4 Tank](./manual_ta4_EN.md#ta4-tank)
|
||||
- [TA4 Pump](./manual_ta4_EN.md#ta4-pump)
|
||||
- [TA4 Furnace Heater](./manual_ta4_EN.md#ta4-furnace-heater)
|
||||
- [TA4 water Pump](./manual_ta4_EN.md#ta4-water-pump)
|
||||
- [TA4 Water Pump (deprecated)](./manual_ta4_EN.md#ta4-water-pump-(deprecated))
|
||||
- [TA4 Water Inlet](./manual_ta4_EN.md#ta4-water-inlet)
|
||||
- [TA4 Tube](./manual_ta4_EN.md#ta4-tube)
|
||||
- [TA4 Pusher](./manual_ta4_EN.md#ta4-pusher)
|
||||
- [TA4 Chest](./manual_ta4_EN.md#ta4-chest)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user