From 99282763d8ede67971fa96c22529e663bec5f81a Mon Sep 17 00:00:00 2001 From: navarchus Date: Fri, 23 Aug 2024 00:18:45 -0400 Subject: [PATCH 1/3] document stack size mishap --- .../resources/assets/hexcasting/lang/en_us.flatten.json5 | 3 +++ .../thehexbook/en_us/entries/casting/mishaps.json | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 index 622d4f748f..0f3634ae5a 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 @@ -1311,6 +1311,9 @@ "true_name.title": "Transgress Other", true_name: "I attempted to $(l:patterns/readwrite#hexcasting:write)$(action)save a reference/$ to another player to a permanent medium.$(br2)Causes black sparks, and robs me of my sight for approximately one minute.", + "stack_size.title": "Stack Size", + "stack_size": "I tried to cast a spell which exceeded the size limit of the $(thing)Stack/$.$(br2)Causes my spell to halt and pushes a $(l:casting/influences)$(action)Garbage/$ to my stack.", + "disabled.title": "Disallowed Action", disabled: "I tried to cast an action that has been disallowed by a server administrator.$(br2)Causes black sparks.", diff --git a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/casting/mishaps.json b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/casting/mishaps.json index a5b5984076..4d7a032866 100644 --- a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/casting/mishaps.json +++ b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/casting/mishaps.json @@ -78,6 +78,11 @@ "title": "hexcasting.page.mishaps.true_name.title", "text": "hexcasting.page.mishaps.true_name" }, + { + "type": "patchouli:text", + "title": "hexcasting.page.mishaps.stack_size.title", + "text": "hexcasting.page.mishaps.stack_size" + }, { "type": "patchouli:text", "title": "hexcasting.page.mishaps.disabled.title", From 2ec0160b0e0273726f58777ae1354ba9a81966d3 Mon Sep 17 00:00:00 2001 From: navarchus Date: Fri, 23 Aug 2024 13:35:31 -0400 Subject: [PATCH 2/3] funny joke --- .../assets/hexcasting/lang/en_us.flatten.json5 | 6 +++--- .../thehexbook/en_us/entries/casting/mishaps.json | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 index 0f3634ae5a..e9ff9176a0 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 @@ -1281,6 +1281,9 @@ "not_enough_iotas.title": "Not Enough Iotas", not_enough_iotas: "The action required more iotas than were on the stack.$(br2)Causes light gray sparks, and as many $(l:casting/influences)$(action)Garbages/$ as would be required to fill up the argument count will be pushed.", + "stack_size.title": "Too Many Iotas", + "stack_size": "I tried to cast a spell which exceeded the size limit of the stack.$(br2)Causes black sparks, and my spell to halt and entire stack will be replaced with a single $(l:casting/influences)$(action)Garbage/$.", + "incorrect_iota.title": "Incorrect Iota", incorrect_iota: "The action that was executed expected an iota of a certain type for an argument, but it got something invalid. If multiple iotas are invalid, the error message will only tell me about the error deepest in the stack.$(br2)Causes dark gray sparks, and the invalid iota will be replaced with $(l:casting/influences)$(action)Garbage/$.", @@ -1311,9 +1314,6 @@ "true_name.title": "Transgress Other", true_name: "I attempted to $(l:patterns/readwrite#hexcasting:write)$(action)save a reference/$ to another player to a permanent medium.$(br2)Causes black sparks, and robs me of my sight for approximately one minute.", - "stack_size.title": "Stack Size", - "stack_size": "I tried to cast a spell which exceeded the size limit of the $(thing)Stack/$.$(br2)Causes my spell to halt and pushes a $(l:casting/influences)$(action)Garbage/$ to my stack.", - "disabled.title": "Disallowed Action", disabled: "I tried to cast an action that has been disallowed by a server administrator.$(br2)Causes black sparks.", diff --git a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/casting/mishaps.json b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/casting/mishaps.json index 4d7a032866..08fb6d0335 100644 --- a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/casting/mishaps.json +++ b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/entries/casting/mishaps.json @@ -28,6 +28,11 @@ "title": "hexcasting.page.mishaps.not_enough_iotas.title", "text": "hexcasting.page.mishaps.not_enough_iotas" }, + { + "type": "patchouli:text", + "title": "hexcasting.page.mishaps.stack_size.title", + "text": "hexcasting.page.mishaps.stack_size" + }, { "type": "patchouli:text", "title": "hexcasting.page.mishaps.incorrect_iota.title", @@ -78,11 +83,6 @@ "title": "hexcasting.page.mishaps.true_name.title", "text": "hexcasting.page.mishaps.true_name" }, - { - "type": "patchouli:text", - "title": "hexcasting.page.mishaps.stack_size.title", - "text": "hexcasting.page.mishaps.stack_size" - }, { "type": "patchouli:text", "title": "hexcasting.page.mishaps.disabled.title", From 4a1d0fa90c91fcf394f7fcf7553be11a4c67e698 Mon Sep 17 00:00:00 2001 From: Toby Vestal Date: Fri, 23 Aug 2024 13:52:45 -0400 Subject: [PATCH 3/3] solve halting problem Co-authored-by: [object Object] --- .../main/resources/assets/hexcasting/lang/en_us.flatten.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 index 13d806c927..6b95353b12 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 @@ -1283,7 +1283,7 @@ not_enough_iotas: "The action required more iotas than were on the stack.$(br2)Causes light gray sparks, and as many $(l:casting/influences)$(action)Garbages/$ as would be required to fill up the argument count will be pushed.", "stack_size.title": "Too Many Iotas", - "stack_size": "I tried to cast a spell which exceeded the size limit of the stack.$(br2)Causes black sparks, and my spell to halt and entire stack will be replaced with a single $(l:casting/influences)$(action)Garbage/$.", + "stack_size": "I tried to cast a spell which exceeded the size limit of the stack.$(br2)Causes black sparks, and my entire stack will be replaced with a single $(l:casting/influences)$(action)Garbage/$.", "incorrect_iota.title": "Incorrect Iota", incorrect_iota: "The action that was executed expected an iota of a certain type for an argument, but it got something invalid. If multiple iotas are invalid, the error message will only tell me about the error deepest in the stack.$(br2)Causes dark gray sparks, and the invalid iota will be replaced with $(l:casting/influences)$(action)Garbage/$.",