Merge branch 'explosivegaming:main' into aperx

* .

* .

* .

* .

* compilatron

* .

* .

* .

* .

* links

* .

* .

* .

* Update tsconfig.browser.json

.vscode/settings.json

@@ -0,0 +1,13 @@
+{
+    "factorio.versions": [
+        {
+            "name": "Online",
+            "factorioPath": "/opt/factorio/factorio/bin/x64/factorio",
+            "onlineDocs": true
+        }
+    ],
+    "Lua.workspace.userThirdParty": [
+        "c:\\Users\\admin\\AppData\\Roaming\\Code\\User\\workspaceStorage\\ec47732e193a837bc89fdb1a43292252\\justarandomgeek.factoriomod-debug\\sumneko-3rd"
+    ],
+    "Lua.workspace.checkThirdParty": "ApplyInMemory"
+}

exp_legacy/module/config/advanced_start.lua

@@ -80,33 +80,28 @@ return {
     enemy_expansion = false, --- @setting enemy_expansion a catch all for in case the map settings file fails to load
     chart_radius = 10 * 32, --- @setting chart_radius the number of tiles that will be charted when the map starts
     items = { --- @setting items items and there condition for being given
-        -- ['item-name'] = function(amount_made, production_stats, player) return <Number> end -- 0 means no items given
+        ["iron-ore"] = cutoff_time(20 * minutes, 80, 0),
-        -- Plates
+        ["stone"] = cutoff_time(20 * minutes, 20, 0),
-        ["iron-plate"] = scale_amount_made(100, 10, 10),
+        ["coal"] = cutoff_time(20 * minutes, 20, 0),
-        ["copper-plate"] = scale_amount_made(100, 0, 8),
+        -- ["burner-mining-drill"]=cutoff_time(20 * minutes, 8, 0),
-        ["steel-plate"] = scale_amount_made(100, 0, 4),
+        -- ["stone-furnace"]=cutoff_time(20 * minutes, 8, 0),
-        -- Secondary Items
+        ["submachine-gun"] = 1,
-        ["electronic-circuit"] = scale_amount_made(1000, 0, 6),
+        ["piercing-rounds-magazine"] = 20,
-        ["iron-gear-wheel"] = scale_amount_made(1000, 0, 6),
+        ["construction-robot"] = 10,
-        -- Starting Items
+        ["modular-armor"] = 1,
-        ["burner-mining-drill"] = cutoff_time(10 * minutes, 4, 0),
+        ["solar-panel-equipment"] = 16,
-        ["stone-furnace"] = cutoff_time(10 * minutes, 4, 0),
+        ["belt-immunity-equipment"] = 1,
-        -- Armor
+        ["battery-equipment"] = 2,
-        ["light-armor"] = cutoff_amount_made_unless(5, 0, 1, "heavy-armor", 5),
+        ["personal-roboport-equipment"] = 1
-        ["heavy-armor"] = cutoff_amount_made(5, 0, 1),
-        -- Weapon
-        ["pistol"] = cutoff_amount_made_unless(0, 1, 1, "submachine-gun", 5),
-        ["submachine-gun"] = cutoff_amount_made(5, 0, 1),
-        -- Ammo
-        ["firearm-magazine"] = cutoff_amount_made_unless(100, 10, 0, "piercing-rounds-magazine", 100),
-        ["piercing-rounds-magazine"] = cutoff_amount_made(100, 0, 10),
         --[[
-        ['construction-robot'] = 10,
+        ["construction-robot"] = 50,
-        ['modular-armor'] = 1,
+        ["spidertron"] = 1,
-        ['solar-panel-equipment'] = 16,
+        ["spidertron-remote"] = 1,
-        ['belt-immunity-equipment'] = 1,
+        ["modular-armor"] = 1,
-        ['battery-equipment'] = 2,
+        ["solar-panel-equipment"] = 60,
-        ['personal-roboport-equipment'] = 1
+        ["belt-immunity-equipment"] = 1,
+        ["battery-equipment"] = 6,
+        ["personal-roboport-equipment"] = 5
         ]]
     }
 }

exp_legacy/module/config/compilatron.lua

