diff --git a/config/_file_loader.lua b/config/_file_loader.lua index 35a07946..73be7622 100644 --- a/config/_file_loader.lua +++ b/config/_file_loader.lua @@ -48,6 +48,7 @@ return { 'modules.gui.warp-list', 'modules.gui.task-list', 'modules.gui.player-list', + 'modules.gui.server-ups', 'modules.commands.debug', -- Config Files 'config.expcore-commands.auth_admin', -- commands tagged with admin_only are blocked for non admins diff --git a/config/roles.lua b/config/roles.lua index ff40131f..22fba6e9 100644 --- a/config/roles.lua +++ b/config/roles.lua @@ -216,6 +216,7 @@ local default = Roles.new_role('Guest','') 'command/find-on-map', 'command/report', 'command/ratio', + 'command/server-ups', 'gui/player-list', 'gui/rocket-info', 'gui/science-info', diff --git a/locale/en/commands.cfg b/locale/en/commands.cfg index ab475d4b..4f25d450 100644 --- a/locale/en/commands.cfg +++ b/locale/en/commands.cfg @@ -74,3 +74,5 @@ home-set=Your home point has been set to x: __1__ y: __2__ return-set=Your return point has been set to x: __1__ y: __2__ home-get=Your home point is at x: __1__ y: __2__ +[expcom-server-ups] +no-ext=No external source was found, cannot display server ups. \ No newline at end of file diff --git a/modules/gui/server-ups.lua b/modules/gui/server-ups.lua new file mode 100644 index 00000000..cba75d89 --- /dev/null +++ b/modules/gui/server-ups.lua @@ -0,0 +1,64 @@ +--[[-- Gui Module - Server UPS + - Adds a server ups counter in the top right and a command to toggle is + @gui server-ups + @alias server_ups +]] + +local Gui = require 'expcore.gui' --- @dep expcore.gui +local Event = require 'utils.event' --- @dep utils.event +local Commands = require 'expcore.commands' --- @dep expcore.commands + +--- Label to show the server ups +-- @element server_ups +local server_ups = +Gui.element{ + type = 'label', + caption = 'Server UPS = 60.0' +} +:style{ + font = 'default-game' +} + +--- Toggles if the server ups is visbile +-- @command server-ups +Commands.new_command('server-ups','Toggle the server ups display') +:add_alias('sups','ups') +:register(function(player) + local label = player.gui.screen[server_ups.name] + if not global.ext or not global.ext.server_ups then + return Commands.error{'expcom-server-ups.no-ext'} + end + label.visible = not label.visible +end) + +-- Set the location of the label +-- 1920x1080: x=1455, y=30 (ui scale 100%) +local function set_location(event) + local player = game.players[event.player_index] + local label = player.gui.screen[server_ups.name] + local res = player.display_resolution + local uis = player.display_scale + label.location = { x=res.width-465*uis, y=30*uis } +end + +-- Draw the label when the player joins +Event.add(defines.events.on_player_created,function(event) + local player = game.players[event.player_index] + local label = server_ups(player.gui.screen) + label.visible = false + set_location(event) +end) + +-- Update the caption for all online players +Event.on_nth_tick(60,function() + if global.ext and global.ext.server_ups then + local caption = 'Server UPS = '..global.ext.server_ups + for _,player in pairs(game.connected_players) do + player.gui.screen[server_ups.name].caption = caption + end + end +end) + +-- Update when res or ui scale changes +Event.add(defines.events.on_player_display_resolution_changed,set_location) +Event.add(defines.events.on_player_display_scale_changed,set_location) \ No newline at end of file