Fix ta5 hyperloop tank bug, EOF blank added
This commit is contained in:
parent
f96abd97b7
commit
f8ca493a6b
@ -109,4 +109,4 @@ minetest.register_node("techage:sink_on", {
|
||||
sounds = default.node_sound_wood_defaults(),
|
||||
})
|
||||
|
||||
power.register_nodes({"techage:sink", "techage:sink_on"}, Cable, "con")
|
||||
power.register_nodes({"techage:sink", "techage:sink_on"}, Cable, "con")
|
||||
|
@ -511,4 +511,4 @@ local power = networks.power
|
||||
|
||||
techage.register_node_for_v1_transition({"techage:ta3_autocrafter_pas", "techage:ta4_autocrafter_pas"}, function(pos, node)
|
||||
power.update_network(pos, nil, Cable)
|
||||
end)
|
||||
end)
|
||||
|
@ -86,4 +86,4 @@ liquid.register_nodes({"techage:blackhole"},
|
||||
put = put_liquid,
|
||||
take = take_liquid,
|
||||
}
|
||||
)
|
||||
)
|
||||
|
@ -442,4 +442,4 @@ minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = "techage:chest_ta4",
|
||||
recipe = {"techage:chest_ta3", "default:chest"}
|
||||
})
|
||||
})
|
||||
|
@ -123,4 +123,4 @@ minetest.register_craft({
|
||||
{"techage:ta4_tubeS", "", "techage:ta4_tubeS"},
|
||||
{"", "techage:ta4_tubeS", ""},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -300,4 +300,4 @@ function techage.register_consumer(base_name, inv_name, tiles, tNode, validState
|
||||
end
|
||||
end
|
||||
return names[1], names[2], names[3], names[4]
|
||||
end
|
||||
end
|
||||
|
@ -599,4 +599,4 @@ minetest.register_craft({
|
||||
{node_name_ta4, "default:copper_ingot"},
|
||||
{"default:mese_crystal_fragment", node_name_ta4},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -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"
|
||||
@ -304,4 +303,4 @@ minetest.register_chatcommand("forceload", {
|
||||
return false, S("Priv missing")
|
||||
end
|
||||
end,
|
||||
})
|
||||
})
|
||||
|
@ -150,4 +150,4 @@ techage.register_node({"xdecor:hive"}, {
|
||||
local inv = meta:get_inventory()
|
||||
return techage.put_items(inv, "honey", stack)
|
||||
end,
|
||||
})
|
||||
})
|
||||
|
@ -278,4 +278,4 @@ techage.recipes.register_craft({
|
||||
output = "techage:sieved_basalt_gravel",
|
||||
items = {"techage:basalt_gravel"},
|
||||
type = "ta4_gravelsieve",
|
||||
})
|
||||
})
|
||||
|
@ -422,4 +422,4 @@ if minetest.global_exists("farming") then
|
||||
techage.add_grinder_recipe({input="farming:seed_rice 6", output="farming:rice_flour"}, true)
|
||||
techage.add_grinder_recipe({input="farming:oat 3", output="farming:flour"}, true)
|
||||
techage.add_grinder_recipe({input="farming:seed_oat 6", output="farming:flour"}, true)
|
||||
end
|
||||
end
|
||||
|
@ -97,4 +97,4 @@ techage.register_node({"techage:itemsource"}, {
|
||||
on_node_load = function(pos)
|
||||
minetest.get_node_timer(pos):start(CYCLE_TIME)
|
||||
end,
|
||||
})
|
||||
})
|
||||
|
@ -129,4 +129,3 @@ techage.register_node({"protector:chest"}, {
|
||||
return techage.put_items(inv, "main", stack)
|
||||
end,
|
||||
})
|
||||
|
||||
|
@ -425,4 +425,4 @@ minetest.register_craft({
|
||||
{"", node_name_ta3, ""},
|
||||
{"", "techage:ta4_wlanchip", ""},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -349,4 +349,4 @@ local function collect_recipes()
|
||||
end
|
||||
end
|
||||
|
||||
minetest.after(2, collect_recipes)
|
||||
minetest.after(2, collect_recipes)
|
||||
|
@ -647,4 +647,4 @@ minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = "techage:chest_ta4",
|
||||
recipe = {"techage:ta4_chest"}
|
||||
})
|
||||
})
|
||||
|
@ -294,4 +294,4 @@ minetest.register_craft({
|
||||
{"", "techage:ta4_pusher_pas", ""},
|
||||
{"", "basic_materials:ic", ""},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -182,4 +182,4 @@ minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = "techage:ta5_hl_chest",
|
||||
recipe = {"techage:chest_ta4", "techage:ta5_aichip"}
|
||||
})
|
||||
})
|
||||
|
@ -238,4 +238,4 @@ end
|
||||
-- param2, and a route table like : {0,3}
|
||||
-- 0 = forward, 1 = right, 2 = backward, 3 = left
|
||||
-- techage.assemble.get_pos(pos, param2, route, y_offs)
|
||||
techage.assemble.get_pos = dest_pos
|
||||
techage.assemble.get_pos = dest_pos
|
||||
|
@ -624,4 +624,4 @@ minetest.register_chatcommand("my_expoints", {
|
||||
end
|
||||
end
|
||||
end
|
||||
})
|
||||
})
|
||||
|
@ -106,4 +106,4 @@ function inv_lib.take_item(pos, inv, listname, num, stacks)
|
||||
end
|
||||
|
||||
|
||||
return inv_lib
|
||||
return inv_lib
|
||||
|
@ -730,4 +730,4 @@ minetest.register_on_dieplayer(function(player)
|
||||
end
|
||||
end)
|
||||
|
||||
return flylib
|
||||
return flylib
|
||||
|
@ -49,4 +49,4 @@ minetest.register_on_leaveplayer(function(player)
|
||||
ActiveFormspecs[ActivePlayer[name]] = nil
|
||||
ActivePlayer[name] = nil
|
||||
end
|
||||
end)
|
||||
end)
|
||||
|
@ -194,4 +194,4 @@ function techage.fuel.get_liquid_table(valid_fuel, capacity, start_firebox)
|
||||
return leftover
|
||||
end
|
||||
}
|
||||
end
|
||||
end
|
||||
|
@ -93,4 +93,4 @@ function techage.gravelsieve_get_random_basalt_ore()
|
||||
else
|
||||
return ItemStack("techage:sieved_basalt_gravel")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -143,4 +143,4 @@ function techage.add_laser(pos, pos1, pos2)
|
||||
end
|
||||
|
||||
-- techage.del_laser(pos)
|
||||
techage.del_laser = del_laser
|
||||
techage.del_laser = del_laser
|
||||
|
@ -22,4 +22,4 @@ function techage.register_node_for_v1_transition(nodenames, on_node_load)
|
||||
on_node_load(pos, node)
|
||||
end
|
||||
})
|
||||
end
|
||||
end
|
||||
|
@ -546,4 +546,4 @@ function techage.set_expoints(player, ex_points)
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -254,4 +254,4 @@ techage.liquid.get_full_container = get_full_container
|
||||
techage.liquid.fill_container = fill_container
|
||||
techage.liquid.empty_container = empty_container
|
||||
techage.liquid.fill_on_punch = fill_on_punch
|
||||
techage.liquid.empty_on_punch = empty_on_punch
|
||||
techage.liquid.empty_on_punch = empty_on_punch
|
||||
|
@ -89,4 +89,3 @@ techage.manual_DE.aPlanTable = {
|
||||
"",
|
||||
"",
|
||||
}
|
||||
|
||||
|
@ -119,4 +119,4 @@ minetest.register_entity(":techage:block_marker", {
|
||||
end,
|
||||
})
|
||||
|
||||
return marker
|
||||
return marker
|
||||
|
@ -503,4 +503,4 @@ minetest.register_node("techage:defect_dummy", {
|
||||
drop = "",
|
||||
groups = {cracky=2, crumbly=2, choppy=2, not_in_creative_inventory=1},
|
||||
is_ground_content = false,
|
||||
})
|
||||
})
|
||||
|
@ -166,4 +166,4 @@ function techage.del_mem(pos)
|
||||
NvmStore[key1] = NvmStore[key1] or backend.get_mapblock_data(key1)
|
||||
NvmStore[key1][key2] = nil
|
||||
backend.store_mapblock_data(key1, NvmStore[key1])
|
||||
end
|
||||
end
|
||||
|
@ -99,4 +99,4 @@ function api.restore_at_startup()
|
||||
return {}
|
||||
end
|
||||
|
||||
return api
|
||||
return api
|
||||
|
@ -116,4 +116,4 @@ function api.restore_at_startup()
|
||||
return {}
|
||||
end
|
||||
|
||||
return api
|
||||
return api
|
||||
|
@ -139,4 +139,4 @@ function api.delete_invalid_entries(node_def)
|
||||
minetest.log("info", "[TechAge] Data maintenance finished")
|
||||
end
|
||||
|
||||
return api
|
||||
return api
|
||||
|
@ -95,4 +95,4 @@ function backend.delete_invalid_entries(node_def)
|
||||
minetest.log("info", "[TechAge] Data maintenance finished")
|
||||
end
|
||||
|
||||
return backend
|
||||
return backend
|
||||
|
@ -100,4 +100,4 @@ techage.OggFileList = {
|
||||
"default_wood_footstep", -- ./games/minetest_game/mods/default/sounds
|
||||
"default_furnace_active", -- ./games/minetest_game/mods/default/sounds
|
||||
"default_item_smoke", -- ./games/minetest_game/mods/default/sounds
|
||||
}
|
||||
}
|
||||
|
@ -276,4 +276,4 @@ techage.recipes.register_craft = function(def)
|
||||
}
|
||||
unified_inventory.register_craft(ui_def)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -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
|
||||
techage.shared_tank.formspec = formspec
|
||||
|
@ -293,4 +293,4 @@ function techage.menu.eval_input(pos, form_def, fields, player_name)
|
||||
evaluate_data(pos, meta, form_def, fields, player_name)
|
||||
end
|
||||
return fields.refresh or fields.save or fields.key_enter_field
|
||||
end
|
||||
end
|
||||
|
@ -164,4 +164,4 @@ function techage.teleport.after_formspec(pos, player, fields, max_dist, ex_point
|
||||
M(pos):set_string("status", S("Ex-points missing (@1 < @2)", techage.get_expoints(player), ex_points))
|
||||
M(pos):set_string("formspec", techage.teleport.formspec(pos))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -54,4 +54,4 @@ minetest.register_craft({
|
||||
{"", "basic_materials:concrete_block", ""},
|
||||
{"", "",""},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -145,4 +145,4 @@ minetest.register_craft({
|
||||
{"", "group:wood", ""},
|
||||
{"group:wood", "", "default:tin_ingot"},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -117,4 +117,4 @@ minetest.register_craft({
|
||||
techage.TA4tubes = {
|
||||
["techage:ta4_tubeS"] = true,
|
||||
["techage:ta4_tubeA"] = true,
|
||||
}
|
||||
}
|
||||
|
@ -77,4 +77,4 @@ function techage.valid_place_for_windturbine(pos, player_name, num_turbines)
|
||||
S("is a suitable place for a wind turbine!"))
|
||||
end
|
||||
return true, "ok"
|
||||
end
|
||||
end
|
||||
|
@ -169,4 +169,4 @@ minetest.register_craft({
|
||||
{"default:junglewood", "default:chest_locked", "default:junglewood"},
|
||||
{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -173,4 +173,4 @@ minetest.register_craft({
|
||||
{"default:junglewood", "techage:ta3_tank", "default:junglewood"},
|
||||
{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -376,4 +376,4 @@ minetest.register_craft({
|
||||
{"techage:ta3_pipeS", "techage:t4_pump", "techage:ta3_pipeS"},
|
||||
{"", "techage:ta4_wlanchip", ""},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -206,4 +206,4 @@ minetest.register_craft({
|
||||
{'basic_materials:concrete_block', 'techage:ta3_pipeS', 'techage:ta3_pipeS'},
|
||||
{'basic_materials:concrete_block', 'basic_materials:concrete_block', 'basic_materials:concrete_block'},
|
||||
}
|
||||
})
|
||||
})
|
||||
|
@ -201,4 +201,4 @@ minetest.register_lbm({
|
||||
inv:set_size('main', 1)
|
||||
M(pos):set_string("formspec", formspec())
|
||||
end,
|
||||
})
|
||||
})
|
||||
|
@ -206,4 +206,4 @@ minetest.register_craft({
|
||||
{'techage:ta3_pipeS', '', ''},
|
||||
{'', '', ''},
|
||||
}
|
||||
})
|
||||
})
|
||||
|
@ -216,4 +216,4 @@ minetest.register_craft({
|
||||
{'default:steel_ingot', '', 'default:steel_ingot'},
|
||||
{'default:stone', 'default:stone', 'default:stone'},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -262,4 +262,4 @@ minetest.register_craft({
|
||||
{"", "basic_materials:gear_steel", "techage:electric_cableS"},
|
||||
{"default:wood", "techage:iron_ingot", "basic_materials:steel_bar"},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -142,4 +142,3 @@ minetest.register_craft({
|
||||
{'', '', ''},
|
||||
},
|
||||
})
|
||||
|
||||
|
@ -361,4 +361,4 @@ minetest.register_craft({
|
||||
{'techage:electric_cableS', 'techage:ta4_colliderblock', ''},
|
||||
{'', '', ''},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -302,4 +302,4 @@ minetest.register_lbm({
|
||||
nvm.liquid.name = "techage:isobutane"
|
||||
end
|
||||
end,
|
||||
})
|
||||
})
|
||||
|
@ -205,4 +205,4 @@ techage.register_node({"techage:ta4_terminal"}, {
|
||||
return true
|
||||
end
|
||||
end,
|
||||
})
|
||||
})
|
||||
|
@ -127,4 +127,4 @@ minetest.register_craft({
|
||||
{'techage:aluminum', 'dye:blue', 'techage:aluminum'},
|
||||
{'', 'default:steel_ingot', ''},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -172,4 +172,4 @@ minetest.register_craft({
|
||||
{"techage:electric_cableS", "default:tin_ingot", "digtron:digtron_core"},
|
||||
{"group:wood", "default:copper_ingot", "group:wood"},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -230,4 +230,4 @@ minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = "techage:construction_board",
|
||||
recipe = {"techage:construction_board_EN"},
|
||||
})
|
||||
})
|
||||
|
@ -216,4 +216,4 @@ function techage.add_manual_items(table_with_items)
|
||||
for name, tbl in pairs(table_with_items) do
|
||||
techage.Items[name] = tbl
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -2552,4 +2552,3 @@ techage.manual_DE.aPlanTable = {
|
||||
"",
|
||||
"",
|
||||
}
|
||||
|
||||
|
@ -2545,4 +2545,3 @@ techage.manual_EN.aPlanTable = {
|
||||
"",
|
||||
"",
|
||||
}
|
||||
|
||||
|
@ -37,4 +37,3 @@ function techage.add_to_manual(language, titles, texts, items, plans)
|
||||
tbl.aPlanTable[#tbl.aPlanTable + 1] = item
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -517,4 +517,4 @@ function techage.add_manual_plans(table_with_plans)
|
||||
for name, tbl in pairs(table_with_plans) do
|
||||
techage.ConstructionPlans[name] = tbl
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -128,4 +128,3 @@ minetest.register_craft({
|
||||
{"", "techage:ta4_wlanchip", ""},
|
||||
},
|
||||
})
|
||||
|
||||
|
@ -397,4 +397,4 @@ minetest.register_craft({
|
||||
{"", "techage:ta4_wlanchip", ""},
|
||||
{"", "techage:baborium_ingot", ""},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -99,4 +99,4 @@ minetest.register_craft({
|
||||
},
|
||||
})
|
||||
|
||||
techage.orientate_node = orientate_node
|
||||
techage.orientate_node = orientate_node
|
||||
|
@ -171,4 +171,4 @@ minetest.register_craft({
|
||||
type = 'shapeless',
|
||||
output = "techage:ta4_pipe_inlet",
|
||||
recipe = {"basic_materials:concrete_block", "techage:ta4_pipeS"},
|
||||
})
|
||||
})
|
||||
|
@ -179,4 +179,4 @@ minetest.register_node("techage:gasflare2", {
|
||||
diggable = false,
|
||||
is_ground_content = false,
|
||||
sounds = default.node_sound_stone_defaults(),
|
||||
})
|
||||
})
|
||||
|
@ -225,4 +225,4 @@ function techage.furnace.register_recipe(recipe)
|
||||
recipe.items = recipe.recipe
|
||||
recipe.type = "ta3_melting"
|
||||
techage.recipes.register_craft(recipe)
|
||||
end
|
||||
end
|
||||
|
@ -202,4 +202,4 @@ techage.register_node({"techage:furnace_firebox", "techage:furnace_firebox_on"},
|
||||
})
|
||||
|
||||
liquid.register_nodes({"techage:furnace_firebox", "techage:furnace_firebox_on"},
|
||||
Pipe, "tank", nil, fuel.get_liquid_table(fuel.BT_OIL, fuel.CAPACITY, start_firebox))
|
||||
Pipe, "tank", nil, fuel.get_liquid_table(fuel.BT_OIL, fuel.CAPACITY, start_firebox))
|
||||
|
@ -133,4 +133,4 @@ minetest.register_craft({
|
||||
{'techage:basalt_stone', 'basic_materials:heating_element', 'techage:basalt_stone'},
|
||||
{'techage:aluminum', 'techage:ta4_furnace_ceramic', 'techage:aluminum'},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -167,4 +167,4 @@ if minetest.global_exists("moreores") then
|
||||
time = 5,
|
||||
})
|
||||
|
||||
end
|
||||
end
|
||||
|
@ -334,4 +334,4 @@ minetest.register_craft({
|
||||
{'techage:ta3_pipeS', 'techage:ta4_fuelcellstack', 'techage:electric_cableS'},
|
||||
{'default:steel_ingot', "techage:ta4_wlanchip", 'default:steel_ingot'},
|
||||
},
|
||||
})
|
||||
})
|
||||
|
@ -176,4 +176,4 @@ techage.register_node({"techage:ta4_battery"}, {
|
||||
return "unsupported"
|
||||
end
|
||||
end,
|
||||
})
|
||||
})
|
||||
|
@ -37,4 +37,4 @@ function techage.edit_command(fs_data, text)
|
||||
return "row "..pos1.." deleted"
|
||||
end
|
||||
return "Invalid command '"..text.."'"
|
||||
end
|
||||
end
|
||||
|
@ -240,4 +240,4 @@ function techage.formspecHelp(offs)
|
||||
"label[0,"..(-offs/50)..";"..sHELP.."]"..
|
||||
--"label[0.2,0;test]"..
|
||||
"scrollbar[12,1;0.5,7;vertical;sb_help;"..offs.."]"
|
||||
end
|
||||
end
|
||||
|
@ -132,4 +132,4 @@ techage.register_node({"techage:ta4_signaltower",
|
||||
return meta:get_string("state")
|
||||
end
|
||||
end,
|
||||
})
|
||||
})
|
||||
|
@ -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
|
||||
|
2
init.lua
2
init.lua
@ -402,4 +402,4 @@ dofile(MP.."/teleport/teleport_pipe.lua")
|
||||
techage.IE = nil
|
||||
|
||||
|
||||
function techage.icta_register_condition(key, tData) end
|
||||
function techage.icta_register_condition(key, tData) end
|
||||
|
@ -246,4 +246,3 @@ function techage.stop_burner(pos)
|
||||
minetest.sound_stop(handle)
|
||||
meta:set_int("burn_time", 0)
|
||||
end
|
||||
|
||||
|
@ -89,4 +89,4 @@ minecart.register_inventory(
|
||||
listname = "dst",
|
||||
},
|
||||
}
|
||||
)
|
||||
)
|
||||
|
@ -60,4 +60,4 @@ techage.furnace.register_recipe({
|
||||
"techage:gibbsite_powder", "techage:gibbsite_powder"},
|
||||
time = 16,
|
||||
|
||||
})
|
||||
})
|
||||
|
@ -48,4 +48,4 @@ minetest.register_craft({
|
||||
output = 'techage:baborium_ingot',
|
||||
recipe = 'techage:baborium_lump',
|
||||
cooktime = 5,
|
||||
})
|
||||
})
|
||||
|
@ -111,4 +111,4 @@ techage.register_liquid("bucket:bucket_river_water", "bucket:bucket_empty", 1, "
|
||||
techage.register_liquid("techage:barrel_water", "techage:ta3_barrel_empty", 10, "techage:water")
|
||||
techage.register_liquid("techage:barrel_river_water", "techage:ta3_barrel_empty", 10, "techage:river_water")
|
||||
|
||||
techage.register_liquid("bucket:bucket_lava", "bucket:bucket_empty", 1, "default:lava_source")
|
||||
techage.register_liquid("bucket:bucket_lava", "bucket:bucket_empty", 1, "default:lava_source")
|
||||
|
@ -200,4 +200,4 @@ minetest.register_craft({
|
||||
techage.add_grinder_recipe({input="techage:basalt_stone", output="techage:basalt_gravel"})
|
||||
techage.add_grinder_recipe({input="techage:basalt_cobble", output="techage:basalt_gravel"})
|
||||
techage.add_grinder_recipe({input="techage:basalt_gravel", output="default:clay"})
|
||||
techage.add_grinder_recipe({input="techage:sieved_basalt_gravel", output="default:clay"})
|
||||
techage.add_grinder_recipe({input="techage:sieved_basalt_gravel", output="default:clay"})
|
||||
|
@ -65,4 +65,4 @@ minetest.register_ore({
|
||||
})
|
||||
|
||||
techage.add_grinder_recipe({input="techage:bauxite_cobble", output="techage:bauxite_gravel"})
|
||||
techage.add_grinder_recipe({input="techage:bauxite_gravel", output="techage:bauxite_powder"})
|
||||
techage.add_grinder_recipe({input="techage:bauxite_gravel", output="techage:bauxite_powder"})
|
||||
|
@ -66,4 +66,4 @@ techage.furnace.register_recipe({
|
||||
"techage:ta4_ceramic_material", "techage:ta4_ceramic_material",
|
||||
},
|
||||
time = 16,
|
||||
})
|
||||
})
|
||||
|
@ -89,4 +89,4 @@ techage.recipes.add("ta4_doser", {
|
||||
"techage:hydrogen 1",
|
||||
},
|
||||
catalyst = "techage:iron_powder",
|
||||
})
|
||||
})
|
||||
|
@ -83,4 +83,4 @@ techage.recipes.add("ta4_electronic_fab", {
|
||||
output = "techage:ta5_aichip 2",
|
||||
input = {"techage:ta4_leds 8", "basic_materials:copper_wire 1", "basic_materials:gold_wire 1", "techage:ta4_silicon_wafer 1"},
|
||||
ex_points = 10,
|
||||
})
|
||||
})
|
||||
|
@ -42,4 +42,4 @@ techage.recipes.add("ta4_doser", {
|
||||
techage.register_liquid("techage:barrel_epoxy", "techage:ta3_barrel_empty", 10, "techage:epoxy")
|
||||
techage.register_liquid("techage:canister_epoxy", "techage:ta3_canister_empty", 1, "techage:epoxy")
|
||||
|
||||
minetest.register_alias("techage:ta4_epoxy", "techage:canister_epoxy")
|
||||
minetest.register_alias("techage:ta4_epoxy", "techage:canister_epoxy")
|
||||
|
@ -11,4 +11,4 @@ minetest.register_on_mods_loaded(function()
|
||||
end
|
||||
end
|
||||
networks.register_filling_items(fillings)
|
||||
end)
|
||||
end)
|
||||
|
@ -40,4 +40,4 @@ techage.recipes.add("ta4_doser", {
|
||||
input = {
|
||||
"techage:gas 1",
|
||||
}
|
||||
})
|
||||
})
|
||||
|
@ -41,4 +41,4 @@ techage.recipes.add("ta4_doser", {
|
||||
})
|
||||
|
||||
techage.register_liquid("techage:barrel_lye", "techage:ta3_barrel_empty", 10, "techage:lye")
|
||||
techage.register_liquid("techage:canister_lye", "techage:ta3_canister_empty", 1, "techage:lye")
|
||||
techage.register_liquid("techage:canister_lye", "techage:ta3_canister_empty", 1, "techage:lye")
|
||||
|
@ -87,4 +87,4 @@ else
|
||||
register_alias(subname)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -133,4 +133,4 @@ minetest.register_craftitem("techage:ta3_canister_oil", {
|
||||
|
||||
techage.register_liquid("techage:bucket_oil", "bucket:bucket_empty", 1, "techage:oil_source")
|
||||
techage.register_liquid("techage:ta3_barrel_oil", "techage:ta3_barrel_empty", 10, "techage:oil_source")
|
||||
techage.register_liquid("techage:ta3_canister_oil", "techage:ta3_canister_empty", 1, "techage:oil_source")
|
||||
techage.register_liquid("techage:ta3_canister_oil", "techage:ta3_canister_empty", 1, "techage:oil_source")
|
||||
|
@ -32,4 +32,4 @@ techage.furnace.register_recipe({
|
||||
recipe = {"techage:plastic_granules"},
|
||||
time = 2,
|
||||
|
||||
})
|
||||
})
|
||||
|
@ -63,4 +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"})
|
||||
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user