added listener for Inventory (I)

basic inventory border layout (WIP)

2 files changed, 22 insertions, 1 deletions

diff --git a/client/index.html b/client/index.html
index aca8039..a2ac92e 100644
--- a/client/index.html
+++ b/client/index.html
@@ -204,6 +204,7 @@
       self.dir = initPack.dir;
       self.shift = false;
       self.sit = false;
+      self.inInventory = false;
 
       self.drawPlayer = function(){
         var x = self.x - Player.list[selfId].x + WIDTH/2;
@@ -308,6 +309,8 @@
             p.playerName = pack.playerName;
           if(pack.sit !== undefined)
             p.sit = pack.sit;
+          if (pack.inInventory !== undefined)
+            p.inInventory = pack.inInventory;
         }
       }
       for(var i = 0; i < data.bullet.length; i++){
@@ -356,6 +359,7 @@
       drawMapOver();
       drawPlayerNames();
       drawGFXOver();
+      drawInventory();
       //drawScore();
     }, 1000/25);
 
@@ -395,6 +399,15 @@
     var drawGFXOver = function(){
 
     }
+
+    var drawInventory = function(){
+      if(Player.list[selfId].inInventory) {
+        ui.style.display = 'inline-block';
+      }
+      else {
+        ui.style.display = 'none';
+      }
+    }
     // TODO Collision
 
     var drawScore = function(){
@@ -410,6 +423,9 @@
         // shift
         if(event.keyCode === 16)
           self.shift = true;
+        // inventory (i)
+        if(event.keyCode === 73)
+          socket.emit('keyPress',{inputId: 'inInventory', state: !Player.list[selfId].inInventory, shift: self.shift});
         // movement
         if(event.keyCode === 68 || event.keyCode === 39) // d
           socket.emit('keyPress',{inputId: 'right', state: true, shift: self.shift});
@@ -420,7 +436,7 @@
         else if(event.keyCode === 87 || event.keyCode === 38) // w
           socket.emit('keyPress',{inputId: 'up', state: true, shift: self.shift});
         else if(event.keyCode === 88)
-          socket.emit('keyPress',{inputId: 'sit', state: !self.sit, shift: self.shift});
+          socket.emit('keyPress',{inputId: 'sit', state: !Player.list[selfId].sit, shift: self.shift});
       }
     }
 
diff --git a/server/Entities/Player.js b/server/Entities/Player.js
index 4374d68..dd11ef4 100644
--- a/server/Entities/Player.js
+++ b/server/Entities/Player.js
@@ -20,6 +20,7 @@ var Player = function(id){
     self.score = 0;
     self.move = true;
     self.sit = false;
+    self.inInventory = false;
 
     var super_update = self.update;
     self.update = function(){
@@ -88,6 +89,7 @@ var Player = function(id){
             hp: self.hp,
             dir: self.dir,
             sit: self.sit,
+            inInventory: self.inInventory,
         };
     }
     Player.list[id] = self;
@@ -133,6 +135,9 @@ Player.onConnect = function(socket, pName){
         else if (data.inputId === 'mouseAngle'){
             player.mouseAngle = data.state;
         }
+        if (data.inputId === 'inInventory'){
+            player.inInventory = data.state;
+        }
     });
 
     socket.emit('init',{