MTSR/techage_modpack
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

built on 04/01/2022 19:43:30

Browse Source
This commit is contained in:
Joachim Stolberg 2022-01-04 19:43:30 +01:00
parent 793888ed80
commit d9710a8213
260 changed files with 2513 additions and 2566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
techage/basic_machines/electronic_fab.lua
View File

@ -277,4 +277,3 @@ techage.recipes.register_craft_type("ta4_electronic_fab", {
width = 2,
height = 2,
})

3
techage/basic_machines/forceload.lua
View File

@ -64,7 +64,7 @@ local function add_pos(pos, player)
local meta = player:get_meta()
local lPos = minetest.deserialize(meta:get_string("techage_forceload_blocks")) or {}
if not in_list(lPos, pos) and (#lPos < techage.max_num_forceload_blocks or
creative and creative.is_enabled_for and
minetest.global_exists("creative") and creative.is_enabled_for and
creative.is_enabled_for(player:get_player_name())) then
lPos[#lPos+1] = pos
local meta = player:get_meta()
@ -116,7 +116,6 @@ local function formspec(name)
local tRes = {}
for idx,pos in ipairs(lPos) do
local pos1, pos2 = calc_area(pos)
local ypos = 0.2 + idx * 0.4
tRes[#tRes+1] = idx
tRes[#tRes+1] = minetest.formspec_escape(P2S(pos1))
tRes[#tRes+1] = "to"

1
techage/basic_machines/gravelrinser.lua
View File

@ -333,4 +333,3 @@ end
techage.add_rinser_recipe({input="techage:sieved_gravel", output="techage:usmium_nuggets", probability=30})
techage.add_rinser_recipe({input="techage:sieved_gravel", output="default:copper_lump", probability=15})

1
techage/basic_machines/liquidsampler.lua
View File

@ -220,4 +220,3 @@ minetest.register_craft({
{"", "techage:vacuum_tube", ""},
},
})

2
techage/basic_machines/mods_support.lua
View File

@ -129,5 +129,3 @@ techage.register_node({"protector:chest"}, {
return techage.put_items(inv, "main", stack)
end,
})

1
techage/basic_machines/pusher.lua
View File

@ -319,4 +319,3 @@ minetest.register_craft({
{"", "techage:ta4_wlanchip", ""},
},
})

1
techage/basic_machines/recipeblock.lua
View File

@ -241,4 +241,3 @@ minetest.register_craft({
{"default:steel_ingot", "techage:ta4_wlanchip", "default:steel_ingot"},
},
})

1
techage/basic_machines/source.lua
View File

@ -263,4 +263,3 @@ control.register_nodes({"techage:t4_source"}, {
end,
}
)

1
techage/basis/boiler_lib.lua
View File

@ -146,4 +146,3 @@ function techage.boiler.on_punch(pos, node, puncher, pointed_thing)
M(pos):set_string("formspec", techage.boiler.formspec(pos, nvm))
end
end

1
techage/basis/counting.lua
View File

@ -69,4 +69,3 @@ minetest.register_chatcommand("ta_limit", {
MAX_POINTS .. " " .. S("is allowed")
end
})

1
techage/basis/fake_player.lua
View File

@ -115,4 +115,3 @@ for method_name, return_value in pairs(methods) do
return return_value
end
end

1
techage/basis/firebox_lib.lua
View File

@ -148,4 +148,3 @@ function techage.firebox.set_firehole(pos, on)
end
end
end

1
techage/basis/hyperloop.lua
View File

@ -232,4 +232,3 @@ function techage.hyperloop.after_formspec(pos, fields)
end
end
end

2
techage/basis/manual.lua
View File

@ -89,5 +89,3 @@ techage.manual_DE.aPlanTable = {
"",
"",
}

1
techage/basis/mark.lua
View File

@ -96,4 +96,3 @@ minetest.register_entity(":techage:region_cube", {
techage.unmark_region(self.player_name)
end,
})

1
techage/basis/mark2.lua
View File

@ -126,4 +126,3 @@ minetest.register_entity(":techage:position_side", {
techage.unmark_position(self.player_name)
end,
})

1
techage/basis/shared_inv.lua
View File

@ -66,4 +66,3 @@ function techage.shared_inv.on_rightclick(pos, clicker, listname)
minetest.get_node_timer(pos):start(2)
end
end

61
techage/basis/shared_tank.lua
View File

@ -21,6 +21,7 @@ techage.shared_tank = {}
local liquid = networks.liquid
local hyperloop = techage.hyperloop
local remote_pos = techage.hyperloop.remote_pos
local is_paired = techage.hyperloop.is_paired
local menu = techage.menu
local function formspec(pos)
@ -36,7 +37,7 @@ local function formspec(pos)
end
function techage.shared_tank.node_timer(pos)
if techage.is_activeformspec(pos) then
if techage.is_activeformspec(pos) and is_paired(pos) then
M(pos):set_string("formspec", formspec(pos))
return true
end
@ -60,26 +61,47 @@ function techage.shared_tank.can_dig(pos, player)
end
function techage.shared_tank.peek_liquid(pos, indir)
pos = remote_pos(pos)
local nvm = techage.get_nvm(pos)
return liquid.srv_peek(nvm)
if is_paired(pos) then
pos = remote_pos(pos)
local nvm = techage.get_nvm(pos)
return liquid.srv_peek(nvm)
end
end
function techage.shared_tank.take_liquid(pos, indir, name, amount)
pos = remote_pos(pos)
local nvm = techage.get_nvm(pos)
amount, name = liquid.srv_take(nvm, name, amount)
if techage.is_activeformspec(pos) then
M(pos):set_string("formspec", formspec(pos))
if is_paired(pos) then
pos = remote_pos(pos)
local nvm = techage.get_nvm(pos)
amount, name = liquid.srv_take(nvm, name, amount)
if techage.is_activeformspec(pos) then
M(pos):set_string("formspec", formspec(pos))
end
return amount, name
end
return amount, name
return 0, name
end
function techage.shared_tank.put_liquid(pos, indir, name, amount)
pos = remote_pos(pos)
-- check if it is not powder
local ndef = minetest.registered_craftitems[name] or {}
if not ndef.groups or ndef.groups.powder ~= 1 then
if is_paired(pos) then
pos = remote_pos(pos)
-- check if it is not powder
local ndef = minetest.registered_craftitems[name] or {}
if not ndef.groups or ndef.groups.powder ~= 1 then
local nvm = techage.get_nvm(pos)
local ndef = NDEF(pos)
local leftover = liquid.srv_put(nvm, name, amount, ndef.liquid.capa)
if techage.is_activeformspec(pos) then
M(pos):set_string("formspec", formspec(pos))
end
return leftover
end
end
return amount
end
function techage.shared_tank.untake_liquid(pos, indir, name, amount)
if is_paired(pos) then
pos = remote_pos(pos)
local nvm = techage.get_nvm(pos)
local ndef = NDEF(pos)
local leftover = liquid.srv_put(nvm, name, amount, ndef.liquid.capa)
@ -91,15 +113,4 @@ function techage.shared_tank.put_liquid(pos, indir, name, amount)
return amount
end
function techage.shared_tank.untake_liquid(pos, indir, name, amount)
pos = remote_pos(pos)
local nvm = techage.get_nvm(pos)
local ndef = NDEF(pos)
local leftover = liquid.srv_put(nvm, name, amount, ndef.liquid.capa)
if techage.is_activeformspec(pos) then
M(pos):set_string("formspec", formspec(pos))
end
return leftover
end
techage.shared_tank.formspec = formspec

1
techage/coal_power_station/boiler_base.lua
View File

@ -65,4 +65,3 @@ minetest.register_craft({
{"default:stone", "default:stone", "default:stone"},
},
})

