Code refactor of project.

Author: SEM24

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

@@ -147,6 +147,7 @@ public boolean load() {
                 }
             }
             gameManager.placeObjects.setInteractiveTiles();
+            gameManager.placeObjects.setAnimatedTiles();
         } catch (IOException | ClassNotFoundException e) {
             System.err.println("Exception " + e.getMessage() + " in " + getClass().getSimpleName());
             return false;

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

@@ -112,7 +112,6 @@ private void setItems() {
         inventory.add(new KeyObject(gameManager));
         inventory.add(new MagicNecklaceObject(gameManager));
         inventory.add(new LanternObject(gameManager));
-        inventory.add(new TentObject(gameManager));
     }
 
     public int getCurrentWeaponSlot() {

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

@@ -16,7 +16,7 @@
 import com.khomsi.game.main.tools.KeyHandler;
 import com.khomsi.game.main.tools.Sound;
 import com.khomsi.game.main.tools.ui.UI;
-import com.khomsi.game.objects.PlaceObjects;
+import com.khomsi.game.objects.editor.PlaceObjects;
 import com.khomsi.game.tiles.Map;
 import com.khomsi.game.tiles.TileManager;
 import com.khomsi.game.tiles.interactive.InteractiveTile;
@@ -205,6 +205,7 @@ private void setDefaultObjects() {
         placeObjects.setNpc();
         placeObjects.setMobs();
         placeObjects.setInteractiveTiles();
+        placeObjects.setAnimatedTiles();
     }
 
     public void setFullScreen() {

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

@@ -1,19 +1,19 @@
 package com.khomsi.game.main.logic;
 
 import com.khomsi.game.entity.Entity;
-import com.khomsi.game.entity.npc.dungeon.NpcRockMovable;
 import com.khomsi.game.main.GameManager;
 import com.khomsi.game.objects.dungeon.DungeonDoorClosedObject;
 import com.khomsi.game.objects.dungeon.DungeonDoorOpenedObject;
 import com.khomsi.game.objects.equipment.*;
-import com.khomsi.game.objects.inside.BedObject;
-import com.khomsi.game.objects.inside.StairsDownObject;
+import com.khomsi.game.objects.inside.*;
 import com.khomsi.game.objects.interact.ChestObject;
 import com.khomsi.game.objects.interact.CoinBObject;
 import com.khomsi.game.objects.interact.KeyObject;
 import com.khomsi.game.objects.interact.MagicNecklaceObject;
 import com.khomsi.game.objects.light.LanternObject;
-import com.khomsi.game.objects.outside.*;
+import com.khomsi.game.objects.outside.DoorObject;
+import com.khomsi.game.objects.outside.RoundTreeObject;
+import com.khomsi.game.objects.outside.TentObject;
 import com.khomsi.game.objects.projectTiles.FireBallObject;
 import com.khomsi.game.objects.projectTiles.MagicArrowObject;
 import com.khomsi.game.objects.projectTiles.RockObject;
@@ -22,6 +22,8 @@
 import com.khomsi.game.objects.spells.PotionObject;
 
 public class EntityGenerator {
+    //TODO refactor this code since it's uncomfortable to use it (always needs to update switch)
+    //Since it's not in one package(it's in subpackages, it has problems to implement)
     GameManager gameManager;
 
     public EntityGenerator(GameManager gameManager) {
@@ -54,6 +56,9 @@ public Entity getObject(String itemNames) {
             case DungeonDoorOpenedObject.OBJ_NAME -> object = new DungeonDoorOpenedObject(gameManager);
             case RoundTreeObject.OBJ_NAME -> object = new RoundTreeObject(gameManager);
             case MagicNecklaceObject.OBJ_NAME -> object = new MagicNecklaceObject(gameManager);
+            case MapObject.OBJ_NAME -> object = new MapObject(gameManager);
+            case WindowObject.OBJ_NAME -> object = new WindowObject(gameManager);
+            case PictureObject.OBJ_NAME -> object = new PictureObject(gameManager);
         }
         return object;
     }

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

@@ -64,7 +64,7 @@ private void handleInteractions() {
         switch (currentMap) {
             case 0 -> { // Main Map
                 if (interact(0, 13, 91, "any")) {
-                    changeLocation(3, 54, 86, GameManager.LIGHT_DUNGEON);
+                    changeLocation(1, 54, 86, GameManager.LIGHT_DUNGEON);
                     gameManager.playSE(4);
 //                    gameManager.playSE(28);
                 }
@@ -82,8 +82,8 @@ else if (interact(0, 35, 84, "any")) {
             }
             case 1 -> { // Dungeon
                 //back to main map from Dungeon
-                if (interact(3, 57, 72, "any")
-                        || interact(3, 53, 86, "any")) {
+                if (interact(1, 57, 72, "any")
+                        || interact(1, 53, 86, "any")) {
                     changeLocation(0, 13, 90, GameManager.OUTSIDE);
                     gameManager.playSE(5);
                 }