Fix duplicate ends and also update Guilty Gear Xrd Rev2 database (#43)

kkots · web-flow · commit 5fabeb472278 · 2025-11-16T11:33:17.000-08:00
* Fix duplicate ends and also update Guilty Gear Xrd Rev2 database

* add support for codeBlock: EndState
diff --git a/src/game_config.rs b/src/game_config.rs
@@ -686,6 +686,7 @@ pub enum CodeBlock {
     End,
     NoBlock,
     BeginNonrecursive,
+    EndState,
 }
 
 impl Default for CodeBlock {
diff --git a/src/parser.rs b/src/parser.rs
@@ -98,11 +98,18 @@ impl ScriptConfig {
                     if indent > 0 {
                         last_block_type_valid = false;
                         indent -= 1;
-                        if indent == 0 {
-                            block_ended = true;
+                        if indent < 1 {
+                            indent = 1;
                         }
                     }
-                }
+                },
+                CodeBlock::EndState => {
+                    if indent > 0 {
+                        last_block_type_valid = false;
+                        indent = 0;
+                        block_ended = true;
+                    }
+                },
                 _ => {}
             }
 
diff --git a/static_db/bbcf.ron b/static_db/bbcf.ron
@@ -341,7 +341,7 @@
         1: (
             size: 4,
             name: "endState",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [],
         ),
         2: (
@@ -396,7 +396,7 @@
         9: (
             size: 4,
             name: "endSubroutine",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [],
         ),
         10: (
diff --git a/static_db/dbfz.ron b/static_db/dbfz.ron
@@ -1131,7 +1131,7 @@
         1: (
             size: 4,
             name: "endState",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [],
         ),
         2: (
@@ -1241,7 +1241,7 @@
         16: (
             size: 4,
             name: "endSubroutine",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [],
         ),
         17: (
diff --git a/static_db/dnf.ron b/static_db/dnf.ron
@@ -242,7 +242,7 @@
         ),
         1: (
             name: "endState",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [
             ],
         ),
@@ -279,7 +279,7 @@
         ),
         9: (
             name: "endSubroutine",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [
             ],
         ),
diff --git a/static_db/gbvs.ron b/static_db/gbvs.ron
@@ -81,7 +81,7 @@
         1: (
             size: 4,
             name: "endState",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [],
         ),
         2: (
@@ -186,7 +186,7 @@
         16: (
             size: 4,
             name: "endSubroutine",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [],
         ),
         17: (
diff --git a/static_db/gbvsr.ron b/static_db/gbvsr.ron
@@ -581,8 +581,8 @@
         1: (
             size: 4,
             name: "endState",
-            codeBlock: End,
             args: [],
+            codeBlock: EndState,
         ),
         2: (
             size: 40,
@@ -691,8 +691,8 @@
         16: (
             size: 4,
             name: "endSubroutine",
-            codeBlock: End,
             args: [],
+            codeBlock: EndState,
         ),
         17: (
             size: 36,
diff --git a/static_db/ggrev2.ron b/static_db/ggrev2.ron
diff --git a/static_db/ggst.ron b/static_db/ggst.ron
@@ -1350,7 +1350,7 @@
         1: (
             size: 4,
             name: "endState",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [],
         ),
         2: (
@@ -1460,7 +1460,7 @@
         16: (
             size: 4,
             name: "endSubroutine",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [],
         ),
         17: (
diff --git a/static_db/p4u2.ron b/static_db/p4u2.ron
@@ -69,7 +69,7 @@
         1: (
             size: 4,
             name: "endState",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [],
         ),
         2: (
@@ -123,7 +123,7 @@
         9: (
             size: 4,
             name: "endSubroutine",
-            codeBlock: End,
+            codeBlock: EndState,
             args: [],
         ),
         10: (

Original file line number	Diff line number	Diff line change
`@@ -686,6 +686,7 @@ pub enum CodeBlock {`
`686`	`686`	`End,`
`687`	`687`	`NoBlock,`
`688`	`688`	`BeginNonrecursive,`
	`689`	`+ EndState,`
`689`	`690`	`}`
`690`	`691`
`691`	`692`	`impl Default for CodeBlock {`