1
techage/coal_power_station/boiler_top.lua
View File

@ -108,4 +108,3 @@ minetest.register_craft({
{"default:stone", "", "default:stone"},
},
})

1
techage/coal_power_station/cooler.lua
View File

@ -131,4 +131,3 @@ minetest.register_craft({
{"basic_materials:steel_bar", "default:wood", "basic_materials:steel_bar"},
},
})

2
techage/coal_power_station/oilfirebox.lua
View File

@ -142,5 +142,3 @@ minetest.register_craft({
{'', '', ''},
},
})

1
techage/coal_power_station/turbine.lua
View File

@ -180,4 +180,3 @@ minetest.register_craft({
{"default:wood", "techage:iron_ingot", "basic_materials:steel_bar"},
},
})

1
techage/collider/cooler.lua
View File

@ -88,4 +88,3 @@ minetest.register_craft({
{'', 'techage:aluminum', ''},
},
})

3
techage/collider/detector.lua
View File

@ -151,7 +151,7 @@ local function create_task(pos, task)
--print(err)
return
end
minetest.after(0.4, create_task, pos)
minetest.after(0.4, create_task, pos, task)
end
-- Call on_cyclic_check of all magents so that the magnets don't need a FLB.
@ -411,4 +411,3 @@ minetest.register_craft({
{'default:steel_ingot', '', 'techage:aluminum'},
},
})

1
techage/collider/worker.lua
View File

@ -207,4 +207,3 @@ minetest.register_craft({
{'default:steel_ingot', 'default:mese_crystal', 'techage:aluminum'},
},
})

8
techage/doc/items.lua
View File

@ -204,9 +204,11 @@ techage.Items = {
ta4_recipeblock = "techage:ta4_recipeblock",
----------------------------
ta5_flycontroller = "techage:ta5_flycontroller",
ta5_aichip = "techage:ta5_aichip",
ta5_tele_pipe = "techage:ta5_tele_pipe",
ta5_tele_tube = "techage:ta5_tele_tube",
ta5_aichip = "techage:ta5_aichip",
ta5_tele_pipe = "techage:ta5_tele_pipe",
ta5_tele_tube = "techage:ta5_tele_tube",
ta5_chest = "techage:ta5_hl_chest",
ta5_tank = "techage:ta5_hl_tank",
}

60
techage/doc/manual_DE.lua
View File

