From b3aa5a7dc3ea6afe90fbf3331b3b62be4cbe08a7 Mon Sep 17 00:00:00 2001 From: Ahmad Abu-Aysha <111224176+The-AhmadAA@users.noreply.github.com> Date: Thu, 19 Oct 2023 07:45:28 +1000 Subject: [PATCH] added engineer death sound, changed weapon sound --- .../sounds/engineers/DesignedGunshot_Pistol1.ogg | Bin 0 -> 9259 bytes .../assets/sounds/engineers/HumanInjured2.ogg | Bin 0 -> 9233 bytes .../com/csse3200/game/areas/ForestGameArea.java | 3 ++- .../player/HumanAnimationController.java | 5 ++++- .../com/csse3200/game/screens/AssetLoader.java | 3 ++- .../player/HumanAnimationControllerTest.java | 3 ++- .../components/tasks/EngineerCombatTaskTest.java | 3 ++- .../tasks/human/HumanWanderTaskTest.java | 4 +++- .../entities/factories/EngineerFactoryTest.java | 3 ++- 9 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 source/core/assets/sounds/engineers/DesignedGunshot_Pistol1.ogg create mode 100644 source/core/assets/sounds/engineers/HumanInjured2.ogg diff --git a/source/core/assets/sounds/engineers/DesignedGunshot_Pistol1.ogg b/source/core/assets/sounds/engineers/DesignedGunshot_Pistol1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..1d95f6ca9b5da8a4f2b1f4bada037227d3be550e GIT binary patch literal 9259 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 VSoKxmzxyhfMgY?#30EM%e*tE+y2Jng literal 0 HcmV?d00001 diff --git a/source/core/assets/sounds/engineers/HumanInjured2.ogg b/source/core/assets/sounds/engineers/HumanInjured2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..0c02b6dafea2fc343a4147b82ff9bf4ac26e8afe GIT binary patch literal 9233 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 literal 0 HcmV?d00001 diff --git a/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java b/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java index dcd6d346f..c818c6254 100644 --- a/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java +++ b/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java @@ -176,8 +176,9 @@ public class ForestGameArea extends GameArea { "sounds/towers/gun_shot_trimmed.mp3", "sounds/towers/deploy.mp3", "sounds/towers/stow.mp3", + "sounds/engineers/DesignedGunshot_Pistol1.ogg", + "sounds/engineers/HumanInjured2.ogg", "sounds/engineers/firing_auto.mp3", - "sounds/engineers/firing_single.mp3", "sounds/projectiles/on_collision.mp3", "sounds/projectiles/explosion.mp3", "sounds/waves/wave-start/Wave_Start_Alarm.ogg", diff --git a/source/core/src/main/com/csse3200/game/components/player/HumanAnimationController.java b/source/core/src/main/com/csse3200/game/components/player/HumanAnimationController.java index 5317c6b4b..92fbe2684 100644 --- a/source/core/src/main/com/csse3200/game/components/player/HumanAnimationController.java +++ b/source/core/src/main/com/csse3200/game/components/player/HumanAnimationController.java @@ -45,13 +45,15 @@ public class HumanAnimationController extends Component { // Sound effects constants private static final String FIRE_AUTO_SFX = "sounds/engineers/firing_auto.mp3"; - private static final String FIRE_SINGLE_SFX = "sounds/engineers/firing_single.mp3"; + private static final String FIRE_SINGLE_SFX = "sounds/engineers/DesignedGunshot_Pistol1.ogg"; + private static final String DEATH_SFX = "sounds/engineers/HumanInjured2.ogg"; private AnimationRenderComponent animator; private final Sound fireAutoSound = ServiceLocator.getResourceService().getAsset( FIRE_AUTO_SFX, Sound.class); private final Sound fireSingleSound = ServiceLocator.getResourceService().getAsset( FIRE_SINGLE_SFX, Sound.class); + private final Sound deathSound = ServiceLocator.getResourceService().getAsset(DEATH_SFX, Sound.class); private boolean clicked = false; @@ -188,6 +190,7 @@ void animateDeath() { } else { animator.startAnimation(DEATH_ANIM); } + deathSound.play(); } /** diff --git a/source/core/src/main/com/csse3200/game/screens/AssetLoader.java b/source/core/src/main/com/csse3200/game/screens/AssetLoader.java index d224c8e78..039a55965 100644 --- a/source/core/src/main/com/csse3200/game/screens/AssetLoader.java +++ b/source/core/src/main/com/csse3200/game/screens/AssetLoader.java @@ -149,8 +149,9 @@ public class AssetLoader { "sounds/towers/gun_shot_trimmed.mp3", "sounds/towers/deploy.mp3", "sounds/towers/stow.mp3", + "sounds/engineers/DesignedGunshot_Pistol1.ogg", "sounds/engineers/firing_auto.mp3", - "sounds/engineers/firing_single.mp3", + "sounds/engineers/HumanInjured2.ogg", "sounds/projectiles/on_collision.mp3", "sounds/projectiles/explosion.mp3", "sounds/waves/wave-start/Wave_Start_Alarm.ogg", diff --git a/source/core/src/test/com/csse3200/game/components/player/HumanAnimationControllerTest.java b/source/core/src/test/com/csse3200/game/components/player/HumanAnimationControllerTest.java index 1647cd9ef..63759a0bc 100644 --- a/source/core/src/test/com/csse3200/game/components/player/HumanAnimationControllerTest.java +++ b/source/core/src/test/com/csse3200/game/components/player/HumanAnimationControllerTest.java @@ -24,7 +24,8 @@ class HumanAnimationControllerTest { private final String[] atlas = {"images/engineers/engineer.atlas"}; private static final String[] sounds = { "sounds/engineers/firing_auto.mp3", - "sounds/engineers/firing_single.mp3" + "sounds/engineers/DesignedGunshot_Pistol1.ogg", + "sounds/engineers/HumanInjured2.ogg" }; private final String[] animations = { diff --git a/source/core/src/test/com/csse3200/game/components/tasks/EngineerCombatTaskTest.java b/source/core/src/test/com/csse3200/game/components/tasks/EngineerCombatTaskTest.java index 70236cac5..812d5a67c 100644 --- a/source/core/src/test/com/csse3200/game/components/tasks/EngineerCombatTaskTest.java +++ b/source/core/src/test/com/csse3200/game/components/tasks/EngineerCombatTaskTest.java @@ -34,7 +34,8 @@ class EngineerCombatTaskTest { private final String[] projectileAtlas = {"images/projectiles/engineer_projectile.atlas"}; private static final String[] sounds = { "sounds/engineers/firing_auto.mp3", - "sounds/engineers/firing_single.mp3" + "sounds/engineers/DesignedGunshot_Pistol1.ogg", + "sounds/engineers/HumanInjured2.ogg" }; private final String[] animations = { diff --git a/source/core/src/test/com/csse3200/game/components/tasks/human/HumanWanderTaskTest.java b/source/core/src/test/com/csse3200/game/components/tasks/human/HumanWanderTaskTest.java index a44eb69e1..4bf5e33d1 100644 --- a/source/core/src/test/com/csse3200/game/components/tasks/human/HumanWanderTaskTest.java +++ b/source/core/src/test/com/csse3200/game/components/tasks/human/HumanWanderTaskTest.java @@ -34,7 +34,9 @@ class HumanWanderTaskTest { private final String[] atlas = {"images/engineers/engineer.atlas"}; private static final String[] sounds = { "sounds/engineers/firing_auto.mp3", - "sounds/engineers/firing_single.mp3" + "sounds/engineers/DesignedGunshot_Pistol1.ogg", + "sounds/engineers/HumanInjured2.ogg" + }; @BeforeEach diff --git a/source/core/src/test/com/csse3200/game/entities/factories/EngineerFactoryTest.java b/source/core/src/test/com/csse3200/game/entities/factories/EngineerFactoryTest.java index 1a54a0685..3e4874311 100644 --- a/source/core/src/test/com/csse3200/game/entities/factories/EngineerFactoryTest.java +++ b/source/core/src/test/com/csse3200/game/entities/factories/EngineerFactoryTest.java @@ -32,7 +32,8 @@ class EngineerFactoryTest { private final String[] atlas = {"images/engineers/engineer.atlas"}; private static final String[] sounds = { "sounds/engineers/firing_auto.mp3", - "sounds/engineers/firing_single.mp3" + "sounds/engineers/DesignedGunshot_Pistol1.ogg", + "sounds/engineers/HumanInjured2.ogg" }; private final String[] animations = {