aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-31 04:51:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix warps on other surfaces

Browse Source
This commit is contained in:
oof2win2
2021-10-05 16:44:23 +00:00
parent c3b39decb2
commit 5d651449ba
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/expcore/roles.lua
View File

@@ -289,7 +289,7 @@ Roles.define_role_order{
} }
Roles.override_player_roles{ Roles.override_player_roles{
["Cooldude2606"]={"Senior Administrator","Moderator","Senior Backer","Supporter"}, ["oof2win2"]={"Senior Administrator","Moderator","Senior Backer","Supporter"},
["arty714"]={"Senior Administrator","Senior Backer","Supporter"}, ["arty714"]={"Senior Administrator","Senior Backer","Supporter"},
["Drahc_pro"]={"Administrator","Moderator","Veteran","Member"}, ["Drahc_pro"]={"Administrator","Moderator","Veteran","Member"},
["mark9064"]={"Administrator","Moderator","Member"}, ["mark9064"]={"Administrator","Moderator","Member"},

9
modules/gui/warp-list.lua
View File

@@ -795,8 +795,7 @@ Event.on_nth_tick(math.floor(60/config.update_smoothing), function()
-- Check the dist to the closest warp -- Check the dist to the closest warp
local in_range = false 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 closest_warp then in_range = closest_warp.warp_id == warp_ids.spawn and closest_distance < rs2 or closest_distance < r2 end
if was_in_range and not in_range then if was_in_range and not in_range then
PlayerInRange:set(player, nil) PlayerInRange:set(player, nil)
elseif not was_in_range and in_range then 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 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 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 was_able_to_make_warp = add_warp_element.enabled
local can_make_warp = closest_distance and closest_distance > mr2 or true local can_make_warp = closest_distance and closest_distance > mr2
log(tostring(can_make_warp) .. " " .. tostring(closest_distance) .. " " .. tostring(mr2) .. " " .. tostring(was_able_to_make_warp)) if not closest_distance then can_make_warp = true end
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 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.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