diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java index 45c2ce7e7d1c424c306e24b5e24d06ca013586f1..81077585679f7d0426968d996763b7736735cb43 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java @@ -21,7 +21,7 @@ class Player implements IEntity { private final Rectangle boxCollider = new Rectangle(8, 16, 32, 32); - private Image directionDownOne, directionDownTwo; + private Image directionDownOne, directionDownTwo, directionUpOne, directionUpTwo, directionLeftOne, directionLeftTwo, directionRightOne, directionRightTwo; private int spriteCounter = 0; private int spriteNumber = 1; @@ -50,8 +50,14 @@ class Player implements IEntity { @Override public void loadEntitySprites() { try { - directionDownOne = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/playerPlaceholder.png"))); - directionDownTwo = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/playerPlaceholder.png"))); + directionDownOne = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/downOne.png"))); + directionDownTwo = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/downTwo.png"))); + directionUpOne = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/upOne.png"))); + directionUpTwo = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/upTwo.png"))); + directionLeftOne = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/leftOne.png"))); + directionLeftTwo = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/leftTwo.png"))); + directionRightOne = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/rightOne.png"))); + directionRightTwo = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/player/rightTwo.png"))); } catch (Exception e) { log.error(e); } @@ -114,11 +120,12 @@ class Player implements IEntity { switch (playerDirection) { case "up": if (spriteNumber == 1) { - playerSprite = directionDownOne; + playerSprite = directionUpOne; } if (spriteNumber == 2) { - playerSprite = directionDownTwo; + playerSprite = directionUpTwo; } + break; case "down": if (spriteNumber == 1) { playerSprite = directionDownOne; @@ -126,23 +133,26 @@ class Player implements IEntity { if (spriteNumber == 2) { playerSprite = directionDownTwo; } + break; case "left": if (spriteNumber == 1) { - playerSprite = directionDownOne; + playerSprite = directionLeftOne; } if (spriteNumber == 2) { - playerSprite = directionDownTwo; + playerSprite = directionLeftTwo; } + break; case "right": if (spriteNumber == 1) { - playerSprite = directionDownOne; + playerSprite = directionRightOne; } if (spriteNumber == 2) { - playerSprite = directionDownTwo; + playerSprite = directionRightTwo; } + break; } - graphicsContext.drawImage(playerSprite, mapPosX, mapPosY, 48, 48); + graphicsContext.drawImage(playerSprite, mapPosX, mapPosY, 128, 128); } public int getMapPosX() { diff --git a/src/main/resources/textures/player/downOne.png b/src/main/resources/textures/player/downOne.png new file mode 100644 index 0000000000000000000000000000000000000000..d1e261cc01b3a32bf937536716162ec5c61d0d50 Binary files /dev/null and b/src/main/resources/textures/player/downOne.png differ diff --git a/src/main/resources/textures/player/downTwo.png b/src/main/resources/textures/player/downTwo.png new file mode 100644 index 0000000000000000000000000000000000000000..9a14543c8d06be035ea8048428faeaa218faec32 Binary files /dev/null and b/src/main/resources/textures/player/downTwo.png differ diff --git a/src/main/resources/textures/player/leftOne.png b/src/main/resources/textures/player/leftOne.png new file mode 100644 index 0000000000000000000000000000000000000000..13cc7b495f2647d10917ebda3046cd8af32f9553 Binary files /dev/null and b/src/main/resources/textures/player/leftOne.png differ diff --git a/src/main/resources/textures/player/leftTwo.png b/src/main/resources/textures/player/leftTwo.png new file mode 100644 index 0000000000000000000000000000000000000000..cbed81ae3a90ef128cb1bd913329c211c69030bd Binary files /dev/null and b/src/main/resources/textures/player/leftTwo.png differ diff --git a/src/main/resources/textures/player/rightOne.png b/src/main/resources/textures/player/rightOne.png new file mode 100644 index 0000000000000000000000000000000000000000..5d26f27d4b44906c9c17e0625329e56407c86d8d Binary files /dev/null and b/src/main/resources/textures/player/rightOne.png differ diff --git a/src/main/resources/textures/player/rightTwo.png b/src/main/resources/textures/player/rightTwo.png new file mode 100644 index 0000000000000000000000000000000000000000..7cf375e6ef6a51ed56f485a03bb5988e21a7ed37 Binary files /dev/null and b/src/main/resources/textures/player/rightTwo.png differ diff --git a/src/main/resources/textures/player/upOne.png b/src/main/resources/textures/player/upOne.png new file mode 100644 index 0000000000000000000000000000000000000000..0e3134b32646f8587e59c68a0c62a9c8697876e1 Binary files /dev/null and b/src/main/resources/textures/player/upOne.png differ diff --git a/src/main/resources/textures/player/upTwo.png b/src/main/resources/textures/player/upTwo.png new file mode 100644 index 0000000000000000000000000000000000000000..2f698853e288792ce6879baa96d7999552fd17fe Binary files /dev/null and b/src/main/resources/textures/player/upTwo.png differ