|
@@ -2,6 +2,7 @@ package pathgame.gameplay;
|
|
|
|
|
|
import java.util.Iterator;
|
|
|
import java.util.LinkedList;
|
|
|
+import pathgame.logging.Logger;
|
|
|
import pathgame.tilemap.Tile;
|
|
|
import pathgame.tilemap.TileMap;
|
|
|
|
|
@@ -86,6 +87,7 @@ public class Player
|
|
|
velY = 0.0f;
|
|
|
if(isMoving)
|
|
|
{
|
|
|
+ Logger.onTileEnter(this, map, currentTileX, currentTileY);
|
|
|
currentTile.onEnter(this, map, currentTileX, currentTileY);
|
|
|
steps.addLast(new MinusStepsValues(currSpeedSlowdown));
|
|
|
energyUsed += currSpeedSlowdown;
|
|
@@ -98,24 +100,28 @@ public class Player
|
|
|
{
|
|
|
velX = -SPEED;
|
|
|
isMoving = true;
|
|
|
+ Logger.onTileLeave(this, map, currentTileX, currentTileY);
|
|
|
currentTile.onLeave(this, map, currentTileX, currentTileY);
|
|
|
}
|
|
|
else if(Keys.RIGHT_KEY.isDown() && !isMoving && currentTileX < map.getWidth() - 1 && !map.getTile(currentTileX + 1, currentTileY).isBlockingMovement(this))
|
|
|
{
|
|
|
velX = SPEED;
|
|
|
isMoving = true;
|
|
|
+ Logger.onTileLeave(this, map, currentTileX, currentTileY);
|
|
|
currentTile.onLeave(this, map, currentTileX, currentTileY);
|
|
|
}
|
|
|
else if(Keys.UP_KEY.isDown() && !isMoving && currentTileY > 0 && !map.getTile(currentTileX, currentTileY - 1).isBlockingMovement(this))
|
|
|
{
|
|
|
velY = -SPEED;
|
|
|
isMoving = true;
|
|
|
+ Logger.onTileLeave(this, map, currentTileX, currentTileY);
|
|
|
currentTile.onLeave(this, map, currentTileX, currentTileY);
|
|
|
}
|
|
|
else if(Keys.DOWN_KEY.isDown() && !isMoving && currentTileY < map.getHeight() - 1 && !map.getTile(currentTileX, currentTileY + 1).isBlockingMovement(this))
|
|
|
{
|
|
|
velY = SPEED;
|
|
|
isMoving = true;
|
|
|
+ Logger.onTileLeave(this, map, currentTileX, currentTileY);
|
|
|
currentTile.onLeave(this, map, currentTileX, currentTileY);
|
|
|
}
|
|
|
|
|
@@ -241,9 +247,10 @@ public class Player
|
|
|
return hasWon;
|
|
|
}
|
|
|
|
|
|
- public void win()
|
|
|
+ public void win(TileMap map)
|
|
|
{
|
|
|
this.hasWon = true;
|
|
|
+ Logger.onWin(this, map);
|
|
|
}
|
|
|
|
|
|
public boolean hasLost()
|