elevator bugfixes

master
Joachim Stolberg 2018-12-01 13:55:25 +01:00
parent 3d07fa3d5b
commit 3ae93a40b8
4 changed files with 14 additions and 6 deletions

View File

@ -28,9 +28,14 @@ local kPLAYER_OVER_GROUND = 0.5
-- Elevator Shaft
-------------------------------------------------------------------------------
-- Down, Up
local dirs_to_check = {5,6} -- vertical only
if hyperloop.free_tube_placement_enabled then
dirs_to_check = {1,2,3,4,5,6} -- all directions
end
local Shaft = tubelib2.Tube:new({
--dirs_to_check = {5,6}, -- vertical only
dirs_to_check = {1,2,3,4,5,6},
dirs_to_check = dirs_to_check,
max_tube_length = 1000,
show_infotext = true,
primary_node_names = {"hyperloop:shaft", "hyperloop:shaft2", "hyperloop:shaftA", "hyperloop:shaftA2"},
@ -284,7 +289,7 @@ local function update_elevator(pos, out_dir, peer_pos, peer_in_dir)
if out_dir == 6 then -- to the top?
-- switch to elevator_bottom node
pos = Shaft:get_pos(pos, 5)
else
elseif peer_pos then
local _,node = Shaft:get_node(peer_pos)
if node.name == "hyperloop:elevator_top" then
peer_pos = Shaft:get_pos(peer_pos, 5)

View File

@ -34,8 +34,8 @@
hyperloop = {}
-- Configuration settings
hyperloop.wifi_enabled = minetest.setting_get("hyperloop_wifi_enabled") or false
hyperloop.free_tube_placement_enabled = minetest.setting_get("hyperloop_free_tube_placement_enabled") or false
hyperloop.wifi_enabled = minetest.settings:get("hyperloop_wifi_enabled") or true
hyperloop.free_tube_placement_enabled = minetest.settings:get("hyperloop_free_tube_placement_enabled") or true
dofile(minetest.get_modpath("hyperloop") .. "/network.lua")

View File

@ -282,6 +282,8 @@ local function convert_elevator_data(tAllElevators)
["hyperloop:shaft2"] = true,
}
local originNodeNames = add_to_table(Shaft.primary_node_names, tLegacyNodeNames)
local originDirsToCheck = table.copy(Shaft.dirs_to_check)
Shaft.dirs_to_check = {5,6} -- legacy elevators use up/down only
for pos,tElevator in pairs(tAllElevators) do
for _,floor in pairs(tElevator.floors) do
@ -296,6 +298,7 @@ local function convert_elevator_data(tAllElevators)
end
Shaft.primary_node_names = originNodeNames
Shaft.dirs_to_check = originDirsToCheck
end

View File

@ -1,5 +1,5 @@
# Enable WiFi block for players (including recipe)
hyperloop_wifi_enabled (WiFi block enabled) bool false
hyperloop_wifi_enabled (WiFi block enabled) bool true
# Enable free tube placement with no level limitation.
# If disabled, connected stations have to be on one level,