1 files changed, 34 insertions, 8 deletions

diff --git a/src/ch/epfl/xblast/server/painter/PlayerPainter.java b/src/ch/epfl/xblast/server/painter/PlayerPainter.java
index 043cb50..9fb0647 100644
--- a/src/ch/epfl/xblast/server/painter/PlayerPainter.java
+++ b/src/ch/epfl/xblast/server/painter/PlayerPainter.java
@@ -2,6 +2,7 @@ package ch.epfl.xblast.server.painter;
 
 import ch.epfl.xblast.Direction;
 import ch.epfl.xblast.PlayerID;
+import ch.epfl.xblast.SubCell;
 import ch.epfl.xblast.server.Player;
 
 /**
@@ -16,19 +17,29 @@ public final class PlayerPainter {
     private static final byte DYING_IMAGE_ID = 12;
     private static final byte LAST_DYING_IMAGE_ID = 13;
 
+    private static final int BLANK_PLAYER_GROUP = 4;
+
     private static final int PLAYER_MULTIPLIER = 20;
     private static final int DIRECTION_MULTIPLIER = 3;
 
-    private static final int ANIMATION_TICK_LOOP = 4;
+    private static final int ANIMATION_POSITION_LOOP = 4;
 
     /**
-     * Computes and returns the animation frame byte for the given tick.
+     * Computes and returns the animation frame byte for the given tick if the player is moving.
      *
-     * @param tick the tick
-     * @return the frame byte
+     * @param dir the direction
+     * @param pos the position
+     * @return the position byte
      */
-    private static byte byteForFrame(int tick) {
-        int cycleTick = tick % ANIMATION_TICK_LOOP;
+    private static byte byteForPosition(Direction dir, SubCell pos) {
+        int axialPosition;
+
+        if (dir == Direction.E || dir == Direction.W)
+            axialPosition = pos.x();
+        else
+            axialPosition = pos.y();
+
+        int cycleTick = axialPosition % ANIMATION_POSITION_LOOP;
         return (byte) (cycleTick % 2 == 0 ? 0 : cycleTick / 2 + 1);
     }
 
@@ -53,13 +64,22 @@ public final class PlayerPainter {
     }
 
     /**
+     * Returns the player image byte for the blank player.
+     *
+     * @return the image byte for the player
+     */
+    private static byte byteForPlayerID() {
+        return (byte) (BLANK_PLAYER_GROUP * PLAYER_MULTIPLIER);
+    }
+
+    /**
      * Returns the image ID for the dying state according to the number of remaining lives.
      *
      * @param lives the number of remaining lives
      * @return the dying image ID
      */
     private static byte byteForDyingState(int lives) {
-        return lives == 0 ? LAST_DYING_IMAGE_ID : DYING_IMAGE_ID;
+        return lives == 1 ? LAST_DYING_IMAGE_ID : DYING_IMAGE_ID;
     }
 
     /**
@@ -78,10 +98,16 @@ public final class PlayerPainter {
                 return (byte) (byteForPlayerID(player.id())
                         + byteForDyingState(player.lives()));
 
+            case INVULNERABLE:
+                if (tick % 2 == 0)
+                    return (byte) (byteForPlayerID()
+                            + byteForDirection(player.direction())
+                            + byteForPosition(player.direction(), player.position()));
+
             default:
                 return (byte) (byteForPlayerID(player.id())
                         + byteForDirection(player.direction())
-                        + byteForFrame(tick));
+                        + byteForPosition(player.direction(), player.position()));
         }
     }