From 119979fce4ae1ea8afd93e6c04af6c18934e2597 Mon Sep 17 00:00:00 2001
From: Diego Marcos <diego.marcos@gmail.com>
Date: Wed, 31 Oct 2018 15:45:59 -0700
Subject: [PATCH] Move score calculation from state to payload of the beathit
 event

---
 src/components/beat.js | 12 ++++++++++--
 src/state/index.js     |  7 +------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/components/beat.js b/src/components/beat.js
index 27455a7..b70f38f 100644
--- a/src/components/beat.js
+++ b/src/components/beat.js
@@ -665,6 +665,7 @@ AFRAME.registerComponent('beat', {
     var hitEventDetail = this.hitEventDetail;
     var maxAngle;
     var saberControls = this.hitSaberEl.components['saber-controls'];
+    var score = 0;
 
     if (cutDirection === 'up' || cutDirection === 'down') {
       maxAngle = saberControls.maxAnglePlaneX;
@@ -673,10 +674,17 @@ AFRAME.registerComponent('beat', {
     } else {
       maxAngle = saberControls.maxAnglePlaneXY;
     }
-    hitEventDetail.angleBeforeHit = this.angleBeforeHit * 180 / Math.PI;
-    hitEventDetail.angleAfterHit = maxAngle * 180 / Math.PI;
+
+    const angleBeforeHit = this.angleBeforeHit * 180 / Math.PI;
+    const angleAfterHit = maxAngle * 180 / Math.PI;
+    score += angleBeforeHit >= 90 ? 70 : (angleBeforeHit / 90) * 70;
+    score += angleAfterHit >= 60 ? 30 : (angleAfterHit / 60) * 30;
+
+    hitEventDetail.score = score;
 
     this.el.emit('beathit', hitEventDetail, true);
+
+    // console.log("BEAT SCORE: " + score + " " + angleBeforeHit + " " + angleAfterHit);
   },
 
   /**
diff --git a/src/state/index.js b/src/state/index.js
index 81b2791..6e0c93e 100644
--- a/src/state/index.js
+++ b/src/state/index.js
@@ -111,7 +111,6 @@ AFRAME.registerState({
     },
 
     beathit: (state, payload) => {
-      var score = 0;
       if (state.damage > DAMAGE_DECAY) {
         state.damage -= DAMAGE_DECAY;
       }
@@ -121,15 +120,11 @@ AFRAME.registerState({
         state.score.maxCombo = state.score.combo;
       }
 
-      score += payload.angleBeforeHit >= 90 ? 70 : (payload.angleBeforeHit / 90) * 70;
-      score += payload.angleAfterHit >= 60 ? 30 : (payload.angleAfterHit / 60) * 30;
-      state.score.score += Math.floor(score * state.score.multiplier);
+      state.score.score += Math.floor(payload.score * state.score.multiplier);
 
       state.score.multiplier = state.score.combo >= 8
         ? 8
         : 2 * Math.floor(Math.log2(state.score.combo));
-
-      // console.log("BEAT SCORE: " + score + " " + payload.angleBeforeHit + " " + payload.angleAfterHit);
     },
 
     beatmiss: state => {