From f89d29a5f7832f019914b3429c0ba2a4c5c54b0b Mon Sep 17 00:00:00 2001 From: Kevin Ngo Date: Fri, 19 Oct 2018 16:27:38 -0700 Subject: [PATCH] clear victory flag on restart --- src/components/beat-loader.js | 2 +- src/state/index.js | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/components/beat-loader.js b/src/components/beat-loader.js index a561c32..dd53b79 100644 --- a/src/components/beat-loader.js +++ b/src/components/beat-loader.js @@ -56,7 +56,7 @@ AFRAME.registerComponent('beat-loader', { const data = this.data; // Start playing. - if (!oldData.challengeId && data.challengeId) { + if (!oldData.challengeId && data.challengeId && this.beatData) { this.processBeats(); return; } diff --git a/src/state/index.js b/src/state/index.js index 6f9ca7b..2057266 100644 --- a/src/state/index.js +++ b/src/state/index.js @@ -9,6 +9,16 @@ const SONG_SUB_NAME_TRUNCATE = 32; const DAMAGE_DECAY = 0.25; const DAMAGE_MAX = 10; +const DEBUG_CHALLENGE = { + author: 'Superman', + difficulty: 'Normal', + id: '517', + image: 'assets/img/molerat.jpg', + songName: 'Friday', + songLength: 100, + songSubName: 'Rebecca Black' +}; + /** * State handler. * @@ -150,12 +160,11 @@ AFRAME.registerState({ * ?debugstate=loading */ debugloading: state => { + Object.assign(state.menuSelectedChallenge, DEBUG_CHALLENGE); + Object.assign(state.challenge, DEBUG_CHALLENGE); state.menuActive = false; state.isSongFetching = true; state.isSongLoading = true; - state.menuSelectedChallenge.songName = 'Friday'; - state.menuSelectedChallenge.songSubName = 'Rebecca Black'; - $('#loadingSongImage').setAttribute('material', 'src', 'assets/img/molerat.jpg'); }, /** @@ -164,15 +173,14 @@ AFRAME.registerState({ * ?debugstate=victory */ debugvictory: state => { + Object.assign(state.menuSelectedChallenge, DEBUG_CHALLENGE); + Object.assign(state.challenge, DEBUG_CHALLENGE); state.isVictory = true; state.menuActive = false; state.score.accuracy = 'Accuracy: 99.99%'; state.score.maxComboText = 'Max Combo: 123'; state.score.rank = 'S'; state.score.scoreText = 'Score: 9001'; - state.menuSelectedChallenge.songName = 'Friday'; - state.menuSelectedChallenge.songSubName = 'Rebecca Black'; - $('#gameMenuSongImage').setAttribute('material', 'src', 'assets/img/molerat.jpg'); }, gamemenuresume: (state) => { @@ -185,6 +193,7 @@ AFRAME.registerState({ state.isGameOver = false; state.isPaused = false; state.isSongLoading = true; + state.isVictory = false; }, gamemenuexit: (state) => {