@ -237,12 +237,13 @@ techage.manual_DE.aTitel = {
"3,TA5 Flug Controller",
"3,TA5 Hyperloop Kiste / TA5 Hyperloop Chest",
"3,TA5 Hyperloop Tank / TA5 Hyperloop Tank",
"3,Hyperloop Teleport Blöcke (geplant)",
"3,TA5 Container (geplant)",
"3,TA5-Raumgleiter (geplant)",
"2,Teleport Blöcke",
"3,TA5 Teleport Block Gegenstände / TA5 Teleport Block Items",
"3,TA5 Teleport Block Flüssigkeiten / TA5 Teleport Block Liquids",
"3,TA5-Raumgleiter (geplant)",
"3,Hyperloop Teleport Blöcke (geplant)",
"2,Weitere TA5 Blöcke/Items",
"3,TA5 Container (geplant)",
"3,TA5 KI Chip / TA5 AI Chip",
}
@ -2019,35 +2020,39 @@ techage.manual_DE.aText = {
"\n"..
"\n"..
"\n",
"Dank einem Spezialantrieb für Lichtgeschwindigkeit können mit dem Raumgleiter auch große Entfernungen sehr schnell überwunden werden.\n"..
"\n",
"Mit Teleport-Blöcken können Dinge zwischen zwei Teleport-Blöcken übertragen werden\\, ohne dass sich dazwischen eine Röhre oder Leitung befinden muss. Für das Pairing der Blöcke musst du zuerst auf der einen Seite einen Namen für den Block eingeben\\, dann kannst du bei dem anderen Block diesen Namen auswählen und so die beiden Blöcke verbinden. Das Pairung kann nur von einem Spieler durchgeführt werden (Spielername wird geprüft) und muss vor einem Server-Neustart abgeschlossen sein. Anderenfalls gehen die Pairing-Daten verloren.\n"..
"\n"..
"Der Plan rechts zeigt\\, wie die Blöcke genutzt werden können.\n"..
"\n"..
"\n"..
"\n",
"Diese Teleport-Blöcke erlauben die Übertragung von Gegenständen und ersetzen somit eine Röhre. Dabei können Entfernungen von bis zu 200 Blöcken überbrückt werden.\n"..
"\n"..
"Ein Teleport-Block benötigt 12 ku Strom.\n"..
"\n"..
"Für die Nutzung der Teleport-Blöcke werden 60 Erfahrungspunkte benötigt.\n"..
"\n"..
"\n"..
"\n",
"Diese Teleport-Blöcke erlauben die Übertragung von Flüssigkeiten und ersetzen somit eine gelbe Leitung. Dabei können Entfernungen von bis zu 200 Blöcken überbrückt werden.\n"..
"\n"..
"Ein Teleport-Block benötigt 12 ku Strom.\n"..
"\n"..
"Für die Nutzung der Teleport-Blöcke werden 60 Erfahrungspunkte benötigt.\n"..
"\n"..
"\n"..
"\n",
"Die Hyperloop Teleport Blöcke erlauben den Aufbau von Hyperloop Netzwerk ohne Hyperloop-Röhren.\n"..
"\n"..
"Die Nutzung der Hyperloop Teleport Blöcke benötigt 120 Erfahrungspunkte.\n"..
"\n",
"",
"Der TA5 Container erlaubt Techage Anlagen ein- und an einer anderen Stelle wieder auszupacken.\n"..
"\n"..
"Für die Nutzung des TA5 Containers werden 80 Erfahrungspunkte benötigt.\n"..
"\n",
"Teleportblöcke erlauben den Item-Transport ohne Röhren bis zu einer Entfernung von 200 Blöcken.\n"..
"Für das Pairing musst du zuerst auf der einen Seite einen Namen für den Block eingeben\\, dann kannst du bei dem anderen Block diesen Namen auswählen und so die beiden Blöcke verbinden.\n"..
"\n"..
"Teleportblöcke benötigen jeweils 12 ku Strom.\n"..
"\n"..
"Für die Nutzung der Teleportblöcke werden 60 Erfahrungspunkte benötigt.\n"..
"\n"..
"\n"..
"\n",
"Teleportblöcke erlauben den Flüssigkeiten-Transport ohne Leitungen bis zu einer Entfernung von 200 Blöcken.\n"..
"Für das Pairing musst du zuerst auf der einen Seite einen Namen für den Block eingeben\\, dann kannst du bei dem anderen Block diesen Namen auswählen und so die beiden Blöcke verbinden.\n"..
"\n"..
"Teleportblöcke benötigen jeweils 12 ku Strom.\n"..
"\n"..
"Für die Nutzung der Teleportblöcke werden 60 Erfahrungspunkte benötigt.\n"..
"\n"..
"\n"..
"\n",
"Dank einem Spezialantrieb für Lichtgeschwindigkeit können mit dem Raumgleiter auch große Entfernungen sehr schnell überwunden werden.\n"..
"\n",
"",
"Der TA5 KI Chip wird teilweise zur Herstellung von TA5 Blöcken benötigt. Der TA5 KI Chip kann nur auf der TA4 Elektronik Fab hergestellt werden. Dazu werden 10 Erfahrungspunkte benötigt.\n"..
"\n"..
"\n"..
@ -2289,14 +2294,15 @@ techage.manual_DE.aItemName = {
"",
"",
"ta5_flycontroller",
"ta4_chest",
"ta4_tank",
"ta5_chest",
"ta5_tank",
"",
"",
"ta5_tele_tube",
"ta5_tele_pipe",
"",
"",
"",
"ta5_aichip",
}
@ -2538,6 +2544,7 @@ techage.manual_DE.aPlanTable = {
"",
"",
"",
"ta5_teleport",
"",
"",
"",
@ -2545,4 +2552,3 @@ techage.manual_DE.aPlanTable = {
"",
"",
}

58
techage/doc/manual_EN.lua
View File

@ -237,11 +237,12 @@ techage.manual_EN.aTitel = {
"3,TA5 Flight Controller",
"3,TA5 Hyperloop Chest",
"3,TA5 Hyperloop Tank",
"3,Hyperloop Teleport Blocks (planned)",
"3,TA5 Container (planned)",
"2,Teleport Blocks",
"3,TA5 Teleport Block Items",
"3,TA5 Teleport Block Liquids",
"2,More TA5 Blocks / Items",
"3,Hyperloop Teleport Blocks (planned)",
"2,More TA5 Blocks/Items",
"3,TA5 Container (planned)",
"3,TA5 AI Chip",
}
@ -2016,33 +2017,37 @@ techage.manual_EN.aText = {
"\n"..
"\n"..
"\n",
"Teleport blocks allow things to be transferred between two teleport blocks without the need for a pipe or tube in between. To pair the blocks\\, you first have to enter a name for the block on one side\\, then you can select this name for the other block and thus connect the two blocks. Pairing can only be carried out by one player (player name is checked) and must be completed before the server is restarted. Otherwise the pairing data will be lost.\n"..
"\n"..
"The map on the right shows how the blocks can be used. \n"..
"\n"..
"\n"..
"\n",
"These teleport blocks allow the transfer of items and thus replace a tube. Distances of up to 200 blocks can be bridged.\n"..
"\n"..
"Each Teleport blocks requires 12 ku of electricity.\n"..
"\n"..
"60 experience points are required to use the teleport blocks. \n"..
"\n"..
"\n"..
"\n",
"These teleport blocks allow the transfer of liquids and thus replace a pipe. Distances of up to 200 blocks can be bridged.\n"..
"\n"..
"Each Teleport blocks requires 12 ku of electricity.\n"..
"\n"..
"60 experience points are required to use the teleport blocks. \n"..
"\n"..
"\n"..
"\n",
"The Hyperloop Teleport Blocks allow the construction of a Hyperloop network without Hyperloop tubes.\n"..
"\n"..
"The use of the Hyperloop Teleport Blocks requires 120 experience points.\n"..
"\n",
"",
"The TA5 container allows Techage systems to be packed and unpacked at another location.\n"..
"\n"..
"80 experience points are required to use the TA5 container.\n"..
"\n",
"Teleport blocks allow items to be transported without tubes up to a distance of 200 blocks.\n"..
"For pairing you first have to enter a name for the block on one side\\, then you can select this name for the other block and thus connect the two blocks.\n"..
"\n"..
"Teleport blocks each require 12 ku of electricity.\n"..
"\n"..
"60 experience points are required to use the Teleport blocks.\n"..
"\n"..
"\n"..
"\n",
"Teleport blocks allow liquids to be transported without pipes up to a distance of 200 blocks.\n"..
"For pairing you first have to enter a name for the block on one side\\, then you can select this name for the other block and thus connect the two blocks.\n"..
"\n"..
"Teleport blocks each require 12 ku of electricity.\n"..
"\n"..
"60 experience points are required to use the Teleport blocks.\n"..
"\n"..
"\n"..
"\n",
"",
"The TA5 AI Chip is partly required for the production of TA5 blocks. The TA5 AI Chip can only be manufactured at the TA4 Electronics Fab. This requires 10 experience points.\n"..
"\n"..
"\n"..
@ -2284,13 +2289,14 @@ techage.manual_EN.aItemName = {
"",
"",
"ta5_flycontroller",
"ta4_chest",
"ta4_tank",
"",
"ta5_chest",
"ta5_tank",
"",
"ta5_tele_tube",
"ta5_tele_pipe",
"",
"",
"",
"ta5_aichip",
}
@ -2531,6 +2537,7 @@ techage.manual_EN.aPlanTable = {
"",
"",
"",
"ta5_teleport",
"",
"",
"",
@ -2538,4 +2545,3 @@ techage.manual_EN.aPlanTable = {
"",
"",
}

2
techage/doc/manual_api.lua
View File

@ -37,5 +37,3 @@ function techage.add_to_manual(language, titles, texts, items, plans)
tbl.aPlanTable[#tbl.aPlanTable + 1] = item
end
end

20
techage/doc/plans.lua
View File

@ -493,6 +493,26 @@ techage.ConstructionPlans["ta4_cooler"] = {
{false, false, false, false, false, false, false, false, false},
}
--
-- TA5 Teleport Blocks
--
local TELEP = {"techage_filling_ta4.png^techage_frame_ta5.png^techage_appl_teleport.png", "techage:ta5_tele_pipe"}
local TELET = {"techage_filling_ta4.png^techage_frame_ta5.png^techage_appl_teleport.png", "techage:ta5_tele_tube"}
local PUMP4 = {"techage_filling_ta4.png^techage_appl_pump.png^techage_frame_ta4.png", "techage:t4_pump"}
local ARROW = {"techage_form_arrow.png"}
techage.ConstructionPlans["ta5_teleport"] = {
{false, false, false, false, false, false, false, false, false, false, false},
{false, CHEST, PushR, TELET, false, ARROW, false, TELET, Tubes, CHEST, false},
{false, false, false, false, false, false, false, false, false, false, false},
{false, CHEST, Tubes, TELET, false, ARROW, false, TELET, PushR, CHEST, false},
{false, false, false, false, false, false, false, false, false, false, false},
{false, false, false, false, false, false, false, false, false, false, false},
{false, TANK4, PUMP4, TELEP, false, ARROW, false, TELEP, PIPEH, TANK4, false},
{false, false, false, false, false, false, false, false, false, false, false},
{false, TANK4, PIPEH, TELEP, false, ARROW, false, TELEP, PUMP4, TANK4, false},
}
function techage.add_manual_plans(table_with_plans)
for name, tbl in pairs(table_with_plans) do
techage.ConstructionPlans[name] = tbl

2
techage/energy_storage/generator.lua
View File

@ -128,5 +128,3 @@ minetest.register_craft({
{"", "techage:ta4_wlanchip", ""},
},
})

1
techage/energy_storage/heatexchanger1.lua
View File

@ -99,4 +99,3 @@ minetest.register_craft({
{"", "techage:baborium_ingot", ""},
},
})

1
techage/energy_storage/nodes.lua
View File

@ -34,4 +34,3 @@ minetest.register_node("techage:glow_gravel", {
sounds = default.node_sound_gravel_defaults(),
drop = "",
})

1
techage/energy_storage/turbine.lua
View File

@ -163,4 +163,3 @@ minetest.register_craft({
{"", "techage:ta4_wlanchip", ""},
},
})

1
techage/furnace/booster.lua
View File

@ -197,4 +197,3 @@ minetest.register_craft({
{"basic_materials:steel_bar", "default:wood", "basic_materials:steel_bar"},
},
})

1
techage/furnace/furnace_top.lua
View File

@ -298,4 +298,3 @@ minetest.register_craft({
{"", "techage:vacuum_tube", ""},
},
})

