diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c71cc3b0..f22e0d0df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). - Edified Panels are now crafted with 9 planks rather than 8 to avoid conflicting with the vanilla chest recipe ([#1080](https://github.com/FallingColors/HexMod/pull/1080)) @Robotgiggle - Drawing Evanition with nothing left to do will now undo the opening Introspection ([#1047](https://github.com/FallingColors/HexMod/pull/1047)) @Robotgiggle - Book pages for patterns without input/output iotas will no longer display the type signature line at all ([#1118](https://github.com/FallingColors/HexMod/pull/1118)) @IridescentVoid +- Consideration, Introspection, Retrospection, and Evanition now count towards the per-hex pattern limit ([#1172](https://github.com/FallingColors/HexMod/pull/1172)) @Robotgiggle - Updated Inline dependency from 1.0.1 to 1.2.2 ([#1043](https://github.com/FallingColors/HexMod/pull/1043)) @Robotgiggle - Updated Fabric Language Kotlin dependency from 1.9.4 to 1.13.7 ([#1043](https://github.com/FallingColors/HexMod/pull/1043)) @Robotgiggle - Updated Kotlin for Forge dependency from 4.3.0 to 4.12.0 ([#1043](https://github.com/FallingColors/HexMod/pull/1043)) @Robotgiggle 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 066632cff..2a7096752 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 5c3a6e825..ea6e227cb 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 87fddccdb..9288a2eef 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 c8f1b3aed..40158299f 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 )