summaryrefslogtreecommitdiff
path: root/server/Entities
diff options
context:
space:
mode:
Diffstat (limited to 'server/Entities')
-rw-r--r--server/Entities/Bullet.js20
-rw-r--r--server/Entities/Entity.js1
-rw-r--r--server/Entities/Player.js53
3 files changed, 39 insertions, 35 deletions
diff --git a/server/Entities/Bullet.js b/server/Entities/Bullet.js
index cb5a1a4..5b93a45 100644
--- a/server/Entities/Bullet.js
+++ b/server/Entities/Bullet.js
@@ -6,9 +6,11 @@ var Bullet = function(parent, angle) {
self.id = Math.random();
self.speedX = Math.cos(angle/180*Math.PI) *10;
self.speedY = Math.sin(angle/180*Math.PI) *10;
+ self.dir = 0;
self.parent = parent;
self.timer = 0;
self.toRemove = false;
+
var super_update = self.update;
self.update = function(){
if (self.timer++ > 100)
@@ -34,19 +36,21 @@ var Bullet = function(parent, angle) {
self.getInitPack = function() {
return {
- id:self.id,
- x:self.x,
- y:self.y,
- map:self.map,
+ id: self.id,
+ x: self.x,
+ y: self.y,
+ map: self.map,
+ dir: self.dir,
};
}
self.getUpdatePack = function() {
return {
- id:self.id,
- x:self.x,
- y:self.y,
- map:self.map,
+ id: self.id,
+ x: self.x,
+ y: self.y,
+ map: self.map,
+ dir: self.dir,
};
}
diff --git a/server/Entities/Entity.js b/server/Entities/Entity.js
index 99d8c0b..d65492d 100644
--- a/server/Entities/Entity.js
+++ b/server/Entities/Entity.js
@@ -10,7 +10,6 @@ var Entity = function(){
speedX: 0,
speedY: 0,
id: "",
- dir: 0
}
self.update = function(){
self.updatePosition();
diff --git a/server/Entities/Player.js b/server/Entities/Player.js
index 6bc0e65..8286355 100644
--- a/server/Entities/Player.js
+++ b/server/Entities/Player.js
@@ -16,6 +16,7 @@ var Player = function(id){
self.mouseAngle = 0;
self.maxSpeed = 10;
self.hp = 10;
+ self.dir = 0;
self.hpMax = 10;
self.score = 0;
@@ -37,22 +38,22 @@ var Player = function(id){
self.updateSpeed = function(){
if(self.pressingRight){
self.speedX = self.maxSpeed;
- self.dir = consts.DIR_RIGHT;
+ self.dir = 4;
}
else if(self.pressingLeft){
self.speedX = -self.maxSpeed;
- self.dir = consts.DIR_LEFT;
+ self.dir = 1;
}
else
self.speedX = 0;
if(self.pressingUp){
self.speedY = -self.maxSpeed;
- self.dir = consts.DIR_UP;
+ self.dir = 2;
}
else if(self.pressingDown){
self.speedY = self.maxSpeed;
- self.dir = consts.DIR_DOWN;
+ self.dir = 0;
}
else
self.speedY = 0;
@@ -60,28 +61,28 @@ var Player = function(id){
self.getInitPack = function() {
return {
- id:self.id,
- playerName:self.playerName,
- x:self.x,
- y:self.y,
- map:self.map,
- number:self.number,
- hp:self.hp,
- hpMax:self.hpMax,
- score:self.score,
- dir:self.dir,
+ id: self.id,
+ playerName: self.playerName,
+ x: self.x,
+ y: self.y,
+ map: self.map,
+ number: self.number,
+ hp: self.hp,
+ hpMax: self.hpMax,
+ score: self.score,
+ dir: self.dir,
};
}
self.getUpdatePack = function() {
return {
- id:self.id,
- playerName:self.playerName,
- x:self.x,
- y:self.y,
- map:self.map,
- score:self.score,
- hp:self.hp,
- dir:self.dir,
+ id: self.id,
+ playerName: self.playerName,
+ x: self.x,
+ y: self.y,
+ map: self.map,
+ score: self.score,
+ hp: self.hp,
+ dir: self.dir,
};
}
Player.list[id] = self;
@@ -99,19 +100,19 @@ Player.onConnect = function(socket, pName){
socket.on('keyPress', function(data){
if (data.inputId === 'left'){
player.pressingLeft = data.state;
- player.dir = consts.DIR_LEFT;
+ player.dir = 1;
}
else if (data.inputId === 'right'){
player.pressingRight = data.state;
- player.dir = consts.DIR_RIGHT;
+ player.dir = 4;
}
else if (data.inputId === 'up'){
player.pressingUp = data.state;
- player.dir = consts.DIR_UP;
+ player.dir = 2;
}
else if (data.inputId === 'down'){
player.pressingDown = data.state;
- player.dir = consts.DIR_DOWN;
+ player.dir = 0;
}
else if (data.inputId === 'attack'){
player.pressingAttack = data.state;