Fix walking sound effect volume

nrebei2 · May 22, 2023 · a458b37 · a458b37
1 parent c27224f
commit a458b37
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/core/src/infinityx/lunarhaze/controllers/PlayerController.java b/core/src/infinityx/lunarhaze/controllers/PlayerController.java
@@ -212,6 +212,8 @@ public PlayerController(LevelContainer levelContainer, GameSetting setting) {
         stateMachine = new DefaultStateMachine<>(this, PlayerState.IDLE);
         attackHandler = new PlayerAttackHandler(player, player.getAttackHitbox(), dash_sound);
         allocateReady = false;
+        isWalkGrassPlaying = false;
+        isDashPlaying = false;
         this.setting = setting;
     }
 
@@ -288,7 +290,7 @@ public void collectMoonlight() {
      * @param lightingController lighting controller to update moonlight particles
      */
     public void resolveMoonlight(LightingController lightingController) {
-        if (player.isCollecting || player.isAttacked()) return;
+        if (player.isCollecting) return;
         boolean isOn = false;
 
         // Check if player is within range of a lamp

diff --git a/core/src/infinityx/lunarhaze/controllers/PlayerState.java b/core/src/infinityx/lunarhaze/controllers/PlayerState.java
@@ -101,16 +101,16 @@ public void update(PlayerController entity) {
                 if (direction == Direction.DOWN) {
                     // special case
                     if (frame == 0 || frame == 4) {
-                        entity.walk_sound.play();
+                        entity.walk_sound.play(entity.getSetting().getSoundVolume());
                     }
                 } else {
                     if (frame == 2 || frame == 5) {
-                        entity.walk_sound.play();
+                        entity.walk_sound.play(entity.getSetting().getSoundVolume());
                     }
                 }
             } else {
                 if (frame == 0 || frame == 2) {
-                        entity.walk_sound.play();
+                        entity.walk_sound.play(entity.getSetting().getSoundVolume());
                 }
             }
         }