From f5619165f6f7290289e81577413e39c8a6ed73e0 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Sat, 20 Jul 2019 23:44:48 +0100 Subject: [PATCH] Added production to control --- config/action_buttons.lua | 2 +- config/science.lua | 4 +- doc/config.ld | 12 +- doc/control/Jail.html | 1169 +++++ doc/control/Production.html | 1284 +++++ doc/control/Reports.html | 1033 ++++ doc/control/Warnings.html | 1426 ++++++ doc/index.html | 42 +- doc/ldoc.ltp | 26 +- doc/modules/Jail.html | 316 +- doc/modules/Production.html | 1281 +++++ doc/modules/Reports.html | 547 ++- doc/modules/Warnings.html | 702 +-- doc/modules/config._file_loader.html | 22 +- doc/modules/config.action_buttons.html | 22 +- doc/modules/config.advanced_start.html | 22 +- doc/modules/config.bonuses.html | 22 +- doc/modules/config.chat_reply.html | 22 +- doc/modules/config.death_logger.html | 22 +- doc/modules/config.discord_alerts.html | 22 +- .../config.expcore-commands.auth_admin.html | 22 +- .../config.expcore-commands.auth_roles.html | 22 +- ...expcore-commands.auth_runtime_disable.html | 22 +- ...config.expcore-commands.parse_general.html | 22 +- .../config.expcore-commands.parse_roles.html | 22 +- doc/modules/config.permission_groups.html | 22 +- doc/modules/config.popup_messages.html | 22 +- doc/modules/config.rockets.html | 54 +- doc/modules/config.roles.html | 22 +- doc/modules/config.scorched_earth.html | 22 +- doc/modules/config.spawn_area.html | 22 +- doc/modules/config.warnings.html | 22 +- doc/modules/config.warps.html | 22 +- doc/modules/control.html | 22 +- doc/modules/expcore.commands.html | 22 +- doc/modules/expcore.common.html | 1876 ++++---- doc/modules/expcore.gui.concepts.center.html | 778 ++-- doc/modules/expcore.gui.concepts.left.html | 1426 +++--- doc/modules/expcore.gui.concepts.popups.html | 493 +- doc/modules/expcore.gui.concepts.toolbar.html | 150 +- doc/modules/expcore.gui.core.html | 22 +- doc/modules/expcore.gui.elements.buttons.html | 262 +- .../expcore.gui.elements.checkboxs.html | 362 +- .../expcore.gui.elements.dropdown.html | 272 +- .../expcore.gui.elements.elem-button.html | 159 +- .../expcore.gui.elements.progress-bar.html | 884 ++-- doc/modules/expcore.gui.elements.slider.html | 204 +- doc/modules/expcore.gui.elements.text.html | 216 +- doc/modules/expcore.gui.html | 22 +- doc/modules/expcore.gui.instances.html | 22 +- doc/modules/expcore.gui.prototype.html | 1369 +++--- doc/modules/expcore.gui.test.html | 22 +- doc/modules/expcore.permission_groups.html | 1528 +++--- doc/modules/expcore.roles.html | 4144 +++++++++-------- doc/modules/expcore.store.html | 564 +-- doc/modules/expcore.sudo.html | 22 +- .../modules.addons.advanced-start.html | 22 +- doc/modules/modules.addons.chat-popups.html | 22 +- doc/modules/modules.addons.damage-popups.html | 22 +- doc/modules/modules.control.production.html | 1281 +++++ doc/modules/modules.control.reports.html | 1026 ++++ doc/modules/modules.control.warnings.html | 1416 ++++++ doc/modules/modules.gui.player-list.html | 22 +- doc/modules/modules.gui.rocket-info.html | 34 +- doc/modules/modules.gui.science-info.html | 22 +- doc/modules/modules.gui.task-list.html | 22 +- .../utils.alien_evolution_progress.html | 38 +- doc/modules/utils.core.html | 873 ++-- doc/modules/utils.debug.html | 318 +- doc/modules/utils.event.html | 826 ++-- doc/modules/utils.event_core.html | 46 +- doc/modules/utils.math.html | 38 +- doc/modules/utils.recipe_locker.html | 38 +- doc/modules/utils.state_machine.html | 212 +- doc/modules/utils.table.html | 1341 +++--- doc/modules/utils.task.html | 206 +- doc/modules/utils.timestamp.html | 160 +- doc/topics/license.html | 23 +- doc/topics/readme.md.html | 23 +- modules/addons/discord-alerts.lua | 2 +- modules/commands/warnings.lua | 2 +- modules/control/jail.lua | 17 +- modules/control/production.lua | 237 + modules/control/reports.lua | 13 +- modules/control/warnings.lua | 13 +- modules/gui/science-info.lua | 101 +- old/locale/en/DeconControl.cfg | 3 - old/locale/en/ExpGamingAdmin.AdminLib.cfg | 21 - old/locale/en/ExpGamingAdmin.Warnings.cfg | 10 - old/locale/en/ExpGamingAdmin.cfg | 21 - old/locale/en/ExpGamingBot.autoChat.cfg | 48 - old/locale/en/ExpGamingBot.autoMessage.cfg | 9 - old/locale/en/ExpGamingCommands.home.cfg | 9 - old/locale/en/ExpGamingCore.Command.cfg | 14 - old/locale/en/ExpGamingCore.Gui.cfg | 4 - old/locale/en/ExpGamingCore.Ranking.cfg | 7 - old/locale/en/ExpGamingCore.Role.cfg | 6 - old/locale/en/ExpGamingCore.Server.cfg | 2 - old/locale/en/ExpGamingInfo.Readme.cfg | 69 - old/locale/en/ExpGamingInfo.Rockets.cfg | 12 - old/locale/en/ExpGamingInfo.Science.cfg | 14 - old/locale/en/ExpGamingInfo.Tasklist.cfg | 4 - .../en/ExpGamingPlayer.inventorySearch.cfg | 4 - old/locale/en/ExpGamingPlayer.playerInfo.cfg | 9 - old/locale/en/ExpGamingPlayer.playerList.cfg | 5 - old/locale/en/ExpGamingPlayer.polls.cfg | 7 - old/locale/en/GameSettingsGui.cfg | 32 - old/locale/en/GuiAnnouncements.cfg | 6 - old/locale/en/WarpPoints.cfg | 10 - old/locale/fr/DeconControl.cfg | 3 - old/locale/fr/ExpGamingAdmin.AdminLib.cfg | 15 - old/locale/fr/ExpGamingAdmin.Warnings.cfg | 11 - old/locale/fr/ExpGamingAdmin.cfg | 15 - old/locale/fr/ExpGamingBot.autoChat.cfg | 20 - old/locale/fr/ExpGamingBot.autoMessage.cfg | 9 - old/locale/fr/ExpGamingCore.Command.cfg | 9 - old/locale/fr/ExpGamingCore.Commands.cfg | 9 - old/locale/fr/ExpGamingCore.Gui.cfg | 4 - old/locale/fr/ExpGamingCore.Ranking.cfg | 7 - old/locale/fr/ExpGamingInfo.Readme.cfg | 68 - old/locale/fr/ExpGamingInfo.Rockets.cfg | 12 - old/locale/fr/ExpGamingInfo.Science.cfg | 14 - old/locale/fr/ExpGamingInfo.Tasklist.cfg | 4 - .../fr/ExpGamingPlayer.inventorySearch.cfg | 4 - old/locale/fr/ExpGamingPlayer.playerInfo.cfg | 8 - old/locale/fr/ExpGamingPlayer.playerList.cfg | 5 - old/locale/fr/ExpGamingPlayer.polls.cfg | 7 - old/locale/fr/GameSettingsGui.cfg | 31 - old/locale/fr/GuiAnnouncements.cfg | 6 - old/locale/fr/WarpPoints.cfg | 9 - old/locale/nl/DeconControl.cfg | 3 - old/locale/nl/ExpGamingAdmin.AdminLib.cfg | 15 - old/locale/nl/ExpGamingAdmin.Warnings.cfg | 11 - old/locale/nl/ExpGamingAdmin.cfg | 15 - old/locale/nl/ExpGamingBot.autoChat.cfg | 20 - old/locale/nl/ExpGamingBot.autoMessage.cfg | 9 - old/locale/nl/ExpGamingCore.Command.cfg | 9 - old/locale/nl/ExpGamingCore.Commands.cfg | 9 - old/locale/nl/ExpGamingCore.Gui.cfg | 4 - old/locale/nl/ExpGamingCore.Ranking.cfg | 7 - old/locale/nl/ExpGamingInfo.Readme.cfg | 68 - old/locale/nl/ExpGamingInfo.Rockets.cfg | 12 - old/locale/nl/ExpGamingInfo.Science.cfg | 14 - old/locale/nl/ExpGamingInfo.Tasklist.cfg | 4 - .../nl/ExpGamingPlayer.inventorySearch.cfg | 4 - old/locale/nl/ExpGamingPlayer.playerInfo.cfg | 8 - old/locale/nl/ExpGamingPlayer.playerList.cfg | 5 - old/locale/nl/ExpGamingPlayer.polls.cfg | 7 - old/locale/nl/GameSettingsGui.cfg | 31 - old/locale/nl/GuiAnnouncements.cfg | 6 - old/locale/nl/WarpPoints.cfg | 9 - old/locale/sv-SE/DeconControl.cfg | 3 - old/locale/sv-SE/ExpGamingAdmin.AdminLib.cfg | 19 - old/locale/sv-SE/ExpGamingAdmin.Warnings.cfg | 10 - old/locale/sv-SE/ExpGamingAdmin.cfg | 19 - old/locale/sv-SE/ExpGamingBot.autoChat.cfg | 25 - old/locale/sv-SE/ExpGamingBot.autoMessage.cfg | 10 - old/locale/sv-SE/ExpGamingCore.Command.cfg | 9 - old/locale/sv-SE/ExpGamingCore.Commands.cfg | 9 - old/locale/sv-SE/ExpGamingCore.Gui.cfg | 4 - old/locale/sv-SE/ExpGamingCore.Ranking.cfg | 7 - old/locale/sv-SE/ExpGamingInfo.Readme.cfg | 69 - old/locale/sv-SE/ExpGamingInfo.Rockets.cfg | 13 - old/locale/sv-SE/ExpGamingInfo.Science.cfg | 14 - old/locale/sv-SE/ExpGamingInfo.Tasklist.cfg | 4 - .../sv-SE/ExpGamingPlayer.inventorySearch.cfg | 4 - .../sv-SE/ExpGamingPlayer.playerInfo.cfg | 8 - .../sv-SE/ExpGamingPlayer.playerList.cfg | 5 - old/locale/sv-SE/ExpGamingPlayer.polls.cfg | 7 - old/locale/sv-SE/GameSettingsGui.cfg | 31 - old/locale/sv-SE/GuiAnnouncements.cfg | 7 - old/locale/sv-SE/WarpPoints.cfg | 9 - .../DONE/AdvancedStartingItems/control.lua | 45 - .../DONE/AdvancedStartingItems/softmod.json | 20 - old/modules/DONE/Bot/autoChat/control.lua | 166 - old/modules/DONE/Bot/autoChat/locale/de.cfg | 20 - old/modules/DONE/Bot/autoChat/locale/en.cfg | 48 - old/modules/DONE/Bot/autoChat/locale/fr.cfg | 20 - old/modules/DONE/Bot/autoChat/locale/nl.cfg | 20 - .../DONE/Bot/autoChat/locale/sv-SE.cfg | 25 - old/modules/DONE/Bot/autoChat/softmod.json | 19 - old/modules/DONE/Bot/autoMessage/control.lua | 74 - .../DONE/Bot/autoMessage/locale/de.cfg | 9 - .../DONE/Bot/autoMessage/locale/en.cfg | 9 - .../DONE/Bot/autoMessage/locale/fr.cfg | 9 - .../DONE/Bot/autoMessage/locale/nl.cfg | 9 - .../DONE/Bot/autoMessage/locale/sv-SE.cfg | 10 - old/modules/DONE/Bot/autoMessage/softmod.json | 20 - .../DONE/Bot/discordAlerts/control.lua | 63 - .../DONE/Bot/discordAlerts/softmod.json | 20 - old/modules/DONE/ChatPopup/control.lua | 57 - old/modules/DONE/ChatPopup/softmod.json | 21 - .../Commands/ExpGamingCommands/softmod.json | 25 - .../DONE/Commands/cheatMode/control.lua | 14 - .../DONE/Commands/cheatMode/softmod.json | 19 - old/modules/DONE/Commands/home/control.lua | 48 - old/modules/DONE/Commands/home/locale/en.cfg | 9 - old/modules/DONE/Commands/home/softmod.json | 20 - old/modules/DONE/Commands/kill/control.lua | 18 - old/modules/DONE/Commands/kill/softmod.json | 21 - old/modules/DONE/Commands/repair/control.lua | 68 - old/modules/DONE/Commands/repair/softmod.json | 22 - .../DONE/Commands/repair/src/tempban.lua | 7 - old/modules/DONE/Commands/tags/control.lua | 45 - old/modules/DONE/Commands/tags/softmod.json | 20 - .../DONE/Commands/teleport/control.lua | 35 - .../DONE/Commands/teleport/softmod.json | 23 - old/modules/DONE/Core/Command/control.lua | 298 -- old/modules/DONE/Core/Command/softmod.json | 21 - old/modules/DONE/Core/Group/config.lua | 81 - old/modules/DONE/Core/Group/control.lua | 189 - old/modules/DONE/Core/Group/softmod.json | 22 - old/modules/DONE/Core/Gui/center/control.lua | 221 - old/modules/DONE/Core/Gui/center/softmod.json | 24 - old/modules/DONE/Core/Gui/control.lua | 190 - old/modules/DONE/Core/Gui/inputs/control.lua | 375 -- old/modules/DONE/Core/Gui/inputs/softmod.json | 23 - old/modules/DONE/Core/Gui/left/control.lua | 246 - .../DONE/Core/Gui/left/order_config.lua | 13 - old/modules/DONE/Core/Gui/left/softmod.json | 26 - old/modules/DONE/Core/Gui/locale/de.cfg | 4 - old/modules/DONE/Core/Gui/locale/en.cfg | 4 - old/modules/DONE/Core/Gui/locale/fr.cfg | 4 - old/modules/DONE/Core/Gui/locale/nl.cfg | 4 - old/modules/DONE/Core/Gui/locale/sv-SE.cfg | 4 - old/modules/DONE/Core/Gui/popup/control.lua | 130 - old/modules/DONE/Core/Gui/popup/softmod.json | 24 - old/modules/DONE/Core/Gui/softmod.json | 29 - old/modules/DONE/Core/Gui/src/server.lua | 40 - old/modules/DONE/Core/Gui/src/test.lua | 187 - old/modules/DONE/Core/Gui/toolbar/control.lua | 90 - .../DONE/Core/Gui/toolbar/order_config.lua | 13 - .../DONE/Core/Gui/toolbar/softmod.json | 23 - old/modules/DONE/Core/Role/config.lua | 284 -- old/modules/DONE/Core/Role/control.lua | 532 --- old/modules/DONE/Core/Role/locale/en.cfg | 6 - old/modules/DONE/Core/Role/softmod.json | 24 - old/modules/DONE/Core/Role/src/commands.lua | 28 - old/modules/DONE/Core/Role/src/sync.lua | 82 - old/modules/DONE/DamagePopup/control.lua | 45 - old/modules/DONE/DamagePopup/softmod.json | 19 - old/modules/DONE/DeathMarkers/control.lua | 46 - old/modules/DONE/DeathMarkers/softmod.json | 17 - old/modules/DONE/ExpAdmin/Ban/control.lua | 49 - old/modules/DONE/ExpAdmin/Ban/softmod.json | 23 - .../DONE/ExpAdmin/ClearInventory/control.lua | 58 - .../DONE/ExpAdmin/ClearInventory/softmod.json | 20 - .../DONE/ExpAdmin/Commands/control.lua | 25 - .../DONE/ExpAdmin/Commands/softmod.json | 29 - .../DONE/ExpAdmin/Commands/src/clear.lua | 12 - .../DONE/ExpAdmin/Commands/src/jail.lua | 30 - .../DONE/ExpAdmin/Commands/src/reports.lua | 35 - .../DONE/ExpAdmin/Commands/src/tempban.lua | 15 - .../DONE/ExpAdmin/Commands/src/warnings.lua | 28 - old/modules/DONE/ExpAdmin/Jail/control.lua | 51 - old/modules/DONE/ExpAdmin/Jail/softmod.json | 24 - old/modules/DONE/ExpAdmin/Kick/control.lua | 47 - old/modules/DONE/ExpAdmin/Kick/softmod.json | 23 - old/modules/DONE/ExpAdmin/Reports/control.lua | 163 - .../DONE/ExpAdmin/Reports/softmod.json | 25 - .../DONE/ExpAdmin/Teleport/control.lua | 43 - .../DONE/ExpAdmin/Teleport/softmod.json | 22 - old/modules/DONE/ExpAdmin/TempBan/control.lua | 48 - .../DONE/ExpAdmin/TempBan/softmod.json | 24 - .../DONE/ExpAdmin/Warnings/control.lua | 142 - .../DONE/ExpAdmin/Warnings/locale/de.cfg | 11 - .../DONE/ExpAdmin/Warnings/locale/en.cfg | 10 - .../DONE/ExpAdmin/Warnings/locale/fr.cfg | 11 - .../DONE/ExpAdmin/Warnings/locale/nl.cfg | 11 - .../DONE/ExpAdmin/Warnings/locale/sv-SE.cfg | 10 - .../DONE/ExpAdmin/Warnings/softmod.json | 26 - old/modules/DONE/ExpGamingBot/softmod.json | 22 - old/modules/DONE/ExpGamingLib/control.lua | 330 -- old/modules/DONE/ExpGamingLib/softmod.json | 19 - .../DONE/FactorioStdLib/Color/control.lua | 232 - .../DONE/FactorioStdLib/Color/softmod.json | 16 - .../DONE/FactorioStdLib/Game/control.lua | 110 - .../DONE/FactorioStdLib/Game/softmod.json | 16 - .../DONE/FactorioStdLib/String/control.lua | 86 - .../DONE/FactorioStdLib/String/softmod.json | 16 - .../DONE/FactorioStdLib/Table/control.lua | 423 -- .../DONE/FactorioStdLib/Table/softmod.json | 16 - old/modules/DONE/FactorioStdLib/softmod.json | 21 - .../DONE/Guis/ExpGamingAdmin/Gui/control.lua | 202 - .../DONE/Guis/ExpGamingAdmin/Gui/softmod.json | 23 - .../DONE/Guis/ExpGamingAdmin/control.lua | 103 - .../DONE/Guis/ExpGamingAdmin/locale/de.cfg | 15 - .../DONE/Guis/ExpGamingAdmin/locale/en.cfg | 21 - .../DONE/Guis/ExpGamingAdmin/locale/fr.cfg | 15 - .../DONE/Guis/ExpGamingAdmin/locale/nl.cfg | 15 - .../DONE/Guis/ExpGamingAdmin/locale/sv-SE.cfg | 19 - .../DONE/Guis/ExpGamingAdmin/softmod.json | 37 - old/modules/DONE/Guis/Rockets/control.lua | 105 - old/modules/DONE/Guis/Rockets/locale/de.cfg | 12 - old/modules/DONE/Guis/Rockets/locale/en.cfg | 12 - old/modules/DONE/Guis/Rockets/locale/fr.cfg | 12 - old/modules/DONE/Guis/Rockets/locale/nl.cfg | 12 - .../DONE/Guis/Rockets/locale/sv-SE.cfg | 13 - old/modules/DONE/Guis/Rockets/softmod.json | 23 - old/modules/DONE/Guis/Rockets/src/sync.lua | 20 - old/modules/DONE/Guis/Science/control.lua | 106 - old/modules/DONE/Guis/Science/locale/de.cfg | 14 - old/modules/DONE/Guis/Science/locale/en.cfg | 14 - old/modules/DONE/Guis/Science/locale/fr.cfg | 14 - old/modules/DONE/Guis/Science/locale/nl.cfg | 14 - .../DONE/Guis/Science/locale/sv-Se.cfg | 14 - old/modules/DONE/Guis/Science/softmod.json | 24 - old/modules/DONE/Guis/Science/src/sync.lua | 19 - old/modules/DONE/Guis/Tasklist/control.lua | 207 - old/modules/DONE/Guis/Tasklist/locale/de.cfg | 4 - old/modules/DONE/Guis/Tasklist/locale/en.cfg | 4 - old/modules/DONE/Guis/Tasklist/locale/fr.cfg | 4 - old/modules/DONE/Guis/Tasklist/locale/nl.cfg | 4 - .../DONE/Guis/Tasklist/locale/sv-SE.cfg | 4 - old/modules/DONE/Guis/Tasklist/softmod.json | 22 - old/modules/DONE/Guis/playerList/control.lua | 145 - .../DONE/Guis/playerList/locale/de.cfg | 5 - .../DONE/Guis/playerList/locale/en.cfg | 5 - .../DONE/Guis/playerList/locale/fr.cfg | 5 - .../DONE/Guis/playerList/locale/nl.cfg | 5 - .../DONE/Guis/playerList/locale/sv-SE.cfg | 5 - old/modules/DONE/Guis/playerList/softmod.json | 24 - .../DONE/Guis/playerList/src/ranking.lua | 15 - old/modules/DONE/PlayerAutoColor/control.lua | 48 - old/modules/DONE/PlayerAutoColor/softmod.json | 19 - old/modules/DONE/SpawnArea/control.lua | 127 - old/modules/DONE/SpawnArea/softmod.json | 19 - .../DONE/SpawnArea/src/spawn_entities.lua | 16 - .../DONE/SpawnArea/src/spawn_tiles.lua | 109 - old/modules/DONE/WarpPoints/control.lua | 250 - old/modules/DONE/WarpPoints/locale/de.cfg | 9 - old/modules/DONE/WarpPoints/locale/en.cfg | 10 - old/modules/DONE/WarpPoints/locale/fr.cfg | 9 - old/modules/DONE/WarpPoints/locale/nl.cfg | 9 - old/modules/DONE/WarpPoints/locale/sv-SE.cfg | 9 - old/modules/DONE/WarpPoints/softmod.json | 22 - old/modules/DONE/WarpPoints/src/commands.lua | 21 - .../DONE/WarpPoints/src/warp_entities.lua | 5 - .../DONE/WarpPoints/src/warp_tiles.lua | 4 - old/modules/DONE/WornPaths/control.lua | 105 - old/modules/DONE/WornPaths/softmod.json | 19 - old/modules/DONE/WornPaths/src/entites.lua | 31 - old/modules/DONE/WornPaths/src/paths.lua | 27 - old/modules/DONE/WornPaths/src/placed.lua | 9 - old/modules/DeconControl/control.lua | 72 - old/modules/DeconControl/locale/de.cfg | 3 - old/modules/DeconControl/locale/en.cfg | 3 - old/modules/DeconControl/locale/fr.cfg | 3 - old/modules/DeconControl/locale/nl.cfg | 3 - old/modules/DeconControl/locale/sv-SE.cfg | 3 - old/modules/DeconControl/softmod.json | 26 - old/modules/ExpGamingCore/Server/control.lua | 562 --- old/modules/ExpGamingCore/Server/softmod.json | 26 - .../ExpGamingCore/Server/src/commands.lua | 49 - old/modules/ExpGamingCore/Sync/control.lua | 338 -- old/modules/ExpGamingCore/Sync/softmod.json | 27 - old/modules/ExpGamingCore/Sync/src/gui.lua | 106 - old/modules/ExpGamingCore/Sync/src/logo.png | Bin 15942 -> 0 bytes old/modules/ExpGamingCore/softmod.json | 24 - old/modules/ExpGamingInfo/Readme/control.lua | 132 - .../ExpGamingInfo/Readme/locale/de.cfg | 68 - .../ExpGamingInfo/Readme/locale/en.cfg | 69 - .../ExpGamingInfo/Readme/locale/fr.cfg | 68 - .../ExpGamingInfo/Readme/locale/nl.cfg | 68 - .../ExpGamingInfo/Readme/locale/sv-SE.cfg | 69 - old/modules/ExpGamingInfo/Readme/softmod.json | 23 - old/modules/ExpGamingInfo/Readme/src/sync.lua | 14 - old/modules/ExpGamingInfo/softmod.json | 21 - .../ExpGamingPlayer/afkKick/control.lua | 37 - .../ExpGamingPlayer/afkKick/softmod.json | 22 - .../ExpGamingPlayer/afkKick/src/server.lua | 29 - .../inventorySearch/control.lua | 92 - .../inventorySearch/locale/de.cfg | 4 - .../inventorySearch/locale/en.cfg | 4 - .../inventorySearch/locale/fr.cfg | 4 - .../inventorySearch/locale/nl.cfg | 4 - .../inventorySearch/locale/sv-SE.cfg | 4 - .../inventorySearch/softmod.json | 22 - .../ExpGamingPlayer/playerInfo/control.lua | 58 - .../ExpGamingPlayer/playerInfo/locale/de.cfg | 8 - .../ExpGamingPlayer/playerInfo/locale/en.cfg | 9 - .../ExpGamingPlayer/playerInfo/locale/fr.cfg | 8 - .../ExpGamingPlayer/playerInfo/locale/nl.cfg | 8 - .../playerInfo/locale/sv-SE.cfg | 8 - .../ExpGamingPlayer/playerInfo/softmod.json | 21 - old/modules/ExpGamingPlayer/polls/control.lua | 274 -- .../ExpGamingPlayer/polls/locale/de.cfg | 7 - .../ExpGamingPlayer/polls/locale/en.cfg | 7 - .../ExpGamingPlayer/polls/locale/fr.cfg | 7 - .../ExpGamingPlayer/polls/locale/nl.cfg | 7 - .../ExpGamingPlayer/polls/locale/sv-SE.cfg | 7 - .../ExpGamingPlayer/polls/softmod.json | 19 - old/modules/ExpGamingPlayer/softmod.json | 23 - old/modules/GameSettingsGui/control.lua | 193 - old/modules/GameSettingsGui/locale/de.cfg | 31 - old/modules/GameSettingsGui/locale/en.cfg | 32 - old/modules/GameSettingsGui/locale/fr.cfg | 31 - old/modules/GameSettingsGui/locale/nl.cfg | 31 - old/modules/GameSettingsGui/locale/sv-SE.cfg | 31 - old/modules/GameSettingsGui/softmod.json | 21 - old/modules/GuiAnnouncements/control.lua | 110 - old/modules/GuiAnnouncements/locale/de.cfg | 6 - old/modules/GuiAnnouncements/locale/en.cfg | 6 - old/modules/GuiAnnouncements/locale/fr.cfg | 6 - old/modules/GuiAnnouncements/locale/nl.cfg | 6 - old/modules/GuiAnnouncements/locale/sv-SE.cfg | 7 - old/modules/GuiAnnouncements/softmod.json | 20 - old/modules/index.lua | 67 - old/modules/softmod.json | 33 - 409 files changed, 21360 insertions(+), 23447 deletions(-) create mode 100644 doc/control/Jail.html create mode 100644 doc/control/Production.html create mode 100644 doc/control/Reports.html create mode 100644 doc/control/Warnings.html create mode 100644 doc/modules/Production.html create mode 100644 doc/modules/modules.control.production.html create mode 100644 doc/modules/modules.control.reports.html create mode 100644 doc/modules/modules.control.warnings.html create mode 100644 modules/control/production.lua delete mode 100644 old/locale/en/DeconControl.cfg delete mode 100644 old/locale/en/ExpGamingAdmin.AdminLib.cfg delete mode 100644 old/locale/en/ExpGamingAdmin.Warnings.cfg delete mode 100644 old/locale/en/ExpGamingAdmin.cfg delete mode 100644 old/locale/en/ExpGamingBot.autoChat.cfg delete mode 100644 old/locale/en/ExpGamingBot.autoMessage.cfg delete mode 100644 old/locale/en/ExpGamingCommands.home.cfg delete mode 100644 old/locale/en/ExpGamingCore.Command.cfg delete mode 100644 old/locale/en/ExpGamingCore.Gui.cfg delete mode 100644 old/locale/en/ExpGamingCore.Ranking.cfg delete mode 100644 old/locale/en/ExpGamingCore.Role.cfg delete mode 100644 old/locale/en/ExpGamingCore.Server.cfg delete mode 100644 old/locale/en/ExpGamingInfo.Readme.cfg delete mode 100644 old/locale/en/ExpGamingInfo.Rockets.cfg delete mode 100644 old/locale/en/ExpGamingInfo.Science.cfg delete mode 100644 old/locale/en/ExpGamingInfo.Tasklist.cfg delete mode 100644 old/locale/en/ExpGamingPlayer.inventorySearch.cfg delete mode 100644 old/locale/en/ExpGamingPlayer.playerInfo.cfg delete mode 100644 old/locale/en/ExpGamingPlayer.playerList.cfg delete mode 100644 old/locale/en/ExpGamingPlayer.polls.cfg delete mode 100644 old/locale/en/GameSettingsGui.cfg delete mode 100644 old/locale/en/GuiAnnouncements.cfg delete mode 100644 old/locale/en/WarpPoints.cfg delete mode 100644 old/locale/fr/DeconControl.cfg delete mode 100644 old/locale/fr/ExpGamingAdmin.AdminLib.cfg delete mode 100644 old/locale/fr/ExpGamingAdmin.Warnings.cfg delete mode 100644 old/locale/fr/ExpGamingAdmin.cfg delete mode 100644 old/locale/fr/ExpGamingBot.autoChat.cfg delete mode 100644 old/locale/fr/ExpGamingBot.autoMessage.cfg delete mode 100644 old/locale/fr/ExpGamingCore.Command.cfg delete mode 100644 old/locale/fr/ExpGamingCore.Commands.cfg delete mode 100644 old/locale/fr/ExpGamingCore.Gui.cfg delete mode 100644 old/locale/fr/ExpGamingCore.Ranking.cfg delete mode 100644 old/locale/fr/ExpGamingInfo.Readme.cfg delete mode 100644 old/locale/fr/ExpGamingInfo.Rockets.cfg delete mode 100644 old/locale/fr/ExpGamingInfo.Science.cfg delete mode 100644 old/locale/fr/ExpGamingInfo.Tasklist.cfg delete mode 100644 old/locale/fr/ExpGamingPlayer.inventorySearch.cfg delete mode 100644 old/locale/fr/ExpGamingPlayer.playerInfo.cfg delete mode 100644 old/locale/fr/ExpGamingPlayer.playerList.cfg delete mode 100644 old/locale/fr/ExpGamingPlayer.polls.cfg delete mode 100644 old/locale/fr/GameSettingsGui.cfg delete mode 100644 old/locale/fr/GuiAnnouncements.cfg delete mode 100644 old/locale/fr/WarpPoints.cfg delete mode 100644 old/locale/nl/DeconControl.cfg delete mode 100644 old/locale/nl/ExpGamingAdmin.AdminLib.cfg delete mode 100644 old/locale/nl/ExpGamingAdmin.Warnings.cfg delete mode 100644 old/locale/nl/ExpGamingAdmin.cfg delete mode 100644 old/locale/nl/ExpGamingBot.autoChat.cfg delete mode 100644 old/locale/nl/ExpGamingBot.autoMessage.cfg delete mode 100644 old/locale/nl/ExpGamingCore.Command.cfg delete mode 100644 old/locale/nl/ExpGamingCore.Commands.cfg delete mode 100644 old/locale/nl/ExpGamingCore.Gui.cfg delete mode 100644 old/locale/nl/ExpGamingCore.Ranking.cfg delete mode 100644 old/locale/nl/ExpGamingInfo.Readme.cfg delete mode 100644 old/locale/nl/ExpGamingInfo.Rockets.cfg delete mode 100644 old/locale/nl/ExpGamingInfo.Science.cfg delete mode 100644 old/locale/nl/ExpGamingInfo.Tasklist.cfg delete mode 100644 old/locale/nl/ExpGamingPlayer.inventorySearch.cfg delete mode 100644 old/locale/nl/ExpGamingPlayer.playerInfo.cfg delete mode 100644 old/locale/nl/ExpGamingPlayer.playerList.cfg delete mode 100644 old/locale/nl/ExpGamingPlayer.polls.cfg delete mode 100644 old/locale/nl/GameSettingsGui.cfg delete mode 100644 old/locale/nl/GuiAnnouncements.cfg delete mode 100644 old/locale/nl/WarpPoints.cfg delete mode 100644 old/locale/sv-SE/DeconControl.cfg delete mode 100644 old/locale/sv-SE/ExpGamingAdmin.AdminLib.cfg delete mode 100644 old/locale/sv-SE/ExpGamingAdmin.Warnings.cfg delete mode 100644 old/locale/sv-SE/ExpGamingAdmin.cfg delete mode 100644 old/locale/sv-SE/ExpGamingBot.autoChat.cfg delete mode 100644 old/locale/sv-SE/ExpGamingBot.autoMessage.cfg delete mode 100644 old/locale/sv-SE/ExpGamingCore.Command.cfg delete mode 100644 old/locale/sv-SE/ExpGamingCore.Commands.cfg delete mode 100644 old/locale/sv-SE/ExpGamingCore.Gui.cfg delete mode 100644 old/locale/sv-SE/ExpGamingCore.Ranking.cfg delete mode 100644 old/locale/sv-SE/ExpGamingInfo.Readme.cfg delete mode 100644 old/locale/sv-SE/ExpGamingInfo.Rockets.cfg delete mode 100644 old/locale/sv-SE/ExpGamingInfo.Science.cfg delete mode 100644 old/locale/sv-SE/ExpGamingInfo.Tasklist.cfg delete mode 100644 old/locale/sv-SE/ExpGamingPlayer.inventorySearch.cfg delete mode 100644 old/locale/sv-SE/ExpGamingPlayer.playerInfo.cfg delete mode 100644 old/locale/sv-SE/ExpGamingPlayer.playerList.cfg delete mode 100644 old/locale/sv-SE/ExpGamingPlayer.polls.cfg delete mode 100644 old/locale/sv-SE/GameSettingsGui.cfg delete mode 100644 old/locale/sv-SE/GuiAnnouncements.cfg delete mode 100644 old/locale/sv-SE/WarpPoints.cfg delete mode 100644 old/modules/DONE/AdvancedStartingItems/control.lua delete mode 100644 old/modules/DONE/AdvancedStartingItems/softmod.json delete mode 100644 old/modules/DONE/Bot/autoChat/control.lua delete mode 100644 old/modules/DONE/Bot/autoChat/locale/de.cfg delete mode 100644 old/modules/DONE/Bot/autoChat/locale/en.cfg delete mode 100644 old/modules/DONE/Bot/autoChat/locale/fr.cfg delete mode 100644 old/modules/DONE/Bot/autoChat/locale/nl.cfg delete mode 100644 old/modules/DONE/Bot/autoChat/locale/sv-SE.cfg delete mode 100644 old/modules/DONE/Bot/autoChat/softmod.json delete mode 100644 old/modules/DONE/Bot/autoMessage/control.lua delete mode 100644 old/modules/DONE/Bot/autoMessage/locale/de.cfg delete mode 100644 old/modules/DONE/Bot/autoMessage/locale/en.cfg delete mode 100644 old/modules/DONE/Bot/autoMessage/locale/fr.cfg delete mode 100644 old/modules/DONE/Bot/autoMessage/locale/nl.cfg delete mode 100644 old/modules/DONE/Bot/autoMessage/locale/sv-SE.cfg delete mode 100644 old/modules/DONE/Bot/autoMessage/softmod.json delete mode 100644 old/modules/DONE/Bot/discordAlerts/control.lua delete mode 100644 old/modules/DONE/Bot/discordAlerts/softmod.json delete mode 100644 old/modules/DONE/ChatPopup/control.lua delete mode 100644 old/modules/DONE/ChatPopup/softmod.json delete mode 100644 old/modules/DONE/Commands/ExpGamingCommands/softmod.json delete mode 100644 old/modules/DONE/Commands/cheatMode/control.lua delete mode 100644 old/modules/DONE/Commands/cheatMode/softmod.json delete mode 100644 old/modules/DONE/Commands/home/control.lua delete mode 100644 old/modules/DONE/Commands/home/locale/en.cfg delete mode 100644 old/modules/DONE/Commands/home/softmod.json delete mode 100644 old/modules/DONE/Commands/kill/control.lua delete mode 100644 old/modules/DONE/Commands/kill/softmod.json delete mode 100644 old/modules/DONE/Commands/repair/control.lua delete mode 100644 old/modules/DONE/Commands/repair/softmod.json delete mode 100644 old/modules/DONE/Commands/repair/src/tempban.lua delete mode 100644 old/modules/DONE/Commands/tags/control.lua delete mode 100644 old/modules/DONE/Commands/tags/softmod.json delete mode 100644 old/modules/DONE/Commands/teleport/control.lua delete mode 100644 old/modules/DONE/Commands/teleport/softmod.json delete mode 100644 old/modules/DONE/Core/Command/control.lua delete mode 100644 old/modules/DONE/Core/Command/softmod.json delete mode 100644 old/modules/DONE/Core/Group/config.lua delete mode 100644 old/modules/DONE/Core/Group/control.lua delete mode 100644 old/modules/DONE/Core/Group/softmod.json delete mode 100644 old/modules/DONE/Core/Gui/center/control.lua delete mode 100644 old/modules/DONE/Core/Gui/center/softmod.json delete mode 100644 old/modules/DONE/Core/Gui/control.lua delete mode 100644 old/modules/DONE/Core/Gui/inputs/control.lua delete mode 100644 old/modules/DONE/Core/Gui/inputs/softmod.json delete mode 100644 old/modules/DONE/Core/Gui/left/control.lua delete mode 100644 old/modules/DONE/Core/Gui/left/order_config.lua delete mode 100644 old/modules/DONE/Core/Gui/left/softmod.json delete mode 100644 old/modules/DONE/Core/Gui/locale/de.cfg delete mode 100644 old/modules/DONE/Core/Gui/locale/en.cfg delete mode 100644 old/modules/DONE/Core/Gui/locale/fr.cfg delete mode 100644 old/modules/DONE/Core/Gui/locale/nl.cfg delete mode 100644 old/modules/DONE/Core/Gui/locale/sv-SE.cfg delete mode 100644 old/modules/DONE/Core/Gui/popup/control.lua delete mode 100644 old/modules/DONE/Core/Gui/popup/softmod.json delete mode 100644 old/modules/DONE/Core/Gui/softmod.json delete mode 100644 old/modules/DONE/Core/Gui/src/server.lua delete mode 100644 old/modules/DONE/Core/Gui/src/test.lua delete mode 100644 old/modules/DONE/Core/Gui/toolbar/control.lua delete mode 100644 old/modules/DONE/Core/Gui/toolbar/order_config.lua delete mode 100644 old/modules/DONE/Core/Gui/toolbar/softmod.json delete mode 100644 old/modules/DONE/Core/Role/config.lua delete mode 100644 old/modules/DONE/Core/Role/control.lua delete mode 100644 old/modules/DONE/Core/Role/locale/en.cfg delete mode 100644 old/modules/DONE/Core/Role/softmod.json delete mode 100644 old/modules/DONE/Core/Role/src/commands.lua delete mode 100644 old/modules/DONE/Core/Role/src/sync.lua delete mode 100644 old/modules/DONE/DamagePopup/control.lua delete mode 100644 old/modules/DONE/DamagePopup/softmod.json delete mode 100644 old/modules/DONE/DeathMarkers/control.lua delete mode 100644 old/modules/DONE/DeathMarkers/softmod.json delete mode 100644 old/modules/DONE/ExpAdmin/Ban/control.lua delete mode 100644 old/modules/DONE/ExpAdmin/Ban/softmod.json delete mode 100644 old/modules/DONE/ExpAdmin/ClearInventory/control.lua delete mode 100644 old/modules/DONE/ExpAdmin/ClearInventory/softmod.json delete mode 100644 old/modules/DONE/ExpAdmin/Commands/control.lua delete mode 100644 old/modules/DONE/ExpAdmin/Commands/softmod.json delete mode 100644 old/modules/DONE/ExpAdmin/Commands/src/clear.lua delete mode 100644 old/modules/DONE/ExpAdmin/Commands/src/jail.lua delete mode 100644 old/modules/DONE/ExpAdmin/Commands/src/reports.lua delete mode 100644 old/modules/DONE/ExpAdmin/Commands/src/tempban.lua delete mode 100644 old/modules/DONE/ExpAdmin/Commands/src/warnings.lua delete mode 100644 old/modules/DONE/ExpAdmin/Jail/control.lua delete mode 100644 old/modules/DONE/ExpAdmin/Jail/softmod.json delete mode 100644 old/modules/DONE/ExpAdmin/Kick/control.lua delete mode 100644 old/modules/DONE/ExpAdmin/Kick/softmod.json delete mode 100644 old/modules/DONE/ExpAdmin/Reports/control.lua delete mode 100644 old/modules/DONE/ExpAdmin/Reports/softmod.json delete mode 100644 old/modules/DONE/ExpAdmin/Teleport/control.lua delete mode 100644 old/modules/DONE/ExpAdmin/Teleport/softmod.json delete mode 100644 old/modules/DONE/ExpAdmin/TempBan/control.lua delete mode 100644 old/modules/DONE/ExpAdmin/TempBan/softmod.json delete mode 100644 old/modules/DONE/ExpAdmin/Warnings/control.lua delete mode 100644 old/modules/DONE/ExpAdmin/Warnings/locale/de.cfg delete mode 100644 old/modules/DONE/ExpAdmin/Warnings/locale/en.cfg delete mode 100644 old/modules/DONE/ExpAdmin/Warnings/locale/fr.cfg delete mode 100644 old/modules/DONE/ExpAdmin/Warnings/locale/nl.cfg delete mode 100644 old/modules/DONE/ExpAdmin/Warnings/locale/sv-SE.cfg delete mode 100644 old/modules/DONE/ExpAdmin/Warnings/softmod.json delete mode 100644 old/modules/DONE/ExpGamingBot/softmod.json delete mode 100644 old/modules/DONE/ExpGamingLib/control.lua delete mode 100644 old/modules/DONE/ExpGamingLib/softmod.json delete mode 100644 old/modules/DONE/FactorioStdLib/Color/control.lua delete mode 100644 old/modules/DONE/FactorioStdLib/Color/softmod.json delete mode 100644 old/modules/DONE/FactorioStdLib/Game/control.lua delete mode 100644 old/modules/DONE/FactorioStdLib/Game/softmod.json delete mode 100644 old/modules/DONE/FactorioStdLib/String/control.lua delete mode 100644 old/modules/DONE/FactorioStdLib/String/softmod.json delete mode 100644 old/modules/DONE/FactorioStdLib/Table/control.lua delete mode 100644 old/modules/DONE/FactorioStdLib/Table/softmod.json delete mode 100644 old/modules/DONE/FactorioStdLib/softmod.json delete mode 100644 old/modules/DONE/Guis/ExpGamingAdmin/Gui/control.lua delete mode 100644 old/modules/DONE/Guis/ExpGamingAdmin/Gui/softmod.json delete mode 100644 old/modules/DONE/Guis/ExpGamingAdmin/control.lua delete mode 100644 old/modules/DONE/Guis/ExpGamingAdmin/locale/de.cfg delete mode 100644 old/modules/DONE/Guis/ExpGamingAdmin/locale/en.cfg delete mode 100644 old/modules/DONE/Guis/ExpGamingAdmin/locale/fr.cfg delete mode 100644 old/modules/DONE/Guis/ExpGamingAdmin/locale/nl.cfg delete mode 100644 old/modules/DONE/Guis/ExpGamingAdmin/locale/sv-SE.cfg delete mode 100644 old/modules/DONE/Guis/ExpGamingAdmin/softmod.json delete mode 100644 old/modules/DONE/Guis/Rockets/control.lua delete mode 100644 old/modules/DONE/Guis/Rockets/locale/de.cfg delete mode 100644 old/modules/DONE/Guis/Rockets/locale/en.cfg delete mode 100644 old/modules/DONE/Guis/Rockets/locale/fr.cfg delete mode 100644 old/modules/DONE/Guis/Rockets/locale/nl.cfg delete mode 100644 old/modules/DONE/Guis/Rockets/locale/sv-SE.cfg delete mode 100644 old/modules/DONE/Guis/Rockets/softmod.json delete mode 100644 old/modules/DONE/Guis/Rockets/src/sync.lua delete mode 100644 old/modules/DONE/Guis/Science/control.lua delete mode 100644 old/modules/DONE/Guis/Science/locale/de.cfg delete mode 100644 old/modules/DONE/Guis/Science/locale/en.cfg delete mode 100644 old/modules/DONE/Guis/Science/locale/fr.cfg delete mode 100644 old/modules/DONE/Guis/Science/locale/nl.cfg delete mode 100644 old/modules/DONE/Guis/Science/locale/sv-Se.cfg delete mode 100644 old/modules/DONE/Guis/Science/softmod.json delete mode 100644 old/modules/DONE/Guis/Science/src/sync.lua delete mode 100644 old/modules/DONE/Guis/Tasklist/control.lua delete mode 100644 old/modules/DONE/Guis/Tasklist/locale/de.cfg delete mode 100644 old/modules/DONE/Guis/Tasklist/locale/en.cfg delete mode 100644 old/modules/DONE/Guis/Tasklist/locale/fr.cfg delete mode 100644 old/modules/DONE/Guis/Tasklist/locale/nl.cfg delete mode 100644 old/modules/DONE/Guis/Tasklist/locale/sv-SE.cfg delete mode 100644 old/modules/DONE/Guis/Tasklist/softmod.json delete mode 100644 old/modules/DONE/Guis/playerList/control.lua delete mode 100644 old/modules/DONE/Guis/playerList/locale/de.cfg delete mode 100644 old/modules/DONE/Guis/playerList/locale/en.cfg delete mode 100644 old/modules/DONE/Guis/playerList/locale/fr.cfg delete mode 100644 old/modules/DONE/Guis/playerList/locale/nl.cfg delete mode 100644 old/modules/DONE/Guis/playerList/locale/sv-SE.cfg delete mode 100644 old/modules/DONE/Guis/playerList/softmod.json delete mode 100644 old/modules/DONE/Guis/playerList/src/ranking.lua delete mode 100644 old/modules/DONE/PlayerAutoColor/control.lua delete mode 100644 old/modules/DONE/PlayerAutoColor/softmod.json delete mode 100644 old/modules/DONE/SpawnArea/control.lua delete mode 100644 old/modules/DONE/SpawnArea/softmod.json delete mode 100644 old/modules/DONE/SpawnArea/src/spawn_entities.lua delete mode 100644 old/modules/DONE/SpawnArea/src/spawn_tiles.lua delete mode 100644 old/modules/DONE/WarpPoints/control.lua delete mode 100644 old/modules/DONE/WarpPoints/locale/de.cfg delete mode 100644 old/modules/DONE/WarpPoints/locale/en.cfg delete mode 100644 old/modules/DONE/WarpPoints/locale/fr.cfg delete mode 100644 old/modules/DONE/WarpPoints/locale/nl.cfg delete mode 100644 old/modules/DONE/WarpPoints/locale/sv-SE.cfg delete mode 100644 old/modules/DONE/WarpPoints/softmod.json delete mode 100644 old/modules/DONE/WarpPoints/src/commands.lua delete mode 100644 old/modules/DONE/WarpPoints/src/warp_entities.lua delete mode 100644 old/modules/DONE/WarpPoints/src/warp_tiles.lua delete mode 100644 old/modules/DONE/WornPaths/control.lua delete mode 100644 old/modules/DONE/WornPaths/softmod.json delete mode 100644 old/modules/DONE/WornPaths/src/entites.lua delete mode 100644 old/modules/DONE/WornPaths/src/paths.lua delete mode 100644 old/modules/DONE/WornPaths/src/placed.lua delete mode 100644 old/modules/DeconControl/control.lua delete mode 100644 old/modules/DeconControl/locale/de.cfg delete mode 100644 old/modules/DeconControl/locale/en.cfg delete mode 100644 old/modules/DeconControl/locale/fr.cfg delete mode 100644 old/modules/DeconControl/locale/nl.cfg delete mode 100644 old/modules/DeconControl/locale/sv-SE.cfg delete mode 100644 old/modules/DeconControl/softmod.json delete mode 100644 old/modules/ExpGamingCore/Server/control.lua delete mode 100644 old/modules/ExpGamingCore/Server/softmod.json delete mode 100644 old/modules/ExpGamingCore/Server/src/commands.lua delete mode 100644 old/modules/ExpGamingCore/Sync/control.lua delete mode 100644 old/modules/ExpGamingCore/Sync/softmod.json delete mode 100644 old/modules/ExpGamingCore/Sync/src/gui.lua delete mode 100644 old/modules/ExpGamingCore/Sync/src/logo.png delete mode 100644 old/modules/ExpGamingCore/softmod.json delete mode 100644 old/modules/ExpGamingInfo/Readme/control.lua delete mode 100644 old/modules/ExpGamingInfo/Readme/locale/de.cfg delete mode 100644 old/modules/ExpGamingInfo/Readme/locale/en.cfg delete mode 100644 old/modules/ExpGamingInfo/Readme/locale/fr.cfg delete mode 100644 old/modules/ExpGamingInfo/Readme/locale/nl.cfg delete mode 100644 old/modules/ExpGamingInfo/Readme/locale/sv-SE.cfg delete mode 100644 old/modules/ExpGamingInfo/Readme/softmod.json delete mode 100644 old/modules/ExpGamingInfo/Readme/src/sync.lua delete mode 100644 old/modules/ExpGamingInfo/softmod.json delete mode 100644 old/modules/ExpGamingPlayer/afkKick/control.lua delete mode 100644 old/modules/ExpGamingPlayer/afkKick/softmod.json delete mode 100644 old/modules/ExpGamingPlayer/afkKick/src/server.lua delete mode 100644 old/modules/ExpGamingPlayer/inventorySearch/control.lua delete mode 100644 old/modules/ExpGamingPlayer/inventorySearch/locale/de.cfg delete mode 100644 old/modules/ExpGamingPlayer/inventorySearch/locale/en.cfg delete mode 100644 old/modules/ExpGamingPlayer/inventorySearch/locale/fr.cfg delete mode 100644 old/modules/ExpGamingPlayer/inventorySearch/locale/nl.cfg delete mode 100644 old/modules/ExpGamingPlayer/inventorySearch/locale/sv-SE.cfg delete mode 100644 old/modules/ExpGamingPlayer/inventorySearch/softmod.json delete mode 100644 old/modules/ExpGamingPlayer/playerInfo/control.lua delete mode 100644 old/modules/ExpGamingPlayer/playerInfo/locale/de.cfg delete mode 100644 old/modules/ExpGamingPlayer/playerInfo/locale/en.cfg delete mode 100644 old/modules/ExpGamingPlayer/playerInfo/locale/fr.cfg delete mode 100644 old/modules/ExpGamingPlayer/playerInfo/locale/nl.cfg delete mode 100644 old/modules/ExpGamingPlayer/playerInfo/locale/sv-SE.cfg delete mode 100644 old/modules/ExpGamingPlayer/playerInfo/softmod.json delete mode 100644 old/modules/ExpGamingPlayer/polls/control.lua delete mode 100644 old/modules/ExpGamingPlayer/polls/locale/de.cfg delete mode 100644 old/modules/ExpGamingPlayer/polls/locale/en.cfg delete mode 100644 old/modules/ExpGamingPlayer/polls/locale/fr.cfg delete mode 100644 old/modules/ExpGamingPlayer/polls/locale/nl.cfg delete mode 100644 old/modules/ExpGamingPlayer/polls/locale/sv-SE.cfg delete mode 100644 old/modules/ExpGamingPlayer/polls/softmod.json delete mode 100644 old/modules/ExpGamingPlayer/softmod.json delete mode 100644 old/modules/GameSettingsGui/control.lua delete mode 100644 old/modules/GameSettingsGui/locale/de.cfg delete mode 100644 old/modules/GameSettingsGui/locale/en.cfg delete mode 100644 old/modules/GameSettingsGui/locale/fr.cfg delete mode 100644 old/modules/GameSettingsGui/locale/nl.cfg delete mode 100644 old/modules/GameSettingsGui/locale/sv-SE.cfg delete mode 100644 old/modules/GameSettingsGui/softmod.json delete mode 100644 old/modules/GuiAnnouncements/control.lua delete mode 100644 old/modules/GuiAnnouncements/locale/de.cfg delete mode 100644 old/modules/GuiAnnouncements/locale/en.cfg delete mode 100644 old/modules/GuiAnnouncements/locale/fr.cfg delete mode 100644 old/modules/GuiAnnouncements/locale/nl.cfg delete mode 100644 old/modules/GuiAnnouncements/locale/sv-SE.cfg delete mode 100644 old/modules/GuiAnnouncements/softmod.json delete mode 100644 old/modules/index.lua delete mode 100644 old/modules/softmod.json diff --git a/config/action_buttons.lua b/config/action_buttons.lua index f48606d3..5230d5f5 100644 --- a/config/action_buttons.lua +++ b/config/action_buttons.lua @@ -8,7 +8,7 @@ local Roles = require 'expcore.roles' local Store = require 'expcore.store' local Game = require 'utils.game' local Reports = require 'modules.control.reports' -local Warnings = require 'modules.addons.warnings' +local Warnings = require 'modules.control.warnings' local Jail = require 'modules.control.jail' local Colors = require 'resources.color_presets' local format_chat_player_name = ext_require('expcore.common','format_chat_player_name') diff --git a/config/science.lua b/config/science.lua index 3cd3ce5f..f3ee8939 100644 --- a/config/science.lua +++ b/config/science.lua @@ -1,8 +1,8 @@ -- config file for the science info gui return { -- list of all science packs to be shown in the gui show_eta=true, -- when true the eta for research completion will be shown - required_for_green=5, -- the amount required for the text to show as green - required_for_red=-5, -- the amount required for the text to show as red + color_clamp=5, -- the amount required for the text to show as green or red + color_flux=0.1, -- the ammount of flucuation allowed in production before icon change 'automation-science-pack', 'logistic-science-pack', 'military-science-pack', diff --git a/doc/config.ld b/doc/config.ld index fdaec597..79ac9eed 100644 --- a/doc/config.ld +++ b/doc/config.ld @@ -5,15 +5,25 @@ title = 'ExpGaming Scenario' description = 'Explosive Gaming\'s server scenario for 0.17' convert_opt = true -sort = true +sort = false not_luadoc = true no_lua_ref = true template_escape = ">" topics = {"../README.md", "../LICENSE"} style = '../doc' template = '../doc' +no_space_before_args = true +new_type("core", "Core", true) +new_type("addon", "Addons", true) +new_type("commands", "Commands", true) +new_type("control", "Control", true) +new_type("gui", "Guis", true) +new_type("config", "Configs", true) + +new_type("dep", "Dependencies", false) new_type("event", "Events", false, "Event Parameters") +new_type("command", "Commands", false, "Command Parameters") local api_url = "http://lua-api.factorio.com/latest/%s.html%s" diff --git a/doc/control/Jail.html b/doc/control/Jail.html new file mode 100644 index 00000000..d9623087 --- /dev/null +++ b/doc/control/Jail.html @@ -0,0 +1,1169 @@ + + + + + + + + Jail control + + + + + + + +
+
+ + + + + + + +
+ + + + + + + + +

Jail control

+

Control Module - Jail + - Adds a way to jail players and temp ban players.

+

+ + + + + + +

Usage

+ 

+    -- import the module from the control modules
+    local Jail = require 'modules.control.jail'
+
+    -- This will move 'MrBiter' to the jail role and remove all other roles from them
+    -- the player name and reason are only so they can be included in the event for user feedback
+    Jail.jail_player('MrBiter','Cooldude2606','Likes biters too much')
+
+    -- 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')
+ + + + + + + +

Dependencies

+ + + + + + + + + + + + + + + + + + + + +
expcore.rolesAllows moving players into the jail role
utils.gameAllows accessing a player from any value
utils.globalAllows storing data in the global table
expcore.commonUse of move_items to clear inventroies
+ + +

Events

+ + + + + + + + + + + + + + + + + + + + +
on_player_jailedWhen a player is assigned to jail
on_player_unjailedWhen a player is unassigned from jail
on_player_temp_bannedWhen a player is temp banned
on_player_untemp_bannedWhen a temp ban is removed from a player
+ + +

Jail

+ + + + + + + + + + + + + + + + +
is_jailed(player)Checks if the player is currently in jail
jail_player(player, by_player_name[, reason='Non given.'])Moves a player to jail and removes all other roles
unjail_player(player, by_player_name)Moves a player out of jail and restores all roles previously removed
+ + +

Temp ban

+ + + + + + + + + + + + + + + + +
is_temp_banned(player)Checks if a player is temp banned
temp_ban_player(player, by_player_name[, reason='Non given.'])Temp bans a player by moving them to jail, clearing all other roles, storing the reason, and moving their items to spawn
untemp_ban_player(player, by_player_name)Rrmoves a player from temp ban by clearing the stored reason, removing them from jail, and restoring previous roles
+ + +
+ + +

Dependencies

+
+
+
+
+ # + expcore.roles +
+
+
+
+ +

Allows moving players into the jail role

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + utils.game +
+
+
+
+ +

Allows accessing a player from any value

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + utils.global +
+
+
+
+ +

Allows storing data in the global table

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + expcore.common +
+
+
+
+ +

Use of move_items to clear inventroies

+

+ + + + + + + + + + + + + + +
+
+

Events

+
+
+
+
+ # + on_player_jailed +
+
+
+
+ +

When a player is assigned to jail

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the index of the player who was jailed + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who jailed the other player + +
    • + + + + + +
  • + + reason + + : + + (string) + + the reason that the player was jailed + +
    • + + +
+ + + + + + + + + + + + + +
+
+
+
+ # + on_player_unjailed +
+
+
+
+ +

When a player is unassigned from jail

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the index of the player who was unjailed + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who unjailed the other player + +
    • + + +
+ + + + + + + + + + + + + +
+
+
+
+ # + on_player_temp_banned +
+
+
+
+ +

When a player is temp banned

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the index of the player who was temp banned + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who temp banned the other player + +
    • + + + + + +
  • + + reason + + : + + (string) + + the reason that the player was temp banned + +
    • + + +
+ + + + + + + + + + + + + +
+
+
+
+ # + on_player_untemp_banned +
+
+
+
+ +

When a temp ban is removed from a player

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the index of the player who was untemp banned + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who untemp banned the other player + +
    • + + +
+ + + + + + + + + + + + + +
+
+

Jail

+
+
+
+
+ # + is_jailed(player) +
+
+
+
+ +

Checks if the player is currently in jail

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to check if they are in jail + +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + whether the player is currently in jail +
    • +
+ + + + + + + + + +
+
+
+
+ # + jail_player(player, by_player_name[, reason='Non given.']) +
+
+
+
+ +

Moves a player to jail and removes all other roles

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player who will be jailed + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who is doing the jailing + +
    • + + + + + +
  • + + reason + + : + + (string) + + the reason that the player is being jailed + + (default: 'Non given.') +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + wheather the user was jailed successfully +
    • +
+ + + + + + + + + +
+
+
+
+ # + unjail_player(player, by_player_name) +
+
+
+
+ +

Moves a player out of jail and restores all roles previously removed

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player that will be unjailed + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player that is doing the unjail + +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + whether the player was unjailed successfully +
    • +
+ + + + + + + + + +
+
+

Temp ban

+
+
+
+
+ # + is_temp_banned(player) +
+
+
+
+ +

Checks if a player is temp banned

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to check if they are temp banned + +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + whether the player is temp banned +
    • +
+ + + + + + + + + +
+
+
+
+ # + temp_ban_player(player, by_player_name[, reason='Non given.']) +
+
+
+
+ +

Temp bans a player by moving them to jail, clearing all other roles, storing the reason, and moving their items to spawn

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player that will be temp banned + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who is doing the temp ban + +
    • + + + + + +
  • + + reason + + : + + (string) + + the reason that the player is being temp banned + + (default: 'Non given.') +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + whether the player was successfully temp banned +
    • +
+ + + + + + + + + +
+
+
+
+ # + untemp_ban_player(player, by_player_name) +
+
+
+
+ +

Rrmoves a player from temp ban by clearing the stored reason, removing them from jail, and restoring previous roles

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player who is being removed from temp ban + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who is doing the untemp ban + +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + whether the player was successfully removed +
    • +
+ + + + + + + + + +
+
+ + + +
+
+
+ +
+
+
+
+ generated by LDoc +
+
+ Last updated 2019-07-20 23:44:09 UTC +
+
+
+ + diff --git a/doc/control/Production.html b/doc/control/Production.html new file mode 100644 index 00000000..96469f11 --- /dev/null +++ b/doc/control/Production.html @@ -0,0 +1,1284 @@ + + + + + + + + Production control + + + + + + + +
+
+ + + + + + + +
+ + + + + + + + +

Production control

+

Control Module - Production + - Common functions used to track production of items

+

+ + + + + + +

Usage

+ 

+    -- import the module from the control modules
+    local Production = require 'modules.control.production'
+
+    -- This will return the less precise index from the one given
+    -- this means that one_second will return one_minute or ten_hours will return fifty_hours
+    -- the other precision work like wise
+    Production.precision_up(defines.flow_precision_index.one_second)
+
+    -- The get production function is used to get production, consumion and net
+    -- it may be used for any item and with any precision level, use total for total
+    Production.get_production(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute)
+
+    -- The fluctuations works by compearing recent production with the average over time
+    -- again any precision may be used, apart from one_thousand_hours as there would be no valid average
+    Production.get_fluctuations(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute)
+
+    -- ETA is calculated based on what function you use but all share a similar method
+    -- for production eta it will take current production average given by the precision
+    -- and work out how many ticks it will require to make the required amount (1000 by default)
+    Production.get_production_eta(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute,250000)
+
+    -- Both get_color and format_number are helper functions to help format production stats
+    -- get_color will return green,orange,red,or grey based on the active_value
+    -- the passive_value is used when active_value is 0 and can only return orange,red,or grey
+    Production.get_color(clamp,active_value,passive_value)
+ + + + + + + +

Dependencies

+ + + + + + + + + + + + +
resources.color_presetsProvides colors for Production.get_color
utilProvides format_number function to add surfixs
+ + +

Precision

+ + + + + + + + + + + + + + + + +
precision_up(precision)Gets the next lesser precision index value, eg 1 second -> 1 minute
precision_down(precision)Gets the next greater precision index value, eg 1 minute -> 1 second
precision_ticks(precision)Gets the number of tick that precision is given over, eg 1 minute -> 60 ticks
+ + +

Statistics

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
get_production_total(force, item_name)Returns the production data for the whole game time
get_production(force, item_name, precision)Returns the production data for the given precision game time
get_fluctuations(force, item_name, precision)Returns the current fluctuation from the average
get_production_eta(force, item_name, precision[, required=1000])Returns the amount of ticks required to produce a certain amount
get_consumsion_eta(force, item_name, precision[, required=1000])Returns the amount of ticks required to consume a certain amount
get_net_eta(force, item_name, precision[, required=1000])Returns the amount of ticks required to produce but not consume a certain amount
+ + +

Formating

+ + + + + + + + + + + + +
get_color(clamp, active_value, passive_value)Returns a color value bassed on the value that was given
format_number(value)Returns three parts used to format a number
+ + +
+ + +

Dependencies

+
+
+
+
+ # + resources.color_presets +
+
+
+
+ +

Provides colors for Production.get_color

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + util +
+
+
+
+ +

Provides format_number function to add surfixs

+

+ + + + + + + + + + + + + + +
+
+

Precision

+
+
+
+
+ # + precision_up(precision) +
+
+
+
+ +

Gets the next lesser precision index value, eg 1 second -> 1 minute

+

+ + + Parameters: + + + + + + + Returns: + + + + + + + + + + +
+
+
+
+ # + precision_down(precision) +
+
+
+
+ +

Gets the next greater precision index value, eg 1 minute -> 1 second

+

+ + + Parameters: + + + + + + + Returns: + + + + + + + + + + +
+
+
+
+ # + precision_ticks(precision) +
+
+
+
+ +

Gets the number of tick that precision is given over, eg 1 minute -> 60 ticks

+

+ + + Parameters: + + + + + + + Returns: +
    +
  • + (number) + the number of ticks in this time +
    • +
+ + + + + + + + + +
+
+

Statistics

+
+
+
+
+ # + get_production_total(force, item_name) +
+
+
+
+ +

Returns the production data for the whole game time

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + +
+ + + + + Returns: +
    +
  • + (table) + contains total made, used and net +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_production(force, item_name, precision) +
+
+
+
+ +

Returns the production data for the given precision game time

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + + + + +
  • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
    • + + +
+ + + + + Returns: +
    +
  • + (table) + contains made, used and net +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_fluctuations(force, item_name, precision) +
+
+
+
+ +

Returns the current fluctuation from the average

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + + + + +
  • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
    • + + +
+ + + + + Returns: +
    +
  • + (table) + contains made, used and net +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_production_eta(force, item_name, precision[, required=1000]) +
+
+
+
+ +

Returns the amount of ticks required to produce a certain amount

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + + + + +
  • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
    • + + + + + +
  • + + required + + : + + (number) + + the number of items that are required to be made + + (default: 1000) +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of ticks required to produce this ammount of items +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_consumsion_eta(force, item_name, precision[, required=1000]) +
+
+
+
+ +

Returns the amount of ticks required to consume a certain amount

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + + + + +
  • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
    • + + + + + +
  • + + required + + : + + (number) + + the number of items that are required to be consumed + + (default: 1000) +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of ticks required to consume this ammount of items +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_net_eta(force, item_name, precision[, required=1000]) +
+
+
+
+ +

Returns the amount of ticks required to produce but not consume a certain amount

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + + + + +
  • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
    • + + + + + +
  • + + required + + : + + (number) + + the number of items that are required to be made but not used + + (default: 1000) +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of ticks required to produce, but not use, this ammount of items +
    • +
+ + + + + + + + + +
+
+

Formating

+
+
+
+
+ # + get_color(clamp, active_value, passive_value) +
+
+
+
+ +

Returns a color value bassed on the value that was given

+

+ + + Parameters: + +
    + + + + + +
  • + + clamp + + : + + (number) + + value which seperates the different colours + +
    • + + + + + +
  • + + active_value + + : + + (number) + + first value tested, tested against clamp + +
    • + + + + + +
  • + + passive_value + + : + + (number) + + second value tested, tested against 0 + +
    • + + +
+ + + + + Returns: +
    +
  • + (table) + contains r,g,b keys +
    • +
+ + + + + + + + + +
+
+
+
+ # + format_number(value) +
+
+
+
+ +

Returns three parts used to format a number

+

+ + + Parameters: + +
    + + + + + +
  • + + value + + : + + (number) + + the value to format + +
    • + + +
+ + + + + Returns: +
    +
  • + (string) + the sign for the number +
    • +
  • + (string) + the surfix for any unit used +
    • +
+ + + + + + + + + +
+
+ + + +
+
+
+ +
+
+
+
+ generated by LDoc +
+
+ Last updated 2019-07-20 23:44:09 UTC +
+
+
+ + diff --git a/doc/control/Reports.html b/doc/control/Reports.html new file mode 100644 index 00000000..70203f0c --- /dev/null +++ b/doc/control/Reports.html @@ -0,0 +1,1033 @@ + + + + + + + + Reports control + + + + + + + +
+
+ + + + + + + +
+ + + + + + + + +

Reports control

+

Control Module - Reports + - Adds a way to report players and store report messages.

+

+ + + + + + +

Usage

+ 

+    -- import the module from the control modules
+    local Reports = require 'modules.control.reports'
+
+    -- This will place a report on "MrBiter" (must be a valid player) the report will have been made
+    -- by "Cooldude2606" (must be the player name) with the reason 'Liking biters too much' this can be
+    -- seen by using Reports.get_report.
+    Reports.report_player('MrBiter','Cooldude2606','Liking biters too much') -- true
+
+    -- The other get methods can be used to get all the reports on a player or to test if a player is reported.
+    Reports.get_report('MrBiter','Cooldude2606') -- 'Liking biters too much'
+
+    -- This will remove the warning on 'MrBiter' (must be a valid player) which was made by 'Cooldude2606'.
+    Reports.remove_report('MrBiter','Cooldude2606') -- true
+
+    -- This will remove all the report that have been made against 'MrBiter'. Note that the remove event will
+    -- be triggered once per report issused.
+    Reports.remove_all('MrBiter') -- true
+
+ + + + + + + +

Dependencies

+ + + + + + + + + + + + +
utils.gameAllows getting player from any value
utils.globalAllows storing of data in global table
+ + +

Events

+ + + + + + + + + + + + +
on_player_reportedWhen a player is reported
on_report_removedWhen a report is removed from a player
+ + +

Getters

+ + + + + + + + + + + + + + + + + + + + +
get_reports(player)Gets a list of all reports that a player has against them
get_report(player, by_player_name)Gets a single report against a player given the name of the player who made the report
is_reported(player[, by_player_name])Checks if a player is reported, option to get if reported by a certain player
count_reports(player[, custom_count])Counts the number of reports that a player has aganist them
+ + +

Setters

+ + + + + + + + + + + + + + + + +
report_player(player, by_player_name[, reason='Non given.'])Adds a report to a player, each player can only report another player once
remove_report(player, reported_by_name)Removes a report from a player
remove_all(player)Removes all reports from a player
+ + +
+ + +

Dependencies

+
+
+
+
+ # + utils.game +
+
+
+
+ +

Allows getting player from any value

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + utils.global +
+
+
+
+ +

Allows storing of data in global table

+

+ + + + + + + + + + + + + + +
+
+

Events

+
+
+
+
+ # + on_player_reported +
+
+
+
+ +

When a player is reported

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the player index of the player who got reported + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who made the report + +
    • + + + + + +
  • + + reason + + : + + (string) + + the reason given for the report + +
    • + + +
+ + + + + + + + + + + + + +
+
+
+
+ # + on_report_removed +
+
+
+
+ +

When a report is removed from a player

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the player index of the player who has the report removed + +
    • + + + + + +
  • + + reported_by_name + + : + + (string) + + the name of the player who made the removed report + +
    • + + + + + +
  • + + removed_by_name + + : + + (string) + + the name of the player who removed the report + +
    • + + +
+ + + + + + + + + + + + + +
+
+

Getters

+
+
+
+
+ # + get_reports(player) +
+
+
+
+ +

Gets a list of all reports that a player has against them

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to get the report for + +
    • + + +
+ + + + + Returns: +
    +
  • + (table) + a list of all reports, key is by player name, value is reason +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_report(player, by_player_name) +
+
+
+
+ +

Gets a single report against a player given the name of the player who made the report

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to get the report for + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who made the report + +
    • + + +
+ + + + + Returns: +
    +
  • + (string or nil) + string is the reason that the player was reported, if the player is not reported +
    • +
+ + + + + + + + + +
+
+
+
+ # + is_reported(player[, by_player_name]) +
+
+
+
+ +

Checks if a player is reported, option to get if reported by a certain player

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to check if reported + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + when given will check if reported by this player + + (optional) +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + if the player has been reported +
    • +
+ + + + + + + + + +
+
+
+
+ # + count_reports(player[, custom_count]) +
+
+
+
+ +

Counts the number of reports that a player has aganist them

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to count the reports for + +
    • + + + + + +
  • + + custom_count + + : + + (function) + + when given this function will be used to count the reports + + (optional) +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of reports that the user has +
    • +
+ + + + + + + + + +
+
+

Setters

+
+
+
+
+ # + report_player(player, by_player_name[, reason='Non given.']) +
+
+
+
+ +

Adds a report to a player, each player can only report another player once

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to add the report to + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player that is making the report + +
    • + + + + + +
  • + + reason + + : + + (string) + + the reason that the player is being reported + + (default: 'Non given.') +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + whether the report was added successfully +
    • +
+ + + + + + + + + +
+
+
+
+ # + remove_report(player, reported_by_name) +
+
+
+
+ +

Removes a report from a player

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to remove the report from + +
    • + + + + + +
  • + + reported_by_name + + : + + (string) + + the name of the player that made the report + +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + whether the report was removed successfully +
    • +
+ + + + + + + + + +
+
+
+
+ # + remove_all(player) +
+
+
+
+ +

Removes all reports from a player

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to remove the reports from + +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + whether the reports were removed successfully +
    • +
+ + + + + + + + + +
+
+ + + +
+
+
+ +
+
+
+
+ generated by LDoc +
+
+ Last updated 2019-07-20 23:44:09 UTC +
+
+
+ + diff --git a/doc/control/Warnings.html b/doc/control/Warnings.html new file mode 100644 index 00000000..ad54c40d --- /dev/null +++ b/doc/control/Warnings.html @@ -0,0 +1,1426 @@ + + + + + + + + Warnings control + + + + + + + +
+
+ + + + + + + +
+ + + + + + + + +

Warnings control

+

Control Module - Warnings + - Adds a way to give and remove warnings to players.

+

+ + + + + + +

Usage

+ 

+    -- import the module from the control modules
+    local Warnings = require 'modules.control.warnings'
+
+    -- This will add a warning to the player
+    Warnings.add_warning('MrBiter','Cooldude2606','Killed too many biters')
+
+    -- This will remove a warning from a player, second name is just who is doing the action
+    Warnings.remove_warning('MrBiter','Cooldude2606')
+
+    -- Script warning as similar to normal warning but are designed to have no effect for a short amount of time
+    -- this is so it can be used for greifer protection without being too agressive
+    Warnings.add_script_warning('MrBiter','Killed too many biters')
+
+    -- Both normal and script warnings can also be cleared, this will remove all warnings
+    Warnings.clear_warnings('MrBiter','Cooldude2606')
+ + + + + + + +

Dependencies

+ + + + + + + + + + + + + + + + + + + + +
utils.eventAllows registering of custom events
utils.gameAllows getting player from any value
utils.globalAllows storing in the global table
config.warningsConfig file for this module
+ + +

Events

+ + + + + + + + + + + + + + + + + + + + +
on_warning_addedWhen a warning is added to a player
on_warning_removedWhen a warning is removed from a player
on_script_warning_addedWhen a warning is added to a player, by the script
on_script_warning_removedWhen a warning is remnoved from a player, by the script
+ + +

Functions

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
get_warnings(player)Gets an array of warnings that the player has, always returns a list even if emtpy
count_warnings(player)Gets the number of warnings that a player has on them
add_warning(player, by_player_name[, reason='Non given.'])Adds a warning to a player, when a warning is added a set action is done based on the number of warnings and the config file
remove_warning(player, by_player_name)Removes a warning from a player, always removes the earlyist warning, fifo
clear_warnings(player, by_player_name)Removes all warnings from a player, will trigger remove event for each warning
get_script_warnings(player)Gets an array of all the script warnings that a player has
count_script_warnings(player)Gets the number of script warnings that a player has on them
add_script_warning(player[, reason='Non given.'])Adds a script warning to a player, this may add a full warning if max script warnings is met
remove_script_warning(player)Removes a script warning from a player
clear_script_warnings(player)Removes all script warnings from a player, emits event for each warning removed
+ + +
+ + +

Dependencies

+
+
+
+
+ # + utils.event +
+
+
+
+ +

Allows registering of custom events

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + utils.game +
+
+
+
+ +

Allows getting player from any value

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + utils.global +
+
+
+
+ +

Allows storing in the global table

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + config.warnings +
+
+
+
+ +

Config file for this module

+

+ + + + + + + + + + + + + + +
+
+

Events

+
+
+
+
+ # + on_warning_added +
+
+
+
+ +

When a warning is added to a player

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the index of the player who recived the warning + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who gave the warning + +
    • + + + + + +
  • + + reason + + : + + (string) + + the reason that the player was given a warning + +
    • + + + + + +
  • + + warning_count + + : + + (number) + + the new number of warnings that the player has + +
    • + + +
+ + + + + + + + + + + + + +
+
+
+
+ # + on_warning_removed +
+
+
+
+ +

When a warning is removed from a player

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the index of the player who is having the warning removed + +
    • + + + + + +
  • + + warning_by_name + + : + + (string) + + the name of the player who gave the warning + +
    • + + + + + +
  • + + removed_by_name + + : + + (string) + + the name of the player who is removing the warning + +
    • + + + + + +
  • + + warning_count + + : + + (number) + + the new number of warnings that the player has + +
    • + + +
+ + + + + + + + + + + + + +
+
+
+
+ # + on_script_warning_added +
+
+
+
+ +

When a warning is added to a player, by the script

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the index of the player who recived the warning + +
    • + + + + + +
  • + + reason + + : + + (string) + + the reason that the player was given a warning + +
    • + + + + + +
  • + + warning_count + + : + + (number) + + the new number of warnings that the player has + +
    • + + +
+ + + + + + + + + + + + + +
+
+
+
+ # + on_script_warning_removed +
+
+
+
+ +

When a warning is remnoved from a player, by the script

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the index of the player who is having the warning removed + +
    • + + + + + +
  • + + warning_count + + : + + (number) + + the new number of warnings that the player has + +
    • + + +
+ + + + + + + + + + + + + +
+
+

Functions

+
+
+
+
+ # + get_warnings(player) +
+
+
+
+ +

Gets an array of warnings that the player has, always returns a list even if emtpy

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to get the warning for + +
    • + + +
+ + + + + Returns: +
    +
  • + (table) + an array of all the warnings on this player, contains tick, by_player_name and reason +
    • +
+ + + + + + + + + +
+
+
+
+ # + count_warnings(player) +
+
+
+
+ +

Gets the number of warnings that a player has on them

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to count the warnings for + +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of warnings that the player has +
    • +
+ + + + + + + + + +
+
+
+
+ # + add_warning(player, by_player_name[, reason='Non given.']) +
+
+
+
+ +

Adds a warning to a player, when a warning is added a set action is done based on the number of warnings and the config file

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to add a warning to + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who is doing the action + +
    • + + + + + +
  • + + reason + + : + + (string) + + the reason that the player is being warned + + (default: 'Non given.') +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of warnings that the player has +
    • +
+ + + + + + + + + +
+
+
+
+ # + remove_warning(player, by_player_name) +
+
+
+
+ +

Removes a warning from a player, always removes the earlyist warning, fifo

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to remove a warning from + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who is doing the action + +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of warnings that the player has +
    • +
+ + + + + + + + + +
+
+
+
+ # + clear_warnings(player, by_player_name) +
+
+
+
+ +

Removes all warnings from a player, will trigger remove event for each warning

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to clear the warnings from + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who is doing the action + +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + true when warnings were cleared succesfully +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_script_warnings(player) +
+
+
+
+ +

Gets an array of all the script warnings that a player has

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to get the script warnings of + +
    • + + +
+ + + + + Returns: +
    +
  • + (table) + a table of all the script warnings a player has, contains tick and reason +
    • +
+ + + + + + + + + +
+
+
+
+ # + count_script_warnings(player) +
+
+
+
+ +

Gets the number of script warnings that a player has on them

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to count the script warnings of + +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of script warnings that the player has +
    • +
+ + + + + + + + + +
+
+
+
+ # + add_script_warning(player[, reason='Non given.']) +
+
+
+
+ +

Adds a script warning to a player, this may add a full warning if max script warnings is met

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to add a script warning to + +
    • + + + + + +
  • + + reason + + : + + (string) + + the reason that the player is being warned + + (default: 'Non given.') +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of script warnings that the player has +
    • +
+ + + + + + + + + +
+
+
+
+ # + remove_script_warning(player) +
+
+
+
+ +

Removes a script warning from a player

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to remove a script warning from + +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of script warnings that the player has +
    • +
+ + + + + + + + + +
+
+
+
+ # + clear_script_warnings(player) +
+
+
+
+ +

Removes all script warnings from a player, emits event for each warning removed

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to clear the script warnings from + +
    • + + +
+ + + + + + + + + + + + + +
+
+ + + +
+
+
+ +
+
+
+
+ generated by LDoc +
+
+ Last updated 2019-07-20 23:44:09 UTC +
+
+
+ + diff --git a/doc/index.html b/doc/index.html index 6e2fc4e9..2f1bd13c 100644 --- a/doc/index.html +++ b/doc/index.html @@ -34,8 +34,6 @@ - - @@ -44,6 +42,29 @@
+

Control

+ + + + + + + + + + + + + + + + + +
JailControl Module - Jail + - Adds a way to jail players and temp ban players.
ProductionControl Module - Production + - Common functions used to track production of items
ReportsControl Module - Reports + - Adds a way to report players and store report messages.
WarningsControl Module - Warnings + - Adds a way to give and remove warnings to players.

Modules

@@ -274,21 +295,6 @@ - - - - - - - - - - - - @@ -380,7 +386,7 @@ generated by LDoc
- Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
diff --git a/doc/ldoc.ltp b/doc/ldoc.ltp index ca3fc3d2..539ab547 100644 --- a/doc/ldoc.ltp +++ b/doc/ldoc.ltp @@ -73,7 +73,22 @@ > if module then - + + +> if module and module.type ~= "topic" then +> if module and not ldoc.no_summary and #module.items > 0 then + +> end +> end > if not ldoc.no_summary then > local this_mod = module and module.name > for kind, mods, type in ldoc.kinds() do @@ -111,13 +126,15 @@ > end > end - + +> if module and module.type ~= "topic" then +
> if module and module.type ~= "topic" then > if module and not ldoc.no_summary and #module.items > 0 then
  • -

    Contents of $(display_name(module))

    +

    Jump to Section

      > for kind,items in module.kinds() do
    • # $(kind)
      • @@ -127,9 +144,6 @@
    > end > end -
-> if module and module.type ~= "topic" then -
Top
> end diff --git a/doc/modules/Jail.html b/doc/modules/Jail.html index f36043a8..a03abf37 100644 --- a/doc/modules/Jail.html +++ b/doc/modules/Jail.html @@ -35,14 +35,23 @@ - + + +
modules.addons.damage-popups Displays the amount of dmg that is done by players to entities also shows player health when a player is attacked
JailControl Module - Jail - - Adds a way to jail players and temp ban players.
ReportsControl Module - Reports - - Adds a way to report players and store report messages.
WarningsControl Module - Warnings - - Adds a way to give and remove warnings to players.
modules.gui.player-list
+

Dependencies

+ + + + + + + + + + + + + + + + + + + + +
expcore.rolesAllows moving players into the jail role
utils.gameAllows accessing a player from any value
utils.globalAllows storing data in the global table
expcore.commonUse of move_items to clear inventroies
+ +

Events

@@ -186,14 +233,14 @@ - - - - + + + + @@ -244,6 +291,117 @@
+

Dependencies

+
+
+
+
+ # + expcore.roles +
+
+
+
+ +

Allows moving players into the jail role

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + utils.game +
+
+
+
+ +

Allows accessing a player from any value

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + utils.global +
+
+
+
+ +

Allows storing data in the global table

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + expcore.common +
+
+
+
+ +

Use of move_items to clear inventroies

+

+ + + + + + + + + + + + + + +
+

Events

@@ -321,6 +479,72 @@ + + + + + + + +
+
+
+ # + on_player_unjailed +
+
+
+
+ +

When a player is unassigned from jail

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the index of the player who was unjailed + +
    • + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who unjailed the other player + +
    • + + +
+ + + + + + + @@ -403,72 +627,6 @@ - - - - - - -
-
-
-
- # - on_player_unjailed -
-
-
-
- -

When a player is unassigned from jail

-

- - - Event Parameters: - -
    - - - - - -
  • - - player_index - - : - - (number) - - the index of the player who was unjailed - -
    • - - - - - -
  • - - by_player_name - - : - - (string) - - the name of the player who unjailed the other player - -
    • - - -
- - - - - - - @@ -1003,7 +1161,7 @@ generated by LDoc
- Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 22:35:58 UTC
diff --git a/doc/modules/Production.html b/doc/modules/Production.html new file mode 100644 index 00000000..ca9dbceb --- /dev/null +++ b/doc/modules/Production.html @@ -0,0 +1,1281 @@ + + + + + + + + Production module + + + + + + + +
+
+ + + + + + + +
+ + + + + + + + +

Production module

+

Control Module - Production + - Common functions used to track production of items

+

+ + + + + + +

Usage

+ 

+    -- import the module from the control modules
+    local Production = require 'modules.control.production'
+
+    -- This will return the less precise index from the one given
+    -- this means that one_second will return one_minute or ten_hours will return fifty_hours
+    -- the other precision work like wise
+    Production.precision_up(defines.flow_precision_index.one_second)
+
+    -- The get production function is used to get production, consumion and net
+    -- it may be used for any item and with any precision level, use total for total
+    Production.get_production(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute)
+
+    -- The fluctuations works by compearing recent production with the average over time
+    -- again any precision may be used, apart from one_thousand_hours as there would be no valid average
+    Production.get_fluctuations(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute)
+
+    -- ETA is calculated based on what function you use but all share a similar method
+    -- for production eta it will take current production average given by the precision
+    -- and work out how many ticks it will require to make the required amount (1000 by default)
+    Production.get_production_eta(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute,250000)
+
+    -- Both get_color and format_number are helper functions to help format production stats
+    -- get_color will return green,orange,red,or grey based on the active_value
+    -- the passive_value is used when active_value is 0 and can only return orange,red,or grey
+    Production.get_color(clamp,active_value,passive_value)
+ + + + + +
When a player is assigned to jail
on_player_temp_bannedWhen a player is temp banned
on_player_unjailed When a player is unassigned from jail
on_player_temp_bannedWhen a player is temp banned
on_player_untemp_banned When a temp ban is removed from a player
+ +

Dependencies

+ + + + + + + + + + + + +
resources.color_presetsProvides colors for Production.get_color
utilProvides format_number function to add surfixs
+ + +

Precision

+ + + + + + + + + + + + + + + + +
precision_up (precision)Gets the next lesser precision index value, eg 1 second -> 1 minute
precision_down (precision)Gets the next greater precision index value, eg 1 minute -> 1 second
precision_ticks (precision)Gets the number of tick that precision is given over, eg 1 minute -> 60 ticks
+ + +

Stats

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
get_production_total (force, item_name)Returns the production data for the whole game time
get_production (force, item_name, precision)Returns the production data for the given precision game time
get_fluctuations (force, item_name, precision)Returns the current fluctuation from the average
get_production_eta (force, item_name, precision[, required=1000])Returns the amount of ticks required to produce a certain amount
get_consumsion_eta (force, item_name, precision[, required=1000])Returns the amount of ticks required to consume a certain amount
get_net_eta (force, item_name, precision[, required=1000])Returns the amount of ticks required to produce but not consume a certain amount
+ + +

Formating

+ + + + + + + + + + + + +
get_color (clamp, active_value, passive_value)Returns a color value bassed on the value that was given
format_number (value)Returns three parts used to format a number
+ + +
+ + +

Dependencies

+
+
+
+
+ # + resources.color_presets +
+
+
+
+ +

Provides colors for Production.get_color

+

+ + + + + + + + + + + + + + +
+
+
+
+ # + util +
+
+
+
+ +

Provides format_number function to add surfixs

+

+ + + + + + + + + + + + + + +
+
+

Precision

+
+
+
+
+ # + precision_up (precision) +
+
+
+
+ +

Gets the next lesser precision index value, eg 1 second -> 1 minute

+

+ + + Parameters: + + + + + + + Returns: + + + + + + + + + + +
+
+
+
+ # + precision_down (precision) +
+
+
+
+ +

Gets the next greater precision index value, eg 1 minute -> 1 second

+

+ + + Parameters: + + + + + + + Returns: + + + + + + + + + + +
+
+
+
+ # + precision_ticks (precision) +
+
+
+
+ +

Gets the number of tick that precision is given over, eg 1 minute -> 60 ticks

+

+ + + Parameters: + + + + + + + Returns: +
    +
  • + (number) + the number of ticks in this time +
    • +
+ + + + + + + + + +
+
+

Stats

+
+
+
+
+ # + get_production_total (force, item_name) +
+
+
+
+ +

Returns the production data for the whole game time

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + +
+ + + + + Returns: +
    +
  • + (table) + contains total made, used and net +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_production (force, item_name, precision) +
+
+
+
+ +

Returns the production data for the given precision game time

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + + + + +
  • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
    • + + +
+ + + + + Returns: +
    +
  • + (table) + contains made, used and net +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_fluctuations (force, item_name, precision) +
+
+
+
+ +

Returns the current fluctuation from the average

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + + + + +
  • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
    • + + +
+ + + + + Returns: +
    +
  • + (table) + contains made, used and net +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_production_eta (force, item_name, precision[, required=1000]) +
+
+
+
+ +

Returns the amount of ticks required to produce a certain amount

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + + + + +
  • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
    • + + + + + +
  • + + required + + : + + (number) + + the number of items that are required to be made + + (default: 1000) +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of ticks required to produce this ammount of items +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_consumsion_eta (force, item_name, precision[, required=1000]) +
+
+
+
+ +

Returns the amount of ticks required to consume a certain amount

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + + + + +
  • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
    • + + + + + +
  • + + required + + : + + (number) + + the number of items that are required to be consumed + + (default: 1000) +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of ticks required to consume this ammount of items +
    • +
+ + + + + + + + + +
+
+
+
+ # + get_net_eta (force, item_name, precision[, required=1000]) +
+
+
+
+ +

Returns the amount of ticks required to produce but not consume a certain amount

+

+ + + Parameters: + +
    + + + + + +
  • + + force + + : + + (LuaForce) + + the force to get the data for + +
    • + + + + + +
  • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
    • + + + + + +
  • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
    • + + + + + +
  • + + required + + : + + (number) + + the number of items that are required to be made but not used + + (default: 1000) +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of ticks required to produce, but not use, this ammount of items +
    • +
+ + + + + + + + + +
+
+

Formating

+
+
+
+
+ # + get_color (clamp, active_value, passive_value) +
+
+
+
+ +

Returns a color value bassed on the value that was given

+

+ + + Parameters: + +
    + + + + + +
  • + + clamp + + : + + (number) + + value which seperates the different colours + +
    • + + + + + +
  • + + active_value + + : + + (number) + + first value tested, tested against clamp + +
    • + + + + + +
  • + + passive_value + + : + + (number) + + second value tested, tested against 0 + +
    • + + +
+ + + + + Returns: +
    +
  • + (table) + contains r,g,b keys +
    • +
+ + + + + + + + + +
+
+
+
+ # + format_number (value) +
+
+
+
+ +

Returns three parts used to format a number

+

+ + + Parameters: + +
    + + + + + +
  • + + value + + : + + (number) + + the value to format + +
    • + + +
+ + + + + Returns: +
    +
  • + (string) + the sign for the number +
    • +
  • + (string) + the surfix for any unit used +
    • +
  • + (string) + the number formated +
    • +
+ + + + + + + + + +
+
+ + + +
+ + + +
+
+
+
+ generated by LDoc +
+
+ Last updated 2019-07-20 22:15:42 UTC +
+
+
+ + diff --git a/doc/modules/Reports.html b/doc/modules/Reports.html index b55cf3e1..35edb453 100644 --- a/doc/modules/Reports.html +++ b/doc/modules/Reports.html @@ -36,13 +36,22 @@ + + @@ -473,8 +545,8 @@ Returns:
  • - (number) - the number of reports that the user has + (table) + a list of all reports, key is by player name, value is reason
@@ -553,63 +625,6 @@ - - - - - - - -
-
-
- # - get_reports (player) -
-
-
-
- -

Gets a list of all reports that a player has against them

-

- - - Parameters: - -
    - - - - - -
  • - - player - - : - - (LuaPlayer) - - the player to get the report for - -
    • - - -
- - - - - Returns: -
    -
  • - (table) - a list of all reports, key is by player name, value is reason -
    • -
- - - @@ -684,6 +699,80 @@ + + + + + + +
+
+
+
+ # + count_reports (player[, custom_count]) +
+
+
+
+ +

Counts the number of reports that a player has aganist them

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to count the reports for + +
    • + + + + + +
  • + + custom_count + + : + + (function) + + when given this function will be used to count the reports + + (optional) +
    • + + +
+ + + + + Returns: +
    +
  • + (number) + the number of reports that the user has +
    • +
+ + + @@ -697,136 +786,6 @@
- # - remove_all (player) -
-
-
-
- -

Removes all reports from a player

-

- - - Parameters: - -
    - - - - - -
  • - - player - - : - - (LuaPlayer) - - the player to remove the reports from - -
    • - - -
- - - - - Returns: -
    -
  • - (boolean) - whether the reports were removed successfully -
    • -
- - - - - - - - - -
-
-
-
- # - remove_report (player, reported_by_name) -
-
-
-
- -

Removes a report from a player

-

- - - Parameters: - -
    - - - - - -
  • - - player - - : - - (LuaPlayer) - - the player to remove the report from - -
    • - - - - - -
  • - - reported_by_name - - : - - (string) - - the name of the player that made the report - -
    • - - -
- - - - - Returns: -
    -
  • - (boolean) - whether the report was removed successfully -
    • -
- - - - - - - - - -
-
-
-
# report_player (player, by_player_name[, reason='Non given.'])
@@ -907,6 +866,136 @@ + + + + + + + +
+
+
+ # + remove_report (player, reported_by_name) +
+
+
+
+ +

Removes a report from a player

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to remove the report from + +
    • + + + + + +
  • + + reported_by_name + + : + + (string) + + the name of the player that made the report + +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + whether the report was removed successfully +
    • +
+ + + + + + + + + +
+
+
+
+ # + remove_all (player) +
+
+
+
+ +

Removes all reports from a player

+

+ + + Parameters: + +
    + + + + + +
  • + + player + + : + + (LuaPlayer) + + the player to remove the reports from + +
    • + + +
+ + + + + Returns: +
    +
  • + (boolean) + whether the reports were removed successfully +
    • +
+ + + @@ -929,7 +1018,7 @@ generated by LDoc
- Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 22:15:42 UTC
diff --git a/doc/modules/Warnings.html b/doc/modules/Warnings.html index 66363f29..69fcc9c9 100644 --- a/doc/modules/Warnings.html +++ b/doc/modules/Warnings.html @@ -36,13 +36,20 @@ + + + + + + + + + + + + + + + +
+
+
+
+ # + on_script_warning_added +
+
+
+
+ +

When a warning is added to a player, by the script

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the index of the player who recived the warning + +
    • + + + + + +
  • + + reason + + : + + (string) + + the reason that the player was given a warning + +
    • + + + + + +
  • + + warning_count + + : + + (number) + + the new number of warnings that the player has + +
    • + + +
+ + + + + + + + + + + + + +
+
+
+
+ # + on_script_warning_removed +
+
+
+
+ +

When a warning is remnoved from a player, by the script

+

+ + + Event Parameters: + +
    + + + + + +
  • + + player_index + + : + + (number) + + the index of the player who is having the warning removed + +
    • + + + + +
  • warning_count @@ -604,14 +614,14 @@
    - # - add_script_warning (player[, reason='Non given.']) + # + get_warnings (player)
    -

    Adds a script warning to a player, this may add a full warning if max script warnings is met

    +

    Gets an array of warnings that the player has, always returns a list even if emtpy

    @@ -631,25 +641,65 @@ (LuaPlayer) - the player to add a script warning to + the player to get the warning for
    • +
+ + + + + Returns: +
    +
  • + (table) + an array of all the warnings on this player, contains tick, by_player_name and reason +
    • +
+ + + + + + + + + +
+
+
+
+ # + count_warnings (player) +
+
+
+
+ +

Gets the number of warnings that a player has on them

+

+ + + Parameters: + +
    + +
  • - reason + player : - (string) + (LuaPlayer) - the reason that the player is being warned + the player to count the warnings for - (default: 'Non given.')
    • @@ -662,7 +712,7 @@
    • (number) - the number of script warnings that the player has + the number of warnings that the player has
    @@ -768,14 +818,14 @@
    - # - clear_script_warnings (player) + # + remove_warning (player, by_player_name)
    -

    Removes all script warnings from a player, emits event for each warning removed

    +

    Removes a warning from a player, always removes the earlyist warning, fifo

    @@ -795,7 +845,23 @@ (LuaPlayer) - the player to clear the script warnings from + the player to remove a warning from + + + + + + + +
  • + + by_player_name + + : + + (string) + + the name of the player who is doing the action
    • @@ -805,6 +871,13 @@ + Returns: +
      +
    • + (number) + the number of warnings that the player has +
      • +
    @@ -881,120 +954,6 @@ - - - - - - -
    -
    -
    -
    - # - count_script_warnings (player) -
    -
    -
    -
    - -

    Gets the number of script warnings that a player has on them

    -

    - - - Parameters: - -
      - - - - - -
    • - - player - - : - - (LuaPlayer) - - the player to count the script warnings of - -
      • - - -
    - - - - - Returns: -
      -
    • - (number) - the number of script warnings that the player has -
      • -
    - - - - - - - - - -
    -
    -
    -
    - # - count_warnings (player) -
    -
    -
    -
    - -

    Gets the number of warnings that a player has on them

    -

    - - - Parameters: - -
      - - - - - -
    • - - player - - : - - (LuaPlayer) - - the player to count the warnings for - -
      • - - -
    - - - - - Returns: -
      -
    • - (number) - the number of warnings that the player has -
      • -
    - - - @@ -1062,14 +1021,14 @@
    - # - get_warnings (player) + # + count_script_warnings (player)
    -

    Gets an array of warnings that the player has, always returns a list even if emtpy

    +

    Gets the number of script warnings that a player has on them

    @@ -1089,7 +1048,7 @@ (LuaPlayer) - the player to get the warning for + the player to count the script warnings of @@ -1102,8 +1061,82 @@ Returns:
    • - (table) - an array of all the warnings on this player, contains tick, by_player_name and reason + (number) + the number of script warnings that the player has +
      • +
    + + + + + + + + + +
    +
    +
    +
    + # + add_script_warning (player[, reason='Non given.']) +
    +
    +
    +
    + +

    Adds a script warning to a player, this may add a full warning if max script warnings is met

    +

    + + + Parameters: + +
      + + + + + +
    • + + player + + : + + (LuaPlayer) + + the player to add a script warning to + +
      • + + + + + +
    • + + reason + + : + + (string) + + the reason that the player is being warned + + (default: 'Non given.') +
      • + + +
    + + + + + Returns: +
      +
    • + (number) + the number of script warnings that the player has
    @@ -1176,14 +1209,14 @@
    - # - remove_warning (player, by_player_name) + # + clear_script_warnings (player)
    -

    Removes a warning from a player, always removes the earlyist warning, fifo

    +

    Removes all script warnings from a player, emits event for each warning removed

    @@ -1203,23 +1236,7 @@ (LuaPlayer) - the player to remove a warning from - - - - - - - -
  • - - by_player_name - - : - - (string) - - the name of the player who is doing the action + the player to clear the script warnings from
    • @@ -1229,13 +1246,6 @@ - Returns: -
      -
    • - (number) - the number of warnings that the player has -
      • -
    @@ -1261,7 +1271,7 @@ generated by LDoc
    - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 22:15:42 UTC
diff --git a/doc/modules/config._file_loader.html b/doc/modules/config._file_loader.html index fcca2f80..e45bf570 100644 --- a/doc/modules/config._file_loader.html +++ b/doc/modules/config._file_loader.html @@ -35,14 +35,12 @@ - + +

  • Modules

    +
      +

    • Topics

      - -
      + Top
      @@ -173,7 +181,7 @@ generated by LDoc
      - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
      diff --git a/doc/modules/config.action_buttons.html b/doc/modules/config.action_buttons.html index f83c1c66..9f8cd67c 100644 --- a/doc/modules/config.action_buttons.html +++ b/doc/modules/config.action_buttons.html @@ -35,14 +35,12 @@ - + +

      • Modules

        +
          +

        • Topics

          - -
          + Top
          @@ -174,7 +182,7 @@ generated by LDoc
          - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
          diff --git a/doc/modules/config.advanced_start.html b/doc/modules/config.advanced_start.html index ff549b34..35002e99 100644 --- a/doc/modules/config.advanced_start.html +++ b/doc/modules/config.advanced_start.html @@ -35,14 +35,12 @@ - + +

          • Modules

            +
              +

            • Topics

              - -
              + Top
              @@ -170,7 +178,7 @@ generated by LDoc
              - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
              diff --git a/doc/modules/config.bonuses.html b/doc/modules/config.bonuses.html index 416a2ae8..9357c133 100644 --- a/doc/modules/config.bonuses.html +++ b/doc/modules/config.bonuses.html @@ -35,14 +35,12 @@ - + +

              • Modules

                +
                  +

                • Topics

                  - -
                  + Top
                  @@ -170,7 +178,7 @@ generated by LDoc
                  - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                  diff --git a/doc/modules/config.chat_reply.html b/doc/modules/config.chat_reply.html index 37262d4c..93ca50ab 100644 --- a/doc/modules/config.chat_reply.html +++ b/doc/modules/config.chat_reply.html @@ -35,14 +35,12 @@ - + +

                  • Modules

                    +
                      +

                    • Topics

                      - -
                      + Top
                      @@ -170,7 +178,7 @@ generated by LDoc
                      - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                      diff --git a/doc/modules/config.death_logger.html b/doc/modules/config.death_logger.html index 21306691..3afffecb 100644 --- a/doc/modules/config.death_logger.html +++ b/doc/modules/config.death_logger.html @@ -35,14 +35,12 @@ - + +

                      • Modules

                        +
                          +

                        • Topics

                          - -
                          + Top
                          @@ -172,7 +180,7 @@ generated by LDoc
                          - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                          diff --git a/doc/modules/config.discord_alerts.html b/doc/modules/config.discord_alerts.html index 76f36d99..428ad476 100644 --- a/doc/modules/config.discord_alerts.html +++ b/doc/modules/config.discord_alerts.html @@ -35,14 +35,12 @@ - + +

                          • Modules

                            +
                              +

                            • Topics

                              - -
                              + Top
                              @@ -170,7 +178,7 @@ generated by LDoc
                              - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                              diff --git a/doc/modules/config.expcore-commands.auth_admin.html b/doc/modules/config.expcore-commands.auth_admin.html index 3337e478..8fe3a0bf 100644 --- a/doc/modules/config.expcore-commands.auth_admin.html +++ b/doc/modules/config.expcore-commands.auth_admin.html @@ -35,14 +35,12 @@ - + +

                              • Modules

                                +
                                  +

                                • Topics

                                  - -
                                  + Top
                                  @@ -172,7 +180,7 @@ generated by LDoc
                                  - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                  diff --git a/doc/modules/config.expcore-commands.auth_roles.html b/doc/modules/config.expcore-commands.auth_roles.html index 42faf6e9..8f12223e 100644 --- a/doc/modules/config.expcore-commands.auth_roles.html +++ b/doc/modules/config.expcore-commands.auth_roles.html @@ -35,14 +35,12 @@ - + +

                                  • Modules

                                    +
                                      +

                                    • Topics

                                      - -
                                      + Top
                                      @@ -170,7 +178,7 @@ generated by LDoc
                                      - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                      diff --git a/doc/modules/config.expcore-commands.auth_runtime_disable.html b/doc/modules/config.expcore-commands.auth_runtime_disable.html index c1a1efa8..a083d17b 100644 --- a/doc/modules/config.expcore-commands.auth_runtime_disable.html +++ b/doc/modules/config.expcore-commands.auth_runtime_disable.html @@ -35,14 +35,12 @@ - + +

                                      • Modules

                                        +
                                          +

                                        • Topics

                                          - -
                                          + Top
                                          @@ -171,7 +179,7 @@ generated by LDoc
                                          - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                          diff --git a/doc/modules/config.expcore-commands.parse_general.html b/doc/modules/config.expcore-commands.parse_general.html index ee5b1fef..6d096641 100644 --- a/doc/modules/config.expcore-commands.parse_general.html +++ b/doc/modules/config.expcore-commands.parse_general.html @@ -35,14 +35,12 @@ - + +

                                          • Modules

                                            +
                                              +

                                            • Topics

                                              - -
                                              + Top
                                              @@ -174,7 +182,7 @@ generated by LDoc
                                              - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                              diff --git a/doc/modules/config.expcore-commands.parse_roles.html b/doc/modules/config.expcore-commands.parse_roles.html index f4352184..c13160a5 100644 --- a/doc/modules/config.expcore-commands.parse_roles.html +++ b/doc/modules/config.expcore-commands.parse_roles.html @@ -35,14 +35,12 @@ - + +

                                              • Modules

                                                +
                                                  +

                                                • Topics

                                                  - -
                                                  + Top
                                                  @@ -170,7 +178,7 @@ generated by LDoc
                                                  - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                  diff --git a/doc/modules/config.permission_groups.html b/doc/modules/config.permission_groups.html index 0f2d7201..35ccf13f 100644 --- a/doc/modules/config.permission_groups.html +++ b/doc/modules/config.permission_groups.html @@ -35,14 +35,12 @@ - + +

                                                  • Modules

                                                    +
                                                      +

                                                    • Topics

                                                      - -
                                                      + Top
                                                      @@ -173,7 +181,7 @@ generated by LDoc
                                                      - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                      diff --git a/doc/modules/config.popup_messages.html b/doc/modules/config.popup_messages.html index 93294b73..04b2f383 100644 --- a/doc/modules/config.popup_messages.html +++ b/doc/modules/config.popup_messages.html @@ -35,14 +35,12 @@ - + +

                                                      • Modules

                                                        +
                                                          +

                                                        • Topics

                                                          - -
                                                          + Top
                                                          @@ -170,7 +178,7 @@ generated by LDoc
                                                          - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                          diff --git a/doc/modules/config.rockets.html b/doc/modules/config.rockets.html index 58f1711c..5f7b3940 100644 --- a/doc/modules/config.rockets.html +++ b/doc/modules/config.rockets.html @@ -35,14 +35,20 @@ - + + +

                                                          • Modules

                                                            +
                                                              +

                                                            • Topics

                                                              - + +
                                                              • -

                                                                Contents of config.rockets

                                                                +

                                                                Jump to Section

                                                              -
                                                              -
                                                              Top
                                                              @@ -166,13 +182,13 @@ - show_progress - The data and buttons in the build progress section - - show_stats The data that will show in the stats section + + show_progress + The data and buttons in the build progress section + @@ -185,14 +201,14 @@
                                                              - # - show_progress + # + show_stats
                                                              -

                                                              The data and buttons in the build progress section

                                                              +

                                                              The data that will show in the stats section

                                                              @@ -212,14 +228,14 @@
                                                              - # - show_stats + # + show_progress
                                                              -

                                                              The data that will show in the stats section

                                                              +

                                                              The data and buttons in the build progress section

                                                              @@ -251,7 +267,7 @@ generated by LDoc
                                                              - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                              diff --git a/doc/modules/config.roles.html b/doc/modules/config.roles.html index 03012fc5..f6da5f49 100644 --- a/doc/modules/config.roles.html +++ b/doc/modules/config.roles.html @@ -35,14 +35,12 @@ - + +
                                                              +
                                                              +
                                                              +
                                                              + # + Common.param_check(value, test_type, param_name, param_number) +
                                                              +
                                                              +
                                                              +
                                                              + +

                                                              Raises an error when the value is the incorrect type, uses a consistent error message format

                                                              +

                                                              + + + Parameters: + +
                                                                + + + + + +
                                                              • + + value + + : + + (any) + + the value that you want to test the type of + +
                                                                • + + + + + +
                                                              • + + test_type + + : + + (string) + + the type that the value should be + +
                                                                • + + + + + +
                                                              • + + param_name + + : + + (string) + + the name of the param + +
                                                                • + + + + + +
                                                              • + + param_number + + : + + (number) + + the number param it is + +
                                                                • + + +
                                                              + + + + + Returns: +
                                                                +
                                                              • + (boolean) + true if no error was raised +
                                                                • +
                                                              + + + + + + + + Usage: + 
                                                              param_check('foo','number','repeat_count',2) -- will raise error "Invalid param #02 given to <anon>; repeat_count is not of type number"
                                                              + + +
                                                              +
                                                              +
                                                              +
                                                              + # + Common.player_return(value[, colour=defines.colour.white][, player=game.player]) +
                                                              +
                                                              +
                                                              +
                                                              + +

                                                              Will return a value of any type to the player/server console, allows colour for in-game players

                                                              +

                                                              + + + Parameters: + +
                                                                + + + + + +
                                                              • + + value + + : + + + any value of any type that will be returned to the player or console + +
                                                                • + + + + + +
                                                              • + + colour + + : + + (defines.color or string) + + the colour of the text for the player, ignored when printing to console + + (default: defines.colour.white) +
                                                                • + + + + + +
                                                              • + + player + + : + + (LuaPlayer) + + the player that return will go to, if no game.player then returns to server + + (default: game.player) +
                                                                • + +
                                                              @@ -428,20 +662,24 @@ + Usage: + 
                                                              player_return('Hello, World!') -- returns 'Hello, World!' to game.player or server console
                                                              + 
                                                              player_return('Hello, World!','green') -- returns 'Hello, World!' to game.player with colour green or server console
                                                              + 
                                                              player_return('Hello, World!',nil,player) -- returns 'Hello, World!' to the given player
                                                              - # - Common.enum (tbl) + # + Common.write_json(path, tbl)
                                                              -

                                                              Converts a table to an enum

                                                              +

                                                              Writes a table object to a file in json format

                                                              @@ -453,6 +691,22 @@ +
                                                            • + + path + + : + + (string) + + the path of the file to write include / to use dir + +
                                                              • + + + + +
                                                            • tbl @@ -461,7 +715,7 @@ (table) - table the that will be converted + the table that will be converted to a json string and wrote to file
                                                              • @@ -471,13 +725,6 @@ - Returns: -
                                                                -
                                                              • - (table) - the new table that acts like an enum -
                                                                • -
                                                              @@ -487,12 +734,70 @@ +
                                                              +
                                                              +
                                                              +
                                                              + # + Common.opt_require(path) +
                                                              +
                                                              +
                                                              +
                                                              + +

                                                              Calls a require that will not error if the file is not found

                                                              +

                                                              + + + Parameters: + +
                                                                + + + + + +
                                                              • + + path + + : + + (string) + + the path that you want to require + +
                                                                • + + +
                                                              + + + + + Returns: +
                                                                +
                                                              • + the returns from that file or nil, error if not loaded +
                                                                • +
                                                              + + + + + + + + Usage: + 
                                                              local file = opt_require('file.not.present') -- will not cause any error
                                                              + +
                                                              # - Common.ext_require (path, ...) + Common.ext_require(path, ...)
                                                              @@ -561,306 +866,12 @@ 
                                                              local extract, param_check = ext_require('expcore.common','extract','param_check')
                                                              -
                                                              -
                                                              -
                                                              -
                                                              - # - Common.extract_keys (tbl, ...) -
                                                              -
                                                              -
                                                              -
                                                              - -

                                                              Extracts certain keys from a table

                                                              -

                                                              - - - Parameters: - -
                                                                - - - - - -
                                                              • - - tbl - - : - - (table) - - table the which contains the keys - -
                                                                • - - - - - -
                                                              • - - ... - - : - - (string) - - the names of the keys you want extracted - -
                                                                • - - -
                                                              - - - - - Returns: -
                                                                -
                                                              • - the keys in the order given -
                                                                • -
                                                              - - - - - - - - Usage: - 
                                                              local key_three, key_one = extract({key_one='foo',key_two='bar',key_three=true},'key_three','key_one')
                                                              - - -
                                                              -
                                                              -
                                                              -
                                                              - # - Common.format_chat_colour (message, color) -
                                                              -
                                                              -
                                                              -
                                                              - -

                                                              Returns a message with valid chat tags to change its colour

                                                              -

                                                              - - - Parameters: - -
                                                                - - - - - -
                                                              • - - message - - : - - (string) - - the message that will be in the output - -
                                                                • - - - - - -
                                                              • - - color - - : - - (table) - - a color which contains r,g,b as its keys - -
                                                                • - - -
                                                              - - - - - Returns: -
                                                                -
                                                              • - (string) - the message with the color tags included -
                                                                • -
                                                              - - - - - - - - - -
                                                              -
                                                              -
                                                              -
                                                              - # - Common.format_chat_colour_localized (message, color) -
                                                              -
                                                              -
                                                              -
                                                              - -

                                                              Returns a message with valid chat tags to change its colour, using localization

                                                              -

                                                              - - - Parameters: - -
                                                                - - - - - -
                                                              • - - message - - : - - (string or table) - - the message that will be in the output - -
                                                                • - - - - - -
                                                              • - - color - - : - - (table) - - a color which contains r,g,b as its keys - -
                                                                • - - -
                                                              - - - - - Returns: -
                                                                -
                                                              • - (table) - the message with the color tags included -
                                                                • -
                                                              - - - - - - - - - -
                                                              -
                                                              -
                                                              -
                                                              - # - Common.format_chat_player_name (player[, raw_string=false]) -
                                                              -
                                                              -
                                                              -
                                                              - -

                                                              Returns the players name in the players color

                                                              -

                                                              - - - Parameters: - -
                                                                - - - - - -
                                                              • - - player - - : - - (LuaPlayer) - - the player to use the name and color of - -
                                                                • - - - - - -
                                                              • - - raw_string - - : - - (boolean) - - when true a is returned rather than a localized string - - (default: false) -
                                                                • - - -
                                                              - - - - - Returns: -
                                                                -
                                                              • - (table) - the players name with tags for the players color -
                                                                • -
                                                              - - - - - - - - -
                                                              # - Common.format_time (ticks, options) + Common.format_time(ticks, options)
                                                              @@ -937,7 +948,7 @@
                                                              # - Common.move_items (items[, surface=navies][, position={0][, radius=32][, chest_type=iron-chest]) + Common.move_items(items[, surface=navies][, position={0][, radius=32][, chest_type=iron-chest])
                                                              @@ -1054,179 +1065,15 @@
                                                              - # - Common.opt_require (path) + # + Common.print_grid_value(value, surface, position, scale, offset, immutable)
                                                              -

                                                              Calls a require that will not error if the file is not found

                                                              -

                                                              - - - Parameters: - -
                                                                - - - - - -
                                                              • - - path - - : - - (string) - - the path that you want to require - -
                                                                • - - -
                                                              - - - - - Returns: -
                                                                -
                                                              • - the returns from that file or nil, error if not loaded -
                                                                • -
                                                              - - - - - - - - Usage: - 
                                                              local file = opt_require('file.not.present') -- will not cause any error
                                                              - - -
                                                              -
                                                              -
                                                              -
                                                              - # - Common.param_check (value, test_type, param_name, param_number) -
                                                              -
                                                              -
                                                              -
                                                              - -

                                                              Raises an error when the value is the incorrect type, uses a consistent error message format

                                                              -

                                                              - - - Parameters: - -
                                                                - - - - - -
                                                              • - - value - - : - - (any) - - the value that you want to test the type of - -
                                                                • - - - - - -
                                                              • - - test_type - - : - - (string) - - the type that the value should be - -
                                                                • - - - - - -
                                                              • - - param_name - - : - - (string) - - the name of the param - -
                                                                • - - - - - -
                                                              • - - param_number - - : - - (number) - - the number param it is - -
                                                                • - - -
                                                              - - - - - Returns: -
                                                                -
                                                              • - (boolean) - true if no error was raised -
                                                                • -
                                                              - - - - - - - - Usage: - 
                                                              param_check('foo','number','repeat_count',2) -- will raise error "Invalid param #02 given to <anon>; repeat_count is not of type number"
                                                              - - -
                                                              -
                                                              -
                                                              -
                                                              - # - Common.player_return (value[, colour=defines.colour.white][, player=game.player]) -
                                                              -
                                                              -
                                                              -
                                                              - -

                                                              Will return a value of any type to the player/server console, allows colour for in-game players

                                                              +

                                                              https://github.com/Refactorio/RedMew/blob/9184b2940f311d8c9c891e83429fc57ec7e0c4a2/map_gen/maps/diggy/debug.lua#L31 + Prints a colored value on a location.

                                                              @@ -1245,7 +1092,7 @@ : - any value of any type that will be returned to the player or console + between -1 and 1
                                                              • @@ -1255,15 +1102,13 @@
                                                            • - colour + surface : - (defines.color or string) - the colour of the text for the player, ignored when printing to console + LuaSurface - (default: defines.colour.white)
                                                              • @@ -1272,15 +1117,58 @@
                                                            • - player + position : - (LuaPlayer) - the player that return will go to, if no game.player then returns to server + Position {x, y} + +
                                                              • + + + + + +
                                                            • + + scale + + : + + + float + +
                                                              • + + + + + +
                                                            • + + offset + + : + + + float + +
                                                              • + + + + + +
                                                            • + + immutable + + : + + + bool if immutable, only set, never do a surface lookup, values never change - (default: game.player)
                                                              • @@ -1296,10 +1184,6 @@ - Usage: - 
                                                              player_return('Hello, World!') -- returns 'Hello, World!' to game.player or server console
                                                              - 
                                                              player_return('Hello, World!','green') -- returns 'Hello, World!' to game.player with colour green or server console
                                                              - 
                                                              player_return('Hello, World!',nil,player) -- returns 'Hello, World!' to the given player
@@ -1307,7 +1191,7 @@
# - Common.print_colored_grid_value (value, surface, position, offset, immutable, color_value, base_color, delta_color, under_bound, over_bound) + Common.print_colored_grid_value(value, surface, position, offset, immutable, color_value, base_color, delta_color, under_bound, over_bound)
@@ -1493,15 +1377,14 @@
- # - Common.print_grid_value (value, surface, position, scale, offset, immutable) + # + Common.clear_flying_text(surface)
-

https://github.com/Refactorio/RedMew/blob/9184b2940f311d8c9c891e83429fc57ec7e0c4a2/map_gen/maps/diggy/debug.lua#L31 - Prints a colored value on a location.

+

Clears all flying text entites on a surface

@@ -1513,89 +1396,15 @@ -
  • - - value - - : - - - between -1 and 1 - -
    • - - - - -
  • surface : + (LuaSurface) - LuaSurface - -
    • - - - - - -
  • - - position - - : - - - Position {x, y} - -
    • - - - - - -
  • - - scale - - : - - - float - -
    • - - - - - -
  • - - offset - - : - - - float - -
    • - - - - - -
  • - - immutable - - : - - - bool if immutable, only set, never do a surface lookup, values never change + the surface to clear
    • @@ -1619,7 +1428,7 @@
    # - Common.string_contains (s, contains) + Common.string_contains(s, contains)
    @@ -1691,14 +1500,14 @@
    - # - Common.table_alphanumsort (tbl) + # + Common.extract_keys(tbl, ...)
    -

    Returns the list is a sorted way that would be expected by people (this is by key)

    +

    Extracts certain keys from a table

    @@ -1718,7 +1527,23 @@ (table) - the table to be sorted + table the which contains the keys + + + + + + + +
  • + + ... + + : + + (string) + + the names of the keys you want extracted
    • @@ -1731,8 +1556,7 @@ Returns:
    • - (table) - the sorted table + the keys in the order given
    @@ -1742,111 +1566,22 @@ + Usage: + 
    local key_three, key_one = extract({key_one='foo',key_two='bar',key_three=true},'key_three','key_one')
    - # - Common.table_keys (table[, sorted][, as_string]) + # + Common.enum(tbl)
    -

    Returns a copy of all of the keys in the table.

    -

    - - - Parameters: - -
      - - - - - -
    • - - table - - : - - (table) - - tbl the to copy the keys from, or an empty table if tbl is nil - -
      • - - - - - -
    • - - sorted - - : - - (boolean) - - whether to sort the keys (slower) or keep the random order from pairs() - - (optional) -
      • - - - - - -
    • - - as_string - - : - - (boolean) - - whether to try and parse the keys as strings, or leave them as their existing type - - (optional) -
      • - - -
    - - - - - Returns: -
      -
    • - (array) - an array with a copy of all the keys in the table -
      • -
    - - - - - - - - - -
    -
    -
    -
    - # - Common.table_keysort (tbl) -
    -
    -
    -
    - -

    Returns the list is a sorted way that would be expected by people (this is by key) (faster alterative than above)

    +

    Converts a table to an enum

    @@ -1866,7 +1601,7 @@ (table) - the table to be sorted + table the that will be converted @@ -1880,7 +1615,113 @@
    • (table) - the sorted table + the new table that acts like an enum +
      • +
    + + + + + + + + + +
    +
    +
    +
    + # + Common.auto_complete(options, input[, use_key=false][, rtn_key=false]) +
    +
    +
    +
    + +

    Returns the closest match to the input

    +

    + + + Parameters: + +
      + + + + + +
    • + + options + + : + + (table) + + table a of options for the auto complete + +
      • + + + + + +
    • + + input + + : + + (string) + + string the input that will be completed + +
      • + + + + + +
    • + + use_key + + : + + (boolean) + + when true the keys of options will be used as the options + + (default: false) +
      • + + + + + +
    • + + rtn_key + + : + + (boolean) + + when true the the key will be returned rather than the value + + (default: false) +
      • + + +
    + + + + + Returns: +
      +
    • + the list item found that matches the input
    @@ -1897,7 +1738,7 @@
    # - Common.table_values (table[, sorted][, as_string]) + Common.table_values(table[, sorted][, as_string])
    @@ -1987,14 +1828,14 @@
    - # - Common.type_check (value[, test_type=nil]) + # + Common.table_keys(table[, sorted][, as_string])
    -

    Compare types faster for faster validation of params

    +

    Returns a copy of all of the keys in the table.

    @@ -2008,13 +1849,13 @@
  • - value + table : - (any) + (table) - the value to be tested + tbl the to copy the keys from, or an empty table if tbl is nil
    • @@ -2024,15 +1865,32 @@
  • - test_type + sorted : - (string) + (boolean) - the type to test for if not given then it tests for nil + whether to sort the keys (slower) or keep the random order from pairs() - (default: nil) + (optional) +
    • + + + + + +
  • + + as_string + + : + + (boolean) + + whether to try and parse the keys as strings, or leave them as their existing type + + (optional)
    • @@ -2044,8 +1902,8 @@ Returns:
    • - (boolean) - is v of type test_type + (array) + an array with a copy of all the keys in the table
    @@ -2055,23 +1913,20 @@ - Usage: - 
    type_check('foo','string') -- return true
    - 
    type_check('foo') -- return false
    - # - Common.type_check_error (value, test_type, error_message, level) + # + Common.table_alphanumsort(tbl)
    -

    Raises an error if the value is of the wrong type

    +

    Returns the list is a sorted way that would be expected by people (this is by key)

    @@ -2083,129 +1938,6 @@ -
  • - - value - - : - - (any) - - the value that you want to test the type of - -
    • - - - - - -
  • - - test_type - - : - - (string) - - the type that the value should be - -
    • - - - - - -
  • - - error_message - - : - - (string) - - the error message that is returned - -
    • - - - - - -
  • - - level - - : - - (number) - - the level to call the error on (level = 1 means the caller) - -
    • - - - - - - - - Returns: -
      -
    • - (boolean) - true if no error was called -
      • -
    - - - - - - - - Usage: - 
    type_check_error('foo','number','Value must be a number') -- will raise error "Value must be a number"
    - - -
    -
    -
    -
    - # - Common.write_json (path, tbl) -
    -
    -
    -
    - -

    Writes a table object to a file in json format

    -

    - - - Parameters: - -
      - - - - - -
    • - - path - - : - - (string) - - the path of the file to write include / to use dir - -
      • - - - - -
    • tbl @@ -2214,7 +1946,7 @@ (table) - the table that will be converted to a json string and wrote to file + the table to be sorted
      • @@ -2224,6 +1956,290 @@ + Returns: +
        +
      • + (table) + the sorted table +
        • +
      + + + + + + + + + +
    +
    +
    +
    + # + Common.table_keysort(tbl) +
    +
    +
    +
    + +

    Returns the list is a sorted way that would be expected by people (this is by key) (faster alterative than above)

    +

    + + + Parameters: + +
      + + + + + +
    • + + tbl + + : + + (table) + + the table to be sorted + +
      • + + +
    + + + + + Returns: +
      +
    • + (table) + the sorted table +
      • +
    + + + + + + + + + +
    +
    +
    +
    + # + Common.format_chat_colour(message, color) +
    +
    +
    +
    + +

    Returns a message with valid chat tags to change its colour

    +

    + + + Parameters: + +
      + + + + + +
    • + + message + + : + + (string) + + the message that will be in the output + +
      • + + + + + +
    • + + color + + : + + (table) + + a color which contains r,g,b as its keys + +
      • + + +
    + + + + + Returns: +
      +
    • + (string) + the message with the color tags included +
      • +
    + + + + + + + + + +
    +
    +
    +
    + # + Common.format_chat_colour_localized(message, color) +
    +
    +
    +
    + +

    Returns a message with valid chat tags to change its colour, using localization

    +

    + + + Parameters: + +
      + + + + + +
    • + + message + + : + + (string or table) + + the message that will be in the output + +
      • + + + + + +
    • + + color + + : + + (table) + + a color which contains r,g,b as its keys + +
      • + + +
    + + + + + Returns: +
      +
    • + (table) + the message with the color tags included +
      • +
    + + + + + + + + + +
    +
    +
    +
    + # + Common.format_chat_player_name(player[, raw_string=false]) +
    +
    +
    +
    + +

    Returns the players name in the players color

    +

    + + + Parameters: + +
      + + + + + +
    • + + player + + : + + (LuaPlayer) + + the player to use the name and color of + +
      • + + + + + +
    • + + raw_string + + : + + (boolean) + + when true a is returned rather than a localized string + + (default: false) +
      • + + +
    + + + + + Returns: +
      +
    • + (table) + the players name with tags for the players color +
      • +
    @@ -2249,7 +2265,7 @@ generated by LDoc
    - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
    diff --git a/doc/modules/expcore.gui.concepts.center.html b/doc/modules/expcore.gui.concepts.center.html index 9ae4718d..8ee49171 100644 --- a/doc/modules/expcore.gui.concepts.center.html +++ b/doc/modules/expcore.gui.concepts.center.html @@ -35,14 +35,20 @@ - + + +
    -
    -
    -
    - # - CenterFrames._prototype:event_handler ([action=update]) -
    -
    -
    -
    - -

    Creates an event handler that will trigger one of its functions, use with Event.add

    -

    - - - Parameters: - -
      - - - - - -
    • - - action - - : - - (string) - - the action to take on this event - - (default: update) -
      • - - -
    - - - - - - - - - - - - - -
    -
    -
    -
    - # - CenterFrames._prototype:redraw_frame (player) -
    -
    -
    -
    - -

    Draws this frame to the player, if already open it will remove it and redraw it (will call on_draw to draw to the frame)

    -

    - - - Parameters: - -
      - - - - - -
    • - - player - - : - - (LuaPlayer) - - the player to draw the frame for - -
      • - - -
    - - - - - Returns: - - - - - - - - - - -
    -
    -
    -
    - # - CenterFrames._prototype:set_auto_focus ([state=true]) -
    -
    -
    -
    - -

    Sets the frame to be the current active gui when opened and closes all other frames

    -

    - - - Parameters: - -
      - - - - - -
    • - - state - - : - - (boolean) - - when true will auto close other frames and set this frame as player.opened - - (default: true) -
      • - - -
    - - - - - - - - - - - - - -
    -
    -
    -
    - # - CenterFrames._prototype:toggle_frame (player) -
    -
    -
    -
    - -

    Toggles if the frame is open, if open it will close it and if closed it will open it

    -

    - - - Parameters: - -
      - - - - - -
    • - - player - - : - - (LuaPlayer) - - the player to draw the frame for - -
      • - - -
    - - - - - Returns: -
      -
    • - (boolean) - with the gui frame is now open + the center flow
    @@ -496,7 +296,7 @@
    # - CenterFrames.clear_flow (player) + CenterFrames.clear_flow(player)
    @@ -546,7 +346,7 @@
    # - CenterFrames.draw_frame (player, name) + CenterFrames.draw_frame(player, name)
    @@ -608,120 +408,6 @@ - - - - - - -
    -
    -
    -
    - # - CenterFrames.get_flow (player) -
    -
    -
    -
    - -

    Gets the center flow for a player

    -

    - - - Parameters: - -
      - - - - - -
    • - - player - - : - - (LuaPlayer) - - the player to get the flow for - -
      • - - -
    - - - - - Returns: - - - - - - - - - - -
    -
    -
    -
    - # - CenterFrames.new_frame (permision_name) -
    -
    -
    -
    - -

    Creates a new center frame define

    -

    - - - Parameters: - -
      - - - - - -
    • - - permision_name - - : - - (string) - - the name that can be used with the permision system - -
      • - - -
    - - - - - Returns: -
      -
    • - (table) - the new center frame define -
      • -
    - - - @@ -733,7 +419,7 @@
    # - CenterFrames.redraw_frame (player, name) + CenterFrames.redraw_frame(player, name)
    @@ -806,7 +492,7 @@
    # - CenterFrames.toggle_frame (player, name[, state]) + CenterFrames.toggle_frame(player, name[, state])
    @@ -885,6 +571,336 @@ + + + + + + +
    +
    +
    +
    + # + CenterFrames.new_frame(permision_name) +
    +
    +
    +
    + +

    Creates a new center frame define

    +

    + + + Parameters: + +
      + + + + + +
    • + + permision_name + + : + + (string) + + the name that can be used with the permision system + +
      • + + +
    + + + + + Returns: +
      +
    • + (table) + the new center frame define +
      • +
    + + + + + + + + + +
    +
    +
    +
    + # + CenterFrames._prototype:set_auto_focus([state=true]) +
    +
    +
    +
    + +

    Sets the frame to be the current active gui when opened and closes all other frames

    +

    + + + Parameters: + +
      + + + + + +
    • + + state + + : + + (boolean) + + when true will auto close other frames and set this frame as player.opened + + (default: true) +
      • + + +
    + + + + + + + + + + + + + +
    +
    +
    +
    + # + CenterFrames._prototype:draw_frame(player) +
    +
    +
    +
    + +

    Draws this frame to the player, if already open does nothing (will call on_draw to draw to the frame)

    +

    + + + Parameters: + +
      + + + + + +
    • + + player + + : + + (LuaPlayer) + + the player to draw the frame for + +
      • + + +
    + + + + + Returns: + + + + + + + + + + +
    +
    +
    +
    + # + CenterFrames._prototype:redraw_frame(player) +
    +
    +
    +
    + +

    Draws this frame to the player, if already open it will remove it and redraw it (will call on_draw to draw to the frame)

    +

    + + + Parameters: + +
      + + + + + +
    • + + player + + : + + (LuaPlayer) + + the player to draw the frame for + +
      • + + +
    + + + + + Returns: + + + + + + + + + + +
    +
    +
    +
    + # + CenterFrames._prototype:toggle_frame(player) +
    +
    +
    +
    + +

    Toggles if the frame is open, if open it will close it and if closed it will open it

    +

    + + + Parameters: + +
      + + + + + +
    • + + player + + : + + (LuaPlayer) + + the player to draw the frame for + +
      • + + +
    + + + + + Returns: +
      +
    • + (boolean) + with the gui frame is now open +
      • +
    + + + + + + + + + +
    +
    +
    +
    + # + CenterFrames._prototype:event_handler([action=update]) +
    +
    +
    +
    + +

    Creates an event handler that will trigger one of its functions, use with Event.add

    +

    + + + Parameters: + +
      + + + + + +
    • + + action + + : + + (string) + + the action to take on this event + + (default: update) +
      • + + +
    + + + + + + + @@ -907,7 +923,7 @@ generated by LDoc
    - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
    diff --git a/doc/modules/expcore.gui.concepts.left.html b/doc/modules/expcore.gui.concepts.left.html index 15c736c4..85a9072f 100644 --- a/doc/modules/expcore.gui.concepts.left.html +++ b/doc/modules/expcore.gui.concepts.left.html @@ -35,14 +35,20 @@ - + + +

    • Modules

      +
        +

      • Topics

        - + +
        • -

          Contents of expcore.gui.concepts.left

          +

          Jump to Section

        -
        -
        Top
        @@ -167,68 +183,68 @@ - LeftFrames._prototype:_internal_draw (player) - Creates the gui for the first time, used internally - - - LeftFrames._prototype:event_handler ([action=update]) - Creates an event handler that will trigger one of its functions, use with Event.add - - - LeftFrames._prototype:get_frame (player) - Gets the frame for this define from the left frame flow - - - LeftFrames._prototype:is_open (player) - Returns if the player currently has this define visible - - - LeftFrames._prototype:redraw (player) - Redraws the frame by calling on_draw, will always clear the frame - - - LeftFrames._prototype:redraw_all ([update_offline=false]) - Redraws the frame for all players, see redraw - - - LeftFrames._prototype:set_direction (direction) - Sets the direction of the frame, either vertical or horizontal - - - LeftFrames._prototype:set_open_by_default ([state=true]) - Sets if the frame is visible when a player joins, can also be a function to return a boolean - - - LeftFrames._prototype:toggle (player) - Toggles the visiblty of the left frame - - - LeftFrames._prototype:update (player) - Updates the contents of the left frame, first tries update callback, oter wise will clear and redraw - - - LeftFrames._prototype:update_all ([update_offline=false]) - Updates the frame for all players, see update - - - LeftFrames.get_flow (player) + LeftFrames.get_flow(player) Gets the left frame flow for a player - LeftFrames.get_frame (name, player) + LeftFrames.get_frame(name, player) Gets one frame from the left flow by its name - LeftFrames.get_open (player) + LeftFrames.get_open(player) Gets all open frames for a player, if non are open it will remove the close all button - LeftFrames.new_frame (permision_name) + LeftFrames.toggle_frame(name, player[, state]) + Toggles the visiblty of a left frame, or sets its visiblty state + + + LeftFrames.new_frame(permision_name) Creates a new left frame define - LeftFrames.toggle_frame (name, player[, state]) - Toggles the visiblty of a left frame, or sets its visiblty state + LeftFrames._prototype:set_open_by_default([state=true]) + Sets if the frame is visible when a player joins, can also be a function to return a boolean + + + LeftFrames._prototype:set_direction(direction) + Sets the direction of the frame, either vertical or horizontal + + + LeftFrames._prototype:_internal_draw(player) + Creates the gui for the first time, used internally + + + LeftFrames._prototype:get_frame(player) + Gets the frame for this define from the left frame flow + + + LeftFrames._prototype:is_open(player) + Returns if the player currently has this define visible + + + LeftFrames._prototype:toggle(player) + Toggles the visiblty of the left frame + + + LeftFrames._prototype:update(player) + Updates the contents of the left frame, first tries update callback, oter wise will clear and redraw + + + LeftFrames._prototype:update_all([update_offline=false]) + Updates the frame for all players, see update + + + LeftFrames._prototype:redraw(player) + Redraws the frame by calling on_draw, will always clear the frame + + + LeftFrames._prototype:redraw_all([update_offline=false]) + Redraws the frame for all players, see redraw + + + LeftFrames._prototype:event_handler([action=update]) + Creates an event handler that will trigger one of its functions, use with Event.add @@ -242,593 +258,8 @@
        - # - LeftFrames._prototype:_internal_draw (player) -
        -
        -
        -
        - -

        Creates the gui for the first time, used internally

        -

        - - - Parameters: - -
          - - - - - -
        • - - player - - : - - (LuaPlayer) - - the player to draw the frame to - -
          • - - -
        - - - - - Returns: - - - - - - - - - - -
        -
        -
        -
        - # - LeftFrames._prototype:event_handler ([action=update]) -
        -
        -
        -
        - -

        Creates an event handler that will trigger one of its functions, use with Event.add

        -

        - - - Parameters: - -
          - - - - - -
        • - - action - - : - - (string) - - the action to take on this event - - (default: update) -
          • - - -
        - - - - - - - - - - - - - -
        -
        -
        -
        - # - LeftFrames._prototype:get_frame (player) -
        -
        -
        -
        - -

        Gets the frame for this define from the left frame flow

        -

        - - - Parameters: - -
          - - - - - -
        • - - player - - : - - (LuaPlayer) - - the player to get the frame of - -
          • - - -
        - - - - - Returns: -
          -
        • - (LuaGuiElement) - the frame in the left frame flow for this define -
          • -
        - - - - - - - - - -
        -
        -
        -
        - # - LeftFrames._prototype:is_open (player) -
        -
        -
        -
        - -

        Returns if the player currently has this define visible

        -

        - - - Parameters: - -
          - - - - - -
        • - - player - - : - - (LuaPlayer) - - the player to get the frame of - -
          • - - -
        - - - - - Returns: -
          -
        • - (boolean) - true if it is open/visible -
          • -
        - - - - - - - - - -
        -
        -
        -
        - # - LeftFrames._prototype:redraw (player) -
        -
        -
        -
        - -

        Redraws the frame by calling on_draw, will always clear the frame

        -

        - - - Parameters: - -
          - - - - - -
        • - - player - - : - - (LuaPlayer) - - the player to update the frame of - -
          • - - -
        - - - - - - - - - - - - - -
        -
        -
        -
        - # - LeftFrames._prototype:redraw_all ([update_offline=false]) -
        -
        -
        -
        - -

        Redraws the frame for all players, see redraw

        -

        - - - Parameters: - -
          - - - - - -
        • - - update_offline - - : - - (boolean) - - when true will update the frame for offline players - - (default: false) -
          • - - -
        - - - - - - - - - - - - - -
        -
        -
        -
        - # - LeftFrames._prototype:set_direction (direction) -
        -
        -
        -
        - -

        Sets the direction of the frame, either vertical or horizontal

        -

        - - - Parameters: - -
          - - - - - -
        • - - direction - - : - - (string) - - the direction to have the elements be added to thef frame - -
          • - - -
        - - - - - - - - - - - - - -
        -
        -
        -
        - # - LeftFrames._prototype:set_open_by_default ([state=true]) -
        -
        -
        -
        - -

        Sets if the frame is visible when a player joins, can also be a function to return a boolean

        -

        - - - Parameters: - -
          - - - - - -
        • - - state - - : - - (boolean or function) - - the default state of the visiblty, can be a function - state param - player LuaPlayer - the player that has joined the game - state param - define_name string - the define name for the frame - state return - boolean - false will hide the frame - - (default: true) -
          • - - -
        - - - - - - - - - - - - - -
        -
        -
        -
        - # - LeftFrames._prototype:toggle (player) -
        -
        -
        -
        - -

        Toggles the visiblty of the left frame

        -

        - - - Parameters: - -
          - - - - - -
        • - - player - - : - - (LuaPlayer) - - the player to toggle the frame of - -
          • - - -
        - - - - - Returns: -
          -
        • - (boolean) - the new state of the visiblity -
          • -
        - - - - - - - - - -
        -
        -
        -
        - # - LeftFrames._prototype:update (player) -
        -
        -
        -
        - -

        Updates the contents of the left frame, first tries update callback, oter wise will clear and redraw

        -

        - - - Parameters: - -
          - - - - - -
        • - - player - - : - - (LuaPlayer) - - the player to update the frame of - -
          • - - -
        - - - - - - - - - - - - - -
        -
        -
        -
        - # - LeftFrames._prototype:update_all ([update_offline=false]) -
        -
        -
        -
        - -

        Updates the frame for all players, see update

        -

        - - - Parameters: - -
          - - - - - -
        • - - update_offline - - : - - (boolean) - - when true will update the frame for offline players - - (default: false) -
          • - - -
        - - - - - - - - - - - - - -
        -
        -
        -
        # - LeftFrames.get_flow (player) + LeftFrames.get_flow(player)
        @@ -885,7 +316,7 @@
        # - LeftFrames.get_frame (name, player) + LeftFrames.get_frame(name, player)
        @@ -958,7 +389,7 @@
        # - LeftFrames.get_open (player) + LeftFrames.get_open(player)
        @@ -1004,63 +435,6 @@ - - - - - - -
        -
        -
        -
        - # - LeftFrames.new_frame (permision_name) -
        -
        -
        -
        - -

        Creates a new left frame define

        -

        - - - Parameters: - -
          - - - - - -
        • - - permision_name - - : - - (string) - - the name that can be used with the permision system - -
          • - - -
        - - - - - Returns: -
          -
        • - (table) - the new left frame define -
          • -
        - - - @@ -1072,7 +446,7 @@
        # - LeftFrames.toggle_frame (name, player[, state]) + LeftFrames.toggle_frame(name, player[, state])
        @@ -1151,6 +525,648 @@ + + + + + + +
        +
        +
        +
        + # + LeftFrames.new_frame(permision_name) +
        +
        +
        +
        + +

        Creates a new left frame define

        +

        + + + Parameters: + +
          + + + + + +
        • + + permision_name + + : + + (string) + + the name that can be used with the permision system + +
          • + + +
        + + + + + Returns: +
          +
        • + (table) + the new left frame define +
          • +
        + + + + + + + + + +
        +
        +
        +
        + # + LeftFrames._prototype:set_open_by_default([state=true]) +
        +
        +
        +
        + +

        Sets if the frame is visible when a player joins, can also be a function to return a boolean

        +

        + + + Parameters: + +
          + + + + + +
        • + + state + + : + + (boolean or function) + + the default state of the visiblty, can be a function + state param - player LuaPlayer - the player that has joined the game + state param - define_name string - the define name for the frame + state return - boolean - false will hide the frame + + (default: true) +
          • + + +
        + + + + + + + + + + + + + +
        +
        +
        +
        + # + LeftFrames._prototype:set_direction(direction) +
        +
        +
        +
        + +

        Sets the direction of the frame, either vertical or horizontal

        +

        + + + Parameters: + +
          + + + + + +
        • + + direction + + : + + (string) + + the direction to have the elements be added to thef frame + +
          • + + +
        + + + + + + + + + + + + + +
        +
        +
        +
        + # + LeftFrames._prototype:_internal_draw(player) +
        +
        +
        +
        + +

        Creates the gui for the first time, used internally

        +

        + + + Parameters: + +
          + + + + + +
        • + + player + + : + + (LuaPlayer) + + the player to draw the frame to + +
          • + + +
        + + + + + Returns: + + + + + + + + + + +
        +
        +
        +
        + # + LeftFrames._prototype:get_frame(player) +
        +
        +
        +
        + +

        Gets the frame for this define from the left frame flow

        +

        + + + Parameters: + +
          + + + + + +
        • + + player + + : + + (LuaPlayer) + + the player to get the frame of + +
          • + + +
        + + + + + Returns: +
          +
        • + (LuaGuiElement) + the frame in the left frame flow for this define +
          • +
        + + + + + + + + + +
        +
        +
        +
        + # + LeftFrames._prototype:is_open(player) +
        +
        +
        +
        + +

        Returns if the player currently has this define visible

        +

        + + + Parameters: + +
          + + + + + +
        • + + player + + : + + (LuaPlayer) + + the player to get the frame of + +
          • + + +
        + + + + + Returns: +
          +
        • + (boolean) + true if it is open/visible +
          • +
        + + + + + + + + + +
        +
        +
        +
        + # + LeftFrames._prototype:toggle(player) +
        +
        +
        +
        + +

        Toggles the visiblty of the left frame

        +

        + + + Parameters: + +
          + + + + + +
        • + + player + + : + + (LuaPlayer) + + the player to toggle the frame of + +
          • + + +
        + + + + + Returns: +
          +
        • + (boolean) + the new state of the visiblity +
          • +
        + + + + + + + + + +
        +
        +
        +
        + # + LeftFrames._prototype:update(player) +
        +
        +
        +
        + +

        Updates the contents of the left frame, first tries update callback, oter wise will clear and redraw

        +

        + + + Parameters: + +
          + + + + + +
        • + + player + + : + + (LuaPlayer) + + the player to update the frame of + +
          • + + +
        + + + + + + + + + + + + + +
        +
        +
        +
        + # + LeftFrames._prototype:update_all([update_offline=false]) +
        +
        +
        +
        + +

        Updates the frame for all players, see update

        +

        + + + Parameters: + +
          + + + + + +
        • + + update_offline + + : + + (boolean) + + when true will update the frame for offline players + + (default: false) +
          • + + +
        + + + + + + + + + + + + + +
        +
        +
        +
        + # + LeftFrames._prototype:redraw(player) +
        +
        +
        +
        + +

        Redraws the frame by calling on_draw, will always clear the frame

        +

        + + + Parameters: + +
          + + + + + +
        • + + player + + : + + (LuaPlayer) + + the player to update the frame of + +
          • + + +
        + + + + + + + + + + + + + +
        +
        +
        +
        + # + LeftFrames._prototype:redraw_all([update_offline=false]) +
        +
        +
        +
        + +

        Redraws the frame for all players, see redraw

        +

        + + + Parameters: + +
          + + + + + +
        • + + update_offline + + : + + (boolean) + + when true will update the frame for offline players + + (default: false) +
          • + + +
        + + + + + + + + + + + + + +
        +
        +
        +
        + # + LeftFrames._prototype:event_handler([action=update]) +
        +
        +
        +
        + +

        Creates an event handler that will trigger one of its functions, use with Event.add

        +

        + + + Parameters: + +
          + + + + + +
        • + + action + + : + + (string) + + the action to take on this event + + (default: update) +
          • + + +
        + + + + + + + @@ -1173,7 +1189,7 @@ generated by LDoc
        - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
        diff --git a/doc/modules/expcore.gui.concepts.popups.html b/doc/modules/expcore.gui.concepts.popups.html index c63277ca..b8201ba2 100644 --- a/doc/modules/expcore.gui.concepts.popups.html +++ b/doc/modules/expcore.gui.concepts.popups.html @@ -35,14 +35,21 @@ - + + +

        • Modules

          +
            +

          • Topics

            - + +
            -
            -
            Top
            @@ -168,24 +185,24 @@ - PopupFrames._prototype:open (player[, open_time], ...) - Opens this define for a player, can be given open time and any other params for the draw function - - - PopupFrames._prototype:set_default_open_time (amount) - Sets the default open time for the popup, will be used if non is provided with open - - - PopupFrames.get_flow (player) + PopupFrames.get_flow(player) Gets the left flow that contains the popup frames - PopupFrames.new_popup ([name]) + PopupFrames.open(define_name, player[, open_time], ...) + Opens a popup for the player, can give the amount of time it is open as well as params for the draw function + + + PopupFrames.new_popup([name]) Creates a new popup frame define - PopupFrames.open (define_name, player[, open_time], ...) - Opens a popup for the player, can give the amount of time it is open as well as params for the draw function + PopupFrames._prototype:set_default_open_time(amount) + Sets the default open time for the popup, will be used if non is provided with open + + + PopupFrames._prototype:open(player[, open_time], ...) + Opens this define for a player, can be given open time and any other params for the draw function @@ -196,13 +213,13 @@ - PopupFrames.close_button - A button which can be used to close the gui before the timer runs out - - PopupFrames.close_progress Progress bar which when depleaded will close the popup frame + + PopupFrames.close_button + A button which can be used to close the gui before the timer runs out + @@ -215,155 +232,8 @@
            - # - PopupFrames._prototype:open (player[, open_time], ...) -
            -
            -
            -
            - -

            Opens this define for a player, can be given open time and any other params for the draw function

            -

            - - - Parameters: - -
              - - - - - -
            • - - player - - : - - (LuaPlayer) - - the player to open the popup for - -
              • - - - - - -
            • - - open_time - - : - - (number) - - the minimum number of ticks you want the popup open for, 0 means no limit, nil will take default - - (optional) -
              • - - - - - -
            • - - ... - - : - - (any) - - the other params that you want to pass to your on_draw event - -
              • - - -
            - - - - - Returns: -
              -
            • - (LuaGuiElement) - the frame that was drawn, the inner gui flow which contains the content -
              • -
            - - - - - - - - - -
            -
            -
            -
            - # - PopupFrames._prototype:set_default_open_time (amount) -
            -
            -
            -
            - -

            Sets the default open time for the popup, will be used if non is provided with open

            -

            - - - Parameters: - -
              - - - - - -
            • - - amount - - : - - (number) - - the number of ticks, by default, the popup will be open for - -
              • - - -
            - - - - - Returns: -
              -
            • - (table) - the define to allow for chaining -
              • -
            - - - - - - - - - -
            -
            -
            -
            # - PopupFrames.get_flow (player) + PopupFrames.get_flow(player)
            @@ -409,64 +279,6 @@ - - - - - - -
            -
            -
            -
            - # - PopupFrames.new_popup ([name]) -
            -
            -
            -
            - -

            Creates a new popup frame define

            -

            - - - Parameters: - -
              - - - - - -
            • - - name - - : - - (string) - - the optional debug name that can be added - - (optional) -
              • - - -
            - - - - - Returns: -
              -
            • - (table) - the new popup frame define -
              • -
            - - - @@ -478,7 +290,7 @@
            # - PopupFrames.open (define_name, player[, open_time], ...) + PopupFrames.open(define_name, player[, open_time], ...)
            @@ -545,6 +357,211 @@ +
          • + + ... + + : + + (any) + + the other params that you want to pass to your on_draw event + +
            • + + +
          + + + + + Returns: +
            +
          • + (LuaGuiElement) + the frame that was drawn, the inner gui flow which contains the content +
            • +
          + + + + + + + + + +
        +
        +
        +
        + # + PopupFrames.new_popup([name]) +
        +
        +
        +
        + +

        Creates a new popup frame define

        +

        + + + Parameters: + +
          + + + + + +
        • + + name + + : + + (string) + + the optional debug name that can be added + + (optional) +
          • + + +
        + + + + + Returns: +
          +
        • + (table) + the new popup frame define +
          • +
        + + + + + + + + + +
        +
        +
        +
        + # + PopupFrames._prototype:set_default_open_time(amount) +
        +
        +
        +
        + +

        Sets the default open time for the popup, will be used if non is provided with open

        +

        + + + Parameters: + +
          + + + + + +
        • + + amount + + : + + (number) + + the number of ticks, by default, the popup will be open for + +
          • + + +
        + + + + + Returns: +
          +
        • + (table) + the define to allow for chaining +
          • +
        + + + + + + + + + +
        +
        +
        +
        + # + PopupFrames._prototype:open(player[, open_time], ...) +
        +
        +
        +
        + +

        Opens this define for a player, can be given open time and any other params for the draw function

        +

        + + + Parameters: + +
          + + + + + +
        • + + player + + : + + (LuaPlayer) + + the player to open the popup for + +
          • + + + + + +
        • + + open_time + + : + + (number) + + the minimum number of ticks you want the popup open for, 0 means no limit, nil will take default + + (optional) +
          • + + + + +
        • ... @@ -586,14 +603,14 @@
          - # - PopupFrames.close_button + # + PopupFrames.close_progress
          -

          A button which can be used to close the gui before the timer runs out

          +

          Progress bar which when depleaded will close the popup frame

          @@ -613,14 +630,14 @@
          - # - PopupFrames.close_progress + # + PopupFrames.close_button
          -

          Progress bar which when depleaded will close the popup frame

          +

          A button which can be used to close the gui before the timer runs out

          @@ -652,7 +669,7 @@ generated by LDoc
          - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
        diff --git a/doc/modules/expcore.gui.concepts.toolbar.html b/doc/modules/expcore.gui.concepts.toolbar.html index fe9a65aa..95e47031 100644 --- a/doc/modules/expcore.gui.concepts.toolbar.html +++ b/doc/modules/expcore.gui.concepts.toolbar.html @@ -35,14 +35,20 @@ - + + +

        • Modules

          +
            +

          • Topics

            - + +
            • -

              Contents of expcore.gui.concepts.toolbar

              +

              Jump to Section

            -
            -
            Top
            @@ -167,15 +183,15 @@ - Toolbar.add_button (button) - Adds an existing buttton to the toolbar - - - Toolbar.new_button ([name]) + Toolbar.new_button([name]) Adds a new button to the toolbar - Toolbar.update (player) + Toolbar.add_button(button) + Adds an existing buttton to the toolbar + + + Toolbar.update(player) Updates the player's toolbar with an new buttons or expected change in auth return @@ -190,58 +206,8 @@
            - # - Toolbar.add_button (button) -
            -
            -
            -
            - -

            Adds an existing buttton to the toolbar

            -

            - - - Parameters: - -
              - - - - - -
            • - - button - - : - - (table) - - the button define for the button to be added - -
              • - - -
            - - - - - - - - - - - - - -
            -
            -
            -
            # - Toolbar.new_button ([name]) + Toolbar.new_button([name])
            @@ -288,6 +254,56 @@ + + + + + + +
            +
            +
            +
            + # + Toolbar.add_button(button) +
            +
            +
            +
            + +

            Adds an existing buttton to the toolbar

            +

            + + + Parameters: + +
              + + + + + +
            • + + button + + : + + (table) + + the button define for the button to be added + +
              • + + +
            + + + + + + + @@ -299,7 +315,7 @@
            # - Toolbar.update (player) + Toolbar.update(player)
            @@ -360,7 +376,7 @@ generated by LDoc
            - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
            diff --git a/doc/modules/expcore.gui.core.html b/doc/modules/expcore.gui.core.html index 3a574755..b5fda828 100644 --- a/doc/modules/expcore.gui.core.html +++ b/doc/modules/expcore.gui.core.html @@ -35,14 +35,12 @@ - + +

            • Modules

              +
                +

              • Topics

                - -
                + Top
                @@ -173,7 +181,7 @@ generated by LDoc
                - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                diff --git a/doc/modules/expcore.gui.elements.buttons.html b/doc/modules/expcore.gui.elements.buttons.html index 46398f04..4bdd4416 100644 --- a/doc/modules/expcore.gui.elements.buttons.html +++ b/doc/modules/expcore.gui.elements.buttons.html @@ -35,14 +35,20 @@ - + + +

                • Modules

                  +
                    +

                  • Topics

                    - + +
                    • -

                      Contents of expcore.gui.elements.buttons

                      +

                      Jump to Section

                    -
                    -
                    Top
                    @@ -167,20 +183,20 @@ - Button._prototype:set_click_filter (filter[, ...]) - Adds a click / mouse button filter to the button + Button.new_button([name]) + Creates a new button element define - Button._prototype:set_key_filter (filter[, ...]) - Adds a control key filter to the button - - - Button._prototype:set_sprites (sprite[, hovered_sprite][, clicked_sprite]) + Button._prototype:set_sprites(sprite[, hovered_sprite][, clicked_sprite]) Adds sprites to a button making it a spirte button - Button.new_button ([name]) - Creates a new button element define + Button._prototype:set_click_filter(filter[, ...]) + Adds a click / mouse button filter to the button + + + Button._prototype:set_key_filter(filter[, ...]) + Adds a control key filter to the button @@ -194,14 +210,14 @@
                    - # - Button._prototype:set_click_filter (filter[, ...]) + # + Button.new_button([name])
                    -

                    Adds a click / mouse button filter to the button

                    +

                    Creates a new button element define

                    @@ -215,29 +231,13 @@
                  • - filter + name : - (table) + (string) - ?string|table either a of mouse buttons or the first mouse button to filter, with a table true means allowed - -
                    • - - - - - -
                  • - - ... - - : - - (table) - - when filter is not a you can add the mouse buttons one after each other + the optional debug name that can be added (optional)
                    • @@ -251,82 +251,8 @@ Returns:
                    • - (self) - returns the button define to allow chaining -
                      • -
                    - - - - - - - - - -
                    -
                    -
                    -
                    - # - Button._prototype:set_key_filter (filter[, ...]) -
                    -
                    -
                    -
                    - -

                    Adds a control key filter to the button

                    -

                    - - - Parameters: - -
                      - - - - - -
                    • - - filter - - : - (table) - - ?string|table either a of control keys or the first control keys to filter, with a table true means allowed - -
                      • - - - - - -
                    • - - ... - - : - - (table) - - when filter is not a you can add the control keyss one after each other - - (optional) -
                      • - - -
                    - - - - - Returns: -
                      -
                    • - (self) - returns the button define to allow chaining + the new button element define
                    @@ -343,7 +269,7 @@
                    # - Button._prototype:set_sprites (sprite[, hovered_sprite][, clicked_sprite]) + Button._prototype:set_sprites(sprite[, hovered_sprite][, clicked_sprite])
                    @@ -433,14 +359,14 @@
                    - # - Button.new_button ([name]) + # + Button._prototype:set_click_filter(filter[, ...])
                    -

                    Creates a new button element define

                    +

                    Adds a click / mouse button filter to the button

                    @@ -454,13 +380,29 @@
                  • - name + filter : - (string) + (table) - the optional debug name that can be added + ?string|table either a of mouse buttons or the first mouse button to filter, with a table true means allowed + +
                    • + + + + + +
                  • + + ... + + : + + (table) + + when filter is not a you can add the mouse buttons one after each other (optional)
                    • @@ -474,8 +416,82 @@ Returns:
                    • + (self) + returns the button define to allow chaining +
                      • +
                    + + + + + + + + + +
                    +
                    +
                    +
                    + # + Button._prototype:set_key_filter(filter[, ...]) +
                    +
                    +
                    +
                    + +

                    Adds a control key filter to the button

                    +

                    + + + Parameters: + +
                      + + + + + +
                    • + + filter + + : + (table) - the new button element define + + ?string|table either a of control keys or the first control keys to filter, with a table true means allowed + +
                      • + + + + + +
                    • + + ... + + : + + (table) + + when filter is not a you can add the control keyss one after each other + + (optional) +
                      • + + +
                    + + + + + Returns: +
                      +
                    • + (self) + returns the button define to allow chaining
                    @@ -503,7 +519,7 @@ generated by LDoc
                    - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                    diff --git a/doc/modules/expcore.gui.elements.checkboxs.html b/doc/modules/expcore.gui.elements.checkboxs.html index 2c349e34..fc410d2e 100644 --- a/doc/modules/expcore.gui.elements.checkboxs.html +++ b/doc/modules/expcore.gui.elements.checkboxs.html @@ -35,14 +35,20 @@ - + + +

                    • Modules

                      +
                        +

                      • Topics

                        - + +
                        • -

                          Contents of expcore.gui.elements.checkboxs

                          +

                          Jump to Section

                        -
                        -
                        Top
                        @@ -167,35 +183,35 @@ - Checkbox._prototype_radiobutton:add_as_option (option_set, option_name) - Adds this radiobutton to be an option in the given option set (only one can be true at a time) - - - Checkbox._prototype_radiobutton:get_store (category, internal) - Gets the stored value of the radiobutton or the option set if present - - - Checkbox._prototype_radiobutton:set_store (category, value, internal) - Sets the stored value of the radiobutton or the option set if present - - - Checkbox.draw_option_set (name, element) - Draws all radiobuttons that are part of an option set at once (Gui.draw will not work) - - - Checkbox.new_checkbox ([name]) + Checkbox.new_checkbox([name]) Creates a new checkbox element define - Checkbox.new_option_set (name, callback, categorize) - Registers a new option set that can be linked to radiobutotns (only one can be true at a time) - - - Checkbox.new_radiobutton ([name]) + Checkbox.new_radiobutton([name]) Creates a new radiobutton element define, has all functions checkbox has - Checkbox.reset_radiobuttons (element[, exclude][, recursive=false]) + Checkbox._prototype_radiobutton:add_as_option(option_set, option_name) + Adds this radiobutton to be an option in the given option set (only one can be true at a time) + + + Checkbox._prototype_radiobutton:get_store(category, internal) + Gets the stored value of the radiobutton or the option set if present + + + Checkbox._prototype_radiobutton:set_store(category, value, internal) + Sets the stored value of the radiobutton or the option set if present + + + Checkbox.new_option_set(name, callback, categorize) + Registers a new option set that can be linked to radiobutotns (only one can be true at a time) + + + Checkbox.draw_option_set(name, element) + Draws all radiobuttons that are part of an option set at once (Gui.draw will not work) + + + Checkbox.reset_radiobuttons(element[, exclude][, recursive=false]) Sets all radiobutotn in a element to false (unless excluded) and can act recursivly @@ -210,8 +226,124 @@
                        + # + Checkbox.new_checkbox([name]) +
                        +
                        +
                        +
                        + +

                        Creates a new checkbox element define

                        +

                        + + + Parameters: + +
                          + + + + + +
                        • + + name + + : + + (string) + + the optional debug name that can be added + + (optional) +
                          • + + +
                        + + + + + Returns: +
                          +
                        • + (table) + the new checkbox element define +
                          • +
                        + + + + + + + + + +
                        +
                        +
                        +
                        + # + Checkbox.new_radiobutton([name]) +
                        +
                        +
                        +
                        + +

                        Creates a new radiobutton element define, has all functions checkbox has

                        +

                        + + + Parameters: + +
                          + + + + + +
                        • + + name + + : + + (string) + + the optional debug name that can be added + + (optional) +
                          • + + +
                        + + + + + Returns: +
                          +
                        • + (table) + the new button element define +
                          • +
                        + + + + + + + + + +
                        +
                        +
                        +
                        # - Checkbox._prototype_radiobutton:add_as_option (option_set, option_name) + Checkbox._prototype_radiobutton:add_as_option(option_set, option_name)
                        @@ -284,7 +416,7 @@
                        # - Checkbox._prototype_radiobutton:get_store (category, internal) + Checkbox._prototype_radiobutton:get_store(category, internal)
                        @@ -357,7 +489,7 @@
                        # - Checkbox._prototype_radiobutton:set_store (category, value, internal) + Checkbox._prototype_radiobutton:set_store(category, value, internal)
                        @@ -435,130 +567,6 @@ - - - - - - -
                        -
                        -
                        -
                        - # - Checkbox.draw_option_set (name, element) -
                        -
                        -
                        -
                        - -

                        Draws all radiobuttons that are part of an option set at once (Gui.draw will not work)

                        -

                        - - - Parameters: - -
                          - - - - - -
                        • - - name - - : - - (string) - - the name of the option set to draw the radiobuttons of - -
                          • - - - - - -
                        • - - element - - : - - (LuaGuiElement) - - the parent element that the radiobuttons will be drawn to - -
                          • - - -
                        - - - - - - - - - - - - - -
                        -
                        -
                        -
                        - # - Checkbox.new_checkbox ([name]) -
                        -
                        -
                        -
                        - -

                        Creates a new checkbox element define

                        -

                        - - - Parameters: - -
                          - - - - - -
                        • - - name - - : - - (string) - - the optional debug name that can be added - - (optional) -
                          • - - -
                        - - - - - Returns: -
                          -
                        • - (table) - the new checkbox element define -
                          • -
                        - - - @@ -570,7 +578,7 @@
                        # - Checkbox.new_option_set (name, callback, categorize) + Checkbox.new_option_set(name, callback, categorize)
                        @@ -660,14 +668,14 @@
                        - # - Checkbox.new_radiobutton ([name]) + # + Checkbox.draw_option_set(name, element)
                        -

                        Creates a new radiobutton element define, has all functions checkbox has

                        +

                        Draws all radiobuttons that are part of an option set at once (Gui.draw will not work)

                        @@ -687,9 +695,24 @@ (string) - the optional debug name that can be added + the name of the option set to draw the radiobuttons of + +
                        • + + + + + +
                      • + + element + + : + + (LuaGuiElement) + + the parent element that the radiobuttons will be drawn to - (optional)
                        • @@ -698,13 +721,6 @@ - Returns: -
                          -
                        • - (table) - the new button element define -
                          • -
                        @@ -719,7 +735,7 @@
                        # - Checkbox.reset_radiobuttons (element[, exclude][, recursive=false]) + Checkbox.reset_radiobuttons(element[, exclude][, recursive=false])
                        @@ -821,7 +837,7 @@ generated by LDoc
                        - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                        diff --git a/doc/modules/expcore.gui.elements.dropdown.html b/doc/modules/expcore.gui.elements.dropdown.html index 34001312..b55272de 100644 --- a/doc/modules/expcore.gui.elements.dropdown.html +++ b/doc/modules/expcore.gui.elements.dropdown.html @@ -35,14 +35,20 @@ - + + +

                        • Modules

                          +
                            +

                          • Topics

                            - + +
                            • -

                              Contents of expcore.gui.elements.dropdown

                              +

                              Jump to Section

                            -
                            -
                            Top
                            @@ -167,33 +183,33 @@ - Dropdown._prototype:add_option_callback (option, callback) - Adds a case specific callback which will only run when that option is selected (general case still triggered) - - - Dropdown._prototype:new_dynamic_options (callback) - Adds a callback which should return a table of values to be added as options for the dropdown (appended after static options) - - - Dropdown._prototype:new_static_options (options[, ...], the) - Adds new static options to the dropdown which will trigger the general callback - - - Dropdown.get_selected_value (element) - Returns the currently selected value rather than index - - - Dropdown.new_dropdown ([name]) + Dropdown.new_dropdown([name]) Creates a new dropdown element define - Dropdown.new_list_box ([name]) + Dropdown.new_list_box([name]) Creates a new list box element define - Dropdown.select_value (element, value) + Dropdown._prototype:new_static_options(options[, ...], the) + Adds new static options to the dropdown which will trigger the general callback + + + Dropdown._prototype:new_dynamic_options(callback) + Adds a callback which should return a table of values to be added as options for the dropdown (appended after static options) + + + Dropdown._prototype:add_option_callback(option, callback) + Adds a case specific callback which will only run when that option is selected (general case still triggered) + + + Dropdown.select_value(element, value) Selects the option from a dropdown or list box given the value rather than key + + Dropdown.get_selected_value(element) + Returns the currently selected value rather than index + @@ -206,14 +222,14 @@
                            - # - Dropdown._prototype:add_option_callback (option, callback) + # + Dropdown.new_dropdown([name])
                            -

                            Adds a case specific callback which will only run when that option is selected (general case still triggered)

                            +

                            Creates a new dropdown element define

                            @@ -227,33 +243,15 @@
                          • - option + name : (string) - the name of the option to trigger the callback on; if not already added then will be added as an option - -
                            • - - - - - -
                          • - - callback - - : - - (function) - - the function that will be called when that option is selected - callback param - player LuaPlayer - the player who owns the gui element - callback param - element LuaGuiElement - the element which is being effected - callback param - value string - the new option that has been selected + the optional debug name that can be added + (optional)
                            • @@ -265,8 +263,8 @@ Returns:
                            • - (self) - the define to allow chaining + (table) + the new dropdown element define
                            @@ -282,14 +280,14 @@
                            - # - Dropdown._prototype:new_dynamic_options (callback) + # + Dropdown.new_list_box([name])
                            -

                            Adds a callback which should return a table of values to be added as options for the dropdown (appended after static options)

                            +

                            Creates a new list box element define

                            @@ -303,17 +301,15 @@
                          • - callback + name : - (function) + (string) - the function that will run to get the options for the dropdown - callback param - player LuaPlayer - the player that the element is being drawn to - callback param - element LuaGuiElement - the element that is being drawn - callback return - table - the values of this table will be appended to the static options of the dropdown + the optional debug name that can be added + (optional)
                            • @@ -325,8 +321,8 @@ Returns:
                            • - (self) - the define to allow chaining + (table) + the new list box element define
                            @@ -343,7 +339,7 @@
                            # - Dropdown._prototype:new_static_options (options[, ...], the) + Dropdown._prototype:new_static_options(options[, ...], the)
                            @@ -425,14 +421,14 @@
                            - # - Dropdown.get_selected_value (element) + # + Dropdown._prototype:new_dynamic_options(callback)
                            -

                            Returns the currently selected value rather than index

                            +

                            Adds a callback which should return a table of values to be added as options for the dropdown (appended after static options)

                            @@ -446,13 +442,16 @@
                          • - element + callback : - (LuaGuiElement) + (function) - the gui element that you want to get the value of + the function that will run to get the options for the dropdown + callback param - player LuaPlayer - the player that the element is being drawn to + callback param - element LuaGuiElement - the element that is being drawn + callback return - table - the values of this table will be appended to the static options of the dropdown
                            • @@ -465,8 +464,8 @@ Returns:
                            • - (string) - the value that is currently selected + (self) + the define to allow chaining
                            @@ -482,14 +481,14 @@
                            - # - Dropdown.new_dropdown ([name]) + # + Dropdown._prototype:add_option_callback(option, callback)
                            -

                            Creates a new dropdown element define

                            +

                            Adds a case specific callback which will only run when that option is selected (general case still triggered)

                            @@ -503,73 +502,33 @@
                          • - name + option : (string) - the optional debug name that can be added + the name of the option to trigger the callback on; if not already added then will be added as an option - (optional)
                            • -
                          - - - - - Returns: -
                            -
                          • - (table) - the new dropdown element define -
                            • -
                          - - - - - - - - - -
                        -
                        -
                        -
                        - # - Dropdown.new_list_box ([name]) -
                        -
                        -
                        -
                        - -

                        Creates a new list box element define

                        -

                        - - - Parameters: - -
                          - -
                        • - name + callback : - (string) + (function) - the optional debug name that can be added + the function that will be called when that option is selected + callback param - player LuaPlayer - the player who owns the gui element + callback param - element LuaGuiElement - the element which is being effected + callback param - value string - the new option that has been selected - (optional)
                          • @@ -581,8 +540,8 @@ Returns:
                          • - (table) - the new list box element define + (self) + the define to allow chaining
                          @@ -599,7 +558,7 @@
                          # - Dropdown.select_value (element, value) + Dropdown.select_value(element, value)
                          @@ -661,6 +620,63 @@ + + + + + + +
                          +
                          +
                          +
                          + # + Dropdown.get_selected_value(element) +
                          +
                          +
                          +
                          + +

                          Returns the currently selected value rather than index

                          +

                          + + + Parameters: + +
                            + + + + + +
                          • + + element + + : + + (LuaGuiElement) + + the gui element that you want to get the value of + +
                            • + + +
                          + + + + + Returns: +
                            +
                          • + (string) + the value that is currently selected +
                            • +
                          + + + @@ -683,7 +699,7 @@ generated by LDoc
                          - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                        diff --git a/doc/modules/expcore.gui.elements.elem-button.html b/doc/modules/expcore.gui.elements.elem-button.html index 9cd38050..73ed011e 100644 --- a/doc/modules/expcore.gui.elements.elem-button.html +++ b/doc/modules/expcore.gui.elements.elem-button.html @@ -35,14 +35,21 @@ - + + +

                        • Modules

                          +
                            +

                          • Topics

                            - + +
                            -
                            -
                            Top
                            @@ -168,12 +185,12 @@ - ElemButton._prototype:set_default (value) - Sets the default value for the elem button, this may be a function or a string + ElemButton.new_elem_button([name]) + Creates a new elem button element define - ElemButton.new_elem_button ([name]) - Creates a new elem button element define + ElemButton._prototype:set_default(value) + Sets the default value for the elem button, this may be a function or a string @@ -199,65 +216,8 @@
                            - # - ElemButton._prototype:set_default (value) -
                            -
                            -
                            -
                            - -

                            Sets the default value for the elem button, this may be a function or a string

                            -

                            - - - Parameters: - -
                              - - - - - -
                            • - - value - - : - - (string or function) - - string a will be a static default and a function will be called when drawn to get the default - -
                              • - - -
                            - - - - - Returns: -
                              -
                            • - (the) - element define to allow for chaining -
                              • -
                            - - - - - - - - - -
                            -
                            -
                            -
                            # - ElemButton.new_elem_button ([name]) + ElemButton.new_elem_button([name])
                            @@ -304,6 +264,63 @@ + + + + + + +
                            +
                            +
                            +
                            + # + ElemButton._prototype:set_default(value) +
                            +
                            +
                            +
                            + +

                            Sets the default value for the elem button, this may be a function or a string

                            +

                            + + + Parameters: + +
                              + + + + + +
                            • + + value + + : + + (string or function) + + string a will be a static default and a function will be called when drawn to get the default + +
                              • + + +
                            + + + + + Returns: +
                              +
                            • + (the) + element define to allow for chaining +
                              • +
                            + + + @@ -378,7 +395,7 @@ generated by LDoc
                            - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                            diff --git a/doc/modules/expcore.gui.elements.progress-bar.html b/doc/modules/expcore.gui.elements.progress-bar.html index ce812b03..98cbaee5 100644 --- a/doc/modules/expcore.gui.elements.progress-bar.html +++ b/doc/modules/expcore.gui.elements.progress-bar.html @@ -35,14 +35,20 @@ - + + +
                            +
                            +
                            +
                            + # + ProgressBar.decrement(element[, amount=1]) +
                            +
                            +
                            +
                            + +

                            Decreases the value of the progressbar, if a define is given all of its instances are decresed

                            +

                            + + + Parameters: + +
                              + + + + + +
                            • + + element + + : + + (LuaGuiElement or string) + + either a gui element or a registered define + +
                              • + + + + +
                            • amount @@ -336,18 +433,52 @@
                              • +
                            + + + + + + + + + + + + + +
                            +
                            +
                            +
                            + # + ProgressBar.new_progressbar([name]) +
                            +
                            +
                            +
                            + +

                            Creates a new progressbar element define

                            +

                            + + + Parameters: + +
                              + +
                            • - category + name : (string) - the category that is used with a store + the optional debug name that can be added (optional)
                              • @@ -358,6 +489,13 @@ + Returns: +
                                +
                              • + (table) + the new progressbar elemente define +
                                • +
                              @@ -371,14 +509,14 @@
                              - # - ProgressBar._prototype:decrement_filtered ([amount=1], filter) + # + ProgressBar._prototype:set_default_maximum(amount)
                              -

                              Decreases the value of the progressbar, if the filter condition is met, does not work with store

                              +

                              Sets the maximum value that represents the end value of the progress bar

                              @@ -398,76 +536,8 @@ (number) - the amount to decrease the progressbar by + the amount to have set as the maximum - (default: 1) - - - - - - -
                            • - - filter - - : - - (function) - - the filter to be used - -
                              • - - -
                            - - - - - - - - - - - - - -
                            -
                            -
                            -
                            - # - ProgressBar._prototype:event_countdown ([filter]) -
                            -
                            -
                            -
                            - -

                            Event handler factory that counts down by 1 every time the event triggeres, can filter which elements are decremented

                            -

                            - - - Parameters: - -
                              - - - - - -
                            • - - filter - - : - - (function) - - when given will use filtered decerement - - (optional)
                              • @@ -479,8 +549,8 @@ Returns:
                              • - (function) - the event handler + (table) + the define to allow chaining
                              @@ -496,14 +566,14 @@
                              - # - ProgressBar._prototype:event_counter ([filter]) + # + ProgressBar._prototype:use_count_down([state=true])
                              -

                              Event handler factory that counts up by 1 every time the event triggeres, can filter which elements are incremented

                              +

                              Will set the progress bar to start at 1 and trigger when it hits 0

                              @@ -517,15 +587,15 @@
                            • - filter + state : - (function) + (boolean) - when given will use filtered incerement + when true the bar will start filled, to be used with decrease - (optional) + (default: true)
                              • @@ -537,8 +607,8 @@ Returns:
                              • - (function) - the event handler + (table) + the define to allow chaining
                              @@ -555,7 +625,7 @@
                              # - ProgressBar._prototype:increment ([amount=1][, category]) + ProgressBar._prototype:increment([amount=1][, category])
                              @@ -623,7 +693,7 @@
                              # - ProgressBar._prototype:increment_filtered ([amount=1], filter) + ProgressBar._prototype:increment_filtered([amount=1], filter)
                              @@ -679,6 +749,209 @@ + + + + + + +
                              +
                              +
                              +
                              + # + ProgressBar._prototype:decrement([amount=1][, category]) +
                              +
                              +
                              +
                              + +

                              Decreases the value of the progressbar

                              +

                              + + + Parameters: + +
                                + + + + + +
                              • + + amount + + : + + (number) + + the amount to decrease the progressbar by + + (default: 1) +
                                • + + + + + +
                              • + + category + + : + + (string) + + the category that is used with a store + + (optional) +
                                • + + +
                              + + + + + + + + + + + + + +
                              +
                              +
                              +
                              + # + ProgressBar._prototype:decrement_filtered([amount=1], filter) +
                              +
                              +
                              +
                              + +

                              Decreases the value of the progressbar, if the filter condition is met, does not work with store

                              +

                              + + + Parameters: + +
                                + + + + + +
                              • + + amount + + : + + (number) + + the amount to decrease the progressbar by + + (default: 1) +
                                • + + + + + +
                              • + + filter + + : + + (function) + + the filter to be used + +
                                • + + +
                              + + + + + + + + + + + + + +
                              +
                              +
                              +
                              + # + ProgressBar._prototype:add_element(element[, maximum]) +
                              +
                              +
                              +
                              + +

                              Adds an element into the list of instances that will are waiting to complete, does not work with store + note use store if you want persistent data, this only stores the elements not the values which they have

                              +

                              + + + Parameters: + +
                                + + + + + +
                              • + + element + + : + + (LuaGuiElement) + + the element that you want to add into the waiting to complete list + +
                                • + + + + + +
                              • + + maximum + + : + + (number) + + the maximum for this element if not given the default for this define is used + + (optional) +
                                • + + +
                              + + + + + + + @@ -690,7 +963,7 @@
                              # - ProgressBar._prototype:reset_element (element) + ProgressBar._prototype:reset_element(element)
                              @@ -739,14 +1012,14 @@
                              - # - ProgressBar._prototype:set_default_maximum (amount) + # + ProgressBar._prototype:event_counter([filter])
                              -

                              Sets the maximum value that represents the end value of the progress bar

                              +

                              Event handler factory that counts up by 1 every time the event triggeres, can filter which elements are incremented

                              @@ -760,262 +1033,13 @@
                            • - amount + filter : - (number) + (function) - the amount to have set as the maximum - -
                              • - - -
                            - - - - - Returns: -
                              -
                            • - (table) - the define to allow chaining -
                              • -
                            - - - - - - - - - -
                            -
                            -
                            -
                            - # - ProgressBar._prototype:use_count_down ([state=true]) -
                            -
                            -
                            -
                            - -

                            Will set the progress bar to start at 1 and trigger when it hits 0

                            -

                            - - - Parameters: - -
                              - - - - - -
                            • - - state - - : - - (boolean) - - when true the bar will start filled, to be used with decrease - - (default: true) -
                              • - - -
                            - - - - - Returns: -
                              -
                            • - (table) - the define to allow chaining -
                              • -
                            - - - - - - - - - -
                            -
                            -
                            -
                            - # - ProgressBar.decrement (element[, amount=1]) -
                            -
                            -
                            -
                            - -

                            Decreases the value of the progressbar, if a define is given all of its instances are decresed

                            -

                            - - - Parameters: - -
                              - - - - - -
                            • - - element - - : - - (LuaGuiElement or string) - - either a gui element or a registered define - -
                              • - - - - - -
                            • - - amount - - : - - (number) - - the amount to decrease the progressbar by - - (default: 1) -
                              • - - -
                            - - - - - - - - - - - - - -
                            -
                            -
                            -
                            - # - ProgressBar.increment (element[, amount=1]) -
                            -
                            -
                            -
                            - -

                            Increases the value of the progressbar, if a define is given all of its instances are incremented

                            -

                            - - - Parameters: - -
                              - - - - - -
                            • - - element - - : - - (LuaGuiElement or string) - - either a gui element or a registered define - -
                              • - - - - - -
                            • - - amount - - : - - (number) - - the amount to increase the progressbar by - - (default: 1) -
                              • - - -
                            - - - - - - - - - - - - - -
                            -
                            -
                            -
                            - # - ProgressBar.new_progressbar ([name]) -
                            -
                            -
                            -
                            - -

                            Creates a new progressbar element define

                            -

                            - - - Parameters: - -
                              - - - - - -
                            • - - name - - : - - (string) - - the optional debug name that can be added + when given will use filtered incerement (optional)
                              • @@ -1029,8 +1053,8 @@ Returns:
                              • - (table) - the new progressbar elemente define + (function) + the event handler
                              @@ -1046,14 +1070,14 @@
                              - # - ProgressBar.set_maximum (element, amount) + # + ProgressBar._prototype:event_countdown([filter])
                              -

                              Sets the maximum value that represents the end value of the progress bar

                              +

                              Event handler factory that counts down by 1 every time the event triggeres, can filter which elements are decremented

                              @@ -1067,30 +1091,15 @@
                            • - element + filter : - (LuaGuiElement or string) + (function) - either a gui element or a registered define - -
                              • - - - - - -
                            • - - amount - - : - - (number) - - the amount to have set as the maximum + when given will use filtered decerement + (optional)
                              • @@ -1099,6 +1108,13 @@ + Returns: +
                                +
                              • + (function) + the event handler +
                                • +
                              @@ -1124,7 +1140,7 @@ generated by LDoc
                              - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                            diff --git a/doc/modules/expcore.gui.elements.slider.html b/doc/modules/expcore.gui.elements.slider.html index 2f447b54..11f0858c 100644 --- a/doc/modules/expcore.gui.elements.slider.html +++ b/doc/modules/expcore.gui.elements.slider.html @@ -35,14 +35,20 @@ - + + +

                            • Modules

                              +
                                +

                              • Topics

                                - + +
                                • -

                                  Contents of expcore.gui.elements.slider

                                  +

                                  Jump to Section

                                -
                                -
                                Top
                                @@ -167,20 +183,20 @@ - Slider._prototype:draw_label (element) - Draws a new label and links its value to the value of this slider, if no store then it will only show one value per player + Slider.new_slider([name]) + Creates a new slider element define - Slider._prototype:enable_auto_draw_label ([state=true]) - Enables auto draw of the label, the label will share the same parent element as the slider - - - Slider._prototype:set_range ([min][, max]) + Slider._prototype:set_range([min][, max]) Sets the range of a slider, if not used will use default values for a slider - Slider.new_slider ([name]) - Creates a new slider element define + Slider._prototype:draw_label(element) + Draws a new label and links its value to the value of this slider, if no store then it will only show one value per player + + + Slider._prototype:enable_auto_draw_label([state=true]) + Enables auto draw of the label, the label will share the same parent element as the slider @@ -194,14 +210,14 @@
                                - # - Slider._prototype:draw_label (element) + # + Slider.new_slider([name])
                                -

                                Draws a new label and links its value to the value of this slider, if no store then it will only show one value per player

                                +

                                Creates a new slider element define

                                @@ -215,14 +231,15 @@
                              • - element + name : - (LuaGuiElement) + (string) - the parent element that the lable will be drawn to + the optional debug name that can be added + (optional)
                                • @@ -234,66 +251,8 @@ Returns:
                                • - (LuaGuiElement) - the new label element so that styles can be applied -
                                  • -
                                - - - - - - - - - -
                                -
                                -
                                -
                                - # - Slider._prototype:enable_auto_draw_label ([state=true]) -
                                -
                                -
                                -
                                - -

                                Enables auto draw of the label, the label will share the same parent element as the slider

                                -

                                - - - Parameters: - -
                                  - - - - - -
                                • - - state - - : - - (boolean) - - when false will disable the auto draw of the label - - (default: true) -
                                  • - - -
                                - - - - - Returns: -
                                  -
                                • - (self) - the define to allow chaining + (table) + the new slider element define
                                @@ -310,7 +269,7 @@
                                # - Slider._prototype:set_range ([min][, max]) + Slider._prototype:set_range([min][, max])
                                @@ -384,14 +343,14 @@
                                - # - Slider.new_slider ([name]) + # + Slider._prototype:draw_label(element)
                                -

                                Creates a new slider element define

                                +

                                Draws a new label and links its value to the value of this slider, if no store then it will only show one value per player

                                @@ -405,15 +364,14 @@
                              • - name + element : - (string) + (LuaGuiElement) - the optional debug name that can be added + the parent element that the lable will be drawn to - (optional)
                                • @@ -425,8 +383,66 @@ Returns:
                                • - (table) - the new slider element define + (LuaGuiElement) + the new label element so that styles can be applied +
                                  • +
                                + + + + + + + + + +
                                +
                                +
                                +
                                + # + Slider._prototype:enable_auto_draw_label([state=true]) +
                                +
                                +
                                +
                                + +

                                Enables auto draw of the label, the label will share the same parent element as the slider

                                +

                                + + + Parameters: + +
                                  + + + + + +
                                • + + state + + : + + (boolean) + + when false will disable the auto draw of the label + + (default: true) +
                                  • + + +
                                + + + + + Returns: +
                                  +
                                • + (self) + the define to allow chaining
                                @@ -454,7 +470,7 @@ generated by LDoc
                                - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                diff --git a/doc/modules/expcore.gui.elements.text.html b/doc/modules/expcore.gui.elements.text.html index 7ed2dccb..1eac057c 100644 --- a/doc/modules/expcore.gui.elements.text.html +++ b/doc/modules/expcore.gui.elements.text.html @@ -35,14 +35,20 @@ - + + +

                                • Modules

                                  +
                                    +

                                  • Topics

                                    - + +
                                    • -

                                      Contents of expcore.gui.elements.text

                                      +

                                      Jump to Section

                                    -
                                    -
                                    Top
                                    @@ -167,24 +183,24 @@ - Text._prototype_box:set_read_only ([state=true]) - Sets the text box to be read only + Text.new_text_field([name]) + Creates a new text field element define - Text._prototype_box:set_selectable ([state=true]) - Sets the text box to be selectable - - - Text._prototype_box:set_word_wrap ([state=true]) - Sets the text box to have word wrap - - - Text.new_text_box ([name]) + Text.new_text_box([name]) Creates a new text box element define - Text.new_text_field ([name]) - Creates a new text field element define + Text._prototype_box:set_selectable([state=true]) + Sets the text box to be selectable + + + Text._prototype_box:set_word_wrap([state=true]) + Sets the text box to have word wrap + + + Text._prototype_box:set_read_only([state=true]) + Sets the text box to be read only @@ -198,14 +214,14 @@
                                    - # - Text._prototype_box:set_read_only ([state=true]) + # + Text.new_text_field([name])
                                    -

                                    Sets the text box to be read only

                                    +

                                    Creates a new text field element define

                                    @@ -219,15 +235,15 @@
                                  • - state + name : - (boolean) + (string) - when false will set the state to false + the optional debug name that can be added - (default: true) + (optional)
                                    • @@ -239,8 +255,66 @@ Returns:
                                    • - (self) - table the define to allow for chaining + (table) + the new text field element define +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Text.new_text_box([name]) +
                                    +
                                    +
                                    +
                                    + +

                                    Creates a new text box element define

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + name + + : + + (string) + + the optional debug name that can be added + + (optional) +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (table) + the new text box element define
                                    @@ -257,7 +331,7 @@
                                    # - Text._prototype_box:set_selectable ([state=true]) + Text._prototype_box:set_selectable([state=true])
                                    @@ -315,7 +389,7 @@
                                    # - Text._prototype_box:set_word_wrap ([state=true]) + Text._prototype_box:set_word_wrap([state=true])
                                    @@ -372,14 +446,14 @@
                                    - # - Text.new_text_box ([name]) + # + Text._prototype_box:set_read_only([state=true])
                                    -

                                    Creates a new text box element define

                                    +

                                    Sets the text box to be read only

                                    @@ -393,15 +467,15 @@
                                  • - name + state : - (string) + (boolean) - the optional debug name that can be added + when false will set the state to false - (optional) + (default: true)
                                    • @@ -413,66 +487,8 @@ Returns:
                                    • - (table) - the new text box element define -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Text.new_text_field ([name]) -
                                    -
                                    -
                                    -
                                    - -

                                    Creates a new text field element define

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - name - - : - - (string) - - the optional debug name that can be added - - (optional) -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (table) - the new text field element define + (self) + table the define to allow for chaining
                                    @@ -500,7 +516,7 @@ generated by LDoc
                                    - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                    diff --git a/doc/modules/expcore.gui.html b/doc/modules/expcore.gui.html index 082631e8..60a00594 100644 --- a/doc/modules/expcore.gui.html +++ b/doc/modules/expcore.gui.html @@ -35,14 +35,12 @@ - + +

                                    • Modules

                                      +
                                        +

                                      • Topics

                                        - -
                                        + Top
                                        @@ -171,7 +179,7 @@ generated by LDoc
                                        - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                        diff --git a/doc/modules/expcore.gui.instances.html b/doc/modules/expcore.gui.instances.html index 2272fc2d..77efa0e8 100644 --- a/doc/modules/expcore.gui.instances.html +++ b/doc/modules/expcore.gui.instances.html @@ -35,14 +35,12 @@ - + +

                                        • Modules

                                          +
                                            +

                                          • Topics

                                            - -
                                            + Top
                                            @@ -171,7 +179,7 @@ generated by LDoc
                                            - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                            diff --git a/doc/modules/expcore.gui.prototype.html b/doc/modules/expcore.gui.prototype.html index 6aa05d6e..43fabdef 100644 --- a/doc/modules/expcore.gui.prototype.html +++ b/doc/modules/expcore.gui.prototype.html @@ -35,14 +35,21 @@ - + + +

                                            • Modules

                                              +
                                                +

                                              • Topics

                                                - + +
                                                -
                                                -
                                                Top
                                                @@ -168,53 +185,53 @@ - Constructor.event (event_name) + Constructor.event(event_name) Creates a new function to add functions to an event handler - Constructor.extend (new_prototype) + Constructor.extend(new_prototype) Extents a prototype with the base functions of all gui prototypes, no metatables - Constructor.setter (value_type, key[, second_key]) - Creates a setter function that checks the type when a value is set - - - Constructor.store (sync, callback) + Constructor.store(sync, callback) Creates a new function which adds a store to a gui define - Prototype:clear_store ([category]) - Sets the value in this elements store to nil, category needed if categorize function used + Constructor.setter(value_type, key[, second_key]) + Creates a setter function that checks the type when a value is set - Prototype:draw_to (element) + Prototype:uid() + Gets the uid for the element define + + + Prototype:set_style(style[, function]) + Sets the style for the element define + + + Prototype:set_embeded_flow(boolean) + Sets the element to be drawn inside a nameless flow, can be given a name using a function + + + Prototype:raise_event(event_name, ...) + Raises a custom event for this define, any number of params can be given + + + Prototype:draw_to(element) The main function for defines, when called will draw an instance of this define to the given element what is drawn is based on the data in draw_data which is set using other functions - Prototype:get_store (category) + Prototype:get_store(category) Gets the value in this elements store, category needed if categorize function used - Prototype:raise_event (event_name, ...) - Raises a custom event for this define, any number of params can be given - - - Prototype:set_embeded_flow (boolean) - Sets the element to be drawn inside a nameless flow, can be given a name using a function - - - Prototype:set_store (category, value) + Prototype:set_store(category, value) Sets the value in this elements store, category needed if categorize function used - Prototype:set_style (style[, function]) - Sets the style for the element define - - - Prototype:uid () - Gets the uid for the element define + Prototype:clear_store([category]) + Sets the value in this elements store to nil, category needed if categorize function used @@ -229,28 +246,28 @@ Sets a debug alias for the define - Prototype.on_draw - Registers a callback to the on_draw event - - - Prototype.on_style_update - Registers a callback to the on_style_update event - - Prototype.set_caption Sets the caption for the element define - Prototype.set_post_authenticator - Sets an authenticator that disables the element if check fails + Prototype.set_tooltip + Sets the tooltip for the element define Prototype.set_pre_authenticator Sets an authenticator that blocks the draw function if check fails - Prototype.set_tooltip - Sets the tooltip for the element define + Prototype.set_post_authenticator + Sets an authenticator that disables the element if check fails + + + Prototype.on_draw + Registers a callback to the on_draw event + + + Prototype.on_style_update + Registers a callback to the on_style_update event @@ -265,7 +282,7 @@
                                                # - Constructor.event (event_name) + Constructor.event(event_name)
                                                @@ -322,7 +339,7 @@
                                                # - Constructor.extend (new_prototype) + Constructor.extend(new_prototype)
                                                @@ -368,6 +385,79 @@ + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Constructor.store(sync, callback) +
                                                +
                                                +
                                                +
                                                + +

                                                Creates a new function which adds a store to a gui define

                                                +

                                                + + + Parameters: + +
                                                  + + + + + +
                                                • + + sync + + : + + (boolean) + + if the function should create a synced store + +
                                                  • + + + + + +
                                                • + + callback + + : + + (function) + + the function called when needing to update the value of an element + +
                                                  • + + +
                                                + + + + + Returns: +
                                                  +
                                                • + (function) + the function that will add a store for this define +
                                                  • +
                                                + + + @@ -379,7 +469,7 @@
                                                # - Constructor.setter (value_type, key[, second_key]) + Constructor.setter(value_type, key[, second_key])
                                                @@ -468,440 +558,25 @@
                                                - # - Constructor.store (sync, callback) + # + Prototype:uid()
                                                -

                                                Creates a new function which adds a store to a gui define

                                                +

                                                Gets the uid for the element define

                                                - Parameters: - -
                                                  - - - - - -
                                                • - - sync - - : - - (boolean) - - if the function should create a synced store - -
                                                  • - - - - - -
                                                • - - callback - - : - - (function) - - the function called when needing to update the value of an element - -
                                                  • - - -
                                                - Returns:
                                                • - (function) - the function that will add a store for this define -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Prototype:clear_store ([category]) -
                                                -
                                                -
                                                -
                                                - -

                                                Sets the value in this elements store to nil, category needed if categorize function used

                                                -

                                                - - - Parameters: - -
                                                  - - - - - -
                                                • - - category - - : - (string) - - the category to get such as player name or force name - - (optional) -
                                                  • - - -
                                                - - - - - Returns: -
                                                  -
                                                • - (boolean) - true if the value was set -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Prototype:draw_to (element) -
                                                -
                                                -
                                                -
                                                - -

                                                The main function for defines, when called will draw an instance of this define to the given element - what is drawn is based on the data in draw_data which is set using other functions

                                                -

                                                - - - Parameters: - -
                                                  - - - - - -
                                                • - - element - - : - - (LuaGuiElement) - - the element that the define will draw a instance of its self onto - -
                                                  • - - -
                                                - - - - - Returns: - - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Prototype:get_store (category) -
                                                -
                                                -
                                                -
                                                - -

                                                Gets the value in this elements store, category needed if categorize function used

                                                -

                                                - - - Parameters: - -
                                                  - - - - - -
                                                • - - category - - : - - (string) - - [opt] the category to get such as player name or force name - -
                                                  • - - -
                                                - - - - - Returns: -
                                                  -
                                                • - (any) - the value that is stored for this define -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Prototype:raise_event (event_name, ...) -
                                                -
                                                -
                                                -
                                                - -

                                                Raises a custom event for this define, any number of params can be given

                                                -

                                                - - - Parameters: - -
                                                  - - - - - -
                                                • - - event_name - - : - - (string) - - the name of the event that you want to raise - -
                                                  • - - - - - -
                                                • - - ... - - : - - (any) - - any params that you want to pass to the event - -
                                                  • - - -
                                                - - - - - Returns: -
                                                  -
                                                • - (number) - the number of handlers that were registered -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Prototype:set_embeded_flow (boolean) -
                                                -
                                                -
                                                -
                                                - -

                                                Sets the element to be drawn inside a nameless flow, can be given a name using a function

                                                -

                                                - - - Parameters: - -
                                                  - - - - - -
                                                • - - boolean - - : - - (state) - - |function when true a padless flow is created to contain the element - -
                                                  • - - -
                                                - - - - - Returns: -
                                                  -
                                                • - (self) - the element define to allow chaining -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Prototype:set_store (category, value) -
                                                -
                                                -
                                                -
                                                - -

                                                Sets the value in this elements store, category needed if categorize function used

                                                -

                                                - - - Parameters: - -
                                                  - - - - - -
                                                • - - category - - : - - (string) - - [opt] the category to get such as player name or force name - -
                                                  • - - - - - -
                                                • - - value - - : - - (any) - - the value to set for this define, must be valid for its type ie for checkbox etc - -
                                                  • - - -
                                                - - - - - Returns: -
                                                  -
                                                • - (boolean) - true if the value was set + the uid of this element define
                                                @@ -918,7 +593,7 @@
                                                # - Prototype:set_style (style[, function]) + Prototype:set_style(style[, function])
                                                @@ -991,25 +666,367 @@
                                                - # - Prototype:uid () + # + Prototype:set_embeded_flow(boolean)
                                                -

                                                Gets the uid for the element define

                                                +

                                                Sets the element to be drawn inside a nameless flow, can be given a name using a function

                                                + Parameters: + +
                                                  + + + + + +
                                                • + + boolean + + : + + (state) + + |function when true a padless flow is created to contain the element + +
                                                  • + + +
                                                + Returns:
                                                • + (self) + the element define to allow chaining +
                                                  • +
                                                + + + + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Prototype:raise_event(event_name, ...) +
                                                +
                                                +
                                                +
                                                + +

                                                Raises a custom event for this define, any number of params can be given

                                                +

                                                + + + Parameters: + +
                                                  + + + + + +
                                                • + + event_name + + : + (string) - the uid of this element define + + the name of the event that you want to raise + +
                                                  • + + + + + +
                                                • + + ... + + : + + (any) + + any params that you want to pass to the event + +
                                                  • + + +
                                                + + + + + Returns: +
                                                  +
                                                • + (number) + the number of handlers that were registered +
                                                  • +
                                                + + + + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Prototype:draw_to(element) +
                                                +
                                                +
                                                +
                                                + +

                                                The main function for defines, when called will draw an instance of this define to the given element + what is drawn is based on the data in draw_data which is set using other functions

                                                +

                                                + + + Parameters: + +
                                                  + + + + + +
                                                • + + element + + : + + (LuaGuiElement) + + the element that the define will draw a instance of its self onto + +
                                                  • + + +
                                                + + + + + Returns: + + + + + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Prototype:get_store(category) +
                                                +
                                                +
                                                +
                                                + +

                                                Gets the value in this elements store, category needed if categorize function used

                                                +

                                                + + + Parameters: + +
                                                  + + + + + +
                                                • + + category + + : + + (string) + + [opt] the category to get such as player name or force name + +
                                                  • + + +
                                                + + + + + Returns: +
                                                  +
                                                • + (any) + the value that is stored for this define +
                                                  • +
                                                + + + + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Prototype:set_store(category, value) +
                                                +
                                                +
                                                +
                                                + +

                                                Sets the value in this elements store, category needed if categorize function used

                                                +

                                                + + + Parameters: + +
                                                  + + + + + +
                                                • + + category + + : + + (string) + + [opt] the category to get such as player name or force name + +
                                                  • + + + + + +
                                                • + + value + + : + + (any) + + the value to set for this define, must be valid for its type ie for checkbox etc + +
                                                  • + + +
                                                + + + + + Returns: +
                                                  +
                                                • + (boolean) + true if the value was set +
                                                  • +
                                                + + + + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Prototype:clear_store([category]) +
                                                +
                                                +
                                                +
                                                + +

                                                Sets the value in this elements store to nil, category needed if categorize function used

                                                +

                                                + + + Parameters: + +
                                                  + + + + + +
                                                • + + category + + : + + (string) + + the category to get such as player name or force name + + (optional) +
                                                  • + + +
                                                + + + + + Returns: +
                                                  +
                                                • + (boolean) + true if the value was set
                                                @@ -1067,6 +1084,208 @@ + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Prototype.set_caption +
                                                +
                                                +
                                                +
                                                + +

                                                Sets the caption for the element define

                                                +

                                                + + + +
                                                  + + + + + +
                                                • + + caption + + : + + (string) + + the caption that will be drawn with the element + +
                                                  • + + +
                                                + + + + + + + + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Prototype.set_tooltip +
                                                +
                                                +
                                                +
                                                + +

                                                Sets the tooltip for the element define

                                                +

                                                + + + +
                                                  + + + + + +
                                                • + + tooltip + + : + + (string) + + the tooltip that will be displayed for this element when drawn + +
                                                  • + + +
                                                + + + + + + + + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Prototype.set_pre_authenticator +
                                                +
                                                +
                                                +
                                                + +

                                                Sets an authenticator that blocks the draw function if check fails

                                                +

                                                + + + +
                                                  + + + + + +
                                                • + + callback + + : + + (function) + + the function that will be ran to test if the element should be drawn or not + callback param - LuaPlayer player - the player that the element is being drawn to + callback param - string define_name - the name of the define that is being drawn + callback return - boolean - false will stop the element from being drawn + +
                                                  • + + +
                                                + + + + + + + + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Prototype.set_post_authenticator +
                                                +
                                                +
                                                +
                                                + +

                                                Sets an authenticator that disables the element if check fails

                                                +

                                                + + + +
                                                  + + + + + +
                                                • + + callback + + : + + (function) + + the function that will be ran to test if the element should be enabled or not + callback param - LuaPlayer player - the player that the element is being drawn to + callback param - string define_name - the name of the define that is being drawn + callback return - boolean - false will disable the element + +
                                                  • + + +
                                                + + + + + + + @@ -1169,208 +1388,6 @@ - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Prototype.set_caption -
                                                -
                                                -
                                                -
                                                - -

                                                Sets the caption for the element define

                                                -

                                                - - - -
                                                  - - - - - -
                                                • - - caption - - : - - (string) - - the caption that will be drawn with the element - -
                                                  • - - -
                                                - - - - - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Prototype.set_post_authenticator -
                                                -
                                                -
                                                -
                                                - -

                                                Sets an authenticator that disables the element if check fails

                                                -

                                                - - - -
                                                  - - - - - -
                                                • - - callback - - : - - (function) - - the function that will be ran to test if the element should be enabled or not - callback param - LuaPlayer player - the player that the element is being drawn to - callback param - string define_name - the name of the define that is being drawn - callback return - boolean - false will disable the element - -
                                                  • - - -
                                                - - - - - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Prototype.set_pre_authenticator -
                                                -
                                                -
                                                -
                                                - -

                                                Sets an authenticator that blocks the draw function if check fails

                                                -

                                                - - - -
                                                  - - - - - -
                                                • - - callback - - : - - (function) - - the function that will be ran to test if the element should be drawn or not - callback param - LuaPlayer player - the player that the element is being drawn to - callback param - string define_name - the name of the define that is being drawn - callback return - boolean - false will stop the element from being drawn - -
                                                  • - - -
                                                - - - - - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Prototype.set_tooltip -
                                                -
                                                -
                                                -
                                                - -

                                                Sets the tooltip for the element define

                                                -

                                                - - - -
                                                  - - - - - -
                                                • - - tooltip - - : - - (string) - - the tooltip that will be displayed for this element when drawn - -
                                                  • - - -
                                                - - - - - - - @@ -1393,7 +1410,7 @@ generated by LDoc
                                                - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                diff --git a/doc/modules/expcore.gui.test.html b/doc/modules/expcore.gui.test.html index 779d1581..5422e9b1 100644 --- a/doc/modules/expcore.gui.test.html +++ b/doc/modules/expcore.gui.test.html @@ -35,14 +35,12 @@ - + +
                                                +
                                                +
                                                +
                                                + # + Permissions_Groups.reload_permissions() +
                                                +
                                                +
                                                +
                                                + +

                                                Reloads/creates all permission groups and sets them to they configured state

                                                +

                                                + + + + + + + + + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Permissions_Groups.lockdown_permissions(exempt) +
                                                +
                                                +
                                                +
                                                + +

                                                Removes all permissions from every permission group except for "Default" and any passed as exempt

                                                +

                                                + + + Parameters: + +
                                                  + + + + + +
                                                • + + exempt + + : + + (string or Array) + + groups that you want to be except, "Default" is always exempt + +
                                                  • + + +
                                                + + + + + Returns: +
                                                  +
                                                • + (number) + the number of groups that had they permissions removed +
                                                  • +
                                                + + + + + + + + + +
                                                +
                                                +
                                                +
                                                + # + Permissions_Groups.set_player_group(player, group) +
                                                +
                                                +
                                                +
                                                + +

                                                Sets a player's group to the one given, a player can only have one group at a time

                                                +

                                                + + + Parameters: + +
                                                  + + + + + +
                                                • + + player + + : + + (LuaPlayer) + + the player to effect can be name index etc + +
                                                  • + + + + + +
                                                • + + group + + : + + (string) + + the name of the group to give to the player
                                                  • @@ -300,485 +587,6 @@ - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Permissions_Groups._prototype:allow (actions) -
                                                -
                                                -
                                                -
                                                - -

                                                Sets an action or actions to be allowed for this group even with disallow_all triggered, Do not use in runtime

                                                -

                                                - - - Parameters: - -
                                                  - - - - - -
                                                • - - actions - - : - - (string or Array) - - the action or actions that you want to allow for this group - -
                                                  • - - -
                                                - - - - - Returns: -
                                                  -
                                                • - (Permissions_Groups._prototype) - returns self so function can be chained -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Permissions_Groups._prototype:allow_all () -
                                                -
                                                -
                                                -
                                                - -

                                                Sets the default state for any actions not given to be allowed, useful with :disallow

                                                -

                                                - - - - - - Returns: -
                                                  -
                                                • - (Permissions_Groups._prototype) - returns self so function can be chained -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Permissions_Groups._prototype:create () -
                                                -
                                                -
                                                -
                                                - -

                                                Creates or updates the permission group with the configured actions, used internally

                                                -

                                                - - - - - - Returns: - - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Permissions_Groups._prototype:disallow (actions) -
                                                -
                                                -
                                                -
                                                - -

                                                Sets an action or actions to be disallowed for this group even with allow_all triggered, Do not use in runtime

                                                -

                                                - - - Parameters: - -
                                                  - - - - - -
                                                • - - actions - - : - - (string or Array) - - the action or actions that you want to disallow for this group - -
                                                  • - - -
                                                - - - - - Returns: -
                                                  -
                                                • - (Permissions_Groups._prototype) - returns self so function can be chained -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Permissions_Groups._prototype:disallow_all () -
                                                -
                                                -
                                                -
                                                - -

                                                Sets the default state for any action not given to be disallowed, useful with :allow

                                                -

                                                - - - - - - Returns: -
                                                  -
                                                • - (Permissions_Groups._prototype) - returns self so function can be chained -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Permissions_Groups._prototype:get_players ([online]) -
                                                -
                                                -
                                                -
                                                - -

                                                Returns all player that are in this group with the option to filter to online/offline only

                                                -

                                                - - - Parameters: - -
                                                  - - - - - -
                                                • - - online - - : - - (boolean) - - if nil returns all players, if true online players only, if false returns online players only - - (optional) -
                                                  • - - -
                                                - - - - - Returns: -
                                                  -
                                                • - (table) - a table of players that are in this group; filtered if online param is given -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Permissions_Groups._prototype:get_raw () -
                                                -
                                                -
                                                -
                                                - -

                                                Returns the LuaPermissionGroup that was created with this group object, used internally

                                                -

                                                - - - - - - Returns: - - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Permissions_Groups._prototype:is_allowed (action) -
                                                -
                                                -
                                                -
                                                - -

                                                Returns if an input action is allowed for this group

                                                -

                                                - - - Parameters: - - - - - - - Returns: -
                                                  -
                                                • - (boolean) - true if the group is allowed the action, false other wise -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Permissions_Groups._prototype:print (message) -
                                                -
                                                -
                                                -
                                                - -

                                                Prints a message to every player in this group

                                                -

                                                - - - Parameters: - -
                                                  - - - - - -
                                                • - - message - - : - - (string) - - the message that you want to send to the players - -
                                                  • - - -
                                                - - - - - Returns: -
                                                  -
                                                • - (number) - the number of players that received the message -
                                                  • -
                                                - - - - - - - - - -
                                                -
                                                -
                                                -
                                                - # - Permissions_Groups._prototype:remove_player (player) -
                                                -
                                                -
                                                -
                                                - -

                                                Removes a player from this group

                                                -

                                                - - - Parameters: - -
                                                  - - - - - -
                                                • - - player - - : - - (LuaPlayer) - - LuaPlayer the player you want to remove from this group can be name or index etc - -
                                                  • - - -
                                                - - - - - Returns: -
                                                  -
                                                • - (boolean) - true if the player was removed successfully, false other wise -
                                                  • -
                                                - - - @@ -790,7 +598,7 @@
                                                # - Permissions_Groups._prototype:set_action (action, state) + Permissions_Groups._prototype:set_action(action, state)
                                                @@ -862,14 +670,14 @@
                                                - # - Permissions_Groups.get_group_by_name (name) + # + Permissions_Groups._prototype:allow(actions)
                                                -

                                                Returns the group with the given name, case sensitive

                                                +

                                                Sets an action or actions to be allowed for this group even with disallow_all triggered, Do not use in runtime

                                                @@ -883,184 +691,13 @@
                                              • - name - - : - - (string) - - the name of the group to get - -
                                                • - - -
                                              - - - - - Returns: -
                                                -
                                              • - (Permissions_Groups._prototype or nil) - the group with that name or nil if non found -
                                                • -
                                              - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Permissions_Groups.get_group_from_player (player) -
                                    -
                                    -
                                    -
                                    - -

                                    Returns the group that a player is in

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - player - - : - - (LuaPlayer) - - the player to get the group of can be name index etc - -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (Permissions_Groups._prototype or nil) - the group with that player or nil if non found -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Permissions_Groups.lockdown_permissions (exempt) -
                                    -
                                    -
                                    -
                                    - -

                                    Removes all permissions from every permission group except for "Default" and any passed as exempt

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - exempt + actions : (string or Array) - groups that you want to be except, "Default" is always exempt - -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (number) - the number of groups that had they permissions removed -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Permissions_Groups.new_group (name) -
                                    -
                                    -
                                    -
                                    - -

                                    Defines a new permission group that can have it actions set in the config

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - name - - : - - (string) - - the name of the new group + the action or actions that you want to allow for this group
                                      • @@ -1074,7 +711,7 @@
                                      • (Permissions_Groups._prototype) - the new group made with function to allow and disallow actions + returns self so function can be chained
                                      @@ -1090,20 +727,50 @@
                                      - # - Permissions_Groups.reload_permissions () + # + Permissions_Groups._prototype:disallow(actions)
                                      -

                                      Reloads/creates all permission groups and sets them to they configured state

                                      +

                                      Sets an action or actions to be disallowed for this group even with allow_all triggered, Do not use in runtime

                                      + Parameters: + +
                                        + + + + + +
                                      • + + actions + + : + + (string or Array) + + the action or actions that you want to disallow for this group + +
                                        • + + +
                                      + + Returns: +
                                        +
                                      • + (Permissions_Groups._prototype) + returns self so function can be chained +
                                        • +
                                      @@ -1117,14 +784,207 @@
                                      - # - Permissions_Groups.set_player_group (player, group) + # + Permissions_Groups._prototype:allow_all()
                                      -

                                      Sets a player's group to the one given, a player can only have one group at a time

                                      +

                                      Sets the default state for any actions not given to be allowed, useful with :disallow

                                      +

                                      + + + + + + Returns: +
                                        +
                                      • + (Permissions_Groups._prototype) + returns self so function can be chained +
                                        • +
                                      + + + + + + + + + +
                                      +
                                      +
                                      +
                                      + # + Permissions_Groups._prototype:disallow_all() +
                                      +
                                      +
                                      +
                                      + +

                                      Sets the default state for any action not given to be disallowed, useful with :allow

                                      +

                                      + + + + + + Returns: +
                                        +
                                      • + (Permissions_Groups._prototype) + returns self so function can be chained +
                                        • +
                                      + + + + + + + + + +
                                      +
                                      +
                                      +
                                      + # + Permissions_Groups._prototype:is_allowed(action) +
                                      +
                                      +
                                      +
                                      + +

                                      Returns if an input action is allowed for this group

                                      +

                                      + + + Parameters: + + + + + + + Returns: +
                                        +
                                      • + (boolean) + true if the group is allowed the action, false other wise +
                                        • +
                                      + + + + + + + + + +
                                      +
                                      +
                                      +
                                      + # + Permissions_Groups._prototype:get_raw() +
                                      +
                                      +
                                      +
                                      + +

                                      Returns the LuaPermissionGroup that was created with this group object, used internally

                                      +

                                      + + + + + + Returns: + + + + + + + + + + +
                                      +
                                      +
                                      +
                                      + # + Permissions_Groups._prototype:create() +
                                      +
                                      +
                                      +
                                      + +

                                      Creates or updates the permission group with the configured actions, used internally

                                      +

                                      + + + + + + Returns: + + + + + + + + + + +
                                      +
                                      +
                                      +
                                      + # + Permissions_Groups._prototype:add_player(player) +
                                      +
                                      +
                                      +
                                      + +

                                      Adds a player to this group

                                      @@ -1144,23 +1004,7 @@ (LuaPlayer) - the player to effect can be name index etc - - - - - - - -
                                    • - - group - - : - - (string) - - the name of the group to give to the player + LuaPlayer the player you want to add to this group can be name or index etc
                                      • @@ -1180,6 +1024,178 @@ + + + + + + +
                                      +
                                      +
                                      +
                                      + # + Permissions_Groups._prototype:remove_player(player) +
                                      +
                                      +
                                      +
                                      + +

                                      Removes a player from this group

                                      +

                                      + + + Parameters: + +
                                        + + + + + +
                                      • + + player + + : + + (LuaPlayer) + + LuaPlayer the player you want to remove from this group can be name or index etc + +
                                        • + + +
                                      + + + + + Returns: +
                                        +
                                      • + (boolean) + true if the player was removed successfully, false other wise +
                                        • +
                                      + + + + + + + + + +
                                      +
                                      +
                                      +
                                      + # + Permissions_Groups._prototype:get_players([online]) +
                                      +
                                      +
                                      +
                                      + +

                                      Returns all player that are in this group with the option to filter to online/offline only

                                      +

                                      + + + Parameters: + +
                                        + + + + + +
                                      • + + online + + : + + (boolean) + + if nil returns all players, if true online players only, if false returns online players only + + (optional) +
                                        • + + +
                                      + + + + + Returns: +
                                        +
                                      • + (table) + a table of players that are in this group; filtered if online param is given +
                                        • +
                                      + + + + + + + + + +
                                      +
                                      +
                                      +
                                      + # + Permissions_Groups._prototype:print(message) +
                                      +
                                      +
                                      +
                                      + +

                                      Prints a message to every player in this group

                                      +

                                      + + + Parameters: + +
                                        + + + + + +
                                      • + + message + + : + + (string) + + the message that you want to send to the players + +
                                        • + + +
                                      + + + + + Returns: +
                                        +
                                      • + (number) + the number of players that received the message +
                                        • +
                                      + + + @@ -1202,7 +1218,7 @@ generated by LDoc
                                      - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                    diff --git a/doc/modules/expcore.roles.html b/doc/modules/expcore.roles.html index e99e5bb8..cb7ff959 100644 --- a/doc/modules/expcore.roles.html +++ b/doc/modules/expcore.roles.html @@ -35,14 +35,20 @@ - + + +
                                    -
                                    -
                                    -
                                    - # - Roles._prototype:print (message) -
                                    -
                                    -
                                    -
                                    - -

                                    Will print a message to all players with this role

                                    -

                                    - - - Parameters: - -
                                      - - @@ -769,7 +426,7 @@ (string) - the message that will be printed to the players + the message to send to the players @@ -779,13 +436,6 @@ - Returns: -
                                        -
                                      • - (number) - the number of players who received the message -
                                        • -
                                      @@ -799,466 +449,14 @@
                                      - # - Roles._prototype:remove_player (player, skip_check, skip_event) + # + Roles.print_to_roles_higher(role, message)
                                      -

                                      Removes a player from this role, players can have more than one role at a time, used internally see Roles.unassign

                                      -

                                      - - - Parameters: - -
                                        - - - - - -
                                      • - - player - - : - - (LuaPlayer) - - the player that will lose this role - -
                                        • - - - - - -
                                      • - - skip_check - - : - - (boolean) - - when true player will be taken as the player name (use when player has not yet joined) - -
                                        • - - - - - -
                                      • - - skip_event - - : - - (boolean) - - when true the event emit will be skipped, this is used internally with Roles.unassign - -
                                        • - - -
                                      - - - - - Returns: -
                                        -
                                      • - (boolean) - true if the player was removed successfully -
                                        • -
                                      - - - - - - - - - -
                                      -
                                      -
                                      -
                                      - # - Roles._prototype:set_allow_all ([state=true]) -
                                      -
                                      -
                                      -
                                      - -

                                      Sets the default allow state of the role, true will allow all actions

                                      -

                                      - - - Parameters: - -
                                        - - - - - -
                                      • - - state - - : - - (boolean) - - true will allow all actions - - (default: true) -
                                        • - - -
                                      - - - - - Returns: -
                                        -
                                      • - (Roles._prototype) - allows chaining -
                                        • -
                                      - - - - - - - - - -
                                      -
                                      -
                                      -
                                      - # - Roles._prototype:set_auto_promote_condition (callback) -
                                      -
                                      -
                                      -
                                      - -

                                      Sets an auto promote condition that is checked every 5 seconds, if true is returned then the player will recive the role - nb: this is one way, failing false after already gaining the role will not revoke the role

                                      -

                                      - - - Parameters: - -
                                        - - - - - -
                                      • - - callback - - : - - (function) - - receives only one param which is player to promote, return true to promote the player - -
                                        • - - -
                                      - - - - - Returns: -
                                        -
                                      • - (Roles._prototype) - allows chaining -
                                        • -
                                      - - - - - - - - - -
                                      -
                                      -
                                      -
                                      - # - Roles._prototype:set_block_auto_promote ([state=true]) -
                                      -
                                      -
                                      -
                                      - -

                                      Sets the role to not allow players to have auto promote effect them, useful to keep people locked to a punishment

                                      -

                                      - - - Parameters: - -
                                        - - - - - -
                                      • - - state - - : - - (boolean) - - when true the players with this role will not be auto promoted - - (default: true) -
                                        • - - -
                                      - - - - - Returns: -
                                        -
                                      • - (Roles._prototype) - allows chaining -
                                        • -
                                      - - - - - - - - - -
                                      -
                                      -
                                      -
                                      - # - Roles._prototype:set_custom_color (color) -
                                      -
                                      -
                                      -
                                      - -

                                      Sets a custom colour for the role, can be accessed by other code

                                      -

                                      - - - Parameters: - -
                                        - - - - - -
                                      • - - color - - : - - (table) - - ?string|table can either be and rgb colour or the name of a colour defined in the presets - -
                                        • - - -
                                      - - - - - Returns: -
                                        -
                                      • - (Roles._prototype) - allows chaining -
                                        • -
                                      - - - - - - - - - -
                                      -
                                      -
                                      -
                                      - # - Roles._prototype:set_custom_tag (tag) -
                                      -
                                      -
                                      -
                                      - -

                                      Sets a custom player tag for the role, can be accessed by other code

                                      -

                                      - - - Parameters: - -
                                        - - - - - -
                                      • - - tag - - : - - (string) - - the value that the tag will be - -
                                        • - - -
                                      - - - - - Returns: -
                                        -
                                      • - (Roles._prototype) - allows chaining -
                                        • -
                                      - - - - - - - - - -
                                      -
                                      -
                                      -
                                      - # - Roles._prototype:set_flag (name[, value=true]) -
                                      -
                                      -
                                      -
                                      - -

                                      Sets the state of a flag for a role, flags can be used to apply effects to players

                                      -

                                      - - - Parameters: - -
                                        - - - - - -
                                      • - - name - - : - - (string) - - the name of the flag to set the value of - -
                                        • - - - - - -
                                      • - - value - - : - - (boolean) - - the state to set the flag to - - (default: true) -
                                        • - - -
                                      - - - - - Returns: -
                                        -
                                      • - (Roles._prototype) - allows chaining -
                                        • -
                                      - - - - - - - - - -
                                      -
                                      -
                                      -
                                      - # - Roles._prototype:set_parent (role) -
                                      -
                                      -
                                      -
                                      - -

                                      Sets the parent for a role, any action not in allow or disallow will be looked for in its parents - nb: this is a recursive action, and changing the allows and disallows will effect all children roles

                                      +

                                      Prints a message to all players who have the given role or one which is higher (excluding default)

                                      @@ -1278,7 +476,23 @@ (string) - the name of the role that will be the parent; has imminent effect if role is already defined + the name of the role to send the message to + + + + + + + +
                                    • + + message + + : + + (string) + + the message to send to the players
                                      • @@ -1288,13 +502,6 @@ - Returns: -
                                        -
                                      • - (Roles._prototype) - allows chaining -
                                        • -
                                      @@ -1308,14 +515,80 @@
                                      - # - Roles._prototype:set_permission_group (name[, use_factorio_api=false]) + # + Roles.print_to_roles_lower(role, message)
                                      -

                                      Sets the permission group for this role, players will be moved to the group of they highest role

                                      +

                                      Prints a message to all players who have the given role or one which is lower (excluding default)

                                      +

                                      + + + Parameters: + +
                                        + + + + + +
                                      • + + role + + : + + (string) + + the name of the role to send the message to + +
                                        • + + + + + +
                                      • + + message + + : + + (string) + + the message to send to the players + +
                                        • + + +
                                      + + + + + + + + + + + + + +
                                      +
                                      +
                                      +
                                      + # + Roles.get_role_by_name(name) +
                                      +
                                      +
                                      +
                                      + +

                                      Get a role for the given name

                                      @@ -1335,28 +608,11 @@ (string) - the name of the permission group to have players moved to + the name of the role to get - - - -
                                    • - - use_factorio_api - - : - - (boolean) - - when true the custom permission group module is ignored - - (default: false) -
                                      • - -
                                    @@ -1366,7 +622,236 @@
                                    • (Roles._prototype) - allows chaining + the role with that name or nil +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.get_role_by_order(index) +
                                    +
                                    +
                                    +
                                    + +

                                    Get a role with the given order index

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + index + + : + + (number) + + the place in the oder list of the role to get + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + the role with that index in the order list or nil +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.get_role_from_any(any) +
                                    +
                                    +
                                    +
                                    + +

                                    Gets a role from a name,index or role object (where it is just returned) + nb: this function is used for the input for most outward facing functions

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + any + + : + + (number, string or table) + + the value used to find the role + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + the role that was found or nil see above +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.get_player_roles(player) +
                                    +
                                    +
                                    +
                                    + +

                                    Gets all the roles of the given player, this will always contain the default role

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + player + + : + + (LuaPlayer) + + the player to get the roles of + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (table) + a table where the values are the roles which the player has +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.get_player_highest_role(player) +
                                    +
                                    +
                                    +
                                    + +

                                    Gets the highest role which the player has, can be used to compeer one player to another

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + player + + : + + (LuaPlayer) + + the player to get the highest role of + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (the) + role with the highest order index which this player has
                                    @@ -1383,7 +868,7 @@
                                    # - Roles.assign_player (player, roles[, by_player_name=][, silent=false]) + Roles.assign_player(player, roles[, by_player_name=][, silent=false])
                                    @@ -1472,1086 +957,6 @@ - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.debug () -
                                    -
                                    -
                                    -
                                    - -

                                    Returns a string which contains all roles in index order displaying all data for them

                                    -

                                    - - - - - - Returns: -
                                      -
                                    • - (string) - the debug output string -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.define_flag_trigger (name, callback) -
                                    -
                                    -
                                    -
                                    - -

                                    Defines a new trigger for when a tag is added or removed from a player

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - name - - : - - (string) - - the name of the flag which the roles will have - -
                                      • - - - - - -
                                    • - - callback - - : - - (function) - - the function that is called when roles are assigned - flag param - player - the player that has had they roles changed - flag param - state - the state of the flag, aka if the flag is present - -
                                      • - - -
                                    - - - - - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.define_role_order (order) -
                                    -
                                    -
                                    -
                                    - -

                                    Used to set the role order, higher in the list is better, must be called at least once in config - nb: function also re links parents due to expected position in the config file

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - order - - : - - (table) - - table a which is keyed only by numbers (start 1) and values are roles in order with highest first - -
                                      • - - -
                                    - - - - - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.get_player_highest_role (player) -
                                    -
                                    -
                                    -
                                    - -

                                    Gets the highest role which the player has, can be used to compeer one player to another

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - player - - : - - (LuaPlayer) - - the player to get the highest role of - -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (the) - role with the highest order index which this player has -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.get_player_roles (player) -
                                    -
                                    -
                                    -
                                    - -

                                    Gets all the roles of the given player, this will always contain the default role

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - player - - : - - (LuaPlayer) - - the player to get the roles of - -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (table) - a table where the values are the roles which the player has -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.get_role_by_name (name) -
                                    -
                                    -
                                    -
                                    - -

                                    Get a role for the given name

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - name - - : - - (string) - - the name of the role to get - -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (Roles._prototype) - the role with that name or nil -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.get_role_by_order (index) -
                                    -
                                    -
                                    -
                                    - -

                                    Get a role with the given order index

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - index - - : - - (number) - - the place in the oder list of the role to get - -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (Roles._prototype) - the role with that index in the order list or nil -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.get_role_from_any (any) -
                                    -
                                    -
                                    -
                                    - -

                                    Gets a role from a name,index or role object (where it is just returned) - nb: this function is used for the input for most outward facing functions

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - any - - : - - (number, string or table) - - the value used to find the role - -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (Roles._prototype) - the role that was found or nil see above -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.new_role (name[, short_hand=name]) -
                                    -
                                    -
                                    -
                                    - -

                                    Defines a new role and returns the prototype to allow configuration

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - name - - : - - (string) - - the name of the new role, must be unique - -
                                      • - - - - - -
                                    • - - short_hand - - : - - (string) - - the shortened version of the name - - (default: name) -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (Roles._prototype) - the start of the config chain for this role -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.override_player_roles (roles) -
                                    -
                                    -
                                    -
                                    - -

                                    Overrides all player roles with the given table of roles, useful to mass set roles on game start

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - roles - - : - - (table) - - table a which is indexed by case sensitive player names and has the value of a table of role names - -
                                      • - - -
                                    - - - - - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.player_allowed (player, action) -
                                    -
                                    -
                                    -
                                    - -

                                    A test for weather a player has at least one role which is allowed the given action

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - player - - : - - (LuaPlayer) - - the player to test the roles of - -
                                      • - - - - - -
                                    • - - action - - : - - (string) - - the name of the action that is being tested for - -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (boolean) - true if the player has at least one role which is allowed this action, false otherwise, nil for errors -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.player_has_flag (player, flag_name) -
                                    -
                                    -
                                    -
                                    - -

                                    A test for weather a player has the given flag true for at least one of they roles

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - player - - : - - (LuaPlayer) - - the player to test the roles of - -
                                      • - - - - - -
                                    • - - flag_name - - : - - (string) - - the name of the flag that is being looked for - -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (boolean) - true if the player has at least one role which has the flag set to true, false otherwise, nil for errors -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.player_has_role (player, search_role) -
                                    -
                                    -
                                    -
                                    - -

                                    A test for weather a player has the given role

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - player - - : - - (LuaPlayer) - - the player to test the roles of - -
                                      • - - - - - -
                                    • - - search_role - - : - - (string, number or table) - - a pointer to the role that is being searched for - -
                                      • - - -
                                    - - - - - Returns: -
                                      -
                                    • - (boolean) - true if the player has the role, false otherwise, nil for errors -
                                      • -
                                    - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.print_to_roles (roles, message) -
                                    -
                                    -
                                    -
                                    - -

                                    Prints a message to all players in the given roles, may send duplicate message however factorio blocks spam

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - roles - - : - - (table) - - table a of roles which to send the message to - -
                                      • - - - - - -
                                    • - - message - - : - - (string) - - the message to send to the players - -
                                      • - - -
                                    - - - - - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.print_to_roles_higher (role, message) -
                                    -
                                    -
                                    -
                                    - -

                                    Prints a message to all players who have the given role or one which is higher (excluding default)

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - role - - : - - (string) - - the name of the role to send the message to - -
                                      • - - - - - -
                                    • - - message - - : - - (string) - - the message to send to the players - -
                                      • - - -
                                    - - - - - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.print_to_roles_lower (role, message) -
                                    -
                                    -
                                    -
                                    - -

                                    Prints a message to all players who have the given role or one which is lower (excluding default)

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - role - - : - - (string) - - the name of the role to send the message to - -
                                      • - - - - - -
                                    • - - message - - : - - (string) - - the message to send to the players - -
                                      • - - -
                                    - - - - - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.set_default (name) -
                                    -
                                    -
                                    -
                                    - -

                                    Sets the default role which every player will have, this needs to be called at least once

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - name - - : - - (string) - - the name of the default role - -
                                      • - - -
                                    - - - - - - - - - - - - - -
                                    -
                                    -
                                    -
                                    - # - Roles.set_root (name) -
                                    -
                                    -
                                    -
                                    - -

                                    Sets the root role which will always have all permissions, any server actions act from this role

                                    -

                                    - - - Parameters: - -
                                      - - - - - -
                                    • - - name - - : - - (string) - - the name of the root role - -
                                      • - - -
                                    - - - - - - - @@ -2563,7 +968,7 @@
                                    # - Roles.unassign_player (player, roles[, by_player_name=][, silent=false]) + Roles.unassign_player(player, roles[, by_player_name=][, silent=false])
                                    @@ -2652,6 +1057,1617 @@ + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.override_player_roles(roles) +
                                    +
                                    +
                                    +
                                    + +

                                    Overrides all player roles with the given table of roles, useful to mass set roles on game start

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + roles + + : + + (table) + + table a which is indexed by case sensitive player names and has the value of a table of role names + +
                                      • + + +
                                    + + + + + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.player_has_role(player, search_role) +
                                    +
                                    +
                                    +
                                    + +

                                    A test for weather a player has the given role

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + player + + : + + (LuaPlayer) + + the player to test the roles of + +
                                      • + + + + + +
                                    • + + search_role + + : + + (string, number or table) + + a pointer to the role that is being searched for + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (boolean) + true if the player has the role, false otherwise, nil for errors +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.player_has_flag(player, flag_name) +
                                    +
                                    +
                                    +
                                    + +

                                    A test for weather a player has the given flag true for at least one of they roles

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + player + + : + + (LuaPlayer) + + the player to test the roles of + +
                                      • + + + + + +
                                    • + + flag_name + + : + + (string) + + the name of the flag that is being looked for + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (boolean) + true if the player has at least one role which has the flag set to true, false otherwise, nil for errors +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.player_allowed(player, action) +
                                    +
                                    +
                                    +
                                    + +

                                    A test for weather a player has at least one role which is allowed the given action

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + player + + : + + (LuaPlayer) + + the player to test the roles of + +
                                      • + + + + + +
                                    • + + action + + : + + (string) + + the name of the action that is being tested for + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (boolean) + true if the player has at least one role which is allowed this action, false otherwise, nil for errors +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.define_role_order(order) +
                                    +
                                    +
                                    +
                                    + +

                                    Used to set the role order, higher in the list is better, must be called at least once in config + nb: function also re links parents due to expected position in the config file

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + order + + : + + (table) + + table a which is keyed only by numbers (start 1) and values are roles in order with highest first + +
                                      • + + +
                                    + + + + + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.define_flag_trigger(name, callback) +
                                    +
                                    +
                                    +
                                    + +

                                    Defines a new trigger for when a tag is added or removed from a player

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + name + + : + + (string) + + the name of the flag which the roles will have + +
                                      • + + + + + +
                                    • + + callback + + : + + (function) + + the function that is called when roles are assigned + flag param - player - the player that has had they roles changed + flag param - state - the state of the flag, aka if the flag is present + +
                                      • + + +
                                    + + + + + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.set_default(name) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets the default role which every player will have, this needs to be called at least once

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + name + + : + + (string) + + the name of the default role + +
                                      • + + +
                                    + + + + + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.set_root(name) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets the root role which will always have all permissions, any server actions act from this role

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + name + + : + + (string) + + the name of the root role + +
                                      • + + +
                                    + + + + + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles.new_role(name[, short_hand=name]) +
                                    +
                                    +
                                    +
                                    + +

                                    Defines a new role and returns the prototype to allow configuration

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + name + + : + + (string) + + the name of the new role, must be unique + +
                                      • + + + + + +
                                    • + + short_hand + + : + + (string) + + the shortened version of the name + + (default: name) +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + the start of the config chain for this role +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:set_allow_all([state=true]) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets the default allow state of the role, true will allow all actions

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + state + + : + + (boolean) + + true will allow all actions + + (default: true) +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + allows chaining +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:allow(actions) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets the allow actions for this role, actions in this list will be allowed for this role

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + actions + + : + + (table) + + indexed with numbers and is an array of action names, order has no effect + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + allows chaining +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:disallow(actions) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets the disallow actions for this role, will prevent actions from being allowed regardless of inheritance

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + actions + + : + + (table) + + indexed with numbers and is an array of action names, order has no effect + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + allows chaining +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:is_allowed(action) +
                                    +
                                    +
                                    +
                                    + +

                                    Test for if a role is allowed the given action, mostly internal see Roles.player_allowed

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + action + + : + + (string) + + the name of the action to test if it is allowed + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (boolean) + true if action is allowed, false otherwise +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:set_flag(name[, value=true]) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets the state of a flag for a role, flags can be used to apply effects to players

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + name + + : + + (string) + + the name of the flag to set the value of + +
                                      • + + + + + +
                                    • + + value + + : + + (boolean) + + the state to set the flag to + + (default: true) +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + allows chaining +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:clear_flags() +
                                    +
                                    +
                                    +
                                    + +

                                    Clears all flags from this role, individual flags can be removed with set_flag(name,false)

                                    +

                                    + + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + allows chaining +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:has_flag(name) +
                                    +
                                    +
                                    +
                                    + +

                                    A test for if the role has a flag set

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + name + + : + + (string) + + the name of the flag to test for + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (boolean) + true if the flag is set, false otherwise +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:set_custom_tag(tag) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets a custom player tag for the role, can be accessed by other code

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + tag + + : + + (string) + + the value that the tag will be + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + allows chaining +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:set_custom_color(color) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets a custom colour for the role, can be accessed by other code

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + color + + : + + (table) + + ?string|table can either be and rgb colour or the name of a colour defined in the presets + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + allows chaining +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:set_permission_group(name[, use_factorio_api=false]) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets the permission group for this role, players will be moved to the group of they highest role

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + name + + : + + (string) + + the name of the permission group to have players moved to + +
                                      • + + + + + +
                                    • + + use_factorio_api + + : + + (boolean) + + when true the custom permission group module is ignored + + (default: false) +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + allows chaining +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:set_parent(role) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets the parent for a role, any action not in allow or disallow will be looked for in its parents + nb: this is a recursive action, and changing the allows and disallows will effect all children roles

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + role + + : + + (string) + + the name of the role that will be the parent; has imminent effect if role is already defined + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + allows chaining +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:set_auto_promote_condition(callback) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets an auto promote condition that is checked every 5 seconds, if true is returned then the player will recive the role + nb: this is one way, failing false after already gaining the role will not revoke the role

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + callback + + : + + (function) + + receives only one param which is player to promote, return true to promote the player + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + allows chaining +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:set_block_auto_promote([state=true]) +
                                    +
                                    +
                                    +
                                    + +

                                    Sets the role to not allow players to have auto promote effect them, useful to keep people locked to a punishment

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + state + + : + + (boolean) + + when true the players with this role will not be auto promoted + + (default: true) +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (Roles._prototype) + allows chaining +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:add_player(player, skip_check, skip_event) +
                                    +
                                    +
                                    +
                                    + +

                                    Adds a player to this role, players can have more than one role at a time, used internally see Roles.assign

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + player + + : + + (LuaPlayer) + + the player that will be given this role + +
                                      • + + + + + +
                                    • + + skip_check + + : + + (boolean) + + when true player will be taken as the player name (use when player has not yet joined) + +
                                      • + + + + + +
                                    • + + skip_event + + : + + (boolean) + + when true the event emit will be skipped, this is used internally with Roles.assign + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (boolean) + true if the player was added successfully +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:remove_player(player, skip_check, skip_event) +
                                    +
                                    +
                                    +
                                    + +

                                    Removes a player from this role, players can have more than one role at a time, used internally see Roles.unassign

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + player + + : + + (LuaPlayer) + + the player that will lose this role + +
                                      • + + + + + +
                                    • + + skip_check + + : + + (boolean) + + when true player will be taken as the player name (use when player has not yet joined) + +
                                      • + + + + + +
                                    • + + skip_event + + : + + (boolean) + + when true the event emit will be skipped, this is used internally with Roles.unassign + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (boolean) + true if the player was removed successfully +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:get_players([online=nil]) +
                                    +
                                    +
                                    +
                                    + +

                                    Returns an array of all the players who have this role, can be filtered by online status

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + online + + : + + (boolean) + + when given will filter by this online state, nil will return all players + + (default: nil) +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (table) + all the players who have this role, indexed order is meaningless +
                                      • +
                                    + + + + + + + + + +
                                    +
                                    +
                                    +
                                    + # + Roles._prototype:print(message) +
                                    +
                                    +
                                    +
                                    + +

                                    Will print a message to all players with this role

                                    +

                                    + + + Parameters: + +
                                      + + + + + +
                                    • + + message + + : + + (string) + + the message that will be printed to the players + +
                                      • + + +
                                    + + + + + Returns: +
                                      +
                                    • + (number) + the number of players who received the message +
                                      • +
                                    + + + @@ -2674,7 +2690,7 @@ generated by LDoc
                                    - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                    diff --git a/doc/modules/expcore.store.html b/doc/modules/expcore.store.html index 954ae48f..f31b0a8b 100644 --- a/doc/modules/expcore.store.html +++ b/doc/modules/expcore.store.html @@ -35,14 +35,20 @@ - + + +

                                    • Modules

                                      +
                                        +

                                      • Topics

                                        - + +
                                        • -

                                          Contents of expcore.store

                                          +

                                          Jump to Section

                                        -
                                        -
                                        Top
                                        @@ -167,33 +183,33 @@ - Store.clear (location[, child][, from_sync]) - Sets the value at a location to nil, this location must be registered - - - Store.get (location[, child][, allow_unregistered=false]) - Gets the value stored at a location, this location must be registered - - - Store.get_children (location) - Gets all non nil children at a location, children can be added and removed during runtime - this is similar to Store.get but will always return a table even if it is empty - - - Store.is_registered (location) + Store.is_registered(location) Check for if a lcoation is registered - Store.register ([location][, synced][, callback]) + Store.uid_location() + Returns a unqiue name that can be used for a store + + + Store.register([location][, synced][, callback]) Registers a new location with an update callback which is triggered when the value updates - Store.set (location[, child], value[, from_sync]) + Store.get(location[, child][, allow_unregistered=false]) + Gets the value stored at a location, this location must be registered + + + Store.set(location[, child], value[, from_sync]) Sets the value at a location, this location must be registered - Store.uid_location () - Returns a unqiue name that can be used for a store + Store.clear(location[, child][, from_sync]) + Sets the value at a location to nil, this location must be registered + + + Store.get_children(location) + Gets all non nil children at a location, children can be added and removed during runtime + this is similar to Store.get but will always return a table even if it is empty @@ -207,248 +223,8 @@
                                        - # - Store.clear (location[, child][, from_sync]) -
                                        -
                                        -
                                        -
                                        - -

                                        Sets the value at a location to nil, this location must be registered

                                        -

                                        - - - Parameters: - -
                                          - - - - - -
                                        • - - location - - : - - (string) - - the location to set the data to - -
                                          • - - - - - -
                                        • - - child - - : - - (string) - - the child location if required - - (optional) -
                                          • - - - - - -
                                        • - - from_sync - - : - - (boolean) - - set this true to avoid an output to the sync file - - (optional) -
                                          • - - -
                                        - - - - - Returns: -
                                          -
                                        • - (boolean) - true if it was successful -
                                          • -
                                        - - - - - - - - - -
                                        -
                                        -
                                        -
                                        - # - Store.get (location[, child][, allow_unregistered=false]) -
                                        -
                                        -
                                        -
                                        - -

                                        Gets the value stored at a location, this location must be registered

                                        -

                                        - - - Parameters: - -
                                          - - - - - -
                                        • - - location - - : - - (string) - - the location to get the data from - -
                                          • - - - - - -
                                        • - - child - - : - - (string) - - the child location if required - - (optional) -
                                          • - - - - - -
                                        • - - allow_unregistered - - : - - (boolean) - - when true no error is returned if the location is not registered - - (default: false) -
                                          • - - -
                                        - - - - - Returns: -
                                          -
                                        • - (any) - the data which was stored at the location -
                                          • -
                                        - - - - - - - - - -
                                        -
                                        -
                                        -
                                        - # - Store.get_children (location) -
                                        -
                                        -
                                        -
                                        - -

                                        Gets all non nil children at a location, children can be added and removed during runtime - this is similar to Store.get but will always return a table even if it is empty

                                        -

                                        - - - Parameters: - -
                                          - - - - - -
                                        • - - location - - : - - (string) - - the location to get the children of - -
                                          • - - -
                                        - - - - - Returns: -
                                          -
                                        • - (table) - a table containg all the children names -
                                          • -
                                        - - - - - - - - - -
                                        -
                                        -
                                        -
                                        # - Store.is_registered (location) + Store.is_registered(location)
                                        @@ -494,6 +270,40 @@ + + + + + + +
                                        +
                                        +
                                        +
                                        + # + Store.uid_location() +
                                        +
                                        +
                                        +
                                        + +

                                        Returns a unqiue name that can be used for a store

                                        +

                                        + + + + + + Returns: +
                                          +
                                        • + (string) + a unqiue name +
                                          • +
                                        + + + @@ -505,7 +315,7 @@
                                        # - Store.register ([location][, synced][, callback]) + Store.register([location][, synced][, callback])
                                        @@ -586,6 +396,97 @@ + + + + + + +
                                        +
                                        +
                                        +
                                        + # + Store.get(location[, child][, allow_unregistered=false]) +
                                        +
                                        +
                                        +
                                        + +

                                        Gets the value stored at a location, this location must be registered

                                        +

                                        + + + Parameters: + +
                                          + + + + + +
                                        • + + location + + : + + (string) + + the location to get the data from + +
                                          • + + + + + +
                                        • + + child + + : + + (string) + + the child location if required + + (optional) +
                                          • + + + + + +
                                        • + + allow_unregistered + + : + + (boolean) + + when true no error is returned if the location is not registered + + (default: false) +
                                          • + + +
                                        + + + + + Returns: +
                                          +
                                        • + (any) + the data which was stored at the location +
                                          • +
                                        + + + @@ -597,7 +498,7 @@
                                        # - Store.set (location[, child], value[, from_sync]) + Store.set(location[, child], value[, from_sync])
                                        @@ -703,25 +604,140 @@
                                        - # - Store.uid_location () + # + Store.clear(location[, child][, from_sync])
                                        -

                                        Returns a unqiue name that can be used for a store

                                        +

                                        Sets the value at a location to nil, this location must be registered

                                        + Parameters: + +
                                          + + + + + +
                                        • + + location + + : + + (string) + + the location to set the data to + +
                                          • + + + + + +
                                        • + + child + + : + + (string) + + the child location if required + + (optional) +
                                          • + + + + + +
                                        • + + from_sync + + : + + (boolean) + + set this true to avoid an output to the sync file + + (optional) +
                                          • + + +
                                        + Returns:
                                        • + (boolean) + true if it was successful +
                                          • +
                                        + + + + + + + + + +
                                        +
                                        +
                                        +
                                        + # + Store.get_children(location) +
                                        +
                                        +
                                        +
                                        + +

                                        Gets all non nil children at a location, children can be added and removed during runtime + this is similar to Store.get but will always return a table even if it is empty

                                        +

                                        + + + Parameters: + +
                                          + + + + + +
                                        • + + location + + : + (string) - a unqiue name + + the location to get the children of + +
                                          • + + +
                                        + + + + + Returns: +
                                          +
                                        • + (table) + a table containg all the children names
                                        @@ -749,7 +765,7 @@ generated by LDoc
                                        - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                        diff --git a/doc/modules/expcore.sudo.html b/doc/modules/expcore.sudo.html index 682fff66..c149e62e 100644 --- a/doc/modules/expcore.sudo.html +++ b/doc/modules/expcore.sudo.html @@ -35,14 +35,12 @@ - + +

                                        • Modules

                                          +
                                            +

                                          • Topics

                                            - -
                                            + Top
                                            @@ -171,7 +179,7 @@ generated by LDoc
                                            - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                            diff --git a/doc/modules/modules.addons.advanced-start.html b/doc/modules/modules.addons.advanced-start.html index e7265ffb..245a26b1 100644 --- a/doc/modules/modules.addons.advanced-start.html +++ b/doc/modules/modules.addons.advanced-start.html @@ -35,14 +35,12 @@ - + +

                                            • Modules

                                              +
                                                +

                                              • Topics

                                                - -
                                                + Top
                                                @@ -170,7 +178,7 @@ generated by LDoc
                                                - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                diff --git a/doc/modules/modules.addons.chat-popups.html b/doc/modules/modules.addons.chat-popups.html index 23591b7b..252a3408 100644 --- a/doc/modules/modules.addons.chat-popups.html +++ b/doc/modules/modules.addons.chat-popups.html @@ -35,14 +35,12 @@ - + +

                                                • Modules

                                                  +
                                                    +

                                                  • Topics

                                                    - -
                                                    + Top
                                                    @@ -171,7 +179,7 @@ generated by LDoc
                                                    - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                    diff --git a/doc/modules/modules.addons.damage-popups.html b/doc/modules/modules.addons.damage-popups.html index d71268cf..b4f59422 100644 --- a/doc/modules/modules.addons.damage-popups.html +++ b/doc/modules/modules.addons.damage-popups.html @@ -35,14 +35,12 @@ - + +

                                                    • Modules

                                                      +
                                                        +

                                                      • Topics

                                                        - -
                                                        + Top
                                                        @@ -171,7 +179,7 @@ generated by LDoc
                                                        - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                        diff --git a/doc/modules/modules.control.production.html b/doc/modules/modules.control.production.html new file mode 100644 index 00000000..30718ab0 --- /dev/null +++ b/doc/modules/modules.control.production.html @@ -0,0 +1,1281 @@ + + + + + + + + modules.control.production module + + + + + + + +
                                                        +
                                                        + + + + + + + +
                                                        + + + + + + + + +

                                                        modules.control.production module

                                                        +

                                                        Control Module - Production + - Common functions used to track production of items

                                                        +

                                                        + + + + + + +

                                                        Usage

                                                        + 
                                                        
+    -- import the module from the control modules
+    local Production = require 'modules.control.production'
+
+    -- This will return the less precise index from the one given
+    -- this means that one_second will return one_minute or ten_hours will return fifty_hours
+    -- the other precision work like wise
+    Production.precision_up(defines.flow_precision_index.one_second)
+
+    -- The get production function is used to get production, consumion and net
+    -- it may be used for any item and with any precision level, use total for total
+    Production.get_production(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute)
+
+    -- The fluctuations works by compearing recent production with the average over time
+    -- again any precision may be used, apart from one_thousand_hours as there would be no valid average
+    Production.get_fluctuations(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute)
+
+    -- ETA is calculated based on what function you use but all share a similar method
+    -- for production eta it will take current production average given by the precision
+    -- and work out how many ticks it will require to make the required amount (1000 by default)
+    Production.get_production_eta(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute,250000)
+
+    -- Both get_color and format_number are helper functions to help format production stats
+    -- get_color will return green,orange,red,or grey based on the active_value
+    -- the passive_value is used when active_value is 0 and can only return orange,red,or grey
+    Production.get_color(clamp,active_value,passive_value)
                                                        + + + + + + + +

                                                        Dependencies

                                                        + + + + + + + + + + + + +
                                                        resources.color_presetsProvides colors for Production.get_color
                                                        utilProvides format_number function to add surfixs
                                                        + + +

                                                        Precision

                                                        + + + + + + + + + + + + + + + + +
                                                        precision_up (precision)Gets the next lesser precision index value, eg 1 second -> 1 minute
                                                        precision_down (precision)Gets the next greater precision index value, eg 1 minute -> 1 second
                                                        precision_ticks (precision)Gets the number of tick that precision is given over, eg 1 minute -> 60 ticks
                                                        + + +

                                                        Statistics

                                                        + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                        get_production_total (force, item_name)Returns the production data for the whole game time
                                                        get_production (force, item_name, precision)Returns the production data for the given precision game time
                                                        get_fluctuations (force, item_name, precision)Returns the current fluctuation from the average
                                                        get_production_eta (force, item_name, precision[, required=1000])Returns the amount of ticks required to produce a certain amount
                                                        get_consumsion_eta (force, item_name, precision[, required=1000])Returns the amount of ticks required to consume a certain amount
                                                        get_net_eta (force, item_name, precision[, required=1000])Returns the amount of ticks required to produce but not consume a certain amount
                                                        + + +

                                                        Formating

                                                        + + + + + + + + + + + + +
                                                        get_color (clamp, active_value, passive_value)Returns a color value bassed on the value that was given
                                                        format_number (value)Returns three parts used to format a number
                                                        + + +
                                                        + + +

                                                        Dependencies

                                                        +
                                                        +
                                                        +
                                                        +
                                                        + # + resources.color_presets +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Provides colors for Production.get_color

                                                        +

                                                        + + + + + + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + util +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Provides format_number function to add surfixs

                                                        +

                                                        + + + + + + + + + + + + + + +
                                                        +
                                                        +

                                                        Precision

                                                        +
                                                        +
                                                        +
                                                        +
                                                        + # + precision_up (precision) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Gets the next lesser precision index value, eg 1 second -> 1 minute

                                                        +

                                                        + + + Parameters: + + + + + + + Returns: + + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + precision_down (precision) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Gets the next greater precision index value, eg 1 minute -> 1 second

                                                        +

                                                        + + + Parameters: + + + + + + + Returns: + + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + precision_ticks (precision) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Gets the number of tick that precision is given over, eg 1 minute -> 60 ticks

                                                        +

                                                        + + + Parameters: + + + + + + + Returns: +
                                                          +
                                                        • + (number) + the number of ticks in this time +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +

                                                        Statistics

                                                        +
                                                        +
                                                        +
                                                        +
                                                        + # + get_production_total (force, item_name) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Returns the production data for the whole game time

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + force + + : + + (LuaForce) + + the force to get the data for + +
                                                          • + + + + + +
                                                        • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (table) + contains total made, used and net +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + get_production (force, item_name, precision) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Returns the production data for the given precision game time

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + force + + : + + (LuaForce) + + the force to get the data for + +
                                                          • + + + + + +
                                                        • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
                                                          • + + + + + +
                                                        • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (table) + contains made, used and net +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + get_fluctuations (force, item_name, precision) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Returns the current fluctuation from the average

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + force + + : + + (LuaForce) + + the force to get the data for + +
                                                          • + + + + + +
                                                        • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
                                                          • + + + + + +
                                                        • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (table) + contains made, used and net +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + get_production_eta (force, item_name, precision[, required=1000]) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Returns the amount of ticks required to produce a certain amount

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + force + + : + + (LuaForce) + + the force to get the data for + +
                                                          • + + + + + +
                                                        • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
                                                          • + + + + + +
                                                        • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
                                                          • + + + + + +
                                                        • + + required + + : + + (number) + + the number of items that are required to be made + + (default: 1000) +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (number) + the number of ticks required to produce this ammount of items +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + get_consumsion_eta (force, item_name, precision[, required=1000]) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Returns the amount of ticks required to consume a certain amount

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + force + + : + + (LuaForce) + + the force to get the data for + +
                                                          • + + + + + +
                                                        • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
                                                          • + + + + + +
                                                        • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
                                                          • + + + + + +
                                                        • + + required + + : + + (number) + + the number of items that are required to be consumed + + (default: 1000) +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (number) + the number of ticks required to consume this ammount of items +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + get_net_eta (force, item_name, precision[, required=1000]) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Returns the amount of ticks required to produce but not consume a certain amount

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + force + + : + + (LuaForce) + + the force to get the data for + +
                                                          • + + + + + +
                                                        • + + item_name + + : + + (string) + + the name of the item that you want the data about + +
                                                          • + + + + + +
                                                        • + + precision + + : + + (defines.flow_precision_index) + + the precision that you want the data given to + +
                                                          • + + + + + +
                                                        • + + required + + : + + (number) + + the number of items that are required to be made but not used + + (default: 1000) +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (number) + the number of ticks required to produce, but not use, this ammount of items +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +

                                                        Formating

                                                        +
                                                        +
                                                        +
                                                        +
                                                        + # + get_color (clamp, active_value, passive_value) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Returns a color value bassed on the value that was given

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + clamp + + : + + (number) + + value which seperates the different colours + +
                                                          • + + + + + +
                                                        • + + active_value + + : + + (number) + + first value tested, tested against clamp + +
                                                          • + + + + + +
                                                        • + + passive_value + + : + + (number) + + second value tested, tested against 0 + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (table) + contains r,g,b keys +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + format_number (value) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Returns three parts used to format a number

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + value + + : + + (number) + + the value to format + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (string) + the sign for the number +
                                                          • +
                                                        • + (string) + the surfix for any unit used +
                                                          • +
                                                        • + (string) + the number formated +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        + + + +
                                                        +
                                                        +
                                                        + +
                                                        +
                                                        +
                                                        +
                                                        + generated by LDoc +
                                                        +
                                                        + Last updated 2019-07-20 22:30:35 UTC +
                                                        +
                                                        +
                                                        + + diff --git a/doc/modules/modules.control.reports.html b/doc/modules/modules.control.reports.html new file mode 100644 index 00000000..cbfd54ef --- /dev/null +++ b/doc/modules/modules.control.reports.html @@ -0,0 +1,1026 @@ + + + + + + + + modules.control.reports module + + + + + + + +
                                                        +
                                                        + + + + + + + +
                                                        + + + + + + + + +

                                                        modules.control.reports module

                                                        +

                                                        Control Module - Reports + - Adds a way to report players and store report messages.

                                                        +

                                                        + + + + + + +

                                                        Usage

                                                        + 
                                                        
+    -- import the module from the control modules
+    local Reports = require 'modules.control.reports'
+
+    -- This will place a report on "MrBiter" (must be a valid player) the report will have been made
+    -- by "Cooldude2606" (must be the player name) with the reason 'Liking biters too much' this can be
+    -- seen by using Reports.get_report.
+    Reports.report_player('MrBiter','Cooldude2606','Liking biters too much') -- true
+
+    -- The other get methods can be used to get all the reports on a player or to test if a player is reported.
+    Reports.get_report('MrBiter','Cooldude2606') -- 'Liking biters too much'
+
+    -- This will remove the warning on 'MrBiter' (must be a valid player) which was made by 'Cooldude2606'.
+    Reports.remove_report('MrBiter','Cooldude2606') -- true
+
+    -- This will remove all the report that have been made against 'MrBiter'. Note that the remove event will
+    -- be triggered once per report issused.
+    Reports.remove_all('MrBiter') -- true
+
                                                        + + + + + + + +

                                                        Events

                                                        + + + + + + + + + + + + +
                                                        on_player_reportedWhen a player is reported
                                                        on_report_removedWhen a report is removed from a player
                                                        + + +

                                                        Dependencies

                                                        + + + + + + + + + + + + +
                                                        utils.gameAllows getting player from any value
                                                        utils.globalAllows storing of data in global table
                                                        + + +

                                                        Get functions

                                                        + + + + + + + + + + + + + + + + + + + + +
                                                        get_reports (player)Gets a list of all reports that a player has against them
                                                        get_report (player, by_player_name)Gets a single report against a player given the name of the player who made the report
                                                        is_reported (player[, by_player_name])Checks if a player is reported, option to get if reported by a certain player
                                                        count_reports (player[, custom_count])Counts the number of reports that a player has aganist them
                                                        + + +

                                                        Set functions

                                                        + + + + + + + + + + + + + + + + +
                                                        report_player (player, by_player_name[, reason='Non given.'])Adds a report to a player, each player can only report another player once
                                                        remove_report (player, reported_by_name)Removes a report from a player
                                                        remove_all (player)Removes all reports from a player
                                                        + + +
                                                        + + +

                                                        Events

                                                        +
                                                        +
                                                        +
                                                        +
                                                        + # + on_player_reported +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        When a player is reported

                                                        +

                                                        + + + Event Parameters: + +
                                                          + + + + + +
                                                        • + + player_index + + : + + (number) + + the player index of the player who got reported + +
                                                          • + + + + + +
                                                        • + + by_player_name + + : + + (string) + + the name of the player who made the report + +
                                                          • + + + + + +
                                                        • + + reason + + : + + (string) + + the reason given for the report + +
                                                          • + + +
                                                        + + + + + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + on_report_removed +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        When a report is removed from a player

                                                        +

                                                        + + + Event Parameters: + +
                                                          + + + + + +
                                                        • + + player_index + + : + + (number) + + the player index of the player who has the report removed + +
                                                          • + + + + + +
                                                        • + + reported_by_name + + : + + (string) + + the name of the player who made the removed report + +
                                                          • + + + + + +
                                                        • + + removed_by_name + + : + + (string) + + the name of the player who removed the report + +
                                                          • + + +
                                                        + + + + + + + + + + + + + +
                                                        +
                                                        +

                                                        Dependencies

                                                        +
                                                        +
                                                        +
                                                        +
                                                        + # + utils.game +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Allows getting player from any value

                                                        +

                                                        + + + + + + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + utils.global +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Allows storing of data in global table

                                                        +

                                                        + + + + + + + + + + + + + + +
                                                        +
                                                        +

                                                        Get functions

                                                        +
                                                        +
                                                        +
                                                        +
                                                        + # + get_reports (player) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Gets a list of all reports that a player has against them

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to get the report for + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (table) + a list of all reports, key is by player name, value is reason +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + get_report (player, by_player_name) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Gets a single report against a player given the name of the player who made the report

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to get the report for + +
                                                          • + + + + + +
                                                        • + + by_player_name + + : + + (string) + + the name of the player who made the report + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (string or nil) + string is the reason that the player was reported, if the player is not reported +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + is_reported (player[, by_player_name]) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Checks if a player is reported, option to get if reported by a certain player

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to check if reported + +
                                                          • + + + + + +
                                                        • + + by_player_name + + : + + (string) + + when given will check if reported by this player + + (optional) +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (boolean) + if the player has been reported +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + count_reports (player[, custom_count]) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Counts the number of reports that a player has aganist them

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to count the reports for + +
                                                          • + + + + + +
                                                        • + + custom_count + + : + + (function) + + when given this function will be used to count the reports + + (optional) +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (number) + the number of reports that the user has +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +

                                                        Set functions

                                                        +
                                                        +
                                                        +
                                                        +
                                                        + # + report_player (player, by_player_name[, reason='Non given.']) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Adds a report to a player, each player can only report another player once

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to add the report to + +
                                                          • + + + + + +
                                                        • + + by_player_name + + : + + (string) + + the name of the player that is making the report + +
                                                          • + + + + + +
                                                        • + + reason + + : + + (string) + + the reason that the player is being reported + + (default: 'Non given.') +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (boolean) + whether the report was added successfully +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + remove_report (player, reported_by_name) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Removes a report from a player

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to remove the report from + +
                                                          • + + + + + +
                                                        • + + reported_by_name + + : + + (string) + + the name of the player that made the report + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (boolean) + whether the report was removed successfully +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + remove_all (player) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Removes all reports from a player

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to remove the reports from + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (boolean) + whether the reports were removed successfully +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        + + + +
                                                        +
                                                        +
                                                        + +
                                                        +
                                                        +
                                                        +
                                                        + generated by LDoc +
                                                        +
                                                        + Last updated 2019-07-20 22:30:35 UTC +
                                                        +
                                                        +
                                                        + + diff --git a/doc/modules/modules.control.warnings.html b/doc/modules/modules.control.warnings.html new file mode 100644 index 00000000..022c2d8a --- /dev/null +++ b/doc/modules/modules.control.warnings.html @@ -0,0 +1,1416 @@ + + + + + + + + modules.control.warnings module + + + + + + + +
                                                        +
                                                        + + + + + + + +
                                                        + + + + + + + + +

                                                        modules.control.warnings module

                                                        +

                                                        Control Module - Warnings + - Adds a way to give and remove warnings to players.

                                                        +

                                                        + + + + + + +

                                                        Usage

                                                        + 
                                                        
+    -- This will add a warning to the player
+    Warnings.add_warning('MrBiter','Cooldude2606','Killed too many biters')
+
+    -- This will remove a warning from a player, second name is just who is doing the action
+    Warnings.remove_warning('MrBiter','Cooldude2606')
+
+    -- Script warning as similar to normal warning but are designed to have no effect for a short amount of time
+    -- this is so it can be used for greifer protection without being too agressive
+    Warnings.add_script_warning('MrBiter','Killed too many biters')
+
+    -- Both normal and script warnings can also be cleared, this will remove all warnings
+    Warnings.clear_warnings('MrBiter','Cooldude2606')
                                                        + + + + + + + +

                                                        Events

                                                        + + + + + + + + + + + + + + + + + + + + +
                                                        on_warning_addedWhen a warning is added to a player
                                                        on_warning_removedWhen a warning is removed from a player
                                                        on_script_warning_addedWhen a warning is added to a player, by the script
                                                        on_script_warning_removedWhen a warning is remnoved from a player, by the script
                                                        + + +

                                                        Dependencies

                                                        + + + + + + + + + + + + + + + + + + + + +
                                                        utils.eventAllows registering of custom events
                                                        utils.gameAllows getting player from any value
                                                        utils.globalAllows storing in the global table
                                                        config.warningsConfig file for this module
                                                        + + +

                                                        Functions

                                                        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                                                        get_warnings (player)Gets an array of warnings that the player has, always returns a list even if emtpy
                                                        count_warnings (player)Gets the number of warnings that a player has on them
                                                        add_warning (player, by_player_name[, reason='Non given.'])Adds a warning to a player, when a warning is added a set action is done based on the number of warnings and the config file
                                                        remove_warning (player, by_player_name)Removes a warning from a player, always removes the earlyist warning, fifo
                                                        clear_warnings (player, by_player_name)Removes all warnings from a player, will trigger remove event for each warning
                                                        get_script_warnings (player)Gets an array of all the script warnings that a player has
                                                        count_script_warnings (player)Gets the number of script warnings that a player has on them
                                                        add_script_warning (player[, reason='Non given.'])Adds a script warning to a player, this may add a full warning if max script warnings is met
                                                        remove_script_warning (player)Removes a script warning from a player
                                                        clear_script_warnings (player)Removes all script warnings from a player, emits event for each warning removed
                                                        + + +
                                                        + + +

                                                        Events

                                                        +
                                                        +
                                                        +
                                                        +
                                                        + # + on_warning_added +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        When a warning is added to a player

                                                        +

                                                        + + + Event Parameters: + +
                                                          + + + + + +
                                                        • + + player_index + + : + + (number) + + the index of the player who recived the warning + +
                                                          • + + + + + +
                                                        • + + by_player_name + + : + + (string) + + the name of the player who gave the warning + +
                                                          • + + + + + +
                                                        • + + reason + + : + + (string) + + the reason that the player was given a warning + +
                                                          • + + + + + +
                                                        • + + warning_count + + : + + (number) + + the new number of warnings that the player has + +
                                                          • + + +
                                                        + + + + + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + on_warning_removed +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        When a warning is removed from a player

                                                        +

                                                        + + + Event Parameters: + +
                                                          + + + + + +
                                                        • + + player_index + + : + + (number) + + the index of the player who is having the warning removed + +
                                                          • + + + + + +
                                                        • + + warning_by_name + + : + + (string) + + the name of the player who gave the warning + +
                                                          • + + + + + +
                                                        • + + removed_by_name + + : + + (string) + + the name of the player who is removing the warning + +
                                                          • + + + + + +
                                                        • + + warning_count + + : + + (number) + + the new number of warnings that the player has + +
                                                          • + + +
                                                        + + + + + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + on_script_warning_added +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        When a warning is added to a player, by the script

                                                        +

                                                        + + + Event Parameters: + +
                                                          + + + + + +
                                                        • + + player_index + + : + + (number) + + the index of the player who recived the warning + +
                                                          • + + + + + +
                                                        • + + reason + + : + + (string) + + the reason that the player was given a warning + +
                                                          • + + + + + +
                                                        • + + warning_count + + : + + (number) + + the new number of warnings that the player has + +
                                                          • + + +
                                                        + + + + + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + on_script_warning_removed +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        When a warning is remnoved from a player, by the script

                                                        +

                                                        + + + Event Parameters: + +
                                                          + + + + + +
                                                        • + + player_index + + : + + (number) + + the index of the player who is having the warning removed + +
                                                          • + + + + + +
                                                        • + + warning_count + + : + + (number) + + the new number of warnings that the player has + +
                                                          • + + +
                                                        + + + + + + + + + + + + + +
                                                        +
                                                        +

                                                        Dependencies

                                                        +
                                                        +
                                                        +
                                                        +
                                                        + # + utils.event +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Allows registering of custom events

                                                        +

                                                        + + + + + + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + utils.game +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Allows getting player from any value

                                                        +

                                                        + + + + + + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + utils.global +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Allows storing in the global table

                                                        +

                                                        + + + + + + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + config.warnings +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Config file for this module

                                                        +

                                                        + + + + + + + + + + + + + + +
                                                        +
                                                        +

                                                        Functions

                                                        +
                                                        +
                                                        +
                                                        +
                                                        + # + get_warnings (player) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Gets an array of warnings that the player has, always returns a list even if emtpy

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to get the warning for + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (table) + an array of all the warnings on this player, contains tick, by_player_name and reason +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + count_warnings (player) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Gets the number of warnings that a player has on them

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to count the warnings for + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (number) + the number of warnings that the player has +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + add_warning (player, by_player_name[, reason='Non given.']) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Adds a warning to a player, when a warning is added a set action is done based on the number of warnings and the config file

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to add a warning to + +
                                                          • + + + + + +
                                                        • + + by_player_name + + : + + (string) + + the name of the player who is doing the action + +
                                                          • + + + + + +
                                                        • + + reason + + : + + (string) + + the reason that the player is being warned + + (default: 'Non given.') +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (number) + the number of warnings that the player has +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + remove_warning (player, by_player_name) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Removes a warning from a player, always removes the earlyist warning, fifo

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to remove a warning from + +
                                                          • + + + + + +
                                                        • + + by_player_name + + : + + (string) + + the name of the player who is doing the action + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (number) + the number of warnings that the player has +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + clear_warnings (player, by_player_name) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Removes all warnings from a player, will trigger remove event for each warning

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to clear the warnings from + +
                                                          • + + + + + +
                                                        • + + by_player_name + + : + + (string) + + the name of the player who is doing the action + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (boolean) + true when warnings were cleared succesfully +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + get_script_warnings (player) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Gets an array of all the script warnings that a player has

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to get the script warnings of + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (table) + a table of all the script warnings a player has, contains tick and reason +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + count_script_warnings (player) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Gets the number of script warnings that a player has on them

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to count the script warnings of + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (number) + the number of script warnings that the player has +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + add_script_warning (player[, reason='Non given.']) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Adds a script warning to a player, this may add a full warning if max script warnings is met

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to add a script warning to + +
                                                          • + + + + + +
                                                        • + + reason + + : + + (string) + + the reason that the player is being warned + + (default: 'Non given.') +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (number) + the number of script warnings that the player has +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + remove_script_warning (player) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Removes a script warning from a player

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to remove a script warning from + +
                                                          • + + +
                                                        + + + + + Returns: +
                                                          +
                                                        • + (number) + the number of script warnings that the player has +
                                                          • +
                                                        + + + + + + + + + +
                                                        +
                                                        +
                                                        +
                                                        + # + clear_script_warnings (player) +
                                                        +
                                                        +
                                                        +
                                                        + +

                                                        Removes all script warnings from a player, emits event for each warning removed

                                                        +

                                                        + + + Parameters: + +
                                                          + + + + + +
                                                        • + + player + + : + + (LuaPlayer) + + the player to clear the script warnings from + +
                                                          • + + +
                                                        + + + + + + + + + + + + + +
                                                        +
                                                        + + + +
                                                        +
                                                        +
                                                        + +
                                                        +
                                                        +
                                                        +
                                                        + generated by LDoc +
                                                        +
                                                        + Last updated 2019-07-20 22:30:35 UTC +
                                                        +
                                                        +
                                                        + + diff --git a/doc/modules/modules.gui.player-list.html b/doc/modules/modules.gui.player-list.html index 8f78908d..f3f0393d 100644 --- a/doc/modules/modules.gui.player-list.html +++ b/doc/modules/modules.gui.player-list.html @@ -35,14 +35,12 @@ - + +

                                                        • Modules

                                                          +
                                                            +

                                                          • Topics

                                                            - -
                                                            + Top
                                                            @@ -170,7 +178,7 @@ generated by LDoc
                                                            - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                            diff --git a/doc/modules/modules.gui.rocket-info.html b/doc/modules/modules.gui.rocket-info.html index ed7e31a1..14166426 100644 --- a/doc/modules/modules.gui.rocket-info.html +++ b/doc/modules/modules.gui.rocket-info.html @@ -35,14 +35,20 @@ - + + +

                                                            • Modules

                                                              +
                                                                +

                                                              • Topics

                                                                - + +
                                                                • -

                                                                  Contents of modules.gui.rocket-info

                                                                  +

                                                                  Jump to Section

                                                                -
                                                                -
                                                                Top
                                                                @@ -220,7 +236,7 @@ generated by LDoc
                                                                - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                diff --git a/doc/modules/modules.gui.science-info.html b/doc/modules/modules.gui.science-info.html index 2408caf8..139afbf9 100644 --- a/doc/modules/modules.gui.science-info.html +++ b/doc/modules/modules.gui.science-info.html @@ -35,14 +35,12 @@ - + +

                                                                • Modules

                                                                  +
                                                                    +

                                                                  • Topics

                                                                    - -
                                                                    + Top
                                                                    @@ -170,7 +178,7 @@ generated by LDoc
                                                                    - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                    diff --git a/doc/modules/modules.gui.task-list.html b/doc/modules/modules.gui.task-list.html index 798ec8b4..aaf86258 100644 --- a/doc/modules/modules.gui.task-list.html +++ b/doc/modules/modules.gui.task-list.html @@ -35,14 +35,12 @@ - + +

                                                                    • Modules

                                                                      +
                                                                        +

                                                                      • Topics

                                                                        - -
                                                                        + Top
                                                                        @@ -170,7 +178,7 @@ generated by LDoc
                                                                        - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                        diff --git a/doc/modules/utils.alien_evolution_progress.html b/doc/modules/utils.alien_evolution_progress.html index 200ed014..0f397ea5 100644 --- a/doc/modules/utils.alien_evolution_progress.html +++ b/doc/modules/utils.alien_evolution_progress.html @@ -35,14 +35,20 @@ - + + +

                                                                        • Modules

                                                                          +
                                                                            +

                                                                          • Topics

                                                                            - + +
                                                                            • -

                                                                              Contents of utils.alien_evolution_progress

                                                                              +

                                                                              Jump to Section

                                                                            -
                                                                            -
                                                                            Top
                                                                            @@ -168,7 +184,7 @@ - AlienEvolutionProgress.create_spawner_request (total_aliens) + AlienEvolutionProgress.create_spawner_request(total_aliens) Creates the spawner_request structure required for AlienEvolutionProgress.get_aliens for all available spawners. @@ -185,7 +201,7 @@ available spawners.
                                                                            # - AlienEvolutionProgress.create_spawner_request (total_aliens) + AlienEvolutionProgress.create_spawner_request(total_aliens)
                                                                            @@ -247,7 +263,7 @@ fraction will decide a chance to spawn. 1 alien for 2 spawners will have 50% on generated by LDoc
                                                                            - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                            diff --git a/doc/modules/utils.core.html b/doc/modules/utils.core.html index 03d91418..e6a70362 100644 --- a/doc/modules/utils.core.html +++ b/doc/modules/utils.core.html @@ -35,14 +35,21 @@ - + + +

                                                                            • Modules

                                                                              +
                                                                                +

                                                                              • Topics

                                                                                - + +
                                                                                -
                                                                                -
                                                                                Top
                                                                                @@ -167,41 +184,41 @@ - Module.cant_run (name) - Prints a message letting the player know they cannot run a command - - - Module.format_time (ticks) - Takes a time in ticks and returns a string with the time in format "x hour(s) x minute(s)" - - - Module.get_actor () - Returns a valid string with the name of the actor of a command. - - - Module.log_command (actor, command, parameters) - Logs the use of a command and its user - - - Module.print_admins (msg, source) - Prints a message to all online admins - - - Module.print_except (msg, player, color) + Module.print_except(msg, player, color) Takes msg and prints it to all players except provided player - Module.random_RGB () + Module.print_admins(msg, source) + Prints a message to all online admins + + + Module.get_actor() + Returns a valid string with the name of the actor of a command. + + + Module.format_time(ticks) + Takes a time in ticks and returns a string with the time in format "x hour(s) x minute(s)" + + + Module.cant_run(name) + Prints a message letting the player know they cannot run a command + + + Module.log_command(actor, command, parameters) + Logs the use of a command and its user + + + Module.verify_mult_types(arg, arg_types) + Asserts the argument is one of type arg_types + + + Module.random_RGB() Returns a random RGB color as a table - Module.set_and_return (tbl, key, value) + Module.set_and_return(tbl, key, value) Sets a table element to value while also returning value. - - Module.verify_mult_types (arg, arg_types) - Asserts the argument is one of type arg_types - @@ -211,10 +228,6 @@ - - - - @@ -223,6 +236,10 @@ + + + +
                                                                                Module.is_module_availableTakes the string of a module and returns whether is it available or not
                                                                                Module.move_position Moves a position according to the parameters given Notice: only accepts cardinal directions as directionModule.opposite_direction Takes a direction and gives you the opposite
                                                                                Module.is_module_availableTakes the string of a module and returns whether is it available or not
                                                                                @@ -235,275 +252,8 @@
                                                                                - # - Module.cant_run (name) -
                                                                                -
                                                                                -
                                                                                -
                                                                                - -

                                                                                Prints a message letting the player know they cannot run a command

                                                                                -

                                                                                - - - Parameters: - -
                                                                                  - - - - - -
                                                                                • - - name - - : - - - string name of the command - -
                                                                                  • - - -
                                                                                - - - - - - - - - - - - - -
                                                                                -
                                                                                -
                                                                                -
                                                                                - # - Module.format_time (ticks) -
                                                                                -
                                                                                -
                                                                                -
                                                                                - -

                                                                                Takes a time in ticks and returns a string with the time in format "x hour(s) x minute(s)"

                                                                                -

                                                                                - - - Parameters: - -
                                                                                  - - - - - -
                                                                                • - - ticks - - - - - -
                                                                                  • - - -
                                                                                - - - - - - - - - - - - - -
                                                                                -
                                                                                -
                                                                                -
                                                                                - # - Module.get_actor () -
                                                                                -
                                                                                -
                                                                                -
                                                                                - -

                                                                                Returns a valid string with the name of the actor of a command.

                                                                                -

                                                                                - - - - - - - - - - - - - - -
                                                                                -
                                                                                -
                                                                                -
                                                                                - # - Module.log_command (actor, command, parameters) -
                                                                                -
                                                                                -
                                                                                -
                                                                                - -

                                                                                Logs the use of a command and its user

                                                                                -

                                                                                - - - Parameters: - -
                                                                                  - - - - - -
                                                                                • - - actor - - : - - - string with the actor's name (usually acquired by calling get_actor) - -
                                                                                  • - - - - - -
                                                                                • - - command - - : - - - the command's name as table element - -
                                                                                  • - - - - - -
                                                                                • - - parameters - - : - - - the command's parameters as a table (optional) - -
                                                                                  • - - -
                                                                                - - - - - - - - - - - - - -
                                                                                -
                                                                                -
                                                                                -
                                                                                - # - Module.print_admins (msg, source) -
                                                                                -
                                                                                -
                                                                                -
                                                                                - -

                                                                                Prints a message to all online admins

                                                                                -

                                                                                - - - Parameters: - -
                                                                                  - - - - - -
                                                                                • - - msg - - : - - - table if locale is used - -
                                                                                  • - - - - - -
                                                                                • - - source - - : - - - string must be the name of a player, nil for server. - -
                                                                                  • - - -
                                                                                - - - - - - - - - - - - - -
                                                                                -
                                                                                -
                                                                                -
                                                                                # - Module.print_except (msg, player, color) + Module.print_except(msg, player, color)
                                                                                @@ -571,6 +321,343 @@ + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Module.print_admins(msg, source) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Prints a message to all online admins

                                                                                +

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + msg + + : + + + table if locale is used + +
                                                                                  • + + + + + +
                                                                                • + + source + + : + + + string must be the name of a player, nil for server. + +
                                                                                  • + + +
                                                                                + + + + + + + + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Module.get_actor() +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Returns a valid string with the name of the actor of a command.

                                                                                +

                                                                                + + + + + + + + + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Module.format_time(ticks) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Takes a time in ticks and returns a string with the time in format "x hour(s) x minute(s)"

                                                                                +

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + ticks + + + + + +
                                                                                  • + + +
                                                                                + + + + + + + + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Module.cant_run(name) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Prints a message letting the player know they cannot run a command

                                                                                +

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + name + + : + + + string name of the command + +
                                                                                  • + + +
                                                                                + + + + + + + + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Module.log_command(actor, command, parameters) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Logs the use of a command and its user

                                                                                +

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + actor + + : + + + string with the actor's name (usually acquired by calling get_actor) + +
                                                                                  • + + + + + +
                                                                                • + + command + + : + + + the command's name as table element + +
                                                                                  • + + + + + +
                                                                                • + + parameters + + : + + + the command's parameters as a table (optional) + +
                                                                                  • + + +
                                                                                + + + + + + + + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Module.verify_mult_types(arg, arg_types) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Asserts the argument is one of type arg_types

                                                                                +

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + arg + + : + + + the variable to check + +
                                                                                  • + + + + + +
                                                                                • + + arg_types + + : + + + the type as a table of sings + +
                                                                                  • + + +
                                                                                + + + + + Returns: +
                                                                                  +
                                                                                • + boolean +
                                                                                  • +
                                                                                + + + @@ -582,7 +669,7 @@
                                                                                # - Module.random_RGB () + Module.random_RGB()
                                                                                @@ -609,7 +696,7 @@
                                                                                # - Module.set_and_return (tbl, key, value) + Module.set_and_return(tbl, key, value)
                                                                                @@ -683,76 +770,6 @@ - - - - - - -
                                                                                -
                                                                                -
                                                                                -
                                                                                - # - Module.verify_mult_types (arg, arg_types) -
                                                                                -
                                                                                -
                                                                                -
                                                                                - -

                                                                                Asserts the argument is one of type arg_types

                                                                                -

                                                                                - - - Parameters: - -
                                                                                  - - - - - -
                                                                                • - - arg - - : - - - the variable to check - -
                                                                                  • - - - - - -
                                                                                • - - arg_types - - : - - - the type as a table of sings - -
                                                                                  • - - -
                                                                                - - - - - Returns: -
                                                                                  -
                                                                                • - boolean -
                                                                                  • -
                                                                                - - - @@ -766,54 +783,6 @@
                                                                                - # - Module.is_module_available -
                                                                                -
                                                                                -
                                                                                -
                                                                                - -

                                                                                Takes the string of a module and returns whether is it available or not

                                                                                -

                                                                                - - - -
                                                                                  - - - - - -
                                                                                • - - name - - : - - - the name of the module (ex. 'utils.core') - -
                                                                                  • - - -
                                                                                - - - - - - - - - - - - - -
                                                                                -
                                                                                -
                                                                                -
                                                                                # Module.move_position
                                                                                @@ -931,6 +900,54 @@ + + + + + + +
                                                                            +
                                                                            +
                                                                            +
                                                                            + # + Module.is_module_available +
                                                                            +
                                                                            +
                                                                            +
                                                                            + +

                                                                            Takes the string of a module and returns whether is it available or not

                                                                            +

                                                                            + + + +
                                                                              + + + + + +
                                                                            • + + name + + : + + + the name of the module (ex. 'utils.core') + +
                                                                              • + + +
                                                                            + + + + + + + @@ -953,7 +970,7 @@ generated by LDoc
                                                                            - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                            diff --git a/doc/modules/utils.debug.html b/doc/modules/utils.debug.html index 4a5e11eb..44eeeb11 100644 --- a/doc/modules/utils.debug.html +++ b/doc/modules/utils.debug.html @@ -35,14 +35,20 @@ - + + +

                                                                            • Modules

                                                                              +
                                                                                +

                                                                              • Topics

                                                                                - + +
                                                                                • -

                                                                                  Contents of utils.debug

                                                                                  +

                                                                                  Jump to Section

                                                                                -
                                                                                -
                                                                                Top
                                                                                @@ -166,31 +182,31 @@ - Debug.cheat (callback) - Executes the given callback if cheating is enabled. + Debug.print(message, stack_traceback) + Shows the given message if debug is enabled. - Debug.get_meta_value (object, key) + Debug.get_meta_value(object, key) Returns the value of the key inside the object or 'InvalidLuaObject' if the LuaObject is invalid. - Debug.is_closure (func) - Returns true if the function is a closure, false otherwise. - - - Debug.object_type (object) + Debug.object_type(object) Returns the Lua data type or the factorio LuaObject type or 'NoHelpLuaObject' if the LuaObject does not have a help function or 'InvalidLuaObject' if the LuaObject is invalid. - Debug.print (message, stack_traceback) - Shows the given message if debug is enabled. + Debug.print_position(position, message) + Shows the given message if debug is on. - Debug.print_position (position, message) - Shows the given message if debug is on. + Debug.cheat(callback) + Executes the given callback if cheating is enabled. + + + Debug.is_closure(func) + Returns true if the function is a closure, false otherwise. @@ -204,15 +220,15 @@
                                                                                - # - Debug.cheat (callback) + # + Debug.print(message, stack_traceback)
                                                                                -

                                                                                Executes the given callback if cheating is enabled.

                                                                                -

                                                                                +

                                                                                Shows the given message if debug is enabled.

                                                                                +

                                                                                Uses serpent to print non scalars.

                                                                                Parameters: @@ -225,12 +241,27 @@
                                                                              • - callback + message : - function + + +
                                                                                • + + + + + +
                                                                              • + + stack_traceback + + : + + + levels of stack trace to give, defaults to 1 level if nil
                                                                                • @@ -254,7 +285,7 @@
                                                                                # - Debug.get_meta_value (object, key) + Debug.get_meta_value(object, key)
                                                                                @@ -315,63 +346,6 @@ - - - - - - -
                                                                                -
                                                                                -
                                                                                -
                                                                                - # - Debug.is_closure (func) -
                                                                                -
                                                                                -
                                                                                -
                                                                                - -

                                                                                Returns true if the function is a closure, false otherwise.

                                                                                -

                                                                                - A closure is a function that contains 'upvalues' or in other words - has a reference to a local variable defined outside the function's scope.

                                                                                - - - Parameters: - -
                                                                                  - - - - - -
                                                                                • - - func - - : - - - - -
                                                                                  • - - -
                                                                                - - - - - Returns: -
                                                                                  -
                                                                                • - boolean -
                                                                                  • -
                                                                                - - - @@ -383,7 +357,7 @@
                                                                                # - Debug.object_type (object) + Debug.object_type(object)
                                                                                @@ -429,70 +403,6 @@ - - - - - - -
                                                                                -
                                                                                -
                                                                                -
                                                                                - # - Debug.print (message, stack_traceback) -
                                                                                -
                                                                                -
                                                                                -
                                                                                - -

                                                                                Shows the given message if debug is enabled.

                                                                                -

                                                                                Uses serpent to print non scalars.

                                                                                - - - Parameters: - -
                                                                                  - - - - - -
                                                                                • - - message - - : - - - - -
                                                                                  • - - - - - -
                                                                                • - - stack_traceback - - : - - - levels of stack trace to give, defaults to 1 level if nil - -
                                                                                  • - - -
                                                                                - - - - - - - @@ -504,7 +414,7 @@
                                                                                # - Debug.print_position (position, message) + Debug.print_position(position, message)
                                                                                @@ -557,6 +467,112 @@ + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Debug.cheat(callback) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Executes the given callback if cheating is enabled.

                                                                                +

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + callback + + : + + + function + +
                                                                                  • + + +
                                                                                + + + + + + + + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Debug.is_closure(func) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Returns true if the function is a closure, false otherwise.

                                                                                +

                                                                                + A closure is a function that contains 'upvalues' or in other words + has a reference to a local variable defined outside the function's scope.

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + func + + : + + + + +
                                                                                  • + + +
                                                                                + + + + + Returns: +
                                                                                  +
                                                                                • + boolean +
                                                                                  • +
                                                                                + + + @@ -579,7 +595,7 @@ generated by LDoc
                                                                                - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                                diff --git a/doc/modules/utils.event.html b/doc/modules/utils.event.html index 3dad7d51..fcff8fa4 100644 --- a/doc/modules/utils.event.html +++ b/doc/modules/utils.event.html @@ -35,14 +35,20 @@ - + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Event.on_init(handler) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Register a handler for the script.on_init event.

                                                                                +

                                                                                + This function must be called in the control stage or in Event.on_init or Event.on_load + See documentation at top of file for details on using events.

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + handler + + : + + + + +
                                                                                  • + + +
                                                                                + + + + + + + + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Event.on_load(handler) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Register a handler for the script.on_load event.

                                                                                +

                                                                                + This function must be called in the control stage or in Event.on_init or Event.on_load + See documentation at top of file for details on using events.

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + handler + + : + + + + +
                                                                                  • + + +
                                                                                + + + + + + + + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Event.on_nth_tick(tick, handler) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Register a handler for the nth_tick event.

                                                                                +

                                                                                + This function must be called in the control stage or in Event.on_init or Event.on_load. + See documentation at top of file for details on using events.

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + tick + + : + + + The handler will be called every nth tick + +
                                                                                  • + + + + +
                                                                                • handler @@ -383,7 +567,7 @@
                                                                                  # - Event.add_removable (event_name, token) + Event.add_removable(event_name, token)
                                                                                  @@ -418,6 +602,72 @@ +
                                                                                • + + token + + : + + + + +
                                                                                  • + + +
                                                                                + + + + + + + + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Event.remove_removable(event_name, token) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Removes a token handler for the given event_name.

                                                                                +

                                                                                + Do NOT call this method during on_load. + See documentation at top of file for details on using events.

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + event_name + + : + + + + +
                                                                                  • + + + + +
                                                                                • token @@ -449,7 +699,7 @@
                                                                                  # - Event.add_removable_function (event_name, func) + Event.add_removable_function(event_name, func)
                                                                                  @@ -485,6 +735,72 @@ +
                                                                                • + + func + + : + + + + +
                                                                                  • + + +
                                                                                + + + + + + + + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Event.remove_removable_function(event_name, func) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Removes a handler for the given event_name.

                                                                                +

                                                                                + Do NOT call this method during on_load. + See documentation at top of file for details on using events.

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + event_name + + : + + + + +
                                                                                  • + + + + +
                                                                                • func @@ -516,7 +832,7 @@
                                                                                  # - Event.add_removable_nth_tick (tick, token) + Event.add_removable_nth_tick(tick, token)
                                                                                  @@ -551,6 +867,72 @@ +
                                                                                • + + token + + : + + + + +
                                                                                  • + + +
                                                                                + + + + + + + + + + + + + +
                                                                                +
                                                                                +
                                                                                +
                                                                                + # + Event.remove_removable_nth_tick(tick, token) +
                                                                                +
                                                                                +
                                                                                +
                                                                                + +

                                                                                Removes a token handler for the nth tick.

                                                                                +

                                                                                + Do NOT call this method during on_load. + See documentation at top of file for details on using events.

                                                                                + + + Parameters: + +
                                                                                  + + + + + +
                                                                                • + + tick + + : + + + + +
                                                                                  • + + + + +
                                                                                • token @@ -582,7 +964,7 @@
                                                                                  # - Event.add_removable_nth_tick_function (tick, func) + Event.add_removable_nth_tick_function(tick, func)
                                                                                  @@ -638,372 +1020,6 @@ - - - - - - -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - # - Event.on_init (handler) -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - -

                                                                                  Register a handler for the script.on_init event.

                                                                                  -

                                                                                  - This function must be called in the control stage or in Event.on_init or Event.on_load - See documentation at top of file for details on using events.

                                                                                  - - - Parameters: - -
                                                                                    - - - - - -
                                                                                  • - - handler - - : - - - - -
                                                                                    • - - -
                                                                                  - - - - - - - - - - - - - -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - # - Event.on_load (handler) -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - -

                                                                                  Register a handler for the script.on_load event.

                                                                                  -

                                                                                  - This function must be called in the control stage or in Event.on_init or Event.on_load - See documentation at top of file for details on using events.

                                                                                  - - - Parameters: - -
                                                                                    - - - - - -
                                                                                  • - - handler - - : - - - - -
                                                                                    • - - -
                                                                                  - - - - - - - - - - - - - -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - # - Event.on_nth_tick (tick, handler) -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - -

                                                                                  Register a handler for the nth_tick event.

                                                                                  -

                                                                                  - This function must be called in the control stage or in Event.on_init or Event.on_load. - See documentation at top of file for details on using events.

                                                                                  - - - Parameters: - -
                                                                                    - - - - - -
                                                                                  • - - tick - - : - - - The handler will be called every nth tick - -
                                                                                    • - - - - - -
                                                                                  • - - handler - - : - - - - -
                                                                                    • - - -
                                                                                  - - - - - - - - - - - - - -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - # - Event.remove_removable (event_name, token) -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - -

                                                                                  Removes a token handler for the given event_name.

                                                                                  -

                                                                                  - Do NOT call this method during on_load. - See documentation at top of file for details on using events.

                                                                                  - - - Parameters: - -
                                                                                    - - - - - -
                                                                                  • - - event_name - - : - - - - -
                                                                                    • - - - - - -
                                                                                  • - - token - - : - - - - -
                                                                                    • - - -
                                                                                  - - - - - - - - - - - - - -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - # - Event.remove_removable_function (event_name, func) -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - -

                                                                                  Removes a handler for the given event_name.

                                                                                  -

                                                                                  - Do NOT call this method during on_load. - See documentation at top of file for details on using events.

                                                                                  - - - Parameters: - -
                                                                                    - - - - - -
                                                                                  • - - event_name - - : - - - - -
                                                                                    • - - - - - -
                                                                                  • - - func - - : - - - - -
                                                                                    • - - -
                                                                                  - - - - - - - - - - - - - -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - # - Event.remove_removable_nth_tick (tick, token) -
                                                                                  -
                                                                                  -
                                                                                  -
                                                                                  - -

                                                                                  Removes a token handler for the nth tick.

                                                                                  -

                                                                                  - Do NOT call this method during on_load. - See documentation at top of file for details on using events.

                                                                                  - - - Parameters: - -
                                                                                    - - - - - -
                                                                                  • - - tick - - : - - - - -
                                                                                    • - - - - - -
                                                                                  • - - token - - : - - - - -
                                                                                    • - - -
                                                                                  - - - - - - - @@ -1015,7 +1031,7 @@
                                                                                  # - Event.remove_removable_nth_tick_function (tick, func) + Event.remove_removable_nth_tick_function(tick, func)
                                                                                  @@ -1092,7 +1108,7 @@ generated by LDoc
                                                                                - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                                diff --git a/doc/modules/utils.event_core.html b/doc/modules/utils.event_core.html index 06ebf725..633fb342 100644 --- a/doc/modules/utils.event_core.html +++ b/doc/modules/utils.event_core.html @@ -35,14 +35,20 @@ - + + +

                                                                                • Modules

                                                                                  +
                                                                                    +

                                                                                  • Topics

                                                                                    - + +
                                                                                    • -

                                                                                      Contents of utils.event_core

                                                                                      +

                                                                                      Jump to Section

                                                                                    -
                                                                                    -
                                                                                    Top
                                                                                    @@ -166,15 +182,15 @@ - Public.on_init (handler) + Public.on_init(handler) Do not use this function, use Event.on_init instead as it has safety checks. - Public.on_load (handler) + Public.on_load(handler) Do not use this function, use Event.on_load instead as it has safety checks. - Public.on_nth_tick (tick, handler) + Public.on_nth_tick(tick, handler) Do not use this function, use Event.on_nth_tick instead as it has safety checks. @@ -190,7 +206,7 @@
                                                                                    # - Public.on_init (handler) + Public.on_init(handler)
                                                                                    @@ -238,7 +254,7 @@
                                                                                    # - Public.on_load (handler) + Public.on_load(handler)
                                                                                    @@ -286,7 +302,7 @@
                                                                                    # - Public.on_nth_tick (tick, handler) + Public.on_nth_tick(tick, handler)
                                                                                    @@ -359,7 +375,7 @@ generated by LDoc
                                                                                    - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                                    diff --git a/doc/modules/utils.math.html b/doc/modules/utils.math.html index 404840ea..acadd8c5 100644 --- a/doc/modules/utils.math.html +++ b/doc/modules/utils.math.html @@ -35,14 +35,20 @@ - + + +

                                                                                    • Modules

                                                                                      +
                                                                                        +

                                                                                      • Topics

                                                                                        - + +
                                                                                        • -

                                                                                          Contents of utils.math

                                                                                          +

                                                                                          Jump to Section

                                                                                        -
                                                                                        -
                                                                                        Top
                                                                                        @@ -166,7 +182,7 @@ - calculate_y_intercept (x, slope) + calculate_y_intercept(x, slope) Calculates the y-intercept of a line @@ -182,7 +198,7 @@
                                                                                        # - calculate_y_intercept (x, slope) + calculate_y_intercept(x, slope)
                                                                                        @@ -263,7 +279,7 @@ generated by LDoc
                                                                                        - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                                        diff --git a/doc/modules/utils.recipe_locker.html b/doc/modules/utils.recipe_locker.html index 3d6808ea..f3b36daa 100644 --- a/doc/modules/utils.recipe_locker.html +++ b/doc/modules/utils.recipe_locker.html @@ -35,14 +35,20 @@ - + + +

                                                                                        • Modules

                                                                                          +
                                                                                            +

                                                                                          • Topics

                                                                                            - + +
                                                                                            • -

                                                                                              Contents of utils.recipe_locker

                                                                                              +

                                                                                              Jump to Section

                                                                                            -
                                                                                            -
                                                                                            Top
                                                                                            @@ -167,7 +183,7 @@ - Public.unlock_recipes (tbl) + Public.unlock_recipes(tbl) Unlocks recipes, allowing them to be enabled by research. @@ -183,7 +199,7 @@
                                                                                            # - Public.unlock_recipes (tbl) + Public.unlock_recipes(tbl)
                                                                                            @@ -244,7 +260,7 @@ generated by LDoc
                                                                                            - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                                            diff --git a/doc/modules/utils.state_machine.html b/doc/modules/utils.state_machine.html index 62df5a8e..13adc7f5 100644 --- a/doc/modules/utils.state_machine.html +++ b/doc/modules/utils.state_machine.html @@ -35,14 +35,20 @@ - + + +

                                                                                            • Modules

                                                                                              +
                                                                                                +

                                                                                              • Topics

                                                                                                - + +
                                                                                                • -

                                                                                                  Contents of utils.state_machine

                                                                                                  +

                                                                                                  Jump to Section

                                                                                                -
                                                                                                -
                                                                                                Top
                                                                                                @@ -170,32 +186,32 @@ - Module.in_state (self, state) + Module.transition(self, new_state) + Transitions the supplied machine into a given state and executes all transaction_callbacks + + + Module.in_state(self, state) Is this machine in this state? - Module.machine_tick (self) + Module.machine_tick(self) Invoke a machine tick. - Module.new (init_state) - Constructs a new state machine - - - Module.register_state_tick_callback (self, state, callback) + Module.register_state_tick_callback(self, state, callback) Register a handler that will be invoked by StateMachine.machine_tick You may register multiple handlers for the same transition NOTICE: This function will invoke an error if called after init. - Module.register_transition_callback (self, state, state, callback) + Module.register_transition_callback(self, state, state, callback) Register a handler that will be invoked by StateMachine.transition You may register multiple handlers for the same transition NOTICE: This function will invoke an error if called after init. - Module.transition (self, new_state) - Transitions the supplied machine into a given state and executes all transaction_callbacks + Module.new(init_state) + Constructs a new state machine @@ -209,8 +225,72 @@
                                                                                                + # + Module.transition(self, new_state) +
                                                                                                +
                                                                                                +
                                                                                                +
                                                                                                + +

                                                                                                Transitions the supplied machine into a given state and executes all transaction_callbacks

                                                                                                +

                                                                                                + + + Parameters: + +
                                                                                                  + + + + + +
                                                                                                • + + self + + : + + + StateMachine + +
                                                                                                  • + + + + + +
                                                                                                • + + new_state + + : + + + number/string The new state to transition to + +
                                                                                                  • + + +
                                                                                                + + + + + + + + + + + + + +
                                                                                                +
                                                                                                +
                                                                                                +
                                                                                                # - Module.in_state (self, state) + Module.in_state(self, state)
                                                                                                @@ -280,7 +360,7 @@
                                                                                                # - Module.machine_tick (self) + Module.machine_tick(self)
                                                                                                @@ -318,61 +398,6 @@ - - - - - - -
                                                                                                -
                                                                                                -
                                                                                                -
                                                                                                - # - Module.new (init_state) -
                                                                                                -
                                                                                                -
                                                                                                -
                                                                                                - -

                                                                                                Constructs a new state machine

                                                                                                -

                                                                                                - - - Parameters: - -
                                                                                                  - - - - - -
                                                                                                • - - init_state - - : - - - number/string The starting state of the machine - -
                                                                                                  • - - -
                                                                                                - - - - - Returns: -
                                                                                                  -
                                                                                                • - StateMachine The constructed state machine object -
                                                                                                  • -
                                                                                                - - - @@ -384,7 +409,7 @@
                                                                                                # - Module.register_state_tick_callback (self, state, callback) + Module.register_state_tick_callback(self, state, callback)
                                                                                                @@ -465,7 +490,7 @@
                                                                                                # - Module.register_transition_callback (self, state, state, callback) + Module.register_transition_callback(self, state, state, callback)
                                                                                                @@ -560,14 +585,14 @@
                                                                                                - # - Module.transition (self, new_state) + # + Module.new(init_state)
                                                                                                -

                                                                                                Transitions the supplied machine into a given state and executes all transaction_callbacks

                                                                                                +

                                                                                                Constructs a new state machine

                                                                                                @@ -581,27 +606,12 @@
                                                                                              • - self + init_state : - StateMachine - -
                                                                                                • - - - - - -
                                                                                              • - - new_state - - : - - - number/string The new state to transition to + number/string The starting state of the machine
                                                                                                • @@ -611,6 +621,12 @@ + Returns: +
                                                                                                  +
                                                                                                • + StateMachine The constructed state machine object +
                                                                                                  • +
                                                                                                @@ -636,7 +652,7 @@ generated by LDoc
                                                                                                - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                                                diff --git a/doc/modules/utils.table.html b/doc/modules/utils.table.html index 4ff129e0..fb703842 100644 --- a/doc/modules/utils.table.html +++ b/doc/modules/utils.table.html @@ -35,14 +35,21 @@ - + + +

                                                                                                • Modules

                                                                                                  +
                                                                                                    +

                                                                                                  • Topics

                                                                                                    - + +
                                                                                                    -
                                                                                                    -
                                                                                                    Top
                                                                                                    @@ -167,52 +184,52 @@ - add_all (t1, t2) - Adds the contents of table t2 to table t1 - - - array_contains (t, e) - Checks if the arrayed portion of a table contains an element - - - clear_table (t, array) - Clears all existing entries in a table - - - contains (t, e) - Checks if a table contains an element - - - fast_remove (tbl, index) + fast_remove(tbl, index) Removes an item from an array in O(1) time. - get_random_dictionary_entry (t, key) + add_all(t1, t2) + Adds the contents of table t2 to table t1 + + + index_of(t, e) + Checks if a table contains an element + + + index_of_in_array(t, e) + Checks if the arrayed portion of a table contains an element + + + contains(t, e) + Checks if a table contains an element + + + array_contains(t, e) + Checks if the arrayed portion of a table contains an element + + + set(t, index, element) + Adds an element into a specific index position while shuffling the rest down + + + get_random_dictionary_entry(t, key) Chooses a random entry from a table because this uses math.random, it cannot be used outside of events - get_random_weighted (weight_table, item_index, weight_index) + get_random_weighted(weight_table, item_index, weight_index) Chooses a random entry from a weighted table because this uses math.random, it cannot be used outside of events - index_of (t, e) - Checks if a table contains an element - - - index_of_in_array (t, e) - Checks if the arrayed portion of a table contains an element - - - set (t, index, element) - Adds an element into a specific index position while shuffling the rest down - - - shuffle_table (t) + shuffle_table(t) Creates a fisher-yates shuffle of a sequential number-indexed table because this uses math.random, it cannot be used outside of events if no rng is supplied from: http://www.sdknews.com/cross-platform/corona/tutorial-how-to-shuffle-table-items + + + clear_table(t, array) + Clears all existing entries in a table @@ -223,24 +240,24 @@ - deep_copy - Creates a deepcopy of a table. - - - equals - Determines if two tables are structurally equal. - - inspect Similar to serpent.block, returns a string with a pretty representation of a table. + size + Takes a table and returns the number of entries in the table. + + + deep_copy + Creates a deepcopy of a table. + + merge Merges multiple tables. - size - Takes a table and returns the number of entries in the table. + equals + Determines if two tables are structurally equal. @@ -254,264 +271,8 @@
                                                                                                    - # - add_all (t1, t2) -
                                                                                                    -
                                                                                                    -
                                                                                                    -
                                                                                                    - -

                                                                                                    Adds the contents of table t2 to table t1

                                                                                                    -

                                                                                                    - - - Parameters: - -
                                                                                                      - - - - - -
                                                                                                    • - - t1 - - : - - - to insert into - - - - - - - -
                                                                                                    • - - t2 - - : - - -
                                                                                                      • to insert from - - - - - - - - - - - - - - - - - - - -
                                                                                                      -
                                                                                                      -
                                                                                                      - # - array_contains (t, e) -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - -

                                                                                                      Checks if the arrayed portion of a table contains an element

                                                                                                      -

                                                                                                      - - - Parameters: - -
                                                                                                        - - - - - -
                                                                                                      • - - t - - : - - -
                                                                                                      - - - - - - - -
                                                                                                    • - - e - - : - - - table element - -
                                                                                                      • - - - - - - - - - - - - - - - - - -
                                                                                                      -
                                                                                                      -
                                                                                                      - # - clear_table (t, array) -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - -

                                                                                                      Clears all existing entries in a table

                                                                                                      -

                                                                                                      - - - Parameters: - -
                                                                                                        - - - - - -
                                                                                                      • - - t - - : - - -
                                                                                                      to clear - - - - - - - -
                                                                                                    • - - array - - : - - - to indicate whether the table is an array or not - -
                                                                                                      • - - - - - - - - - - - - - - - - - -
                                                                                                      -
                                                                                                      -
                                                                                                      - # - contains (t, e) -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - -

                                                                                                      Checks if a table contains an element

                                                                                                      -

                                                                                                      - - - Parameters: - -
                                                                                                        - - - - - -
                                                                                                      • - - t - - : - - -
                                                                                                      - - - - - - - -
                                                                                                    • - - e - - : - - - table element - -
                                                                                                      • - - - - - - - - - - - - - - - - - -
                                                                                                      -
                                                                                                      -
                                                                                                      # - fast_remove (tbl, index) + fast_remove(tbl, index)
                                                                                                      @@ -565,6 +326,405 @@ + + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + # + add_all(t1, t2) +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +

                                                                                                      Adds the contents of table t2 to table t1

                                                                                                      +

                                                                                                      + + + Parameters: + +
                                                                                                        + + + + + +
                                                                                                      • + + t1 + + : + + +
                                                                                                      to insert into + + + + + + + +
                                                                                                    • + + t2 + + : + + +
                                                                                                      • to insert from + + + + + + + + + + + + + + + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      + # + index_of(t, e) +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +

                                                                                                      Checks if a table contains an element

                                                                                                      +

                                                                                                      + + + Parameters: + +
                                                                                                        + + + + + +
                                                                                                      • + + t + + : + + +
                                                                                                      + + + + + + + +
                                                                                                    • + + e + + : + + + table element + +
                                                                                                      • + + + + + + + + + + + + + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      + # + index_of_in_array(t, e) +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +

                                                                                                      Checks if the arrayed portion of a table contains an element

                                                                                                      +

                                                                                                      + + + Parameters: + +
                                                                                                        + + + + + +
                                                                                                      • + + t + + : + + +
                                                                                                      + + + + + + + +
                                                                                                    • + + e + + : + + + table element + +
                                                                                                      • + + + + + + + + + + + + + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      + # + contains(t, e) +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +

                                                                                                      Checks if a table contains an element

                                                                                                      +

                                                                                                      + + + Parameters: + +
                                                                                                        + + + + + +
                                                                                                      • + + t + + : + + +
                                                                                                      + + + + + + + +
                                                                                                    • + + e + + : + + + table element + +
                                                                                                      • + + + + + + + + + + + + + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      + # + array_contains(t, e) +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +

                                                                                                      Checks if the arrayed portion of a table contains an element

                                                                                                      +

                                                                                                      + + + Parameters: + +
                                                                                                        + + + + + +
                                                                                                      • + + t + + : + + +
                                                                                                      + + + + + + + +
                                                                                                    • + + e + + : + + + table element + +
                                                                                                      • + + + + + + + + + + + + + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      + # + set(t, index, element) +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +

                                                                                                      Adds an element into a specific index position while shuffling the rest down

                                                                                                      +

                                                                                                      + + + Parameters: + +
                                                                                                        + + + + + +
                                                                                                      • + + t + + : + + +
                                                                                                      to add into + + + + + + + +
                                                                                                    • + + index + + : + + + the position in the table to add to + +
                                                                                                      • + + + + + +
                                                                                                    • + + element + + : + + + to add to the table + +
                                                                                                      • + + + + + + + + + + @@ -576,7 +736,7 @@
                                                                                                      # - get_random_dictionary_entry (t, key) + get_random_dictionary_entry(t, key)
                                                                                                      @@ -647,7 +807,7 @@
                                                                                                      # - get_random_weighted (weight_table, item_index, weight_index) + get_random_weighted(weight_table, item_index, weight_index)
                                                                                                      @@ -731,219 +891,12 @@ -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - # - index_of (t, e) -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - -

                                                                                                      Checks if a table contains an element

                                                                                                      -

                                                                                                      - - - Parameters: - -
                                                                                                        - - - - - -
                                                                                                      • - - t - - : - - -
                                                                                                      - - - - - - - -
                                                                                                    • - - e - - : - - - table element - -
                                                                                                      • - - - - - - - - - - - - - - - - - -
                                                                                                      -
                                                                                                      -
                                                                                                      - # - index_of_in_array (t, e) -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - -

                                                                                                      Checks if the arrayed portion of a table contains an element

                                                                                                      -

                                                                                                      - - - Parameters: - -
                                                                                                        - - - - - -
                                                                                                      • - - t - - : - - -
                                                                                                      - - - - - - - -
                                                                                                    • - - e - - : - - - table element - -
                                                                                                      • - - - - - - - - - - - - - - - - - -
                                                                                                      -
                                                                                                      -
                                                                                                      - # - set (t, index, element) -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - -

                                                                                                      Adds an element into a specific index position while shuffling the rest down

                                                                                                      -

                                                                                                      - - - Parameters: - -
                                                                                                        - - - - - -
                                                                                                      • - - t - - : - - -
                                                                                                      to add into - - - - - - - -
                                                                                                    • - - index - - : - - - the position in the table to add to - -
                                                                                                      • - - - - - -
                                                                                                    • - - element - - : - - - to add to the table - -
                                                                                                      • - - - - - - - - - - - - - - - -
                                                                                                      # - shuffle_table (t) + shuffle_table(t)
                                                                                                      @@ -983,6 +936,70 @@ + + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + # + clear_table(t, array) +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +

                                                                                                      Clears all existing entries in a table

                                                                                                      +

                                                                                                      + + + Parameters: + +
                                                                                                        + + + + + +
                                                                                                      • + + t + + : + + +
                                                                                                      to clear + + + + + + + +
                                                                                                    • + + array + + : + + + to indicate whether the table is an array or not + +
                                                                                                      • + + + + + + + + + + @@ -996,6 +1013,101 @@
                                                                                                      + # + inspect +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +

                                                                                                      Similar to serpent.block, returns a string with a pretty representation of a table.

                                                                                                      +

                                                                                                      + Notice: This method is not appropriate for saving/restoring tables. It is meant to be used by the programmer mainly while debugging a program. + depth sets the maximum depth that will be printed out. When the max depth is reached, inspect will stop parsing tables and just return {...} + process is a function which allow altering the passed object before transforming it into a string. + A typical way to use it would be to remove certain values so that they don't appear at all. + return the prettied table

                                                                                                      + + + +
                                                                                                        + + + + + +
                                                                                                      • + + table + + : + + +
                                                                                                      the table to serialize + + + + + + + +
                                                                                                    • + + options + + : + + +
                                                                                                      • options are depth, newline, indent, process + + + + + + + + + + + + + + + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      + # + size +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +

                                                                                                      Takes a table and returns the number of entries in the table.

                                                                                                      +

                                                                                                      (Slower than #table, faster than iterating via pairs)

                                                                                                      + + + + + + + + + + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      # deep_copy
                                                                                                      @@ -1035,6 +1147,55 @@ + + + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      + # + merge +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +

                                                                                                      Merges multiple tables.

                                                                                                      +

                                                                                                      Tables later in the list will overwrite entries from tables earlier in the list. + Ex. merge({{1, 2, 3}, {[2] = 0}, {[3] = 0}}) will return {1, 0, 0}

                                                                                                      + + + +
                                                                                                        + + + + + +
                                                                                                      • + + tables + + : + + +
                                                                                                      takes a table of tables to merge + + + + + + + + + + + + @@ -1099,150 +1260,6 @@ - - - - - - - -
                                                                                                      -
                                                                                                      -
                                                                                                      - # - inspect -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - -

                                                                                                      Similar to serpent.block, returns a string with a pretty representation of a table.

                                                                                                      -

                                                                                                      - Notice: This method is not appropriate for saving/restoring tables. It is meant to be used by the programmer mainly while debugging a program. - depth sets the maximum depth that will be printed out. When the max depth is reached, inspect will stop parsing tables and just return {...} - process is a function which allow altering the passed object before transforming it into a string. - A typical way to use it would be to remove certain values so that they don't appear at all. - return the prettied table

                                                                                                      - - - -
                                                                                                        - - - - - -
                                                                                                      • - - table - - : - - -
                                                                                                      the table to serialize - - - - - - - -
                                                                                                    • - - options - - : - - -
                                                                                                      • options are depth, newline, indent, process - - - - - - - - - - - - - - - - - - - -
                                                                                                      -
                                                                                                      -
                                                                                                      - # - merge -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - -

                                                                                                      Merges multiple tables.

                                                                                                      -

                                                                                                      Tables later in the list will overwrite entries from tables earlier in the list. - Ex. merge({{1, 2, 3}, {[2] = 0}, {[3] = 0}}) will return {1, 0, 0}

                                                                                                      - - - -
                                                                                                        - - - - - -
                                                                                                      • - - tables - - : - - -
                                                                                                      takes a table of tables to merge - - - - - - - - - - - - - - - - - - - -
                                                                                                      -
                                                                                                      -
                                                                                                      - # - size -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - -

                                                                                                      Takes a table and returns the number of entries in the table.

                                                                                                      -

                                                                                                      (Slower than #table, faster than iterating via pairs)

                                                                                                      - - - - - - - - @@ -1265,7 +1282,7 @@ generated by LDoc
                                                                                                      - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                                                      diff --git a/doc/modules/utils.task.html b/doc/modules/utils.task.html index cc392e76..da2183dd 100644 --- a/doc/modules/utils.task.html +++ b/doc/modules/utils.task.html @@ -35,14 +35,20 @@ - + + +
                                                                                                      - - - - - + + + + +
                                                                                                      Task.queue_task (func_token, params, weight)Queueing allows you to split up heavy tasks which don't need to be completed in the same tick.
                                                                                                      Task.set_timeout (sec, func_token, params)Task.set_timeout(sec, func_token, params) Allows you to set a timer (in seconds) after which the tokened function will be run with params given as an argument Cannot be called before init
                                                                                                      Task.queue_task(func_token, params, weight)Queueing allows you to split up heavy tasks which don't need to be completed in the same tick.
                                                                                                      @@ -187,8 +203,88 @@
                                                                                                      + # + Task.set_timeout(sec, func_token, params) +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      + +

                                                                                                      Allows you to set a timer (in seconds) after which the tokened function will be run with params given as an argument + Cannot be called before init

                                                                                                      +

                                                                                                      + + + Parameters: + +
                                                                                                        + + + + + +
                                                                                                      • + + sec + + : + + + + +
                                                                                                        • + + + + + +
                                                                                                      • + + func_token + + : + + + a token for a function store via the token system + +
                                                                                                        • + + + + + +
                                                                                                      • + + params + + : + + + the argument to send to the tokened function + +
                                                                                                        • + + +
                                                                                                      + + + + + + + + + + + + + +
                                                                                                      +
                                                                                                      +
                                                                                                      +
                                                                                                      # - Task.queue_task (func_token, params, weight) + Task.queue_task(func_token, params, weight)
                                                                                                      @@ -259,86 +355,6 @@ - - - - - - -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - # - Task.set_timeout (sec, func_token, params) -
                                                                                                      -
                                                                                                      -
                                                                                                      -
                                                                                                      - -

                                                                                                      Allows you to set a timer (in seconds) after which the tokened function will be run with params given as an argument - Cannot be called before init

                                                                                                      -

                                                                                                      - - - Parameters: - -
                                                                                                        - - - - - -
                                                                                                      • - - sec - - : - - - - -
                                                                                                        • - - - - - -
                                                                                                      • - - func_token - - : - - - a token for a function store via the token system - -
                                                                                                        • - - - - - -
                                                                                                      • - - params - - : - - - the argument to send to the tokened function - -
                                                                                                        • - - -
                                                                                                      - - - - - - - @@ -361,7 +377,7 @@ generated by LDoc
                                                                                                      - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                                                    diff --git a/doc/modules/utils.timestamp.html b/doc/modules/utils.timestamp.html index e07fe382..4d2b4fb2 100644 --- a/doc/modules/utils.timestamp.html +++ b/doc/modules/utils.timestamp.html @@ -35,14 +35,20 @@ - + + +

                                                                                                    • Modules

                                                                                                      +
                                                                                                        +

                                                                                                      • Topics

                                                                                                        - + +
                                                                                                        • -

                                                                                                          Contents of utils.timestamp

                                                                                                          +

                                                                                                          Jump to Section

                                                                                                        -
                                                                                                        -
                                                                                                        Top
                                                                                                        @@ -167,17 +183,17 @@ - Public.from_timetable (timetable) + Public.to_timetable(sec) + Converts unix epoch timestamp into table {year: number, month: number, day: number, hour: number, min: number, sec: number} + + + Public.from_timetable(timetable) Converts timetable into unix epoch timestamp - Public.to_string (secs) + Public.to_string(secs) Converts unix epoch timestamp into human readable string. - - Public.to_timetable (sec) - Converts unix epoch timestamp into table {year: number, month: number, day: number, hour: number, min: number, sec: number} - @@ -190,8 +206,63 @@
                                                                                                        + # + Public.to_timetable(sec) +
                                                                                                        +
                                                                                                        +
                                                                                                        +
                                                                                                        + +

                                                                                                        Converts unix epoch timestamp into table {year: number, month: number, day: number, hour: number, min: number, sec: number}

                                                                                                        +

                                                                                                        + + + Parameters: + +
                                                                                                          + + + + + +
                                                                                                        • + + sec + + : + + + unix epoch timestamp + +
                                                                                                          • + + +
                                                                                                        + + + + + Returns: +
                                                                                                          +
                                                                                                        • + {year: number, month: number, day: number, hour: number, min: number, sec: number} +
                                                                                                          • +
                                                                                                        + + + + + + + + + +
                                                                                                        +
                                                                                                        +
                                                                                                        +
                                                                                                        # - Public.from_timetable (timetable) + Public.from_timetable(timetable)
                                                                                                        @@ -246,7 +317,7 @@
                                                                                                        # - Public.to_string (secs) + Public.to_string(secs)
                                                                                                        @@ -290,61 +361,6 @@ - - - - - - -
                                                                                                        -
                                                                                                        -
                                                                                                        -
                                                                                                        - # - Public.to_timetable (sec) -
                                                                                                        -
                                                                                                        -
                                                                                                        -
                                                                                                        - -

                                                                                                        Converts unix epoch timestamp into table {year: number, month: number, day: number, hour: number, min: number, sec: number}

                                                                                                        -

                                                                                                        - - - Parameters: - -
                                                                                                          - - - - - -
                                                                                                        • - - sec - - : - - - unix epoch timestamp - -
                                                                                                          • - - -
                                                                                                        - - - - - Returns: -
                                                                                                          -
                                                                                                        • - {year: number, month: number, day: number, hour: number, min: number, sec: number} -
                                                                                                          • -
                                                                                                        - - - @@ -367,7 +383,7 @@ generated by LDoc
                                                                                                        - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                                                        diff --git a/doc/topics/license.html b/doc/topics/license.html index 5cdaf3a1..47d594ee 100644 --- a/doc/topics/license.html +++ b/doc/topics/license.html @@ -35,13 +35,25 @@ - + + + @@ -49,9 +61,6 @@

                                                                                                      • Modules

                                                                                                        - - @@ -723,7 +730,7 @@ Public License instead of this License. But first, please read generated by LDoc
                                                                                                        - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                                                        diff --git a/doc/topics/readme.md.html b/doc/topics/readme.md.html index 5640c39e..ae36365e 100644 --- a/doc/topics/readme.md.html +++ b/doc/topics/readme.md.html @@ -35,13 +35,25 @@ - + + + @@ -49,9 +61,6 @@

                                                                                                      • Modules

                                                                                                        - - @@ -263,7 +270,7 @@ generated by LDoc
                                                                                                        - Last updated 2019-06-29 01:27:33 UTC + Last updated 2019-07-20 23:44:09 UTC
                                                                                                        diff --git a/modules/addons/discord-alerts.lua b/modules/addons/discord-alerts.lua index d9452336..b8928d15 100644 --- a/modules/addons/discord-alerts.lua +++ b/modules/addons/discord-alerts.lua @@ -102,7 +102,7 @@ end --- Warnings added and removed if config.player_warnings then - local Warnings = require 'modules.addons.warnings' + local Warnings = require 'modules.control.warnings' Event.add(Warnings.events.on_warning_added,function(event) local player_name,by_player_name = get_player_name(event) emit_event{ diff --git a/modules/commands/warnings.lua b/modules/commands/warnings.lua index 9e453acf..2e26785f 100644 --- a/modules/commands/warnings.lua +++ b/modules/commands/warnings.lua @@ -1,5 +1,5 @@ local Commands = require 'expcore.commands' -local Warnings = require 'modules.addons.warnings' +local Warnings = require 'modules.control.warnings' local format_chat_player_name = ext_require('expcore.common','format_chat_player_name') local config = require 'config.warnings' require 'config.expcore-commands.parse_roles' diff --git a/modules/control/jail.lua b/modules/control/jail.lua index e1b67018..0cb9ab7e 100644 --- a/modules/control/jail.lua +++ b/modules/control/jail.lua @@ -1,9 +1,12 @@ --[[-- Control Module - Jail - Adds a way to jail players and temp ban players. - @module Jail + @control Jail @alias Jail @usage + -- import the module from the control modules + local Jail = require 'modules.control.jail' + -- This will move 'MrBiter' to the jail role and remove all other roles from them -- the player name and reason are only so they can be included in the event for user feedback Jail.jail_player('MrBiter','Cooldude2606','Likes biters too much') @@ -17,9 +20,17 @@ Jail.temp_ban_player('MrBiter','Cooldude2606','Likes biters too much') ]] +--- Allows moving players into the jail role +-- @dep expcore.roles local Roles = require 'expcore.roles' +--- Allows accessing a player from any value +-- @dep utils.game local Game = require 'utils.game' +--- Allows storing data in the global table +-- @dep utils.global local Global = require 'utils.global' +--- Use of move_items to clear inventroies +-- @dep expcore.common local move_items = ext_require('expcore.common','move_items') local valid_player = Game.get_player_from_any @@ -82,7 +93,7 @@ local function event_emit(event,player,by_player_name,reason) }) end ---- Jail functions. +--- Jail. -- Functions related to jail -- @section jail-functions @@ -137,7 +148,7 @@ function Jail.unjail_player(player,by_player_name) return true end ---- Temp ban functions. +--- Temp ban. -- Functions related to temp ban -- @section temp-ban-functions diff --git a/modules/control/production.lua b/modules/control/production.lua new file mode 100644 index 00000000..efac3a4d --- /dev/null +++ b/modules/control/production.lua @@ -0,0 +1,237 @@ +--[[-- Control Module - Production + - Common functions used to track production of items + @control Production + @alias Production + + @usage + -- import the module from the control modules + local Production = require 'modules.control.production' + + -- This will return the less precise index from the one given + -- this means that one_second will return one_minute or ten_hours will return fifty_hours + -- the other precision work like wise + Production.precision_up(defines.flow_precision_index.one_second) + + -- The get production function is used to get production, consumion and net + -- it may be used for any item and with any precision level, use total for total + Production.get_production(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute) + + -- The fluctuations works by compearing recent production with the average over time + -- again any precision may be used, apart from one_thousand_hours as there would be no valid average + Production.get_fluctuations(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute) + + -- ETA is calculated based on what function you use but all share a similar method + -- for production eta it will take current production average given by the precision + -- and work out how many ticks it will require to make the required amount (1000 by default) + Production.get_production_eta(game.forces.player,'iron-plate',defines.flow_precision_index.one_minute,250000) + + -- Both get_color and format_number are helper functions to help format production stats + -- get_color will return green,orange,red,or grey based on the active_value + -- the passive_value is used when active_value is 0 and can only return orange,red,or grey + Production.get_color(clamp,active_value,passive_value) + +]] + +--- Provides colors for Production.get_color +-- @dep resources.color_presets +local Colors = require 'resources.color_presets' +--- Provides format_number function to add surfixs +-- @dep util +local format_number = ext_require('util','format_number') + +local precision_index = defines.flow_precision_index +local Production = {} + +--- Precision. +-- Functions which are used to do basic things +-- @section precision + +--- Gets the next lesser precision index value, eg 1 second -> 1 minute +-- @tparam defines.flow_precision_index precision +-- @treturn[1] defines.flow_precision_index the next precision value +-- @treturn[1] number the multiplicive difference between the values +function Production.precision_up(precision) + if precision == precision_index.one_second then return precision_index.one_minute,60 + elseif precision == precision_index.one_minute then return precision_index.ten_minutes,10 + elseif precision == precision_index.ten_minutes then return precision_index.one_hour,6 + elseif precision == precision_index.one_hour then return precision_index.ten_hours,10 + elseif precision == precision_index.ten_hours then return precision_index.fifty_hours,5 + elseif precision == precision_index.fifty_hours then return precision_index.two_hundred_fifty_hours,5 + elseif precision == precision_index.two_hundred_fifty_hours then return precision_index.one_thousand_hours,4 + end +end + +--- Gets the next greater precision index value, eg 1 minute -> 1 second +-- @tparam defines.flow_precision_index precision +-- @treturn[1] defines.flow_precision_index the next precision value +-- @treturn[1] number the multiplicive difference between the values +function Production.precision_down(precision) + if precision == precision_index.one_minute then return precision_index.one_second,60 + elseif precision == precision_index.ten_minutes then return precision_index.one_minute,10 + elseif precision == precision_index.one_hour then return precision_index.ten_minutes,6 + elseif precision == precision_index.ten_hours then return precision_index.one_hour,10 + elseif precision == precision_index.fifty_hours then return precision_index.ten_hours,5 + elseif precision == precision_index.two_hundred_fifty_hours then return precision_index.fifty_hours,5 + elseif precision == precision_index.one_thousand_hours then return precision_index.two_hundred_fifty_hours,4 + end +end + +--- Gets the number of tick that precision is given over, eg 1 minute -> 60 ticks +-- @tparam defines.flow_precision_index precision +-- @treturn number the number of ticks in this time +function Production.precision_ticks(precision) + if precision == precision_index.one_second then return 60 + elseif precision == precision_index.one_minute then return 3600 + elseif precision == precision_index.ten_minutes then return 36000 + elseif precision == precision_index.one_hour then return 216000 + elseif precision == precision_index.ten_hours then return 2160000 + elseif precision == precision_index.fifty_hours then return 10800000 + elseif precision == precision_index.two_hundred_fifty_hours then return 54000000 + elseif precision == precision_index.one_thousand_hours then return 216000000 + end +end + +--- Statistics. +-- Functions used to get information about production +-- @section stats + +--- Returns the production data for the whole game time +-- @tparam LuaForce force the force to get the data for +-- @tparam string item_name the name of the item that you want the data about +-- @treturn table contains total made, used and net +function Production.get_production_total(force,item_name) + local stats = force.item_production_statistics + local made = stats.get_input_count(item_name) or 0 + local used = stats.get_output_count(item_name) or 0 + + return { + made=made, + used=used, + net=made-used + } + +end + +--- Returns the production data for the given precision game time +-- @tparam LuaForce force the force to get the data for +-- @tparam string item_name the name of the item that you want the data about +-- @tparam defines.flow_precision_index precision the precision that you want the data given to +-- @treturn table contains made, used and net +function Production.get_production(force,item_name,precision) + local stats = force.item_production_statistics.get_flow_count + local made = stats{name=item_name,input=true,precision_index=precision} or 0 + local used = stats{name=item_name,input=false,precision_index=precision} or 0 + + return { + made=made, + used=used, + net=made-used + } + +end + +--- Returns the current fluctuation from the average +-- @tparam LuaForce force the force to get the data for +-- @tparam string item_name the name of the item that you want the data about +-- @tparam defines.flow_precision_index precision the precision that you want the data given to +-- @treturn table contains made, used and net +function Production.get_fluctuations(force,item_name,precision) + local percision_up = Production.precision_up(precision) + local current = Production.get_production(force,item_name,precision) + local previous = Production.get_production(force,item_name,percision_up) + + return { + made=(current.made/previous.made)-1, + used=(current.used/previous.used)-1, + net=(current.net/previous.net)-1, + } + +end + +--- Returns the amount of ticks required to produce a certain amount +-- @tparam LuaForce force the force to get the data for +-- @tparam string item_name the name of the item that you want the data about +-- @tparam defines.flow_precision_index precision the precision that you want the data given to +-- @tparam[opt=1000] number required the number of items that are required to be made +-- @treturn number the number of ticks required to produce this ammount of items +function Production.get_production_eta(force,item_name,precision,required) + required = required or 1000 + local ticks = Production.precision_ticks(precision) + local production = Production.get_production(force,item_name,precision) + return production.made == 0 and -1 or ticks*required/production.made +end + +--- Returns the amount of ticks required to consume a certain amount +-- @tparam LuaForce force the force to get the data for +-- @tparam string item_name the name of the item that you want the data about +-- @tparam defines.flow_precision_index precision the precision that you want the data given to +-- @tparam[opt=1000] number required the number of items that are required to be consumed +-- @treturn number the number of ticks required to consume this ammount of items +function Production.get_consumsion_eta(force,item_name,precision,required) + required = required or 1000 + local ticks = Production.precision_ticks(precision) + local production = Production.get_production(force,item_name,precision) + return production.used == 0 and -1 or ticks*required/production.used +end + +--- Returns the amount of ticks required to produce but not consume a certain amount +-- @tparam LuaForce force the force to get the data for +-- @tparam string item_name the name of the item that you want the data about +-- @tparam defines.flow_precision_index precision the precision that you want the data given to +-- @tparam[opt=1000] number required the number of items that are required to be made but not used +-- @treturn number the number of ticks required to produce, but not use, this ammount of items +function Production.get_net_eta(force,item_name,precision,required) + required = required or 1000 + local ticks = Production.precision_ticks(precision) + local production = Production.get_production(force,item_name,precision) + return production.net == 0 and -1 or ticks*required/production.net +end + +--- Formating. +-- Functions used to format production values +-- @section formating + +--- Returns a color value bassed on the value that was given +-- @tparam number clamp value which seperates the different colours +-- @tparam number active_value first value tested, tested against clamp +-- @tparam number passive_value second value tested, tested against 0 +-- @treturn table contains r,g,b keys +function Production.get_color(clamp,active_value,passive_value) + if active_value > clamp then + return Colors.light_green + elseif active_value < -clamp then + return Colors.indian_red + elseif active_value ~= 0 then + return Colors.orange + elseif passive_value and passive_value > 0 then + return Colors.orange + elseif passive_value and passive_value ~= 0 then + return Colors.indian_red + else + return Colors.grey + end +end + +--- Returns three parts used to format a number +-- @tparam number value the value to format +-- @treturn[1] string the sign for the number +-- @treturn[1] string the surfix for any unit used +function Production.format_number(value) + local rtn = format_number(math.round(value,1),true) + local surfix = rtn:sub(-1) + + if value > 0 then + rtn = '+'..rtn + elseif value == 0 and rtn:sub(1,1) == '-' then + rtn = rtn:sub(2) + end + + if not tonumber(surfix) then + return surfix,rtn:sub(1,-2) + else + return '',rtn + end + +end + +return Production \ No newline at end of file diff --git a/modules/control/reports.lua b/modules/control/reports.lua index d869964c..cc8a66d7 100644 --- a/modules/control/reports.lua +++ b/modules/control/reports.lua @@ -1,9 +1,12 @@ --[[-- Control Module - Reports - Adds a way to report players and store report messages. - @module Reports + @control Reports @alias Reports @usage + -- import the module from the control modules + local Reports = require 'modules.control.reports' + -- This will place a report on "MrBiter" (must be a valid player) the report will have been made -- by "Cooldude2606" (must be the player name) with the reason 'Liking biters too much' this can be -- seen by using Reports.get_report. @@ -21,7 +24,11 @@ ]] +--- Allows getting player from any value +-- @dep utils.game local Game = require 'utils.game' +--- Allows storing of data in global table +-- @dep utils.global local Global = require 'utils.global' local valid_player = Game.get_player_from_any @@ -49,7 +56,7 @@ Global.register(user_reports,function(tbl) user_reports = tbl end) ---- Get functions. +--- Getters. -- Functions used to get information from reports -- @section get-functions @@ -112,7 +119,7 @@ function Reports.count_reports(player,custom_count) end end ---- Set functions. +--- Setters. -- Functions used to get information from reports -- @section set-functions diff --git a/modules/control/warnings.lua b/modules/control/warnings.lua index a00bf878..8950659e 100644 --- a/modules/control/warnings.lua +++ b/modules/control/warnings.lua @@ -1,9 +1,12 @@ --[[-- Control Module - Warnings - Adds a way to give and remove warnings to players. - @module Warnings + @control Warnings @alias Warnings @usage + -- import the module from the control modules + local Warnings = require 'modules.control.warnings' + -- This will add a warning to the player Warnings.add_warning('MrBiter','Cooldude2606','Killed too many biters') @@ -18,9 +21,17 @@ Warnings.clear_warnings('MrBiter','Cooldude2606') ]] +--- Allows registering of custom events +-- @dep utils.event local Event = require 'utils.event' +--- Allows getting player from any value +-- @dep utils.game local Game = require 'utils.game' +--- Allows storing in the global table +-- @dep utils.global local Global = require 'utils.global' +--- Config file for this module +-- @dep config.warnings local config = require 'config.warnings' local valid_player = Game.get_player_from_any diff --git a/modules/gui/science-info.lua b/modules/gui/science-info.lua index 6fd522d2..d8e70e86 100644 --- a/modules/gui/science-info.lua +++ b/modules/gui/science-info.lua @@ -1,53 +1,13 @@ --- Adds a science info gui that shows production usage and net for the different science packs as well as an eta local Gui = require 'expcore.gui' local Event = require 'utils.event' -local Colors = require 'resources.color_presets' local format_time = ext_require('expcore.common','format_time') -local format_number = ext_require('util','format_number') local config = require 'config.science' +local Production = require 'modules.control.production' local null_time_short = {'science-info.eta-time',format_time(0,{hours=true,minutes=true,seconds=true,time=true,null=true})} local null_time_long = format_time(0,{hours=true,minutes=true,seconds=true,long=true,null=true}) ---- Gets the production stats for a certain science pack -local function get_production_stats(player,science_pack) - local force = player.force - local stats = force.item_production_statistics - local total_made = stats.get_input_count(science_pack) - local total_used = stats.get_output_count(science_pack) - local minute_made = stats.get_flow_count{ - name=science_pack, - input=true, - precision_index=defines.flow_precision_index.one_minute, - } - local minute_used = stats.get_flow_count{ - name=science_pack, - input=false, - precision_index=defines.flow_precision_index.one_minute, - } - return { - total_made=total_made, - total_used=total_used, - total_net=total_made-total_used, - minute_made=minute_made, - minute_used=minute_used, - minute_net=minute_made-minute_used - } -end - ---- Gets the font colour for a certain level of production -local function get_font_colour(value,secondary) - if value > config.required_for_green then - return Colors.light_green - elseif value < config.required_for_red then - return Colors.indian_red - elseif secondary and secondary > 0 or not secondary and value ~= 0 then - return Colors.orange - else - return Colors.grey - end -end - --[[ Generates the main structure for the gui element > container @@ -60,7 +20,7 @@ end >>> eta >>>> label ]] -local function generate_container(player,element) +local function generate_container(element) Gui.set_padding(element,1,2,2,2) element.style.minimal_width = 200 @@ -137,21 +97,8 @@ end > spm-"name" ]] local function add_data_label(element,name,value,secondary,tooltip) - local data_colour = get_font_colour(value,secondary) - local caption = format_number(math.round(value,1),true) - - local surfix = caption:sub(-1) - if not tonumber(surfix) then - caption = caption:sub(1,-2) - else - surfix = '' - end - - if value > 0 then - caption = '+'..caption - elseif value == 0 and caption:sub(1,1) == '-' then - caption = caption:sub(2) - end + local data_colour = Production.get_color(config.color_clamp, value, secondary) + local surfix,caption = Production.format_number(value) if element[name] then local data = element[name].label @@ -197,16 +144,18 @@ end > net-"science_pack" (add_data_label) ]] local function generate_science_pack(player,element,science_pack) - local stats = get_production_stats(player,science_pack) - if stats.total_made > 0 then + local total = Production.get_production_total(player.force, science_pack) + local minute = Production.get_production(player.force, science_pack, defines.flow_precision_index.one_minute) + if total.made > 0 then element.parent.non_made.visible = false local icon_style = 'quick_bar_slot_button' - if stats.minute_net > config.required_for_green then + local flux = Production.get_fluctuations(player.force, science_pack, defines.flow_precision_index.one_minute) + if flux.net > -config.color_flux/2 then icon_style = 'green_slot_button' - elseif stats.minute_net < config.required_for_red then + elseif flux.net < -config.color_flux then icon_style = 'red_slot_button' - elseif stats.minute_made > 0 then + elseif minute.made > 0 then icon_style = 'selected_slot_button' end @@ -257,9 +206,9 @@ local function generate_science_pack(player,element,science_pack) Gui.set_padding(delta_table) end - add_data_label(delta.table,'pos-'..science_pack,stats.minute_made,nil,{'science-info.pos-tooltip',stats.total_made}) - add_data_label(delta.table,'neg-'..science_pack,-stats.minute_used,nil,{'science-info.neg-tooltip',stats.total_used}) - add_data_label(element,'net-'..science_pack,stats.minute_net,stats.minute_made+stats.minute_used,{'science-info.net-tooltip',stats.total_net}) + add_data_label(delta.table,'pos-'..science_pack,minute.made,nil,{'science-info.pos-tooltip',total.made}) + add_data_label(delta.table,'neg-'..science_pack,-minute.used,nil,{'science-info.neg-tooltip',total.used}) + add_data_label(element,'net-'..science_pack,minute.net,minute.made+minute.used,{'science-info.net-tooltip',total.net}) end end @@ -281,18 +230,9 @@ local function update_eta(player,element) for _,ingredient in pairs(research.research_unit_ingredients) do local pack_name = ingredient.name local required = ingredient.amount * remaining - local consumed = stats.get_flow_count{ - name=pack_name, - input=false, - precision_index=defines.flow_precision_index.one_minute, - } - if consumed == 0 then - limit = -1 - break - end - local minutes = required / consumed - if not limit or limit < minutes then - limit = minutes + local time = Production.get_consumsion_eta(force, pack_name, defines.flow_precision_index.one_minute, required) + if not limit or limit < time then + limit = time end end @@ -301,9 +241,8 @@ local function update_eta(player,element) element.tooltip = null_time_long else - local ticks = limit*3600 - element.caption = {'science-info.eta-time',format_time(ticks,{hours=true,minutes=true,seconds=true,time=true})} - element.tooltip = format_time(ticks,{hours=true,minutes=true,seconds=true,long=true}) + element.caption = {'science-info.eta-time',format_time(limit,{hours=true,minutes=true,seconds=true,time=true})} + element.tooltip = format_time(limit,{hours=true,minutes=true,seconds=true,long=true}) end end @@ -316,7 +255,7 @@ Gui.new_left_frame('gui/science-info') :set_direction('vertical') :set_tooltip{'science-info.main-tooltip'} :on_creation(function(player,element) - local table, eta = generate_container(player,element) + local table, eta = generate_container(element) for _,science_pack in ipairs(config) do generate_science_pack(player,table,science_pack) diff --git a/old/locale/en/DeconControl.cfg b/old/locale/en/DeconControl.cfg deleted file mode 100644 index 556c1f3a..00000000 --- a/old/locale/en/DeconControl.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[DeconControl] -player-print=You do not have permission to do this right now. You require the Regular rank which can be obtained through 3 hours of in-game playtime on a server. -rank-print=__1__ tried to deconstruct something. diff --git a/old/locale/en/ExpGamingAdmin.AdminLib.cfg b/old/locale/en/ExpGamingAdmin.AdminLib.cfg deleted file mode 100644 index f240bac1..00000000 --- a/old/locale/en/ExpGamingAdmin.AdminLib.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[ExpGamingAdmin] -name=Admin Commands -tooltip=Admin commands make their home here -no-info-file=No info file was found -message=Please select a player and an action to take. Make sure to choose the correct one! -warning=Warning: This player outranks you. Therefore, you cannot edit their rank. -short-reason=Warning: The reason is too short. -rank-high=Warning: This player outranks you. Therefore, you cannot edit their rank. -invalid=The player or the action is invalid. Please try again! -take-action=Take Action -tooltip-ban=Ban Player -tooltip-kick=Kick Player -tooltip-jail=Jail Player -tooltip-go-to=Go To Player -tooltip-bring=Bring Player -temp-ban=__1__ was temporary banned by __2__ and will remain in jail until next reset -report=Report Player -cant-report-ban=Invalid player as player is banned; Either unban or use /clear-all -low-print=__1__ has been reported by a user for: __2__ -high-print=__1__ has been reported by __2__ for: __3__ -cant-report=This player can't be reported. \ No newline at end of file diff --git a/old/locale/en/ExpGamingAdmin.Warnings.cfg b/old/locale/en/ExpGamingAdmin.Warnings.cfg deleted file mode 100644 index 01715fc7..00000000 --- a/old/locale/en/ExpGamingAdmin.Warnings.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[ExpGamingAdmin-Warnings] -warning-given-by=This warning was given by: __1__ -player-warning=__1__ was given a warning by __2__ for: __3__ -remove-warn=One of your warnings expired. You have __1__ warnings left, next warning will be removed in __2__ -message=You are currently being warned by the system. These will continue until you cease and desist. -reported=You have been reported to the admins by the system. Further action may be taken if you do not cease and desist. -kick-warn=This is your last warning before you get kicked. The system will automatically kick you if you do not cease and desist. -temp-warn=This is your last warning before you get temporary banned. The system will automatically ban you if you do not cease and desist. -ban-warn=WARNING: This is your last warning before you get BANNED. The system will automatically BAN you if you do not cease and desist. -last-warn=WARNING: This is your last warning before you get PERMANENTLY BANNED. The system will automatically PERMANENTLY BAN you if you do not cease and desist. diff --git a/old/locale/en/ExpGamingAdmin.cfg b/old/locale/en/ExpGamingAdmin.cfg deleted file mode 100644 index f240bac1..00000000 --- a/old/locale/en/ExpGamingAdmin.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[ExpGamingAdmin] -name=Admin Commands -tooltip=Admin commands make their home here -no-info-file=No info file was found -message=Please select a player and an action to take. Make sure to choose the correct one! -warning=Warning: This player outranks you. Therefore, you cannot edit their rank. -short-reason=Warning: The reason is too short. -rank-high=Warning: This player outranks you. Therefore, you cannot edit their rank. -invalid=The player or the action is invalid. Please try again! -take-action=Take Action -tooltip-ban=Ban Player -tooltip-kick=Kick Player -tooltip-jail=Jail Player -tooltip-go-to=Go To Player -tooltip-bring=Bring Player -temp-ban=__1__ was temporary banned by __2__ and will remain in jail until next reset -report=Report Player -cant-report-ban=Invalid player as player is banned; Either unban or use /clear-all -low-print=__1__ has been reported by a user for: __2__ -high-print=__1__ has been reported by __2__ for: __3__ -cant-report=This player can't be reported. \ No newline at end of file diff --git a/old/locale/en/ExpGamingBot.autoChat.cfg b/old/locale/en/ExpGamingBot.autoChat.cfg deleted file mode 100644 index 4afb021d..00000000 --- a/old/locale/en/ExpGamingBot.autoChat.cfg +++ /dev/null @@ -1,48 +0,0 @@ -[ExpGamingBot-autoChat] -message=[Chat Bot]: __1__ -rank-error=You can't use global chat commands -players-online=There are __1__ players online -players=There have been __1__ players on this map -map-time=This map has been on for __1__ -line-8=Type /help for more info -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: https://www.explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (It can be found through the question mark on the top left) -not-real-dev=Cooldude2606 is a dev for this server and makes the softmod (look top left) and is not a factorio dev. -softmod=A softmod is a custom scenario that runs on this server, example is the player list. -redmew=We dont talk about redmew here; they beat us to 1000 members; F -blame=Blame __1__ for what just happend! -afk=Your afk? Look at __1__, that player has been afk for: __2__ -links=To see links open the readme and click links. -current-evolution=Current evolution factor is __1__ -magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆ -aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖ -riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server) -loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!! -lenny=( ͡° ͜ʖ ͡°) -make-tea-1= ☕ Boiling the water... ☕ -make-tea-2= ☕ __1__ your tea is done! ☕ -order-pizza-1= 🍕 Finding nearest pizza supplier... 🍕 -order-pizza-2= 🍕 Figuring out the favourite pizza of __1__ 🍕 -order-pizza-3= 🍕 __1__ your pizza is here! 🍕 -make-coffee-1= ☕ Boiling the water and grinding the coffee beans... ☕ -make-coffee-2= ☕ __1__ we ran out of coffe beans! Have some tea instead. ☕ -get-beer-1= 🍺 Pouring A Glass 🍺 -get-beer-2= 🍻 Chears Mate 🍻 -get-mead-1= Filling the drinking horn -get-mead-2= Skål! -get-snaps-1=Pouring the glasses and finding the correct song book... -get-snaps-2=Singing a song...🎤🎶 -get-snaps-3=skål, my friends! -get-cocktail-1= 🍸 Inintiating mind reading unit... 🍸 -get-cocktail-2= 🍸 Mixing favourite ingredients of __1__ 🍸 -get-cocktail-3=🍸 __1__ your cocktail is done.🍸 -lhd=All trains must be LHD! -food=Don't know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ -get-popcorn-1=Heating the oil and waiting for the popping sound... -get-popcorn-2=__1__ your popcorn is finished. Lean backwards and watch the drama unfold. -wiki=You can get more information about us and the custom scenario from our wiki: https://wiki.explosivegaming.nl/ -feedback=Do you have feedback? leave it at https://exp.fider.io/ -hodor=Hodor \ No newline at end of file diff --git a/old/locale/en/ExpGamingBot.autoMessage.cfg b/old/locale/en/ExpGamingBot.autoMessage.cfg deleted file mode 100644 index c67078a9..00000000 --- a/old/locale/en/ExpGamingBot.autoMessage.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingBot-autoMessage] -message=[Chat Bot]: __1__ -players-online=There are __1__ players online -map-time=This map has been on for __1__ -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: https://www.explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (It can be found through the question mark on the top left) \ No newline at end of file diff --git a/old/locale/en/ExpGamingCommands.home.cfg b/old/locale/en/ExpGamingCommands.home.cfg deleted file mode 100644 index e70a2161..00000000 --- a/old/locale/en/ExpGamingCommands.home.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingCommands-home] -too-many-homes=You have too many homes, to add more you must remove one. Your max is __1__. -homes=Your Homes: (__1__/__2__) -home=__1__) __2__: __3__ , __4__ -set=Your home "__1__" as been set to __2__ , __3__ -remove=Your home "__1__" as been removed -goto=You are now at "__1__" -return=You are now at your previous location: __1__ , __2__ -invalid=Invalid name, __1__ \ No newline at end of file diff --git a/old/locale/en/ExpGamingCore.Command.cfg b/old/locale/en/ExpGamingCore.Command.cfg deleted file mode 100644 index 66af8ae2..00000000 --- a/old/locale/en/ExpGamingCore.Command.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[expcore-commands] -unauthorized=Unauthorized, Access is denied due to invalid credentials -error-string-list=Invalid Option, Must be one of: __1__ -error-string-len=Invalid Length, Max: __1__ -error-number=Invalid Number -error-number-range=Invalid Range, Min (exclusive): __1__, Max (inclusive): __2__ -error-player=Invaild Player Name, __1__ ,try using tab key to auto-complete the name -error-player-online=Player is offline. -error-player-alive=Player is dead. -error-player-rank=Player is of Higher Rank. -invalid-inputs=Invalid Input, /__1__ __2__ -invalid-parse=Invalid Input, There was a problem prasing the paramaters -command-ran=Command Complete -command-fail=Command failed to run: __1__ \ No newline at end of file diff --git a/old/locale/en/ExpGamingCore.Gui.cfg b/old/locale/en/ExpGamingCore.Gui.cfg deleted file mode 100644 index f7eb1a6a..00000000 --- a/old/locale/en/ExpGamingCore.Gui.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingCore_Gui] -unauthorized=401 - Unauthorized: Access is denied due to invalid credentials -cant-open=You can't open this panel right now, reason: __1__ -cant-open-no-reason=You can't open this panel right now \ No newline at end of file diff --git a/old/locale/en/ExpGamingCore.Ranking.cfg b/old/locale/en/ExpGamingCore.Ranking.cfg deleted file mode 100644 index dc641783..00000000 --- a/old/locale/en/ExpGamingCore.Ranking.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ranking] -all-rank-print=[Everyone]: __1__ -rank-print=[__1__]: __2__ -rank-up=__1__ was promoted to __2__ by __3__ -rank-down=__1__ was demoted to __2__ by __3__ -rank-given=You have been given the __1__ Rank! -tag-reset=Your Tag was reset due to a Rank change \ No newline at end of file diff --git a/old/locale/en/ExpGamingCore.Role.cfg b/old/locale/en/ExpGamingCore.Role.cfg deleted file mode 100644 index 4cb41594..00000000 --- a/old/locale/en/ExpGamingCore.Role.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[ExpGamingCore-Role] -default-print=[Everyone]: __1__ -print=[__1__]: __2__ -assign=__1__ was assigned to __2__ by __3__ -unassign=__1__ was unassigned from __2__ by __3__ -tag-reset=Your Tag was reset due to a role change \ No newline at end of file diff --git a/old/locale/en/ExpGamingCore.Server.cfg b/old/locale/en/ExpGamingCore.Server.cfg deleted file mode 100644 index e70ede54..00000000 --- a/old/locale/en/ExpGamingCore.Server.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[ExpGamingCore_Server] -interface-description=Runs the given input from the script \ No newline at end of file diff --git a/old/locale/en/ExpGamingInfo.Readme.cfg b/old/locale/en/ExpGamingInfo.Readme.cfg deleted file mode 100644 index 086261eb..00000000 --- a/old/locale/en/ExpGamingInfo.Readme.cfg +++ /dev/null @@ -1,69 +0,0 @@ -[ExpGamingInfo-Readme] -tooltip=Open the ReadMe if this is your first time joining. -guildlines-name=Guidelines -guildlines-tooltip=These are the guidelines everyone should follow -guildlines-line1=Welcome to the Explosive Gaming Community! -guildlines-line2=Here are some guidelines that everyone is obligated to follow. -guildlines-line3=!!!No rights can be derived from these guidelines as the full list of rules (another tab in this window) is valid / operative!!! -guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. -guildlines-line5=- Be polite and use common sense. -guildlines-line6=- Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed. -guildlines-line7=- Do not remove stuff without asking your fellow players. -guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). No train loops! -guildlines-line9= -guildlines-line10=If you have any questions about our rules, the server or Factorio in general, feel free to ask your fellow players or our helpful team. Have fun! -chat-name=How To Chat -chat-tooltip=How to chat in Factorio with default key config -chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”) - If you would like to change the key, go to your Controls tab in options. The key you need to change is “Toggle LUA console” -commands-name=Commands -commands-tooltip=Commands that you can use in ExplosiveGaming -commands-singleline=Custom commands that you can use. Base commands are not shown here. -commands-col1=Command Name -commands-col2=Command Help -links-name=Links -links-tooltip=Helpful links for ways to get in touch with us -links-cap1=Discord voice and chat server: -links-cap2=Our website: -links-cap3=Steam: -links-cap4=Patreon: -links-cap5=Our wiki: -servers-name=Servers -servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. -servers-format=S__1__: __2__ -servers-cap1=Public -servers-des1=A place for all players, this map resets every 144H At 16:00 UTC. -servers-cap2=Public -servers-des2=A place for all players, this map resets every 144H At 16:00 UTC. -servers-cap3=Public -servers-des3=A place for all players, this map resets every 144H At 16:00 UTC. -servers-cap4=Modded -servers-des4=A Modded server for all players. Link on Discord for members. -servers-cap5=Events -servers-des5=Server for events (everyone can join) - May require a password. Join Discord for more info -servers-cap6=Donator -servers-des6=For players who support us financially. Changes can be made per request. -rules-name=Rules -rules-tooltip=The full list of ExplosiveGaming rules. -rules-singleline=Although the guidelines cover most of our rules, the full list always have more priority and override any guideline. It is advised to be familiar with all rules to prevent warnings or bans. -rules-format=__1__) __2__ -rules-rule1=Hacking / cheating / abusing bugs will not be tolerated. -rules-rule2=Any bugs or exploits found should be reported to our team members. (excluding creative items) -rules-rule3=Do not disrespect any player in the server. -rules-rule4=Taking all items from a belt or logistics request is forbidden: sharing resources is mandatory. -rules-rule5=Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed. -rules-rule6=Do not lay down/remove concrete or stone with bots without permission. -rules-rule7=Do not use active provider chests without permission. -rules-rule8=Do not use speakers on global or with alerts without permission. -rules-rule9=Do not remove/move major parts of the factory without permission. -rules-rule10=Do not walk in random directions for no reason (to save map size and server resources). -rules-rule11=Do not remove stuff without asking your fellow players. -rules-rule12=Do not rotate belts, deactivate belts with wires, or cause production to stop. -rules-rule13=Do not make train roundabouts. Or any loops of any kind. -rules-rule14=When using trains, use the same size other players have used. -rules-rule15=Trains are Left Hand Drive (LHD) only. -rules-rule16=Do not complain about lag, low fps and low ups etc. -rules-rule17=Do not ask for ranks. Our ranks are synchronized with Discord, make sure to join us there. -rules-rule18=Do not advertise other servers unless you are a trusted server owner. -rules-rule19=Report players who break the rules. -rules-rule20=Use common sense and what an Admin says goes. diff --git a/old/locale/en/ExpGamingInfo.Rockets.cfg b/old/locale/en/ExpGamingInfo.Rockets.cfg deleted file mode 100644 index 263d9b2c..00000000 --- a/old/locale/en/ExpGamingInfo.Rockets.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[ExpGamingInfo-Rockets] -name=Rocket Info -tooltip=List of details about the rockets sent. -none=No rockets have been sent yet. -nan=Not available -sent=Rockets Sent: __1__ -first=First Lanuched At: __1__ -last=Last Launch Took: __1__ -time=Average Launch Time: __1__ -fastest=Fastest Launch: __1__ -milestones=Milestones: -format=__1__: __2__ \ No newline at end of file diff --git a/old/locale/en/ExpGamingInfo.Science.cfg b/old/locale/en/ExpGamingInfo.Science.cfg deleted file mode 100644 index a9bc1526..00000000 --- a/old/locale/en/ExpGamingInfo.Science.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[ExpGamingInfo-Science] -name=Science Info -tooltip=List of details about science packs. -total=Packs Made: -time=Packs Per Minute: -format=__1__: __2__ -science-pack-1=Red -science-pack-2=Green -science-pack-3=Blue -military-science-pack=Military -production-science-pack=Production -high-tech-science-pack=High Tech -space-science-pack=Space -none=No science packs have been made yet. \ No newline at end of file diff --git a/old/locale/en/ExpGamingInfo.Tasklist.cfg b/old/locale/en/ExpGamingInfo.Tasklist.cfg deleted file mode 100644 index 7e698acf..00000000 --- a/old/locale/en/ExpGamingInfo.Tasklist.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingInfo-Tasklist] -name=Task List -tooltip=Jobs that needs to be completed all around the factory. -none=There are currently no tasks. Ask a Member in-game or through Discord to add tasks. \ No newline at end of file diff --git a/old/locale/en/ExpGamingPlayer.inventorySearch.cfg b/old/locale/en/ExpGamingPlayer.inventorySearch.cfg deleted file mode 100644 index 0c45c5b1..00000000 --- a/old/locale/en/ExpGamingPlayer.inventorySearch.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingPlayer-inventorySearch] -low=Your inventory was searched and __1__ was removed. -med=Your inventory was searched and __1__ was removed, you have been given a warning as a result. -high=Your inventory was searched and __1__ was removed: this is NOT allowed. You have been temp-banned as a result. \ No newline at end of file diff --git a/old/locale/en/ExpGamingPlayer.playerInfo.cfg b/old/locale/en/ExpGamingPlayer.playerInfo.cfg deleted file mode 100644 index 4bbc1f12..00000000 --- a/old/locale/en/ExpGamingPlayer.playerInfo.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingPlayer-playerInfo] -yes=Yes -no=No -name=[__1__] __2__ -online=Is Online: __1__ (__2__) -admin=Has Admin: __1__ -group=In User Group: __1__ -role=Highest Role: __1__ -roles=Other Roles: __1__ \ No newline at end of file diff --git a/old/locale/en/ExpGamingPlayer.playerList.cfg b/old/locale/en/ExpGamingPlayer.playerList.cfg deleted file mode 100644 index d2c2e345..00000000 --- a/old/locale/en/ExpGamingPlayer.playerList.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[ExpGamingPlayer-playerList] -tooltip=Toggle player list, right click player for more info -format-nil=__1__ - __2__ -format=__1__ - __2__ - __3__ -no-info-file=No info file was found \ No newline at end of file diff --git a/old/locale/en/ExpGamingPlayer.polls.cfg b/old/locale/en/ExpGamingPlayer.polls.cfg deleted file mode 100644 index afd15bf3..00000000 --- a/old/locale/en/ExpGamingPlayer.polls.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ExpGamingPlayer-polls] -name=Polls -tooltip=View Old Polls -no-poll=No Old Polls -end=Poll Just Ended: __1__ -winner=__1__ had the most votes. -time-left=You will have __1__s to pick. \ No newline at end of file diff --git a/old/locale/en/GameSettingsGui.cfg b/old/locale/en/GameSettingsGui.cfg deleted file mode 100644 index 54825990..00000000 --- a/old/locale/en/GameSettingsGui.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[GameSettingsGui] -name=Game Settings -tooltip=Edits Game Settings. Please use responsibly. -basic-name=Basic Settings -basic-tooltip=These settings are safe to edit and have no big impact. -basic-message=Basic Settings can be used to improve game play for players. -advanced-name=Advanced Settings -advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch the Advanced Settings unless you are 100% sure what you are doing: changes made to these settings might have a bigger impact than you realise. -personal-name=Personal Settings -personal-tooltip=Personal Settings only affect you. -personal-message=Personal Settings only affect your character. If you are spotted as a result of these settings, you are on your own! -sure=Are you sure? -effect-mining-speed=Mining Speed -effect-craft-speed=Crafting Speed -effect-running-speed=Running Speed -effect-build-distance=Build Distance -effect-reach-distance=Reach Distance -effect-bot-speed=Bot Speed -effect-lab-speed=Lab Speed -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory Size -effect-mining-prod=Mining Productivity -effect-game-speed=Game Speed -effect-save=Save Game -effect-reload-effects=Reload Effects -effect-reload-map=Reload Minimap -effect-kill-biters=Kill Biters -effect-crc=Force CRC Check -effect-reset-force=Reset Force -effect-clear-pollution=Clear Pollution \ No newline at end of file diff --git a/old/locale/en/GuiAnnouncements.cfg b/old/locale/en/GuiAnnouncements.cfg deleted file mode 100644 index be1e94da..00000000 --- a/old/locale/en/GuiAnnouncements.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[GuiAnnouncements] -name=Announcements -tooltip=Sends an announcement to all players -sent-to=This announcement is sent to __1__ -sent-by=This announcement was sent by __1__ ( __2__ ) -select-rank=This announcement will be sent to: \ No newline at end of file diff --git a/old/locale/en/WarpPoints.cfg b/old/locale/en/WarpPoints.cfg deleted file mode 100644 index 0f517e6e..00000000 --- a/old/locale/en/WarpPoints.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[WarpPoints] -name=Warp List -tooltip=A list of warp points. -remove-tooltip=Remove Warp point -go-to-tooltip=Go To -cooldown=You must wait for the cooldown. Time left: __1__ -cooldown-zero=Your cooldown has expired, You can use warp points again. -name-used=That name is already taken. -too-close=You are too close to an existing warp point to make a new one. -not-on-warp=You are not on a warp point right now, you must be on a warp point to go to one. \ No newline at end of file diff --git a/old/locale/fr/DeconControl.cfg b/old/locale/fr/DeconControl.cfg deleted file mode 100644 index 8eca4e13..00000000 --- a/old/locale/fr/DeconControl.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[DeconControl] -player-print=You are not allowed to do this yet, You require the Regular rank, you must play for at least 3 hours -rank-print=__1__ tried to deconstruct something. \ No newline at end of file diff --git a/old/locale/fr/ExpGamingAdmin.AdminLib.cfg b/old/locale/fr/ExpGamingAdmin.AdminLib.cfg deleted file mode 100644 index f882fc1c..00000000 --- a/old/locale/fr/ExpGamingAdmin.AdminLib.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[ExpGamingAdmin] -name=Commandes Admin -tooltip=Des commandes très puissantes résident ici. -no-info-file=Aucun fichier info trouvé -message=Veuillez sélectionner un joueur et une action, faites en sorte que ce soit la bonne ! -warning=Attention, ce joueur est de rang supérieur au vôtre, vous ne pouvez le modifier. -short-reason=Attention, la raison indiquée est trop courte. Soyez concis mais aussi précis. (Warning: The reason is too short. UPDATE) -rank-high=Ce joueur est de rang supérieur, veuillez utiliser une commande dont vous maîtriser l'utilisation ! -invalid=Le Joueur ou l'action est invalide, ré-essayez ! -take-action=Agir -tooltip-ban=Bannir un Joueur -tooltip-kick=Exclure un Joueur -tooltip-jail=Emprisonner un Joueur -tooltip-go-to=Aller à la position d'un Joueur -tooltip-bring=Amener le Joueur à soi diff --git a/old/locale/fr/ExpGamingAdmin.Warnings.cfg b/old/locale/fr/ExpGamingAdmin.Warnings.cfg deleted file mode 100644 index c48f518a..00000000 --- a/old/locale/fr/ExpGamingAdmin.Warnings.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[ExpGamingAdmin-Warnings] -warning-given-by=This Warnings Was Given By: __1__ -player-warning=__1__ was given a warning by __2__ reason: __3__ -temp-ban=__1__ was temp-ban by __2__ and will remain in jail untill next reset -remove-warn=You are had a warning Removed, you have __1__ warnings, next removed in __2__ -message=You Are Currently Reciving Warnings From The Script, This Will Continue Unless You Cease And Desist -reported=You Have Been Reported To The Admins By The Script, Further Acction May Be Taken If You Do Not Cease And Desist. -kick-warn=You Are On A Warning To Be KICKED, The Script Will Auto Kick If You Do Not Cease And Desist. -temp-warn=You Are On A Warning To Be TEMP BANNED, The Script Will Auto Ban If You Do Not Cease And Desist. -ban-warn=You Are On A Warning To Be BANNED, The Script Will Auto Ban If You Do Not Cease And Desist. -last-warn=YOU ARE ON A LAST WARNING TO BE BANNED, THE SCRIPT WILL AUTO BAN IF YOU DO NOT CEASE AND DESIST. \ No newline at end of file diff --git a/old/locale/fr/ExpGamingAdmin.cfg b/old/locale/fr/ExpGamingAdmin.cfg deleted file mode 100644 index f882fc1c..00000000 --- a/old/locale/fr/ExpGamingAdmin.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[ExpGamingAdmin] -name=Commandes Admin -tooltip=Des commandes très puissantes résident ici. -no-info-file=Aucun fichier info trouvé -message=Veuillez sélectionner un joueur et une action, faites en sorte que ce soit la bonne ! -warning=Attention, ce joueur est de rang supérieur au vôtre, vous ne pouvez le modifier. -short-reason=Attention, la raison indiquée est trop courte. Soyez concis mais aussi précis. (Warning: The reason is too short. UPDATE) -rank-high=Ce joueur est de rang supérieur, veuillez utiliser une commande dont vous maîtriser l'utilisation ! -invalid=Le Joueur ou l'action est invalide, ré-essayez ! -take-action=Agir -tooltip-ban=Bannir un Joueur -tooltip-kick=Exclure un Joueur -tooltip-jail=Emprisonner un Joueur -tooltip-go-to=Aller à la position d'un Joueur -tooltip-bring=Amener le Joueur à soi diff --git a/old/locale/fr/ExpGamingBot.autoChat.cfg b/old/locale/fr/ExpGamingBot.autoChat.cfg deleted file mode 100644 index 32fea59f..00000000 --- a/old/locale/fr/ExpGamingBot.autoChat.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[ExpGamingBot-autoChat] -message=[Chat Bot]: __1__ -rank-error=You cant use global chat commands -players-online=There are __1__ players online -players=There have been __1__ players on this map -map-time=This map has been on for __1__ -line-8=Type /help for more info -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (can be found through the question mark on the top left) -not-real-dev=Cooldude2606 is a dev for this server and makes the softmod (look top left) and is not a factorio dev. -softmod=A softmod is a custom scenario that runs on this server, example is the player list. -blame=Blame __1__ for what just happend! -afk=Your afk? Look at __1__ they have been afk for: __2__ -links=To see links open the readme and click links. -magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆ -aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖ -riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server) \ No newline at end of file diff --git a/old/locale/fr/ExpGamingBot.autoMessage.cfg b/old/locale/fr/ExpGamingBot.autoMessage.cfg deleted file mode 100644 index 49d19ede..00000000 --- a/old/locale/fr/ExpGamingBot.autoMessage.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingBot-autoMessage] -message=[Chat Bot]: __1__ -players-online=There are __1__ players online -map-time=This map has been on for __1__ -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (can be found through the question mark on the top left) \ No newline at end of file diff --git a/old/locale/fr/ExpGamingCore.Command.cfg b/old/locale/fr/ExpGamingCore.Command.cfg deleted file mode 100644 index 2fbd4aee..00000000 --- a/old/locale/fr/ExpGamingCore.Command.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[expcore-commands] -unauthorized=401 - Unauthorized: Access is denied due to invalid credentials -invalid-inputs=Invalid Input, /__1__ __2__ -invalid-range=Invalid Range, Min: __1__, Max: __2__ -invalid-length=Invalid Length, Max: __1__ -invalid-player=Invaild Player Name, __1__ ,try using tab key to auto-complete the name -offline-player=Player is offline, Command Failed To Run -dead-player=Player is dead, Command Failed To Run -command-ran=Command Complete \ No newline at end of file diff --git a/old/locale/fr/ExpGamingCore.Commands.cfg b/old/locale/fr/ExpGamingCore.Commands.cfg deleted file mode 100644 index 2fbd4aee..00000000 --- a/old/locale/fr/ExpGamingCore.Commands.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[expcore-commands] -unauthorized=401 - Unauthorized: Access is denied due to invalid credentials -invalid-inputs=Invalid Input, /__1__ __2__ -invalid-range=Invalid Range, Min: __1__, Max: __2__ -invalid-length=Invalid Length, Max: __1__ -invalid-player=Invaild Player Name, __1__ ,try using tab key to auto-complete the name -offline-player=Player is offline, Command Failed To Run -dead-player=Player is dead, Command Failed To Run -command-ran=Command Complete \ No newline at end of file diff --git a/old/locale/fr/ExpGamingCore.Gui.cfg b/old/locale/fr/ExpGamingCore.Gui.cfg deleted file mode 100644 index a8976a4e..00000000 --- a/old/locale/fr/ExpGamingCore.Gui.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingCore_Gui] -unauthorized=401 - Unauthorized: Access is denied due to invalid credentials -cant-open=You can not open this panel right now, reason: __1__ -cant-open-no-reason=You can not open this panel right now \ No newline at end of file diff --git a/old/locale/fr/ExpGamingCore.Ranking.cfg b/old/locale/fr/ExpGamingCore.Ranking.cfg deleted file mode 100644 index dc641783..00000000 --- a/old/locale/fr/ExpGamingCore.Ranking.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ranking] -all-rank-print=[Everyone]: __1__ -rank-print=[__1__]: __2__ -rank-up=__1__ was promoted to __2__ by __3__ -rank-down=__1__ was demoted to __2__ by __3__ -rank-given=You have been given the __1__ Rank! -tag-reset=Your Tag was reset due to a Rank change \ No newline at end of file diff --git a/old/locale/fr/ExpGamingInfo.Readme.cfg b/old/locale/fr/ExpGamingInfo.Readme.cfg deleted file mode 100644 index 45c6f9d0..00000000 --- a/old/locale/fr/ExpGamingInfo.Readme.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[ExpGamingInfo-Readme] -tooltip=Open the readme gui that opens when you first join. -guildlines-name=Guild Lines -guildlines-tooltip=These are the guildlines you should follow -guildlines-line1=Welcome to the Explosive Gaming Community! -guildlines-line2= -guildlines-line3=Here are some guidelines to keep this Server fun for everyone: -guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. -guildlines-line5=- Be polite and use common sense. -guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. -guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. -guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) -guildlines-line9= -guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! -chat-name=How To Chat -chat-tooltip=How to chat in factorio with default key config -chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. -commands-name=Commands -commands-tooltip=These are the commands you can use -commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown -commands-col1=Command Name -commands-col2=Command Help -links-name=Links -links-tooltip=Helpful links for ways to get in touch -links-cap1=Discord voice and chat server: -links-cap2=Our website: -links-cap3=Steam: -links-cap4=Patreon: -servers-name=Servers -servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! -servers-format=S__1__: __2__ -servers-cap1=Public -servers-des1=A place for all players, this map reset every 24h. -servers-cap2=Standard -servers-des2=Before you play make sure you understand the game, reset every 48h. -servers-cap3=Pro -servers-des3=A pure mega base server, reset every 7 days and a password is needed to join. -servers-cap4=Modded -servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. -servers-cap5=Events -servers-des5=Sometimes we hold events, may require a password, join discord for more info. -servers-cap6=Donator -servers-des6=For those people who have two much money and give us some. Anything goes per request. -rules-name=All Rules -rules-tooltip=A full list of rules for the server -rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. -rules-format=__1__) __2__ -rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. -rules-rule2=Any bugs or exploits found should be reported. (no creative items) -rules-rule3=Do not disrespect any player in the server. -rules-rule4=Do not take every item frmo a belt or via logics request, share resources. -rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. -rules-rule6=Do not laydown or remove concrete or stone with bots without permission. -rules-rule7=Do not use active provider chests without permission. -rules-rule8=Do not use speakers on global or with alearts without permission. -rules-rule9=Do not remove/move major parts of the factory without permission. -rules-rule10=Do not walk in player random direction for no reason(to save map size). -rules-rule11=Do not remove stuff just because you dont like it, tell people first. -rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. -rules-rule13=Do not make train roundabouts. Or any loops of any kind. -rules-rule14=When using trains use the same size that others have used. -rules-rule15=Trains are Left Hand Drive (LHD) only. -rules-rule16=Do not complain about lag, low fps and low ups or other things like that. -rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. -rules-rule18=Do not advertise other servers unless you are a trusted server owner. -rules-rule19=Report any one who breaks the rules. -rules-rule20=Use common sense and what an admin says goes. \ No newline at end of file diff --git a/old/locale/fr/ExpGamingInfo.Rockets.cfg b/old/locale/fr/ExpGamingInfo.Rockets.cfg deleted file mode 100644 index 344c368d..00000000 --- a/old/locale/fr/ExpGamingInfo.Rockets.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[ExpGamingInfo-Rockets] -name=Rocket Info -tooltip=List of details about the rockets sent. -none=No rockets have been sent yet. -nan=NaN -sent=Rockets Sent: __1__ -first=First Lanuched At: __1__ -last=Last Launch Took: __1__ -time=Average Launch Time: __1__ -fastest=Fastest Launch: __1__ -milestones=Milestones: -format=__1__: __2__ \ No newline at end of file diff --git a/old/locale/fr/ExpGamingInfo.Science.cfg b/old/locale/fr/ExpGamingInfo.Science.cfg deleted file mode 100644 index a9bc1526..00000000 --- a/old/locale/fr/ExpGamingInfo.Science.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[ExpGamingInfo-Science] -name=Science Info -tooltip=List of details about science packs. -total=Packs Made: -time=Packs Per Minute: -format=__1__: __2__ -science-pack-1=Red -science-pack-2=Green -science-pack-3=Blue -military-science-pack=Military -production-science-pack=Production -high-tech-science-pack=High Tech -space-science-pack=Space -none=No science packs have been made yet. \ No newline at end of file diff --git a/old/locale/fr/ExpGamingInfo.Tasklist.cfg b/old/locale/fr/ExpGamingInfo.Tasklist.cfg deleted file mode 100644 index e739ac38..00000000 --- a/old/locale/fr/ExpGamingInfo.Tasklist.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingInfo-Tasklist] -name=Task List -tooltip=What jobs need to be done round the factory. -none=There are no tasks to do right now, ask a member to add some. \ No newline at end of file diff --git a/old/locale/fr/ExpGamingPlayer.inventorySearch.cfg b/old/locale/fr/ExpGamingPlayer.inventorySearch.cfg deleted file mode 100644 index 4d3eb1e4..00000000 --- a/old/locale/fr/ExpGamingPlayer.inventorySearch.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingPlayer-inventorySearch] -low=Your Inventory Was Search And __1__ was removed. -med=Your Inventory Was Search And __1__ was removed, you have been given a warning. -high=Your Inventory Was Search And __1__ was found, this is not allowed AT ALL, your inventory has been moved to spawn. \ No newline at end of file diff --git a/old/locale/fr/ExpGamingPlayer.playerInfo.cfg b/old/locale/fr/ExpGamingPlayer.playerInfo.cfg deleted file mode 100644 index 257168f7..00000000 --- a/old/locale/fr/ExpGamingPlayer.playerInfo.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[ExpGamingPlayer-playerInfo] -yes=Yes -no=No -name=[__1__] __2__ -online=Is Online: __1__ (__2__) -admin=Has Admin: __1__ -group=In User Group: __1__ -role=Has Rank: __1__ \ No newline at end of file diff --git a/old/locale/fr/ExpGamingPlayer.playerList.cfg b/old/locale/fr/ExpGamingPlayer.playerList.cfg deleted file mode 100644 index 83d2dd03..00000000 --- a/old/locale/fr/ExpGamingPlayer.playerList.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[ExpGamingPlayer-playerList] -tooltip=Toogle player list, right click player for info -format-nil=__1__ - __2__ -format=__1__ - __2__ - __3__ -no-info-file=No info file was found \ No newline at end of file diff --git a/old/locale/fr/ExpGamingPlayer.polls.cfg b/old/locale/fr/ExpGamingPlayer.polls.cfg deleted file mode 100644 index afd15bf3..00000000 --- a/old/locale/fr/ExpGamingPlayer.polls.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ExpGamingPlayer-polls] -name=Polls -tooltip=View Old Polls -no-poll=No Old Polls -end=Poll Just Ended: __1__ -winner=__1__ had the most votes. -time-left=You will have __1__s to pick. \ No newline at end of file diff --git a/old/locale/fr/GameSettingsGui.cfg b/old/locale/fr/GameSettingsGui.cfg deleted file mode 100644 index f13485d0..00000000 --- a/old/locale/fr/GameSettingsGui.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[GameSettingsGui] -name=Game Settings -tooltip=Allows for editing of the game settings, please use resposibliy. -basic-name=Basic Settings -basic-tooltip=These settings are safe to change with no large effects. -basic-message=These settings are force wide settings which can be used to inprove gameplay and make it more enjoyible for players. -advanced-name=Advanced Settings -advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch these settings at all unless you know 100% what they do and the effect of using them, leave game.speed alone it has a bigger effect then you think. -personal-name=Personal Settings -personal-tooltip=These will only effect you, if you are spoted you are on your own. -personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. -sure=Are You Sure! -effect-mining-speed=Mining Speed -effect-craft-speed=Crafting Speed -effect-running-speed=Running Speed -effect-build-distance=Build Distance -effect-reach-distance=Reach Distance -effect-bot-speed=Bot Speed -effect-lab-speed=Lab Speed -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory Size -effect-mining-prod=Mining Productivity -effect-game-speed=Game Speed -effect-save=Save Game -effect-reload-effects=Reload Effects -effect-reload-map=Reload Minimap -effect-kill-biters=Kill Biters -effect-crc=Force CRC Check -effect-reset-force=Reset Force \ No newline at end of file diff --git a/old/locale/fr/GuiAnnouncements.cfg b/old/locale/fr/GuiAnnouncements.cfg deleted file mode 100644 index 11041b57..00000000 --- a/old/locale/fr/GuiAnnouncements.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[GuiAnnouncements] -name=Announcement -tooltip=Sent an announcement to players -sent-to=This is sent to __1__ -sent-by=This was sent by __1__ of rank __2__ -select-rank=This message will be sent to: \ No newline at end of file diff --git a/old/locale/fr/WarpPoints.cfg b/old/locale/fr/WarpPoints.cfg deleted file mode 100644 index b15a3345..00000000 --- a/old/locale/fr/WarpPoints.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[WarpPoints] -name=Warp List -tooltip=A list of warp points. -remove-tooltip=Remove Warp Point -go-to-tooltip=Go To -cooldown=You Must Wait For The Cooldown, Time Left: __1__ -cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. -name-used=That Name Is Already Taken -not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file diff --git a/old/locale/nl/DeconControl.cfg b/old/locale/nl/DeconControl.cfg deleted file mode 100644 index bc857511..00000000 --- a/old/locale/nl/DeconControl.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[DeconControl] -player-print=Je moet minstens 3 uur gespeeld hebben om dit uit te voeren. -rank-print=__1__ heeft geprobeerd iets te deconstrueren. diff --git a/old/locale/nl/ExpGamingAdmin.AdminLib.cfg b/old/locale/nl/ExpGamingAdmin.AdminLib.cfg deleted file mode 100644 index ff47947a..00000000 --- a/old/locale/nl/ExpGamingAdmin.AdminLib.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[ExpGamingAdmin] -name=Admin Commands -tooltip=Admin Commands kan je hier vinden. -no-info-file=Infobestand niet gevonden. -message=Selecteer een speler en de bijbehorende actie. Wees er zeker van dat je de correcte actie kiest. -warning=Fout: Je kan de rank van deze speler niet aanpassen omdat het jouw rank overtreft. -short-reason=Fout: De reden is te kort. (Warning: The reason is too short. UPDATE) -rank-high=Fout: Deze speler overtreft jouw rank. -invalid=Fout: De speler kan niet gevonden worden en/of de actie is onjuist. Probeer opnieuw! -take-action=Actie ondernemen -tooltip-ban=Ban speler -tooltip-kick=Kick speler -tooltip-jail=Jail speler -tooltip-go-to=Ga naar speler -tooltip-bring=Breng speler diff --git a/old/locale/nl/ExpGamingAdmin.Warnings.cfg b/old/locale/nl/ExpGamingAdmin.Warnings.cfg deleted file mode 100644 index 104ef981..00000000 --- a/old/locale/nl/ExpGamingAdmin.Warnings.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[ExpGamingAdmin-Warnings] -warning-given-by=Deze waarschuwing is gegeven door: __1__ -player-warning=__1__ is gewaarschuwd door __2__ met de reden: __3__ -temp-ban=__1__ is verbannen door __2__ en is gejailed tot de volgende reset. -remove-warn=Een waarschuwing is verlopen. Je hebt nu nog maar __1__ waarschuwing, volgende waarschuwing verloopt in __2__ -message=Je ontvangt waarschuwingen door het systeem. Deze waarschuwingen stoppen niet tot je stopt met wat je verkeerd doet. -reported=Je bent gerapporteerd aan de administrators door het systeem. Je zal bestraft worden als je niet stopt met wat je verkeerd doet. -kick-warn=WAARSCHUWING: Dit is je laatste waarschuwing voordat je gekickt wordt. -temp-warn=WAARSCHUWING: Dit is je laatste waarschuwing voordat je tijdelijk verbannen wordt. -ban-warn=WAARSCHUWING: Dit is je laatste waarschuwing voordat je permanent verbannen wordt. -last-warn=DIT IS JE LAATSTE WAARSCHUWING. Het systeem zal je automatisch VERBANNEN als je niet stopt met wat je verkeerd doet. diff --git a/old/locale/nl/ExpGamingAdmin.cfg b/old/locale/nl/ExpGamingAdmin.cfg deleted file mode 100644 index ff47947a..00000000 --- a/old/locale/nl/ExpGamingAdmin.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[ExpGamingAdmin] -name=Admin Commands -tooltip=Admin Commands kan je hier vinden. -no-info-file=Infobestand niet gevonden. -message=Selecteer een speler en de bijbehorende actie. Wees er zeker van dat je de correcte actie kiest. -warning=Fout: Je kan de rank van deze speler niet aanpassen omdat het jouw rank overtreft. -short-reason=Fout: De reden is te kort. (Warning: The reason is too short. UPDATE) -rank-high=Fout: Deze speler overtreft jouw rank. -invalid=Fout: De speler kan niet gevonden worden en/of de actie is onjuist. Probeer opnieuw! -take-action=Actie ondernemen -tooltip-ban=Ban speler -tooltip-kick=Kick speler -tooltip-jail=Jail speler -tooltip-go-to=Ga naar speler -tooltip-bring=Breng speler diff --git a/old/locale/nl/ExpGamingBot.autoChat.cfg b/old/locale/nl/ExpGamingBot.autoChat.cfg deleted file mode 100644 index 32fea59f..00000000 --- a/old/locale/nl/ExpGamingBot.autoChat.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[ExpGamingBot-autoChat] -message=[Chat Bot]: __1__ -rank-error=You cant use global chat commands -players-online=There are __1__ players online -players=There have been __1__ players on this map -map-time=This map has been on for __1__ -line-8=Type /help for more info -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (can be found through the question mark on the top left) -not-real-dev=Cooldude2606 is a dev for this server and makes the softmod (look top left) and is not a factorio dev. -softmod=A softmod is a custom scenario that runs on this server, example is the player list. -blame=Blame __1__ for what just happend! -afk=Your afk? Look at __1__ they have been afk for: __2__ -links=To see links open the readme and click links. -magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆ -aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖ -riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server) \ No newline at end of file diff --git a/old/locale/nl/ExpGamingBot.autoMessage.cfg b/old/locale/nl/ExpGamingBot.autoMessage.cfg deleted file mode 100644 index 49d19ede..00000000 --- a/old/locale/nl/ExpGamingBot.autoMessage.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingBot-autoMessage] -message=[Chat Bot]: __1__ -players-online=There are __1__ players online -map-time=This map has been on for __1__ -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (can be found through the question mark on the top left) \ No newline at end of file diff --git a/old/locale/nl/ExpGamingCore.Command.cfg b/old/locale/nl/ExpGamingCore.Command.cfg deleted file mode 100644 index 77ad98b9..00000000 --- a/old/locale/nl/ExpGamingCore.Command.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[expcore-commands] -unauthorized=401 - Onbevoegd: toegang wordt geweigerd vanwege ongeldige inloggegevens -invalid-inputs=Onjuiste invoer, /__1__ __2__ -invalid-range=Onjuiste radius, Min: __1__, Max: __2__ -invalid-length=Onjuiste lengte, Max: __1__ -invalid-player=Onjuiste naam, __1__ , probeer tab te gebruiken om de naam automatisch in te vullen -offline-player=Speler is offline. -dead-player=Speler is dood. -command-ran=Commando uitgevoerd. diff --git a/old/locale/nl/ExpGamingCore.Commands.cfg b/old/locale/nl/ExpGamingCore.Commands.cfg deleted file mode 100644 index 77ad98b9..00000000 --- a/old/locale/nl/ExpGamingCore.Commands.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[expcore-commands] -unauthorized=401 - Onbevoegd: toegang wordt geweigerd vanwege ongeldige inloggegevens -invalid-inputs=Onjuiste invoer, /__1__ __2__ -invalid-range=Onjuiste radius, Min: __1__, Max: __2__ -invalid-length=Onjuiste lengte, Max: __1__ -invalid-player=Onjuiste naam, __1__ , probeer tab te gebruiken om de naam automatisch in te vullen -offline-player=Speler is offline. -dead-player=Speler is dood. -command-ran=Commando uitgevoerd. diff --git a/old/locale/nl/ExpGamingCore.Gui.cfg b/old/locale/nl/ExpGamingCore.Gui.cfg deleted file mode 100644 index d53dc64c..00000000 --- a/old/locale/nl/ExpGamingCore.Gui.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingCore_Gui] -unauthorized=401 - Onbevoegd: toegang wordt geweigerd vanwege ongeldige inloggegevens -cant-open=Je kan dit momenteel niet openen. Reden: __1__ -cant-open-no-reason=Je kan dit momenteel niet openen. \ No newline at end of file diff --git a/old/locale/nl/ExpGamingCore.Ranking.cfg b/old/locale/nl/ExpGamingCore.Ranking.cfg deleted file mode 100644 index 16e5c4f1..00000000 --- a/old/locale/nl/ExpGamingCore.Ranking.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ranking] -all-rank-print=[Everyone]: __1__ -rank-print=[__1__]: __2__ -rank-up=__1__ is gepromoot naar __2__ door __3__ -rank-down=__1__ is gedegradeerd naar __2__ door __3__ -rank-given=Je rank is veranderd naar __1__ -tag-reset=Je tag is gereset door een wijziging in je rank. \ No newline at end of file diff --git a/old/locale/nl/ExpGamingInfo.Readme.cfg b/old/locale/nl/ExpGamingInfo.Readme.cfg deleted file mode 100644 index cc54dbd3..00000000 --- a/old/locale/nl/ExpGamingInfo.Readme.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[ExpGamingInfo-Readme] -tooltip=Open de ReadMe wanneer je voor het eerst speelt. -guildlines-name=Richtlijnen -guildlines-tooltip=Dit zijn de richtlijnen die je moet volgen. -guildlines-line1=Welkom op de ExplosiveGaming community! -guildlines-line2= -guildlines-line3=Hier zijn een aantal richtlijnen die ieder speler moet volgen. -guildlines-line4=- Hacken / cheaten en bugs misbruiken is niet toegestaan. -guildlines-line5=- Wees aardig en gebruik je gezonde verstand. -guildlines-line6=- Spammen (in de zin van chat, kisten en beton) is niet toegestaan. -guildlines-line7=- Geen spullen verwijderen zonder toestemming van andere spelers. -guildlines-line8=- Treinen (LHD - Left Hand Drive) geen loops. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) -guildlines-line9= -guildlines-line10=Als je vragen hebt over deze regels of over de server in algemeen, aarzel dan niet om contact op te nemen met onze staff. -chat-name=Chatten -chat-tooltip=Chatten in Factorio met standaard instellingen -chat-singleline=Chatten kan moeilijk zijn voor nieuwe spelers omdat de chatmechanisme in Factorio anders is dan andere spellen. Het is simpel: druk op de "GRAVE/TILDE" knop (locatie is onder de ESC knop). Als je deze knop wilt aanpassen, ga naar de Controls tab in Opties. De knop die je moet aanpassen is "Toggle LUA Console" -commands-name=Commands -commands-tooltip=Dit zijn de commands die je kunt gebruiken. -commands-singleline=Er zijn veel verschillende custom commands die je kunt gebruiken. Let er wel op dat basis commands hier niet zichtbaar zijn. -commands-col1=Commando naam -commands-col2=Commando hulp -links-name=Links -links-tooltip=Nuttige links om in contact te komen met de community -links-cap1=Discord server: -links-cap2=Onze website: -links-cap3=Steam: -links-cap4=Patreon: -servers-name=Servers -servers-tooltip=Info over onze andere servers -servers-singleline=Welkom op de ExplosiveGaming community! S1 tot en met S3 heeft geplande resets. -servers-format=S__1__: __2__ -servers-cap1=Openbaar -servers-des1=Server voor alle spelers, deze map reset elke 144 uur om 16:00 UTC. -servers-cap2=Openbaar -servers-des2=A place for all players, deze map reset elke 144 uur om 16:00 UTC. -servers-cap3=Openbaar -servers-des3=A place for all players, deze map reset elke 144 uur om 16:00 UTC. -servers-cap4=Modded -servers-des4=Een modded server voor alle spelers. Links zijn te vinden in de Discord server. -servers-cap5=Events -servers-des5=Server voor events. Links en wachtwoorden zijn te vinden in de Discord server. -servers-cap6=Donator -servers-des6=Voor de spelers die ons financieel ondersteunen. -rules-name=Alle regels -rules-tooltip=Een lijst met regels die van toepassing zijn op alle ExplosiveGaming servers. -rules-singleline=Dit is een lijst met alle regels. De richtlijnen behandelt de meeste punten, maar de volledige lijst is ook van toepassing. -rules-format=__1__) __2__ -rules-rule1=Hacken / cheaten en bugs misbruiken is niet toegestaan. -rules-rule2=Bugs of fouten horen gerapporteerd te worden aan de staff. -rules-rule3=Respecteer iedereen in de server. -rules-rule4=Pak niet alles uit een belt of via logistiekaanvragen: deel je middelen. -rules-rule5=Spammen (in de zin van chat, kisten en beton) is niet toegestaan. -rules-rule6=Bouw geen beton of steen met bots zonder toestemming. -rules-rule7=Gebruik geen actieve providerkist zonder toestemming. -rules-rule8=Gebruik geen speakers (globaal of met alerts) zonder toestemming. -rules-rule9=Verwijder geen grote delen van het fabriek zonder toestemming. -rules-rule10=Loop niet in willekeurige plekken zonder een reden (bespaart mapgrootte en server resources) -rules-rule11=Geen spullen verwijderen zonder toestemming van andere spelers. -rules-rule12=Draai de belts niet, deactiveer belts niet met draden en laat de productie niet stoppen. -rules-rule13=Maak geen treinrotondes of lussen. -rules-rule14=Gebruik de zelfde grootte treinen als andere spelers. -rules-rule15=Treinen zijn alleen LHD (Left Hand Drive) -rules-rule16=Klaag niet over de lag, lage FPS of lage UPS. -rules-rule17=Vraag niet om ranks: ranks zijn synchroon met onze Discord server. -rules-rule18=Maak geen reclame voor andere servers, tenzij je daarvoor bevoegd bent. -rules-rule19=Rapporteer spelers die de regels breken. -rules-rule20=Gebruik gezond verstand. diff --git a/old/locale/nl/ExpGamingInfo.Rockets.cfg b/old/locale/nl/ExpGamingInfo.Rockets.cfg deleted file mode 100644 index 2fee0a06..00000000 --- a/old/locale/nl/ExpGamingInfo.Rockets.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[ExpGamingInfo-Rockets] -name=Raket Info -tooltip=Lijst met details over de verstuurde raketten. -none=Er zijn nog geen raketten verstuurd. -nan=Niet beschikbaar -sent=Raketten verstuurd: __1__ -first=Eerste raket gelanceerd op: __1__ -last=Meest recente lancering: __1__ -time=Gemiddelde lanceertijd: __1__ -fastest=Snelste lancering: __1__ -milestones=Mijlpalen: -format=__1__: __2__ diff --git a/old/locale/nl/ExpGamingInfo.Science.cfg b/old/locale/nl/ExpGamingInfo.Science.cfg deleted file mode 100644 index 2ac8d7c0..00000000 --- a/old/locale/nl/ExpGamingInfo.Science.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[ExpGamingInfo-Science] -name=Wetenschap info -tooltip=Lijst met details over de wetenschaps pakketten. -total=Pakketten gemaakt: -time=Pakketten per minuut: -format=__1__: __2__ -science-pack-1=Rood -science-pack-2=Groen -science-pack-3=Blauw -military-science-pack=Militair -production-science-pack=Productie -high-tech-science-pack=High Tech -space-science-pack=Ruimte -none=Er zijn nog geen wetenschaps pakketten gemaakt. diff --git a/old/locale/nl/ExpGamingInfo.Tasklist.cfg b/old/locale/nl/ExpGamingInfo.Tasklist.cfg deleted file mode 100644 index 6ab37662..00000000 --- a/old/locale/nl/ExpGamingInfo.Tasklist.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingInfo-Tasklist] -name=Taaklijst -tooltip=Wat voor werk er rondom de fabriek gedaan moet worden -none=Er zijn momenteel geen taken. Vraag een Member om taken toe te voegen. diff --git a/old/locale/nl/ExpGamingPlayer.inventorySearch.cfg b/old/locale/nl/ExpGamingPlayer.inventorySearch.cfg deleted file mode 100644 index 2c6b6a60..00000000 --- a/old/locale/nl/ExpGamingPlayer.inventorySearch.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingPlayer-inventorySearch] -low=Je inventaris is doorzocht en __1__ is verwijderd. -med=Je inventaris is doorzocht en __1__ is verwijderd, je bent gewaarschuwd. -high=Je inventaris is doorzocht en __1__ is gevonden, dit is ten strengste verboden! Je inventaris is verwijderd. diff --git a/old/locale/nl/ExpGamingPlayer.playerInfo.cfg b/old/locale/nl/ExpGamingPlayer.playerInfo.cfg deleted file mode 100644 index 931736ee..00000000 --- a/old/locale/nl/ExpGamingPlayer.playerInfo.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[ExpGamingPlayer-playerInfo] -yes=Ja -no=Nee -name=[__1__] __2__ -online=Is Online: __1__ (__2__) -admin=Heeft Admin: __1__ -group=In Groep: __1__ -role=Heeft Rank: __1__ diff --git a/old/locale/nl/ExpGamingPlayer.playerList.cfg b/old/locale/nl/ExpGamingPlayer.playerList.cfg deleted file mode 100644 index 6a58e08a..00000000 --- a/old/locale/nl/ExpGamingPlayer.playerList.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[ExpGamingPlayer-playerList] -tooltip=Toggle speler lijst. Rechtermuisklik op een speler voor meer info -format-nil=__1__ - __2__ -format=__1__ - __2__ - __3__ -no-info-file=Geen infobestand gevonden. diff --git a/old/locale/nl/ExpGamingPlayer.polls.cfg b/old/locale/nl/ExpGamingPlayer.polls.cfg deleted file mode 100644 index 928ddefb..00000000 --- a/old/locale/nl/ExpGamingPlayer.polls.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ExpGamingPlayer-polls] -name=Polls -tooltip=Laat oude polls zien -no-poll=Geen oude polls -end=Poll is zojuist beëindigd: __1__ -winner=__1__ had de meeste stemmen. -time-left=Je hebt __1__s om te kiezen. diff --git a/old/locale/nl/GameSettingsGui.cfg b/old/locale/nl/GameSettingsGui.cfg deleted file mode 100644 index 19017a6b..00000000 --- a/old/locale/nl/GameSettingsGui.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[GameSettingsGui] -name=Game instellingen -tooltip=Maakt het mogelijk om gameinstellingen te wijzigen. Gebruik het verantwoord! -basic-name=Basis instellingen -basic-tooltip=Deze instellingen kunnen veilig worden gewijzigd. -basic-message=Deze instellingen kunnen worden gebruikt om het spelervaring voor de spelers te verbeteren. -advanced-name=Geavanceerde instellingen -advanced-tooltip=Het is ten zeerste aangeraden om niet aan deze instellingen te zitten, tenzij je weet wat je doet. -advanced-message=Waarschuwing: Niet aan deze instellingen zitten tenzij je honderd procent zeker weet wat je aan het doen bent. Het wijzigen van deze instellingen kunnen een groter effect hebben dan je denkt. -personal-name=Persoonlijke instellingen -personal-tooltip=Deze instellingen hebben alleen effect op jouw speler. -personal-message=Deze instellingen hebben alleen effect op jouw speler: gebruik het verantwoord, aangezien het overmatig gebruik van deze instellingen niet zijn toegestaan. -sure=Weet je het zeker? -effect-mining-speed=Mining Snelheid -effect-craft-speed=Crafting Snelheid -effect-running-speed=Ren Snelheid -effect-build-distance=Bouwafstand -effect-reach-distance=Bereik -effect-bot-speed=Bot Snelheid -effect-lab-speed=Lab Snelheid -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory grootte -effect-mining-prod=Mining Productiviteit -effect-game-speed=Gamesnelheid -effect-save=Opslaan -effect-reload-effects=Effecten herladen -effect-reload-map=Minimap herladen -effect-kill-biters=Biters vermoorden -effect-crc=Forceer CRC check -effect-reset-force=Forceren resetten diff --git a/old/locale/nl/GuiAnnouncements.cfg b/old/locale/nl/GuiAnnouncements.cfg deleted file mode 100644 index 5c92cc68..00000000 --- a/old/locale/nl/GuiAnnouncements.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[GuiAnnouncements] -name=Mededelingen -tooltip=Verstuurt een mededeling naar iedereen -sent-to=Deze mededeling is gestuurd naar __1__ -sent-by=Deze mededeling is gestuurd door __1__ ( __2__ ) -select-rank=Deze mededeling wordt gestuurd naar: diff --git a/old/locale/nl/WarpPoints.cfg b/old/locale/nl/WarpPoints.cfg deleted file mode 100644 index b15a3345..00000000 --- a/old/locale/nl/WarpPoints.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[WarpPoints] -name=Warp List -tooltip=A list of warp points. -remove-tooltip=Remove Warp Point -go-to-tooltip=Go To -cooldown=You Must Wait For The Cooldown, Time Left: __1__ -cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. -name-used=That Name Is Already Taken -not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file diff --git a/old/locale/sv-SE/DeconControl.cfg b/old/locale/sv-SE/DeconControl.cfg deleted file mode 100644 index c8ad5cb7..00000000 --- a/old/locale/sv-SE/DeconControl.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[DeconControl] -player-print=Du har inte tillåtelse med det här just nu. Du behöver ha rang "Regular" vilket kan uppnås genom 3 timmar inne i spelet (den här kartan) hos Explosive Gaming. -rank-print=__1__ försökte dekonstruera något. diff --git a/old/locale/sv-SE/ExpGamingAdmin.AdminLib.cfg b/old/locale/sv-SE/ExpGamingAdmin.AdminLib.cfg deleted file mode 100644 index 679188c2..00000000 --- a/old/locale/sv-SE/ExpGamingAdmin.AdminLib.cfg +++ /dev/null @@ -1,19 +0,0 @@ -[ExpGamingAdmin] -name=Adminkommandon -tooltip=Adminkommando gör dit hem här -no-info-file=Ingen informationsfil kunde hittas -message=Var snäll och välj en spelare och en åtgärd att utfärda, se till att du väljer den rätta! -warning=Warning: Den här spelaren har högre rang än dig. Därför kan du inte redigera dess rang. -short-reason=Warning: Skälet är för kort. -rank-high=Warning: Den här spelaren har högre rang än dig. Därför kan du inte redigera dess rang. -invalid=Spelaren eller åtgärden är ogiltig. Var vänlig och försök igen! -take-action=Utför åtgärd. -tooltip-ban=Bannlys Spelare -tooltip-kick=Sparka Spelare -tooltip-jail=Fängsla Spelare -tooltip-go-to=Gå till Spelare -tooltip-bring=Hämta spelare -report=Rapportera Spelare -low-print=__1__ har blivit rapporterad av __2__ för: __3__ -high-print=__1__ har blivit rapporterad av __2__ för: __3__ -cant-report=Den här spelaren kan inte bli rapporterad. diff --git a/old/locale/sv-SE/ExpGamingAdmin.Warnings.cfg b/old/locale/sv-SE/ExpGamingAdmin.Warnings.cfg deleted file mode 100644 index 9358b9cf..00000000 --- a/old/locale/sv-SE/ExpGamingAdmin.Warnings.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[ExpGamingAdmin-Warnings] -warning-given-by=Den här varningen gavs av: __1__ -player-warning=__1__ var tillfälligt bannlyst av __2__ och kommer att förbli i fängelset tills nästa återställning (reset) -remove-warn=En av dina varningar har gått ut. Du har __1__ varning kvar, nästa varning kommer at tas bort om __2__ -message=Du får för nuvarande varningar av systemet. De kommer fortsätta tills du upphör med överträdelsen. -reported= Du har blivit rapporterad till administrationen av systemet. Mer påföljd kan komma att tas om du inte upphör med överträdelsen. -kick-warn=Det här är din sista varning innan du blir sparkad. Systemet kommer att automatisk sparka dig om du inte upphör med överträdelsen -temp-warn=Det här är din sista varning innan du blir tillfälligt bannlyst. Systemet kommer att automatiskt bannlysa dig om du inte upphör överträdelsen -ban-warn=VARNING: Det här är din sista varning innan du blir bannlyst. Systemet kommer att automatisk bannlysa dig om du inte upphör med överträdelsen. -last-warn=VARNING: Det här är din sista varning innan du blir permanent bannlyst. Systemet kommer att automatiskt permanent bannlysa dig om du inte upphör med överträdelsen. diff --git a/old/locale/sv-SE/ExpGamingAdmin.cfg b/old/locale/sv-SE/ExpGamingAdmin.cfg deleted file mode 100644 index 679188c2..00000000 --- a/old/locale/sv-SE/ExpGamingAdmin.cfg +++ /dev/null @@ -1,19 +0,0 @@ -[ExpGamingAdmin] -name=Adminkommandon -tooltip=Adminkommando gör dit hem här -no-info-file=Ingen informationsfil kunde hittas -message=Var snäll och välj en spelare och en åtgärd att utfärda, se till att du väljer den rätta! -warning=Warning: Den här spelaren har högre rang än dig. Därför kan du inte redigera dess rang. -short-reason=Warning: Skälet är för kort. -rank-high=Warning: Den här spelaren har högre rang än dig. Därför kan du inte redigera dess rang. -invalid=Spelaren eller åtgärden är ogiltig. Var vänlig och försök igen! -take-action=Utför åtgärd. -tooltip-ban=Bannlys Spelare -tooltip-kick=Sparka Spelare -tooltip-jail=Fängsla Spelare -tooltip-go-to=Gå till Spelare -tooltip-bring=Hämta spelare -report=Rapportera Spelare -low-print=__1__ har blivit rapporterad av __2__ för: __3__ -high-print=__1__ har blivit rapporterad av __2__ för: __3__ -cant-report=Den här spelaren kan inte bli rapporterad. diff --git a/old/locale/sv-SE/ExpGamingBot.autoChat.cfg b/old/locale/sv-SE/ExpGamingBot.autoChat.cfg deleted file mode 100644 index 98f81ad7..00000000 --- a/old/locale/sv-SE/ExpGamingBot.autoChat.cfg +++ /dev/null @@ -1,25 +0,0 @@ - -[ExpGamingBot-autoChat] -message=[Chat Bot]: __1__ -rank-error=Du kan inte utföra globala chat-kommandon. -players-online=Det är __1__ spelare online -players=Det har varit __1__ spelare på den här kartan -map-time=Den här kartan har varit igång under __1__ -line-8=Type /help för mer information -join-us=Var snäll och förena dig med oss: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=Vi använder oss av specialiserade kommandon, som till exempel /tag och /report, se kommandotabben i readme för mer information. -read-readme=Se till att du har läst "Readme" (Finn den genom att klicka på frågetecknet högst upp i vänstra hörnet) -not-real-dev=Cooldude2606 är dev för den här servern och gör mjukmodden ("the softmod") och är inte en factorio dev. -ssoftmod=En mjukmod ("softmod") är ett specialscenario som används på den här servern, exempelvis listan över spelare. -blame=Skyll på __1__ för vad som just hände! -afk=Är du afk (borta från tangentbordet)? Titta på __1__, den spelaren har varit afk under: __2__ -links=För att se länkar, öppna readme och klicka "länkar". -magic=Frukta admin-magin (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆ -aids=≖ ‿ ≖Fear the aids of a public server ≖ ‿ ≖ -riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server) -loops=INGA LOOPAR; LOOPAR ÄR DÅLIGT; JUST INGA LOOPAR!!!!!; OM DU GJÖR EN LOOP.... DET KOMMER INTE ATT SLUTA VÄL!!!!!!! -lhd=Alla tåg skall köras med vänstertrafik! -current-evolution=Nuvarande evolutionsfaktor är __1__ -wiki=Du kan få mer information om oss och scenariot på vår wiki: https://wiki.explosivegaming.nl/ \ No newline at end of file diff --git a/old/locale/sv-SE/ExpGamingBot.autoMessage.cfg b/old/locale/sv-SE/ExpGamingBot.autoMessage.cfg deleted file mode 100644 index f037d9df..00000000 --- a/old/locale/sv-SE/ExpGamingBot.autoMessage.cfg +++ /dev/null @@ -1,10 +0,0 @@ - -[ExpGamingBot-autoMessage] -message=[Chat Bot]: __1__ -players-online=Det är __1__ spelare online -map-time=Den här kartan har varit igång under __1__ -join-us=Var snäll och förena dig med oss: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=Vi använder oss av specialiserade kommandon, som till exempel /tag och /report, se kommandotabben i readme för mer information. -read-readme=Se till att du har läst "Readme" (Finn den genom att klicka på frågetecknet högst upp i vänstra hörnet) \ No newline at end of file diff --git a/old/locale/sv-SE/ExpGamingCore.Command.cfg b/old/locale/sv-SE/ExpGamingCore.Command.cfg deleted file mode 100644 index 99b1c6f4..00000000 --- a/old/locale/sv-SE/ExpGamingCore.Command.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[expcore-commands] -unauthorized=401 - Otillåten: Tillgång nekas på grund av otillräcklig säkerhetsprövning. -invalid-inputs=Igiltig inmatning, /__1__ __2__ -invalid-range=Invalid räckvid, Min: __1__, Max: __2__ -invalid-length=ogiltig längd, Max: __1__ -invalid-player=Ogiltigt spelarnamn, __1__ , försök använda tab-tangenten för att auto-slutföra namn. -offline-player=Spelare är offline. Kommando misslyckades med att köras. -dead-player=Spelare är död. Kommando misslyckades med att köras. -command-ran=Kommandot slutfört diff --git a/old/locale/sv-SE/ExpGamingCore.Commands.cfg b/old/locale/sv-SE/ExpGamingCore.Commands.cfg deleted file mode 100644 index 99b1c6f4..00000000 --- a/old/locale/sv-SE/ExpGamingCore.Commands.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[expcore-commands] -unauthorized=401 - Otillåten: Tillgång nekas på grund av otillräcklig säkerhetsprövning. -invalid-inputs=Igiltig inmatning, /__1__ __2__ -invalid-range=Invalid räckvid, Min: __1__, Max: __2__ -invalid-length=ogiltig längd, Max: __1__ -invalid-player=Ogiltigt spelarnamn, __1__ , försök använda tab-tangenten för att auto-slutföra namn. -offline-player=Spelare är offline. Kommando misslyckades med att köras. -dead-player=Spelare är död. Kommando misslyckades med att köras. -command-ran=Kommandot slutfört diff --git a/old/locale/sv-SE/ExpGamingCore.Gui.cfg b/old/locale/sv-SE/ExpGamingCore.Gui.cfg deleted file mode 100644 index 279ba842..00000000 --- a/old/locale/sv-SE/ExpGamingCore.Gui.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingCore_Gui] -unauthorized=401 -Otillåten: Tillgång nekas på grund av otillräcklig säkerhetsprövning. -cant-open=Du kan inte öppna den här panelen just nu, orsak: __1__ -cant-open-no-reason=Du kan inte öppna den här panelen just nu \ No newline at end of file diff --git a/old/locale/sv-SE/ExpGamingCore.Ranking.cfg b/old/locale/sv-SE/ExpGamingCore.Ranking.cfg deleted file mode 100644 index 8ee4d10a..00000000 --- a/old/locale/sv-SE/ExpGamingCore.Ranking.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ranking] -all-rank-print=[Everyone]: __1__ -rank-print=[__1__]: __2__ -rank-up=__1__ blev befordrad till __2__ av __3__ -rank-down=__1__ blev degraderad till __2__ av __3__ -rank-given=Du har fått __1__ Rang! -tag-reset=Din tag blev återställd på grund av rangförändrning. \ No newline at end of file diff --git a/old/locale/sv-SE/ExpGamingInfo.Readme.cfg b/old/locale/sv-SE/ExpGamingInfo.Readme.cfg deleted file mode 100644 index 5299c304..00000000 --- a/old/locale/sv-SE/ExpGamingInfo.Readme.cfg +++ /dev/null @@ -1,69 +0,0 @@ -[ExpGamingInfo-Readme] -tooltip=Öppna ReadMe om det här är första gången du ansluter dig. -guildlines-name=Riktlinjer -guildlines-tooltip=Det här är riktlinjerna som alla bör följa -guildlines-line1=Välkommen till gemenskapen ExplosiveGaming! -guildlines-line2=Här är riktlinjerna som alla är tvingade att följa. -guildlines-line3=!!!No rights can be derived from these guidelines as the full list of rules (another tab in this window) is valid / operative!!! -guildlines-line4=- Dataintrång / fusk / missbruk av buggar kommer inte att tolereras. -guildlines-line5=- Var artig och använd sunt förnuft. -guildlines-line6=- Spam (genom chat, bottar, obegränsade kistor och betong) är inte tillåtet. -guildlines-line7=- Ta inte bort saker utan att fråga dina medspelare. -guildlines-line8=- Tåg är bara tillåtna med vänstertrafik. Inga tågloopar! -guildlines-line9= -guildlines-line10= Om du har frågor om reglerna, servern eller generelt om Factorio, känn dig fri att fråga dina medspelare eller vårat hjälpsamma team. Ha kul! -chat-name=Hur du chattar -chat-tooltip=Hur du chattar i Factorio med standardinställningar -chat-singleline=Att chatta kan vara svårt för nya spelare efterson det är annurlunda från andra spel. Det är väldigt enkelt, tangenten som du behöver trycka på är "ö".Om du vill byta det, gå in till "kontroller" och ändra tangent för "lua konsol". -commands-name=Kommandon -commands-tooltip=Kommandon som du kan använda i ExplosiveGaming -commands-singleline=Anpassade kommandon som du kan använda. Baskommandon visas inte här. -commands-col1=Kommandonamn -commands-col2=kommandohjälp -links-name=Länkar -links-tooltip=Hjälpfulla länkar som visar vägar att komma i kontakt med oss. -links-cap1=Discord röst- och chatserver: -links-cap2=Våran Webbadress : -links-cap3=Steam: -links-cap4=Patreon: -links-cap5=Vår wiki: -servers-name=Servrar -servers-tooltip=Information om våra servrar -servers-singleline=Välkommen till ExplosiveGamings gemenskap! S1-S3 har förskjutna återställningar (resets). -servers-format=S__1__: __2__ -servers-cap1=Offentlig -servers-des1=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. -servers-cap2=Offentlig -servers-des2=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. -servers-cap3=Offentlig -servers-des3=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. -servers-cap4=Modifierad -servers-des4=En modifierad server för alla spelare. Länk i Discord för medlemmar. -servers-cap5=Evenemang -servers-des5=Server för evenemang (alla kan ansluta sig) - Kan kräva lösenord. Anslut dig till Discord för mer info. -servers-cap6=Donator -servers-des6=För spelare som stöder oss finansiellt. Ändringar kan göras på begäran. -rules-name=Regler -rules-tooltip=Den fullla listan över ExplosiveGamings regler. -rules-singleline=Även om riktlinjerna täcker de flesta av reglerna så har den fulla listan alltid prioritet och går alltid före riktlinjerna. Det är välbetänkt att vara bekant med alla reglerna för att förhindra varningar och bannlystningar. -rules-format=__1__) __2__ -rules-rule1=Dataintrång / fusk / missbruk av buggar kommer inte att tolereras. -rules-rule2=Buggar och utnyttjingssätt ska rapporteras till team-medlemmar (exkludera kreativa saker) -rules-rule3=Var inte respektlös mot någon annan spelare i servern. -rules-rule4=Att ta alla saker från ett bälte eller logistikbegäran är förbjudet: att dela med sig av resurserna är obligatoriskt. -rules-rule5=Spam (genom chat, bottar, obegränsade kistor eller betong) är inte tillåtet. -rules-rule6=Gör inga placeringar/borttagningar av betong eller sten med hjälp av bottar utan tillåtelse. -rules-rule7=Använd inte aktiva tillgångskistor utan tillåtelse. -rules-rule8=Använd inte globala högtalare eller varningar utan tillåtelse. -rules-rule9=Ta inte bort eller flytta huvuddelar av fabriken utan tillåtelse. -rules-rule10=Gå inte omkring i slumpvisa riktningar utan anledning (för att spara kartstorlek och serverresurser) -rules-rule11=Ta inte bort saker utan att fråga dina medspelare. -rules-rule12=Rotera inte bälten, deaktivera inte bälten med kabel och orsaka inte produktionsstop. -rules-rule13=Gör inte tågrondeller. Eller någon loop av något slag. -rules-rule14=Vid användning av tåg, använd samma storlek som andra spelare använt sig av. -rules-rule15=Tåg körs endast med vänstertrafik. -rules-rule16=Klaga inte om lag, låg fps, låg ups etc. -rules-rule17=Be inte om högre rang. Våra ranger är synkroniserade med Discord, se till att du ansluter dig till oss där. -rules-rule18=Gör inte reklam för andra servrar om du inte är en betrodd serverägare. -rules-rule19=Rapportera spelare som bryter mot reglerna. -rules-rule20=Använd sunt förnuft och vad en admin säger gäller. diff --git a/old/locale/sv-SE/ExpGamingInfo.Rockets.cfg b/old/locale/sv-SE/ExpGamingInfo.Rockets.cfg deleted file mode 100644 index eb4d93bd..00000000 --- a/old/locale/sv-SE/ExpGamingInfo.Rockets.cfg +++ /dev/null @@ -1,13 +0,0 @@ - -[ExpGamingInfo-Rockets] -name=Raketinformation -tooltip=Lista över detaljerna kring skickade raketer. -none=Inga raketer har blivit skickade ännu. -nan=Inte tillgängligt -sent=Skickade raketer: __1__ -first=Första uppskjutningen skedde: __1__ -last=Senaste uppskjutningen tog: __1__ -time=Genomsnittlig uppskjutningstid: __1__ -fastest=Snabbaste uppskjutning: __1__ -milestones=Milstolpar: -format=__1__: __2__ diff --git a/old/locale/sv-SE/ExpGamingInfo.Science.cfg b/old/locale/sv-SE/ExpGamingInfo.Science.cfg deleted file mode 100644 index db40737c..00000000 --- a/old/locale/sv-SE/ExpGamingInfo.Science.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[ExpGamingInfo-Science] -name=Vetenskapsinformation -tooltip=Detaljerad lista över vetenskapspaket. -total=Paket gjorda: -time=Paket per minut: -format=__1__: __2__ -science-pack-1=Röda -science-pack-2=Gröna -science-pack-3=Blåa -military-science-pack=Militära -production-science-pack=Produktion -high-tech-science-pack=Högteknologiska -space-science-pack=Rymd -none=Inga vetenskapspaket har blivit gjorda ännu. diff --git a/old/locale/sv-SE/ExpGamingInfo.Tasklist.cfg b/old/locale/sv-SE/ExpGamingInfo.Tasklist.cfg deleted file mode 100644 index 5b0009bf..00000000 --- a/old/locale/sv-SE/ExpGamingInfo.Tasklist.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingInfo-Tasklist] -name=Uppgiftslista -tooltip=Jobb som behövs slutföras överallt i fabriken -none=Det finns för närvarande inga uppgifter. Fråga en medlem i spelet eller via Discord för att lägga till nya uppgifter. \ No newline at end of file diff --git a/old/locale/sv-SE/ExpGamingPlayer.inventorySearch.cfg b/old/locale/sv-SE/ExpGamingPlayer.inventorySearch.cfg deleted file mode 100644 index ff5995b3..00000000 --- a/old/locale/sv-SE/ExpGamingPlayer.inventorySearch.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingPlayer-inventorySearch] -low=Ditt inventarie blev genomsökt och __1__ togs bort. -med=Ditt inventarie blev genomsökt och __1__ togs bort, du har fått en varning på grund av detta. -high=Ditt inventarie blev genomsökt och __1__ togs bort: Det här är inte tillåtet. Som ett resultat av det har du blivit tillfälligt bannlyst. diff --git a/old/locale/sv-SE/ExpGamingPlayer.playerInfo.cfg b/old/locale/sv-SE/ExpGamingPlayer.playerInfo.cfg deleted file mode 100644 index 5a4406ae..00000000 --- a/old/locale/sv-SE/ExpGamingPlayer.playerInfo.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[ExpGamingPlayer-playerInfo] -yes=Ja -no=Nej -name=[__1__] __2__ -online=Är Online: __1__ (__2__) -admin=Har Admin: __1__ -group=I användargrupp: __1__ -role=Har rang: __1__ diff --git a/old/locale/sv-SE/ExpGamingPlayer.playerList.cfg b/old/locale/sv-SE/ExpGamingPlayer.playerList.cfg deleted file mode 100644 index b871c389..00000000 --- a/old/locale/sv-SE/ExpGamingPlayer.playerList.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[ExpGamingPlayer-playerList] -tooltip=Växla spelarlista, högerklicka på spelare för mer information. -format-nil=__1__ - __2__ -format=__1__ - __2__ - __3__ -no-info-file=Ingen informationsfil kunde hittas diff --git a/old/locale/sv-SE/ExpGamingPlayer.polls.cfg b/old/locale/sv-SE/ExpGamingPlayer.polls.cfg deleted file mode 100644 index e9050a52..00000000 --- a/old/locale/sv-SE/ExpGamingPlayer.polls.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ExpGamingPlayer-polls] -name=Undersökningar -tooltip=Se gamla undersökningar -no-poll=Inga gamla undersökningar -end=Röstning slutade nyss: __1__ -winner=__1__ hade flest röster. -time-left=Du kommer att få __1__s på dig att välja. \ No newline at end of file diff --git a/old/locale/sv-SE/GameSettingsGui.cfg b/old/locale/sv-SE/GameSettingsGui.cfg deleted file mode 100644 index 88185c07..00000000 --- a/old/locale/sv-SE/GameSettingsGui.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[GameSettingsGui] -name=Game Settings -tooltip=Edits Game Settings. Please use responsibly. -basic-name=Basic Settings -basic-tooltip=These settings are safe to edit and have no big impact. -basic-message=Basic Settings can be used to improve game play for players. -advanced-name=Advanced Settings -advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch the Advanced Settings unless you are 100% sure what you are doing: changes made to these settings might have a bigger impact than you realize. -personal-name=Personal Settings -personal-tooltip=Personal Settings only affects you. -personal-message=Personal Settings only affects your character. If you are spotted as a result of these settings, you are on your own! -sure=Are you sure? -effect-mining-speed=Mining Speed -effect-craft-speed=Crafting Speed -effect-running-speed=Running Speed -effect-build-distance=Build Distance -effect-reach-distance=Reach Distance -effect-bot-speed=Bot Speed -effect-lab-speed=Lab Speed -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory Size -effect-mining-prod=Mining Productivity -effect-game-speed=Game Speed -effect-save=Save Game -effect-reload-effects=Reload Effects -effect-reload-map=Reload Minimap -effect-kill-biters=Kill Biters -effect-crc=Force CRC Check -effect-reset-force=Reset Force diff --git a/old/locale/sv-SE/GuiAnnouncements.cfg b/old/locale/sv-SE/GuiAnnouncements.cfg deleted file mode 100644 index 2b3a8317..00000000 --- a/old/locale/sv-SE/GuiAnnouncements.cfg +++ /dev/null @@ -1,7 +0,0 @@ - -[GuiAnnouncements] -name=Meddelanden -tooltip=Sänder ett meddelande till alla spelare -sent-to=Det här meddelandet är skickat till __1__ -sent-by=Det här meddelandet är skickat av __1__ ( __2__ ) -select-rank=Det här meddelandet kommer att skickas till: diff --git a/old/locale/sv-SE/WarpPoints.cfg b/old/locale/sv-SE/WarpPoints.cfg deleted file mode 100644 index afbdb799..00000000 --- a/old/locale/sv-SE/WarpPoints.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[WarpPoints] -name=Warp-lista -tooltip=En lista över Warp-punkter. -remove-tooltip=Ta bort Warp-punkt -go-to-tooltip=Gå till -cooldown=Du måste vänta på nedräkningen. Tid kvar: __1__ -cooldown-zero=Din nedräkningstimer har gått ut, så nu kan du använda Warp-punkter igen. -name-used=Det namnet är redan taget. -not-on-warp=Du är inte på en Warp-punkt just nu, för att gå till en Warp-punkt måste du befinna dig på en. diff --git a/old/modules/DONE/AdvancedStartingItems/control.lua b/old/modules/DONE/AdvancedStartingItems/control.lua deleted file mode 100644 index c97ebec2..00000000 --- a/old/modules/DONE/AdvancedStartingItems/control.lua +++ /dev/null @@ -1,45 +0,0 @@ ---- Adds a better method of player starting items based on production levels. --- @module AdvancedStartingItems@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Local Variables -local items = { - ['iron-plate']=function(player,made) if tick_to_min(game.tick) < 5 then return 8 else return (made*10)/math.pow(tick_to_min(game.tick),2) end end, - ['copper-plate']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return (made*8)/math.pow(tick_to_min(game.tick),2) end end, - ['electronic-circuit']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return (made*6)/math.pow(tick_to_min(game.tick),2) end end, - ['iron-gear-wheel']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return (made*6)/math.pow(tick_to_min(game.tick),2) end end, - ['steel-plate']=function(player,made) if tick_to_min(game.tick) < 5 then return 0 else return(made*4)/math.pow(tick_to_min(game.tick),2) end end, - ['pistol']=function(player,made) if player.force.item_production_statistics.get_input_count('submachine-gun') > 5 then return 0 else return 1 end end, - ['submachine-gun']=function(player,made) if made > 5 then return 1 else return 0 end end, - ['firearm-magazine']=function(player,made) if player.force.item_production_statistics.get_input_count('piercing-rounds-magazine') > 100 then return 0 else return 10 end end, - ['piercing-rounds-magazine']=function(player,made) if made > 100 then return 10 else return 0 end end, - ['light-armor']=function(player,made) if made > 5 and player.force.item_production_statistics.get_input_count('heavy-armor') <= 5 then return 1 else return 0 end end, - ['heavy-armor']=function(player,made) if made > 5 then return 1 else return 0 end end, - ['burner-mining-drill']=function(player,made) if tick_to_min(game.tick) < 5 then return 4 else return 0 end end, - ['stone-furnace']=function(player,made) if tick_to_min(game.tick) < 5 then return 4 else return 0 end end, - ['iron-axe']=function(player,made) if made > 5 and player.force.item_production_statistics.get_input_count('steel-axe') <= 5 then return 1 else return 0 end end, - ['steel-axe']=function(player,made) if made > 5 then return 1 else return 0 end end -} - --- Module Define -local module_verbose = false -local ThisModule = {} - --- Event Handlers Define -Event.add(defines.events.on_player_created, function(event) - local player = game.players[event.player_index] - if event.player_index == 1 then - player.force.friendly_fire = false - game.map_settings.enemy_expansion.enabled = false - player.force.chart(player.surface, {{player.position.x - 400, player.position.y - 400}, {player.position.x + 400, player.position.y + 400}}) - end - for item,count in pairs(items) do - if type(count) == 'function' then count = math.floor(count(player,player.force.item_production_statistics.get_input_count(item))) end - if count > 0 then player.insert{name=item, count=count} end - end -end) - --- Module Return -return ThisModule \ No newline at end of file diff --git a/old/modules/DONE/AdvancedStartingItems/softmod.json b/old/modules/DONE/AdvancedStartingItems/softmod.json deleted file mode 100644 index dc9653e1..00000000 --- a/old/modules/DONE/AdvancedStartingItems/softmod.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "AdvancedStartingItems", - "version": "4.0.0", - "description": "Adds a better method of player starting items based on production levels.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Inventory", - "Start", - "Items", - "Player", - "Advanced", - "Useful", - "Balaced" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": {}, - "submodules": {} -} diff --git a/old/modules/DONE/Bot/autoChat/control.lua b/old/modules/DONE/Bot/autoChat/control.lua deleted file mode 100644 index ed4aa492..00000000 --- a/old/modules/DONE/Bot/autoChat/control.lua +++ /dev/null @@ -1,166 +0,0 @@ ---- Sends messages in chat in response to other messages --- @module ExpGamingBot.autoChat --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Game = require('FactorioStdLib.Game') -local Server = require('ExpGamingCore.Server') -local Role -- ExpGamingCore.Role@^4.0.0 - --- Local Variables --- lots of these are jokes, but some have uses - --- white spaces removed and made into lower --- these messages are sent only to the player -local messages = { - ['discord']={'ExpGamingBot-autoChat.discord'}, - ['expgaming']={'ExpGamingBot-autoChat.website'}, - ['website']={'ExpGamingBot-autoChat.website'}, - ['command']={'ExpGamingBot-autoChat.custom-commands'}, - ['commands']={'ExpGamingBot-autoChat.custom-commands'}, - ['softmod']={'ExpGamingBot-autoChat.softmod'}, - ['script']={'ExpGamingBot-autoChat.softmod'}, - ['link']={'ExpGamingBot-autoChat.links'}, - ['links']={'ExpGamingBot-autoChat.links'}, - ['loop']={'ExpGamingBot-autoChat.loops'}, - ['loops']={'ExpGamingBot-autoChat.loops'}, - ['rhd']={'ExpGamingBot-autoChat.lhd'}, - ['roundabout']={'ExpGamingBot-autoChat.loops'}, - ['roundabouts']={'ExpGamingBot-autoChat.loops'}, - ['redmew']={'ExpGamingBot-autoChat.redmew'}, - ['afk']=function(_player) local max=_player for _,player in pairs(game.connected_players) do if max.afk_time < player.afk_time then max=player end end return {'ExpGamingBot-autoChat.afk',max.name,tick_to_display_format(max.afk_time)} end -} --- white spaces removed and made into lower --- these are global chat commands that can be used --- commands start with ! (all messages are also commands) -local command_syntax = '!' -local commands = { - ['online']=function() return {'ExpGamingBot-autoChat.players-online',#game.connected_players} end, - ['playtime']=function() return {'ExpGamingBot-autoChat.map-time',tick_to_display_format(game.tick)} end, - ['players']=function() return {'ExpGamingBot-autoChat.players',#game.players} end, - ['dev']={'ExpGamingBot-autoChat.not-real-dev'}, - ['blame']=function(player) local names = {'Cooldude2606','arty714','badgamernl',player.name} return {'ExpGamingBot-autoChat.blame',names[math.random(#names)]} end, - ['readme']={'ExpGamingBot-autoChat.read-readme'}, - ['magic']={'ExpGamingBot-autoChat.magic'}, - ['aids']={'ExpGamingBot-autoChat.aids'}, - ['riot']={'ExpGamingBot-autoChat.riot'}, - ['lenny']={'ExpGamingBot-autoChat.lenny'}, - ['feedback']={'ExpGamingBot-autoChat.feedback'}, - ['wiki']={'ExpGamingBot-autoChat.wiki'}, - ['hodor']=function() local options = {'?','.','!','!!!'} return {'ExpGamingBot-autoChat.hodor',options[math.random(#options)]} end, - ['evolution']=function() return {'ExpGamingBot-autoChat.current-evolution',string.format('%.2f',game.forces['enemy'].evolution_factor)} end, - --Jokes about food and drink - ['whattoeat']={'ExpGamingBot-autoChat.food'}, - - ['makepopcorn']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.get-popcorn-2',self.data}} end - end):open() return {'ExpGamingBot-autoChat.get-popcorn-1'} end, - - ['orderpizza']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true - }:on_event('timeout',function(self) - if self.data[2]==0 then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.order-pizza-2',self.data[1]}} - elseif self.data[2]==1 then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.order-pizza-3',self.data[1]}} self.reopen = false - end - self.data[2]=self.data[2]+1 - end):open() return {'ExpGamingBot-autoChat.order-pizza-1'} end, - - ['passsomesnaps']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true - }:on_event('timeout',function(self) - if self.data[2]==0 then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.get-snaps-2',self.data[1]}} - elseif self.data[2]==1 then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.get-snaps-3',self.data[1]}} self.reopen = false - end - self.data[2]=self.data[2]+1 - end):open() return {'ExpGamingBot-autoChat.get-snaps-1'} end, - - ['makecocktail']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true - }:on_event('timeout',function(self) - if self.data[2]==0 then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.get-cocktail-2',self.data[1]}} - elseif self.data[2]==1 then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.get-cocktail-3',self.data[1]}} self.reopen = false - end - self.data[2]=self.data[2]+1 - end):open() return {'ExpGamingBot-autoChat.get-cocktail-1'} end, - - ['makecoffee']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.make-coffee-2',self.data}} end - end):open() return {'ExpGamingBot-autoChat.make-coffee-1'} end, - - ['orderpizza']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true - }:on_event('timeout',function(self) - if self.data[2]==0 then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.order-pizza-2',self.data[1]}} - elseif self.data[2]==1 then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.order-pizza-3',self.data[1]}} self.reopen = false - end - self.data[2]=self.data[2] + 1 - end):open() return {'ExpGamingBot-autoChat.order-pizza-1'} end, - - ['maketea']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.make-tea-2',self.data}} end - end):open() return {'ExpGamingBot-autoChat.make-tea-1'} end, - - ['popcorn']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.get-popcorn-2',self.data}} end - end):open() return {'ExpGamingBot-autoChat.get-popcorn-1'} end, - - ['meadplease']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.get-mead-2',self.data}} end - end):open() return {'ExpGamingBot-autoChat.get-mead-1'} end, - - ['passabeer']=function(player) Server.new_thread{ - timeout=math.floor(180*(math.random()+0.5)),data=player.name - }:on_event('timeout',function(self) - if self.data then game.print{'ExpGamingBot-autoChat.message',{'ExpGamingBot-autoChat.get-beer-2',self.data}} end - end):open() return {'ExpGamingBot-autoChat.get-beer-1'} end -} - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end - end -} - --- Event Handlers Define -Event.add(defines.events.on_console_chat,function(event) - local player = Game.get_player(event) - if not player then return end - local player_message = event.message:lower():gsub("%s+", "") - local allowed = Role and Role.allowed(player,'global-chat') or player.admin - for to_find,message in pairs(messages) do - if player_message:match(command_syntax..to_find) then - if allowed then - if is_type(message,'function') then message=message(player) end - game.print{'ExpGamingBot-autoChat.message',message} - else player_return({'ExpGamingBot-autoChat.rank-error'},nil,player) end - elseif player_message:match(to_find) then - if is_type(message,'function') then message=message(player) end - if not allowed then player_return({'ExpGamingBot-autoChat.message',message},nil,player) end - end - end - for to_find,message in pairs(commands) do - if player_message:match(command_syntax..to_find) then - if allowed then - if is_type(message,'function') then message=message(player) end - game.print{'ExpGamingBot-autoChat.message',message} - else player_return({'ExpGamingBot-autoChat.rank-error'},nil,player) end - end - end -end) - --- Module Return -return ThisModule \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoChat/locale/de.cfg b/old/modules/DONE/Bot/autoChat/locale/de.cfg deleted file mode 100644 index 32fea59f..00000000 --- a/old/modules/DONE/Bot/autoChat/locale/de.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[ExpGamingBot-autoChat] -message=[Chat Bot]: __1__ -rank-error=You cant use global chat commands -players-online=There are __1__ players online -players=There have been __1__ players on this map -map-time=This map has been on for __1__ -line-8=Type /help for more info -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (can be found through the question mark on the top left) -not-real-dev=Cooldude2606 is a dev for this server and makes the softmod (look top left) and is not a factorio dev. -softmod=A softmod is a custom scenario that runs on this server, example is the player list. -blame=Blame __1__ for what just happend! -afk=Your afk? Look at __1__ they have been afk for: __2__ -links=To see links open the readme and click links. -magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆ -aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖ -riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server) \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoChat/locale/en.cfg b/old/modules/DONE/Bot/autoChat/locale/en.cfg deleted file mode 100644 index 4afb021d..00000000 --- a/old/modules/DONE/Bot/autoChat/locale/en.cfg +++ /dev/null @@ -1,48 +0,0 @@ -[ExpGamingBot-autoChat] -message=[Chat Bot]: __1__ -rank-error=You can't use global chat commands -players-online=There are __1__ players online -players=There have been __1__ players on this map -map-time=This map has been on for __1__ -line-8=Type /help for more info -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: https://www.explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (It can be found through the question mark on the top left) -not-real-dev=Cooldude2606 is a dev for this server and makes the softmod (look top left) and is not a factorio dev. -softmod=A softmod is a custom scenario that runs on this server, example is the player list. -redmew=We dont talk about redmew here; they beat us to 1000 members; F -blame=Blame __1__ for what just happend! -afk=Your afk? Look at __1__, that player has been afk for: __2__ -links=To see links open the readme and click links. -current-evolution=Current evolution factor is __1__ -magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆ -aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖ -riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server) -loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!! -lenny=( ͡° ͜ʖ ͡°) -make-tea-1= ☕ Boiling the water... ☕ -make-tea-2= ☕ __1__ your tea is done! ☕ -order-pizza-1= 🍕 Finding nearest pizza supplier... 🍕 -order-pizza-2= 🍕 Figuring out the favourite pizza of __1__ 🍕 -order-pizza-3= 🍕 __1__ your pizza is here! 🍕 -make-coffee-1= ☕ Boiling the water and grinding the coffee beans... ☕ -make-coffee-2= ☕ __1__ we ran out of coffe beans! Have some tea instead. ☕ -get-beer-1= 🍺 Pouring A Glass 🍺 -get-beer-2= 🍻 Chears Mate 🍻 -get-mead-1= Filling the drinking horn -get-mead-2= Skål! -get-snaps-1=Pouring the glasses and finding the correct song book... -get-snaps-2=Singing a song...🎤🎶 -get-snaps-3=skål, my friends! -get-cocktail-1= 🍸 Inintiating mind reading unit... 🍸 -get-cocktail-2= 🍸 Mixing favourite ingredients of __1__ 🍸 -get-cocktail-3=🍸 __1__ your cocktail is done.🍸 -lhd=All trains must be LHD! -food=Don't know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ -get-popcorn-1=Heating the oil and waiting for the popping sound... -get-popcorn-2=__1__ your popcorn is finished. Lean backwards and watch the drama unfold. -wiki=You can get more information about us and the custom scenario from our wiki: https://wiki.explosivegaming.nl/ -feedback=Do you have feedback? leave it at https://exp.fider.io/ -hodor=Hodor \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoChat/locale/fr.cfg b/old/modules/DONE/Bot/autoChat/locale/fr.cfg deleted file mode 100644 index 32fea59f..00000000 --- a/old/modules/DONE/Bot/autoChat/locale/fr.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[ExpGamingBot-autoChat] -message=[Chat Bot]: __1__ -rank-error=You cant use global chat commands -players-online=There are __1__ players online -players=There have been __1__ players on this map -map-time=This map has been on for __1__ -line-8=Type /help for more info -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (can be found through the question mark on the top left) -not-real-dev=Cooldude2606 is a dev for this server and makes the softmod (look top left) and is not a factorio dev. -softmod=A softmod is a custom scenario that runs on this server, example is the player list. -blame=Blame __1__ for what just happend! -afk=Your afk? Look at __1__ they have been afk for: __2__ -links=To see links open the readme and click links. -magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆ -aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖ -riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server) \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoChat/locale/nl.cfg b/old/modules/DONE/Bot/autoChat/locale/nl.cfg deleted file mode 100644 index 32fea59f..00000000 --- a/old/modules/DONE/Bot/autoChat/locale/nl.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[ExpGamingBot-autoChat] -message=[Chat Bot]: __1__ -rank-error=You cant use global chat commands -players-online=There are __1__ players online -players=There have been __1__ players on this map -map-time=This map has been on for __1__ -line-8=Type /help for more info -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (can be found through the question mark on the top left) -not-real-dev=Cooldude2606 is a dev for this server and makes the softmod (look top left) and is not a factorio dev. -softmod=A softmod is a custom scenario that runs on this server, example is the player list. -blame=Blame __1__ for what just happend! -afk=Your afk? Look at __1__ they have been afk for: __2__ -links=To see links open the readme and click links. -magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆ -aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖ -riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server) \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoChat/locale/sv-SE.cfg b/old/modules/DONE/Bot/autoChat/locale/sv-SE.cfg deleted file mode 100644 index 98f81ad7..00000000 --- a/old/modules/DONE/Bot/autoChat/locale/sv-SE.cfg +++ /dev/null @@ -1,25 +0,0 @@ - -[ExpGamingBot-autoChat] -message=[Chat Bot]: __1__ -rank-error=Du kan inte utföra globala chat-kommandon. -players-online=Det är __1__ spelare online -players=Det har varit __1__ spelare på den här kartan -map-time=Den här kartan har varit igång under __1__ -line-8=Type /help för mer information -join-us=Var snäll och förena dig med oss: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=Vi använder oss av specialiserade kommandon, som till exempel /tag och /report, se kommandotabben i readme för mer information. -read-readme=Se till att du har läst "Readme" (Finn den genom att klicka på frågetecknet högst upp i vänstra hörnet) -not-real-dev=Cooldude2606 är dev för den här servern och gör mjukmodden ("the softmod") och är inte en factorio dev. -ssoftmod=En mjukmod ("softmod") är ett specialscenario som används på den här servern, exempelvis listan över spelare. -blame=Skyll på __1__ för vad som just hände! -afk=Är du afk (borta från tangentbordet)? Titta på __1__, den spelaren har varit afk under: __2__ -links=För att se länkar, öppna readme och klicka "länkar". -magic=Frukta admin-magin (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆ -aids=≖ ‿ ≖Fear the aids of a public server ≖ ‿ ≖ -riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server) -loops=INGA LOOPAR; LOOPAR ÄR DÅLIGT; JUST INGA LOOPAR!!!!!; OM DU GJÖR EN LOOP.... DET KOMMER INTE ATT SLUTA VÄL!!!!!!! -lhd=Alla tåg skall köras med vänstertrafik! -current-evolution=Nuvarande evolutionsfaktor är __1__ -wiki=Du kan få mer information om oss och scenariot på vår wiki: https://wiki.explosivegaming.nl/ \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoChat/softmod.json b/old/modules/DONE/Bot/autoChat/softmod.json deleted file mode 100644 index 7c790178..00000000 --- a/old/modules/DONE/Bot/autoChat/softmod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "ExpGamingBot.autoChat", - "version": "4.0.0", - "description": "Sends messages in chat based on what has been said by other players", - "location": "FSM_ARCHIVE", - "keywords": [ - "Chat", - "Bot", - "Jokes", - "Fun" - ], - "dependencies": { - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Server": "^4.0.0", - "ExpGamingCore.Role": "?^4.0.0" - }, - "collection": "ExpGamingBot@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/Bot/autoMessage/control.lua b/old/modules/DONE/Bot/autoMessage/control.lua deleted file mode 100644 index b21a0f7c..00000000 --- a/old/modules/DONE/Bot/autoMessage/control.lua +++ /dev/null @@ -1,74 +0,0 @@ ---- Prints a message every 15 minutes to chat. --- @module ExpGamingBot.autoMessage --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Server = require('ExpGamingCore.Server') -local Game = require('FactorioStdLib.Game') -local Role -- ExpGamingCore.Role@4.0.0 -local Sync -- ExpGamingCore.Sync@4.0.0 - --- Local Variables - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end - if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end - end, - on_post=function() - --code - end -} - --- Event Handlers Define -script.on_init(function() - Server.new_thread{ - name='auto-message', - timeout=54000, -- 3240000 = 15 hours dont make the mistake i did, 54000 is 15 minutes - reopen=true, - data={ - high_role= 'Owner', - low_role= 'Regular', - low={ - {'ExpGamingBot-autoMessage.join-us'}, - {'ExpGamingBot-autoMessage.discord'}, - {'ExpGamingBot-autoMessage.website'}, - {'ExpGamingBot-autoMessage.custom-commands'}, - {'ExpGamingBot-autoMessage.read-readme'} - } - } - }:on_event('timeout',function(self) - local data = self.data - if not data.high_role or not data.low_role - or not data.low then self.reopen = false return end - game.print{'ExpGamingBot-autoMessage.message',{'ExpGamingBot-autoMessage.players-online',#game.connected_players}} - game.print{'ExpGamingBot-autoMessage.message',{'ExpGamingBot-autoMessage.map-time',tick_to_display_format(game.tick)}} - self.reopen = true - end):on_event(defines.events.on_player_joined_game,function(self,event) - local player = Game.get_player(event) - if not player then return end - local data = self.data - if not data.high_role or not data.low_role - or not data.low then self.reopen = false return end - if Role and Role.get_highest(player).index <= Role.get(data.low_role).index or player.admin then return end - for _,message in pairs(data.low) do - player_return({'ExpGamingBot-autoMessage.message',message},nil,player) - end - end):on_event('error',function(self,err) - if Sync then Sync.emit_embedded{ - title='Auto Message Error', - color=Color.to_hex(defines.textcolor.bg), - description='Auto Message Error - Closed Thread', - Error=err - } end - self.reopen = false - self:close() - end):open() -end) - --- Module Return -return ThisModule \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoMessage/locale/de.cfg b/old/modules/DONE/Bot/autoMessage/locale/de.cfg deleted file mode 100644 index 49d19ede..00000000 --- a/old/modules/DONE/Bot/autoMessage/locale/de.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingBot-autoMessage] -message=[Chat Bot]: __1__ -players-online=There are __1__ players online -map-time=This map has been on for __1__ -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (can be found through the question mark on the top left) \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoMessage/locale/en.cfg b/old/modules/DONE/Bot/autoMessage/locale/en.cfg deleted file mode 100644 index c67078a9..00000000 --- a/old/modules/DONE/Bot/autoMessage/locale/en.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingBot-autoMessage] -message=[Chat Bot]: __1__ -players-online=There are __1__ players online -map-time=This map has been on for __1__ -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: https://www.explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (It can be found through the question mark on the top left) \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoMessage/locale/fr.cfg b/old/modules/DONE/Bot/autoMessage/locale/fr.cfg deleted file mode 100644 index 49d19ede..00000000 --- a/old/modules/DONE/Bot/autoMessage/locale/fr.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingBot-autoMessage] -message=[Chat Bot]: __1__ -players-online=There are __1__ players online -map-time=This map has been on for __1__ -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (can be found through the question mark on the top left) \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoMessage/locale/nl.cfg b/old/modules/DONE/Bot/autoMessage/locale/nl.cfg deleted file mode 100644 index 49d19ede..00000000 --- a/old/modules/DONE/Bot/autoMessage/locale/nl.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingBot-autoMessage] -message=[Chat Bot]: __1__ -players-online=There are __1__ players online -map-time=This map has been on for __1__ -join-us=Please join us on: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=We use custom commands, such as /tag and /report, see the commands tab in readme for more info. -read-readme=Make sure you have read the Readme (can be found through the question mark on the top left) \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoMessage/locale/sv-SE.cfg b/old/modules/DONE/Bot/autoMessage/locale/sv-SE.cfg deleted file mode 100644 index f037d9df..00000000 --- a/old/modules/DONE/Bot/autoMessage/locale/sv-SE.cfg +++ /dev/null @@ -1,10 +0,0 @@ - -[ExpGamingBot-autoMessage] -message=[Chat Bot]: __1__ -players-online=Det är __1__ spelare online -map-time=Den här kartan har varit igång under __1__ -join-us=Var snäll och förena dig med oss: -discord=Discord: https://discord.explosivegaming.nl -website=Website: explosivegaming.nl -custom-commands=Vi använder oss av specialiserade kommandon, som till exempel /tag och /report, se kommandotabben i readme för mer information. -read-readme=Se till att du har läst "Readme" (Finn den genom att klicka på frågetecknet högst upp i vänstra hörnet) \ No newline at end of file diff --git a/old/modules/DONE/Bot/autoMessage/softmod.json b/old/modules/DONE/Bot/autoMessage/softmod.json deleted file mode 100644 index 769ab362..00000000 --- a/old/modules/DONE/Bot/autoMessage/softmod.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "ExpGamingBot.autoMessage", - "version": "4.0.0", - "description": "Prints a message every 15 minutes to chat.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Bot", - "Chat", - "Auto Message", - "Message" - ], - "dependencies": { - "ExpGamingCore.Server": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Role": "?^4.0.0", - "ExpGamingCore.Sync": "?^4.0.0" - }, - "collection": "ExpGamingBot@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/Bot/discordAlerts/control.lua b/old/modules/DONE/Bot/discordAlerts/control.lua deleted file mode 100644 index f3ba31f9..00000000 --- a/old/modules/DONE/Bot/discordAlerts/control.lua +++ /dev/null @@ -1,63 +0,0 @@ ---- Sends alerts to discord once there is a bot set up to read the alerts. --- @module ExpGamingBot.discordAlerts@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Sync = require('ExpGamingCore.Sync') -local Color = require('FactorioStdLib.Color') -local Game = require('FactorioStdLib.Game') - --- Module Define -local module_verbose = false -local ThisModule = {} - --- Event Handlers Define -Event.add(defines.events.on_console_command,function(event) - local command = event.command - local args = {} - if event.parameters then for word in event.parameters:gmatch('%S+') do table.insert(args,word) end end - local data = {} - data.title = string.gsub(command,'^%l',string.upper) - data.by = event.player_index and game.players[event.player_index].name or '' - if data.by == '' then return end - if command == 'config' or command == 'banlist' then - Sync.emit_embedded{ - title='Edit To '..data.title, - color=Color.to_hex(defines.textcolor.bg), - description='A player edited the '..command..'.', - ['By:']=data.by, - ['Edit:']=table.concat(args,' ',1) - } - else - if command == 'ban' then - data.colour = Color.to_hex(defines.textcolor.crit) - data.reason = table.concat(args,' ',2) - elseif command == 'kick' then - data.colour = Color.to_hex(defines.textcolor.high) - data.reason = table.concat(args,' ',2) - elseif command == 'unban' then data.colour = Color.to_hex(defines.textcolor.low) - elseif command == 'mute' then data.colour = Color.to_hex(defines.textcolor.med) - elseif command == 'unmute' then data.colour = Color.to_hex(defines.textcolor.low) - elseif command == 'promote' then data.colour = Color.to_hex(defines.textcolor.info) - elseif command == 'demote' then data.colour = Color.to_hex(defines.textcolor.info) - elseif command == 'purge' then data.colour = Color.to_hex(defines.textcolor.med) - else return end - data.username = args[1] - if not Game.get_player(data.username) then return end - if string.sub(command,-1) == 'e' then data.command = command..'d' else data.command = command..'ed' end - data.reason = data.reason and data.reason ~= '' and data.reason or 'No Reason Required' - Sync.emit_embedded{ - title='Player '..data.title, - color=data.colour, - description='There was a player '..data.command..'.', - ['Player:']='<>'..data.username, - ['By:']='<>'..data.by, - ['Reason:']=data.reason - } - end -end) - --- Module Return -return ThisModule \ No newline at end of file diff --git a/old/modules/DONE/Bot/discordAlerts/softmod.json b/old/modules/DONE/Bot/discordAlerts/softmod.json deleted file mode 100644 index 1bcd1602..00000000 --- a/old/modules/DONE/Bot/discordAlerts/softmod.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "ExpGamingBot.discordAlerts", - "version": "4.0.0", - "description": "Sends alerts to discord once there is a bot set up to read the alerts.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Bot", - "Discord", - "Alerts", - "Messages", - "Acctions" - ], - "dependencies": { - "ExpGamingCore.Sync": "^4.0.0", - "FactorioStdLib.Color": "^0.8.0", - "FactorioStdLib.Game": "^0.8.0" - }, - "collection": "ExpGamingBot@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/ChatPopup/control.lua b/old/modules/DONE/ChatPopup/control.lua deleted file mode 100644 index 992fcda8..00000000 --- a/old/modules/DONE/ChatPopup/control.lua +++ /dev/null @@ -1,57 +0,0 @@ ---- Creates flying text above player when they send a message. --- @module ChatPopup@4.0.0 --- @author badgamernl --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ChatPopup - --- Module Require -local Game = require('FactorioStdLib.Game') -local Color = require('FactorioStdLib.Color') - -local ChatPopup = {} - -function ChatPopup.sendFlyingText(player, text) - local _player = Game.get_player(player) - if not _player then return end - -- Split long text in chunks - local chunkSize = 40 - local chunks = {} - for i=1, #text, chunkSize do - chunks[#chunks+1] = text:sub(i,i+chunkSize - 1) - end - -- Iterate over text chunks and create them as floating text centered above the player - -- Disabled false centering because of not being able to disable scaling: (1 / 7.9 * #value) - for i,value in ipairs(chunks) do - _player.surface.create_entity{ - name="flying-text", - color=_player.chat_color, - text=value, - position={_player.position.x, _player.position.y-(2 - (1 * i))} - } - end -end - -Event.add(defines.events.on_console_chat, function(event) - if not event.player_index then return end - local player = game.players[event.player_index] - if not player then return end - if not event.message then return end - - -- Send message player send to player itself - local message = player.name .. ': ' .. event.message - ChatPopup.sendFlyingText(player, message) - - -- parse message for players and if it includes player, send him a notification that he has been mentioned in the chat - local player_message = event.message:lower():gsub("%s+", "") - - for i,_player in ipairs(game.connected_players) do - if _player.index ~= player.index then - if player_message:match(_player.name:lower()) then - ChatPopup.sendFlyingText(_player, 'You\'ve been mentioned by: ' ..player.name .. ' in chat!') - end - end - end - -end) - -return ChatPopup \ No newline at end of file diff --git a/old/modules/DONE/ChatPopup/softmod.json b/old/modules/DONE/ChatPopup/softmod.json deleted file mode 100644 index 273ab7d9..00000000 --- a/old/modules/DONE/ChatPopup/softmod.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "ChatPopup", - "version": "4.0.0", - "description": "Creates flying text above player when they send a message.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Chat", - "Popup", - "Mention", - "Floating", - "Text" - ], - "author": "badgamernl", - "contact": "badgamernl@gmail.com", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": { - "FactorioStdLib.Game": "^0.8.0", - "FactorioStdLib.Color": "^0.8.0" - }, - "submodules": {} -} diff --git a/old/modules/DONE/Commands/ExpGamingCommands/softmod.json b/old/modules/DONE/Commands/ExpGamingCommands/softmod.json deleted file mode 100644 index 6cfb5d37..00000000 --- a/old/modules/DONE/Commands/ExpGamingCommands/softmod.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "ExpGamingCommands", - "version": "4.0.0", - "description": "A Collection of all of the custom commands used on ExpGaming servers.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Commands", - "ExpGaming", - "Admin", - "Tools" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "submodules": { - "ExpGamingCommands.bonus": "4.0.0", - "ExpGamingCommands.cheatMode": "4.0.0", - "ExpGamingCommands.home": "4.0.0", - "ExpGamingCommands.kill": "4.0.0", - "ExpGamingCommands.repair": "4.0.0", - "ExpGamingCommands.tags": "4.0.0", - "ExpGamingCommands.teleport": "4.0.0" - }, - "dependencies": {} -} diff --git a/old/modules/DONE/Commands/cheatMode/control.lua b/old/modules/DONE/Commands/cheatMode/control.lua deleted file mode 100644 index 19d05276..00000000 --- a/old/modules/DONE/Commands/cheatMode/control.lua +++ /dev/null @@ -1,14 +0,0 @@ ---- A full ranking system for factorio. --- @module ExpGamingCommands.cheatMode@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - ---- Toggles cheat mode for a player --- @command cheat-mode --- @param[opt] player the player to toggle if nil then the player using the command -commands.add_command('cheat-mode', 'Toggles cheat mode for a player', { - ['player']={false,'player'} -}, function(event,args) - local player = args.player or game.player - if player.cheat_mode == true then player.cheat_mode = false else player.cheat_mode = true end -end).default_admin_only = true diff --git a/old/modules/DONE/Commands/cheatMode/softmod.json b/old/modules/DONE/Commands/cheatMode/softmod.json deleted file mode 100644 index cc2843f6..00000000 --- a/old/modules/DONE/Commands/cheatMode/softmod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "ExpGamingCommands.cheatMode", - "version": "4.0.0", - "description": "Adds a command which allow you to toggle cheatmode", - "location": "FSM_ARCHIVE", - "keywords": [ - "Cheat", - "Commands", - "Admin", - "ExpGaming", - "Cheat Mode", - "Hacks" - ], - "dependencies": { - "ExpGamingCore.Command": "^4.0.0" - }, - "collection": "ExpGamingCommands@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/Commands/home/control.lua b/old/modules/DONE/Commands/home/control.lua deleted file mode 100644 index a30f9087..00000000 --- a/old/modules/DONE/Commands/home/control.lua +++ /dev/null @@ -1,48 +0,0 @@ ---- A full ranking system for factorio. --- @module ExpGamingCommands.home@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - -local Game = require('FactorioStdLib.Game') -local global = {} -Global.register(global,function(tbl) global = tbl end) - ---- Sets the home for a player --- @command set-home -commands.add_command('home', 'Allows you to set, remove and goto your homes', { - ['command'] = {false,'string-list',{'set','remove','goto','list','return'}}, - ['name'] = {false,'string-len',10} -}, function(event,args) - local player = Game.get_player(event) - if not global[player.index] then local spawn_pos = player.force.get_spawn_position(player.surface) global[player.index] = {Spawn={spawn_pos.x,spawn_pos.y},_m=3,_n=1,_r={spawn_pos.x,spawn_pos.y}} end - local homes = global[player.index] - local command = args.command - local name = args.name - if command == 'set' then - local pos = {math.floor(player.position.x),math.floor(player.position.y)} - if homes._n+1 > homes._m then player_return{'ExpGamingCommands-home.too-many-homes',homes._m} return commands.error end - if not homes[name] then homes._n=homes._n+1 end - homes[name] = pos - player_return{'ExpGamingCommands-home.set',name,pos[1],pos[2]} - elseif command == 'remove' then - if not homes[name] then player_return{'ExpGamingCommands-home.invalid',name} return commands.error end - homes[name] = nil - homes._n=homes._n-1 - player_return{'ExpGamingCommands-home.remove',name} - elseif command == 'goto' then - if not homes[name] then player_return{'ExpGamingCommands-home.invalid',name} return commands.error end - local pos = {math.floor(player.position.x),math.floor(player.position.y)} - player.teleport(player.surface.find_non_colliding_position('player',homes[name],32,1),player.surface) - homes._r = pos - player_return{'ExpGamingCommands-home.goto',name} - elseif command == 'return' then - local pos = {math.floor(player.position.x),math.floor(player.position.y)} - player.teleport(player.surface.find_non_colliding_position('player',homes._r,32,1),player.surface) - homes._r = pos - player_return{'ExpGamingCommands-home.return',pos[1],pos[2]} - else - player_return{'ExpGamingCommands-home.homes',homes._n,homes._m} - local index = 1 - for home_name,pos in pairs(homes) do if home_name ~= '_n' and home_name ~= '_r' and home_name ~= '_m' then player_return{'ExpGamingCommands-home.home',index,home_name,pos[1],pos[2]} index=index+1 end end - end -end) diff --git a/old/modules/DONE/Commands/home/locale/en.cfg b/old/modules/DONE/Commands/home/locale/en.cfg deleted file mode 100644 index e2993070..00000000 --- a/old/modules/DONE/Commands/home/locale/en.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingCommands-home] -too-many-homes=You have too many homes, to add more you must remove one. Your max is __1__. -homes=Your Homes: (__1__/__2__) -home=__1__) __2__: __3__ , __4__ -set=Your home "__1__" has been set to __2__ , __3__ -remove=Your home "__1__" has been removed -goto=You are now at "__1__" -return=You are now at your previous location: __1__ , __2__ -invalid=Invalid name, __1__ \ No newline at end of file diff --git a/old/modules/DONE/Commands/home/softmod.json b/old/modules/DONE/Commands/home/softmod.json deleted file mode 100644 index 72d2c368..00000000 --- a/old/modules/DONE/Commands/home/softmod.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "ExpGamingCommands.home", - "version": "4.0.0", - "description": "Allows players to set homes and then return to them later.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Teleport", - "ExpGaming", - "Home", - "Return", - "Set Home", - "Commands" - ], - "dependencies": { - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Command": "^4.0.0" - }, - "collection": "ExpGamingCommands@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/Commands/kill/control.lua b/old/modules/DONE/Commands/kill/control.lua deleted file mode 100644 index b04ef3d8..00000000 --- a/old/modules/DONE/Commands/kill/control.lua +++ /dev/null @@ -1,18 +0,0 @@ ---- A full ranking system for factorio. --- @module ExpGamingCommands.kill@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - -local Game = require('FactorioStdLib.Game') - ---- Kills a player of a lower rank --- @command kill --- @param player the player to be killed -commands.add_command('kill', 'Kills a player. No player name kills yourself.', { - ['player']={false,'player-rank-alive'} -}, function(event,args) - local _player = Game.get_player(event) - local player = args.player - if player then player.character.die() - else _player.character.die() end -end).default_admin_only = true diff --git a/old/modules/DONE/Commands/kill/softmod.json b/old/modules/DONE/Commands/kill/softmod.json deleted file mode 100644 index 989c03ee..00000000 --- a/old/modules/DONE/Commands/kill/softmod.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "ExpGamingCommands.kill", - "version": "4.0.0", - "description": "Adds a command which can be used to kill a player or yourself.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Command", - "ExpGaming", - "Kill", - "Death", - "Admin", - "Tool" - ], - "dependencies": { - "ExpGamingCore.Command": "^4.0.0", - "ExpGamingCore.Role": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0" - }, - "collection": "ExpGamingCommands@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/Commands/repair/control.lua b/old/modules/DONE/Commands/repair/control.lua deleted file mode 100644 index be84b7f0..00000000 --- a/old/modules/DONE/Commands/repair/control.lua +++ /dev/null @@ -1,68 +0,0 @@ ---- A full ranking system for factorio. --- @module ExpGamingCommands.repair@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - - -local Game = require('FactorioStdLib.Game') -local Role = require('ExpGamingCore.Role') - --- Set an item to true to disallow it from being repaired -local disallow = { - ['loader']=true, - ['fast-loader']=true, - ['express-loader']=true, - ['electric-energy-interface']=true, - ['infinity-chest']=true -} - --- Given const = 100: admin+ has unlimited, admin has const (100), mod has const / 2 (50), member has const / 5 (20) -local const = 100 -local repairDisallow - --- Module Define -local module_verbose = false -local ThisModule = { - on_init = function(self) - if loaded_modules['ExpGamingAdmin.TempBan'] then verbose('ExpGamingAdmin.TempBan is installed; Loading tempban src') repairDisallow = require(module_path..'/src/tempban') end - end -} - ---- Used so that the value can be overridden if tempban is present --- @local --- @function repairDisallow --- @param player the player who called the command --- @param entity the entity which was repaired -repairDisallow = function(player,entity) - player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.textcolor.crit,player) - entity.destroy() -end - ---- Used to repair and heal items in an area, different ranks get different size areas --- @command repair --- @param range the range that items are repaired in -commands.add_command('repair', 'Repairs all destroyed and damaged entities in an area.', { - ['range']={true,'number-int'} -}, function(event,args) - local range = args.range - local player = Game.get_player(event) - local role = Role.get_highest(player) - local highest_admin_power = Role.meta.groups.Admin.highest-1 - local max_range = role.index-highest_admin_power > 0 and const/(role.index-highest_admin_power) or nil - local center = player and player.position or {x=0,y=0} - if not range or max_range and range > max_range then player_return({'ExpGamingCore_Command.invalid-range',0,math.floor(max_range)}) return commands.error end - local area = {{center.x-range,center.y-range},{center.x+range,center.y+range}} - local max_time_to_live = 2^32 - 1 - local sq_range = range^2 - for key, entity in pairs(player.surface.find_entities_filtered({area=area,type='entity-ghost'})) do - if entity.force == player.force and (entity.position.x-center.x)^2+(entity.position.y-center.y)^2 < sq_range then - if disallow[entity.ghost_prototype.name] then repairDisallow(player,entity) - elseif entity.time_to_live ~= max_time_to_live then entity.revive() end - end - end - for key, entity in pairs(player.surface.find_entities(area)) do - if entity.force == player.force and (entity.position.x-center.x)^2+(entity.position.y-center.y)^2 < sq_range and entity.health then entity.health = 10000 end - end -end).default_admin_only = true - -return ThisModule diff --git a/old/modules/DONE/Commands/repair/softmod.json b/old/modules/DONE/Commands/repair/softmod.json deleted file mode 100644 index db6cbfab..00000000 --- a/old/modules/DONE/Commands/repair/softmod.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "ExpGamingCommands.repair", - "version": "4.0.0", - "description": "Allows items to be healed and repaired with a command", - "location": "FSM_ARCHIVE", - "keywords": [ - "ExpGaming", - "Command", - "Heal", - "Repair", - "Ghosts", - "Revive" - ], - "dependencies": { - "ExpGamingLib": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Role": "^4.0.0", - "ExpGamingAdmin.TempBan": "?^4.0.0" - }, - "collection": "ExpGamingCommands@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/Commands/repair/src/tempban.lua b/old/modules/DONE/Commands/repair/src/tempban.lua deleted file mode 100644 index 31c029c2..00000000 --- a/old/modules/DONE/Commands/repair/src/tempban.lua +++ /dev/null @@ -1,7 +0,0 @@ --- not_luadoc=true -local temp_ban = require('ExpGamingAdmin').temp_ban -return function(player,entity) - player_return('You have repaired: '..entity.name..' this item is not allowed.',defines.textcolor.crit,player) - temp_ban(player,'','Attempt To Repair A Banned Item') - entity.destroy() -end \ No newline at end of file diff --git a/old/modules/DONE/Commands/tags/control.lua b/old/modules/DONE/Commands/tags/control.lua deleted file mode 100644 index f320144b..00000000 --- a/old/modules/DONE/Commands/tags/control.lua +++ /dev/null @@ -1,45 +0,0 @@ ---- A full ranking system for factorio. --- @module ExpGamingCommands@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - -local Game = require('FactorioStdLib.Game') -local Role -- ExpGamingCore.Role@^4.0.0 - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end - end -} - ---- Gives you a tag --- @command tag --- @param tag the tag you want to have -commands.add_command('tag', 'Give yourself a custom tag. Use "" to have more than one word.', { - ['tag'] = {true,'string-len',20} -}, function(event,args) - local player = Game.get_player(event) - if Role then - local role = Role.get_highest(player) - player.tag = role.tag..' - '..args.tag - else player.tag = args.tag end - player_return('Your tag has been set. Use /tag-clear to remove your tag') -end) - ---- Gives you a tag --- @command tag --- @param tag the tag you want to have -commands.add_command('tag-clear', 'Removes a custom tag.', { - ['player'] = {false,'player-rank'} -}, function(event,args) - local player = args.player or game.player - if Role then - local role = Role.get_highest(player) - player.tag = role.tag - else player.tag = '' end - player_return('Your tag has been removed.') -end) - -return ThisModule \ No newline at end of file diff --git a/old/modules/DONE/Commands/tags/softmod.json b/old/modules/DONE/Commands/tags/softmod.json deleted file mode 100644 index ae4843ee..00000000 --- a/old/modules/DONE/Commands/tags/softmod.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "ExpGamingCommands.tags", - "version": "4.0.0", - "description": "Allows tags to be used by users.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Tags", - "Custom Tags", - "Commands", - "ExpGaming" - ], - "dependencies": { - "ExpGamingLib": "^4.0.0", - "ExpGamingCore.Role": "?^4.0.0", - "ExpGamingCore.Command": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0" - }, - "collection": "ExpGamingCommands@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/Commands/teleport/control.lua b/old/modules/DONE/Commands/teleport/control.lua deleted file mode 100644 index d66f7e1b..00000000 --- a/old/modules/DONE/Commands/teleport/control.lua +++ /dev/null @@ -1,35 +0,0 @@ ---- A full ranking system for factorio. --- @module ExpGamingCommands.teleport@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - -local Admin = require('ExpGamingAdmin') - ---- Teleports the user to the player given --- @command go-to --- @param player player to go to -commands.add_command('go-to', 'Go to a player\'s location', { - ['player']={true,'player-online'} -}, function(event,args) - Admin.go_to(args.player,event) -end) - ---- Teleports a player to the user --- @command bring --- @param player player to go to -commands.add_command('bring', 'Bring a player to your location', { - ['player']={true,'player-online'} -}, function(event,args) - Admin.bring(args.player,event) -end) - ---- Teleports one player to another --- @command tp --- @param player_one the player that is teleported --- @param player_two the player who is the destination -commands.add_command('tp', 'Teleport a player to another player\'s location', { - ['player_one']={true,'player-online'}, - ['player_two']={true,'player-online'} -}, function(event,args) - Admin.tp(args.player_one,args.player_two) -end) diff --git a/old/modules/DONE/Commands/teleport/softmod.json b/old/modules/DONE/Commands/teleport/softmod.json deleted file mode 100644 index 4420b19c..00000000 --- a/old/modules/DONE/Commands/teleport/softmod.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "ExpGamingCommands.teleport", - "version": "4.0.0", - "description": "Adds a few commands used to teleport players.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Teleport", - "Tp", - "Bring", - "GoTo", - "ExpGaming", - "Command", - "Admin", - "Tools" - ], - "dependencies": { - "ExpGamingCore.Command": "^4.0.0", - "ExpGamingAdmin.Teleport": "^4.0.0", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingCommands@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/Core/Command/control.lua b/old/modules/DONE/Core/Command/control.lua deleted file mode 100644 index ffe85e73..00000000 --- a/old/modules/DONE/Core/Command/control.lua +++ /dev/null @@ -1,298 +0,0 @@ ---- Command system that allows middle ware and auto validation of command arguments. --- @module ExpGamingCore.Command@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias commands - -local Game = require('FactorioStdLib.Game') -local Color = require('FactorioStdLib.Color') - ---- Used as an error constant for validation --- @field commands.error --- @usage return commands.error, 'err message' --- @usage return commands.error('err message') -commands.error = setmetatable({},{__call=function(...) return ... end}) -commands._add_command = commands.add_command -local commandDataStore = {} -local middleware = {} - ---- Used to add middle ware to the command handler, functions should return true or false --- @tparam function callback function(player,commandName,event) should return true to allow next middle ware to run -function commands.add_middleware(callback) if not is_type(callback,'function') then error('Callback is not a function',2) return end table.insert(middleware,callback) end - ---- Index of all command data --- @field commands.data --- @usage commands.command_name -- returns command data --- @usage commands.data -- returns all data --- @tparam string table ?string|table|event key the command that will be returned: is the name, is the command data, event is event from add_command --- @treturn table the command data -setmetatable(commands,{ - __index=function(tbl,key) return is_type(key,'table') and (key.command and rawget(commandDataStore,key.name) or key) or key == 'data' and commandDataStore or rawget(commandDataStore,key) end -}) - ---- Collection of functions that can be used to validate inputs --- @table commands.validate --- @usage commands.validate[type](value,event,...) --- @tparam string type the type that the value should be --- @param value the value that will be tested --- @param ... any other data that can be passed to the function --- @return[1] the validated value --- @return[2] error constant --- @return[2] the err message --- @field __comment replace _ with - the ldoc did not like me using - in the names --- @field string basically does nothing but a type filed is required --- @field string_inf same as string but is infinite in length, must be last arg --- @field string_len same as string but can define a max length --- @field number converts the input into a number --- @field number_int converts the input to a number and floors it --- @field number_range allows a number in a range min < X <= max --- @field number_range allows a number in a range after it has been floored min < math.floor(X) <= max --- @field player converts the input into a valid player --- @field player_online converts the input to a player if the player is online --- @field player_alive converts the input to a player if the player is online and alive --- @field player_role converts the input to a player if the player is a lower rank than the user or if the person is not admin and the user is --- @field player_role-online converts the input to a player if the player is a lower rank than the user and online --- @field player_role_alive converts the input to a player if the player is a lower rank than the user and online and alive -commands.validate = { - ['boolean']=function(value) value = value.lower() if value == 'true' or value == 'yes' or value == 'y' or value == '1' then return true else return false end end, - ['string']=function(value) return tostring(value) end, - ['string-inf']=function(value) return tostring(value) end, - ['string-list']=function(value,event,list) - local rtn = tostring(value) and table.includes(list,tostring(value)) and tostring(value) or nil - if not rtn then return commands.error{'expcore-commands.error-string-list',table.concat(list,', ')} end return rtn end, - ['string-len']=function(value,event,max) - local rtn = tostring(value) and tostring(value):len() <= max and tostring(value) or nil - if not rtn then return commands.error{'expcore-commands.error-string-len',max} end return rtn end, - ['number']=function(value) - local rtn = tonumber(value) or nil - if not rtn then return commands.error{'expcore-commands.error-number'} end return rtn end, - ['number-int']=function(value) - local rtn = tonumber(value) and math.floor(tonumber(value)) or nil - if not rtn then return commands.error{'expcore-commands.error-number'} end return rtn end, - ['number-range']=function(value,event,min,max) - local rtn = tonumber(value) and tonumber(value) > min and tonumber(value) <= max and tonumber(value) or nil - if not rtn then return commands.error{'expcore-commands.error-number-range',min,max} end return rtn end, - ['number-range-int']=function(value,event,min,max) - local rtn = tonumber(value) and math.floor(tonumber(value)) > min and math.floor(tonumber(value)) <= max and math.floor(tonumber(value)) or nil - if not rtn then return commands.error{'expcore-commands.error-number-range',min,max} end return rtn end, - ['player']=function(value) - local rtn = Game.get_player(value) or nil - if not rtn then return commands.error{'expcore-commands.error-player',value} end return rtn end, - ['player-online']=function(value) - local player,err = commands.validate['player'](value) - if err then return commands.error(err) end - local rtn = player.connected and player or nil - if not rtn then return commands.error{'expcore-commands.error-player-online'} end return rtn end, - ['player-alive']=function(value) - local player,err = commands.validate['player-online'](value) - if err then return commands.error(err) end - local rtn = player.character and player.character.health > 0 and player or nil - if not rtn then return commands.error{'expcore-commands.error-player-alive'} end return rtn end, - ['player-rank']=function(value,event) - local player,err = commands.validate['player'](value) - if err then return commands.error(err) end - local rtn = player.admin and Game.get_player(event).admin and player or nil - if not rtn then return commands.error{'expcore-commands.error-player-rank'} end return rtn end, - ['player-rank-online']=function(value) - local player,err = commands.validate['player-online'](value) - if err then return commands.error(err) end - local player,err = commands.validate['player-rank'](player) - if err then return commands.error(err) end return player end, - ['player-rank-alive']=function(value) - local player,err = commands.validate['player-alive'](value) - if err then return commands.error(err) end - local player,err = commands.validate['player-rank'](player) - if err then return commands.error(err) end return player end, -} ---- Adds a function to the validation list --- @tparam string name the name of the validation --- @tparam function callback function(value,event) which returns either the value to be used or commands.error{'error-message'} -function commands.add_validation(name,callback) if not is_type(callback,'function') then error('Callback is not a function',2) return end commands.validate[name]=callback end - ---- Returns the inputs of this command as a formated string --- @usage commands.format_inputs('interface') -- returns (if you have ExpGamingCore.Server) --- @tparam ?string|table|event command the command to get the inputs of --- @treturn string the formated string for the inputs -function commands.format_inputs(command) - command = commands[command] - if not is_type(command,'table') then error('Command is not valid',2) end - local rtn = '' - for name,data in pairs(command.inputs) do - if data[1] == false then rtn=rtn..string.format('[%s] ',name) - else rtn=rtn..string.format('<%s> ',name) end - end - return rtn -end - ---- Used to validate the arguments of a command, will understand strings with "" as a single param else spaces divede the params --- @usage commands.validate_args(event) -- returns args table --- @tparam table event this is the event created by add_command not on_console_command --- @treturn[1] table the args for this command --- @return[2] command.error --- @treturn string the error that happend while parsing the args -function commands.validate_args(event) - local command = commands[event.name] - if not is_type(command,'table') then error('Command not valid',2) end - local rtn = {} - local count = 0 - local count_opt = 0 - for _,data in pairs(command.inputs) do count = count + 1 if data[1] == false then count_opt = count_opt + 1 end end - -- checks that there is some args given if there is meant to be - if not event.parameter then - if count == count_opt then return rtn - else return commands.error('invalid-inputs') end - end - -- splits the args into words so that it can be used to assign values - local words = string.split(event.parameter,' ') - local index = 0 - for _,word in pairs(words) do - index = index+1 - if not word then break end - local pos, _pos = word:find('"') - local hasSecond = pos and word:find('"',pos+1) or nil - while not hasSecond and pos and pos == _pos do - local next = table.remove(words,index+1) - if not next then return commands.error('invalid-parse') end - words[index] = words[index]..' '..next - _pos = words[index]:find('"',pos+1) - end - end - -- assigns the values from the words to the args - index = 0 - for name,data in pairs(command.inputs) do - index = index+1 - local arg = words[index] - if not arg and data[1] then return commands.error('invalid-inputs') end - if data[2] == 'string-inf' then rtn[name] = table.concat(words,' ',index) break end - local valid = is_type(data[2],'function') and data[2] or commands.validate[data[2]] or error('Invalid validation ("'..tostring(data[2])..'") for command: "'..command.name..'/'..name..'"') - local temp_tbl = table.deepcopy(data) table.remove(temp_tbl,1) table.remove(temp_tbl,1) - local value, err = valid(arg,event,unpack(temp_tbl)) - if value == commands.error then return value, err end - rtn[name] = is_type(value,'string') and value:gsub('"','') or value - end - return rtn -end - ---- Used to return all the commands a player can use --- @usage get_commands(1) -- return table of command data for each command that the player can use --- @tparam ?index|name|player| player the player to test as --- @treturn table a table containg all the commands the player can use -function commands.get_commands(player) - player = Game.get_player(player) - local commands = {} - if not player then return error('Invalid player',2) end - for name,data in pairs(commandDataStore) do - if #middleware > 0 then for _,callback in pairs(middleware) do - local success, err = pcall(callback,player,name,data) - if not success then error(err) - elseif err then table.insert(commands,data) end - end elseif data.default_admin_only == true and player.admin then table.insert(commands,data) end - end - return commands -end - -local function logMessage(player_name,command,message,args) - game.write_file('commands.log', - game.tick - ..' Player: "'..player_name..'"' - ..' '..message..': "'..command.name..'"' - ..' With args of: '..table.tostring(args) - ..'\n' - , true, 0) -end - ---- Used to call the custom commands --- @usage You dont its an internal command --- @tparam table command the event rasied by the command -local function run_custom_command(command) - local data = commands.data[command.name] - local player = Game.get_player(command) or SERVER - -- runs all middle ware if any, if there is no middle where then it relies on .default_admin_only - if #middleware > 0 then for _,callback in pairs(middleware) do - local success, err = pcall(callback,player,command.name,command) - if not success then error(err) - elseif not err then - player_return({'expcore-commands.command-fail',{'expcore-commands.unauthorized'}},defines.textcolor.crit) - logMessage(player.name,command,'Failed to use command (Unauthorized)',commands.validate_args(command)) - game.player.play_sound{path='utility/cannot_build'} - return - end - end elseif data.default_admin_only == true and player and not player.admin then - player_return({'expcore-commands.command-fail',{'expcore-commands.unauthorized'}},defines.textcolor.crit) - logMessage(player.name,command,'Failed to use command (Unauthorized)',commands.validate_args(command)) - game.player.play_sound{path='utility/cannot_build'} - return - end - -- gets the args for the command - local args, err = commands.validate_args(command) - if args == commands.error then - if is_type(err,'table') then table.insert(err,command.name) table.insert(err,commands.format_inputs(data)) - player_return({'expcore-commands.command-fail',err},defines.textcolor.high) else player_return({'expcore-commands.command-fail',{'expcore-commands.invalid-inputs',command.name,commands.format_inputs(data)}},defines.textcolor.high) end - logMessage(player.name,command,'Failed to use command (Invalid Args)',args) - player.play_sound{path='utility/deconstruct_big'} - return - end - -- runs the command - local success, err = pcall(data.callback,command,args) - if not success then error(err) end - if err ~= commands.error then player_return({'expcore-commands.command-ran'},defines.textcolor.info) end - logMessage(player.name,command,'Used command',args) -end - ---- Used to define commands --- @usage --see examples in file --- @tparam string name the name of the command --- @tparam[opt='No string Description'] description the description of the command --- @tparam[opt=an table table infinite string] inputs a of the inputs to be used, last index being true makes the last parameter open ended (longer than one word) --- @tparam function function callback the to call on the event -commands.add_command = function(name, description, inputs, callback) - if commands[name] then error('That command is already registered',2) end - if not is_type(name,'string') then error('Command name has not been given') end - if not is_type(callback,'function') or not is_type(inputs,'table') then - if is_type(inputs,'function') then commands._add_command(name,description,inputs) - else error('Invalid args given to add_command') end - end - verbose('Created Command: '..name) - -- test for string and then test for locale string - description = is_type(description,'string') and description - or is_type(description,'table') and is_type(description[1],'string') and string.find(description[1],'.+[.].+') and {description,''} - or 'No Description' - inputs = is_type(inputs,'table') and inputs or {['param']={false,'string-inf'}} - commandDataStore[name] = { - name=name, - description=description, - inputs=inputs, - callback=callback, - admin_only=false - } - local help = is_type(description,'string') and commands.format_inputs(name)..'- '..description - or is_type(description,'table') and is_type(description[1],'string') and string.find(description[1],'.+[.].+') and {description,commands.format_inputs(name)..'- '} - or commands.format_inputs(name) - commandDataStore[name].help = help - commands._add_command(name,help,function(...) - local success, err = Manager.sandbox(run_custom_command,{},...) - if not success then error(err) end - end) - return commandDataStore[name] -end - -return commands - ---[[ - command example - - **locale file** - [foo] - description=__1__ this is a command - - **control.lua** - commands.add_command('foo',{'foo.description'},{ - ['player']={true,'player'}, -- a required arg that must be a valid player - ['number']={true,'number-range',0,10}, -- a required arg that must be a number 0 0 then - local update = 4 - if global.cam_index >= #global.cams then global.cam_index = 1 end - if update > #global.cams then update = #global.cams end - for cam_offset = 0,update do - local _cam = global.cams[global.cam_index+cam_offset] - if not _cam then break end - if not _cam.cam.valid then table.remove(global.cams,global.cam_index) - elseif not _cam.entity.valid then table.remove(global.cams,global.cam_index) - else _cam.cam.position = _cam.entity.position if not _cam.surface then _cam.cam.surface_index = _cam.entity.surface.index end global.cam_index = global.cam_index+1 - end - end - global.cam_index = global.cam_index+update - end -end) - -Event.add('on_player_respawned',function(event) - if loaded_modules['ExpGamingCore.Server'] then return end - if global.players and is_type(global.players,'table') and #global.players > 0 and global.players[event.player_index] then - local remove = {} - local player = Game.get_player(event) - for index,cam in pairs(global.players[event.player_index]) do - if cam.valid then table.insert(global.cams,{cam=cam,entity=player.character,surface=player.surface}) - else table.insert(remove,index) end - end - for n,index in pairs(remove) do - table.remove(global.players[event.player_index],index-n+1) - end - end -end) - -function Gui:on_init() - if loaded_modules['ExpGamingCore.Server'] then - Server = require('ExpGamingCore.Server') - verbose('ExpGamingCore.Server is installed; Loading server src') - script.on_init(require(module_path..'/src/server',{Gui=self})) - end -end - -function Gui.on_post() - Gui.test = require(module_path..'/src/test',{Gui=Gui}) -end - - -return Gui \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/inputs/control.lua b/old/modules/DONE/Core/Gui/inputs/control.lua deleted file mode 100644 index 1da9afee..00000000 --- a/old/modules/DONE/Core/Gui/inputs/control.lua +++ /dev/null @@ -1,375 +0,0 @@ ---- Adds a clean way of making new inputs for a gui allowing for sliders and text inputs to be hanndleded with custom events --- @module ExpGamingCore.Gui.Inputs --- @alias inputs --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - ---- This is a submodule of ExpGamingCore.Gui but for ldoc reasons it is under its own module --- @function _comment - -local Game = require('FactorioStdLib.Game') -local Color = require('FactorioStdLib.Color') -local mod_gui = require('mod-gui') -local Gui = require('ExpGamingCore.Gui') - -local inputs = {} -inputs._prototype = {} --- these are just so you can have short cuts to this -inputs.events = { - --error={}, -- this is added after event calls are added as it is not a script event - state=defines.events.on_gui_checked_state_changed, - click=defines.events.on_gui_click, - elem=defines.events.on_gui_elem_changed, - selection=defines.events.on_gui_selection_state_changed, - text=defines.events.on_gui_text_changed, - slider=defines.events.on_gui_value_changed -} - ---- Sets the input to trigger on an certain event --- @usage button:on_event(defines.events.on_gui_click,player_return) --- @param event the event to raise callback on | can be number of the event | can be a key of inputs.events --- @tparam function function callback the you want to run on the event --- @treturn table returns self so you can chain together -function inputs._prototype:on_event(event,callback) - if not is_type(callback,'function') then return self end - if inputs.events[event] then event = inputs.events[event] end - if event == inputs.events.error then self._error = callback return self end - self.events[event] = callback - return self -end - ---- Draw the input into the root element --- @usage button:draw(frame) --- @param root the element you want to add the input to --- @return returns the element that was added -function inputs._prototype:draw(root) - local player = Game.get_player(root.player_index) - if is_type(self.draw_data.caption,'string') and player.gui.is_valid_sprite_path(self.draw_data.caption) then - local data = table.deepcopy(self.draw_data) - data.type = 'sprite-button' - data.sprite = data.caption - data.caption = nil - return root.add(data) - elseif is_type(self.draw_data.sprite,'string') and player.gui.is_valid_sprite_path(self.draw_data.sprite) then - local data = table.deepcopy(self.draw_data) - data.type = 'sprite-button' - return root.add(data) - elseif is_type(self.data._state,'function') then - local data = table.deepcopy(self.draw_data) - local success, err = pcall(self.data._state,player,root) - if success then data.state = err else error(err) end - return root.add(data) - elseif is_type(self.data._start,'function') then - local data = table.deepcopy(self.draw_data) - local success, err = pcall(self.data._start,player,root) - if success then data.value = err else error(err) end - return root.add(data) - elseif is_type(self.data._index,'function') then - local data = table.deepcopy(self.draw_data) - local success, err = pcall(self.data._index,player,root) - if success then data.selected_index = err else error(err) end - if is_type(self.data._items,'function') then - local success, err = pcall(self.data._items,player,root) - if success then data.items = err else error(err) end - end - return root.add(data) - elseif is_type(self.data._items,'function') then - local data = table.deepcopy(self.draw_data) - local success, err = pcall(self.data._items,player,root) - if success then data.items = err else error(err) end - if is_type(self.data._index,'function') then - local _success, _err = pcall(self.data._index,player,root) - if _success then data.selected_index = _err else error(_err) end - end - return root.add(data) - else - return root.add(self.draw_data) - end -end - ---- Add a new input, this is the same as doing frame.add{} but returns a different object --- @usage Gui.inputs.add{type='button',name='test',caption='Test'} --- @usage return_value(frame) -- draws the button onto that frame --- @tparam table obj the new element to add if caption is a sprite path then sprite is used --- @treturn table the custom input object, calling the returned value will draw the button -function inputs.add(obj) - if not is_type(obj,'table') then return end - if not is_type(obj.type,'string') then return end - local type = obj.type - if type ~= 'button' - and type ~= 'sprite-button' - and type ~= 'choose-elem-button' - and type ~= 'checkbox' - and type ~= 'radiobutton' - and type ~= 'textfield' - and type ~= 'text-box' - and type ~= 'slider' - and type ~= 'drop-down' - then return end - verbose('Created Input: '..obj.name..' ('..obj.type..')') - if obj.type == 'button' or obj.type == 'sprite-button' then obj.style = mod_gui.button_style end - obj.draw_data = table.deepcopy(obj) - obj.data = {} - obj.events = {} - setmetatable(obj,{__index=inputs._prototype,__call=function(self,...) return self:draw(...) end}) - Gui.data('inputs_'..type,obj.name,obj) - return obj -end - --- this just runs the events given to inputs -function inputs._event_handler(event) - if not event.element then return end - local elements = Gui.data['inputs_'..event.element.type] or {} - local element = elements[event.element.name] - if not element and event.element.type == 'sprite-button' then - elements = Gui.data.inputs_button or {} - element = elements[event.element.name] - end - if element then - verbose('There was a gui event ('..Event.names[event.name]..') with element: '..event.element.name) - if not is_type(element.events[event.name],'function') then return end - local success, err = Manager.sandbox(element.events[event.name],{},event) - if not success then - if is_type(element._error,'function') then pcall(element._error) - else error(err) end - end - end -end - -Event.add(inputs.events,inputs._event_handler) -inputs.events.error = {} - --- the following functions are just to make inputs easier but if what you want is not include use inputs.add(obj) ---- Used to define a button, can have many function --- @usage Gui.inputs.add_button('test','Test','Just for testing',{{condition,callback},...}) --- @tparam string name the name of this button --- @tparam string the display for this button, either text or sprite path --- @tparam string tooltip the tooltip to show on the button --- @param callbacks can either be a single function or a list of function pairs see examples at bottom --- @treturn table the button object that was made, to allow a custom error event if wanted -function inputs.add_button(name,display,tooltip,callbacks) - local rtn_button = inputs.add{ - type='button', - name=name, - caption=display, - tooltip=tooltip - } - rtn_button.data._callbacks = callbacks - rtn_button:on_event('click',function(event) - local elements = Gui.data['inputs_'..event.element.type] or {} - local button = elements[event.element.name] - if not button and event.element.type == 'sprite-button' then - elements = Gui.data.inputs_button or {} - button = elements[event.element.name] - end - local player = Game.get_player(event) - local mouse = event.button - local keys = {alt=event.alt,ctrl=event.control,shift=event.shift} - local element = event.element - local btn_callbacks = button.data._callbacks - if is_type(btn_callbacks,'function') then btn_callbacks = {{function() return true end,btn_callbacks}} end - for _,data in pairs(btn_callbacks) do - if is_type(data[1],'function') and is_type(data[2],'function') then - local success, err = pcall(data[1],player,mouse,keys,event) - if success and err == true then - local _success, _err = pcall(data[2],player,element,event) - if not _success then error(_err) end - elseif not success then error(err) end - else error('Invalid Callback Condition Format') end - end - end) - return rtn_button -end - ---- Used to define a choose-elem-button callback only on elem_changed --- @usage Gui.inputs.add_elem_button('test','Test','Just for testing',function) --- @tparam string name the name of this button --- @tparam string elem_type the display for this button, either text or sprite path --- @tparam string tooltip the tooltip to show on the button --- @tparam function callback the callback to call on change function(player,element,elem) --- @treturn table the button object that was made, to allow a custom error event if wanted -function inputs.add_elem_button(name,elem_type,tooltip,callback) - local button = inputs.add{ - type='choose-elem-button', - name=name, - elem_type=elem_type, - tooltip=tooltip - } - button.data._callback = callback - button:on_event('elem',function(event) - local button = Gui.data['inputs_'..event.element.type][event.element.name] - local player = Game.get_player(event) - local element = event.element or {elem_type=nil,elem_value=nil} - local elem = {type=element.elem_type,value=element.elem_value} - if is_type(button.data._callback,'function') then - local success, err = pcall(button.data._callback,player,element,elem) - if not success then error(err) end - else error('Invalid Callback') end - end) - return button -end - ---- Used to define a checkbox callback only on state_changed --- @usage Gui.inputs.add_checkbox('test',false,'Just for testing',function,function,funvtion) --- @tparam string name the name of this button --- @tparam boolean radio if this is a radio button --- @tparam string display the display for this button, either text or sprite path --- @tparam function default the callback which choses the default check state --- @tparam function callback_true the callback to call when changed to true --- @tparam function callback_false the callback to call when changed to false --- @treturn table the button object that was made, to allow a custom error event if wanted -function inputs.add_checkbox(name,radio,display,default,callback_true,callback_false) - local type = 'checkbox'; if radio then type='radiobutton' end - local state = false; if is_type(default,'boolean') then state = default end - local rtn_checkbox = inputs.add{ - type=type, - name=name, - caption=display, - state=state - } - if is_type(default,'function') then rtn_checkbox.data._state = default end - rtn_checkbox.data._true = callback_true - rtn_checkbox.data._false = callback_false - rtn_checkbox:on_event('state',function(event) - local checkbox = Gui.data['inputs_'..event.element.type][event.element.name] - local player = Game.get_player(event) - if event.element.state then - if is_type(checkbox.data._true,'function') then - local success, err = pcall(checkbox.data._true,player,event.element) - if not success then error(err) end - else error('Invalid Callback') end - else - if is_type(checkbox.data._false,'function') then - local success, err = pcall(checkbox.data._false,player,event.element) - if not success then error(err) end - else error('Invalid Callback') end - end - end) - return rtn_checkbox -end - ---- Used to reset the state of radio buttons, recommended to be called on_state_change to reset any radio buttons it is meant to work with. --- @usage Gui.inputs.reset_radio{radio1,radio2,...} --- @param elements can be a list of elements or a single element -function inputs.reset_radio(elements) - if #elements > 0 then - for _,element in pairs(elements) do - if element.valid then - local _elements = Gui.data['inputs_'..element.type] or {} - local _element = _elements[element.name] - local player = Game.get_player(element.player_index) - local state = false - local success, err = pcall(_element.data._state,player,element.parent) - if success then state = err else error(err) end - element.state = state - end - end - else - if elements.valid then - local _elements = Gui.data['inputs_'..elements.type] or {} - local _element = _elements[elements.name] - local player = Game.get_player(elements.player_index) - local state = false - local success, err = pcall(_element.data._state,player,elements.parent) - if success then state = err else error(err) end - elements.state = state - end - end -end - ---- Used to define a text callback only on text_changed --- @usage Gui.inputs.add_text('test',false,'Just for testing',function) --- @tparam string name the name of this button --- @tparam boolean box is it a text box rather than a text field --- @tparam string text the starting text --- @tparam function callback the callback to call on change function(player,text,element) --- @treturn table the text object that was made, to allow a custom error event if wanted -function inputs.add_text(name,box,text,callback) - local type = 'textfield'; if box then type='text-box' end - local rtn_textbox = inputs.add{ - type=type, - name=name, - text=text - } - rtn_textbox.data._callback = callback - rtn_textbox:on_event('text',function(event) - local textbox = Gui.data['inputs_'..event.element.type][event.element.name] - local player = Game.get_player(event) - local element = event.element - local event_callback = textbox.data._callback - if is_type(event_callback,'function') then - local success, err = pcall(event_callback,player,element.text,element) - if not success then error(err) end - else error('Invalid Callback Condition Format') end - end) - return rtn_textbox -end - ---- Used to define a slider callback only on value_changed --- @usage Gui.inputs.add_slider('test','horizontal',1,10,5,function) --- @tparam string name the name of this button --- @tparam string orientation direction of the slider --- @tparam number min the lowest number --- @tparam number max the highest number --- @tparam number function function start_callback either a or a to return a number --- @tparam function function callback the to be called on value_changed function(player,value,percent,element) --- @treturn table the slider object that was made, to allow a custom error event if wanted -function inputs.add_slider(name,orientation,min,max,start_callback,callback) - local slider = inputs.add{ - type='slider', - name=name, - orientation=orientation, - minimum_value=min, - maximum_value=max, - value=start_callback - } - slider.data._start = start_callback - slider.data._callback = callback - slider:on_event('slider',function(event) - local slider = Gui.data['inputs_'..event.element.type][event.element.name] - local player = Game.get_player(event) - local value = event.element.slider_value - local data = slider.data - local percent = value/event.element.get_slider_maximum() - if is_type(data._callback,'function') then - local success, err = pcall(data._callback,player,value,percent,event.element) - if not success then error(err) end - else error('Invalid Callback Condition Format') end - end) - return slider -end - ---- Used to define a drop down callback only on value_changed --- @usage Gui.inputs.add_drop_down('test',{1,2,3},1,function) --- @tparam string name name of the drop down --- @param items either a list or a function which returns a list --- @param index either a number or a function which returns a number --- @tparam function callback the callback which is called when a new index is selected function(player,selected,items,element) --- @treturn table the drop-down object that was made, to allow a custom error event if wanted -function inputs.add_drop_down(name,items,index,callback) - local rtn_dropdown = inputs.add{ - type='drop-down', - name=name, - items=items, - selected_index=index - } - rtn_dropdown.data._items = items - rtn_dropdown.data._index = index - rtn_dropdown.data._callback = callback - rtn_dropdown:on_event('selection',function(event) - local dropdown = Gui.data['inputs_'..event.element.type][event.element.name] - local player = Game.get_player(event) - local element = event.element - local drop_items = element.items - local selected = drop_items[element.selected_index] - local drop_callback = dropdown.data._callback - if is_type(drop_callback,'function') then - local success, err = pcall(drop_callback,player,selected,drop_items,element) - if not success then error(err) end - else error('Invalid Callback Condition Format') end - end) - return rtn_dropdown -end - --- calling will attempt to add a new input -return setmetatable(inputs,{__call=function(self,...) return self.add(...) end}) diff --git a/old/modules/DONE/Core/Gui/inputs/softmod.json b/old/modules/DONE/Core/Gui/inputs/softmod.json deleted file mode 100644 index ba17e5a2..00000000 --- a/old/modules/DONE/Core/Gui/inputs/softmod.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "ExpGamingCore.Gui.inputs", - "version": "4.0.0", - "description": "Addds an event manager for gui inputs and easy input creation", - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "location": "FSM_ARCHIVE", - "keywords": [ - "Gui", - "Inputs", - "Buttons", - "Text Fields" - ], - "collection": "ExpGamingCore.Gui@4.0.0", - "dependencies": { - "mod-gui": "*", - "FactorioStdLib.Color": "^0.8.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Gui": "^4.0.0" - }, - "submodules": {} -} diff --git a/old/modules/DONE/Core/Gui/left/control.lua b/old/modules/DONE/Core/Gui/left/control.lua deleted file mode 100644 index ac281d58..00000000 --- a/old/modules/DONE/Core/Gui/left/control.lua +++ /dev/null @@ -1,246 +0,0 @@ ---- Adds a organiser for left gui elements which will automatically update there information and have open requirements --- @module ExpGamingCore.Gui.Left --- @alias left --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - ---- This is a submodule of ExpGamingCore.Gui but for ldoc reasons it is under its own module --- @function _comment -local Game = require('FactorioStdLib.Game') -local Server = require('ExpGamingCore.Server') -local Color = require('FactorioStdLib.Color') -local mod_gui = require('mod-gui') -local Gui = require('ExpGamingCore.Gui') -local order_config = require(module_path..'/order_config') -local Role -- this is optional and is handled by it being present, it is loaded on init - -local left = {} -left._prototype = {} - -left.hide = Gui.inputs{ - name='gui-left-hide', - type='button', - caption='<' -}:on_event('click',function(event) - for _,child in pairs(event.element.parent.children) do - if child.name ~= 'popups' then child.style.visible = false end - end -end) - -local global = {} -Global.register(global,function(tbl) global = tbl end) - --- used for debugging -function left.override_open(state) - global.over_ride_left_can_open = state -end ---- Used to add a left gui frame --- @usage Gui.left.add{name='foo',caption='Foo',tooltip='just testing',open_on_join=true,can_open=function,draw=function} --- @usage return_value(player) -- toggles visibility for that player, if no player then updates for all players --- @param obj this is what will be made, needs a name and a draw function(root_frame), open_on_join can be used to set the default state true/false, can_open is a test to block it from opening but is not needed --- @return the object that is made, calling the returned value with out a param will update the gui, else will toggle visibility for that player -function left.add(obj) - if not is_type(obj,'table') then return end - if not is_type(obj.name,'string') then return end - verbose('Created Left Gui: '..obj.name) - setmetatable(obj,{__index=left._prototype,__call=function(self,player) if player then return self:toggle(player) else return left.update(self.name) end end}) - Gui.data('left',obj.name,obj) - if Gui.toolbar then Gui.toolbar(obj.name,obj.caption,obj.tooltip,function(event) obj:toggle(event) end) end - return obj -end - ---- This is used to update all the guis of connected players, good idea to use our thread system as it as nested for loops --- @usage Gui.left.update() --- @tparam[opt] string frame this is the name of a frame if you only want to update one --- @param[opt] players the player to update for, if not given all players are updated, can be one player -function left.update(frame,players) - if not Server or not Server._thread then - players = is_type(players,'table') and #players > 0 and {unpack(players)} or is_type(players,'table') and {players} or Game.get_player(players) and {Game.get_player(players)} or game.connected_players - for _,player in pairs(players) do - local frames = Gui.data.left or {} - if frame then frames = {[frame]=frames[frame]} or {} end - for _,left_frame in pairs(frames) do - if left_frame then left_frame:first_open(player) end - end - end - else - local frames = Gui.data.left or {} - if frame then frames = {[frame]=frames[frame]} or {} end - players = is_type(players,'table') and #players > 0 and {unpack(players)} or is_type(players,'table') and {players} or Game.get_player(players) and {Game.get_player(players)} or game.connected_players - Server.new_thread{ - data={players=players,frames=frames} - }:on_event('tick',function(thread) - if #thread.data.players == 0 then thread:close() return end - local player = table.remove(thread.data.players,1) - Server.new_thread{ - data={player=player,frames=thread.data.frames} - }:on_event('resolve',function(thread) - for _,left_frame in pairs(thread.data.frames) do - if left_frame then left_frame:first_open(thread.data.player) end - end - end):queue() - end):open() - end -end - ---- Used to open the left gui of every player --- @usage Gui.left.open('foo') --- @tparam string left_name this is the gui that you want to open --- @tparam[opt] LuaPlayer the player to open the gui for -function left.open(left_name,player) - local players = player and {player} or game.connected_players - local _left = Gui.data.left[left_name] - if not _left then return end - if not Server or not Server._thread then - for _,next_player in pairs(players) do _left:open(next_player) end - else - Server.new_thread{ - data={players=players} - }:on_event('tick',function(thread) - if #thread.data.players == 0 then thread:close() return end - local next_player = table.remove(thread.data.players,1) - _left:open(next_player) - end):open() - end -end - ---- Used to close the left gui of every player --- @usage Gui.left.close('foo') --- @tparam string left_name this is the gui that you want to close --- @tparam[opt] LuaPlayer the player to close the gui for -function left.close(left_name,player) - local players = player and {player} or game.connected_players - local _left = Gui.data.left[left_name] - if not _left then return end - if not Server or not Server._thread or player then - for _,next_player in pairs(players) do _left:close(next_player) end - else - Server.new_thread{ - data={players=players} - }:on_event('tick',function(thread) - if #thread.data.players == 0 then thread:close() return end - local next_player = table.remove(thread.data.players,1) - _left:close(next_player) - end):open() - end -end - - ---- Used to force the gui open for the player --- @usage left:open(player) --- @tparam luaPlayer player the player to open the gui for -function left._prototype:open(player) - player = Game.get_player(player) - if not player then error('Invalid Player') end - local left_flow = mod_gui.get_frame_flow(player) - if not left_flow[self.name] then self:first_open(player) end - left_flow[self.name].style.visible = true - if left_flow['gui-left-hide'] then left_flow['gui-left-hide'].style.visible = true end -end - ---- Used to force the gui closed for the player --- @usage left:open(player) --- @tparam luaPlayer player the player to close the gui for -function left._prototype:close(player) - player = Game.get_player(player) - if not player then error('Invalid Player') end - local left_flow = mod_gui.get_frame_flow(player) - if not left_flow[self.name] then self:first_open(player) end - left_flow[self.name].style.visible = false - local count = 0 - for _,child in pairs(left_flow.children) do if child.style.visible then count = count+1 end if count > 1 then break end end - if count == 1 and left_flow['gui-left-hide'] then left_flow['gui-left-hide'].style.visible = false end -end - ---- When the gui is first made or is updated this function is called, used by the script --- @usage left:first_open(player) -- returns the frame --- @tparam LuaPlayer player the player to draw the gui for --- @treturn LuaFrame the frame made/updated -function left._prototype:first_open(player) - player = Game.get_player(player) - local left_flow = mod_gui.get_frame_flow(player) - local frame - if left_flow[self.name] then - frame = left_flow[self.name] - frame.clear() - else - if not left_flow['gui-left-hide'] then left.hide(left_flow).style.maximal_width=15 end - frame = left_flow.add{type='frame',name=self.name,style=mod_gui.frame_style,caption=self.caption,direction='vertical'} - frame.style.visible = false - if is_type(self.open_on_join,'boolean') then frame.style.visible = self.open_on_join left_flow['gui-left-hide'].style.visible = true end - end - if is_type(self.draw,'function') then self:draw(frame) else frame.style.visible = false error('No Callback On '..self.name) end - return frame -end - ---- Toggles the visibility of the gui based on some conditions --- @usage left:toggle(player) -- returns new state --- @tparam LuaPlayer player the player to toggle the gui for, remember there are condition which need to be met --- @treturn boolean the new state that the gui is in -function left._prototype:toggle(player) - player = Game.get_player(player) - local left_flow = mod_gui.get_frame_flow(player) - if not left_flow[self.name] then self:first_open(player) end - local left_frame = left_flow[self.name] - local open = false - if is_type(self.can_open,'function') then - local success, err = pcall(self.can_open,player) - if not success then error(err) - elseif err == true then open = true - elseif global.over_ride_left_can_open then - if is_type(Role,'table') then - if Role.allowed(player,self.name) then open = true - else open = {'ExpGamingCore_Gui.unauthorized'} end - else open = true end - else open = err end - else - if is_type(Role,'table') then - if Role.allowed(player,self.name) then open = true - else open = {'ExpGamingCore_Gui.unauthorized'} end - else open = true end - end - if open == true and left_frame.style.visible ~= true then - left_frame.style.visible = true - left_flow['gui-left-hide'].style.visible = true - else - left_frame.style.visible = false - local count = 0 - for _,child in pairs(left_flow.children) do if child.style.visible then count = count+1 end if count > 1 then break end end - if count == 1 and left_flow['gui-left-hide'] then left_flow['gui-left-hide'].style.visible = false end - end - if open == false then player_return({'ExpGamingCore_Gui.cant-open-no-reason'},defines.textcolor.crit,player) player.play_sound{path='utility/cannot_build'} - elseif open ~= true then player_return({'ExpGamingCore_Gui.cant-open',open},defines.textcolor.crit,player) player.play_sound{path='utility/cannot_build'} end - return left_frame.style.visible -end - -Event.add(defines.events.on_player_joined_game,function(event) - -- draws the left guis when a player first joins, fake_event is just because i am lazy - local player = Game.get_player(event) - local frames = Gui.data.left or {} - local left_flow = mod_gui.get_frame_flow(player) - if not left_flow['gui-left-hide'] then left.hide(left_flow).style.maximal_width=15 end - local done = {} - for _,name in pairs(order_config) do - local left_frame = Gui.data.left[name] - if left_frame then - done[name] = true - left_frame:first_open(player) - end - end - for name,left_frame in pairs(frames) do - if not done[name] then left_frame:first_open(player) end - end -end) - -Event.add(defines.events.on_tick,function(event) - if ((event.tick+10)/(3600*game.speed)) % 15 == 0 then - left.update() - end -end) - -function left.on_init() - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end -end - --- calling will attempt to add a new gui -return setmetatable(left,{__call=function(self,...) return self.add(...) end}) \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/left/order_config.lua b/old/modules/DONE/Core/Gui/left/order_config.lua deleted file mode 100644 index 7f19658f..00000000 --- a/old/modules/DONE/Core/Gui/left/order_config.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - 'server-info', - 'readme', - 'science', - 'rockets', - 'player-list', - 'tasklist', - 'warp-list', - 'polls', - 'announcements', - 'admin-commands', - 'game-settings' -} \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/left/softmod.json b/old/modules/DONE/Core/Gui/left/softmod.json deleted file mode 100644 index d02b320e..00000000 --- a/old/modules/DONE/Core/Gui/left/softmod.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "ExpGamingCore.Gui.left", - "version": "4.0.0", - "description": "Adds an easy way to create auto updating left guis with toggle buttons.", - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "location": "FSM_ARCHIVE", - "keywords": [ - "Gui", - "Left", - "AutoUpdate" - ], - "collection": "ExpGamingCore.Gui@4.0.0", - "dependencies": { - "mod-gui": "*", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Server": "^4.0.0", - "FactorioStdLib.Color": "^0.8.0", - "ExpGamingCore.Gui": "^4.0.0", - "ExpGamingCore.Gui.inputs": "^4.0.0", - "ExpGamingCore.Gui.toolbar": "?^4.0.0", - "ExpGamingCore.Role": "?^4.0.0" - }, - "submodules": {} -} diff --git a/old/modules/DONE/Core/Gui/locale/de.cfg b/old/modules/DONE/Core/Gui/locale/de.cfg deleted file mode 100644 index fbdba2f7..00000000 --- a/old/modules/DONE/Core/Gui/locale/de.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingCore_Gui] -unauthorized=401 - Unbefugt: Du hast keinen Zugriff auf diese Befehle! -cant-open=Du kannst dieses Menü nicht öffnen, Grund: __1__ -cant-open-no-reason=Du kannst dieses Menü gerade nicht öffnen. \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/locale/en.cfg b/old/modules/DONE/Core/Gui/locale/en.cfg deleted file mode 100644 index f7eb1a6a..00000000 --- a/old/modules/DONE/Core/Gui/locale/en.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingCore_Gui] -unauthorized=401 - Unauthorized: Access is denied due to invalid credentials -cant-open=You can't open this panel right now, reason: __1__ -cant-open-no-reason=You can't open this panel right now \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/locale/fr.cfg b/old/modules/DONE/Core/Gui/locale/fr.cfg deleted file mode 100644 index a8976a4e..00000000 --- a/old/modules/DONE/Core/Gui/locale/fr.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingCore_Gui] -unauthorized=401 - Unauthorized: Access is denied due to invalid credentials -cant-open=You can not open this panel right now, reason: __1__ -cant-open-no-reason=You can not open this panel right now \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/locale/nl.cfg b/old/modules/DONE/Core/Gui/locale/nl.cfg deleted file mode 100644 index d53dc64c..00000000 --- a/old/modules/DONE/Core/Gui/locale/nl.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingCore_Gui] -unauthorized=401 - Onbevoegd: toegang wordt geweigerd vanwege ongeldige inloggegevens -cant-open=Je kan dit momenteel niet openen. Reden: __1__ -cant-open-no-reason=Je kan dit momenteel niet openen. \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/locale/sv-SE.cfg b/old/modules/DONE/Core/Gui/locale/sv-SE.cfg deleted file mode 100644 index 279ba842..00000000 --- a/old/modules/DONE/Core/Gui/locale/sv-SE.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingCore_Gui] -unauthorized=401 -Otillåten: Tillgång nekas på grund av otillräcklig säkerhetsprövning. -cant-open=Du kan inte öppna den här panelen just nu, orsak: __1__ -cant-open-no-reason=Du kan inte öppna den här panelen just nu \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/popup/control.lua b/old/modules/DONE/Core/Gui/popup/control.lua deleted file mode 100644 index a773c901..00000000 --- a/old/modules/DONE/Core/Gui/popup/control.lua +++ /dev/null @@ -1,130 +0,0 @@ ---- Adds a location for popups which can be dismissed by a player and created from other scripts --- @module ExpGamingCore.Gui.Popup --- @alias popup --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - ---- This is a submodule of ExpGamingCore.Gui but for ldoc reasons it is under its own module --- @function _comment - -local Game = require('FactorioStdLib.Game') -local mod_gui = require('mod-gui') -local Gui = require('ExpGamingCore.Gui') -local Server -- loaded on_init - -local popup = {} -popup._prototype = {} - ---- Used to add a popup gui style --- @usage Gui.left.add{name='foo',caption='Foo',draw=function} --- @usage return_value(data,player) -- opens popup for one player use popup.open to open for more than one player --- @param obj this is what will be made, needs a name and a draw function(root_frame,data) --- @return the object that is made, calling the returned value will open the popup for that player -function popup.add(obj) - if not is_type(obj,'table') then return end - if not is_type(obj.name,'string') then return end - verbose('Created Popup Gui: '..obj.name) - setmetatable(obj,{__index=popup._prototype,__call=function(self,data,player) local players = player and {player} or nil return popup.open(self.name,data,players) end}) - local name = obj.name; obj.name = nil - Gui.data('popup',name,obj) - obj.name = name - return obj -end - --- this is used by the script to find the popup flow -function popup.flow(player) - player = Game.get_player(player) - if not player then error('Invalid Player',2) end - local flow = mod_gui.get_frame_flow(player).popups - if not flow then flow = mod_gui.get_frame_flow(player).add{name='popups',type='flow',direction='vertical'} flow.style.visible=false end - return flow -end - ---- Use to open a popup for these players --- @usage Gui.popup.open('ban',nil,{player=1,reason='foo'}) --- @tparam string style this is the name you gave to the popup when added --- @param data this is the data that is sent to the draw function --- @tparam[opt=game.connected_players] table players the players to open the popup for -function popup.open(style,data,players) - local _popup = Gui.data.popup[style] - players = players or game.connected_players - data = data or {} - if not _popup then return end - if not Server or not Server._thread then - for _,player in pairs(players) do - if _popup.left then _popup.left:close(player) end - local flow = popup.flow(player) - flow.style.visible=true - local _frame = flow.add{ - type='frame', - direction='horizontal', - style=mod_gui.frame_style - } - local frame = _frame.add{ - type='frame', - name='inner_frame', - direction='vertical', - style='image_frame' - } - _popup.close(_frame) - if is_type(_popup.draw,'function') then - local success, err = pcall(_popup.draw,_popup,frame,data) - if not success then error(err) end - else error('No Draw On Popup '.._popup.name) end - end - else - Server.new_thread{ - data={players=players,popup=_popup,data=data} - }:on_event('tick',function(self) - if #self.data.players == 0 then self:close() return end - local player = table.remove(self.data.players,1) - if self.data.popup.left then self.data.popup.left:close(player) end - local flow = popup.flow(player) - flow.style.visible=true - local _frame = flow.add{ - type='frame', - direction='horizontal', - style=mod_gui.frame_style - } - local frame = _frame.add{ - type='frame', - name='inner_frame', - direction='vertical', - style='image_frame' - } - self.data.popup.close(_frame) - if is_type(self.data.popup.draw,'function') then - local success, err = pcall(self.data.popup.draw,self.data.popup,frame,self.data.data) - if not success then error(err) end - else error('No Draw On Popup '..self.data.popup.name) end - end):open() - end -end - -function popup._prototype:add_left(obj) - if not Gui.left then return end - obj.name = obj.name or self.name - self.left = Gui.left(obj) -end - -function popup.on_init() - if loaded_modules['ExpGamingCore.Server'] then Server = require('ExpGamingCore.Server') end -end - -function popup.on_post() - popup._prototype.close = Gui.inputs.add{ - type='button', - name='popup-close', - caption='utility/set_bar_slot', - tooltip='Close This Popup' - }:on_event('click',function(event) - local frame = event.element.parent - local parent = frame.parent - if frame and frame.valid then frame.destroy() if #parent.children == 0 then parent.style.visible = false end end - end) -end - -Event.add(defines.events.on_player_joined_game,popup.flow) - --- calling will attempt to add a new popup style -return setmetatable(popup,{__call=function(self,...) return self.add(...) end}) \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/popup/softmod.json b/old/modules/DONE/Core/Gui/popup/softmod.json deleted file mode 100644 index f4b3f736..00000000 --- a/old/modules/DONE/Core/Gui/popup/softmod.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "ExpGamingCore.Gui.popup", - "version": "4.0.0", - "description": "Adds popup guis to the gui system which builds upon the left gui system.", - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "location": "FSM_ARCHIVE", - "keywords": [ - "Gui", - "Popup", - "Left" - ], - "collection": "ExpGamingCore.Gui@4.0.0", - "dependencies": { - "mod-gui": "*", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Gui": "^4.0.0", - "ExpGamingCore.Gui.inputs": "^4.0.0", - "ExpGamingCore.Server": "?^4.0.0", - "ExpGamingCore.Gui.left": "?^4.0.0" - }, - "submodules": {} -} diff --git a/old/modules/DONE/Core/Gui/softmod.json b/old/modules/DONE/Core/Gui/softmod.json deleted file mode 100644 index 7363526b..00000000 --- a/old/modules/DONE/Core/Gui/softmod.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "ExpGamingCore.Gui", - "version": "4.0.0", - "description": "Adds a objective version to custom guis.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Library", - "Lib", - "ExpGaming", - "Core", - "Gui", - "ExpGui" - ], - "dependencies": { - "ExpGamingLib": "^4.0.0", - "FactorioStdLib.Table": "^0.8.0", - "FactorioStdLib.Color": "^0.8.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Server": "?^4.0.0" - }, - "collection": "ExpGamingCore@4.0.0", - "submodules": { - "ExpGamingCore.Gui.center": "4.0.0", - "ExpGamingCore.Gui.inputs": "4.0.0", - "ExpGamingCore.Gui.left": "4.0.0", - "ExpGamingCore.Gui.popup": "4.0.0", - "ExpGamingCore.Gui.toolbar": "4.0.0" - } -} diff --git a/old/modules/DONE/Core/Gui/src/server.lua b/old/modules/DONE/Core/Gui/src/server.lua deleted file mode 100644 index 1b613e11..00000000 --- a/old/modules/DONE/Core/Gui/src/server.lua +++ /dev/null @@ -1,40 +0,0 @@ ---- This file will be loaded when ExpGamingCore.Server is present --- @function _comment - -local Game = require('FactorioStdLib.Game') -local Server = require('ExpGamingCore.Server') - -Server.add_module_to_interface('ExpGui','ExpGamingCore.Gui') - ---- Adds a server thread that allows the camera follows to be toggled off and on -return function() - Server.new_thread{ - name='camera-follow', - data={cams={},cam_index=1,players={}} - }:on_event('tick',function(self) - local update = 4 - if self.data.cam_index >= #self.data.cams then self.data.cam_index = 1 end - if update > #self.data.cams then update = #self.data.cams end - for cam_offset = 0,update do - local _cam = self.data.cams[self.data.cam_index+cam_offset] - if not _cam then break end - if not _cam.cam.valid then table.remove(self.data.cams,self.data.cam_index) - elseif not _cam.entity.valid then table.remove(self.data.cams,self.data.cam_index) - else _cam.cam.position = _cam.entity.position if not _cam.surface then _cam.cam.surface_index = _cam.entity.surface.index end - end - end - self.data.cam_index = self.data.cam_index+update - end):on_event(defines.events.on_player_respawned,function(self,event) - if self.data.players[event.player_index] then - local remove = {} - local player = Game.get_player(event) - for index,cam in pairs(self.data.players[event.player_index]) do - if cam.valid then table.insert(self.data.cams,{cam=cam,entity=player.character,surface=player.surface}) - else table.insert(remove,index) end - end - for n,index in pairs(remove) do - table.remove(self.data.players[event.player_index],index-n+1) - end - end - end):open() -end \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/src/test.lua b/old/modules/DONE/Core/Gui/src/test.lua deleted file mode 100644 index 9ba60632..00000000 --- a/old/modules/DONE/Core/Gui/src/test.lua +++ /dev/null @@ -1,187 +0,0 @@ ---- Used to test all gui elements and parts can be used in game via Gui.test() --- @module ExpGamingCore.Gui.Test --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - ---- This is a submodule of ExpGamingCore.Gui but for ldoc reasons it is under its own module --- @function _comment - -local Game = require('FactorioStdLib.Game') -local Gui = Gui -- this is to force gui to remain in the ENV -local mod_gui = require("mod-gui") - -local gui_test_close = Gui.inputs{ - name='gui-test-close', - type='button', - caption='Close Test Gui' -}:on_event('click',function(event) event.element.parent.destroy() end) - -local caption_test = Gui.inputs{ - name='text-button', - type='button', - caption='Test' -}:on_event('click',function(event) game.print('test') end) - -local sprite_test = Gui.inputs{ - name='sprite-button', - type='button', - sprite='item/lab' -}:on_event('click',function(event) game.print('test') end) - -local input_test = Gui.inputs.add_button('test-inputs','Try RMB','alt,ctrl,shift and mouse buttons',{ - { - function(player,mouse,keys) return mouse == defines.mouse_button_type.left and keys.alt end, - function(player,element) player_return('Left: Alt',nil,player) end - }, - { - function(player,mouse,keys) return mouse == defines.mouse_button_type.left and keys.ctrl end, - function(player,element) player_return('Left: Ctrl',nil,player) end - }, - { - function(player,mouse,keys) return mouse == defines.mouse_button_type.left and keys.shift end, - function(player,element) player_return('Left: Shift',nil,player) end - }, - { - function(player,mouse,keys) return mouse == defines.mouse_button_type.right and keys.alt end, - function(player,element) player_return('Right: Alt',nil,player) end - }, - { - function(player,mouse,keys) return mouse == defines.mouse_button_type.right and keys.ctrl end, - function(player,element) player_return('Right: Ctrl',nil,player) end - }, - { - function(player,mouse,keys) return mouse == defines.mouse_button_type.right and keys.shift end, - function(player,element) player_return('Right: Shift',nil,player) end - } -}):on_event('error',function(err) game.print('this is error handling') end) - -local elem_test = Gui.inputs.add_elem_button('test-elem','item','Testing Elems',function(player,element,elem) - player_return(elem.type..' '..elem.value,nil,player) -end) - -local check_test = Gui.inputs.add_checkbox('test-check',false,'Cheat Mode',function(player,parent) - return game.players[parent.player_index].cheat_mode -end,function(player,element) - player.cheat_mode = true -end,function(player,element) - player.cheat_mode = false -end) - -local radio_test = Gui.inputs.add_checkbox('test-radio',true,'Kill Self',function(player,parent) - return false -end,function(player,element) - if player.character then player.character.die() end - Gui.inputs.reset_radio(element.parent['test-radio-reset']) -end) - -local radio_test_reset = Gui.inputs.add_checkbox('test-radio-reset',true,'Reset Kill Self',function(player,parent) - return not parent['test-radio'].state -end,function(player,element) - Gui.inputs.reset_radio(element.parent['test-radio']) -end) - -local text_test = Gui.inputs.add_text('test-text',false,'default text',function(player,text,element) - player_return(text,nil,player) -end) - -local box_test = Gui.inputs.add_text('test-box',true,'default text but a box',function(player,text,element) - player_return(text,nil,player) -end) - -local slider_test = Gui.inputs.add_slider('test-slider','vertical',0,5,function(player,parent) - return player.character_running_speed_modifier -end,function(player,value,percent,element) - player.character_running_speed_modifier = value - player_return('Value In Percent of Max '..math.floor(percent*100)-(math.floor(percent*100)%5),nil,player) -end) - -local drop_test = Gui.inputs.add_drop_down('test-drop',table.keys(defines.color),1,function(player,selected,items,element) - player.color = defines.color[selected] - player.chat_color = defines.color[selected] -end) - ---- The funcation that is called when calling Gui.test --- @function Gui.test --- @usage Gui.test() -- draws test gui --- @param[opt=game.player] player a pointer to a player to draw the test gui for -local function test_gui(player) - local player = game.player or Game.get_player(player) or nil - if not player then return end - if mod_gui.get_frame_flow(player)['gui-test'] then mod_gui.get_frame_flow(player)['gui-test'].destroy() end - local frame = mod_gui.get_frame_flow(player).add{type='frame',name='gui-test',direction='vertical'} - gui_test_close(frame) - caption_test(frame) - sprite_test(frame) - input_test(frame) - elem_test(frame) - check_test(frame) - radio_test(frame) - radio_test_reset(frame) - text_test(frame) - box_test(frame) - slider_test(frame) - drop_test(frame) -end - -Gui.toolbar.add('open-gui-test','Open Test Gui','Opens the test gui with every input',test_gui) - --- testing the center gui -Gui.center{ - name='test-center', - caption='Gui Center', - tooltip='Just a gui test' -}:add_tab('tab-1','Tab 1','Just a tab',function(frame) - frame.add{type='label',caption='Test'} -end):add_tab('tab-2','Tab 2','Just a tab',function(frame) - for i = 1,100 do - frame.add{type='label',caption='Test 2'} - end -end) - --- testing the left gui -Gui.left{ - name='test-left', - caption='Gui Left', - tooltip='just testing', - draw=function(self,frame) - for _,player in pairs(game.connected_players) do - frame.add{type='label',caption=player.name} - end - end, - can_open=function(player) return player.index == 1 end -} - -local text_popup = Gui.inputs.add_text('test-popup-text',true,'Message To Send',function(player,text,element) - element.text = text -end) -local send_popup = Gui.inputs{ - type='button', - name='test-popup-send', - caption='Send Message' -}:on_event('click',function(event) - local player = Game.get_player(event) - local message = event.element.parent['test-popup-text'].text - Gui.popup.open('test-popup',{message=message,player=player.name}) -end) -Gui.popup{ - name='test-popup', - caption='Gui Popup', - draw=function(self,frame,data) - frame.add{type='label',caption='Opened by: '..data.player} - frame.add{type='label',caption='Message: '..data.message} - end -}:add_left{ - caption='Gui Left w/ Popup', - tooltip='Send a message', - draw=function(self,frame) - text_popup:draw(frame) - send_popup:draw(frame) - end -} - -return test_gui - - - - - diff --git a/old/modules/DONE/Core/Gui/toolbar/control.lua b/old/modules/DONE/Core/Gui/toolbar/control.lua deleted file mode 100644 index 4bc95bb4..00000000 --- a/old/modules/DONE/Core/Gui/toolbar/control.lua +++ /dev/null @@ -1,90 +0,0 @@ ---- Adds a toolbar to the top left of the screen --- @module ExpGamingCore.Gui.Toolbar --- @alias toolbar --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - ---- This is a submodule of ExpGamingCore.Gui but for ldoc reasons it is under its own module --- @function _comment - -local Game = require('FactorioStdLib.Game') -local mod_gui = require('mod-gui') -local Gui = require('ExpGamingCore.Gui') -local order_config = require(module_path..'/order_config') -local Role -- this is optional and is handled by it being present, it is loaded on init - -local toolbar = {} - -toolbar.hide = Gui.inputs{ - name='gui-toolbar-hide', - type='button', - caption='<' -}:on_event('click',function(event) - if event.element.caption == '<' then - event.element.caption = '>' - for _,child in pairs(event.element.parent.children) do - if child.name ~= event.element.name then child.style.visible = false end - end - else - event.element.caption = '<' - for _,child in pairs(event.element.parent.children) do - if child.name ~= event.element.name then child.style.visible = true end - end - end -end) - ---- Add a button to the toolbar, ranks need to be allowed to use these buttons if ranks is preset --- @usage toolbar.add('foo','Foo','Test',function() game.print('test') end) --- @tparam string name the name of the button --- @tparam string caption can be a sprite path or text to show --- @tparam string tooltip the help to show for the button --- @tparam function function callback the which is called on_click --- @treturn table the button object that was made, calling the returned value will draw the toolbar button added -function toolbar.add(name,caption,tooltip,callback) - verbose('Created Toolbar Button: '..name) - local button = Gui.inputs.add{type='button',name=name,caption=caption,tooltip=tooltip} - button:on_event(Gui.inputs.events.click,callback) - Gui.data('toolbar',name,button) - return button -end - ---- Draws the toolbar for a certain player --- @usage toolbar.draw(1) --- @param player the player to draw the tool bar of -function toolbar.draw(player) - player = Game.get_player(player) - if not player then return end - local toolbar_frame = mod_gui.get_button_flow(player) - toolbar_frame.clear() - if not Gui.data.toolbar then return end - toolbar.hide(toolbar_frame).style.maximal_width = 15 - local done = {} - for _,name in pairs(order_config) do - local button = Gui.data.toolbar[name] - if button then - done[name] = true - if is_type(Role,'table') then - if Role.allowed(player,name) then - button(toolbar_frame) - end - else button(toolbar_frame) end - end - end - for name,button in pairs(Gui.data.toolbar) do - if not done[name] then - if is_type(Role,'table') then - if Role.allowed(player,name) then - button(toolbar_frame) - end - else button(toolbar_frame) end - end - end -end - -function toolbar.on_init() - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end -end - -Event.add({defines.events.on_role_change,defines.events.on_player_joined_game},toolbar.draw) --- calling with only a player will draw the toolbar for that player, more params will attempt to add a button -return setmetatable(toolbar,{__call=function(self,player,extra,...) if extra then return self.add(player,extra,...) else self.draw(player) end end}) \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/toolbar/order_config.lua b/old/modules/DONE/Core/Gui/toolbar/order_config.lua deleted file mode 100644 index 7f19658f..00000000 --- a/old/modules/DONE/Core/Gui/toolbar/order_config.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - 'server-info', - 'readme', - 'science', - 'rockets', - 'player-list', - 'tasklist', - 'warp-list', - 'polls', - 'announcements', - 'admin-commands', - 'game-settings' -} \ No newline at end of file diff --git a/old/modules/DONE/Core/Gui/toolbar/softmod.json b/old/modules/DONE/Core/Gui/toolbar/softmod.json deleted file mode 100644 index 54884fbf..00000000 --- a/old/modules/DONE/Core/Gui/toolbar/softmod.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "ExpGamingCore.Gui.toolbar", - "version": "4.0.0", - "description": "Adds a toolbar at the top of the screen", - "author": "Cooldude2606", - "contact": "Discord: Cooldude26060#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "location": "FSM_ARCHIVE", - "keywords": [ - "Gui", - "Toolbar", - "Buttons" - ], - "collection": "ExpGamingCore.Gui@4.0.0", - "dependencies": { - "mod-gui": "*", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Gui": "^4.0.0", - "ExpGamingCore.Gui.inputs": "^4.0.0", - "ExpGamingCore.Role": "?^4.0.0" - }, - "submodules": {} -} diff --git a/old/modules/DONE/Core/Role/config.lua b/old/modules/DONE/Core/Role/config.lua deleted file mode 100644 index aadb38fb..00000000 --- a/old/modules/DONE/Core/Role/config.lua +++ /dev/null @@ -1,284 +0,0 @@ --- the two below are used internally by the role system and should not be REMOVED, name must be kept the same and used at least once -Role.add_flag('is_default') -- this must be included in at least one role -Role.add_flag('is_root',function(player,state) - if state then game.print('--- !!!ALERT!!! --- '..player.name..' has been given a role with ROOT ACCESS --- !!!ALERT!!! ---') end - if player.character then player.character.destructible = not state end -end) -- the SERVER role will have root but you may assign this to other roles --- the two below are ised internally by the role system and should not be RENAMED, name must be kept the same but does not need to be used -Role.add_flag('block_auto_promote') -- is not required but name is used internally to block time based promotions -Role.add_flag('is_antiroot',function(player,state) if player.character then player.character.destructible = not state end end) -- not required but setting true will disallow everything for that role --- all below are not required and are not used internally -Role.add_flag('is_admin',function(player,state) player.admin = state end) -- highly recommenced but not required -Role.add_flag('is_spectator',function(player,state) player.spectator = state end) -Role.add_flag('is_jail',function(player,state) if player.character then player.character.active = not state end end) -Role.add_flag('allow_afk_kick') -Role.add_flag('is_donator') -Role.add_flag('is_timed') -Role.add_flag('is_verified') -Role.add_flag('not_reportable') - --- Root -Role{ - name='Root', - short_hand='Root', - tag='[Root]', - group='Root', - colour={r=255,b=255,g=255}, - is_root=true, - is_admin=true, - is_spectator=true, - not_reportable=true, - allow={} -} -Role{ - name='Community Manager', - short_hand='Com Mngr', - tag='[Com Mngr]', - group='Root', - colour={r=150,g=68,b=161}, - is_admin=true, - is_spectator=true, - is_donator=true, - not_reportable=true, - allow={} -} -Role{ - name='Developer', - short_hand='Dev', - tag='[Dev]', - group='Root', - colour={r=179,g=125,b=46}, - is_admin=true, - is_spectator=true, - is_donator=true, - not_reportable=true, - allow={ - ['interface']=true, - ['cheat-mode']=true - } -} - --- Admin -Role{ - name='Administrator', - short_hand='Admin', - tag='[Admin]', - group='Admin', - colour={r=233,g=63,b=233}, - is_admin=true, - is_spectator=true, - is_verified=true, - not_reportable=true, - allow={ - ['game-settings']=true, - ['always-warp']=true, - ['admin-items']=true - } -} -Role{ - name='Moderator', - short_hand='Mod', - tag='[Mod]', - group='Admin', - colour={r=0,g=170,b=0}, - is_admin=true, - is_spectator=true, - is_verified=true, - not_reportable=true, - allow={ - ['set-home']=true, - ['home']=true, - ['return']=true, - ['bonus']=true, - ['announcements']=true, - ['rank-changer']=true, - } -} -Role{ - name='Trainee', - short_hand='TrMod', - tag='[TrMod]', - group='Admin', - colour={r=0,g=196,b=137}, - is_spectator=true, - is_verified=true, - not_reportable=true, - allow={ - ['go-to']=true, - ['bring']=true, - ['set-home']=false, - ['home']=false, - ['return']=false, - ['bonus']=false, - ['admin-commands']=true, - ['warn']=true, - ['temp-ban']=true, - ['clear-warnings']=true, - ['clear-reports']=true, - ['clear-all']=true, - ['clear-inv']=true, - } -} - --- High Member -Role{ - name='Sponsor', - short_hand='Spon', - tag='[Sponsor]', - group='HiMember', - colour={r=247,g=246,b=54}, - is_spectator=true, - is_donator=true, - allow={} -} -Role{ - name='Pay to Win', - short_hand='P2W', - tag='[P2W]', - group='HiMember', - colour={r=238,g=172,b=44}, - is_donator=true, - allow={ - ['jail']=true, - ['unjail']=true, - ['bonus']=true, - ['bonus-respawn']=true - } -} -Role{ - name='Donator', - short_hand='Don', - tag='[Donator]', - group='HiMember', - colour={r=230,g=99,b=34}, - is_donator=true, - allow_afk_kick=true, - allow={ - ['set-home']=true, - ['home']=true, - ['return']=true, - } -} -Role{ - name='Partner', - short_hand='Part', - tag='[Partner]', - group='HiMember', - colour={r=140,g=120,b=200}, - allow_afk_kick=false, - is_spectator=true, - allow={ - ['global-chat']=true, - } -} -Role{ - name='Veteran', - short_hand='Vet', - tag='[Veteran]', - group='HiMember', - colour={r=140,g=120,b=200}, - is_timed=true, - is_verified=true, - allow_afk_kick=true, - time=600, -- 10 hours - allow={ - ['tree-decon']=true, - ['create-poll']=true, - ['repair']=true - } -} - --- Member -Role{ - name='Member', - short_hand='Mem', - tag='[Member]', - group='Member', - colour={r=24,g=172,b=188}, - is_verified=true, - allow_afk_kick=true, - allow={ - ['edit-tasklist']=true, - ['make-warp']=true, - ['nuke']=true, - ['verified']=true - } -} -Role{ - name='Regular', - short_hand='Reg', - tag='[Regular]', - group='Member', - colour={r=79,g=155,b=163}, - allow_afk_kick=true, - is_timed=true, - time=180, -- 3 hours - allow={ - ['kill']=true, - ['decon']=true, - ['capsules']=true - } -} - --- Guest -Role{ - name='Guest', - short_hand='', - tag='', - group='User', - colour={r=185,g=187,b=160}, - allow_afk_kick=true, - is_default=true, - allow={ - ['player-list']=true, - ['readme']=true, - ['rockets']=true, - ['science']=true, - ['tasklist']=true, - ['report']=true, - ['warp-list']=true, - ['polls']=true, - ['tag']=true, - ['tag-clear']=true, - ['report']=true - } -} - --- Jail -Role{ - name='Jail', - short_hand='Jail', - tag='[Jail]', - group='Jail', - colour={r=50,g=50,b=50}, - is_jail=true, - is_antiroot=true, - block_auto_promote=true, - allow={} -} - -Role.order = { - 'Root', - 'Community Manager', - 'Developer', - 'Administrator', - 'Moderator', - 'Trainee', - 'Sponsor', - 'Pay to Win', - 'Donator', - 'Partner', - 'Veteran', - 'Member', - 'Regular', - 'Guest', - 'Jail' -} - -Role.set_preassign{ - ["cooldude2606"]={"Developer","Admin","Mod"}, - ["aldldl"]={"Sponsor","Admin","Donator","Sponsor","Member","Mod"}, - ["arty714"]={"Admin","Community Manager","Member","Mod"}, - ["drahc_pro"]={"Admin","Member","Mod"}, - ["mark9064"]={"Admin","Member","Mod"} -} diff --git a/old/modules/DONE/Core/Role/control.lua b/old/modules/DONE/Core/Role/control.lua deleted file mode 100644 index 61a32206..00000000 --- a/old/modules/DONE/Core/Role/control.lua +++ /dev/null @@ -1,532 +0,0 @@ ---- Adds roles where a player can have more than one role --- @module ExpGamingCore.Role@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias Role - --- Module Require -local Group = require('ExpGamingCore.Group') -local Game = require('FactorioStdLib.Game') - --- Local Variables -local role_change_event_id = script.generate_event_name('on_role_change') -local RoleGlobal - --- Module Define -local _RoleSelfReference -local module_verbose = false -local Role = { - _prototype={}, - order={}, - flags={}, - actions={}, - preassign={}, - meta={times={},groups={},count=0}, - roles=setmetatable({},{ - __index=table.autokey, - __newindex=function(tbl,key,value) - rawset(tbl,key,_RoleSelfReference.define(value)) - end - }), - on_init=function(self) - if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server').add_module_to_interface('Role','ExpGamingCore.Role') end - if loaded_modules['ExpGamingCore.Command'] then require(module_path..'/src/commands',{self=self}) end - if loaded_modules['ExpGamingCore.Sync'] then require(module_path..'/src/sync',{self=self,RoleGlobal=RoleGlobal}) end - end, - on_post=function(self) - -- creates a server role with root access - self.meta.server = self{name='SERVER',group='Root',is_root=true,allow={}} - -- loads the roles in config - require(module_path..'/config',{Role=self}) - self.order[0] = 'SERVER' - -- joins role allows into a chain - local previous - for index,role_name in pairs(self.order) do - local role = self.get(role_name) - if not role then error('Invalid role name in order listing: '..role_name) return end - if role.is_default then self.meta.default = role end - if role.is_timed then self.meta.times[role.name] = {index,role.time*3600} end - if not self.meta.groups[role.group.name] then self.meta.groups[role.group.name] = {lowest=index,highest=index} end - if self.meta.groups[role.group.name].highest > index then self.meta.groups[role.group.name].highest = index end - if self.meta.groups[role.group.name].lowest < index then self.meta.groups[role.group.name].lowest = index end - if previous then setmetatable(previous.allow,{__index=role.allow}) end - self.meta.count = self.meta.count+1 - role.index = index - previous = role - end - if previous then setmetatable(previous.allow,{__index=function(tbl,key) return false end}) - else error('Invalid roles, no roles to load.') end - end -} -_RoleSelfReference=Role - --- Global Define -local global = { - change_cache_length=15, - changes={}, - latest_change={}, - preassign={}, - players={}, - roles={} -} -Global.register(global,function(tbl) RoleGlobal = tbl end) - --- Function Define - ---- Used to set default roles for players who join --- @usage Role.set_preassign{name={roles}} -function Role.set_preassign(tbl) if game then global.preassign = tbl else Role.preassign = tbl end end - ---- Defines a new instance of a role --- @usage Role.define{name='Root',short_hand='Root',tag='[Root]',group='Root',colour={r=255,b=255,g=255},is_root=true,allow={}} -- returns new role --- @usage Role{name='Root',short_hand='Root',tag='[Root]',group='Root',colour={r=255,b=255,g=255},is_root=true,allow={}} -- returns new role --- @tparam table table obj contains the strings: name,short_hand,tag a called allow a table called colour and a pointer to a permission group --- @treturn Role the role which has been made -function Role.define(obj) - if not type_error(game,nil,'Cant define Role during runtime.') then return end - if not type_error(obj.name,'string','Role creation is invalid: role.name is not a string') then return end - if not is_type(obj.short_hand,'string') then obj.short_hand = obj.name:sub(1,3) end - if not is_type(obj.tag,'string') then obj.tag = '['..obj.short_hand..']' end - if not is_type(obj.colour,'table') then obj.colour = {r=255,b=255,g=255} end - if not type_error(obj.allow,'table','Role creation is invalid: role.allow is not a table') then return end - obj.group = Group.get(obj.group) - if not type_error(obj.group,'table','Role creation is invalid: role.group is invalid') then return end - if obj.time and not type_error(obj.time,'number','Role creation is invalid: role.time is not a number') then return end - verbose('Created Role: '..obj.name) - setmetatable(obj,{__index=Role._prototype}) - obj.connected_players = setmetatable({self=obj,connected=true},Role._prototype.players_mt) - obj.players = setmetatable({self=obj},Role._prototype.players_mt) - rawset(Role.roles,obj.name,obj) - table.insert(Role.order,obj.name) - return obj -end - ---- Used to get the role of a player or the role by name --- @usage Role.get('foo') -- returns group foo --- @usage Role.get(player) -- returns group of player --- @tparam ?LuaPlayer|pointerToPlayer|string mixed can either be the name of the role or a player identifier --- @treturn table the group which was found or nil -function Role.get(mixed,forceIsRole) - local player = game and Game.get_player(mixed) - if player == SERVER then return {Role.meta.server} end - if not forceIsRole and player then - local rtn = {} - if not global.players[player.index] then return Role.meta.default and {Role.meta.default} or {} end - for _,role in pairs(global.players[player.index]) do table.insert(rtn,Role.get(role)) end - return rtn - elseif is_type(mixed,'table') and mixed.group then return mixed - elseif is_type(mixed,'string') then return Role.roles[mixed] - elseif is_type(mixed,'number') then - for _,role in pairs(Role.roles) do - if role.index == mixed then return role end - end - end -end - ---- Used to place a player into a role(s) --- @usage Role.assign(player,'Root') --- @usage Role.assign(player,{'Root','Foo'}) --- @tparam ?LuaPlayer|pointerToPlayer player the player to assign the role to --- @tparam table ?string|role|table the role to add the player to, if its a then it will act recursively though the table --- @tparam[opt=''] ?LuaPlayer|pointerToPlayer by_player the player who assigned the roles to the player --- @tparam[opt] table batch this is used internally to prevent multiple event calls, contains {role_index_in_batch,batch} --- @treturn boolean was the player assigned the roles -function Role.assign(player,role,by_player,batch) - player = Game.get_player(player) - if not player then error('Invalid player #1 given to Role.assign.',2) return end - verbose('Assigning Roles: '..serpent.line(role)..' to: '..player.name) - -- this loops over a table of role if given; will return if ipairs returns, else will assume it was meant to be a role and error - if is_type(role,'table') and not role.name then - local ctn = 0 - for n,_role in ipairs(role) do ctn=ctn+1 Role.assign(player,_role,by_player,{n,role}) end - if ctn > 0 then if not batch then table.insert(global.changes[player.index],{'assign',role}) global.latest_change = {player.index,'assign',role} end return end - end - role = Role.get(role) - if not role then error('Invalid role #2 given to Role.assign.',2) return end - -- this acts as a way to prevent the global table getting too full - if not global.changes[player.index] then global.changes[player.index]={} end - if #global.changes[player.index] > global.change_cache_length then table.remove(global.changes[player.index],1) end - if not batch then table.insert(global.changes[player.index],{'assign',role.name}) global.latest_change = {player.index,'assign',role.name} end - return role:add_player(player,by_player,batch) -end - ---- Used to remove a player from a role(s) --- @usage Role.unassign(player,'Root') --- @tparam ?LuaPlayer|pointerToPlayer player the player to unassign the role to --- @tparam table ?string|role|table role the role to remove the player from, if its a then it will act recursively though the table --- @tparam[opt=''] ?LuaPlayer|pointerToPlayer by_player the player who unassigned the roles from the player --- @tparam[opt] table batch this is used internally to prevent multiple event calls --- @treturn boolean was the player unassigned the roles -function Role.unassign(player,role,by_player,batch) - player = Game.get_player(player) - if not player then error('Invalid player #1 given to Role.unassign.',2) return end - verbose('Assigning Roles: '..serpent.line(role)..' to: '..player.name) - -- this loops over a table of role if given; will return if ipairs returns, else will assume it was meant to be a role and error - if is_type(role,'table') and not role.name then - local ctn = 0 - for n,_role in ipairs(role) do ctn=ctn+1 Role.unassign(player,_role,by_player,{n,role}) end - if ctn > 0 then if not batch then table.insert(global.changes[player.index],{'unassign',role}) global.latest_change = {player.index,'unassign',role} end return end - end - role = Role.get(role) - if not role then error('Invalid role #2 given to Role.unassign.',2) return end - if not global.changes[player.index] then global.changes[player.index]={} end - -- this acts as a way to prevent the global table getting too full - if #global.changes[player.index] > global.change_cache_length then table.remove(global.changes[player.index],1) end - if not batch then table.insert(global.changes[player.index],{'unassign',role.name}) global.latest_change = {player.index,'unassign',role.name} end - return role:remove_player(player,by_player,batch) -end - ---- Returns the highest role given in a list, if a player is passed then it returns the highest role of the player --- @usage Role.get_highest{'Root','Admin','Mod'} -- returns Root (given that root is highest) --- @usage Role.get_highest(player) -- returns the players highest role --- @tparam table ?table|LuaPlayer|pointerToPlayer options of options or a player --- @treturn role the highest role given in the options -function Role.get_highest(options) - local player = Game.get_player(options) - if player then options = Role.get(player) end - if not type_error(options,'table','Invalid argument #1 to Role.get_highest, options is not a table of roles.') then return end - local highest_index = -1 - local highest - for _,role_name in pairs(options) do - local role = Role.get(role_name) - if not role then error('Invalid role inside options: '..serpent.line(role_name)) return end - if highest_index == -1 or role.index < highest_index then highest_index,highest = role.index,role end - end - return highest -end - ---- Uses the change cache to revert changes to players roles --- @usage Role.revert(player) -- reverts the last change to the players roles --- @tparam ?LuaPlayer|pointerToPlayer player the player to revert the changes of --- @tparam[opt] ?LuaPlayer|pointerToPlayer the player who preformed the role revert --- @tparam[opt=1] number count the of reverts to do, if 0 all changes cached are reverted --- @treturn number the number of changes that occurred -function Role.revert(player,by_player,count) - player = Game.get_player(player) - if not player then error('Invalid player #1 given to Role.revert.',2) return end - if count and not type_error(count,'number','Invalid argument #2 to Role.revert, count is not a number.') then return end - local changes = global.changes[player.index] or {} - if #changes == 0 then error('Player has no role changes logged, can not revert.') end - count = count or 1 - local ctn = 0 - if count > #changes or count == 0 then count = #changes end - for i = 1,count do - local change = table.remove(changes) - if not change then break end - local batch = is_type(change[2],'table') and change[2] or {change[2]} - if change[1] == 'assign' then Role.unassign(player,change[2],by_player,batch) end - if change[1] == 'unassign' then Role.assign(player,change[2],by_player,batch) end - ctn=ctn+1 - end - return ctn -end - ---- Adds a flag which can be set on roles; these flags act as a quick way to access general role changes --- @usage Role.add_flag('is_admin',function(player,state) player.admin = state end) -- the function is passed player and if the flag is true or false --- @tparam string flag the name of the flag that is being added --- @tparam[opt] function function callback the function(player,state) which is called when a player loses or gains a flag, if nil no is called -function Role.add_flag(flag,callback) - if not type_error(flag,'string','Invalid argument #1 to Role.add_flag, flag is not a string.') then return end - if callback and not type_error(callback,'function','Invalid argument #2 to Role.add_flag, callback is not a function.') then return end - verbose('Added flag: '..flag) - Role.flags[flag] = callback or true -end - ---- Checks if a player or role has the requested flag, if player all roles of player are checked (true has priority) --- @usage Role.has_flag(role,'is_admin') -- returns true if this role has is_admin set --- @tparam role|LuaPlayer|pointerToPlayer mixed the player or role that will be tested --- @tparam string flag the flag to test for --- @treturn boolean if the flag was true or false, false if nil -function Role.has_flag(mixed,flag) - if not type_error(flag,'string','Invalid argument #2 to Role.has_flag, flag is not a string.') then return end - local roles = Role.get(mixed) - if not type_error(roles,'table','Invalid argument #1 to Role.has_flag, mixed is not a role or player.') then return end - if #roles > 0 then for _,role in pairs(roles) do - if role:has_flag(flag) then return true end - end elseif roles:has_flag(flag) then return true end - return false -end - ---- Adds a action to be used by the role system --- @usage Role.add_action('foo') --- @tparam string action the name of the action that will be added -function Role.add_action(action) - if not type_error(action,'string','Invalid argument #1 to Role.add_action, action is not a string.') then return end - verbose('Added action: '..action) - table.insert(Role.actions,action) -end - ---- Checks if a player or role is allowed the requested action, if player all roles of player are checked (true has priority) --- @usage Role.allowed(role,'foo') -- returns true if this role is allowed 'foo' --- @tparam ?role|LuaPlayer|pointerToPlayer mixed the player or role that will be tested --- @tparam string action the action to test for --- @treturn boolean if the action is allowed for the player or role -function Role.allowed(mixed,action) - if not type_error(action,'string','Invalid argument #2 to Role.allowed, action is not a string.') then return end - local roles = Role.get(mixed) - if not type_error(roles,'table','Invalid argument #1 to Role.allowed, mixed is not a role or player.') then return end - if #roles > 0 then for _,role in pairs(roles) do - if role:allowed(action) then return true end - end elseif roles:allowed(action) then return true end - return false -end - ---- Prints to all roles and players of those roles which are greater than the given role (or if inv then all below) --- @usage Role.print('Admin','Hello, World!') -- returns the number of players who received the message --- @tparam ?role|string role the role which acts as the turning point of the print (always included regardless of inv value) --- @param rtn the value that will be returned to the players --- @tparam[opt] table colour the colour that you want the message printed in --- @tparam[opt=false] boolean inv true to print to roles below, false to print to roles above --- @treturn number the number of players who received the message -function Role.print(role,rtn,colour,inv) - role = Role.get(role,true) - if not type_error(role,'table','Invalid argument #1 to Role.print, role is invalid.') then return end - if colour and not type_error(colour,'table','Invalid argument #3 to Role.print, colour is not a table.') then return end - if inv and not type_error(inv,'boolean','Invalid argument #4 to Role.print, inv is not a boolean.') then return end - local message = inv and {'ExpGamingCore-Role.default-print',rtn} or {'ExpGamingCore-Role.print',role.name,rtn} - local change = inv and 1 or -1 - local ctn = 0 - local i = role.index - while true do - local _role = Role.get(i,true) - if not _role then break end - ctn=ctn+_role:print(message,colour) - i=i+change - end - return ctn -end - ---- Prints all registered roles and there important information (debug) --- @tparam[opt] ?role|string the role to print the info of, if nil then all roles are printed in order of power --- @tparam[opt=game.player] ?LuaPlayer|pointerToPlayer the player to print the info to, default the player who ran command -function Role.debug_output(role,player) - player = Game.get_player(player) or game.player - if not player then error('Invalid player #2 given to Role.debug_output.',2) return end - local function _output(_role) - local flags = {};for flag in pairs(Role.flags) do if _role:has_flag(flag) then table.insert(flags,flag) end end - local rtn = string.format('%s) %q-%q || Tag: %s Short Hand: %q Time: %s Flags: %s', - _role.index,_role.group.name,_role.name,_role.tag,_role.short_hand,tostring(_role.time),table.concat(flags,', ')) - player_return(rtn,_role.colour,player) - end - if role then - role = Role.get(role) - if not type_error(role,'table','Invalid argument #1 to Role.print, role is invalid.') then return end - _output(role) - else for index,_role in pairs(Role.roles) do _output(_role) end end -end - ---- Used to test if a role has a flag set --- @usage role:has_flag('is_admin') -- returns true if the role has the flag 'is_admin' --- @tparam string flag the flag to test for --- @treturn boolean true if the flag is set else false -function Role._prototype:has_flag(flag) - if not self_test(self,'role','has_flag') then return end - if not type_error(flag,'string','Invalid argument #1 to role:has_flag, flag is not a string.') then return end - return self[flag] or false -end - ---- Used to test if a role is allowed an action --- @usage role:allowed('foo') -- returns true if the role is allowed 'foo' --- @tparam string action the action to test for --- @treturn boolean true if the action is allowed else false -function Role._prototype:allowed(action) - if not self_test(self,'role','allowed') then return end - if not type_error(action,'string','Invalid argument #1 to role:allowed, action is not a string.') then return end - if self.is_antiroot then return false end - return self.allow[action] or self.is_root or false -- still include is_root exception flag -end - ---- Returns the players who have this role --- @usage role:get_player() -- returns table of players --- @usage role.players -- returns table of players --- @usage role.connected_players -- returns table of online players --- @tparam[opt] boolean online if true only returns online players -function Role._prototype:get_players(online) - if not self_test(self,'role','get_players') then return end - if online and not type_error(online,'boolean','Invalid argument #1 to role:get_players, online is not a boolean.') then return end - if not global.roles[self.name] then global.roles[self.name] = {} end - if self.is_default then if online then return game.connected_players else return game.players end end - local rtn = {} - for _,player_index in pairs(global.roles[self.name]) do - local player = game.players[player_index] - if player and not online or player.connected then table.insert(rtn,player) end - end - return rtn -end - --- this is used to create a connected_players table -Role._prototype.players_mt = { - __call=function(tbl) return tbl.self:get_players(tbl.connected) end, - __pairs=function(tbl) - local players = tbl.self:get_players(tbl.connected) - local function next_pair(tbl,key) - local k, v = next(players, key) - if v then return k,v end - end - return next_pair, players, nil - end, - __ipairs=function(tbl) - local players = tbl.self:get_players(tbl.connected) - local function next_pair(tbl,key) - local k, v = next(players, key) - if v then return k,v end - end - return next_pair, players, nil - end -} - - ---- Prints a message to all players who have this role --- @usage role:print('Hello, World!') -- returns number of players who received the message --- @param rtn the message to print to the players --- @tparam[opt] table colour the colour to print the message in --- @treturn number the number of players who received the message -function Role._prototype:print(rtn,colour) - if not self_test(self,'role','print') then return end - if colour and not type_error(colour,'table','Invalid argument #2 to Role.print, colour is not a table.') then return end - local ctn = 0 - for _,player in pairs(self:get_players(true)) do ctn=ctn+1 player_return(rtn,colour,player) end - return ctn -end - ---- Returns a table that describes all the permissions and which this role is allowed --- @usage role:get_permissions() -- returns table of permissions --- @treturn table a table of permissions, only includes ones which were defined with Role.add_action -function Role._prototype:get_permissions() - if not self_test(self,'role','get_permissions') then return end - local rtn = {} - for _,action in pairs(Role.actions) do rtn[action] = self:allowed(action) end - return rtn -end - ---- Adds a player to this role (players can have more than one role) --- @usage role:add_player(player) --- @tparam ?LuaPlayer|PointerToPlayer player the player to add --- @tparam[opt] ?LuaPlayer|PointerToPlayer by_player the player who ran the command --- @tparam[opt] table batch this is used internally to prevent multiple event calls -function Role._prototype:add_player(player,by_player,batch) - if not self_test(self,'role','add_player') then return end - player = Game.get_player(player) - if not player then error('Invalid player #1 given to role:add_player.',2) return end - by_player = Game.get_player(by_player) or SERVER - if not global.roles[self.name] then global.roles[self.name] = {} end - if not global.players[player.index] then global.players[player.index] = {} end - local highest = Role.get_highest(player) or Role.meta.default - for _,player_index in pairs(global.roles[self.name]) do if player_index == player.index then return end end - table.insert(global.roles[self.name],player.index) - table.insert(global.players[player.index],self.name) - script.raise_event(role_change_event_id,{ - name=role_change_event_id, - tick=game.tick, - player_index=player.index, - by_player_index=by_player.index, - old_highest=highest.name, - role_name=self.name, - batch=batch and batch[2] or {self.name}, - batch_index=batch and batch[1] or 1, - effect='assign' - }) -end - ---- Removes a player from this role (players can have more than one role) --- @usage role:remove_player(player) --- @tparam ?LuaPlayer|PointerToPlayer player the player to remove --- @tparam[opt] ?LuaPlayer|PointerToPlayer by_player the player who ran the command --- @tparam[opt] table batch this is used internally to prevent multiple event calls -function Role._prototype:remove_player(player,by_player,batch) - if not self_test(self,'role','add_player') then return end - player = Game.get_player(player) - if not player then error('Invalid player #1 given to role:remove_player.',2) return end - by_player = Game.get_player(by_player) or SERVER - if not global.roles[self.name] then global.roles[self.name] = {} end - if not global.players[player.index] then global.players[player.index] = {} end - local highest = Role.get_highest(player) or Role.meta.default - local index = 0 - for _index,player_index in pairs(global.roles[self.name]) do if player_index == player.index then index=_index break end end - table.remove(global.roles[self.name],index) - for _index,role_name in pairs(global.players[player.index]) do if role_name == self.name then index=_index break end end - table.remove(global.players[player.index],index) - script.raise_event(role_change_event_id,{ - name=role_change_event_id, - tick=game.tick, - player_index=player.index, - by_player_index=by_player.index, - old_highest=highest.name, - role_name=self.name, - batch=batch and batch[2] or {self.name}, - batch_index=batch and batch[1] or 1, - effect='unassign' - }) -end - --- Event Handlers Define -Event.add(role_change_event_id,function(event) - -- variable init - local player = Game.get_player(event) - local by_player = Game.get_player(event.by_player_index) or SERVER - local role = Role.get(event.role_name) - local highest = Role.get_highest(player) - if not highest then Role.meta.default:add_player(player) highest = Role.meta.default end - -- gets the flags the player currently has - for flag,callback in pairs(Role.flags) do if is_type(callback,'function') then callback(player,Role.has_flag(player,flag)) end end - -- assign new tag and group of highest role - Group.assign(player,highest.group) - local old_highest_tag = Role.get(event.old_highest).tag or '' - local start, _end = string.find(player.tag,old_highest_tag,1,true) - if start and old_highest_tag ~= highest.tag then player.tag = string.sub(player.tag,0,start-1)..highest.tag..string.sub(player.tag,_end+1) end - if not start then player.tag = highest.tag player_return({'ExpGamingCore-Role.tag-reset'},nil,player) end - if player.online_time > 60 then - -- send a message to other players - if event.batch_index == 1 then - local names = {} - for _,name in pairs(event.batch) do local next_role = Role.get(name) if next_role then table.insert(names,next_role.name) end end - if event.effect == 'assign' then - if not role.is_jail then player.play_sound{path='utility/achievement_unlocked'} end - game.print{'ExpGamingCore-Role.default-print',{'ExpGamingCore-Role.assign',player.name,table.concat(names,', '),by_player.name}} - else - player.play_sound{path='utility/game_lost'} - game.print{'ExpGamingCore-Role.default-print',{'ExpGamingCore-Role.unassign',player.name,table.concat(names,', '),by_player.name}} - end - end - -- log change to file - game.write_file('role-change.json', - table.json({ - tick=game.tick, - effect=event.effect, - role_name=role.name, - player_name=player.name, - by_player_name=by_player.name, - play_time=player.online_time, - highest_role_name=highest.name, - old_highest=event.highest, - batch_count=#event.batch, - batch_index=event.batch_index - })..'\n' - , true, 0) - end -end) - -Event.add(defines.events.on_player_created,function(event) - local player = Game.get_player(event) - local highest = Role.get_highest(player) or Role.meta.default - Group.assign(player,highest.group) - player.tag=highest.tag - if global.preassign[player.name:lower()] then Role.assign(player,global.preassign[player.name:lower()]) end - if Role.preassign[player.name:lower()] then Role.assign(player,Role.preassign[player.name:lower()]) end -end) - -Event.add(defines.events.on_tick,function(event) - if game.tick%(3600*5) ~= 0 then return end -- every 5 minutes - for _,player in pairs(game.connected_players) do - if not Role.has_flag(player,'block_auto_promote') then - local highest = Role.get_highest(player) - for role_name, time in pairs(Role.meta.times) do - if highest.index > time[1] and (player.online_time) > time[2] then Role.assign(player,role_name) end - end - end - end -end) - --- Module Return --- calling will attempt to define a new role -return setmetatable(Role,{__call=function(tbl,...) return tbl.define(...) end}) \ No newline at end of file diff --git a/old/modules/DONE/Core/Role/locale/en.cfg b/old/modules/DONE/Core/Role/locale/en.cfg deleted file mode 100644 index 4cb41594..00000000 --- a/old/modules/DONE/Core/Role/locale/en.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[ExpGamingCore-Role] -default-print=[Everyone]: __1__ -print=[__1__]: __2__ -assign=__1__ was assigned to __2__ by __3__ -unassign=__1__ was unassigned from __2__ by __3__ -tag-reset=Your Tag was reset due to a role change \ No newline at end of file diff --git a/old/modules/DONE/Core/Role/softmod.json b/old/modules/DONE/Core/Role/softmod.json deleted file mode 100644 index 3af9da54..00000000 --- a/old/modules/DONE/Core/Role/softmod.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "ExpGamingCore.Role", - "version": "4.0.0", - "description": "Adds roles where a player can have more than one role", - "location": "FSM_ARCHIVE", - "keywords": [ - "Role", - "Ranks", - "Permissions", - "Alowed", - "Admin" - ], - "dependencies": { - "ExpGamingLib": "^4.0.0", - "FactorioStdLib.Table": "^0.8.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Group": "^4.0.0", - "ExpGamingCore.Server": "?^4.0.0", - "ExpGamingCore.Command": "?^4.0.0", - "ExpGamingCore.Sync": "?^4.0.0" - }, - "collection": "ExpGamingCore@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/Core/Role/src/commands.lua b/old/modules/DONE/Core/Role/src/commands.lua deleted file mode 100644 index 612a781a..00000000 --- a/old/modules/DONE/Core/Role/src/commands.lua +++ /dev/null @@ -1,28 +0,0 @@ -local Role = self - -commands.add_validation('player-rank',function(value,event) - local player,err = commands.validate['player'](value) - if err then return commands.error(err) end - local rtn = Role.get_highest(player).index > Role.get_highest(event).index and player or player.index == event.player_index and player or nil - if not rtn then return commands.error{'ExpGamingCore_Command.error-player-rank'} end return rtn -end) - -commands.add_validation('player-rank-online',function(value,event) - local player,err = commands.validate['player-online'](value) - if err then return commands.error(err) end - local player,err = commands.validate['player-rank'](player) - if err then return commands.error(err) end - return player -end) - -commands.add_validation('player-rank-alive',function(value,event) - local player,err = commands.validate['player-alive'](value) - if err then return commands.error(err) end - local player,err = commands.validate['player-rank'](player,event) - if err then return commands.error(err) end - return player -end) - -commands.add_middleware(function(player,command_name,event) - return Role.allowed(player,command_name) -end) \ No newline at end of file diff --git a/old/modules/DONE/Core/Role/src/sync.lua b/old/modules/DONE/Core/Role/src/sync.lua deleted file mode 100644 index 6f5361ad..00000000 --- a/old/modules/DONE/Core/Role/src/sync.lua +++ /dev/null @@ -1,82 +0,0 @@ -local Role = self -local RoleGlobal = RoleGlobal -local Sync = require('ExpGamingCore.Sync') -local Game = require('FactorioStdLib.Game') -local Color = require('FactorioStdLib.Color') - --- just to hard reset the role sync -function Sync.set_roles(...) - Role.set_preassign(...) -end - --- used to assign the role if the player is online, or add to the the preassign -function Sync.assign_role(player_name,roles,by_player_name) - if not game then return end - local preassign = RoleGlobal.preassign - local player_roles = preassign[player_name] - if Game.get_player(player_name) then Role.assign(player_name,roles,by_player_name) - else - if not is_type(roles,'table') then roles = {roles} end - if not player_roles then preassign[player_name] = roles return end - for _,role_name in pairs(roles) do - if not table.includes(player_roles,role_name) then table.insert(player_roles,role_name) end - end - end -end - --- used to unassign the role if the player is online, or removes the preassign -function Sync.unassign_role(player_name,roles,by_player_name) - if not game then return end - local preassign = RoleGlobal.preassign - local player_roles = preassign[player_name] - if Game.get_player(player_name) then Role.unassign(player_name,roles,by_player_name) - else - if not is_type(roles,'table') then roles = {roles} end - if not player_roles then preassign[player_name] = nil return end - for _,role_name in pairs(roles) do - local index = table.index(player_roles,role_name) - if index then table.remove(player_roles,index) end - end - end -end - -Sync.add_update('roles',function() - if not game then return {'Offline'} end - local _rtn = {} - for _,role in pairs(Role.roles) do - local players = role:get_players() - local _players = {} - for k,player in pairs(players) do _players[k] = player.name end - local online = role:get_players(true) - local _online = {} - for k,player in pairs(online) do _online[k] = player.name end - _rtn[role.name] = {players=_players,online=_online,n_players=#_players,n_online=#_online} - end - return _rtn -end) - --- Adds a caption to the info gui that shows the rank given to the player -if Sync.add_to_gui then - Sync.add_to_gui(function(player) - local names = {} - for _,role in pairs(Role.get(player)) do table.insert(names,role.name) end - return 'You have been assigned the roles: '..table.concat(names,', ') - end) -end - --- adds a discord emit for rank changing -Event.add('on_role_change',function(event) - local role = Role.get(event.role_name) - local player = Game.get_player(event) - local by_player = Game.get_player(event.by_player_index) or SERVER - if role.is_jail and RoleGlobal.last_change[1] ~= player.index then - Sync.emit_embedded{ - title='Player Jail', - color=Color.to_hex(defines.textcolor.med), - description='There was a player jailed.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player.name, - ['Reason:']='No Reason' - } - end -end) \ No newline at end of file diff --git a/old/modules/DONE/DamagePopup/control.lua b/old/modules/DONE/DamagePopup/control.lua deleted file mode 100644 index d172b8e3..00000000 --- a/old/modules/DONE/DamagePopup/control.lua +++ /dev/null @@ -1,45 +0,0 @@ ---- When a entity is damaged y a player it will show how much damage you've death, When a player gets attacked by a entity it will popup the player's health in color. --- @module DamagePopup@4.0.0 --- @author badgamernl --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias DamagePopup - --- Module Require -local Color = require('FactorioStdLib.Color') - -local DamagePopup = {} - -Event.add(defines.events.on_entity_damaged, function(event) - local entity = event.entity - local cause = event.cause - local damage = event.original_damage_amount - local health = entity.health - -- local pre_attack_health = health + damage -- Didn't use it after all, maybe useful later - - local color = defines.textcolor.crit - - if entity.name == 'player' then - if health > 100 then - if health > 200 then - color = defines.textcolor.low - else - color = defines.textcolor.med - end - end - entity.surface.create_entity{ - name="flying-text", - color=color, - text=math.floor(health), - position=entity.position - } - elseif cause and cause.name == 'player' then - entity.surface.create_entity{ - name="flying-text", - color=defines.textcolor.med, - text='-'..math.floor(damage), -- cooldude2606 added floor for damage amount - position=entity.position - } - end -end) - -return DamagePopup \ No newline at end of file diff --git a/old/modules/DONE/DamagePopup/softmod.json b/old/modules/DONE/DamagePopup/softmod.json deleted file mode 100644 index a5ea4de0..00000000 --- a/old/modules/DONE/DamagePopup/softmod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "DamagePopup", - "version": "4.0.0", - "description": "When a entibty is damaged y a player it will show how much damage you've dealth, When a player gets attacked by a entity it will popup the player's health in color.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Damage", - "Popup", - "Floating", - "Text" - ], - "author": "badgamernl", - "contact": "badgamernl@gmail.com", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": { - "FactorioStdLib.Color": "^0.8.0" - }, - "submodules": {} -} diff --git a/old/modules/DONE/DeathMarkers/control.lua b/old/modules/DONE/DeathMarkers/control.lua deleted file mode 100644 index 3e0e9004..00000000 --- a/old/modules/DONE/DeathMarkers/control.lua +++ /dev/null @@ -1,46 +0,0 @@ ---- Adds markers to the map when a player dies and removes it when the body is removed. --- @module DeathMarkers@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Define -local module_verbose = false -local ThisModule = {} - --- Global Define -local global = { - corpses={} -} -Global.register(global,function(tbl) global = tbl end) - --- Event Handlers Define -Event.add(defines.events.on_player_died, function(event) - local player = game.players[event.player_index] - local tag = player.force.add_chart_tag(player.surface,{ - position=player.position, - text='Death: '..player.name..' ('..tick_to_display_format(event.tick)..')' - }) - if not global.corpses then global.corpses = {} end - table.insert(global.corpses,tag) -end) - -Event.add(defines.events.on_tick, function(event) - if (game.tick%3600) ~= 0 then return end - if not global.corpses then global.corpses = {} end - local key = 1 - while key <= #global.corpses do - local tag = global.corpses[key] - if not tag or not tag.valid then table.remove(global.corpses,key) else - if not tag.target then - local entity = tag.surface.find_entity('character-corpse',tag.position) - if entity then tag.target = entity - else tag.destroy() table.remove(global.corpses,key) key=key-1 end - elseif not tag.target.valid then tag.destroy() table.remove(global.corpses,key) key=key-1 end - end - key=key+1 - end -end) - --- Module Return -return ThisModule \ No newline at end of file diff --git a/old/modules/DONE/DeathMarkers/softmod.json b/old/modules/DONE/DeathMarkers/softmod.json deleted file mode 100644 index ac58f593..00000000 --- a/old/modules/DONE/DeathMarkers/softmod.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "DeathMarkers", - "version": "4.0.0", - "description": "Adds markers to the map when a player dies and removes it when the body is removed.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Death", - "Marker", - "Body", - "Map" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": {}, - "submodules": {} -} diff --git a/old/modules/DONE/ExpAdmin/Ban/control.lua b/old/modules/DONE/ExpAdmin/Ban/control.lua deleted file mode 100644 index 0a5f1935..00000000 --- a/old/modules/DONE/ExpAdmin/Ban/control.lua +++ /dev/null @@ -1,49 +0,0 @@ ---- Adds a custom ban function to the admin command set. --- @module ExpGamingAdmin.Ban@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Admin = require('ExpGamingAdmin') -local AdminGui = require('ExpGamingAdmin.Gui') -local Server = require('ExpGamingCore.Server') -local Game = require('FactorioStdLib.Game') -local Color -- FactorioStdLib.Color@^0.8.0 -local Sync -- ExpGamingCore.Sync@^4.0.0 - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end - if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end - end -} - --- Function Define -AdminGui.add_button('Ban','utility/danger_icon',{'ExpGamingAdmin.tooltip-ban'},function(player,byPlayer) - Admin.open(byPlayer,player,'Ban') -end) - -function Admin.ban(player,by_player,reason) - player = Game.get_player(player) - local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' - reason = Admin.create_reason(reason,by_player_name) - Admin.set_banned(player,true) - if Sync then Sync.emit_embedded{ - title='Player Ban', - color=Color.to_hex(defines.textcolor.crit), - description='There was a player banned.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player_name, - ['Reason:']=reason - } end - if Admin.move_inventory then Admin.move_inventory(player) end - Server.interface(game.ban_player,true,player,reason) -end - -Admin.add_action('Ban',Admin.ban) - --- Module Return -return setmetatable(ThisModule,{__call=Admin.ban}) \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Ban/softmod.json b/old/modules/DONE/ExpAdmin/Ban/softmod.json deleted file mode 100644 index a055b3e5..00000000 --- a/old/modules/DONE/ExpAdmin/Ban/softmod.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "ExpGamingAdmin.Ban", - "version": "4.0.0", - "description": "Adds a custom ban function to the admin command set.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Ban", - "Admin", - "Set", - "ExpGaming" - ], - "dependencies": { - "ExpGamingAdmin.Gui": "^4.0.0", - "ExpGamingCore.Server": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "FactorioStdLib.Color": "?^0.8.0", - "ExpGamingCore.Sync": "?^4.0.0", - "ExpGamingAdmin.ClearInventory": "?^4.0.0", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingAdmin@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/ExpAdmin/ClearInventory/control.lua b/old/modules/DONE/ExpAdmin/ClearInventory/control.lua deleted file mode 100644 index dea36113..00000000 --- a/old/modules/DONE/ExpAdmin/ClearInventory/control.lua +++ /dev/null @@ -1,58 +0,0 @@ ---- Adds a function to clear a players inventory and move the items to spawn. --- @module ExpGamingAdmin.ClearInventory@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Admin = require('ExpGamingAdmin') -local Game = require('FactorioStdLib.Game') - --- Module Define -local module_verbose = false -local ThisModule = {} - --- Function Define -local inventories = { - defines.inventory.player_main, - defines.inventory.player_quickbar, - defines.inventory.player_trash, - defines.inventory.player_guns, - defines.inventory.player_ammo, - defines.inventory.player_armor -} - -function Admin.move_item_to_spawn(item,surface,chests) - chests = chests or surface.find_entities_filtered{area={{-10,-10},{10,10}},name='iron-chest'} or {} - local chest = nil - while not chest or not chest.get_inventory(defines.inventory.chest).can_insert(item) do - chest = table.remove(chests,1) - if not chest then chest = surface.create_entity{ - name='iron-chest', - position=surface.find_non_colliding_position('iron-chest',{0,0},32,1) - } end - end - chest.get_inventory(defines.inventory.chest).insert(item) - table.insert(chests,chest) - return chests -end - -function Admin.move_inventory(player) - player = Game.get_player(player) - if not player then return end - local chests = player.surface.find_entities_filtered{area={{-10,-10},{10,10}},name='iron-chest'} or {} - for _,_inventory in pairs(inventories) do - local inventory = player.get_inventory(_inventory) - if inventory then - for item,count in pairs(inventory.get_contents()) do - item = {name=item,count=count} - chests = Admin.move_item_to_spawn(item,player.surface,chests) - end - inventory.clear() - end - end -end - -Admin.add_action('Clear Inventory',Admin.move_inventory) --- Module Return -return setmetatable(ThisModule,{__call=Admin.move_inventory}) \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/ClearInventory/softmod.json b/old/modules/DONE/ExpAdmin/ClearInventory/softmod.json deleted file mode 100644 index ae931353..00000000 --- a/old/modules/DONE/ExpAdmin/ClearInventory/softmod.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "ExpGamingAdmin.ClearInventory", - "version": "4.0.0", - "description": "Adds a function to clear a players inventoy and move the items to spawn.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Spawn", - "Items", - "Admin", - "Move", - "Clear", - "Inventory" - ], - "dependencies": { - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingAdmin@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/ExpAdmin/Commands/control.lua b/old/modules/DONE/ExpAdmin/Commands/control.lua deleted file mode 100644 index 73038cd6..00000000 --- a/old/modules/DONE/ExpAdmin/Commands/control.lua +++ /dev/null @@ -1,25 +0,0 @@ ---- A full ranking system for factorio. --- @module ExpGamingAdmin.Commands@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - -local Admin = require('ExpGamingAdmin') - ---- Used to clear all parts of a player, removing warnings, reports, jail and temp ban --- @command clear-all --- @param player the player to clear -commands.add_command('clear-all', 'Clears a player of any temp-ban, reports or warnings', { - ['player']={true,'player'} -}, function(event,args) - Admin.clear_player(args.player,event.player_index) -end) - -return { - on_init = function(self) - if loaded_modules['ExpGamingAdmin.TempBan'] then verbose('ExpGamingAdmin.TempBan is installed; Loading tempban src') require(module_path..'/src/tempban',{self=Admin}) end - if loaded_modules['ExpGamingAdmin.Jail'] then verbose('ExpGamingAdmin.Jail is installed; Loading tempban src') require(module_path..'/src/jail',{self=Admin}) end - if loaded_modules['ExpGamingAdmin.Warnings'] then verbose('ExpGamingAdmin.Warnings is installed; Loading tempban src') require(module_path..'/src/warnings',{self=Admin}) end - if loaded_modules['ExpGamingAdmin.Reports'] then verbose('ExpGamingAdmin.Reports is installed; Loading tempban src') require(module_path..'/src/reports',{self=Admin}) end - if loaded_modules['ExpGamingAdmin.ClearInventory'] then verbose('ExpGamingAdmin.ClearInventory is installed; Loading tempban src') require(module_path..'/src/clear',{self=Admin}) end - end -} \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Commands/softmod.json b/old/modules/DONE/ExpAdmin/Commands/softmod.json deleted file mode 100644 index 541a7255..00000000 --- a/old/modules/DONE/ExpAdmin/Commands/softmod.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "ExpGamingAdmin.Commands", - "version": "4.0.0", - "description": "Admins many of the admin featues which the script can use as in game commands.", - "location": "FSM_ARCHIVE", - "keywords": [ - "ExpGaming", - "Admin", - "Tools", - "Commands", - "Temp ban", - "Jail", - "Clear Inventory", - "Report", - "Warnings" - ], - "dependencies": { - "ExpGamingLib": "^4.0.0", - "ExpGamingCore.Command": "^4.0.0", - "ExpGamingAdmin.TempBan": "?^4.0.0", - "ExpGamingAdmin.Jail": "?^4.0.0", - "ExpGamingAdmin.Warnings": "?^4.0.0", - "ExpGamingAdmin.Reports": "?^4.0.0", - "ExpGamingAdmin.ClearInventory": "?^4.0.0", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingAdmin@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/ExpAdmin/Commands/src/clear.lua b/old/modules/DONE/ExpAdmin/Commands/src/clear.lua deleted file mode 100644 index ec6262a7..00000000 --- a/old/modules/DONE/ExpAdmin/Commands/src/clear.lua +++ /dev/null @@ -1,12 +0,0 @@ -local Admin = self - ---- Clears a players inventory and moves it to chests in spawn --- @command clear-inv --- @param player the player to clear the inventory of -commands.add_command('clear-inv', 'Clears a player\'s invetory', { - ['player'] = {true,'player-rank'} -}, function(event,args) - local player = args.player - if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player.name}) return commands.error end - Admin.move_inventory(player) -end) diff --git a/old/modules/DONE/ExpAdmin/Commands/src/jail.lua b/old/modules/DONE/ExpAdmin/Commands/src/jail.lua deleted file mode 100644 index 7d60da06..00000000 --- a/old/modules/DONE/ExpAdmin/Commands/src/jail.lua +++ /dev/null @@ -1,30 +0,0 @@ -local Admin = self -local Role = require('ExpGamingCore.Role') -local Server = require('ExpGamingCore.Server') - ---- Used to jail a player which stops them from moving --- @command jail --- @param player the player to be jailed --- @param[opt] reason the reason the player was jailed -commands.add_command('jail', 'Jails a player', { - ['player']={true,'player-rank'}, - ['reason']={false,'string-inf'} -}, function(event,args) - local player = args.player - local reason = args.reason - if Role.has_flag(player,'not_reportable') then player_return{'ExpGamingAdmin.cant-report',args.player.name} return commands.error end - if Admin.is_banned(player) then player_return{'ExpGamingAdmin.cant-report-ban',args.player.name} return commands.error end - Admin.jail(player,event.player_index,reason) -end) - ---- Used to unjail a player --- @command unjail --- @param player the player to unjail -commands.add_command('unjail', 'Returns a player\'s old rank', { - ['player']={true,'player'} -}, function(event,args) - local player = args.player - if Admin.is_banned(player,true) ~= 'jail' then player_return({'ExpGamingAdmin.cant-report-ban',args.player.name}) return commands.error end - Admin.set_banned(player,false) - Server.interface(Role.revert,true,player,event.player_index,2) -end) \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Commands/src/reports.lua b/old/modules/DONE/ExpAdmin/Commands/src/reports.lua deleted file mode 100644 index be67e7d8..00000000 --- a/old/modules/DONE/ExpAdmin/Commands/src/reports.lua +++ /dev/null @@ -1,35 +0,0 @@ -local Admin = self -local Role = require('ExpGamingCore.Role') -local Game = require('FactorioStdLib.Game') - ---- Reports a player --- @command report --- @param player the player to report --- @param[opt] reason the reason why the player was reported -commands.add_command('report', 'Reports a player', { - ['player']={true,'player-rank'}, - ['reason']={false,'string-inf'} -}, function(event,args) - local _player = Game.get_player(event) - local player = args.player - local reason = args.reason - if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player.name}) return commands.error end - if Role.has_flag(player,'not_reportable') then player_return({'ExpGamingAdmin.cant-report',args.player.name}) return commands.error end - for _,report in pairs(global.addons.reports.reports) do if report[1] == _player.name then player_return({'ExpGamingAdmin.cant-report',args.player.name}) return commands.error end end - for _,report in pairs(global.addons.reports.verified) do if report[1] == _player.name then player_return({'ExpGamingAdmin.cant-report',args.player.name}) return commands.error end end - Admin.report(player,event.player_index,reason) -end) - ---- Clears the reports of the player --- @command clear-reports --- @param player the player to clear the reports of -commands.add_command('clear-reports', 'Clears a player\'s reports', { - ['player'] = {true,function(value) - local player,err = commands.validate['player'](value) - if err then return commands.error(err) end - local rtn = not Admin.is_banned(player) and player - if not rtn then return commands.error{'ExpGamingAdmin.cant-report-ban',value} end return rtn - end} -}, function(event,args) - Admin.clear_reports(args.player,event.player_index) -end) \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Commands/src/tempban.lua b/old/modules/DONE/ExpAdmin/Commands/src/tempban.lua deleted file mode 100644 index 8657d1ad..00000000 --- a/old/modules/DONE/ExpAdmin/Commands/src/tempban.lua +++ /dev/null @@ -1,15 +0,0 @@ -local Admin = self - ---- Used to temp ban a player and give a reason --- @command temp-ban --- @param player the player to temp ban --- @param[opt] reason the reason for the ban -commands.add_command('temp-ban', 'Temporarily ban a player', { - ['player']={true,'player-rank'}, - ['reason']={false,'string-inf'} -}, function(event,args) - local player = args.player - local reason = args.reason - if Admin.is_banned(player) and Admin.is_banned(player,true) ~= 'jail' then player_return({'ExpGamingAdmin.cant-report-ban',args.player.name}) return commands.error end - Admin.temp_ban(player,event.player_index,reason) -end) \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Commands/src/warnings.lua b/old/modules/DONE/ExpAdmin/Commands/src/warnings.lua deleted file mode 100644 index b3796656..00000000 --- a/old/modules/DONE/ExpAdmin/Commands/src/warnings.lua +++ /dev/null @@ -1,28 +0,0 @@ -local Admin = self -local Role = require('ExpGamingCore.Role') - ---- Gives a warning to a player --- @command warn --- @param player the player to give a warning to --- @param[opt] reason the reason the player was given a warning -commands.add_command('warn', 'Gives a player a warning', { - ['player']={true,'player-rank'}, - ['reason']={false,'string-inf'} -}, function(event,args) - local player = args.player - local reason = args.reason - if Admin.is_banned(player) then player_return{'ExpGamingAdmin.cant-report-ban',args.player.name} return commands.error end - if Role.has_flag(player,'not_reportable') then player_return{'ExpGamingAdmin.cant-report',args.player.name} return commands.error end - Admin.give_warning(player,event.player_index,reason) -end) - ---- Clears the warning of a player --- @command clear-warnings --- @param player the player to clear the warning of -commands.add_command('clear-warnings', 'Clears a player\'s warnings', { - ['player'] = {true,'player'} -}, function(event,args) - local player = args.player - if Admin.is_banned(player) then player_return({'ExpGamingAdmin.cant-report-ban',args.player.name}) return commands.error end - Admin.clear_warnings(player,event.player_index) -end) \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Jail/control.lua b/old/modules/DONE/ExpAdmin/Jail/control.lua deleted file mode 100644 index 49ed0f56..00000000 --- a/old/modules/DONE/ExpAdmin/Jail/control.lua +++ /dev/null @@ -1,51 +0,0 @@ ---- Adds a jail function to the admin set, require ExpGamingRole to work. --- @module ExpGamingAdmin.Jail@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Admin = require('ExpGamingAdmin') -local AdminGui = require('ExpGamingAdmin.Gui') -local Server = require('ExpGamingCore.Server') -local Role = require('ExpGamingCore.Role') -local Color -- FactorioStdLib.Color@^0.8.0 -local Sync -- ExpGamingCore.Sync@^4.0.0 - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end - if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end - end -} - --- Function Define -AdminGui.add_button('jail','utility/clock',{'ExpGamingAdmin.tooltip-jail'},function(player,byPlayer) - Admin.open(byPlayer,player,'Jail') -end) - -function Admin.jail(player,by_player,reason) - player, by_player = Admin.valid_players(player,by_player) - if not player then return end - reason = Admin.create_reason(reason,by_player.name) - Admin.set_banned(player,'jail') - if Sync then Sync.emit_embedded{ - title='Player Jail', - color=Color.to_hex(defines.textcolor.med), - description='There was a player jailed.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player.name, - ['Reason:']=reason - } end - Role.meta.last_jail = player.name - player.driving = false - Server.interface(Role.assign,true,player,'Jail',by_player.name) - Server.interface(Role.unassign,true,player,Role.get(player),by_player.name) -end - -Admin.add_action('Jail',Admin.jail) - --- Module Return -return setmetatable(ThisModule,{__call=Admin.jail}) \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Jail/softmod.json b/old/modules/DONE/ExpAdmin/Jail/softmod.json deleted file mode 100644 index c6dba711..00000000 --- a/old/modules/DONE/ExpAdmin/Jail/softmod.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "ExpGamingAdmin.Jail", - "version": "4.0.0", - "description": "Adds a jail function to the admin set, require ExpGamingRole to work.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Jail", - "Roles", - "Admin", - "ExpGaming" - ], - "dependencies": { - "ExpGamingAdmin.Gui": "^4.0.0", - "ExpGamingCore.Server": "^4.0.0", - "ExpGamingCore.Role": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "FactorioStdLib.Color": "?^0.8.0", - "ExpGamingCore.Sync": "?^4.0.0", - "ExpGamingAdmin.ClearInventory": "?^4.0.0", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingAdmin@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/ExpAdmin/Kick/control.lua b/old/modules/DONE/ExpAdmin/Kick/control.lua deleted file mode 100644 index 33fdf2c8..00000000 --- a/old/modules/DONE/ExpAdmin/Kick/control.lua +++ /dev/null @@ -1,47 +0,0 @@ ---- Adds a kick function to the admin function set. --- @module ExpGamingAdmin.Kick@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Admin = require('ExpGamingAdmin') -local AdminGui = require('ExpGamingAdmin.Gui') -local Server = require('ExpGamingCore.Server') -local Game = require('FactorioStdLib.Game') -local Color -- FactorioStdLib.Color@^0.8.0 -local Sync -- ExpGamingCore.Sync@^4.0.0 - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end - if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end - end -} --- Function Define -AdminGui.add_button('Kick','utility/warning_icon',{'ExpGamingAdmin.tooltip-kick'},function(player,byPlayer) - Admin.open(byPlayer,player,'Kick') -end) - -function Admin.kick(player,by_player,reason) - player = Game.get_player(player) - local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' - reason = Admin.create_reason(reason,by_player_name) - if Sync then Sync.emit_embedded{ - title='Player Kick', - color=Color.to_hex(defines.textcolor.high), - description='There was a player kicked.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player_name, - ['Reason:']=reason - } end - if Admin.move_inventory then Admin.move_inventory(player) end - Server.interface(game.kick_player,true,player,reason) -end - -Admin.add_action('Kick',Admin.kick) - --- Module Return -return setmetatable(ThisModule,{__call=Admin.kick}) \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Kick/softmod.json b/old/modules/DONE/ExpAdmin/Kick/softmod.json deleted file mode 100644 index 26baa78c..00000000 --- a/old/modules/DONE/ExpAdmin/Kick/softmod.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "ExpGamingAdmin.Kick", - "version": "4.0.0", - "description": "Adds a kick function to the admin function set.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Admin", - "ExpGaming", - "Kick", - "Commands" - ], - "dependencies": { - "ExpGamingAdmin.Gui": "^4.0.0", - "ExpGamingCore.Server": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "FactorioStdLib.Color": "?^0.8.0", - "ExpGamingCore.Sync": "?^4.0.0", - "ExpGamingAdmin.ClearInventory": "?^4.0.0", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingAdmin@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/ExpAdmin/Reports/control.lua b/old/modules/DONE/ExpAdmin/Reports/control.lua deleted file mode 100644 index 521397ae..00000000 --- a/old/modules/DONE/ExpAdmin/Reports/control.lua +++ /dev/null @@ -1,163 +0,0 @@ ---- Adds a report system into the game that can also push notifactions to discord. --- @module ExpGamingAdmin.Reports@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Admin = require('ExpGamingAdmin') -local Role = require('ExpGamingCore.Role') -local Gui = require('ExpGamingCore.Gui') -local Game = require('FactorioStdLib.Game') -local Color -- FactorioStdLib.Color@^0.8.0 -local Sync -- ExpGamingCore.Sync@^4.0.0 - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end - if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end - end -} - --- Global Define -local global = { - reports={}, - verified={} -} -Global.register(global,function(tbl) global = tbl end) - --- Local Variables -local report_to_warnings = 1 -- used in count_reports -local verified_to_warnings = 3 -- used in count_reports -local reports_needed_for_jail = 6 - --- Function Define -local function report_message(player,by_player,reason) - player, by_player = Admin.valid_players(player,by_player) - if not player then return end - if Admin.is_banned(player,true) == 'report' then return end - Role.print(Role.meta.groups.User.lowest,{'ExpGamingAdmin.low-print',player.name,reason},defines.textcolor.info,true) - Role.print(Role.meta.groups.Admin.lowest,{'ExpGamingAdmin.high-print',player.name,by_player.name,reason},defines.textcolor.med) - if Sync then Sync.emit_embedded{ - title='Player Report', - color=Color.to_hex(defines.textcolor.med), - description='A player was reported.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player.name, - ['Reason:']=reason - } end -end - -local function cheak_reports(player) - player = Game.get_player(player) - if not player then return end - local reports = Admin.count_reports(player) - if reports >= reports_needed_for_jail and Role.get_highest(player).group.name ~= 'Jail' then - Admin.jail(player,'','Too many user reports. Contact an Admin to be unjailed.') - end -end - -function Admin.count_reports(player) - player = Game.get_player(player) - if not player then return 0 end - local _count = 0 - if global.reports[player.name] then - for _ in pairs(global.reports[player.name]) do - _count=_count+report_to_warnings - end - end - if global.verified[player.name] then - for _ in pairs(global.verified[player.name]) do - _count=_count+verified_to_warnings - end - end - return _count -end - -function Admin.report(player,by_player,reason) - player, by_player = Admin.valid_players(player,by_player) - if not player or Role.has_flag(player,'not_reportable') then return end - if Admin.is_banned(by_player) or Role.has_flag(by_player,'is_jail') then return end - if Role.has_flag(by_player,'is_verified') then - global.verified[player.name] = global.verified[player.name] or {} - local reports = global.verified[player.name] - for _,value in pairs(reports) do - if value[1] == by_player.name then return end - end - table.insert(reports,{by_player.name,reason}) - else - global.reports[player.name] = global.reports[player.name] or {} - local reports = global.reports[player.name] - for _,value in pairs(reports) do - if value[1] == by_player.name then return end - end - table.insert(reports,{by_player.name,reason}) - end - report_message(player,by_player,reason) - cheak_reports(player) -end - -function Admin.clear_reports(player,by_player,no_emit) - player, by_player = Admin.valid_players(player,by_player) - if not player then return end - global.reports[player.name]={} - global.verified[player.name]={} - if not no_emit and Sync then - Sync.emit_embedded{ - title='Player Clear', - color=Color.to_hex(defines.textcolor.low), - description='A player had their reports cleared.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player.name, - } - end -end - -local confirm_report = Gui.inputs{ - type='button', - name='admin-report-confirm', - caption='utility/spawn_flag', - tooltip={'ExpGamingAdmin.report'} -}:on_event('click',function(event) - local parent = event.element.parent - local player = Game.get_player(parent.player.caption) - local reason = parent.reason.text - Admin.report(player,event.player_index,reason) - Gui.center.clear(event.player_index) -end) - -Admin.report_btn = Gui.inputs{ - type='button', - name='admin-report', - caption='utility/spawn_flag', - tooltip={'ExpGamingAdmin.report'} -}:on_event('click',function(event) - local parent = event.element.parent - local player = Game.get_player(parent.children[1].name) - if not player then return end - local _player = Game.get_player(event) - Gui.center.clear(_player) - local frame = Gui.center.get_flow(_player).add{ - type='frame', - name='report-gui' - } - _player.opened=frame - frame.caption={'ExpGamingAdmin.report'} - frame.add{ - type='textfield', - name='reason' - }.style.width = 300 - local btn = confirm_report:draw(frame) - btn.style.height = 30 - btn.style.width = 30 - frame.add{ - type='label', - name='player', - caption=player.name - }.style.visible = false -end) - --- Module Return -return ThisModule \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Reports/softmod.json b/old/modules/DONE/ExpAdmin/Reports/softmod.json deleted file mode 100644 index 4aee29bb..00000000 --- a/old/modules/DONE/ExpAdmin/Reports/softmod.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "ExpGamingAdmin.Reports", - "version": "4.0.0", - "description": "Adds a report system into the game that can also push notifactions to discord.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Report", - "Player", - "Admin", - "ExpGaming", - "Player List", - "Commands" - ], - "dependencies": { - "ExpGamingCore.Server": "^4.0.0", - "ExpGamingCore.Role": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "FactorioStdLib.Color": "?^0.8.0", - "ExpGamingCore.Sync": "?^4.0.0", - "ExpGamingCore.Gui": "^4.0.0", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingAdmin@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/ExpAdmin/Teleport/control.lua b/old/modules/DONE/ExpAdmin/Teleport/control.lua deleted file mode 100644 index f745add4..00000000 --- a/old/modules/DONE/ExpAdmin/Teleport/control.lua +++ /dev/null @@ -1,43 +0,0 @@ ---- Adds three function to admin: tp, bring and go to, these all move the player --- @module ExpGamingAdmin.Teleport@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Admin = require('ExpGamingAdmin') -local AdminGui = require('ExpGamingAdmin.Gui') -local Game = require('FactorioStdLib.Game') - --- Module Define -local module_verbose = false -local ThisModule = {} - --- Function Define -AdminGui.add_button('Go To','utility/export_slot',{'ExpGamingAdmin.tooltip-go-to'},function(player,byPlayer) - Admin.go_to(player,byPlayer) -end) -AdminGui.add_button('Bring','utility/import_slot',{'ExpGamingAdmin.tooltip-bring'},function(player,byPlayer) - Admin.bring(player,byPlayer) -end) - -function Admin.tp(from_player, to_player) - local _from_player = Game.get_player(from_player) - local _to_player = Game.get_player(to_player) - if not _from_player or not _to_player then return end - _from_player.teleport(_to_player.surface.find_non_colliding_position('player',_to_player.position,32,1),_to_player.surface) -end - -function Admin.go_to(player,by_player) - Admin.tp(by_player, player) -end - -function Admin.bring(player,by_player) - Admin.tp(player, by_player) -end - -Admin.add_action('Go To',Admin.go_to) -Admin.add_action('Bring',Admin.bring) - --- Module Return -return setmetatable(ThisModule,{__call=Admin.tp}) \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Teleport/softmod.json b/old/modules/DONE/ExpAdmin/Teleport/softmod.json deleted file mode 100644 index 2bebb4c4..00000000 --- a/old/modules/DONE/ExpAdmin/Teleport/softmod.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "ExpGamingAdmin.Teleport", - "version": "4.0.0", - "description": "Adds three function to admin: tp, bring and go to, these all move the player.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Tp", - "Bring", - "Go To", - "Admin", - "ExpGaming", - "Teleport", - "Commands" - ], - "dependencies": { - "ExpGamingAdmin.Gui": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingAdmin@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/ExpAdmin/TempBan/control.lua b/old/modules/DONE/ExpAdmin/TempBan/control.lua deleted file mode 100644 index 5848fd5c..00000000 --- a/old/modules/DONE/ExpAdmin/TempBan/control.lua +++ /dev/null @@ -1,48 +0,0 @@ ---- Adds a temp ban function to the admin set, requires ExpGamingCore.Role to work. --- @module ExpGamingAdmin.KicTempBan@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Admin = require('ExpGamingAdmin') -local Server = require('ExpGamingCore.Server') -local Role = require('ExpGamingCore.Role') -local Game = require('FactorioStdLib.Game') -local Color -- FactorioStdLib.Color@^0.8.0 -local Sync -- ExpGamingCore.Sync@^4.0.0 - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end - if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end - end -} - --- Function Define -function Admin.temp_ban(player,by_player,reason) - local player = Game.get_player(player) - local by_player_name = Game.get_player(by_player) and Game.get_player(by_player).name or '' - if not player or Admin.is_banned(player) then return end - Admin.set_banned(player,'temp') - if Sync then Sync.emit_embedded{ - title='Player Temp-Ban', - color=Color.to_hex(defines.textcolor.high), - description='A player was jailed.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player_name, - ['Reason:']=Admin.create_reason(reason,by_player_name) - } end - game.print({'ExpGamingAdmin.temp-ban',player.name,by_player_name,reason},defines.textcolor.info) - if Admin.move_inventory then Admin.move_inventory(player) end - Role.meta.last_jail = player.name - Server.interface(Role.unassign,true,player,Role.get(player),by_player_name) - Server.interface(Role.assign,true,player,'Jail',by_player_name) -end - -Admin.add_action('Temp Ban',Admin.temp_ban) - --- Module Return -return setmetatable(ThisModule,{__call=Admin.temp_ban}) \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/TempBan/softmod.json b/old/modules/DONE/ExpAdmin/TempBan/softmod.json deleted file mode 100644 index 64853ebb..00000000 --- a/old/modules/DONE/ExpAdmin/TempBan/softmod.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "ExpGamingAdmin.TempBan", - "version": "4.0.0", - "description": "Adds a temp ban function to the admin set, requires ExpGamingCore.Role to work.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Jail", - "Temp Ban", - "Admin", - "ExpGaming", - "Roles" - ], - "dependencies": { - "ExpGamingCore.Server": "^4.0.0", - "ExpGamingCore.Role": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "FactorioStdLib.Color": "?^0.8.0", - "ExpGamingCore.Sync": "?^4.0.0", - "ExpGamingAdmin.ClearInventory": "?^4.0.0", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingAdmin@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/ExpAdmin/Warnings/control.lua b/old/modules/DONE/ExpAdmin/Warnings/control.lua deleted file mode 100644 index f10bc95a..00000000 --- a/old/modules/DONE/ExpAdmin/Warnings/control.lua +++ /dev/null @@ -1,142 +0,0 @@ ---- Adds a warning system into the admin set which can be used by admins and the script. --- @module ExpGamingAdmin.Warnings@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Admin = require('ExpGamingAdmin') -local Server = require('ExpGamingCore.Server') -local Role = require('ExpGamingCore.Role') -local Game = require('FactorioStdLib.Game') -local Color -- FactorioStdLib.Color@^0.8.0 -local Sync -- ExpGamingCore.Sync@^4.0.0 - --- Local Variables -local take_action = 8 -- the first admin given warning jumps to this number, this case kick-warn is giving -local remove_warnings_time = {} -local min_time_to_remove_warning = 18000 -- this is in ticks -local punishments = { - {'nothing'}, - {'nothing'}, - {'nothing'}, - {'nothing'}, - {'nothing'}, - {'message',{'ExpGamingAdmin-Warnings.message'},defines.textcolor.info}, - {'message',{'ExpGamingAdmin-Warnings.message'},defines.textcolor.info}, - {'message',{'ExpGamingAdmin-Warnings.kick-warn'},defines.textcolor.med}, - {'kick'}, - {'message',{'ExpGamingAdmin-Warnings.temp-warn'},defines.textcolor.high}, - {'temp-ban'}, - {'message',{'ExpGamingAdmin-Warnings.ban-warn'},defines.textcolor.high}, - {'message',{'ExpGamingAdmin-Warnings.last-warn'},defines.textcolor.crit}, - {'ban'} -} - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end - if loaded_modules['FactorioStdLib.Color'] then Color = require('FactorioStdLib.Color') end - if loaded_modules['ExpGamingAdmin.Reports'] then - take_action = take_action + 1 - table.insert(punishments,take_action,{'report',{'ExpGamingAdmin-Warnings.reported'},defines.textcolor.med}) - end - end, - on_post=function() - local highest = nil - for _,role in pairs(Role.roles) do - local power = role.index - if not highest and not role.not_reportable then highest = power-1 end - local _power = power; if highest then _power = power-highest end - if role.not_reportable then remove_warnings_time[power] = 0 - else remove_warnings_time[power] = min_time_to_remove_warning*_power end - end - end -} - --- Global Define -local global = {} -Global.register(global,function(tbl) global = tbl end) - --- Function Define -local function give_punishment(player,by_player,reason) - player, by_player = Admin.valid_players(player,by_player) - reason = reason or 'No Other Reason' - local warnings = Admin.get_warnings(player) - local punishment = punishments[warnings] - if not punishment or punishment[1] == 'nothing' then return - elseif punishment[1] == 'message' then - local message = punishment[2] - local colour = punishment[3] - player_return(message,colour,player) - elseif punishment[1] == 'report' then - local message = punishment[2] - local colour = punishment[3] - player_return(message,colour,player) - Admin.report(player,'',reason) - elseif punishment[1] == 'kick' then - Admin.kick(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) - elseif punishment[1] == 'temp-ban' then - Admin.temp_ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) - elseif punishment[1] == 'ban' then - Admin.ban(player,by_player,'Too Many Warnings: '..warnings-(take_action-1)..' Also: '..reason) - end -end - -function Admin.get_warnings(player) - player = Game.get_player(player) - return global[player.name] or 0 -end - -function Admin.give_warning(player,by_player,reason,min) - player, by_player = Admin.valid_players(player,by_player) - if not player then return end - min = Game.get_player(by_player) and Game.get_player(by_player) ~= SERVER and take_action or min or 0 - local warnings = Admin.get_warnings(player) - if warnings < min then warnings = min-1 end - warnings = warnings+1 - global[player.name] = warnings - if warnings > take_action then - player_return({'ExpGamingAdmin-Warnings.warning-given-by',by_player.name},defines.textcolor.info,player) - game.print({'ExpGamingAdmin-Warnings.player-warning',player.name,by_player.name,reason}) - end - give_punishment(player,by_player,reason) -end - -function Admin.clear_warnings(player,by_player,no_emit) - player, by_player = Admin.valid_players(player,by_player) - if not player then return end - global[player.name]=nil - if not no_emit and Sync then - Sync.emit_embedded{ - title='Player Clear', - color=Color.to_hex(defines.textcolor.low), - description='A player had their warnings cleared.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player.name, - } - end -end - --- Event Handlers Define -Event.add(defines.events.on_tick,function(event) - if (game.tick % min_time_to_remove_warning) == 0 then - for name,warnings in pairs(global) do - if warnings > 0 then - local role = Role.get_highest(name) - local time_to_remove = remove_warnings_time[role.index] - if (game.tick % time_to_remove) == 0 then - global[name]=warnings-1 - if global[name] > 5 then - player_return({'ExpGamingAdmin-Warnings.remove-warn',global[name],tick_to_display_format(time_to_remove)},defines.textcolor.low,name) - end - end - end - end - end -end) - --- Module Return -return ThisModule \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Warnings/locale/de.cfg b/old/modules/DONE/ExpAdmin/Warnings/locale/de.cfg deleted file mode 100644 index c48f518a..00000000 --- a/old/modules/DONE/ExpAdmin/Warnings/locale/de.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[ExpGamingAdmin-Warnings] -warning-given-by=This Warnings Was Given By: __1__ -player-warning=__1__ was given a warning by __2__ reason: __3__ -temp-ban=__1__ was temp-ban by __2__ and will remain in jail untill next reset -remove-warn=You are had a warning Removed, you have __1__ warnings, next removed in __2__ -message=You Are Currently Reciving Warnings From The Script, This Will Continue Unless You Cease And Desist -reported=You Have Been Reported To The Admins By The Script, Further Acction May Be Taken If You Do Not Cease And Desist. -kick-warn=You Are On A Warning To Be KICKED, The Script Will Auto Kick If You Do Not Cease And Desist. -temp-warn=You Are On A Warning To Be TEMP BANNED, The Script Will Auto Ban If You Do Not Cease And Desist. -ban-warn=You Are On A Warning To Be BANNED, The Script Will Auto Ban If You Do Not Cease And Desist. -last-warn=YOU ARE ON A LAST WARNING TO BE BANNED, THE SCRIPT WILL AUTO BAN IF YOU DO NOT CEASE AND DESIST. \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Warnings/locale/en.cfg b/old/modules/DONE/ExpAdmin/Warnings/locale/en.cfg deleted file mode 100644 index 01715fc7..00000000 --- a/old/modules/DONE/ExpAdmin/Warnings/locale/en.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[ExpGamingAdmin-Warnings] -warning-given-by=This warning was given by: __1__ -player-warning=__1__ was given a warning by __2__ for: __3__ -remove-warn=One of your warnings expired. You have __1__ warnings left, next warning will be removed in __2__ -message=You are currently being warned by the system. These will continue until you cease and desist. -reported=You have been reported to the admins by the system. Further action may be taken if you do not cease and desist. -kick-warn=This is your last warning before you get kicked. The system will automatically kick you if you do not cease and desist. -temp-warn=This is your last warning before you get temporary banned. The system will automatically ban you if you do not cease and desist. -ban-warn=WARNING: This is your last warning before you get BANNED. The system will automatically BAN you if you do not cease and desist. -last-warn=WARNING: This is your last warning before you get PERMANENTLY BANNED. The system will automatically PERMANENTLY BAN you if you do not cease and desist. diff --git a/old/modules/DONE/ExpAdmin/Warnings/locale/fr.cfg b/old/modules/DONE/ExpAdmin/Warnings/locale/fr.cfg deleted file mode 100644 index c48f518a..00000000 --- a/old/modules/DONE/ExpAdmin/Warnings/locale/fr.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[ExpGamingAdmin-Warnings] -warning-given-by=This Warnings Was Given By: __1__ -player-warning=__1__ was given a warning by __2__ reason: __3__ -temp-ban=__1__ was temp-ban by __2__ and will remain in jail untill next reset -remove-warn=You are had a warning Removed, you have __1__ warnings, next removed in __2__ -message=You Are Currently Reciving Warnings From The Script, This Will Continue Unless You Cease And Desist -reported=You Have Been Reported To The Admins By The Script, Further Acction May Be Taken If You Do Not Cease And Desist. -kick-warn=You Are On A Warning To Be KICKED, The Script Will Auto Kick If You Do Not Cease And Desist. -temp-warn=You Are On A Warning To Be TEMP BANNED, The Script Will Auto Ban If You Do Not Cease And Desist. -ban-warn=You Are On A Warning To Be BANNED, The Script Will Auto Ban If You Do Not Cease And Desist. -last-warn=YOU ARE ON A LAST WARNING TO BE BANNED, THE SCRIPT WILL AUTO BAN IF YOU DO NOT CEASE AND DESIST. \ No newline at end of file diff --git a/old/modules/DONE/ExpAdmin/Warnings/locale/nl.cfg b/old/modules/DONE/ExpAdmin/Warnings/locale/nl.cfg deleted file mode 100644 index 104ef981..00000000 --- a/old/modules/DONE/ExpAdmin/Warnings/locale/nl.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[ExpGamingAdmin-Warnings] -warning-given-by=Deze waarschuwing is gegeven door: __1__ -player-warning=__1__ is gewaarschuwd door __2__ met de reden: __3__ -temp-ban=__1__ is verbannen door __2__ en is gejailed tot de volgende reset. -remove-warn=Een waarschuwing is verlopen. Je hebt nu nog maar __1__ waarschuwing, volgende waarschuwing verloopt in __2__ -message=Je ontvangt waarschuwingen door het systeem. Deze waarschuwingen stoppen niet tot je stopt met wat je verkeerd doet. -reported=Je bent gerapporteerd aan de administrators door het systeem. Je zal bestraft worden als je niet stopt met wat je verkeerd doet. -kick-warn=WAARSCHUWING: Dit is je laatste waarschuwing voordat je gekickt wordt. -temp-warn=WAARSCHUWING: Dit is je laatste waarschuwing voordat je tijdelijk verbannen wordt. -ban-warn=WAARSCHUWING: Dit is je laatste waarschuwing voordat je permanent verbannen wordt. -last-warn=DIT IS JE LAATSTE WAARSCHUWING. Het systeem zal je automatisch VERBANNEN als je niet stopt met wat je verkeerd doet. diff --git a/old/modules/DONE/ExpAdmin/Warnings/locale/sv-SE.cfg b/old/modules/DONE/ExpAdmin/Warnings/locale/sv-SE.cfg deleted file mode 100644 index 9358b9cf..00000000 --- a/old/modules/DONE/ExpAdmin/Warnings/locale/sv-SE.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[ExpGamingAdmin-Warnings] -warning-given-by=Den här varningen gavs av: __1__ -player-warning=__1__ var tillfälligt bannlyst av __2__ och kommer att förbli i fängelset tills nästa återställning (reset) -remove-warn=En av dina varningar har gått ut. Du har __1__ varning kvar, nästa varning kommer at tas bort om __2__ -message=Du får för nuvarande varningar av systemet. De kommer fortsätta tills du upphör med överträdelsen. -reported= Du har blivit rapporterad till administrationen av systemet. Mer påföljd kan komma att tas om du inte upphör med överträdelsen. -kick-warn=Det här är din sista varning innan du blir sparkad. Systemet kommer att automatisk sparka dig om du inte upphör med överträdelsen -temp-warn=Det här är din sista varning innan du blir tillfälligt bannlyst. Systemet kommer att automatiskt bannlysa dig om du inte upphör överträdelsen -ban-warn=VARNING: Det här är din sista varning innan du blir bannlyst. Systemet kommer att automatisk bannlysa dig om du inte upphör med överträdelsen. -last-warn=VARNING: Det här är din sista varning innan du blir permanent bannlyst. Systemet kommer att automatiskt permanent bannlysa dig om du inte upphör med överträdelsen. diff --git a/old/modules/DONE/ExpAdmin/Warnings/softmod.json b/old/modules/DONE/ExpAdmin/Warnings/softmod.json deleted file mode 100644 index 70c11140..00000000 --- a/old/modules/DONE/ExpAdmin/Warnings/softmod.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "ExpGamingAdmin.Warnings", - "version": "4.0.0", - "description": "Adds a warning system into the admin set which can be used by admins and the script.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Warning", - "Admin", - "ExpGaming", - "Report", - "Kick", - "Punishments", - "Ban" - ], - "dependencies": { - "ExpGamingCore.Server": "^4.0.0", - "ExpGamingCore.Role": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "FactorioStdLib.Color": "?^0.8.0", - "ExpGamingAdmin.Reports": "?^4.0.0", - "ExpGamingCore.Sync": "?^4.0.0", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingAdmin@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/ExpGamingBot/softmod.json b/old/modules/DONE/ExpGamingBot/softmod.json deleted file mode 100644 index a7328e25..00000000 --- a/old/modules/DONE/ExpGamingBot/softmod.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "ExpGamingBot", - "version": "4.0.0", - "description": "Different parts of a useful bot to help run a server. Discord Bot Not Included.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Discord", - "Bot", - "Messages", - "Chat", - "Auto" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "submodules": { - "ExpGamingBot.autoChat": "4.0.0", - "ExpGamingBot.autoMessage": "4.0.0", - "ExpGamingBot.discordAlerts": "4.0.0" - }, - "dependencies": {} -} diff --git a/old/modules/DONE/ExpGamingLib/control.lua b/old/modules/DONE/ExpGamingLib/control.lua deleted file mode 100644 index 5bc65516..00000000 --- a/old/modules/DONE/ExpGamingLib/control.lua +++ /dev/null @@ -1,330 +0,0 @@ ---- Adds some common functions used though out all ExpGaming modules --- @module ExpGamingLib --- @alias ExpLib --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - -local Game = require('FactorioStdLib.Game') -local Color = require('FactorioStdLib.Color') - -local module_verbose = false -- there is no verbose in this file so true will do nothing -local ExpLib = {} - ---- Loads a table into _G even when sandboxes; will not overwrite values or append to tables; will not work during runtime to avoid desyncs --- @usage unpack_to_G{key1='foo',key2='bar'} --- @tparam table table tbl to be unpacked -function ExpLib.unpack_to_G(tbl) - if not type(tbl) == 'table' or game then return end - for key,value in pairs(tbl) do - if not _G[key] then rawset(_G,key,value) end - end -end - ---- Used to get the current ENV with all _G keys removed; useful when saving function to global --- @usage get_env() returns current ENV with _G keys removed --- @treturn table the env table with _G keys removed --- @warning does not work from console -function ExpLib.get_env(level) - level = level and level+1 or 2 - local env = setmetatable({},{__index=_G}) - while true do - if not debug.getinfo(level) then break end - local i = 1 - while true do - local name, value = debug.getlocal(level,i) - if not name or _G[name] == value then break else env[name] = value end - i=i+1 - end - level=level+1 - end - return env -end - ---- Used to get the current ENV with all _G keys removed; useful when saving function to global --- @usage get_env() returns current ENV with _G keys removed --- @treturn table the env table with _G keys removed --- @warning does not work from console -function ExpLib.get_upvalues(level) - local func = level and ExpLib.is_type(level,'function') and level or nil - level = level and ExpLib.is_type(level,'number') and level+1 or 2 - func = func or debug.getinfo(level).func - local upvalues = setmetatable({},{__index=_G}) - local i = 1 - while true do - local name, value = debug.getupvalue(func,i) - if not name then break else upvalues[name] = value end - i=i+1 - end - return upvalues -end - ---- Creates a table that will act like a string and a function --- @usage add_metatable({},function) -- returns table --- @tparam table table tbl the that will have its metatable set --- @tparam[opt=tostring] function function callback the that will be used for the call --- @tparam[opt=table.tostring] function string string ?function|string a that resolves to a or a string --- @treturn table the new table with its metatable set -function ExpLib.add_metatable(tbl,callback,string) - if not ExpLib.is_type(tbl,'table') then error('No table given to add_metatable',2) end - callback = ExpLib.is_type(callback,'function') and callback or tostring - string = ExpLib.is_type(string,'function') and string or ExpLib.is_type(string,'string') and function() return string end or table.tostring - return setmetatable(tbl,{ - __tostring=string, - __concat=function(val1,val2) return type(val1) == 'string' and val1..string(val2) or string(val1)..val2 end, - __call=callback - }) -end - ---- Compare types faster for faster validation of prams --- @usage is_type('foo','string') -- return true --- @usage is_type('foo') -- return false --- @param v the value to be tested --- @tparam[opt=nil] string test_type the type to test for if not given then it tests for nil --- @treturn boolean is v of type test_type -function ExpLib.is_type(v,test_type) - return test_type and v and type(v) == test_type or not test_type and not v or false -end - ---- Compare types faster for faster validation of prams, including giving an error if incorrect --- @usage type_error('foo','string','Value is not a string') -- return true --- @usage type_error('foo','table','Value is not a string') -- return error --- @param value the value to be tested --- @tparam[opt=nil] string type the type that the value should be --- @tparam string error_message the message given when type is not matched --- @treturn boolean if it matched or and error -function ExpLib.type_error(value,type,error_message) - return ExpLib.is_type(value,type) or error(error_message,3) -end - ---- A specialised version of type_error to test for self --- @usage self_test(self,'Object','get_name') --- @tparam table table self the that is the object --- @tparam string prototype_name the name of the class --- @tparam string function_name the name of the function -function ExpLib.self_test(self,prototype_name,function_name) - return ExpLib.is_type(self,'table') or error('Call to prototype without context, either supply a '..prototype_name..' or use '..prototype_name..':'..function_name,3) -end - ---- Will return a value of any type to the player/server console, allows colour for in-game players --- @usage player_return('Hello, World!') -- returns 'Hello, World!' to game.player or server console --- @usage player_return('Hello, World!','green') -- returns 'Hello, World!' to game.player with colour green or server console --- @usage player_return('Hello, World!',nil,player) -- returns 'Hello, World!' to the given player --- @param rtn any value of any type that will be returned to the player or console --- @tparam[opt=defines.colour.white] ?defines.color|string colour the colour of the text for the player, ignored when printing to console --- @tparam[opt=game.player] LuaPlayer player the player that return will go to, if no game.player then returns to server -function ExpLib.player_return(rtn,colour,player) - colour = ExpLib.is_type(colour,'table') and colour or defines.textcolor[colour] ~= defines.color.white and defines.textcolor[colour] or defines.color[colour] - player = player or game.player - -- converts the value to a string - local returnAsString - if ExpLib.is_type(rtn,'table') then - if ExpLib.is_type(rtn.__self,'userdata') then - -- value is userdata - returnAsString = 'Cant Display Userdata' - elseif ExpLib.is_type(rtn[1],'string') and string.find(rtn[1],'.+[.].+') and not string.find(rtn[1],'%s') then - -- value is a locale string - returnAsString = rtn - elseif getmetatable(rtn) ~= nil and not tostring(rtn):find('table: 0x') then - -- value has a tostring meta method - returnAsString = tostring(rtn) - else - -- value is a table - returnAsString = table.tostring(rtn) - end - elseif ExpLib.is_type(rtn,'function') then - -- value is a function - returnAsString = 'Cant Display Functions' - else returnAsString = tostring(rtn) end - -- returns to the player or the server - if player then - -- allows any valid player identifier to be used - player = Game.get_player(player) - if not player then error('Invalid Player given to player_return',2) end - -- plays a nice sound that is different to normal message sound - player.play_sound{path='utility/scenario_message'} - player.print(returnAsString,colour) - else rcon.print(returnAsString) end -end - ---- Convert ticks to hours --- @usage tick_to_hour(216001) -- return 1 --- @tparam number tick tick to convert to hours --- @treturn number the number of whole hours from this tick -function ExpLib.tick_to_hour(tick) - if not ExpLib.is_type(tick,'number') then return 0 end - if not game then return math.floor(tick/216000) end - return math.floor(tick/(216000*game.speed)) -end - ---- Convert ticks to minutes --- @usage tick_to_hour(3601) -- return 1 --- @tparam number tick tick to convert to minutes --- @treturn number the number of whole minutes from this tick -function ExpLib.tick_to_min (tick) - if not ExpLib.is_type(tick,'number') then return 0 end - if not game then return math.floor(tick/3600) end - return math.floor(tick/(3600*game.speed)) -end - ---- Converts a tick into a clean format for end user --- @usage tick_to_display_format(3600) -- return '1.00 M' --- @usage tick_to_display_format(234000) -- return '1 H 5 M' --- @tparam number tick the tick to convert --- @treturn string the formated string -function ExpLib.tick_to_display_format(tick) - if not ExpLib.is_type(tick,'number') then return '0H 0M' end - if ExpLib.tick_to_min(tick) < 10 then - if not game then return math.floor(tick/3600) end - return string.format('%.2f M',tick/(3600*game.speed)) - else - return string.format('%d H %d M', - ExpLib.tick_to_hour(tick), - ExpLib.tick_to_min(tick)-60*ExpLib.tick_to_hour(tick) - ) - end -end - ---- Used as a way to view the structure of a gui, used for debugging --- @usage Gui_tree(root) returns all children of gui recursively --- @tparam LuaGuiElement root the root to start the tree from --- @treturn table the table that describes the gui -function ExpLib.gui_tree(root) - if not ExpLib.is_type(root,'table') or not root.valid then error('Invalid Gui Element given to gui_tree',2) end - local tree = {} - for _,child in pairs(root.children) do - if #child.children > 0 then - if child.name then tree[child.name] = ExpLib.gui_tree(child) - else table.insert(tree,ExpLib.gui_tree(child)) end - else - if child.name then tree[child.name] = child.type - else table.insert(tree,child.type) end - end - end - return tree -end - ---- Extents the table class --- @type table --- @alias table - ---- Returns a value in a form able to be read as a value, any value to string --- @usage table.val_to_str{a='foo'} -- return '"foo"' --- @param v value to convert --- @treturn string the converted value -function table.val_to_str(v) - if "string" == type( v ) then - v = string.gsub(v,"\n","\\n") - if string.match(string.gsub(v,"[^'\"]",""),'^"+$') then - return "'"..v.."'" - end - return '"'..string.gsub(v,'"', '\\"' )..'"' - else - return "table" == type( v) and table.tostring(v) or - "function" == type(v) and '"cant-display-function"' or - "userdata" == type(v) and '"cant-display-userdata"' or - tostring(v) - end -end - ---- Returns a value in a form able to be read as a key, any key to string --- @usage table.val_to_str{a='foo'} -- return '["a"]' --- @param k key to convert --- @treturn string the converted key -function table.key_to_str (k) - if "string" == type(k) and string.match(k,"^[_%player][_%player%d]*$") then - return k - else - return "["..table.val_to_str(k).."]" - end -end - ---- Returns a table in a form able to be read as a table --- @usage table.tostring{k1='foo',k2='bar'} -- return '{["k1"]="foo",["k2"]="bar"}' --- @tparam table table tbl to convert --- @treturn string the converted table -function table.tostring(tbl) - if type(tbl) ~= 'table' then return tostring(tbl) end - local result, done = {}, {} - for k, v in ipairs(tbl) do - table.insert(result,table.val_to_str(v)) - done[k] = true - end - for k, v in pairs(tbl) do - if not done[k] then - table.insert(result, - table.key_to_str(k).."="..table.val_to_str(v)) - end - end - return "{"..table.concat(result,",") .."}" -end - ---- Similar to table.tostring but converts a lua table to a json one --- @usage table.json{k1='foo',k2='bar'} -- return '{"k1":"foo","k2":"bar"}' --- @tparam table table lua_table the to convert --- @treturn string the table in a json format -function table.json(lua_table) - --if game and game.table_to_json then return game.table_to_json(lua_table) end - local result, done, only_indexes = {}, {}, true - for key,value in ipairs(lua_table) do - done[key] = true - if type(value) == 'table' then table.insert(result,table.json(value,true)) - elseif not value then table.insert(result,'null') - else table.insert(result,table.val_to_str(value)) - end - end - for key,value in pairs(lua_table) do - if not done[key] then - only_indexes = false - if type(value) == 'table' then table.insert(result,table.val_to_str(key)..':'..table.json(value,true)) - elseif not value then table.insert(result,table.val_to_str(key)..':null') - else table.insert(result,table.val_to_str(key)..':'..table.val_to_str(value)) - end - end - end - if only_indexes then return "["..table.concat(result,",").."]" - else return "{"..table.concat(result,",").."}" - end -end - ---- Returns the closest match to a key --- @usage table.autokey({foo=1,bar=2},'f') -- return 1 --- @tparam table table tbl the that will be searched --- @tparam string string str the that will be looked for in the keys -function table.autokey(tbl,str) - if not ExpLib.is_type(str,'string') then return end - local _return = {} - for key,value in pairs(tbl) do - if string.contains(string.lower(key),string.lower(str)) then table.insert(_return,value) end - end - return _return[1] or false -end - ---- Returns the list is a sorted way that would be expected by people (this is by key) --- @usage tbl = table.alphanumsort(tbl) --- @tparam table table tbl the to be sorted --- @treturn table the sorted table -function table.alphanumsort(tbl) - local o = table.keys(tbl) - local function padnum(d) local dec, n = string.match(d, "(%.?)0*(.+)") - return #dec > 0 and ("%.12f"):format(d) or ("%s%03d%s"):format(dec, #n, n) end - table.sort(o, function(a,b) - return tostring(a):gsub("%.?%d+",padnum)..("%3d"):format(#b) - < tostring(b):gsub("%.?%d+",padnum)..("%3d"):format(#a) end) - local _tbl = {} - for _,k in pairs(o) do _tbl[k] = tbl[k] end - return _tbl -end - ---- Returns the list is a sorted way that would be expected by people (this is by key) (faster alterative than above) --- @usage tbl = table.alphanumsort(tbl) --- @tparam table table tbl the to be sorted --- @treturn table the sorted table -function table.keysort(tbl) - local o = table.keys(tbl,true) - local _tbl = {} - for _,k in pairs(o) do _tbl[k] = tbl[k] end - return _tbl -end - -ExpLib:unpack_to_G() -return ExpLib \ No newline at end of file diff --git a/old/modules/DONE/ExpGamingLib/softmod.json b/old/modules/DONE/ExpGamingLib/softmod.json deleted file mode 100644 index 160803be..00000000 --- a/old/modules/DONE/ExpGamingLib/softmod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "ExpGamingLib", - "version": "4.0.0", - "description": "Adds some common functions used though out all ExpGaming modules", - "location": "FSM_ARCHIVE", - "keywords": [ - "ExpGaming", - "Lib" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": { - "FactorioStdLib.Game": "^0.8.0", - "FactorioStdLib.Color": "^0.8.0", - "FactorioStdLib.Table": "^0.8.0" - }, - "submodules": {} -} diff --git a/old/modules/DONE/FactorioStdLib/Color/control.lua b/old/modules/DONE/FactorioStdLib/Color/control.lua deleted file mode 100644 index e7eeae1f..00000000 --- a/old/modules/DONE/FactorioStdLib/Color/control.lua +++ /dev/null @@ -1,232 +0,0 @@ ---- A defines module for retrieving colors by name. --- Extends the Factorio defines table. --- @module StdLib.Color --- @alias defines.color - --- defines table is automatically required in all mod loading stages. --- luacheck: ignore 122/defines --- Ignore assigning to read only defines table. defines table is not ready only, however --- marking it this way allows warnings to be generated when trying to assign values - -defines = defines or {} --luacheck: ignore defines (This is used for testing locally) - ---- A table of colors allowing retrieval by color name. --- @table defines.color --- @field white {r=1.00,g=1.00,b=1.00} --- @field black {r=0.00,g=0.00,b=0.00} --- @field darkgrey {r=0.25,g=0.25,b=0.25} --- @field grey {r=0.50,g=0.50,b=0.50} --- @field lightgrey {r=0.75,g=0.75,b=0.75} --- @field red {r=1.00,g=0.00,b=0.00} --- @field darkred {r=0.50,g=0.00,b=0.00} --- @field lightred {r=1.00,g=0.50,b=0.50} --- @field green {r=0.00,g=1.00,b=0.00} --- @field darkgreen {r=0.00,g=0.50,b=0.00} --- @field lightgreen {r=0.50,g=1.00,b=0.50} --- @field blue {r=0.00,g=0.00,b=1.00} --- @field darkblue {r=0.00,g=0.00,b=0.50} --- @field lightblue {r=0.50,g=0.50,b=1.00} --- @field orange {r=1.00,g=0.55,b=0.10} --- @field yellow {r=1.00,g=1.00,b=0.00} --- @field pink {r=1.00,g=0.00,b=1.00} --- @field purple {r=0.60,g=0.10,b=0.60} --- @field brown {r=0.60,g=0.40,b=0.10} -defines.color = { - white={r=1.00,g=1.00,b=1.00}, - black={r=0.00,g=0.00,b=0.00}, - darkgrey={r=0.25,g=0.25,b=0.25}, - grey={r=0.50,g=0.50,b=0.50}, - lightgrey={r=0.75,g=0.75,b=0.75}, - red={r=1.00,g=0.00,b=0.00}, - darkred={r=0.50,g=0.00,b=0.00}, - lightred={r=1.00,g=0.50,b=0.50}, - green={r=0.00,g=1.00,b=0.00}, - darkgreen={r=0.00,g=0.50,b=0.00}, - lightgreen={r=0.50,g=1.00,b=0.50}, - blue={r=0.00,g=0.00,b=1.00}, - darkblue={r=0.00,g=0.00,b=0.50}, - lightblue={r=0.50,g=0.50,b=1.00}, - orange={r=1.00,g=0.55,b=0.10}, - yellow={r=1.00,g=1.00,b=0.00}, - pink={r=1.00,g=0.00,b=1.00}, - purple={r=0.60,g=0.10,b=0.60}, - brown={r=0.60,g=0.40,b=0.10} -} -local colors = defines.color - ---- Returns white for dark colors or black for lighter colors. --- @table defines.anticolor -defines.anticolor = { - green = colors.black, -- defines.color.black - grey = colors.black, -- defines.color.black - lightblue = colors.black, -- defines.color.black - lightgreen = colors.black, -- defines.color.black - lightgrey = colors.black, -- defines.color.black - lightred = colors.black, -- defines.color.black - orange = colors.black, -- defines.color.black - white = colors.black, -- defines.color.black - yellow = colors.black, -- defines.color.black - black = colors.white, -- defines.color.white - blue = colors.white, -- defines.color.white - brown = colors.white, -- defines.color.white - darkblue = colors.white, -- defines.color.white - darkgreen = colors.white, -- defines.color.white - darkgrey = colors.white, -- defines.color.white - darkred = colors.white, -- defines.color.white - pink = colors.white, -- defines.color.white - purple = colors.white, -- defines.color.white - red = colors.white -- defines.color.white -} - ---- Returns a lighter color of a named color --- @table defines.lightcolor -defines.lightcolor = { - white = colors.lightgrey, -- defines.color.lightgrey - grey = colors.darkgrey, -- defines.color.darkgrey - lightgrey = colors.grey, -- defines.color.grey - red = colors.lightred, -- defines.color.lightred - green = colors.lightgreen, -- defines.color.lightgreen - blue = colors.lightblue, -- defines.color.lightblue - yellow = colors.orange, -- defines.color.orange - pink = colors.purple -- defines.color.purple -} - --- added by cooldude260 - ---- Returns a lighter color of a named color. --- @table defines.textcolor --- @field info {r=0.21,g=0.95,b=1.00} --- @field bg {r=0.00,g=0.00,b=0.00} --- @field low {r=0.18,g=0.77,b=0.18} --- @field med {r=1.00,g=0.89,b=0.26} --- @field high {r=1.00,g=0.33,b=0.00} --- @field crit {r=1.00,g=0.00,b=0.00} -defines.textcolor = { - info={r=0.21,g=0.95,b=1.00}, - bg={r=0.00,g=0.00,b=0.00}, - low={r=0.18,g=0.77,b=0.18}, - med={r=1.00,g=0.89,b=0.26}, - high={r=1.00,g=0.33,b=0.00}, - crit={r=1.00,g=0.00,b=0.00} -} - --- metatable remade by cooldude -local _mt = { - __index=function(tbl,key) - return rawget(tbl,tostring(key):lower()) or rawget(defines.color,'white') - end, - __pairs=function(tbl) - return function() - local v - k, v = next(tbl, k) - return k, (v and {r = v['r'], g = v['g'], b = v['b'], a = v['a']}) or nil - end, tbl, nil - end, - __eq=function(tbl1,tbl2) - return tbl1.r == tbl2.r and tbl1.g == tbl2.g and tbl1.b == tbl2.b and tbl1.a == tbl2.a - end -} - -setmetatable(defines.color, _mt) -setmetatable(defines.anticolor, _mt) -setmetatable(defines.textcolor, _mt) -setmetatable(defines.lightcolor, _mt) - -local Color = {} --luacheck: allow defined top - ---- Set a value for the alpha channel in the given color table. --- `color.a` represents the alpha channel in the given color table. ---
                                                                                                          ---
                                                                                                        • If ***alpha*** is given, set `color.a` to it. ---
                                                                                                        • If ***alpha*** is not given, and if the given color table does not have a value for `color.a`, set `color.a` to 1. ---
                                                                                                        • If ***alpha*** is not given, and if the given color table already has a value for `color.a`, then leave `color.a` alone. ---
                                                                                                        --- @tparam[opt=white] defines.color|Concepts.Color color the color to configure --- @tparam[opt=1] float alpha the alpha value (*[0 - 1]*) to set for the given color --- @treturn a color table that has the specified value for the alpha channel -function Color.set(color, alpha) - color = color or defines.color.white - Color.to_table(color) - color.a = alpha or color.a or 1 - return color -end - ---- Converts a color in the array format to a color in the table format. --- @tparam table c_arr the color to convert --- @treturn a converted color — { r = c\_arr[1], g = c\_arr[2], b = c\_arr[3], a = c\_arr[4] } -function Color.to_table(c_arr) - if #c_arr > 0 then - return {r = c_arr[1], g = c_arr[2], b = c_arr[3], a = c_arr[4]} - end - return c_arr -end - ---- Converts a color in the rgb format to a color table --- @tparam[opt=0] int r 0-255 red --- @tparam[opt=0] int g 0-255 green --- @tparam[opt=0] int b 0-255 blue --- @tparam[opt=255] int a 0-255 alpha --- @treturn Concepts.Color -function Color.from_rgb(r, g, b, a) - r = r or 0 - g = g or 0 - b = b or 0 - a = a or 255 - return {r = r/255, g = g/255, b = b/255, a = a/255} -end - ---- Get a color table with a hexadecimal string. --- Optionally provide the value for the alpha channel. --- @tparam string string hex hexadecimal color (#ffffff, not #fff) --- @tparam[opt=1] float alpha the alpha value to set; such that ***[ 0 ⋜ value ⋜ 1 ]*** --- @treturn a color table with RGB converted from Hex and with alpha -function Color.from_hex(hex, alpha) - if not _G.Game then error('StdLib/Game not loaded') end - _G.Game.fail_if_missing(hex, "missing color hex value") - if hex:find("#") then hex = hex:sub(2) end - if not(#hex == 6) then error("invalid color hex value: "..hex) end - local number = tonumber(hex, 16) - return { - r = bit32.extract(number, 16, 8) / 255, - g = bit32.extract(number, 8, 8) / 255, - b = bit32.extract(number, 0, 8) / 255, - a = alpha or 1 - } -end - ---added by cooldude2606 - ---- Converts a color in the color table format to rgb --- @tparam table color the color to convert --- @treturn table the color as rgb -function Color.to_rgb(color) - local r = color.r or 0 - local g = color.g or 0 - local b = color.b or 0 - local a = color.a or 0.5 - return {r = r*255, g = g*255, b = b*255, a = a*255} -end - ---added by cooldude2606 - ---- Converts a color in the color table format to hex --- @tparam table color the color to convert --- @treturn string the color as hex -function Color.to_hex(color) - local hexadecimal = '0x' - for key, value in pairs{math.floor(color.r*255),math.floor(color.g*255),math.floor(color.b*255)} do - local hex = '' - while(value > 0)do - local index = math.fmod(value, 16) + 1 - value = math.floor(value / 16) - hex = string.sub('0123456789ABCDEF', index, index) .. hex - end - if string.len(hex) == 0 then hex = '00' - elseif string.len(hex) == 1 then hex = '0' .. hex - end - hexadecimal = hexadecimal .. hex - end - return hexadecimal -end - -return Color diff --git a/old/modules/DONE/FactorioStdLib/Color/softmod.json b/old/modules/DONE/FactorioStdLib/Color/softmod.json deleted file mode 100644 index c95f14bc..00000000 --- a/old/modules/DONE/FactorioStdLib/Color/softmod.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "FactorioStdLib.Color", - "version": "0.8.0", - "description": "A defines module for retrieving colors by name.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Standard Library", - "Lib", - "StdLib", - "Color", - "Extends" - ], - "dependencies": {}, - "collection": "FactorioStdLib@0.8.0", - "submodules": {} -} diff --git a/old/modules/DONE/FactorioStdLib/Game/control.lua b/old/modules/DONE/FactorioStdLib/Game/control.lua deleted file mode 100644 index 1c783c38..00000000 --- a/old/modules/DONE/FactorioStdLib/Game/control.lua +++ /dev/null @@ -1,110 +0,0 @@ ---- The game module. --- @module StdLib.Game - -local Game = { --luacheck: allow defined top - VALID_FILTER = function(v) - return v and v.valid - end, - _protect = function(moduleName) - return { - __newindex = function() error("Attempt to mutatate read-only "..moduleName.." Module") end, - __metatable = true - } - end, - _concat = function(lhs, rhs) - --Sanatize to remove address - return tostring(lhs):gsub("(%w+)%: %x+", "%1: (ADDR)") .. tostring(rhs):gsub("(%w+)%: %x+", "%1: (ADDR)") - end, - _rawstring = function (t) - local m = getmetatable(t) - local f = m.__tostring - m.__tostring = nil - local s = tostring(t) - m.__tostring = f - return s - end -} - --- No Doc --- This is a helper global and functions until .16 --- to set the name of your mod in control.lua set _stdlib_mod_name = 'name of your mod' --- luacheck: ignore _stdlib_mod_name -function Game.get_mod_name() - local ok, mod_name = pcall(function() return script.mod_name end) - return ok and mod_name or _stdlib_mod_name or "stdlib" -end - ---- Print msg if specified var evaluates to false. --- @tparam Mixed var variable to evaluate --- @tparam[opt="missing string value"] msg message -function Game.fail_if_missing(var, msg) - if not var then - error(msg or "Missing value", 3) - end - return false -end - ---- Return a valid player object from event, index, string, or userdata --- @tparam string|number|LuaPlayer|event mixed --- @treturn LuaPlayer a valid player or nil -function Game.get_player(mixed) - if type(mixed) == "table" then - if mixed.__self then - return mixed and mixed.valid and mixed - elseif mixed.player_index then - local player = game.players[mixed.player_index] - return player and player.valid and player - end - elseif mixed then - local player = game.players[mixed] - if type(mixed) == "string" and tonumber(mixed) then - for _, p in pairs(game.players) do - if p.name == mixed then - player = p - break - end - end - end - return player and player.valid and player - end -end - ---- Return a valid force object from event, string, or userdata --- @tparam string|LuaForce|event mixed --- @treturn LuaForce a valid force or nil -function Game.get_force(mixed) - if type(mixed) == "table" then - if mixed.__self then - return mixed and mixed.valid and mixed - elseif mixed.force then - return Game.get_force(mixed.force) - end - elseif type(mixed) == "string" then - local force = game.forces[mixed] - return (force and force.valid) and force - end -end - ---- Messages all players currently connected to the game. ---> Offline players are not counted as having received the message. --- If no players exist msg is stored in the `global._print_queue` table. --- @tparam string msg the message to send to players --- @tparam[opt] ?|nil|boolean condition the condition to be true for a player to be messaged --- @treturn uint the number of players who received the message. -function Game.print_all(msg, condition) - local num = 0 - if #game.players > 0 then - for _, player in pairs(game.players) do - if condition == nil or select(2, pcall(condition, player)) then - player.print(msg) - num = num + 1 - end - end - return num - else - global._print_queue = global._print_queue or {} - global._print_queue[#global._print_queue + 1] = msg - end -end - -return Game diff --git a/old/modules/DONE/FactorioStdLib/Game/softmod.json b/old/modules/DONE/FactorioStdLib/Game/softmod.json deleted file mode 100644 index 76b50163..00000000 --- a/old/modules/DONE/FactorioStdLib/Game/softmod.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "FactorioStdLib.Game", - "version": "0.8.0", - "description": "The game module.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Standard Library", - "Lib", - "StdLib", - "Game", - "Extends" - ], - "dependencies": {}, - "collection": "FactorioStdLib@0.8.0", - "submodules": {} -} diff --git a/old/modules/DONE/FactorioStdLib/String/control.lua b/old/modules/DONE/FactorioStdLib/String/control.lua deleted file mode 100644 index 48ccea0b..00000000 --- a/old/modules/DONE/FactorioStdLib/String/control.lua +++ /dev/null @@ -1,86 +0,0 @@ ---- Extends Lua 5.2 string. --- @module StdLib.String --- @alias string - --- luacheck: globals string (Allow mutating string) - ---- Returns a copy of the string with any leading or trailing whitespace from the string removed. --- @tparam string string s the to remove leading or trailing whitespace from --- @treturn string a copy of the string without leading or trailing whitespace -function string.trim(s) - return (s:gsub("^%s*(.-)%s*$", "%1")) -end - ---- Tests if a string starts with a given substring. --- @tparam string string s the to check for the start substring --- @tparam string start the substring to test for --- @treturn boolean true if the start substring was found in the string -function string.starts_with(s, start) - return string.find(s, start, 1, true) == 1 -end - ---- Tests if a string ends with a given substring. --- @tparam string string s the to check for the end substring --- @tparam string ends the substring to test for --- @treturn boolean true if the end substring was found in the string -function string.ends_with(s, ends) - return #s >= #ends and string.find(s, ends, #s - #ends + 1, true) and true or false -end - ---- Tests if a string contains a given substring. --- @tparam string string s the to check for the substring --- @tparam string contains the substring to test for --- @treturn boolean true if the substring was found in the string -function string.contains(s, contains) - return s and string.find(s, contains) ~= nil -end - ---- Tests whether a string is empty. --- @tparam string string s the to test --- @treturn boolean true if the string is empty -function string.is_empty(s) - return s == nil or s == '' -end - ---- Splits a string into an array. --- *Note:* Empty split substrings are not included in the resulting table. ---

                                                                                                        For example, `string.split("foo.bar...", ".", false)` results in the table `{"foo", "bar"}`. --- @tparam string string s the to split --- @tparam[opt="."] string sep the separator to use. --- @tparam[opt=false] string boolean pattern whether to interpret the separator as a lua pattern or plaintext for the split --- @treturn {string,...} an array of strings -function string.split(s, sep, pattern) - sep = sep or "." - sep = sep ~= "" and sep or "." - sep = not pattern and string.gsub(sep, "([^%w])", "%%%1") or sep - - local fields = {} - local start_idx, end_idx = string.find(s, sep) - local last_find = 1 - while start_idx do - local substr = string.sub(s, last_find, start_idx - 1) - if string.len(substr) > 0 then - table.insert(fields, string.sub(s, last_find, start_idx - 1)) - end - last_find = end_idx + 1 - start_idx, end_idx = string.find(s, sep, end_idx + 1) - end - local substr = string.sub(s, last_find) - if string.len(substr) > 0 then - table.insert(fields, string.sub(s, last_find)) - end - return fields -end - --- added by cooldude2606 ---- Returns a string as a hex format (also a string) --- @usage a = 'foo' --- string.to_hex(a) -- return '666f6f' --- @tparam string string str the to encode --- @treturn string the hex format of the string -function string.to_hex(str) - if not is_type(str,'string') then return '' end - return str:gsub('.',function (c) - return string.format('%02X',string.byte(c)) - end) -end \ No newline at end of file diff --git a/old/modules/DONE/FactorioStdLib/String/softmod.json b/old/modules/DONE/FactorioStdLib/String/softmod.json deleted file mode 100644 index 3ef2d9a6..00000000 --- a/old/modules/DONE/FactorioStdLib/String/softmod.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "FactorioStdLib.String", - "version": "0.8.0", - "description": "Extends Lua 5.2 string.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Standard Library", - "Lib", - "StdLib", - "String", - "Extends" - ], - "dependencies": {}, - "collection": "FactorioStdLib@0.8.0", - "submodules": {} -} diff --git a/old/modules/DONE/FactorioStdLib/Table/control.lua b/old/modules/DONE/FactorioStdLib/Table/control.lua deleted file mode 100644 index e9196e1c..00000000 --- a/old/modules/DONE/FactorioStdLib/Table/control.lua +++ /dev/null @@ -1,423 +0,0 @@ ---- Extends Lua 5.2 table. --- @module StdLib.Table --- @alias table - --- luacheck: globals table (Allow mutating global table) - ---- Given a mapping function, creates a transformed copy of the table ---- by calling the function for each element in the table, and using ---- the result as the new value for the key. Passes the index as second argument to the function. ---- @usage a= { 1, 2, 3, 4, 5} ----table.map(a, function(v) return v * 10 end) --produces: { 10, 20, 30, 40, 50 } ---- @usage a = {1, 2, 3, 4, 5} ----table.map(a, function(v, k, x) return v * k + x end, 100) --produces { 101, 104, 109, 116, 125} --- @tparam table table tbl the to be mapped to the transform --- @tparam function function func the to transform values --- @param[opt] ... additional arguments passed to the function --- @treturn table a new table containing the keys and mapped values -function table.map(tbl, func, ...) - local newtbl = {} - for i, v in pairs(tbl) do - newtbl[i] = func(v, i, ...) - end - return newtbl -end - ---- Given a filter function, creates a filtered copy of the table ---- by calling the function for each element in the table, and ---- filtering out any key-value pairs for non-true results. Passes the index as second argument to the function. ---- @usage a= { 1, 2, 3, 4, 5} ----table.filter(a, function(v) return v % 2 == 0 end) --produces: { 2, 4 } ---- @usage a = {1, 2, 3, 4, 5} ----table.filter(a, function(v, k, x) return k % 2 == 1 end) --produces: { 1, 3, 5 } --- @tparam table table tbl the to be filtered --- @tparam function function func the to filter values --- @param[opt] ... additional arguments passed to the function --- @treturn table a new table containing the filtered key-value pairs -function table.filter(tbl, func, ...) - local newtbl = {} - local insert = #tbl > 0 - for k, v in pairs(tbl) do - if func(v, k, ...) then - if insert then table.insert(newtbl, v) - else newtbl[k] = v end - end - end - return newtbl -end - ---- Given a candidate search function, iterates over the table, calling the function ---- for each element in the table, and returns the first element the search function returned true. ---- Passes the index as second argument to the function. ---- @usage a= { 1, 2, 3, 4, 5} ----table.find(a, function(v) return v % 2 == 0 end) --produces: 2 ---- @usage a = {1, 2, 3, 4, 5} ----table.find(a, function(v, k, x) return k % 2 == 1 end) --produces: 1 --- @tparam table table tbl the to be searched --- @tparam function any func the function to use to search for matching element --- @param[opt] ... additional arguments passed to the function --- @treturn ?|nil|Mixed the first found value, or nil if none was found -function table.find(tbl, func, ...) - for k, v in pairs(tbl) do - if func(v, k, ...) then - return v, k - end - end - return nil -end - ---- Finds the first index at which the value appears in the table --- @usage table.index({'foo','bar','baz'},'bar') -- retuns 2,'bar' --- @tparam table table tbl the to search though --- @param value the value you want the index of --- @treturn number the index that the value apeears at --- @return the value in that possition -function table.index(tbl, value) - for k, v in pairs(tbl) do - if v == value then - return k, v - end - end - return nil -end - ---- Returns a boolean on weather the table includes the value or not --- @usage table.includes({'foo','bar','baz'},'bar') -- retuns true --- @tparam table table tbl the to search though --- @param value the value you want the index of --- @treturn boolean if the table includes the value -function table.includes(tbl, value) - for k, v in pairs(tbl) do - if v == value then - return true - end - end - return false -end - ---- Given a candidate search function, iterates over the table, calling the function --- for each element in the table, and returns true if search function returned true. --- Passes the index as second argument to the function. --- @usage a= { 1, 2, 3, 4, 5} table.any(a, function(v) return v % 2 == 0 end) --produces: true --- @usage a = {1, 2, 3, 4, 5} table.any(a, function(v, k, x) return k % 2 == 1 end) --produces: true --- @tparam table table tbl the to be searched --- @tparam function any func the function to use to search for matching element --- @param[opt] ... additional arguments passed to the function --- @treturn boolean true if an element was found, false if none was found -function table.any(tbl, func, ...) - return table.find(tbl, func, ...) ~= nil -end - ---- Given a function, apply it to each element in the table. --- Passes the index as the second argument to the function. ---

                                                                                                        Iteration is aborted if the applied function returns true for any element during iteration. --- @usage --- a = {10, 20, 30, 40} --- table.each(a, function(v) game.print(v) end) --prints 10, 20, 30, 40, 50 --- @tparam table table tbl the to be iterated --- @tparam function function func the to apply to elements --- @param[opt] ... additional arguments passed to the function --- @treturn table the table where the given function has been applied to its elements -function table.each(tbl, func, ...) - for k, v in pairs(tbl) do - if func(v, k, ...) then - break - end - end - return tbl -end - ---- Returns a new array that is a one-dimensional recursive flattening of the given array. --- For every element that is an array, extract its elements into the new array. ---

                                                                                                        The optional level argument determines the level of recursion to flatten. ---> This function flattens an integer-indexed array, but not an associative array. --- @tparam array tbl the array to be flattened --- @tparam[opt] uint level recursive levels, or no limit to recursion if not supplied --- @treturn array a new array that represents the flattened contents of the given array -function table.flatten(tbl, level) - local flattened = {} - table.each(tbl, - function(value) - if type(value) == "table" and #value > 0 then - if level then - if level > 0 then - table.merge(flattened, table.flatten(value, level - 1), true) - else - table.insert(flattened, value) - end - else - table.merge(flattened, table.flatten(value), true) - end - else - table.insert(flattened, value) - end - end - ) - return flattened -end - ---- Given an array, returns the first element or nil if no element exists. --- @tparam array tbl the array --- @treturn ?|nil|Mixed the first element -function table.first(tbl) - return tbl[1] -end - ---- Given an array, returns the last element or nil if no elements exist. --- @tparam array tbl the array --- @treturn ?|nil|Mixed the last element or nil -function table.last(tbl) - local size = #tbl - if size == 0 then return nil end - return tbl[size] -end - ---- Given an array of only numeric values, returns the minimum or nil if no element exists. --- @tparam {number,...} tbl the array with only numeric values --- @treturn ?|nil|number the minimum value -function table.min(tbl) - if #tbl == 0 then return nil end - - local min = tbl[1] - for _, num in pairs(tbl) do - min = num < min and num or min - end - return min -end - ----Given an array of only numeric values, returns the maximum or nil if no element exists. --- @tparam {number,...} tbl the array with only numeric values --- @treturn ?|nil|number the maximum value -function table.max(tbl) - if #tbl == 0 then return nil end - - local max = tbl[1] - for _, num in pairs(tbl) do - max = num > max and num or max - end - return max -end - ---- Given an array of only numeric values, return the sum of all values, or 0 for empty arrays. --- @tparam {number,...} tbl the array with only numeric values --- @treturn number the sum of the numbers or zero if the given array was empty -function table.sum(tbl) - local sum = 0 - for _, num in pairs(tbl) do - sum = sum + num - end - return sum -end - ---- Given an array of only numeric values, returns the average or nil if no element exists. --- @tparam {number,...} tbl the array with only numeric values --- @treturn ?|nil|number the average value -function table.avg(tbl) - local cnt = #tbl - return cnt ~= 0 and table.sum(tbl) / cnt or nil -end - ---- Merges two tables — values from first get overwritten by the second. ---- @usage --- function some_func(x, y, args) --- args = table.merge({option1=false}, args) --- if opts.option1 == true then return x else return y end --- end --- some_func(1,2) -- returns 2 --- some_func(1,2,{option1=true}) -- returns 1 --- @tparam table tblA first table --- @tparam table tblB second table --- @tparam[opt=false] boolean array_merge set to true to merge the tables as an array or false for an associative array --- @treturn array|table an array or an associated array where tblA and tblB have been merged -function table.merge(tblA, tblB, array_merge) - if not tblB then - return tblA - end - if array_merge then - for _, v in pairs(tblB) do - table.insert(tblA, v) - end - - else - for k, v in pairs(tblB) do - tblA[k] = v - end - end - return tblA -end - --- copied from factorio/data/core/luablib/util.lua - ---- Creates a deep copy of table without copying Factorio objects. --- @usage local copy = table.deepcopy[data.raw.["stone-furnace"]["stone-furnace"]] -- returns a copy of the stone furnace entity --- @tparam table table object the to copy --- @treturn table a copy of the table -function table.deepcopy(object) - local lookup_table = {} - local function _copy(this_object) - if type(this_object) ~= "table" then - return this_object - elseif this_object.__self then - return this_object - elseif lookup_table[this_object] then - return lookup_table[this_object] - end - local new_table = {} - lookup_table[this_object] = new_table - for index, value in pairs(this_object) do - new_table[_copy(index)] = _copy(value) - end - return setmetatable(new_table, getmetatable(this_object)) - end - return _copy(object) -end - ---- Default table comparator sort function. --- @local --- @param x one comparator operand --- @param y the other comparator operand --- @return true if x logically comes before y in a list, false otherwise -local function sortFunc(x, y) --sorts tables with mixed index types. - local tx = type(x) - local ty = type(y) - if tx == ty then - if type(x) == 'string' then - return string.lower(x) < string.lower(y) - else - return x < y - end - elseif tx == 'number' then - return true --only x is a number and goes first - else - return false --only y is a number and goes first - end -end - ---- Returns a copy of all of the values in the table. --- @tparam table table tbl the to copy the keys from, or an empty table if tbl is nil --- @tparam[opt] boolean sorted whether to sort the keys (slower) or keep the random order from pairs() --- @tparam[opt] boolean as_string whether to try and parse the values as strings, or leave them as their existing type --- @treturn array an array with a copy of all the values in the table -function table.values(tbl, sorted, as_string) - if not tbl then return {} end - local valueset = {} - local n = 0 - if as_string then --checking as_string /before/ looping is faster - for _, v in pairs(tbl) do - n = n + 1 - valueset[n] = tostring(v) - end - else - for _, v in pairs(tbl) do - n = n + 1 - valueset[n] = v - end - end - if sorted then - table.sort(valueset,sortFunc) - end - return valueset -end - ---- Returns a copy of all of the keys in the table. --- @tparam table table tbl the to copy the keys from, or an empty table if tbl is nil --- @tparam[opt] boolean sorted whether to sort the keys (slower) or keep the random order from pairs() --- @tparam[opt] boolean as_string whether to try and parse the keys as strings, or leave them as their existing type --- @treturn array an array with a copy of all the keys in the table -function table.keys(tbl, sorted, as_string) - if not tbl then return {} end - local keyset = {} - local n = 0 - if as_string then --checking as_string /before/ looping is faster - for k, _ in pairs(tbl) do - n = n + 1 - keyset[n] = tostring(k) - end - else - for k, _ in pairs(tbl) do - n = n + 1 - keyset[n] = k - end - end - if sorted then - table.sort(keyset,sortFunc) - end - return keyset -end - ---- Removes keys from a table by setting the values associated with the keys to nil. --- @usage local a = {1, 2, 3, 4} ---table.remove_keys(a, {1,3}) --returns {nil, 2, nil, 4} --- @usage local b = {k1 = 1, k2 = 'foo', old_key = 'bar'} ---table.remove_keys(b, {'old_key'}) --returns {k1 = 1, k2 = 'foo'} --- @tparam table table tbl the to remove the keys from --- @tparam {Mixed,...} keys an array of keys that exist in the given table --- @treturn table tbl without the specified keys -function table.remove_keys(tbl, keys) - for i = 1, #keys do - tbl[keys[i]] = nil - end - return tbl -end - ---- Returns the number of keys in a table, if func is passed only count keys when the function is true. --- @tparam table tbl to count keys --- @tparam[opt] function func to incremement counter --- @param[optchain] ... additional arguments passed to the function --- @treturn number The number of keys matching the function or the number of all keys if func isn't passed --- @treturn number The total number of keys --- @usage local a = { 1, 2, 3, 4, 5} --- table.count_keys(a) -- produces: 5, 5 --- @usage local a = {1, 2, 3, 4, 5} --- table.count_keys(a, function(v, k) return k % 2 == 1 end) -- produces: 3, 5 -function table.count_keys(tbl, func, ...) - if type(tbl) ~= 'table' then return 0, 0 end - local count, total = 0, 0 - for k, v in pairs(tbl) do - total = total + 1 - if func then - if func(v, k, ...) then - count = count + 1 - end - else - count = count + 1 - end - end - return count, total -end - ---- Returns an inverted (***{[value] = key,...}***) copy of the given table. If the values are not unique, the assigned key depends on the order of pairs(). --- @usage local a = {k1 = 'foo', k2 = 'bar'} ---table.invert(a) --returns {'foo' = k1, 'bar' = k2} --- @usage local b = {k1 = 'foo', k2 = 'bar', k3 = 'bar'} ---table.invert(b) --returns {'foo' = k1, 'bar' = ?} --- @tparam table table tbl the to invert --- @treturn table a new table with inverted mapping -function table.invert(tbl) - local inverted = {} - for k, v in pairs(tbl) do - inverted[v] = k - end - return inverted -end - ---- Return the size of a table using built in table_size function --- @function size --- @tparam table table to use --- @treturn int size of the table -table.size = table_size - ---- For all string or number values in an array map them to a key = true table --- @usage local a = {"v1", "v2"} --- table.array_to_dict_bool(a) -- return {["v1"] = true, ["v2"]= true} --- @tparam table table tbl the to convert --- @treturn table the converted table -function table.arr_to_bool(tbl) - local newtbl = {} - for _, v in pairs(tbl) do - if type(v) == "string" or type(v) == "number" then - newtbl[v] = true - end - end - return newtbl -end \ No newline at end of file diff --git a/old/modules/DONE/FactorioStdLib/Table/softmod.json b/old/modules/DONE/FactorioStdLib/Table/softmod.json deleted file mode 100644 index e915763c..00000000 --- a/old/modules/DONE/FactorioStdLib/Table/softmod.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "FactorioStdLib.Table", - "version": "0.8.0", - "description": "Extends Lua 5.2 table.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Standard Library", - "Lib", - "StdLib", - "Table", - "Extends" - ], - "dependencies": {}, - "collection": "FactorioStdLib@0.8.0", - "submodules": {} -} diff --git a/old/modules/DONE/FactorioStdLib/softmod.json b/old/modules/DONE/FactorioStdLib/softmod.json deleted file mode 100644 index 7cc751b9..00000000 --- a/old/modules/DONE/FactorioStdLib/softmod.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "FactorioStdLib", - "version": "0.8.0", - "description": "Factorio Standard Library Projects", - "location": "FSM_ARCHIVE", - "keywords": [ - "Standard Library", - "Lib", - "StdLib" - ], - "author": "Afforess", - "contact": "https://github.com/Afforess/Factorio-Stdlib/issues", - "license": "https://github.com/Afforess/Factorio-Stdlib/blob/master/LICENSE", - "submodules": { - "FactorioStdLib.Color": "0.8.0", - "FactorioStdLib.Game": "0.8.0", - "FactorioStdLib.String": "0.8.0", - "FactorioStdLib.Table": "0.8.0" - }, - "dependencies": {} -} diff --git a/old/modules/DONE/Guis/ExpGamingAdmin/Gui/control.lua b/old/modules/DONE/Guis/ExpGamingAdmin/Gui/control.lua deleted file mode 100644 index 7dd8c2e7..00000000 --- a/old/modules/DONE/Guis/ExpGamingAdmin/Gui/control.lua +++ /dev/null @@ -1,202 +0,0 @@ ---- Adds a gui that can be used to access all the admin commands. --- @module ExpGamingAdmin.Gui@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias AdminGui - --- Module Require -local Admin = require('ExpGamingAdmin') -local Gui = require('ExpGamingCore.Gui') -local Role = require('ExpGamingCore.Role') -local Game = require('FactorioStdLib.Game') -local playerInfo -- ExpGamingPlayer.playerInfo@^4.0.0 - --- Module Define -local module_verbose = false -local AdminGui = { - on_init=function() - if loaded_modules['ExpGamingPlayer.playerInfo'] then playerInfo = require('ExpGamingPlayer.playerInfo') - else playerInfo = function(player,frame) - frame.add{ - type='label', - caption={'ExpGamingAdmin.no-info-file'} - } - end end - --code - end, - buttons={} -} - -function Admin.open(player,pre_select_player,pre_select_action) - Gui.center.clear(player) - Admin.center(player,pre_select_player,pre_select_action) -end - --- Function Define -function AdminGui.add_button(name,caption,tooltip,callback) - AdminGui.buttons[name] = Gui.inputs.add{ - type='button', - name='admin-gui-'..name, - caption=caption, - tooltip=tooltip - }:on_event('click',function(event) - local parent = event.element.parent - local pre_select_player = parent.player and parent.player.caption or nil - callback(pre_select_player,event.player_index) - end) -end - -function AdminGui.draw(frame,filter_buttons) - local frame = frame.add{ - type='flow', - name='admin' - } - frame.add{ - type='label', - caption='', - name='player' - }.style.visible = false - local function format(btn) - btn.style.height = 30 - btn.style.width = 30 - end - for name,button in pairs(AdminGui.buttons) do - if not filter_buttons or filter_buttons[name] then format(button(frame)) end - end - return frame.player -end - --- Gui Define -local function get_players(_player,root_frame,state) - local players = {'Select Player'} - local _players = state and game.players or game.connected_players - for _,player in pairs(_players) do - if player.name ~= _player.name then - if not Admin.is_banned or not Admin.is_banned(player) then - table.insert(players,player.name) - end - end - end - return players -end - -local online_check = Gui.inputs.add_checkbox('online-check-admin-commands',false,'Show Offline',false,function(player,element) - element.parent['player-drop-down-admin-commands'].items = get_players(player,element.parent,true) - element.parent['player-drop-down-admin-commands'].selected_index = 1 -end,function(player,element) - element.parent['player-drop-down-admin-commands'].items = get_players(player,element.parent,false) - element.parent['player-drop-down-admin-commands'].selected_index = 1 -end) - -local player_drop_down = Gui.inputs.add_drop_down('player-drop-down-admin-commands',get_players,1,function(player,selected,items,element) - element.parent.parent.player.caption = selected - local player_info_flow = element.parent.parent.info_flow - player_info_flow.clear() - if selected == 'Select Player' then return - else playerInfo(selected,player_info_flow,true) end - local role = Role.get_highest(player) - local _role = Role.get_highest(selected) - if role.index >= _role.index then element.parent.warning.caption = {'ExpGamingAdmin.warning'} - else element.parent.warning.caption = '' end -end) - -local reason_input = Gui.inputs.add_text('reason-input-admin-commands',false,'Enter Reason',function(player,text,element) - if string.len(text) < 20 or text == 'Enter Reason' then - element.parent.warning.caption = {'ExpGamingAdmin.short-reason'} - else - element.parent.warning.caption = '' - end -end) - -local action_drop_down = Gui.inputs.add_drop_down('action-drop-down-rank-change',function() return {'Select Action',unpack(Admin.action_names)} end,1,function(player,selected,items,element) - element.parent.parent.action.caption = selected - if selected == 'Jail' or selected == 'Kick' or selected == 'Ban' or selected == 'Temp Ban' then - element.parent['reason-input-admin-commands'].style.visible = true - else - element.parent['reason-input-admin-commands'].style.visible = false - end -end) - -local take_action = Gui.inputs{ - type='button', - name='admin-commands-take', - caption={'ExpGamingAdmin.take-action'} -}:on_event('click',function(event) - local dropdowns = event.element.parent - local role = Role.get_highest(event.player_index) - local _action= dropdowns.parent.action.caption ~= 'Select Action' and dropdowns.parent.action.caption or nil - local _player = Game.get_player(dropdowns.parent.player.caption) - if not _player or not _action then dropdowns.warning.caption = {'ExpGamingAdmin.invalid'} return end - local _role = Role.get_highest(_player) - if role.index >= _role.index then dropdowns.warning.caption = {'ExpGamingAdmin.rank-high'} return end - local _reason = dropdowns['reason-input-admin-commands'] and dropdowns['reason-input-admin-commands'].text - if (_action == 'Jail' or _action == 'Kick' or _action == 'Ban' or _action == 'Temp Ban') and (_reason == 'Enter Reason' or string.len(_reason) < 10) then return end - Admin.take_action(_action,_player,event.player_index,_reason) - Gui.center.clear(event) -end) - -Admin.center = Gui.center{ - name='admin-commands', - caption='utility/danger_icon', - tooltip={'ExpGamingAdmin.tooltip'}, - draw=function(self,frame,pre_select_player,pre_select_action) - frame.caption={'ExpGamingAdmin.name'} - frame = frame.add{ - type='flow', - direction='horizontal' - } - local dropdowns = frame.add{ - type='flow', - direction='vertical' - } - local player_info_flow = frame.add{ - name='info_flow', - type='flow', - direction='vertical' - } - player_info_flow.style.height = 280 - player_info_flow.style.width = 200 - local label = dropdowns.add{ - type='label', - caption={'ExpGamingAdmin.message'} - } - label.style.single_line = false - label.style.width = 200 - online_check:draw(dropdowns) - local _drop = player_drop_down:draw(dropdowns) - if pre_select_player then Gui.set_dropdown_index(_drop,pre_select_player.name) end - _drop = action_drop_down:draw(dropdowns) - Gui.set_dropdown_index(_drop,pre_select_action) - local _text = reason_input:draw(dropdowns) - if pre_select_action == 'Jail' or pre_select_action == 'Kick' or pre_select_action == 'Ban' then - _text.style.visible = true else _text.style.visible = false - end - if pre_select_player then playerInfo(pre_select_player,player_info_flow,true) end - _text.style.width = 200 - label = dropdowns.add{ - name='warning', - type='label', - caption='', - style='bold_red_label' - } - label.style.single_line = false - label.style.width = 200 - take_action:draw(dropdowns) - local caption = pre_select_player and pre_select_player.name or '' - frame.add{ - name='player', - type='label', - caption=caption - }.style.visible = false - caption = pre_select_action or '' - frame.add{ - name='action', - type='label', - caption=caption - }.style.visible = false - end -} - --- Module Return --- calling will draw the admin buttons to that frame -return setmetatable(AdminGui,{__call=function(self,...) return self.draw(...) end}) \ No newline at end of file diff --git a/old/modules/DONE/Guis/ExpGamingAdmin/Gui/softmod.json b/old/modules/DONE/Guis/ExpGamingAdmin/Gui/softmod.json deleted file mode 100644 index 97fc27d7..00000000 --- a/old/modules/DONE/Guis/ExpGamingAdmin/Gui/softmod.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "ExpGamingAdmin.Gui", - "version": "4.0.0", - "description": "Adds a gui that can be used to access all the admin commands.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Admin", - "ExpGaming", - "Commands", - "Gui" - ], - "dependencies": { - "ExpGamingCore.Gui": "^4.0.0", - "ExpGamingCore.Role": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingPlayer": "?^4.0.0", - "ExpGamingPlayer.playerInfo": "?^4.0.0", - "mod-gui": "*", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingAdmin@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/Guis/ExpGamingAdmin/control.lua b/old/modules/DONE/Guis/ExpGamingAdmin/control.lua deleted file mode 100644 index 9642ee9b..00000000 --- a/old/modules/DONE/Guis/ExpGamingAdmin/control.lua +++ /dev/null @@ -1,103 +0,0 @@ ---- The base functions required to make the others work. --- @module ExpGamingAdmin@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias Admin - --- Module Require -local Game = require('FactorioStdLib.Game') -local Color = require('FactorioStdLib.Color') -local Role -- ExpGamingCore.Role@^4.0.0 -local Sync -- ExpGamingCore.Sync@^4.0.0 -local Server -- ExpGamingCore.Server@^4.0.0 - --- Module Define -local module_verbose = false -local Admin = { - on_init=function() - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end - if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end - if loaded_modules['ExpGamingCore.Server'] then - Server = require('ExpGamingCore.Server') - Server.add_module_to_interface('Admin','ExpGamingAdmin') - end - end, - actions={}, - action_functions={}, - action_names={} -} - --- Global Define -local global = { - banned = {} -} -Global.register(global,function(tbl) global = tbl end) - --- Function Define -function Admin.valid_players(player,by_player) - player = Game.get_player(player) - by_player = Game.get_player(by_player) or SERVER - return player, by_player -end - -function Admin.create_reason(reason,name) - reason = reason or 'No Reason' - if not string.find(string.lower(reason),string.lower(name)) then reason = reason..' - '..name end - if Sync and Sync.info.date ~= '0000/00/00' and not string.find(string.lower(reason),Sync.info.date) then reason = reason..' - '..Sync.info.date end - if not string.find(string.lower(reason),'appeal') then reason = reason..' - Visit www.explosivegaming.nl to appeal.' end - return reason -end - -function Admin.allowed(player) - player = Game.get_player(player) - if Role then - return Role.allowed(player,'admin-commands') - else return player.admin end -end - -function Admin.set_banned(player,set) - player = Game.get_player(player) - if not player then return false end - global.banned[player.name] = set -end - -function Admin.is_banned(player,detail) - player = Game.get_player(player) - if not player then return false end - local banned = global.banned[player.name] - if banned == true then return true end - if not banned then return false end - if detail then return banned - else return true end -end - -function Admin.add_action(action,callback) - verbose('Added admin action: '..action) - Admin.actions[string.lower(action)] = table.insert(Admin.action_names,action) - Admin.action_functions[string.lower(action)] = callback -end - -function Admin.take_action(action,player,by_player,reason) - if Admin.action_functions[string.lower(action)] then Admin.action_functions[string.lower(action)](player,by_player,reason) end - if Admin[action] then Admin[action](player,by_player,reason) end -end - -function Admin.clear_player(player,by_player) - player, by_player = Admin.valid_players(player,by_player) - if not player then return end - if Server and Admin.is_banned(player,true) == true then Server.interface(game.unban_player,true,player) end - if Admin.clear_warnings then Admin.clear_warnings(player,by_player,true) end - if Admin.clear_reports then Admin.clear_reports(player,by_player,true) end - if Server and Role.has_flag(player,'is_jail') then Server.interface(Role.revert,true,player,by_player,2) end - if Sync then Sync.emit_embedded{ - title='Player Clear', - color=Color.to_hex(defines.textcolor.low), - description='A player had their reports and warnings cleared.', - ['Player:']='<>'..player.name, - ['By:']='<>'..by_player.name, - } end - Admin.set_banned(player,false) -end - --- Module Return -return Admin \ No newline at end of file diff --git a/old/modules/DONE/Guis/ExpGamingAdmin/locale/de.cfg b/old/modules/DONE/Guis/ExpGamingAdmin/locale/de.cfg deleted file mode 100644 index 299b094f..00000000 --- a/old/modules/DONE/Guis/ExpGamingAdmin/locale/de.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[ExpGamingAdmin] -name=Admin-Befehle -tooltip=Die mächtigsten Befehle sind hier zuhause. -no-info-file=Die Informationsdatei wurde nicht gefunden. -message=Wähle einen Spieler und eine Aktion. Stell vor dem Ausführen sicher, dass der Richtige ist! -warning=Achtung, dieser Spieler hat einen höheren Rang als du selbst, weshalb du seinen Rang nicht ändern kannst. -short-reason=Achtung, dies ist ein sehr kurzer Grund. Bitte versuche, mehr Informationen anzugeben. (Warning: The reason is too short. UPDATE) -rank-high=Dieser Spieler hat einen hohen Rang. Bitte benutze nur Ingame-Befehle gegen diese Person, wenn du dir sicher bist! -invalid=Der Spieler oder die Aktion war ungültig. Bitte versuche es noch einmal! -take-action= Ergreife Maßnahme -tooltip-ban=Banne Spieler -tooltip-kick=Kicke Spieler -tooltip-jail=Sperre Spieler ins Gefängnis -tooltip-go-to=Gehe zum Spieler -tooltip-bring=Bringe den Spieler zu dir \ No newline at end of file diff --git a/old/modules/DONE/Guis/ExpGamingAdmin/locale/en.cfg b/old/modules/DONE/Guis/ExpGamingAdmin/locale/en.cfg deleted file mode 100644 index f240bac1..00000000 --- a/old/modules/DONE/Guis/ExpGamingAdmin/locale/en.cfg +++ /dev/null @@ -1,21 +0,0 @@ -[ExpGamingAdmin] -name=Admin Commands -tooltip=Admin commands make their home here -no-info-file=No info file was found -message=Please select a player and an action to take. Make sure to choose the correct one! -warning=Warning: This player outranks you. Therefore, you cannot edit their rank. -short-reason=Warning: The reason is too short. -rank-high=Warning: This player outranks you. Therefore, you cannot edit their rank. -invalid=The player or the action is invalid. Please try again! -take-action=Take Action -tooltip-ban=Ban Player -tooltip-kick=Kick Player -tooltip-jail=Jail Player -tooltip-go-to=Go To Player -tooltip-bring=Bring Player -temp-ban=__1__ was temporary banned by __2__ and will remain in jail until next reset -report=Report Player -cant-report-ban=Invalid player as player is banned; Either unban or use /clear-all -low-print=__1__ has been reported by a user for: __2__ -high-print=__1__ has been reported by __2__ for: __3__ -cant-report=This player can't be reported. \ No newline at end of file diff --git a/old/modules/DONE/Guis/ExpGamingAdmin/locale/fr.cfg b/old/modules/DONE/Guis/ExpGamingAdmin/locale/fr.cfg deleted file mode 100644 index f882fc1c..00000000 --- a/old/modules/DONE/Guis/ExpGamingAdmin/locale/fr.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[ExpGamingAdmin] -name=Commandes Admin -tooltip=Des commandes très puissantes résident ici. -no-info-file=Aucun fichier info trouvé -message=Veuillez sélectionner un joueur et une action, faites en sorte que ce soit la bonne ! -warning=Attention, ce joueur est de rang supérieur au vôtre, vous ne pouvez le modifier. -short-reason=Attention, la raison indiquée est trop courte. Soyez concis mais aussi précis. (Warning: The reason is too short. UPDATE) -rank-high=Ce joueur est de rang supérieur, veuillez utiliser une commande dont vous maîtriser l'utilisation ! -invalid=Le Joueur ou l'action est invalide, ré-essayez ! -take-action=Agir -tooltip-ban=Bannir un Joueur -tooltip-kick=Exclure un Joueur -tooltip-jail=Emprisonner un Joueur -tooltip-go-to=Aller à la position d'un Joueur -tooltip-bring=Amener le Joueur à soi diff --git a/old/modules/DONE/Guis/ExpGamingAdmin/locale/nl.cfg b/old/modules/DONE/Guis/ExpGamingAdmin/locale/nl.cfg deleted file mode 100644 index ff47947a..00000000 --- a/old/modules/DONE/Guis/ExpGamingAdmin/locale/nl.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[ExpGamingAdmin] -name=Admin Commands -tooltip=Admin Commands kan je hier vinden. -no-info-file=Infobestand niet gevonden. -message=Selecteer een speler en de bijbehorende actie. Wees er zeker van dat je de correcte actie kiest. -warning=Fout: Je kan de rank van deze speler niet aanpassen omdat het jouw rank overtreft. -short-reason=Fout: De reden is te kort. (Warning: The reason is too short. UPDATE) -rank-high=Fout: Deze speler overtreft jouw rank. -invalid=Fout: De speler kan niet gevonden worden en/of de actie is onjuist. Probeer opnieuw! -take-action=Actie ondernemen -tooltip-ban=Ban speler -tooltip-kick=Kick speler -tooltip-jail=Jail speler -tooltip-go-to=Ga naar speler -tooltip-bring=Breng speler diff --git a/old/modules/DONE/Guis/ExpGamingAdmin/locale/sv-SE.cfg b/old/modules/DONE/Guis/ExpGamingAdmin/locale/sv-SE.cfg deleted file mode 100644 index 679188c2..00000000 --- a/old/modules/DONE/Guis/ExpGamingAdmin/locale/sv-SE.cfg +++ /dev/null @@ -1,19 +0,0 @@ -[ExpGamingAdmin] -name=Adminkommandon -tooltip=Adminkommando gör dit hem här -no-info-file=Ingen informationsfil kunde hittas -message=Var snäll och välj en spelare och en åtgärd att utfärda, se till att du väljer den rätta! -warning=Warning: Den här spelaren har högre rang än dig. Därför kan du inte redigera dess rang. -short-reason=Warning: Skälet är för kort. -rank-high=Warning: Den här spelaren har högre rang än dig. Därför kan du inte redigera dess rang. -invalid=Spelaren eller åtgärden är ogiltig. Var vänlig och försök igen! -take-action=Utför åtgärd. -tooltip-ban=Bannlys Spelare -tooltip-kick=Sparka Spelare -tooltip-jail=Fängsla Spelare -tooltip-go-to=Gå till Spelare -tooltip-bring=Hämta spelare -report=Rapportera Spelare -low-print=__1__ har blivit rapporterad av __2__ för: __3__ -high-print=__1__ har blivit rapporterad av __2__ för: __3__ -cant-report=Den här spelaren kan inte bli rapporterad. diff --git a/old/modules/DONE/Guis/ExpGamingAdmin/softmod.json b/old/modules/DONE/Guis/ExpGamingAdmin/softmod.json deleted file mode 100644 index efeae92e..00000000 --- a/old/modules/DONE/Guis/ExpGamingAdmin/softmod.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "ExpGamingAdmin", - "version": "4.0.0", - "description": "A set of useful admin commands and functions that can be used by other modules.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Admin", - "ExpGaming", - "Set", - "Commands", - "Functions", - "Scripts", - "Useful" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "submodules": { - "ExpGamingAdmin": "4.0.0", - "ExpGamingAdmin.Ban": "4.0.0", - "ExpGamingAdmin.ClearInventory": "4.0.0", - "ExpGamingAdmin.Gui": "4.0.0", - "ExpGamingAdmin.Jail": "4.0.0", - "ExpGamingAdmin.Kick": "4.0.0", - "ExpGamingAdmin.Reports": "4.0.0", - "ExpGamingAdmin.Teleport": "4.0.0", - "ExpGamingAdmin.TempBan": "4.0.0", - "ExpGamingAdmin.Warnings": "4.0.0", - "ExpGamingAdmin.Commands": "4.0.0" - }, - "dependencies": { - "ExpGamingCore.Role": "?^4.0.0", - "ExpGamingCore.Sync": "?^4.0.0", - "ExpGamingCore.Server": "?^4.0.0", - "FactorioStdLib.Game": "^0.8.0" - } -} diff --git a/old/modules/DONE/Guis/Rockets/control.lua b/old/modules/DONE/Guis/Rockets/control.lua deleted file mode 100644 index d11f558d..00000000 --- a/old/modules/DONE/Guis/Rockets/control.lua +++ /dev/null @@ -1,105 +0,0 @@ ---- Adds a rocket count gui to the game that shows milestones and average rocket time --- @module ExpGamingInfo.Rockets --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Gui = require('ExpGamingCore.Gui') -local Game = require('FactorioStdLib.Game') - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Sync^4.0.0'] then require(module_path..'/src/sync') end - end -} - --- Global Define -local global = { - update=0, - first=0, - _last=0, - last=0, - fastest=0, - milestones={m1=0,m2=0,m5=0,m10=0,m20=0,m50=0,m100=0,m200=0,m500=0,m1000=0,m2000=0,m5000=0} -} -Global.register(global,function(tbl) global = tbl end) - --- Function Define -ThisModule.Gui = Gui.left{ - name='rockets', - caption='item/rocket-silo', - tooltip={'ExpGamingInfo-Rockets.tooltip'}, - draw=function(self,frame) - frame.caption = {'ExpGamingInfo-Rockets.name'} - local player = Game.get_player(frame.player_index) - local satellites = player.force.get_item_launched('satellite') - local time = {'ExpGamingInfo-Rockets.nan'} - if satellites == 1 then time = tick_to_display_format(game.tick) - elseif satellites > 1 then time = tick_to_display_format((game.tick-global.first)/satellites) end - if satellites ~= global.update then - global.update = satellites - if global.first == 0 then global.first = game.tick end - global._last = global.last - global.last = game.tick - if global.last-global._last < global.fastest or global.fastest == 0 then global.fastest = global.last-global._last end - end - frame.add{ - type='label', - caption={'ExpGamingInfo-Rockets.sent',satellites} - } - frame.add{ - type='label', - caption={'ExpGamingInfo-Rockets.first',tick_to_display_format(global.first)} - } - frame.add{ - type='label', - caption={'ExpGamingInfo-Rockets.last',tick_to_display_format(global.last-global._last)} - } - frame.add{ - type='label', - caption={'ExpGamingInfo-Rockets.time',time} - } - frame.add{ - type='label', - caption={'ExpGamingInfo-Rockets.fastest',tick_to_display_format(global.fastest)} - } - frame.add{ - type='label', - caption={'ExpGamingInfo-Rockets.milestones'}, - style='caption_label' - } - local milestones = frame.add{ - type='flow', - direction='vertical' - } - for milestone,next_time in pairs(global.milestones) do - milestone = tonumber(milestone:match('%d+')) - if next_time == 0 and satellites == milestone then - global.milestones['m'..milestone] = global.last - next_time = global.last - Gui.left.open('rockets') - end - local _time = {'ExpGamingInfo-Rockets.nan'} - if next_time > 0 then _time = tick_to_display_format(next_time) end - milestones.add{ - type='label', - caption={'ExpGamingInfo-Rockets.format',tostring(milestone),_time} - } - if next_time == 0 then break end - end - end, - can_open=function(player) - if player.force.get_item_launched('satellite') > 0 then return true - else return {'ExpGamingInfo-Rockets.none'} end - end -} - --- Event Define -Event.add(defines.events.on_rocket_launched,function(event) Gui.left.update('rockets') end) - --- Module Return --- when called will toggle the gui for that player, updates gui if no player given -return setmetatable(ThisModule,{__call=function(self,...) self.Gui(...) end}) \ No newline at end of file diff --git a/old/modules/DONE/Guis/Rockets/locale/de.cfg b/old/modules/DONE/Guis/Rockets/locale/de.cfg deleted file mode 100644 index 8fd5471e..00000000 --- a/old/modules/DONE/Guis/Rockets/locale/de.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[ExpGamingInfo-Rockets] -name=Raketeninfo -tooltip=Detailliste über gestartete Raketen. -none=Es wurden noch keine Rakten gestartet. -nan=NaN -sent=Gestartete Raketen: __1__ -first=Erster Start: __1__ -last=Dauer bis zum letzten Start: __1__ -time=Durchschnittliche Starzeit: __1__ -fastest=Schnellster Start: __1__ -milestones=Meilensteine: -format=__1__: __2__ \ No newline at end of file diff --git a/old/modules/DONE/Guis/Rockets/locale/en.cfg b/old/modules/DONE/Guis/Rockets/locale/en.cfg deleted file mode 100644 index 263d9b2c..00000000 --- a/old/modules/DONE/Guis/Rockets/locale/en.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[ExpGamingInfo-Rockets] -name=Rocket Info -tooltip=List of details about the rockets sent. -none=No rockets have been sent yet. -nan=Not available -sent=Rockets Sent: __1__ -first=First Lanuched At: __1__ -last=Last Launch Took: __1__ -time=Average Launch Time: __1__ -fastest=Fastest Launch: __1__ -milestones=Milestones: -format=__1__: __2__ \ No newline at end of file diff --git a/old/modules/DONE/Guis/Rockets/locale/fr.cfg b/old/modules/DONE/Guis/Rockets/locale/fr.cfg deleted file mode 100644 index 344c368d..00000000 --- a/old/modules/DONE/Guis/Rockets/locale/fr.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[ExpGamingInfo-Rockets] -name=Rocket Info -tooltip=List of details about the rockets sent. -none=No rockets have been sent yet. -nan=NaN -sent=Rockets Sent: __1__ -first=First Lanuched At: __1__ -last=Last Launch Took: __1__ -time=Average Launch Time: __1__ -fastest=Fastest Launch: __1__ -milestones=Milestones: -format=__1__: __2__ \ No newline at end of file diff --git a/old/modules/DONE/Guis/Rockets/locale/nl.cfg b/old/modules/DONE/Guis/Rockets/locale/nl.cfg deleted file mode 100644 index 2fee0a06..00000000 --- a/old/modules/DONE/Guis/Rockets/locale/nl.cfg +++ /dev/null @@ -1,12 +0,0 @@ -[ExpGamingInfo-Rockets] -name=Raket Info -tooltip=Lijst met details over de verstuurde raketten. -none=Er zijn nog geen raketten verstuurd. -nan=Niet beschikbaar -sent=Raketten verstuurd: __1__ -first=Eerste raket gelanceerd op: __1__ -last=Meest recente lancering: __1__ -time=Gemiddelde lanceertijd: __1__ -fastest=Snelste lancering: __1__ -milestones=Mijlpalen: -format=__1__: __2__ diff --git a/old/modules/DONE/Guis/Rockets/locale/sv-SE.cfg b/old/modules/DONE/Guis/Rockets/locale/sv-SE.cfg deleted file mode 100644 index eb4d93bd..00000000 --- a/old/modules/DONE/Guis/Rockets/locale/sv-SE.cfg +++ /dev/null @@ -1,13 +0,0 @@ - -[ExpGamingInfo-Rockets] -name=Raketinformation -tooltip=Lista över detaljerna kring skickade raketer. -none=Inga raketer har blivit skickade ännu. -nan=Inte tillgängligt -sent=Skickade raketer: __1__ -first=Första uppskjutningen skedde: __1__ -last=Senaste uppskjutningen tog: __1__ -time=Genomsnittlig uppskjutningstid: __1__ -fastest=Snabbaste uppskjutning: __1__ -milestones=Milstolpar: -format=__1__: __2__ diff --git a/old/modules/DONE/Guis/Rockets/softmod.json b/old/modules/DONE/Guis/Rockets/softmod.json deleted file mode 100644 index 10c6e3e8..00000000 --- a/old/modules/DONE/Guis/Rockets/softmod.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "ExpGamingInfo.Rockets", - "version": "4.0.0", - "description": "Adds a rocket count gui to the game that shows milestones and average rocket time", - "location": "FSM_ARCHIVE", - "keywords": [ - "Gui", - "Info", - "ExpGaming", - "Rockets" - ], - "author": "", - "contact": "", - "license": "", - "dependencies": { - "ExpGamingCore.Gui": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Sync": "?^4.0.0", - "ExpGamingCore.Sync^4.0.0": "?*" - }, - "submodules": {}, - "collection": "ExpGamingInfo@4.0.0" -} diff --git a/old/modules/DONE/Guis/Rockets/src/sync.lua b/old/modules/DONE/Guis/Rockets/src/sync.lua deleted file mode 100644 index 82482eac..00000000 --- a/old/modules/DONE/Guis/Rockets/src/sync.lua +++ /dev/null @@ -1,20 +0,0 @@ -local Sync = require('ExpGamingCore.Sync') -local global = global['ExpGamingInfo.Rockets'] - -Sync.add_update('rockets',function() - local _return = {} - local satellites = game.forces.player.get_item_launched('satellite') - local time = {'rockets.nan'} - if satellites == 1 then time = tick_to_display_format(game.tick) - elseif satellites > 1 then time = tick_to_display_format((game.tick-global.first)/satellites) end - _return.total = satellites - _return.first = Sync.tick_format(global.first) - _return.last = Sync.tick_format(global.last-global._last) - _return.time = Sync.tick_format(time) - _return.fastest = Sync.tick_format(global.fastest) - _return.milestones = {} - for milestone,next_time in pairs(global.milestones) do - _return.milestones[milestone] = Sync.tick_format(next_time) - end - return _return -end) \ No newline at end of file diff --git a/old/modules/DONE/Guis/Science/control.lua b/old/modules/DONE/Guis/Science/control.lua deleted file mode 100644 index 9edfa55f..00000000 --- a/old/modules/DONE/Guis/Science/control.lua +++ /dev/null @@ -1,106 +0,0 @@ ---- Adds a science count gui to the game that shows total made and per minute --- @module ExpGamingInfo.Science --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Gui = require('ExpGamingCore.Gui') -local Game = require('FactorioStdLib.Game') - --- Local Variables -local science_packs = { - 'science-pack-1', - 'science-pack-2', - 'science-pack-3', - 'military-science-pack', - 'production-science-pack', - 'high-tech-science-pack', - 'space-science-pack' -} - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Sync^4.0.0'] then require(module_path..'/src/sync',{science_packs=science_packs}) end - end -} - --- Global Define -local global = { - _base={ - update=0, - _update=0, - made={0,0,0,0,0,0,0}, - _made={0,0,0,0,0,0,0} - } -} -Global.register(global,function(tbl) global = tbl end) - --- Function Define -ThisModule.Gui = Gui.left{ - name='science', - caption='item/lab', - tooltip={'ExpGamingInfo-Science.tooltip'}, - draw=function(self,frame) - local player = Game.get_player(frame.player_index) - if not global[player.force.name] then - verbose('Added Science Global for: '..player.force.name) - global[player.force.name] = table.deepcopy(global._base) - end - local force_data = global[player.force.name] - frame.caption = {'ExpGamingInfo-Science.name'} - frame.add{ - type='label', - caption={'ExpGamingInfo-Science.total'}, - style='caption_label' - } - local totals = frame.add{ - type='flow', - direction='vertical' - } - frame.add{ - type='label', - caption={'ExpGamingInfo-Science.time'}, - style='caption_label' - } - local times = frame.add{ - type='flow', - direction='vertical' - } - if force_data.update < game.tick-100 then - force_data._update = force_data.update - force_data._made = table.deepcopy(force_data.made) - for i,name in pairs(science_packs) do - force_data.made[i] = player.force.item_production_statistics.get_input_count(name) - end - force_data.update = game.tick - end - for i,name in pairs(science_packs) do - local made = force_data.made[i] - if made > 0 then - totals.add{ - type='label', - caption={'ExpGamingInfo-Science.format',{'ExpGamingInfo-Science.'..name},made} - } - local _made = string.format('%.2f',(made-force_data._made[i])/((force_data.update-force_data._update)/(3600*game.speed))) - times.add{ - type='label', - caption={'ExpGamingInfo-Science.format',{'ExpGamingInfo-Science.'..name},_made} - } - end - end - end, - can_open=function(player) - if player.force.item_production_statistics.get_input_count('science-pack-1') > 0 then return true - else return {'ExpGamingInfo-Science.none'} end - end -} - --- Event Define -Event.add(defines.events.on_research_finished,function(event) Gui.left.update('science') end) - --- Module Return --- when called will toggle the gui for that player, if no player it will update the gui -return setmetatable(ThisModule,{_call=function(self,...) self.Gui(...) end}) \ No newline at end of file diff --git a/old/modules/DONE/Guis/Science/locale/de.cfg b/old/modules/DONE/Guis/Science/locale/de.cfg deleted file mode 100644 index e10b31a4..00000000 --- a/old/modules/DONE/Guis/Science/locale/de.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[ExpGamingInfo-Science] -name=Wissenschaftsinfo -tooltip=Detailliste über Wissenschaftspakete -total=Gemachte Pakete: -time=Pakete pro Minute: -format=__1__: __2__ -science-pack-1=Rot -science-pack-2=Grün -science-pack-3=Blau -military-science-pack=Militär -production-science-pack=Produktion -high-tech-science-pack=Hochtechnologie -space-science-pack=Weltraum -none=Es wurden noch keine Wissenschaftspakete gemacht. \ No newline at end of file diff --git a/old/modules/DONE/Guis/Science/locale/en.cfg b/old/modules/DONE/Guis/Science/locale/en.cfg deleted file mode 100644 index a9bc1526..00000000 --- a/old/modules/DONE/Guis/Science/locale/en.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[ExpGamingInfo-Science] -name=Science Info -tooltip=List of details about science packs. -total=Packs Made: -time=Packs Per Minute: -format=__1__: __2__ -science-pack-1=Red -science-pack-2=Green -science-pack-3=Blue -military-science-pack=Military -production-science-pack=Production -high-tech-science-pack=High Tech -space-science-pack=Space -none=No science packs have been made yet. \ No newline at end of file diff --git a/old/modules/DONE/Guis/Science/locale/fr.cfg b/old/modules/DONE/Guis/Science/locale/fr.cfg deleted file mode 100644 index a9bc1526..00000000 --- a/old/modules/DONE/Guis/Science/locale/fr.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[ExpGamingInfo-Science] -name=Science Info -tooltip=List of details about science packs. -total=Packs Made: -time=Packs Per Minute: -format=__1__: __2__ -science-pack-1=Red -science-pack-2=Green -science-pack-3=Blue -military-science-pack=Military -production-science-pack=Production -high-tech-science-pack=High Tech -space-science-pack=Space -none=No science packs have been made yet. \ No newline at end of file diff --git a/old/modules/DONE/Guis/Science/locale/nl.cfg b/old/modules/DONE/Guis/Science/locale/nl.cfg deleted file mode 100644 index 2ac8d7c0..00000000 --- a/old/modules/DONE/Guis/Science/locale/nl.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[ExpGamingInfo-Science] -name=Wetenschap info -tooltip=Lijst met details over de wetenschaps pakketten. -total=Pakketten gemaakt: -time=Pakketten per minuut: -format=__1__: __2__ -science-pack-1=Rood -science-pack-2=Groen -science-pack-3=Blauw -military-science-pack=Militair -production-science-pack=Productie -high-tech-science-pack=High Tech -space-science-pack=Ruimte -none=Er zijn nog geen wetenschaps pakketten gemaakt. diff --git a/old/modules/DONE/Guis/Science/locale/sv-Se.cfg b/old/modules/DONE/Guis/Science/locale/sv-Se.cfg deleted file mode 100644 index db40737c..00000000 --- a/old/modules/DONE/Guis/Science/locale/sv-Se.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[ExpGamingInfo-Science] -name=Vetenskapsinformation -tooltip=Detaljerad lista över vetenskapspaket. -total=Paket gjorda: -time=Paket per minut: -format=__1__: __2__ -science-pack-1=Röda -science-pack-2=Gröna -science-pack-3=Blåa -military-science-pack=Militära -production-science-pack=Produktion -high-tech-science-pack=Högteknologiska -space-science-pack=Rymd -none=Inga vetenskapspaket har blivit gjorda ännu. diff --git a/old/modules/DONE/Guis/Science/softmod.json b/old/modules/DONE/Guis/Science/softmod.json deleted file mode 100644 index 8f9cf99a..00000000 --- a/old/modules/DONE/Guis/Science/softmod.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "ExpGamingInfo.Science", - "version": "4.0.0", - "description": "Adds a science count gui to the game that shows toatal made and per minute", - "location": "FSM_ARCHIVE", - "keywords": [ - "Gui", - "Info", - "ExpGaming", - "Science", - "Production" - ], - "author": "", - "contact": "", - "license": "", - "dependencies": { - "ExpGamingCore.Gui": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Sync": "?^4.0.0", - "ExpGamingCore.Sync^4.0.0": "?*" - }, - "submodules": {}, - "collection": "ExpGamingInfo@4.0.0" -} diff --git a/old/modules/DONE/Guis/Science/src/sync.lua b/old/modules/DONE/Guis/Science/src/sync.lua deleted file mode 100644 index 6f624d4f..00000000 --- a/old/modules/DONE/Guis/Science/src/sync.lua +++ /dev/null @@ -1,19 +0,0 @@ -local Sync = require('ExpGamingCore.Sync') -local data = global['ExpGamingInfo.Science'] -local science_packs = science_packs - -Sync.add_update('science',function() - local _return = {} - for force_name,global in pairs(data) do - if force_name ~= '_base' then - _return[force_name] = {totals={},times={}} - for i,name in pairs(science_packs) do - local made = global.made[i] - _return[force_name].totals[name] = made - local _made = string.format('%.2f',(made-global._made[i])/((global.update-global._update)/(3600*game.speed))) - _return[force_name].times[name] = _made - end - end - end - return _return -end) \ No newline at end of file diff --git a/old/modules/DONE/Guis/Tasklist/control.lua b/old/modules/DONE/Guis/Tasklist/control.lua deleted file mode 100644 index d8dbe8b5..00000000 --- a/old/modules/DONE/Guis/Tasklist/control.lua +++ /dev/null @@ -1,207 +0,0 @@ ---- Adds a task list gui which acts like a bulletin board for the current tasks --- @module ExpGamingInfo.Tasklist --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Gui = require('ExpGamingCore.Gui') -local Role = require('ExpGamingCore.Role') -local Game = require('FactorioStdLib.Game') - --- Module Define -local module_verbose = false -local ThisModule = {} - --- Global Define -local global = { - tasks={}, - _edit={}, - _base={ - _edit=false, - _tasks={}, - _editing={} - } -} -Global.register(global,function(tbl) global = tbl end) - --- Function Define -local edit = Gui.inputs{ - name='tasklist-edit', - type='button', - caption='utility/rename_icon_normal' -}:on_event('click',function(event) - local text_flow = event.element.parent.parent.text_flow - local data = global._edit[event.player_index] - if not data._edit then data._tasks = table.deepcopy(global.tasks) end - if text_flow.input.type == 'label' then - data._editing[tonumber(text_flow.parent.name)]=true - Gui.left.update('tasklist',event.player_index) - elseif text_flow.input.type == 'textfield' then - local text = text_flow.input.text - data._editing[tonumber(text_flow.parent.name)]=false - data._tasks[tonumber(text_flow.parent.name)]=text - Gui.left.update('tasklist',event.player_index) - end -end) - -local function _edit(frame) - local element = edit(frame) - element.style.height = 20 - element.style.width = 20 - local text_flow = element.parent.parent.text_flow - local data = global._edit[frame.player_index] - data._tasks[text_flow.parent.name]=text - if data._editing[tonumber(text_flow.parent.name)] then - element.style.height = 30 - element.style.width = 30 - local text = text_flow.input.caption - text_flow.clear() - local _text = text_flow.add{ - name='input', - type='textfield', - text=text - } - _text.style.width = 200 - element.sprite = 'utility/enter' - end -end - -local remove = Gui.inputs{ - name='tasklist-remove', - type='button', - caption='utility/remove' -}:on_event('click',function(event) - local frame = event.element.parent.parent - local data = global._edit[event.player_index] - if data._edit then - table.remove(data._tasks,tonumber(frame.name)) - table.remove(data._editing,tonumber(frame.name)) - else - table.remove(global.tasks,tonumber(frame.name)) - Gui.left.update('tasklist') - end - Gui.left.update('tasklist',event.player_index) -end) - -local add = Gui.inputs{ - name='tasklist-add', - type='button', - caption='utility/add' -}:on_event('click',function(event) - local frame = event.element.parent.parent - local data = global._edit[event.player_index] - if data._edit then - table.insert(data._tasks,tonumber(frame.name)+1,'New Value') - table.insert(data._editing,tonumber(frame.name)+1,true) - else - data._tasks = table.deepcopy(global.tasks) - table.insert(data._tasks,tonumber(frame.name)+1,'New Value') - table.insert(data._editing,tonumber(frame.name)+1,true) - end - Gui.left.update('tasklist',event.player_index) -end) - -local function _tasks(player) - player = Game.get_player(player) - local data = global._edit[player.index] - if not data then return global.tasks end - local editing = false - for _,v in pairs(data._editing) do - if v == true then - editing = true - break - end - end - if data._edit and not editing then - global.tasks = table.deepcopy(data._tasks) - global._edit[player.index] = table.deepcopy(global._base) - Gui.left.update('tasklist') - return global.tasks - elseif not data._edit and editing then - data._edit = true - for key,_ in pairs(data._tasks) do if not data._editing[key] then data._editing[key] = false end end - return data._tasks - elseif editing then return data._tasks - else return global.tasks - end -end - -ThisModule.Gui = Gui.left{ - name='tasklist', - caption='utility/not_enough_repair_packs_icon', - tooltip={'ExpGamingInfo-Tasklist.tooltip'}, - draw=function(self,frame) - frame.caption = '' - local title = frame.add{ - type='flow', - direction='horizontal' - } - title.add{ - type='label', - caption={'ExpGamingInfo-Tasklist.name'}, - style='caption_label' - } - local player = Game.get_player(frame.player_index) - local allowed = Role.allowed(player,'edit-tasklist') - if allowed then - if not global._edit[player.index] then global._edit[player.index] = table.deepcopy(global._base) end - end - for i,task in pairs(_tasks(player)) do - local flow = frame.add{ - name=i, - type='flow', - direction='horizontal' - } - local text_flow = flow.add{ - name='text_flow', - type='flow', - direction='horizontal' - } - text_flow.add{ - name='input', - type='label', - caption=task - } - local button_flow = flow.add{ - type='flow', - direction='horizontal' - } - if allowed then - _edit(button_flow) - if global._edit[player.index]._editing[i] then - local element = remove(button_flow) - element.style.height = 30 - element.style.width = 30 - local _element = add(button_flow) - _element.style.height = 30 - _element.style.width = 30 - end - end - end - if allowed then - local flow = title.add{ - name=#_tasks(player), - type='flow', - direction='horizontal' - } - local button_flow = flow.add{ - type='flow', - direction='horizontal' - } - local element = add(button_flow) - element.style.height = 20 - element.style.width = 20 - end - if #_tasks(player) == 0 and not allowed then frame.style.visible = false end - end, - can_open=function(player) - if Role.allowed(player,'edit-tasklist') or #global.tasks > 0 then return true - else return {'ExpGamingInfo-Tasklist.none'} end - end, - open_on_join=true -} - --- Module return --- when called it will toggle the gui for that player, if no player then it will update the gui -return setmetatable(ThisModule,{__call=function(self,...) self.Gui(...) end}) \ No newline at end of file diff --git a/old/modules/DONE/Guis/Tasklist/locale/de.cfg b/old/modules/DONE/Guis/Tasklist/locale/de.cfg deleted file mode 100644 index 48573724..00000000 --- a/old/modules/DONE/Guis/Tasklist/locale/de.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingInfo-Tasklist] -name=Taskliste -tooltip=Welche Aufgaben müssen rund um die Fabrik erledigt werden? -none=Es sind aktuell keine Tasks erfasst, frage einen Member um einen hinzuzufügen. \ No newline at end of file diff --git a/old/modules/DONE/Guis/Tasklist/locale/en.cfg b/old/modules/DONE/Guis/Tasklist/locale/en.cfg deleted file mode 100644 index 7e698acf..00000000 --- a/old/modules/DONE/Guis/Tasklist/locale/en.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingInfo-Tasklist] -name=Task List -tooltip=Jobs that needs to be completed all around the factory. -none=There are currently no tasks. Ask a Member in-game or through Discord to add tasks. \ No newline at end of file diff --git a/old/modules/DONE/Guis/Tasklist/locale/fr.cfg b/old/modules/DONE/Guis/Tasklist/locale/fr.cfg deleted file mode 100644 index e739ac38..00000000 --- a/old/modules/DONE/Guis/Tasklist/locale/fr.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingInfo-Tasklist] -name=Task List -tooltip=What jobs need to be done round the factory. -none=There are no tasks to do right now, ask a member to add some. \ No newline at end of file diff --git a/old/modules/DONE/Guis/Tasklist/locale/nl.cfg b/old/modules/DONE/Guis/Tasklist/locale/nl.cfg deleted file mode 100644 index 6ab37662..00000000 --- a/old/modules/DONE/Guis/Tasklist/locale/nl.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingInfo-Tasklist] -name=Taaklijst -tooltip=Wat voor werk er rondom de fabriek gedaan moet worden -none=Er zijn momenteel geen taken. Vraag een Member om taken toe te voegen. diff --git a/old/modules/DONE/Guis/Tasklist/locale/sv-SE.cfg b/old/modules/DONE/Guis/Tasklist/locale/sv-SE.cfg deleted file mode 100644 index 5b0009bf..00000000 --- a/old/modules/DONE/Guis/Tasklist/locale/sv-SE.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingInfo-Tasklist] -name=Uppgiftslista -tooltip=Jobb som behövs slutföras överallt i fabriken -none=Det finns för närvarande inga uppgifter. Fråga en medlem i spelet eller via Discord för att lägga till nya uppgifter. \ No newline at end of file diff --git a/old/modules/DONE/Guis/Tasklist/softmod.json b/old/modules/DONE/Guis/Tasklist/softmod.json deleted file mode 100644 index dcb673a7..00000000 --- a/old/modules/DONE/Guis/Tasklist/softmod.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "ExpGamingInfo.Tasklist", - "version": "4.0.0", - "description": "Adds a task list gui which acts like a bulletin board for the current tasks", - "location": "FSM_ARCHIVE", - "keywords": [ - "Gui", - "Info", - "ExpGaming", - "Tasks" - ], - "author": "", - "contact": "", - "license": "", - "dependencies": { - "ExpGamingCore.Gui": "^4.0.0", - "ExpGamingCore.Role": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0" - }, - "submodules": {}, - "collection": "ExpGamingInfo@4.0.0" -} diff --git a/old/modules/DONE/Guis/playerList/control.lua b/old/modules/DONE/Guis/playerList/control.lua deleted file mode 100644 index 536519f2..00000000 --- a/old/modules/DONE/Guis/playerList/control.lua +++ /dev/null @@ -1,145 +0,0 @@ ---- A full ranking system for factorio. --- @module ExpGamingPlayer.playerList@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - -local Game = require('FactorioStdLib.Game') -local Gui = require('ExpGamingCore.Gui') -local Admin -- ExpGamingAdmin@^4.0.0 -local AdminGui -- ExpGamingAdmin.Gui@^4.0.0 - --- Local Variables -local playerInfo = function(player,frame) - frame.add{ - type='label', - caption={'ExpGamingPlayer-playerList.no-info-file'} - } -end - -local getPlayers = function() - local rtn = {{{r=233,g=63,b=233},'Admin',{},true},{{r=255,g=159,b=27},'',{},false}} - for _,player in pairs(game.connected_players) do - if player.admin then table.insert(rtn[2][3],player) - else table.insert(rtn[1][3],player) end - end - return rtn -end - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function(self) - if loaded_modules['ExpGamingPlayer.playerInfo'] then playerInfo = require('ExpGamingPlayer.playerInfo') end - if loaded_modules['ExpGamingCore.Role'] then getPlayers = require(module_path..'/src/ranking',{self=self}) end - if loaded_modules['ExpGamingAdmin'] then Admin = require('ExpGamingAdmin') end - if loaded_modules['ExpGamingAdmin.Gui'] then AdminGui = require('ExpGamingAdmin.Gui') end - end -} - --- Global Define -local global = { - update=0, - delay=10, - interval=54000 -} -Global.register(global,function(tbl) global = tbl end) - -function ThisModule.update(tick) - local tick = is_type(tick,'table') and tick.tick or is_type(tick,'number') and tick or game.tick - if tick + global.delay > global.update - global.interval then - global.update = tick + global.delay - end -end - -local back_btn = Gui.inputs{ - type='button', - caption='utility/enter', - name='player-list-back' -}:on_event('click',function(event) - event.element.parent.parent.scroll.style.visible = true - event.element.parent.destroy() -end) - -ThisModule.Gui = Gui.left{ - name='player-list', - caption='entity/player', - tooltip={'ExpGamingPlayer-playerList.tooltip'}, - draw=function(self,frame) - frame.caption = '' - local player_list = frame.add{ - name='scroll', - type = 'scroll-pane', - direction = 'vertical', - vertical_scroll_policy='auto', - horizontal_scroll_policy='never' - } - player_list.vertical_scroll_policy = 'auto' - player_list.style.maximal_height=195 - local done = {} - local players = getPlayers() -- list of [colour,shortHand,[playerOne,playerTwo]] - for _,rank in pairs(players) do - for _,player in pairs(rank[3]) do - if not done[player.index] then - done[player.index] = true - local flow = player_list.add{type='flow'} - if rank[2] == '' then - flow.add{ - type='label', - name=player.name, - style='caption_label', - caption={'ExpGamingPlayer-playerList.format-nil',tick_to_display_format(player.online_time),player.name} - }.style.font_color = rank[1] - else - flow.add{ - type='label', - name=player.name, - style='caption_label', - caption={'ExpGamingPlayer-playerList.format',tick_to_display_format(player.online_time),player.name,rank[2]} - }.style.font_color = rank[1] - end - if Admin and Admin.report_btn then - if not rank[4] and player.index ~= frame.player_index then - local btn = Admin.report_btn(flow) - btn.style.height = 20 - btn.style.width = 20 - end - end - end - end - end - end, - open_on_join=true -} - -Event.add(defines.events.on_tick,function(event) - if event.tick > global.update then - ThisModule.Gui() - global.update = event.tick + global.interval - end -end) - -Event.add(defines.events.on_gui_click,function(event) - -- lots of checks for it being valid - if event.element and event.element.valid - and event.element.parent and event.element.parent.parent and event.element.parent.parent.parent - and event.element.parent.parent.parent.name == 'player-list' then else return end - -- must be a right click - if event.button == defines.mouse_button_type.right then else return end - local player_list = event.element.parent.parent.parent - -- must be a valid player which is clicked - if not Game.get_player(event.element.name) then return end - -- hides the player list to show the info - player_list.scroll.style.visible = false - local flow = player_list.add{type='flow',direction='vertical'} - back_btn:draw(flow) - playerInfo(event.element.name,flow,true) - if Game.get_player(event.element.name) and event.player_index == Game.get_player(event.element.name).index then return end - if Admin and AdminGui and Admin.allowed(event.player_index) then AdminGui(flow).caption = event.element.name end -end) - -Event.add(defines.events.on_player_joined_game,function() ThisModule.update() end) -Event.add(defines.events.on_player_left_game,function() ThisModule.update() end) - -ThisModule.force_update = function() return ThisModule.Gui() end --- when called it will queue an update to the player list -return setmetatable(ThisModule,{__call=function(self,...) self.update(...) end}) \ No newline at end of file diff --git a/old/modules/DONE/Guis/playerList/locale/de.cfg b/old/modules/DONE/Guis/playerList/locale/de.cfg deleted file mode 100644 index ed48069f..00000000 --- a/old/modules/DONE/Guis/playerList/locale/de.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[ExpGamingPlayer-playerList] -tooltip=Verkleinere die Spielerliste. Rechtsklicke einen Spieler für Informationen über ihn. -format-nil=__1__ - __2__ -format=__1__ - __2__ - __3__ -no-info-file=Es wurden keine Informationen gefunden. \ No newline at end of file diff --git a/old/modules/DONE/Guis/playerList/locale/en.cfg b/old/modules/DONE/Guis/playerList/locale/en.cfg deleted file mode 100644 index d2c2e345..00000000 --- a/old/modules/DONE/Guis/playerList/locale/en.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[ExpGamingPlayer-playerList] -tooltip=Toggle player list, right click player for more info -format-nil=__1__ - __2__ -format=__1__ - __2__ - __3__ -no-info-file=No info file was found \ No newline at end of file diff --git a/old/modules/DONE/Guis/playerList/locale/fr.cfg b/old/modules/DONE/Guis/playerList/locale/fr.cfg deleted file mode 100644 index 83d2dd03..00000000 --- a/old/modules/DONE/Guis/playerList/locale/fr.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[ExpGamingPlayer-playerList] -tooltip=Toogle player list, right click player for info -format-nil=__1__ - __2__ -format=__1__ - __2__ - __3__ -no-info-file=No info file was found \ No newline at end of file diff --git a/old/modules/DONE/Guis/playerList/locale/nl.cfg b/old/modules/DONE/Guis/playerList/locale/nl.cfg deleted file mode 100644 index 6a58e08a..00000000 --- a/old/modules/DONE/Guis/playerList/locale/nl.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[ExpGamingPlayer-playerList] -tooltip=Toggle speler lijst. Rechtermuisklik op een speler voor meer info -format-nil=__1__ - __2__ -format=__1__ - __2__ - __3__ -no-info-file=Geen infobestand gevonden. diff --git a/old/modules/DONE/Guis/playerList/locale/sv-SE.cfg b/old/modules/DONE/Guis/playerList/locale/sv-SE.cfg deleted file mode 100644 index b871c389..00000000 --- a/old/modules/DONE/Guis/playerList/locale/sv-SE.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[ExpGamingPlayer-playerList] -tooltip=Växla spelarlista, högerklicka på spelare för mer information. -format-nil=__1__ - __2__ -format=__1__ - __2__ - __3__ -no-info-file=Ingen informationsfil kunde hittas diff --git a/old/modules/DONE/Guis/playerList/softmod.json b/old/modules/DONE/Guis/playerList/softmod.json deleted file mode 100644 index bda73c47..00000000 --- a/old/modules/DONE/Guis/playerList/softmod.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "ExpGamingPlayer.playerList", - "version": "4.0.0", - "description": "Used to display player names and online time on the top left.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Player List", - "List", - "Gui", - "Names" - ], - "dependencies": { - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Gui": "^4.0.0", - "ExpGamingCore.Role": "?^4.0.0", - "ExpGamingAdmin": "?^4.0.0", - "ExpGamingAdmin.buttonFlow": "?^4.0.0", - "ExpGamingAdmin.reports": "?^4.0.0", - "ExpGamingPlayer.playerInfo": "?^4.0.0", - "ExpGamingAdmin.Gui": "?^4.0.0" - }, - "collection": "ExpGamingPlayer@4.0.0", - "submodules": {} -} diff --git a/old/modules/DONE/Guis/playerList/src/ranking.lua b/old/modules/DONE/Guis/playerList/src/ranking.lua deleted file mode 100644 index 266741b9..00000000 --- a/old/modules/DONE/Guis/playerList/src/ranking.lua +++ /dev/null @@ -1,15 +0,0 @@ -local Role = require('ExpGamingCore.Role') - -Event.add(defines.events.on_role_change,self.update) - -return function() - local rtn = {} - local default = {} - for _,role_name in pairs(Role.order) do - local role = Role.get(role_name,true) - if role.is_default then default = {role.colour,role.short_hand,role:get_players(true),role.not_reportable} - else table.insert(rtn,{role.colour,role.short_hand,role:get_players(true),role.not_reportable}) end - end - table.insert(rtn,default) - return rtn -end \ No newline at end of file diff --git a/old/modules/DONE/PlayerAutoColor/control.lua b/old/modules/DONE/PlayerAutoColor/control.lua deleted file mode 100644 index 3dc7a494..00000000 --- a/old/modules/DONE/PlayerAutoColor/control.lua +++ /dev/null @@ -1,48 +0,0 @@ ---- Assigns random colours to players (larger range than default) and allows predefined colours for users. --- @module PlayerAutoColor@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Color = require('FactorioStdLib.Color') - --- Module Define -local module_verbose = false -local ThisModule = {} - --- Global Define -local global = { - BADgamerNL={r=255,g=20,b=147}, - arty714={r=150,g=68,b=161}, - Cooldude2606={r=57,g=192,b=207}, - mark9064={r=99,g=0,b=255}, - eissturm={r=25,g=25,b=112}, - Sakama={r=20,g=213,b=80}, - Sakama={r=20,g=213,b=80}, - freek18={r=50,g=0,b=255}, - aldldl={r=0,g=131,b=255}, - NAD4X4={r=135,g=206,b=250}, - cydes={r=82,g=249,b=155}, - UUBlueFire={r=0,g=204,b=255} -} -Global.register(global,function(tbl) global = tbl end) - --- Event Handlers Define -Event.add(defines.events.on_player_created, function(event) - local player = game.players[event.player_index] - local colours = table.keys(defines.color) - player.color = defines.color.black - while player.color.r == defines.color.black.r and player.color.g == defines.color.black.g and player.color.b == defines.color.black.b - or player.color.r == defines.color.white.r and player.color.g == defines.color.white.g and player.color.b == defines.color.white.b do - player.color = defines.color[colours[math.random(#colours)]] - if global[player.name] then - local c = global[player.name] - player.color = Color.from_rgb(c.r,c.g,c.b) - end - end - player.chat_color = player.color -end) - --- Module Return -return ThisModule \ No newline at end of file diff --git a/old/modules/DONE/PlayerAutoColor/softmod.json b/old/modules/DONE/PlayerAutoColor/softmod.json deleted file mode 100644 index d028bba7..00000000 --- a/old/modules/DONE/PlayerAutoColor/softmod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "PlayerAutoColor", - "version": "4.0.0", - "description": "Assigns random colours to players (larger range than default) and allows predefined colours for users.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Colour", - "Color", - "Player", - "Vibrant" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": { - "FactorioStdLib.Color": "^0.8.0" - }, - "submodules": {} -} diff --git a/old/modules/DONE/SpawnArea/control.lua b/old/modules/DONE/SpawnArea/control.lua deleted file mode 100644 index 0e9e1d2c..00000000 --- a/old/modules/DONE/SpawnArea/control.lua +++ /dev/null @@ -1,127 +0,0 @@ ---- Creates a safe spawn area with chests and auto refilling turrets. --- @module SpawnArea@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Game = require('FactorioStdLib.Game') - --- Local Variables -local turret_enabled = true -local turret_ammo = 'uranium-rounds-magazine' - -local tile_positions = require(module_path..'/src/spawn_tiles') -local entity_positions = require(module_path..'/src/spawn_entities') - -local global_offset = {x=0,y=-2} -local decon_radius = 20 -local decon_tile = 'concrete' -local pattern_radius = 50 -local pattern_tile = 'stone-path' - --- Module Define -local module_verbose = false -local ThisModule = {} - --- Global Define --- location of auto refill turrets -local global = { - {1,-3,-3}, - {1,-3,3}, - {1,3,-3}, - {1,3,3} -} -Global.register(global,function(tbl) global = tbl end) - --- Function Define -function ThisModule.afk_belt(surface,offset) - local belts = {{-0.5,-0.5,2},{0.5,-0.5,4},{-0.5,0.5,0},{0.5,0.5,6}} - for _,pos in pairs(belts) do - local position = {pos[1]+offset[1],pos[2]+offset[2]} - local belt = surface.create_entity{name='transport-belt',position=position,force='neutral',direction=pos[3]} - belt.destructible = false; belt.health = 0; belt.minable = false; belt.rotatable = false - end -end - -function ThisModule.auto_turret(surface,pos) - if not turret_enabled then error('Auto Turrets are disabled.') end - -- adds a new turret to the global list, returns index - local _return - if surface then - surface = Game.get_surface(surface) - if not surface then error('Surface is not valid.') end - local posx = pos.x or pos[1] or error('Position is not valid.') - local posy = pos.y or pos[2] or error('Position is not valid.') - _return = table.insert(global,{surface.index,posx,posy}) - end - -- spawns turrets and refills them - if not game.forces['spawn'] then game.create_force('spawn').set_cease_fire('player',true) game.forces['player'].set_cease_fire('spawn',true) end - for _,pos in pairs(global) do - surface = game.surfaces[pos[1]] - local turret = surface.find_entity('gun-turret',{pos[2],pos[3]}) - if not turret then - turret = surface.create_entity{name='gun-turret',position={pos[2],pos[3]},force='spawn'} - turret.destructible = false; turret.health = 0; turret.minable = false; turret.rotatable = false; turret.operable = false; turret.health = 0 - end - if turret.get_inventory(defines.inventory.turret_ammo).can_insert{name=turret_ammo,count=10} then - turret.get_inventory(defines.inventory.turret_ammo).insert{name=turret_ammo,count=10} - end - end -end - --- Event Handlers Define -if turret_enabled then - Event.add(defines.events.on_tick,function(event) - if event.tick % 3600 then - ThisModule.auto_turret() - end - end) -end - -Event.add(defines.events.on_player_created, function(event) - if event.player_index == 1 then - local player = Game.get_player(event) - local surface = player.surface - local offset = {x=0,y=0} - local pattern_base_tile = surface.get_tile(player.position).name - if pattern_base_tile == 'deepwater' or pattern_base_tile == 'water' then pattern_base_tile = 'grass-1' end - local base_tiles = {} - local tiles = {} - -- generates a safe area of land and removes all entities - for x = -pattern_radius, pattern_radius do - for y = -pattern_radius, pattern_radius do - if x^2+y^2 < decon_radius^2 then - table.insert(base_tiles,{name=decon_tile,position={x+offset.x,y+offset.y}}) - local entities = surface.find_entities_filtered{area={{x+offset.x-1,y+offset.y-1},{x+offset.x,y+offset.y}}} - for _,entity in pairs(entities) do if entity.name ~= 'player' then entity.destroy() end end - elseif x^2+y^2 < pattern_radius^2 then - table.insert(base_tiles,{name=pattern_base_tile,position={x+offset.x,y+offset.y}}) - end - end - end - surface.set_tiles(base_tiles) - -- creates the pattern in the spawn - for _,position in pairs(tile_positions) do - table.insert(tiles,{name=pattern_tile,position={position[1]+offset.x+global_offset.x,position[2]+offset.y+global_offset.y}}) - end - surface.set_tiles(tiles) - -- spawns all the entities in spawn - for _,entity in pairs(entity_positions) do - entity = surface.create_entity{name=entity[1],position={entity[2]+offset.x+global_offset.x,entity[3]+offset.y+global_offset.y},force='neutral'} - entity.destructible = false; entity.health = 0; entity.minable = false; entity.rotatable = false - end - -- generates spawn turrets and afk belts - if turret_enabled then ThisModule.auto_turret() end - ThisModule.afk_belt(surface,{offset.x-5,offset.y-5}) - ThisModule.afk_belt(surface,{offset.x+5,offset.y-5}) - ThisModule.afk_belt(surface,{offset.x-5,offset.y+5}) - ThisModule.afk_belt(surface,{offset.x+5,offset.y+5}) - -- sets the spawn and moves the first player there - player.force.set_spawn_position(offset,surface) - player.teleport(offset,surface) - end -end) - --- Module Return -return ThisModule \ No newline at end of file diff --git a/old/modules/DONE/SpawnArea/softmod.json b/old/modules/DONE/SpawnArea/softmod.json deleted file mode 100644 index 240e1af4..00000000 --- a/old/modules/DONE/SpawnArea/softmod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "SpawnArea", - "version": "4.0.0", - "description": "Creates a safe spawn area with chests and auto refilling turrets.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Spawn", - "Safe", - "Turrets", - "Auto Refill" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": { - "FactorioStdLib.Game": "^0.8.0" - }, - "submodules": {} -} diff --git a/old/modules/DONE/SpawnArea/src/spawn_entities.lua b/old/modules/DONE/SpawnArea/src/spawn_entities.lua deleted file mode 100644 index 408082d5..00000000 --- a/old/modules/DONE/SpawnArea/src/spawn_entities.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - {"stone-wall",-10,-6},{"stone-wall",-10,-5},{"stone-wall",-10,-4},{"stone-wall",-10,-3},{"stone-wall",-10,-2},{"stone-wall",-10,-1},{"stone-wall",-10,0},{"stone-wall",-10,3},{"stone-wall",-10,4},{"stone-wall",-10,5}, - {"stone-wall",-10,6},{"stone-wall",-10,7},{"stone-wall",-10,8},{"stone-wall",-10,9},{"stone-wall",-8,-8},{"small-lamp",-8,-4},{"small-lamp",-8,-1},{"iron-chest",-8,0},{"iron-chest",-8,3},{"small-lamp",-8,4}, - {"small-lamp",-8,7},{"stone-wall",-8,11},{"stone-wall",-7,-8},{"small-electric-pole",-7,-2},{"iron-chest",-7,0},{"iron-chest",-7,3},{"small-electric-pole",-7,5},{"stone-wall",-7,11},{"stone-wall",-6,-8},{"small-lamp",-6,-6}, - {"iron-chest",-6,0},{"iron-chest",-6,3},{"small-lamp",-6,9},{"stone-wall",-6,11},{"stone-wall",-5,-8},{"small-lamp",-5,-1},{"iron-chest",-5,0},{"iron-chest",-5,3},{"small-lamp",-5,4},{"stone-wall",-5,11}, - {"stone-wall",-4,-8},{"small-electric-pole",-4,-5},{"iron-chest",-4,0},{"iron-chest",-4,3},{"small-electric-pole",-4,8},{"stone-wall",-4,11},{"stone-wall",-3,-8},{"small-lamp",-3,-6},{"small-lamp",-3,-3},{"small-lamp",-3,6}, - {"small-lamp",-3,9},{"stone-wall",-3,11},{"stone-wall",-2,-8},{"iron-chest",-2,-6},{"iron-chest",-2,-5},{"iron-chest",-2,-4},{"iron-chest",-2,-3},{"iron-chest",-2,-2},{"iron-chest",-2,5},{"iron-chest",-2,6}, - {"iron-chest",-2,7},{"iron-chest",-2,8},{"iron-chest",-2,9},{"stone-wall",-2,11},{"stone-wall",1,-8},{"iron-chest",1,-6}, - {"iron-chest",1,-5},{"iron-chest",1,-4},{"iron-chest",1,-3},{"iron-chest",1,-2},{"iron-chest",1,5},{"iron-chest",1,6},{"iron-chest",1,7},{"iron-chest",1,8},{"iron-chest",1,9},{"stone-wall",1,11}, - {"stone-wall",2,-8},{"small-lamp",2,-6},{"small-lamp",2,-3},{"small-lamp",2,6},{"small-lamp",2,9},{"stone-wall",2,11},{"stone-wall",3,-8},{"small-electric-pole",3,-5},{"iron-chest",3,0},{"iron-chest",3,3}, - {"small-electric-pole",3,8},{"stone-wall",3,11},{"stone-wall",4,-8},{"small-lamp",4,-1},{"iron-chest",4,0},{"iron-chest",4,3},{"small-lamp",4,4},{"stone-wall",4,11},{"stone-wall",5,-8},{"small-lamp",5,-6}, - {"iron-chest",5,0},{"iron-chest",5,3},{"small-lamp",5,9},{"stone-wall",5,11},{"stone-wall",6,-8},{"small-electric-pole",6,-2},{"iron-chest",6,0},{"iron-chest",6,3},{"small-electric-pole",6,5},{"stone-wall",6,11}, - {"stone-wall",7,-8},{"small-lamp",7,-4},{"small-lamp",7,-1},{"iron-chest",7,0},{"iron-chest",7,3},{"small-lamp",7,4},{"small-lamp",7,7},{"stone-wall",7,11},{"stone-wall",9,-6},{"stone-wall",9,-5}, - {"stone-wall",9,-4},{"stone-wall",9,-3},{"stone-wall",9,-2},{"stone-wall",9,-1},{"stone-wall",9,0},{"stone-wall",9,3},{"stone-wall",9,4},{"stone-wall",9,5},{"stone-wall",9,6},{"stone-wall",9,7}, - {"stone-wall",9,8},{"stone-wall",9,9} -} \ No newline at end of file diff --git a/old/modules/DONE/SpawnArea/src/spawn_tiles.lua b/old/modules/DONE/SpawnArea/src/spawn_tiles.lua deleted file mode 100644 index 77aa62c6..00000000 --- a/old/modules/DONE/SpawnArea/src/spawn_tiles.lua +++ /dev/null @@ -1,109 +0,0 @@ -return { - {-49,-3},{-49,-2},{-49,1},{-49,2},{-49,5},{-49,6},{-48,-4},{-48,-3},{-48,-2},{-48,1},{-48,2},{-48,5},{-48,6},{-48,7},{-47,-7},{-47,-6},{-47,-5},{-47,-4},{-47,-3},{-47,-2},{-47,5},{-47,6},{-47,7},{-47,8},{-47,9},{-47,10},{-46,-8},{-46,-7},{-46,-6},{-46,-5}, - {-46,-4},{-46,-3},{-46,-2},{-46,-1},{-46,4},{-46,5},{-46,6},{-46,7},{-46,8},{-46,9},{-46,10},{-46,11},{-45,-17},{-45,-16},{-45,-15},{-45,-14},{-45,-13},{-45,-12},{-45,-9},{-45,-8},{-45,-7},{-45,-2},{-45,-1},{-45,0},{-45,1},{-45,2},{-45,3},{-45,4},{-45,5},{-45,10}, - {-45,11},{-45,12},{-45,15},{-45,16},{-45,17},{-45,18},{-45,19},{-45,20},{-44,-18},{-44,-17},{-44,-16},{-44,-15},{-44,-14},{-44,-13},{-44,-12},{-44,-9},{-44,-8},{-44,-1},{-44,0},{-44,1},{-44,2},{-44,3},{-44,4},{-44,11},{-44,12},{-44,15},{-44,16},{-44,17},{-44,18},{-44,19}, - {-44,20},{-44,21},{-43,-19},{-43,-18},{-43,-17},{-43,-1},{-43,0},{-43,1},{-43,2},{-43,3},{-43,4},{-43,20},{-43,21},{-43,22},{-42,-19},{-42,-18},{-42,-1},{-42,0},{-42,1},{-42,2},{-42,3},{-42,4},{-42,21},{-42,22},{-41,-25},{-41,-24},{-41,-19},{-41,-18},{-41,-13},{-41,-12}, - {-41,-11},{-41,-10},{-41,-5},{-41,-4},{-41,7},{-41,8},{-41,13},{-41,14},{-41,15},{-41,16},{-41,21},{-41,22},{-41,27},{-41,28},{-40,-26},{-40,-25},{-40,-24},{-40,-20},{-40,-19},{-40,-18},{-40,-13},{-40,-12},{-40,-11},{-40,-10},{-40,-5},{-40,-4},{-40,7},{-40,8},{-40,13},{-40,14}, - {-40,15},{-40,16},{-40,21},{-40,22},{-40,23},{-40,27},{-40,28},{-40,29},{-39,-27},{-39,-26},{-39,-25},{-39,-24},{-39,-21},{-39,-20},{-39,-19},{-39,-13},{-39,-12},{-39,-5},{-39,-4},{-39,-3},{-39,-2},{-39,-1},{-39,0},{-39,1},{-39,2},{-39,3},{-39,4},{-39,5},{-39,6},{-39,7}, - {-39,8},{-39,15},{-39,16},{-39,22},{-39,23},{-39,24},{-39,27},{-39,28},{-39,29},{-39,30},{-38,-27},{-38,-26},{-38,-25},{-38,-24},{-38,-21},{-38,-20},{-38,-13},{-38,-12},{-38,-5},{-38,-4},{-38,-3},{-38,-2},{-38,-1},{-38,0},{-38,1},{-38,2},{-38,3},{-38,4},{-38,5},{-38,6}, - {-38,7},{-38,8},{-38,15},{-38,16},{-38,23},{-38,24},{-38,27},{-38,28},{-38,29},{-38,30},{-37,-17},{-37,-16},{-37,-13},{-37,-12},{-37,-11},{-37,-10},{-37,-4},{-37,-3},{-37,-2},{-37,-1},{-37,0},{-37,3},{-37,4},{-37,5},{-37,6},{-37,7},{-37,13},{-37,14},{-37,15},{-37,16}, - {-37,19},{-37,20},{-36,-17},{-36,-16},{-36,-13},{-36,-12},{-36,-11},{-36,-10},{-36,-9},{-36,-3},{-36,-2},{-36,-1},{-36,0},{-36,3},{-36,4},{-36,5},{-36,6},{-36,12},{-36,13},{-36,14},{-36,15},{-36,16},{-36,19},{-36,20},{-35,-29},{-35,-28},{-35,-23},{-35,-22},{-35,-17},{-35,-16}, - {-35,-12},{-35,-11},{-35,-10},{-35,-9},{-35,-8},{-35,11},{-35,12},{-35,13},{-35,14},{-35,15},{-35,19},{-35,20},{-35,25},{-35,26},{-35,31},{-35,32},{-34,-30},{-34,-29},{-34,-28},{-34,-23},{-34,-22},{-34,-17},{-34,-16},{-34,-15},{-34,-11},{-34,-10},{-34,-9},{-34,-8},{-34,11},{-34,12}, - {-34,13},{-34,14},{-34,18},{-34,19},{-34,20},{-34,25},{-34,26},{-34,31},{-34,32},{-34,33},{-33,-31},{-33,-30},{-33,-29},{-33,-28},{-33,-23},{-33,-22},{-33,-16},{-33,-15},{-33,-14},{-33,-5},{-33,-4},{-33,-1},{-33,0},{-33,3},{-33,4},{-33,7},{-33,8},{-33,17},{-33,18},{-33,19}, - {-33,25},{-33,26},{-33,31},{-33,32},{-33,33},{-33,34},{-32,-32},{-32,-31},{-32,-30},{-32,-29},{-32,-28},{-32,-27},{-32,-23},{-32,-22},{-32,-21},{-32,-15},{-32,-14},{-32,-6},{-32,-5},{-32,-4},{-32,-1},{-32,0},{-32,3},{-32,4},{-32,7},{-32,8},{-32,9},{-32,17},{-32,18},{-32,24}, - {-32,25},{-32,26},{-32,30},{-32,31},{-32,32},{-32,33},{-32,34},{-32,35},{-31,-33},{-31,-32},{-31,-31},{-31,-30},{-31,-29},{-31,-28},{-31,-27},{-31,-26},{-31,-22},{-31,-21},{-31,-20},{-31,-19},{-31,-18},{-31,-11},{-31,-10},{-31,-9},{-31,-8},{-31,-7},{-31,-6},{-31,-5},{-31,-1},{-31,0}, - {-31,1},{-31,2},{-31,3},{-31,4},{-31,8},{-31,9},{-31,10},{-31,11},{-31,12},{-31,13},{-31,14},{-31,21},{-31,22},{-31,23},{-31,24},{-31,25},{-31,29},{-31,30},{-31,31},{-31,32},{-31,33},{-31,34},{-31,35},{-31,36},{-30,-33},{-30,-32},{-30,-31},{-30,-30},{-30,-29},{-30,-28}, - {-30,-27},{-30,-26},{-30,-21},{-30,-20},{-30,-19},{-30,-18},{-30,-11},{-30,-10},{-30,-9},{-30,-8},{-30,-7},{-30,-6},{-30,-1},{-30,0},{-30,1},{-30,2},{-30,3},{-30,4},{-30,9},{-30,10},{-30,11},{-30,12},{-30,13},{-30,14},{-30,21},{-30,22},{-30,23},{-30,24},{-30,29},{-30,30}, - {-30,31},{-30,32},{-30,33},{-30,34},{-30,35},{-30,36},{-29,-37},{-29,-36},{-29,-30},{-29,-29},{-29,-28},{-29,-27},{-29,-26},{-29,-15},{-29,-14},{-29,-10},{-29,-9},{-29,-8},{-29,-7},{-29,10},{-29,11},{-29,12},{-29,13},{-29,17},{-29,18},{-29,29},{-29,30},{-29,31},{-29,32},{-29,33}, - {-29,39},{-29,40},{-28,-38},{-28,-37},{-28,-36},{-28,-29},{-28,-28},{-28,-27},{-28,-26},{-28,-16},{-28,-15},{-28,-14},{-28,-9},{-28,-8},{-28,11},{-28,12},{-28,17},{-28,18},{-28,19},{-28,29},{-28,30},{-28,31},{-28,32},{-28,39},{-28,40},{-28,41},{-27,-39},{-27,-38},{-27,-37},{-27,-36}, - {-27,-23},{-27,-22},{-27,-19},{-27,-18},{-27,-17},{-27,-16},{-27,-15},{-27,-5},{-27,-4},{-27,-1},{-27,0},{-27,1},{-27,2},{-27,3},{-27,4},{-27,7},{-27,8},{-27,18},{-27,19},{-27,20},{-27,21},{-27,22},{-27,25},{-27,26},{-27,39},{-27,40},{-27,41},{-27,42},{-26,-39},{-26,-38}, - {-26,-37},{-26,-36},{-26,-24},{-26,-23},{-26,-22},{-26,-19},{-26,-18},{-26,-17},{-26,-16},{-26,-6},{-26,-5},{-26,-4},{-26,-1},{-26,0},{-26,1},{-26,2},{-26,3},{-26,4},{-26,7},{-26,8},{-26,9},{-26,19},{-26,20},{-26,21},{-26,22},{-26,25},{-26,26},{-26,27},{-26,39},{-26,40}, - {-26,41},{-26,42},{-25,-33},{-25,-32},{-25,-31},{-25,-30},{-25,-25},{-25,-24},{-25,-23},{-25,-22},{-25,-19},{-25,-18},{-25,-17},{-25,-9},{-25,-8},{-25,-7},{-25,-6},{-25,-5},{-25,-4},{-25,-1},{-25,0},{-25,1},{-25,2},{-25,3},{-25,4},{-25,7},{-25,8},{-25,9},{-25,10},{-25,11}, - {-25,12},{-25,20},{-25,21},{-25,22},{-25,25},{-25,26},{-25,27},{-25,28},{-25,33},{-25,34},{-25,35},{-25,36},{-24,-33},{-24,-32},{-24,-31},{-24,-30},{-24,-29},{-24,-25},{-24,-24},{-24,-23},{-24,-22},{-24,-19},{-24,-18},{-24,-9},{-24,-8},{-24,-7},{-24,-6},{-24,-5},{-24,-4},{-24,-1}, - {-24,0},{-24,1},{-24,2},{-24,3},{-24,4},{-24,7},{-24,8},{-24,9},{-24,10},{-24,11},{-24,12},{-24,21},{-24,22},{-24,25},{-24,26},{-24,27},{-24,28},{-24,32},{-24,33},{-24,34},{-24,35},{-24,36},{-23,-37},{-23,-36},{-23,-30},{-23,-29},{-23,-28},{-23,-19},{-23,-18},{-23,-15}, - {-23,-14},{-23,-9},{-23,-8},{-23,-7},{-23,-6},{-23,-5},{-23,0},{-23,1},{-23,2},{-23,3},{-23,8},{-23,9},{-23,10},{-23,11},{-23,12},{-23,17},{-23,18},{-23,21},{-23,22},{-23,31},{-23,32},{-23,33},{-23,39},{-23,40},{-22,-38},{-22,-37},{-22,-36},{-22,-29},{-22,-28},{-22,-19}, - {-22,-18},{-22,-15},{-22,-14},{-22,-13},{-22,-9},{-22,-8},{-22,-7},{-22,-6},{-22,1},{-22,2},{-22,9},{-22,10},{-22,11},{-22,12},{-22,16},{-22,17},{-22,18},{-22,21},{-22,22},{-22,31},{-22,32},{-22,39},{-22,40},{-22,41},{-21,-41},{-21,-40},{-21,-39},{-21,-38},{-21,-37},{-21,-29}, - {-21,-28},{-21,-25},{-21,-24},{-21,-23},{-21,-22},{-21,-21},{-21,-20},{-21,-19},{-21,-18},{-21,-15},{-21,-14},{-21,-13},{-21,-12},{-21,-3},{-21,-2},{-21,5},{-21,6},{-21,15},{-21,16},{-21,17},{-21,18},{-21,21},{-21,22},{-21,23},{-21,24},{-21,25},{-21,26},{-21,27},{-21,28},{-21,31}, - {-21,32},{-21,40},{-21,41},{-21,42},{-21,43},{-21,44},{-20,-42},{-20,-41},{-20,-40},{-20,-39},{-20,-38},{-20,-29},{-20,-28},{-20,-25},{-20,-24},{-20,-23},{-20,-22},{-20,-21},{-20,-20},{-20,-19},{-20,-18},{-20,-15},{-20,-14},{-20,-13},{-20,-12},{-20,-3},{-20,-2},{-20,-1},{-20,4},{-20,5}, - {-20,6},{-20,15},{-20,16},{-20,17},{-20,18},{-20,21},{-20,22},{-20,23},{-20,24},{-20,25},{-20,26},{-20,27},{-20,28},{-20,31},{-20,32},{-20,41},{-20,42},{-20,43},{-20,44},{-20,45},{-19,-43},{-19,-42},{-19,-41},{-19,-35},{-19,-34},{-19,-33},{-19,-32},{-19,-25},{-19,-24},{-19,-23}, - {-19,-15},{-19,-14},{-19,-13},{-19,-9},{-19,-8},{-19,-7},{-19,-6},{-19,-2},{-19,-1},{-19,0},{-19,1},{-19,2},{-19,3},{-19,4},{-19,5},{-19,9},{-19,10},{-19,11},{-19,12},{-19,16},{-19,17},{-19,18},{-19,26},{-19,27},{-19,28},{-19,35},{-19,36},{-19,37},{-19,38},{-19,44}, - {-19,45},{-19,46},{-18,-43},{-18,-42},{-18,-35},{-18,-34},{-18,-33},{-18,-32},{-18,-31},{-18,-26},{-18,-25},{-18,-24},{-18,-15},{-18,-14},{-18,-10},{-18,-9},{-18,-8},{-18,-7},{-18,-6},{-18,-1},{-18,0},{-18,1},{-18,2},{-18,3},{-18,4},{-18,9},{-18,10},{-18,11},{-18,12},{-18,13}, - {-18,17},{-18,18},{-18,27},{-18,28},{-18,29},{-18,34},{-18,35},{-18,36},{-18,37},{-18,38},{-18,45},{-18,46},{-17,-43},{-17,-42},{-17,-32},{-17,-31},{-17,-30},{-17,-27},{-17,-26},{-17,-25},{-17,-21},{-17,-20},{-17,-19},{-17,-18},{-17,-17},{-17,-16},{-17,-15},{-17,-14},{-17,-11},{-17,-10}, - {-17,-9},{-17,-8},{-17,-7},{-17,-6},{-17,0},{-17,1},{-17,2},{-17,3},{-17,9},{-17,10},{-17,11},{-17,12},{-17,13},{-17,14},{-17,17},{-17,18},{-17,19},{-17,20},{-17,21},{-17,22},{-17,23},{-17,24},{-17,28},{-17,29},{-17,30},{-17,33},{-17,34},{-17,35},{-17,45},{-17,46}, - {-16,-43},{-16,-42},{-16,-31},{-16,-30},{-16,-27},{-16,-26},{-16,-21},{-16,-20},{-16,-19},{-16,-18},{-16,-17},{-16,-16},{-16,-15},{-16,-14},{-16,-11},{-16,-10},{-16,-9},{-16,-8},{-16,-7},{-16,-6},{-16,1},{-16,2},{-16,9},{-16,10},{-16,11},{-16,12},{-16,13},{-16,14},{-16,17},{-16,18}, - {-16,19},{-16,20},{-16,21},{-16,22},{-16,23},{-16,24},{-16,29},{-16,30},{-16,33},{-16,34},{-16,45},{-16,46},{-15,-43},{-15,-42},{-15,-39},{-15,-38},{-15,-37},{-15,-36},{-15,-35},{-15,-34},{-15,-20},{-15,-19},{-15,-18},{-15,-17},{-15,-10},{-15,-9},{-15,-8},{-15,-7},{-15,-3},{-15,-2}, - {-15,1},{-15,2},{-15,5},{-15,6},{-15,10},{-15,11},{-15,12},{-15,13},{-15,20},{-15,21},{-15,22},{-15,23},{-15,37},{-15,38},{-15,39},{-15,40},{-15,41},{-15,42},{-15,45},{-15,46},{-14,-43},{-14,-42},{-14,-39},{-14,-38},{-14,-37},{-14,-36},{-14,-35},{-14,-34},{-14,-33},{-14,-19}, - {-14,-18},{-14,-9},{-14,-8},{-14,-4},{-14,-3},{-14,-2},{-14,1},{-14,2},{-14,5},{-14,6},{-14,7},{-14,11},{-14,12},{-14,21},{-14,22},{-14,36},{-14,37},{-14,38},{-14,39},{-14,40},{-14,41},{-14,42},{-14,45},{-14,46},{-13,-39},{-13,-38},{-13,-35},{-13,-34},{-13,-33},{-13,-32}, - {-13,-29},{-13,-28},{-13,-15},{-13,-14},{-13,-5},{-13,-4},{-13,-3},{-13,-2},{-13,5},{-13,6},{-13,7},{-13,8},{-13,17},{-13,18},{-13,31},{-13,32},{-13,35},{-13,36},{-13,37},{-13,38},{-13,41},{-13,42},{-12,-39},{-12,-38},{-12,-35},{-12,-34},{-12,-33},{-12,-32},{-12,-29},{-12,-28}, - {-12,-27},{-12,-16},{-12,-15},{-12,-14},{-12,-13},{-12,-5},{-12,-4},{-12,-3},{-12,-2},{-12,5},{-12,6},{-12,7},{-12,8},{-12,16},{-12,17},{-12,18},{-12,19},{-12,30},{-12,31},{-12,32},{-12,35},{-12,36},{-12,37},{-12,38},{-12,41},{-12,42},{-11,-43},{-11,-42},{-11,-34},{-11,-33}, - {-11,-32},{-11,-29},{-11,-28},{-11,-27},{-11,-26},{-11,-23},{-11,-22},{-11,-21},{-11,-20},{-11,-17},{-11,-16},{-11,-15},{-11,-14},{-11,-13},{-11,-12},{-11,-9},{-11,-8},{-11,1},{-11,2},{-11,11},{-11,12},{-11,15},{-11,16},{-11,17},{-11,18},{-11,19},{-11,20},{-11,23},{-11,24},{-11,25}, - {-11,26},{-11,29},{-11,30},{-11,31},{-11,32},{-11,35},{-11,36},{-11,37},{-11,45},{-11,46},{-10,-44},{-10,-43},{-10,-42},{-10,-33},{-10,-32},{-10,-29},{-10,-28},{-10,-27},{-10,-26},{-10,-23},{-10,-22},{-10,-21},{-10,-20},{-10,-17},{-10,-16},{-10,-15},{-10,-14},{-10,-13},{-10,-12},{-10,-9}, - {-10,-8},{-10,-7},{-10,0},{-10,1},{-10,2},{-10,3},{-10,10},{-10,11},{-10,12},{-10,15},{-10,16},{-10,17},{-10,18},{-10,19},{-10,20},{-10,23},{-10,24},{-10,25},{-10,26},{-10,29},{-10,30},{-10,31},{-10,32},{-10,35},{-10,36},{-10,45},{-10,46},{-10,47},{-9,-45},{-9,-44}, - {-9,-43},{-9,-29},{-9,-28},{-9,-27},{-9,-23},{-9,-22},{-9,-21},{-9,-20},{-9,-17},{-9,-16},{-9,-15},{-9,-14},{-9,-13},{-9,-8},{-9,-7},{-9,-6},{-9,-5},{-9,-1},{-9,0},{-9,1},{-9,2},{-9,3},{-9,4},{-9,8},{-9,9},{-9,10},{-9,11},{-9,16},{-9,17},{-9,18}, - {-9,19},{-9,20},{-9,23},{-9,24},{-9,25},{-9,26},{-9,30},{-9,31},{-9,32},{-9,46},{-9,47},{-9,48},{-8,-45},{-8,-44},{-8,-30},{-8,-29},{-8,-28},{-8,-24},{-8,-23},{-8,-22},{-8,-21},{-8,-20},{-8,-17},{-8,-16},{-8,-15},{-8,-14},{-8,-7},{-8,-6},{-8,-5},{-8,-4}, - {-8,-1},{-8,0},{-8,1},{-8,2},{-8,3},{-8,4},{-8,7},{-8,8},{-8,9},{-8,10},{-8,17},{-8,18},{-8,19},{-8,20},{-8,23},{-8,24},{-8,25},{-8,26},{-8,27},{-8,31},{-8,32},{-8,33},{-8,47},{-8,48},{-7,-45},{-7,-44},{-7,-39},{-7,-38},{-7,-37},{-7,-36}, - {-7,-31},{-7,-30},{-7,-29},{-7,-25},{-7,-24},{-7,-23},{-7,-22},{-7,-21},{-7,-11},{-7,-10},{-7,-7},{-7,-6},{-7,-5},{-7,-4},{-7,7},{-7,8},{-7,9},{-7,10},{-7,13},{-7,14},{-7,24},{-7,25},{-7,26},{-7,27},{-7,28},{-7,32},{-7,33},{-7,34},{-7,39},{-7,40}, - {-7,41},{-7,42},{-7,47},{-7,48},{-6,-46},{-6,-45},{-6,-44},{-6,-39},{-6,-38},{-6,-37},{-6,-36},{-6,-35},{-6,-31},{-6,-30},{-6,-25},{-6,-24},{-6,-23},{-6,-22},{-6,-12},{-6,-11},{-6,-10},{-6,-6},{-6,-5},{-6,8},{-6,9},{-6,13},{-6,14},{-6,15},{-6,25},{-6,26}, - {-6,27},{-6,28},{-6,33},{-6,34},{-6,38},{-6,39},{-6,40},{-6,41},{-6,42},{-6,47},{-6,48},{-6,49},{-5,-47},{-5,-46},{-5,-45},{-5,-44},{-5,-37},{-5,-36},{-5,-35},{-5,-34},{-5,-19},{-5,-18},{-5,-13},{-5,-12},{-5,-11},{-5,-10},{-5,-1},{-5,0},{-5,1},{-5,2}, - {-5,3},{-5,4},{-5,13},{-5,14},{-5,15},{-5,16},{-5,21},{-5,22},{-5,37},{-5,38},{-5,39},{-5,40},{-5,47},{-5,48},{-5,49},{-5,50},{-4,-47},{-4,-46},{-4,-45},{-4,-44},{-4,-43},{-4,-37},{-4,-36},{-4,-35},{-4,-34},{-4,-19},{-4,-18},{-4,-17},{-4,-13},{-4,-12}, - {-4,-11},{-4,-10},{-4,-2},{-4,-1},{-4,0},{-4,1},{-4,2},{-4,3},{-4,4},{-4,5},{-4,13},{-4,14},{-4,15},{-4,16},{-4,20},{-4,21},{-4,22},{-4,37},{-4,38},{-4,39},{-4,40},{-4,46},{-4,47},{-4,48},{-4,49},{-4,50},{-3,-44},{-3,-43},{-3,-42},{-3,-41}, - {-3,-40},{-3,-37},{-3,-36},{-3,-35},{-3,-34},{-3,-31},{-3,-30},{-3,-29},{-3,-28},{-3,-25},{-3,-24},{-3,-23},{-3,-22},{-3,-18},{-3,-17},{-3,-16},{-3,-7},{-3,-6},{-3,-3},{-3,-2},{-3,-1},{-3,0},{-3,3},{-3,4},{-3,5},{-3,6},{-3,9},{-3,10},{-3,19},{-3,20}, - {-3,21},{-3,25},{-3,26},{-3,27},{-3,28},{-3,31},{-3,32},{-3,33},{-3,34},{-3,37},{-3,38},{-3,39},{-3,40},{-3,43},{-3,44},{-3,45},{-3,46},{-3,47},{-2,-43},{-2,-42},{-2,-41},{-2,-40},{-2,-37},{-2,-36},{-2,-35},{-2,-34},{-2,-31},{-2,-30},{-2,-29},{-2,-28}, - {-2,-25},{-2,-24},{-2,-23},{-2,-22},{-2,-21},{-2,-17},{-2,-16},{-2,-15},{-2,-8},{-2,-7},{-2,-6},{-2,-3},{-2,-2},{-2,-1},{-2,0},{-2,3},{-2,4},{-2,5},{-2,6},{-2,9},{-2,10},{-2,11},{-2,18},{-2,19},{-2,20},{-2,24},{-2,25},{-2,26},{-2,27},{-2,28}, - {-2,31},{-2,32},{-2,33},{-2,34},{-2,37},{-2,38},{-2,39},{-2,40},{-2,43},{-2,44},{-2,45},{-2,46},{-1,-47},{-1,-46},{-1,-43},{-1,-42},{-1,-41},{-1,-40},{-1,-37},{-1,-36},{-1,-29},{-1,-28},{-1,-25},{-1,-24},{-1,-23},{-1,-22},{-1,-21},{-1,-20},{-1,-17},{-1,-16}, - {-1,-15},{-1,-14},{-1,-13},{-1,-12},{-1,-9},{-1,-8},{-1,-7},{-1,-6},{-1,-3},{-1,-2},{-1,5},{-1,6},{-1,9},{-1,10},{-1,11},{-1,12},{-1,15},{-1,16},{-1,17},{-1,18},{-1,19},{-1,20},{-1,23},{-1,24},{-1,25},{-1,26},{-1,27},{-1,28},{-1,31},{-1,32}, - {-1,39},{-1,40},{-1,43},{-1,44},{-1,45},{-1,46},{-1,49},{-1,50},{0,-47},{0,-46},{0,-43},{0,-42},{0,-41},{0,-40},{0,-37},{0,-36},{0,-29},{0,-28},{0,-25},{0,-24},{0,-23},{0,-22},{0,-21},{0,-20},{0,-17},{0,-16},{0,-15},{0,-14},{0,-13},{0,-12}, - {0,-9},{0,-8},{0,-7},{0,-6},{0,-3},{0,-2},{0,5},{0,6},{0,9},{0,10},{0,11},{0,12},{0,15},{0,16},{0,17},{0,18},{0,19},{0,20},{0,23},{0,24},{0,25},{0,26},{0,27},{0,28},{0,31},{0,32},{0,39},{0,40},{0,43},{0,44}, - {0,45},{0,46},{0,49},{0,50},{1,-43},{1,-42},{1,-41},{1,-40},{1,-37},{1,-36},{1,-35},{1,-34},{1,-31},{1,-30},{1,-29},{1,-28},{1,-25},{1,-24},{1,-23},{1,-22},{1,-21},{1,-17},{1,-16},{1,-15},{1,-8},{1,-7},{1,-6},{1,-3},{1,-2},{1,-1}, - {1,0},{1,3},{1,4},{1,5},{1,6},{1,9},{1,10},{1,11},{1,18},{1,19},{1,20},{1,24},{1,25},{1,26},{1,27},{1,28},{1,31},{1,32},{1,33},{1,34},{1,37},{1,38},{1,39},{1,40},{1,43},{1,44},{1,45},{1,46},{2,-44},{2,-43}, - {2,-42},{2,-41},{2,-40},{2,-37},{2,-36},{2,-35},{2,-34},{2,-31},{2,-30},{2,-29},{2,-28},{2,-25},{2,-24},{2,-23},{2,-22},{2,-18},{2,-17},{2,-16},{2,-7},{2,-6},{2,-3},{2,-2},{2,-1},{2,0},{2,3},{2,4},{2,5},{2,6},{2,9},{2,10}, - {2,19},{2,20},{2,21},{2,25},{2,26},{2,27},{2,28},{2,31},{2,32},{2,33},{2,34},{2,37},{2,38},{2,39},{2,40},{2,43},{2,44},{2,45},{2,46},{2,47},{3,-47},{3,-46},{3,-45},{3,-44},{3,-43},{3,-37},{3,-36},{3,-35},{3,-34},{3,-19}, - {3,-18},{3,-17},{3,-13},{3,-12},{3,-11},{3,-10},{3,-2},{3,-1},{3,0},{3,1},{3,2},{3,3},{3,4},{3,5},{3,13},{3,14},{3,15},{3,16},{3,20},{3,21},{3,22},{3,37},{3,38},{3,39},{3,40},{3,46},{3,47},{3,48},{3,49},{3,50}, - {4,-47},{4,-46},{4,-45},{4,-44},{4,-37},{4,-36},{4,-35},{4,-34},{4,-19},{4,-18},{4,-13},{4,-12},{4,-11},{4,-10},{4,-1},{4,0},{4,1},{4,2},{4,3},{4,4},{4,13},{4,14},{4,15},{4,16},{4,21},{4,22},{4,37},{4,38},{4,39},{4,40}, - {4,47},{4,48},{4,49},{4,50},{5,-46},{5,-45},{5,-44},{5,-39},{5,-38},{5,-37},{5,-36},{5,-35},{5,-31},{5,-30},{5,-25},{5,-24},{5,-23},{5,-22},{5,-12},{5,-11},{5,-10},{5,-6},{5,-5},{5,8},{5,9},{5,13},{5,14},{5,15},{5,25},{5,26}, - {5,27},{5,28},{5,33},{5,34},{5,38},{5,39},{5,40},{5,41},{5,42},{5,47},{5,48},{5,49},{6,-45},{6,-44},{6,-39},{6,-38},{6,-37},{6,-36},{6,-31},{6,-30},{6,-29},{6,-25},{6,-24},{6,-23},{6,-22},{6,-21},{6,-11},{6,-10},{6,-7},{6,-6}, - {6,-5},{6,-4},{6,7},{6,8},{6,9},{6,10},{6,13},{6,14},{6,24},{6,25},{6,26},{6,27},{6,28},{6,32},{6,33},{6,34},{6,39},{6,40},{6,41},{6,42},{6,47},{6,48},{7,-45},{7,-44},{7,-30},{7,-29},{7,-28},{7,-24},{7,-23},{7,-22}, - {7,-21},{7,-20},{7,-17},{7,-16},{7,-15},{7,-14},{7,-7},{7,-6},{7,-5},{7,-4},{7,-1},{7,0},{7,1},{7,2},{7,3},{7,4},{7,7},{7,8},{7,9},{7,10},{7,17},{7,18},{7,19},{7,20},{7,23},{7,24},{7,25},{7,26},{7,27},{7,31}, - {7,32},{7,33},{7,47},{7,48},{8,-45},{8,-44},{8,-43},{8,-29},{8,-28},{8,-27},{8,-23},{8,-22},{8,-21},{8,-20},{8,-17},{8,-16},{8,-15},{8,-14},{8,-13},{8,-8},{8,-7},{8,-6},{8,-5},{8,-1},{8,0},{8,1},{8,2},{8,3},{8,4},{8,8}, - {8,9},{8,10},{8,11},{8,16},{8,17},{8,18},{8,19},{8,20},{8,23},{8,24},{8,25},{8,26},{8,30},{8,31},{8,32},{8,46},{8,47},{8,48},{9,-44},{9,-43},{9,-42},{9,-33},{9,-32},{9,-29},{9,-28},{9,-27},{9,-26},{9,-23},{9,-22},{9,-21}, - {9,-20},{9,-17},{9,-16},{9,-15},{9,-14},{9,-13},{9,-12},{9,-9},{9,-8},{9,-7},{9,0},{9,1},{9,2},{9,3},{9,10},{9,11},{9,12},{9,15},{9,16},{9,17},{9,18},{9,19},{9,20},{9,23},{9,24},{9,25},{9,26},{9,29},{9,30},{9,31}, - {9,32},{9,35},{9,36},{9,45},{9,46},{9,47},{10,-43},{10,-42},{10,-34},{10,-33},{10,-32},{10,-29},{10,-28},{10,-27},{10,-26},{10,-23},{10,-22},{10,-21},{10,-20},{10,-17},{10,-16},{10,-15},{10,-14},{10,-13},{10,-12},{10,-9},{10,-8},{10,1},{10,2},{10,11}, - {10,12},{10,15},{10,16},{10,17},{10,18},{10,19},{10,20},{10,23},{10,24},{10,25},{10,26},{10,29},{10,30},{10,31},{10,32},{10,35},{10,36},{10,37},{10,45},{10,46},{11,-39},{11,-38},{11,-35},{11,-34},{11,-33},{11,-32},{11,-29},{11,-28},{11,-27},{11,-16}, - {11,-15},{11,-14},{11,-13},{11,-5},{11,-4},{11,-3},{11,-2},{11,5},{11,6},{11,7},{11,8},{11,16},{11,17},{11,18},{11,19},{11,30},{11,31},{11,32},{11,35},{11,36},{11,37},{11,38},{11,41},{11,42},{12,-39},{12,-38},{12,-35},{12,-34},{12,-33},{12,-32}, - {12,-29},{12,-28},{12,-15},{12,-14},{12,-5},{12,-4},{12,-3},{12,-2},{12,5},{12,6},{12,7},{12,8},{12,17},{12,18},{12,31},{12,32},{12,35},{12,36},{12,37},{12,38},{12,41},{12,42},{13,-43},{13,-42},{13,-39},{13,-38},{13,-37},{13,-36},{13,-35},{13,-34}, - {13,-33},{13,-19},{13,-18},{13,-9},{13,-8},{13,-4},{13,-3},{13,-2},{13,1},{13,2},{13,5},{13,6},{13,7},{13,11},{13,12},{13,21},{13,22},{13,36},{13,37},{13,38},{13,39},{13,40},{13,41},{13,42},{13,45},{13,46},{14,-43},{14,-42},{14,-39},{14,-38}, - {14,-37},{14,-36},{14,-35},{14,-34},{14,-20},{14,-19},{14,-18},{14,-17},{14,-10},{14,-9},{14,-8},{14,-7},{14,-3},{14,-2},{14,1},{14,2},{14,5},{14,6},{14,10},{14,11},{14,12},{14,13},{14,20},{14,21},{14,22},{14,23},{14,37},{14,38},{14,39},{14,40}, - {14,41},{14,42},{14,45},{14,46},{15,-43},{15,-42},{15,-31},{15,-30},{15,-27},{15,-26},{15,-21},{15,-20},{15,-19},{15,-18},{15,-17},{15,-16},{15,-15},{15,-14},{15,-11},{15,-10},{15,-9},{15,-8},{15,-7},{15,-6},{15,1},{15,2},{15,9},{15,10},{15,11},{15,12}, - {15,13},{15,14},{15,17},{15,18},{15,19},{15,20},{15,21},{15,22},{15,23},{15,24},{15,29},{15,30},{15,33},{15,34},{15,45},{15,46},{16,-43},{16,-42},{16,-32},{16,-31},{16,-30},{16,-27},{16,-26},{16,-25},{16,-21},{16,-20},{16,-19},{16,-18},{16,-17},{16,-16}, - {16,-15},{16,-14},{16,-11},{16,-10},{16,-9},{16,-8},{16,-7},{16,-6},{16,0},{16,1},{16,2},{16,3},{16,9},{16,10},{16,11},{16,12},{16,13},{16,14},{16,17},{16,18},{16,19},{16,20},{16,21},{16,22},{16,23},{16,24},{16,28},{16,29},{16,30},{16,33}, - {16,34},{16,35},{16,45},{16,46},{17,-43},{17,-42},{17,-35},{17,-34},{17,-33},{17,-32},{17,-31},{17,-26},{17,-25},{17,-24},{17,-15},{17,-14},{17,-10},{17,-9},{17,-8},{17,-7},{17,-6},{17,-1},{17,0},{17,1},{17,2},{17,3},{17,4},{17,9},{17,10},{17,11}, - {17,12},{17,13},{17,17},{17,18},{17,27},{17,28},{17,29},{17,34},{17,35},{17,36},{17,37},{17,38},{17,45},{17,46},{18,-43},{18,-42},{18,-41},{18,-35},{18,-34},{18,-33},{18,-32},{18,-25},{18,-24},{18,-23},{18,-15},{18,-14},{18,-13},{18,-9},{18,-8},{18,-7}, - {18,-6},{18,-2},{18,-1},{18,0},{18,1},{18,2},{18,3},{18,4},{18,5},{18,9},{18,10},{18,11},{18,12},{18,16},{18,17},{18,18},{18,26},{18,27},{18,28},{18,35},{18,36},{18,37},{18,38},{18,44},{18,45},{18,46},{19,-42},{19,-41},{19,-40},{19,-39}, - {19,-38},{19,-29},{19,-28},{19,-25},{19,-24},{19,-23},{19,-22},{19,-21},{19,-20},{19,-19},{19,-18},{19,-15},{19,-14},{19,-13},{19,-12},{19,-3},{19,-2},{19,-1},{19,4},{19,5},{19,6},{19,15},{19,16},{19,17},{19,18},{19,21},{19,22},{19,23},{19,24},{19,25}, - {19,26},{19,27},{19,28},{19,31},{19,32},{19,41},{19,42},{19,43},{19,44},{19,45},{20,-41},{20,-40},{20,-39},{20,-38},{20,-37},{20,-29},{20,-28},{20,-25},{20,-24},{20,-23},{20,-22},{20,-21},{20,-20},{20,-19},{20,-18},{20,-15},{20,-14},{20,-13},{20,-12},{20,-3}, - {20,-2},{20,5},{20,6},{20,15},{20,16},{20,17},{20,18},{20,21},{20,22},{20,23},{20,24},{20,25},{20,26},{20,27},{20,28},{20,31},{20,32},{20,40},{20,41},{20,42},{20,43},{20,44},{21,-38},{21,-37},{21,-36},{21,-29},{21,-28},{21,-19},{21,-18},{21,-15}, - {21,-14},{21,-13},{21,-9},{21,-8},{21,-7},{21,-6},{21,1},{21,2},{21,9},{21,10},{21,11},{21,12},{21,16},{21,17},{21,18},{21,21},{21,22},{21,31},{21,32},{21,39},{21,40},{21,41},{22,-37},{22,-36},{22,-30},{22,-29},{22,-28},{22,-19},{22,-18},{22,-15}, - {22,-14},{22,-9},{22,-8},{22,-7},{22,-6},{22,-5},{22,0},{22,1},{22,2},{22,3},{22,8},{22,9},{22,10},{22,11},{22,12},{22,17},{22,18},{22,21},{22,22},{22,31},{22,32},{22,33},{22,39},{22,40},{23,-33},{23,-32},{23,-31},{23,-30},{23,-29},{23,-25}, - {23,-24},{23,-23},{23,-22},{23,-19},{23,-18},{23,-9},{23,-8},{23,-7},{23,-6},{23,-5},{23,-4},{23,-1},{23,0},{23,1},{23,2},{23,3},{23,4},{23,7},{23,8},{23,9},{23,10},{23,11},{23,12},{23,21},{23,22},{23,25},{23,26},{23,27},{23,28},{23,32}, - {23,33},{23,34},{23,35},{23,36},{24,-33},{24,-32},{24,-31},{24,-30},{24,-25},{24,-24},{24,-23},{24,-22},{24,-19},{24,-18},{24,-17},{24,-9},{24,-8},{24,-7},{24,-6},{24,-5},{24,-4},{24,-1},{24,0},{24,1},{24,2},{24,3},{24,4},{24,7},{24,8},{24,9}, - {24,10},{24,11},{24,12},{24,20},{24,21},{24,22},{24,25},{24,26},{24,27},{24,28},{24,33},{24,34},{24,35},{24,36},{25,-39},{25,-38},{25,-37},{25,-36},{25,-24},{25,-23},{25,-22},{25,-19},{25,-18},{25,-17},{25,-16},{25,-6},{25,-5},{25,-4},{25,-1},{25,0}, - {25,1},{25,2},{25,3},{25,4},{25,7},{25,8},{25,9},{25,19},{25,20},{25,21},{25,22},{25,25},{25,26},{25,27},{25,39},{25,40},{25,41},{25,42},{26,-39},{26,-38},{26,-37},{26,-36},{26,-23},{26,-22},{26,-19},{26,-18},{26,-17},{26,-16},{26,-15},{26,-5}, - {26,-4},{26,-1},{26,0},{26,1},{26,2},{26,3},{26,4},{26,7},{26,8},{26,18},{26,19},{26,20},{26,21},{26,22},{26,25},{26,26},{26,39},{26,40},{26,41},{26,42},{27,-38},{27,-37},{27,-36},{27,-29},{27,-28},{27,-27},{27,-26},{27,-16},{27,-15},{27,-14}, - {27,-9},{27,-8},{27,11},{27,12},{27,17},{27,18},{27,19},{27,29},{27,30},{27,31},{27,32},{27,39},{27,40},{27,41},{28,-37},{28,-36},{28,-30},{28,-29},{28,-28},{28,-27},{28,-26},{28,-15},{28,-14},{28,-10},{28,-9},{28,-8},{28,-7},{28,10},{28,11},{28,12}, - {28,13},{28,17},{28,18},{28,29},{28,30},{28,31},{28,32},{28,33},{28,39},{28,40},{29,-33},{29,-32},{29,-31},{29,-30},{29,-29},{29,-28},{29,-27},{29,-26},{29,-21},{29,-20},{29,-19},{29,-18},{29,-11},{29,-10},{29,-9},{29,-8},{29,-7},{29,-6},{29,-1},{29,0}, - {29,1},{29,2},{29,3},{29,4},{29,9},{29,10},{29,11},{29,12},{29,13},{29,14},{29,21},{29,22},{29,23},{29,24},{29,29},{29,30},{29,31},{29,32},{29,33},{29,34},{29,35},{29,36},{30,-33},{30,-32},{30,-31},{30,-30},{30,-29},{30,-28},{30,-27},{30,-26}, - {30,-22},{30,-21},{30,-20},{30,-19},{30,-18},{30,-11},{30,-10},{30,-9},{30,-8},{30,-7},{30,-6},{30,-5},{30,-1},{30,0},{30,1},{30,2},{30,3},{30,4},{30,8},{30,9},{30,10},{30,11},{30,12},{30,13},{30,14},{30,21},{30,22},{30,23},{30,24},{30,25}, - {30,29},{30,30},{30,31},{30,32},{30,33},{30,34},{30,35},{30,36},{31,-32},{31,-31},{31,-30},{31,-29},{31,-28},{31,-27},{31,-23},{31,-22},{31,-21},{31,-15},{31,-14},{31,-6},{31,-5},{31,-4},{31,-1},{31,0},{31,3},{31,4},{31,7},{31,8},{31,9},{31,17}, - {31,18},{31,24},{31,25},{31,26},{31,30},{31,31},{31,32},{31,33},{31,34},{31,35},{32,-31},{32,-30},{32,-29},{32,-28},{32,-23},{32,-22},{32,-16},{32,-15},{32,-14},{32,-5},{32,-4},{32,-1},{32,0},{32,3},{32,4},{32,7},{32,8},{32,17},{32,18},{32,19}, - {32,25},{32,26},{32,31},{32,32},{32,33},{32,34},{33,-30},{33,-29},{33,-28},{33,-23},{33,-22},{33,-17},{33,-16},{33,-15},{33,-11},{33,-10},{33,-9},{33,-8},{33,11},{33,12},{33,13},{33,14},{33,18},{33,19},{33,20},{33,25},{33,26},{33,31},{33,32},{33,33}, - {34,-29},{34,-28},{34,-23},{34,-22},{34,-17},{34,-16},{34,-12},{34,-11},{34,-10},{34,-9},{34,-8},{34,11},{34,12},{34,13},{34,14},{34,15},{34,19},{34,20},{34,25},{34,26},{34,31},{34,32},{35,-17},{35,-16},{35,-13},{35,-12},{35,-11},{35,-10},{35,-9},{35,-3}, - {35,-2},{35,-1},{35,0},{35,3},{35,4},{35,5},{35,6},{35,12},{35,13},{35,14},{35,15},{35,16},{35,19},{35,20},{36,-17},{36,-16},{36,-13},{36,-12},{36,-11},{36,-10},{36,-4},{36,-3},{36,-2},{36,-1},{36,0},{36,3},{36,4},{36,5},{36,6},{36,7}, - {36,13},{36,14},{36,15},{36,16},{36,19},{36,20},{37,-27},{37,-26},{37,-25},{37,-24},{37,-21},{37,-20},{37,-13},{37,-12},{37,-5},{37,-4},{37,-3},{37,-2},{37,-1},{37,0},{37,1},{37,2},{37,3},{37,4},{37,5},{37,6},{37,7},{37,8},{37,15},{37,16}, - {37,23},{37,24},{37,27},{37,28},{37,29},{37,30},{38,-27},{38,-26},{38,-25},{38,-24},{38,-21},{38,-20},{38,-19},{38,-13},{38,-12},{38,-5},{38,-4},{38,-3},{38,-2},{38,-1},{38,0},{38,1},{38,2},{38,3},{38,4},{38,5},{38,6},{38,7},{38,8},{38,15}, - {38,16},{38,22},{38,23},{38,24},{38,27},{38,28},{38,29},{38,30},{39,-26},{39,-25},{39,-24},{39,-20},{39,-19},{39,-18},{39,-13},{39,-12},{39,-11},{39,-10},{39,-5},{39,-4},{39,7},{39,8},{39,13},{39,14},{39,15},{39,16},{39,21},{39,22},{39,23},{39,27}, - {39,28},{39,29},{40,-25},{40,-24},{40,-19},{40,-18},{40,-13},{40,-12},{40,-11},{40,-10},{40,-5},{40,-4},{40,7},{40,8},{40,13},{40,14},{40,15},{40,16},{40,21},{40,22},{40,27},{40,28},{41,-19},{41,-18},{41,-1},{41,0},{41,1},{41,2},{41,3},{41,4}, - {41,21},{41,22},{42,-19},{42,-18},{42,-17},{42,-1},{42,0},{42,1},{42,2},{42,3},{42,4},{42,20},{42,21},{42,22},{43,-18},{43,-17},{43,-16},{43,-15},{43,-14},{43,-13},{43,-12},{43,-9},{43,-8},{43,-1},{43,0},{43,1},{43,2},{43,3},{43,4},{43,11}, - {43,12},{43,15},{43,16},{43,17},{43,18},{43,19},{43,20},{43,21},{44,-17},{44,-16},{44,-15},{44,-14},{44,-13},{44,-12},{44,-9},{44,-8},{44,-7},{44,-2},{44,-1},{44,0},{44,1},{44,2},{44,3},{44,4},{44,5},{44,10},{44,11},{44,12},{44,15},{44,16}, - {44,17},{44,18},{44,19},{44,20},{45,-8},{45,-7},{45,-6},{45,-5},{45,-4},{45,-3},{45,-2},{45,-1},{45,4},{45,5},{45,6},{45,7},{45,8},{45,9},{45,10},{45,11},{46,-7},{46,-6},{46,-5},{46,-4},{46,-3},{46,-2},{46,5},{46,6},{46,7},{46,8}, - {46,9},{46,10},{47,-4},{47,-3},{47,-2},{47,1},{47,2},{47,5},{47,6},{47,7},{48,-3},{48,-2},{48,1},{48,2},{48,5},{48,6} -} \ No newline at end of file diff --git a/old/modules/DONE/WarpPoints/control.lua b/old/modules/DONE/WarpPoints/control.lua deleted file mode 100644 index 19b5a9ad..00000000 --- a/old/modules/DONE/WarpPoints/control.lua +++ /dev/null @@ -1,250 +0,0 @@ ---- Creates a warp point system which makes moving around large maps easier. --- @module WarpPoints@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Gui = require('ExpGamingCore.Gui') -local Game = require('FactorioStdLib.Game') -local Role -- ExpGamingCore.Role@^4.0.0 - --- Local Variables -local warp_tiles = require(module_path..'/src/warp_tiles') -local warp_entities = require(module_path..'/src/warp_entities') - -local warp_radius = 4 -local spawn_warp_scale = 5 -local warp_tile = 'tutorial-grid' -local warp_limit = 60 -local warp_item = 'discharge-defense-equipment' -local global_offset = {x=0,y=0} -local warp_min_distance = 25 - --- Module Define -local global -local module_verbose = false -local ThisModule = { - on_init=function(self) - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end - if loaded_modules['ExpGamingCore.Command'] then require(module_path..'/src/commands',{self=self,warps=global,warp_min_distance=warp_min_distance}) end - end -} - --- Global Define -global = { - warps={}, -- 0,0 is always a warp - cooldowns={} -} -Global.register(global,function(tbl) global = tbl end) - --- Function Define - ---- Removes a warp point from the list, and then updates the gui --- @usage ThisModule.remove_warp_point(name) -- name cant be spawn --- @tparam string name the name of the warp point -function ThisModule.remove_warp_point(name) - local warp = global.warps[name] - if not warp then return end - local surface = game.surfaces[warp.surface] - local offset = warp.position - local tiles = {} - -- clears the area where the warp was - for x = -warp_radius, warp_radius do - for y = -warp_radius, warp_radius do - if x^2+y^2 < (warp_radius+1)^2 then - table.insert(tiles,{name=warp.old_tile,position={x+offset.x,y+offset.y}}) - local entities = surface.find_entities_filtered{area={{x+offset.x-1,y+offset.y-1},{x+offset.x,y+offset.y}}} - for _,entity in pairs(entities) do if entity.name ~= 'player' then entity.destroy() end end - end - end - end - surface.set_tiles(tiles) - if warp.tag.valid then warp.tag.destroy() end - global.warps[name] = nil - ThisModule.Gui() -end - ---- Adds a warp point from the list, and then updates the gui --- @usage ThisModule.make_warp_point({x=10,y=10},surface,force,name) --- @tparam table position the position of the new warp point --- @tparam surface surface the surface that the warp point is on --- @tparam force force the force that the warp point will belong to --- @tparam string name the name of the warp point to be made -function ThisModule.make_warp_point(position,surface,force,warpName) - local warp = global.warps[warpName] - if warp then return end - local offset = {x=math.floor(position.x),y=math.floor(position.y)} - local old_tile = surface.get_tile(offset).name - local base_tiles = {} - local tiles = {} - -- this makes a base plate to make the warp point - for x = -warp_radius, warp_radius do - for y = -warp_radius, warp_radius do - if x^2+y^2 < warp_radius^2 then - table.insert(base_tiles,{name=warp_tile,position={x+offset.x,y+offset.y}}) - end - end - end - surface.set_tiles(base_tiles) - -- this adds the pattern and entities - for _,pos in pairs(warp_tiles) do - table.insert(tiles,{name=warp_tile,position={pos[1]+offset.x+global_offset.x,pos[2]+offset.y+global_offset.y}}) - end - surface.set_tiles(tiles) - for _,entity in pairs(warp_entities) do - entity = surface.create_entity{name=entity[1],position={entity[2]+offset.x+global_offset.x,entity[3]+offset.y+global_offset.y},force='neutral'} - entity.destructible = false; entity.health = 0; entity.minable = false; entity.rotatable = false - end - -- creates a tag on the map for the wap point - local tag = force.add_chart_tag(surface,{ - position={offset.x+0.5,offset.y+0.5}, - text='Warp: '..warpName, - icon={type='item',name=warp_item} - }) - global.warps[warpName] = {tag=tag,surface=surface.index,position=tag.position,old_tile=old_tile} - local _temp = {spawn=global.warps.spawn} - global.warps.spawn = nil - for name,data in pairs(table.keysort(global.warps)) do _temp[name] = data end - global.warps = _temp - ThisModule.Gui() -end - -local remove_warp = Gui.inputs{ - type='button', - name='remove-warp-point', - caption='utility/remove', - tooltip={'WarpPoints.remove-tooltip'} -}:on_event('click',function(event) - local name = event.element.parent.name - ThisModule.remove_warp_point(name) -end) - -local go_to_warp = Gui.inputs{ - type='button', - name='go-to-warp-point', - caption='utility/export_slot', - tooltip={'WarpPoints.go-to-tooltip'} -}:on_event('click',function(event) - local player = Game.get_player(event) - local cooldown = global.cooldowns[event.player_index] or 0 - local warp = global.warps[event.element.parent.name] - if not warp then return end - if cooldown > 0 then player_return({'WarpPoints.cooldown',cooldown},nil,event) return end - if player.vehicle then player.vehicle.set_driver(nil) end - if player.vehicle then player.vehicle.set_passenger(nil) end - if player.vehicle then return end - local surface = game.surfaces[warp.surface] - player.teleport(surface.find_non_colliding_position('player',warp.position,32,1),surface) - if not Role and not player.admin or Role and not Role.allowed(player,'always-warp') then - event.element.parent.parent.parent.parent.style.visible = false - global.cooldowns[event.player_index] = warp_limit - end -end) - -ThisModule.Gui = Gui.left{ - name='warp-list', - caption='item/'..warp_item, - tooltip={'WarpPoints.tooltip'}, - draw=function(self,frame) - local player = Game.get_player(frame.player_index) - frame.caption={'WarpPoints.name'} - local warp_list = frame.add{ - type='scroll-pane', - direction='vertical', - vertical_scroll_policy='auto', - horizontal_scroll_policy='never' - } - warp_list.vertical_scroll_policy = 'auto' - warp_list.style.maximal_height = 150 - local table = warp_list.add{ - type='table', - column_count=2 - } - for name,warp in pairs(global.warps) do - if not warp.tag or not warp.tag.valid then - warp.tag = player.force.add_chart_tag(game.surfaces[warp.surface],{ - position=warp.position, - text='Warp: '..name, - icon={type='item',name=warp_item} - }) - end - table.add{ - type='label', - caption=name, - style='caption_label' - } - local _flow = table.add{ - type='flow', - name=name - } - local btn = go_to_warp(_flow) - btn.style.height = 20 - btn.style.width = 20 - if not Role and player.admin and name ~= 'spawn' or Role and Role.allowed(player,'make-warp') and name ~= 'spawn' then - local btn = remove_warp(_flow) - btn.style.height = 20 - btn.style.width = 20 - end - end - local cooldown = global.cooldowns[player.index] or 0 - if cooldown > 0 then frame.style.visible = false return - elseif not Role and player.admin or Role and Role.allowed(player,'always-warp') then return - elseif player.surface.get_tile(player.position).name == warp_tile - and player.surface.name == 'nauvis' - then return - elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then return - else frame.style.visible = false end - end, - can_open=function(player) - local cooldown = global.cooldowns[player.index] or 0 - if not Role and player.admin or Role and Role.allowed(player,'always-warp') then return true - elseif player.surface.get_tile(player.position).name == warp_tile - and player.surface.name == 'nauvis' - then return true - elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then return true - elseif cooldown > 0 then return {'WarpPoints.cooldown',cooldown} - else return {'WarpPoints.not-on-warp'} end - end, - open_on_join=true -} - --- Event Handlers Define -Event.add(defines.events.on_tick,function(event) - if not (event.tick % 60 == 0) then return end - for index,time in pairs(global.cooldowns) do - if time > 0 then - global.cooldowns[index] = time-1 - if global.cooldowns[index] == 0 then player_return({'WarpPoints.cooldown-zero'},defines.textcolor.low,index) end - end - end -end) - -Event.add(defines.events.on_player_changed_position, function(event) - local player = Game.get_player(event) - local cooldown = global.cooldowns[player.index] or 0 - local tile = player.surface.get_tile(player.position).name - if not Role and player.admin or Role and not Role.allowed(player,'always-warp') and cooldown == 0 then - if tile == warp_tile and player.surface.name == 'nauvis' then - ThisModule.Gui:open(player) - elseif player.position.x^2+player.position.y^2 < (warp_radius*spawn_warp_scale)^2 then - ThisModule.Gui:open(player) - else ThisModule.Gui:close(player) end - end -end) - -Event.add(defines.events.on_player_created, function(event) - if event.player_index == 1 then - local player = Game.get_player(event) - player.force.chart(player.surface, {{player.position.x - 20, player.position.y - 20}, {player.position.x + 20, player.position.y + 20}}) - local tag = player.force.add_chart_tag(player.surface,{ - position={0,0}, - text='Warp: spawn', - icon={type='item',name=warp_item} - }) - global.warps['spawn'] = {tag=tag,surface=player.surface.index,position={x=0,y=0}} - end -end) - --- Module Return -return ThisModule \ No newline at end of file diff --git a/old/modules/DONE/WarpPoints/locale/de.cfg b/old/modules/DONE/WarpPoints/locale/de.cfg deleted file mode 100644 index fac81895..00000000 --- a/old/modules/DONE/WarpPoints/locale/de.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[WarpPoints] -name=Warp List -tooltip=Die Liste mit den Warp-Punkten -remove-tooltip=Entferne Warp-Punkt -go-to-tooltip=Gehe zu Warp-Punkt -cooldown=Warte, bis der Cooldown abgelaufen ist. Verbleibende Zeit: __1__ -cooldown-zero=Dein Cooldown ist abgelaufen, du kannst jetzt wieder Warp-Punkte verwenden. -name-used=Dieser Name ist schon vergeben. -not-on-warp=Du bist nicht auf einem Warp-Punkt. Gehe auf einen Warp-Punkt, um zu einem anderen zu springen. \ No newline at end of file diff --git a/old/modules/DONE/WarpPoints/locale/en.cfg b/old/modules/DONE/WarpPoints/locale/en.cfg deleted file mode 100644 index 0f517e6e..00000000 --- a/old/modules/DONE/WarpPoints/locale/en.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[WarpPoints] -name=Warp List -tooltip=A list of warp points. -remove-tooltip=Remove Warp point -go-to-tooltip=Go To -cooldown=You must wait for the cooldown. Time left: __1__ -cooldown-zero=Your cooldown has expired, You can use warp points again. -name-used=That name is already taken. -too-close=You are too close to an existing warp point to make a new one. -not-on-warp=You are not on a warp point right now, you must be on a warp point to go to one. \ No newline at end of file diff --git a/old/modules/DONE/WarpPoints/locale/fr.cfg b/old/modules/DONE/WarpPoints/locale/fr.cfg deleted file mode 100644 index b15a3345..00000000 --- a/old/modules/DONE/WarpPoints/locale/fr.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[WarpPoints] -name=Warp List -tooltip=A list of warp points. -remove-tooltip=Remove Warp Point -go-to-tooltip=Go To -cooldown=You Must Wait For The Cooldown, Time Left: __1__ -cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. -name-used=That Name Is Already Taken -not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file diff --git a/old/modules/DONE/WarpPoints/locale/nl.cfg b/old/modules/DONE/WarpPoints/locale/nl.cfg deleted file mode 100644 index b15a3345..00000000 --- a/old/modules/DONE/WarpPoints/locale/nl.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[WarpPoints] -name=Warp List -tooltip=A list of warp points. -remove-tooltip=Remove Warp Point -go-to-tooltip=Go To -cooldown=You Must Wait For The Cooldown, Time Left: __1__ -cooldown-zero=You Cooldown Has Expired, YOu Can Use Warp Points Again. -name-used=That Name Is Already Taken -not-on-warp=You Are Not On A Warp Point Right Now, You Must Be On A Warp Point To Go To One. \ No newline at end of file diff --git a/old/modules/DONE/WarpPoints/locale/sv-SE.cfg b/old/modules/DONE/WarpPoints/locale/sv-SE.cfg deleted file mode 100644 index afbdb799..00000000 --- a/old/modules/DONE/WarpPoints/locale/sv-SE.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[WarpPoints] -name=Warp-lista -tooltip=En lista över Warp-punkter. -remove-tooltip=Ta bort Warp-punkt -go-to-tooltip=Gå till -cooldown=Du måste vänta på nedräkningen. Tid kvar: __1__ -cooldown-zero=Din nedräkningstimer har gått ut, så nu kan du använda Warp-punkter igen. -name-used=Det namnet är redan taget. -not-on-warp=Du är inte på en Warp-punkt just nu, för att gå till en Warp-punkt måste du befinna dig på en. diff --git a/old/modules/DONE/WarpPoints/softmod.json b/old/modules/DONE/WarpPoints/softmod.json deleted file mode 100644 index 82df5531..00000000 --- a/old/modules/DONE/WarpPoints/softmod.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "WarpPoints", - "version": "4.0.0", - "description": "Creates a warp point system which makes moving around large maps easier.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Warps", - "System", - "Teleport", - "PAX" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": { - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Role": "?^4.0.0", - "ExpGamingCore.Command": "?^4.0.0", - "ExpGamingCore.Gui": "^4.0.0" - }, - "submodules": {} -} diff --git a/old/modules/DONE/WarpPoints/src/commands.lua b/old/modules/DONE/WarpPoints/src/commands.lua deleted file mode 100644 index 9fe0e436..00000000 --- a/old/modules/DONE/WarpPoints/src/commands.lua +++ /dev/null @@ -1,21 +0,0 @@ -local warp_min_distance = warp_min_distance^2 -local warps = warps -local self = self - -commands.add_command('make-warp', 'Make a warp point at your location', { - ['name']={true,'string-inf'} -}, function(event,args) - if not game.player then return end - local position = game.player.position - local name = args.name - if name:len() > 40 then player_return({'ExpGamingCore_Command.error-string-len',40},defines.textcolor.med) return commands.error end - if game.player.gui.top[name] then player_return({'WarpPoints.name-used'},defines.textcolor.med) return commands.error end - if warps.warps[name] then player_return({'WarpPoints.name-used'},defines.textcolor.med) return commands.error end - for name,warp in pairs(warps.warps) do - local dx = position.x-warp.position.x - local dy = position.y-warp.position.y - if dx^2 + dy^2 < warp_min_distance then player_return({'WarpPoints.too-close'},defines.textcolor.med) return commands.error end - end - -- to do add a test for all warps - self.make_warp_point(position,game.player.surface,game.player.force,name) -end) \ No newline at end of file diff --git a/old/modules/DONE/WarpPoints/src/warp_entities.lua b/old/modules/DONE/WarpPoints/src/warp_entities.lua deleted file mode 100644 index 8944daf4..00000000 --- a/old/modules/DONE/WarpPoints/src/warp_entities.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - {'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} -} \ No newline at end of file diff --git a/old/modules/DONE/WarpPoints/src/warp_tiles.lua b/old/modules/DONE/WarpPoints/src/warp_tiles.lua deleted file mode 100644 index 01d7b6af..00000000 --- a/old/modules/DONE/WarpPoints/src/warp_tiles.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - {-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} -} \ No newline at end of file diff --git a/old/modules/DONE/WornPaths/control.lua b/old/modules/DONE/WornPaths/control.lua deleted file mode 100644 index 0459de26..00000000 --- a/old/modules/DONE/WornPaths/control.lua +++ /dev/null @@ -1,105 +0,0 @@ ---- Makes paths which wear down and paths where entities are placed. --- @module WornPaths@^4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Game = require('FactorioStdLib.Game') - --- Local Variables -local entities = require(module_path..'/src/entites') -local paths = require(module_path..'/src/paths') -for _,value in pairs(paths) do value[1]=-1/value[1] end -local placed_paths = require(module_path..'/src/placed') - -local adjacency_boost = 2 -- makes paths more likely to be next to each other; must be greater than 0 -adjacency_boost = 10/adjacency_boost -- dont change this line - --- Module Define -local module_verbose = false -local ThisModule = {} - --- Global Define -local global = {} -Global.register(global,function(tbl) global = tbl end) - --- Function Define -local function global_key(surface,pos) - return 'S'..surface.name..'X'..math.floor(pos.x)..'Y'..math.floor(pos.y) -end - ---- Downgrades a tile in this position --- @usage ThisModule.down_grade(surface,{x=10,y=10}) --- @tparam surface surface the surface the tile is on --- @tparam table pos the position of the tile to change -function ThisModule.down_grade(surface,pos) - local tile = surface.get_tile(pos).name - local new_tile = paths[tile][2] - if new_tile == 'world-gen' then - new_tile = global[global_key(surface,pos)] or 'grass-1' - end - surface.set_tiles{{name=new_tile,position=pos}} -end - --- Event Handlers Define -Event.add({defines.events.on_player_built_tile,defines.events.on_robot_built_tile}, function(event) - local surface = event.surface_index and game.surfaces[event.surface_index] or event.robot and event.robot.surface - local old_tiles = event.tiles - for _,old_tile in pairs(old_tiles) do - if not placed_paths[old_tile.old_tile.name] and old_tile.old_tile.name ~= 'water' and old_tile.old_tile.name ~= 'deepwater' then - global[global_key(surface,old_tile.position)]=old_tile.old_tile.name -- not a mistake, this makes it have demising returns - end - end -end) - -Event.add(defines.events.on_player_changed_position, function(event) - local player = Game.get_player(event) - if not player or not player.valid or game.tick < 10 then return end - if player.afk_time > 300 then return end - local surface = player.surface - local pos = player.position - local tile_name = surface.get_tile(pos).name - if not paths[tile_name] then return end - local count = -9 -- this value is important - for x = -1,1 do for y = -1,1 do - local _pos = {pos.x+x,pos.y+y} - if placed_paths[tile_name] and not placed_paths[surface.get_tile(_pos).name] - or surface.get_tile(_pos).name == paths[tile_name][2] - then count=count+1 end - end end - local chance = paths[tile_name][1]/(count-adjacency_boost) - if math.random() < chance then - ThisModule.down_grade(surface,pos) - end -end) - -Event.add({defines.events.on_built_entity,on_robot_built_entity}, function(event) - local entity = event.created_entity - local surface = entity.surface - if entities[entity.name] then - local box = entity.prototype.collision_box - for x = box.left_top.x,box.right_bottom.x do for y = box.left_top.y,box.right_bottom.y do - local pos = {x=entity.position.x+x,y=entity.position.y+y} - local tile = surface.get_tile(pos).name - if paths[tile] then ThisModule.down_grade(surface,pos) end - end end - end -end) --- Module Return --- when called it will downgrade a tile -return setmetatable(ThisModule,{__call=function(self,...) self.down_grade(...) end}) - ---[[ -/interface -local tile_name = surface.get_tile(position).name -if not paths[tile_name] then return end -local count = -9 -- this value is important -for x = -1,1 do for y = -1,1 do - local _pos = {position.x+x,position.y+y} - if placed_paths[tile_name] and not placed_paths[surface.get_tile(_pos).name] - or surface.get_tile(_pos).name == paths[tile_name][2] - then count=count+1 end -end end -return paths[tile_name][1]/(count-adjacency_boost) -]] \ No newline at end of file diff --git a/old/modules/DONE/WornPaths/softmod.json b/old/modules/DONE/WornPaths/softmod.json deleted file mode 100644 index 1b1a489a..00000000 --- a/old/modules/DONE/WornPaths/softmod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "WornPaths", - "version": "4.0.0", - "description": "Makes paths which wear down and paths where entites are placed.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Paths", - "Worn", - "Decay", - "Degrade" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": { - "FactorioStdLib.Game": "^0.8.0" - }, - "submodules": {} -} diff --git a/old/modules/DONE/WornPaths/src/entites.lua b/old/modules/DONE/WornPaths/src/entites.lua deleted file mode 100644 index 6ee6868b..00000000 --- a/old/modules/DONE/WornPaths/src/entites.lua +++ /dev/null @@ -1,31 +0,0 @@ -return { - ['stone-furnace']=true, - ['steel-furnace']=true, - ['electric-furnace']=true, - ['assembling-machine-1']=true, - ['assembling-machine-2']=true, - ['assembling-machine-3']=true, - ['beacon']=true, - ['centrifuge']=true, - ['chemical-plant']=true, - ['oil-refinery']=true, - ['storage-tank']=true, - ['nuclear-reactor']=true, - ['steam-engine']=true, - ['steam-turbine']=true, - ['boiler']=true, - ['heat-exchanger']=true, - ['stone-wall']=true, - ['gate']=true, - ['gun-turret']=true, - ['laser-turret']=true, - ['flamethrower-turret']=true, - ['radar']=true, - ['lab']=true, - ['big-electric-pole']=true, - ['substation']=true, - ['rocket-silo']=true, - ['pumpjack']=true, - ['electric-mining-drill']=true, - ['roboport']=true -} \ No newline at end of file diff --git a/old/modules/DONE/WornPaths/src/paths.lua b/old/modules/DONE/WornPaths/src/paths.lua deleted file mode 100644 index a41a7dfc..00000000 --- a/old/modules/DONE/WornPaths/src/paths.lua +++ /dev/null @@ -1,27 +0,0 @@ -return { - -- ['tile name'] = {health,convert to} - -- the greater health is the lower the chance it will be down graded, must be grater than 0 - ['refined-concrete']={70,'concrete'}, - ['refined-hazard-concrete-right']={70,'hazard-concrete-right'}, - ['refined-hazard-concrete-left']={70,'hazard-concrete-left'}, - ['concrete']={50,'stone-path'}, - ['hazard-concrete-right']={50,'stone-path'}, - ['hazard-concrete-left']={50,'stone-path'}, - ['stone-path']={40,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player - ['sand-1']={5,'sand-2'}, - ['sand-2']={10,'sand-3'}, - ['sand-3']={5,'red-desert-3'}, - ['red-desert-3']={5,'red-desert-2'}, - ['red-desert-2']={10,'dirt-1'}, - ['grass-2']={5,'grass-1'}, - ['grass-1']={5,'grass-3'}, - ['grass-3']={10,'red-desert-0'}, - ['red-desert-0']={5,'red-desert-1'}, - ['red-desert-1']={10,'dirt-1'}, - ['dirt-1']={5,'dirt-2'}, - ['dirt-2']={5,'dirt-3'}, - ['dirt-3']={10,'dirt-4'}, - ['dirt-4']={5,'dirt-5'}, - ['dirt-5']={5,'dirt-6'}, - ['grass-4']={10,'dirt-4'} -} \ No newline at end of file diff --git a/old/modules/DONE/WornPaths/src/placed.lua b/old/modules/DONE/WornPaths/src/placed.lua deleted file mode 100644 index 2fb909b1..00000000 --- a/old/modules/DONE/WornPaths/src/placed.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - ['refined-concrete']=true, - ['refined-hazard-concrete-right']=true, - ['refined-hazard-concrete-left']=true, - ['concrete']=true, - ['hazard-concrete-right']=true, - ['hazard-concrete-left']=true, - ['stone-path']=true -} \ No newline at end of file diff --git a/old/modules/DeconControl/control.lua b/old/modules/DeconControl/control.lua deleted file mode 100644 index 2976cb33..00000000 --- a/old/modules/DeconControl/control.lua +++ /dev/null @@ -1,72 +0,0 @@ ---- Allows control over decon rights, if ExpGamingCore.Role is not installed it will allow admins to instant remove trees and thats it. --- @module DeconControl@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Game = require('FactorioStdLib.Game') -local Server = require('ExpGamingCore.Server') -local Role -- ExpGamingCore.Role@^4.0.0 -local Admin -- ExpGamingAdmin@^4.0.0 - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end - if loaded_modules['ExpGamingAdmin'] then Admin = require('ExpGamingAdmin') end - end -} - --- Event Handlers Define -Event.register(-1,function(event) - Server.new_thread{ - name='tree-decon', - data={trees={},cache={},clear=0} - }:on_event('tick',function(self) - local trees = self.data.trees - if self.data.clear ~= 0 and self.data.clear < game.tick then self.data.cache = {} self.data.clear = 0 end - if #trees == 0 then return end - for i = 0,math.ceil(#trees/10) do - local tree = table.remove(trees,1) - if tree and tree.valid then tree.destroy() end - end - end):on_event(defines.events.on_marked_for_deconstruction,function(self,event) - local cache = self.data.cache[event.player_index] - if not cache then - local player = Game.get_player(event) - if not player then return end - if not Role then - if player.admin then self.data.cache[event.player_index] = {'tree-decon',false} - else self.data.cache[event.player_index] = {'decon',false} end - else - if Role.allowed(player,'tree-decon') then self.data.cache[event.player_index] = {'tree-decon',false} - elseif not Role.allowed(player,'decon') then self.data.cache[event.player_index] = {'no-decon',false} - else self.data.cache[event.player_index] = {'decon',false} end - end - cache = self.data.cache[event.player_index] - end - if not event.entity.last_user or event.entity.name == 'entity-ghost' then - if cache[1] == 'tree-decon' then - table.insert(self.data.trees,event.entity) - self.data.clear = game.tick + 10 - end - else - if cache[1] == 'no-decon' then - event.entity.cancel_deconstruction('player') - if not cache[2] then - cache[2] = true - local player = Game.get_player(event) - player_return({'DeconControl.player-print'},defines.textcolor.crit,player) - Role.print(Role.meta.groups.Admin.lowest,{'DeconControl.rank-print',player.name},defines.textcolor.info) - if Admin then Admin.give_warning(player,'','Trying To Decon The Base') end - end - self.data.clear = game.tick + 10 - end - end - end):open() -end) - --- Module Return -return ThisModule \ No newline at end of file diff --git a/old/modules/DeconControl/locale/de.cfg b/old/modules/DeconControl/locale/de.cfg deleted file mode 100644 index efab5765..00000000 --- a/old/modules/DeconControl/locale/de.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[DeconControl] -player-print=Du darfst dies noch nicht entfernen. Du benötigst dazu den Rang Regular, den du nach 3 Stunden auf dem Server automatisch erhältst. -rank-print=__1__ versuchte etwas zu entfernen. \ No newline at end of file diff --git a/old/modules/DeconControl/locale/en.cfg b/old/modules/DeconControl/locale/en.cfg deleted file mode 100644 index 556c1f3a..00000000 --- a/old/modules/DeconControl/locale/en.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[DeconControl] -player-print=You do not have permission to do this right now. You require the Regular rank which can be obtained through 3 hours of in-game playtime on a server. -rank-print=__1__ tried to deconstruct something. diff --git a/old/modules/DeconControl/locale/fr.cfg b/old/modules/DeconControl/locale/fr.cfg deleted file mode 100644 index 8eca4e13..00000000 --- a/old/modules/DeconControl/locale/fr.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[DeconControl] -player-print=You are not allowed to do this yet, You require the Regular rank, you must play for at least 3 hours -rank-print=__1__ tried to deconstruct something. \ No newline at end of file diff --git a/old/modules/DeconControl/locale/nl.cfg b/old/modules/DeconControl/locale/nl.cfg deleted file mode 100644 index bc857511..00000000 --- a/old/modules/DeconControl/locale/nl.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[DeconControl] -player-print=Je moet minstens 3 uur gespeeld hebben om dit uit te voeren. -rank-print=__1__ heeft geprobeerd iets te deconstrueren. diff --git a/old/modules/DeconControl/locale/sv-SE.cfg b/old/modules/DeconControl/locale/sv-SE.cfg deleted file mode 100644 index c8ad5cb7..00000000 --- a/old/modules/DeconControl/locale/sv-SE.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[DeconControl] -player-print=Du har inte tillåtelse med det här just nu. Du behöver ha rang "Regular" vilket kan uppnås genom 3 timmar inne i spelet (den här kartan) hos Explosive Gaming. -rank-print=__1__ försökte dekonstruera något. diff --git a/old/modules/DeconControl/softmod.json b/old/modules/DeconControl/softmod.json deleted file mode 100644 index 2f33a047..00000000 --- a/old/modules/DeconControl/softmod.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "DeconControl", - "version": "4.0.0", - "description": "Allows control over decon rights, if ExpGamingCore.Role is not installed it will allow admins to instant remove trees and thats it.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Trees", - "Decon", - "Protection", - "Admin", - "Tool", - "Report" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": { - "ExpGamingCore.Server": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingLib": "^4.0.0", - "ExpGamingAdmin.Warnings": "?^4.0.0", - "ExpGamingCore.Role": "?^4.0.0", - "ExpGamingAdmin": "?^4.0.0" - }, - "submodules": {} -} diff --git a/old/modules/ExpGamingCore/Server/control.lua b/old/modules/ExpGamingCore/Server/control.lua deleted file mode 100644 index 4de7da63..00000000 --- a/old/modules/ExpGamingCore/Server/control.lua +++ /dev/null @@ -1,562 +0,0 @@ ---- Adds a thread system and event listening and a admin bypass (recommend to disable /c and use optional /interface) --- @module ExpGamingCore.Server --- @alias Server --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - -local Game = require('FactorioStdLib.Game') -local Color = require('FactorioStdLib.Color') - -local Server = {} -local module_verbose = false --true|false - ---- Global Table --- @table global --- @field all a list of every thread (indexed by uuid) --- @field queue an index for threads which will be resolved (contains uuids) --- @field tick an index for threads which will run every tick (contains uuids) --- @field timeout an index for threads which will timeout (contains uuids) --- @field events an index of threads based on event ids (contains uuids) --- @field paused an index of paused threads (contains uuids) --- @field named a name index for thread uuids --- @field print_to contains players that event details will be printed to --- @field uuid contains the random number generator for the uuid system -local pre_load_uuid = 0 -local global = { - all={_n=0}, - queue={}, - tick={}, - timeout={}, - events={}, - paused={}, - named={}, - print_to={}, - uuid=0 -} -Global.register(global,function(tbl) global = tbl end) - ---- Used to generate a new uuid for the thread system --- @usage local uuid = tostring(Server.uuid) -- calling tostring locks the value --- @treturn string the new uuid -Server.uuid = add_metatable({},function() - -- when it is called as a function - local uuid - if game then - global.uuid=global.uuid+1 - uuid=global.uuid+pre_load_uuid - verbose('Game UUID Increased: '..global.uuid..' ('..uuid..')') - else - pre_load_uuid=pre_load_uuid+1 - uuid=pre_load_uuid - verbose('Load UUID Increased: '..pre_load_uuid..' ('..uuid..')') - end - return add_metatable({uuid},nil,function(tbl) return string.format("%x", tostring(tbl[1])) end) -end,function() - -- when it is treated as a string - return tostring(Server.uuid()) -end) - ---- Redirect to the thread index --- @usage Server.threads -- return #global.all --- @usage Server.threads -- return global.all --- @treturn[1] number the number of threads --- @treturn[2] table table of all threads -Server.threads = setmetatable({},{ - __metatable=false, - __call=function(tbl) return global.all._n end, - __len=function(tbl) return global.all._n end, - __index=function(tbl,key) return rawget(global.all,key) end, - __newindex=function(tbl,key,value) rawset(global.all,key,value) end, - __pairs=function(tbl) - local tbl = global.all - local function next_pair(tbl,key) - local k, v = next(tbl, key) - if type(v) ~= nil and k ~= '_n' then return k,v - else return next(tbl, k) end - end - return next_pair, tbl, nil - end -}) - ---- Generates a new thread object --- @usage Server.new_thread{name='foo',data={}} --- @tparam table obj the attributes to give to the thread --- @treturn Server._thread the new thread created -function Server.new_thread(obj) return Server._thread.create(obj) end - ---- Used to get a thread via uuid or name (if one is assigned) --- @usage Server.get_thread('decon') -- return thread --- @param mixed either a uuid or the name given to a thread --- @treturn[1] Server._thread the thread by that name or uuid --- @treturn[2] boolean if false is returned then no thread exists -function Server.get_thread(mixed) - local threads = global - if threads.named[mixed] then return threads.all[threads.named[mixed]] - elseif threads.paused[mixed] then return threads.all[threads.paused[mixed]] - elseif threads.all[mixed] then return threads.all[mixed] - else return false end -end - ---- Adds a thread into the resolve queue, can be used to lower lag --- @usage Server.queue_thread(thread) -- return true/false --- @tparam Server._thread thread_to_queue the thread to be added to the queue, must be open and have a on_resolve function --- @treturn boolean was it added successfully -function Server.queue_thread(thread_to_queue) - if not thread_to_queue and not thread_to_queue.valid and not thread_to_queue:valid() then return false end - if not thread_to_queue._resolve then return false end - table.insert(global.queue,thread_to_queue.uuid) - return true -end - ---- Closes all active threads, can use force if it causes errors --- @usage Server.close_all_threads() -- asks all threads to close --- @usage Server.close_all_threads(true) -- forcefully close all threads --- @tparam boolean with_force use force when closing -function Server.close_all_threads(with_force) - if not with_force then - for uuid,thread in pairs(Server.threads) do thread:close() end - else global.Server(true) end -- idk why you cant just use global even when global is defined at the top to be overridden -end - ---- Runs all the threads which have opened with an on_tick event --- @usage Server.run_tick_threads() -function Server.run_tick_threads() - table.each(global.tick,function(uuid) - local next_thread = Server.get_thread(uuid) - if next_thread and next_thread:valid() and next_thread._tick then - local success, err = Manager.sandbox(next_thread._tick,next_thread._env,next_thread) - if not success then next_thread:error(err) end - end - end) -end - ---- Checks the timeout on all active timeout threads --- @usage Server.check_timeouts() -function Server.check_timeouts() - table.each(global.timeout,function(uuid) - local next_thread = Server.get_thread(uuid) - if next_thread and next_thread:valid() then - next_thread:check_timeout() - end - end) -end - ---- Used to print event info to a player --- @usage Server._thread_debuger('Cooldude2606','on_player_died',true) -- will output event info to 'Cooldude2606' for 'on_player_died' --- @tparam ?name|index|LuaPlayer player the player that the info will be returned to --- @tparam ?name|index event the event that info will be returned fo --- @tparam[opt=toggle] boolean state will info be returned, nil to toggle current state -function Server._thread_debuger(player,event,state) - player = Game.get_player(player) - event = tonumber(event) or Manager.event.names[event] - local print_to = global.print_to - print_to[player.index] = print_to[player.index] or {} - if state then print_to[player.index][event] = state - elseif print_to[player.index][event] then print_to[player.index][event] = false - else print_to[player.index][event] = true end -end - ---- Calls all threads on a certain game event (used with Event.add) --- @local Server._thread_handler --- @usage Event.add(defines.events,Server._thread_handler) -- adds this handler --- @tparam table event the event that is called -function Server._thread_handler(event) - -- returns to players who have set _thread_debuger to true - table.each(global.print_to,function(print_to,player_index,event) - if event.name == defines.events.on_tick then return true end - if print_to[event.name] then - player_return(event,defines.textcolor.bg,player_index) - end - end,event) - -- gets the thread uuids - local event_id = event.name - local threads = global.events[event_id] - if not threads then return end - -- loops over the uuids - table.each(threads,function(uuid) - local thread = Server.get_thread(uuid) - if thread and thread:valid() then - if is_type(thread._events[event_id],'function') then - -- runs the function in the same env it was created (avoids desyncs) - local success, err = Manager.sandbox(thread._events[event_id],thread._env,thread,event) - -- if there is an error it asks the thread to deal with it - if not success then thread:error(err) end - end - end - end) -end - ---[[ cant be used V ---- Adds a event handler to tell threads about events --- @usage Server.add_thread_handler(defines.event) --- @tparam number event the event to run the thread handler on` --- @treturn boolean if the handler was added -function Server.add_thread_handler(event) - if not is_type(event,'number') then return false end - local threads = global - if not threads.events[event] then - threads.events[event] = {} - Event.add(event,Server._thread_handler) - return true - end - return false -end -]] - ---- Acts as a bypass for running functions, can accept a string --- @usage Server.interface('local x = 1+1 print(x) return x') -- return 2 --- @usage Server.interface('local x = 1+1 print(x)',true) -- will create a thread to run as root (this is the bypass) --- @tparam function ?string|function callback to be ran --- @tparam[opt] ?Server._thread|true use_thread run the command on a pre-made thread or let it make its own --- @tparam[opt] table env run the env to run the command in must have _env key as true to be --- @param[opt] ... any args you want to pass to the function --- @treturn[1] boolean if no thread then it will return a true for the success --- @return[1] if no thread then it will return the value(s) returned by the callback --- @treturn[2] boolean if no thread then it will return a false for the success --- @treturn[2] string if no thread then it will return a an err value -function Server.interface(callback,use_thread,env,...) - if use_thread then - -- if use_thread is true then it makes a new thread - if use_thread == true then use_thread = Server.new_thread{data={callback,env,...}} end - -- creates the resolve function for the thread - use_thread:on_event('resolve',function(thread) - local thread_callback = table.remove(thread.data,1) - thread_callback = is_type(thread_callback,'function') and thread_callback or loadstring(thread_callback) - local thread_env = table.remove(thread.data,1) - if is_type(thread_env,'table') and not is_type(thread_env.__self,'userdata') and thread_env._env == true then - local success, err = Manager.sandbox(thread_callback,thread_env,unpack(thread.data)) - if not success then error(err) end - return err - else - local success, err = Manager.sandbox(thread_callback,{},env,unpack(thread.data)) - if not success then error(err) end - return err - end - end) - -- opens the thread and then queues it - use_thread:open() - Server.queue_thread(use_thread) - else - local _callback = callback - if not is_type(callback,'function') then - local rtn, err = loadstring(callback) - if err then return false, err end - _callback = rtn - end - if is_type(env,'table') and not is_type(env.__self,'userdata') and env._env == true then - local success, err = Manager.sandbox(_callback,env,...) - if not success then return success,err - else return success, unpack(err) end - else - local success, err = Manager.sandbox(_callback,{},env,...) - if not success then return success,err - else return success, unpack(err) end - end - end -end - ---- The class for the server threads, allows ability to run async function --- @type Thread --- @alias Server._thread --- @field name the name that is given to the thread, use for easy later indexing --- @field timeout the time in ticks that the thread will have before it times out --- @field reopen when true the thread will reopen itself until set to false, combine with timeout to create a long on_nth_tick wait --- @field data any data that the thread will be able to access -Server._thread = {} - -local _env_metatable = { - __index=function(tbl,key) if rawget(tbl,'_modules') and tbl._modules[key] then return require(tbl._modules[key]) else return rawget(_G,key) end end -} - ---- Returns a new thread object --- @usage new_thread = thread:create() --- @tparam[opt={}] table obj all values are opt {timeout=int,name=str,data=any} --- @treturn Server._thread the new thread object -function Server._thread.create(obj) - obj = obj or {} - setmetatable(obj,{__index=Server._thread}) - obj.uuid = tostring(Server.uuid) - -- creates a variable containing all upvalus for the thread (stops desyncs) - obj._env = get_upvalues(2) - obj._env._env = true - obj._env._ENV = nil -- prevents infinite recursion - -- removes any modules from the _env to save space in global (less time to serialize) - obj._env._modules = {} - for name,value in pairs(obj._env) do - if is_type(value,'table') and value._moduleName and loaded_modules[value._moduleName] == value then - obj._env._modules[name] = value._moduleName obj._env[name] = nil - end - end - setmetatable(obj._env,_env_metatable) - local name = obj.name or 'Anon' - verbose('Created new thread: '..name..' ('..obj.uuid..')') - return obj -end - ---- Opens and queues a thread --- @usage Server._thread:queue() -- returns true/false --- @treturn boolean was the thread queued successfully --- @see Server.queue_thread -function Server._thread:queue() - self:open() - return Server.queue_thread(self) -end - ---- Test if the thread has all required parts --- @usage if thread:valid() then end -- basic test for valid --- @tparam[opt=false] boolean skip_location_check true to skip the location checking --- @treturn boolean is the thread valid -function Server._thread:valid(skip_location_check) - skip_location_check = skip_location_check or false - if is_type(self.uuid,'string') and - skip_location_check or is_type(self.opened,'number') and - skip_location_check or is_type(global.all[self.uuid],'table') and - is_type(self.timeout) or is_type(self.timeout,'number') and - is_type(self.name) or is_type(self.name,'string') and - is_type(self._close) or is_type(self._close,'function') and - is_type(self._timeout) or is_type(self._timeout,'function') and - is_type(self._tick) or is_type(self._tick,'function') and - is_type(self._resolve) or is_type(self._resolve,'function') and - is_type(self._success) or is_type(self._success,'function') and - is_type(self._error) or is_type(self._error,'function') then - -- all above must be true to be valid, must accept nil and function - return true - end - return false -end - ---- Opens the thread; indexes this thread in the global index --- @usage thread:open() -- return true --- @treturn boolean if the thread was opened successfully -function Server._thread:open() - -- if the thread is valid and not already opened - if not self:valid(true) or self.opened then return false end - local uuid = self.uuid - -- sets the thread to open, this is the tick it was opened - self.opened = game.tick - -- creates the global index - global.all[uuid] = global.all[uuid] or self - global.all._n = global.all._n+1 - -- indexes the thread in other places if it has more function - -- if it was paused before (ie did not run any events) then the index is removed from the paused index - if global.paused[self.name] then global.paused[self.name] = nil end - -- if it has a timeout or on_tick handler then it is indexed in those indexes - if is_type(self.timeout,'number') then table.insert(global.timeout,uuid) end - if is_type(self._tick,'function') then table.insert(global.tick,uuid) end - -- if the thread is given a name then a index from the name to uuid is made - if is_type(self.name,'string') then global.named[self.name] = global.named[self.name] or self.uuid end - -- if there are event handlers then it will loop over them and add them to the event index - if is_type(self._events,'table') then - table.each(self._events,function(callback,event,global,uuid) - -- cant be used V - --Server.add_thread_handler(event) - if not global.events[event] then global.events[event] = {} end - table.insert(global.events[event],uuid) - end,global,self.uuid) - end - local name = self.name or 'Anon' - verbose('Opened thread: '..name..' ('..self.uuid..')') - return true -end - ---- Inverse of thread:open() - Removes all indexes to this thread, most cases this will cause it to become inaccessible --- @usage thread:close() -- return true --- @treturn boolean if the thread had a on_close function -function Server._thread:close() - local uuid = self.uuid - local _return = false - -- if there is a call to the threads on close event, will later return true - if is_type(self._close,'function') then Manager.sandbox(self._close,self._env,self) _return = true end - -- will search every possible location for this thread and remove it - local _,key = table.find(global.queue,function(v,k,uuid) return v == uuid end,uuid) - if key then table.remove(global.queue,key) end -- queue - _,key = table.find(global.timeout,function(v,k,uuid) return v == uuid end,uuid) - if key then table.remove(global.timeout,key) end -- timeouts - _,key = table.find(global.tick,function(v,k,uuid) return v == uuid end,uuid) - if key then table.remove(global.tick,key) end -- on_tick - -- then will look for it in the event handlers and remove it if found - if is_type(self._events,'table') then - table.each(self._events,function(callback,event) - if global.events[event] then - local _,key = table.find(global.events[event],function(v,k,uuid) return v == uuid end,uuid) - if key then table.remove(global.events[event],key) end - -- cant be used V - --if #global.events[event] == 0 then Event.remove(event,Server.game_event) global.events[event] = nil end - end - end) - end - -- sets the thread to closed - self.opened=nil - -- unless the thread has a name or is assigned to be reopened - if self.reopen == true then self:open() else - -- if it has a name but not assigned to reopen then it will become 'paused' - if is_type(self.name,'string') then global.paused[self.name]=self.uuid - -- else it will just be wiped from the global index - else global.all[uuid] = nil global.all._n = global.all._n-1 end - end - local name = self.name or 'Anon' - verbose('Closed thread: '..name..' ('..self.uuid..')') - return _return -end - ---- Trigger the on_resolve function and closes the thread - error and success called based on result of pcall (useful for async) --- @usage thread:resolve(x,y,z) -- return true --- @param[opt] ... any arguments you want to pass to the resolve function --- @treturn boolean true if the thread called on_success or on_error -function Server._thread:resolve(...) - local _return = false - -- checks if the resolve handler is still present - if is_type(self._resolve,'function') then - local success, err = Manager.sandbox(self._resolve,self._env,self,...) - if success then - -- if it was successful then it will attempt to call the success handler - if is_type(self._success,'function') then - -- interface is used as a way to delay the success call till the next tick - Server.interface(function(thread,err) - local _success, _err = Manager.sandbox(thread._success,thread._env,thread,err) - if not _success then thread:error(_err) end - end,true,self,err) - -- later returns true if there was a call to the success handler - _return = true - end - -- if there is an error the thread is asked to deal with it, returns true/false based on result of handler - else _return = self:error(err) end - end - -- closes the thread as it is no longer needed as its command has be ran - self:close() - return _return -end - ---- Checks the timeout on a thread - if timed out then it calls on_timeout and closes --- @usage thread:check_timeout() -- return true --- @treturn boolean if the thread timed out -function Server._thread:check_timeout() - local _return = false - -- makes sure the thread is still valid - if not self:valid() then return false end - -- checks if the thread has been opened longer than its time out period - if is_type(self.timeout,'number') and game.tick >= (self.opened+self.timeout) then - if is_type(self._timeout,'function') then - -- we do not care if the time out has caused an error as it is in most cases an error in its own right - Manager.sandbox(self._timeout,self._env,self) - end - _return = true - -- closes the thread to prevent any further event calls - self:close() - end - return _return -end - ---- Used to check and raise the error handler of the thread, if not present it raises an error --- @usage thread:error(err) -- return true --- @tparam string err the err to be raised --- @treturn boolean did the thread have an error handler -function Server._thread:error(err) - local _return = false - if is_type(self._error,'function') then - Manager.sandbox(self._error,self._env,self,err) - _return = true - else - self:close() -- no matter what happens next this thread will be closed - local name = self.name or self.uuid - error('Thread Error (no handler) on <'..name..'>: '..err) - end - return _return -end - ---- Set function to run then an event is triggered, none of them are 'needed' but you are advised to have at least one --- @usage thread:on_event('close',function) -- if event is not one below then a game event is used --- @usage thread_only_events = ['close','timeout','tick','resolve','success','error'] --- @tparam function ?string|index event the name of the event that the should be called on --- @tparam function function callback the which is called by the event trigger --- @treturn table returns self so that they can be chained together -function Server._thread:on_event(event,callback) - local events = {'close','timeout','tick','resolve','success','error'} - -- searches the above list for the event - local value = table.find(events,function(v,k,find) return v == string.lower(find) end,event) - if value and is_type(callback,'function') then - -- if it is a thread_only_event then it will add it to its core values - self['_'..value] = callback - elseif is_type(event,'number') and is_type(callback,'function') then - -- other wise it is appended to the event index of the thread - if not self._events then self._events = {} end - self._events[event] = callback - end - -- returns self to allowing chaining of on_event():on_event():on_event() etc.. - return self -end - -Event.add(defines.events.on_tick,function(event) - -- uses its own on_tick event so that other actions can be tested for - if event.tick < 10 then return end - if #global.tick > 0 then Server.run_tick_threads() end -- on tick events - if #global.timeout > 0 then Server.check_timeouts() end -- timeout checks - if #global.queue > 0 then -- resolve one thread - local current_thread = global.all[global.queue[1]] - if current_thread and current_thread:valid() then current_thread:resolve() end - end -end) - -script.on_load(function(event) - -- sets up metatable again so that threads continue to work - for uuid,thread in pairs(Server.threads) do - setmetatable(thread,{__index=Server._thread}) - setmetatable(thread._env,_env_metatable) - end -end) - -function Server:on_init() - for name,id in pairs(defines.events) do if not script.get_event_handler(id) then Event.add(id,Server._thread_handler) end end - if loaded_modules['ExpGamingCore.Command'] then verbose('ExpGamingCore.Command is installed; Loading commands src') require(module_path..'/src/commands',{Server=Server}) end -end - -return Server - ---[[ - Thread Example: - - local thread = Server.new_thread{name='tree-decon',data={}} - -- user thread:on_event('tick') rather than thread:on_event(defines.events.on_tick) as it makes less lag - thread:on_event('tick',function(self) - local trees = self.data - if #trees == 0 then return end - local tree = table.remove(trees,1) - if tree.valid then tree.destroy() end - end) - thread:on_event('error',function(self,err) - -- cant see how this can cause an error - -- but this is where error handling goes - -- any event including on_resolve and on_tick can raise this - end) - thread:on_event(defines.events.on_marked_for_deconstruction,function(self,event) - if event.entity.type == 'tree' then - table.insert(self.data,event.entity) - end - end) - thread:open() - - local thread = Server.new_thread{name='print-place',data={}} - thread:on_event(defines.events.on_built_entity,function(self,event) - game.print('Events') - end) - thread:open() - - all on_event functions can be chained from the thread creation rather than use variables eg: - Server.new_thread{ - name='tree-decon', - data={} - }:on_event('tick',function(self) - local trees = self.data - if #trees == 0 then return end - local tree = table.remove(trees,1) - if tree.valid then tree.destroy() end - end):on_event('error',function(self,err) - -- cant see how this can cause an error - -- but this is where error handling goes - -- any event including on_resolve and on_tick can raise this - end):on_event(defines.events.on_marked_for_deconstruction,function(self,event) - if event.entity.type == 'tree' then - table.insert(self.data,event.entity) - end - end):open() -]] \ No newline at end of file diff --git a/old/modules/ExpGamingCore/Server/softmod.json b/old/modules/ExpGamingCore/Server/softmod.json deleted file mode 100644 index 7c0ef190..00000000 --- a/old/modules/ExpGamingCore/Server/softmod.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "ExpGamingCore.Server", - "version": "4.0.0", - "description": "Adds a thread system and event listening and a admin bypass (recommend to disable /c and use optional /interface)", - "location": "FSM_ARCHIVE", - "keywords": [ - "Library", - "Lib", - "ExpGaming", - "Core", - "Server", - "Thread", - "Interface", - "Events" - ], - "dependencies": { - "ExpGamingLib": "^4.0.0", - "FactorioStdLib.Table": "^0.8.0", - "FactorioStdLib.Color": "^0.8.0", - "FactorioStdLib.String": "^0.8.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Command": "?^4.0.0" - }, - "collection": "ExpGamingCore@4.0.0", - "submodules": {} -} diff --git a/old/modules/ExpGamingCore/Server/src/commands.lua b/old/modules/ExpGamingCore/Server/src/commands.lua deleted file mode 100644 index 4a0abf28..00000000 --- a/old/modules/ExpGamingCore/Server/src/commands.lua +++ /dev/null @@ -1,49 +0,0 @@ ---- Adds a thread system and event listening and a admin bypass (recommend to disable /c and use optional /interface) --- @submodule ExpGamingCore.Server --- @alias Server --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - ---- This file will be loaded when ExpGamingCore.Command is present --- @function _comment - -local Server = Server - -Server.interfaceCallbacks = {} -function Server.add_to_interface(loadAs,callback) Server.interfaceCallbacks[loadAs] = callback end - -function Server.add_module_to_interface(loadAs,moduleName) - local moduleName = moduleName or tostring(_G.moduleName) or nil - if not moduleName then error('No module name supplied for: '..loadAs,2) return end - Server.add_to_interface(loadAs,function() return require(moduleName) end) -end -Server.add_module_to_interface('Server','ExpGamingCore.Server') - ---- Runs the given input from the script --- @command interface --- @param code The code that will be ran -commands.add_command('interface','Runs the given input from the script', { - ['code']={true,'string-inf'} -}, function(event,args) - local callback = args.code - -- looks for spaces, if non the it will prefix the command with return - if not string.find(callback,'%s') and not string.find(callback,'return') then callback = 'return '..callback end - -- sets up an env for the command to run in - local env = {_env=true,} - if game.player then - env.player = game.player - env.surface = game.player.surface - env.force = game.player.force - env.position = game.player.position - env.entity = game.player.selected - env.tile = game.player.surface.get_tile(game.player.position) - end - -- adds custom callbacks to the interface - for name,custom_callback in pairs(Server.interfaceCallbacks) do env[name] = custom_callback() end - -- runs the function - local success, err = Server.interface(callback,false,env) - -- if there is an error then it will remove the stacktrace and return the error - if not success and is_type(err,'string') then local _end = string.find(err,':1:') if _end then err = string.sub(err,_end+4) end end - -- if there is a value returned that is not nill then it will return that value - if err or err == false then player_return(err) end -end) \ No newline at end of file diff --git a/old/modules/ExpGamingCore/Sync/control.lua b/old/modules/ExpGamingCore/Sync/control.lua deleted file mode 100644 index d7511518..00000000 --- a/old/modules/ExpGamingCore/Sync/control.lua +++ /dev/null @@ -1,338 +0,0 @@ ---- Allows syncing with an outside server and info panel. --- @module ExpGamingCore.Sync --- @alias Sync --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - -local Game = require('FactorioStdLib.Game') -local Color = require('FactorioStdLib.Color') - -local Sync = {} -local Sync_updates = {} -local module_verbose = false --true|false - ---- Global Table --- @table global --- @field server_name the server name --- @field server_description a short description of the server --- @field reset_time the reset time of the server --- @field time the last known irl time --- @field time_set the last in game time that the time was set --- @field last_update the last time that this info was updated --- @field time_period how often this information is updated --- @field players a list of different player related states --- @field ranks a list of player ranks --- @field rockets the number of rockets launched --- @field mods the mods which are loaded -local global = { - server_name='Factorio Server', - server_description='A factorio server for everyone', - reset_time='On Demand', - time='Day Mth 00 00:00:00 UTC Year', - date='0000/00/00', - time_set={0,'0.00M'}, - last_update={0,'0.00M'}, - time_period={18000,'5.00M'}, - game_speed=1.0, - players={ - online={}, - n_online=0, - all={}, - n_all=0, - admins_online=0, - afk_players={}, - times={} - }, - roles={admin={online={},players={},n_online=0,n_players=0},user={online={},players={},n_online=0,n_players=0}}, - rockets=0, - mods={'Offline'} -} -Global.register(global,function(tbl) global = tbl end) - ---- Player sub-table --- @table global.players --- @field online list of all players online --- @field n_online the number of players online --- @field all list of all player on or offline --- @field n_all the number of players who have joined the server --- @field admins_online the number of admins online --- @field afk_players the number of afk players --- @field times the play times of every player - ---- Used to standardise the tick format for any sync info --- @usage Sync.tick_format(60) -- return {60,'1.00M'} --- @treturn {number,string} table containing both the raw number and clean version of a time -function Sync.tick_format(tick) - if not is_type(tick,'number') then error('Tick was not given to Sync.tick_format',2) end - return {tick,tick_to_display_format(tick)} -end - ---- Prints to chat as if it were a player --- @usage Sync.print('Test','Cooldude2606') --- @tparam string player_message the message to be printed in chat --- @tparam string player_name the name of the player sending the message --- @tparam[opt] string player_tag the tag applied to the player's name --- @tparam[opt] string player_colour the colour of the message, either hex or named colour --- @tparam[opt] string prefix add a prefix before the chat eg [IRC] -function Sync.print(player_message,player_name,player_tag,player_colour,prefix) - if not player_message then error('No message given to Sync.print',2) end - local player = game.player or game.players[player_name] - local tag = player_tag and player_tag ~= '' and ' '..player_tag or '' - local colour = type(player_colour) == 'string' and player_colour or '#FFFFFF' - prefix = prefix and prefix..' ' or '' - -- if it is an in game player it will over ride the given params - if player then - tag = ' '..player.tag - colour = player.chat_color - player_name = player.name - else - -- converts colour into the accepted factorio version - if colour:find('#') then colour = Color.from_hex(colour) - else colour = defines.color[player_colour] end - end - game.print(prefix..player_name..tag..': '..player_message,colour) -end - ---- Outline of the parameters accepted by Sync.emit_embedded --- @table EmitEmbededParamaters --- @field title the tile of the embed --- @field color the color given in hex you can use Color.to_hex{r=0,g=0,b=0} --- @field description the description of the embed --- @field server_detail sting to add onto the pre-set server detail --- @field fieldone the filed to add to the embed (key is name) (value is text) (start value with <<inline>> to make inline) --- @field fieldtwo the filed to add to the embed (key is name) (value is text) (start value with <<inline>> to make inline) - ---- Logs an embed to the json.data we use a js script to add things we cant here --- @usage Sync.emit_embedded{title='BAN',color='0x0',description='A player was banned' ... } --- @tparam table table args a which contains everything that the embedded will use --- @see EmitEmbededParamaters -function Sync.emit_embedded(args) - if not is_type(args,'table') then error('Args table not given to Sync.emit_embedded',2) end - if not game then error('Game has not loaded',2) end - local title = is_type(args.title,'string') and args.title or '' - local color = is_type(args.color,'string') and args.color:find("0x") and args.color or '0x0' - local description = is_type(args.description,'string') and args.description or '' - local server_detail = is_type(args.server_detail,'string') and args.server_detail or '' - local mods_online = 'Mods Online: '..Sync.info.players.admins_online - -- creates the first field given for every emit - local done, fields = {title=true,color=true,description=true,server_detail=true}, {{ - name='Server Details', - value='Server Name: ${serverName} Online Players: '..#game.connected_players..' '..mods_online..' Server Time: '..tick_to_display_format(game.tick)..' '..server_detail - }} - -- for each value given in args it will create a new field for the embed - for key, value in pairs(args) do - if not done[key] then - done[key] = true - local f = {name=key,value='',inline=false} - -- if <> is present then it will cause the field to be inline if the previous - local value, inline = value:gsub("<>",'',1) - if inline > 0 then f.inline = true end - f.value = value - table.insert(fields,f) - end - end - -- forms the data that will be emitted to the file - local log_data = { - title=title, - description=description, - color=color, - fields=fields - } - game.write_file('embedded.json',table.json(log_data)..'\n',true,0) -end - ---- The error handle setup by sync to emit a discord embed for any errors --- @local here --- @function errorHandler --- @tparam string err the error passed by the err control -error.addHandler('Discord Emit',function(err) - if not game then return error(error()) end - local color = Color and Color.to_hex(defines.textcolor.bg) or '0x0' - Sync.emit_embedded{title='SCRIPT ERROR',color=color,description='There was an error in the script @Developers ',Error=err} -end) - ---- Used to get the number of admins currently online --- @usage Sync.count_admins() -- returns number --- @treturn number the number of admins online -function Sync.count_admins() - -- game check - if not game then return 0 end - local _count = 0 - for _,player in pairs(game.connected_players) do - if player.admin then _count=_count+1 end - end - return _count -end - ---- Used to get the number of afk players defined by 2 min by default --- @usage Sync.count_afk_times() --- @tparam[opt=7200] int time in ticks that a player is called afk --- @treturn number the number of afk players -function Sync.count_afk_times(time) - if not game then return 0 end - time = time or 7200 - local rtn = {} - for _,player in pairs(game.connected_players) do - if player.afk_time > time then rtn[player.name] = Sync.tick_format(player.afk_time) end - end - return rtn -end - ---- Used to get the number of players in each rank and currently online --- @usage Sync.count_roles() --- @treturn table contains the ranks and the players in that rank -function Sync.count_roles() - if not game then return {'Offline'} end - local _rtn = {admin={online={},players={}},user={online={},players={}}} - for index,player in pairs(game.players) do - if player.admin then - table.insert(_rtn.admin.players,player.name) - if player.connected then table.insert(_rtn.admin.online,player.name) end - else - table.insert(_rtn.user.players,player.name) - if player.connected then table.insert(_rtn.user.online,player.name) end - end - end - _rtn.admin.n_players,_rtn.admin.n_online=#_rtn.admin.players,#_rtn.admin.online - _rtn.user.n_players,_rtn.user.n_online=#_rtn.user.players,#_rtn.user.online - return _rtn -end - ---- Used to get a list of every player name with the option to limit to only online players --- @usage Sync.count_players() --- @tparam boolean online true will get only the online players --- @treturn table table of player names -function Sync.count_players(online) - if not game then return {'Offline'} end - local _players = {} - local players = {} - if online then _players = game.connected_players else _players = game.players end - for k,player in pairs(_players) do table.insert(players,player.name) end - return players -end - ---- Used to get a list of every player name with the amount of time they have played for --- @usage Sync.count_player_times() --- @treturn table table indexed by player name, each value contains the raw tick and then the clean string -function Sync.count_player_times() - if not game then return {'Offline'} end - local _players = {} - for index,player in pairs(game.players) do - _players[player.name] = Sync.tick_format(player.online_time) - end - return _players -end - ---- used to get the global list that has been defined, also used to set that list --- @usage Sync.info{server_name='Factorio Server 2'} -- returns true --- @usage Sync.info -- table of info --- @tparam[opt=nil] table set keys to be replaced in the server info --- @treturn boolean success was the data set -Sync.info = setmetatable({},{ - __index=global, - __newindex=global, - __call=function(tbl,set) - if not is_type(set,'table') then return false end - for key,value in pairs(set) do global[key] = value end - return true - end, - __pairs=function(tbl) - tbl = global - local function next_pair(tbl,key) - local k, v = next(tbl, key) - if type(v) ~= nil then return k,v end - end - return next_pair, tbl, nil - end, - __ipairs=function(tbl) - tbl = global - local function next_pair(tbl, i) - i = i + 1 - local v = tbl[i] - if v then return i, v end - end - return next_pair, tbl, 0 - end -}) - ---- Called to update values inside of the info --- @usage Sync.update() --- @return all of the new info -function Sync.update() - local info = Sync.info - info.time_period[2] = tick_to_display_format(info.time_period[1]) - info.last_update[1] = game.tick - info.last_update[2] = tick_to_display_format(game.tick) - info.game_speed = game.speed - info.players={ - online=Sync.count_players(true), - n_online=#game.connected_players, - all=Sync.count_players(), - n_all=#game.players, - admins_online=Sync.count_admins(), - afk_players=Sync.count_afk_times(), - times=Sync.count_player_times() - } - info.roles = Sync.count_roles() - info.rockets = game.forces['player'].get_item_launched('satellite') - for key,callback in pairs(Sync_updates) do info[key] = callback() end - return info -end - ---- Adds a callback to be called when the info is updated --- @usage Sync.add_update('players',function() return #game.players end) --- @tparam string key the key that the value will be stored in --- @tparam function function callback the which will return this value -function Sync.add_update(key,callback) - if game then return end - if not is_type(callback,'function') then return end - Sync_updates[key] = callback -end - ---- Outputs the curent server info into a file --- @usage Sync.emit_data() -function Sync.emit_data() - local info = Sync.info - game.write_file('server-info.json',table.json(info),false,0) -end - ---- Updates the info and emits the data to a file --- @usage Sync.emit_update() -function Sync.emit_update() - Sync.update() Sync.emit_data() -end - ---- Used to return and set the current IRL time; not very good need a better way to do this --- @usage Sync.time('Sun Apr 1 18:44:30 UTC 2018') --- @usage Sync.time -- string --- @tparam[opt=nil] string set the date time to be set --- @treturn boolean if the date time set was successful -Sync.time=add_metatable({},function(full,date) - local info = Sync.info - if not is_type(full,'string') then return false end - info.time = full - info.date = date - info.time_set[1] = Sync.tick_format(game.tick) - return true -end,function() local info = Sync.info return info.time..' (+'..(game.tick-info.time_set[1])..' Ticks)' end) - --- will auto replace the file every 5 min by default -Event.add('on_tick',function(event) - local time = Sync.info.time_period[1] - if (event.tick%time)==0 then Sync.emit_update() end -end) - -Event.add('on_player_joined_game',Sync.emit_update) -Event.add('on_pre_player_left_game',Sync.emit_update) -Event.add('on_rocket_launched',Sync.emit_update) - -function Sync:on_init() - if loaded_modules['ExpGamingCore.Gui'] then verbose('ExpGamingCore.Gui is installed; Loading gui src') require(module_path..'/src/gui',{Sync=Sync,module_path=module_path}) end - if loaded_modules['ExpGamingCore.Server'] then require('ExpGamingCore.Server').add_module_to_interface('Sync','ExpGamingCore.Sync') end -end - -function Sync:on_post() - Sync.info{mods=table.keys(loaded_modules)} -end - -return Sync \ No newline at end of file diff --git a/old/modules/ExpGamingCore/Sync/softmod.json b/old/modules/ExpGamingCore/Sync/softmod.json deleted file mode 100644 index c86e56dd..00000000 --- a/old/modules/ExpGamingCore/Sync/softmod.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "ExpGamingCore.Sync", - "version": "4.0.0", - "description": "Allows syncing with an outside server and info panle.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Library", - "Lib", - "ExpGaming", - "Core", - "Info", - "Sync", - "External", - "Discord" - ], - "dependencies": { - "ExpGamingLib": "^4.0.0", - "FactorioStdLib.Color": "^0.8.0", - "FactorioStdLib.Game": "^0.8.0", - "FactorioStdLib.Table": "^0.8.0", - "ExpGamingCore.Role": "?^4.0.0", - "ExpGamingCore.Gui": "?^4.0.0", - "ExpGamingCore.Server": "?^4.0.0" - }, - "collection": "ExpGamingCore@4.0.0", - "submodules": {} -} diff --git a/old/modules/ExpGamingCore/Sync/src/gui.lua b/old/modules/ExpGamingCore/Sync/src/gui.lua deleted file mode 100644 index 72c256dd..00000000 --- a/old/modules/ExpGamingCore/Sync/src/gui.lua +++ /dev/null @@ -1,106 +0,0 @@ ---- Allows syncing with an outside server and info panel. --- @submodule ExpGamingCore.Sync --- @alias Sync --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - ---- This file will be loaded when ExpGamingCore.Gui is present --- @function _comment - -local Gui = require('ExpGamingCore.Gui') -local Sync = Sync -- this is to force sync to remain in the ENV - -local Sync_gui_functions = {} -local logo_sprite_path = 'file'..string.sub(module_path,2)..'/src/logo.png' - ---- Adds a element to the sever info gui --- @usage Sync.add_to_gui('string') -- return true --- @param element see examples before for what can be used, it can also be a return from Gui.inputs.add --- @treturn boolean based on weather it was successful or not -function Sync.add_to_gui(element,...) - if game then return false end - if is_type(element,'function') then - table.insert(Sync_gui_functions,{'function',element,...}) - elseif is_type(element,'table') then - if element.draw then table.insert(Sync_gui_functions,{'gui',element}) - else table.insert(Sync_gui_functions,{'table',element}) end - else table.insert(Sync_gui_functions,{'string',element}) end - return true -end - -Sync.add_to_gui('Welcome to the Explosive Gaming community! This is one of many servers which we host.') -Sync.add_to_gui(function(player,frame) return 'This server\'s next reset: '..Sync.info.reset_time end) - ---- Formats a label to be a certain format --- @local label_format -local function label_format(label,width) - label.style.width = width - label.style.align = 'center' - label.style.single_line = false -end - ---- Creates a center gui that will appear on join --- @gui server-info -Sync.info_gui = Gui.center{ - name='server-info', - caption=logo_sprite_path, - tooltip='Basic info about the current server', - draw=function(self,frame) - frame.caption = '' - local info = Sync.info - frame = frame.add{type='flow',direction='vertical'} - local h_flow = frame.add{type='flow'} - h_flow.add{type='sprite',sprite=logo_sprite_path} - local v_flow = h_flow.add{type='flow',direction='vertical'} - h_flow.add{type='sprite',sprite=logo_sprite_path} - local _flow = v_flow.add{type='flow'} - label_format(v_flow.add{ - type='label', - caption=info.server_description,style='description_label' - },412) - Gui.bar(_flow,110) - label_format(_flow.add{ - type='label', - caption='Welcome To '..info.server_name, - style='caption_label' - },180) - Gui.bar(_flow,110) - Gui.bar(frame,600) - local _frame = frame - frame = frame.add{ - type='frame', - direction='vertical', - style='image_frame' - } - frame.style.width = 600 - local text_flow = frame.add{type='flow',direction='vertical'} - local button_flow = frame.add{type='table',column_count=3} - for _,element in pairs(table.deepcopy(Sync_gui_functions)) do - local _type = table.remove(element,1) - if _type == 'function' then - local success, err = pcall(table.remove(element,1),frame.player_index,frame,unpack(element)) - if not success then error(err) else - if is_type(err,'table') then - if element.draw then element:draw(button_flow).style.width = 195 - else label_format(text_flow.add{type='label',caption=err},585) end - else label_format(text_flow.add{type='label',caption=tostring(err)},585) end - end - elseif _type == 'gui' then element[1]:draw(button_flow).style.width = 195 - elseif _type == 'string' then label_format(text_flow.add{type='label',caption=tostring(element[1])},585) - elseif _type == 'table' then label_format(text_flow.add{type='label',caption=element[1]},585) end - end - _frame.add{ - type='label', - caption='Press Ecs or E to close; this is only visible once!', - style='fake_disabled_label' - }.style.font='default-small' -end} - -Event.add(defines.events.on_gui_click,function(event) - local element = event.element - if element and element.valid and element.caption and element.caption == 'Press Ecs or E to close; this is only visible once!' then - Gui.center.clear(event) - end -end) - -Event.add(defines.events.on_player_joined_game,function(event) Sync.info_gui(event) end) \ No newline at end of file diff --git a/old/modules/ExpGamingCore/Sync/src/logo.png b/old/modules/ExpGamingCore/Sync/src/logo.png deleted file mode 100644 index cef59c4d1f82ada58092f1d64480c7e8df6ced72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15942 zcmV-MKDoh(P)i7DS&CHzo@BKCK|6%z%c8o#7+#iOy z8-VR#ViJ6Gz%-iWb|zxgx9xL%&j;?*Rhc+M!6;i<{=x8w`B6KIU&-V^uzA1?m9!KH$TL=e-FZe+1mQ#@lO`{wHAfZzI6p zwev8T*10hKLj~vxa+S{(0le!2bBAr*GvMOAf&zLqz+oClCX%SFO~VY3V3;G;hqAp#Fcp@I&*Y^~Gd%lNau_RnVWN<|hLS$^4vdrV_O#if&xKV+M(GVdQ zATo>>;JG&$@2sBp?;zq|Mu5M|*e}B}W(lFK*kEanD3{6@9v%u15Fm#LF%1!4 zTygj~q0zw4+7f=N6}j2^I6^S&y$RR9$ar_n-~JUud|?ELe2<$q!!o}g0=}B+BNSis zfXjMHxPQQf&6kWPkV@Af9$%#a|arltm|nwky1 zr{g*p9?r@!M4}mR3D58A>q9&im+$$RTtW`sGj&j2oP}-Gv@#pvk6r1-QH&#H}=`k6d#MlP+#8w(=tW0@UNzDg@6)5mR1E3pdsINmR&!yy zg#V^kBO>zo97?5T2bghzPrEV{j-FDsLj9(*kZDm%vwQ zBgR`45n4&>o4Vd*#@nl}-V~9vNeJ+FANzZl*7S{u94gpftX1O1v*Ms^_dH+z@&)Va z>QIwT%Vl!eJc^}){F~GsT?CHfdIBsi4M2X+>k$E3IY-ay>+csz*2mLS^cJF(hmh z0sd~C4{wURUsQDcA9mTsr>-IPcp|Q-Wq5d4fS*X#2P+i zk90aMmK4QaA(spLqeQjO6JTPS~UpA8&LNb{Y;G2|MrXdIz7$gGJA_8iXBg!?303xrg ztu>V61Z?zN0jBQ@lBpl!am7spb8k;ih=4>QDfiKf&(_=97mB#rR1NCt>jg1fxm;F| zkV>UdlT65Qbnvp-EMS*$S$o|7No#xrewrJqk+2a?ST6!9WPY`M9|8VF-6h;L;CeCB zGUEhveZ7bPEmH>u2Zgd~>uST7&t!(h+R&@1sS&A~lu#HcpQ0vWNh$;cfZZ5NM<9&e zzJ54?n4vVI%qM3yH8l%25dm5mQ%p8BH;bqu5-6UiQ|jyLkVqy(K@$nZViEaV7LMn7 zKWMbf+d7j3y@JU4kgx%rFe(B9Yv&oc=z4%pd4Jr>B3{akDB7A-4eIOb#q=WrJl944 z0AHdW>9q1>34AIx0z+iIgzn-rm*@>kA-2J6gRx6hXEilSDy- zAd!g4^N^Fe*RGZCEh`pSLN*$knnX-iBS4$2e8!=nVR?4G#~vvYPfe^@S1(j^g5w=A znsu}e0>sX*iM=nT=6Zln+y3YkMZ8%EfX|l`r-`<`zN8^alnRi4wL<1+ZAumj1)+Fy z0G%%thfwEd1_n_q73JTQ&y5X@@T)xR%-|r(WgG2d+Sg%>VzGe1fdTnG7E1_{#o?pv zFVw0KAVgDFC*Cyu1g)1un+D=YE)wVtkZ?R#i~)^=ty30WnmCGbu0+CG6rCNb{e*Q9 zpq1_hfPeUkBHoVxKM_xaVrRr=SJn-wi;I*);ByfHl=-AG%5%{HsdQj1nK0-i83y|M z`%o?^QAH#)G&ae^(7ECZDsNL$5h<&#wicyw34?=~00F+}gk(x7-BO__ z76vU8nu!FIUb*aWU`17$k2)lw<@Y+|ANhg=&=&X&+KeUj4-I8dwjIz15Fk4)hBAX> z}G+S0<% zT%ge)UU8vNL~S}P=a$P3T-TA11ZhKm=I=uJrLqtKsak(FEdwnrtpTNaa-HF9R=jQ! z2tU{O4z@PSc)4G38$}e2f@w(?pOh^8G@Zv&Lmn187MdCwMJdx~pch?@1nPu&o7X7C zJesrSd2bqTt=>!1NQi(?@m2@b0^*~!!w9B$wxa-_7t|&ul@vupT{LKHE9qS;yLniXeua$Bi2&@6*%UBY&y1 zg{o=kL=>?&S0n;DYq2=mYLl2=U&IbE4;QT{V?{X#e<$K-PFOgjp@ew_3$w-m`+e*n zl}-yWL_;W}A>pVx)4z8@je_lHNQfxp5d`c$;W=3TSC#k)z7Bv-JO9j8wwRg(K5hJ# z=H`&{Lu>{LRNMJP0A)8hgD+pq=LKK~Bum&Y4O}-=hnQuE2r3l|s7a}ifL^IoQXDkx z_0p-MVio|KCW?i;a2It0^@2vg*p3dku6lFokZdj|Ar8lO=|^UE_Jwg+`7b z%kqJ>9X-x+@W{k6PX8!}+L{>N8!Tfjj54lkFJaGy1eWK@`1{%tp3b;<#g2<5Mg(0` zpU0ss3V3aC6MHTypxa1EQfRb5B99aAIh(Dpj-K6o6pvZQja+*wlR5zcIxj)Y{AEQV z#e`7B?o0Cmpkz&rC`nQ`sZuMiFx(qtqJ;GwXGGi>hQ#YNwLCnbjNMWuy2>7kWfwQ~ zs8GT9q=C9b3|1tr-(?&4C=VspBI>bXAtxahBAu2~n^(qLQ_{*us1`+zcPRsQ3IThKpATTiYSDAX>JlE$ zni5_}CTUVy0$3ei;ki^~%tYzfx`;j33t~M$%yrP2G_XzD!j~HjoYJWjreZ!OM5^+X zBSuhoSa-IJ4>Jz#?Q`*2-o@Sx77iJc#H6^7Z!Ib#<0}7yqAF@3kz%PZQ*iN%<}8kB zNdmmS!Z}cKPzVB?2}ha8RuIF2qaZd^vhil#!$0#LJ}(1r`E|&-%B!YT#c+lA2tnqK z;cp>ATZJtSNH}WqWXKS17UI zd-z9hS%AQG$yPy3$8$mCT)oD}yj)VOATFI9qos3ni;r0oEu={G)k`Bne;;+c^mhRw z^hdYs;L(hW-)3T1JX8|G7AI6<9j4?mNDMS8dab{f%0;>@V0dZLA}T9QRnm z-(&o*U>Uzql&K!&s-6;V=_BE>7!Aq9Z*L z-*VtGuE<~+IC!mN(qd9)~U{cDMU|Al27r4hj7`F4v7%IaB9j3*I~qq(_BtPBR+ zqS)Rh=3w7u#zj0VD)?B2B!1lJ;0NQi?5Chra(H2`gunHaQH;mYTlCOpyLcn(B2&|- z{0(}>hRP9eiLc<4uw?IA#A;OjK$h)e`o~2)x3+}in|;jOrWP@)GReck9M{I7uV>I$ zn?#%Gq3HUkH-RfACDBov7|{(pn5JdPMw)r+;Qp0ZS1CM-$-`Cv9~TWV0O;d{%lF`t zIO%tIF5aAy@+Za_Ak&=aKW&HtHjEuL^;7Xal3`X!Wwdxf>Hz+qwl;x4Ylv15#Skf* zNKl&JmPnyxnPAL>oUu(BcwsA=nE`tR&$n=>gu@q<;h0J`i_0I>0;OwfK_pY`>CiTj z!ThjMF06|H08g&SA!QmkJc?+$vi9n(&oa1lg$l;$_!Yg~7j{UBJ)n@Opz~5s5vO$- zi1`lot23~b;o-E-1RAKbqRaPj$;vY33{dVn;&?_Cv<}=cD!Yz@=KJp({+{EhfIEnQ zYU*cY25n=>WCZ|>CNcQbwPI-`1p&1GDWbS^NcfgXi4p1#fZv@fUj zAdeRG=iwL@hyaanBA66N2TZQ*dw6u)1P&M*;iz>;v+9eIgJ&}?&Rvuji%FT3N#Wd? zV+%N@y-HNs9=`T|7VqRdpMF)MOd_FIw zFq#V(Zh37|QWb&`&z|3H_+Oe(f(hYgP5p^v3Uw@svSMOU=u8%mi6TJP+|UZ5nHuGQ zwp0RpCCj*V%NnKZqRQ3)s93dDn^#eRSt-?6p{V(v%iNfKIP60zga5wjGHE7xLL^E+~fx-~}dqk_X}mG&D4d zZBMI*)TbQ|CR22bK8%+Wknsds(+M0~U&2>wfw2~_S;7J|wNzU=k%(sn&^#9lGbJo6 z0euA!IMfdA^Cjc&y8Mky&?E=@Z=L!nqiQ?v4bYdjl& z-@1%cdUPZd`V07A*u~F!l34AvK=A5m^rZ5`PR zX}EYf=VI1s2TNo16$S$%w6V<{|Wj3?sh<*V> z6dz6%9i|YlsOTDde_rzAR@`iEX%VdDa)l81JW>}l>DW8v91%dwQu%IS58?jJ-Q-$z()+r%m9wofDYSy#DgU zce@KXVtx^Z6+>%lON9v4M3e37!ArZRF{M6GzST&GB0zxeVJKI|yqu5cGcNu#;ER}M zQb~(w#>glY$N|ypA4N4eka-h{kqr)_ST1>wPfVC!sf{TFT-04M8SAIx)z;D~?8*Zf zLDbZ*iA@L9m_)CuSE;-)ehItz!>F+=EOBF))#+oirif)>us*1S|Lz7}9x_lct*pNh(^sWn z)n`5n6+f#)%B2Fn-)Mmq6@q~67w64xpVa{tS{drKEU~%Csygx*jnk9eSU1BsJ{=}z zsTd2Vr9ZVHiC4Cc0r8PAM4{~9#x*YH45*jZz-K;}rWw6RMh|I2vvN+Coy!Z6^@sZL z)b3F#MqbzRga>XL4wR{{>YYWi7)MQ11Z4n=V91!Rs5(*a$f#(No{Grdm zDlZ|XE9;#c*OwG4a~;%^bVgYi(A3mWnZ&0g^Sz(~uqfO}WlX}R&(i?cU%F-5HWu#M z=~4VJ*+K-gwYLibbW*#uwN(|;nkvH;t%vc{E!B&ZKU%!W@o?t+ zERJZ8;j8Vj5ujI}pR<7^-^dgrfPuZ&@;;uM$B z8%7BjEv5b{C+2KIy_oG^nB^TvUJ>HE+DXeGy+(y#znQq zU99cx5sFPF64*CwW6tEt=q8=6`qVw?YWdVG=4gSPt#SR#On)eaOli~(uUKqcJQ*DtKdy8XK+ z7I8pRM7Bm9E;>7rN|jAI27KE#43; zgMl}ek5jRd%_xG%Mv~JN8DCQ2)<#uDOm?DDVeJkbG0OhGP6=eGJbCbX(cskj5U`GD zaTSo(BVK4~p19P&`;HQ6-)XUN#ndiQCn+km`kSTJ1{UH-Y?-s7}3C> zq@Z)g&*Tmo6;j2`3|~`Ai%a>>ie}wWLM2P=>hkR<_E=4zLjt^Dd%j;XR40#5V4Ldj zZ`9+h20rr>0p;7KfvjQTtpNug5860wQWB|#z|@QawP>SIc5&`91Ft(HA?bSG#viw_ z*WrRp!NFHPFp(*_NShvB*wH|HDuzP73>00Y8WeXO@KFMTz9p4(tZ`~?QC!bOh1s*V zN0e+`Jr%7IUD@HRz=#NtSQxFf%%H@7B<)*e4Y9sec;0nUEEFVYX}h*32%!B>*+%6@ zyOx;b!zeR!gmrk)rZ{jyi-E5;$FWTksAqJrD$*J7>dFnl~Q0L<=h5P8korN*X4aYpr`6zEyoEwEux zuSNjH2&*tCrg?7JvBP|HSdkd~gXSo!|5zzV%SiVi&>v6;h$l>K|MSLFE+d^LL5-yE z;pj#mTbRBm)SWFKM~z9KHbK+QQb?!@xba$rl7r8St^oX#;j+l=n%a68>B^)E<4m-u zW^G~N#LZK9pxeb@33xo4!fz%OF-%DUd3 zUNOUU^j8Qruy8dO==xZSZ(5k^AfUdk-qcmi3iu4b8i-k@lx%a+;i3}BGK>W*wOu?jU}8bZz}tm5iY9xkOkq#D=?rO5E^|p&O2F1k@c(9P26uJ2 zc)rgO1Ar7Zqjm^S78|fSTR^E~qqa5`_LgZ~L@#r5qktFoQ%P}h%(JVCIDA|Up8PC} zW2QC;N0n_)EU@VxmM~bf@xDX9L-niCi)9N{N5|L-1n>hB?5z5uj%;iQ?m=Q59u7@* zsrX}3K4OZpmMNR3sjfU?>H>-(D(cM8pl6I7+vzin#`q6o8dScT`r|CX66L`ph973X z2t?LIGBog|rX=p2VuDo#jFZrTIeEDOFI_L!(_Sr2G2Qh-Ybx5K#Zp4;@Qrhauwcj$ zWU&B?R3~D{GBHRuzEld?UNz$>AH;K6(q6{wZ4x+kd{PkbM7NC>`+?iGG(?OM0e;EF z+>C)=F1LgjNcmD~BIPE^a$pl6%NdD$%>^0(d~WK%rl2%NBOsMx2T))k21UTU*5KfP z_yJtBt~3G|7h*%8vDxO6edc#{P)R3MbYB%CklHiV;ZxvLn4!kj80u&Z;t?zO9Ps$&XvgwiWp?lB-*I0tKf9$p%w*< zKGNFA4h^9^(1TaMltN?N6!CM){2ZRzuNg~w@)+m)SY;Ua(TZB+%%sSCX`hP6(b3r{ ze`)osUcE}*Sy#$Q8>{aL_i0hXV>S2k-KdOp4}-44)-6@MCKtVDhFZu0%n{IM2ob;l zoG!BEiHu!~h%ii1O!1(CfDb~dpzI?8emyCMTUM5^O??c#o{86oRf!*gOaxegSx5>c z_L~|<+Jx5jtd*KkmJ%i-ElM;1GQ&e5rAs}h545zj2xVG<_)?J4BH-d>PX?S#Tj&^8t}J5EwU1eGR3+{B;r!uPJnW01PIp!CbSljuEWmC zz(Z$J%T*&6D{ z0ket%yt3i$%Yc8&{?P%0JC)wLQ|Z2_cW2BxKe+q;0JnGzP4N4Qca{5!^W zR>YnLGZ`r}Y-LC$QZzgsF0mli?Q2+$6hHa~f+7UlGW*`!FlWwf_<_yiOk zF=}`=PH0b<2p|@@+S&s8bZL(bD8k^g4X2d$*_BA~s!qMdeq2p|!XNOca~*nH9! zK4mS-zWF6F8ASjeitMTp(AV29EGO8L)+1ADgxFz7r+sZtk2rL6X82n)vPtS()7>q= zrPU=OE<$BPnGE{-`!Qj{1TfDmVj#w17+*vb0015VNklzN9b-iltz5ZM6f;HJY01_2eWn39D=A`ATRBlKFpI0 zl^j4%m=z)vON58+1fsof##A(!h6Fi)gsgib$YDI5o-(tHUl;*&wRuwplZY51fe5Up zX~y2$Dg^KaG!jNbfPO($cCs!4_&Yg(&C^;05do~hq4Pt9rmZa^fM)6P<;y~yp|4La zU$trtYU|P%)6SSqWx9?CSh0MCn3<82q9bppXGqn&zW}qb5ktd6LTIjSi`67m53C9dOih~O z3@Z>Zx<^^-2F(Hbd38okM3BRXsHc>0BBt`2)g>s}J*PFJMUaw>BM4}$Z>Z=#=R-1R zMT%q;+A7*&@)qL6>9wYNjmZ6|z92%^tX?gL zXao@Ww5l}V_4)K8c#N)Qqxhn(p|iRF{s&;$@?~OG(GV!vWhqRiSx)_-MGA`r*h)pG zk>BgE3<+j51W*T7C}HgfRGXpf_|VQ0?RPzKB--K`O}Ryjbtz70|C4gGY~)K*KBnvH z#C+AU6pE6TX0mlUL|8t{K$q&IC&kj-)8~_WwBFDZPt#GyXb5Z)0avtCosMP{Q3QVX znl)l7Q?b$vB?1WO+H@^`IQ>Vs>Z&Wkl6TeKq*`t@@Iy)nGKX4vXy1kJKce#N+qc|L%LoV1hX9+eDJ~I zOU$|V_kjZ#RB^PnAVUYORF;N8;XdCJg}vaz59KrU0eu}lC!MK_F8mo@f8%vL_Q=EG zydfS(+ubq^?6mW)7&B%Jw%vAH%%4AB#O|`sKMUHIRKub+WTF#XMs>uhLlMJ6S;={F z5kQ)1G}al-)9pCpCvJvQPB|4j?y#LG!kDgb^IW|6;$QH{BM%DzsRt-4i5M%=){pNp-xnudqwK7x7A{8_|<<|+okNWn*a z^GN*o^wW?T8pfGto+UxOt)^{_^Uga*^ihBRAkI1GEU}ts9`Cu=-Zp2f>AzYM!v6kV#)mug&tv@Qi1u~CC@)%gJ4Y<=NqiWD;z z!*{;(9en58$0D8_QHTWmv-6(8yl3ZOU~m9+wQRUk!8kpVjACH&lqvYt)mKaXPjrzx zX3Ur&NTWq|*kOm`g7eQ4z|saE%nSITM#%eg$^eaR*HQ z;fdk*^X9#X>t%uKm?DVnLmE!G+j+uRVmz@`WNUIPW}( z-=B2i4{`882P#eofZyHSgFig^B<4N)XYq;j(!;5uT{EGWTVFW3Iw8ZGs?lF=n8(zy z?dda478aF@#$wW*`QZl(Fz4QTBtXY71nYY!r)i2xoF$>`;-#N1#ibWtTrtZ{`U^ZC zufO>guDSY`u*)SeQ*Xch4s>)VQ&dKo4QE9}ee}^sB74t1=Uhyixq<;Q`2)O2#SBhM}^pgKpzj;2MnfDy-zi$rC zJ@5RGWBA)ZCWBXAc@=XXdQhUXqah2zcP3hw;SYk4l7;lzrmy$A^JDp0KiOHC}x2 zMUn3_rcbY!lE~i~Cb;<0OR@9LJBdEf>yyQw;=h0KGwid^emMKAGb@144F)q98 z5?p`7jp4Hq*}T>_zW$An@-^@udhj9i_4i?yU3SH^sZ+&kkH;C>E=nKrqD3F$fd}u$ zs;;iEtCJkfaS3{YOhrmEnv_qc(n7&B^K@mL4A1jCY%ygDuDbFnxfz#j)9LDyGWO;c z<+xNYBH+F8?oUZnD;p8g{qnfoyAx%=+WXW{pE-F**UeeD(8@!Q|Z#1(P&YzMKRX!f(umy0Ml z=j;GEo(~ekKz~1edd5$}+b|f{KbVnn6FpK>|43cH)+kzAciwRa-hAVAY3rpPpm^dv zrFkzXG_FX>e`jKw&-oA0vXtn{kt-<2FTdg{j2|~vsDIV!wfNwJ_p$%}`>pdZJXg!d z#fv}2$BP!>8%KT@sD1JsSZ@T#=nd7tHe*5FluNjDV{KJQc34Jf`fwcII_r8lH958FDTWwqj)$PCM;XO#jggeD~OI%lE7?efQn@ z*lUm71qn<*5wMywm#yf+tn04D%xhJX5T15v@NGj!;LrIAj2;NIct0H^50$- zJ)#SJDRUXu;o|v{moQ8${CKe-S_4nGhhxwNGb%?BXN5x%E4o(Ur)T^azx& zy_h^@OB{aq5pwu$yX_VZp?dxGH}LqQk4U+u44ZOQ){O6=%=)4@VvNw{i^a;qtm@K4 z@iYx144KxZQzAaL-Q$J1!woWNi)QNT?r!{O`gELs{)IT?kidem9sK&%-w37Ne%ozofKz0V z`meu!7B0X1ax@2tBU1m_XPt%Yu=32QXn%ahnb>dNeMKBo8f3G>xbu$RN+g%kf~L1b ziX(o2GUqEx6QA2WX-aYKZp%vM@{+P$X}!>Fl#Y1EmOSSzxBOaUJ=a@rzl$5Lp9!y2 zMC-WmIOB{nvCA$y$!}3vD4mooO`&t9lN+Qel`T^vEx9Oj>GWJTbEY7GK>g=GUdLT` z-62-ke)}IFmd2ZJydlTmeDh7>*-}ps&_6l-bo}IuGjY&?`wP`kvETQ=LwMu$f8y3( z-x?y7qK*z3*W8EaRv-ft!!0+@ z#@>7Hi(|fh4AQ~irSO6O_$RT3=q=J|;RDiNpq%{p<3(8b(MQ;3+ih{gVP6xm!E3d>rzl!OwSAlaF_(I=1?l}C{$tQ=_6HQEtnS1WJM{IO@ z-c;~EJ@X74dg#}1{BhqGpM&1;oH=vw+N-Zf?EkUH9}{t>Ij?VE0GD1u&%6~^U3o=_ zfLC7q2ma^DCvfn=hv49Y4iYZsqWq^J!fXEZuYZxKZ1u=Cb&<;QbShw4auwz2)eRbC zBgSKB60%(JuDkCF5ul$;o1*+o6Ku(nrFiv~SMchquVCV4o8j7Pt`W_di&Gn{T=ici(llD0KEx&3pa@31jHy2Syeti`f+N(1Q<(A;1s= zDf+x~&%vQz`zofN^h2R&o`3&?58$akJcT>&{2e;SjuB3yo}f8O<((NEz;AB96H}*5 zlHaspz&H{^-V|keX~!!ns_1lnzHAv@eBlMrQMy2k$58z0P>x1`9-$m<(4hF)Gi9yY zqNGxZ%8sW7XSDLFtFOT}TW>8K5M2bs&`?%vU%LOacsTp*;!7@-ktmj2Q(#xN>@!(yY8XPkoVci2wYmek1T=BGqW=6mU1u+VplEvMq76HgMS?V4+@#pauDjvaT}3Gcl9Ha`03LkZ03zAGhyvd9$* zxah*4OFW)l`ZLe`37;-qg3TvQ#*s&UQ^FsNKQVa5fZmO>Zx*>r;@~qb`Q#H-RK@|X zjSZMIX)+Ez=n!nZ^;QDVTW+~oMrU%3pD=z@SlqS7=W>5x#2g97aiZ<0PmK5PxF$pC^MT{Qr&a@-bf>eGhR<6J&AAc<23ccBa z1~QZC3=hBX+;hT?((W4Mei=e$ux;P{_Q&xj953;f#^z>G_-nh@hQ(64ESxW;hj`yK z`(`};_+wbOaDfVP6>>Q8sG}tc$?Arl?ryP+7|)-5)6KZ+uDh^s(L(V`^{9MK!R7n$ zINf;Cy|!EYp!x_Fxac0CYZ!Uxj)jp!Q*sjTMvMZwyAP* zic`o}wW&rLwe?&$Qi2{I#s}7QIW(iFM53KCR6Mkh==te#^)X||ijt(ILPWB#RpvQM zb+99fnGZUB`V8Fr`+HPgAr_OE4;2*4A!R~KF!zm=#@~0`VJE!#<{Ki%8H%PK!O8|& zApFccE1!XW3(Z%iI$52-d(ntstcr~!O)V|K%uiPPsqvMZEu;$t_`VEX^FF#6o$XjG z1kmL>(WwAY5f$wb){WXEE^$~C(3R4g0`#utnZ)l+W7FR#tnE&}Xfa zI7UJ6kW~>HSS(NBv#YxPA!)!60tpb!N)J8*ohe;X&LS*UOt5H7FDC2xJH;xMF9}kQ z)Fj16hjj#|r>1@?&G$zgSF^*?l3_Eg78zGFLe++_GxNk;T8^^dh*Yh+YWSdf2&=9r zpzx2dkJq)9y2OQl$Byj?5ulh&^(jy}Q}&M^-&rvhM*mJ7LaJpekzTqmfS&%+btM^-&y=%Vq(E9s93{{A4Hcwb zy8VY#InsS-iZbMRG72p+v|B2Tvw5*nsyAcMHT+caEXay3iY6}hAVkFlzvIMS*7=M) zlR`k0SU5_VX;NJ;OY4S|&ZYMwVBs!3UJ{TKYOe`?wFx;mb;>t8Wy`LC=rSL;G|W z9+4n(<%04+U7pfE&@WuVvUe(8atO^=#!FabLF(4BnH0*MF}N7)Voi|}2ey=|Q$dm= z@_CjcI+91wOIIK8zSK`#tW}bG78!+1g=LPM-J^RHX!YopQvp0Juwp^1DEbS0U%t0o zHIk&`zmKrsi=tnuISLdx#O*o{b%&ydT5_ubv9u}*UX|FQ&z z!9FTkU42L3bF&A%(_XaQNMD%amrFC!KZ27^`6Nc{LLB?i7003IbazYnCuFYD#mKcDx?( zNIRKb`q9#F{qj_dtV7bGgGyR2-M7onq(}mni#14f5l)Gsh%qFJH&Qqk+l9yxwLG5P zKmmZGg;lH?Ap-Pong}UENgN!@%q|)k+{#)d&d`VsZWYW0PeBA!3~v1wMiFWKe1tZ4|)nB~%~QhX_1lYzY`M?}p~J~Jzp8C%!=T10>@ zOOJ97TbHi{S`HA*&aWO)Z$4L+rU8(u#qiHc)4$_D4HDZF&Yv`4bfPT-ok{|0;yH|3Pb?w zkhmBuqwOyJ1bXXQR^TzAJv3I?SQX zU=j*rLo^690`y)oY%-DN>iT+V@}myXE4sav%5W)XOYd{3EgijK!;UEv&u(lxtBq~q zBM8`pZLEldV^`e35KcmxARy)ix}HV#TprN6IsqOez*DHgY?p*2LTi z>k&KhAOY)a>PBvw1vhmoLp^Do0HqkA^`J|$^+paG+saUL1Va)G1BmX5?8q^OJ-d}okb>Swl5^>UDg@=~=^Narg`@llbZXaDm%jQ~D7t1478o(iextqf0Tw#;xMx;%7n zwd!5;zUWqlArdyUjcsIW0B-hhQkN6XeP&HibTdy{4Y~uRdNWTQOB!u6Pp!10n|V@J zGpebmymB}D>((<50g0h-Do9I=4A=9l;OI&Un86M*5&59cBgtvbM6y)>$v#HCe9nD{QvBh<{=W4bu>qIS{2P!wXb{? zBDewEF3ga zi9FTWBSxZhaMHxpJ77@c@EItkwEoZopD31SG;oFwV^b7sO(y*FTjTgiYn-wrNL5wc zReQMV>$Pya>7#91Tm7v1^E$h!uJ6DQ3G@@<=FOY3%{kAZ&oFz?#vMHh5lnM7)Uh!` zZBY{KA)|@Mf-Xi-bzv5fz!Gl)gdvEivL5YOsifKALWD9Hs1d2W^uBQa0DhMFN0Rtg z^B(kmFGCFZ%YK?4ByK$<21h#ih^>(!zgXb4UK!^y2Ei7YJxcR3dv?a&^)HIPZIfxXCGooTEH@2sZ9UPGJ)zm6SsAT4tIXf719;;Fc(Q5(Px?#H_hGC2KKHsad>TvTZmM8ae^UeyLA8ty5Zq- o01M!IZ=>wJ@ diff --git a/old/modules/ExpGamingCore/softmod.json b/old/modules/ExpGamingCore/softmod.json deleted file mode 100644 index 4b2715eb..00000000 --- a/old/modules/ExpGamingCore/softmod.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "ExpGamingCore", - "version": "4.0.0", - "description": "Explosive Gaming Core Files", - "location": "FSM_ARCHIVE", - "keywords": [ - "Library", - "Lib", - "ExpGaming", - "Core" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "submodules": { - "ExpGamingCore.Gui": "4.0.0", - "ExpGamingCore.Server": "4.0.0", - "ExpGamingCore.Sync": "4.0.0", - "ExpGamingCore.Command": "4.0.0", - "ExpGamingCore.Group": "4.0.0", - "ExpGamingCore.Role": "4.0.0" - }, - "dependencies": {} -} diff --git a/old/modules/ExpGamingInfo/Readme/control.lua b/old/modules/ExpGamingInfo/Readme/control.lua deleted file mode 100644 index 55365037..00000000 --- a/old/modules/ExpGamingInfo/Readme/control.lua +++ /dev/null @@ -1,132 +0,0 @@ ---- Adds a readme gui to the game that contains useful information --- @module ExpGamingInfo.Readme --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Gui = require('ExpGamingCore.Gui') - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Sync'] then require(module_path..'/src/sync') end - end -} - --- Function Define -local function format_label(label) - label.style.maximal_width = 480 - label.style.single_line = false -end - -ThisModule.Gui = Gui.center{ - name='readme', - caption='utility/questionmark', - tooltip={'ExpGamingInfo-Readme.tooltip'} -}:add_tab('guildlines',{'ExpGamingInfo-Readme.guildlines-name'},{'ExpGamingInfo-Readme.guildlines-tooltip'},function(frame) - for i = 1,10 do - local style=nil; if i == 1 then style = 'caption_label' end - format_label(frame.add{ - type='label', - caption={'ExpGamingInfo-Readme.guildlines-line'..tostring(i)}, - style=style - }) - end -end):add_tab('chat',{'ExpGamingInfo-Readme.chat-name'},{'ExpGamingInfo-Readme.chat-tooltip'},function(frame) - format_label(frame.add{ - type='label', - caption={'ExpGamingInfo-Readme.chat-singleline'} - }) -end):add_tab('commands',{'ExpGamingInfo-Readme.commands-name'},{'ExpGamingInfo-Readme.commands-tooltip'},function(frame) - format_label(frame.add{ - type='label', - caption={'ExpGamingInfo-Readme.commands-singleline'} - }) - Gui.bar(frame,480) - local table = frame.add{name='command_table',type='table',column_count=2} - table.add{ - type='label', - caption={'ExpGamingInfo-Readme.commands-col1'}, - style='caption_label' - } - table.add{ - type='label', - caption={'ExpGamingInfo-Readme.commands-col2'}, - style='caption_label' - } - table.style.width = 480 - table.draw_vertical_lines = true - table.draw_horizontal_line_after_headers = true - for _,command in pairs(commands.get_commands(frame.player_index)) do - table.add{ - type='label', - caption='/'..command.name - } - local description = table.add{ - type='label', - caption=command.description, - } - description.style.maximal_width = 400 - description.style.single_line = false - end -end):add_tab('links',{'ExpGamingInfo-Readme.links-name'},{'ExpGamingInfo-Readme.links-tooltip'},function(frame) - local links={ - 'https://discord.explosivegaming.nl', - 'https://explosivegaming.nl', - 'http://steamcommunity.com/groups/tntexplosivegaming', - 'https://www.patreon.com/badgamernl', - 'https://wiki.explosivegaming.nl/' - } - local function format(text_box) - text_box.style.minimal_width=400 - text_box.read_only = true - text_box.word_wrap = true - text_box.selectable = true - end - for i,link in pairs(links) do - frame.add{ - type="label", - caption={'ExpGamingInfo-Readme.links-cap'..tostring(i)}, - style='caption_label' - } - format(frame.add{ - type='text-box', - text=link - }) - end -end):add_tab('servers',{'ExpGamingInfo-Readme.servers-name'},{'ExpGamingInfo-Readme.servers-tooltip'},function(frame) - format_label(frame.add{ - type='label', - caption={'ExpGamingInfo-Readme.servers-singleline'} - }) - Gui.bar(frame,480) - for i = 1,6 do - frame.add{ - type='label', - caption={'ExpGamingInfo-Readme.servers-format',tostring(i),{'ExpGamingInfo-Readme.servers-cap'..tostring(i)}}, - style='caption_label' - } - format_label(frame.add{ - type='label', - caption={'ExpGamingInfo-Readme.servers-des'..tostring(i)} - }) - end -end):add_tab('rules',{'ExpGamingInfo-Readme.rules-name'},{'ExpGamingInfo-Readme.rules-tooltip'},function(frame) - format_label(frame.add{ - type='label', - caption={'ExpGamingInfo-Readme.rules-singleline'} - }) - Gui.bar(frame,480) - for i = 1,20 do - format_label(frame.add{ - type='label', - caption={'ExpGamingInfo-Readme.rules-format',i,{'ExpGamingInfo-Readme.rules-rule'..tostring(i)}} - }) - end -end) - --- Module Return --- when called will open readme for that user -return setmetatable(ThisModule,{__call=function(self,...) self.Gui(...) end}) \ No newline at end of file diff --git a/old/modules/ExpGamingInfo/Readme/locale/de.cfg b/old/modules/ExpGamingInfo/Readme/locale/de.cfg deleted file mode 100644 index 4fc2512b..00000000 --- a/old/modules/ExpGamingInfo/Readme/locale/de.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[ExpGamingInfo-Readme] -tooltip=Open the readme gui that opens when you first join. -guildlines-name=Guild Lines -guildlines-tooltip=These are the guildlines you should follow -guildlines-line1=Welcome to the Explosive Gaming Community! -guildlines-line2= -guildlines-line3=Here are some guidelines to keep this Server fun for everyone: -guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. -guildlines-line5=- Be polite and use common sense. -guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. -guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. -guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) -guildlines-line9= -guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! -chat-name=How To Chat -chat-tooltip=How to chat in factorio with default key config -chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. -commands-name=Commands -commands-tooltip=These are the commands you can use -commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown -commands-col1=Command Name -commands-col2=Command Help -links-name=Links -links-tooltip=Helpful links for ways to get in touch -links-cap1=Discord voice and chat server: -links-cap2=Our website: -links-cap3=Steam: -links-cap4=Patreon: -servers-name=Servers -servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. -servers-format=S__1__: __2__ -servers-cap1=Public -servers-des1=A place for all players, this map reset every 144H At 16:00 UTC. -servers-cap2=Public -servers-des2=A place for all players, this map reset every 144H At 16:00 UTC. -servers-cap3=Public -servers-des3=A place for all players, this map reset every 144H At 16:00 UTC. -servers-cap4=Modded -servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. -servers-cap5=Events -servers-des5=Sometimes we hold events, may require a password, join discord for more info. -servers-cap6=Donator -servers-des6=For those people who have two much money and give us some. Anything goes per request. -rules-name=All Rules -rules-tooltip=A full list of rules for the server -rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. -rules-format=__1__) __2__ -rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. -rules-rule2=Any bugs or exploits found should be reported. (no creative items) -rules-rule3=Do not disrespect any player in the server. -rules-rule4=Do not take every item frmo a belt or via logics request, share resources. -rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. -rules-rule6=Do not laydown or remove concrete or stone with bots without permission. -rules-rule7=Do not use active provider chests without permission. -rules-rule8=Do not use speakers on global or with alearts without permission. -rules-rule9=Do not remove/move major parts of the factory without permission. -rules-rule10=Do not walk in player random direction for no reason(to save map size). -rules-rule11=Do not remove stuff just because you dont like it, tell people first. -rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. -rules-rule13=Do not make train roundabouts. Or any loops of any kind. -rules-rule14=When using trains use the same size that others have used. -rules-rule15=Trains are Left Hand Drive (LHD) only. -rules-rule16=Do not complain about lag, low fps and low ups or other things like that. -rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. -rules-rule18=Do not advertise other servers unless you are a trusted server owner. -rules-rule19=Report any one who breaks the rules. -rules-rule20=Use common sense and what an admin says goes. diff --git a/old/modules/ExpGamingInfo/Readme/locale/en.cfg b/old/modules/ExpGamingInfo/Readme/locale/en.cfg deleted file mode 100644 index 086261eb..00000000 --- a/old/modules/ExpGamingInfo/Readme/locale/en.cfg +++ /dev/null @@ -1,69 +0,0 @@ -[ExpGamingInfo-Readme] -tooltip=Open the ReadMe if this is your first time joining. -guildlines-name=Guidelines -guildlines-tooltip=These are the guidelines everyone should follow -guildlines-line1=Welcome to the Explosive Gaming Community! -guildlines-line2=Here are some guidelines that everyone is obligated to follow. -guildlines-line3=!!!No rights can be derived from these guidelines as the full list of rules (another tab in this window) is valid / operative!!! -guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. -guildlines-line5=- Be polite and use common sense. -guildlines-line6=- Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed. -guildlines-line7=- Do not remove stuff without asking your fellow players. -guildlines-line8=- Trains are only allowed in LHD (Left Hand Drive). No train loops! -guildlines-line9= -guildlines-line10=If you have any questions about our rules, the server or Factorio in general, feel free to ask your fellow players or our helpful team. Have fun! -chat-name=How To Chat -chat-tooltip=How to chat in Factorio with default key config -chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”) - If you would like to change the key, go to your Controls tab in options. The key you need to change is “Toggle LUA console” -commands-name=Commands -commands-tooltip=Commands that you can use in ExplosiveGaming -commands-singleline=Custom commands that you can use. Base commands are not shown here. -commands-col1=Command Name -commands-col2=Command Help -links-name=Links -links-tooltip=Helpful links for ways to get in touch with us -links-cap1=Discord voice and chat server: -links-cap2=Our website: -links-cap3=Steam: -links-cap4=Patreon: -links-cap5=Our wiki: -servers-name=Servers -servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! S1-S3 are staggered resets. -servers-format=S__1__: __2__ -servers-cap1=Public -servers-des1=A place for all players, this map resets every 144H At 16:00 UTC. -servers-cap2=Public -servers-des2=A place for all players, this map resets every 144H At 16:00 UTC. -servers-cap3=Public -servers-des3=A place for all players, this map resets every 144H At 16:00 UTC. -servers-cap4=Modded -servers-des4=A Modded server for all players. Link on Discord for members. -servers-cap5=Events -servers-des5=Server for events (everyone can join) - May require a password. Join Discord for more info -servers-cap6=Donator -servers-des6=For players who support us financially. Changes can be made per request. -rules-name=Rules -rules-tooltip=The full list of ExplosiveGaming rules. -rules-singleline=Although the guidelines cover most of our rules, the full list always have more priority and override any guideline. It is advised to be familiar with all rules to prevent warnings or bans. -rules-format=__1__) __2__ -rules-rule1=Hacking / cheating / abusing bugs will not be tolerated. -rules-rule2=Any bugs or exploits found should be reported to our team members. (excluding creative items) -rules-rule3=Do not disrespect any player in the server. -rules-rule4=Taking all items from a belt or logistics request is forbidden: sharing resources is mandatory. -rules-rule5=Spamming (in the form of chat, bots, unlimited chests and concrete) is not allowed. -rules-rule6=Do not lay down/remove concrete or stone with bots without permission. -rules-rule7=Do not use active provider chests without permission. -rules-rule8=Do not use speakers on global or with alerts without permission. -rules-rule9=Do not remove/move major parts of the factory without permission. -rules-rule10=Do not walk in random directions for no reason (to save map size and server resources). -rules-rule11=Do not remove stuff without asking your fellow players. -rules-rule12=Do not rotate belts, deactivate belts with wires, or cause production to stop. -rules-rule13=Do not make train roundabouts. Or any loops of any kind. -rules-rule14=When using trains, use the same size other players have used. -rules-rule15=Trains are Left Hand Drive (LHD) only. -rules-rule16=Do not complain about lag, low fps and low ups etc. -rules-rule17=Do not ask for ranks. Our ranks are synchronized with Discord, make sure to join us there. -rules-rule18=Do not advertise other servers unless you are a trusted server owner. -rules-rule19=Report players who break the rules. -rules-rule20=Use common sense and what an Admin says goes. diff --git a/old/modules/ExpGamingInfo/Readme/locale/fr.cfg b/old/modules/ExpGamingInfo/Readme/locale/fr.cfg deleted file mode 100644 index 45c6f9d0..00000000 --- a/old/modules/ExpGamingInfo/Readme/locale/fr.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[ExpGamingInfo-Readme] -tooltip=Open the readme gui that opens when you first join. -guildlines-name=Guild Lines -guildlines-tooltip=These are the guildlines you should follow -guildlines-line1=Welcome to the Explosive Gaming Community! -guildlines-line2= -guildlines-line3=Here are some guidelines to keep this Server fun for everyone: -guildlines-line4=- Hacking / cheating / abusing bugs will not be tolerated. -guildlines-line5=- Be polite and use common sense. -guildlines-line6=- Nobody likes spam. That includes: Chat, Bots, unlimited Chests and Concrete. -guildlines-line7=- Do not remove stuff without even trying to talk / ask about it. -guildlines-line8=- Trains: LHD (Left hand drive), no Loops and use them for long distances. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) -guildlines-line9= -guildlines-line10=If you have any questions about the rules, the server or the game in general, feel free to ask. Have Fun! -chat-name=How To Chat -chat-tooltip=How to chat in factorio with default key config -chat-singleline=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key it’s located under the “ESC key”. If you would like to change the key go to your controls tab in options. The key you need to change is “Toggle Lua console” it’s located in the second column 2nd from bottom. -commands-name=Commands -commands-tooltip=These are the commands you can use -commands-singleline=These are the many diffrent custom commands you are able to use, the base game commands are not shown -commands-col1=Command Name -commands-col2=Command Help -links-name=Links -links-tooltip=Helpful links for ways to get in touch -links-cap1=Discord voice and chat server: -links-cap2=Our website: -links-cap3=Steam: -links-cap4=Patreon: -servers-name=Servers -servers-tooltip=Info on our other servers -servers-singleline=Welcome to the Explosive Gaming Community! -servers-format=S__1__: __2__ -servers-cap1=Public -servers-des1=A place for all players, this map reset every 24h. -servers-cap2=Standard -servers-des2=Before you play make sure you understand the game, reset every 48h. -servers-cap3=Pro -servers-des3=A pure mega base server, reset every 7 days and a password is needed to join. -servers-cap4=Modded -servers-des4=A modded server not much to say, just download the mods to play. Link on Discord for members. -servers-cap5=Events -servers-des5=Sometimes we hold events, may require a password, join discord for more info. -servers-cap6=Donator -servers-des6=For those people who have two much money and give us some. Anything goes per request. -rules-name=All Rules -rules-tooltip=A full list of rules for the server -rules-singleline=This is a full list of rules what must be followed, the guildlines will cover most points in here but for those who like to follow the rules word to word then here is the full list. -rules-format=__1__) __2__ -rules-rule1=Hacking/cheating, exploiting and abusing bugs is not allowed. -rules-rule2=Any bugs or exploits found should be reported. (no creative items) -rules-rule3=Do not disrespect any player in the server. -rules-rule4=Do not take every item frmo a belt or via logics request, share resources. -rules-rule5=Do not spam, this includes stuff such as chat spam, item spam, chest spam etc. -rules-rule6=Do not laydown or remove concrete or stone with bots without permission. -rules-rule7=Do not use active provider chests without permission. -rules-rule8=Do not use speakers on global or with alearts without permission. -rules-rule9=Do not remove/move major parts of the factory without permission. -rules-rule10=Do not walk in player random direction for no reason(to save map size). -rules-rule11=Do not remove stuff just because you dont like it, tell people first. -rules-rule12=Do not rotate belts, deactive belts with wires, or cause production to stop. -rules-rule13=Do not make train roundabouts. Or any loops of any kind. -rules-rule14=When using trains use the same size that others have used. -rules-rule15=Trains are Left Hand Drive (LHD) only. -rules-rule16=Do not complain about lag, low fps and low ups or other things like that. -rules-rule17=Do not ask for rank, our ranks are synced with discord, admins cant give ranks. -rules-rule18=Do not advertise other servers unless you are a trusted server owner. -rules-rule19=Report any one who breaks the rules. -rules-rule20=Use common sense and what an admin says goes. \ No newline at end of file diff --git a/old/modules/ExpGamingInfo/Readme/locale/nl.cfg b/old/modules/ExpGamingInfo/Readme/locale/nl.cfg deleted file mode 100644 index cc54dbd3..00000000 --- a/old/modules/ExpGamingInfo/Readme/locale/nl.cfg +++ /dev/null @@ -1,68 +0,0 @@ -[ExpGamingInfo-Readme] -tooltip=Open de ReadMe wanneer je voor het eerst speelt. -guildlines-name=Richtlijnen -guildlines-tooltip=Dit zijn de richtlijnen die je moet volgen. -guildlines-line1=Welkom op de ExplosiveGaming community! -guildlines-line2= -guildlines-line3=Hier zijn een aantal richtlijnen die ieder speler moet volgen. -guildlines-line4=- Hacken / cheaten en bugs misbruiken is niet toegestaan. -guildlines-line5=- Wees aardig en gebruik je gezonde verstand. -guildlines-line6=- Spammen (in de zin van chat, kisten en beton) is niet toegestaan. -guildlines-line7=- Geen spullen verwijderen zonder toestemming van andere spelers. -guildlines-line8=- Treinen (LHD - Left Hand Drive) geen loops. (- Trains are only allowed in LHD (Left Hand Drive). Train loops. UPDATE) -guildlines-line9= -guildlines-line10=Als je vragen hebt over deze regels of over de server in algemeen, aarzel dan niet om contact op te nemen met onze staff. -chat-name=Chatten -chat-tooltip=Chatten in Factorio met standaard instellingen -chat-singleline=Chatten kan moeilijk zijn voor nieuwe spelers omdat de chatmechanisme in Factorio anders is dan andere spellen. Het is simpel: druk op de "GRAVE/TILDE" knop (locatie is onder de ESC knop). Als je deze knop wilt aanpassen, ga naar de Controls tab in Opties. De knop die je moet aanpassen is "Toggle LUA Console" -commands-name=Commands -commands-tooltip=Dit zijn de commands die je kunt gebruiken. -commands-singleline=Er zijn veel verschillende custom commands die je kunt gebruiken. Let er wel op dat basis commands hier niet zichtbaar zijn. -commands-col1=Commando naam -commands-col2=Commando hulp -links-name=Links -links-tooltip=Nuttige links om in contact te komen met de community -links-cap1=Discord server: -links-cap2=Onze website: -links-cap3=Steam: -links-cap4=Patreon: -servers-name=Servers -servers-tooltip=Info over onze andere servers -servers-singleline=Welkom op de ExplosiveGaming community! S1 tot en met S3 heeft geplande resets. -servers-format=S__1__: __2__ -servers-cap1=Openbaar -servers-des1=Server voor alle spelers, deze map reset elke 144 uur om 16:00 UTC. -servers-cap2=Openbaar -servers-des2=A place for all players, deze map reset elke 144 uur om 16:00 UTC. -servers-cap3=Openbaar -servers-des3=A place for all players, deze map reset elke 144 uur om 16:00 UTC. -servers-cap4=Modded -servers-des4=Een modded server voor alle spelers. Links zijn te vinden in de Discord server. -servers-cap5=Events -servers-des5=Server voor events. Links en wachtwoorden zijn te vinden in de Discord server. -servers-cap6=Donator -servers-des6=Voor de spelers die ons financieel ondersteunen. -rules-name=Alle regels -rules-tooltip=Een lijst met regels die van toepassing zijn op alle ExplosiveGaming servers. -rules-singleline=Dit is een lijst met alle regels. De richtlijnen behandelt de meeste punten, maar de volledige lijst is ook van toepassing. -rules-format=__1__) __2__ -rules-rule1=Hacken / cheaten en bugs misbruiken is niet toegestaan. -rules-rule2=Bugs of fouten horen gerapporteerd te worden aan de staff. -rules-rule3=Respecteer iedereen in de server. -rules-rule4=Pak niet alles uit een belt of via logistiekaanvragen: deel je middelen. -rules-rule5=Spammen (in de zin van chat, kisten en beton) is niet toegestaan. -rules-rule6=Bouw geen beton of steen met bots zonder toestemming. -rules-rule7=Gebruik geen actieve providerkist zonder toestemming. -rules-rule8=Gebruik geen speakers (globaal of met alerts) zonder toestemming. -rules-rule9=Verwijder geen grote delen van het fabriek zonder toestemming. -rules-rule10=Loop niet in willekeurige plekken zonder een reden (bespaart mapgrootte en server resources) -rules-rule11=Geen spullen verwijderen zonder toestemming van andere spelers. -rules-rule12=Draai de belts niet, deactiveer belts niet met draden en laat de productie niet stoppen. -rules-rule13=Maak geen treinrotondes of lussen. -rules-rule14=Gebruik de zelfde grootte treinen als andere spelers. -rules-rule15=Treinen zijn alleen LHD (Left Hand Drive) -rules-rule16=Klaag niet over de lag, lage FPS of lage UPS. -rules-rule17=Vraag niet om ranks: ranks zijn synchroon met onze Discord server. -rules-rule18=Maak geen reclame voor andere servers, tenzij je daarvoor bevoegd bent. -rules-rule19=Rapporteer spelers die de regels breken. -rules-rule20=Gebruik gezond verstand. diff --git a/old/modules/ExpGamingInfo/Readme/locale/sv-SE.cfg b/old/modules/ExpGamingInfo/Readme/locale/sv-SE.cfg deleted file mode 100644 index 5299c304..00000000 --- a/old/modules/ExpGamingInfo/Readme/locale/sv-SE.cfg +++ /dev/null @@ -1,69 +0,0 @@ -[ExpGamingInfo-Readme] -tooltip=Öppna ReadMe om det här är första gången du ansluter dig. -guildlines-name=Riktlinjer -guildlines-tooltip=Det här är riktlinjerna som alla bör följa -guildlines-line1=Välkommen till gemenskapen ExplosiveGaming! -guildlines-line2=Här är riktlinjerna som alla är tvingade att följa. -guildlines-line3=!!!No rights can be derived from these guidelines as the full list of rules (another tab in this window) is valid / operative!!! -guildlines-line4=- Dataintrång / fusk / missbruk av buggar kommer inte att tolereras. -guildlines-line5=- Var artig och använd sunt förnuft. -guildlines-line6=- Spam (genom chat, bottar, obegränsade kistor och betong) är inte tillåtet. -guildlines-line7=- Ta inte bort saker utan att fråga dina medspelare. -guildlines-line8=- Tåg är bara tillåtna med vänstertrafik. Inga tågloopar! -guildlines-line9= -guildlines-line10= Om du har frågor om reglerna, servern eller generelt om Factorio, känn dig fri att fråga dina medspelare eller vårat hjälpsamma team. Ha kul! -chat-name=Hur du chattar -chat-tooltip=Hur du chattar i Factorio med standardinställningar -chat-singleline=Att chatta kan vara svårt för nya spelare efterson det är annurlunda från andra spel. Det är väldigt enkelt, tangenten som du behöver trycka på är "ö".Om du vill byta det, gå in till "kontroller" och ändra tangent för "lua konsol". -commands-name=Kommandon -commands-tooltip=Kommandon som du kan använda i ExplosiveGaming -commands-singleline=Anpassade kommandon som du kan använda. Baskommandon visas inte här. -commands-col1=Kommandonamn -commands-col2=kommandohjälp -links-name=Länkar -links-tooltip=Hjälpfulla länkar som visar vägar att komma i kontakt med oss. -links-cap1=Discord röst- och chatserver: -links-cap2=Våran Webbadress : -links-cap3=Steam: -links-cap4=Patreon: -links-cap5=Vår wiki: -servers-name=Servrar -servers-tooltip=Information om våra servrar -servers-singleline=Välkommen till ExplosiveGamings gemenskap! S1-S3 har förskjutna återställningar (resets). -servers-format=S__1__: __2__ -servers-cap1=Offentlig -servers-des1=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. -servers-cap2=Offentlig -servers-des2=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. -servers-cap3=Offentlig -servers-des3=En plats för alla spelare, then här kartan återställs varje 144H, 16:00 UTC. -servers-cap4=Modifierad -servers-des4=En modifierad server för alla spelare. Länk i Discord för medlemmar. -servers-cap5=Evenemang -servers-des5=Server för evenemang (alla kan ansluta sig) - Kan kräva lösenord. Anslut dig till Discord för mer info. -servers-cap6=Donator -servers-des6=För spelare som stöder oss finansiellt. Ändringar kan göras på begäran. -rules-name=Regler -rules-tooltip=Den fullla listan över ExplosiveGamings regler. -rules-singleline=Även om riktlinjerna täcker de flesta av reglerna så har den fulla listan alltid prioritet och går alltid före riktlinjerna. Det är välbetänkt att vara bekant med alla reglerna för att förhindra varningar och bannlystningar. -rules-format=__1__) __2__ -rules-rule1=Dataintrång / fusk / missbruk av buggar kommer inte att tolereras. -rules-rule2=Buggar och utnyttjingssätt ska rapporteras till team-medlemmar (exkludera kreativa saker) -rules-rule3=Var inte respektlös mot någon annan spelare i servern. -rules-rule4=Att ta alla saker från ett bälte eller logistikbegäran är förbjudet: att dela med sig av resurserna är obligatoriskt. -rules-rule5=Spam (genom chat, bottar, obegränsade kistor eller betong) är inte tillåtet. -rules-rule6=Gör inga placeringar/borttagningar av betong eller sten med hjälp av bottar utan tillåtelse. -rules-rule7=Använd inte aktiva tillgångskistor utan tillåtelse. -rules-rule8=Använd inte globala högtalare eller varningar utan tillåtelse. -rules-rule9=Ta inte bort eller flytta huvuddelar av fabriken utan tillåtelse. -rules-rule10=Gå inte omkring i slumpvisa riktningar utan anledning (för att spara kartstorlek och serverresurser) -rules-rule11=Ta inte bort saker utan att fråga dina medspelare. -rules-rule12=Rotera inte bälten, deaktivera inte bälten med kabel och orsaka inte produktionsstop. -rules-rule13=Gör inte tågrondeller. Eller någon loop av något slag. -rules-rule14=Vid användning av tåg, använd samma storlek som andra spelare använt sig av. -rules-rule15=Tåg körs endast med vänstertrafik. -rules-rule16=Klaga inte om lag, låg fps, låg ups etc. -rules-rule17=Be inte om högre rang. Våra ranger är synkroniserade med Discord, se till att du ansluter dig till oss där. -rules-rule18=Gör inte reklam för andra servrar om du inte är en betrodd serverägare. -rules-rule19=Rapportera spelare som bryter mot reglerna. -rules-rule20=Använd sunt förnuft och vad en admin säger gäller. diff --git a/old/modules/ExpGamingInfo/Readme/softmod.json b/old/modules/ExpGamingInfo/Readme/softmod.json deleted file mode 100644 index d824408e..00000000 --- a/old/modules/ExpGamingInfo/Readme/softmod.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "ExpGamingInfo.Readme", - "version": "4.0.0", - "description": "Adds a readme gui to the game that contains useful information", - "location": "FSM_ARCHIVE", - "keywords": [ - "Gui", - "Info", - "ExpGaming", - "Readme", - "New Player" - ], - "author": "", - "contact": "", - "license": "", - "dependencies": { - "ExpGamingCore.Gui": "^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Sync": "?^4.0.0" - }, - "submodules": {}, - "collection": "ExpGamingInfo@4.0.0" -} diff --git a/old/modules/ExpGamingInfo/Readme/src/sync.lua b/old/modules/ExpGamingInfo/Readme/src/sync.lua deleted file mode 100644 index 51c3c8da..00000000 --- a/old/modules/ExpGamingInfo/Readme/src/sync.lua +++ /dev/null @@ -1,14 +0,0 @@ -local Sync = require('ExpGamingCore.Sync') -local Gui = require('ExpGamingCore.Gui') - -Sync.add_to_gui(Gui.inputs.add_button('readme-sync-guildlines','View Guildlines','View the guildlines in the readme',function(player,element) - Gui.center.open_tab(player,'readme','guildlines') -end)) - -Sync.add_to_gui(Gui.inputs.add_button('readme-sync-links','View Other Links','View the links in the readme',function(player,element) - Gui.center.open_tab(player,'readme','links') -end)) - -Sync.add_to_gui(Gui.inputs.add_button('readme-sync-rules','View All Rules','View the all rules in the readme',function(player,element) - Gui.center.open_tab(player,'readme','rules') -end)) \ No newline at end of file diff --git a/old/modules/ExpGamingInfo/softmod.json b/old/modules/ExpGamingInfo/softmod.json deleted file mode 100644 index fda8359b..00000000 --- a/old/modules/ExpGamingInfo/softmod.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "ExpGamingInfo", - "version": "4.0.0", - "description": "Adds info guis to the game for different production areas", - "location": "FSM_ARCHIVE", - "keywords": [ - "Gui", - "Info", - "ExpGaming", - "Production" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606@5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "submodules": { - "ExpGamingInfo.Readme": "4.0.0", - "ExpGamingInfo.Rockets": "4.0.0", - "ExpGamingInfo.Science": "4.0.0", - "ExpGamingInfo.Tasklist": "4.0.0" - } -} diff --git a/old/modules/ExpGamingPlayer/afkKick/control.lua b/old/modules/ExpGamingPlayer/afkKick/control.lua deleted file mode 100644 index 1add91c9..00000000 --- a/old/modules/ExpGamingPlayer/afkKick/control.lua +++ /dev/null @@ -1,37 +0,0 @@ ---- A full ranking system for factorio. --- @module ExpGamingPlayer.afkKick@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - -local Game = require('FactorioStdLib.Game') -local Role -- ExpGamingCore.Role@^4.0.0 -local Sync -- ExpGamingCore.Sync@^4.0.0 - -local function get_allowed_afk_time(player) - player = Game.get_player(player) - local role = Role and Role.get_highest(player) or {index=1,allow_afk_kick=not player.admin} - local player_count = #game.connected_players - local role_count = Role and Role.meta.count or 1 - local role_index = role.allow_afk_kick and role.index or false - if not role_index then return false end - return (role_count/role_index)*player_count -end - -Event.add(defines.events.on_tick,function(event) - if (game.tick%3600) ~= 0 then return end - for _,player in pairs(game.connected_players) do - local afk = #game.connected_players < 3 and 10 or get_allowed_afk_time(player) - if afk then - if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..math.floor(afk)..' Minutes)') end - end - end -end) - -return setmetatable({ - get_allowed_afk_time=get_allowed_afk_time, - on_init=function(self) - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end - if loaded_modules['ExpGamingCore.Sync'] then Sync = require('ExpGamingCore.Sync') end - if loaded_modules['ExpGamingCore.Server'] then require(module_path..'/src/server',{Sync=Sync,self=self}) end - end -},{__call=function(self,...) return self.get_allowed_afk_time(...) end}) \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/afkKick/softmod.json b/old/modules/ExpGamingPlayer/afkKick/softmod.json deleted file mode 100644 index bace003d..00000000 --- a/old/modules/ExpGamingPlayer/afkKick/softmod.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "ExpGamingPlayer.afkKick", - "version": "4.0.0", - "description": "Adds a varible amount of time before a user is kicked based on the current player count.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Kick", - "AFK", - "Players", - "Smart", - "Varible" - ], - "dependencies": { - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Gui": "^4.0.0", - "ExpGamingCore.Role": "?^4.0.0", - "ExpGamingCore.Sync": "?^4.0.0", - "ExpGamingCore.Server": "?^4.0.0" - }, - "collection": "ExpGamingPlayer@4.0.0", - "submodules": {} -} diff --git a/old/modules/ExpGamingPlayer/afkKick/src/server.lua b/old/modules/ExpGamingPlayer/afkKick/src/server.lua deleted file mode 100644 index ed6bcf00..00000000 --- a/old/modules/ExpGamingPlayer/afkKick/src/server.lua +++ /dev/null @@ -1,29 +0,0 @@ -local Sync = Sync -local get_allowed_afk_time = self -local Server = require('ExpGamingCore.Server') -local Color = require('FactorioStdLib.Color') -Event[defines.events.on_tick] = nil - -script.on_init(function(event) - Server.new_thread{ - name='afk-kick', - }:on_event('tick',function(self) - if (game.tick%3600) ~= 0 then return end - for _,player in pairs(game.connected_players) do - local afk = #game.connected_players < 3 and 10 or get_allowed_afk_time(player) - if afk then - if player.afk_time > afk*3600 then game.kick_player(player,'AFK For Too Long ('..math.floor(afk)..' Minutes)') end - end - end - end):on_event('error',function(self,err) - if Sync then - Sync.emit_embedded{ - title='Auto Kick Error', - color=Color.to_hex(defines.textcolor.bg), - description='Auto Kick Error - Closed Thread', - Error=err - } - end - self:close() - end):open() -end) diff --git a/old/modules/ExpGamingPlayer/inventorySearch/control.lua b/old/modules/ExpGamingPlayer/inventorySearch/control.lua deleted file mode 100644 index b2313f14..00000000 --- a/old/modules/ExpGamingPlayer/inventorySearch/control.lua +++ /dev/null @@ -1,92 +0,0 @@ ---- Adds an inventory search that is preformed on a random player every 15 seconds --- @module ExpGamingPlayer.inventorySearch@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- Module Require -local Admin = require('ExpGamingAdmin') -local Role -- ExpGamingCore.Role@^4.0.0 - --- Local Variables --- removed from none admin ranks, no further action -local low_items = { - 'loader', - 'fast-loader', - 'express-loader', - 'small-plane', - 'player-port', - 'coin', - 'programmable-speaker', - 'logistic-chest-active-provider' -} - --- removed for admin and non-admin ranks, gives warnings to non-admins -local med_items = { - 'railgun', - 'railgun-dart', - 'belt-immunity-equipment' -} - --- temp-ban for any rank, this is a very hard enforcement, admin ranks lose rank -local high_items = { - 'electric-energy-interface', - 'infinity-chest' -} - --- inventories which are searched -local inventories = { - defines.inventory.player_main, - defines.inventory.player_quickbar, - defines.inventory.player_trash -} - -local _root_tree = {low_items=low_items,med_items=med_items,high_items=high_items} - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end - end -} - --- Function Define -local function take_action(player,item_name,category) - if category == 'low_items' then player_return({'ExpGamingPlayer-inventorySearch.low',item_name},defines.textcolor.med,player) - elseif category == 'med_items' then player_return({'ExpGamingPlayer-inventorySearch.med',item_name},defines.textcolor.high,player) Admin.give_warning(player,'','Found A Banned Item',5) - elseif category == 'high_items' then player_return({'ExpGamingPlayer-inventorySearch.high',item_name},defines.textcolor.crit,player) Admin.temp_ban(player,'','Found A Banned Item') - else return end -end - -function ThisModule.search_player(player) - for category,items in pairs(_root_tree) do - if not Role or category ~= 'low_items' and not Role.allowed(player,'admin-items') then - for _,_inventory in pairs(inventories) do - local inventory = player.get_inventory(_inventory) - if inventory then - for _,item in pairs(items) do - local found = inventory.remove(item) - if found > 0 then take_action(player,item,category) end - end - end - end - end - end -end - --- Event Handlers Define -Event.add(defines.events.on_tick,function(event) - if (game.tick%900) == 0 then - local players = game.connected_players - if #players == 0 then return end - local player = players[math.random(#players)] - if Role and Role.allowed(player,'all-items') then return end - ThisModule.search_player(player) - end -end) - --- Module Return -return setmetatable(ThisModule,{ - __call=function(self,...) self.search_player(...) end -}) \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/inventorySearch/locale/de.cfg b/old/modules/ExpGamingPlayer/inventorySearch/locale/de.cfg deleted file mode 100644 index 895707f4..00000000 --- a/old/modules/ExpGamingPlayer/inventorySearch/locale/de.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingPlayer-inventorySearch] -low=Dein Inventar wurde durchsucht und __1__ wurde entfernt. -med=Dein Inventar wurde durchsucht und __1__ wurde entfernt. Dir wird hiermit eine Warnung erteilt! Versuche es nicht erneut! -high=Dein inventar wurde durchsucht und __1__ wurde gefunden, dies ist auf GAR KEINEN Fall erlaubt, dein Inventar wurde zum Spawnpunkt transferiert. \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/inventorySearch/locale/en.cfg b/old/modules/ExpGamingPlayer/inventorySearch/locale/en.cfg deleted file mode 100644 index 0c45c5b1..00000000 --- a/old/modules/ExpGamingPlayer/inventorySearch/locale/en.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingPlayer-inventorySearch] -low=Your inventory was searched and __1__ was removed. -med=Your inventory was searched and __1__ was removed, you have been given a warning as a result. -high=Your inventory was searched and __1__ was removed: this is NOT allowed. You have been temp-banned as a result. \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/inventorySearch/locale/fr.cfg b/old/modules/ExpGamingPlayer/inventorySearch/locale/fr.cfg deleted file mode 100644 index 4d3eb1e4..00000000 --- a/old/modules/ExpGamingPlayer/inventorySearch/locale/fr.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingPlayer-inventorySearch] -low=Your Inventory Was Search And __1__ was removed. -med=Your Inventory Was Search And __1__ was removed, you have been given a warning. -high=Your Inventory Was Search And __1__ was found, this is not allowed AT ALL, your inventory has been moved to spawn. \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/inventorySearch/locale/nl.cfg b/old/modules/ExpGamingPlayer/inventorySearch/locale/nl.cfg deleted file mode 100644 index 2c6b6a60..00000000 --- a/old/modules/ExpGamingPlayer/inventorySearch/locale/nl.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingPlayer-inventorySearch] -low=Je inventaris is doorzocht en __1__ is verwijderd. -med=Je inventaris is doorzocht en __1__ is verwijderd, je bent gewaarschuwd. -high=Je inventaris is doorzocht en __1__ is gevonden, dit is ten strengste verboden! Je inventaris is verwijderd. diff --git a/old/modules/ExpGamingPlayer/inventorySearch/locale/sv-SE.cfg b/old/modules/ExpGamingPlayer/inventorySearch/locale/sv-SE.cfg deleted file mode 100644 index ff5995b3..00000000 --- a/old/modules/ExpGamingPlayer/inventorySearch/locale/sv-SE.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[ExpGamingPlayer-inventorySearch] -low=Ditt inventarie blev genomsökt och __1__ togs bort. -med=Ditt inventarie blev genomsökt och __1__ togs bort, du har fått en varning på grund av detta. -high=Ditt inventarie blev genomsökt och __1__ togs bort: Det här är inte tillåtet. Som ett resultat av det har du blivit tillfälligt bannlyst. diff --git a/old/modules/ExpGamingPlayer/inventorySearch/softmod.json b/old/modules/ExpGamingPlayer/inventorySearch/softmod.json deleted file mode 100644 index 17f251c0..00000000 --- a/old/modules/ExpGamingPlayer/inventorySearch/softmod.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "ExpGamingPlayer.inventorySearch", - "version": "4.0.0", - "description": "Adds an inventory search that is proformed on a random player every 15 seconds.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Search", - "ExpGaming", - "Player", - "Inventory" - ], - "dependencies": { - "ExpGamingLib": "^4.0.0", - "ExpGamingAdmin.TempBan": "^4.0.0", - "ExpGamingAdmin.Warnings": "^4.0.0", - "ExpGamingCore.Role": "?^4.0.0", - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingAdmin": "^4.0.0" - }, - "collection": "ExpGamingPlayer@4.0.0", - "submodules": {} -} diff --git a/old/modules/ExpGamingPlayer/playerInfo/control.lua b/old/modules/ExpGamingPlayer/playerInfo/control.lua deleted file mode 100644 index cd68d962..00000000 --- a/old/modules/ExpGamingPlayer/playerInfo/control.lua +++ /dev/null @@ -1,58 +0,0 @@ ---- Used to give so common info on a player as a lua table or a frame. --- @module ExpGamingPlayer.playerInfo@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - -local Game = require('FactorioStdLib.Game') -local Gui = require('ExpGamingCore.Gui') -local Role -- ExpGamingCore.Role@^4.0.0 -local Group -- ExpGamingCore.Group@^4.0.0 - -local function get_player_info(player,frame,add_cam) - player = Game.get_player(player) - if not player then return {} end - local _player = {} - _player.index = player.index - _player.name = player.name - _player.online = player.connected - _player.tag = player.tag - _player.color = player.color - _player.admin = player.admin - _player.online_time = player.online_time - _player.group = player.permission_group.name - if Role then - _player.highest_role = Role.get_highest(player).name - local roles = {}; for _,role in pairs(Role.get(player)) do table.insert(roles,role.name) end - _player.roles = roles - end - if frame then - frame = frame.add{type='frame',direction='vertical',style='image_frame'} - frame.style.width = 200 - if Role then frame.style.height = 300 - else frame.style.height = 260 end - frame.add{type='label',caption={'ExpGamingPlayer-playerInfo.name',_player.index,_player.name},style='caption_label'} - local _online = {'ExpGamingPlayer-playerInfo.no'}; if _player.online then _online = {'ExpGamingPlayer-playerInfo.yes'} end - frame.add{type='label',caption={'ExpGamingPlayer-playerInfo.online',_online,tick_to_display_format(_player.online_time)}} - local _admin = {'ExpGamingPlayer-playerInfo.no'}; if _player.admin then _admin = {'ExpGamingPlayer-playerInfo.yes'} end - frame.add{type='label',caption={'ExpGamingPlayer-playerInfo.admin',_admin}} - if Role then - frame.add{type='label',caption={'ExpGamingPlayer-playerInfo.group',_player.group}} - frame.add{type='label',caption={'ExpGamingPlayer-playerInfo.role',_player.highest_role}} - frame.add{type='label',caption={'ExpGamingPlayer-playerInfo.roles',table.concat(_player.roles,', ')}}.style.single_line = false - end - if add_cam then - Gui.cam_link{entity=player.character,frame=frame,width=200,height=150,zoom=0.5,respawn_open=true} - end - end - return _player -end - -return setmetatable({ - get_player_info=get_player_info, - on_init=function(self) - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end - if loaded_modules['ExpGamingCore.Group'] then Group = require('ExpGamingCore.Group') end - end -},{ - __call=function(self,...) return self.get_player_info(...) end -}) \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/playerInfo/locale/de.cfg b/old/modules/ExpGamingPlayer/playerInfo/locale/de.cfg deleted file mode 100644 index 1d52251f..00000000 --- a/old/modules/ExpGamingPlayer/playerInfo/locale/de.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[ExpGamingPlayer-playerInfo] -yes=Ja -no=Nein -name=[__1__] __2__ -online=Ist online: __1__ (__2__) -admin=Hat Admin Rang: __1__ -group=In Benutzer Gruppe: __1__ -role=Hat Rang: __1__ \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/playerInfo/locale/en.cfg b/old/modules/ExpGamingPlayer/playerInfo/locale/en.cfg deleted file mode 100644 index 4bbc1f12..00000000 --- a/old/modules/ExpGamingPlayer/playerInfo/locale/en.cfg +++ /dev/null @@ -1,9 +0,0 @@ -[ExpGamingPlayer-playerInfo] -yes=Yes -no=No -name=[__1__] __2__ -online=Is Online: __1__ (__2__) -admin=Has Admin: __1__ -group=In User Group: __1__ -role=Highest Role: __1__ -roles=Other Roles: __1__ \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/playerInfo/locale/fr.cfg b/old/modules/ExpGamingPlayer/playerInfo/locale/fr.cfg deleted file mode 100644 index 257168f7..00000000 --- a/old/modules/ExpGamingPlayer/playerInfo/locale/fr.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[ExpGamingPlayer-playerInfo] -yes=Yes -no=No -name=[__1__] __2__ -online=Is Online: __1__ (__2__) -admin=Has Admin: __1__ -group=In User Group: __1__ -role=Has Rank: __1__ \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/playerInfo/locale/nl.cfg b/old/modules/ExpGamingPlayer/playerInfo/locale/nl.cfg deleted file mode 100644 index 931736ee..00000000 --- a/old/modules/ExpGamingPlayer/playerInfo/locale/nl.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[ExpGamingPlayer-playerInfo] -yes=Ja -no=Nee -name=[__1__] __2__ -online=Is Online: __1__ (__2__) -admin=Heeft Admin: __1__ -group=In Groep: __1__ -role=Heeft Rank: __1__ diff --git a/old/modules/ExpGamingPlayer/playerInfo/locale/sv-SE.cfg b/old/modules/ExpGamingPlayer/playerInfo/locale/sv-SE.cfg deleted file mode 100644 index 5a4406ae..00000000 --- a/old/modules/ExpGamingPlayer/playerInfo/locale/sv-SE.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[ExpGamingPlayer-playerInfo] -yes=Ja -no=Nej -name=[__1__] __2__ -online=Är Online: __1__ (__2__) -admin=Har Admin: __1__ -group=I användargrupp: __1__ -role=Har rang: __1__ diff --git a/old/modules/ExpGamingPlayer/playerInfo/softmod.json b/old/modules/ExpGamingPlayer/playerInfo/softmod.json deleted file mode 100644 index 2fda8414..00000000 --- a/old/modules/ExpGamingPlayer/playerInfo/softmod.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "ExpGamingPlayer.playerInfo", - "version": "4.0.0", - "description": "Used to give so common info on a player as a lua table or a frame.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Cam", - "Follow", - "Player", - "Info", - "Useful" - ], - "dependencies": { - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Gui": "^4.0.0", - "ExpGamingCore.Role": "?^4.0.0", - "ExpGamingCore.Group": "?^4.0.0" - }, - "collection": "ExpGamingPlayer@4.0.0", - "submodules": {} -} diff --git a/old/modules/ExpGamingPlayer/polls/control.lua b/old/modules/ExpGamingPlayer/polls/control.lua deleted file mode 100644 index fa9ed01e..00000000 --- a/old/modules/ExpGamingPlayer/polls/control.lua +++ /dev/null @@ -1,274 +0,0 @@ ---- Adds a poll gui into the game for quick polls (default 90 seconds) --- @module ExpGamingPlayer.polls@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - --- Module Require -local Server = require('ExpGamingCore.Server') -local Gui = require('ExpGamingCore.Gui') -local Role -- ExpGamingCore.Server@^4.0.0 - --- Local Variables -local poll_time_out = 90 -- In seconds - --- Module Define -local module_verbose = false -local ThisModule = { - on_init=function() - if loaded_modules['ExpGamingCore.Role'] then Role = require('ExpGamingCore.Role') end - end -} - --- Global Define -local global = { - active={}, - old={} -} -Global.register(global,function(tbl) global = tbl end) - --- Function Define -local function _poll_data(question,answers) - local rtn_poll = { - uuid=Server.uuid(), - question=question, - answers=answers or {'None'}, - votes={}, - voted={} - } - Server.new_thread{ - data={poll_uuid=rtn_poll.uuid}, - timeout=poll_time_out*60 - }:on_event('timeout',function(self) - local uuid = tostring(self.data.poll_uuid) - local poll = global.active[uuid] - if not poll then return end - local highest = {nil,-1} - local _votes = {} - for index,answer in pairs(poll.answers) do - local _result = poll.votes[index] or 0 - if _result > highest[2] then highest = {answer,_result} end - _votes[answer] = _result - end - poll.uuid = nil - poll.votes = _votes - poll.answers = nil - poll.voted = nil - table.insert(global.old,poll) - global.active[uuid] = nil - game.print({'ExpGamingPlayer-polls.end',poll.question},defines.textcolor.info) - game.print({'ExpGamingPlayer-polls.winner',highest[1]},defines.textcolor.info) - verbose('Ended Poll: '..poll.question..' ('..uuid..') Highest: '..highest[1]) - end):open() - global.active[tostring(rtn_poll.uuid)]=rtn_poll - verbose('Created Poll: '..question..' ('..rtn_poll.uuid..')') - return rtn_poll.uuid -end - -local function draw_poll(frame) - frame.clear() - local index = tonumber(frame.parent.current_index.caption) - local poll = global.old[index] - if not poll then - frame.add{ - type='label', - caption={'ExpGamingPlayer-polls.no-poll'} - } - return - end - frame.add{ - type='label', - caption='Question: '..poll.question - } - for answer,votes in pairs(poll.votes) do - frame.add{ - type='label', - caption=answer..') '..votes - } - end -end - -local function _options(player,root_frame) - local options = {'Please Select An option'} - local uuid = root_frame.name - local poll = global.active[uuid] - if not poll then return {'Invalid Poll'} end - for _,answer in pairs(poll.answers) do - table.insert(options,answer) - end - return options -end - -local option_drop_down = Gui.inputs.add_drop_down('option-drop-down-polls',_options,1,function(player,selected,items,element) - local uuid = element.parent.name - local poll = global.active[uuid] - if not poll then return end - if poll.voted[player.index] and poll.voted[player.index] > 1 then - local old_vote = poll.voted[player.index] - poll.votes[old_vote-1] = poll.votes[old_vote-1] and poll.votes[old_vote-1]-1 or 0 - end - if element.selected_index > 1 then - poll.votes[element.selected_index-1] = poll.votes[element.selected_index-1] and poll.votes[element.selected_index-1]+1 or 1 - end - poll.voted[player.index]=element.selected_index - element.parent.answer.caption = 'Your Answer: '..selected -end) - -local prev = Gui.inputs{ - type='button', - name='prev-poll', - caption='utility/hint_arrow_left' -}:on_event('click',function(event) - local parent = event.element.parent - local index = parent.parent.current_index.caption - local _index = tonumber(index)-1 - if _index < 1 then _index = #global.old end - parent.parent.current_index.caption = _index - parent.parent.title.title.caption = 'Viewing Poll: '.._index - draw_poll(parent.parent.poll_area) -end) - -local next = Gui.inputs{ - type='button', - name='next-poll', - caption='utility/hint_arrow_right' -}:on_event('click',function(event) - local parent = event.element.parent - local index = parent.parent.current_index.caption - local _index = tonumber(index)+1 - if _index > #global.old then _index = 1 end - parent.parent.current_index.caption = _index - parent.parent.title.title.caption = 'Viewing Poll: '.._index - draw_poll(parent.parent.poll_area) -end) - -local poll_question_input = Gui.inputs.add_text('poll-question-input',true,'Question',function(player,text,element) - local options = element.parent.options - if not options.question then options.add{type='label',name='question',caption=''} - else options.question.caption = text end -end) - -local _self_reference_poll_option_input = nil -local poll_option_input = Gui.inputs.add_text('poll-option-input',true,'Enter Option',function(player,text,element) - local options = element.parent.parent.parent.options - if not options[element.parent.name] then options.add{type='label',name=element.parent.name,caption=text} - else options[element.parent.name].caption = text end - if options.last.caption == element.parent.name then - options.last.caption = tonumber(options.last.caption)+1 - _self_reference_poll_option_input(element.parent.parent.add{type='flow',name=options.last.caption}).style.minimal_width = 200 - end -end) -_self_reference_poll_option_input = poll_option_input - -local function poll_assembler(frame) - frame.clear() - local options = frame.add{type='flow',name='options'} - options.style.visible = false - options.add{type='label',name='last',caption='2'} - poll_question_input(frame).style.minimal_width = 200 - local flow = frame.add{type='flow',direction='vertical'} - poll_option_input(flow.add{type='flow',name='1'}).style.minimal_width = 200 - poll_option_input(flow.add{type='flow',name='2'}).style.minimal_width = 200 -end - -local create_poll = Gui.inputs{ - type='button', - name='create-poll', - caption='utility/add' -}:on_event('click',function(event) - local parent = event.element.parent - if event.element.sprite == 'utility/enter' then - local inputs = parent.parent.poll_area.options - if not inputs then - event.element.sprite = 'utility/add' - draw_poll(parent.parent.poll_area) - return - end - local options = {} - for _,option in pairs(inputs.children) do - if option.name ~= 'question' and option.name ~= 'last' then - if option.caption ~= 'Enter Option' and option.caption ~= '' then table.insert(options,option.caption) end - end - end - if not inputs.question or #options == 0 then - event.element.sprite = 'utility/add' - draw_poll(parent.parent.poll_area) - return - end - local uuid = _poll_data(inputs.question.caption,options) - Gui.popup.open('polls',{uuid=uuid}) - event.element.sprite = 'utility/add' - draw_poll(parent.parent.poll_area) - else - event.element.sprite = 'utility/enter' - poll_assembler(parent.parent.poll_area) - end -end) - -ThisModule.Gui = Gui.popup{ - name='polls', - caption={'ExpGamingPlayer-polls.name'}, - draw=function(self,frame,data) - frame.style.right_padding = 5 - frame.style.bottom_padding = 5 - local uuid = data.uuid - local poll = global.active[tostring(uuid)] - if not poll then return end - local flow = frame.add{ - type='flow', - name=tostring(uuid), - direction='vertical' - } - flow.add{type='label',caption={'ExpGamingPlayer-polls.time-left',poll_time_out}} - flow.add{type='label',caption='Question: '..poll.question} - flow.add{type='label',name='answer',caption='Your Answer: None'} - option_drop_down(flow) - end -}:add_left{ - caption='utility/item_editor_icon', - tooltip={'ExpGamingPlayer-polls.tooltip'}, - draw=function(self,frame) - frame.caption={'ExpGamingPlayer-polls.name'} - frame.add{ - type='label', - name='current_index', - caption=1 - }.style.visible = false - local title = frame.add{ - type='flow', - name='title' - } - local btn = prev:draw(title) - btn.style.width = 20 - btn.style.height = 20 - title.add{ - type='label', - name='title', - caption='Viewing Poll: 1', - style='caption_label' - } - btn = next:draw(title) - btn.style.width = 20 - btn.style.height = 20 - if Role and Role.allowed(frame.player_index,'create-poll') or game.players[frame.player_index].admin then - btn = create_poll:draw(title) - btn.style.width = 20 - btn.style.height = 20 - end - local flow = frame.add{ - type='flow', - name='poll_area', - direction='vertical' - } - draw_poll(flow) - end, - can_open=function(player) - if #global.old > 0 then return true - elseif Role and Role.allowed(player,'create-poll') or player.admin then return true - else return {'ExpGamingPlayer-polls.no-poll'} end - end -} --- Event Handlers Define - --- Module Return --- when called it will toggle the left gui for this player -return setmetatable(ThisModule,{__call=function(self,...) self.Gui(...) end}) \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/polls/locale/de.cfg b/old/modules/ExpGamingPlayer/polls/locale/de.cfg deleted file mode 100644 index b476a903..00000000 --- a/old/modules/ExpGamingPlayer/polls/locale/de.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ExpGamingPlayer-polls] -name=Umfragen -tooltip=Alte Umfragen ansehen -no-poll=Keine alten Umfragen -end=Die Umfrage hat gerade geendet: __1__ -winner=__1__ hatte die meisten Stimmen. -time-left=Du hast noch __1__s um deine Wahl zu erfassen. \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/polls/locale/en.cfg b/old/modules/ExpGamingPlayer/polls/locale/en.cfg deleted file mode 100644 index afd15bf3..00000000 --- a/old/modules/ExpGamingPlayer/polls/locale/en.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ExpGamingPlayer-polls] -name=Polls -tooltip=View Old Polls -no-poll=No Old Polls -end=Poll Just Ended: __1__ -winner=__1__ had the most votes. -time-left=You will have __1__s to pick. \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/polls/locale/fr.cfg b/old/modules/ExpGamingPlayer/polls/locale/fr.cfg deleted file mode 100644 index afd15bf3..00000000 --- a/old/modules/ExpGamingPlayer/polls/locale/fr.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ExpGamingPlayer-polls] -name=Polls -tooltip=View Old Polls -no-poll=No Old Polls -end=Poll Just Ended: __1__ -winner=__1__ had the most votes. -time-left=You will have __1__s to pick. \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/polls/locale/nl.cfg b/old/modules/ExpGamingPlayer/polls/locale/nl.cfg deleted file mode 100644 index 928ddefb..00000000 --- a/old/modules/ExpGamingPlayer/polls/locale/nl.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ExpGamingPlayer-polls] -name=Polls -tooltip=Laat oude polls zien -no-poll=Geen oude polls -end=Poll is zojuist beëindigd: __1__ -winner=__1__ had de meeste stemmen. -time-left=Je hebt __1__s om te kiezen. diff --git a/old/modules/ExpGamingPlayer/polls/locale/sv-SE.cfg b/old/modules/ExpGamingPlayer/polls/locale/sv-SE.cfg deleted file mode 100644 index e9050a52..00000000 --- a/old/modules/ExpGamingPlayer/polls/locale/sv-SE.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[ExpGamingPlayer-polls] -name=Undersökningar -tooltip=Se gamla undersökningar -no-poll=Inga gamla undersökningar -end=Röstning slutade nyss: __1__ -winner=__1__ hade flest röster. -time-left=Du kommer att få __1__s på dig att välja. \ No newline at end of file diff --git a/old/modules/ExpGamingPlayer/polls/softmod.json b/old/modules/ExpGamingPlayer/polls/softmod.json deleted file mode 100644 index d5c416b6..00000000 --- a/old/modules/ExpGamingPlayer/polls/softmod.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "ExpGamingPlayer.polls", - "version": "4.0.0", - "description": "Adds a poll gui into the game for quick polls (default 90 seconds)", - "location": "FSM_ARCHIVE", - "keywords": [ - "Polls", - "Poll", - "Question", - "Gui" - ], - "dependencies": { - "ExpGamingCore.Gui": "^4.0.0", - "ExpGamingCore.Server": "^4.0.0", - "ExpGamingCore.Role": "?^4.0.0" - }, - "collection": "ExpGamingPlayer@4.0.0", - "submodules": {} -} diff --git a/old/modules/ExpGamingPlayer/softmod.json b/old/modules/ExpGamingPlayer/softmod.json deleted file mode 100644 index e31dddb6..00000000 --- a/old/modules/ExpGamingPlayer/softmod.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "ExpGamingPlayer", - "version": "4.0.0", - "description": "Useful collection of modules for displaying player infomation.", - "location": "FSM_ARCHIVE", - "keywords": [ - "ExpGaming", - "Player", - "Information", - "AFK" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "submodules": { - "ExpGamingPlayer.afkKick": "4.0.0", - "ExpGamingPlayer.playerInfo": "4.0.0", - "ExpGamingPlayer.playerList": "4.0.0", - "ExpGamingPlayer.inventorySearch": "4.0.0", - "ExpGamingPlayer.polls": "4.0.0" - }, - "dependencies": {} -} diff --git a/old/modules/GameSettingsGui/control.lua b/old/modules/GameSettingsGui/control.lua deleted file mode 100644 index 2a447482..00000000 --- a/old/modules/GameSettingsGui/control.lua +++ /dev/null @@ -1,193 +0,0 @@ ---- A gui for controlling game settings with sliders as well as some global commands. --- @module GameSettingsGui@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE - --- Module Require -local Server = require('ExpGamingCore.Server') -local Gui = require('ExpGamingCore.Gui') - --- Local Variables ---{type='slider',object='',key='',name='',min=x,max=y} ---{type='function',object='',key='',name='',param={}} -local basic_settings = { - {type='slider',object='force',key='manual_mining_speed_modifier',name='mining-speed',min=0,max=10}, - {type='slider',object='force',key='manual_crafting_speed_modifier',name='craft-speed',min=0,max=10}, - {type='slider',object='force',key='character_running_speed_modifier',name='running-speed',min=0,max=10}, - {type='slider',object='force',key='character_build_distance_bonus',name='build-distance',min=0,max=50}, - {type='slider',object='force',key='character_reach_distance_bonus',name='reach-distance',min=0,max=50}, - {type='slider',object='force',key='worker_robots_speed_modifier',name='bot-speed',min=0,max=10}, - {type='slider',object='force',key='laboratory_speed_modifier',name='lab-speed',min=0,max=10}, - {type='slider',object='force',key='stack_inserter_capacity_bonus',name='stack-bonus',min=1,max=30} -} - -local advanced_settings = { - {type='slider',object='force',key='quickbar_count',name='quickbar-count',min=1,max=5}, - {type='slider',object='force',key='character_inventory_slots_bonus',name='inventory-size',min=0,max=1000}, - {type='slider',object='force',key='mining_drill_productivity_bonus',name='mining-prod',min=0,max=10}, - {type='slider',object='game',key='speed',name='game-speed',min=0.01,max=5}, - {type='function',object='surface',key='clear_pollution',name='clear-pollution'}, - {type='function',object='game',key='server_save',name='save'}, - {type='function',object='force',key='reset_technology_effects',name='reload-effects'}, - {type='function',object='enemy',key='kill_all_units',name='kill-biters'}, - {type='function',object='force',key='rechart',name='reload-map'}, - {type='function',object='game',key='force_crc',name='crc'}, - {type='function',object='force',key='reset',name='reset-force'} -} - -local personal_settings = { - {type='slider',object='player',key='character_mining_speed_modifier',name='mining-speed',min=0,max=10}, - {type='slider',object='player',key='character_crafting_speed_modifier',name='craft-speed',min=0,max=10}, - {type='slider',object='player',key='character_running_speed_modifier',name='running-speed',min=0,max=10}, - {type='slider',object='player',key='character_build_distance_bonus',name='build-distance',min=0,max=50}, - {type='slider',object='player',key='character_reach_distance_bonus',name='reach-distance',min=0,max=50}, - {type='slider',object='player',key='character_inventory_slots_bonus',name='inventory-size',min=0,max=1000}, - {type='slider',object='player',key='quickbar_count_bonus',name='quickbar-count',min=0,max=5} -} - -local _root_list = {basic_settings=basic_settings,advanced_settings=advanced_settings,personal_settings=personal_settings} - --- Module Define -local module_verbose = false -local ThisModule = {} - --- Function Define -local function _get_data(root_frame) - local object = root_frame.name - local key = root_frame.setting_name.caption - for _,setting in pairs(_root_list[object]) do - if key == setting.key then return setting end - end -end - -local function _object_list(player) return {game=game,player=player,force=player.force,enemy=game.forces['enemy'],surface=player.surface} end - -for name,group in pairs(_root_list) do - for key,setting in pairs(group) do - local _added = nil - if setting.type == 'slider' then - _added = Gui.inputs.add_slider('game-settings-'..setting.name,'horizontal',setting.min,setting.max, - function(player,root_frame) - local data = _get_data(root_frame) - local objects = _object_list(player) - local object = objects[data.object] - return object[data.key] or 1 - end, - function(player,value,percent,element) - local data = _get_data(element.parent) - local objects = _object_list(player) - local object = objects[data.object] - local _caption = string.format('%.2f',value); if value > 2 then _caption = string.format('%.2f',math.floor(value)) end - object[data.key] = tonumber(_caption) - element.parent.counter.caption = _caption - end - ) - elseif setting.type == 'function' then - _added = Gui.inputs.add_checkbox('game-settings-'..setting.name,true,nil,false,function(player,element) - local data = _get_data(element.parent.parent) - local objects = _object_list(player) - local object = objects[data.object] - -- if key is a function it will run the function rather than attempt to get a function - if is_type(data.key,'function') then pcall(data.key,object,unpack(data.params)) - else pcall(object[data.key],unpack(data.params)) end - Server.new_thread{ - timeout=60, - data=element - }:on_event('timeout',function(self) - if self.data and self.data.valid then - self.data.parent.parent['game-settings-are-you-sure'].state = false - self.data.parent.style.visible = false - self.data.state = false - end - end):open() - end) - if not setting.params then setting.params = {} end - end - setting._loaded = _added - setting._group = name - end -end - -local are_you_sure = Gui.inputs.add_checkbox('game-settings-are-you-sure',true,nil,false,function(player,element) - element.parent.sure.style.visible = true - Server.new_thread{ - timeout=600, - data=element - }:on_event('timeout',function(self) - if self.data and self.data.valid then - self.data.state = false - self.data.parent.sure.style.visible = false - end - end):open() -end) - -local function _draw_setting(frame,setting) - frame = frame.add{type='flow'}.add{ - type='flow', - name=setting._group - } - frame.add{ - type='label', - caption={'GameSettingsGui.effect-'..setting.name}, - style='caption_label' - } - frame.add{ - type='label', - caption=setting.key, - name='setting_name' - }.style.visible = false - if setting.type == 'slider' then - local slider = setting._loaded(frame) - slider.style.width = 300 - local _caption = string.format('%.2f',slider.slider_value); if slider.slider_value > 2 then _caption = tostring(math.floor(slider.slider_value)) end - frame.add{ - type='label', - name='counter', - caption=_caption - } - elseif setting.type == 'function' then - are_you_sure(frame) - local flow = frame.add{type='flow',name='sure'} - flow.style.visible = false - flow.add{ - type='label', - caption={'GameSettingsGui.sure'}, - style='bold_red_label' - } - setting._loaded(flow) - end -end - -ThisModule.Gui = Gui.center{ - name='game-settings', - caption='utility/no_building_material_icon', - tooltip={'GameSettingsGui.tooltip'} -}:add_tab('basic',{'GameSettingsGui.basic-name'},{'GameSettingsGui.basic-name'},function(frame) - frame.add{ - type='label', - caption={'GameSettingsGui.basic-message'} - }.style.single_line = false - for _,setting in pairs(basic_settings) do - _draw_setting(frame,setting) - end -end):add_tab('advanced',{'GameSettingsGui.advanced-name'},{'GameSettingsGui.advanced-tooltip'},function(frame) - frame.add{ - type='label', - caption={'GameSettingsGui.advanced-message'} - }.style.single_line = false - for _,setting in pairs(advanced_settings) do - _draw_setting(frame,setting) - end -end):add_tab('personal',{'GameSettingsGui.personal-name'},{'GameSettingsGui.personal-tooltip'},function(frame) - frame.add{ - type='label', - caption={'GameSettingsGui.personal-message'} - }.style.single_line = false - for _,setting in pairs(personal_settings) do - _draw_setting(frame,setting) - end -end) - --- Module return --- when called it will open the center gui for the player -return setmetatable(ThisModule,{__call=function(self,...) self.Gui(...) end}) \ No newline at end of file diff --git a/old/modules/GameSettingsGui/locale/de.cfg b/old/modules/GameSettingsGui/locale/de.cfg deleted file mode 100644 index dece78e7..00000000 --- a/old/modules/GameSettingsGui/locale/de.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[GameSettingsGui] -name=Spieleinstellungen -tooltip=Erlaubt das Modifizieren von Spieleinstellungen. Bitte mit Bedacht benutzen. -basic-name=Einfache Einstellungen -basic-tooltip=Diese Einstellungen sind ohne Probleme veränderbar, sie verursachen keine großen Probleme im nachhinein. -basic-message=Dies sind fraktionsweite Einstellungen, welche genutzt werden können um das Spiel zu vereinfachen und es für Alle angenehmer zu machen. -advanced-name=Erweiterte Einstellungen -advanced-tooltip=Diese Einstellungen sollten nicht von Leuten benutzt werden, die nicht wissen was sie tun. -advanced-message=Bitte ändere keine dieser Einstellungen ausser du bist dir 100% sicher was sie tun,lass game.speed allein, da es einen viel größeren Effekt hat als du denkst. -personal-name=Persönliche Einstellungen -personal-tooltip=Diese Einstellungen betreffen nur deinen Spieler. Wenn man dich beim cheaten erwischt bist du auf dich allein gestellt. -personal-message=Diese Einstellungen betreffen nur deinen Spieler, übertreib es nicht ansonsten besteht die Gefahr, dass dich normale Spieler (gierige Kleinkinder) dabei erwischen (und rumheulen). -sure=Bist du dir Sicher?! -effect-mining-speed=Abbaugeschwindigkeit -effect-craft-speed=Herstellgeschwindigkeit -effect-running-speed=Laufgeschwindigkeit -effect-build-distance=Baudistanz -effect-reach-distance=Armreichweite -effect-bot-speed=Robotergeschwindigkeit -effect-lab-speed=Laborgeschwindigkeit -effect-stack-bonus=Stapelnonuss -effect-quickbar-count=Anzahl Schnellleistenelemente -effect-inventory-size=Inventargröße -effect-mining-prod=Abbauproduktivität -effect-game-speed=Spielgeschwindigkeit -effect-save=Spiel speichern -effect-reload-effects=Effekte neu laden -effect-reload-map=Minimap neu laden -effect-kill-biters=Töte alle Beisser -effect-crc=Forciere CRC check -effect-reset-force=Fraktion zurücksetzen \ No newline at end of file diff --git a/old/modules/GameSettingsGui/locale/en.cfg b/old/modules/GameSettingsGui/locale/en.cfg deleted file mode 100644 index 54825990..00000000 --- a/old/modules/GameSettingsGui/locale/en.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[GameSettingsGui] -name=Game Settings -tooltip=Edits Game Settings. Please use responsibly. -basic-name=Basic Settings -basic-tooltip=These settings are safe to edit and have no big impact. -basic-message=Basic Settings can be used to improve game play for players. -advanced-name=Advanced Settings -advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch the Advanced Settings unless you are 100% sure what you are doing: changes made to these settings might have a bigger impact than you realise. -personal-name=Personal Settings -personal-tooltip=Personal Settings only affect you. -personal-message=Personal Settings only affect your character. If you are spotted as a result of these settings, you are on your own! -sure=Are you sure? -effect-mining-speed=Mining Speed -effect-craft-speed=Crafting Speed -effect-running-speed=Running Speed -effect-build-distance=Build Distance -effect-reach-distance=Reach Distance -effect-bot-speed=Bot Speed -effect-lab-speed=Lab Speed -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory Size -effect-mining-prod=Mining Productivity -effect-game-speed=Game Speed -effect-save=Save Game -effect-reload-effects=Reload Effects -effect-reload-map=Reload Minimap -effect-kill-biters=Kill Biters -effect-crc=Force CRC Check -effect-reset-force=Reset Force -effect-clear-pollution=Clear Pollution \ No newline at end of file diff --git a/old/modules/GameSettingsGui/locale/fr.cfg b/old/modules/GameSettingsGui/locale/fr.cfg deleted file mode 100644 index f13485d0..00000000 --- a/old/modules/GameSettingsGui/locale/fr.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[GameSettingsGui] -name=Game Settings -tooltip=Allows for editing of the game settings, please use resposibliy. -basic-name=Basic Settings -basic-tooltip=These settings are safe to change with no large effects. -basic-message=These settings are force wide settings which can be used to inprove gameplay and make it more enjoyible for players. -advanced-name=Advanced Settings -advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch these settings at all unless you know 100% what they do and the effect of using them, leave game.speed alone it has a bigger effect then you think. -personal-name=Personal Settings -personal-tooltip=These will only effect you, if you are spoted you are on your own. -personal-message=These settings will only effect your player any changes you make are to be resposible ones and dont over do it or you may be caught using them. -sure=Are You Sure! -effect-mining-speed=Mining Speed -effect-craft-speed=Crafting Speed -effect-running-speed=Running Speed -effect-build-distance=Build Distance -effect-reach-distance=Reach Distance -effect-bot-speed=Bot Speed -effect-lab-speed=Lab Speed -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory Size -effect-mining-prod=Mining Productivity -effect-game-speed=Game Speed -effect-save=Save Game -effect-reload-effects=Reload Effects -effect-reload-map=Reload Minimap -effect-kill-biters=Kill Biters -effect-crc=Force CRC Check -effect-reset-force=Reset Force \ No newline at end of file diff --git a/old/modules/GameSettingsGui/locale/nl.cfg b/old/modules/GameSettingsGui/locale/nl.cfg deleted file mode 100644 index 19017a6b..00000000 --- a/old/modules/GameSettingsGui/locale/nl.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[GameSettingsGui] -name=Game instellingen -tooltip=Maakt het mogelijk om gameinstellingen te wijzigen. Gebruik het verantwoord! -basic-name=Basis instellingen -basic-tooltip=Deze instellingen kunnen veilig worden gewijzigd. -basic-message=Deze instellingen kunnen worden gebruikt om het spelervaring voor de spelers te verbeteren. -advanced-name=Geavanceerde instellingen -advanced-tooltip=Het is ten zeerste aangeraden om niet aan deze instellingen te zitten, tenzij je weet wat je doet. -advanced-message=Waarschuwing: Niet aan deze instellingen zitten tenzij je honderd procent zeker weet wat je aan het doen bent. Het wijzigen van deze instellingen kunnen een groter effect hebben dan je denkt. -personal-name=Persoonlijke instellingen -personal-tooltip=Deze instellingen hebben alleen effect op jouw speler. -personal-message=Deze instellingen hebben alleen effect op jouw speler: gebruik het verantwoord, aangezien het overmatig gebruik van deze instellingen niet zijn toegestaan. -sure=Weet je het zeker? -effect-mining-speed=Mining Snelheid -effect-craft-speed=Crafting Snelheid -effect-running-speed=Ren Snelheid -effect-build-distance=Bouwafstand -effect-reach-distance=Bereik -effect-bot-speed=Bot Snelheid -effect-lab-speed=Lab Snelheid -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory grootte -effect-mining-prod=Mining Productiviteit -effect-game-speed=Gamesnelheid -effect-save=Opslaan -effect-reload-effects=Effecten herladen -effect-reload-map=Minimap herladen -effect-kill-biters=Biters vermoorden -effect-crc=Forceer CRC check -effect-reset-force=Forceren resetten diff --git a/old/modules/GameSettingsGui/locale/sv-SE.cfg b/old/modules/GameSettingsGui/locale/sv-SE.cfg deleted file mode 100644 index 88185c07..00000000 --- a/old/modules/GameSettingsGui/locale/sv-SE.cfg +++ /dev/null @@ -1,31 +0,0 @@ -[GameSettingsGui] -name=Game Settings -tooltip=Edits Game Settings. Please use responsibly. -basic-name=Basic Settings -basic-tooltip=These settings are safe to edit and have no big impact. -basic-message=Basic Settings can be used to improve game play for players. -advanced-name=Advanced Settings -advanced-tooltip=These settings should be left alone unless you know what you are doing. -advanced-message=Please do not touch the Advanced Settings unless you are 100% sure what you are doing: changes made to these settings might have a bigger impact than you realize. -personal-name=Personal Settings -personal-tooltip=Personal Settings only affects you. -personal-message=Personal Settings only affects your character. If you are spotted as a result of these settings, you are on your own! -sure=Are you sure? -effect-mining-speed=Mining Speed -effect-craft-speed=Crafting Speed -effect-running-speed=Running Speed -effect-build-distance=Build Distance -effect-reach-distance=Reach Distance -effect-bot-speed=Bot Speed -effect-lab-speed=Lab Speed -effect-stack-bonus=Stack Bonus -effect-quickbar-count=Quickbar Count -effect-inventory-size=Inventory Size -effect-mining-prod=Mining Productivity -effect-game-speed=Game Speed -effect-save=Save Game -effect-reload-effects=Reload Effects -effect-reload-map=Reload Minimap -effect-kill-biters=Kill Biters -effect-crc=Force CRC Check -effect-reset-force=Reset Force diff --git a/old/modules/GameSettingsGui/softmod.json b/old/modules/GameSettingsGui/softmod.json deleted file mode 100644 index 2e09943f..00000000 --- a/old/modules/GameSettingsGui/softmod.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "GameSettingsGui", - "version": "4.0.0", - "description": "A gui for controlling game settings with sliders as well as some global commands.", - "location": "FSM_ARCHIVE", - "keywords": [ - "Gui", - "Game", - "Game Settings", - "Settings", - "Admin" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": { - "ExpGamingCore.Server": "^4.0.0", - "ExpGamingCore.Gui": "^4.0.0" - }, - "submodules": {} -} diff --git a/old/modules/GuiAnnouncements/control.lua b/old/modules/GuiAnnouncements/control.lua deleted file mode 100644 index d1a434d2..00000000 --- a/old/modules/GuiAnnouncements/control.lua +++ /dev/null @@ -1,110 +0,0 @@ ---- Creates a gui for making and receiving announcements --- @module GuiAnnouncements@4.0.0 --- @author Cooldude2606 --- @license https://github.com/explosivegaming/scenario/blob/master/LICENSE --- @alias ThisModule - --- maybe make this not require Role and have it optional - --- Module Require -local Game = require('FactorioStdLib.Game') -local Gui = require('ExpGamingCore.Gui') -local Role = require('ExpGamingCore.Role') - --- Module Define -local module_verbose = false -local ThisModule = {} - --- Function Define -local function _roles(player) - local roles = {'Select Role'} - local _role = Role.get_highest(player) - for index,role_name in pairs(Role.order) do - if index >= _role.index then - table.insert(roles,role_name) - end - end - return roles -end - -local role_drop_down = Gui.inputs.add_drop_down('rank-drop-down-announcements',_roles,1,function(player,selected,items,element) - element.parent.role.caption = selected - if selected == 'Select Role' then element.parent['send-announcement'].style.visible = false - else element.parent['send-announcement'].style.visible = true end -end) - -local send_popup = Gui.inputs{ - type='button', - name='send-announcement', - caption='utility/export_slot' -}:on_event('click',function(event) - local player = Game.get_player(event) - local role = Role.get_highest(player) - local _role = Role.get(event.element.parent.role.caption); if not _role then return end - local sent_by = {'GuiAnnouncements.sent-by',player.name,role.name} - local role_name = _role.name..'s'; if role_name == Role.meta.default.name..'s' then role_name = 'Everyone' end - local sent_to = {'GuiAnnouncements.sent-to',role_name} - local message = event.element.parent.parent.message.text - local players = _role:get_players(true) - if _role.index == Role.meta.default.index then players = game.connected_players end - Gui.popup.open('announcements',{sent_by=sent_by,sent_to=sent_to,message=message},players) - player_return('Announcement sent to '..#players..' players ('..role_name..')',defines.textcolor.info,player) - verbose('Announcement sent to '..#players..' players ('..role_name..') by '..player.name..'('..role.name..') with message: '..message) - event.element.parent.parent.message.text = '' - Gui.left.close('announcements',player) -end) - -ThisModule.Gui = Gui.popup{ - name='announcements', - caption={'GuiAnnouncements.name'}, - draw=function(self,frame,data) - frame.style.right_padding = 5 - frame.style.bottom_padding = 5 - frame.add{type='label',caption=data.sent_by,style='caption_label'} - frame.add{type='label',caption=data.sent_to,style='caption_label'} - local text_box = frame.add{type='text-box'} - text_box.text = data.message - text_box.style.width = 400 - text_box.read_only = true - text_box.word_wrap = true - text_box.selectable = true - end -}:add_left{ - caption='item/programmable-speaker', - tooltip={'GuiAnnouncements.tooltip'}, - draw=function(self,frame) - frame.caption = {'GuiAnnouncements.name'} - frame = frame.add{ - type='flow', - direction='vertical' - } - local text_box = frame.add{ - type='text-box', - name='message' - } - text_box.style.width = 400 - text_box.style.minimal_height = 100 - text_box.read_only = false - text_box.word_wrap = true - text_box.selectable = true - local flow = frame.add{type='flow'} - flow.add{ - type='label', - caption={'GuiAnnouncements.select-rank'} - } - role_drop_down(flow) - local btn = send_popup(flow) - btn.style.visible = false - btn.style.height = 25 - btn.style.width = 25 - flow.add{ - type='label', - name='role', - caption='' - }.style.visible = false - end -} - --- Module return --- when called it will open the center gui for the player -return setmetatable(ThisModule,{__call=function(self,...) self.Gui(...) end}) \ No newline at end of file diff --git a/old/modules/GuiAnnouncements/locale/de.cfg b/old/modules/GuiAnnouncements/locale/de.cfg deleted file mode 100644 index 9744da36..00000000 --- a/old/modules/GuiAnnouncements/locale/de.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[GuiAnnouncements] -name=Ankündigung -tooltip=Eine Ankündigung an Spieler senden -sent-to=Dies wurde zu __1__ gesendet -sent-by=Dies wurde von __1__ mit Rang __2__ gesendet -select-rank=Diese Nachricht wird gesendet an: \ No newline at end of file diff --git a/old/modules/GuiAnnouncements/locale/en.cfg b/old/modules/GuiAnnouncements/locale/en.cfg deleted file mode 100644 index be1e94da..00000000 --- a/old/modules/GuiAnnouncements/locale/en.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[GuiAnnouncements] -name=Announcements -tooltip=Sends an announcement to all players -sent-to=This announcement is sent to __1__ -sent-by=This announcement was sent by __1__ ( __2__ ) -select-rank=This announcement will be sent to: \ No newline at end of file diff --git a/old/modules/GuiAnnouncements/locale/fr.cfg b/old/modules/GuiAnnouncements/locale/fr.cfg deleted file mode 100644 index 11041b57..00000000 --- a/old/modules/GuiAnnouncements/locale/fr.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[GuiAnnouncements] -name=Announcement -tooltip=Sent an announcement to players -sent-to=This is sent to __1__ -sent-by=This was sent by __1__ of rank __2__ -select-rank=This message will be sent to: \ No newline at end of file diff --git a/old/modules/GuiAnnouncements/locale/nl.cfg b/old/modules/GuiAnnouncements/locale/nl.cfg deleted file mode 100644 index 5c92cc68..00000000 --- a/old/modules/GuiAnnouncements/locale/nl.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[GuiAnnouncements] -name=Mededelingen -tooltip=Verstuurt een mededeling naar iedereen -sent-to=Deze mededeling is gestuurd naar __1__ -sent-by=Deze mededeling is gestuurd door __1__ ( __2__ ) -select-rank=Deze mededeling wordt gestuurd naar: diff --git a/old/modules/GuiAnnouncements/locale/sv-SE.cfg b/old/modules/GuiAnnouncements/locale/sv-SE.cfg deleted file mode 100644 index 2b3a8317..00000000 --- a/old/modules/GuiAnnouncements/locale/sv-SE.cfg +++ /dev/null @@ -1,7 +0,0 @@ - -[GuiAnnouncements] -name=Meddelanden -tooltip=Sänder ett meddelande till alla spelare -sent-to=Det här meddelandet är skickat till __1__ -sent-by=Det här meddelandet är skickat av __1__ ( __2__ ) -select-rank=Det här meddelandet kommer att skickas till: diff --git a/old/modules/GuiAnnouncements/softmod.json b/old/modules/GuiAnnouncements/softmod.json deleted file mode 100644 index 9867fd84..00000000 --- a/old/modules/GuiAnnouncements/softmod.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "GuiAnnouncements", - "version": "4.0.0", - "description": "Creates a gui for making and reciving announcements", - "location": "FSM_ARCHIVE", - "keywords": [ - "Announcements", - "Gui", - "Admin" - ], - "author": "Cooldude2606", - "contact": "Discord: Cooldude2606#5241", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "dependencies": { - "FactorioStdLib.Game": "^0.8.0", - "ExpGamingCore.Role": "^4.0.0", - "ExpGamingCore.Gui": "^4.0.0" - }, - "submodules": {} -} diff --git a/old/modules/index.lua b/old/modules/index.lua deleted file mode 100644 index d48bd875..00000000 --- a/old/modules/index.lua +++ /dev/null @@ -1,67 +0,0 @@ --- not_luadoc=true ---- Used to index the files to be loaded -return { - ['AdvancedStartingItems']={'./modules/AdvancedStartingItems',}, - ['ChatPopup']={'./modules/ChatPopup','FactorioStdLib.Game','FactorioStdLib.Color'}, - ['DamagePopup']={'./modules/DamagePopup','FactorioStdLib.Color'}, - ['DeathMarkers']={'./modules/DeathMarkers',}, - ['DeconControl']={'./modules/DeconControl','ExpGamingCore.Server','FactorioStdLib.Game','ExpGamingLib'}, - ['ExpGamingAdmin']={'./modules/ExpGamingAdmin','FactorioStdLib.Game'}, - ['ExpGamingBot']={'./modules/ExpGamingBot',}, - ['ExpGamingCommands']={'./modules/ExpGamingCommands',}, - ['ExpGamingCore']={'./modules/ExpGamingCore',}, - ['ExpGamingInfo']={'./modules/ExpGamingInfo',}, - ['ExpGamingLib']={'./modules/ExpGamingLib','FactorioStdLib.Game','FactorioStdLib.Color','FactorioStdLib.Table'}, - ['ExpGamingPlayer']={'./modules/ExpGamingPlayer',}, - ['FactorioStdLib']={'./modules/FactorioStdLib',}, - ['GameSettingsGui']={'./modules/GameSettingsGui','ExpGamingCore.Server','ExpGamingCore.Gui'}, - ['GuiAnnouncements']={'./modules/GuiAnnouncements','FactorioStdLib.Game','ExpGamingCore.Role','ExpGamingCore.Gui'}, - ['PlayerAutoColor']={'./modules/PlayerAutoColor','FactorioStdLib.Color'}, - ['SpawnArea']={'./modules/SpawnArea','FactorioStdLib.Game'}, - ['WarpPoints']={'./modules/WarpPoints','FactorioStdLib.Game','ExpGamingCore.Gui'}, - ['WornPaths']={'./modules/WornPaths','FactorioStdLib.Game'}, - ['ExpGamingAdmin.Gui']={'./modules/ExpGamingAdmin/Gui','ExpGamingAdmin.AdminLib','ExpGamingCore.Gui','ExpGamingCore.Role','FactorioStdLib.Game','mod-gui'}, - ['ExpGamingAdmin.Ban']={'./modules/ExpGamingAdmin/Ban','ExpGamingAdmin.AdminLib','ExpGamingAdmin.Gui','ExpGamingCore.Server','FactorioStdLib.Game'}, - ['ExpGamingAdmin.Reports']={'./modules/ExpGamingAdmin/Reports','ExpGamingAdmin.AdminLib','ExpGamingCore.Server','ExpGamingCore.Role','FactorioStdLib.Game','ExpGamingCore.Gui'}, - ['ExpGamingAdmin.ClearInventory']={'./modules/ExpGamingAdmin/ClearInventory','ExpGamingAdmin.AdminLib','FactorioStdLib.Game'}, - ['ExpGamingAdmin.TempBan']={'./modules/ExpGamingAdmin/TempBan','ExpGamingAdmin.AdminLib','ExpGamingCore.Server','ExpGamingCore.Role','FactorioStdLib.Game'}, - ['ExpGamingAdmin.Teleport']={'./modules/ExpGamingAdmin/Teleport','ExpGamingAdmin.AdminLib','ExpGamingAdmin.Gui','FactorioStdLib.Game'}, - ['ExpGamingAdmin.Commands']={'./modules/ExpGamingAdmin/Commands','ExpGamingLib','ExpGamingCore.Command','ExpGamingAdmin.AdminLib'}, - ['ExpGamingAdmin.Jail']={'./modules/ExpGamingAdmin/Jail','ExpGamingAdmin.AdminLib','ExpGamingAdmin.Gui','ExpGamingCore.Server','ExpGamingCore.Role','FactorioStdLib.Game'}, - ['ExpGamingAdmin.Warnings']={'./modules/ExpGamingAdmin/Warnings','ExpGamingAdmin.AdminLib','ExpGamingCore.Server','ExpGamingCore.Role','FactorioStdLib.Game'}, - ['ExpGamingAdmin.Kick']={'./modules/ExpGamingAdmin/Kick','ExpGamingAdmin.AdminLib','ExpGamingAdmin.Gui','ExpGamingCore.Server','FactorioStdLib.Game'}, - ['ExpGamingBot.autoMessage']={'./modules/ExpGamingBot/autoMessage','ExpGamingCore.Server','FactorioStdLib.Game'}, - ['ExpGamingBot.discordAlerts']={'./modules/ExpGamingBot/discordAlerts','ExpGamingCore.Sync','FactorioStdLib.Color','FactorioStdLib.Game'}, - ['ExpGamingBot.autoChat']={'./modules/ExpGamingBot/autoChat','FactorioStdLib.Game','ExpGamingCore.Server'}, - ['ExpGamingCommands.cheatMode']={'./modules/ExpGamingCommands/cheatMode','ExpGamingCore.Command'}, - ['ExpGamingCommands.repair']={'./modules/ExpGamingCommands/repair','ExpGamingLib','FactorioStdLib.Game','ExpGamingCore.Role'}, - ['ExpGamingCommands.tags']={'./modules/ExpGamingCommands/tags','ExpGamingLib','ExpGamingCore.Command','FactorioStdLib.Game'}, - ['ExpGamingCommands.home']={'./modules/ExpGamingCommands/home','FactorioStdLib.Game','ExpGamingCore.Command'}, - ['ExpGamingCore.Command']={'./modules/ExpGamingCore/Command','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Color','FactorioStdLib.Game'}, - ['ExpGamingCommands.teleport']={'./modules/ExpGamingCommands/teleport','ExpGamingCore.Command','ExpGamingAdmin.Teleport','ExpGamingAdmin.AdminLib'}, - ['ExpGamingCommands.bonus']={'./modules/ExpGamingCommands/bonus','FactorioStdLib.Game','ExpGamingLib','ExpGamingCore.Command','ExpGamingCore.Role'}, - ['ExpGamingCommands.kill']={'./modules/ExpGamingCommands/kill','ExpGamingCore.Command','ExpGamingCore.Role','FactorioStdLib.Game'}, - ['ExpGamingCore.Server']={'./modules/ExpGamingCore/Server','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Color','FactorioStdLib.String','FactorioStdLib.Game'}, - ['ExpGamingCore.Gui']={'./modules/ExpGamingCore/Gui','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Color','FactorioStdLib.Game'}, - ['ExpGamingInfo.Science']={'./modules/ExpGamingInfo/Science','ExpGamingCore.Gui','FactorioStdLib.Game'}, - ['ExpGamingPlayer.playerList']={'./modules/ExpGamingPlayer/playerList','FactorioStdLib.Game','ExpGamingCore.Gui'}, - ['ExpGamingCore.Sync']={'./modules/ExpGamingCore/Sync','ExpGamingLib','FactorioStdLib.Color','FactorioStdLib.Game','FactorioStdLib.Table'}, - ['ExpGamingCore.Role']={'./modules/ExpGamingCore/Role','ExpGamingLib','FactorioStdLib.Table','FactorioStdLib.Game','ExpGamingCore.Group'}, - ['ExpGamingInfo.Readme']={'./modules/ExpGamingInfo/Readme','ExpGamingCore.Gui','FactorioStdLib.Game'}, - ['ExpGamingInfo.Rockets']={'./modules/ExpGamingInfo/Rockets','ExpGamingCore.Gui','FactorioStdLib.Game'}, - ['ExpGamingCore.Group']={'./modules/ExpGamingCore/Group','FactorioStdLib','ExpGamingLib','FactorioStdLib.Game'}, - ['ExpGamingInfo.Tasklist']={'./modules/ExpGamingInfo/Tasklist','ExpGamingCore.Gui','ExpGamingCore.Role','FactorioStdLib.Game'}, - ['ExpGamingPlayer.playerInfo']={'./modules/ExpGamingPlayer/playerInfo','FactorioStdLib.Game','ExpGamingCore.Gui'}, - ['ExpGamingPlayer.afkKick']={'./modules/ExpGamingPlayer/afkKick','FactorioStdLib.Game','ExpGamingCore.Gui'}, - ['FactorioStdLib.Table']={'./modules/FactorioStdLib/Table',}, - ['ExpGamingPlayer.polls']={'./modules/ExpGamingPlayer/polls','ExpGamingCore.Gui','ExpGamingCore.Server'}, - ['FactorioStdLib.Color']={'./modules/FactorioStdLib/Color',}, - ['FactorioStdLib.Game']={'./modules/FactorioStdLib/Game',}, - ['FactorioStdLib.String']={'./modules/FactorioStdLib/String',}, - ['ExpGamingPlayer.inventorySearch']={'./modules/ExpGamingPlayer/inventorySearch','ExpGamingLib','ExpGamingAdmin.TempBan','ExpGamingAdmin.Warnings','FactorioStdLib.Game','ExpGamingAdmin.AdminLib'}, - ['ExpGamingCore.Gui.center']={'./modules/ExpGamingCore/Gui/center','mod-gui','FactorioStdLib.Game','FactorioStdLib.Color','ExpGamingCore.Gui','ExpGamingCore.Gui.inputs'}, - ['ExpGamingCore.Gui.popup']={'./modules/ExpGamingCore/Gui/popup','mod-gui','FactorioStdLib.Game','ExpGamingCore.Gui','ExpGamingCore.Gui.inputs'}, - ['ExpGamingCore.Gui.toolbar']={'./modules/ExpGamingCore/Gui/toolbar','mod-gui','FactorioStdLib.Game','ExpGamingCore.Gui','ExpGamingCore.Gui.inputs'}, - ['ExpGamingCore.Gui.left']={'./modules/ExpGamingCore/Gui/left','mod-gui','FactorioStdLib.Game','ExpGamingCore.Server','FactorioStdLib.Color','ExpGamingCore.Gui','ExpGamingCore.Gui.inputs'}, - ['ExpGamingCore.Gui.inputs']={'./modules/ExpGamingCore/Gui/inputs','mod-gui','FactorioStdLib.Color','FactorioStdLib.Game','ExpGamingCore.Gui'}, -} \ No newline at end of file diff --git a/old/modules/softmod.json b/old/modules/softmod.json deleted file mode 100644 index d74c2446..00000000 --- a/old/modules/softmod.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "ExpGamingScenario", - "version": "4.0.0", - "description": "The basic scenario used on ExpGaming public servers", - "author": "ExpGaming", - "contact": "https://explosivegaming.nl", - "license": "https://github.com/explosivegaming/scenario/blob/master/LICENSE", - "keywords": [ - "ExpGaming", - "Vanila Plus" - ], - "softmods": { - "AdvancedStartingItems": "4.0.0", - "ChatPopup": "4.0.0", - "DamagePopup": "4.0.0", - "DeathMarkers": "4.0.0", - "DeconControl": "4.0.0", - "ExpGamingAdmin": "4.0.0", - "ExpGamingBot": "4.0.0", - "ExpGamingCommands": "4.0.0", - "ExpGamingCore": "4.0.0", - "ExpGamingInfo": "4.0.0", - "ExpGamingLib": "4.0.0", - "ExpGamingPlayer": "4.0.0", - "FactorioStdLib": "0.8.0", - "GameSettingsGui": "4.0.0", - "GuiAnnouncements": "4.0.0", - "PlayerAutoColor": "4.0.0", - "SpawnArea": "4.0.0", - "WarpPoints": "4.0.0", - "WornPaths": "4.0.0" - } -}