From 1ea296e710b7a88bd7dc0ecff8ac965583e26234 Mon Sep 17 00:00:00 2001 From: garrettmills Date: Wed, 9 Sep 2020 11:50:57 -0500 Subject: [PATCH] Fix bug with game state service get_winner (#3) Needed to properly fetch the cell state, not just coordinates --- src/services/GameState.service.js | 10 ++++++++-- src/style/components.css | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/services/GameState.service.js b/src/services/GameState.service.js index d0126cc..45cafa6 100644 --- a/src/services/GameState.service.js +++ b/src/services/GameState.service.js @@ -553,13 +553,19 @@ export class GameStateService { // Make sure to sink any fully-damaged ships this._sink_damaged_ships(player_1) const player_1_ship_cells = this.get_ship_cells(player_1) - const player_1_loses = (player_1_ship_cells.length > 0) && player_1_ship_cells.every(cell => cell.render === GridCellState.Sunk) + const player_1_loses = ( + (player_1_ship_cells.length > 0) + && player_1_ship_cells.every(cell => this._get_cell_state(player_1, cell[0], cell[1]).render === GridCellState.Sunk) + ) if ( player_1_loses ) return player_2 // Make sure to sink any fully-damaged ships this._sink_damaged_ships(player_2) const player_2_ship_cells = this.get_ship_cells(player_2) - const player_2_loses = (player_2_ship_cells.length > 0) && player_2_ship_cells.every(cell => cell.render === GridCellState.Sunk) + const player_2_loses = ( + (player_2_ship_cells.length > 0) + && player_2_ship_cells.every(cell => this._get_cell_state(player_2, cell[0], cell[1]).render === GridCellState.Sunk) + ) if ( player_2_loses ) return player_2 } diff --git a/src/style/components.css b/src/style/components.css index 83bce52..9afd3f5 100644 --- a/src/style/components.css +++ b/src/style/components.css @@ -53,7 +53,7 @@ } .game-board-cell-component.missed { - background: #eeeeee; + background: #ffbbbb; } .column_labels {