1
techage/hydrogen/electrolyzer.lua
View File

@ -349,4 +349,3 @@ minetest.register_craft({
{'default:steel_ingot', "techage:ta4_wlanchip", 'default:steel_ingot'},
},
})

1
techage/hydrogen/fuelcellstack.lua
View File

@ -31,4 +31,3 @@ minetest.register_craft({
{"techage:canister_lye", "techage:ta3_canister_empty"},
}
})

1
techage/icta_controller/action.lua
View File

@ -105,4 +105,3 @@ techage.icta_register_action("print", {
end
end,
})

1
techage/icta_controller/commands.lua
View File

@ -956,4 +956,3 @@ techage.icta_register_action("exchange", {
end
end,
})

1
techage/icta_controller/condition.lua
View File

@ -82,4 +82,3 @@ techage.icta_register_condition("default", {
end,
button = function(data, environ) return "..." end,
})

1
techage/icta_controller/controller.lua
View File

@ -445,4 +445,3 @@ techage.register_node({"techage:ta4_icta_controller"}, {
end
end,
})

1
techage/icta_controller/display.lua
View File

@ -270,4 +270,3 @@ techage.register_node({"techage:ta4_displayXL"}, {
lcdlib.register_display_entity("techage:display_entity")
lcdlib.register_display_entity("techage:display_entityXL")

14
techage/icta_controller/submenu.lua
View File

@ -22,11 +22,10 @@ end
-- generate the choice dependent part of the form
local function add_controls_to_table(tbl, kvDefinition, kvSelect)
local val = ""
local offs = 1.4
if kvDefinition[kvSelect.choice] then
local lControls = kvDefinition[kvSelect.choice].formspec
for idx,elem in ipairs(lControls) do
for _,elem in ipairs(lControls) do
if elem.type == "label" then
tbl[#tbl+1] = "label[0,"..offs..";Description:\n"..elem.label.."]"
offs = offs + 0.4
@ -36,12 +35,12 @@ local function add_controls_to_table(tbl, kvDefinition, kvSelect)
end
if elem.type == "numbers" or elem.type == "number" or elem.type == "digits" or elem.type == "letters"
or elem.type == "ascii" then
val = kvSelect[elem.name] or elem.default
local val = kvSelect[elem.name] or elem.default
tbl[#tbl+1] = "field[0.3,"..(offs+0.2)..";8,1;"..elem.name..";;"..val.."]"
offs = offs + 0.9
elseif elem.type == "textlist" then
local l = elem.choices:split(",")
val = index(l, kvSelect[elem.name]) or elem.default
local val = index(l, kvSelect[elem.name]) or elem.default
tbl[#tbl+1] = "dropdown[0.0,"..(offs)..";8.5,1.4;"..elem.name..";"..elem.choices..";"..val.."]"
offs = offs + 0.9
end
@ -52,7 +51,7 @@ end
local function default_data(kvDefinition, kvSelect)
local lControls = kvDefinition[kvSelect.choice].formspec
for idx,elem in ipairs(lControls) do
for _,elem in ipairs(lControls) do
kvSelect[elem.name] = elem.default
end
kvSelect.button = kvDefinition[kvSelect.choice].button(kvSelect)
@ -66,7 +65,7 @@ end
local function field_to_kvSelect(kvDefinition, kvSelect, fields)
local error = false
local lControls = kvDefinition[kvSelect.choice].formspec
for idx,elem in ipairs(lControls) do
for _,elem in ipairs(lControls) do
if elem.type == "numbers" then
if fields[elem.name] then
if fields[elem.name]:find("^[%d ]+$") then
@ -131,7 +130,7 @@ end
function techage.submenu_verify(owner, kvDefinition, kvSelect)
local error = false
local lControls = kvDefinition[kvSelect.choice].formspec
for idx,elem in ipairs(lControls) do
for _,elem in ipairs(lControls) do
if elem.type == "numbers" then
if not kvSelect[elem.name]:find("^[%d ]+$") then
error = true
@ -212,4 +211,3 @@ function techage.submenu_eval_input(kvDefinition, lKeys, lChoice, kvSelect, fiel
end
return kvSelect
end

1
techage/iron_age/charcoalpile.lua
View File

@ -225,4 +225,3 @@ minetest.register_lbm({
end
end
})

2
techage/iron_age/coalburner.lua
View File

@ -246,5 +246,3 @@ function techage.stop_burner(pos)
minetest.sound_stop(handle)
meta:set_int("burn_time", 0)
end

1
techage/iron_age/gravelsieve.lua
View File

@ -210,4 +210,3 @@ minetest.register_craft({
minetest.register_alias("techage:sieve", "techage:sieve3")
minetest.register_alias("techage:auto_sieve", "techage:auto_sieve3")

1
techage/iron_age/hammer.lua
View File

@ -213,4 +213,3 @@ minetest.register_craft({
{"", "group:stick", ""},
}
})

1
techage/iron_age/lighter.lua
View File

@ -87,4 +87,3 @@ minetest.register_craft({
{''},
}
})

1
techage/iron_age/main.lua
View File

@ -26,4 +26,3 @@ function techage.ironage_swap_nodes(pos1, pos2, name1, name2)
techage.ironage_swap_node(p, name2)
end
end

1
techage/iron_age/meltingpot.lua
View File

@ -511,4 +511,3 @@ function techage.ironage_register_recipe(recipe)
recipe.type = "melting"
techage.recipes.register_craft(recipe)
end

1
techage/iron_age/meridium.lua
View File

@ -123,4 +123,3 @@ techage.ironage_register_recipe({
heat = 4,
time = 3,
})

1
techage/iron_age/recipes.lua
View File

@ -235,4 +235,3 @@ if techage.modified_recipes_enabled then
"Lava Bucket"
)
end

1
techage/iron_age/tools.lua
View File

@ -100,4 +100,3 @@ local function tools()
end
minetest.after(1, tools)

1
techage/items/cement.lua
View File

@ -61,4 +61,3 @@ minetest.register_craft({
},
replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}},
})

1
techage/items/petroleum.lua
View File

@ -171,4 +171,3 @@ techage.register_liquid("techage:ta3_canister_naphtha", "techage:ta3_canister_em
techage.register_liquid("techage:ta3_canister_gasoline", "techage:ta3_canister_empty", 1, "techage:gasoline")
techage.register_liquid("techage:ta3_cylinder_small_gas", "techage:ta3_cylinder_small", 1, "techage:gas")
techage.register_liquid("techage:ta4_cylinder_small_isobutane", "techage:ta3_cylinder_small", 1, "techage:isobutane")

2
techage/items/powder.lua
View File

@ -63,5 +63,3 @@ techage.add_grinder_recipe({input="default:clay", output="techage:clay_powder"})
techage.add_grinder_recipe({input="techage:aluminum", output="techage:aluminum_powder"})
techage.add_grinder_recipe({input="default:silver_sandstone", output="techage:silver_sandstone_powder"})

1
techage/items/redstone.lua
View File

@ -66,4 +66,3 @@ techage.furnace.register_recipe({
waste = "techage:ta3_canister_empty",
time = 4,
})

1
techage/lamps/lib.lua
View File

@ -181,4 +181,3 @@ function techage.register_lamp(basename, ndef_off, ndef_on)
power.update_network(pos, nil, Cable)
end)
end

1
techage/lamps/streetlamp2.lua
View File

@ -126,4 +126,3 @@ minetest.register_craft({
{"", "", ""},
},
})

1
techage/liquids/liquid_pipe.lua
View File

@ -203,4 +203,3 @@ minetest.register_alias("techage:ta4_pipeA", "techage:ta3_pipeA")
minetest.register_alias("techage:ta4_pipeS", "techage:ta3_pipeS")
techage.LiquidPipe = Pipe

1
techage/liquids/waterinlet.lua
View File

@ -106,4 +106,3 @@ minetest.register_craft({
{"techage:iron_ingot", "techage:ta3_barrel_empty", "techage:iron_ingot"},
},
})

