diff --git a/app/src/main/java/de/frajul/endlessroll/entities/tools/Magnet.java b/app/src/main/java/de/frajul/endlessroll/entities/tools/Magnet.java index 1db58b4..53abc92 100644 --- a/app/src/main/java/de/frajul/endlessroll/entities/tools/Magnet.java +++ b/app/src/main/java/de/frajul/endlessroll/entities/tools/Magnet.java @@ -41,8 +41,8 @@ public class Magnet extends Tool { public void updateSoundVolume(Player player) { float distanceToPlayer = super.getPosition().vectorTo(player.getPosition()).length(); - float factor = 1.0f / (distanceToPlayer * distanceToPlayer); - if (distanceToPlayer > 2 && player.getPosition().getX() > super.getPosition().getX()) { + float factor = 1.0f / distanceToPlayer; + if (distanceToPlayer > 3 && player.getPosition().getX() > super.getPosition().getX()) { soundManager.stopSound(soundStream); return; } diff --git a/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java b/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java index 659d60b..a2b610d 100644 --- a/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java +++ b/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java @@ -57,9 +57,9 @@ public class SoundManager { fireworkSound = new Sound(loadSound(R.raw.sound_firework)); stasisSound = new Sound(loadSound(R.raw.sound_stasis), 1.3f, true); mushroomSound = new Sound(loadSound(R.raw.sound_mushroom)); - springSound = new Sound(loadSound(R.raw.sound_spring), 1.5f); + springSound = new Sound(loadSound(R.raw.sound_spring)); placeToolSound = new Sound(loadSound(R.raw.sound_place_tool), 1.5f); - magnetSound = new Sound(loadSound(R.raw.sound_magnet), 1.2f, true); + magnetSound = new Sound(loadSound(R.raw.sound_magnet), 0.8f, true); } public void setSoundsMuted(boolean soundsMuted) { diff --git a/app/src/main/res/raw/sound_countdown.wav b/app/src/main/res/raw/sound_countdown.wav index 0b86cef..e497381 100644 Binary files a/app/src/main/res/raw/sound_countdown.wav and b/app/src/main/res/raw/sound_countdown.wav differ diff --git a/app/src/main/res/raw/sound_firework.wav b/app/src/main/res/raw/sound_firework.wav index 607281d..c2d04f8 100644 Binary files a/app/src/main/res/raw/sound_firework.wav and b/app/src/main/res/raw/sound_firework.wav differ diff --git a/app/src/main/res/raw/sound_magnet.wav b/app/src/main/res/raw/sound_magnet.wav index 400dffd..076e979 100644 Binary files a/app/src/main/res/raw/sound_magnet.wav and b/app/src/main/res/raw/sound_magnet.wav differ diff --git a/app/src/main/res/raw/sound_spring.wav b/app/src/main/res/raw/sound_spring.wav index 86da4b0..5b3d0f4 100644 Binary files a/app/src/main/res/raw/sound_spring.wav and b/app/src/main/res/raw/sound_spring.wav differ