From fb6155a30d099fbdd87cd5d4e77855b88fbb6141 Mon Sep 17 00:00:00 2001 From: Ben Burlingham Date: Tue, 26 Apr 2016 14:08:38 -0700 Subject: [PATCH] Updating dynamic high score in-game. --- components/board/scorebar.component.js | 4 ++-- controllers/board/scorebar.controller.js | 3 ++- models/multiples.model.js | 2 +- sass/board/scorebar.scss | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/components/board/scorebar.component.js b/components/board/scorebar.component.js index 6b3efe7..7bd99d5 100644 --- a/components/board/scorebar.component.js +++ b/components/board/scorebar.component.js @@ -11,8 +11,8 @@ export class Scorebar extends Component { } return (
-
{this.props.current}
-
{this.props.high}
+
{this.props.current}
+
{this.props.high}
{lives}
); }; diff --git a/controllers/board/scorebar.controller.js b/controllers/board/scorebar.controller.js index 23e46df..ff5c9d7 100644 --- a/controllers/board/scorebar.controller.js +++ b/controllers/board/scorebar.controller.js @@ -1,7 +1,7 @@ import * as ScorebarActions from '../../actions/board/scorebar.actions'; import SETTINGS from '../../AppSettings'; -const stored = localStorage.getItem(SETTINGS.LOCAL_STORAGE_KEY) || [{ score: 0 }]; +const stored = JSON.parse(localStorage.getItem(SETTINGS.LOCAL_STORAGE_KEY)) || [{ score: 0 }]; let dispatch; let lives = SETTINGS.LIVES; @@ -27,6 +27,7 @@ const ScorebarCtrl = { highScore = previousHighScore; } + dispatch(ScorebarActions.update(lives, currentScore, highScore)); }, diff --git a/models/multiples.model.js b/models/multiples.model.js index 775cbb6..f313b91 100644 --- a/models/multiples.model.js +++ b/models/multiples.model.js @@ -5,7 +5,7 @@ const MultiplesModel = Object.create(BaseModel); MultiplesModel.generate = function(n, level) { const multiples = []; const nonmultiples = []; - const target = 19//level + 2; + const target = level + 2; const upperLimit = target * 150; let tmp; diff --git a/sass/board/scorebar.scss b/sass/board/scorebar.scss index 4aa627d..f21c372 100644 --- a/sass/board/scorebar.scss +++ b/sass/board/scorebar.scss @@ -17,11 +17,11 @@ vertical-align:top; } - .current-score { + .currentscore { width:35%; } - .high-score { + .highscore { text-align:center; width:30%; }