added command: @hide

4 files changed, 13 insertions, 1 deletions

diff --git a/app.js b/app.js
index d3c9214..0eae115 100644
--- a/app.js
+++ b/app.js
@@ -232,6 +232,11 @@ io.sockets.on('connection', function(socket){
                             });
                             break;
 
+                        // @hide
+                        case "hide":
+                            Player.Player.list[socket.id].ignorePlayerAttack = ! Player.Player.list[socket.id].ignorePlayerAttack;
+                            break;
+
                         // @setgm (args:<playername> <lvl>)
                         case "setgm":
                             hasPermission(socket.playerName, 99, function(res){
diff --git a/client/index.html b/client/index.html
index 4bb4a1c..c961d93 100644
--- a/client/index.html
+++ b/client/index.html
@@ -204,6 +204,7 @@
       self.shift = false;
       self.sit = false;
       self.inInventory = false;
+      self.ignorePlayerAttack = initPack.ignorePlayerAttacky;
 
       self.drawPlayer = function(){
         var x = self.x - Player.list[selfId].x + WIDTH/2;
@@ -310,6 +311,8 @@
             p.sit = pack.sit;
           if (pack.inInventory !== undefined)
             p.inInventory = pack.inInventory;
+          if (pack.ignorePlayerAttack != undefined)
+            p.ignorePlayerAttack = pack.ignorePlayerAttack;
         }
       }
       for(var i = 0; i < data.bullet.length; i++){
diff --git a/server/Entities/Bullet.js b/server/Entities/Bullet.js
index 5b93a45..6ae6c0f 100644
--- a/server/Entities/Bullet.js
+++ b/server/Entities/Bullet.js
@@ -19,7 +19,8 @@ var Bullet = function(parent, angle) {
         for (var i in Player.list){
             var p = Player.list[i];
             if(self.getDistance(p) < 32 && self.parent !== p.id){
-                p.hp -= 1;
+                if (!p.ignorePlayerAttack)
+                    p.hp -= 1;
                 if (p.hp <= 0){
                     var shooter = Player.list[self.parent];
                     if (shooter)
diff --git a/server/Entities/Player.js b/server/Entities/Player.js
index dd11ef4..4c67f45 100644
--- a/server/Entities/Player.js
+++ b/server/Entities/Player.js
@@ -21,6 +21,7 @@ var Player = function(id){
     self.move = true;
     self.sit = false;
     self.inInventory = false;
+    self.ignorePlayerAttack = false;
 
     var super_update = self.update;
     self.update = function(){
@@ -76,6 +77,7 @@ var Player = function(id){
             score: self.score,
             dir: self.dir,
             sit: self.sit,
+            ignorePlayerAttack: self.ignorePlayerAttack,
         };
     }
     self.getUpdatePack = function() {
@@ -90,6 +92,7 @@ var Player = function(id){
             dir: self.dir,
             sit: self.sit,
             inInventory: self.inInventory,
+            ignorePlayerAttack: self.ignorePlayerAttack,
         };
     }
     Player.list[id] = self;