Sound effect, UI changes. Returned main tiles to GitHub.

Author: SEM24

.gitignore

@@ -41,5 +41,4 @@ build/
 /src/main/resources/META-INF/
 /META-INF/
 /src/test/
-/save.dat
-/src/main/resources/tiles/
+/save.dat

config.ini

@@ -1,3 +1,3 @@
 fullscreen=Off
-music_volume=0
-se_volume=1
+music_volume=2
+se_volume=2

src/main/java/com/khomsi/game/entity/player/Player.java

@@ -88,10 +88,11 @@ public void setDefaultPosition() {
         worldX = GameManager.TILE_SIZE * 30;
         worldY = GameManager.TILE_SIZE * 21;
         direction = "down";
-        //TODO remove later
+        //TODO remove later(after finishing debugging)
 //        gameManager.currentMap = 2;
 //        worldX = GameManager.TILE_SIZE * 21;
 //        worldY = GameManager.TILE_SIZE * 34;
+
 //        gameManager.currentMap = 3;
 //        worldX = GameManager.TILE_SIZE * 25;
 //        worldY = GameManager.TILE_SIZE * 1;

src/main/java/com/khomsi/game/main/GameManager.java

@@ -117,6 +117,9 @@ public class GameManager extends JPanel implements Runnable {
     public boolean playerRun = false;
     public boolean fullScreenOn = false;
     public boolean bossBattleOn = false;
+    public boolean isSEPlaying = false;
+    public boolean isMusicPlaying = false;
+
     public Instant startTime;
     public Duration playTime;
     // Add a timer variable to keep track of the game time
@@ -468,6 +471,11 @@ public void playSE(int i) {
         se.play();
     }
 
+    public void stopTitleMusic() {
+        music.stop();
+        isMusicPlaying = false;
+    }
+
     public void changeArea() {
         if (nextArea != currentArea) {
             stopMusic();

src/main/java/com/khomsi/game/main/logic/CutSceneManager.java

@@ -36,10 +36,14 @@ public void sceneDungeonBoss() {
                 for (int i = 0; i < gameManager.object[1].length; i++) {
                     if (gameManager.object[gameManager.currentMap][i] == null) {
                         gameManager.object[gameManager.currentMap][i] = new DungeonDoorClosedObject(gameManager);
-                        //TODO change the location of door and the map of dungeon 2
                         gameManager.object[gameManager.currentMap][i].worldX = GameManager.TILE_SIZE * 25;
                         gameManager.object[gameManager.currentMap][i].worldY = GameManager.TILE_SIZE * 8;
                         gameManager.object[gameManager.currentMap][i].markered = true;
+                        i++;
+                        gameManager.object[gameManager.currentMap][i] = new DungeonDoorClosedObject(gameManager);
+                        gameManager.object[gameManager.currentMap][i].worldX = GameManager.TILE_SIZE * 25;
+                        gameManager.object[gameManager.currentMap][i].worldY = GameManager.TILE_SIZE * 33;
+                        gameManager.object[gameManager.currentMap][i].markered = true;
                         gameManager.playSE(5);
                         break;
                     }

src/main/java/com/khomsi/game/main/tools/KeyHandler.java

@@ -151,9 +151,8 @@ private void gameOverState(int code) {
                 //fixme check the se
                 gameManager.playMusic(0);
             } else if (gameManager.ui.commandNum == 1) {
-                gameManager.ui.titleScreenState = -1;
-                gameManager.gameState = GameManager.START_STATE;
                 gameManager.resetGame(true);
+                System.exit(0);
             }
         }
     }
@@ -257,6 +256,11 @@ private void startState(int code) {
     }
 
     private void tutorialState(int code) {
+        // Play music only once in tutorial screen
+        if (!gameManager.isMusicPlaying) {
+            gameManager.playMusic(25);
+            gameManager.isMusicPlaying = true;
+        }
         if (gameManager.ui.titleScreenState == 0) {
             if (!isEnterPressed && code == KeyEvent.VK_ENTER) {
                 gameManager.ui.titleScreenState = 2;
@@ -268,6 +272,11 @@ private void tutorialState(int code) {
 
 
     private void titleState(int code) {
+        // Play music only once in title screen
+        if (!gameManager.isMusicPlaying) {
+            gameManager.playMusic(25);
+            gameManager.isMusicPlaying = true;
+        }
         if (gameManager.ui.titleScreenState == 1) {
             if (code == KeyEvent.VK_DOWN || code == KeyEvent.VK_S) {
                 gameManager.ui.commandNum = 2; // Move cursor to "EXIT GAME" (commandNum = 2)
@@ -282,6 +291,7 @@ private void titleState(int code) {
                     case 2 -> System.exit(0);
                     case 1 -> {
                         if (gameManager.saveLoad.load()) {
+                            gameManager.stopTitleMusic();
                             gameManager.saveLoad.load();
                             gameManager.gameState = GameManager.PLAY_STATE;
                             gameManager.playMusic(0);
@@ -300,6 +310,7 @@ private void titleState(int code) {
             }
 
             if (!isEnterPressed && code == KeyEvent.VK_ENTER) {
+                gameManager.stopTitleMusic();
                 if (gameManager.saveLoad.hasFile) {
                     gameManager.saveLoad.file.delete();
                     gameManager.resetTimer();

src/main/java/com/khomsi/game/main/tools/Sound.java

@@ -14,31 +14,33 @@ public class Sound {
     URL[] soundURL = new URL[30];
 
     public Sound() {
-        //TODO make it automatic in future
         soundURL[0] = getResource("main-theme.wav");
-        soundURL[1] = getResource("snd_pombark.wav");
-        soundURL[2] = getResource("mus_sfx_a_grab.wav");
+        soundURL[1] = getResource("snd_fireball_cast.wav");
+        soundURL[2] = getResource("snd_pick_up.wav");
         soundURL[3] = getResource("mus_dununnn.wav");
         soundURL[4] = getResource("mus_dooropen.wav");
         soundURL[5] = getResource("mus_doorclose.wav");
-        soundURL[6] = getResource("snd_power.wav");
+        soundURL[6] = getResource("snd_pickup_coin.wav");
         soundURL[7] = getResource("snd_victory.wav");
-        soundURL[8] = getResource("hitmonster.wav");
+        soundURL[8] = getResource("snd_damage_monster.wav");
         soundURL[9] = getResource("receivedamage.wav");
         soundURL[10] = getResource("sword-swipes.wav");
-        soundURL[11] = getResource("level_up.wav");
+        soundURL[11] = getResource("snd_level_up.wav");
         soundURL[12] = getResource("cursor.wav");
         soundURL[13] = getResource("cuttree.wav");
         soundURL[14] = getResource("game_over.wav");
         soundURL[15] = getResource("sleep.wav");
-        soundURL[16] = getResource("parry.wav");
+        soundURL[16] = getResource("snd_parry.wav");
         soundURL[17] = getResource("blocked.wav");
         soundURL[18] = getResource("snd_text_2.wav");
         soundURL[19] = getResource("Merchant.wav");
         soundURL[20] = getResource("Dungeon.wav");
         soundURL[21] = getResource("snd_switchpull_n.wav");
         soundURL[22] = getResource("boss_music.wav");
         soundURL[23] = getResource("fight-theme.wav");
+        soundURL[24] = getResource("snd_startscreen.wav");
+        soundURL[25] = getResource("title-theme.wav");
+        soundURL[26] = getResource("mus_sfx_a_grab.wav");
     }
 
     private URL getResource(String path) {

src/main/java/com/khomsi/game/main/tools/ui/UI.java

@@ -855,6 +855,10 @@ public void drawTutorialScreen() {
     }
 
     private void drawStartScreen() {
+        if (!gameManager.isSEPlaying) {
+            gameManager.playSE(24);
+            gameManager.isSEPlaying = true;
+        }
         Color bgColor = new Color(0, 0, 0);
         if (titleScreenState == -1) {
             graphics2D.setColor(bgColor);
@@ -926,12 +930,7 @@ public void drawTitleScreen() {
 
             x = getXCenterText(text) + 20;
             y += GameManager.TILE_SIZE * 3;
-            //Draw back button
-            if (gameManager.saveLoad.hasFile) {
-                drawMenuItem("Back", x, y, commandNum == 2);
-            } else {
-                drawMenuItem("Exit", x, y, commandNum == 2);
-            }
+            drawMenuItem("Exit", x, y, commandNum == 2);
         }
     }
 

src/main/java/com/khomsi/game/objects/PlaceObjects.java

@@ -147,6 +147,11 @@ private void objectsOnMap3() {
         gameManager.object[mapNum][index] = new DungeonDoorOpenedObject(gameManager);
         gameManager.object[mapNum][index].worldX = GameManager.TILE_SIZE * 25;
         gameManager.object[mapNum][index].worldY = GameManager.TILE_SIZE * 8;
+        index++;
+
+        gameManager.object[mapNum][index] = new DungeonDoorOpenedObject(gameManager);
+        gameManager.object[mapNum][index].worldX = GameManager.TILE_SIZE * 25;
+        gameManager.object[mapNum][index].worldY = GameManager.TILE_SIZE * 33;
     }
 
     public void setInteractiveTiles() {

src/main/java/com/khomsi/game/objects/interact/KeyObject.java

@@ -1,7 +1,7 @@
 package com.khomsi.game.objects.interact;
 
-import com.khomsi.game.main.GameManager;
 import com.khomsi.game.entity.Entity;
+import com.khomsi.game.main.GameManager;
 
 public class KeyObject extends Entity {
     public static final String OBJ_NAME = "Key";