Conjure staff documentation

common/src/main/java/miyucomics/hexical/blocks/AdvancedConjuredBlock.kt

@@ -46,7 +46,6 @@ class AdvancedConjuredBlock : BlockConjured(
 		if (tile !is AdvancedConjuredBlockEntity)
 			return
 		if (tile.properties["bouncy"]!!) {
-			println("Entity landed with velocity of " + entity.velocity.toString())
 			val velocity = entity.velocity
 			if (velocity.y < 0) {
 				entity.setVelocity(velocity.x, -velocity.y, velocity.z)

common/src/main/resources/assets/hexical/lang/en_us.json

@@ -8,6 +8,7 @@
 	"hexcasting.spell.hexical:get_lamp_use_time": "Genie Refl.: Temporal",
 	"hexcasting.spell.hexical:chorus_blink": "Chorus Blink",
 	"hexcasting.spell.hexical:conjure_advanced_block": "Conjure Advanced Block",
+	"hexcasting.spell.hexical:conjure_staff": "Conjure Staff",
 	"hexcasting.spell.hexical:modify_block_bouncy": "Modify Block: Bouncy",
 	"hexcasting.spell.hexical:modify_block_ephemeral": "Modify Block: Ephemeral",
 	"hexcasting.spell.hexical:modify_block_invisible": "Modify Block: Invisible",
@@ -18,6 +19,10 @@
 
 	"hexcasting.mishap.hexical:lamp_needed": "Expected to be cast by Genieless Lamp.",
 
+	"hexical.page.hexical_changes": "Hexical Changes",
+	"hexical.page.hexical_changes.1": "The media feels different somehow, almost friendly. I feel strangely more receptive of the ambient media around me. I can even feel it responding to certain tasks I perform, as if new spells are available to me.",
+	"hexical.page.hexical_changes.2": "The media has also become more adaptable, letting me manipulate it more precisely into specialized effects and even interface with items like my abacus.",
+
 	"hexical.category.lamp": "Genieless Lamp",
 	"hexical.category.lamp.desc": "I have heard tales from the villagers about a magical artifact. Legends say it contains a spirit that grants wishes, but I suspect that is just embellishment evolved over centuries of storytelling. Regardless, I dedicate this chapter to my pursuit and research of it.",
 
@@ -42,9 +47,6 @@
 	"hexical.page.nephthys.1": "Pops a pattern list and a number from the stack and dives down n iota to casts the pattern list. Useful for surgery-like operations.",
 	"hexical.page.nephthys.2": "It's extremely versatile and I can mend almost any error in my stack using Bookkeeper's Gambit, pushing iota after a dive, and transforming surfaced iota. It was named after a goddess of mourning and rivers, lending to how it buries/dives down into the stack.",
 
-	"hexical.category.hexomancy": "Hexomancy",
-	"hexical.category.hexomancy.desc": "I feel strangely more receptive of the ambient media around me. I can even feel it responding to certain tasks I perform, as if suggesting spells to me. Because I am essentially divining spells from the media, I shall call it hexomancy.",
-
 	"hexical.page.advanced_conjuration": "Advanced Conjuration",
 	"hexical.page.advanced_conjuration.1": "While Conjure Block is an interesting spell, it has multiple shortcomings. The blocks stay around forever, are a mess to clean up, and don't have many interesting properties.",
 	"hexical.page.conjure_advanced_block": "Luckily, Nature offers an elegant and flexible solution. These advanced blocks come with a suite of $(o)modifiers$(). I could even stack multiple modifiers on one block.",
@@ -56,10 +58,15 @@
 	"hexical.page.chorus_blink.1": "Between Blink, Greater Teleport, ender pearls, and chorus fruit, this spell serves a harmonious midpoint for safe, precise, and cheap teleportation.",
 	"hexical.page.chorus_blink.2": "It consumes a chorus fruit from my inventory and teleports me up to 16 blocks using an offset vector. The cost is constant whether I teleport the full 16 blocks or less, and has no penalty for multiple casts in one hex. With a lot of chorus fruit, it can be a significantly cheaper Greater Teleport.",
 
+	"hexical.page.conjure_staff.1": "Conjures a staff at the location with the amount of media, rank, and hex respectively.",
+	"hexical.page.conjure_staff.2": "A conjured staff is not unlike a cypher. It has a media bank that it relies on for casting and breaks when it runs out, unable to consume my health or my inventory's media. It is not rechargable or programmable. Using erase item on it simply destroys it. However, its true power is $(o)input interception$().",
+	"hexical.page.conjure_staff.3": "When I use my primary or secondary use keys with a staff in my main hand, it intercepts my click. Depending on the rank I assigned during creation, after that many clicks, it will cast the hex I gave it, starting the stack with false and true, corresponding to my left and right clicks respectively.",
+	"hexical.page.conjure_staff.4": "The spell is not cheap, requiring a charged amethyst, the media battery, and an additional amethyst shard for every additional rank. However, the conjured result is both speedy and versatile, with infinitely more possibilities and none of the cooldown of other casting devices.",
+
 	"hexical.page.ping.1": "For the price of a single dust, I can cause a voluntary hallucination of a little circular ripple of my pigment color!",
 	"hexical.page.ping.2": "I can see it through blocks and its size does not change much even from a far distance, making it perfect for reporting locations from my hexes.",
 
 	"hexical.page.surveil_sentinel.1": "The name sentinel has perplexed me for a long time. My sentinel highlights locations and can even expand my reach, but not once has it kept watch... until now.",
 	"hexical.page.surveil_sentinel.2": "This spell magically displaces my vision to my sentinel's position. While dissociating, I still maintain control over my body. Once a sentinel is stationed, I can watch over anything, everything, everywhere from any distance away. I wonder what I would see if I banished my sentinel and casted the spell...$(br)$(br)It $(o)burns.",
 	"hexical.page.surveil_sentinel.3": "$(o)The Aleph's diameter was probably little more than an inch, but all space was there, actual and undiminished... I saw daybreak and nightfall... I saw all the mirrors on earth and none of them reflected me... I saw the Aleph from every point and angle, and in the Aleph I saw the earth and in the earth the Aleph and in the Aleph the earth..."
-}
+}

common/src/main/resources/data/hexical/patchouli_books/hexicalbook/en_us/categories/lamp.json

@@ -1,6 +1,6 @@
 {
 	"name": "hexical.category.lamp",
 	"icon": "hexical:lamp",
-    "parent": "hexcasting:items",
+	"sortnum": 2.5,
 	"description": "hexical.category.lamp.desc"
-}
+}

