From 50ef457be656bd3cd55c1b32b67b9c93118909b7 Mon Sep 17 00:00:00 2001
From: Robotgiggle <88736742+Robotgiggle@users.noreply.github.com>
Date: Wed, 17 Jun 2026 20:47:39 -0400
Subject: [PATCH] Make escaper patterns increment the op count (1.21 edition)

---
 .../common/casting/actions/escaping/OpCloseParen.kt           | 4 ++--
 .../hexcasting/common/casting/actions/escaping/OpEscape.kt    | 4 ++--
 .../hexcasting/common/casting/actions/escaping/OpOpenParen.kt | 4 ++--
 .../hexcasting/common/casting/actions/escaping/OpUndo.kt      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpCloseParen.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpCloseParen.kt
index 066632cff7..2a70967527 100644
--- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpCloseParen.kt
+++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpCloseParen.kt
@@ -23,7 +23,7 @@ object OpCloseParen : Action {
         if (newParenCount == 0) {
             val newStack = image.stack.toMutableList()
             newStack.add(ListIota(image.parenthesized.toList().map { it.iota }))
-            val image2 = image.copy(
+            val image2 = image.withUsedOp().copy(
                 stack = newStack,
                 parenCount = newParenCount,
                 parenthesized = listOf()
@@ -34,7 +34,7 @@ object OpCloseParen : Action {
             // we need to add the close paren
             val newParens = image.parenthesized.toMutableList()
             newParens.add(ParenthesizedIota(thisIota, false))
-            val image2 = image.copy(
+            val image2 = image.withUsedOp().copy(
                 parenCount = newParenCount,
                 parenthesized = newParens
             )
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpEscape.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpEscape.kt
index 5c3a6e8258..ea6e227cb2 100644
--- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpEscape.kt
+++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpEscape.kt
@@ -12,14 +12,14 @@ import at.petrak.hexcasting.common.lib.hex.HexEvalSounds
 
 object OpEscape : Action {
     override fun operate(env: CastingEnvironment, image: CastingImage, continuation: SpellContinuation): OperationResult {
-        val image2 = image.copy(
+        val image2 = image.withUsedOp().copy(
             escapeNext = true
         )
         return OperationResult(image2, listOf(), continuation, HexEvalSounds.NORMAL_EXECUTE)
     }
 
     override fun operateInParens(env: CastingEnvironment, image: CastingImage, continuation: SpellContinuation, thisIota: Iota): ParenthesizedOperationResult {
-        val image2 = image.copy(
+        val image2 = image.withUsedOp().copy(
             escapeNext = true
         )
         return ParenthesizedOperationResult(image2, listOf(), continuation, HexEvalSounds.NORMAL_EXECUTE, ResolvedPatternType.EVALUATED)
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpOpenParen.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpOpenParen.kt
index 87fddccdb2..9288a2eef9 100644
--- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpOpenParen.kt
+++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpOpenParen.kt
@@ -12,7 +12,7 @@ import at.petrak.hexcasting.common.lib.hex.HexEvalSounds
 
 object OpOpenParen : Action {
     override fun operate(env: CastingEnvironment, image: CastingImage, continuation: SpellContinuation): OperationResult {
-        val image2 = image.copy(
+        val image2 = image.withUsedOp().copy(
             parenCount = image.parenCount + 1
         )
         return OperationResult(image2, listOf(), continuation, HexEvalSounds.NORMAL_EXECUTE)
@@ -22,7 +22,7 @@ object OpOpenParen : Action {
         // we have escaped the parens onto the stack; we just also record our count.
         val newParens = image.parenthesized.toMutableList()
         newParens.add(CastingImage.ParenthesizedIota(thisIota, false))
-        val image2 = image.copy(
+        val image2 = image.withUsedOp().copy(
             parenthesized = newParens,
             parenCount = image.parenCount + 1
         )
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpUndo.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpUndo.kt
index c8f1b3aed3..40158299f5 100644
--- a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpUndo.kt
+++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpUndo.kt
@@ -32,7 +32,7 @@ object OpUndo : Action {
                 HexActions.CLOSE_PAREN.prototype.angles -> newParenCount++
             }
         }
-        val image2 = image.copy(
+        val image2 = image.withUsedOp().copy(
             parenthesized = newParens,
             parenCount = newParenCount
         )