1
techage/logic/button.lua
View File

@ -331,4 +331,3 @@ minetest.register_craft({
{"", "", ""},
},
})

1
techage/logic/detector.lua
View File

@ -277,4 +277,3 @@ techage.register_node({"techage:ta4_detector_off", "techage:ta4_detector_on"}, {
end
end,
})

2
techage/logic/logic_block.lua
View File

@ -408,5 +408,3 @@ techage.register_node({"techage:ta3_logic2"}, {
end
end,
})

2
techage/logic/lua_logic.lua
View File

@ -250,5 +250,3 @@ techage.register_node({"techage:ta3_logic"}, {
end,
})

1
techage/logic/mba_detector.lua
View File

@ -97,4 +97,3 @@ techage.register_node({"techage:ta4_mbadetector"}, {
end,
}
)

1
techage/logic/node_detector.lua
View File

@ -207,4 +207,3 @@ techage.register_node({"techage:ta3_nodedetector_off", "techage:ta3_nodedetector
minetest.get_node_timer(pos):start(CYCLE_TIME)
end,
})

1
techage/logic/player_detector.lua
View File

@ -328,4 +328,3 @@ techage.register_node({
end,
}
)

1
techage/logic/programmer.lua
View File

@ -98,4 +98,3 @@ minetest.register_craft({
{"", "dye:red", ""},
},
})

