diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/ParticleTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/ParticleTool.java index baad4beec..ff62db42d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/ParticleTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/ParticleTool.java @@ -55,10 +55,10 @@ public class ParticleTool { if ((level.getBlockState(BlockPos.containing(x, y, z))).getBlock() == Blocks.WATER) { level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_WATER.get(), SoundSource.BLOCKS, 2, 1); } - level.playSound(null, BlockPos.containing(x, y + 1, z), SoundEvents.FIREWORK_ROCKET_BLAST, SoundSource.BLOCKS, 4, 1); - level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 3, 1); - level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_FAR.get(), SoundSource.BLOCKS, 6, 1); - level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 12, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), SoundEvents.FIREWORK_ROCKET_BLAST, SoundSource.BLOCKS, 2, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 2, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_FAR.get(), SoundSource.BLOCKS, 8, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 32, 1); } if (level instanceof ServerLevel serverLevel) { @@ -79,7 +79,7 @@ public class ParticleTool { if ((level.getBlockState(BlockPos.containing(x, y, z))).getBlock() == Blocks.WATER) { level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_WATER.get(), SoundSource.BLOCKS, 3, 1); } - level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 8, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 4, 1); level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_FAR.get(), SoundSource.BLOCKS, 16, 1); level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 32, 1); } @@ -109,9 +109,9 @@ public class ParticleTool { if ((level.getBlockState(BlockPos.containing(x, y, z))).getBlock() == Blocks.WATER) { level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.EXPLOSION_WATER.get(), SoundSource.BLOCKS, 3, 1); } - level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.HUGE_EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 16, 1); - level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.HUGE_EXPLOSION_FAR.get(), SoundSource.BLOCKS, 32, 1); - level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.HUGE_EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 64, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.HUGE_EXPLOSION_CLOSE.get(), SoundSource.BLOCKS, 8, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.HUGE_EXPLOSION_FAR.get(), SoundSource.BLOCKS, 24, 1); + level.playSound(null, BlockPos.containing(x, y + 1, z), ModSounds.HUGE_EXPLOSION_VERY_FAR.get(), SoundSource.BLOCKS, 128, 1); } if (level instanceof ServerLevel serverLevel) { diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/ProjectileTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/ProjectileTool.java index 6e663c7ef..f93596d5f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/ProjectileTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/ProjectileTool.java @@ -25,9 +25,9 @@ public class ProjectileTool { EventHooks.onExplosionStart(projectile.level(), explosion); explosion.finalizeExplosion(false); - if (radius <= 5) { + if (radius <= 4) { ParticleTool.spawnSmallExplosionParticles(projectile.level(), projectile.position().add(projectile.getDeltaMovement().scale(0.5))); - } else if (radius > 5 && radius < 10) { + } else if (radius > 4 && radius < 10) { ParticleTool.spawnMediumExplosionParticles(projectile.level(), projectile.position().add(projectile.getDeltaMovement().scale(0.5))); } else { ParticleTool.spawnHugeExplosionParticles(projectile.level(), projectile.position().add(projectile.getDeltaMovement().scale(0.5))); diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close.ogg index 2757c5216..cd091a0a8 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close2.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close2.ogg index 124765b3a..20af6dd1b 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close2.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close2.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close3.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close3.ogg index 80bff52c9..8cfa012c1 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close3.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_close3.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far.ogg index ff94e640f..e0c2c81f3 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far2.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far2.ogg index 504927ee2..5212a0ed0 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far2.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far2.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far3.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far3.ogg index ab5f9d4ac..959a0c426 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far3.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_far3.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_very_far.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_very_far.ogg index 459346ccd..1e95968a8 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_very_far.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_very_far.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_very_far2.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_very_far2.ogg index 2abae1bc7..0c054ec83 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_very_far2.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_very_far2.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water.ogg index 6147a72a7..ebeebf088 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water2.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water2.ogg index f19219f65..4b4a5102f 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water2.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water2.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water3.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water3.ogg index 1d7070f4c..bbff1ef8c 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water3.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/explosion_water3.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_close.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_close.ogg index bd904657a..ae01f6f49 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_close.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_close.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_close2.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_close2.ogg index 503383092..f05fae2f3 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_close2.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_close2.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far.ogg index 1957a7865..4b3e1b26c 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far2.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far2.ogg index 5a62b7e2e..eb8a9132f 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far2.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far2.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far3.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far3.ogg index a0b32d77e..d5abdd7ac 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far3.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_far3.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_very_far.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_very_far.ogg index 3f962aa67..e24c38b99 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_very_far.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_very_far.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_very_far2.ogg b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_very_far2.ogg index 20f69a754..12b4e96d3 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_very_far2.ogg and b/src/main/resources/assets/superbwarfare/sounds/explosion/huge_explosion_very_far2.ogg differ