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

* If statement restructured like suggested, seems to work fine;

Browse Source 
* Changed cooldown color to be same as the disabled one;
This commit is contained in:
bbassie
2020-11-17 23:35:14 +01:00
parent 94fa2bc8ea
commit c308aa8c21
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -387,14 +387,18 @@ local function update_icon_button(element, on_cooldown, warp, warp_player_is_on,
local label_style = element.parent.parent['name-'..warp.warp_id][warp_label.name].style local label_style = element.parent.parent['name-'..warp.warp_id][warp_label.name].style
if not warp_player_is_on and not bypass_warp_proximity then if not warp_player_is_on then
element.tooltip = {'warp-list.goto-disabled'} if bypass_warp_proximity then
element.enabled = false local position = warp.position
label_style.font_color = Colors.light_grey element.tooltip = {'warp-list.goto-bypass', position.x, position.y}
return element.enabled = true
end label_style.font_color = Colors.dark_turquoise
else
if warp_player_is_on and warp_player_is_on.warp_id == warp.warp_id then element.tooltip = {'warp-list.goto-disabled'}
element.enabled = false
label_style.font_color = Colors.light_grey
end
elseif warp_player_is_on and warp_player_is_on.warp_id == warp.warp_id then
element.tooltip = {'warp-list.goto-same-warp'} element.tooltip = {'warp-list.goto-same-warp'}
element.enabled = false element.enabled = false
label_style.font_color = Colors.light_grey label_style.font_color = Colors.light_grey
@@ -403,14 +407,6 @@ local function update_icon_button(element, on_cooldown, warp, warp_player_is_on,
element.enabled = false element.enabled = false
label_style.font_color = Colors.light_grey label_style.font_color = Colors.light_grey
else else
if not warp_player_is_on and bypass_warp_proximity then
local position = warp.position
element.tooltip = {'warp-list.goto-bypass', position.x, position.y}
element.enabled = true
label_style.font_color = Colors.dark_turquoise
return
end
-- Check if the warps are in the same electricity network
local warp_electric_network_id = warp.electric_pole and warp.electric_pole.electric_network_id or -1 local warp_electric_network_id = warp.electric_pole and warp.electric_pole.electric_network_id or -1
local player_warp_electric_network_id = warp_player_is_on.electric_pole and warp_player_is_on.electric_pole.electric_network_id or -2 local player_warp_electric_network_id = warp_player_is_on.electric_pole and warp_player_is_on.electric_pole.electric_network_id or -2
if warp_electric_network_id == player_warp_electric_network_id then if warp_electric_network_id == player_warp_electric_network_id then
@@ -418,14 +414,12 @@ local function update_icon_button(element, on_cooldown, warp, warp_player_is_on,
element.tooltip = {'warp-list.goto-tooltip', position.x, position.y} element.tooltip = {'warp-list.goto-tooltip', position.x, position.y}
element.enabled = true element.enabled = true
label_style.font_color = Colors.white label_style.font_color = Colors.white
elseif bypass_warp_proximity then
local position = warp.position
element.tooltip = {'warp-list.goto-bypass-different-network', position.x, position.y}
element.enabled = true
label_style.font_color = Colors.orange
else else
if bypass_warp_proximity then
local position = warp.position
element.tooltip = {'warp-list.goto-bypass-different-network', position.x, position.y}
element.enabled = true
label_style.font_color = Colors.orange
return
end
element.tooltip = {'warp-list.goto-different-network'} element.tooltip = {'warp-list.goto-different-network'}
element.enabled = false element.enabled = false
label_style.font_color = Colors.crimson label_style.font_color = Colors.crimson