Skip to content

Commit

Permalink
Removed wandering lamps
Browse files Browse the repository at this point in the history
  • Loading branch information
miyucomics committed Dec 1, 2024
1 parent 3d19a62 commit 998c339
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 153 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
- added effect to magic missiles to set the velocity of a target hit to 0.6th of their own normalized velocity + a bit of upwards push
- added prestidigitation support for shearing beehives and bee nests for honeycomb
- added ability to dye specklikes with the Dye spell
- added wandering lamps: resembles a compass and points you towards the vector left at the top of the stack
- added two more akashic utility patterns for clearing and getting the pattern of an akashic bookshelf
- added one tick item pickup delay to conjured hextitos so hextito quines can properly function
- added Atalanta Gambit: skip to the next Thoth iteration; "continue"
Expand All @@ -23,6 +22,7 @@
- changed how Evoker's Purification works to be like all the other keybind patterns
- changed Janus' Gambit to persist the Ravenmind, used in wisps
- changed specks to remove opening and closing quotes if there are any, for string iota
- changed hand used for evocation to offhand if mainhand contains item
- changed some documentation quotes to fit better
- fixed bug that made magic missile deal velocity damage, making it the cheapest railgun in existence
- fixed a hacky workaround used by evocation where it replaces the player's hand. Now it directly takes from the inventory
Expand Down Expand Up @@ -194,4 +194,4 @@
- fixed telepathy crashing on servers

## 1.0.0
- Initial release, wooo!
- Initial release, wooo!
8 changes: 0 additions & 8 deletions src/main/java/miyucomics/hexical/inits/HexicalItems.kt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ object HexicalItems {
val HAND_LAMP_ITEM = HandLampItem()
@JvmField
val ARCH_LAMP_ITEM = ArchLampItem()
val WANDERING_LAMP_ITEM = WanderingLampItem()

@JvmField
val CONJURED_COMPASS_ITEM = ConjuredCompassItem()
Expand All @@ -42,7 +41,6 @@ object HexicalItems {
fun init() {
Registry.register(Registry.ITEM, HexicalMain.id("lamp"), HAND_LAMP_ITEM)
Registry.register(Registry.ITEM, HexicalMain.id("arch_lamp"), ARCH_LAMP_ITEM)
Registry.register(Registry.ITEM, HexicalMain.id("wandering_lamp"), WANDERING_LAMP_ITEM)

Registry.register(Registry.ITEM, HexicalMain.id("gauntlet_staff"), ItemStaff(Settings().maxCount(1).group(HEXICAL_GROUP)))
Registry.register(Registry.ITEM, HexicalMain.id("lightning_rod_staff"), ItemStaff(Settings().maxCount(1).group(HEXICAL_GROUP)))
Expand All @@ -67,11 +65,5 @@ object HexicalItems {
val nbt = stack.nbt ?: return@CompassTarget null
return@CompassTarget GlobalPos.create(player.world.registryKey, BlockPos(nbt.getInt("x"), nbt.getInt("y"), nbt.getInt("z")))
}))
ModelPredicateProviderRegistry.register(WANDERING_LAMP_ITEM, Identifier("angle"), CompassAnglePredicateProvider(CompassTarget { _: ClientWorld, stack: ItemStack, player: Entity ->
val nbt = stack.nbt ?: return@CompassTarget null
if (!nbt.contains("x"))
return@CompassTarget null
return@CompassTarget GlobalPos.create(player.world.registryKey, BlockPos(nbt.getInt("x"), nbt.getInt("y"), nbt.getInt("z")))
}))
}
}
85 changes: 0 additions & 85 deletions src/main/java/miyucomics/hexical/items/WanderingLampItem.kt

This file was deleted.

