From 5d651449bad74c8165dc2f6bf12936204393269c Mon Sep 17 00:00:00 2001 From: oof2win2 Date: Tue, 5 Oct 2021 16:44:23 +0000 Subject: [PATCH] :bug: Fix warps on other surfaces --- config/expcore/roles.lua | 2 +- modules/gui/warp-list.lua | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/expcore/roles.lua b/config/expcore/roles.lua index 95b797bd..405efddb 100644 --- a/config/expcore/roles.lua +++ b/config/expcore/roles.lua @@ -289,7 +289,7 @@ Roles.define_role_order{ } Roles.override_player_roles{ - ["Cooldude2606"]={"Senior Administrator","Moderator","Senior Backer","Supporter"}, + ["oof2win2"]={"Senior Administrator","Moderator","Senior Backer","Supporter"}, ["arty714"]={"Senior Administrator","Senior Backer","Supporter"}, ["Drahc_pro"]={"Administrator","Moderator","Veteran","Member"}, ["mark9064"]={"Administrator","Moderator","Member"}, diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua index 9eb95125..2b72e786 100644 --- a/modules/gui/warp-list.lua +++ b/modules/gui/warp-list.lua @@ -795,8 +795,7 @@ Event.on_nth_tick(math.floor(60/config.update_smoothing), function() -- Check the dist to the closest warp - local in_range = false - if closest_warp then in_range = closest_warp.warp_id == warp_ids.spawn and closest_distance < rs2 or closest_distance < r2 end + local in_range = closest_warp and closest_warp.warp_id == warp_ids.spawn and closest_distance and (closest_distance < rs2 or closest_distance < r2) or false if was_in_range and not in_range then PlayerInRange:set(player, nil) elseif not was_in_range and in_range then @@ -808,12 +807,12 @@ Event.on_nth_tick(math.floor(60/config.update_smoothing), function() 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 and closest_warp.name local was_able_to_make_warp = add_warp_element.enabled - local can_make_warp = closest_distance and closest_distance > mr2 or true - log(tostring(can_make_warp) .. " " .. tostring(closest_distance) .. " " .. tostring(mr2) .. " " .. tostring(was_able_to_make_warp)) + local can_make_warp = closest_distance and closest_distance > mr2 + if not closest_distance then can_make_warp = true end if can_make_warp and not was_able_to_make_warp then add_warp_element.enabled = true add_warp_element.tooltip = {'warp-list.add-tooltip'} - elseif not can_make_warp and was_able_to_make_warp or closest_warp and old_closest_warp_name ~= closest_warp.name then + elseif not can_make_warp and was_able_to_make_warp or closest_warp and (old_closest_warp_name ~= closest_warp.name) then add_warp_element.enabled = false add_warp_element.tooltip = {'warp-list.too-close', closest_warp.name} end