Merged in feature-weather (pull request #19)

Feature weather

Author: Arifolth

Assets/src/main/resources/assets/Sounds/ambient/rain/heavy-rain-shower-ftus-1-00-59.ogg

@@ -0,0 +1 @@
+https://uppbeat.io/sfx/heavy-rain-shower/10257/26429

Assets/src/main/resources/assets/Sounds/ambient/rain/license

@@ -0,0 +1 @@
+https://uppbeat.io/sfx/wind-blowing-trees-in-woods/7784/23795

Assets/src/main/resources/assets/Sounds/ambient/wind/license

@@ -38,15 +38,31 @@ public CombatTracker() {
     public void update(float tpf) {
         inCombat = !enemies.isEmpty();
 
-        if(inCombat && !GameState.BATTLE.equals(gameLogicCore.getGameStateManager().getCurrentGameState())) {
-            gameLogicCore.getGameStateManager().setGameState(GameState.BATTLE);
-        }
+        isNotInBattle();
+
+        isInBattle();
+    }
 
+    private void isInBattle() {
         if(!inCombat && GameState.BATTLE.equals(gameLogicCore.getGameStateManager().getCurrentGameState())) {
-            gameLogicCore.getGameStateManager().setGameState(GameState.CALM);
+            leaveBattle();
+        }
+    }
+
+    private void isNotInBattle() {
+        if(inCombat && !GameState.BATTLE.equals(gameLogicCore.getGameStateManager().getCurrentGameState())) {
+            joinBattle();
         }
     }
 
+    private void leaveBattle() {
+        gameLogicCore.getGameStateManager().setGameState(GameState.CALM);
+    }
+
+    private void joinBattle() {
+        gameLogicCore.getGameStateManager().setGameState(GameState.BATTLE);
+    }
+
     @Override
     public void decCounter(CharacterInterface enemy) {
         enemies.remove(enemy);

Assets/src/main/resources/assets/Sounds/ambient/wind/wind-blowing-trees-in-woods-ivo-vicic-1-02-49.ogg

@@ -36,7 +36,7 @@ public class Constants {
     public static final int MODEL_ADJUSTMENT = 3;
 
     public static final float SOUND_VOLUME = 0.5f;
-    public static final float MUSIC_VOLUME_MULTIPLIER = 0.25f;
+    public static final float MUSIC_VOLUME_MULTIPLIER = 0.225f;
 
     public static final float SOUND_PITCH = 0.5f;
     public static final SSAOFilter SSAO_FILTER_BASIC = new SSAOFilter(1f, 1.5f, 5.8f, 0.9f);

Assets/src/main/resources/assets/Sounds/birds/459977__florianreichelt__soft-wind.ogg

@@ -21,5 +21,9 @@
 public interface FilterManagerInterface {
     void initialize();
 
+    void addFog();
+
+    void removeFog();
+
     void update(float tpf);
 }