10 changes: 3 additions & 7 deletions src/main/java/miyucomics/hexical/utils/CastingUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import at.petrak.hexcasting.api.HexAPI
import at.petrak.hexcasting.api.misc.DiscoveryHandlers
import at.petrak.hexcasting.api.misc.HexDamageSources
import at.petrak.hexcasting.api.mod.HexConfig
import at.petrak.hexcasting.api.spell.casting.CastingContext
import at.petrak.hexcasting.api.spell.casting.CastingHarness
import at.petrak.hexcasting.api.spell.iota.Iota
import at.petrak.hexcasting.api.spell.mishaps.Mishap
Expand Down Expand Up @@ -72,15 +73,10 @@ object CastingUtils {

@JvmStatic
fun castSpecial(world: ServerWorld, user: ServerPlayerEntity, hex: List<Iota>, source: SpecializedSource, finale: Boolean): CastingHarness {
val hand = if(!user.getStackInHand(Hand.MAIN_HAND).isEmpty && user.getStackInHand(Hand.OFF_HAND).isEmpty){
Hand.OFF_HAND
} else {
Hand.MAIN_HAND
}
val harness = IXplatAbstractions.INSTANCE.getHarness(user, hand)
val hand = if (!user.getStackInHand(Hand.MAIN_HAND).isEmpty && user.getStackInHand(Hand.OFF_HAND).isEmpty) Hand.OFF_HAND else Hand.MAIN_HAND
val harness = CastingHarness(CastingContext(user, hand, CastingContext.CastSource.PACKAGED_HEX))
(harness.ctx as CastingContextMinterface).setSpecializedSource(source)
(harness.ctx as CastingContextMinterface).setFinale(finale)
harness.stack = mutableListOf()
harness.executeIotas(hex, world)
return harness
}
Expand Down
7 changes: 0 additions & 7 deletions src/main/resources/assets/hexical/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"advancements.hexical.arch_lamp.title": "Daemon",
"advancements.hexical.arch_lamp.description": "Acquire an archgenie lamp.",
"advancements.hexical.wandering_lamp.title": "Itty Bitty Living Space",
"advancements.hexical.wandering_lamp.description": "Acquire a wandering lamp.",

"advancements.hexical.reload_lamp.title": "Phenomenal Cosmic Powers!",
"advancements.hexical.reload_lamp.description": "Reload the lamp.",
Expand Down Expand Up @@ -43,7 +41,6 @@
"item.hexical.hexburst": "Hexburst",
"item.hexical.hextito": "Hextito",
"item.hexical.lamp": "Hand Genie Lamp",
"item.hexical.wandering_lamp": "Wandering Lamp",
"item.hexical.gauntlet_staff": "Gauntlet Staff",
"item.hexical.lightning_rod_staff": "Lightning Rod Staff",
"item.hexical.living_scroll_small": "Small Living Scroll",
Expand Down Expand Up @@ -245,10 +242,6 @@
"hexical.page.offerings.3": "Not all villagers can be a genie. I estimate there is so little media potential in any villager lesser than Journeyman-grade that the spell would simply fail. Having most of its workings $(o)optimized$() purely for casting, I doubt an Expert villager will perform any better than a Journeyman. However, certain skills may still affect the quality of casting. My notes on that on the next page.",
"hexical.page.offerings.4": "Ingrained memories and inherent abilities seem to be able to survive the optimization process. A master villager who has honed its craft to perfection has internalized its knowledge so deeply, that it casts differently. A wandering villager who has spent its life travelling the world may be so attuned to exploration that the way it casts reflects its experience.",

"hexical.page.wandering_lamps.title": "Wandering Lamps",
"hexical.page.wandering_lamps.0": "By some remarkable process, the lamp transformed into a compass! It still retains its original casting abilities when I hold down on it, but if there is a vector left at the top of the stack once its stored _Hex completes, the compass's needle swings to point towards that location. I find this purpose rather niche although it may be useful.",
"hexical.page.wandering_lamps.1": "All the patterns available to a regular lamp is still available to the wandering genie lamp. In addition to that, the wandering genie lamp has some new patterns exclusive to it.",

"hexical.page.arch_lamps.title": "Archgenie Lamps",
"hexical.page.arch_lamps.0": "Rather just losing memories, the master villager's mind exited its body and completely supplanted the original genie. Because a separate entity casts my spells, a lamp should be able to cast even without me holding it. These archgenie lamps are activated and deactivated rather than used and while active in my inventory, they cast every moment even without my input.",
"hexical.page.arch_lamps.1": "The output of an archgenie lamp is so grand that it saturates the air around me with _media... it's incredible. Unfortunately, if two lamps are active at once within my inventory, the resonances clash and deactivate both lamps, as well as rendering every archgenie lamp in my inventory useless for a few seconds. I should only have one archgenie lamp active at once, although I can still simultaneously use a regular lamp.",
Expand Down
31 changes: 0 additions & 31 deletions src/main/resources/data/hexical/advancements/wandering_lamp.json

This file was deleted.

This file was deleted.

0 comments on commit 998c339

Please sign in to comment.