mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2025-12-31 04:51:40 +09:00
Merge branch 'patch/6.0.10' into dev
This commit is contained in:
@@ -93,7 +93,9 @@ Permission_Groups.new_group('Guest')
|
|||||||
'use_artillery_remote',
|
'use_artillery_remote',
|
||||||
'launch_rocket',
|
'launch_rocket',
|
||||||
'cancel_research',
|
'cancel_research',
|
||||||
'activate_cut'
|
'activate_cut',
|
||||||
|
'flush_opened_entity_fluid',
|
||||||
|
'flush_opened_entity_specific_fluid'
|
||||||
}
|
}
|
||||||
|
|
||||||
Permission_Groups.new_group('Restricted')
|
Permission_Groups.new_group('Restricted')
|
||||||
|
|||||||
@@ -591,12 +591,13 @@ Event.on_nth_tick(math.floor(60/config.update_smoothing), function()
|
|||||||
-- Change the enabled state of the add warp button
|
-- Change the enabled state of the add warp button
|
||||||
local frame = Gui.get_left_element(player, warp_list_container)
|
local frame = Gui.get_left_element(player, warp_list_container)
|
||||||
local add_warp_element = frame.container.header.alignment[add_new_warp.name]
|
local add_warp_element = frame.container.header.alignment[add_new_warp.name]
|
||||||
|
local old_closest_warp_name = add_warp_element.tooltip[2] or closest_warp.name
|
||||||
local was_able_to_make_warp = add_warp_element.enabled
|
local was_able_to_make_warp = add_warp_element.enabled
|
||||||
local can_make_warp = closest_distance > mr2
|
local can_make_warp = closest_distance > mr2
|
||||||
if can_make_warp and not was_able_to_make_warp then
|
if can_make_warp and not was_able_to_make_warp then
|
||||||
add_warp_element.enabled = true
|
add_warp_element.enabled = true
|
||||||
add_warp_element.tooltip = {'warp-list.add-tooltip'}
|
add_warp_element.tooltip = {'warp-list.add-tooltip'}
|
||||||
elseif not can_make_warp and was_able_to_make_warp then
|
elseif not can_make_warp and was_able_to_make_warp or old_closest_warp_name ~= closest_warp.name then
|
||||||
add_warp_element.enabled = false
|
add_warp_element.enabled = false
|
||||||
add_warp_element.tooltip = {'warp-list.too-close', closest_warp.name}
|
add_warp_element.tooltip = {'warp-list.too-close', closest_warp.name}
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user