From 23bf0aed20012064e55fda36847ac0ec665b806d Mon Sep 17 00:00:00 2001 From: VictorABoye Date: Wed, 25 Oct 2023 18:26:06 +0200 Subject: [PATCH 1/3] Added support for animations in SpritePart and moved assets around --- .../Data/EntityParts/MovingPart.java | 2 +- .../Data/EntityParts/SpritePart.java | 137 +++++++++++++++--- .../modulemon/Player/PlayerControlSystem.java | 15 +- .../mmmi/modulemon/Player/PlayerPlugin.java | 32 ++-- .../assets/{ => OLD}/main-char-down.png | Bin .../assets/{ => OLD}/main-char-down2.png | Bin .../assets/{ => OLD}/main-char-down3.png | Bin .../assets/{ => OLD}/main-char-down4.png | Bin .../assets/{ => OLD}/main-char-left.png | Bin .../assets/{ => OLD}/main-char-left2.png | Bin .../assets/{ => OLD}/main-char-left3.png | Bin .../assets/{ => OLD}/main-char-left4.png | Bin .../assets/{ => OLD}/main-char-right.png | Bin .../assets/{ => OLD}/main-char-right2.png | Bin .../assets/{ => OLD}/main-char-right3.png | Bin .../assets/{ => OLD}/main-char-right4.png | Bin .../assets/{ => OLD}/main-char-up.png | Bin .../assets/{ => OLD}/main-char-up2.png | Bin .../assets/{ => OLD}/main-char-up3.png | Bin .../assets/{ => OLD}/main-char-up4.png | Bin .../assets/{ => OLD}/npc-char-down.png | Bin .../assets/{ => OLD}/npc-char-down1.png | Bin .../assets/{ => OLD}/npc-char-left.png | Bin .../assets/{ => OLD}/npc-char-left1.png | Bin .../assets/{ => OLD}/npc-char-right.png | Bin .../assets/{ => OLD}/npc-char-right1.png | Bin .../assets/{ => OLD}/npc-char-up.png | Bin .../assets/{ => OLD}/npc-char-up1.png | Bin src/main/resources/assets/{ => OLD}/npc.png | Bin .../idleAnimations/main-char-down-idle1.png | Bin 0 -> 394 bytes .../idleAnimations/main-char-down-idle2.png | Bin 0 -> 394 bytes .../idleAnimations/main-char-down-idle3.png | Bin 0 -> 400 bytes .../idleAnimations/main-char-left-idle1.png | Bin 0 -> 376 bytes .../idleAnimations/main-char-left-idle2.png | Bin 0 -> 369 bytes .../idleAnimations/main-char-left-idle3.png | Bin 0 -> 376 bytes .../idleAnimations/main-char-right-idle1.png | Bin 0 -> 382 bytes .../idleAnimations/main-char-right-idle2.png | Bin 0 -> 376 bytes .../idleAnimations/main-char-right-idle3.png | Bin 0 -> 382 bytes .../idleAnimations/main-char-up-idle1.png | Bin 0 -> 366 bytes .../idleAnimations/main-char-up-idle2.png | Bin 0 -> 369 bytes .../idleAnimations/main-char-up-idle3.png | Bin 0 -> 366 bytes src/main/resources/assets/main-char-down5.png | Bin 363 -> 394 bytes .../main-char-down-walking1.png | Bin 0 -> 470 bytes .../main-char-down-walking2.png | Bin 0 -> 479 bytes .../main-char-down-walking3.png | Bin 0 -> 394 bytes .../main-char-down-walking4.png | Bin 0 -> 426 bytes .../main-char-down-walking5.png | Bin 0 -> 455 bytes .../main-char-down-walking6.png | Bin 0 -> 455 bytes .../main-char-down-walking7.png | Bin 0 -> 422 bytes .../main-char-down-walking8.png | Bin 0 -> 411 bytes 50 files changed, 151 insertions(+), 35 deletions(-) rename src/main/resources/assets/{ => OLD}/main-char-down.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-down2.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-down3.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-down4.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-left.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-left2.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-left3.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-left4.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-right.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-right2.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-right3.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-right4.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-up.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-up2.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-up3.png (100%) rename src/main/resources/assets/{ => OLD}/main-char-up4.png (100%) rename src/main/resources/assets/{ => OLD}/npc-char-down.png (100%) rename src/main/resources/assets/{ => OLD}/npc-char-down1.png (100%) rename src/main/resources/assets/{ => OLD}/npc-char-left.png (100%) rename src/main/resources/assets/{ => OLD}/npc-char-left1.png (100%) rename src/main/resources/assets/{ => OLD}/npc-char-right.png (100%) rename src/main/resources/assets/{ => OLD}/npc-char-right1.png (100%) rename src/main/resources/assets/{ => OLD}/npc-char-up.png (100%) rename src/main/resources/assets/{ => OLD}/npc-char-up1.png (100%) rename src/main/resources/assets/{ => OLD}/npc.png (100%) create mode 100644 src/main/resources/assets/idleAnimations/main-char-down-idle1.png create mode 100644 src/main/resources/assets/idleAnimations/main-char-down-idle2.png create mode 100644 src/main/resources/assets/idleAnimations/main-char-down-idle3.png create mode 100644 src/main/resources/assets/idleAnimations/main-char-left-idle1.png create mode 100644 src/main/resources/assets/idleAnimations/main-char-left-idle2.png create mode 100644 src/main/resources/assets/idleAnimations/main-char-left-idle3.png create mode 100644 src/main/resources/assets/idleAnimations/main-char-right-idle1.png create mode 100644 src/main/resources/assets/idleAnimations/main-char-right-idle2.png create mode 100644 src/main/resources/assets/idleAnimations/main-char-right-idle3.png create mode 100644 src/main/resources/assets/idleAnimations/main-char-up-idle1.png create mode 100644 src/main/resources/assets/idleAnimations/main-char-up-idle2.png create mode 100644 src/main/resources/assets/idleAnimations/main-char-up-idle3.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-down-walking1.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-down-walking2.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-down-walking3.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-down-walking4.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-down-walking5.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-down-walking6.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-down-walking7.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-down-walking8.png diff --git a/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/MovingPart.java b/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/MovingPart.java index 47246cf3..f6d0a6eb 100644 --- a/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/MovingPart.java +++ b/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/MovingPart.java @@ -79,7 +79,7 @@ public void setDown(boolean down) { } } - private boolean anyDirectionKeyPressed() { + public boolean anyDirectionKeyPressed() { return down || up || left || right; } diff --git a/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/SpritePart.java b/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/SpritePart.java index 16b3ac64..d77210c2 100644 --- a/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/SpritePart.java +++ b/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/SpritePart.java @@ -1,60 +1,147 @@ package dk.sdu.mmmi.modulemon.CommonMap.Data.EntityParts; +import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Texture; import dk.sdu.mmmi.modulemon.CommonMap.Data.Entity; import dk.sdu.mmmi.modulemon.CommonMap.Data.World; import dk.sdu.mmmi.modulemon.common.data.GameData; +import java.util.Collections; +import java.util.List; +import java.util.PrimitiveIterator; + public class SpritePart implements EntityPart { - private Texture upSprite; - private Texture downSprite; - private Texture leftSprite; - private Texture rightSprite; + private List upSprite; + private List downSprite; + private List leftSprite; + private List rightSprite; + + private List upIdleSprite; + private List downIdleSprite; + private List leftIdleSprite; + private List rightIdleSprite; + + private float timer = 0; + private float duration = 0.25f; + private int frameIndex = 0; private Texture currentSprite; + private List currentSpritePool; public SpritePart(Texture upSprite, Texture downSprite, Texture leftSprite, Texture rightSprite) { + this.upSprite = Collections.singletonList(upSprite); + this.downSprite = Collections.singletonList(downSprite); + this.leftSprite = Collections.singletonList(leftSprite); + this.rightSprite = Collections.singletonList(rightSprite); + } + + public SpritePart(List upSprite, List downSprite, List leftSprite, List rightSprite) { + this.upSprite = upSprite; + this.downSprite = downSprite; + this.leftSprite = leftSprite; + this.rightSprite = rightSprite; + } + + public SpritePart( + List upSprite, + List downSprite, + List leftSprite, + List rightSprite, + List upIdleSprite, + List downIdleSprite, + List leftIdleSprite, + List rightIdleSprite) { this.upSprite = upSprite; this.downSprite = downSprite; this.leftSprite = leftSprite; this.rightSprite = rightSprite; + this.upIdleSprite = upIdleSprite; + this.downIdleSprite = downIdleSprite; + this.leftIdleSprite = leftIdleSprite; + this.rightIdleSprite = rightIdleSprite; + this.currentSpritePool = downIdleSprite; } + public SpritePart( + Texture upSprite, + Texture downSprite, + Texture leftSprite, + Texture rightSprite, + List upIdleSprite, + List downIdleSprite, + List leftIdleSprite, + List rightIdleSprite) { + this.upSprite = Collections.singletonList(upSprite); + this.downSprite = Collections.singletonList(downSprite); + this.leftSprite = Collections.singletonList(leftSprite); + this.rightSprite = Collections.singletonList(rightSprite); + this.upIdleSprite = upIdleSprite; + this.downIdleSprite = downIdleSprite; + this.leftIdleSprite = leftIdleSprite; + this.rightIdleSprite = rightIdleSprite; + this.currentSpritePool = downIdleSprite; + } + + + public Texture getUpSprite(boolean isMoving) { + if(!isMoving && upIdleSprite != null){ + updateAnimation(upIdleSprite, isMoving); + return upIdleSprite.get(frameIndex); + } else { + updateAnimation(upSprite, isMoving); + return upSprite.get(frameIndex% upSprite.size()); + } + } public Texture getUpSprite() { - return upSprite; + return upSprite.get(0); } - public void setUpSprite(Texture upSprite) { - this.upSprite = upSprite; + public Texture getDownSprite(boolean isMoving) { + if(!isMoving && downIdleSprite != null){ + updateAnimation(downIdleSprite, isMoving); + return downIdleSprite.get(frameIndex); + } else { + updateAnimation(downSprite, isMoving); + return downSprite.get(frameIndex % downSprite.size()); + } } public Texture getDownSprite() { - return downSprite; + return downSprite.get(0); } - public void setDownSprite(Texture downSprite) { - this.downSprite = downSprite; + public Texture getLeftSprite(boolean isMoving) { + if(!isMoving && leftIdleSprite != null){ + updateAnimation(leftIdleSprite, isMoving); + return leftIdleSprite.get(frameIndex); + } else { + updateAnimation(leftSprite, isMoving); + return leftSprite.get(frameIndex % leftSprite.size()); + } } public Texture getLeftSprite() { - return leftSprite; + return leftSprite.get(0); } - public void setLeftSprite(Texture leftSprite) { - this.leftSprite = leftSprite; + public Texture getRightSprite(boolean isMoving) { + if(!isMoving && rightIdleSprite != null){ + updateAnimation(rightIdleSprite, isMoving); + return rightIdleSprite.get(frameIndex); + } else { + updateAnimation(rightSprite, isMoving); + return rightSprite.get(frameIndex % rightSprite.size()); + } } public Texture getRightSprite() { - return rightSprite; - } - - public void setRightSprite(Texture rightSprite) { - this.rightSprite = rightSprite; + return rightSprite.get(0); } public Texture getCurrentSprite() { + timer += Gdx.graphics.getDeltaTime(); return currentSprite; } @@ -62,6 +149,20 @@ public void setCurrentSprite(Texture currentSprite) { this.currentSprite = currentSprite; } + private void updateAnimation(List animationTextures, boolean isMoving) { + if(timer >= duration){ + timer = 0; + frameIndex = (frameIndex + 1) % animationTextures.size(); + } + if(this.currentSpritePool != null) { + if(!this.currentSpritePool.contains(animationTextures.get(frameIndex % animationTextures.size()))){ + timer = isMoving ? 0 : -1; + frameIndex = 0; + } + } + this.currentSpritePool = animationTextures; + } + @Override public void process(GameData gameData, World world, Entity entity) { diff --git a/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerControlSystem.java b/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerControlSystem.java index 8b3870a7..331b0633 100644 --- a/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerControlSystem.java +++ b/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerControlSystem.java @@ -17,12 +17,13 @@ public class PlayerControlSystem implements IEntityProcessingService { public void process(GameData gameData, World world) { for (Entity player : world.getEntities(Player.class)) { MovingPart movingPart = player.getPart(MovingPart.class); - + var isMoving = false; if (movingPart != null) { movingPart.setLeft(gameData.getKeys().isDown(LEFT)); movingPart.setRight(gameData.getKeys().isDown(RIGHT)); movingPart.setUp(gameData.getKeys().isDown(UP)); movingPart.setDown(gameData.getKeys().isDown(DOWN)); + isMoving = movingPart.anyDirectionKeyPressed(); } Collection entityParts = player.getParts(); @@ -30,11 +31,11 @@ public void process(GameData gameData, World world) { entityPart.process(gameData, world, player); } - updateShape(player); + updateShape(player, isMoving); } } - private void updateShape(Entity entity) { + private void updateShape(Entity entity, boolean isMoving) { SpritePart spritePart = entity.getPart(SpritePart.class); PositionPart positionPart = entity.getPart(PositionPart.class); @@ -43,16 +44,16 @@ private void updateShape(Entity entity) { Texture result = null; switch (positionPart.getDirection()) { case EAST: - result = spritePart.getRightSprite(); + result = spritePart.getRightSprite(isMoving); break; case WEST: - result = spritePart.getLeftSprite(); + result = spritePart.getLeftSprite(isMoving); break; case NORTH: - result = spritePart.getUpSprite(); + result = spritePart.getUpSprite(isMoving); break; case SOUTH: - result = spritePart.getDownSprite(); + result = spritePart.getDownSprite(isMoving); break; default: System.out.println(("Did not match any direction")); diff --git a/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerPlugin.java b/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerPlugin.java index ae956a48..e0be5400 100644 --- a/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerPlugin.java +++ b/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerPlugin.java @@ -11,11 +11,10 @@ import dk.sdu.mmmi.modulemon.CommonMap.Data.World; import dk.sdu.mmmi.modulemon.CommonMap.Services.IGamePluginService; import dk.sdu.mmmi.modulemon.common.data.GameKeys; +import org.jetbrains.annotations.NotNull; +import org.w3c.dom.Text; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Queue; +import java.util.*; public class PlayerPlugin implements IGamePluginService { private static final int TILE_SIZE = 64; @@ -47,11 +46,16 @@ private Entity createPlayer(GameData gameData) { player.add(positionPart); player.add(new MovingPart()); player.add(new InteractPart(positionPart, 1)); - Texture upSprite = AssetLoader.getInstance().getTextureAsset("/assets/main-char-up5.png", Player.class); - Texture downSprite = AssetLoader.getInstance().getTextureAsset("/assets/main-char-down5.png", Player.class); - Texture leftSprite = AssetLoader.getInstance().getTextureAsset("/assets/main-char-left5.png", Player.class); - Texture rightSprite = AssetLoader.getInstance().getTextureAsset("/assets/main-char-right5.png", Player.class); - player.add(new SpritePart(upSprite, downSprite, leftSprite, rightSprite)); + List upSprite = Collections.singletonList(AssetLoader.getInstance().getTextureAsset("/assets/main-char-up5.png", Player.class)); + List downSprites = getAnimations("down", "walking", 8); + List leftSprite = Collections.singletonList(AssetLoader.getInstance().getTextureAsset("/assets/main-char-left5.png", Player.class)); + List rightSprite = Collections.singletonList(AssetLoader.getInstance().getTextureAsset("/assets/main-char-right5.png", Player.class)); + + List upIdleSprites = getAnimations("up", "idle", 3); + List downIdleSprites = getAnimations("down", "idle", 3); + List leftIdleSprites = getAnimations("left", "idle", 3); + List rightIdleSprites = getAnimations("right", "idle", 3); + player.add(new SpritePart(upSprite, downSprites, leftSprite, rightSprite, upIdleSprites, downIdleSprites, leftIdleSprites, rightIdleSprites)); Queue playerLines = new LinkedList<>(); playerLines.add("Alright, lets battle!"); player.add(new TextDisplayPart(playerLines)); @@ -60,6 +64,16 @@ private Entity createPlayer(GameData gameData) { return player; } + @NotNull + private static List getAnimations(String direction, String action, int frameCount) { + List sprites = new ArrayList<>(); + for (int i = 1; i <= frameCount; i++) { + Texture sprite = AssetLoader.getInstance().getTextureAsset("/assets/" + action + "Animations/main-char-" + direction + "-" + action + "" + i +".png", Player.class); + sprites.add(sprite); + } + return sprites; + } + private void addMonsterTeam(Entity entity, GameData gameData) { List monsterList = new ArrayList<>(); if(gameData != null && gameData.getKeys().isDown(GameKeys.LEFT_CTRL)) diff --git a/src/main/resources/assets/main-char-down.png b/src/main/resources/assets/OLD/main-char-down.png similarity index 100% rename from src/main/resources/assets/main-char-down.png rename to src/main/resources/assets/OLD/main-char-down.png diff --git a/src/main/resources/assets/main-char-down2.png b/src/main/resources/assets/OLD/main-char-down2.png similarity index 100% rename from src/main/resources/assets/main-char-down2.png rename to src/main/resources/assets/OLD/main-char-down2.png diff --git a/src/main/resources/assets/main-char-down3.png b/src/main/resources/assets/OLD/main-char-down3.png similarity index 100% rename from src/main/resources/assets/main-char-down3.png rename to src/main/resources/assets/OLD/main-char-down3.png diff --git a/src/main/resources/assets/main-char-down4.png b/src/main/resources/assets/OLD/main-char-down4.png similarity index 100% rename from src/main/resources/assets/main-char-down4.png rename to src/main/resources/assets/OLD/main-char-down4.png diff --git a/src/main/resources/assets/main-char-left.png b/src/main/resources/assets/OLD/main-char-left.png similarity index 100% rename from src/main/resources/assets/main-char-left.png rename to src/main/resources/assets/OLD/main-char-left.png diff --git a/src/main/resources/assets/main-char-left2.png b/src/main/resources/assets/OLD/main-char-left2.png similarity index 100% rename from src/main/resources/assets/main-char-left2.png rename to src/main/resources/assets/OLD/main-char-left2.png diff --git a/src/main/resources/assets/main-char-left3.png b/src/main/resources/assets/OLD/main-char-left3.png similarity index 100% rename from src/main/resources/assets/main-char-left3.png rename to src/main/resources/assets/OLD/main-char-left3.png diff --git a/src/main/resources/assets/main-char-left4.png b/src/main/resources/assets/OLD/main-char-left4.png similarity index 100% rename from src/main/resources/assets/main-char-left4.png rename to src/main/resources/assets/OLD/main-char-left4.png diff --git a/src/main/resources/assets/main-char-right.png b/src/main/resources/assets/OLD/main-char-right.png similarity index 100% rename from src/main/resources/assets/main-char-right.png rename to src/main/resources/assets/OLD/main-char-right.png diff --git a/src/main/resources/assets/main-char-right2.png b/src/main/resources/assets/OLD/main-char-right2.png similarity index 100% rename from src/main/resources/assets/main-char-right2.png rename to src/main/resources/assets/OLD/main-char-right2.png diff --git a/src/main/resources/assets/main-char-right3.png b/src/main/resources/assets/OLD/main-char-right3.png similarity index 100% rename from src/main/resources/assets/main-char-right3.png rename to src/main/resources/assets/OLD/main-char-right3.png diff --git a/src/main/resources/assets/main-char-right4.png b/src/main/resources/assets/OLD/main-char-right4.png similarity index 100% rename from src/main/resources/assets/main-char-right4.png rename to src/main/resources/assets/OLD/main-char-right4.png diff --git a/src/main/resources/assets/main-char-up.png b/src/main/resources/assets/OLD/main-char-up.png similarity index 100% rename from src/main/resources/assets/main-char-up.png rename to src/main/resources/assets/OLD/main-char-up.png diff --git a/src/main/resources/assets/main-char-up2.png b/src/main/resources/assets/OLD/main-char-up2.png similarity index 100% rename from src/main/resources/assets/main-char-up2.png rename to src/main/resources/assets/OLD/main-char-up2.png diff --git a/src/main/resources/assets/main-char-up3.png b/src/main/resources/assets/OLD/main-char-up3.png similarity index 100% rename from src/main/resources/assets/main-char-up3.png rename to src/main/resources/assets/OLD/main-char-up3.png diff --git a/src/main/resources/assets/main-char-up4.png b/src/main/resources/assets/OLD/main-char-up4.png similarity index 100% rename from src/main/resources/assets/main-char-up4.png rename to src/main/resources/assets/OLD/main-char-up4.png diff --git a/src/main/resources/assets/npc-char-down.png b/src/main/resources/assets/OLD/npc-char-down.png similarity index 100% rename from src/main/resources/assets/npc-char-down.png rename to src/main/resources/assets/OLD/npc-char-down.png diff --git a/src/main/resources/assets/npc-char-down1.png b/src/main/resources/assets/OLD/npc-char-down1.png similarity index 100% rename from src/main/resources/assets/npc-char-down1.png rename to src/main/resources/assets/OLD/npc-char-down1.png diff --git a/src/main/resources/assets/npc-char-left.png b/src/main/resources/assets/OLD/npc-char-left.png similarity index 100% rename from src/main/resources/assets/npc-char-left.png rename to src/main/resources/assets/OLD/npc-char-left.png diff --git a/src/main/resources/assets/npc-char-left1.png b/src/main/resources/assets/OLD/npc-char-left1.png similarity index 100% rename from src/main/resources/assets/npc-char-left1.png rename to src/main/resources/assets/OLD/npc-char-left1.png diff --git a/src/main/resources/assets/npc-char-right.png b/src/main/resources/assets/OLD/npc-char-right.png similarity index 100% rename from src/main/resources/assets/npc-char-right.png rename to src/main/resources/assets/OLD/npc-char-right.png diff --git a/src/main/resources/assets/npc-char-right1.png b/src/main/resources/assets/OLD/npc-char-right1.png similarity index 100% rename from src/main/resources/assets/npc-char-right1.png rename to src/main/resources/assets/OLD/npc-char-right1.png diff --git a/src/main/resources/assets/npc-char-up.png b/src/main/resources/assets/OLD/npc-char-up.png similarity index 100% rename from src/main/resources/assets/npc-char-up.png rename to src/main/resources/assets/OLD/npc-char-up.png diff --git a/src/main/resources/assets/npc-char-up1.png b/src/main/resources/assets/OLD/npc-char-up1.png similarity index 100% rename from src/main/resources/assets/npc-char-up1.png rename to src/main/resources/assets/OLD/npc-char-up1.png diff --git a/src/main/resources/assets/npc.png b/src/main/resources/assets/OLD/npc.png similarity index 100% rename from src/main/resources/assets/npc.png rename to src/main/resources/assets/OLD/npc.png diff --git a/src/main/resources/assets/idleAnimations/main-char-down-idle1.png b/src/main/resources/assets/idleAnimations/main-char-down-idle1.png new file mode 100644 index 0000000000000000000000000000000000000000..eb17f83413563b0cd378d6f8434053a9366511c5 GIT binary patch literal 394 zcmV;50d@X~P)Px$L`g(JRA_d>JB$LPp_)B|vdZu9^ghXcUYOK^Zn42&FufguAD ztf{M5jvE{-`E6C5$1YDLQJaFblNpku=9Ro`UbF z)=`;h6DLMWfgFbL)ZwH}@)u0O}fcjpv|%#~QX>809dK;@(}yn%}pI%1oPRDWW{> z`-Px$L`g(JRA_d>JB$LPp_)B|vdZu9^ghXcUYOK^Zn42&FufguAD ztf{M5jvE{-`E6C5$1YDLQJaFblNpku=9Ro`UbF z)=`;h6DLMWfgFbL)ZwH}@)u0O}fcjpv|%#~QX>809dK;@(}yn%}pI%1oPRDWW{> z`-{ohfMKeHge4oZGn>kc33oy^%9yJ} ze7e2L>fH3tQ!PTfofJ~nxEz~du6izNcg4A@msl(XG_5jL8gOrU+c+gzrvF}f$m@o02ubijS`8Zkl`dbKNJt zHM8qJ^&BlaelX(3$IdldJT7k5<=1n*`(?5>!&Ro3nAa~<70i`f*<*7QH~xA1OJdQy zbG;rHUl{(o5%K=O*Rw8y4s)IRKgvvbx2;WA+|86{$&T>r8$UU(2HWB~Vfn)KJMKMy z7UKUrA+3MH>71Mu#ob`X-g=t&C+YNIf%{K4+J8;jakYD^R{Vv2Q@xPa1sC@V{NvrW m{Nl3vmX^**AoqG)l>hiAcUN1B#zSBbGkCiCxvX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/idleAnimations/main-char-left-idle1.png b/src/main/resources/assets/idleAnimations/main-char-left-idle1.png new file mode 100644 index 0000000000000000000000000000000000000000..834c8683c5ba05575c71094efe352049176fc900 GIT binary patch literal 376 zcmV-;0f+vHP)Px$GD$>1R9J=Wm@y8*FbqXq)FA@{$3W`BfYbwUiEeNJj>7?9>m@iqr4B5WI07RB zLkA?73Qkq0PDEs(`c0LRxYqx*lQaP)#+Vm(E&xE=wh3q6%qM6JGy%&em(O{=_X=E9 z2XYL5AL0s#CqP=@EBP4M614!6#FU)^+aa!iCZGw3C&2E6=hJ#Hz-C)}zf{W*Lt5~- z9<7P<Px$D@jB_R9J=WnY|6dFc5_ul)?oCV<4rWK*|6tkq!o690q_cOE5sB6f}_-fs%qE z1rk(&=O~x>EUYWIuZm>ne0neEzZfG-;@i<$`{D#{+tw@gj1x2lntX9cdR z1KEb(hqwab36K_WC7%KZGfcH#zKCK4>Y_>IfP%T4*wBT_) zIvwZBouS$~(2k~Y`()YoeYF5de;EvAzt!%R3@z0C0ODN*Tu^dj=#!GT0-6AMg5{ou zr_gVJBItqwOBBoPzG^?ui;H#MR|_bj-4UT3#<-T~VuS?k2dIVWSrqJ8;tKp<0{sao zS{Y6a-0>e4j9pv@m0^FD>!4=4F~lthQXnnM;fCH$*avY1#1qh8Hk!a27&2&X&goVk P00000NkvXXu0mjfx`~)L literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/idleAnimations/main-char-left-idle3.png b/src/main/resources/assets/idleAnimations/main-char-left-idle3.png new file mode 100644 index 0000000000000000000000000000000000000000..834c8683c5ba05575c71094efe352049176fc900 GIT binary patch literal 376 zcmV-;0f+vHP)Px$GD$>1R9J=Wm@y8*FbqXq)FA@{$3W`BfYbwUiEeNJj>7?9>m@iqr4B5WI07RB zLkA?73Qkq0PDEs(`c0LRxYqx*lQaP)#+Vm(E&xE=wh3q6%qM6JGy%&em(O{=_X=E9 z2XYL5AL0s#CqP=@EBP4M614!6#FU)^+aa!iCZGw3C&2E6=hJ#Hz-C)}zf{W*Lt5~- z9<7P<Px$I7vi7R9J=Wm@y85KoCU-L$QU0rAIKKu^{099z+k|aX0{WT*3p8SlEzw3=0c7 zty~APgR_e;lFX|X*}%{LJF~12FfqnFxpM&knx=_3^AlNxLmzNHrOw}X`%CLuJ0S%bL0uQE z>m)hYF=hL5^O^Iw6`gzT_lP?nE+ED$vZ`{sF?B6mr+A}sM-YOz1L6Y6(@XaYxf_Wu zxI(lM{gnXr8W;+7S{8ReTmbuf;J$6_cy%>)jLVZMwLZih5EnomPO;?xZQD6$1YClu zATCSi99#ul#2xrA0o;}QOGev_=3jPx$GD$>1R9J=WS+NbmFc5T53KtZVjDVDeB2orm5Ey`QGC=6E1Or&2pozp76cp~D z!n`eiupPoD(qCoA*5`ERf7^)=#K=M?N-3W)fwk5_u@^Bx#{d(seCqSLs*X{Cm8#J( zxIV}gASZxY5G(mNKug#Hh-^&RF+e-W6<`8PfSf=+G{E^(dY|w17pu>e5CdvK*ELqZ zC=RBL$-dlt<~(kVGv_2l6F_e-?g`noBo;73 zxDZW>K=2wE3hcH_t^hfK;Pb$Jt4(`#m8K2T6HB!|kSjn=0KJ?-$%U|G4*^>cili*a z+txb=WPx$I7vi7R9J=Wm@y85KoCU-L$QU0rAIKKu^{099z+k|aX0{WT*3p8SlEzw3=0c7 zty~APgR_e;lFX|X*}%{LJF~12FfqnFxpM&knx=_3^AlNxLmzNHrOw}X`%CLuJ0S%bL0uQE z>m)hYF=hL5^O^Iw6`gzT_lP?nE+ED$vZ`{sF?B6mr+A}sM-YOz1L6Y6(@XaYxf_Wu zxI(lM{gnXr8W;+7S{8ReTmbuf;J$6_cy%>)jLVZMwLZih5EnomPO;?xZQD6$1YClu zATCSi99#ul#2xrA0o;}QOGev_=3jPx$C`m*?RA_1!uZ)xU>HKA1q%@mCIOpDy`@Hwf(z&)vUr+;+(pgKzMWFA`qIXQwB{?RIj>$?x zS_?KqG{e%|&V}YZm2s1mhO`!t)&kO6Kw1k(YXNC3cJxBn*}WdupRwcVwyF%BukD7f zOW5(5th7mKd<19#X)Urc9YVLKxwPGo97CpSV^TWGOqk>6!6zTw-(3*_=^Qx5YtYbb zja#mogi$eBX-I1keYtRixhj?YIqx)CX_L~?mdAB(Tt`*{>D(qO4QVadE{|i4Esq0T zUJarXk^2)s8Xdai(kS6Cgnz@NbXJ%5^WZq92gz}tbFT!Gl{P8;0sppK7+N7QApigX M07*qoM6N<$f*ZJ<5dZ)H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/idleAnimations/main-char-up-idle2.png b/src/main/resources/assets/idleAnimations/main-char-up-idle2.png new file mode 100644 index 0000000000000000000000000000000000000000..a2d4fd1355da8273a6e0bd87fbdacc03f00a1b0a GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^x8E$!S(K@%ho zNj`gKCO+qT#Iew@TT7N2WNP|EaZR3f2+XvqVJs_KfBb9un~GhzTFuvAx4(SNWNkNf zYM5rOJY&#|Eh3&X+aA2toL)C$QS!8xw^mHyGh#0OWAo!h^Y7i-N(W*O_kEPwQW3p4 zF5EXEBm`su$G#Yigmqr2_UV2gV`OtGL%zF}rl>wxw|3JdHC@)5PXlu{J`G&){?jBr zalIW?OJ{FznDtAzL3(b?8~v7gW$Vj#ZH}{FJUO#SpB-etU&htpF%nKvt>1uQ$l&Sf K=d#Wzp$Py8BA7}5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/idleAnimations/main-char-up-idle3.png b/src/main/resources/assets/idleAnimations/main-char-up-idle3.png new file mode 100644 index 0000000000000000000000000000000000000000..7d528c494d0e247ad71adc963718a3bd14accb66 GIT binary patch literal 366 zcmV-!0g?WRP)Px$C`m*?RA_1!uZ)xU>HKA1q%@mCIOpDy`@Hwf(z&)vUr+;+(pgKzMWFA`qIXQwB{?RIj>$?x zS_?KqG{e%|&V}YZm2s1mhO`!t)&kO6Kw1k(YXNC3cJxBn*}WdupRwcVwyF%BukD7f zOW5(5th7mKd<19#X)Urc9YVLKxwPGo97CpSV^TWGOqk>6!6zTw-(3*_=^Qx5YtYbb zja#mogi$eBX-I1keYtRixhj?YIqx)CX_L~?mdAB(Tt`*{>D(qO4QVadE{|i4Esq0T zUJarXk^2)s8Xdai(kS6Cgnz@NbXJ%5^WZq92gz}tbFT!Gl{P8;0sppK7+N7QApigX M07*qoM6N<$f*ZJ<5dZ)H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/main-char-down5.png b/src/main/resources/assets/main-char-down5.png index 6c3ce46c2653071c9dcf5ddde3756ac58da747a7..eb17f83413563b0cd378d6f8434053a9366511c5 100644 GIT binary patch delta 368 zcmV-$0gwLc0*V8WBYyw^b5ch_0Itp)=>Px$L`g(JRA_d>JB$LPp_ z)B|vdZu9^ghXcUYOK^Zn42&FufguADtf{M5jvE{-`E6C5$1YDLQJaFblNpku=9Ro`UbF)=`;h6DwWH==II>F>=DzSDVqJC3)-oG>pmuyg33&*6#WIhsBOCP5e=gN O0000s6j;oI9Aw_;pV~4rkhJtfPX(iVYnHV`0UodPp%k^58a9^={Ava1{sztD{XoYVvPv zA+h|%9z)dW)Z}-K-&f8%aCx;+65y_(*LVsFe5_I1MNxJgEAH90LGwdZR1YcgcN%&X z>VD{)>U0W5dP+=bW@E!$TlJ74zbcR78%G|6R(UBPKh|Kl>fkNss-*uy_%;6PHy5%~ jLD&71SPrU(2*#KPx$kV!;ARA_0zmFwUmCRJnk~nA=-)%ZAFN-B1Bs;YCFEZ+>y`jAKuh$ zCAiFVh_+&~i^4m*ua9T4<7&M-`^~l0_QP%Qj?ZPLU5cKRJUk7n_3rEtAhm#&(mHVn z=#5L!RR>$lQvNP|j0sQo#-(U>8UMTmvg7r8UPOR&j9A8dFr*~61jo4Fi`so}x2pI@ zs{p{@GSea2imKB%EVRc>a1PvOK{1Px$nMp)JRA_s06k6)kZ!p|4iF$i#vY?X z2Mz_&p-`d76-(2yR04ckVu}8tKSsu+Q-*X;UnQ0SU3lm)n6I}}vT?;4OczWGruRT3q z#A`XI%(RKF#o!bbpX@%~4%v;%_3rL7wN|<>UK^kIRAySG=t0SgAH#CJyBh+y7Lbx! z$A*B`s1!YFu#G9@@6^XJ=IPd`6iv4A_eacbe7O1|0=W0EHr|2`fNu#3cRaGzefGU5 zey|E6b}BQy002OgWw#Y7Gabsv&HHc9a7&QX`&3NM6rIVh}qN$nfzYs+KcnJ}+ z!>qK*P-PTX{ph&A*@K$US^u7y8?mRkP3SKqPfsKo5y?g{MG%Kk%>@yQpS>mVz5o`t VgN(4uMz#O|002ovPDHLkV1oG^&+`BP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-down-walking3.png b/src/main/resources/assets/walkingAnimations/main-char-down-walking3.png new file mode 100644 index 0000000000000000000000000000000000000000..eb17f83413563b0cd378d6f8434053a9366511c5 GIT binary patch literal 394 zcmV;50d@X~P)Px$L`g(JRA_d>JB$LPp_)B|vdZu9^ghXcUYOK^Zn42&FufguAD ztf{M5jvE{-`E6C5$1YDLQJaFblNpku=9Ro`UbF z)=`;h6DLMWfgFbL)ZwH}@)u0O}fcjpv|%#~QX>809dK;@(}yn%}pI%1oPRDWW{> z`-Px$WJyFpRA_X3nfV=yux!OkVv=m9tm2Y{`YU-PDyOzYWz%ex0wxt|&&C2qC;VaWTfC>ssTk6AVGCx2CeWT<%zNTrT_MGwv>! z%(RQvg7gsfFxR(Iu-{W2H<@V{t%Zx$!bNN0qO~Zc15d|A^4WTO6~}TgnQ0fTMWc#> zmEH4xNDiFLs=wbf90g)9QNYxp%j1O-0UsO_RC>zWn!+H6GgL#vp~w2RiFm8YSv zq~4d#Y2MS~?;d?XoD*+GJ@; z(Z@MWVZJmaKh|KlyC8-8FN9t$7rf=Utn|gCJxq!g+k<=E_kl{ml=}ru+QX#i4?4nk Unq1LaIRF3v07*qoM6N<$f~nfVIRF3v literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-down-walking5.png b/src/main/resources/assets/walkingAnimations/main-char-down-walking5.png new file mode 100644 index 0000000000000000000000000000000000000000..c125517a6bb34c5876eba0ebfccb9114102c12f4 GIT binary patch literal 455 zcmeAS@N?(olHy`uVBq!ia0vp^x?dSdb`BosCmid^WW8ezbUR4-2OBPEa#~vnqF4FeSOaI zqg6h2({FkGKAM|(EZyjmnyb2d+#a6puQNm#W4JvQUi+w&z%@hUtX@v?mOs9=GLPrY zV^VWXU;ptw|CzF=xaLz&?pXejsuwqISgz}JIyA{*Zp7Pv<<=K}T+vcfe!Hmp;JRbU z@qzENE4HTD&+OUadGX}L@Zd99!NE^vfq5?t*L+&;z+vS%iH-SyardJ-UxmHzH1FgH z8qW3qa%~H%skH6yd(DSpS*2{3hI*Fxs$KHk@3i1w75gF&@z2kXO&4fzD0zGF`Xhd` r-7x|mmrh+0mc38VTU@Nc=LhqasVy;LaUXhsF~i{L>gTe~DWM4fpXb9B literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-down-walking6.png b/src/main/resources/assets/walkingAnimations/main-char-down-walking6.png new file mode 100644 index 0000000000000000000000000000000000000000..1e99d53303cf675f947177285f39cb7d84e1b637 GIT binary patch literal 455 zcmV;&0XY7NP)Px$fk{L`RA_J1q>a0JGV3`jiym*_?h(Bp6b*m?;LP>F$&V=ypy zK%x^gv6RTR{LHiDZ>wJ7{B?dgabE!vA66DYN+~~_afoQL-r6FFHz7r{w`*j9-R{VW zaXvqFpGm9}GSeyAi>{BThq=DhLj6ASc*snrXfIN<7b)6{6z#>Nne_T{-+lJ*_@*Aq zC1j>kv=_}ys=nEMeLQz3ZMKKz^JuJgUOkrH_(Ennr0AyP)!VSy9-1bAYXL3PI@ts) zfsmrvjctvUzp0OF($h;Ir0DK3{&|PpNjLAsWO42qd5r%TD}bvlM%y)FI-OYKzV~}o zd}@`DnNHDOG@j;m5?b$5YOhMlU&u^{6s`KP#_B|@8J10Q8*D^RxBWU=ioH-RYXG}< z)?WN&njxI^(%u7=r{^enBM{s5RH7w9tiE84xo9n;ei6vMUo09CMde8nm&;-@4T8UM xh($~5^&Go0Tc&@vdvss{=ngHFr!CRMy8sQ$es{v+J|+MF002ovPDHLkV1hE&&tm`p literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-down-walking7.png b/src/main/resources/assets/walkingAnimations/main-char-down-walking7.png new file mode 100644 index 0000000000000000000000000000000000000000..dff8cd6b978525258d3eb1a649c3e421aa626d5d GIT binary patch literal 422 zcmV;X0a^ZuP)Px$U`a$lRA_ZUDw%0O(kP9wZ7%#-N}`fdm!8 z=Tj`lM2;-^b?BVr<9y}p=$b(xLI`h8T#T{#cdg;S6VxEM8Fv>< zX4*w-L3#*#nCn|9*zYNio6NL}*1|<=;i9#0(OQh815bx}^4V&06~}TgnQ0fTMX!p2 zmEH5cPYxVU+sVvO8Fc6 z7~-C;jY-kuYy2^b$$^twC?bHnhQG#Z(BNZ@+AfOG@yLpMt=FRYp;b&~+C^)T`#CNu4#wIHiJOpL!HDK5(h2Px$RY^oaRA_04hMj(m*4=E7#KMQ149NR zSe;0T94mEWi2AZb%V&bf|b&mBmIVRyoq-gZ#idmrVPpCQO`5b(g zVjYp0R?%DpedK!>>suhh{6dgRqUppHdw0$&L7RRok$M{;*SWCn((}arq3V4{*f8lAT35f0jk>Z9M(q&Dq6A_Y69(Oej7)3>iBw!D-s##Ep@^{)*|MW#LA zL#&y^{)pmlhgd7=UkD{aIuVl=SfDf@iC()#5or&RqJJ6mZ%F%px%&VB002ovPDHLk FV1nMVw9x Date: Wed, 25 Oct 2023 21:45:22 +0200 Subject: [PATCH 2/3] Added rest of walking animations for player --- .../mmmi/modulemon/Player/PlayerPlugin.java | 28 +++++++++++------- .../main-char-left-walking1.png | Bin 0 -> 531 bytes .../main-char-left-walking2.png | Bin 0 -> 550 bytes .../main-char-left-walking3.png | Bin 0 -> 456 bytes .../main-char-left-walking4.png | Bin 0 -> 472 bytes .../main-char-left-walking5.png | Bin 0 -> 513 bytes .../main-char-left-walking6.png | Bin 0 -> 533 bytes .../main-char-left-walking7.png | Bin 0 -> 453 bytes .../main-char-left-walking8.png | Bin 0 -> 459 bytes .../main-char-right-walking.png | Bin 0 -> 347 bytes .../main-char-right-walking1.png | Bin 0 -> 534 bytes .../main-char-right-walking2.png | Bin 0 -> 546 bytes .../main-char-right-walking3.png | Bin 0 -> 466 bytes .../main-char-right-walking4.png | Bin 0 -> 487 bytes .../main-char-right-walking5.png | Bin 0 -> 543 bytes .../main-char-right-walking6.png | Bin 0 -> 563 bytes .../main-char-right-walking7.png | Bin 0 -> 445 bytes .../main-char-right-walking8.png | Bin 0 -> 507 bytes .../main-char-up-walking1.png | Bin 0 -> 429 bytes .../main-char-up-walking2.png | Bin 0 -> 441 bytes .../main-char-up-walking3.png | Bin 0 -> 366 bytes .../main-char-up-walking4.png | Bin 0 -> 391 bytes .../main-char-up-walking5.png | Bin 0 -> 416 bytes .../main-char-up-walking6.png | Bin 0 -> 421 bytes .../main-char-up-walking7.png | Bin 0 -> 391 bytes .../main-char-up-walking8.png | Bin 0 -> 376 bytes 26 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/walkingAnimations/main-char-left-walking1.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-left-walking2.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-left-walking3.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-left-walking4.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-left-walking5.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-left-walking6.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-left-walking7.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-left-walking8.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-right-walking.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-right-walking1.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-right-walking2.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-right-walking3.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-right-walking4.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-right-walking5.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-right-walking6.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-right-walking7.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-right-walking8.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-up-walking1.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-up-walking2.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-up-walking3.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-up-walking4.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-up-walking5.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-up-walking6.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-up-walking7.png create mode 100644 src/main/resources/assets/walkingAnimations/main-char-up-walking8.png diff --git a/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerPlugin.java b/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerPlugin.java index e0be5400..73ed383d 100644 --- a/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerPlugin.java +++ b/src/main/java/dk/sdu/mmmi/modulemon/Player/PlayerPlugin.java @@ -46,15 +46,15 @@ private Entity createPlayer(GameData gameData) { player.add(positionPart); player.add(new MovingPart()); player.add(new InteractPart(positionPart, 1)); - List upSprite = Collections.singletonList(AssetLoader.getInstance().getTextureAsset("/assets/main-char-up5.png", Player.class)); - List downSprites = getAnimations("down", "walking", 8); - List leftSprite = Collections.singletonList(AssetLoader.getInstance().getTextureAsset("/assets/main-char-left5.png", Player.class)); - List rightSprite = Collections.singletonList(AssetLoader.getInstance().getTextureAsset("/assets/main-char-right5.png", Player.class)); - - List upIdleSprites = getAnimations("up", "idle", 3); - List downIdleSprites = getAnimations("down", "idle", 3); - List leftIdleSprites = getAnimations("left", "idle", 3); - List rightIdleSprites = getAnimations("right", "idle", 3); + List upSprite = getWalkingAnimation("up"); + List downSprites = getWalkingAnimation("down"); + List leftSprite = getWalkingAnimation("left"); + List rightSprite = getWalkingAnimation("right"); + + List upIdleSprites = getIdleAnimation("up", 3); + List downIdleSprites = getIdleAnimation("down", 3); + List leftIdleSprites = getIdleAnimation("left", 3); + List rightIdleSprites = getIdleAnimation("right", 3); player.add(new SpritePart(upSprite, downSprites, leftSprite, rightSprite, upIdleSprites, downIdleSprites, leftIdleSprites, rightIdleSprites)); Queue playerLines = new LinkedList<>(); playerLines.add("Alright, lets battle!"); @@ -64,8 +64,16 @@ private Entity createPlayer(GameData gameData) { return player; } + private static List getIdleAnimation(String direction, int frameCount){ + return getAnimation(direction, "idle", frameCount); + } + + private static List getWalkingAnimation(String direction){ + return getAnimation(direction, "walking", 8); + } + @NotNull - private static List getAnimations(String direction, String action, int frameCount) { + private static List getAnimation(String direction, String action, int frameCount) { List sprites = new ArrayList<>(); for (int i = 1; i <= frameCount; i++) { Texture sprite = AssetLoader.getInstance().getTextureAsset("/assets/" + action + "Animations/main-char-" + direction + "-" + action + "" + i +".png", Player.class); diff --git a/src/main/resources/assets/walkingAnimations/main-char-left-walking1.png b/src/main/resources/assets/walkingAnimations/main-char-left-walking1.png new file mode 100644 index 0000000000000000000000000000000000000000..ebe1b8ece2fe03bb102f4ff61ad228f4fb747bb7 GIT binary patch literal 531 zcmV+u0_^>XP)Px$%}GQ-R9J=WSfNtGKoH$@B2FMsNF>8d4T70|KxKcRD5%FFQ3xasUr^)+kbFRA zDlnZvqmYP-70eWoE^N~5-EK*^ihC;UT{bW8?d@I;ATl!TMCaVf5*QIxv3r)FT_6#t z_~i3>Ft{`Yp3UyXF`ggM6^Kqiw7@EP2;7on0Y}!Q>=L*g(G^Gp5`mt!Z+8WCC46~2 zZ459xpPL_=mLZ2|!Sd~)GI8(t0;Dklw_~xW&gu7m?@tzR76gMjIH69Z+ z@6AMth|r4=k=@M!SikwxQTb!?UcNzH=DNg$COi0iQsB?skUvNw<3o_Z!OeAfF}d4{ zjHHB`KpV)5;^%q^<;ro+tq?KmED7t`FOmxd8lK$(0DyCLe>I4{41EgJmuM%Y*_?#i zEHxiGJFM0K5i_#_zJ@bBEXSy7YG5J|Dk>6uM*u1UR{2Q@fKm-AI!$v;%P=pBN>ytE z!6cM6A_Tr6d7fTvjE~kmB-);kNJ%!fN?@eun02TvXah|)m0@?kEP)Px$;7LS5R9J=WSfOsiFc7^=1qK5}gN4(il7UJ6fWrPji?;Bw!GURDuxz{?YJXs` zA5f_vq|!7vGz|?D7);7Q>-6II;&YnDljcVn)z0Ply}Pp$fd7t&J5dOcx&)R|vSOdO z1U&`cmD~nwNw5GTI;QLtupQnN2m}HF?*!PL zaPe|w4A8$`IX^U%AqHu|=53mrczSUI)R+RcW4+GL>2~+`2MaJ-bq2$-f3EUJGHhWu z4`8sXz!g|>0QybIy8?j#`3CFyHf+P6&4I=gP|%g&d_+ihgaDv?lls1tWRP|uj0D)N zSW20Z008(I4tH0=e1ir>uAS_al~P6&fo#(3eEU0k=TdcpPQdE>e&t0dnK5)*kP;w- zNR0|CX7}0k*TYjOA^ZRn0rel1AM6~!{#PYaiNM+8PK|iX3P_=yh+GA2U|T`89!M~_ zYIyI2Mg{t#V&ZXfpbB&a*q?6e!qL7JbKyM)SPH1sQ_VzW`J}TQk3Wj}(&%|$(vcY% z8?1dmt=@D>F54FX0A43|001zE#~_4AO)4CuKx;l{w_GyDAvf!1|Ez5{ML@@(!hT_` o0$crKU(4oFRp3;HE`hoD1t@c;?m6xk$^ZZW07*qoM6N<$f<0&RX#fBK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-left-walking3.png b/src/main/resources/assets/walkingAnimations/main-char-left-walking3.png new file mode 100644 index 0000000000000000000000000000000000000000..ba34a3ce188bf07f66fafdd5f3a84abf85f0381d GIT binary patch literal 456 zcmV;(0XP1MP)Px$f=NU{R9J=WnXgU*K@i5jBNZzUJV7-{4T7W(faC@0pdQC_;OY-tU!al)Xi`zr zq`C@;K#U+Mf?PYhxw)I&+_HlCsU|l!H<@o{_D?G)an2pJwg5mxmB#KO#%T^L08ghb zou|{MD97vdLVU*Sqj(022OvrioAN%mBqjl;%9(ZvE=TbUSO6A4@c`75@cr$!)xq7v zCiAjoBuSt_k|UHtvlSqAJ{rpArTf7SfJsUR655L8@DiuIO ySLz$GNYK{z(k#f90qwtL>a_sSuLs(X1Hcd0CV&}yfukk>00006P)Px$l1W5CR9J=WSfNe>K@fdM5GxQUB$}iKLDCOE@&k2H&mW-p03050{RuvxNkvT) zGzy8RI6+dxb#rsa?d_Z1UIwwxU2bmo^}U(dofaVBoZGRn08o}?!NeVD799iT1R65+ z$vmCjs}^1^pM&qDJ?09S69`(Ml{^M%Nwz?u7*qBTq#fo8WCEFhIRUy8zQ0{{E^vLj zQg52eP$Fo-_T#k?cye)v&^r%l$7a)vnM~^Mvjq~zDHoHnf32EVGHGGH4@l5epoNqi z2oEae3SH**AIk%C3sefU52&Bn>`!c0^7W};u0XOI5nFai2{4<+k}&C=P_wbepfXHBz&r`n zhtbP<)qLikmH)CC`J7;XJ@5|{FeebLg0}QPxBR0K=>2%HXgqIGotDnI9h(O^B=az?kR2U;^z6idTefUgiqWIdHT09jF^kis9v;YdK4Rsf1sCNs(MxL>IpR O0000Px$yGcYrR9J=WSS?cnF%aD_6)O-`$ZBS45X={Ih2x&qM&I4ua3+y~W?WPu9NrtB`Lc0^Yo5l9506JYOztM^-Lfbqj7 z_)k+As&HCx*e|q!m)DQr>XT6I*zNQ&!{Kp$vOqHIdC=wBupi0eW3Wcq0%}1EqV!@#e(^OU_QvnB4Va4rn@;H z(S-DJ^%B#syq}0fbOoHpv0S-%Cj3q&&S18rt4yE{q(zd@)$>drFn#_1*6+Q(`Rh)4t_p}C_09CtM{`S23}(Qij%`#^t-CnSgnz@suZ z2eKj<8+4Z|V4i*^*b1yZX4ZDPe+eR1g#bJGddsEWP?T_?UIrFB8Y@FYJlQi2`-S&` zQ#lF8HKmu}?gKs>gdF24Jy%6=EfBWJM!WFTy>+pF=u(w_+dR%w00000NkvXXu0mjf D+1cJs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-left-walking6.png b/src/main/resources/assets/walkingAnimations/main-char-left-walking6.png new file mode 100644 index 0000000000000000000000000000000000000000..38dfc306cf5ff98cf6b72cc6047db9638b4f9017 GIT binary patch literal 533 zcmV+w0_y#VP)Px$&q+ihAVC_bPLUvT_DB_Gh4 z3QT8^OcWA||+tIrMi9jOIJAvSp@cHqA zOmKO%Q5Q{Ph{0O$`TF1m4o7p~?m1vPwp%}DJl=gjS%5L)ra3M2yT308X=mcaGE!3c0f4o;v-B;-eg@|O@B@NsU*>&GuY-&vmS?&pQ^ z2n08wwR91#xCEy#_bw<=Ae*FZag3@3HQy-$O@*E87}x>_X9cOi*V|M5+HA%am5>*P zBmvOzLPR~igwFN@Qt`Ynuv*^yeO>{;G+%T>02inFqlsKA0$jp2Q$Z3KoYfmH);LxP zWI&8!jKa8J5MsR>f(XQXF{zrcx|q1t3_$MwD0@O~b<;qlz{%Zh{bIgg0r4{GFl~7HQ0%RMla-p3>fwZfIEK;)VqZ0}!33nlR8kx-{dx5b XbPx$e@R3^R9J=Wn6YlcKn#W*#NeR=kAcL}p%M?!u`j?@*x7iFZrw>YUVxDYKw{{E zlt<{ukl_X-I)(buIA@=7Itlrk5V>=l|F>SjN>!mZm>-$N4 zQ)@#CYe8L=-oU5n61Zy()Q$4oC^<% zAZkCry{N8>g*sODB21n@y8xpTK#~0Qx^%M{mpNN(T@wHjeBT z40bSS6dCV!_y5{E<1REyvAAOz>Z*jgDghC1To+}xK=oA8wSYU?cc~bqz<#@d{dN;G v^&e3Ra5sNjee}*BOo0%Zf=yBbngo6U8^DVA#-5~i00000NkvXXu0mjfxx~g$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-left-walking8.png b/src/main/resources/assets/walkingAnimations/main-char-left-walking8.png new file mode 100644 index 0000000000000000000000000000000000000000..9e526d271a7bc9cefbb683570966e47e89799ebd GIT binary patch literal 459 zcmV;+0W|)JP)Px$g-Jv~R9J=WSTSw_F%X=KQe2TDFQAS@lOhripv)rzeY(6OU3%aVlz9LWMH-~k zsZvruVrH+qQdYEC3i|8cE!hX3-odPQZ~VB=czW ztXg=rdSjnadx|SioB(TqR`M9ACDj6oCa3His2#->s01p3;snH<@O|;%U10pQR&QF% zkb<>f_c?b0Z|)}Go>@>kHXAo)IQ)ITT0n8#=VDa$@3lLUQ48xlKq0OIEvV!Ge^Du} zKqbIlAhnm#7-|l15Z&Q{(=3sEBTy5t{ejl`_TK!7zx`-MB#K+0K8(5@E)^mLV*XpX zvk^!^jJ(Q%(3o~AvMJ!J3?GsvBIza}TwWPUps5N`CrmjRW1TRI0+Nj_)MvqLa7?`E z*HLDgh|>O_M8LOUmz0LU`B#DOpZ_ZX4p#oKEIqX1{;6gkKl(1M*9 zFd7BK0z>pg4foluJ!Ov&v}bXG3~L2U(-#=%pkKAeWY-B_XkZ ttnmR{B_YFTNk|45oiiHY4q#wl006d4Wn7-O)qDT|002ovPDHLkV1j@yh}-}G literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-right-walking1.png b/src/main/resources/assets/walkingAnimations/main-char-right-walking1.png new file mode 100644 index 0000000000000000000000000000000000000000..77f050ff123dca5b04b303418b6f57c445836ab0 GIT binary patch literal 534 zcmV+x0_pvUP)Px$&`Cr=R9J=WSglS2K@i>}CsrU(1cfH4sc6y%sN@A&MeA`$6atB>Z|nL3NFLx4 z1f~f=@&px#6(mJmW;@;6xt+P6EMh;kx4W77=9}5SQz|kt?nJHiL1Ne#!?JxQG1>B9`A$0_1u_M@-TLHvFqqpmCHwi!an8@@+8OiviLO9&0y(b8qFCC4$(8VG zgbylz3Ys9g0?`SOuNU`*?50Etyh74O^sfl8YoINt*K%|PDrZ60k&6kq*bhym@8Uz- zcJjix$nRD(6j-0AEyAYJOVIjVKw%P)9uR#Q_NIVh{sv|d zp!R?+kSW#A0VF;PIDp-4@lCG|sam;GG}|W1?1x4~f>Z#UL)21etq+_ubh--ck&Le3 zAq4M)ud9d3*zMxQwyF05_hRDRi0Yho4e?HhqwfNpRX>GL3L3o&z$nZy=D1R{)-1<> YKgr>s?%kJ>ZU6uP07*qoM6N<$f<&h9U;qFB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-right-walking2.png b/src/main/resources/assets/walkingAnimations/main-char-right-walking2.png new file mode 100644 index 0000000000000000000000000000000000000000..538f0a074a31d02f6fd78f933586f48d8f624f96 GIT binary patch literal 546 zcmV+-0^R+IP)Px$+(|@1R9J=WSuJk@K@fd3CsrU(O;u$>f~g?k2O#?gKoxvlC8DXQtiuBe{y-%^ z;F1aqNmE%_Re?Csgo?{;=k9j)gXOX`y=U0F-J5y)W_EV(0RB4~wgZI_dl$n=l33Y3 zb1_;4Y67`9>Ehh$-8mVK<0;!m^CP$d!3nS-aFyHy8j?B$6pbon=Rm^|T!ETEO&~ad z$k)Jn(N*5>-@fLq>q^Lh4Z(Ih&s}#qBiZI;Z?=EO?B3>uKDD3V3Irz*(Tt4asoa=~ z5?*xaMx_qHAqcKOa02YxOYwwU42dh~3aJaxNfEHl0bg)$%fS^W?FGl4xif(bU)Kry zP-`P(yS(X)002oMpVxkXl&}TH=2?1b-w3rDY_9hj)mSJlnypQWv1WILf{4ATz_Q;EbmcR{hR22?771Owy k>WC=^tpBv)U`v$44c)Y1^@s6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-right-walking3.png b/src/main/resources/assets/walkingAnimations/main-char-right-walking3.png new file mode 100644 index 0000000000000000000000000000000000000000..c89f0219cc49a0fdf45bf5d81ddc58bd48421780 GIT binary patch literal 466 zcmV;@0WJQCP)Px$j7da6R9J=WSD|hKK@gp5POPY?tU{AuDoFT%N-d1G$~yc}#}8EY11>>e zNYF@BMa4R5uGhKi&N8#dGAH&WBzxSj`*?3=b~ghij4>x}EC7JDHsi$ING6SeM4;i5 z&*#bHSu}B3F3EQ|KhzaaCqP;tmHZsACCLJeET-%fupR0OBm#+mI)S|F1fTC?=l73K zo5pkMgcL{%cDq&Mc{G~UV@meh;a|-6e${&CUPoO4bpkog$g*748&g}t`!U|A+!lmD zT>*6hLT+0k1+I|Ph`0G@_=!Y7S42><{907*qo IM6N<$f+1PUHvj+t literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-right-walking4.png b/src/main/resources/assets/walkingAnimations/main-char-right-walking4.png new file mode 100644 index 0000000000000000000000000000000000000000..cef910fd9ef6f49e08110201cebeb80c967ffbde GIT binary patch literal 487 zcmVPx$p-DtRR9J=WSUXMwF%TW2EnHBfim0fO(ojUo0Vp{HY|jm-I6%7egf5rh04q_X ziA0?fP^54NMda+P@$AmnSq(^jRs4zf?R(?#cnvUNt^MZC1psi)8P2>5$)aOGoj^yX zKA9JbC(*)9vm(c^J?aXm6Cf>+NY=^o6g+L*oPN2$N;QehL?Z12Y z=(I~Fq(EA*+pRn8+3fN3o09$Vrk!*6TnA(E=cp^7PN2dO*)*%u!4yh(HOB{4+=3LS zE1*t*ygY;za%hPZc!!ik^rr~0V;~pQWmR1PbpotAe2N|1?*r_D#iX%t!ity%eYGvy|nY d0G`LqggPx$*-1n}R9J=Wn4xaNFc60SOaTT3L(|YSSgE9-QpfWWD_YC<215gdW94gEU!o5X zX<($%@SdPxz$^o8(zD}B>?YX_(Y*N2VIK_7_xyaVtv>fS;snGE#B@cb>8jY6Y=pNHx>31P zaEZhTh#O!}FZLU(8fYr+v@A}bv=_8J^I!um9mcw{|N2vv+I&Ay z6b9(b-|vnCF22iw+m`qmh=B9#^O@(e33QPPaRNavrTGjw5{I!yyxkgYgW)^_coK$z zo7We!ckyNn=tA67;wcC+KuP4kKQ+*WycS{AOiO*_#luJ91dKw|rh@l^nqbfmW?PQl zuAV^H9ul7hsB&AP(`G$j3DC6E?E$v5*1*wtZ5l56K5!ZUfTMZ>*a1jpORrd*flO-+ zrH-iW`i}cYui)^YP)Wdb7#R%bP)ZpTny7IdNM=iK+%9o=vK+rHGV=(IC&V*;A&x-R hd4cvv%)MNDNx$yAnCG6TB(?wm002ovPDHLkV1nPP_RjzS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-right-walking6.png b/src/main/resources/assets/walkingAnimations/main-char-right-walking6.png new file mode 100644 index 0000000000000000000000000000000000000000..331f78856723f02b93562ea7c7a988a4ca0d39c3 GIT binary patch literal 563 zcmV-30?hr1P)Px$?MXyIR9J=WSiMfeFc7{}89a1gLQIIUQkM*s`T&f)KsVZ*jgg55VC&wp^#vGt zfJh81m6&;g3=B6Qm8CWp+vlJB)JWu$A~m*q_uY5rixYtVjx2Pc5aJMH7!iYPk7A7W zfq_6RPp&-A=XX(t%W}=m(fUZPKym_X3SuSqfu>|g0Y%oQ>>Ox1k}EI}7ziXMkheAP z`aH9aU*Epf?uSmufla}FzpdR*r%UyllYKn-UGw#^)#mJek}Hs$Ku#;NEZ6G6q)T`) zqYo;33Ys9f0?7%mZ!h`@Sx-qU=nfeg(Vrp^Tmx;vy)7H9xNFBgC<3Q;Y!HyxT%!8D z`V;^FP!*^z0|0=tcflG)RR3{)s2Bk>kDen&oO{uF7uZM$A=Cu`2XYz6W%N{f9aL(Y zLpkP3$q|x-N(*}+k@=4SC717Z#(aLYFvg-&5D;Y)asYsr&3$d~X7%JH!4+U50vv2k zqyk-$h<-1q3apXP=XxhV9q9zz{i|Aj#(Q_fFolw<{}WH&<_`)vA|~BagP81002ovPDHLkV1k6= B^UDAL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-right-walking7.png b/src/main/resources/assets/walkingAnimations/main-char-right-walking7.png new file mode 100644 index 0000000000000000000000000000000000000000..6997368cf4c9d963aa3634112088b5f8d00df469 GIT binary patch literal 445 zcmV;u0Yd(XP)Px$cS%G+R9J=WSg{SlFc5T53KtZVjDSQ#fy4kTK?eiSu}XTNV*yGAh(tky#26G5 zE|5Y237^RCyq%a2l23}{B#(2t`}f;Kf(R*PMvWCh2&Gg+iR;-+>H~p5$tRP~v)S5e z;xtXrcQ8NL6<{ZTT3{=A9iSz_0*J_`>=>XO>B%!r>G)D!m0RU{`>h0D5|< z?vSgN*aB8aScp1BfSdzOft{Aw6<{Yo-VfX-su&M0vKYhi#7fNsb_Li882=x@WT&7D z7G$66_XLzu^+6vvRY80>Xk%a%P{E#rMgq2p*O&k`bL$`_ow&DV)P*u60VU9u9d&R% zoWimc!aZTxEg&fXTkdnQ@J}GG0N1U!P5%6c1v%bpeY>k;D+(O98*$ujoPKLm0PAk9 nAJc)XfUkwgYEo){up#>b8fPx$wMj%lR9J=WSgmfuFc5a80E2?Sq2Wp;1C{y!gL{Z2d~DA#R^E=44Gr!AA{B&G z8twy30|j9nh%P(3c6|P+ZonT(9LN6heRpR&g&;yod8YOiLWsWa3rfEmpFytyb^?k_ zQ!=ks&t3z!?b`Yb+rzE^I{~W&zLL9uEy)&O6xWp925bkr0+~Q2z)qly9pLkAX>5OZ z+AH_D653$3;BeR~_lre6UfX1!&HwtGzP8#k^E~VduoEb8M7HgET$pqTZ{*a( zF#>=ZRX5n>vcfwCJ~l5(+hg;pObme7a1kIWK*@k|w^Qywz9Rt*=W_r){?k~WXmsB%#)#?BM002ovPDHLkV1gFs)WZM( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-up-walking1.png b/src/main/resources/assets/walkingAnimations/main-char-up-walking1.png new file mode 100644 index 0000000000000000000000000000000000000000..0994d7f15cf74e37dc9b815bd966fffa8f94650a GIT binary patch literal 429 zcmV;e0aE^nP)Px$XGugsRA_+a0VuNycNCP2K|!GoDuQsZ zkWDO~?)1tymjB5=vI22VA=>^>;~d`-HF;SD02-B06;&vM9IU#zO3DMd9O_O7x1q-AyiOFir6FUwYj^({X>5s znwrS{5T!KLs|WXa!iZFlw(H`9M8$~4D$z XA47O5@&miF00000NkvXXu0mjf7Y)57 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-up-walking2.png b/src/main/resources/assets/walkingAnimations/main-char-up-walking2.png new file mode 100644 index 0000000000000000000000000000000000000000..26b2d8722a21ad3465bbae2917cb127e13b04bfd GIT binary patch literal 441 zcmV;q0Y?6bP)Px$b4f%&RA_twqs8sfVS$ttIt)&f_LC?V`1C(OS4@EnKt~E?Ns0twl&5@X7A`^X=yB z>G^$CG3ocV`_okmpZH8>+N5Y-0<>_^TFmk^CoNC4Z1<<^nR~i7CPhy?!+reqi0ls^ zK4KFA(r=ig>m)T$%a5QvCk>?eQ|cE{`)*J#QfsWilsqY`WI7en zdY+kxF70gh!YKOcB>>rFwzkTY$|!cn*>V4}M`=SB{d;C@sy!`jLjO^7dsU(V6dS=3 jK@w&)7XZy?@0xhO|JrZeqJ8im00000NkvXXu0mjfRsqU_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-up-walking3.png b/src/main/resources/assets/walkingAnimations/main-char-up-walking3.png new file mode 100644 index 0000000000000000000000000000000000000000..7d528c494d0e247ad71adc963718a3bd14accb66 GIT binary patch literal 366 zcmV-!0g?WRP)Px$C`m*?RA_1!uZ)xU>HKA1q%@mCIOpDy`@Hwf(z&)vUr+;+(pgKzMWFA`qIXQwB{?RIj>$?x zS_?KqG{e%|&V}YZm2s1mhO`!t)&kO6Kw1k(YXNC3cJxBn*}WdupRwcVwyF%BukD7f zOW5(5th7mKd<19#X)Urc9YVLKxwPGo97CpSV^TWGOqk>6!6zTw-(3*_=^Qx5YtYbb zja#mogi$eBX-I1keYtRixhj?YIqx)CX_L~?mdAB(Tt`*{>D(qO4QVadE{|i4Esq0T zUJarXk^2)s8Xdai(kS6Cgnz@NbXJ%5^WZq92gz}tbFT!Gl{P8;0sppK7+N7QApigX M07*qoM6N<$f*ZJ<5dZ)H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-up-walking4.png b/src/main/resources/assets/walkingAnimations/main-char-up-walking4.png new file mode 100644 index 0000000000000000000000000000000000000000..3e9e3e153e2aaa97cda6b68cb5faa6c4163634a7 GIT binary patch literal 391 zcmV;20eJq2P)Px$K}keGRA_X4xW$LPpbb`C-hz;QSLV~;{521bs-z>p0#Fpgrm zY2wPrZ)}?6$N6%cs?{nJ&bb%oJ@0)rcdqr^0hVCWs;Ovp-H|oMIG&OEJmQ5S*S;Y1%&8W}aRem7)XBKp#K0KH70}b6Es%=dfdZ2`Ze{ zsO?%3Xcd)_HqlZ9Hx~-%t6bhs8T0=mU7C6r;*FrN3Pf`|<~k8mP-zbnEk%uQ2k-+4 z#`|wd^1D0&+=cfZoSQ67DN5vN3iYLFkn*TM0l2%63imIBB8Lm!^4#UFN_(gjooo;8 labE(Ff+_a`RoX+P=r;qBW%&GsUXTC)002ovPDHLkV1niar&Is{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-up-walking5.png b/src/main/resources/assets/walkingAnimations/main-char-up-walking5.png new file mode 100644 index 0000000000000000000000000000000000000000..680146d13b10359f81d0dff7e5f89e48842eeafc GIT binary patch literal 416 zcmV;R0bl-!P)Px$T1iAfRA_=4%XeqKjNVZ7r$aOCDF5X%j7liI&1dOJSm=Fws(&XenHH5q5U3$0eG$JKUNI zN#iZn$Dfw8<5QVwm7?tut<;fmK#grBPm-v5 zxYa&8(R-dIi311l@1m%G6SOFKB@p9yPx$Ur9tkRA_Vj?j^@8wcPLY;b@crw3ruqCjbMT7D;$ z!Kq`!HvTMT0QXq*rt6v1QE^%6khY?@xlG4nvthpFYGpsqDyL7Em3ApTJ#O+JtsOC^ z7fq;6gJq`Qw$1la(ifF72hjUwZN;t91aZ^wPkATTMX91 P00000NkvXXu0mjfYv#Bk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-up-walking7.png b/src/main/resources/assets/walkingAnimations/main-char-up-walking7.png new file mode 100644 index 0000000000000000000000000000000000000000..1e5f01395013da22d50a92fb0a6a5b78f75343c6 GIT binary patch literal 391 zcmV;20eJq2P)Px$K}keGRA_X4xW$LPpbb`Amu;5ZzBu}7g210%;^V8{j=q>gMk zX>er8Z*0=|*ZFcCDb1=7&bc>dp7*|48f(3Dff^)zHI>a_II-54rZYOm-367IHqla$ z9)cd``ZgEncg*7|Gi{=!Fws(&Xemsz6ed~<6D>sxAB3IV>v5Tl?GLxVih=RE{`l1r zc6=%`tx~id0;Dj}QY3jg1eT{N5km7=4PM|E#hM^*xEY?YZd(Nd6I9>n`!N%Ffg z0^D^L8=V(+c}aD8zG#^`O$o(NX^$w=)J*{HosL|%w-A!-!3CabO1HZz?O~#&$o6zQ lj`$$xQBvk|P?>3!qCa%4Uqk`>f7Ac~002ovPDHLkV1nNHsXG7w literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/walkingAnimations/main-char-up-walking8.png b/src/main/resources/assets/walkingAnimations/main-char-up-walking8.png new file mode 100644 index 0000000000000000000000000000000000000000..2ef57259adab399dbe7f2a100ec9ca87ed5f3893 GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^xMC(EP?vH>*VVr|MdB% zE)8uv=G*{Md^@vizwOgYUz0z`&AG><<*dJFp`1Ox-jBt9?}|mv+0EAXacjm-uQi?P z7lVy|_J4x@mDNG-o}XK}|5DnlL(0l$drfj|HJ19hczGQRc?Gmt;`ycR>!qUOP6hX5 zdQ^Mef0ZLSx9URojl(M6oki-cpR8(GFR;zyTIY-{4z1S|w7=Z4?eek>Y5T_@aVd7$ Ubsu&!U{Er6y85}Sb4q9e0OH1?aR2}S literal 0 HcmV?d00001 From 724fbbc933a3a6167f52e0cc8dc991a48b8942e1 Mon Sep 17 00:00:00 2001 From: VictorABoye Date: Thu, 26 Oct 2023 13:16:09 +0200 Subject: [PATCH 3/3] Clean up in SpritePart --- .../Data/EntityParts/SpritePart.java | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/SpritePart.java b/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/SpritePart.java index d77210c2..7b3585c3 100644 --- a/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/SpritePart.java +++ b/src/main/java/dk/sdu/mmmi/modulemon/CommonMap/Data/EntityParts/SpritePart.java @@ -36,13 +36,6 @@ public SpritePart(Texture upSprite, Texture downSprite, Texture leftSprite, Text this.rightSprite = Collections.singletonList(rightSprite); } - public SpritePart(List upSprite, List downSprite, List leftSprite, List rightSprite) { - this.upSprite = upSprite; - this.downSprite = downSprite; - this.leftSprite = leftSprite; - this.rightSprite = rightSprite; - } - public SpritePart( List upSprite, List downSprite, @@ -63,27 +56,6 @@ public SpritePart( this.currentSpritePool = downIdleSprite; } - public SpritePart( - Texture upSprite, - Texture downSprite, - Texture leftSprite, - Texture rightSprite, - List upIdleSprite, - List downIdleSprite, - List leftIdleSprite, - List rightIdleSprite) { - this.upSprite = Collections.singletonList(upSprite); - this.downSprite = Collections.singletonList(downSprite); - this.leftSprite = Collections.singletonList(leftSprite); - this.rightSprite = Collections.singletonList(rightSprite); - this.upIdleSprite = upIdleSprite; - this.downIdleSprite = downIdleSprite; - this.leftIdleSprite = leftIdleSprite; - this.rightIdleSprite = rightIdleSprite; - this.currentSpritePool = downIdleSprite; - } - - public Texture getUpSprite(boolean isMoving) { if(!isMoving && upIdleSprite != null){ updateAnimation(upIdleSprite, isMoving);