1
techage/logic/repeater.lua
View File

@ -112,4 +112,3 @@ techage.register_node({"techage:ta3_repeater"}, {
minetest.get_node_timer(pos):start(CYCLE_TIME)
end,
})

1
techage/logic/sequencer.lua
View File

@ -285,4 +285,3 @@ techage.register_node({"techage:ta3_sequencer"}, {
end
end,
})

1
techage/logic/sequencer2.lua
View File

@ -312,4 +312,3 @@ techage.register_node({"techage:ta4_sequencer"}, {
end
end,
})

1
techage/logic/signallamp.lua
View File

@ -131,4 +131,3 @@ minetest.register_craft({
{"", "techage:vacuum_tube", ""},
},
})

1
techage/logic/timer.lua
View File

@ -207,4 +207,3 @@ techage.register_node({"techage:ta3_timer"}, {
check_rules(pos,0)
end,
})

1
techage/lua_controller/sensorchest.lua
View File

@ -233,4 +233,3 @@ minetest.register_craft({
output = "techage:ta4_sensor_chest",
recipe = {"techage:chest_ta4", "techage:ta4_wlanchip"}
})

2
techage/lua_controller/server.lua
View File

@ -323,5 +323,3 @@ techage.lua_ctlr.register_action("server_write", {
" return value: true if successful or false\n"..
' example: res = $server_write("123", "state", state)'
})

1
techage/lua_controller/terminal.lua
View File

@ -259,4 +259,3 @@ techage.lua_ctlr.register_action("send_msg", {
' Send a message to the controller with number "num".\n'..
' example: $send_msg("0123", "test")'
})

66
techage/manuals/manual_ta5_DE.md
View File

@ -40,7 +40,7 @@ Für das Pairing musst du zuerst auf der einen Seite einen Namen für die Kiste
Die Nutzung der TA5 Hyperloop Kiste benötigt 20 Erfahrungspunkte.
[ta4_chest|image]
[ta5_chest|image]
### TA5 Hyperloop Tank / TA5 Hyperloop Tank
@ -52,7 +52,39 @@ Für das Pairing musst du zuerst auf der einen Seite einen Namen für den Tank e
Die Nutzung des TA5 Hyperloop Tanks benötigt 20 Erfahrungspunkte.
[ta4_tank|image]
[ta5_tank|image]
### TA5-Raumgleiter (geplant)
Dank einem Spezialantrieb für Lichtgeschwindigkeit können mit dem Raumgleiter auch große Entfernungen sehr schnell überwunden werden.
## Teleport Blöcke
Mit Teleport-Blöcken können Dinge zwischen zwei Teleport-Blöcken übertragen werden, ohne dass sich dazwischen eine Röhre oder Leitung befinden muss. Für das Pairing der Blöcke musst du zuerst auf der einen Seite einen Namen für den Block eingeben, dann kannst du bei dem anderen Block diesen Namen auswählen und so die beiden Blöcke verbinden. Das Pairung kann nur von einem Spieler durchgeführt werden (Spielername wird geprüft) und muss vor einem Server-Neustart abgeschlossen sein. Anderenfalls gehen die Pairing-Daten verloren.
Der Plan rechts zeigt, wie die Blöcke genutzt werden können.
[ta5_teleport|plan]
### TA5 Teleport Block Gegenstände / TA5 Teleport Block Items
Diese Teleport-Blöcke erlauben die Übertragung von Gegenständen und ersetzen somit eine Röhre. Dabei können Entfernungen von bis zu 200 Blöcken überbrückt werden.
Ein Teleport-Block benötigt 12 ku Strom.
Für die Nutzung der Teleport-Blöcke werden 60 Erfahrungspunkte benötigt.
[ta5_tele_tube|image]
### TA5 Teleport Block Flüssigkeiten / TA5 Teleport Block Liquids
Diese Teleport-Blöcke erlauben die Übertragung von Flüssigkeiten und ersetzen somit eine gelbe Leitung. Dabei können Entfernungen von bis zu 200 Blöcken überbrückt werden.
Ein Teleport-Block benötigt 12 ku Strom.
Für die Nutzung der Teleport-Blöcke werden 60 Erfahrungspunkte benötigt.
[ta5_tele_pipe|image]
### Hyperloop Teleport Blöcke (geplant)
@ -60,40 +92,14 @@ Die Hyperloop Teleport Blöcke erlauben den Aufbau von Hyperloop Netzwerk ohne H
Die Nutzung der Hyperloop Teleport Blöcke benötigt 120 Erfahrungspunkte.
## Weitere TA5 Blöcke/Items
### TA5 Container (geplant)
Der TA5 Container erlaubt Techage Anlagen ein- und an einer anderen Stelle wieder auszupacken.
Für die Nutzung des TA5 Containers werden 80 Erfahrungspunkte benötigt.
### TA5 Teleport Block Gegenstände / TA5 Teleport Block Items
Teleportblöcke erlauben den Item-Transport ohne Röhren bis zu einer Entfernung von 200 Blöcken.
Für das Pairing musst du zuerst auf der einen Seite einen Namen für den Block eingeben, dann kannst du bei dem anderen Block diesen Namen auswählen und so die beiden Blöcke verbinden.
Teleportblöcke benötigen jeweils 12 ku Strom.
Für die Nutzung der Teleportblöcke werden 60 Erfahrungspunkte benötigt.
[ta5_tele_tube|image]
### TA5 Teleport Block Flüssigkeiten / TA5 Teleport Block Liquids
Teleportblöcke erlauben den Flüssigkeiten-Transport ohne Leitungen bis zu einer Entfernung von 200 Blöcken.
Für das Pairing musst du zuerst auf der einen Seite einen Namen für den Block eingeben, dann kannst du bei dem anderen Block diesen Namen auswählen und so die beiden Blöcke verbinden.
Teleportblöcke benötigen jeweils 12 ku Strom.
Für die Nutzung der Teleportblöcke werden 60 Erfahrungspunkte benötigt.
[ta5_tele_pipe|image]
### TA5-Raumgleiter (geplant)
Dank einem Spezialantrieb für Lichtgeschwindigkeit können mit dem Raumgleiter auch große Entfernungen sehr schnell überwunden werden.
## Weitere TA5 Blöcke/Items
### TA5 KI Chip / TA5 AI Chip
Der TA5 KI Chip wird teilweise zur Herstellung von TA5 Blöcken benötigt. Der TA5 KI Chip kann nur auf der TA4 Elektronik Fab hergestellt werden. Dazu werden 10 Erfahrungspunkte benötigt.

