Merge branch 'wordspace'

# Conflicts:
#	js/WordObject.js
#	js/WordSpace.js

index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8"/>
     <script src="/socket.io/socket.io.js"></script>
     <script src="js/phaser.js"></script>
-    <script src="js/Background.js"></script>]
+    <script src="js/Background.js"></script>
     <script src="js/Input.js"></script>
     <script src="js/WordSpace.js"></script>
     <script src="js/WordObject.js"></script>

js/WordObject.js

@@ -31,6 +31,7 @@ class WordObject
 
     destroy()
     {
+        console.log(this.generationCode + ': ' + this.wordText + ' destroyed');
         this.wordObj.destroy();
         const groupIdx = WordSpace.wordGroup.findIndex(function(item) {return this.isEqualObject(item.generationCode)}, this);
         if (groupIdx > -1) WordSpace.wordGroup.splice(groupIdx, 1);
@@ -49,5 +50,5 @@ class WordObject
 
     getWordWeight() { return this.wordWeight; }
 
-    isEqualObject(_generationCode) { return _generationCode === this._generationCode; }
+    isEqualObject(_generationCode) { return _generationCode === this.generationCode; }
 }
\ No newline at end of file

js/WordSpace.js

@@ -15,26 +15,65 @@ WordSpace.wordPhysicsGroup = null;
 
 WordSpace.gravityPoint = {x: 400, y: 300};
 
-WordSpace.wordCycle = null;
-WordSpace.resetCycle = function(scene, _delay)
+WordSpace.attackGauge = 
 {
-    var option = 
+    value: 0,
+    add: function(plus)
     {
-        delay: _delay,
-        callback: function()
-        {
-            WordSpace.generateWord(this)
-        },
-        callbackScope: scene,
-        loop: true
-    };
-    if (this.wordCycle != null)
+        if (this.value + plus > 11) this.value = 11;
+        else this.value += plus;
+        this.text.setText('게이지: ' + this.value.toFixed(1));
+    },
+    sub: function(minus)
     {
-        this.wordCycle = this.wordCycle.reset(option);
-    }
-    else
+        if (this.value - minus < 0) this.value = 0;
+        else this.value -= minus;
+        this.text.setText('게이지: ' + this.value.toFixed(1));
+    },
+    resetValue: function() {this.value = 0;},
+    cutValue: function(cutOut) {this.value *= (1-cutOut);},
+    resetCycle: function(scene)
     {
-        this.wordCycle = scene.time.addEvent(option);
+        var option = 
+        {
+            delay: 300,
+            callback: function()
+            {
+                WordSpace.attackGauge.sub(0.1);
+            },
+            loop: true
+        };
+        this.currentCycle = scene.time.addEvent(option);
+
+        this.text = scene.add.text(100,100,'게이지: ' + this.value.toFixed(1)).setColor('#ffffff');
+    },
+    pauseCycle: function(bool) {this.currentCycle.paused = bool;}
+    // showValue: 아래쪽에 바의 길이로 게이지 표시, 색으로 게이지의 강도 표현
+}
+
+WordSpace.wordCycle =
+{
+    currentCycle: null,
+    resetCycle: function(scene, _delay)
+    {
+        var option = 
+        {
+            delay: _delay,
+            callback: function()
+            {
+                WordSpace.generateWord(this)
+            },
+            callbackScope: scene,
+            loop: true
+        };
+        if (this.currentCycle != null)
+        {
+            this.currentCycle = this.currentCycle.reset(option);
+        }
+        else
+        {
+            this.currentCycle = scene.time.addEvent(option);
+        }
     }
 }
 
@@ -59,8 +98,9 @@ WordSpace.generateWord = function(scene)
 
 function gameOver()
 {
-    this.wordCycle.paused = true;
+    this.wordCycle.currentCycle.paused = true;
     //To Do
+    console.log('defeat');
 }
 
 //게임 오버 판정을 위한 타이머
@@ -72,4 +112,24 @@ WordSpace.setGameOverTimer = function()
         this.gameOverTimer = setTimeout(gameOver.bind(this), this.defeatTime);
         isTimerOn = true;
     }
+}
+
+WordSpace.findWord = function(word)
+{
+    var found = WordSpace.wordGroup.find(function(element)
+    {
+        return Input.isEqual(word, element.wordText);
+    });
+    if (found != undefined)
+    {
+        switch(found.wordGrade) // 이부분 나중에 더 효율적으로 바꿀수있지 않을까
+        {
+            case 0: WordSpace.attackGauge.add(2.5); break;
+            case 1: WordSpace.attackGauge.add(1.5); break;
+            case 2: WordSpace.attackGauge.add(0.9); break;
+            case 3: WordSpace.attackGauge.add(0.5); break;
+            default: console.log('[ERR] wrong grade of word'); break;
+        }
+        found.destroy();
+    }
 }
\ No newline at end of file

js/main.js

@@ -31,7 +31,8 @@ function create()
     BackGround.drawBrain(this);
     Input.inputField.generate(this);
     WordSpace.wordPhysicsGroup = this.physics.add.group();
-    WordSpace.resetCycle(this, 2000);
+    WordSpace.wordCycle.resetCycle(this, 2000);
+    WordSpace.attackGauge.resetCycle(this);
 }
 
 function update()