끝내기 플레이어, 끝내기단어 결정 구현

공격시 4초 카운터 적용

GameServer.js

@@ -18,12 +18,12 @@ GameServer.findPlayer = function(playerId)
 {
     var idx = this.currentPlayer.findIndex(function(element)
     {
-        return element.id === socket;
+        return element.id === playerId;
     });
     if (idx != -1) return this.currentPlayer[idx];
     else
     {
-        console.log('[ERR] wrong playerId to find');
+        console.log('[ERR] wrong playerId('+ playerId +') to find');
         return null;
     }
 }
@@ -137,7 +137,19 @@ GameServer.playerDefeat = function(playerData)
     playerData.playingData.rank = playerData.currentRoom.nextRank--;
     playerData.isReceivable = false;
     playerData.currentRoom.aliveCount--;
-    // 끝내기단어 체크
+    if (playerData.playingData.lastAttacks.length > 0)
+    {
+        playerData.playingData.lastAttack = playerData.playingData.lastAttacks[playerData.playingData.lastAttacks.length - 1];
+        if (Date.now() - playerData.playingData.lastAttack.time > 40000) playerData.playingData.lastAttack = null;
+        else
+        {
+            playerData.playingData.lastAttacks.forEach(function(element)
+            {
+                if (Date.now() - element.time < 40000 && element.wordGrade > playerData.playingData.lastAttack.wordGrade) playerData.playingData.lastAttack = element;
+            }); 
+        }
+    }
+
     GameServer.announceToRoom(this.findRoomIndex(playerData.currentRoom.roomNum), 'defeat', playerData.playingData);
     console.log('['+playerData.id+']'+ ' defeated, rank: ' + playerData.playingData.rank);
 
@@ -179,7 +191,10 @@ class Player
         this.nickname = playerData.nickname;
         this.isAlive = true;
         this.rank = -1;
+
         this.playerTyping = 0;
+        this.lastAttacks = []; // { attackerId, word, wordGrade, time }
+        this.lastAttack = null;
     }
 }
 

js/Client.js

@@ -47,13 +47,25 @@ socket.on('setPlayerTypingRate', function(msg) // number playerTypingRate
 });
 socket.on('attacked', function(msg) // object attackData
 {
+    setTimeout(function()
+    {
         WordSpace.generateWord.Attack(WordSpace.gameSceneForTest, msg.text, msg.grade, msg.attacker, msg.isStrong);
+    }, 4000);
 });
 socket.on('defeat', function(msg) // object player
 {
     RoomData.players[msg.index] = msg;
     RoomData.aliveCount--;
+    if (msg.lastAttack != null) 
+    {
+        console.log(RoomData.players[msg.index].nickname + ' defeated by ' + msg.lastAttack.attacker + ', with ' + msg.lastAttack.word);
+        WordSpace.killLogForTest += ('\n' + msg.lastAttack.attacker + ' --' + msg.lastAttack.word + '-> ' + RoomData.players[msg.index].nickname);
+    }
+    else 
+    {
         console.log(RoomData.players[msg.index].nickname + ' defeated');
+        WordSpace.killLogForTest += ('\n--Suicide->' + RoomData.players[msg.index].nickname);
+    }
 });
 socket.on('gameEnd', function(msg) // object player
 {

js/ScenesData.js

@@ -92,6 +92,7 @@ var gameScene = new Phaser.Class(
         
         WordSpace.nameWordTextForTest.setText('현재 가진 호패들 : \n' + tempNames);
         WordSpace.weightTextObjForTest.setText('뇌의 무게: (현재) '+WordSpace.totalWeight+' / '+ WordSpace.brainCapacity+' (전체)');
+        WordSpace.killLogTextForTest.setText(WordSpace.killLogForTest);
         WordSpace.setPlayerTyping.add('');
     }
 });
\ No newline at end of file

js/WordSpace.js

@@ -4,6 +4,8 @@ var WordSpace = WordSpace || {};
 WordSpace.gameSceneForTest = null;
 WordSpace.weightTextObjForTest = null;
 WordSpace.nameWordTextForTest = null;
+WordSpace.killLogTextForTest = null;
+WordSpace.killLogForTest = '';
 
 WordSpace.nextWordCode = 0;
 WordSpace.totalWeight = 0; //현재 단어 무게 총합
@@ -237,6 +239,7 @@ WordSpace.loadImage = function(scene)
 
     WordSpace.gameSceneForTest = scene; // for test
     WordSpace.weightTextObjForTest = scene.add.text(100, 75, '뇌의 무게: (현재) 0 / 100 (전체)').setDepth(10).setColor('#000000');
+    WordSpace.killLogTextForTest = scene.add.text(1100, 50, WordSpace.killLogForTest).setDepth(10).setColor('#000000').setAlign('right');
 }
 
 WordSpace.generateWord = 

server.js

@@ -75,6 +75,25 @@ io.on('connection', function(socket)
     socket.on('attack', function(msg)
     {
         GameServer.announceToTarget(GameServer.findRoomIndex(msg.roomNum), msg.target, 'attacked', msg);
+        let target = GameServer.findPlayer(msg.target);
+        if (target != null)
+        {
+            let dataToPush = 
+            {
+                attackerId: msg.attacker.idNum,
+                attacker: msg.attacker.nickname,
+                word: msg.text,
+                wordGrade: msg.grade,
+                time: Date.now()
+            }
+
+            if (target.playingData.lastAttacks.length < 5) target.playingData.lastAttacks.push(dataToPush);
+            else
+            {
+                target.playingData.lastAttacks.splice(0, 1);
+                target.playingData.lastAttacks.push(dataToPush);
+            }
+        }
     });
 
     socket.on('defeated', function()