Added new tiles, sounds. Code refactor. New game design.

Author: SEM24

config.ini

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

src/main/java/com/khomsi/game/data/DataInitializer.java

@@ -6,6 +6,9 @@
 import java.util.ArrayList;
 
 public class DataInitializer implements Serializable {
+    //Player Coord
+    int playerX;
+    int playerY;
     //Player stats
     int level;
     int maxHp;

src/main/java/com/khomsi/game/data/SaveLoad.java

@@ -21,6 +21,9 @@ public SaveLoad(GameManager gameManager) {
     public void save() {
         try (ObjectOutputStream os = new ObjectOutputStream(new FileOutputStream(FILE_PATH))) {
             DataInitializer initializer = new DataInitializer();
+            initializer.playerX = gameManager.player.worldX;
+            initializer.playerY = gameManager.player.worldY;
+
             initializer.level = gameManager.player.level;
             initializer.maxHp = gameManager.player.maxHp;
             initializer.hp = gameManager.player.hp;
@@ -33,7 +36,6 @@ public void save() {
             initializer.nextLevelXp = gameManager.player.nextLevelXp;
             initializer.coin = gameManager.player.coin;
             initializer.playerSkin = gameManager.player.playerSkin;
-            //TODO currently doesn't work
             // Save play time and game timer
             initializer.savedPlayTime = gameManager.playTime;
             initializer.savedGameTimer = gameManager.getGameTimer();
@@ -84,6 +86,9 @@ public boolean load() {
         try (ObjectInputStream is = new ObjectInputStream(new FileInputStream(FILE_PATH))) {
             //Read object from file
             DataInitializer initializer = (DataInitializer) is.readObject();
+            gameManager.player.worldX = initializer.playerX;
+            gameManager.player.worldY = initializer.playerY;
+
             gameManager.player.level = initializer.level;
             gameManager.player.maxHp = initializer.maxHp;
             gameManager.player.hp = initializer.hp;
@@ -137,6 +142,7 @@ public boolean load() {
                     }
                 }
             }
+            gameManager.placeObjects.setInteractiveTiles();
         } catch (IOException | ClassNotFoundException e) {
             System.err.println("Exception " + e.getMessage() + " in " + getClass().getSimpleName());
             return false;

src/main/java/com/khomsi/game/entity/mobs/MobDungeonBoss.java

@@ -6,7 +6,7 @@
 import com.khomsi.game.objects.spells.HeartObject;
 import com.khomsi.game.objects.spells.ManaObject;
 import com.khomsi.game.objects.interact.CoinBObject;
-import com.khomsi.game.objects.outside.DungeonDoorClosedObject;
+import com.khomsi.game.objects.dungeon.DungeonDoorClosedObject;
 
 import java.util.Random;
 

src/main/java/com/khomsi/game/entity/npc/beach/CrabEntity.java

@@ -0,0 +1,103 @@
+package com.khomsi.game.entity.npc.beach;
+
+import com.khomsi.game.entity.Entity;
+import com.khomsi.game.main.GameManager;
+
+import java.awt.*;
+import java.util.Random;
+
+public class CrabEntity extends Entity {
+
+    public CrabEntity(GameManager gameManager) {
+        super(gameManager);
+        direction = "up";
+        speed = 1;
+
+        solidArea = new Rectangle();
+        solidArea.x = 8;
+        solidArea.y = 16;
+
+        solidAreaDefaultX = solidArea.x;
+        solidAreaDefaultY = solidArea.y;
+        //boundaries of npc
+        solidArea.width = 31;
+        solidArea.height = 32;
+        dialogueSet = -1;
+        setDialog();
+    }
+
+    @Override
+    public void update() {
+        super.update();
+    }
+
+    public void getImage(String basePath) {
+        // Loop from 0 to 15 to set up the images
+        for (int i = 0; i < 16; i++) {
+            String filename = basePath + String.format("%02d", i);
+            switch (i) {
+                case 0 -> down = setup(filename);
+                case 1 -> down1 = setup(filename);
+                case 2 -> down2 = setup(filename);
+                case 3 -> down3 = setup(filename);
+
+                case 4 -> right = setup(filename);
+                case 5 -> right1 = setup(filename);
+                case 6 -> right2 = setup(filename);
+                case 7 -> right3 = setup(filename);
+
+                case 8 -> up = setup(filename);
+                case 9 -> up1 = setup(filename);
+                case 10 -> up2 = setup(filename);
+                case 11 -> up3 = setup(filename);
+
+                case 12 -> left = setup(filename);
+                case 13 -> left1 = setup(filename);
+                case 14 -> left2 = setup(filename);
+                case 15 -> left3 = setup(filename);
+            }
+        }
+    }
+
+
+    private void setDialog() {
+        dialogues[0][0] = "Scuttle-scuffle!";
+        dialogues[1][0] = "(Don't touch me, little human!)";
+    }
+
+    //set npc movement
+    public void setAction() {
+        lockCounter++;
+        if (lockCounter == 120) {
+            Random random = new Random();
+            int i = random.nextInt(100) + 1;
+            if (i <= 30) {
+                direction = "up";
+            }
+            if (i <= 30) {
+                direction = "up";
+            }
+            if (i > 30 && i <= 50) {
+                direction = "down";
+            }
+            if (i > 50 && i <= 75) {
+                direction = "left";
+            }
+            if (i > 75) {
+                direction = "right";
+            }
+            lockCounter = 0;
+        }
+    }
+
+    //Maybe add special stuff, different custom text for this character
+    public void speak() {
+        facePlayer();
+        startDialogue(this, dialogueSet);
+        dialogueSet++;
+
+        if (dialogues[dialogueSet][0] == null) {
+            dialogueSet = 0;
+        }
+    }
+}

src/main/java/com/khomsi/game/entity/npc/beach/crab/NpcCrabBlue.java

@@ -0,0 +1,12 @@
+package com.khomsi.game.entity.npc.beach.crab;
+
+import com.khomsi.game.entity.npc.beach.CrabEntity;
+import com.khomsi.game.main.GameManager;
+
+public class NpcCrabBlue extends CrabEntity {
+
+    public NpcCrabBlue(GameManager gameManager) {
+        super(gameManager);
+        getImage("/npc/beach/crab/blue/crab_blue_");
+    }
+}

src/main/java/com/khomsi/game/entity/npc/beach/crab/NpcCrabRed.java

@@ -0,0 +1,12 @@
+package com.khomsi.game.entity.npc.beach.crab;
+
+import com.khomsi.game.entity.npc.beach.CrabEntity;
+import com.khomsi.game.main.GameManager;
+
+public class NpcCrabRed extends CrabEntity {
+
+    public NpcCrabRed(GameManager gameManager) {
+        super(gameManager);
+        getImage("/npc/beach/crab/red/crab_red_");
+    }
+}

src/main/java/com/khomsi/game/entity/npc/beach/crab/NpcCrabYellow.java

@@ -0,0 +1,12 @@
+package com.khomsi.game.entity.npc.beach.crab;
+
+import com.khomsi.game.entity.npc.beach.CrabEntity;
+import com.khomsi.game.main.GameManager;
+
+public class NpcCrabYellow extends CrabEntity {
+
+    public NpcCrabYellow(GameManager gameManager) {
+        super(gameManager);
+        getImage("/npc/beach/crab/yellow/crab_yellow_");
+    }
+}

src/main/java/com/khomsi/game/entity/npc/object/NpcRock.java

@@ -2,10 +2,10 @@
 
 import com.khomsi.game.main.GameManager;
 import com.khomsi.game.entity.Entity;
-import com.khomsi.game.objects.outside.DungeonDoorClosedObject;
-import com.khomsi.game.objects.outside.DungeonDoorOpenedObject;
+import com.khomsi.game.objects.dungeon.DungeonDoorClosedObject;
+import com.khomsi.game.objects.dungeon.DungeonDoorOpenedObject;
 import com.khomsi.game.tiles.interactive.InteractiveTile;
-import com.khomsi.game.tiles.interactive.SwitchPress;
+import com.khomsi.game.tiles.interactive.dungeon.SwitchPress;
 
 import java.awt.*;
 import java.util.Arrays;

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

@@ -85,8 +85,8 @@ public void setDefaultValues() {
     public void setDefaultPosition() {
         //player position of player
         gameManager.currentMap = 0;
-        worldX = GameManager.TILE_SIZE * 30;
-        worldY = GameManager.TILE_SIZE * 21;
+        worldX = GameManager.TILE_SIZE * 29;
+        worldY = GameManager.TILE_SIZE * 92;
         direction = "down";
         //TODO remove later(after finishing debugging)
 //        gameManager.currentMap = 2;