From 0b67b8a7b5be4127db647bbc1023b2d2bad53c6f Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Tue, 14 Aug 2018 17:24:31 +0100 Subject: [PATCH] Updates to json files --- modules/ExpGamingCommands/admin/softmod.json | 5 +- modules/ExpGamingCommands/bonus/softmod.json | 5 +- .../ExpGamingCommands/cheatMode/softmod.json | 5 +- modules/ExpGamingCommands/home/softmod.json | 5 +- modules/ExpGamingCommands/kill/softmod.json | 5 +- modules/ExpGamingCommands/repair/softmod.json | 5 +- modules/ExpGamingCommands/softmod.json | 42 +++++++----- modules/ExpGamingCommands/tags/softmod.json | 5 +- .../ExpGamingCommands/teleport/softmod.json | 5 +- modules/ExpGamingCore/Commands/control.lua | 2 + modules/ExpGamingCore/Commands/softmod.json | 8 +-- modules/ExpGamingCore/Gui/softmod.json | 8 +-- modules/ExpGamingCore/Ranking/softmod.json | 10 ++- modules/ExpGamingCore/Server/softmod.json | 10 ++- modules/ExpGamingCore/Server/src/commands.lua | 1 + modules/ExpGamingCore/Sync/softmod.json | 8 +-- modules/ExpGamingCore/softmod.json | 30 +++++---- modules/ExpGamingLib/softmod.json | 2 +- modules/ExpGamingPlayer/afkKick/softmod.json | 5 +- .../ExpGamingPlayer/playerInfo/softmod.json | 5 +- .../ExpGamingPlayer/playerList/softmod.json | 5 +- modules/ExpGamingPlayer/softmod.json | 17 +++-- modules/FactorioStdLib/Color/softmod.json | 8 +-- modules/FactorioStdLib/Game/softmod.json | 8 +-- modules/FactorioStdLib/String/softmod.json | 8 +-- modules/FactorioStdLib/Table/softmod.json | 8 +-- modules/FactorioStdLib/softmod.json | 25 ++++--- softmod.json | 8 ++- to convert/StandAlone/paths.lua | 66 +++++++++++++++---- 29 files changed, 193 insertions(+), 131 deletions(-) diff --git a/modules/ExpGamingCommands/admin/softmod.json b/modules/ExpGamingCommands/admin/softmod.json index 1020528a..2b30520f 100644 --- a/modules/ExpGamingCommands/admin/softmod.json +++ b/modules/ExpGamingCommands/admin/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Admins many of the admin featues which the script can use as in game commands.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.admin_4.0.0.zip", "keywords": [ "ExpGaming", "Admin", @@ -23,5 +23,6 @@ "ExpGamingAdmin.Warnings": "?^4.0.0", "ExpGamingAdmin.Reports": "^?4.0.0", "ExpGamingAdmin.ClearInventory": "?^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCommands/bonus/softmod.json b/modules/ExpGamingCommands/bonus/softmod.json index 3fc2a968..89214d92 100644 --- a/modules/ExpGamingCommands/bonus/softmod.json +++ b/modules/ExpGamingCommands/bonus/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Allows a bonus to be applied to players and instant respawn.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.bonus_4.0.0.zip", "keywords": [ "Instant Respawn", "Bonus", @@ -17,5 +17,6 @@ "ExpGamingLib": "^4.0.0", "ExpGamingCore.Commands": "^4.0.0", "ExpGamingCore.Ranking": "?^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCommands/cheatMode/softmod.json b/modules/ExpGamingCommands/cheatMode/softmod.json index f38df421..68d16ef5 100644 --- a/modules/ExpGamingCommands/cheatMode/softmod.json +++ b/modules/ExpGamingCommands/cheatMode/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Adds a command which allow you to toggle cheatmode", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.cheatMode_4.0.0.zip", "keywords": [ "Cheat", "Commands", @@ -14,5 +14,6 @@ ], "dependencies": { "ExpGamingCore.Commands": "^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCommands/home/softmod.json b/modules/ExpGamingCommands/home/softmod.json index 61513ddf..62675d38 100644 --- a/modules/ExpGamingCommands/home/softmod.json +++ b/modules/ExpGamingCommands/home/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Allows players to set homes and then return to them later.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.home_4.0.0.zip", "keywords": [ "Teleport", "ExpGaming", @@ -15,5 +15,6 @@ "dependencies": { "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Commands": "^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCommands/kill/softmod.json b/modules/ExpGamingCommands/kill/softmod.json index a9c677ce..87fe9fe2 100644 --- a/modules/ExpGamingCommands/kill/softmod.json +++ b/modules/ExpGamingCommands/kill/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Adds a command which can be used to kill a player or yourself.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.kill_4.0.0.zip", "keywords": [ "Command", "ExpGaming", @@ -16,5 +16,6 @@ "ExpGamingCore.Commands": "^4.0.0", "ExpGamingCore.Ranking": "^4.0.0", "FactorioStdLib.Game": "^0.8.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCommands/repair/softmod.json b/modules/ExpGamingCommands/repair/softmod.json index 62e9805c..bb3a0272 100644 --- a/modules/ExpGamingCommands/repair/softmod.json +++ b/modules/ExpGamingCommands/repair/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Allows items to be healed and repaired with a command", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.repair_4.0.0.zip", "keywords": [ "ExpGaming", "Command", @@ -17,5 +17,6 @@ "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Ranking": "^4.0.0", "ExpGamingAdmin.TempBan": "?^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCommands/softmod.json b/modules/ExpGamingCommands/softmod.json index 6dc162f3..5a5d1d2d 100644 --- a/modules/ExpGamingCommands/softmod.json +++ b/modules/ExpGamingCommands/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Collection", "description": "A Collection of all of the custom commands used on ExpGaming servers.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands_4.0.0.zip", "keywords": [ "Commands", "ExpGaming", @@ -19,7 +19,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Admins many of the admin featues which the script can use as in game commands.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.admin_4.0.0.zip", "keywords": [ "ExpGaming", "Admin", @@ -39,14 +39,15 @@ "ExpGamingAdmin.Warnings": "?^4.0.0", "ExpGamingAdmin.Reports": "^?4.0.0", "ExpGamingAdmin.ClearInventory": "?^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" }, "bonus": { "name": "bonus", "version": "4.0.0", "type": "Submodule", "description": "Allows a bonus to be applied to players and instant respawn.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.bonus_4.0.0.zip", "keywords": [ "Instant Respawn", "Bonus", @@ -60,14 +61,15 @@ "ExpGamingLib": "^4.0.0", "ExpGamingCore.Commands": "^4.0.0", "ExpGamingCore.Ranking": "?^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" }, "cheatMode": { "name": "cheatMode", "version": "4.0.0", "type": "Submodule", "description": "Adds a command which allow you to toggle cheatmode", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.cheatMode_4.0.0.zip", "keywords": [ "Cheat", "Commands", @@ -78,14 +80,15 @@ ], "dependencies": { "ExpGamingCore.Commands": "^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" }, "home": { "name": "home", "version": "4.0.0", "type": "Submodule", "description": "Allows players to set homes and then return to them later.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.home_4.0.0.zip", "keywords": [ "Teleport", "ExpGaming", @@ -97,14 +100,15 @@ "dependencies": { "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Commands": "^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" }, "kill": { "name": "kill", "version": "4.0.0", "type": "Submodule", "description": "Adds a command which can be used to kill a player or yourself.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.kill_4.0.0.zip", "keywords": [ "Command", "ExpGaming", @@ -117,14 +121,15 @@ "ExpGamingCore.Commands": "^4.0.0", "ExpGamingCore.Ranking": "^4.0.0", "FactorioStdLib.Game": "^0.8.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" }, "repair": { "name": "repair", "version": "4.0.0", "type": "Submodule", "description": "Allows items to be healed and repaired with a command", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.repair_4.0.0.zip", "keywords": [ "ExpGaming", "Command", @@ -138,14 +143,15 @@ "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Ranking": "^4.0.0", "ExpGamingAdmin.TempBan": "?^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" }, "tags": { "name": "tags", "version": "4.0.0", "type": "Submodule", "description": "Allows tags to be used by users.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.tags_4.0.0.zip", "keywords": [ "Tags", "Custom Tags", @@ -157,14 +163,15 @@ "ExpGamingCore.Ranking": "^4.0.0", "ExpGamingCore.Commands": "^4.0.0", "FactorioStdLib.Game": "^0.8.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" }, "teleport": { "name": "teleport", "version": "4.0.0", "type": "Submodule", "description": "Adds a few commands used to teleport players.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.teleport_4.0.0.zip", "keywords": [ "Teleport", "Tp", @@ -178,7 +185,8 @@ "dependencies": { "ExpGamingCore.Commands": "^4.0.0", "ExpGamingAdmin.Teleport": "^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" } }, "dependencies": {} diff --git a/modules/ExpGamingCommands/tags/softmod.json b/modules/ExpGamingCommands/tags/softmod.json index c978fad6..fd45cb23 100644 --- a/modules/ExpGamingCommands/tags/softmod.json +++ b/modules/ExpGamingCommands/tags/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Allows tags to be used by users.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.tags_4.0.0.zip", "keywords": [ "Tags", "Custom Tags", @@ -15,5 +15,6 @@ "ExpGamingCore.Ranking": "^4.0.0", "ExpGamingCore.Commands": "^4.0.0", "FactorioStdLib.Game": "^0.8.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCommands/teleport/softmod.json b/modules/ExpGamingCommands/teleport/softmod.json index 2390252c..a0839206 100644 --- a/modules/ExpGamingCommands/teleport/softmod.json +++ b/modules/ExpGamingCommands/teleport/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Adds a few commands used to teleport players.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCommands.teleport_4.0.0.zip", "keywords": [ "Teleport", "Tp", @@ -17,5 +17,6 @@ "dependencies": { "ExpGamingCore.Commands": "^4.0.0", "ExpGamingAdmin.Teleport": "^4.0.0" - } + }, + "collection": "ExpGamingCommands_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCore/Commands/control.lua b/modules/ExpGamingCore/Commands/control.lua index 8f5d6583..0d68fe90 100644 --- a/modules/ExpGamingCore/Commands/control.lua +++ b/modules/ExpGamingCore/Commands/control.lua @@ -228,6 +228,8 @@ function commands:on_init() if loaded_modules['ExpGamingCore.Ranking'] then Ranking = require('ExpGamingCore.Ranking') end end +return commands + --[[ command example diff --git a/modules/ExpGamingCore/Commands/softmod.json b/modules/ExpGamingCore/Commands/softmod.json index ff4d1f6b..147db03f 100644 --- a/modules/ExpGamingCore/Commands/softmod.json +++ b/modules/ExpGamingCore/Commands/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "A better command handler than the base game.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Commands.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Commands_4.0.0.zip", "keywords": [ "Library", "Lib", @@ -11,14 +11,12 @@ "Core", "Commands" ], - "author": "", - "contact": "", - "license": "", "dependencies": { "ExpGamingLib": "^4.0.0", "FactorioStdLib.Table": "^0.8.0", "FactorioStdLib.Color": "^0.8.0", "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Ranking": "?^4.0.0" - } + }, + "collection": "ExpGamingCore_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCore/Gui/softmod.json b/modules/ExpGamingCore/Gui/softmod.json index 070b63fb..8868ce38 100644 --- a/modules/ExpGamingCore/Gui/softmod.json +++ b/modules/ExpGamingCore/Gui/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Adds a objective version to custom guis.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Gui.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Gui_4.0.0.zip", "keywords": [ "Library", "Lib", @@ -12,9 +12,6 @@ "Gui", "ExpGui" ], - "author": "", - "contact": "", - "license": "", "dependencies": { "ExpGamingLib": "^4.0.0", "FactorioStdLib.Table": "^0.8.0", @@ -22,5 +19,6 @@ "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Ranking": "?^4.0.0", "ExpGamingCore.Server": "?^4.0.0" - } + }, + "collection": "ExpGamingCore_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCore/Ranking/softmod.json b/modules/ExpGamingCore/Ranking/softmod.json index 5aec2eac..e5f08c27 100644 --- a/modules/ExpGamingCore/Ranking/softmod.json +++ b/modules/ExpGamingCore/Ranking/softmod.json @@ -1,9 +1,9 @@ { "name": "Ranking", - "version": "4.0.0", + "version": "4.0.0", "type": "Submodule", "description": "A full ranking system for factorio.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Ranking.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Ranking_4.0.0.zip", "keywords": [ "Library", "Lib", @@ -14,14 +14,12 @@ "Permissions", "Roles" ], - "author": "", - "contact": "", - "license": "", "dependencies": { "ExpGamingLib": "^4.0.0", "FactorioStdLib.Color": "^0.8.0", "FactorioStdLib.Table": "^0.8.0", "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Server": "?^4.0.0" - } + }, + "collection": "ExpGamingCore_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCore/Server/softmod.json b/modules/ExpGamingCore/Server/softmod.json index a8224590..a5d1e29e 100644 --- a/modules/ExpGamingCore/Server/softmod.json +++ b/modules/ExpGamingCore/Server/softmod.json @@ -1,9 +1,9 @@ { "name": "Server", - "version": "4.0.0", + "version": "4.0.0", "type": "Submodule", "description": "Adds a thread system and event listening and a admin bypass (recommend to disable /c and use optional /interface)", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Server.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Server_4.0.0.zip", "keywords": [ "Library", "Lib", @@ -14,9 +14,6 @@ "Interface", "Events" ], - "author": "", - "contact": "", - "license": "", "dependencies": { "ExpGamingLib": "^4.0.0", "FactorioStdLib.Table": "^0.8.0", @@ -24,5 +21,6 @@ "FactorioStdLib.String": "^0.8.0", "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Commands": "?^4.0.0" - } + }, + "collection": "ExpGamingCore_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCore/Server/src/commands.lua b/modules/ExpGamingCore/Server/src/commands.lua index 16fbc551..9ebc0fa6 100644 --- a/modules/ExpGamingCore/Server/src/commands.lua +++ b/modules/ExpGamingCore/Server/src/commands.lua @@ -8,6 +8,7 @@ -- @function _comment local Game = require('FactorioStdLib.Game') +local Server = Server --- Runs the given input from the script -- @command interface diff --git a/modules/ExpGamingCore/Sync/softmod.json b/modules/ExpGamingCore/Sync/softmod.json index 819e42ef..5db6b316 100644 --- a/modules/ExpGamingCore/Sync/softmod.json +++ b/modules/ExpGamingCore/Sync/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Allows syncing with an outside server and info panle.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Sync.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Sync_4.0.0.zip", "keywords": [ "Library", "Lib", @@ -14,9 +14,6 @@ "External", "Discord" ], - "author": "", - "contact": "", - "license": "", "dependencies": { "ExpGamingLib": "^4.0.0", "FactorioStdLib.Color": "^0.8.0", @@ -24,5 +21,6 @@ "FactorioStdLib.Table": "^0.8.0", "ExpGamingCore.Ranking": "?^4.0.0", "ExpGamingCore.Gui": "?^4.0.0" - } + }, + "collection": "ExpGamingCore_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingCore/softmod.json b/modules/ExpGamingCore/softmod.json index e65dc3a1..b6a644f6 100644 --- a/modules/ExpGamingCore/softmod.json +++ b/modules/ExpGamingCore/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Collection", "description": "Explosive Gaming Core Files", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore_4.0.0.zip", "keywords": [ "Library", "Lib", @@ -19,7 +19,7 @@ "version": "4.0.0", "type": "Submodule", "description": "A better command handler than the base game.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Commands.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Commands_4.0.0.zip", "keywords": [ "Library", "Lib", @@ -33,13 +33,15 @@ "FactorioStdLib.Color": "^0.8.0", "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Ranking": "?^4.0.0" - } + }, + "collection": "ExpGamingCore_4.0.0" }, "Gui": { "name": "Gui", "version": "4.0.0", + "type": "Submodule", "description": "Adds a objective version to custom guis.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Gui.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Gui_4.0.0.zip", "keywords": [ "Library", "Lib", @@ -56,13 +58,14 @@ "ExpGamingCore.Ranking": "?^4.0.0", "ExpGamingCore.Server": "?^4.0.0" }, - "type": "Submodule" + "collection": "ExpGamingCore_4.0.0" }, "Ranking": { "name": "Ranking", "version": "4.0.0", + "type": "Submodule", "description": "A full ranking system for factorio.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Ranking.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Ranking_4.0.0.zip", "keywords": [ "Library", "Lib", @@ -80,13 +83,14 @@ "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Server": "?^4.0.0" }, - "type": "Submodule" + "collection": "ExpGamingCore_4.0.0" }, "Server": { "name": "Server", "version": "4.0.0", + "type": "Submodule", "description": "Adds a thread system and event listening and a admin bypass (recommend to disable /c and use optional /interface)", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Server.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Server_4.0.0.zip", "keywords": [ "Library", "Lib", @@ -105,13 +109,14 @@ "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Commands": "?^4.0.0" }, - "type": "Submodule" + "collection": "ExpGamingCore_4.0.0" }, "Sync": { "name": "Sync", "version": "4.0.0", + "type": "Submodule", "description": "Allows syncing with an outside server and info panle.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Sync.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingCore.Sync_4.0.0.zip", "keywords": [ "Library", "Lib", @@ -130,7 +135,8 @@ "ExpGamingCore.Ranking": "?^4.0.0", "ExpGamingCore.Gui": "?^4.0.0" }, - "type": "Submodule" + "collection": "ExpGamingCore_4.0.0" } - } + }, + "dependencies": {} } \ No newline at end of file diff --git a/modules/ExpGamingLib/softmod.json b/modules/ExpGamingLib/softmod.json index 76e09242..45846fa5 100644 --- a/modules/ExpGamingLib/softmod.json +++ b/modules/ExpGamingLib/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Module", "description": "Adds some common functions used though out all ExpGaming modules", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingLib.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingLib_4.0.0.zip", "keywords": [ "ExpGaming", "Lib" diff --git a/modules/ExpGamingPlayer/afkKick/softmod.json b/modules/ExpGamingPlayer/afkKick/softmod.json index 23eec2cf..6bf26661 100644 --- a/modules/ExpGamingPlayer/afkKick/softmod.json +++ b/modules/ExpGamingPlayer/afkKick/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Adds a varible amount of time before a user is kicked based on the current player count.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingPlayer.afkKick_4.0.0.zip", "keywords": [ "Kick", "AFK", @@ -17,5 +17,6 @@ "ExpGamingCore.Ranking": "?^4.0.0", "ExpGamingCore.Sync": "?^4.0.0", "ExpGamingCore.Server": "?^4.0.0" - } + }, + "collection": "ExpGamingPlayer_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingPlayer/playerInfo/softmod.json b/modules/ExpGamingPlayer/playerInfo/softmod.json index 285bc4d5..1791bab0 100644 --- a/modules/ExpGamingPlayer/playerInfo/softmod.json +++ b/modules/ExpGamingPlayer/playerInfo/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Used to give so common info on a player as a lua table or a frame.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingPlayer.playerInfo_4.0.0.zip", "keywords": [ "Cam", "Follow", @@ -15,5 +15,6 @@ "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Gui": "^4.0.0", "ExpGamingCore.Ranking": "?^4.0.0" - } + }, + "collection": "ExpGamingPlayer_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingPlayer/playerList/softmod.json b/modules/ExpGamingPlayer/playerList/softmod.json index 921b36df..e5ae20bf 100644 --- a/modules/ExpGamingPlayer/playerList/softmod.json +++ b/modules/ExpGamingPlayer/playerList/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Used to display player names and online time on the top left.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingPlayer.playerList_4.0.0.zip", "keywords": [ "Player List", "List", @@ -17,5 +17,6 @@ "ExpGamingAdmin.buttonFlow": "?^4.0.0", "ExpGamingAdmin.reports": "?^4.0.0", "ExpGamingPlayer.playerInfo": "?^4.0.0" - } + }, + "collection": "ExpGamingPlayer_4.0.0" } \ No newline at end of file diff --git a/modules/ExpGamingPlayer/softmod.json b/modules/ExpGamingPlayer/softmod.json index 314e62fc..6ef17f23 100644 --- a/modules/ExpGamingPlayer/softmod.json +++ b/modules/ExpGamingPlayer/softmod.json @@ -3,7 +3,7 @@ "version": "4.0.0", "type": "Collection", "description": "Useful collection of modules for displaying player infomation.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingPlayer_4.0.0.zip", "keywords": [ "ExpGaming", "Player", @@ -19,7 +19,7 @@ "version": "4.0.0", "type": "Submodule", "description": "Adds a varible amount of time before a user is kicked based on the current player count.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingPlayer.afkKick_4.0.0.zip", "keywords": [ "Kick", "AFK", @@ -33,14 +33,15 @@ "ExpGamingCore.Ranking": "?^4.0.0", "ExpGamingCore.Sync": "?^4.0.0", "ExpGamingCore.Server": "?^4.0.0" - } + }, + "collection": "ExpGamingPlayer_4.0.0" }, "playerInfo": { "name": "playerInfo", "version": "4.0.0", "type": "Submodule", "description": "Used to give so common info on a player as a lua table or a frame.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingPlayer.playerInfo_4.0.0.zip", "keywords": [ "Cam", "Follow", @@ -52,14 +53,15 @@ "FactorioStdLib.Game": "^0.8.0", "ExpGamingCore.Gui": "^4.0.0", "ExpGamingCore.Ranking": "?^4.0.0" - } + }, + "collection": "ExpGamingPlayer_4.0.0" }, "playerList": { "name": "playerList", "version": "4.0.0", "type": "Submodule", "description": "Used to display player names and online time on the top left.", - "location": "", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/ExpGamingPlayer.playerList_4.0.0.zip", "keywords": [ "Player List", "List", @@ -73,7 +75,8 @@ "ExpGamingAdmin.buttonFlow": "?^4.0.0", "ExpGamingAdmin.reports": "?^4.0.0", "ExpGamingPlayer.playerInfo": "?^4.0.0" - } + }, + "collection": "ExpGamingPlayer_4.0.0" } }, "dependencies": {} diff --git a/modules/FactorioStdLib/Color/softmod.json b/modules/FactorioStdLib/Color/softmod.json index 424e86a5..63974367 100644 --- a/modules/FactorioStdLib/Color/softmod.json +++ b/modules/FactorioStdLib/Color/softmod.json @@ -3,7 +3,7 @@ "version": "0.8.0", "type": "Submodule", "description": "A defines module for retrieving colors by name.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Color.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Color_0.8.0.zip", "keywords": [ "Standard Library", "Lib", @@ -11,8 +11,6 @@ "Color", "Extends" ], - "author": "", - "contact": "", - "license": "", - "dependencies": {} + "dependencies": {}, + "collection": "FactorioStdLib_0.8.0" } \ No newline at end of file diff --git a/modules/FactorioStdLib/Game/softmod.json b/modules/FactorioStdLib/Game/softmod.json index dba6d9f4..a175839a 100644 --- a/modules/FactorioStdLib/Game/softmod.json +++ b/modules/FactorioStdLib/Game/softmod.json @@ -3,7 +3,7 @@ "version": "0.8.0", "type": "Submodule", "description": "The game module.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Game.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Game_0.8.0.zip", "keywords": [ "Standard Library", "Lib", @@ -11,8 +11,6 @@ "Game", "Extends" ], - "author": "", - "contact": "", - "license": "", - "dependencies": {} + "dependencies": {}, + "collection": "FactorioStdLib_0.8.0" } \ No newline at end of file diff --git a/modules/FactorioStdLib/String/softmod.json b/modules/FactorioStdLib/String/softmod.json index f6263d0a..426934a4 100644 --- a/modules/FactorioStdLib/String/softmod.json +++ b/modules/FactorioStdLib/String/softmod.json @@ -3,7 +3,7 @@ "version": "0.8.0", "type": "Submodule", "description": "Extends Lua 5.2 string.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.String.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.String_0.8.0.zip", "keywords": [ "Standard Library", "Lib", @@ -11,8 +11,6 @@ "String", "Extends" ], - "author": "", - "contact": "", - "license": "", - "dependencies": {} + "dependencies": {}, + "collection": "FactorioStdLib_0.8.0" } \ No newline at end of file diff --git a/modules/FactorioStdLib/Table/softmod.json b/modules/FactorioStdLib/Table/softmod.json index 3b033efb..8e86a708 100644 --- a/modules/FactorioStdLib/Table/softmod.json +++ b/modules/FactorioStdLib/Table/softmod.json @@ -3,7 +3,7 @@ "version": "0.8.0", "type": "Submodule", "description": "Extends Lua 5.2 table.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Table.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Table_0.8.0.zip", "keywords": [ "Standard Library", "Lib", @@ -11,8 +11,6 @@ "Table", "Extends" ], - "author": "", - "contact": "", - "license": "", - "dependencies": {} + "dependencies": {}, + "collection": "FactorioStdLib_0.8.0" } \ No newline at end of file diff --git a/modules/FactorioStdLib/softmod.json b/modules/FactorioStdLib/softmod.json index b545d9bb..f2471e5f 100644 --- a/modules/FactorioStdLib/softmod.json +++ b/modules/FactorioStdLib/softmod.json @@ -3,7 +3,7 @@ "version": "0.8.0", "type": "Collection", "description": "Factorio Standard Library Projects", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib_0.8.0.zip", "keywords": [ "Standard Library", "Lib", @@ -18,7 +18,7 @@ "version": "0.8.0", "type": "Submodule", "description": "A defines module for retrieving colors by name.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Color.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Color_0.8.0.zip", "keywords": [ "Standard Library", "Lib", @@ -26,14 +26,15 @@ "Color", "Extends" ], - "dependencies": {} + "dependencies": {}, + "collection": "FactorioStdLib_0.8.0" }, "Game": { "name": "Game", "version": "0.8.0", "type": "Submodule", "description": "The game module.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Game.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Game_0.8.0.zip", "keywords": [ "Standard Library", "Lib", @@ -41,14 +42,15 @@ "Game", "Extends" ], - "dependencies": {} + "dependencies": {}, + "collection": "FactorioStdLib_0.8.0" }, "String": { "name": "String", "version": "0.8.0", "type": "Submodule", "description": "Extends Lua 5.2 string.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.String.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.String_0.8.0.zip", "keywords": [ "Standard Library", "Lib", @@ -56,14 +58,15 @@ "String", "Extends" ], - "dependencies": {} + "dependencies": {}, + "collection": "FactorioStdLib_0.8.0" }, "Table": { "name": "Table", "version": "0.8.0", "type": "Submodule", "description": "Extends Lua 5.2 table.", - "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Table.zip", + "location": "https://github.com/explosivegaming/scenario/releases/download/v4.0-core/FactorioStdLib.Table_0.8.0.zip", "keywords": [ "Standard Library", "Lib", @@ -71,7 +74,9 @@ "Table", "Extends" ], - "dependencies": {} + "dependencies": {}, + "collection": "FactorioStdLib_0.8.0" } - } + }, + "dependencies": {} } \ No newline at end of file diff --git a/softmod.json b/softmod.json index 79c4d3c2..57c26bbd 100644 --- a/softmod.json +++ b/softmod.json @@ -1,7 +1,6 @@ { "name": "ExpGamingScenario", "version": "0.16.51", - "type": "Scenario", "description": "Explosive gaming's factorio secenario ran on every public server", "modules": { @@ -11,6 +10,9 @@ "FactorioStdLib.Game": "^0.8.0", "FactorioStdLib.String": "^0.8.0", "FactorioStdLib.Table": "^0.8.0", - "FactorioStdLib": "^0.8.0" - } + "FactorioStdLib": "^0.8.0", + "ExpGamingCommands": "^4.0.0", + "ExpGamingPlayer": "^4.0.0" + }, + "dependencies": {} } \ No newline at end of file diff --git a/to convert/StandAlone/paths.lua b/to convert/StandAlone/paths.lua index a73439fb..6f045709 100644 --- a/to convert/StandAlone/paths.lua +++ b/to convert/StandAlone/paths.lua @@ -1,7 +1,34 @@ -- made by cooldude -- idea from Mylon - Dirt Path -local adjacency_boost = 10 -- makes paths more lickly to be next to each other +local adjacency_boost = 2 -- makes paths more lickly to be next to each other; must be greater than 0 +local entities = { + ['stone-furnace']=2, + ['steel-furnace']=2, + ['electric-furnace']=3, + ['assembling-machine-1']=3, + ['assembling-machine-2']=3, + ['assembling-machine-3']=3, + ['beacon']=3, + ['centrifuge']=3, + ['chemical-plant']=3, + ['oil-refinery']=7, + ['storage-tank']=3, + ['nuclear-reactor']=5, + ['steam-engine']=4, + ['steam-turbine']=4, + ['boiler']=3, + ['heat-exchanger']=3, + ['stone-wall']=1, + ['gate']=1, + ['gun-turret']=2, + ['laser-turret']=2, + ['radar']=3, + ['lab']=3, + ['big-electric-pole']=2, + ['substation']=2, + ['rocket-silo']=7 +} local placed_paths = { ['refined-concrete']=true, ['refined-hazard-concrete-right']=true, @@ -14,13 +41,13 @@ local placed_paths = { local paths = { -- ['tile name'] = {health,convert to} -- health is the average number of steps in hundards before it changes - ['refined-concrete']={40,'concrete'}, - ['refined-hazard-concrete-right']={40,'hazard-concrete-right'}, - ['refined-hazard-concrete-left']={40,'hazard-concrete-left'}, - ['concrete']={30,'stone-path'}, - ['hazard-concrete-right']={30,'stone-path'}, - ['hazard-concrete-left']={30,'stone-path'}, - ['stone-path']={25,'world-gen'}, -- world-gen just makes it pick the last tile not placed by a player + ['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']={1,'sand-2'}, ['sand-2']={3,'sand-3'}, ['sand-3']={1,'red-desert-3'}, @@ -62,7 +89,7 @@ Event.register(defines.events.on_player_built_tile, function(event) for _,old_tile in pairs(old_tiles) do if placed_paths[old_tile.old_tile.name] or old_tile.old_tile.name == 'water' or old_tile.old_tile.name == 'deep-water' then else if global.paths == nil then global.paths = {} end -- nil as you can set to false to disable - global.paths[global_key(surface,old_tile.position)]=old_tile.old_tile.name + global.paths[global_key(surface,old_tile.position)]=old_tile.old_tile.name -- not a mistake, this makes it have dimising returns end end end) @@ -79,15 +106,30 @@ Event.register(defines.events.on_player_changed_position, function(event) local count = 1 for x = -1,1 do for y = -1,1 do local _pos = {pos.x+x,pos.y+y} - if paths[tile_name][2] == 'world-gen' and not placed_paths[surface.get_tile(_pos).name] + 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 chance=chance*(adjacency_boost/count) count=count+1 end + then chance=chance*((adjacency_boost+8)/count) count=count+1 end end end if math.random() < chance then down_grade(surface,pos) end end) +Event.register(defines.events.on_built_entity, function(event) + local entity = event.entity + local surface = player.surface + if entities[entity.name] then + local size = entities[entity.name] + for (x in 0,size) do for (y in 0,size) do + local pos = [entity.position.x+x,entity.position.y+y] + local tile = surface.get_tile(pos).name + if math.random() < paths[tile]*size then + down_grade(surface,pos) + end + end end + end +end) + --[[ /interface local tile_name = tile.name @@ -100,4 +142,4 @@ for x = -1,1 do for y = -1,1 do then game.print('boost '..tostring(count)) chance=chance=chance*(adjacency_boost/count) count=count+1 end end end return chance -]] \ No newline at end of file +]]