tp icon labels

ori-community · Feb 10, 2022 · a7bf521 · a7bf521
1 parent ccf426b
commit a7bf521
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/description.ts b/src/description.ts
@@ -103,7 +103,7 @@ function describeSysCommand(command: SysSubcommand): string {
             const uberStateDescription = describeUberState(command.uberIdentifier);
             return `Enable multiplayer sync for ${uberStateDescription}`;
         } case SysCommandVariant.createWarpIcon:
-            return `Create warp icon ${command.warpId} at ${command.x}, ${command.y}`;
+            return `Create warp icon ${command.warpId} at ${command.x}, ${command.y}${command.label === undefined ? "" : ` with a label "${command.label}"`}`;
         case SysCommandVariant.destroyWarpIcon:
             return `Destroy warp icon ${command.warpId}`;
         case SysCommandVariant.ifBounds: {

diff --git a/src/item/sysCommand.ts b/src/item/sysCommand.ts
@@ -106,6 +106,7 @@ interface CreateWarpIcon {
     warpId: number,
     x: number,
     y: number,
+    label?: string,
 }
 interface DestroyWarpIcon {
     id: SysCommandVariant.destroyWarpIcon,

diff --git a/src/parser/parseItem.ts b/src/parser/parseItem.ts
@@ -273,11 +273,18 @@ function parseCreateWarpIcon(status: ParseStatus): ParseCommandSuccess | ParseFa
     const y = parseFloat(status);
     if (y === null) { return fail(Token.float, status, undefined); }
 
+    let label;
+    if (eat(status, "|")) {
+        label = parseRemainingLine(status);
+        if (label === null) { return fail(Token.text, status, undefined); }
+    }
+
     const command: SysSubcommand = {
         id: SysCommandVariant.createWarpIcon,
         warpId,
         x,
         y,
+        label,
     };
 
     return succeed(command);

diff --git a/syntaxes/ori-wotw-header.tmLanguage.json b/syntaxes/ori-wotw-header.tmLanguage.json
@@ -179,10 +179,11 @@
             }
         },
         "createWarp": {
-            "match": "\\G(4\\|22\\|)(\\d+\\|-?\\d+(?:[.,]\\d+)?\\|-?\\d+(?:[.,]\\d+)?)\\b",
+            "match": "\\G(4\\|22\\|)(\\d+\\|-?\\d+(?:[.,]\\d+)?\\|-?\\d+(?:[.,]\\d+)?)(\\|[^\\s]+)?\\b",
             "captures": {
                 "1": { "name": "variable.other.enummember" },
-                "2": { "name": "variable" }
+                "2": { "name": "variable" },
+                "3": { "name": "string" }
             }
         },
         "destroyWarp": {