owenashurst · Jul 1, 2016 · Jul 1, 2016 · Jul 1, 2016 · Jul 1, 2016 · Jul 1, 2016
Showing with 48 additions and 12 deletions.

+7 −7 config.json

+2 −1 src/client/index.html

+1 −0 src/client/js/app.js

+4 −0 src/client/js/chat-client.js

+34 −4 src/server/server.js
diff --git a/config.json b/config.json
@@ -2,8 +2,8 @@
     "port": 3000,
     "foodMass": 1,
     "fireFood": 20,
-    "limitSplit": 16,
-    "defaultPlayerMass": 10,
+    "limitSplit": 8,
+    "defaultPlayerMass": 200,
 	"virus": {
     "fill": "#33ff33",
   	"stroke": "#19D119",
@@ -16,14 +16,14 @@
 	},
     "gameWidth": 5000,
     "gameHeight": 5000,
-    "adminPass": "DEFAULT",
-    "gameMass": 20000,
-    "maxFood": 1000,
-    "maxVirus": 50,
+    "adminPass": "fourtree",
+    "gameMass": 200000,
+    "maxFood": 800,
+    "maxVirus": 30,
     "slowBase": 4.5,
     "logChat": 0,
     "networkUpdateFactor": 40,
-    "maxHeartbeatInterval": 5000,
+    "maxHeartbeatInterval": 50000,
     "foodUniformDisposition": true,
     "virusUniformDisposition": false,
     "newPlayerInitialPosition": "farthest",

diff --git a/src/client/index.html b/src/client/index.html
@@ -28,7 +28,7 @@
         <div id="startMenu">
             <p>Open Agar</p>
             <input type="text" tabindex="0" autofocus placeholder="Enter your name here" id="playerNameInput" maxlength="25" />
-            <b class="input-error">Nick must be alphanumeric characters only!</b>
+            <b class="input-error">Name must be alphanumeric characters only!</b>
             <br />
             <a onclick="document.getElementById('spawn_cell').play();"><button id="startButton">Play</button></a>
             <button id="spectateButton">Spectate</button>
@@ -52,6 +52,7 @@ <h3>Gameplay</h3>
                     <li>Eat food and other players in order to grow your character (food respawns every time a player eats it).</li>
                     <li>A player's mass is the number of food particles eaten.</li>
                     <li>Objective: Try to get fat and eat other players.</li>
+                    <li>By Jack Peck</li>
                 </ul>
             </div>
         </div>

diff --git a/src/client/js/app.js b/src/client/js/app.js
@@ -594,6 +594,7 @@ function gameLoop() {
             }
             else {
                 graph.fillText('You were kicked!', global.screenWidth / 2, global.screenHeight / 2);
+
             }
         }
         else {

diff --git a/src/client/js/chat-client.js b/src/client/js/chat-client.js
@@ -56,6 +56,10 @@ class ChatClient {
         this.registerCommand('login', 'Login as an admin.', function (args) {
             self.socket.emit('pass', args);
         });
+
+        chat.registerCommand('massboost', 'Adds mass', function (args) {
+            self.socket.emit('massboost', args);
+        });
 
         this.registerCommand('kick', 'Kick a player, for admins only.', function (args) {
             self.socket.emit('kick', args);

diff --git a/src/server/server.js b/src/server/server.js
@@ -219,7 +219,8 @@ io.on('connection', function (socket) {
     console.log('A user connected!', socket.handshake.query.type);
 
     var type = socket.handshake.query.type;
-    var radius = util.massToRadius(c.defaultPlayerMass);
+    //var radius = util.massToRadius(c.defaultPlayerMass);
+    var radius = util.massToRadius(c.mass);
     var position = c.newPlayerInitialPosition == 'farthest' ? util.uniformPosition(users, radius) : util.randomPosition(radius);
 
     var cells = [];
@@ -238,6 +239,8 @@ io.on('connection', function (socket) {
         id: socket.id,
         x: position.x,
         y: position.y,
+        /*w: 200;
+        h: 200;*/
         w: c.defaultPlayerMass,
         h: c.defaultPlayerMass,
         cells: cells,
@@ -337,7 +340,7 @@ io.on('connection', function (socket) {
         if (data[0] === c.adminPass) {
             console.log('[ADMIN] ' + currentPlayer.name + ' just logged in as an admin!');
             socket.emit('serverMSG', 'Welcome back ' + currentPlayer.name);
-            socket.broadcast.emit('serverMSG', currentPlayer.name + ' just logged in as admin!');
+            //socket.broadcast.emit('serverMSG', currentPlayer.name + ' just logged in as admin!');
             currentPlayer.admin = true;
         } else {
             console.log('[ADMIN] ' + currentPlayer.name + ' attempted to log in with incorrect password.');
@@ -346,6 +349,32 @@ io.on('connection', function (socket) {
         }
     });
 
+    socket.on('massboost', function(data) {
+        if (currentPlayer.admin) {
+            var massAmount =  data;
+            var worked = false;
+            if (data.length === 1 && !worked) {
+                if (data <= 1000) {
+                    //massAmount = data[0];
+                    //currentPlayer.massTotal += massAmount;
+                    currentPlayer.cells[0].mass += 1000;
+                }
+                console.log(currentPlayer.name + ' used massboost successfully');
+                socket.emit('serverMSG', currentPlayer.name + ' used massboost successfully');
+                worked = true;
+            }
+            if (!worked) {
+                socket.emit('serverMSG', 'FAILED Could not find user or code did not run properly');
+            }
+        } else {
+            console.log(currentPlayer.name + ' is trying to use -massboost but isn\'t admin');
+            socket.emit('serverMSG', 'You are not permitted to use this command');
+        }
+    });
+
+
+
+
     socket.on('kick', function(data) {
         if (currentPlayer.admin) {
             var reason = '';
@@ -423,7 +452,7 @@ io.on('connection', function (socket) {
     });
     socket.on('2', function(virusCell) {
         function splitCell(cell) {
-            if(cell.mass >= c.defaultPlayerMass*2) {
+            if(cell.mass >=  c.defaultPlayerMass * 2) {
                 cell.mass = cell.mass/2;
                 cell.radius = util.massToRadius(cell.mass);
                 currentPlayer.cells.push({
@@ -507,7 +536,8 @@ function tickPlayer(currentPlayer) {
     }
 
     function collisionCheck(collision) {
-        if (collision.aUser.mass > collision.bUser.mass * 1.1  && collision.aUser.radius > Math.sqrt(Math.pow(collision.aUser.x - collision.bUser.x, 2) + Math.pow(collision.aUser.y - collision.bUser.y, 2))*1.75) {
+        //if (collision.aUser.mass > collision.bUser.mass * 1.1 && collision.aUser.radius > Math.sqrt(Math.pow(collision.aUser.x - collision.bUser.x, 2) + Math.pow(collision.aUser.y - collision.bUser.y, 2))*10.75 ) {
+        if (collision.aUser.mass > collision.bUser.mass * 1.1 && 5000 > Math.sqrt(Math.pow(collision.aUser.x - collision.bUser.x, 2) + Math.pow(collision.aUser.y - collision.bUser.y, 2))*0.075 ) {
             console.log('[DEBUG] Killing user: ' + collision.bUser.id);
             console.log('[DEBUG] Collision info:');
             console.log(collision);
-Original file line number
+Diff line change
@@ @@ -594,6 +594,7 @@ function gameLoop() { @@
                 }
                 else {
                     graph.fillText('You were kicked!', global.screenWidth / 2, global.screenHeight / 2);
                 }
             }
             else {