Merge pull request #383 from CactusPuppy/alive-workshop

fix: remove unneeded game mode settings check
Zezombye · Nov 5, 2024 · d1634db · d1634db
2 parents 42cc4a1 + 6a8c91b
commit d1634db
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -32,8 +32,7 @@
         "syntaxes/**",
         "LICENSE{,.txt}",
         "customGameSettingsSchema.json",
-        "language-configuration.json",
-        "decompilerui.html"
+        "language-configuration.json"
     ],
     "contributes": {
         "configuration": {

diff --git a/src/compiler/compiler.ts b/src/compiler/compiler.ts
@@ -403,10 +403,6 @@ export function compileCustomGameSettings(customGameSettings: Record<string, any
                         error("The gamemode '" + gamemode + "' is not available in OW2");
                     }
                 }
-                if (["control", "escort", "flashpoint", "hybrid", "push"].includes(gamemode)) {
-                    warn("w_dead_workshop", "The gamemode '" + gamemode + "' cannot be enabled from pasted settings and has been removed from the settings.");
-                    continue;
-                }
                 var wsGamemode = tows(gamemode, customGameSettingsSchema.gamemodes.values);
                 var isGamemodeEnabled = true;
                 if ("enabled" in customGameSettings.gamemodes[gamemode] && customGameSettings.gamemodes[gamemode].enabled === false) {

diff --git a/src/tests/customGameSettings.opy b/src/tests/customGameSettings.opy
@@ -16,6 +16,12 @@ settings {
             ],
             "captureSpeed%": 60
         },
+        "escort": {
+            "enabledMaps": [
+                "dorado"
+            ],
+            "payloadSpeed%": 200
+        },
         "general": {
             "gamemodeStartTrigger": "manual",
             "heroLimit": "off",

diff --git a/src/tests/results/customGameSettings.txt b/src/tests/results/customGameSettings.txt
@@ -21,6 +21,14 @@ settings
 			}
 			Capture Speed Modifier: 60%
 		}
+		Escort
+		{
+			enabled maps
+			{
+				Dorado
+			}
+			Payload Speed Modifier: 200%
+		}
 		General
 		{
 			Game Mode Start: Manual