From 9616b89979b7af15a666b28e8190f3173903fe31 Mon Sep 17 00:00:00 2001 From: "petrak@" Date: Sat, 3 Dec 2022 11:52:45 -0500 Subject: [PATCH] redocument flock's refl, close #338 --- .../assets/hexcasting/lang/en_us.json | 1 + .../en_us/entries/patterns/stackmanip.json | 25 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.json b/Common/src/main/resources/assets/hexcasting/lang/en_us.json index 22e3c130..603a5278 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.json +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.json @@ -948,6 +948,7 @@ "hexcasting.page.stackmanip.over": "Copy the second-to-last iota of the stack to the top. [0, 1] becomes [0, 1, 0].", "hexcasting.page.stackmanip.tuck": "Copy the top iota of the stack, then put it under the second iota. [0, 1] becomes [1, 0, 1].", "hexcasting.page.stackmanip.2dup": "Copy the top two iotas of the stack. [0, 1] becomes [0, 1, 0, 1].", + "hexcasting.page.stackmanip.stack_len": "Pushes the size of the stack as a number to the top of the stack. (For example, a stack of [0, 1] will become [0, 1, 2].)", "hexcasting.page.stackmanip.duplicate_n": "Removes the number at the top of the stack, then copies the top iota of the stack that number of times. (A count of 2 results in two of the iota on the stack, not three.)", "hexcasting.page.stackmanip.fisherman": "Grabs the element in the stack indexed by the number and brings it to the top.", "hexcasting.page.stackmanip.fisherman/copy": "Like $(action)Fisherman's Gambit/$, but instead of moving the iota, copies it.", diff --git a/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/stackmanip.json b/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/stackmanip.json index 04b72502..dcae03f1 100644 --- a/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/stackmanip.json +++ b/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/stackmanip.json @@ -78,6 +78,22 @@ "output": "many", "text": "hexcasting.page.stackmanip.duplicate_n" }, + { + "type": "hexcasting:pattern", + "op_id": "hexcasting:2dup", + "anchor": "hexcasting:2dup", + "input": "any, any", + "output": "any, any, any, any", + "text": "hexcasting.page.stackmanip.2dup" + }, + { + "type": "hexcasting:pattern", + "op_id": "hexcasting:stack_len", + "anchor": "hexcasting:stack_len", + "input": "", + "output": "number", + "text": "hexcasting.page.stackmanip.stack_len" + }, { "type": "hexcasting:pattern", "op_id": "hexcasting:fisherman", @@ -137,15 +153,6 @@ "text": "hexcasting.page.stackmanip.swizzle.2", "link_text": "hexcasting.page.stackmanip.swizzle.link", "url": "https://github.com/gamma-delta/HexMod/wiki/Table-of-Lehmer-Codes-for-Swindler's-Gambit" - }, - { - "_comment": "i hate that I have to put this here at the end. two-page design bad", - "type": "hexcasting:pattern", - "op_id": "hexcasting:2dup", - "anchor": "hexcasting:2dup", - "input": "any, any", - "output": "any, any, any, any", - "text": "hexcasting.page.stackmanip.2dup" } ] }