From d72118b1579a7a41f4ead38361b919e203420f77 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Sat, 18 May 2019 23:08:54 +1000
Subject: [PATCH] fix friendly targeting

---
 client/src/components/game.component.jsx | 9 +++++++--
 client/src/components/game.cryp.jsx      | 2 +-
 client/src/components/nav.jsx            | 2 +-
 client/src/events.jsx                    | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/src/components/game.component.jsx b/client/src/components/game.component.jsx
index 2de012a5..78a3a03c 100644
--- a/client/src/components/game.component.jsx
+++ b/client/src/components/game.component.jsx
@@ -69,7 +69,7 @@ function GamePanel(props) {
     const now = Date.now();
     const end = Date.parse(game.phase_end);
     const timerPct = ((now - zero) / (end - zero) * 100);
-    const displayPct = resolution
+    const displayPct = resolution || game.phase === 'Finish'
         ? 0
         : Math.min(timerPct, 100);
 
@@ -162,8 +162,13 @@ function GamePanel(props) {
 
     const gameClasses = `game ${resolution ? 'resolving': ''}`;
 
+    function gameClick(e) {
+        e.stopPropagation();
+        setActiveCryp(null);
+    }
+
     return (
-        <main className={gameClasses} onClick={() => setActiveCryp(null)} >
+        <main className={gameClasses} onClick={gameClick} >
             {header}
             {timer}
             {otherTeams.map(OpponentTeam)}
diff --git a/client/src/components/game.cryp.jsx b/client/src/components/game.cryp.jsx
index c125ee73..def959d9 100644
--- a/client/src/components/game.cryp.jsx
+++ b/client/src/components/game.cryp.jsx
@@ -47,7 +47,7 @@ function GameCryp(props) {
         resolution,
         activeSkill,
         setActiveCryp,
-        // selectSkillTarget,
+        selectSkillTarget,
     } = props;
 
     const ko = cryp.green_life.value === 0 ? 'ko' : '';
diff --git a/client/src/components/nav.jsx b/client/src/components/nav.jsx
index 2aa20c85..a72c9a9c 100644
--- a/client/src/components/nav.jsx
+++ b/client/src/components/nav.jsx
@@ -78,7 +78,7 @@ function Nav(args) {
             <h2>Team</h2>
             {teamElements}
             <h2>Instances</h2>
-            <button onClick={() => navTo('list')}>list</button>
+            <button onClick={() => navTo('list')}>Join</button>
             <hr />
             {joined}
             <h2>Hax</h2>
diff --git a/client/src/events.jsx b/client/src/events.jsx
index 29ffe914..d26ef0a8 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -88,7 +88,7 @@ function registerEvents(store) {
         }
 
         return store.dispatch(actions.setGame(game));
-        // return console.log('EVENT ->', 'game', game);
+        return console.log('EVENT ->', 'game', game);
     }
 
     function setAccount(account) {