62
techage/manuals/manual_ta5_EN.md
View File

@ -40,7 +40,7 @@ For pairing you first have to enter a name for the chest on one side, then you c
The use of the TA5 Hyperloop Chest requires 20 experience points.
[ta4_chest|image]
[ta5_chest|image]
### TA5 Hyperloop Tank
@ -52,7 +52,37 @@ For pairing you first have to enter a name for the tank on one side, then you ca
The use of the TA5 Hyperloop Tank requires 20 experience points.
[ta4_tank|image]
[ta5_tank|image]
## Teleport Blocks
Teleport blocks allow things to be transferred between two teleport blocks without the need for a pipe or tube in between. To pair the blocks, you first have to enter a name for the block on one side, then you can select this name for the other block and thus connect the two blocks. Pairing can only be carried out by one player (player name is checked) and must be completed before the server is restarted. Otherwise the pairing data will be lost.
The map on the right shows how the blocks can be used.
[ta5_teleport|plan]
### TA5 Teleport Block Items
These teleport blocks allow the transfer of items and thus replace a tube. Distances of up to 200 blocks can be bridged.
Each Teleport blocks requires 12 ku of electricity.
60 experience points are required to use the teleport blocks.
[ta5_tele_tube|image]
### TA5 Teleport Block Liquids
These teleport blocks allow the transfer of liquids and thus replace a pipe. Distances of up to 200 blocks can be bridged.
Each Teleport blocks requires 12 ku of electricity.
60 experience points are required to use the teleport blocks.
[ta5_tele_pipe|image]
### Hyperloop Teleport Blocks (planned)
@ -60,36 +90,16 @@ The Hyperloop Teleport Blocks allow the construction of a Hyperloop network with
The use of the Hyperloop Teleport Blocks requires 120 experience points.
## More TA5 Blocks/Items
### TA5 Container (planned)
The TA5 container allows Techage systems to be packed and unpacked at another location.
80 experience points are required to use the TA5 container.
### TA5 Teleport Block Items
Teleport blocks allow items to be transported without tubes up to a distance of 200 blocks.
For pairing you first have to enter a name for the block on one side, then you can select this name for the other block and thus connect the two blocks.
Teleport blocks each require 12 ku of electricity.
60 experience points are required to use the Teleport blocks.
[ta5_tele_tube|image]
### TA5 Teleport Block Liquids
Teleport blocks allow liquids to be transported without pipes up to a distance of 200 blocks.
For pairing you first have to enter a name for the block on one side, then you can select this name for the other block and thus connect the two blocks.
Teleport blocks each require 12 ku of electricity.
60 experience points are required to use the Teleport blocks.
[ta5_tele_pipe|image]
## More TA5 Blocks / Items
### TA5 AI Chip
The TA5 AI Chip is partly required for the production of TA5 blocks. The TA5 AI Chip can only be manufactured at the TA4 Electronics Fab. This requires 10 experience points.

7
techage/manuals/toc_DE.md
View File

