fix(ghost): ghost block overloads current block

Pablito2020 · Apr 23, 2022 · aca156e · aca156e
1 parent b4a1840
commit aca156e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/main/kotlin/game/ghost/GhostGame.kt b/src/main/kotlin/game/ghost/GhostGame.kt
@@ -1,6 +1,7 @@
 package game.ghost
 
 import block_factory.BlockCreator
+import board.Cell
 import game.Game
 import game.GameCell
 import game.normal.NormalGame
@@ -49,7 +50,8 @@ class GhostGame(creator: BlockCreator, scoreCalculator: ScoreCalculator) : Game
         // Write Result
         for (position in result) {
             val currentGhostBlock = GameCell(grid[position.row][position.column].cell, false, true)
-            grid[position.row + distance][position.column] = currentGhostBlock
+            if (grid[position.row + distance][position.column].cell == Cell.EMPTY)
+                grid[position.row + distance][position.column] = currentGhostBlock
         }
         return grid
     }

diff --git a/src/test/kotlin/game/ghost/GameGhostTest.kt b/src/test/kotlin/game/ghost/GameGhostTest.kt
@@ -6,6 +6,7 @@ import board.Cell
 import game.normal.GAME_COLUMNS
 import game.normal.GAME_ROWS
 import game.GameCell
+import movements.Direction
 import movements.Position
 import movements.Rotation
 import org.junit.jupiter.api.Assertions
@@ -33,7 +34,7 @@ class GameGhostTest {
     }
 
     @Test
-    fun `get grid after first get block, all in same row`() {
+    fun `get grid after first I block returns top block and down ghost`() {
         game.generateNextBlock()
         val expectedGrid = MutableList(GAME_ROWS) { MutableList(GAME_COLUMNS) { GameCell(Cell.EMPTY, false) } }
         // Actual Grid
@@ -50,7 +51,7 @@ class GameGhostTest {
     }
 
     @Test
-    fun `get grid after first get block, all in same column`() {
+    fun `get grid after rotated I block returns rotated I ghost`() {
         game.generateNextBlock()
         game.rotateBlock(Rotation.LEFT_90_DEGREE)
         val expectedGrid = MutableList(GAME_ROWS) { MutableList(GAME_COLUMNS) { GameCell(Cell.EMPTY, false) } }
@@ -67,4 +68,22 @@ class GameGhostTest {
         Assertions.assertEquals(expectedGrid, game.getGrid())
     }
 
+    @Test
+    fun `Current block has more priority than ghost block`() {
+        game.generateNextBlock()
+        game.rotateBlock(Rotation.LEFT_90_DEGREE)
+        for (i in 0 until 14)
+            game.moveBlock(Direction.DOWN)
+        val expectedGrid = MutableList(GAME_ROWS) { MutableList(GAME_COLUMNS) { GameCell(Cell.EMPTY, false) } }
+        // Actual Grid
+        expectedGrid[14][4] = GameCell(Cell.I_BLOCK, true)
+        expectedGrid[15][4] = GameCell(Cell.I_BLOCK, true)
+        expectedGrid[16][4] = GameCell(Cell.I_BLOCK, true)
+        expectedGrid[17][4] = GameCell(Cell.I_BLOCK, true)
+        // Ghost
+        expectedGrid[18][4] = GameCell(Cell.I_BLOCK, false, true)
+        expectedGrid[19][4] = GameCell(Cell.I_BLOCK, false, true)
+        Assertions.assertEquals(expectedGrid, game.getGrid())
+    }
+
 }