Adjust Creature sprite naming conventions

gurkenlabs · Sep 12, 2024 · 44f934b · 44f934b
1 parent b79b1d3
commit 44f934b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/litiengine/src/main/java/de/gurkenlabs/litiengine/graphics/CreatureAnimationState.java b/litiengine/src/main/java/de/gurkenlabs/litiengine/graphics/CreatureAnimationState.java
@@ -2,7 +2,7 @@
 
 public enum CreatureAnimationState {
  IDLE,
- WALK,
+ MOVE,
  DEAD;
 
  private final String spriteString;
@@ -16,6 +16,6 @@ public String spriteString() {
  }
 
  public CreatureAnimationState getOpposite() {
- return this == CreatureAnimationState.IDLE ? WALK : IDLE;
+ return this == CreatureAnimationState.IDLE ? MOVE : IDLE;
  }
 }
diff --git a/...rc/main/java/de/gurkenlabs/litiengine/graphics/animation/CreatureAnimationController.java b/...rc/main/java/de/gurkenlabs/litiengine/graphics/animation/CreatureAnimationController.java
@@ -20,7 +20,7 @@
  *
  * <ul>
  * <li>{@link #getSpritePrefix()}-idle-{DIRECTION}.{EXTENSION}
- * <li>{@link #getSpritePrefix()}-walk-{DIRECTION}.{EXTENSION}
+ * <li>{@link #getSpritePrefix()}-move-{DIRECTION}.{EXTENSION}
  * </ul>
  * <p>
  * Where {DIRECTION} refers to a value of the {@link Direction} enum and {@link #getSpritePrefix()} refers to the
@@ -126,10 +126,10 @@ protected String getCurrentAnimationName() {
  return hasAnimation(deadName) ? deadName : chooseRandomDeathAnimation();
  } else if (entity.isIdle()) {
  String idleName = getIdleSpriteName(direction);
- return hasAnimation(idleName) ? idleName : getWalkSpriteName(direction);
+ return hasAnimation(idleName) ? idleName : getMoveSpriteName(direction);
  } else {
- String walkName = getWalkSpriteName(direction);
- return hasAnimation(walkName) ? walkName : getIdleSpriteName(direction);
+ String moveName = getMoveSpriteName(direction);
+ return hasAnimation(moveName) ? moveName : getIdleSpriteName(direction);
  }
  }
 
@@ -152,7 +152,7 @@ private String chooseRandomDeathAnimation() {
  }
 
  /**
- * Initializes the available animations for the creature. This method sets up walking, idle, and dead animations for all directions.
+ * Initializes the available animations for the creature. This method sets up moving, idle, and dead animations for all directions.
  */
 
  private void initializeAvailableAnimations() {
@@ -203,8 +203,8 @@ private String getIdleSpriteName(Direction dir) {
  return getSpriteNameWithDirection(CreatureAnimationState.IDLE, dir);
  }
 
- private String getWalkSpriteName(Direction dir) {
- return getSpriteNameWithDirection(CreatureAnimationState.WALK, dir);
+ private String getMoveSpriteName(Direction dir) {
+ return getSpriteNameWithDirection(CreatureAnimationState.MOVE, dir);
  }
 
  private String getSpriteNameWithDirection(CreatureAnimationState state, Direction dir) {

diff --git a/utiliti/src/main/java/de/gurkenlabs/utiliti/swing/IconTreeListRenderer.java b/utiliti/src/main/java/de/gurkenlabs/utiliti/swing/IconTreeListRenderer.java
@@ -121,7 +121,7 @@ private static Icon getIcon(Creature creature) {
  || s.getName()
  .equals(
  CreatureAnimationController.getSpriteName(
- creature, CreatureAnimationState.WALK))
+ creature, CreatureAnimationState.MOVE))
  || s.getName()
  .equals(
  CreatureAnimationController.getSpriteName(