common/src/main/resources/data/hexical/patchouli_books/hexicalbook/en_us/entries/hexical_changes.json

@@ -0,0 +1,17 @@
+{
+	"name": "hexical.page.hexical_changes",
+	"icon": "minecraft:ender_eye",
+	"category": "hexcasting:basics",
+	"sortnum": 1,
+	"advancement": "hexcasting:root",
+	"pages": [
+		{
+			"type": "patchouli:text",
+			"text": "hexical.page.hexical_changes.1"
+		},
+		{
+			"type": "patchouli:text",
+			"text": "hexical.page.hexical_changes.2"
+		}
+	]
+}

common/src/main/resources/data/hexical/patchouli_books/hexicalbook/en_us/entries/hexomancy/advanced_conjuration.json → common/src/main/resources/data/hexical/patchouli_books/hexicalbook/en_us/entries/patterns/advanced_conjuration.json

@@ -1,7 +1,7 @@
 {
 	"name": "hexical.page.advanced_conjuration",
 	"icon": "minecraft:glass",
-	"category": "hexical:hexomancy",
+	"category": "hexcasting:patterns/spells",
 	"pages": [
 		{
 			"type": "patchouli:text",
@@ -48,4 +48,4 @@
 			"text": "hexical.page.modify_block_volatile"
 		}
 	]
-}
+}

common/src/main/resources/data/hexical/patchouli_books/hexicalbook/en_us/entries/hexomancy/chorus_blink.json → common/src/main/resources/data/hexical/patchouli_books/hexicalbook/en_us/entries/patterns/chorus_blink.json

@@ -1,7 +1,7 @@
 {
 	"name": "hexcasting.spell.hexical:chorus_blink",
 	"icon": "minecraft:chorus_fruit",
-	"category": "hexical:hexomancy",
+	"category": "hexcasting:patterns/spells",
 	"pages": [
 		{
 			"type": "hexcasting:pattern",
@@ -16,4 +16,4 @@
 			"text": "hexical.page.chorus_blink.2"
 		}
 	]
-}
+}

common/src/main/resources/data/hexical/patchouli_books/hexicalbook/en_us/entries/patterns/conjure_staff.json

@@ -0,0 +1,27 @@
+{
+	"name": "hexcasting.spell.hexical:conjure_staff",
+	"icon": "hexical:conjured_staff",
+	"category": "hexcasting:patterns/spells",
+	"pages": [
+		{
+			"type": "hexcasting:pattern",
+			"op_id": "hexical:conjure_staff",
+			"anchor": "hexical:conjure_staff",
+			"input": "vec, num, num, [pattern]",
+			"output": "",
+			"text": "hexical.page.conjure_staff.1"
+		},
+		{
+			"type": "patchouli:text",
+			"text": "hexical.page.conjure_staff.2"
+		},
+		{
+			"type": "patchouli:text",
+			"text": "hexical.page.conjure_staff.3"
+		},
+		{
+			"type": "patchouli:text",
+			"text": "hexical.page.conjure_staff.4"
+		}
+	]
+}

common/src/main/resources/data/hexical/patchouli_books/hexicalbook/en_us/entries/hexomancy/ping_spell.json → common/src/main/resources/data/hexical/patchouli_books/hexicalbook/en_us/entries/patterns/ping_spell.json

@@ -1,7 +1,7 @@
 {
 	"name": "hexcasting.spell.hexical:ping",
 	"icon": "minecraft:ender_eye",
-	"category": "hexical:hexomancy",
+	"category": "hexcasting:patterns/spells",
 	"pages": [
 		{
 			"type": "hexcasting:pattern",
@@ -16,4 +16,4 @@
 			"text": "hexical.page.ping.2"
 		}
 	]
-}
+}