From 797a24c022ce307a98d6a9365ce05815e59013d8 Mon Sep 17 00:00:00 2001 From: Diego Marcos Date: Tue, 16 Oct 2018 13:50:03 -0700 Subject: [PATCH] Take damage when hitting mines --- src/components/beat.js | 7 ++++++- src/state/index.js | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/beat.js b/src/components/beat.js index cbbf23c..716c91d 100644 --- a/src/components/beat.js +++ b/src/components/beat.js @@ -144,7 +144,7 @@ AFRAME.registerComponent('beat', { var hitColliderConfiguration; var hitColliderEl; - if (this.data.type === 'dot') { return; } + if (this.data.type === 'dot' || this.data.type === 'mine') { return; } hitColliderConfiguration = { position: {x: 0, y: data.size / 2, z: 0}, @@ -467,6 +467,11 @@ AFRAME.registerComponent('beat', { if (saberBoundingBox.intersectsBox(beatBoundingBox)) { this.el.parentNode.components['beat-hit-sound'].playSound(this.el); this.destroyBeat(saberEls[i]); + if (this.data.type === 'mine') { + this.el.emit('minehit', null, true); + break; + } + if (this.data.type === 'dot' && saberEls[i].components['saber-controls'].swinging && this.data.color === saberColors[saberEls[i].getAttribute('saber-controls').hand]) { this.el.emit('beathit', null, true); } else { diff --git a/src/state/index.js b/src/state/index.js index 68fce0c..d3e753a 100644 --- a/src/state/index.js +++ b/src/state/index.js @@ -186,6 +186,10 @@ AFRAME.registerState({ state.menuSelectedChallenge.difficulty = difficulty; }, + minehit: state => { + takeDamage(state); + }, + pausegame: (state) => { if (!state.isPlaying) { return; } state.isPaused = true;