@@ -8,7 +8,7 @@ return {
         ["Spawn"] = {
             spawn_position = { x = 0, y = 0 },
             spawn_surface = "nauvis",
-            entity_name = "small-biter",
+            entity_name = "behemoth-biter",
             messages = {
                 { "info.website", config_server_detail["website"] },
                 { "info.read-readme" },

exp_legacy/module/config/discord_alerts.lua

@@ -10,15 +10,15 @@ return {
     player_kicks = true,
     player_promotes = false,
     player_jail = true,
-    ["config"] = true,
+    ["config"] = false,
-    ["purge"] = true,
+    ["purge"] = false,
-    ["c"] = true,
+    ["c"] = false,
-    ["command"] = true,
+    ["command"] = false,
-    ["silent-command"] = true,
+    ["silent-command"] = false,
-    ["measured-command"] = true,
+    ["measured-command"] = false,
-    ["banlist"] = true,
+    ["banlist"] = false,
-    ["permissions"] = true,
+    ["permissions"] = false,
-    ["editor"] = true,
+    ["editor"] = false,
-    ["cheat"] = true,
+    ["cheat"] = false,
     ["open"] = false,
 }

exp_legacy/module/config/inventory_clear.lua

@@ -4,6 +4,6 @@
 local events = defines.events
 return {
     events.on_player_banned,
-    events.on_player_kicked,
+    -- events.on_player_kicked,
     -- events.on_player_left_game
 }

exp_legacy/module/config/server_detail.lua

@@ -2,10 +2,10 @@
 -- @config Server
 
 return {
-    community_name = "Explosive Gaming",
+    community_name = "APERX",
-    discord = "https://discord.explosivegaming.nl",
+    discord = "https://discord.aperx.org",
-    website = "https://www.explosivegaming.nl",
+    website = "https://www.aperx.org",
-    status = "https://status.explosivegaming.nl",
+    status = "https://www.aperx.org",
     github = "https://github.com/explosivegaming/ExpCluster",
-    patreon = "https://www.patreon.com/ExpGaming"
+    patreon = "https://www.aperx.org"
 }

exp_legacy/module/config/spawn_area.lua

@@ -6,7 +6,7 @@ return {
         -- Enable predefined patches: 128, else: 32
         deconstruction_radius = 20, -- @setting deconstruction_radius All entities within this radius will be removed
         tile_radius = 20,
-        deconstruction_tile = "concrete", --- @setting deconstruction_tile Tile to be placed in the deconstruction radius, use nil for map gen
+        deconstruction_tile = "refined-concrete", --- @setting deconstruction_tile Tile to be placed in the deconstruction radius, use nil for map gen
         landfill_radius = 50, --- @setting pattern_radius All water within this radius will be land filled
     },
     turrets = { --- @setting turrets Settings relating to adding turrets to spawn
@@ -15,10 +15,10 @@ return {
         refill_time = 60 * 60 * 5, --- @setting refill_time The time in ticks between each refill of the turrets, only change if having lag issues
         offset = { x = 0, y = 0 }, --- @setting offset The position offset to apply to turrets
         locations = { --- @setting locations The locations of all turrets, this list can change during runtime
-            { -3, -3 },
+            { -2, -2 },
-            { 3, -3 },
+            { 2, -2 },
-            { -3, 3 },
+            { -2, 2 },
-            { 3, 3 },
+            { 2, 2 },
         },
     },
     afk_belts = { --- @setting afk_belts Settings relating to adding afk belts to spawn
@@ -27,8 +27,10 @@ return {
         protected = true, --- @setting protected Whether belts will be protected from player interaction
         offset = { x = 0, y = 0 }, --- @setting offset The position offset to apply to afk belts
         locations = { --- @setting locations The locations to spawn afk belts at, given as the top left position
-            { -5, -5 }, { 5, -5 },
+            { 4, 4 },
-            { -5, 5 }, { 5, 5 },
+            { 4, -4 },
+            { -4, 4 },
+            { -4, -4 }
         },
     },
     water = { --- @setting water Settings relating to adding water to spawn
@@ -37,38 +39,43 @@ return {
         offset = { x = 0, y = 0 }, --- @setting offset The position offset to apply to water tiles
         locations = { --- @setting locations The location of the water tiles {x,y}
             -- Each is a 3x3 with the closest tile to 0,0 removed
-            { 7, 8 }, { 7, 9 }, { 8, 7 }, { 8, 8 }, { 8, 9 }, { 9, 7 }, { 9, 8 }, { 9, 9 }, -- Bottom Right
+            { 5, 6 }, { 5, 7 }, { 6, 5 }, { 6, 6 }, { 6, 7 }, { 7, 5 }, { 7, 6 }, { 7, 7 },
-            { 7, -9 }, { 7, -10 }, { 8, -8 }, { 8, -9 }, { 8, -10 }, { 9, -8 }, { 9, -9 }, { 9, -10 }, -- Top Right
+            { 5, -7 }, { 5, -8 }, { 6, -6 }, { 6, -7 }, { 6, -8 }, { 7, -6 }, { 7, -7 }, { 7, -8 },
-            { -8, -9 }, { -8, -10 }, { -9, -8 }, { -9, -9 }, { -9, -10 }, { -10, -8 }, { -10, -9 }, { -10, -10 }, -- Top Left
+            { -6, 6 }, { -6, 7 }, { -7, 5 }, { -7, 6 }, { -7, 7 }, { -8, 5 }, { -8, 6 }, { -8, 7 },
-            { -8, 8 }, { -8, 9 }, { -9, 7 }, { -9, 8 }, { -9, 9 }, { -10, 7 }, { -10, 8 }, { -10, 9 }, -- Bottom Left
+            { -6, -7 }, { -6, -8 }, { -7, -6 }, { -7, -7 }, { -7, -8 }, { -8, -6 }, { -8, -7 }, { -8, -8 },
         },
     },
     entities = { --- @setting entities Settings relating to adding entities to spawn
         enabled = true, --- @setting enabled Whether entities will be added to spawn
         protected = true, --- @setting protected Whether entities will be protected from player interaction
         operable = true, --- @setting operable Whether entities can be opened by players, must be true if chests are used
-        offset = { x = 0, y = -2 }, --- @setting offset The position offset to apply to entities
+        offset = { x = 0, y = 0 }, --- @setting offset The position offset to apply to entities
         locations = { --- @setting locations The location and names of entities {name,x,y}
-            { "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 },
+            { "steel-chest", 1, 3 }, { "steel-chest", 1, 4 }, { "steel-chest", 1, 5 },
-            { "stone-wall", -10, 6 }, { "stone-wall", -10, 7 }, { "stone-wall", -10, 8 }, { "small-lamp", -8, -4 }, { "small-lamp", -8, -1 }, { "iron-chest", -8, 0 }, { "iron-chest", -8, 3 }, { "small-lamp", -8, 4 },
+            { "steel-chest", 3, 1 }, { "steel-chest", 4, 1 }, { "steel-chest", 5, 1 },
-            { "small-lamp", -8, 7 }, { "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 },
+            { "steel-chest", 1, -4 }, { "steel-chest", 1, -5 }, { "steel-chest", 1, -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 },
+            { "steel-chest", 3, -2 }, { "steel-chest", 4, -2 }, { "steel-chest", 5, -2 },
-            { "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 },
+            { "steel-chest", -2, 3 }, { "steel-chest", -2, 4 }, { "steel-chest", -2, 5 },
-            { "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 },
+            { "steel-chest", -4, 1 }, { "steel-chest", -5, 1 }, { "steel-chest", -6, 1 },
-            { "iron-chest", -2, 7 }, { "iron-chest", -2, 8 }, { "iron-chest", -2, 9 }, { "stone-wall", -2, 11 }, { "stone-wall", 1, -8 }, { "iron-chest", 1, -6 },
+            { "steel-chest", -2, -4 }, { "steel-chest", -2, -5 }, { "steel-chest", -2, -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 },
+            { "steel-chest", -4, -2 }, { "steel-chest", -5, -2 }, { "steel-chest", -6, -2 },
-            { "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 },
+            { "medium-electric-pole", 2, 3 }, { "medium-electric-pole", 2, -4 }, { "medium-electric-pole", -3, 3 }, { "medium-electric-pole", -3, -4 },
-            { "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 },
+            { "small-lamp", 2, 4 }, { "small-lamp", 2, -5 }, { "small-lamp", -3, 4 }, { "small-lamp", -3, -5 },
-            { "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 },
+            { "small-lamp", 4, 2 }, { "small-lamp", 4, -3 }, { "small-lamp", -5, 2 }, { "small-lamp", -5, -3 },
-            { "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", 9, -5 },
+            { "stone-wall", 1, 7 }, { "stone-wall", 2, 7 }, { "stone-wall", 3, 7 }, { "stone-wall", 4, 7 },
-            { "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", 7, 1 }, { "stone-wall", 7, 2 }, { "stone-wall", 7, 3 }, { "stone-wall", 7, 4 },
-            { "stone-wall", 9, 8 },
+            { "stone-wall", 1, -8 }, { "stone-wall", 2, -8 }, { "stone-wall", 3, -8 }, { "stone-wall", 4, -8 },
+            { "stone-wall", 7, -2 }, { "stone-wall", 7, -3 }, { "stone-wall", 7, -4 }, { "stone-wall", 7, -5 },
+            { "stone-wall", -2, 7 }, { "stone-wall", -3, 7 }, { "stone-wall", -4, 7 }, { "stone-wall", -5, 7 },
+            { "stone-wall", -8, 1 }, { "stone-wall", -8, 2 }, { "stone-wall", -8, 3 }, { "stone-wall", -8, 4 },
+            { "stone-wall", -2, -8 }, { "stone-wall", -3, -8 }, { "stone-wall", -4, -8 }, { "stone-wall", -5, -8 },
+            { "stone-wall", -8, -2 }, { "stone-wall", -8, -3 }, { "stone-wall", -8, -4 }, { "stone-wall", -8, -5 },
         },
     },
     pattern = {
-        enabled = true, --- @setting enabled Whether pattern tiles will be added to spawn
+        enabled = false, --- @setting enabled Whether pattern tiles will be added to spawn
-        pattern_tile = "stone-path", --- @setting pattern_tile The tile to be used for the pattern
+        pattern_tile = "refined-concrete", --- @setting pattern_tile The tile to be used for the pattern
-        offset = { x = 0, y = -2 }, --- @setting offset The position offset to apply to pattern tiles
+        offset = { x = 0, y = 0 }, --- @setting offset The position offset to apply to pattern tiles
         locations = { --- @setting locations The location of the pattern tiles {x,y}
             { -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 },

exp_legacy/module/config/vlayer.lua

@@ -8,7 +8,7 @@ return {
 
     unlimited_capacity = false, --- @setting unlimited_capacity When true the vlayer has an unlimited energy capacity, accumulators are not required
     unlimited_surface_area = false, --- @setting unlimited_surface_area When true the vlayer has an unlimited surface area, landfill is not required
-    modded_auto_downgrade = false, --- @setting modded_auto_downgrade When true modded items will be converted into their base game equivalent, original items can not be recovered
+    modded_auto_downgrade = true, --- @setting modded_auto_downgrade When true modded items will be converted into their base game equivalent, original items can not be recovered
     power_on_space = false, --- @setting power_on_space When true allow on spaceship
     power_on_space_research = { --- @setting power_on_space_research the research level needed to use power_on_space
         name = "research-productivity",

exp_legacy/module/locale/zh-CN.cfg

@@ -8,7 +8,7 @@ status=伺服器狀態: __1__
 github=增加功能或回報錯誤: __1__
 patreon=支持我們: __1__
 custom-commands=這裹使用了自制指令，如 /tag 和 /me。可使用 /chelp 查看更多。
-read-readme=確保你已閱讀相關資訊。按左上 i 圖標可再次查看
+read-readme=確保你已閱讀相關資訊。按左上 i 圖標可再次查看。
 softmod=這裹用了自設情境，是一種軟裝模組。
 redmew=We don't talk about redmew here; they beat us to 1000 members ;-;
 lhd=列車必須是左則通行。這是本服務器長久以來的規則。
@@ -18,7 +18,7 @@ lhd=列車必須是左則通行。這是本服務器長久以來的規則。
 description-add=設定 / 取得你的加入信息。
 description-remove=移除你的加入信息。
 arg-message=你的加入信息。
-greet=[color=0,1,0] 歡迎來到 __1__ 的服務器! 若果你喜歡本服務器可加入 Discord: __2__ [/color]
+greet=[color=0,1,0] 歡迎來到 __1__ 的服務器! 若果你喜歡本服務器可加入 DISCORD: __2__ [/color]
 message-set=你的加入信息已更新。
 message-get=你的加入信息為: __1__
 message-cleared=你的加入信息已清除。
@@ -127,7 +127,7 @@ Locale-tooltip=用戶介面語言
 # expcore
 [expcore-data]
 description-preference=允許寫入資料。
-description-data=把用戶資料寫入電腦。
+description-data=把用戶資料寫入電腦
 arg-option="All", "Statistics", "Settings", "Required" 之中
 set-preference=你的喜好已設定為 __1__ 。在你重新加入前將不會有任何改動。
 get-preference=你的喜好為 __1__ 。使用 /set-preference 來更改，使用 /save-data 來獲得一份資料副本。

exp_legacy/module/locale/zh-TW.cfg

@@ -8,7 +8,7 @@ status=伺服器狀態: __1__
 github=增加功能或回報錯誤: __1__
 patreon=支持我們: __1__
 custom-commands=這裹使用了自制指令，如 /tag 和 /me。可使用 /chelp 查看更多。
-read-readme=確保你已閱讀相關資訊。按左上 i 圖標可再次查看
+read-readme=確保你已閱讀相關資訊。按左上 i 圖標可再次查看。
 softmod=這裹用了自設情境，是一種軟裝模組。
 redmew=We don't talk about redmew here; they beat us to 1000 members ;-;
 lhd=列車必須是左則通行。這是本服務器長久以來的規則。
@@ -18,7 +18,7 @@ lhd=列車必須是左則通行。這是本服務器長久以來的規則。
 description-add=設定 / 取得你的加入信息。
 description-remove=移除你的加入信息。
 arg-message=你的加入信息。
-greet=[color=0,1,0] 歡迎來到 __1__ 的服務器! 若果你喜歡本服務器可加入 Discord: __2__ [/color]
+greet=[color=0,1,0] 歡迎來到 __1__ 的服務器! 若果你喜歡本服務器可加入 DISCORD: __2__ [/color]
 message-set=你的加入信息已更新。
 message-get=你的加入信息為: __1__
 message-cleared=你的加入信息已清除。
@@ -127,7 +127,7 @@ Locale-tooltip=用戶介面語言
 # expcore
 [expcore-data]
 description-preference=允許寫入資料。
-description-data=把用戶資料寫入電腦。
+description-data=把用戶資料寫入電腦
 arg-option="All", "Statistics", "Settings", "Required" 之中
 set-preference=你的喜好已設定為 __1__ 。在你重新加入前將不會有任何改動。
 get-preference=你的喜好為 __1__ 。使用 /set-preference 來更改，使用 /save-data 來獲得一份資料副本。

exp_scenario/module/control.lua

@@ -79,8 +79,8 @@ add(require("modules/exp_scenario/gui/production_stats"))
 add(require("modules/exp_scenario/gui/quick_actions"))
 add(require("modules/exp_scenario/gui/readme"))
 add(require("modules/exp_scenario/gui/research_milestones"))
-add(require("modules/exp_scenario/gui/rocket_info"))
+-- add(require("modules/exp_scenario/gui/rocket_info"))
-add(require("modules/exp_scenario/gui/science_production"))
+-- add(require("modules/exp_scenario/gui/science_production"))
 add(require("modules/exp_scenario/gui/surveillance"))
 add(require("modules/exp_scenario/gui/task_list"))
 add(require("modules/exp_scenario/gui/debug/shim"))

exp_scenario/module/locale/en.cfg

@@ -507,23 +507,23 @@ reply-evolution=Current evolution factor is __1__
 reply-magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆
 reply-aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖
 reply-riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server)
-reply-loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!; IF YOU MAKE A LOOP… IT WILL NOT END WELL!!!
+reply-loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!!!; IF YOU MAKE A LOOP.... IT WILL NOT END WELL!!!!!!!
 reply-lenny=( ͡° ͜ʖ ͡°)
 reply-hodor=Hodor
-reply-popcorn-1=Heating the oil and waiting for the popping sound…
+reply-popcorn-1=Heating the oil and waiting for the popping sound...
 reply-popcorn-2=__1__ your popcorn is finished. Lean backwards and watch the drama unfold.
-reply-snaps-1=Pouring the glasses and finding the correct song book…
+reply-snaps-1=Pouring the glasses and finding the correct song book...
-reply-snaps-2=Singing a song…🎤🎶
+reply-snaps-2=Singing a song...🎤🎶
 reply-snaps-3=schkål, my friends!
-reply-cocktail-1= 🍸 Inintiating mind reading unit… 🍸
+reply-cocktail-1= 🍸 Inintiating mind reading unit... 🍸
 reply-cocktail-2= 🍸 Mixing favourite ingredients of __1__ 🍸
 reply-cocktail-3=🍸 __1__ your cocktail is done.🍸
-reply-coffee-1= ☕ Boiling the water and grinding the coffee beans… ☕
+reply-coffee-1= ☕ Boiling the water and grinding the coffee beans... ☕
 reply-coffee-2= ☕ __1__ we ran out of coffe beans! Have some tea instead. ☕
-reply-pizza-1= 🍕 Finding nearest pizza supplier… 🍕
+reply-pizza-1= 🍕 Finding nearest pizza supplier... 🍕
 reply-pizza-2= 🍕 Figuring out the favourite pizza of __1__ 🍕
 reply-pizza-3= 🍕 __1__ your pizza is here! 🍕
-reply-tea-1= ☕ Boiling the water… ☕
+reply-tea-1= ☕ Boiling the water... ☕
 reply-tea-2= ☕ __1__ your tea is done! ☕
 reply-mead-1= Filling the drinking horn
 reply-mead-2= Skål!

exp_scenario/module/locale/zh-CN.cfg

@@ -84,7 +84,7 @@ home-get=你的回程傳送點在 __1__ 上， x: __2__ y: __3__
 description=把用戶送監而禁止其行動。
 arg-player=用戶
 arg-reason=原因
-jailed=__1__ 已被 __2__ ，因 __3__ 而被禁止行動
+jailed=__1__ 已被 __2__ ，因 __3__ 而被禁止行動。
 already-jailed=__1__ 已被禁止行動。
 
 [exp-commands_unjail]
@@ -129,8 +129,6 @@ already-protected=本地區已受保護。
 protected-area=本地區現已受保護。
 unprotected-area=本地區現不受保護。
 repeat-offence=__1__ 在 [gps=__3__,__4__] 拆除了 __2__
-enter-entity-selection = Entered entity selection, select entites to protect, hold shift to remove protection.
-enter-area-selection = Entered area selection, select areas to protect, hold shift to remove protection.
 
 [exp-commands_tag-protection]
 description=切換管理員標記模式，新標記只能由管理員編輯。
@@ -155,7 +153,6 @@ fluid-in=你每秒需要 __1__ 來做 [fluid=__2__]。
 item-out=結果: __1__ [item=__2__] 每秒。
 fluid-out=結果: __1__ [fluid=__2__] 每秒。
 machines=你需要 __1__ 部同樣的機器。
-machine-count = And you will need __1__ machines (with the same speed as this one) for this.
 
 [exp-commands_repair]
 selection-name=維修
@@ -238,9 +235,9 @@ response=__1__ 把 __2__ 個火車設置為自動模式。
 description-teleport=將一名玩家傳送到另一名玩家。
 description-bring=將一名玩家傳送到你身邊。
 description-goto=將你傳送到玩家身邊。
-description-spawn=傳送到出生點
+description-spawn=傳送到出生點。
 arg-player-teleport=傳送的玩家，若沒有目標，你會被傳送到這。
-arg-player-from=傳送的玩家。
+arg-player-from=傳送的玩家
 arg-player-to=傳送的玩家目標
 unavailable=沒找到空間進行傳送
 same-player=沒辦法傳送到自己
@@ -392,7 +389,6 @@ data-statistics=數據
 data-required=需要
 data-misc=雜項
 data-format=__1____2__
-welcome-title = Welcome to __1__
 
 [exp-gui_research-milestones]
 tooltip-main=研究介面
@@ -484,17 +480,16 @@ tooltip-edit-none=現沒有被人修改
 caption-create-footer=加入工作流程
 caption-edit-footer=修改工作流程
 caption-view-footer=工作流程細節
-tooltip-confirm = Save changes (minimum of 5 characters long)
 
 [exp_afk-kick]
 kick-message=因地圖中沒有活躍玩家，所以所有人都已被請離。
 
 [exp_chat-auto-reply]
 chat-reply=[Compilatron] __1__
-chat-disallowed=You can't use global chat commands
+chat-disallowed=你沒有權限使用這個指令。
 reply-online=現在有 __1__ 人在線
 reply-players=這張地圖上共有__1__名用戶
-reply-dev=Cooldude2606 is a dev for this server and makes the scenario and is not a factorio dev.
+reply-dev=Cooldude2606 只是本場境的開發者
 reply-softmod=這裹用了自設情境。
 reply-clusterio=Clusterio is a factorio server hosting platform allowing internet enabled mods.
 reply-blame=責怪 __1__ 吧!
@@ -503,23 +498,23 @@ reply-evolution=現在敵人進化度為 __1__
 reply-magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆
 reply-aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖
 reply-riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server)
-reply-loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!; IF YOU MAKE A LOOP… IT WILL NOT END WELL!!!
+reply-loops=架設迴旋處最終後果都不好!
 reply-lenny=( ͡° ͜ʖ ͡°)
 reply-hodor=Hodor
-reply-popcorn-1=Heating the oil and waiting for the popping sound…
+reply-popcorn-1=Heating the oil and waiting for the popping sound...
 reply-popcorn-2=__1__ your popcorn is finished. Lean backwards and watch the drama unfold.
-reply-snaps-1=Pouring the glasses and finding the correct song book…
+reply-snaps-1=Pouring the glasses and finding the correct song book...
-reply-snaps-2=Singing a song…🎤🎶
+reply-snaps-2=Singing a song...🎤🎶
 reply-snaps-3=schkål, my friends!
-reply-cocktail-1= 🍸 Inintiating mind reading unit… 🍸
+reply-cocktail-1= 🍸 Inintiating mind reading unit... 🍸
 reply-cocktail-2= 🍸 Mixing favourite ingredients of __1__ 🍸
 reply-cocktail-3=🍸 __1__ your cocktail is done.🍸
-reply-coffee-1= ☕ Boiling the water and grinding the coffee beans… ☕
+reply-coffee-1= ☕ Boiling the water and grinding the coffee beans... ☕
 reply-coffee-2= ☕ __1__ we ran out of coffe beans! Have some tea instead. ☕
-reply-pizza-1= 🍕 Finding nearest pizza supplier… 🍕
+reply-pizza-1= 🍕 Finding nearest pizza supplier... 🍕
 reply-pizza-2= 🍕 Figuring out the favourite pizza of __1__ 🍕
 reply-pizza-3= 🍕 __1__ your pizza is here! 🍕
-reply-tea-1= ☕ Boiling the water… ☕
+reply-tea-1= ☕ Boiling the water... ☕
 reply-tea-2= ☕ __1__ your tea is done! ☕
 reply-mead-1= Filling the drinking horn
 reply-mead-2= Skål!
@@ -551,22 +546,3 @@ chat-jailed=__1__ 因被多次拆除受保護物體而被禁止行動。請等
 
 [exp_report-jail]
 chat-jailed=__1__ 因被多次舉報而被禁止行動。請等候管理員作出下一步處理。
-
-
-[exp-gui_player-list]
-main-tooltip = Player List
-open-action-bar = Options
-close-action-bar = Close Options
-reason-confirm = Confirm Reason
-reason-entry = Enter Reason
-goto-player = Goto player
-bring-player = Bring player
-report-player = Report player
-jail-player = Jail player
-kick-player = Kick player
-ban-player = Ban player
-afk-time = __1__% of total map time\nLast moved __2__ ago
-open-map = __1__ __2__\n__3__\nClick to open map
-
-[exp_spectate]
-follow-label = Following __1__.\nClick here or press escape to stop following.

exp_scenario/module/locale/zh-TW.cfg

@@ -84,7 +84,7 @@ home-get=你的回程傳送點在 __1__ 上， x: __2__ y: __3__
 description=把用戶送監而禁止其行動。
 arg-player=用戶
 arg-reason=原因
-jailed=__1__ 已被 __2__ ，因 __3__ 而被禁止行動
+jailed=__1__ 已被 __2__ ，因 __3__ 而被禁止行動。
 already-jailed=__1__ 已被禁止行動。
 
 [exp-commands_unjail]
@@ -129,8 +129,6 @@ already-protected=本地區已受保護。
 protected-area=本地區現已受保護。
 unprotected-area=本地區現不受保護。
 repeat-offence=__1__ 在 [gps=__3__,__4__] 拆除了 __2__
-enter-entity-selection = Entered entity selection, select entites to protect, hold shift to remove protection.
-enter-area-selection = Entered area selection, select areas to protect, hold shift to remove protection.
 
 [exp-commands_tag-protection]
 description=切換管理員標記模式，新標記只能由管理員編輯。
@@ -155,7 +153,6 @@ fluid-in=你每秒需要 __1__ 來做 [fluid=__2__]。
 item-out=結果: __1__ [item=__2__] 每秒。
 fluid-out=結果: __1__ [fluid=__2__] 每秒。
 machines=你需要 __1__ 部同樣的機器。
-machine-count = And you will need __1__ machines (with the same speed as this one) for this.
 
 [exp-commands_repair]
 selection-name=維修
@@ -238,9 +235,9 @@ response=__1__ 把 __2__ 個火車設置為自動模式。
 description-teleport=將一名玩家傳送到另一名玩家。
 description-bring=將一名玩家傳送到你身邊。
 description-goto=將你傳送到玩家身邊。
-description-spawn=傳送到出生點
+description-spawn=傳送到出生點。
 arg-player-teleport=傳送的玩家，若沒有目標，你會被傳送到這。
-arg-player-from=傳送的玩家。
+arg-player-from=傳送的玩家
 arg-player-to=傳送的玩家目標
 unavailable=沒找到空間進行傳送
 same-player=沒辦法傳送到自己
@@ -392,7 +389,6 @@ data-statistics=數據
 data-required=需要
 data-misc=雜項
 data-format=__1____2__
-welcome-title = Welcome to __1__
 
 [exp-gui_research-milestones]
 tooltip-main=研究介面
@@ -484,17 +480,16 @@ tooltip-edit-none=現沒有被人修改
 caption-create-footer=加入工作流程
 caption-edit-footer=修改工作流程
 caption-view-footer=工作流程細節
-tooltip-confirm = Save changes (minimum of 5 characters long)
 
 [exp_afk-kick]
 kick-message=因地圖中沒有活躍玩家，所以所有人都已被請離。
 
 [exp_chat-auto-reply]
 chat-reply=[Compilatron] __1__
-chat-disallowed=You can't use global chat commands
+chat-disallowed=你沒有權限使用這個指令。
 reply-online=現在有 __1__ 人在線
 reply-players=這張地圖上共有__1__名用戶
-reply-dev=Cooldude2606 is a dev for this server and makes the scenario and is not a factorio dev.
+reply-dev=Cooldude2606 只是本場境的開發者
 reply-softmod=這裹用了自設情境。
 reply-clusterio=Clusterio is a factorio server hosting platform allowing internet enabled mods.
 reply-blame=責怪 __1__ 吧!
@@ -503,23 +498,23 @@ reply-evolution=現在敵人進化度為 __1__
 reply-magic=Fear the admin magic (ノﾟ∀ﾟ)ノ⌒･*:.｡. .｡.:*･゜ﾟ･*☆
 reply-aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖
 reply-riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( 　´)/››‹‹\ ( ´ω`)/›› (rest of server)
-reply-loops=NO LOOPS; LOOPS ARE BAD; JUST NO LOOPS!!!; IF YOU MAKE A LOOP… IT WILL NOT END WELL!!!
+reply-loops=架設迴旋處最終後果都不好!
 reply-lenny=( ͡° ͜ʖ ͡°)
 reply-hodor=Hodor
-reply-popcorn-1=Heating the oil and waiting for the popping sound…
+reply-popcorn-1=Heating the oil and waiting for the popping sound...
 reply-popcorn-2=__1__ your popcorn is finished. Lean backwards and watch the drama unfold.
-reply-snaps-1=Pouring the glasses and finding the correct song book…
+reply-snaps-1=Pouring the glasses and finding the correct song book...
-reply-snaps-2=Singing a song…🎤🎶
+reply-snaps-2=Singing a song...🎤🎶
 reply-snaps-3=schkål, my friends!
-reply-cocktail-1= 🍸 Inintiating mind reading unit… 🍸
+reply-cocktail-1= 🍸 Inintiating mind reading unit... 🍸
 reply-cocktail-2= 🍸 Mixing favourite ingredients of __1__ 🍸
 reply-cocktail-3=🍸 __1__ your cocktail is done.🍸
-reply-coffee-1= ☕ Boiling the water and grinding the coffee beans… ☕
+reply-coffee-1= ☕ Boiling the water and grinding the coffee beans... ☕
 reply-coffee-2= ☕ __1__ we ran out of coffe beans! Have some tea instead. ☕
-reply-pizza-1= 🍕 Finding nearest pizza supplier… 🍕
+reply-pizza-1= 🍕 Finding nearest pizza supplier... 🍕
 reply-pizza-2= 🍕 Figuring out the favourite pizza of __1__ 🍕
 reply-pizza-3= 🍕 __1__ your pizza is here! 🍕
-reply-tea-1= ☕ Boiling the water… ☕
+reply-tea-1= ☕ Boiling the water... ☕
 reply-tea-2= ☕ __1__ your tea is done! ☕
 reply-mead-1= Filling the drinking horn
 reply-mead-2= Skål!
@@ -551,22 +546,3 @@ chat-jailed=__1__ 因被多次拆除受保護物體而被禁止行動。請等
 
 [exp_report-jail]
 chat-jailed=__1__ 因被多次舉報而被禁止行動。請等候管理員作出下一步處理。
-
-
-[exp-gui_player-list]
-main-tooltip = Player List
-open-action-bar = Options
-close-action-bar = Close Options
-reason-confirm = Confirm Reason
-reason-entry = Enter Reason
-goto-player = Goto player
-bring-player = Bring player
-report-player = Report player
-jail-player = Jail player
-kick-player = Kick player
-ban-player = Ban player
-afk-time = __1__% of total map time\nLast moved __2__ ago
-open-map = __1__ __2__\n__3__\nClick to open map
-
-[exp_spectate]
-follow-label = Following __1__.\nClick here or press escape to stop following.