bug fix (i hope)

src/entities/units/Unit.java

@@ -68,6 +68,7 @@ public Unit(int level, int health, int attack, int defense, int critRate, int cr
     public void setPosition(int x, int y)   {
         this.position = new Coordinate(x,y);
     }
+    public void setPosition(Coordinate c) {this.position = c;}
 
     public void takeDamage(int amount)  {
         this.health-=amount;

src/entities/units/npc/NPC.java

@@ -13,7 +13,7 @@ public class NPC extends Unit {
     public void setCombatState(EnemyStates combatState) {
         this.combatState = combatState;
     }
-    private int interactLength = 1000;
+    private int interactLength = 120;
     private int timer;
     private boolean isInteracting;
     public EnemyStates getCombatState() {
@@ -31,28 +31,23 @@ public NPC(float x, float y) throws SlickException {//later change parameters to
         this.sheet = new SpriteSheet("res/experimentalEnemy.png", 256, 512);
         this.sprite = sheet.getSprite(0, 0);
         this.level = 1;
-        this.timer = -1;
+        this.timer = interactLength;
     }
 
     public void render(GameContainer gc, float plrX, float plrY)  {
-        if(isInteracting) timer++;
+        timer++;
         gc.getGraphics().drawImage(sprite, -plrX - position.getX(), -plrY/2 - position.getY());
         gc.getGraphics().setColor(new Color(255, 0,0,0.5f));
         hitBox.setX(-plrX - position.getX() + width);
         hitBox.setY((-plrY/2) + this.getHeight()*1.6f);
 
-        if(timer <= interactLength && timer > -1) {
+        if(timer < interactLength) {
             DrawUtilities.drawStringCentered(gc.getGraphics(),"Hello!!", -plrX - position.getX(),-plrY/2 + this.getHeight());
         }
-        else    {
-            isInteracting = false;
-            timer = -1;
-        }
     }
 
     public void interact()    {
         timer = 0;
-        isInteracting = true;
     }
 
 

src/entities/units/player/Player.java

@@ -63,6 +63,10 @@ public Player(Coordinate pos) throws SlickException {
         this.hitBox = new Rectangle((Main.getScreenWidth()/2) - this.getWidth()/2, (Main.getScreenHeight()/2) + 170, this.width, this.height-100); // set size to tiles
     }
 
+    public void resetHitbox()   {
+        this.hitBox = new Rectangle((Main.getScreenWidth()/2) - this.getWidth()/2, (Main.getScreenHeight()/2) + 170, this.width, this.height-100);
+    }
+
     public void startBattle()   {
         queue = 5;
         this.arteHand = new ArrayList<Arte>(arteDeck.subList(0,6));

src/gamestates/Game.java

@@ -29,7 +29,6 @@ public class Game extends BasicGameState {
 
     private static GameContainer gc;
     private final int id;
-
     public static int time;
     public static long battleTimeStamp;
     public static int battleCooldown;
@@ -183,13 +182,15 @@ public void update(GameContainer gc, StateBasedGame sbg, int delta) throws Slick
 
     public void enter(GameContainer gc, StateBasedGame sbg) throws SlickException {
         System.out.println("Entering game");
-
+        plr.gainExp(BattleState.expGain);
+        plr.gainMoney(BattleState.currencyGain);
         // Reset time
         time = 0;
         System.out.println("[VERBOSE] Time reset");
-        plr.gainExp(BattleState.expGain);
-        plr.gainMoney(BattleState.currencyGain);
-        /*// Initialize Both Entity Maps
+        //enemy = new Enemy(10,0);
+        //plr.setPosition(0,0);
+        //plrTeam.add(plr);
+        // Initialize Both Entity Maps
         entities = new EnumMap<>(Map.of(
                 EntityType.UNIT, new ArrayList<>(),
                 EntityType.PROJECTILE, new ArrayList<>(),
@@ -202,8 +203,10 @@ public void enter(GameContainer gc, StateBasedGame sbg) throws SlickException {
         ));
 
         // Initialize the Player
-        plr = new Player(plrPosition);
-        plrTeam.add(plr);
+        plr.setPosition(plrPosition);
+        plr.resetHitbox();
+        //plr = new Player(plrPosition);
+        //plrTeam.add(plr);
         System.out.println("[VERBOSE] Player initialized");
         enemy = new Enemy(10, 0);
         enemyTeam.add(enemy);
@@ -214,14 +217,13 @@ public void enter(GameContainer gc, StateBasedGame sbg) throws SlickException {
         System.out.println("[VERBOSE] DisplayManager initialized");
 
         // Play BGM
-        SoundManager.playBackgroundMusic("02");*/
+        SoundManager.playBackgroundMusic("02");
     }
 
     public void leave(GameContainer gc, StateBasedGame sbg) {
         // This code happens when you leave a gameState.
         BattleState.plrs = plrTeam;
         BattleState.enemies = enemyTeam;
-
     }