New features, map refactor and bug fixes.

Author: SEM24

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

@@ -2,7 +2,6 @@
 
 import java.io.Serializable;
 import java.time.Duration;
-import java.time.Instant;
 import java.util.ArrayList;
 
 public class DataInitializer implements Serializable {

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

@@ -1,12 +1,14 @@
 package com.khomsi.game.data;
 
 import com.khomsi.game.entity.Entity;
+import com.khomsi.game.entity.npc.dungeon.NpcTutorialMan;
 import com.khomsi.game.main.GameManager;
 
 import java.io.*;
 
 public class SaveLoad {
-    GameManager gameManager;
+    private GameManager gameManager;
+
     // Path to save.dat file to check the statement
     public static final String FILE_PATH = "save.dat";
     public final File file = new File(FILE_PATH);
@@ -30,6 +32,7 @@ public void save() {
             initializer.maxHp = gameManager.player.maxHp;
             initializer.hp = gameManager.player.hp;
             initializer.maxMana = gameManager.player.maxMana;
+            //FIXME if player press shift while saving, he will gain the speed higher that he supposed to.
             initializer.speed = gameManager.player.speed;
             initializer.mana = gameManager.player.mana;
             initializer.strength = gameManager.player.strength;

src/main/java/com/khomsi/game/entity/npc/dungeon/NpcTutorialMan.java

@@ -69,18 +69,20 @@ private void setDialog() {
         dialogues[1][0] = "Are you still here?\n There's nothing to do here, go outside!";
     }
 
+    //TODO the npc doesn't save the position on which he moved after loading the game + the text appears again.
+    // Somehow needs to be fixed or just not to move the npc
+
+    //TODO maybe it's better to remove the npc when player speaks to him by moving him to exit and use flag to indicate
+    // in NpcPlacement with that flag that the player had already spoken to him (and store the flag in SaveLoad class)
     //set npc movement
     public void setAction() {
         if (onPath) {
             int goalCol = 60;
             int goalRow = 73;
-//            int goalCol = (gameManager.player.worldX + gameManager.player.solidArea.x) / GameManager.TILE_SIZE;
-//            int goalRow = (gameManager.player.worldY + gameManager.player.solidArea.y) / GameManager.TILE_SIZE;
             searchPath(goalCol, goalRow, true);
         }
     }
 
-    //Maybe add special stuff, different custom text for this character
     public void speak() {
         facePlayer();
         startDialogue(this, dialogueSet);

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

@@ -87,9 +87,13 @@ public void setDefaultValues() {
 
     public void setDefaultPosition() {
         //player position of player
-        gameManager.currentMap = 0;
+    /*    gameManager.currentMap = 0;
         worldX = GameManager.TILE_SIZE * 29;
         worldY = GameManager.TILE_SIZE * 92;
+        direction = "down";*/
+        gameManager.currentMap = 0;
+        worldX = GameManager.TILE_SIZE * 15;
+        worldY = GameManager.TILE_SIZE * 27;
         direction = "down";
     }
 

src/main/java/com/khomsi/game/enviroment/Lightning.java

@@ -28,8 +28,9 @@ public void setLightSource() {
         darknessFilter = new BufferedImage(GameManager.SCREEN_WIDTH,
                 GameManager.SCREEN_HEIGHT, BufferedImage.TYPE_INT_ARGB);
         Graphics2D g2d = (Graphics2D) darknessFilter.getGraphics();
+
         if (gameManager.player.currentLight == null) {
-            g2d.setColor(new Color(0, 0, 0.1F, 0.98F));
+            g2d.setColor(new Color(0, 0, 0.1F, 0.94F));
         } else {
             //Get the center x and y of the light circle
             int centerX = gameManager.player.screenX + (GameManager.TILE_SIZE) / 2;
@@ -125,7 +126,14 @@ public void draw(Graphics2D g2d) {
             g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, filterAlfa));
         }
 
-        if (gameManager.currentArea == GameManager.OUTSIDE || gameManager.currentArea == GameManager.DUNGEON
+        if (gameManager.currentArea == GameManager.OUTSIDE
+               /* || gameManager.currentArea == GameManager.DUNGEON
+                || gameManager.currentArea == GameManager.BOSS_DUNGEON*/
+                || gameManager.currentArea == GameManager.FOREST) {
+            g2d.drawImage(darknessFilter, 0, 0, null);
+        }
+
+        if (gameManager.currentArea == GameManager.DUNGEON
                 || gameManager.currentArea == GameManager.BOSS_DUNGEON) {
             g2d.drawImage(darknessFilter, 0, 0, null);
         }

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

@@ -112,7 +112,6 @@ public class GameManager extends JPanel implements Runnable {
     public static final int CUTSCENE_STATE = 13;
     public static final int DYING_STATE = 14;
 
-
     //Area
     public int currentArea;
     public int nextArea;
@@ -121,6 +120,7 @@ public class GameManager extends JPanel implements Runnable {
     public static final int DUNGEON = 13;
     public static final int BOSS_DUNGEON = 14;
     public static final int LIGHT_DUNGEON = 15;
+    public static final int FOREST = 16;
     //Until player doesn't press shift, he doesn't run
     public boolean playerRun = false;
     public boolean fullScreenOn = false;
@@ -512,7 +512,7 @@ public void changeArea() {
             }
             if (nextArea == LIGHT_DUNGEON) {
                 playMusic(20);
-                placeObjects.trapsOnDungeonMap1();
+                placeObjects.setTrapsOnDungeonMap1();
             }
             if (nextArea == DUNGEON) {
                 playMusic(20);

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

@@ -16,6 +16,7 @@ public class EventHandler {
     public int tempMap;
     public int tempCol;
     public int tempRow;
+    private boolean inForest = false; // Flag to track the player location
 
     public EventHandler(GameManager gameManager) {
         this.gameManager = gameManager;
@@ -79,6 +80,16 @@ else if (interact(0, 35, 84, "any")) {
                     changeLocation(2, 47, 71, GameManager.INDOOR);
                     gameManager.playSE(28);
                 }
+
+                //Enter the forest
+                if (interact(0, 15, 24, "any") && inForest) {
+                    changeLocation(0, 15, 24, GameManager.OUTSIDE);
+                    inForest = false; // restore the flag after the exit of forest
+                } else if (interact(0, 15, 23, "any") && !inForest) {
+                    changeLocation(0, 15, 23, GameManager.FOREST, GameManager.TRANSITION_STATE);
+                    inForest = true; // install the flag that we're in forest
+                }
+
             }
             case 1 -> { // Dungeon
                 //back to main map from Dungeon
@@ -226,7 +237,11 @@ private void speak(Entity entity) {
     }
 
     private void changeLocation(int map, int col, int row, int area) {
-        gameManager.gameState = GameManager.TRANSITION_STATE;
+        changeLocation(map, col, row, area, GameManager.TRANSITION_STATE);
+    }
+
+    private void changeLocation(int map, int col, int row, int area, int gameState) {
+        gameManager.gameState = gameState;
         gameManager.nextArea = area;
         tempMap = map;
         tempCol = col;

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

@@ -94,7 +94,7 @@ public void draw(Graphics2D graphics2D) {
         if (gameManager.gameState == GameManager.GAME_OVER_STATE) {
             drawGameOverScreen();
         }
-        //Transition Over state
+        //Transition state
         if (gameManager.gameState == GameManager.TRANSITION_STATE) {
             drawTransitionScreen();
         }
@@ -321,6 +321,7 @@ private void drawTransitionScreen() {
         }
     }
 
+
     void drawSleepScreen() {
         counter++;
         if (counter < 120) {

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

@@ -6,8 +6,8 @@
 public class PlaceObjects {
     private final GameManager gameManager;
     public static final int MAP_MAIN = 0;
-    public static final int MAP_HOUSE_BEACH = 2;
     public static final int MAP_DUNGEON = 1;
+    public static final int MAP_HOUSE_BEACH = 2;
 
     public PlaceObjects(GameManager gameManager) {
         this.gameManager = gameManager;
@@ -42,7 +42,7 @@ public void setMobs() {
         mobPlacement.setMobsOnDungeonMap1();
     }
 
-    public void trapsOnDungeonMap1() {
+    public void setTrapsOnDungeonMap1() {
         DungeonTrapsPlacement trapsPlacement = new DungeonTrapsPlacement(gameManager);
         trapsPlacement.trapsOnDungeonMap1();
     }

src/main/java/com/khomsi/game/objects/editor/placement/ObjectPlacement.java

@@ -44,11 +44,6 @@ public void placeObjectsOnMapHouseBeach1() {
         gameManager.object[mapNum][index].worldY = GameManager.TILE_SIZE * 72;
         index++;
 
-        gameManager.object[mapNum][index] = new WindowObject(gameManager);
-        gameManager.object[mapNum][index].worldX = GameManager.TILE_SIZE * 45;
-        gameManager.object[mapNum][index].worldY = GameManager.TILE_SIZE * 72;
-        index++;
-
         gameManager.object[mapNum][index] = new PictureObject(gameManager);
         gameManager.object[mapNum][index].worldX = GameManager.TILE_SIZE * 50;
         gameManager.object[mapNum][index].worldY = GameManager.TILE_SIZE * 66;