overpy 9.5.5 → 9.5.7

package/overpy.js

@@ -45328,10 +45328,9 @@ astParsingFunctions.__raiseToPower__ = function(content) {
 astParsingFunctions.__rule__ = function(content) {
   var isRelativeGotoEncountered = false;
   var isGotoEncountered = false;
-  var hasMeaningfulInstructionBeenEncountered = false;
   var declaredLabels = [];
   function iterateOnRuleActions(children) {
-    for (var i2 = 0; i2 < children.length; i2++) {
+    for (let i2 = 0; i2 < children.length; i2++) {
       setFileStack(content.fileStack);
       if (children[i2].name === "__skip__" && children[i2].args[0].name !== "__distanceTo__" || children[i2].name === "__skipIf__" && children[i2].args[1].name !== "__distanceTo__") {
         isRelativeGotoEncountered = true;
@@ -45345,39 +45344,6 @@ astParsingFunctions.__rule__ = function(content) {
         }
         declaredLabels.push(content.name);
       }
-      if (!hasMeaningfulInstructionBeenEncountered && ![
-        "__abortIf__",
-        "__abortIfConditionIsFalse__",
-        "__abortIfConditionIsTrue__",
-        "break",
-        "continue",
-        "__disableOptimizations__",
-        "__disableOptimizeForSize__",
-        "__disableOptimizeStrict__",
-        "__enableOptimizations__",
-        "__enableOptimizeForSize__",
-        "__enableOptimizeStrict__",
-        "__else__",
-        "__elif__",
-        "__end__",
-        //"__for__", //meaningful because it modifies the loop variable
-        //"__forGlobalVariable__",
-        //"__forPlayerVariable__",
-        "__if__",
-        "loop",
-        "__loopIf__",
-        "__loopIfConditionIsFalse__",
-        "__loopIfConditionIsTrue__",
-        "pass",
-        "return",
-        "__skip__",
-        "__skipIf__",
-        //"wait",
-        "__while__"
-      ].includes(children[i2].name) && children[i2].type !== "Label" && !(children[i2].name === "wait" && content.ruleAttributes.event !== "__subroutine__")) {
-        debug("meaningful instruction :" + children[i2].name);
-        hasMeaningfulInstructionBeenEncountered = true;
-      }
       iterateOnRuleActions(children[i2].children);
       if (!isRelativeGotoEncountered) {
         if (children[i2].name === "pass") {
@@ -45397,7 +45363,14 @@ astParsingFunctions.__rule__ = function(content) {
             }
           }
           if (isDefinitelyFalsy(children[i2].args[0]) && (children[i2].children.length === 0 || !isGotoEncountered)) {
-            if (children[i2 + 1].name === "__else__") {
+            if (i2 === children.length - 1 || children[i2 + 1].name === "__end__") {
+              children.splice(i2, 1);
+              if (i2 < children.length && children[i2].name === "__end__") {
+                children.splice(i2, 1);
+              }
+              i2--;
+              continue;
+            } else if (children[i2 + 1].name === "__else__") {
               children[i2 + 1].name = "__if__";
               children[i2 + 1].args = [getAstForTrue()];
               children.splice(i2, 1);
@@ -45446,10 +45419,51 @@ astParsingFunctions.__rule__ = function(content) {
       }
     }
   }
+  function checkForMeaningfulInstructions(instructions) {
+    for (let instruction of instructions) {
+      if (![
+        "__abortIf__",
+        "__abortIfConditionIsFalse__",
+        "__abortIfConditionIsTrue__",
+        "break",
+        "continue",
+        "__disableOptimizations__",
+        "__disableOptimizeForSize__",
+        "__disableOptimizeStrict__",
+        "__enableOptimizations__",
+        "__enableOptimizeForSize__",
+        "__enableOptimizeStrict__",
+        "__else__",
+        "__elif__",
+        "__end__",
+        //"__for__", //meaningful because it modifies the loop variable
+        //"__forGlobalVariable__",
+        //"__forPlayerVariable__",
+        "__if__",
+        "loop",
+        "__loopIf__",
+        "__loopIfConditionIsFalse__",
+        "__loopIfConditionIsTrue__",
+        "pass",
+        "return",
+        "__skip__",
+        "__skipIf__",
+        //"wait",
+        "__while__"
+      ].includes(instruction.name) && instruction.type !== "Label" && !(instruction.name === "wait" && content.ruleAttributes.event !== "__subroutine__")) {
+        debug("meaningful instruction :" + instruction.name);
+        return true;
+      }
+      if (checkForMeaningfulInstructions(instruction.children)) {
+        return true;
+      }
+    }
+    return false;
+  }
   if (enableOptimization) {
     iterateOnRuleActions(content.children);
   }
-  if (enableOptimization && !hasMeaningfulInstructionBeenEncountered && !content.ruleAttributes.isDelimiter) {
+  if (enableOptimization && !checkForMeaningfulInstructions(content.children) && !content.ruleAttributes.isDelimiter) {
     return getAstForUselessInstruction();
   }
   function resolveDistanceTo(content2) {
@@ -47034,6 +47048,15 @@ astParsingFunctions.getClosestPlayer = function(content) {
   return content;
 };
 
+// src/compiler/functions/getCurrentMap.ts
+astParsingFunctions.getCurrentMap = function(content) {
+  if (usedMaps.has("colosseo") || usedMaps.has("esperanca") || usedMaps.has("samoa")) {
+    let buggedUsedMaps = ["colosseo", "esperanca", "samoa"].filter((m) => usedMaps.has(m));
+    return parseOpyMacro(`[${buggedUsedMaps.map((m) => "Map." + m.toUpperCase()).join(", ")}, __getCurrentMap__()].filter(lambda x: "{}".format(__getCurrentMap__()) == x.split([]))[0]`, [], []);
+  }
+  return new Ast2("__getCurrentMap__");
+};
+
 // src/compiler/functions/getFarthestPlayer.ts
 astParsingFunctions.getFarthestPlayer = function(content) {
   warn("w_farthest_player", "The getFarthestPlayer() function targets dead and unspawned players (at 0,0,0). Use getRealFarthestPlayer() instead.");
@@ -61560,7 +61583,7 @@ var valueFuncKw = (
       "th-TH": "Current Game Mode",
       "zh-TW": "Current Game Mode"
     },
-    "getCurrentMap": {
+    "__getCurrentMap__": {
       "guid": "00000000D418",
       "description": "The current map of the custom game.",
       "args": [],
@@ -65313,7 +65336,7 @@ rule "Disable inspector":
   }
   if (DEBUG_MODE) {
     for (var elem of astRules) {
-      console.log(astToString2(elem));
+      console.log(astToString3(elem));
     }
     console.log(astRules);
   }
@@ -66930,6 +66953,9 @@ function parseMember(object, member) {
         if (astInfo.name === "__color__" && constantValues[astInfo.type][name]?.onlyInOverpy) {
           return new Ast2("rgb", [getAstForNumber(constantValues[astInfo.type][name].red ?? 0), getAstForNumber(constantValues[astInfo.type][name].green ?? 0), getAstForNumber(constantValues[astInfo.type][name].blue ?? 0), getAstForNumber(constantValues[astInfo.type][name].alpha ?? 255)]);
         }
+        if (astInfo.name === "__map__") {
+          usedMaps.add(name.toLowerCase());
+        }
         return new Ast2(astInfo.name, [new Ast2(name, [], [], astInfo.type)]);
       } else if (object[0].text === "Math") {
         if (name === "PI") {
@@ -67736,7 +67762,7 @@ function nthOfNumber(nb) {
     return nb + "th";
   }
 }
-function astToString2(ast, nbTabs2 = 0) {
+function astToString3(ast, nbTabs2 = 0) {
   var result = "";
   if (ast === void 0) {
     return "__undefined__";
@@ -67745,14 +67771,14 @@ function astToString2(ast, nbTabs2 = 0) {
   if (ast.args === void 0) {
     result += "(__undefined__)";
   } else if (ast.args.length > 0) {
-    result += "(" + ast.args.map((x) => astToString2(x)).join(", ") + ")";
+    result += "(" + ast.args.map((x) => astToString3(x)).join(", ") + ")";
   }
   if (ast.children === void 0) {
     result += ":__undefined__";
   } else if (ast.children.length > 0) {
     result += ":\n";
     for (var child of ast.children) {
-      result += tabLevel(nbTabs2 + 1) + astToString2(child, nbTabs2 + 1) + "\n";
+      result += tabLevel(nbTabs2 + 1) + astToString3(child, nbTabs2 + 1) + "\n";
     }
   }
   return result;
@@ -68818,6 +68844,12 @@ Wrapping a string with \`___\` has the same caveats as putting a translated stri
     class: "String",
     return: "String"
   },
+  "getCurrentMap": {
+    "description": "The current map of the custom game.",
+    "args": [],
+    "isConstant": true,
+    "return": "Map"
+  },
   ".getNormal": {
     "description": "The surface normal at the raycast hit position (or from end pos to start pos if no hit occurs).",
     "args": [
@@ -69198,6 +69230,7 @@ var activatedExtensions;
 var setActivatedExtensions = (extensions) => activatedExtensions = extensions;
 var availableExtensionPoints;
 var setAvailableExtensionPoints = (points) => availableExtensionPoints = points;
+var usedMaps = /* @__PURE__ */ new Set();
 var enableTagsSetup;
 var setEnableTagsSetup = (enable) => enableTagsSetup = enable;
 var translationLanguages2 = [];
@@ -69293,6 +69326,7 @@ function resetGlobalVariables(language) {
   disableInspector = false;
   keepUnusedTranslations = false;
   disableTranslationSourceLines = false;
+  usedMaps = /* @__PURE__ */ new Set();
   postCompileHook = null;
 }
 var operatorPrecedence = {

package/package.json

@@ -7,7 +7,7 @@
         "url": "https://github.com/Zezombye/overpy"
     },
     "description": "High-level language for the Overwatch Workshop, with decompilation and compilation.",
-    "version": "9.5.5",
+    "version": "9.5.7",
     "readme": "README.md",
     "keywords": [
         "overpy",