jeena/chuck.js
1
0
Fork 0
mirror of https://github.com/logsol/chuck.js.git synced 2026-05-11 10:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

better feedback on killing. fixes #109

Browse source
This commit is contained in:
logsol 2015-03-02 00:13:21 +01:00
parent 81f5990e0c
commit 5007ab5b02
8 changed files with 95 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Game/Channel/GameObjects/Doll.js
View file

@ -70,7 +70,7 @@ function (Parent, Item, Box2D, Nc) {
var player = item.lastMoved.player;
var callback = function() {
self.player.addDamage(damage, player);
self.player.addDamage(damage, player, item);
}
Nc.trigger(Nc.ns.channel.engine.worldQueue.add, callback)

11
app/Game/Channel/Player.js
View file

@ -58,14 +58,14 @@ function (Parent, Nc) {
this.addDamage(100, this);
};
Player.prototype.addDamage = function(damage, enemy) {
Player.prototype.addDamage = function(damage, enemy, byItem) {
this.stats.health -= damage;
if(this.stats.health < 0) this.stats.health = 0;
if(this.stats.health <= 0) {
if(enemy != this) enemy.score();
this.kill(enemy);
this.kill(enemy, byItem);
} else {
this.broadcastStats();
}
@ -77,7 +77,7 @@ function (Parent, Nc) {
this.broadcastStats();
};
Player.prototype.kill = function(killedByPlayer) {
Player.prototype.kill = function(killedByPlayer, byItem) {
this.stats.deaths++;
var ragDollId = this.stats.deaths;
Parent.prototype.kill.call(this, killedByPlayer, ragDollId);
@ -86,9 +86,12 @@ function (Parent, Nc) {
Nc.trigger(Nc.ns.channel.to.client.gameCommand.broadcast, "playerKill", {
playerId: this.id,
killedByPlayerId: killedByPlayer.id,
ragDollId: ragDollId
ragDollId: ragDollId,
item: byItem.options.name
});
Nc.trigger(Nc.ns.channel.events.game.player.killed, this, killedByPlayer); // sends endround
if(this.ragDoll) {