updated damage and range calculations for sonorous staff

KyaniteMods · May 2, 2024 · 1ff2d5d · 1ff2d5d
1 parent c2c8d2c
commit 1ff2d5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/kyanite/deeperdarker/DeeperDarker.java b/src/main/java/com/kyanite/deeperdarker/DeeperDarker.java
@@ -234,7 +234,7 @@ public static void clientSetup(final FMLClientSetupEvent event) {
                 Sheets.addWoodType(DDBlocks.BLOOM);
                 ItemProperties.register(DDItems.SOUL_ELYTRA.get(), new ResourceLocation("broken"), (pStack, pLevel, pEntity, pSeed) -> SoulElytraItem.isFlyEnabled(pStack) ? 0 : 1);
                 ItemProperties.register(DDItems.SCULK_TRANSMITTER.get(), new ResourceLocation(MOD_ID, "linked"), (pStack, pLevel, pEntity, pSeed) -> SculkTransmitterItem.isLinked(pStack) ? 1 : 0);
-                ItemProperties.register(DDItems.SONOROUS_STAFF.get(), new ResourceLocation(MOD_ID, "charge"), (pStack, pLevel, pEntity, pSeed) -> pEntity != null && pEntity.getUseItem() == pStack ? (pStack.getUseDuration() - pEntity.getUseItemRemainingTicks()) / 668f : 0);
+                ItemProperties.register(DDItems.SONOROUS_STAFF.get(), new ResourceLocation(MOD_ID, "charge"), (pStack, pLevel, pEntity, pSeed) -> pEntity != null && pEntity.getUseItem() == pStack ? (pStack.getUseDuration() - pEntity.getUseItemRemainingTicks()) / 123f : 0);
             });
 
             BlockEntityRenderers.register(DDBlockEntities.DEEPER_DARKER_SIGNS.get(), SignRenderer::new);

diff --git a/src/main/java/com/kyanite/deeperdarker/content/items/SonorousStaffItem.java b/src/main/java/com/kyanite/deeperdarker/content/items/SonorousStaffItem.java
@@ -33,8 +33,8 @@ public void releaseUsing(ItemStack pStack, Level pLevel, LivingEntity pLivingEnt
         if(!(pLivingEntity instanceof Player player)) return;
 
         int timeUsed = getUseDuration(pStack) - pTimeCharged;
-        int damage = (int) Math.min(50, Math.round(Math.pow(timeUsed, 3/5.0)));
-        int range = (int) Math.min(50, Math.round(Math.pow(timeUsed, 3/4.0))) + 2;
+        int damage = (int) Math.round(50 / (1 + 16 / Math.exp(0.06 * timeUsed)));
+        int range = (int) Math.min(40, Math.round(3 * Math.log(timeUsed + 1)));
 
         Vec3 eyePos = player.getEyePosition();
         Vec3 facing = player.getForward();
@@ -75,7 +75,7 @@ public InteractionResultHolder<ItemStack> use(Level pLevel, Player pPlayer, Inte
     @Override
     public void inventoryTick(ItemStack pStack, Level pLevel, Entity pEntity, int pSlotId, boolean pIsSelected) {
         if(pEntity instanceof Player player) {
-            pStack.getOrCreateTag().putBoolean("charged", player.getUseItem() == pStack && pStack.getUseDuration() - player.getUseItemRemainingTicks() >= 668);
+            pStack.getOrCreateTag().putBoolean("charged", player.getUseItem() == pStack && pStack.getUseDuration() - player.getUseItemRemainingTicks() >= 123);
         }
     }