| Commands-Parse |
This file contains some common command param parse functions;
this file is less of a config and more of a requirement but you may wish to change how some behave;
@@ -559,7 +563,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
- Last updated 2020-11-06 14:54:05 UTC
+ Last updated 2020-11-06 21:49:00 UTC
diff --git a/docs/modules/control.html b/docs/modules/control.html
index 0409a627..a60169e7 100644
--- a/docs/modules/control.html
+++ b/docs/modules/control.html
@@ -176,6 +176,7 @@
+
@@ -312,7 +313,7 @@
generated by LDoc
- Last updated 2020-11-06 14:54:05 UTC
+ Last updated 2020-11-06 21:49:00 UTC
diff --git a/docs/modules/modules.addons.station-auto-name.html b/docs/modules/modules.addons.station-auto-name.html
index 2fbb9015..f86d59f2 100644
--- a/docs/modules/modules.addons.station-auto-name.html
+++ b/docs/modules/modules.addons.station-auto-name.html
@@ -176,6 +176,7 @@
+
@@ -310,7 +311,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
- Last updated 2020-11-06 14:54:05 UTC
+ Last updated 2020-11-06 21:49:00 UTC
diff --git a/docs/modules/overrides.debug.html b/docs/modules/overrides.debug.html
index ae20bbc6..0c3a66f2 100644
--- a/docs/modules/overrides.debug.html
+++ b/docs/modules/overrides.debug.html
@@ -176,6 +176,7 @@
+
@@ -671,7 +672,7 @@
generated by LDoc
- Last updated 2020-11-06 14:54:05 UTC
+ Last updated 2020-11-06 21:49:00 UTC
diff --git a/docs/modules/overrides.math.html b/docs/modules/overrides.math.html
index 34caea5f..2b207e99 100644
--- a/docs/modules/overrides.math.html
+++ b/docs/modules/overrides.math.html
@@ -176,6 +176,7 @@
+
@@ -370,7 +371,7 @@
generated by LDoc
- Last updated 2020-11-06 14:54:05 UTC
+ Last updated 2020-11-06 21:49:00 UTC
diff --git a/docs/modules/overrides.table.html b/docs/modules/overrides.table.html
index 2a8f887f..73b24bb3 100644
--- a/docs/modules/overrides.table.html
+++ b/docs/modules/overrides.table.html
@@ -178,6 +178,7 @@
+
@@ -2025,7 +2026,7 @@
generated by LDoc
- Last updated 2020-11-06 14:54:05 UTC
+ Last updated 2020-11-06 21:49:00 UTC
diff --git a/docs/modules/utils.event.html b/docs/modules/utils.event.html
index 158c1971..fd72eb6a 100644
--- a/docs/modules/utils.event.html
+++ b/docs/modules/utils.event.html
@@ -177,6 +177,7 @@
+
@@ -1309,7 +1310,7 @@
generated by LDoc
- Last updated 2020-11-06 14:54:05 UTC
+ Last updated 2020-11-06 21:49:00 UTC
diff --git a/docs/modules/utils.event_core.html b/docs/modules/utils.event_core.html
index e1a26f1a..3b35157a 100644
--- a/docs/modules/utils.event_core.html
+++ b/docs/modules/utils.event_core.html
@@ -176,6 +176,7 @@
+
@@ -451,7 +452,7 @@
generated by LDoc
- Last updated 2020-11-06 14:54:05 UTC
+ Last updated 2020-11-06 21:49:00 UTC
diff --git a/docs/modules/utils.task.html b/docs/modules/utils.task.html
index e45c32a1..e4de0bdd 100644
--- a/docs/modules/utils.task.html
+++ b/docs/modules/utils.task.html
@@ -177,6 +177,7 @@
+
@@ -668,7 +669,7 @@
generated by LDoc
- Last updated 2020-11-06 14:54:05 UTC
+ Last updated 2020-11-06 21:49:00 UTC
diff --git a/docs/topics/LICENSE.html b/docs/topics/LICENSE.html
index 880a10fc..aa98760a 100644
--- a/docs/topics/LICENSE.html
+++ b/docs/topics/LICENSE.html
@@ -162,6 +162,7 @@
+
@@ -806,7 +807,7 @@ Public License instead of this License. But first, please read
generated by LDoc
- Last updated 2020-11-06 14:54:05 UTC
+ Last updated 2020-11-06 21:49:00 UTC
diff --git a/docs/topics/README.md.html b/docs/topics/README.md.html
index bf888dcd..d8402f86 100644
--- a/docs/topics/README.md.html
+++ b/docs/topics/README.md.html
@@ -162,6 +162,7 @@
+
@@ -361,7 +362,7 @@ Please report these errors to [the issues page](issues).
generated by LDoc
- Last updated 2020-11-06 14:54:05 UTC
+ Last updated 2020-11-06 21:49:00 UTC
From bd59342497109cd3e99426b147a810e2f6762562 Mon Sep 17 00:00:00 2001
From: badgamernl
Date: Sat, 7 Nov 2020 00:42:34 +0100
Subject: [PATCH 047/187] Changed choose_elem from item type to signal
---
config/gui/warps.lua | 2 +-
modules/control/warps.lua | 22 ++++++++++++----------
modules/gui/warp-list.lua | 24 ++++++++++++++++++------
3 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/config/gui/warps.lua b/config/gui/warps.lua
index 3e8b272b..98e8f627 100644
--- a/config/gui/warps.lua
+++ b/config/gui/warps.lua
@@ -5,7 +5,7 @@ return {
-- General config
update_smoothing = 10, --- @setting update_smoothing the amount of smoothing applied to updates to the cooldown timer, higher is better, max is 60
minimum_distance = 100, --- @setting minimum_distance the minimum distance that is allowed between warps on the same force
- default_icon = 'discharge-defense-equipment', --- @setting default_icon the default icon that will be used for warps
+ default_icon = { type = 'item', name = 'discharge-defense-equipment' }, --- @setting default_icon the default icon that will be used for warps
-- Warp cooldowns
bypass_warp_cooldown = 'expcore.roles', --- @setting bypass_warp_cooldown dictates who the warp cooldown is applied to; values: all, admin, expcore.roles, none
diff --git a/modules/control/warps.lua b/modules/control/warps.lua
index b846460a..27dae30a 100644
--- a/modules/control/warps.lua
+++ b/modules/control/warps.lua
@@ -90,7 +90,7 @@ function Warps.make_warp_tag(warp_id)
local tag = warp.tag
if tag and tag.valid then
tag.text = 'Warp: '..name
- tag.icon = {type='item', name=icon}
+ tag.icon = icon
return false
end
@@ -102,7 +102,7 @@ function Warps.make_warp_tag(warp_id)
tag = force.add_chart_tag(surface, {
position = {position.x+0.5, position.y+0.5},
text = 'Warp: '..name,
- icon = {type='item', name=icon}
+ icon = icon
})
-- Add the tag to this warp, store.update not needed as we dont want it to trigger
@@ -221,15 +221,17 @@ function Warps.remove_warp_area(warp_id)
end
surface.set_tiles(tiles)
- -- Remove all the entities that are in the area
- local entities = surface.find_entities_filtered{
- force='neutral',
- area={
- {position.x-radius, position.y-radius},
- {position.x+radius, position.y+radius}
- }
+ local area = {
+ {position.x-radius, position.y-radius},
+ {position.x+radius, position.y+radius}
}
+
+ -- Remove all the entities that are in the area
+ local entities = surface.find_entities_filtered{ force='neutral', area=area }
for _, entity in pairs(entities) do if entity and entity.valid and entity.name ~= 'player' then entity.destroy() end end
+
+ -- Rechart map area, usefull if warp is not covered by a radar
+ game.forces[warp.force_name].chart(surface, area)
end
--[[-- Set a warp to be the spawn point for a force, force must own this warp
@@ -323,7 +325,7 @@ function Warps.add_warp(force_name, surface, position, player_name, warp_name)
warp_id = warp_id,
force_name = force_name,
name = warp_name,
- icon = config.default_icon,
+ icon = { type = config.default_icon.type, name = config.default_icon.name },
surface = surface,
position = {
x = math.floor(position.x),
diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua
index 88979247..699b46f0 100644
--- a/modules/gui/warp-list.lua
+++ b/modules/gui/warp-list.lua
@@ -249,11 +249,18 @@ local update_wrap_buttons
warp_icon_button =
Gui.element(function(event_trigger, parent, warp)
local warp_position = warp.position
+
+ -- The SpritePath type is not the same as the SignalID type
+ local sprite = warp.icon.type .. '/' ..warp.icon.name
+ if warp.icon.type == 'virtual' then
+ sprite = 'virtual-signal/' ..warp.icon.name
+ end
+
-- Draw the element
return parent.add{
name = event_trigger,
type = 'sprite-button',
- sprite = 'item/'..warp.icon,
+ sprite = sprite,
tooltip = {'warp-list.goto-tooltip', warp_position.x, warp_position.y},
style = 'slot_button'
}
@@ -278,9 +285,9 @@ Gui.element(function(_, parent, warp)
return parent.add{
name = warp_icon_button.name,
type = 'choose-elem-button',
- elem_type = 'item',
- item = warp.icon,
- tooltip = {'warp-list.goto-edit'},
+ elem_type = 'signal',
+ signal = {type = warp.icon.type, name = warp.icon.name},
+ tooltip = {'warp-list.goto-edit'}
}
end)
:style(Styles.sprite32)
@@ -373,7 +380,12 @@ local function update_warp(player, warp_table, warp_id)
local last_edit_time = warp.last_edit_time
warp_label_element.caption = warp_name
warp_label_element.tooltip = {'warp-list.last-edit', last_edit_name, format_time(last_edit_time)}
- icon_entry.sprite = 'item/'..warp_icon
+ -- The SpritePath type is not the same as the SignalID type
+ local sprite = warp_icon.type .. '/' ..warp_icon.name
+ if warp_icon.type == 'virtual' then
+ sprite = 'virtual-signal/' ..warp_icon.name
+ end
+ icon_entry.sprite = sprite
elseif player_was_editing and not player_is_editing then
-- Player was editing but is no longer, remove text field and add label
@@ -475,7 +487,7 @@ end)
--- Button on the top flow used to toggle the warp list container
-- @element warp_list_toggle
-Gui.left_toolbar_button('item/'..config.default_icon, {'warp-list.main-tooltip', config.standard_proximity_radius}, warp_list_container, function(player)
+Gui.left_toolbar_button(config.default_icon.type ..'/'..config.default_icon.name, {'warp-list.main-tooltip', config.standard_proximity_radius}, warp_list_container, function(player)
return Roles.player_allowed(player, 'gui/warp-list')
end)
:on_custom_event(Gui.events.on_visibility_changed_by_click, function(player, _,event)
From e8dd5cedea896e346e94fcd7f95c1f0453c55ea6 Mon Sep 17 00:00:00 2001
From: badgamernl
Date: Sat, 7 Nov 2020 00:50:31 +0100
Subject: [PATCH 048/187] Fixed the part that removes the ghost train staton
key
---
modules/addons/station-auto-name.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/addons/station-auto-name.lua b/modules/addons/station-auto-name.lua
index 15a9f21b..eddd4ed0 100644
--- a/modules/addons/station-auto-name.lua
+++ b/modules/addons/station-auto-name.lua
@@ -40,7 +40,7 @@ local function station_name_changer(event)
elseif name == "train-stop" then --only do the event if its a train stop
local backername = entity.backer_name
if backername:sub(-custom_string_len) == custom_string then
- entity.backer_name = backername:sub(1, -custom_string_len)
+ entity.backer_name = backername:sub(1, -custom_string_len-1)
return
end
From 294766714a9a46d0a3ade300aa65bf02785486fb Mon Sep 17 00:00:00 2001
From: badgamernl
Date: Sat, 7 Nov 2020 01:10:11 +0100
Subject: [PATCH 049/187] Removed Temp ban related stuff
---
config/discord_alerts.lua | 1 -
config/expcore/roles.lua | 2 -
config/gui/player_list_actions.lua | 24 --------
locale/en/commands.cfg | 4 --
locale/en/gui.cfg | 1 -
modules/addons/discord-alerts.lua | 26 --------
modules/commands/jail.lua | 37 +-----------
modules/control/jail.lua | 96 +-----------------------------
8 files changed, 4 insertions(+), 187 deletions(-)
diff --git a/config/discord_alerts.lua b/config/discord_alerts.lua
index dc9c48c4..1890aa4b 100644
--- a/config/discord_alerts.lua
+++ b/config/discord_alerts.lua
@@ -9,7 +9,6 @@ return {
player_kicks=true,
player_promotes=false,
player_jail=true,
- player_temp_ban=true,
['config']=true,
['purge']=true,
['c']=true,
diff --git a/config/expcore/roles.lua b/config/expcore/roles.lua
index e28ac848..baad6f93 100644
--- a/config/expcore/roles.lua
+++ b/config/expcore/roles.lua
@@ -71,7 +71,6 @@ Roles.new_role('Moderator','Mod')
'command/go-to-spawn/always',
'command/clear-reports',
'command/clear-warnings',
- 'command/clear-temp-ban',
'command/clear-inventory',
'command/bonus',
'command/home',
@@ -96,7 +95,6 @@ Roles.new_role('Trainee','TrMod')
'command/teleport',
'command/bring',
'command/goto',
- 'command/temp-ban',
'command/give-warning',
'command/get-warnings',
'command/get-reports',
diff --git a/config/gui/player_list_actions.lua b/config/gui/player_list_actions.lua
index 2d956e94..508dacd3 100644
--- a/config/gui/player_list_actions.lua
+++ b/config/gui/player_list_actions.lua
@@ -150,25 +150,6 @@ local function jail_player_callback(player,reason)
Jail.jail_player(selected_player_name,player.name,reason)
end
---- Temp bans the action player, requires a reason
--- @element temp_ban_player
-local temp_ban_player = new_button('utility/warning_white',{'player-list.temp-ban-player'})
-:on_click(function(player)
- local selected_player_name, selected_player_color = get_action_player_name(player)
- if Jail.is_jailed(selected_player_name) then
- player.print({'expcom-jail.already-banned', selected_player_color},Colors.orange_red)
- else
- SelectedAction:set(player, 'command/temp-ban')
- end
-end)
-
-local function temp_ban_player_callback(player,reason)
- local selected_player, selected_player_color = get_action_player_name(player)
- local by_player_name_color = format_chat_player_name(player)
- game.print{'expcom-jail.temp-ban', selected_player_color,by_player_name_color,reason}
- Jail.temp_ban_player(selected_player,player.name,reason)
-end
-
--- Kicks the action player, requires a reason
-- @element kick_player
local kick_player = new_button('utility/warning_icon',{'player-list.kick-player'})
@@ -232,11 +213,6 @@ return {
reason_callback=jail_player_callback,
jail_player
},
- ['command/temp-ban'] = {
- auth=auth_lower_role,
- reason_callback=temp_ban_player_callback,
- temp_ban_player
- },
['command/kick'] = {
auth=auth_lower_role,
reason_callback=kick_player_callback,
diff --git a/locale/en/commands.cfg b/locale/en/commands.cfg
index 6c9fb44f..57f7754c 100644
--- a/locale/en/commands.cfg
+++ b/locale/en/commands.cfg
@@ -26,10 +26,6 @@ give=__1__ was jailed by __2__. Reason: __3__
remove=__1__ was unjailed by __2__.
already-jailed=__1__ is already in jail.
not-jailed=__1__ is not currently in jail.
-temp-ban=__1__ was temp banned until next reset by __2__. Reason: __3__
-temp-ban-clear=__1__ was cleared from temp banned by __2__.
-not-temp-banned=__1__ is not currently temp banned.
-already-banned=__1__ is already banned.
[expcom-report]
player-immune=This player can not be reported.
diff --git a/locale/en/gui.cfg b/locale/en/gui.cfg
index e4fa8611..09583413 100644
--- a/locale/en/gui.cfg
+++ b/locale/en/gui.cfg
@@ -10,7 +10,6 @@ kill-player=Kill player
report-player=Report player
warn-player=Warn player
jail-player=Jail player
-temp-ban-player=Temp ban player
kick-player=Kick player
ban-player=Ban player
afk-time=__1__% of total map time\nLast moved __2__ ago
diff --git a/modules/addons/discord-alerts.lua b/modules/addons/discord-alerts.lua
index 27b89ad9..fbeabf8a 100644
--- a/modules/addons/discord-alerts.lua
+++ b/modules/addons/discord-alerts.lua
@@ -158,32 +158,6 @@ if config.player_jail then
end)
end
---- When a player is tempbanned
-if config.player_temp_ban then
- local Jail = require 'modules.control.jail'
- Event.add(Jail.events.on_player_temp_banned, function(event)
- local player_name, by_player_name = get_player_name(event)
- emit_event{
- title='Temp Ban',
- description='A player has been temp banned',
- color=Colors.red,
- ['Player']=''..player_name,
- ['By']=''..by_player_name,
- ['Reason']=event.reason
- }
- end)
- Event.add(Jail.events.on_player_untemp_banned, function(event)
- local player_name, by_player_name = get_player_name(event)
- emit_event{
- title='Temp Ban Removed',
- description='A player has been untemp banned',
- color=Colors.green,
- ['Player']=''..player_name,
- ['By']=''..by_player_name
- }
- end)
-end
-
--- Ban and unban
if config.player_bans then
Event.add(defines.events.on_player_banned, function(event)
diff --git a/modules/commands/jail.lua b/modules/commands/jail.lua
index 98941616..a68553dc 100644
--- a/modules/commands/jail.lua
+++ b/modules/commands/jail.lua
@@ -1,5 +1,5 @@
--[[-- Commands Module - Jail
- - Adds a commands that allow admins to jail, unjail, and temp ban players
+ - Adds a commands that allow admins to jail and unjail
@commands Jail
]]
@@ -45,38 +45,3 @@ Commands.new_command('unjail', 'Removes a player from jail.')
return Commands.error{'expcom-jail.not-jailed', action_player_name_color}
end
end)
-
---- Temp bans a player until the next reset; this requires a reason; this will clear the players inventory.
--- @command temp-ban
--- @tparam LuaPlayer player the player that will be temp banned
--- @tparam string reason the reason that the player is being temp banned
-Commands.new_command('temp-ban', 'Temp bans a player until the next reset; this requires a reason; this will clear the players inventory.')
-:add_param('player', false, 'player-role')
-:add_param('reason', false)
-:enable_auto_concat()
-:register(function(player, action_player, reason)
- local action_player_name_color = format_chat_player_name(action_player)
- local by_player_name_color = format_chat_player_name(player)
- if Jail.temp_ban_player(action_player, player.name, reason) then
- game.print{'expcom-jail.temp-ban', action_player_name_color, by_player_name_color, reason}
- else
- return Commands.error{'expcom-jail.already-banned', action_player_name_color}
- end
-end)
-
---- Removes temp ban from a player; this will not restore their items.
--- @command clear-temp-ban
--- @tparam LuaPlayer player the player to revoke the temp ban from
-Commands.new_command('clear-temp-ban', 'Removes temp ban from a player; this will not restore their items.')
-:add_param('player', false, 'player-role')
-:add_alias('untemp-ban', 'remove-temp-ban')
-:enable_auto_concat()
-:register(function(player, action_player)
- local action_player_name_color = format_chat_player_name(action_player)
- local by_player_name_color = format_chat_player_name(player)
- if Jail.untemp_ban_player(action_player, player.name) then
- game.print{'expcom-jail.temp-ban-clear', action_player_name_color, by_player_name_color}
- else
- return Commands.error{'expcom-jail.not-temp-banned', action_player_name_color}
- end
-end)
diff --git a/modules/control/jail.lua b/modules/control/jail.lua
index df46f9ce..6e2ca00f 100644
--- a/modules/control/jail.lua
+++ b/modules/control/jail.lua
@@ -1,5 +1,5 @@
--[[-- Control Module - Jail
- - Adds a way to jail players and temp ban players.
+ - Adds a way to jail players.
@control Jail
@alias Jail
@@ -14,16 +14,11 @@
-- This will give 'MrBiter' all his roles back and remove him from jail
-- again as above the player name is only used in the event for user feedback
Jail.unjail_player('MrBiter', 'Cooldude2606')
-
- -- Temp ban works the same as jail but will store the reason and move the players items to spawn
- -- this is meant to be used as a more permiment jail but not as strong as a ban
- Jail.temp_ban_player('MrBiter', 'Cooldude2606', 'Likes biters too much')
]]
local Roles = require 'expcore.roles' --- @dep expcore.roles
local Game = require 'utils.game' --- @dep utils.game
local Global = require 'utils.global' --- @dep utils.global
-local move_items = _C.move_items --- @dep expcore.common
local valid_player = Game.get_player_from_any
local assign_roles = Roles.assign_player
@@ -33,7 +28,6 @@ local get_roles = Roles.get_player_roles
local Jail = {
old_roles = {},
- temp_bans = {},
events = {
--- When a player is assigned to jail
-- @event on_player_jailed
@@ -46,37 +40,22 @@ local Jail = {
-- @tparam number player_index the index of the player who was unjailed
-- @tparam string by_player_name the name of the player who unjailed the other player
on_player_unjailed=script.generate_event_name(),
- --- When a player is temp banned
- -- @event on_player_temp_banned
- -- @tparam number player_index the index of the player who was temp banned
- -- @tparam string by_player_name the name of the player who temp banned the other player
- -- @tparam string reason the reason that the player was temp banned
- on_player_temp_banned=script.generate_event_name(),
- --- When a temp ban is removed from a player
- -- @event on_player_untemp_banned
- -- @tparam number player_index the index of the player who was untemp banned
- -- @tparam string by_player_name the name of the player who untemp banned the other player
- on_player_untemp_banned=script.generate_event_name()
}
}
local old_roles = Jail.old_roles
-local temp_bans = Jail.temp_bans
Global.register({
- old_roles = old_roles,
- temp_bans = temp_bans
+ old_roles = old_roles
}, function(tbl)
Jail.old_roles = tbl.old_roles
- Jail.temp_bans = tbl.temp_bans
old_roles = Jail.old_roles
- temp_bans = Jail.temp_bans
end)
--- Used to emit the jail related events
-- @tparam number event the name of the event that will be emited
-- @tparam LuaPlayer player the player who is being acted on
-- @tparam string by_player_name the player who is doing the action
--- @tparam string reason the reason for the action (jail and tempban only)
+-- @tparam string reason the reason for the action (jail)
local function event_emit(event, player, by_player_name, reason)
script.raise_event(event, {
name=event,
@@ -142,73 +121,4 @@ function Jail.unjail_player(player, by_player_name)
return true
end
---- Temp ban.
--- Functions related to temp ban
--- @section temp-ban-functions
-
---- Checks if a player is temp banned
--- @tparam LuaPlayer player the player to check if they are temp banned
--- @treturn boolean whether the player is temp banned
-function Jail.is_temp_banned(player)
- player = valid_player(player)
- if not player then return end
- return temp_bans[player.name] ~= nil
-end
-
---- Temp bans a player by moving them to jail, clearing all other roles, storing the reason, and moving their items to spawn
--- @tparam LuaPlayer player the player that will be temp banned
--- @tparam string by_player_name the name of the player who is doing the temp ban
--- @tparam[opt='Non given.'] string reason the reason that the player is being temp banned
--- @treturn boolean whether the player was successfully temp banned
-function Jail.temp_ban_player(player, by_player_name, reason)
- player = valid_player(player)
- if not player then return end
- if not by_player_name then return end
-
- reason = reason or 'Non given.'
-
- if temp_bans[player.name] then return end
- temp_bans[player.name] = {reason, by_player_name}
-
- if not has_role(player, 'Jail') then
- local roles = get_roles(player)
- old_roles[player.name] = roles
-
- assign_roles(player, 'Jail', by_player_name, nil, true)
- unassign_roles(player, roles, by_player_name, nil, true)
- end
-
- local inv = player.get_main_inventory()
- move_items(inv.get_contents())
- inv.clear()
-
- event_emit(Jail.events.on_player_temp_banned, player, by_player_name, reason)
-
- return true
-end
-
---- Rrmoves a player from temp ban by clearing the stored reason, removing them from jail, and restoring previous roles
--- @tparam LuaPlayer player the player who is being removed from temp ban
--- @tparam string by_player_name the name of the player who is doing the untemp ban
--- @treturn boolean whether the player was successfully removed
-function Jail.untemp_ban_player(player, by_player_name)
- player = valid_player(player)
- if not player then return end
- if not by_player_name then return end
-
- if not temp_bans[player.name] then return end
- temp_bans[player.name] = nil
-
- if has_role(player, 'Jail') then
- local roles = old_roles[player.name]
-
- assign_roles(player, roles, by_player_name, nil, true)
- unassign_roles(player, 'Jail', by_player_name, nil, true)
- end
-
- event_emit(Jail.events.on_player_untemp_banned, player, by_player_name)
-
- return true
-end
-
return Jail
\ No newline at end of file
From 05b5b109f11f4b4f645ce0635c9933a9bec8361d Mon Sep 17 00:00:00 2001
From: badgamernl
Date: Sat, 7 Nov 2020 00:59:33 +0100
Subject: [PATCH 050/187] Removed kill button from playerlist actions
---
config/gui/player_list_actions.lua | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/config/gui/player_list_actions.lua b/config/gui/player_list_actions.lua
index 2d956e94..54fd7c79 100644
--- a/config/gui/player_list_actions.lua
+++ b/config/gui/player_list_actions.lua
@@ -84,19 +84,6 @@ local bring_player = new_button('utility/import',{'player-list.bring-player'})
end
end)
---- Kills the action player, if there are alive
--- @element kill_player
-local kill_player = new_button('utility/too_far',{'player-list.kill-player'})
-:on_click(function(player)
- local selected_player_name = get_action_player_name(player)
- local selected_player = game.players[selected_player_name]
- if selected_player.character then
- selected_player.character.die()
- else
- player.print({'expcom-kill.already-dead'},Colors.orange_red)
- end
-end)
-
--- Reports the action player, requires a reason to be given
-- @element report_player
local report_player = new_button('utility/spawn_flag',{'player-list.report-player'})
@@ -203,16 +190,6 @@ return {
goto_player,
bring_player
},
- ['command/kill'] = {
- auth=function(player,selected_player)
- if player.name == selected_player.name then
- return true
- elseif Roles.player_allowed(player,'command/kill/always') then
- return auth_lower_role(player,selected_player)
- end
- end, -- player must be lower role, or your self
- kill_player
- },
['command/report'] = {
auth=function(player,selected_player)
if not Roles.player_allowed(player,'command/give-warning') then
From c4cc626f2bcca45f64928018c848b4fdaa2cb3b7 Mon Sep 17 00:00:00 2001
From: badgamernl
Date: Sat, 7 Nov 2020 01:14:03 +0100
Subject: [PATCH 051/187] Removed gui locales
---
locale/en/gui.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/locale/en/gui.cfg b/locale/en/gui.cfg
index e4fa8611..07f347ac 100644
--- a/locale/en/gui.cfg
+++ b/locale/en/gui.cfg
@@ -6,7 +6,6 @@ reason-confirm=Confirm Reason
reason-entry=Enter Reason
goto-player=Goto player
bring-player=Bring player
-kill-player=Kill player
report-player=Report player
warn-player=Warn player
jail-player=Jail player
From 8797f4da19331877aa9dff01352a5be7359096bd Mon Sep 17 00:00:00 2001
From: Cooldude2606
Date: Sat, 7 Nov 2020 00:25:10 +0000
Subject: [PATCH 052/187] Automatic Doc Update
---
docs/addons/Advanced-Start.html | 2 +-
docs/addons/Chat-Popups.html | 2 +-
docs/addons/Chat-Reply.html | 2 +-
docs/addons/Compilatron.html | 2 +-
docs/addons/Damage-Popups.html | 2 +-
docs/addons/Death-Logger.html | 2 +-
docs/addons/Discord-Alerts.html | 2 +-
docs/addons/Inventory-Clear.html | 2 +-
docs/addons/Pollution-Grading.html | 2 +-
docs/addons/Scorched-Earth.html | 2 +-
docs/addons/Spawn-Area.html | 2 +-
docs/addons/Tree-Decon.html | 2 +-
docs/commands/Admin-Chat.html | 2 +-
docs/commands/Cheat-Mode.html | 2 +-
docs/commands/Clear-Inventory.html | 2 +-
docs/commands/Connect.html | 2 +-
docs/commands/Debug.html | 2 +-
docs/commands/Find.html | 2 +-
docs/commands/Help.html | 2 +-
docs/commands/Home.html | 2 +-
docs/commands/Interface.html | 2 +-
docs/commands/Jail.html | 2 +-
docs/commands/Kill.html | 2 +-
docs/commands/Me.html | 2 +-
docs/commands/Rainbow.html | 2 +-
docs/commands/Repair.html | 2 +-
docs/commands/Reports.html | 2 +-
docs/commands/Roles.html | 2 +-
docs/commands/Spawn.html | 2 +-
docs/commands/Teleport.html | 2 +-
docs/commands/Warnings.html | 2 +-
docs/configs/Advanced-Start.html | 2 +-
docs/configs/Autofill.html | 2 +-
docs/configs/Bonuses.html | 2 +-
docs/configs/Chat-Reply.html | 2 +-
docs/configs/Commands-Auth-Admin.html | 2 +-
docs/configs/Commands-Auth-Roles.html | 2 +-
docs/configs/Commands-Auth-Runtime-Disable.html | 2 +-
docs/configs/Commands-Color-Parse.html | 2 +-
docs/configs/Commands-Parse-Roles.html | 2 +-
docs/configs/Commands-Parse.html | 2 +-
docs/configs/Compilatron.html | 2 +-
docs/configs/Death-Logger.html | 2 +-
docs/configs/Discord-Alerts.html | 2 +-
docs/configs/File-Loader.html | 2 +-
docs/configs/Permission-Groups.html | 2 +-
docs/configs/Player-List.html | 2 +-
docs/configs/Pollution-Grading.html | 2 +-
docs/configs/Popup-Messages.html | 2 +-
docs/configs/Preset-Player-Colours.html | 2 +-
docs/configs/Preset-Player-Quickbar.html | 2 +-
docs/configs/Repair.html | 2 +-
docs/configs/Rockets.html | 2 +-
docs/configs/Roles.html | 2 +-
docs/configs/Science.html | 2 +-
docs/configs/Scorched-Earth.html | 2 +-
docs/configs/Spawn-Area.html | 2 +-
docs/configs/Statistics.html | 2 +-
docs/configs/Tasks.html | 2 +-
docs/configs/Warnings.html | 2 +-
docs/configs/Warps.html | 2 +-
docs/configs/inventory_clear.html | 2 +-
docs/control/Jail.html | 2 +-
docs/control/Production.html | 2 +-
docs/control/Reports.html | 2 +-
docs/control/Rockets.html | 2 +-
docs/control/Tasks.html | 2 +-
docs/control/Warnings.html | 2 +-
docs/control/Warps.html | 2 +-
docs/core/Async.html | 2 +-
docs/core/Commands.html | 2 +-
docs/core/Common.html | 2 +-
docs/core/Datastore.html | 2 +-
docs/core/External.html | 2 +-
docs/core/Groups.html | 2 +-
docs/core/Gui.html | 2 +-
docs/core/PlayerData.html | 2 +-
docs/core/Roles.html | 2 +-
docs/data/Alt-View.html | 2 +-
docs/data/Bonus.html | 2 +-
docs/data/Greetings.html | 2 +-
docs/data/Player-Colours.html | 2 +-
docs/data/Quickbar.html | 2 +-
docs/data/Tag.html | 2 +-
docs/guis/Autofill.html | 2 +-
docs/guis/Player-List.html | 2 +-
docs/guis/Readme.html | 2 +-
docs/guis/Rocket-Info.html | 2 +-
docs/guis/Science-Info.html | 2 +-
docs/guis/Task-List.html | 2 +-
docs/guis/Warps-List.html | 2 +-
docs/guis/server-ups.html | 2 +-
docs/index.html | 2 +-
docs/modules/control.html | 2 +-
docs/modules/modules.addons.station-auto-name.html | 2 +-
docs/modules/overrides.debug.html | 2 +-
docs/modules/overrides.math.html | 2 +-
docs/modules/overrides.table.html | 2 +-
docs/modules/utils.event.html | 2 +-
docs/modules/utils.event_core.html | 2 +-
docs/modules/utils.task.html | 2 +-
docs/topics/LICENSE.html | 2 +-
docs/topics/README.md.html | 2 +-
103 files changed, 103 insertions(+), 103 deletions(-)
diff --git a/docs/addons/Advanced-Start.html b/docs/addons/Advanced-Start.html
index ef034504..608e173c 100644
--- a/docs/addons/Advanced-Start.html
+++ b/docs/addons/Advanced-Start.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/addons/Chat-Popups.html b/docs/addons/Chat-Popups.html
index b3d569f7..25428842 100644
--- a/docs/addons/Chat-Popups.html
+++ b/docs/addons/Chat-Popups.html
@@ -367,7 +367,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/addons/Chat-Reply.html b/docs/addons/Chat-Reply.html
index 3b1e91c3..7e9898b4 100644
--- a/docs/addons/Chat-Reply.html
+++ b/docs/addons/Chat-Reply.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/addons/Compilatron.html b/docs/addons/Compilatron.html
index aa186983..512f4ba8 100644
--- a/docs/addons/Compilatron.html
+++ b/docs/addons/Compilatron.html
@@ -575,7 +575,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/addons/Damage-Popups.html b/docs/addons/Damage-Popups.html
index 37a90bb8..6b1085f6 100644
--- a/docs/addons/Damage-Popups.html
+++ b/docs/addons/Damage-Popups.html
@@ -367,7 +367,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/addons/Death-Logger.html b/docs/addons/Death-Logger.html
index a5fee87c..ae8b3ffa 100644
--- a/docs/addons/Death-Logger.html
+++ b/docs/addons/Death-Logger.html
@@ -394,7 +394,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/addons/Discord-Alerts.html b/docs/addons/Discord-Alerts.html
index 7c54bd10..d4d39f99 100644
--- a/docs/addons/Discord-Alerts.html
+++ b/docs/addons/Discord-Alerts.html
@@ -450,7 +450,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/addons/Inventory-Clear.html b/docs/addons/Inventory-Clear.html
index 09249095..fc37972e 100644
--- a/docs/addons/Inventory-Clear.html
+++ b/docs/addons/Inventory-Clear.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/addons/Pollution-Grading.html b/docs/addons/Pollution-Grading.html
index 6277c302..f2a3d723 100644
--- a/docs/addons/Pollution-Grading.html
+++ b/docs/addons/Pollution-Grading.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/addons/Scorched-Earth.html b/docs/addons/Scorched-Earth.html
index 471e6693..aeba007d 100644
--- a/docs/addons/Scorched-Earth.html
+++ b/docs/addons/Scorched-Earth.html
@@ -394,7 +394,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/addons/Spawn-Area.html b/docs/addons/Spawn-Area.html
index 154eea08..730660d6 100644
--- a/docs/addons/Spawn-Area.html
+++ b/docs/addons/Spawn-Area.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/addons/Tree-Decon.html b/docs/addons/Tree-Decon.html
index a9488c51..75464bfc 100644
--- a/docs/addons/Tree-Decon.html
+++ b/docs/addons/Tree-Decon.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Admin-Chat.html b/docs/commands/Admin-Chat.html
index 3081d66f..25449c05 100644
--- a/docs/commands/Admin-Chat.html
+++ b/docs/commands/Admin-Chat.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Cheat-Mode.html b/docs/commands/Cheat-Mode.html
index 1d01e379..6b689bdf 100644
--- a/docs/commands/Cheat-Mode.html
+++ b/docs/commands/Cheat-Mode.html
@@ -379,7 +379,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Clear-Inventory.html b/docs/commands/Clear-Inventory.html
index 1fca18c0..1ab0ed04 100644
--- a/docs/commands/Clear-Inventory.html
+++ b/docs/commands/Clear-Inventory.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Connect.html b/docs/commands/Connect.html
index 6c8ff581..b25fb597 100644
--- a/docs/commands/Connect.html
+++ b/docs/commands/Connect.html
@@ -609,7 +609,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Debug.html b/docs/commands/Debug.html
index e202f6fa..dd79b7d8 100644
--- a/docs/commands/Debug.html
+++ b/docs/commands/Debug.html
@@ -383,7 +383,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Find.html b/docs/commands/Find.html
index b61a8705..dc295430 100644
--- a/docs/commands/Find.html
+++ b/docs/commands/Find.html
@@ -378,7 +378,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Help.html b/docs/commands/Help.html
index c4325099..abcffe9f 100644
--- a/docs/commands/Help.html
+++ b/docs/commands/Help.html
@@ -422,7 +422,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Home.html b/docs/commands/Home.html
index c0060ffb..5d4d787f 100644
--- a/docs/commands/Home.html
+++ b/docs/commands/Home.html
@@ -476,7 +476,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Interface.html b/docs/commands/Interface.html
index 0e3c1071..26a05eab 100644
--- a/docs/commands/Interface.html
+++ b/docs/commands/Interface.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Jail.html b/docs/commands/Jail.html
index b3c28a53..2e5200cf 100644
--- a/docs/commands/Jail.html
+++ b/docs/commands/Jail.html
@@ -629,7 +629,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Kill.html b/docs/commands/Kill.html
index 1975f75f..41cc60d0 100644
--- a/docs/commands/Kill.html
+++ b/docs/commands/Kill.html
@@ -407,7 +407,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Me.html b/docs/commands/Me.html
index efd83e1a..08b05404 100644
--- a/docs/commands/Me.html
+++ b/docs/commands/Me.html
@@ -378,7 +378,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Rainbow.html b/docs/commands/Rainbow.html
index 392db94a..547cf9dc 100644
--- a/docs/commands/Rainbow.html
+++ b/docs/commands/Rainbow.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Repair.html b/docs/commands/Repair.html
index 527fce8d..ace1e6b3 100644
--- a/docs/commands/Repair.html
+++ b/docs/commands/Repair.html
@@ -339,7 +339,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Reports.html b/docs/commands/Reports.html
index cb65e39f..c9ec55d9 100644
--- a/docs/commands/Reports.html
+++ b/docs/commands/Reports.html
@@ -603,7 +603,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Roles.html b/docs/commands/Roles.html
index 1f31a0fe..28dc83fe 100644
--- a/docs/commands/Roles.html
+++ b/docs/commands/Roles.html
@@ -575,7 +575,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Spawn.html b/docs/commands/Spawn.html
index 4b018b24..0e1a3e52 100644
--- a/docs/commands/Spawn.html
+++ b/docs/commands/Spawn.html
@@ -407,7 +407,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Teleport.html b/docs/commands/Teleport.html
index dfdb56b1..a991de5d 100644
--- a/docs/commands/Teleport.html
+++ b/docs/commands/Teleport.html
@@ -502,7 +502,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/commands/Warnings.html b/docs/commands/Warnings.html
index 1119d802..7634d6b1 100644
--- a/docs/commands/Warnings.html
+++ b/docs/commands/Warnings.html
@@ -587,7 +587,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Advanced-Start.html b/docs/configs/Advanced-Start.html
index f6144dbb..45955e0c 100644
--- a/docs/configs/Advanced-Start.html
+++ b/docs/configs/Advanced-Start.html
@@ -524,7 +524,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Autofill.html b/docs/configs/Autofill.html
index dc5499ec..5b90340f 100644
--- a/docs/configs/Autofill.html
+++ b/docs/configs/Autofill.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Bonuses.html b/docs/configs/Bonuses.html
index 54b5aa6d..d2802512 100644
--- a/docs/configs/Bonuses.html
+++ b/docs/configs/Bonuses.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Chat-Reply.html b/docs/configs/Chat-Reply.html
index be8f4fe0..c7cdd601 100644
--- a/docs/configs/Chat-Reply.html
+++ b/docs/configs/Chat-Reply.html
@@ -503,7 +503,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Commands-Auth-Admin.html b/docs/configs/Commands-Auth-Admin.html
index 1040df3c..02d911b1 100644
--- a/docs/configs/Commands-Auth-Admin.html
+++ b/docs/configs/Commands-Auth-Admin.html
@@ -312,7 +312,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Commands-Auth-Roles.html b/docs/configs/Commands-Auth-Roles.html
index 3d9657d5..371854ad 100644
--- a/docs/configs/Commands-Auth-Roles.html
+++ b/docs/configs/Commands-Auth-Roles.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Commands-Auth-Runtime-Disable.html b/docs/configs/Commands-Auth-Runtime-Disable.html
index 71163b30..3220583e 100644
--- a/docs/configs/Commands-Auth-Runtime-Disable.html
+++ b/docs/configs/Commands-Auth-Runtime-Disable.html
@@ -460,7 +460,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Commands-Color-Parse.html b/docs/configs/Commands-Color-Parse.html
index 4c770196..9574bd8c 100644
--- a/docs/configs/Commands-Color-Parse.html
+++ b/docs/configs/Commands-Color-Parse.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Commands-Parse-Roles.html b/docs/configs/Commands-Parse-Roles.html
index 5ce54e9c..31e685d7 100644
--- a/docs/configs/Commands-Parse-Roles.html
+++ b/docs/configs/Commands-Parse-Roles.html
@@ -372,7 +372,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Commands-Parse.html b/docs/configs/Commands-Parse.html
index c3539bd8..fbbf17be 100644
--- a/docs/configs/Commands-Parse.html
+++ b/docs/configs/Commands-Parse.html
@@ -328,7 +328,7 @@ see ./expcore/commands.lua for more details
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Compilatron.html b/docs/configs/Compilatron.html
index 40295980..3cad84ca 100644
--- a/docs/configs/Compilatron.html
+++ b/docs/configs/Compilatron.html
@@ -372,7 +372,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Death-Logger.html b/docs/configs/Death-Logger.html
index fc637e70..d2358132 100644
--- a/docs/configs/Death-Logger.html
+++ b/docs/configs/Death-Logger.html
@@ -434,7 +434,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Discord-Alerts.html b/docs/configs/Discord-Alerts.html
index 839aa58e..f179bef0 100644
--- a/docs/configs/Discord-Alerts.html
+++ b/docs/configs/Discord-Alerts.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/File-Loader.html b/docs/configs/File-Loader.html
index 078fcf82..3a088854 100644
--- a/docs/configs/File-Loader.html
+++ b/docs/configs/File-Loader.html
@@ -258,7 +258,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Permission-Groups.html b/docs/configs/Permission-Groups.html
index 942b8fe6..90dceb28 100644
--- a/docs/configs/Permission-Groups.html
+++ b/docs/configs/Permission-Groups.html
@@ -313,7 +313,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Player-List.html b/docs/configs/Player-List.html
index a1271a6d..93acb243 100644
--- a/docs/configs/Player-List.html
+++ b/docs/configs/Player-List.html
@@ -774,7 +774,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Pollution-Grading.html b/docs/configs/Pollution-Grading.html
index 3ab9966b..649ea3de 100644
--- a/docs/configs/Pollution-Grading.html
+++ b/docs/configs/Pollution-Grading.html
@@ -402,7 +402,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Popup-Messages.html b/docs/configs/Popup-Messages.html
index 4dcdaf19..0bc7cd6a 100644
--- a/docs/configs/Popup-Messages.html
+++ b/docs/configs/Popup-Messages.html
@@ -432,7 +432,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Preset-Player-Colours.html b/docs/configs/Preset-Player-Colours.html
index 91382cb0..227a28b0 100644
--- a/docs/configs/Preset-Player-Colours.html
+++ b/docs/configs/Preset-Player-Colours.html
@@ -342,7 +342,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Preset-Player-Quickbar.html b/docs/configs/Preset-Player-Quickbar.html
index 7abadac1..3ea11770 100644
--- a/docs/configs/Preset-Player-Quickbar.html
+++ b/docs/configs/Preset-Player-Quickbar.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Repair.html b/docs/configs/Repair.html
index bf7a6c86..1fdfbaac 100644
--- a/docs/configs/Repair.html
+++ b/docs/configs/Repair.html
@@ -432,7 +432,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Rockets.html b/docs/configs/Rockets.html
index 002543fc..3ef8c4a0 100644
--- a/docs/configs/Rockets.html
+++ b/docs/configs/Rockets.html
@@ -852,7 +852,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Roles.html b/docs/configs/Roles.html
index 6e63635e..969e2e0c 100644
--- a/docs/configs/Roles.html
+++ b/docs/configs/Roles.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Science.html b/docs/configs/Science.html
index a24939ae..f6f94616 100644
--- a/docs/configs/Science.html
+++ b/docs/configs/Science.html
@@ -372,7 +372,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Scorched-Earth.html b/docs/configs/Scorched-Earth.html
index 7d61b64c..7e782fdd 100644
--- a/docs/configs/Scorched-Earth.html
+++ b/docs/configs/Scorched-Earth.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Spawn-Area.html b/docs/configs/Spawn-Area.html
index 101efcb5..a7dfaf53 100644
--- a/docs/configs/Spawn-Area.html
+++ b/docs/configs/Spawn-Area.html
@@ -762,7 +762,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Statistics.html b/docs/configs/Statistics.html
index fd3f7f9a..06c9eac3 100644
--- a/docs/configs/Statistics.html
+++ b/docs/configs/Statistics.html
@@ -672,7 +672,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Tasks.html b/docs/configs/Tasks.html
index f570aa94..95665c81 100644
--- a/docs/configs/Tasks.html
+++ b/docs/configs/Tasks.html
@@ -402,7 +402,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Warnings.html b/docs/configs/Warnings.html
index 300b6231..e9b6ea00 100644
--- a/docs/configs/Warnings.html
+++ b/docs/configs/Warnings.html
@@ -373,7 +373,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/Warps.html b/docs/configs/Warps.html
index fe1c1d43..e1394e6b 100644
--- a/docs/configs/Warps.html
+++ b/docs/configs/Warps.html
@@ -792,7 +792,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/configs/inventory_clear.html b/docs/configs/inventory_clear.html
index 784fe97c..5803bd2a 100644
--- a/docs/configs/inventory_clear.html
+++ b/docs/configs/inventory_clear.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/control/Jail.html b/docs/control/Jail.html
index c95d129e..206a0e9e 100644
--- a/docs/control/Jail.html
+++ b/docs/control/Jail.html
@@ -1226,7 +1226,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/control/Production.html b/docs/control/Production.html
index 2a449b8d..f92e253f 100644
--- a/docs/control/Production.html
+++ b/docs/control/Production.html
@@ -1347,7 +1347,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/control/Reports.html b/docs/control/Reports.html
index 5f8e270d..988ba393 100644
--- a/docs/control/Reports.html
+++ b/docs/control/Reports.html
@@ -1160,7 +1160,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/control/Rockets.html b/docs/control/Rockets.html
index 5909c319..472b4a8f 100644
--- a/docs/control/Rockets.html
+++ b/docs/control/Rockets.html
@@ -1002,7 +1002,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/control/Tasks.html b/docs/control/Tasks.html
index a6606979..356fe835 100644
--- a/docs/control/Tasks.html
+++ b/docs/control/Tasks.html
@@ -988,7 +988,7 @@ Tasks.update_task(task_id, 'We need more iron!', gam
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/control/Warnings.html b/docs/control/Warnings.html
index b843c12d..be525739 100644
--- a/docs/control/Warnings.html
+++ b/docs/control/Warnings.html
@@ -1543,7 +1543,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/control/Warps.html b/docs/control/Warps.html
index 0fb566f1..6ac750ed 100644
--- a/docs/control/Warps.html
+++ b/docs/control/Warps.html
@@ -1525,7 +1525,7 @@ Warps.make_warp_tag(warp_id)
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/core/Async.html b/docs/core/Async.html
index 9aefe809..dd7834c4 100644
--- a/docs/core/Async.html
+++ b/docs/core/Async.html
@@ -616,7 +616,7 @@ Async.register(function(player, message)
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/core/Commands.html b/docs/core/Commands.html
index 8d272cca..a3e61c2f 100644
--- a/docs/core/Commands.html
+++ b/docs/core/Commands.html
@@ -2431,7 +2431,7 @@ nb: use error(error_message) within your callback to trigger do not trigger dire
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/core/Common.html b/docs/core/Common.html
index efc538b1..3ef6675d 100644
--- a/docs/core/Common.html
+++ b/docs/core/Common.html
@@ -2770,7 +2770,7 @@ https://github.com/Refactorio/RedMew/blob/9184b2940f311d8c9c891e83429fc57ec7e0c4
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/core/Datastore.html b/docs/core/Datastore.html
index 3482b3f7..80b165c9 100644
--- a/docs/core/Datastore.html
+++ b/docs/core/Datastore.html
@@ -2967,7 +2967,7 @@ ExampleData:on_update(function(key, value)
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/core/External.html b/docs/core/External.html
index 34934500..6b6ae448 100644
--- a/docs/core/External.html
+++ b/docs/core/External.html
@@ -751,7 +751,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/core/Groups.html b/docs/core/Groups.html
index 70c946f0..015cdb66 100644
--- a/docs/core/Groups.html
+++ b/docs/core/Groups.html
@@ -1446,7 +1446,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/core/Gui.html b/docs/core/Gui.html
index d964e134..88c35374 100644
--- a/docs/core/Gui.html
+++ b/docs/core/Gui.html
@@ -4424,7 +4424,7 @@ Gui.left_toolbar_button('entity/inserter', generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/core/PlayerData.html b/docs/core/PlayerData.html
index 0075119b..e959c346 100644
--- a/docs/core/PlayerData.html
+++ b/docs/core/PlayerData.html
@@ -534,7 +534,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/core/Roles.html b/docs/core/Roles.html
index 6c20c606..b3553405 100644
--- a/docs/core/Roles.html
+++ b/docs/core/Roles.html
@@ -3394,7 +3394,7 @@ nb: this is one way, failing false after already gaining the role will not revok
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html
index e30343fe..b469a0e0 100644
--- a/docs/data/Alt-View.html
+++ b/docs/data/Alt-View.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/data/Bonus.html b/docs/data/Bonus.html
index 50be5869..ba196e46 100644
--- a/docs/data/Bonus.html
+++ b/docs/data/Bonus.html
@@ -490,7 +490,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/data/Greetings.html b/docs/data/Greetings.html
index 1deb958c..a5088ec7 100644
--- a/docs/data/Greetings.html
+++ b/docs/data/Greetings.html
@@ -433,7 +433,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/data/Player-Colours.html b/docs/data/Player-Colours.html
index e03bd851..8c215808 100644
--- a/docs/data/Player-Colours.html
+++ b/docs/data/Player-Colours.html
@@ -394,7 +394,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/data/Quickbar.html b/docs/data/Quickbar.html
index da39c0a9..1b499e35 100644
--- a/docs/data/Quickbar.html
+++ b/docs/data/Quickbar.html
@@ -411,7 +411,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/data/Tag.html b/docs/data/Tag.html
index 8bba9c5e..1142efa2 100644
--- a/docs/data/Tag.html
+++ b/docs/data/Tag.html
@@ -543,7 +543,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/guis/Autofill.html b/docs/guis/Autofill.html
index f29745ef..3640f265 100644
--- a/docs/guis/Autofill.html
+++ b/docs/guis/Autofill.html
@@ -595,7 +595,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/guis/Player-List.html b/docs/guis/Player-List.html
index 77478470..ea0c92d2 100644
--- a/docs/guis/Player-List.html
+++ b/docs/guis/Player-List.html
@@ -709,7 +709,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/guis/Readme.html b/docs/guis/Readme.html
index 5685167b..51d27295 100644
--- a/docs/guis/Readme.html
+++ b/docs/guis/Readme.html
@@ -1001,7 +1001,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/guis/Rocket-Info.html b/docs/guis/Rocket-Info.html
index 674fe833..732732ef 100644
--- a/docs/guis/Rocket-Info.html
+++ b/docs/guis/Rocket-Info.html
@@ -709,7 +709,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/guis/Science-Info.html b/docs/guis/Science-Info.html
index b70d3a03..3a50d351 100644
--- a/docs/guis/Science-Info.html
+++ b/docs/guis/Science-Info.html
@@ -588,7 +588,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/guis/Task-List.html b/docs/guis/Task-List.html
index 1f308c8d..c0e10a12 100644
--- a/docs/guis/Task-List.html
+++ b/docs/guis/Task-List.html
@@ -774,7 +774,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/guis/Warps-List.html b/docs/guis/Warps-List.html
index 9120044a..428a65a9 100644
--- a/docs/guis/Warps-List.html
+++ b/docs/guis/Warps-List.html
@@ -1045,7 +1045,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/guis/server-ups.html b/docs/guis/server-ups.html
index 135790bc..b6c1022d 100644
--- a/docs/guis/server-ups.html
+++ b/docs/guis/server-ups.html
@@ -511,7 +511,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/index.html b/docs/index.html
index 66945cbc..d36af626 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -563,7 +563,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/modules/control.html b/docs/modules/control.html
index a60169e7..9606bf51 100644
--- a/docs/modules/control.html
+++ b/docs/modules/control.html
@@ -313,7 +313,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/modules/modules.addons.station-auto-name.html b/docs/modules/modules.addons.station-auto-name.html
index f86d59f2..26f3449c 100644
--- a/docs/modules/modules.addons.station-auto-name.html
+++ b/docs/modules/modules.addons.station-auto-name.html
@@ -311,7 +311,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/modules/overrides.debug.html b/docs/modules/overrides.debug.html
index 0c3a66f2..885551e2 100644
--- a/docs/modules/overrides.debug.html
+++ b/docs/modules/overrides.debug.html
@@ -672,7 +672,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/modules/overrides.math.html b/docs/modules/overrides.math.html
index 2b207e99..f8203198 100644
--- a/docs/modules/overrides.math.html
+++ b/docs/modules/overrides.math.html
@@ -371,7 +371,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/modules/overrides.table.html b/docs/modules/overrides.table.html
index 73b24bb3..1523bae1 100644
--- a/docs/modules/overrides.table.html
+++ b/docs/modules/overrides.table.html
@@ -2026,7 +2026,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/modules/utils.event.html b/docs/modules/utils.event.html
index fd72eb6a..ccee8d03 100644
--- a/docs/modules/utils.event.html
+++ b/docs/modules/utils.event.html
@@ -1310,7 +1310,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/modules/utils.event_core.html b/docs/modules/utils.event_core.html
index 3b35157a..f7c60bc7 100644
--- a/docs/modules/utils.event_core.html
+++ b/docs/modules/utils.event_core.html
@@ -452,7 +452,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/modules/utils.task.html b/docs/modules/utils.task.html
index e4de0bdd..da6d62e6 100644
--- a/docs/modules/utils.task.html
+++ b/docs/modules/utils.task.html
@@ -669,7 +669,7 @@
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/topics/LICENSE.html b/docs/topics/LICENSE.html
index aa98760a..d7c902b4 100644
--- a/docs/topics/LICENSE.html
+++ b/docs/topics/LICENSE.html
@@ -807,7 +807,7 @@ Public License instead of this License. But first, please read
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
diff --git a/docs/topics/README.md.html b/docs/topics/README.md.html
index d8402f86..20e71744 100644
--- a/docs/topics/README.md.html
+++ b/docs/topics/README.md.html
@@ -362,7 +362,7 @@ Please report these errors to [the issues page](issues).
generated by LDoc
- Last updated 2020-11-06 21:49:00 UTC
+ Last updated 2020-11-07 00:25:08 UTC
From fd2d2c8830ffda459746e749c6aa33e74aecf874 Mon Sep 17 00:00:00 2001
From: Cooldude2606
Date: Sat, 7 Nov 2020 00:36:05 +0000
Subject: [PATCH 053/187] Automatic Doc Update
---
docs/addons/Advanced-Start.html | 2 +-
docs/addons/Chat-Popups.html | 2 +-
docs/addons/Chat-Reply.html | 2 +-
docs/addons/Compilatron.html | 2 +-
docs/addons/Damage-Popups.html | 2 +-
docs/addons/Death-Logger.html | 2 +-
docs/addons/Discord-Alerts.html | 2 +-
docs/addons/Inventory-Clear.html | 2 +-
docs/addons/Pollution-Grading.html | 2 +-
docs/addons/Scorched-Earth.html | 2 +-
docs/addons/Spawn-Area.html | 2 +-
docs/addons/Tree-Decon.html | 2 +-
docs/commands/Admin-Chat.html | 2 +-
docs/commands/Cheat-Mode.html | 2 +-
docs/commands/Clear-Inventory.html | 2 +-
docs/commands/Connect.html | 2 +-
docs/commands/Debug.html | 2 +-
docs/commands/Find.html | 2 +-
docs/commands/Help.html | 2 +-
docs/commands/Home.html | 2 +-
docs/commands/Interface.html | 2 +-
docs/commands/Jail.html | 2 +-
docs/commands/Kill.html | 2 +-
docs/commands/Me.html | 2 +-
docs/commands/Rainbow.html | 2 +-
docs/commands/Repair.html | 2 +-
docs/commands/Reports.html | 2 +-
docs/commands/Roles.html | 2 +-
docs/commands/Spawn.html | 2 +-
docs/commands/Teleport.html | 2 +-
docs/commands/Warnings.html | 2 +-
docs/configs/Advanced-Start.html | 2 +-
docs/configs/Autofill.html | 2 +-
docs/configs/Bonuses.html | 2 +-
docs/configs/Chat-Reply.html | 2 +-
docs/configs/Commands-Auth-Admin.html | 2 +-
docs/configs/Commands-Auth-Roles.html | 2 +-
docs/configs/Commands-Auth-Runtime-Disable.html | 2 +-
docs/configs/Commands-Color-Parse.html | 2 +-
docs/configs/Commands-Parse-Roles.html | 2 +-
docs/configs/Commands-Parse.html | 2 +-
docs/configs/Compilatron.html | 2 +-
docs/configs/Death-Logger.html | 2 +-
docs/configs/Discord-Alerts.html | 2 +-
docs/configs/File-Loader.html | 2 +-
docs/configs/Permission-Groups.html | 2 +-
docs/configs/Player-List.html | 2 +-
docs/configs/Pollution-Grading.html | 2 +-
docs/configs/Popup-Messages.html | 2 +-
docs/configs/Preset-Player-Colours.html | 2 +-
docs/configs/Preset-Player-Quickbar.html | 2 +-
docs/configs/Repair.html | 2 +-
docs/configs/Rockets.html | 2 +-
docs/configs/Roles.html | 2 +-
docs/configs/Science.html | 2 +-
docs/configs/Scorched-Earth.html | 2 +-
docs/configs/Spawn-Area.html | 2 +-
docs/configs/Statistics.html | 2 +-
docs/configs/Tasks.html | 2 +-
docs/configs/Warnings.html | 2 +-
docs/configs/Warps.html | 2 +-
docs/configs/inventory_clear.html | 2 +-
docs/control/Jail.html | 2 +-
docs/control/Production.html | 2 +-
docs/control/Reports.html | 2 +-
docs/control/Rockets.html | 2 +-
docs/control/Tasks.html | 2 +-
docs/control/Warnings.html | 2 +-
docs/control/Warps.html | 2 +-
docs/core/Async.html | 2 +-
docs/core/Commands.html | 2 +-
docs/core/Common.html | 2 +-
docs/core/Datastore.html | 2 +-
docs/core/External.html | 2 +-
docs/core/Groups.html | 2 +-
docs/core/Gui.html | 2 +-
docs/core/PlayerData.html | 2 +-
docs/core/Roles.html | 2 +-
docs/data/Alt-View.html | 2 +-
docs/data/Bonus.html | 2 +-
docs/data/Greetings.html | 2 +-
docs/data/Player-Colours.html | 2 +-
docs/data/Quickbar.html | 2 +-
docs/data/Tag.html | 2 +-
docs/guis/Autofill.html | 2 +-
docs/guis/Player-List.html | 2 +-
docs/guis/Readme.html | 2 +-
docs/guis/Rocket-Info.html | 2 +-
docs/guis/Science-Info.html | 2 +-
docs/guis/Task-List.html | 2 +-
docs/guis/Warps-List.html | 2 +-
docs/guis/server-ups.html | 2 +-
docs/index.html | 2 +-
docs/modules/control.html | 2 +-
docs/modules/modules.addons.station-auto-name.html | 2 +-
docs/modules/overrides.debug.html | 2 +-
docs/modules/overrides.math.html | 2 +-
docs/modules/overrides.table.html | 2 +-
docs/modules/utils.event.html | 2 +-
docs/modules/utils.event_core.html | 2 +-
docs/modules/utils.task.html | 2 +-
docs/topics/LICENSE.html | 2 +-
docs/topics/README.md.html | 2 +-
103 files changed, 103 insertions(+), 103 deletions(-)
diff --git a/docs/addons/Advanced-Start.html b/docs/addons/Advanced-Start.html
index 608e173c..5a31de5b 100644
--- a/docs/addons/Advanced-Start.html
+++ b/docs/addons/Advanced-Start.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/addons/Chat-Popups.html b/docs/addons/Chat-Popups.html
index 25428842..de57620f 100644
--- a/docs/addons/Chat-Popups.html
+++ b/docs/addons/Chat-Popups.html
@@ -367,7 +367,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/addons/Chat-Reply.html b/docs/addons/Chat-Reply.html
index 7e9898b4..dada62f1 100644
--- a/docs/addons/Chat-Reply.html
+++ b/docs/addons/Chat-Reply.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/addons/Compilatron.html b/docs/addons/Compilatron.html
index 512f4ba8..a5972e06 100644
--- a/docs/addons/Compilatron.html
+++ b/docs/addons/Compilatron.html
@@ -575,7 +575,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/addons/Damage-Popups.html b/docs/addons/Damage-Popups.html
index 6b1085f6..02500d90 100644
--- a/docs/addons/Damage-Popups.html
+++ b/docs/addons/Damage-Popups.html
@@ -367,7 +367,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/addons/Death-Logger.html b/docs/addons/Death-Logger.html
index ae8b3ffa..2c7167c6 100644
--- a/docs/addons/Death-Logger.html
+++ b/docs/addons/Death-Logger.html
@@ -394,7 +394,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/addons/Discord-Alerts.html b/docs/addons/Discord-Alerts.html
index d4d39f99..cfc2cbd5 100644
--- a/docs/addons/Discord-Alerts.html
+++ b/docs/addons/Discord-Alerts.html
@@ -450,7 +450,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/addons/Inventory-Clear.html b/docs/addons/Inventory-Clear.html
index fc37972e..0b78157e 100644
--- a/docs/addons/Inventory-Clear.html
+++ b/docs/addons/Inventory-Clear.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/addons/Pollution-Grading.html b/docs/addons/Pollution-Grading.html
index f2a3d723..c4fda8c7 100644
--- a/docs/addons/Pollution-Grading.html
+++ b/docs/addons/Pollution-Grading.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/addons/Scorched-Earth.html b/docs/addons/Scorched-Earth.html
index aeba007d..b114fa0a 100644
--- a/docs/addons/Scorched-Earth.html
+++ b/docs/addons/Scorched-Earth.html
@@ -394,7 +394,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/addons/Spawn-Area.html b/docs/addons/Spawn-Area.html
index 730660d6..33414c23 100644
--- a/docs/addons/Spawn-Area.html
+++ b/docs/addons/Spawn-Area.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/addons/Tree-Decon.html b/docs/addons/Tree-Decon.html
index 75464bfc..897fa7ab 100644
--- a/docs/addons/Tree-Decon.html
+++ b/docs/addons/Tree-Decon.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Admin-Chat.html b/docs/commands/Admin-Chat.html
index 25449c05..bab8fb0b 100644
--- a/docs/commands/Admin-Chat.html
+++ b/docs/commands/Admin-Chat.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Cheat-Mode.html b/docs/commands/Cheat-Mode.html
index 6b689bdf..8e682efd 100644
--- a/docs/commands/Cheat-Mode.html
+++ b/docs/commands/Cheat-Mode.html
@@ -379,7 +379,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Clear-Inventory.html b/docs/commands/Clear-Inventory.html
index 1ab0ed04..a9bedec8 100644
--- a/docs/commands/Clear-Inventory.html
+++ b/docs/commands/Clear-Inventory.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Connect.html b/docs/commands/Connect.html
index b25fb597..868d124c 100644
--- a/docs/commands/Connect.html
+++ b/docs/commands/Connect.html
@@ -609,7 +609,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Debug.html b/docs/commands/Debug.html
index dd79b7d8..36aa4748 100644
--- a/docs/commands/Debug.html
+++ b/docs/commands/Debug.html
@@ -383,7 +383,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Find.html b/docs/commands/Find.html
index dc295430..79198f54 100644
--- a/docs/commands/Find.html
+++ b/docs/commands/Find.html
@@ -378,7 +378,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Help.html b/docs/commands/Help.html
index abcffe9f..1a0fb217 100644
--- a/docs/commands/Help.html
+++ b/docs/commands/Help.html
@@ -422,7 +422,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Home.html b/docs/commands/Home.html
index 5d4d787f..04737d4f 100644
--- a/docs/commands/Home.html
+++ b/docs/commands/Home.html
@@ -476,7 +476,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Interface.html b/docs/commands/Interface.html
index 26a05eab..f3b92aaf 100644
--- a/docs/commands/Interface.html
+++ b/docs/commands/Interface.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Jail.html b/docs/commands/Jail.html
index 2e5200cf..c254e097 100644
--- a/docs/commands/Jail.html
+++ b/docs/commands/Jail.html
@@ -629,7 +629,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Kill.html b/docs/commands/Kill.html
index 41cc60d0..290eae79 100644
--- a/docs/commands/Kill.html
+++ b/docs/commands/Kill.html
@@ -407,7 +407,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Me.html b/docs/commands/Me.html
index 08b05404..d42c4b5a 100644
--- a/docs/commands/Me.html
+++ b/docs/commands/Me.html
@@ -378,7 +378,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Rainbow.html b/docs/commands/Rainbow.html
index 547cf9dc..c879a086 100644
--- a/docs/commands/Rainbow.html
+++ b/docs/commands/Rainbow.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Repair.html b/docs/commands/Repair.html
index ace1e6b3..47c86483 100644
--- a/docs/commands/Repair.html
+++ b/docs/commands/Repair.html
@@ -339,7 +339,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Reports.html b/docs/commands/Reports.html
index c9ec55d9..9763919f 100644
--- a/docs/commands/Reports.html
+++ b/docs/commands/Reports.html
@@ -603,7 +603,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Roles.html b/docs/commands/Roles.html
index 28dc83fe..8a9edeb9 100644
--- a/docs/commands/Roles.html
+++ b/docs/commands/Roles.html
@@ -575,7 +575,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Spawn.html b/docs/commands/Spawn.html
index 0e1a3e52..7386ec86 100644
--- a/docs/commands/Spawn.html
+++ b/docs/commands/Spawn.html
@@ -407,7 +407,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Teleport.html b/docs/commands/Teleport.html
index a991de5d..44a58f30 100644
--- a/docs/commands/Teleport.html
+++ b/docs/commands/Teleport.html
@@ -502,7 +502,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/commands/Warnings.html b/docs/commands/Warnings.html
index 7634d6b1..73e8c6a6 100644
--- a/docs/commands/Warnings.html
+++ b/docs/commands/Warnings.html
@@ -587,7 +587,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Advanced-Start.html b/docs/configs/Advanced-Start.html
index 45955e0c..179090bb 100644
--- a/docs/configs/Advanced-Start.html
+++ b/docs/configs/Advanced-Start.html
@@ -524,7 +524,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Autofill.html b/docs/configs/Autofill.html
index 5b90340f..fbededee 100644
--- a/docs/configs/Autofill.html
+++ b/docs/configs/Autofill.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Bonuses.html b/docs/configs/Bonuses.html
index d2802512..c6e1c5d4 100644
--- a/docs/configs/Bonuses.html
+++ b/docs/configs/Bonuses.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Chat-Reply.html b/docs/configs/Chat-Reply.html
index c7cdd601..35815f74 100644
--- a/docs/configs/Chat-Reply.html
+++ b/docs/configs/Chat-Reply.html
@@ -503,7 +503,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Commands-Auth-Admin.html b/docs/configs/Commands-Auth-Admin.html
index 02d911b1..e89a092a 100644
--- a/docs/configs/Commands-Auth-Admin.html
+++ b/docs/configs/Commands-Auth-Admin.html
@@ -312,7 +312,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Commands-Auth-Roles.html b/docs/configs/Commands-Auth-Roles.html
index 371854ad..a63b77cd 100644
--- a/docs/configs/Commands-Auth-Roles.html
+++ b/docs/configs/Commands-Auth-Roles.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Commands-Auth-Runtime-Disable.html b/docs/configs/Commands-Auth-Runtime-Disable.html
index 3220583e..40d3b492 100644
--- a/docs/configs/Commands-Auth-Runtime-Disable.html
+++ b/docs/configs/Commands-Auth-Runtime-Disable.html
@@ -460,7 +460,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Commands-Color-Parse.html b/docs/configs/Commands-Color-Parse.html
index 9574bd8c..19c322c2 100644
--- a/docs/configs/Commands-Color-Parse.html
+++ b/docs/configs/Commands-Color-Parse.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Commands-Parse-Roles.html b/docs/configs/Commands-Parse-Roles.html
index 31e685d7..ca31a6c2 100644
--- a/docs/configs/Commands-Parse-Roles.html
+++ b/docs/configs/Commands-Parse-Roles.html
@@ -372,7 +372,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Commands-Parse.html b/docs/configs/Commands-Parse.html
index fbbf17be..6d55bc60 100644
--- a/docs/configs/Commands-Parse.html
+++ b/docs/configs/Commands-Parse.html
@@ -328,7 +328,7 @@ see ./expcore/commands.lua for more details
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Compilatron.html b/docs/configs/Compilatron.html
index 3cad84ca..cdd8d2f7 100644
--- a/docs/configs/Compilatron.html
+++ b/docs/configs/Compilatron.html
@@ -372,7 +372,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Death-Logger.html b/docs/configs/Death-Logger.html
index d2358132..7fef1e1e 100644
--- a/docs/configs/Death-Logger.html
+++ b/docs/configs/Death-Logger.html
@@ -434,7 +434,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Discord-Alerts.html b/docs/configs/Discord-Alerts.html
index f179bef0..c03c0aba 100644
--- a/docs/configs/Discord-Alerts.html
+++ b/docs/configs/Discord-Alerts.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/File-Loader.html b/docs/configs/File-Loader.html
index 3a088854..281d111e 100644
--- a/docs/configs/File-Loader.html
+++ b/docs/configs/File-Loader.html
@@ -258,7 +258,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Permission-Groups.html b/docs/configs/Permission-Groups.html
index 90dceb28..28ee27ec 100644
--- a/docs/configs/Permission-Groups.html
+++ b/docs/configs/Permission-Groups.html
@@ -313,7 +313,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Player-List.html b/docs/configs/Player-List.html
index 93acb243..1b340e7d 100644
--- a/docs/configs/Player-List.html
+++ b/docs/configs/Player-List.html
@@ -774,7 +774,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Pollution-Grading.html b/docs/configs/Pollution-Grading.html
index 649ea3de..b256430b 100644
--- a/docs/configs/Pollution-Grading.html
+++ b/docs/configs/Pollution-Grading.html
@@ -402,7 +402,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Popup-Messages.html b/docs/configs/Popup-Messages.html
index 0bc7cd6a..ba554d4d 100644
--- a/docs/configs/Popup-Messages.html
+++ b/docs/configs/Popup-Messages.html
@@ -432,7 +432,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Preset-Player-Colours.html b/docs/configs/Preset-Player-Colours.html
index 227a28b0..a0c09699 100644
--- a/docs/configs/Preset-Player-Colours.html
+++ b/docs/configs/Preset-Player-Colours.html
@@ -342,7 +342,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Preset-Player-Quickbar.html b/docs/configs/Preset-Player-Quickbar.html
index 3ea11770..ccd72a38 100644
--- a/docs/configs/Preset-Player-Quickbar.html
+++ b/docs/configs/Preset-Player-Quickbar.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Repair.html b/docs/configs/Repair.html
index 1fdfbaac..73cbad5b 100644
--- a/docs/configs/Repair.html
+++ b/docs/configs/Repair.html
@@ -432,7 +432,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Rockets.html b/docs/configs/Rockets.html
index 3ef8c4a0..ef3adc97 100644
--- a/docs/configs/Rockets.html
+++ b/docs/configs/Rockets.html
@@ -852,7 +852,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Roles.html b/docs/configs/Roles.html
index 969e2e0c..2df130f3 100644
--- a/docs/configs/Roles.html
+++ b/docs/configs/Roles.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Science.html b/docs/configs/Science.html
index f6f94616..b04242b5 100644
--- a/docs/configs/Science.html
+++ b/docs/configs/Science.html
@@ -372,7 +372,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Scorched-Earth.html b/docs/configs/Scorched-Earth.html
index 7e782fdd..9f821496 100644
--- a/docs/configs/Scorched-Earth.html
+++ b/docs/configs/Scorched-Earth.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Spawn-Area.html b/docs/configs/Spawn-Area.html
index a7dfaf53..ff57a0d0 100644
--- a/docs/configs/Spawn-Area.html
+++ b/docs/configs/Spawn-Area.html
@@ -762,7 +762,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Statistics.html b/docs/configs/Statistics.html
index 06c9eac3..0360b604 100644
--- a/docs/configs/Statistics.html
+++ b/docs/configs/Statistics.html
@@ -672,7 +672,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Tasks.html b/docs/configs/Tasks.html
index 95665c81..97a60d61 100644
--- a/docs/configs/Tasks.html
+++ b/docs/configs/Tasks.html
@@ -402,7 +402,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Warnings.html b/docs/configs/Warnings.html
index e9b6ea00..bad0bccc 100644
--- a/docs/configs/Warnings.html
+++ b/docs/configs/Warnings.html
@@ -373,7 +373,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/Warps.html b/docs/configs/Warps.html
index e1394e6b..17b8ae71 100644
--- a/docs/configs/Warps.html
+++ b/docs/configs/Warps.html
@@ -792,7 +792,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/configs/inventory_clear.html b/docs/configs/inventory_clear.html
index 5803bd2a..cb781bdd 100644
--- a/docs/configs/inventory_clear.html
+++ b/docs/configs/inventory_clear.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/control/Jail.html b/docs/control/Jail.html
index 206a0e9e..8e9c1602 100644
--- a/docs/control/Jail.html
+++ b/docs/control/Jail.html
@@ -1226,7 +1226,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/control/Production.html b/docs/control/Production.html
index f92e253f..9d0cebb0 100644
--- a/docs/control/Production.html
+++ b/docs/control/Production.html
@@ -1347,7 +1347,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/control/Reports.html b/docs/control/Reports.html
index 988ba393..ff87e15e 100644
--- a/docs/control/Reports.html
+++ b/docs/control/Reports.html
@@ -1160,7 +1160,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/control/Rockets.html b/docs/control/Rockets.html
index 472b4a8f..e07940ae 100644
--- a/docs/control/Rockets.html
+++ b/docs/control/Rockets.html
@@ -1002,7 +1002,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/control/Tasks.html b/docs/control/Tasks.html
index 356fe835..51acccf6 100644
--- a/docs/control/Tasks.html
+++ b/docs/control/Tasks.html
@@ -988,7 +988,7 @@ Tasks.update_task(task_id, 'We need more iron!', gam
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/control/Warnings.html b/docs/control/Warnings.html
index be525739..2796a781 100644
--- a/docs/control/Warnings.html
+++ b/docs/control/Warnings.html
@@ -1543,7 +1543,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/control/Warps.html b/docs/control/Warps.html
index 6ac750ed..36c5e44d 100644
--- a/docs/control/Warps.html
+++ b/docs/control/Warps.html
@@ -1525,7 +1525,7 @@ Warps.make_warp_tag(warp_id)
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/core/Async.html b/docs/core/Async.html
index dd7834c4..5fd12f6e 100644
--- a/docs/core/Async.html
+++ b/docs/core/Async.html
@@ -616,7 +616,7 @@ Async.register(function(player, message)
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/core/Commands.html b/docs/core/Commands.html
index a3e61c2f..f55ae15d 100644
--- a/docs/core/Commands.html
+++ b/docs/core/Commands.html
@@ -2431,7 +2431,7 @@ nb: use error(error_message) within your callback to trigger do not trigger dire
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/core/Common.html b/docs/core/Common.html
index 3ef6675d..5df145f7 100644
--- a/docs/core/Common.html
+++ b/docs/core/Common.html
@@ -2770,7 +2770,7 @@ https://github.com/Refactorio/RedMew/blob/9184b2940f311d8c9c891e83429fc57ec7e0c4
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/core/Datastore.html b/docs/core/Datastore.html
index 80b165c9..3e775ad0 100644
--- a/docs/core/Datastore.html
+++ b/docs/core/Datastore.html
@@ -2967,7 +2967,7 @@ ExampleData:on_update(function(key, value)
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/core/External.html b/docs/core/External.html
index 6b6ae448..4182451c 100644
--- a/docs/core/External.html
+++ b/docs/core/External.html
@@ -751,7 +751,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/core/Groups.html b/docs/core/Groups.html
index 015cdb66..50a0e002 100644
--- a/docs/core/Groups.html
+++ b/docs/core/Groups.html
@@ -1446,7 +1446,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/core/Gui.html b/docs/core/Gui.html
index 88c35374..6e064430 100644
--- a/docs/core/Gui.html
+++ b/docs/core/Gui.html
@@ -4424,7 +4424,7 @@ Gui.left_toolbar_button('entity/inserter', generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/core/PlayerData.html b/docs/core/PlayerData.html
index e959c346..1c5ea940 100644
--- a/docs/core/PlayerData.html
+++ b/docs/core/PlayerData.html
@@ -534,7 +534,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/core/Roles.html b/docs/core/Roles.html
index b3553405..81108bb9 100644
--- a/docs/core/Roles.html
+++ b/docs/core/Roles.html
@@ -3394,7 +3394,7 @@ nb: this is one way, failing false after already gaining the role will not revok
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html
index b469a0e0..b2c439a9 100644
--- a/docs/data/Alt-View.html
+++ b/docs/data/Alt-View.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/data/Bonus.html b/docs/data/Bonus.html
index ba196e46..83829082 100644
--- a/docs/data/Bonus.html
+++ b/docs/data/Bonus.html
@@ -490,7 +490,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/data/Greetings.html b/docs/data/Greetings.html
index a5088ec7..8219562f 100644
--- a/docs/data/Greetings.html
+++ b/docs/data/Greetings.html
@@ -433,7 +433,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/data/Player-Colours.html b/docs/data/Player-Colours.html
index 8c215808..0cbd1f4f 100644
--- a/docs/data/Player-Colours.html
+++ b/docs/data/Player-Colours.html
@@ -394,7 +394,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/data/Quickbar.html b/docs/data/Quickbar.html
index 1b499e35..d311a9a9 100644
--- a/docs/data/Quickbar.html
+++ b/docs/data/Quickbar.html
@@ -411,7 +411,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/data/Tag.html b/docs/data/Tag.html
index 1142efa2..0d1c2efa 100644
--- a/docs/data/Tag.html
+++ b/docs/data/Tag.html
@@ -543,7 +543,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/guis/Autofill.html b/docs/guis/Autofill.html
index 3640f265..84e48a81 100644
--- a/docs/guis/Autofill.html
+++ b/docs/guis/Autofill.html
@@ -595,7 +595,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/guis/Player-List.html b/docs/guis/Player-List.html
index ea0c92d2..4f73f22c 100644
--- a/docs/guis/Player-List.html
+++ b/docs/guis/Player-List.html
@@ -709,7 +709,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/guis/Readme.html b/docs/guis/Readme.html
index 51d27295..c3eada55 100644
--- a/docs/guis/Readme.html
+++ b/docs/guis/Readme.html
@@ -1001,7 +1001,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/guis/Rocket-Info.html b/docs/guis/Rocket-Info.html
index 732732ef..89d605fe 100644
--- a/docs/guis/Rocket-Info.html
+++ b/docs/guis/Rocket-Info.html
@@ -709,7 +709,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/guis/Science-Info.html b/docs/guis/Science-Info.html
index 3a50d351..2be87186 100644
--- a/docs/guis/Science-Info.html
+++ b/docs/guis/Science-Info.html
@@ -588,7 +588,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/guis/Task-List.html b/docs/guis/Task-List.html
index c0e10a12..4d56dac3 100644
--- a/docs/guis/Task-List.html
+++ b/docs/guis/Task-List.html
@@ -774,7 +774,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/guis/Warps-List.html b/docs/guis/Warps-List.html
index 428a65a9..651b8f72 100644
--- a/docs/guis/Warps-List.html
+++ b/docs/guis/Warps-List.html
@@ -1045,7 +1045,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/guis/server-ups.html b/docs/guis/server-ups.html
index b6c1022d..13c1e0de 100644
--- a/docs/guis/server-ups.html
+++ b/docs/guis/server-ups.html
@@ -511,7 +511,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/index.html b/docs/index.html
index d36af626..2bed7105 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -563,7 +563,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/modules/control.html b/docs/modules/control.html
index 9606bf51..45a4ad5d 100644
--- a/docs/modules/control.html
+++ b/docs/modules/control.html
@@ -313,7 +313,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/modules/modules.addons.station-auto-name.html b/docs/modules/modules.addons.station-auto-name.html
index 26f3449c..3e80cc55 100644
--- a/docs/modules/modules.addons.station-auto-name.html
+++ b/docs/modules/modules.addons.station-auto-name.html
@@ -311,7 +311,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/modules/overrides.debug.html b/docs/modules/overrides.debug.html
index 885551e2..b5116b47 100644
--- a/docs/modules/overrides.debug.html
+++ b/docs/modules/overrides.debug.html
@@ -672,7 +672,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/modules/overrides.math.html b/docs/modules/overrides.math.html
index f8203198..debc9c31 100644
--- a/docs/modules/overrides.math.html
+++ b/docs/modules/overrides.math.html
@@ -371,7 +371,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/modules/overrides.table.html b/docs/modules/overrides.table.html
index 1523bae1..1b72db87 100644
--- a/docs/modules/overrides.table.html
+++ b/docs/modules/overrides.table.html
@@ -2026,7 +2026,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/modules/utils.event.html b/docs/modules/utils.event.html
index ccee8d03..abdf3ad3 100644
--- a/docs/modules/utils.event.html
+++ b/docs/modules/utils.event.html
@@ -1310,7 +1310,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/modules/utils.event_core.html b/docs/modules/utils.event_core.html
index f7c60bc7..7d92bab1 100644
--- a/docs/modules/utils.event_core.html
+++ b/docs/modules/utils.event_core.html
@@ -452,7 +452,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/modules/utils.task.html b/docs/modules/utils.task.html
index da6d62e6..8e078047 100644
--- a/docs/modules/utils.task.html
+++ b/docs/modules/utils.task.html
@@ -669,7 +669,7 @@
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/topics/LICENSE.html b/docs/topics/LICENSE.html
index d7c902b4..30e08a75 100644
--- a/docs/topics/LICENSE.html
+++ b/docs/topics/LICENSE.html
@@ -807,7 +807,7 @@ Public License instead of this License. But first, please read
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
diff --git a/docs/topics/README.md.html b/docs/topics/README.md.html
index 20e71744..8aa87518 100644
--- a/docs/topics/README.md.html
+++ b/docs/topics/README.md.html
@@ -362,7 +362,7 @@ Please report these errors to [the issues page](issues).
generated by LDoc
- Last updated 2020-11-07 00:25:08 UTC
+ Last updated 2020-11-07 00:36:03 UTC
From 8197b172ad279d8b8741faf9067f4d593e6dd12f Mon Sep 17 00:00:00 2001
From: badgamernl
Date: Sat, 7 Nov 2020 02:30:37 +0100
Subject: [PATCH 054/187] Working implementation
---
locale/en/gui.cfg | 1 +
modules/control/warps.lua | 5 +++++
modules/gui/warp-list.lua | 35 ++++++++++++++++++++++-------------
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/locale/en/gui.cfg b/locale/en/gui.cfg
index e4fa8611..5b027785 100644
--- a/locale/en/gui.cfg
+++ b/locale/en/gui.cfg
@@ -107,6 +107,7 @@ discard-tooltip=Remove warp
timer-tooltip=Warp cooldown takes __1__ seconds
goto-tooltip=Go to x __1__ y __2__
goto-disabled=You must be on a warp point and have a full charge to warp
+goto-different-network=The warp is not connected to the same energy network
goto-edit=Edit warp icon
[readme]
diff --git a/modules/control/warps.lua b/modules/control/warps.lua
index 27dae30a..ddbc6f95 100644
--- a/modules/control/warps.lua
+++ b/modules/control/warps.lua
@@ -187,6 +187,11 @@ function Warps.make_warp_area(warp_id)
entity.health = 0
entity.minable = false
entity.rotatable = false
+
+ -- Save reference of the last power pole
+ if entity.type == 'electric-pole' then
+ warp.electic_pole = entity
+ end
end
end
diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua
index 699b46f0..e46ae014 100644
--- a/modules/gui/warp-list.lua
+++ b/modules/gui/warp-list.lua
@@ -308,27 +308,36 @@ Gui.element{
local warp_list_container
--- Update the warp buttons for a player
-function update_wrap_buttons(player, timer, in_range)
+function update_wrap_buttons(player, timer, warp_id)
-- Get the warp table
local frame = Gui.get_left_element(player, warp_list_container)
local scroll_table = frame.container.scroll.table
-- Check if the buttons should be active
timer = timer or PlayerCooldown:get(player)
- in_range = in_range or PlayerInRange:get(player)
- local button_disabled = timer > 0 or not in_range
+ warp_id = warp_id or PlayerInRange:get(player)
+ local button_disabled = timer > 0 or not warp_id
+
+ local warp = warp_id and Warps.get_warp(warp_id)
-- Change the enabled state of the warp buttons
local warp_ids = Warps.get_force_warp_ids(player.force.name)
- for _, warp_id in pairs(warp_ids) do
- local element = scroll_table['icon-'..warp_id][warp_icon_button.name]
+ for _, next_warp_id in pairs(warp_ids) do
+ local element = scroll_table['icon-'..next_warp_id][warp_icon_button.name]
if element and element.valid then
- element.enabled = not button_disabled
if button_disabled then
element.tooltip = {'warp-list.goto-disabled'}
+ element.enabled = false
else
- local position = Warps.get_warp(warp_id).position
- element.tooltip = {'warp-list.goto-tooltip', position.x, position.y}
+ local next_warp = Warps.get_warp(next_warp_id)
+ if warp.electic_pole and next_warp.electic_pole and warp.electic_pole.electric_network_id == next_warp.electic_pole.electric_network_id then
+ local position = next_warp.position
+ element.tooltip = {'warp-list.goto-tooltip', position.x, position.y}
+ element.enabled = true
+ else
+ element.tooltip = {'warp-list.goto-different-network'}
+ element.enabled = false
+ end
end
end
end
@@ -506,17 +515,17 @@ Warps.on_update(function(_, warp, old_warp)
end)
--- When the player leaves or enters range of a warp this is triggered
-PlayerInRange:on_update(function(player_name, player_in_range)
+PlayerInRange:on_update(function(player_name, warp_id)
local player = game.players[player_name]
-- Change if the frame is visible based on if the player is in range
if not keep_gui_open[player.name] then
- Gui.toggle_left_element(player, warp_list_container, player_in_range)
+ Gui.toggle_left_element(player, warp_list_container, warp_id ~= nil)
end
-- Check if the player requires proximity
if not check_player_permissions(player, 'bypass_warp_proximity') then
- update_wrap_buttons(player, nil, player_in_range)
+ update_wrap_buttons(player, nil, warp_id)
end
end)
@@ -595,9 +604,9 @@ Event.on_nth_tick(math.floor(60/config.update_smoothing), function()
-- Check the dist to the closest warp
local in_range = closest_warp.warp_id == warp_ids.spawn and closest_distance < rs2 or closest_distance < r2
if was_in_range and not in_range then
- PlayerInRange:set(player, false)
+ PlayerInRange:set(player, nil)
elseif not was_in_range and in_range then
- PlayerInRange:set(player, true)
+ PlayerInRange:set(player, closest_warp.warp_id)
end
-- Change the enabled state of the add warp button
From 94cfceb5a34e445c612999976c3189c987c90e7b Mon Sep 17 00:00:00 2001
From: badgamernl
Date: Sun, 8 Nov 2020 05:00:35 +0100
Subject: [PATCH 055/187] Fix electric pole name
---
modules/control/warps.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/control/warps.lua b/modules/control/warps.lua
index ddbc6f95..36c78358 100644
--- a/modules/control/warps.lua
+++ b/modules/control/warps.lua
@@ -190,7 +190,7 @@ function Warps.make_warp_area(warp_id)
-- Save reference of the last power pole
if entity.type == 'electric-pole' then
- warp.electic_pole = entity
+ warp.electric_pole = entity
end
end
end
From 90e025aa1a005ac9632576d0398e2819977fd4fa Mon Sep 17 00:00:00 2001
From: badgamernl
Date: Sun, 8 Nov 2020 05:04:53 +0100
Subject: [PATCH 056/187] Warp-list changes: - Refactor gui layout - Changed
update flow
---
locale/en/gui.cfg | 4 +-
modules/gui/warp-list.lua | 538 +++++++++++++++++++++-----------------
2 files changed, 300 insertions(+), 242 deletions(-)
diff --git a/locale/en/gui.cfg b/locale/en/gui.cfg
index 5b027785..ca7750c4 100644
--- a/locale/en/gui.cfg
+++ b/locale/en/gui.cfg
@@ -106,8 +106,10 @@ edit-tooltip-none=Currently being edited by: Nobody
discard-tooltip=Remove warp
timer-tooltip=Warp cooldown takes __1__ seconds
goto-tooltip=Go to x __1__ y __2__
-goto-disabled=You must be on a warp point and have a full charge to warp
+goto-cooldown=You are on cooldown, wait for the cooldown to recharge
+goto-disabled=You must be on a warp point
goto-different-network=The warp is not connected to the same energy network
+goto-same-warp=You are already on this warp
goto-edit=Edit warp icon
[readme]
diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua
index e46ae014..99e2b93c 100644
--- a/modules/gui/warp-list.lua
+++ b/modules/gui/warp-list.lua
@@ -30,8 +30,7 @@ end)
--- Styles used for sprite buttons
local Styles = {
- sprite20 = Gui.sprite_style(20),
- sprite22 = Gui.sprite_style(20, nil, { right_margin = -3 }),
+ sprite22 = { height = 22, width = 22, padding = -2 },
sprite32 = { height = 32, width = 32, left_margin = 1 }
}
@@ -73,9 +72,9 @@ Gui.element{
type = 'sprite-button',
sprite = 'utility/add',
tooltip = {'warp-list.add-tooltip'},
- style = 'tool_button'
+ style = 'shortcut_bar_button'
}
-:style(Styles.sprite20)
+:style(Styles.sprite22)
:on_click(function(player, _)
-- Add the new warp
local force_name = player.force.name
@@ -86,167 +85,10 @@ Gui.element{
Warps.make_warp_area(warp_id)
end)
---- Removes a warp from the list, including the physical area and map tag
--- @element discard_warp
-local discard_warp =
-Gui.element{
- type = 'sprite-button',
- sprite = 'utility/trash',
- tooltip = {'warp-list.discard-tooltip'},
- style = 'tool_button'
-}
-:style(Styles.sprite20)
-:on_click(function(_, element)
- local warp_id = element.parent.name:sub(6)
- Warps.remove_warp(warp_id)
-end)
---- Opens edit mode for the warp
--- @element edit_warp
-local edit_warp =
-Gui.element{
- type = 'sprite-button',
- sprite = 'utility/rename_icon_normal',
- tooltip = {'warp-list.edit-tooltip-none'},
- style = 'tool_button'
-}
-:style(Styles.sprite20)
-:on_click(function(player, element)
- local warp_id = element.parent.name:sub(6)
- Warps.set_editing(warp_id, player.name, true)
-end)
-
---- Set of three elements which make up each row of the warp table
--- @element add_warp_base
-local add_warp_base =
-Gui.element(function(_, parent, warp_id)
- -- Add the icon flow
- local icon_flow =
- parent.add{
- name = 'icon-'..warp_id,
- type = 'flow',
- caption = warp_id
- }
- icon_flow.style.padding = 0
-
- -- Add a flow which will contain the warp name and edit buttons
- local warp_flow = parent.add{ type = 'flow', name = warp_id }
- warp_flow.style.padding = 0
-
- -- Add the two edit buttons outside the warp flow
- local edit_flow = Gui.alignment(parent, 'edit-'..warp_id)
- edit_warp(edit_flow)
- discard_warp(edit_flow)
-
- -- Return the warp flow as the main element
- return warp_flow
-end)
-
--- Removes the three elements that are added as part of the warp base
-local function remove_warp_base(parent, warp_id)
- Gui.destroy_if_valid(parent['icon-'..warp_id])
- Gui.destroy_if_valid(parent['edit-'..warp_id])
- Gui.destroy_if_valid(parent[warp_id])
-end
-
---- Confirms the edit to name or icon of the warp
--- @element confirm_edit
-local warp_editing
-local warp_icon_button
-local confirm_edit =
-Gui.element{
- type = 'sprite-button',
- sprite = 'utility/confirm_slot',
- tooltip = {'warp-list.confirm-tooltip'},
- style = 'shortcut_bar_button_green'
-}
-:style(Styles.sprite22)
-:on_click(function(player, element)
- local warp_id = element.parent.name
- local warp_name = element.parent[warp_editing.name].text
- local warp_icon = element.parent.parent['icon-'..warp_id][warp_icon_button.name].elem_value
- Warps.set_editing(warp_id, player.name)
- Warps.update_warp(warp_id, warp_name, warp_icon, player.name)
-end)
-
---- Cancels the editing changes of the selected warp name or icon
--- @element cancel_edit
-local cancel_edit =
-Gui.element{
- type = 'sprite-button',
- sprite = 'utility/close_black',
- tooltip = {'warp-list.cancel-tooltip'},
- style = 'shortcut_bar_button_red'
-}
-:style(Styles.sprite22)
-:on_click(function(player, element)
- local warp_id = element.parent.name
- Warps.set_editing(warp_id, player.name)
-end)
-
---- Editing state for a warp, contains a text field and the two edit buttons
--- @element warp_editing
-warp_editing =
-Gui.element(function(event_trigger, parent, warp)
- local name = warp.name
-
- -- Draw the element
- local element =
- parent.add{
- name = event_trigger,
- type = 'textfield',
- text = name,
- clear_and_focus_on_right_click = true
- }
-
- -- Add the edit buttons
- cancel_edit(parent)
- confirm_edit(parent)
-
- -- Return the element
- return element
-end)
-:style{
- maximal_width = 110,
- height = 20
-}
-:on_confirmed(function(player, element, _)
- local warp_id = element.parent.name
- local warp_name = element.text
- local warp_icon = element.parent.parent['icon-'..warp_id][warp_icon_button.name].elem_value
- Warps.set_editing(warp_id, player.name)
- Warps.update_warp(warp_id, warp_name, warp_icon, player.name)
-end)
-
---- Default state for a warp, contains only a label with the warp name
--- @element warp_label
-local warp_label =
-Gui.element(function(event_trigger, parent, warp)
- local last_edit_name = warp.last_edit_name
- local last_edit_time = warp.last_edit_time
- -- Draw the element
- return parent.add{
- name = event_trigger,
- type = 'label',
- caption = warp.name,
- tooltip = {'warp-list.last-edit', last_edit_name, format_time(last_edit_time)}
- }
-end)
-:style{
- single_line = false,
- maximal_width = 150
-}
-:on_click(function(player, element, _)
- local warp_id = element.parent.name
- local warp = Warps.get_warp(warp_id)
- local position = warp.position
- player.zoom_to_world(position, 1.5)
-end)
-
-local update_wrap_buttons
---- Default state for the warp icon, when pressed teleports the player
+--- Warp icon button, this will trigger a warp when the player is able to
-- @element warp_icon_button
-warp_icon_button =
+local warp_icon_button =
Gui.element(function(event_trigger, parent, warp)
local warp_position = warp.position
@@ -274,16 +116,17 @@ end)
-- Reset the warp cooldown if the player does not have unlimited warps
if not check_player_permissions(player, 'bypass_warp_cooldown') then
PlayerCooldown:set(player, config.cooldown_duration)
- update_wrap_buttons(player)
end
+
+ PlayerInRange:set(player, warp_id)
end)
---- Editing state for the warp icon, chose elem used to chosse icon
+--- The button that is visible when the warp is in edit state
-- @element warp_icon_editing
local warp_icon_editing =
-Gui.element(function(_, parent, warp)
+Gui.element(function(event_trigger, parent, warp)
return parent.add{
- name = warp_icon_button.name,
+ name = event_trigger,
type = 'choose-elem-button',
elem_type = 'signal',
signal = {type = warp.icon.type, name = warp.icon.name},
@@ -292,6 +135,179 @@ Gui.element(function(_, parent, warp)
end)
:style(Styles.sprite32)
+--- Warp label, visible if the player is not in edit state
+-- @element warp_label
+local warp_label =
+Gui.element(function(event_trigger, parent, warp)
+ local last_edit_name = warp.last_edit_name
+ local last_edit_time = warp.last_edit_time
+ -- Draw the element
+ return parent.add{
+ name = event_trigger,
+ type = 'label',
+ caption = warp.name,
+ tooltip = {'warp-list.last-edit', last_edit_name, format_time(last_edit_time)}
+ }
+end)
+:style{
+ single_line = false,
+ horizontally_stretchable = true
+}
+:on_click(function(player, element, _)
+ local warp_id = element.parent.caption
+ local warp = Warps.get_warp(warp_id)
+ local position = warp.position
+ player.zoom_to_world(position, 1.5)
+end)
+
+--- Warp textfield, visible if the player is in edit state
+-- @element warp_textfield
+local warp_textfield =
+Gui.element(function(event_trigger, parent, warp)
+ -- Draw the element
+ local element =
+ parent.add{
+ name = event_trigger,
+ type = 'textfield',
+ text = warp.name,
+ clear_and_focus_on_right_click = true
+ }
+
+ -- Return the element
+ return element
+end)
+:style{
+ maximal_width = 81,
+ height = 22,
+ padding = -2
+}
+:on_confirmed(function(player, element, _)
+ local warp_id = element.parent.caption
+ local warp_name = element.text
+ local warp_icon = element.parent.parent['icon-'..warp_id][warp_icon_editing.name].elem_value
+ Warps.set_editing(warp_id, player.name)
+ Warps.update_warp(warp_id, warp_name, warp_icon, player.name)
+end)
+
+
+--- Confirms the edit to name or icon of the warp
+-- @element confirm_edit_button
+local confirm_edit_button =
+Gui.element{
+ type = 'sprite-button',
+ sprite = 'utility/confirm_slot',
+ tooltip = {'warp-list.confirm-tooltip'},
+ style = 'shortcut_bar_button_green'
+}
+:style(Styles.sprite22)
+:on_click(function(player, element)
+ local warp_id = element.parent.caption
+ local warp_name = element.parent.parent['name-'..warp_id][warp_textfield.name].text
+ local warp_icon = element.parent.parent['icon-'..warp_id][warp_icon_editing.name].elem_value
+ Warps.set_editing(warp_id, player.name)
+ Warps.update_warp(warp_id, warp_name, warp_icon, player.name)
+end)
+
+--- Cancels the editing changes of the selected warp name or icon
+-- @element cancel_edit_button
+local cancel_edit_button =
+Gui.element{
+ type = 'sprite-button',
+ sprite = 'utility/close_black',
+ tooltip = {'warp-list.cancel-tooltip'},
+ style = 'shortcut_bar_button_red'
+}
+:style(Styles.sprite22)
+:on_click(function(player, element)
+ local warp_id = element.parent.caption
+ Warps.set_editing(warp_id, player.name)
+end)
+
+--- Removes a warp from the list, including the physical area and map tag
+-- @element remove_warp_button
+local remove_warp_button =
+Gui.element{
+ type = 'sprite-button',
+ sprite = 'utility/trash',
+ tooltip = {'warp-list.discard-tooltip'},
+ style = 'shortcut_bar_button_red'
+}
+:style(Styles.sprite22)
+:on_click(function(_, element)
+ local warp_id = element.parent.caption
+ Warps.remove_warp(warp_id)
+end)
+
+--- Opens edit mode for the warp
+-- @element edit_warp_button
+local edit_warp_button =
+Gui.element{
+ type = 'sprite-button',
+ sprite = 'utility/rename_icon_normal',
+ tooltip = {'warp-list.edit-tooltip-none'},
+ style = 'shortcut_bar_button'
+}
+:style(Styles.sprite22)
+:on_click(function(player, element)
+ local warp_id = element.parent.caption
+ Warps.set_editing(warp_id, player.name, true)
+end)
+
+local update_wrap_buttons
+--- Set of three elements which make up each row of the warp table
+-- @element add_warp_elements
+local add_warp_elements =
+Gui.element(function(_, parent, warp)
+ -- Add icon flow this will contain the warp button and warp icon edit button
+ local icon_flow = parent.add{
+ name = 'icon-'..warp.warp_id,
+ type = 'flow',
+ caption = warp.warp_id
+ }
+ icon_flow.style.padding = 0
+
+ -- Add the button and the icon edit button
+ warp_icon_button(icon_flow, warp)
+ warp_icon_editing(icon_flow, warp)
+
+ -- Add name flow this will contain the warp label and textbox
+ local name_flow = parent.add{
+ type = 'flow',
+ name = 'name-'..warp.warp_id,
+ caption = warp.warp_id
+ }
+ name_flow.style.padding = 0
+
+ -- Add the label and textfield of the warp
+ warp_label(name_flow, warp)
+ warp_textfield(name_flow, warp)
+
+
+ -- Add button flow this will contain buttons to manage this specific warp
+ local button_flow = parent.add{
+ type = 'flow',
+ name = 'button-'..warp.warp_id,
+ caption = warp.warp_id
+ }
+ button_flow.style.padding = 0
+
+ -- Add both edit state buttons
+ confirm_edit_button(button_flow)
+ cancel_edit_button(button_flow)
+ edit_warp_button(button_flow)
+ remove_warp_button(button_flow)
+
+ -- Return the warp flow elements
+ return { icon_flow, name_flow, button_flow }
+end)
+
+-- Removes the three elements that are added as part of the warp base
+local function remove_warp_elements(parent, warp_id)
+ Gui.destroy_if_valid(parent['icon-'..warp_id])
+ Gui.destroy_if_valid(parent['name-'..warp_id])
+ Gui.destroy_if_valid(parent['button-'..warp_id])
+end
+
--- This timer controls when a player is able to warp, eg every 60 seconds
-- @element warp_timer
local warp_timer =
@@ -307,6 +323,46 @@ Gui.element{
}
local warp_list_container
+
+-- Helper function to style and enable or disable a button element
+local function update_icon_button(element, on_cooldown, warp, warp_player_is_on)
+ -- Check if button element is valid
+ if not element or not element.valid then return end
+
+ local label_style = element.parent.parent['name-'..warp.warp_id][warp_label.name].style
+
+ if not warp_player_is_on then
+ element.tooltip = {'warp-list.goto-disabled'}
+ element.enabled = false
+ label_style.font_color = { 1, 1, 1, 0.7 }
+ return
+ end
+
+ if warp_player_is_on.warp_id == warp.warp_id then
+ element.tooltip = {'warp-list.goto-same-warp'}
+ element.enabled = false
+ label_style.font_color = { 1, 1, 1, 0.7 }
+ elseif on_cooldown then
+ element.tooltip = {'warp-list.goto-cooldown'}
+ element.enabled = false
+ label_style.font_color = { 1, 1, 1, 0.7 }
+ else
+ -- Check if the warps are in the same electricity network
+ local warp_electric_network_id = warp and warp.electric_pole.electric_network_id or -1
+ local player_warp_electric_network_id = warp_player_is_on and warp_player_is_on.electric_pole.electric_network_id or -1
+ if warp_electric_network_id == player_warp_electric_network_id then
+ local position = warp_player_is_on.position
+ element.tooltip = {'warp-list.goto-tooltip', position.x, position.y}
+ element.enabled = true
+ label_style.font_color = { 1, 1, 1, 1 }
+ else
+ element.tooltip = {'warp-list.goto-different-network'}
+ element.enabled = false
+ label_style.font_color = { 1, 0, 0, 0.7 }
+ end
+ end
+end
+
--- Update the warp buttons for a player
function update_wrap_buttons(player, timer, warp_id)
-- Get the warp table
@@ -316,30 +372,16 @@ function update_wrap_buttons(player, timer, warp_id)
-- Check if the buttons should be active
timer = timer or PlayerCooldown:get(player)
warp_id = warp_id or PlayerInRange:get(player)
- local button_disabled = timer > 0 or not warp_id
+ local on_cooldown = timer > 0
- local warp = warp_id and Warps.get_warp(warp_id)
+ local warp_player_is_on = warp_id and Warps.get_warp(warp_id) or nil
-- Change the enabled state of the warp buttons
local warp_ids = Warps.get_force_warp_ids(player.force.name)
for _, next_warp_id in pairs(warp_ids) do
local element = scroll_table['icon-'..next_warp_id][warp_icon_button.name]
- if element and element.valid then
- if button_disabled then
- element.tooltip = {'warp-list.goto-disabled'}
- element.enabled = false
- else
- local next_warp = Warps.get_warp(next_warp_id)
- if warp.electic_pole and next_warp.electic_pole and warp.electic_pole.electric_network_id == next_warp.electic_pole.electric_network_id then
- local position = next_warp.position
- element.tooltip = {'warp-list.goto-tooltip', position.x, position.y}
- element.enabled = true
- else
- element.tooltip = {'warp-list.goto-different-network'}
- element.enabled = false
- end
- end
- end
+ local next_warp = Warps.get_warp(next_warp_id)
+ update_icon_button(element, on_cooldown, next_warp, warp_player_is_on)
end
end
@@ -347,25 +389,41 @@ end
local function update_warp(player, warp_table, warp_id)
local warp = Warps.get_warp(warp_id)
- -- Warp no longer exists so should be removed from the list
+ -- If the warp does no longer exist then remove the warp elements from the warp table
if not warp then
- remove_warp_base(warp_table, warp_id)
+ remove_warp_elements(warp_table, warp_id)
return
end
- -- Get the warp flow for this warp
- local warp_flow = warp_table[warp_id] or add_warp_base(warp_table, warp_id)
+ -- Check if the warp elements are created, if they are not then create a new set of them
+ if not warp_table['icon-'..warp_id] then
+ add_warp_elements(warp_table, warp)
+ end
local icon_flow = warp_table['icon-'..warp_id]
+ local name_flow = warp_table['name-'..warp_id]
+ local button_flow = warp_table['button-'..warp_id]
- -- Update the edit flow
- local edit_flow = warp_table['edit-'..warp_id]
+ -- Create local references to the elements for this warp
+ local warp_icon_element = icon_flow[warp_icon_button.name]
+ local warp_icon_edit_element = icon_flow[warp_icon_editing.name]
+
+ local label_element = name_flow[warp_label.name]
+ local textfield_element = name_flow[warp_textfield.name]
+
+ local cancel_edit_element = button_flow[cancel_edit_button.name]
+ local confirm_edit_element = button_flow[confirm_edit_button.name]
+
+ local edit_warp_element = button_flow[edit_warp_button.name]
+ local remove_warp_element = button_flow[remove_warp_button.name]
+
+ -- Hide the edit button if the player is not allowed to edit the warp
local player_allowed_edit = check_player_permissions(player, 'allow_edit_warp', warp)
local players_editing = table.get_keys(warp.currently_editing)
- local edit_warp_element = edit_flow[edit_warp.name]
- local discard_warp_element = edit_flow[discard_warp.name]
-
+ -- button_flow.visible = player_allowed_edit
edit_warp_element.visible = player_allowed_edit
- discard_warp_element.visible = player_allowed_edit
+ remove_warp_element.visible = player_allowed_edit
+
+ -- Set the tooltip of the edit button
if #players_editing > 0 then
edit_warp_element.hovered_sprite = 'utility/warning_icon'
edit_warp_element.tooltip = {'warp-list.edit-tooltip', table.concat(players_editing, ', ')}
@@ -374,54 +432,43 @@ local function update_warp(player, warp_table, warp_id)
edit_warp_element.tooltip = {'warp-list.edit-tooltip-none'}
end
- -- Check if the player is was editing and/or currently editing
- local warp_label_element = warp_flow[warp_label.name] or warp_label(warp_flow, warp)
- local icon_entry = icon_flow[warp_icon_button.name] or warp_icon_button(icon_flow, warp)
- local player_was_editing = icon_entry.type == 'choose-elem-button'
+ -- Set the warp elements visibility based on if the user is editing or not
local player_is_editing = warp.currently_editing[player.name]
-
- -- Update the warp and icon flow
- if not player_was_editing and not player_is_editing then
- -- Update the warp name label and icon
- local warp_name = warp.name
- local warp_icon = warp.icon
- local last_edit_name = warp.last_edit_name
- local last_edit_time = warp.last_edit_time
- warp_label_element.caption = warp_name
- warp_label_element.tooltip = {'warp-list.last-edit', last_edit_name, format_time(last_edit_time)}
- -- The SpritePath type is not the same as the SignalID type
- local sprite = warp_icon.type .. '/' ..warp_icon.name
- if warp_icon.type == 'virtual' then
- sprite = 'virtual-signal/' ..warp_icon.name
- end
- icon_entry.sprite = sprite
-
- elseif player_was_editing and not player_is_editing then
- -- Player was editing but is no longer, remove text field and add label
- edit_warp_element.enabled = true
- warp_flow.clear()
- warp_label(warp_flow, warp)
-
- icon_flow.clear()
- local warp_icon_element = warp_icon_button(icon_flow, warp)
- local timer = PlayerCooldown:get(player)
- local in_range = PlayerInRange:get(player)
- local apply_proximity = not check_player_permissions(player, 'bypass_warp_proximity')
- if timer > 0 or (apply_proximity and not in_range) then
- warp_icon_element.enabled = false
- warp_icon_element.tooltip = {'warp-list.goto-disabled'}
- end
-
- elseif not player_was_editing and player_is_editing then
- -- Player was not editing but now is, remove label and add text field
- edit_warp_element.enabled = false
- warp_flow.clear()
- warp_editing(warp_flow, warp).focus()
- warp_table.parent.scroll_to_element(warp_flow, 'top-third')
- icon_flow.clear()
- warp_icon_editing(icon_flow, warp)
-
+ if player_is_editing then
+ -- Set the icon elements visibility
+ warp_icon_element.visible = false
+ warp_icon_edit_element.visible = true
+ -- Set the name elements visibility
+ label_element.visible = false
+ textfield_element.visible = true
+ textfield_element.focus()
+ warp_table.parent.scroll_to_element(textfield_element, 'top-third')
+ -- Set the edit buttons
+ cancel_edit_element.visible = true
+ confirm_edit_element.visible = true
+ -- Set the warp buttons
+ edit_warp_element.visible = false
+ remove_warp_element.visible = false
+ else
+ -- Set the icon elements visibility
+ warp_icon_element.visible = true
+ warp_icon_edit_element.visible = false
+ -- Set the name elements visibility
+ label_element.visible = true
+ textfield_element.visible = false
+ -- Set the edit buttons
+ cancel_edit_element.visible = false
+ confirm_edit_element.visible = false
+ -- Set the warp buttons
+ edit_warp_element.visible = true and player_allowed_edit
+ remove_warp_element.visible = true and player_allowed_edit
end
+
+ local timer = PlayerCooldown:get(player)
+ local current_warp_id = PlayerInRange:get(player)
+ local to_warp = current_warp_id and Warps.get_warp(current_warp_id) or nil
+ local apply_proximity = not check_player_permissions(player, 'bypass_warp_proximity')
+ update_icon_button(warp_icon_element, timer > 0 or (apply_proximity and not current_warp_id), warp, to_warp)
end
-- Update all the warps for a player
@@ -469,6 +516,8 @@ Gui.element(function(event_trigger, parent)
-- Draw the scroll table for the warps
local scroll_table = Gui.scroll_table(container, 250, 3)
+ -- Set the scroll panel to always show the scrollbar (not doing this will result in a changing gui size)
+ scroll_table.parent.vertical_scroll_policy = 'always'
-- Change the style of the scroll table
local scroll_table_style = scroll_table.style
@@ -640,6 +689,13 @@ Event.add(defines.events.on_player_created, function(event)
spawn_id = Warps.add_warp(force.name, player.surface, spawn_position, nil, 'Spawn')
Warps.set_spawn_warp(spawn_id, force)
Warps.make_warp_tag(spawn_id)
+
+ local entities = player.surface.find_entities_filtered{ type = 'electric-pole', position = spawn_position, radius = 20, limit = 1 }
+ if entities and entities[1] then
+ local warp = Warps.get_warp(spawn_id)
+ warp.electric_pole = entities[1]
+ player.print('found')
+ end
end
end)
From bb5790a33d7c38490051b8ce1aa3666ad8a39d7b Mon Sep 17 00:00:00 2001
From: badgamernl
Date: Sun, 8 Nov 2020 15:30:10 +0100
Subject: [PATCH 057/187] Fix function name
---
modules/gui/warp-list.lua | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua
index 99e2b93c..70cc04dd 100644
--- a/modules/gui/warp-list.lua
+++ b/modules/gui/warp-list.lua
@@ -481,7 +481,7 @@ local function update_all_warps(player, warp_table)
end
-- Update all warps for all players on a force
-local function update_all_wrap_force(force)
+local function update_all_warp_force(force)
local warp_ids = Warps.get_force_warp_ids(force.name)
for _, player in pairs(force.connected_players) do
local frame = Gui.get_left_element(player, warp_list_container)
@@ -557,9 +557,9 @@ end)
Warps.on_update(function(_, warp, old_warp)
-- Get the force to update, warp is nil when removed
if warp then
- update_all_wrap_force(game.forces[warp.force_name])
+ update_all_warp_force(game.forces[warp.force_name])
else
- update_all_wrap_force(game.forces[old_warp.force_name])
+ update_all_warp_force(game.forces[old_warp.force_name])
end
end)
From c95616d1f807aea2d8b429f6e75f83e0e5673fa2 Mon Sep 17 00:00:00 2001
From: badgamernl
Date: Sun, 8 Nov 2020 15:38:00 +0100
Subject: [PATCH 058/187] Fix network id checks
---
modules/gui/warp-list.lua | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua
index 70cc04dd..5fffb2bf 100644
--- a/modules/gui/warp-list.lua
+++ b/modules/gui/warp-list.lua
@@ -348,8 +348,8 @@ local function update_icon_button(element, on_cooldown, warp, warp_player_is_on)
label_style.font_color = { 1, 1, 1, 0.7 }
else
-- Check if the warps are in the same electricity network
- local warp_electric_network_id = warp and warp.electric_pole.electric_network_id or -1
- local player_warp_electric_network_id = warp_player_is_on and warp_player_is_on.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
if warp_electric_network_id == player_warp_electric_network_id then
local position = warp_player_is_on.position
element.tooltip = {'warp-list.goto-tooltip', position.x, position.y}
From e851b48a0eced5357e2f32f43aec655d5cf36c98 Mon Sep 17 00:00:00 2001
From: badgamernl
Date: Sun, 8 Nov 2020 16:04:07 +0100
Subject: [PATCH 059/187] Remove spawn debug message
---
modules/gui/warp-list.lua | 1 -
1 file changed, 1 deletion(-)
diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua
index 5fffb2bf..f28308a0 100644
--- a/modules/gui/warp-list.lua
+++ b/modules/gui/warp-list.lua
@@ -694,7 +694,6 @@ Event.add(defines.events.on_player_created, function(event)
if entities and entities[1] then
local warp = Warps.get_warp(spawn_id)
warp.electric_pole = entities[1]
- player.print('found')
end
end
end)
From 84fda87848d223aa31b4bb485436bda6d3e6cba5 Mon Sep 17 00:00:00 2001
From: bbassie
Date: Sun, 8 Nov 2020 18:44:04 +0100
Subject: [PATCH 060/187] Changed warp area to fit the radius
---
config/gui/warps.lua | 25 ++++++++++++++++++-------
modules/control/warps.lua | 37 +++++++++----------------------------
2 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/config/gui/warps.lua b/config/gui/warps.lua
index 98e8f627..29e8075d 100644
--- a/config/gui/warps.lua
+++ b/config/gui/warps.lua
@@ -29,13 +29,24 @@ return {
-- Warp area generation
entities = { --- @setting entities The entities which are created for warp areas
- {'small-lamp',-3,-2},{'small-lamp',-3,2},{'small-lamp',3,-2},{'small-lamp',3,2},
- {'small-lamp',-2,-3},{'small-lamp',2,-3},{'small-lamp',-2,3},{'small-lamp',2,3},
- {'small-electric-pole',-3,-3},{'small-electric-pole',3,3},{'small-electric-pole',-3,3},{'small-electric-pole',3,-3}
+ {'small-lamp', -4, -2}, {'small-lamp', -2, -4}, {'small-electric-pole',-3,-3}, -- Top left corner
+ {'small-lamp', 3, -2}, {'small-lamp', 1, -4}, {'small-electric-pole',2,-3}, -- Top right corner
+ {'small-lamp', 3, 1}, {'small-lamp', 1, 3}, {'small-electric-pole',2,2}, -- Bottom right corner
+ {'small-lamp', -4, 1}, {'small-lamp', -2, 3}, {'small-electric-pole',-3,2}, -- Bottom left corner
},
- base_tile = 'tutorial-grid', --- @setting base_tile The tile which is used for the warp areas
tiles = { --- @setting tiles The tiles which are created for warp areas
- {-3,-2},{-3,-1},{-3,0},{-3,1},{-3,2},{3,-2},{3,-1},{3,0},{3,1},{3,2},
- {-2,-3},{-1,-3},{0,-3},{1,-3},{2,-3},{-2,3},{-1,3},{0,3},{1,3},{2,3}
+ {"black-refined-concrete",-4,-2},{"black-refined-concrete",-4,-1},{"black-refined-concrete",-4,0},{"black-refined-concrete",-4,1},
+ {"black-refined-concrete",-3,-3},{"purple-refined-concrete",-3,-2},{"purple-refined-concrete",-3,-1},{"purple-refined-concrete",-3,0},
+ {"purple-refined-concrete",-3,1},{"black-refined-concrete",-3,2},{"black-refined-concrete",-2,-4},{"purple-refined-concrete",-2,-3},
+ {"purple-refined-concrete",-2,-2},{"purple-refined-concrete",-2,-1},{"purple-refined-concrete",-2,0},{"purple-refined-concrete",-2,1},
+ {"purple-refined-concrete",-2,2},{"black-refined-concrete",-2,3},{"black-refined-concrete",-1,-4},{"purple-refined-concrete",-1,-3},
+ {"purple-refined-concrete",-1,-2},{"purple-refined-concrete",-1,-1},{"purple-refined-concrete",-1,0},{"purple-refined-concrete",-1,1},
+ {"purple-refined-concrete",-1,2},{"black-refined-concrete",-1,3},{"black-refined-concrete",0,-4},{"purple-refined-concrete",0,-3},
+ {"purple-refined-concrete",0,-2},{"purple-refined-concrete",0,-1},{"purple-refined-concrete",0,0},{"purple-refined-concrete",0,1},
+ {"purple-refined-concrete",0,2},{"black-refined-concrete",0,3},{"black-refined-concrete",1,-4},{"purple-refined-concrete",1,-3},
+ {"purple-refined-concrete",1,-2},{"purple-refined-concrete",1,-1},{"purple-refined-concrete",1,0},{"purple-refined-concrete",1,1},
+ {"purple-refined-concrete",1,2},{"black-refined-concrete",1,3},{"black-refined-concrete",2,-3},{"purple-refined-concrete",2,-2},
+ {"purple-refined-concrete",2,-1},{"purple-refined-concrete",2,0},{"purple-refined-concrete",2,1},{"black-refined-concrete",2,2},
+ {"black-refined-concrete",3,-2},{"black-refined-concrete",3,-1},{"black-refined-concrete",3,0},{"black-refined-concrete",3,1}
}
-}
\ No newline at end of file
+}
diff --git a/modules/control/warps.lua b/modules/control/warps.lua
index 36c78358..c855d499 100644
--- a/modules/control/warps.lua
+++ b/modules/control/warps.lua
@@ -148,31 +148,15 @@ function Warps.make_warp_area(warp_id)
local position = warp.position
local posx = position.x
local posy = position.y
- local radius = config.standard_proximity_radius
- local radius2 = radius^2
-- Get the tile that is being replaced, store.update not needed as we dont want it to trigger
local old_tile = surface.get_tile(position).name
warp.old_tile = old_tile
- -- Make a circle that acts as a base for the warp structure
- local base_tile = config.base_tile
- local base_tiles = {}
- for x = -radius, radius do
- local x2 = x^2
- for y = -radius, radius do
- local y2 = y^2
- if x2+y2 < radius2 then
- table.insert(base_tiles, {name=base_tile, position={x+posx, y+posy}})
- end
- end
- end
- surface.set_tiles(base_tiles)
-
-- Add a tile pattern on top of the base
local tiles = {}
- for _, pos in pairs(config.tiles) do
- table.insert(tiles, {name=base_tile, position={pos[1]+posx, pos[2]+posy}})
+ for _, tile in pairs(config.tiles) do
+ table.insert(tiles, {name=tile[1], position={tile[2]+posx, tile[3]+posy}})
end
surface.set_tiles(tiles)
@@ -193,6 +177,10 @@ function Warps.make_warp_area(warp_id)
warp.electric_pole = entity
end
end
+
+ local radius = config.standard_proximity_radius
+ rendering.draw_circle{ color = {0,1,0,.5}, radius = 0.1, filled = true, target = position, surface = surface, draw_on_ground = true }
+ rendering.draw_circle{ color = {0,1,0,.5}, radius = radius, filled = false, target = position, surface = surface, draw_on_ground = true }
end
--[[-- Remove the warp area for a warp
@@ -207,22 +195,15 @@ function Warps.remove_warp_area(warp_id)
local position = warp.position
local surface = warp.surface
local radius = config.standard_proximity_radius
- local radius2 = radius^2
-- Check that a warp area was created previously
local base_tile = warp.old_tile
if not base_tile then return end
- -- Reset all the tiles that were replaced
+ -- Loop over warp tiles and set them to the old tile that was below
local tiles = {}
- for x = -radius, radius do
- local x2 = x^2
- for y = -radius, radius do
- local y2 = y^2
- if x2+y2 < radius2 then
- table.insert(tiles, {name=base_tile, position={x+position.x, y+position.y}})
- end
- end
+ for _, tile in pairs(config.tiles) do
+ table.insert(tiles, {name=base_tile, position={tile[2]+position.x, tile[3]+position.y}})
end
surface.set_tiles(tiles)
From 1d980c6d64b004d08bb1bcbb97b7c22314fc97ba Mon Sep 17 00:00:00 2001
From: bbassie
Date: Sun, 8 Nov 2020 19:02:55 +0100
Subject: [PATCH 061/187] Warp water check
---
locale/en/gui.cfg | 1 +
modules/gui/warp-list.lua | 13 ++++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/locale/en/gui.cfg b/locale/en/gui.cfg
index ca7750c4..18ffc672 100644
--- a/locale/en/gui.cfg
+++ b/locale/en/gui.cfg
@@ -97,6 +97,7 @@ main-caption=Warp List
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
too-close=Can't make warp; too close to warp: __1__
+too-close-to-water=Cannot create warp this close to water, please move __1__ tiles away from the water body
last-edit=Last edited by __1__ at __2__\nClick to view on map
add-tooltip=Add new warp
confirm-tooltip=Save changes
diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua
index f28308a0..a0ff2187 100644
--- a/modules/gui/warp-list.lua
+++ b/modules/gui/warp-list.lua
@@ -12,7 +12,7 @@ local Roles = require 'expcore.roles' --- @dep expcore.roles
local Colors = require 'utils.color_presets' --- @dep utils.color_presets
local config = require 'config.gui.warps' --- @dep config.gui.warps
local Warps = require 'modules.control.warps' --- @dep modules.control.warps
-local format_time = _C.format_time --- @dep expcore.common
+local format_time, player_return = _C.format_time, _C.player_return --- @dep expcore.common
--- Stores all data for the warp gui
local WrapGuiData = Datastore.connect('WrapGuiData')
@@ -80,6 +80,17 @@ Gui.element{
local force_name = player.force.name
local surface = player.surface
local position = player.position
+
+ -- Check if the warp is too close to water
+ local water_tiles = surface.find_tiles_filtered{collision_mask = "water-tile", radius = config.standard_proximity_radius + 1, position = position, limit = 1}
+ if #water_tiles > 0 then
+ player_return({'expcore-commands.command-fail', {'warp-list.too-close-to-water', config.standard_proximity_radius + 1}}, 'orange_red', player)
+ local play_sound = 'utility/wire_pickup'
+ if game.player then game.player.play_sound{path=play_sound} end
+ return
+ end
+
+ -- Create the warp
local warp_id = Warps.add_warp(force_name, surface, position, player.name)
Warps.make_warp_tag(warp_id)
Warps.make_warp_area(warp_id)
From ebfe24c21c3107bfe0a5554fbc893b38e960252d Mon Sep 17 00:00:00 2001
From: bbassie
Date: Sun, 8 Nov 2020 19:04:44 +0100
Subject: [PATCH 062/187] Removed temp debug rendering
---
modules/control/warps.lua | 4 ----
1 file changed, 4 deletions(-)
diff --git a/modules/control/warps.lua b/modules/control/warps.lua
index c855d499..bc1e7207 100644
--- a/modules/control/warps.lua
+++ b/modules/control/warps.lua
@@ -177,10 +177,6 @@ function Warps.make_warp_area(warp_id)
warp.electric_pole = entity
end
end
-
- local radius = config.standard_proximity_radius
- rendering.draw_circle{ color = {0,1,0,.5}, radius = 0.1, filled = true, target = position, surface = surface, draw_on_ground = true }
- rendering.draw_circle{ color = {0,1,0,.5}, radius = radius, filled = false, target = position, surface = surface, draw_on_ground = true }
end
--[[-- Remove the warp area for a warp
From 2fcee48a97afa987f1169539aa8fafb3f8bef35d Mon Sep 17 00:00:00 2001
From: bbassie
Date: Sun, 8 Nov 2020 20:05:25 +0100
Subject: [PATCH 063/187] Corpse light and line addition
---
config/death_logger.lua | 4 +++-
modules/addons/death-logger.lua | 38 +++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/config/death_logger.lua b/config/death_logger.lua
index 1c5c578b..19095ade 100644
--- a/config/death_logger.lua
+++ b/config/death_logger.lua
@@ -10,5 +10,7 @@ return {
auto_collect_bodies=true, --- @setting auto_collect_bodies enables items being returned to the spawn point in chests upon corpse expiring
show_map_markers=true, --- @setting show_map_markers shows markers on the map where bodies are
include_time_of_death=true, --- @setting include_time_of_death weather to include the time of death on the map marker
- map_icon=nil --- @setting map_icon the icon that the map marker shows; nil means no icon; format as a SingleID
+ map_icon=nil, --- @setting map_icon the icon that the map marker shows; nil means no icon; format as a SingleID
+ show_light_at_corpse=true, --- @setting show_light_at_corpse if a light should be rendered at the corpse
+ show_line_to_corpse=true --- @setting show_line_to_corpse if a line should be rendered from you to your corpse
}
\ No newline at end of file
diff --git a/modules/addons/death-logger.lua b/modules/addons/death-logger.lua
index a046fa35..49bbed64 100644
--- a/modules/addons/death-logger.lua
+++ b/modules/addons/death-logger.lua
@@ -77,8 +77,46 @@ Event.add(defines.events.on_player_died, function(event)
create_map_tag(death)
end
table.insert(deaths, death)
+
+ -- Draw a light attached to the corpse with the player color
+ if config.show_light_at_corpse then
+ rendering.draw_light{
+ sprite = 'utility/light_medium',
+ color = player.color,
+ target = corpse,
+ force = player.force,
+ surface = player.surface
+ }
+ end
end)
+-- Draw lines to the player corpse
+if config.show_line_to_corpse then
+ Event.add(defines.events.on_player_respawned, function(event)
+ local player = game.players[event.player_index]
+
+ for _, death in pairs(deaths) do
+ -- Check if the death body is from the player
+ -- Check if the corpse entity is still valid
+ if death.player_name == player.name and death.corpse and death.corpse.valid then
+ local line_color = player.color
+ line_color.a = .3
+ rendering.draw_line{
+ color = line_color,
+ from = player.character,
+ to = death.corpse,
+ players = { event.player_index },
+ width = 2,
+ dash_length = 1,
+ gap_length = 1,
+ surface = player.surface,
+ draw_on_ground = true
+ }
+ end
+ end
+ end)
+end
+
-- every 5 min all bodies are checked for valid map tags
if config.show_map_markers then
local check_period = 60*60*5 -- five minutes
From 8defd3976287c0fc2bcba28d57485f6dbbe046ca Mon Sep 17 00:00:00 2001
From: bbassie
Date: Sat, 14 Nov 2020 21:01:49 +0100
Subject: [PATCH 064/187] Draw corpse lines improvement * Itterate over deaths
in reverse. * Check expired bodies and break out of the loop.
---
modules/addons/death-logger.lua | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/modules/addons/death-logger.lua b/modules/addons/death-logger.lua
index 49bbed64..97c057fe 100644
--- a/modules/addons/death-logger.lua
+++ b/modules/addons/death-logger.lua
@@ -6,6 +6,9 @@ local Global = require 'utils.global' --- @dep utils.global
local config = require 'config.death_logger' --- @dep config.death_logger
local format_time, move_items = _C.format_time, _C.move_items --- @dep expcore.common
+-- Max amount of ticks a corpse can be alive
+local corpse_lifetime = 60*60*15
+
local deaths = {
archive={} -- deaths moved here after body is gone
--{player_name='Cooldude2606', time_of_death='15H 15M', position={x=0, y=0}, corpse=LuaEntity, tag=LuaCustomChartTag}
@@ -95,7 +98,16 @@ if config.show_line_to_corpse then
Event.add(defines.events.on_player_respawned, function(event)
local player = game.players[event.player_index]
- for _, death in pairs(deaths) do
+ -- New deaths are added at the end of the deaths array, this is why
+ -- we are itterating over the array in reverse. This saves on the amount
+ -- of itterations we do.
+ for index = #deaths, 1, -1 do
+ local death = deaths[index]
+
+ -- If the corpse has already expired break out of the loop because
+ -- all the deaths that will follow will be expired.
+ if game.tick - death.time_of_death > corpse_lifetime then break end
+
-- Check if the death body is from the player
-- Check if the corpse entity is still valid
if death.player_name == player.name and death.corpse and death.corpse.valid then
From 94fa2bc8eafc130e2572c58bc2e4d740b981284e Mon Sep 17 00:00:00 2001
From: bbassie
Date: Sun, 15 Nov 2020 01:46:59 +0100
Subject: [PATCH 065/187] Warp additions * Add bypass styling and functionality
* Fix using wrong warp position for goto label * Add warp placement checks *
Edit remove warp to keep the corpses of the entities * Fix warp label and
textbox * Make Warp container wider by 20
---
locale/en/gui.cfg | 4 ++
modules/control/warps.lua | 16 +++++--
modules/gui/warp-list.lua | 97 +++++++++++++++++++++++++++++++--------
3 files changed, 94 insertions(+), 23 deletions(-)
diff --git a/locale/en/gui.cfg b/locale/en/gui.cfg
index 18ffc672..5fd0e35e 100644
--- a/locale/en/gui.cfg
+++ b/locale/en/gui.cfg
@@ -98,6 +98,8 @@ 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
too-close=Can't make warp; too close to warp: __1__
too-close-to-water=Cannot create warp this close to water, please move __1__ tiles away from the water body
+too-close-to-entities=Cannot create warp this close to entities, please move __1__ tiles away from the entities or destroy them
+too-close-to-neutral-entities=Cannot create warp this close to neutral entities, please move __1__ tiles away from the neutral entities or destroy them
last-edit=Last edited by __1__ at __2__\nClick to view on map
add-tooltip=Add new warp
confirm-tooltip=Save changes
@@ -107,6 +109,8 @@ edit-tooltip-none=Currently being edited by: Nobody
discard-tooltip=Remove warp
timer-tooltip=Warp cooldown takes __1__ seconds
goto-tooltip=Go to x __1__ y __2__
+goto-bypass=Go to x __1__ y __2__, bypass mode
+goto-bypass-different-network=Go to x __1__ y __2__, bypass mode different network
goto-cooldown=You are on cooldown, wait for the cooldown to recharge
goto-disabled=You must be on a warp point
goto-different-network=The warp is not connected to the same energy network
diff --git a/modules/control/warps.lua b/modules/control/warps.lua
index bc1e7207..5c797805 100644
--- a/modules/control/warps.lua
+++ b/modules/control/warps.lua
@@ -208,9 +208,19 @@ function Warps.remove_warp_area(warp_id)
{position.x+radius, position.y+radius}
}
- -- Remove all the entities that are in the area
- local entities = surface.find_entities_filtered{ force='neutral', area=area }
- for _, entity in pairs(entities) do if entity and entity.valid and entity.name ~= 'player' then entity.destroy() end end
+ -- Remove warp structure entities
+ local entity_names = {}
+ for _, entity in pairs(config.entities) do
+ table.insert(entity_names, entity[1])
+ end
+ local entities = surface.find_entities_filtered{ force='neutral', area=area, name = entity_names }
+ for _, entity in pairs(entities) do
+ -- Destroy them, this will leave corpses of the entities that it distroyed.
+ if entity and entity.valid and entity.destructible == false then
+ entity.destructible = true
+ entity.die(entity.force)
+ end
+ end
-- Rechart map area, usefull if warp is not covered by a radar
game.forces[warp.force_name].chart(surface, area)
diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua
index a0ff2187..45541720 100644
--- a/modules/gui/warp-list.lua
+++ b/modules/gui/warp-list.lua
@@ -82,11 +82,52 @@ Gui.element{
local position = player.position
-- Check if the warp is too close to water
- local water_tiles = surface.find_tiles_filtered{collision_mask = "water-tile", radius = config.standard_proximity_radius + 1, position = position, limit = 1}
+ local water_tiles = surface.find_tiles_filtered{ collision_mask = "water-tile", radius = config.standard_proximity_radius + 1, position = position }
if #water_tiles > 0 then
player_return({'expcore-commands.command-fail', {'warp-list.too-close-to-water', config.standard_proximity_radius + 1}}, 'orange_red', player)
local play_sound = 'utility/wire_pickup'
if game.player then game.player.play_sound{path=play_sound} end
+ for _, tile in pairs(water_tiles) do
+ rendering.draw_sprite{
+ sprite = 'utility/rail_path_not_possible',
+ x_scale = 0.5,
+ y_scale = 0.5,
+ target = tile.position,
+ surface = surface,
+ players = {player},
+ time_to_live = 60
+ }
+ end
+ return
+ end
+
+ -- Check if there are player entities in the way (has a bigger radius because the enities that can be placed by a player are larger)
+ local entities = surface.find_entities_filtered{
+ radius = config.standard_proximity_radius + 4.5,
+ position = position,
+ collision_mask = {
+ 'item-layer', 'object-layer', 'player-layer', 'water-tile'
+ }
+ }
+ -- Remove 1 because that is the current player
+ if #entities-1 > 0 then
+ player_return({'expcore-commands.command-fail', {'warp-list.too-close-to-entities', config.standard_proximity_radius + 4.5}}, 'orange_red', player)
+ local play_sound = 'utility/wire_pickup'
+ if game.player then game.player.play_sound{path=play_sound} end
+ local character = player.character
+ for _, entity in pairs(entities) do
+ if entity ~= character then
+ rendering.draw_sprite{
+ sprite = 'utility/rail_path_not_possible',
+ x_scale = 0.5,
+ y_scale = 0.5,
+ target = entity,
+ surface = surface,
+ players = {player},
+ time_to_live = 60
+ }
+ end
+ end
return
end
@@ -162,6 +203,8 @@ Gui.element(function(event_trigger, parent, warp)
end)
:style{
single_line = false,
+ left_padding = 2,
+ right_padding = 2,
horizontally_stretchable = true
}
:on_click(function(player, element, _)
@@ -188,9 +231,11 @@ Gui.element(function(event_trigger, parent, warp)
return element
end)
:style{
- maximal_width = 81,
+ maximal_width = 97,
height = 22,
- padding = -2
+ padding = -2,
+ left_margin = 2,
+ right_margin = 2,
}
:on_confirmed(function(player, element, _)
local warp_id = element.parent.caption
@@ -336,40 +381,54 @@ Gui.element{
local warp_list_container
-- Helper function to style and enable or disable a button element
-local function update_icon_button(element, on_cooldown, warp, warp_player_is_on)
+local function update_icon_button(element, on_cooldown, warp, warp_player_is_on, bypass_warp_proximity)
-- Check if button element is valid
if not element or not element.valid then return end
local label_style = element.parent.parent['name-'..warp.warp_id][warp_label.name].style
- if not warp_player_is_on then
+ if not warp_player_is_on and not bypass_warp_proximity then
element.tooltip = {'warp-list.goto-disabled'}
element.enabled = false
- label_style.font_color = { 1, 1, 1, 0.7 }
+ label_style.font_color = Colors.light_grey
return
end
- if warp_player_is_on.warp_id == warp.warp_id then
+ if warp_player_is_on and warp_player_is_on.warp_id == warp.warp_id then
element.tooltip = {'warp-list.goto-same-warp'}
element.enabled = false
- label_style.font_color = { 1, 1, 1, 0.7 }
+ label_style.font_color = Colors.light_grey
elseif on_cooldown then
element.tooltip = {'warp-list.goto-cooldown'}
element.enabled = false
- label_style.font_color = { 1, 1, 1, 0.7 }
+ label_style.font_color = Colors.light_grey
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 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
- local position = warp_player_is_on.position
+ local position = warp.position
element.tooltip = {'warp-list.goto-tooltip', position.x, position.y}
element.enabled = true
- label_style.font_color = { 1, 1, 1, 1 }
+ label_style.font_color = Colors.white
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.enabled = false
- label_style.font_color = { 1, 0, 0, 0.7 }
+ label_style.font_color = Colors.crimson
end
end
end
@@ -389,10 +448,11 @@ function update_wrap_buttons(player, timer, warp_id)
-- Change the enabled state of the warp buttons
local warp_ids = Warps.get_force_warp_ids(player.force.name)
+ local bypass_warp_proximity = check_player_permissions(player, 'bypass_warp_proximity')
for _, next_warp_id in pairs(warp_ids) do
local element = scroll_table['icon-'..next_warp_id][warp_icon_button.name]
local next_warp = Warps.get_warp(next_warp_id)
- update_icon_button(element, on_cooldown, next_warp, warp_player_is_on)
+ update_icon_button(element, on_cooldown, next_warp, warp_player_is_on, bypass_warp_proximity)
end
end
@@ -478,8 +538,8 @@ local function update_warp(player, warp_table, warp_id)
local timer = PlayerCooldown:get(player)
local current_warp_id = PlayerInRange:get(player)
local to_warp = current_warp_id and Warps.get_warp(current_warp_id) or nil
- local apply_proximity = not check_player_permissions(player, 'bypass_warp_proximity')
- update_icon_button(warp_icon_element, timer > 0 or (apply_proximity and not current_warp_id), warp, to_warp)
+ local bypass_warp_proximity = check_player_permissions(player, 'bypass_warp_proximity')
+ update_icon_button(warp_icon_element, timer > 0, warp, to_warp, bypass_warp_proximity)
end
-- Update all the warps for a player
@@ -510,7 +570,7 @@ end
warp_list_container =
Gui.element(function(event_trigger, parent)
-- Draw the internal container
- local container = Gui.container(parent, event_trigger, 200)
+ local container = Gui.container(parent, event_trigger, 220)
-- Draw the header
local header = Gui.header(
@@ -583,10 +643,7 @@ PlayerInRange:on_update(function(player_name, warp_id)
Gui.toggle_left_element(player, warp_list_container, warp_id ~= nil)
end
- -- Check if the player requires proximity
- if not check_player_permissions(player, 'bypass_warp_proximity') then
- update_wrap_buttons(player, nil, warp_id)
- end
+ update_wrap_buttons(player, nil, warp_id)
end)
--- Update the warp cooldown progress bars to match the current cooldown
From 5b1e48f84e4a44d12e5cb54c3e9dde7ceb1b6781 Mon Sep 17 00:00:00 2001
From: Cooldude2606
Date: Sun, 15 Nov 2020 23:26:18 +0000
Subject: [PATCH 066/187] Automatic Doc Update
---
docs/addons/Advanced-Start.html | 2 +-
docs/addons/Chat-Popups.html | 2 +-
docs/addons/Chat-Reply.html | 2 +-
docs/addons/Compilatron.html | 2 +-
docs/addons/Damage-Popups.html | 2 +-
docs/addons/Death-Logger.html | 2 +-
docs/addons/Discord-Alerts.html | 2 +-
docs/addons/Inventory-Clear.html | 2 +-
docs/addons/Pollution-Grading.html | 2 +-
docs/addons/Scorched-Earth.html | 2 +-
docs/addons/Spawn-Area.html | 2 +-
docs/addons/Tree-Decon.html | 2 +-
docs/commands/Admin-Chat.html | 2 +-
docs/commands/Cheat-Mode.html | 2 +-
docs/commands/Clear-Inventory.html | 2 +-
docs/commands/Connect.html | 2 +-
docs/commands/Debug.html | 2 +-
docs/commands/Find.html | 2 +-
docs/commands/Help.html | 2 +-
docs/commands/Home.html | 2 +-
docs/commands/Interface.html | 2 +-
docs/commands/Jail.html | 2 +-
docs/commands/Kill.html | 2 +-
docs/commands/Me.html | 2 +-
docs/commands/Rainbow.html | 2 +-
docs/commands/Repair.html | 2 +-
docs/commands/Reports.html | 2 +-
docs/commands/Roles.html | 2 +-
docs/commands/Spawn.html | 2 +-
docs/commands/Teleport.html | 2 +-
docs/commands/Warnings.html | 2 +-
docs/configs/Advanced-Start.html | 2 +-
docs/configs/Autofill.html | 2 +-
docs/configs/Bonuses.html | 2 +-
docs/configs/Chat-Reply.html | 2 +-
docs/configs/Commands-Auth-Admin.html | 2 +-
docs/configs/Commands-Auth-Roles.html | 2 +-
.../Commands-Auth-Runtime-Disable.html | 2 +-
docs/configs/Commands-Color-Parse.html | 2 +-
docs/configs/Commands-Parse-Roles.html | 2 +-
docs/configs/Commands-Parse.html | 2 +-
docs/configs/Compilatron.html | 2 +-
docs/configs/Death-Logger.html | 62 ++++++++++++++++++-
docs/configs/Discord-Alerts.html | 2 +-
docs/configs/File-Loader.html | 2 +-
docs/configs/Permission-Groups.html | 2 +-
docs/configs/Player-List.html | 2 +-
docs/configs/Pollution-Grading.html | 2 +-
docs/configs/Popup-Messages.html | 2 +-
docs/configs/Preset-Player-Colours.html | 2 +-
docs/configs/Preset-Player-Quickbar.html | 2 +-
docs/configs/Repair.html | 2 +-
docs/configs/Rockets.html | 2 +-
docs/configs/Roles.html | 2 +-
docs/configs/Science.html | 2 +-
docs/configs/Scorched-Earth.html | 2 +-
docs/configs/Spawn-Area.html | 2 +-
docs/configs/Statistics.html | 2 +-
docs/configs/Tasks.html | 2 +-
docs/configs/Warnings.html | 2 +-
docs/configs/Warps.html | 2 +-
docs/configs/inventory_clear.html | 2 +-
docs/control/Jail.html | 2 +-
docs/control/Production.html | 2 +-
docs/control/Reports.html | 2 +-
docs/control/Rockets.html | 2 +-
docs/control/Tasks.html | 2 +-
docs/control/Warnings.html | 2 +-
docs/control/Warps.html | 2 +-
docs/core/Async.html | 2 +-
docs/core/Commands.html | 2 +-
docs/core/Common.html | 2 +-
docs/core/Datastore.html | 2 +-
docs/core/External.html | 2 +-
docs/core/Groups.html | 2 +-
docs/core/Gui.html | 2 +-
docs/core/PlayerData.html | 2 +-
docs/core/Roles.html | 2 +-
docs/data/Alt-View.html | 2 +-
docs/data/Bonus.html | 2 +-
docs/data/Greetings.html | 2 +-
docs/data/Player-Colours.html | 2 +-
docs/data/Quickbar.html | 2 +-
docs/data/Tag.html | 2 +-
docs/guis/Autofill.html | 2 +-
docs/guis/Player-List.html | 2 +-
docs/guis/Readme.html | 2 +-
docs/guis/Rocket-Info.html | 2 +-
docs/guis/Science-Info.html | 2 +-
docs/guis/Task-List.html | 2 +-
docs/guis/Warps-List.html | 2 +-
docs/guis/server-ups.html | 2 +-
docs/index.html | 2 +-
docs/modules/control.html | 2 +-
.../modules.addons.station-auto-name.html | 2 +-
docs/modules/overrides.debug.html | 2 +-
docs/modules/overrides.math.html | 2 +-
docs/modules/overrides.table.html | 2 +-
docs/modules/utils.event.html | 2 +-
docs/modules/utils.event_core.html | 2 +-
docs/modules/utils.task.html | 2 +-
docs/topics/LICENSE.html | 2 +-
docs/topics/README.md.html | 2 +-
103 files changed, 163 insertions(+), 103 deletions(-)
diff --git a/docs/addons/Advanced-Start.html b/docs/addons/Advanced-Start.html
index 5a31de5b..2a2a2a35 100644
--- a/docs/addons/Advanced-Start.html
+++ b/docs/addons/Advanced-Start.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/addons/Chat-Popups.html b/docs/addons/Chat-Popups.html
index de57620f..00ef376c 100644
--- a/docs/addons/Chat-Popups.html
+++ b/docs/addons/Chat-Popups.html
@@ -367,7 +367,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/addons/Chat-Reply.html b/docs/addons/Chat-Reply.html
index dada62f1..6c8c842d 100644
--- a/docs/addons/Chat-Reply.html
+++ b/docs/addons/Chat-Reply.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/addons/Compilatron.html b/docs/addons/Compilatron.html
index a5972e06..0d664b29 100644
--- a/docs/addons/Compilatron.html
+++ b/docs/addons/Compilatron.html
@@ -575,7 +575,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/addons/Damage-Popups.html b/docs/addons/Damage-Popups.html
index 02500d90..5ef6ce0d 100644
--- a/docs/addons/Damage-Popups.html
+++ b/docs/addons/Damage-Popups.html
@@ -367,7 +367,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/addons/Death-Logger.html b/docs/addons/Death-Logger.html
index 2c7167c6..a78846b8 100644
--- a/docs/addons/Death-Logger.html
+++ b/docs/addons/Death-Logger.html
@@ -394,7 +394,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/addons/Discord-Alerts.html b/docs/addons/Discord-Alerts.html
index cfc2cbd5..8202ed8c 100644
--- a/docs/addons/Discord-Alerts.html
+++ b/docs/addons/Discord-Alerts.html
@@ -450,7 +450,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/addons/Inventory-Clear.html b/docs/addons/Inventory-Clear.html
index 0b78157e..8897ac0c 100644
--- a/docs/addons/Inventory-Clear.html
+++ b/docs/addons/Inventory-Clear.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/addons/Pollution-Grading.html b/docs/addons/Pollution-Grading.html
index c4fda8c7..615b9543 100644
--- a/docs/addons/Pollution-Grading.html
+++ b/docs/addons/Pollution-Grading.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/addons/Scorched-Earth.html b/docs/addons/Scorched-Earth.html
index b114fa0a..0f8196c9 100644
--- a/docs/addons/Scorched-Earth.html
+++ b/docs/addons/Scorched-Earth.html
@@ -394,7 +394,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/addons/Spawn-Area.html b/docs/addons/Spawn-Area.html
index 33414c23..d5df0b0b 100644
--- a/docs/addons/Spawn-Area.html
+++ b/docs/addons/Spawn-Area.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/addons/Tree-Decon.html b/docs/addons/Tree-Decon.html
index 897fa7ab..54afe9c3 100644
--- a/docs/addons/Tree-Decon.html
+++ b/docs/addons/Tree-Decon.html
@@ -366,7 +366,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Admin-Chat.html b/docs/commands/Admin-Chat.html
index bab8fb0b..052a3efe 100644
--- a/docs/commands/Admin-Chat.html
+++ b/docs/commands/Admin-Chat.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Cheat-Mode.html b/docs/commands/Cheat-Mode.html
index 8e682efd..4b445388 100644
--- a/docs/commands/Cheat-Mode.html
+++ b/docs/commands/Cheat-Mode.html
@@ -379,7 +379,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Clear-Inventory.html b/docs/commands/Clear-Inventory.html
index a9bedec8..fa26b7dd 100644
--- a/docs/commands/Clear-Inventory.html
+++ b/docs/commands/Clear-Inventory.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Connect.html b/docs/commands/Connect.html
index 868d124c..5c67848c 100644
--- a/docs/commands/Connect.html
+++ b/docs/commands/Connect.html
@@ -609,7 +609,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Debug.html b/docs/commands/Debug.html
index 36aa4748..b45f5442 100644
--- a/docs/commands/Debug.html
+++ b/docs/commands/Debug.html
@@ -383,7 +383,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Find.html b/docs/commands/Find.html
index 79198f54..e4deb76b 100644
--- a/docs/commands/Find.html
+++ b/docs/commands/Find.html
@@ -378,7 +378,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Help.html b/docs/commands/Help.html
index 1a0fb217..6179c2be 100644
--- a/docs/commands/Help.html
+++ b/docs/commands/Help.html
@@ -422,7 +422,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Home.html b/docs/commands/Home.html
index 04737d4f..f1d56c68 100644
--- a/docs/commands/Home.html
+++ b/docs/commands/Home.html
@@ -476,7 +476,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Interface.html b/docs/commands/Interface.html
index f3b92aaf..41e1b802 100644
--- a/docs/commands/Interface.html
+++ b/docs/commands/Interface.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Jail.html b/docs/commands/Jail.html
index c254e097..9aae09dc 100644
--- a/docs/commands/Jail.html
+++ b/docs/commands/Jail.html
@@ -629,7 +629,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Kill.html b/docs/commands/Kill.html
index 290eae79..a547ebce 100644
--- a/docs/commands/Kill.html
+++ b/docs/commands/Kill.html
@@ -407,7 +407,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Me.html b/docs/commands/Me.html
index d42c4b5a..16318c8e 100644
--- a/docs/commands/Me.html
+++ b/docs/commands/Me.html
@@ -378,7 +378,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Rainbow.html b/docs/commands/Rainbow.html
index c879a086..39166d4d 100644
--- a/docs/commands/Rainbow.html
+++ b/docs/commands/Rainbow.html
@@ -406,7 +406,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Repair.html b/docs/commands/Repair.html
index 47c86483..bdd45247 100644
--- a/docs/commands/Repair.html
+++ b/docs/commands/Repair.html
@@ -339,7 +339,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Reports.html b/docs/commands/Reports.html
index 9763919f..49529d03 100644
--- a/docs/commands/Reports.html
+++ b/docs/commands/Reports.html
@@ -603,7 +603,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Roles.html b/docs/commands/Roles.html
index 8a9edeb9..3d4743c4 100644
--- a/docs/commands/Roles.html
+++ b/docs/commands/Roles.html
@@ -575,7 +575,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Spawn.html b/docs/commands/Spawn.html
index 7386ec86..8539bc2b 100644
--- a/docs/commands/Spawn.html
+++ b/docs/commands/Spawn.html
@@ -407,7 +407,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Teleport.html b/docs/commands/Teleport.html
index 44a58f30..f705967d 100644
--- a/docs/commands/Teleport.html
+++ b/docs/commands/Teleport.html
@@ -502,7 +502,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/commands/Warnings.html b/docs/commands/Warnings.html
index 73e8c6a6..afbace75 100644
--- a/docs/commands/Warnings.html
+++ b/docs/commands/Warnings.html
@@ -587,7 +587,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Advanced-Start.html b/docs/configs/Advanced-Start.html
index 179090bb..4de4e670 100644
--- a/docs/configs/Advanced-Start.html
+++ b/docs/configs/Advanced-Start.html
@@ -524,7 +524,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Autofill.html b/docs/configs/Autofill.html
index fbededee..48d3959e 100644
--- a/docs/configs/Autofill.html
+++ b/docs/configs/Autofill.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Bonuses.html b/docs/configs/Bonuses.html
index c6e1c5d4..1be38eac 100644
--- a/docs/configs/Bonuses.html
+++ b/docs/configs/Bonuses.html
@@ -255,7 +255,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Chat-Reply.html b/docs/configs/Chat-Reply.html
index 35815f74..32e78464 100644
--- a/docs/configs/Chat-Reply.html
+++ b/docs/configs/Chat-Reply.html
@@ -503,7 +503,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Commands-Auth-Admin.html b/docs/configs/Commands-Auth-Admin.html
index e89a092a..acceec80 100644
--- a/docs/configs/Commands-Auth-Admin.html
+++ b/docs/configs/Commands-Auth-Admin.html
@@ -312,7 +312,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Commands-Auth-Roles.html b/docs/configs/Commands-Auth-Roles.html
index a63b77cd..ee9e2e24 100644
--- a/docs/configs/Commands-Auth-Roles.html
+++ b/docs/configs/Commands-Auth-Roles.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Commands-Auth-Runtime-Disable.html b/docs/configs/Commands-Auth-Runtime-Disable.html
index 40d3b492..5036e07e 100644
--- a/docs/configs/Commands-Auth-Runtime-Disable.html
+++ b/docs/configs/Commands-Auth-Runtime-Disable.html
@@ -460,7 +460,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Commands-Color-Parse.html b/docs/configs/Commands-Color-Parse.html
index 19c322c2..62f6837f 100644
--- a/docs/configs/Commands-Color-Parse.html
+++ b/docs/configs/Commands-Color-Parse.html
@@ -338,7 +338,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Commands-Parse-Roles.html b/docs/configs/Commands-Parse-Roles.html
index ca31a6c2..dd1f11d0 100644
--- a/docs/configs/Commands-Parse-Roles.html
+++ b/docs/configs/Commands-Parse-Roles.html
@@ -372,7 +372,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Commands-Parse.html b/docs/configs/Commands-Parse.html
index 6d55bc60..4244aa81 100644
--- a/docs/configs/Commands-Parse.html
+++ b/docs/configs/Commands-Parse.html
@@ -328,7 +328,7 @@ see ./expcore/commands.lua for more details
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Compilatron.html b/docs/configs/Compilatron.html
index cdd8d2f7..16ce8198 100644
--- a/docs/configs/Compilatron.html
+++ b/docs/configs/Compilatron.html
@@ -372,7 +372,7 @@
generated by LDoc
- Last updated 2020-11-07 00:36:03 UTC
+ Last updated 2020-11-15 23:26:16 UTC
diff --git a/docs/configs/Death-Logger.html b/docs/configs/Death-Logger.html
index 7fef1e1e..a4981836 100644
--- a/docs/configs/Death-Logger.html
+++ b/docs/configs/Death-Logger.html
@@ -275,6 +275,12 @@
| map_icon |
+
+ | show_light_at_corpse |
+
+
+ | show_line_to_corpse |
+
|