Rework hallucination rate to briefly spike after adding/triggering a mind

Author: Robotgiggle

common/src/main/java/robotgiggle/hierophantics/HierophanticsClient.kt

@@ -16,8 +16,10 @@ import robotgiggle.hierophantics.inits.HierophanticsConfig.GlobalConfig
 import me.shedaniel.autoconfig.AutoConfig
 
 object HierophanticsClient {
-    @JvmStatic
+    @JvmField
     var clientOwnedMinds = 0;
+
+    var scalingTimestamp = 0L;
 
     fun init() {
         HierophanticsConfig.initClient()
@@ -27,6 +29,18 @@ object HierophanticsClient {
         return AutoConfig.getConfigScreen(GlobalConfig::class.java, parent).get()
     }
 
+    @JvmStatic
+    fun setHallucinationScaling(strength: Double) {
+        scalingTimestamp = ClientTickCounter.ticksInGame + (2000*strength).toInt()
+    }
+
+    @JvmStatic
+    fun getHallucinationScaling(): Double {
+        // when the timestamp is in the future, hallucination rate is increased
+        // as the current time approaches the timestamp, the rate scales back down
+        return Math.max((scalingTimestamp - ClientTickCounter.ticksInGame)/2000.0, 0.4)
+    }
+
     @JvmStatic
     fun hallucinateItem(original: ItemStack): ItemStack {
         val config = HierophanticsConfig.client.itemHallucinations;
@@ -36,7 +50,10 @@ object HierophanticsClient {
         val rng = Math.abs((hash + timeScramble * (150 + (hash % 300))) % 10000);
 
         // hallucinate emeralds due to embedded minds
-        val emeraldChance = Math.min(config.baseEmeraldRate * clientOwnedMinds, config.maxEmeraldRate);
+        val emeraldChance = Math.min(
+            config.baseEmeraldRate * clientOwnedMinds * getHallucinationScaling(), 
+            config.maxEmeraldRate
+        );
         if (rng < emeraldChance * 10000) {
             if (original.getItem() is BlockItem)
                 return ItemStack(Items.EMERALD_BLOCK, original.getCount());

common/src/main/java/robotgiggle/hierophantics/blocks/FlayBedBlockEntity.kt

@@ -44,6 +44,7 @@ import robotgiggle.hierophantics.inits.HierophanticsBlockEntities
 import robotgiggle.hierophantics.inits.BaseCriterion
 import robotgiggle.hierophantics.blocks.FlayBedBlock
 import robotgiggle.hierophantics.networking.msg.MsgOwnedMindsS2C
+import robotgiggle.hierophantics.networking.msg.MsgHallucinationTriggerS2C
 
 import at.petrak.hexcasting.api.casting.ParticleSpray
 import at.petrak.hexcasting.api.pigment.FrozenPigment
@@ -85,6 +86,7 @@ class FlayBedBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Hieroph
                 val villagerName = sacrifice.getCustomName()?.getString()
                 val newTotal = HieroServerState.getPlayerState(subject).addMind(world.server, villagerName)
                 MsgOwnedMindsS2C(newTotal).sendToPlayer(subject)
+                MsgHallucinationTriggerS2C(4.0).sendToPlayer(subject)
 
                 HierophanticsAdvancements.EMBED_MIND.trigger(subject)
 

common/src/main/java/robotgiggle/hierophantics/data/HieroMind.kt

@@ -12,6 +12,7 @@ import robotgiggle.hierophantics.data.HieroServerState
 import robotgiggle.hierophantics.inits.HierophanticsSounds
 import robotgiggle.hierophantics.iotas.MishapThrowerIota
 import robotgiggle.hierophantics.iotas.TriggerIota.Trigger
+import robotgiggle.hierophantics.networking.msg.MsgHallucinationTriggerS2C
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.util.Hand
@@ -43,6 +44,7 @@ class HieroMind(var hex: NbtCompound, var trigger: Trigger, var muted: Boolean)
 				val sound = if (ecv.resolutionType.success) HierophanticsSounds.HIEROMIND_CAST.value else HexSounds.CAST_FAILURE
 				player.getWorld().playSound(null, pos.x, pos.y, pos.z, sound, SoundCategory.PLAYERS, 1f, 1f)
 			}
+			MsgHallucinationTriggerS2C(2.8).sendToPlayer(player)
 		}	
 	}
 

common/src/main/java/robotgiggle/hierophantics/data/HieroPlayerState.kt

@@ -7,7 +7,6 @@ import at.petrak.hexcasting.api.utils.serializeToNBT
 import at.petrak.hexcasting.api.utils.vecFromNBT
 import at.petrak.hexcasting.api.casting.iota.Iota
 import robotgiggle.hierophantics.Hierophantics
-import robotgiggle.hierophantics.networking.msg.MsgOwnedMindsS2C
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.nbt.NbtElement
 import net.minecraft.nbt.NbtList

common/src/main/java/robotgiggle/hierophantics/inits/HierophanticsConfig.kt

@@ -85,7 +85,7 @@ object HierophanticsConfig {
 
         class AudioHallucinations {
             @Tooltip
-            val baseVillagerRate: Double = 0.00006
+            val baseVillagerRate: Double = 0.0002
             @Tooltip
             val maxVillagerRate: Double = 0.004
             @Tooltip

common/src/main/java/robotgiggle/hierophantics/mixin/PlayerEntityMixin.java

@@ -72,7 +72,7 @@ private void playVillagerHurtNoise(CallbackInfoReturnable<SoundEvent> ci) {
         if (ci.getReturnValue() == SoundEvents.ENTITY_PLAYER_HURT) {
             PlayerEntity player = (PlayerEntity) (Object) this;
             int minds = 0;
-            if (player.getWorld().isClient()) minds = HierophanticsClient.getClientOwnedMinds();
+            if (player.getWorld().isClient()) minds = HierophanticsClient.clientOwnedMinds;
             else minds = HieroServerState.getPlayerState(player).getOwnedMinds();
             if (player.getRandom().nextDouble() < 0.3 - 1.0/(minds + 3)) {
                 ci.setReturnValue(SoundEvents.ENTITY_VILLAGER_HURT);

common/src/main/java/robotgiggle/hierophantics/mixin/client/AbstractClientPlayerEntityMixin.java

@@ -35,7 +35,7 @@ private void hallucinateAudio(CallbackInfo ci) {
 
         // hallucinate villager nosies due to embedded minds
         double villagerChance = Math.min(
-            config.getBaseVillagerRate() * HierophanticsClient.getClientOwnedMinds(),
+            config.getBaseVillagerRate() * HierophanticsClient.clientOwnedMinds * HierophanticsClient.getHallucinationScaling(),
             config.getMaxVillagerRate()
         );
         if (rand.nextDouble() < villagerChance) {

common/src/main/java/robotgiggle/hierophantics/networking/handler/ClientMessageHandler.kt

@@ -14,6 +14,9 @@ fun HierophanticsMessageS2C.applyOnClient(ctx: PacketContext) = ctx.queue {
         is MsgOwnedMindsS2C -> {
             HierophanticsClient.clientOwnedMinds = ownedMinds
         }
-        // add more client-side message handlers here
+
+        is MsgHallucinationTriggerS2C -> {
+            HierophanticsClient.setHallucinationScaling(strength)
+        }
     }
 }

common/src/main/java/robotgiggle/hierophantics/networking/msg/MsgHallucinationTriggerS2C.kt

@@ -0,0 +1,18 @@
+package robotgiggle.hierophantics.networking.msg
+
+import robotgiggle.hierophantics.inits.HierophanticsConfig
+import net.minecraft.network.PacketByteBuf
+
+data class MsgHallucinationTriggerS2C(val strength: Double) : HierophanticsMessageS2C {
+    companion object : HierophanticsMessageCompanion<MsgHallucinationTriggerS2C> {
+        override val type = MsgHallucinationTriggerS2C::class.java
+
+        override fun decode(buf: PacketByteBuf) = MsgHallucinationTriggerS2C(
+            strength = buf.readDouble()
+        )
+
+        override fun MsgHallucinationTriggerS2C.encode(buf: PacketByteBuf) {
+            buf.writeDouble(strength)
+        }
+    }
+}