From 5c9af086bde4276ccaef1266f6b4e8654a676987 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 28 Nov 2018 22:29:18 +1100
Subject: [PATCH] put clicks abck in

---
 client/src/scenes/combat.cryps.js |  2 +-
 client/src/scenes/combat.js       | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/client/src/scenes/combat.cryps.js b/client/src/scenes/combat.cryps.js
index 6186105f..1ea6e7cf 100644
--- a/client/src/scenes/combat.cryps.js
+++ b/client/src/scenes/combat.cryps.js
@@ -194,4 +194,4 @@ class CombatCryps extends Phaser.GameObjects.Group {
     }
 }
 
-module.exports = CombatCryps;
+module.exports = { CombatCryps, CrypImage, CrypSkill };
diff --git a/client/src/scenes/combat.js b/client/src/scenes/combat.js
index 2e0c8ae3..8c7a119e 100644
--- a/client/src/scenes/combat.js
+++ b/client/src/scenes/combat.js
@@ -3,7 +3,7 @@ const fs = require('fs');
 const { throttle } = require('lodash');
 
 const { POSITIONS: { COMBAT }, TEXT } = require('./constants');
-const CombatCryps = require('./combat.cryps');
+const { CombatCryps, CrypImage, CrypSkill } = require('./combat.cryps');
 const renderResolutions = require('./combat.render.resolutions');
 
 const CRYP_KEY_MAP = ['keydown_ONE', 'keydown_TWO', 'keydown_THREE'];
@@ -33,14 +33,14 @@ class Combat extends Phaser.Scene {
             this.registry.set('game', null);
         }, 0, this);
 
-        // this.input.on('pointerup', (pointer, obj) => {
-        //     if (obj[0] instanceof CrypImage || obj[0] instanceof CrypSkill) {
-        //         obj[0].clickHandler();
-        //     } else if (this.registry.get('activeSkill')) {
-        //         this.registry.get('activeSkill').clearTint();
-        //         this.registry.set('activeSkill', null);
-        //     }
-        // });
+        this.input.on('pointerup', (pointer, obj) => {
+            if (obj[0] instanceof CrypImage || obj[0] instanceof CrypSkill) {
+                obj[0].clickHandler();
+            } else if (this.registry.get('activeSkill')) {
+                this.registry.get('activeSkill').clearTint();
+                this.registry.set('activeSkill', null);
+            }
+        });
 
         this.combatCryps = new CombatCryps(this);
 
@@ -82,8 +82,6 @@ class Combat extends Phaser.Scene {
 
         // do we need to render resolution animations?
         if (game.resolved.length !== this.renderedResolves) {
-            // Turn skills off...in future we might get it to show something else instead
-            this.combatCryps.removeSkills();
             const newResolutions = game.resolved.slice(this.renderedResolves);
             renderResolutions(this, game, this.combatCryps, newResolutions);
             this.renderedResolves = game.resolved.length;