Klagarge/PokeHES
1
0
Fork 0
mirror of https://github.com/Klagarge/PokeHES.git synced 2025-10-31 03:39:16 +00:00
Code Releases Activity

some maps and fix turn, display and new sprite

Browse Source
This commit is contained in:
Rémi Heredero
2022-06-15 09:23:49 +02:00
parent c1ed41fdbe
commit da998e0862
20 changed files with 188 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Entity/Player.java
View File

@@ -17,7 +17,7 @@ public class Player extends Character{
public boolean onEnemy = false;
public Player(int x, int y, String map) {
super("Player", x, y, "Character", map);
super("Player", x, y, "Character_flipped", map);
}
public void addXp(int xp){
@@ -26,6 +26,8 @@ public class Player extends Character{
public void manageEntity(ScreenMap sm, Controller c) {
boolean onDoor = sm.isDoor(getPosition());
// Do nothing if hero is already moving
if (!isMoving()) {
@@ -34,19 +36,21 @@ public class Player extends Character{
Player.Direction goalDirection = Player.Direction.NULL;
Vector2 nextPos = new Vector2(position);
if (c.keyStatus.get(Input.Keys.RIGHT)) {
if (c.keyStatus.get(Input.Keys.RIGHT) && !onDoor) {
goalDirection = Player.Direction.RIGHT;
nextCell = sm.getTile(getPosition(), 1, 0);
nextPos.x+=sm.tileWidth;
} else if (c.keyStatus.get(Input.Keys.LEFT)) {
} else if (c.keyStatus.get(Input.Keys.LEFT) && !onDoor) {
goalDirection = Player.Direction.LEFT;
nextCell = sm.getTile(getPosition(), -1, 0);
nextPos.x-=sm.tileWidth;
} else if (c.keyStatus.get(Input.Keys.UP)) {
} else if (c.keyStatus.get(Input.Keys.UP) && !onDoor) {
goalDirection = Player.Direction.UP;
nextCell = sm.getTile(getPosition(), 0, 1);
nextPos.y+=sm.tileHeight;
} else if (c.keyStatus.get(Input.Keys.DOWN)) {
} else if (c.keyStatus.get(Input.Keys.DOWN) && !onDoor) {
goalDirection = Player.Direction.DOWN;
nextCell = sm.getTile(getPosition(), 0, -1);
nextPos.y-=sm.tileHeight;
@@ -59,7 +63,7 @@ public class Player extends Character{
turn(goalDirection);
System.out.println("It's a enemy !!");
} else {
setSpeed(sm.getSpeed(nextCell));
setSpeed(sm.getSpeed(nextCell)*3); //TODO remove x3
go(goalDirection);
}
} else {
@@ -68,7 +72,7 @@ public class Player extends Character{
}
if(sm.isDoor(getPosition())){
if(onDoor){
String nMap = null;
Integer x = null;
Integer y = null;
@@ -77,12 +81,32 @@ public class Player extends Character{
x = ScreenMap.Door.nextX;
y = ScreenMap.Door.nextY;
goalDirection = ScreenMap.Door.nextDirection;
/*
if (ScreenMap.Door.changeDirection) {
switch (goalDirection) {
case UP:
goalDirection = Direction.DOWN;
System.out.println("go down");
break;
case DOWN:
goalDirection = Direction.UP;
System.out.println("go up");
default:
goalDirection = Direction.NULL;
break;
}
}
*/
} catch (Exception e) { }
ScreenMap.Door.reset();
if (nMap == null || x == null || y == null) return;
map = nMap;
setPosition(x*sm.tileWidth, y*sm.tileHeight);
System.out.println("Go to: " + sm.map + " in " + x + " x " + y);
System.out.println(goalDirection);
turn(goalDirection);
System.out.println("Go to: " + map + " in " + x + " x " + y);
}
}
}