@ -236,10 +236,11 @@
- [TA5 Flug Controller](./manual_ta5_DE.md#ta5-flug-controller)
- [TA5 Hyperloop Kiste / TA5 Hyperloop Chest](./manual_ta5_DE.md#ta5-hyperloop-kiste--ta5-hyperloop-chest)
- [TA5 Hyperloop Tank / TA5 Hyperloop Tank](./manual_ta5_DE.md#ta5-hyperloop-tank--ta5-hyperloop-tank)
- [Hyperloop Teleport Blöcke (geplant)](./manual_ta5_DE.md#hyperloop-teleport-blöcke-(geplant))
- [TA5 Container (geplant)](./manual_ta5_DE.md#ta5-container-(geplant))
- [TA5-Raumgleiter (geplant)](./manual_ta5_DE.md#ta5-raumgleiter-(geplant))
- [Teleport Blöcke](./manual_ta5_DE.md#teleport-blöcke)
- [TA5 Teleport Block Gegenstände / TA5 Teleport Block Items](./manual_ta5_DE.md#ta5-teleport-block-gegenstände--ta5-teleport-block-items)
- [TA5 Teleport Block Flüssigkeiten / TA5 Teleport Block Liquids](./manual_ta5_DE.md#ta5-teleport-block-flüssigkeiten--ta5-teleport-block-liquids)
- [TA5-Raumgleiter (geplant)](./manual_ta5_DE.md#ta5-raumgleiter-(geplant))
- [Hyperloop Teleport Blöcke (geplant)](./manual_ta5_DE.md#hyperloop-teleport-blöcke-(geplant))
- [Weitere TA5 Blöcke/Items](./manual_ta5_DE.md#weitere-ta5-blöckeitems)
- [TA5 Container (geplant)](./manual_ta5_DE.md#ta5-container-(geplant))
- [TA5 KI Chip / TA5 AI Chip](./manual_ta5_DE.md#ta5-ki-chip--ta5-ai-chip)

7
techage/manuals/toc_EN.md
View File

@ -236,9 +236,10 @@
- [TA5 Flight Controller](./manual_ta5_EN.md#ta5-flight-controller)
- [TA5 Hyperloop Chest](./manual_ta5_EN.md#ta5-hyperloop-chest)
- [TA5 Hyperloop Tank](./manual_ta5_EN.md#ta5-hyperloop-tank)
- [Hyperloop Teleport Blocks (planned)](./manual_ta5_EN.md#hyperloop-teleport-blocks-(planned))
- [TA5 Container (planned)](./manual_ta5_EN.md#ta5-container-(planned))
- [Teleport Blocks](./manual_ta5_EN.md#teleport-blocks)
- [TA5 Teleport Block Items](./manual_ta5_EN.md#ta5-teleport-block-items)
- [TA5 Teleport Block Liquids](./manual_ta5_EN.md#ta5-teleport-block-liquids)
- [More TA5 Blocks / Items](./manual_ta5_EN.md#more-ta5-blocks--items)
- [Hyperloop Teleport Blocks (planned)](./manual_ta5_EN.md#hyperloop-teleport-blocks-(planned))
- [More TA5 Blocks/Items](./manual_ta5_EN.md#more-ta5-blocksitems)
- [TA5 Container (planned)](./manual_ta5_EN.md#ta5-container-(planned))
- [TA5 AI Chip](./manual_ta5_EN.md#ta5-ai-chip)

2
techage/mod.conf
View File

@ -1,4 +1,4 @@
name = techage
depends = default,doors,flowers,tubelib2,networks,basic_materials,bucket,stairs,screwdriver,minecart,lcdlib,safer_lua
optional_depends = unified_inventory,wielded_light,unifieddyes,moreores,ethereal,mesecon,digtron,bakedclay,moreblocks,i3
optional_depends = unified_inventory,wielded_light,unifieddyes,moreores,ethereal,mesecon,digtron,bakedclay,moreblocks,i3,creative,craftguide
description = Techage, go through 5 tech ages in search of wealth and power!

1
techage/move_controller/doorcontroller.lua
View File

@ -134,4 +134,3 @@ minetest.register_craft({
{"", "group:wood", ""},
},
})

1
techage/move_controller/gateblock.lua
View File

@ -92,4 +92,3 @@ minetest.register_craft({
{"group:wood", "", ""},
},
})

1
techage/move_controller/soundblock.lua
View File

@ -125,4 +125,3 @@ minetest.register_craft({
{"", "group:wood", ""},
},
})

1
techage/oil/pumpjack.lua
View File

@ -239,4 +239,3 @@ minetest.register_craft({
})
liquid.register_nodes({"techage:ta3_pumpjack_pas", "techage:ta3_pumpjack_act"}, Pipe, "pump", {"U"}, {})

1
techage/oil/reboiler.lua
View File

@ -279,4 +279,3 @@ minetest.register_craft({
{"", "basic_materials:heating_element", ""},
},
})

1
techage/oil/tower.lua
View File

@ -284,4 +284,3 @@ function techage.oiltower.remove(pos, player_name)
minetest.chat_send_player(player_name, S("[TA] Derrick is being removed!"))
techage.assemble.remove(pos, AssemblyPlan, player_name)
end

1
techage/power/formspecs.lua
View File

@ -318,4 +318,3 @@ function techage.formspec_label_bar(pos, x, y, label, max_power, current_power,
"container_end[]"
end

1
techage/power/gearbox.lua
View File

@ -144,4 +144,3 @@ minetest.register_craft({
{"default:wood", "techage:axle", "default:junglewood"},
},
})

1
techage/power/power_line.lua
View File

@ -365,4 +365,3 @@ minetest.register_craft({
{"", "group:wood", ""},
},
})

1
techage/power/powerswitch.lua
View File

@ -271,4 +271,3 @@ minetest.register_craft({
output = "techage:powerswitchsmall",
recipe = {"techage:powerswitch"},
})

1
techage/power/protection.lua
View File

@ -69,4 +69,3 @@ techage.register_powerline_node("techage:power_line")
techage.register_powerline_node("techage:power_lineS")
techage.register_powerline_node("techage:power_lineA")
techage.register_powerline_node("techage:power_pole3")

2
techage/power/ta4_cable.lua
View File

@ -187,5 +187,3 @@ minetest.register_craft({
},})
techage.TA4_Cable = Cable

1
techage/solar/minicell.lua
View File

@ -133,4 +133,3 @@ minetest.register_craft({
{"default:tin_ingot", "techage:iron_ingot", "default:copper_ingot"},
},
})

1
techage/solar/solarcell.lua
View File

@ -291,4 +291,3 @@ minetest.register_craft({
{"", "", ""},
},
})

1
techage/steam_engine/boiler.lua
View File

@ -135,4 +135,3 @@ minetest.register_craft({
{"techage:iron_ingot", "", "techage:iron_ingot"},
},
})

1
techage/steam_engine/cylinder.lua
View File

@ -174,4 +174,3 @@ minetest.register_craft({
{"default:wood", "techage:iron_ingot", "basic_materials:steel_bar"},
},
})

Some files were not shown because too many files have changed in this diff Show More