Modify helper methods for scoreboard on game state service (#4)

master
Garrett Mills 4 years ago
parent 23b972b366
commit 8ee2a8252b
Signed by: garrettmills
GPG Key ID: D2BF5FBA8298F246

@ -1,4 +1,5 @@
import {Component} from '../../lib/vues6.js' import {Component} from '../../lib/vues6.js'
import {Player} from '../module/util.js'
/* /*
* This is the HTML/JavaScript for the game board component. * This is the HTML/JavaScript for the game board component.

@ -1,5 +1,6 @@
import {Component} from '../../lib/vues6.js' import {Component} from '../../lib/vues6.js'
import game_service from '../services/GameState.service.js' import game_service from '../services/GameState.service.js'
import {Player} from '../module/util.js'
const template = ` const template = `
<div class="app-scoreboard-component"> <div class="app-scoreboard-component">
@ -21,5 +22,6 @@ export default class ScoreBoardComponent extends Component {
update() { update() {
// here is where you should fetch the data from the game service and update variables on the class // here is where you should fetch the data from the game service and update variables on the class
this.player_one_score = game_service.get_player_score(Player.One)
} }
} }

@ -179,15 +179,15 @@ export class GameStateService {
* @return {number} * @return {number}
* @private * @private
*/ */
get_player_score () { get_player_score(player) {
let i = 1; let i = 1;
let j = 1; let j = 1;
let score = 0; let score = 0;
for(i; i<=9; i++) for(i; i<=8; i++)
{ {
for(j; j<=9; j++) for(j; j<=8; j++)
{ {
let cell = this.player_x_game_board[this.current_opponent][i][j]; let cell = this.player_x_game_board[this.get_other_player(player)][i][j];
if(cell.render === GridCellState.Damaged || cell.render === GridCellState.Sunk ) if(cell.render === GridCellState.Damaged || cell.render === GridCellState.Sunk )
{ {
score++; score++;
@ -203,15 +203,15 @@ export class GameStateService {
* @return {number} * @return {number}
* @private * @private
*/ */
get_boat_count(){ get_boat_count(player){
let i = 1; let i = 1;
let j = 1; let j = 1;
let boat_count = 0; let boat_count = 0;
for(i; i<=9; i++) for(i; i<=8; i++)
{ {
for(j; j<=9; j++) for(j; j<=8; j++)
{ {
let cell = this.player_x_game_board[this.current_opponent][i][j]; let cell = this.player_x_game_board[this.get_other_player(player)][i][j];
if(cell.render === GridCellState.Damaged || cell.render === GridCellState.Sunk || cell.render === GridCellState.Ship ) if(cell.render === GridCellState.Damaged || cell.render === GridCellState.Sunk || cell.render === GridCellState.Ship )
{ {
boat_count++; boat_count++;
@ -226,8 +226,8 @@ export class GameStateService {
* @return {number} * @return {number}
* @private * @private
*/ */
get_progress(){ get_progress(player){
return(this.get_player_score() / this.get_progress() ) return(this.get_player_score(player) / this.get_boat_count(player))
} }
/** /**

@ -92,6 +92,9 @@ p {
justify-content: center; justify-content: center;
} }
.app-scoreboard-component {
}

Loading…
Cancel
Save