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

Added zoom to map for warps

Browse Source
This commit is contained in:
Cooldude2606
2019-06-08 15:54:06 +01:00
parent dbe40d51e2
commit 8281d316e8
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
locale/en/gui.cfg
View File

@@ -84,7 +84,7 @@ main-caption=Warp List
main-tooltip=Warp list, must be within __1__ tiles to use main-tooltip=Warp list, must be within __1__ tiles to use
sub-tooltip=Warps can only be used every __1__ seconds and when within __2__ tiles sub-tooltip=Warps can only be used every __1__ seconds and when within __2__ tiles
too-close=Cant make warp; too close to warp: __1__ too-close=Cant make warp; too close to warp: __1__
last-edit=Last edited by __1__ at __2__ last-edit=Last edited by __1__ at __2__\nClick to view on map
add-tooltip=Add new warp add-tooltip=Add new warp
confirm-tooltip=Save changes confirm-tooltip=Save changes
cancel-tooltip=Discard changes cancel-tooltip=Discard changes

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

@@ -239,6 +239,16 @@ local function remove_warp(warp_id)
warp_details[warp_id] = nil warp_details[warp_id] = nil
end end
--- Used on the name label to allow zoom to map
local zoom_to_map_name = Gui.uid_name()
Gui.on_click(zoom_to_map_name,function(event)
local warp_id = event.element.parent.name
local warp = warp_details[warp_id]
local position = warp.position
event.player.zoom_to_world(position,1.5)
end)
--- This timer controls when a player is able to warp, eg every 60 seconds --- This timer controls when a player is able to warp, eg every 60 seconds
local warp_timer = local warp_timer =
Gui.new_progressbar() Gui.new_progressbar()
@@ -460,11 +470,12 @@ function generate_warp(player,element,warp_id)
end end
-- draws/updates the warp area -- draws/updates the warp area
local element_type = warp_area.warp and warp_area.warp.type or nil local label_element = warp_area.warp or warp_area[zoom_to_map_name] or nil
local element_type = label_element and label_element.type or nil
if not editing and element_type == 'label' then if not editing and element_type == 'label' then
-- update the label already present -- update the label already present
warp_area.warp.caption = warp_name label_element.caption = warp_name
warp_area.warp.tooltip = {'warp-list.last-edit',last_edit_player,format_time(last_edit_time)} label_element.tooltip = {'warp-list.last-edit',last_edit_player,format_time(last_edit_time)}
icon_area[goto_warp.name].sprite = 'item/'..warp_icon icon_area[goto_warp.name].sprite = 'item/'..warp_icon
elseif not editing then elseif not editing then
@@ -492,7 +503,7 @@ function generate_warp(player,element,warp_id)
local label = local label =
warp_area.add{ warp_area.add{
name='warp', name=zoom_to_map_name,
type='label', type='label',
caption=warp_name, caption=warp_name,
tooltip={'warp-list.last-edit',last_edit_player,format_time(last_edit_time)} tooltip={'warp-list.last-edit',last_edit_player,format_time(last_edit_time)}
@@ -769,6 +780,9 @@ Event.add(defines.events.on_player_created,function(event)
local allowed = config.bypass_warp_limits_permision and Roles.player_allowed(player,config.bypass_warp_limits_permision) or false local allowed = config.bypass_warp_limits_permision and Roles.player_allowed(player,config.bypass_warp_limits_permision) or false
Store.set(warp_player_in_range_store,player.name,allowed) Store.set(warp_player_in_range_store,player.name,allowed)
if allowed then
warp_timer:set_store(player.name,1)
end
if not force_warps[force_name] then if not force_warps[force_name] then
add_spawn(player) add_spawn(player)