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 handling of dangerousnes, etc. fixes #107

Browse source
This commit is contained in:
Jeena 2015-04-02 22:49:43 +02:00
parent 46f14c22c6
commit aff23e8de0
4 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,10 @@ function (Parent, Item, Box2D, Nc, Assert) {
// Max danger of knife: 3 // Max danger of knife: 3
var dangerDamage = item.options.danger / 3; var dangerDamage = item.options.danger / 3;
var damage = velocityDamage * (weightDamage * 180 + dangerDamage * 80); // + 0.5 and / 2: offsetting for lower velocity impact
// * 300: tested imperically by throwing piano from deadly height
// * 80: tested imperically by throwing knife fast
var damage = (velocityDamage + 0.5) * (weightDamage * 300 + dangerDamage * 80) / 2;
var callback = function() { var callback = function() {
self.player.addDamage(damage, item.lastMoved.player, item); self.player.addDamage(damage, item.lastMoved.player, item);

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

@ -60,29 +60,19 @@ function (Parent, Nc) {
} }
}; };
Player.prototype.addDamage = function(damage, enemy, byItem, reheal) { Player.prototype.addDamage = function(damage, enemy, byItem) {
this.stats.health -= damage; this.stats.health -= damage;
if(this.stats.health > 100) this.stats.health = 100;
if(this.stats.health < 0) this.stats.health = 0; if(this.stats.health < 0) this.stats.health = 0;
/*
if(this.stats.health <= 0) { if(this.stats.health <= 0) {
if(enemy != this) enemy.score(); if(enemy != this) enemy.score();
this.kill(enemy, byItem); this.kill(enemy, byItem);
} else { } else {
this.broadcastStats(); this.broadcastStats();
} }
*/
this.broadcastStats();
if (!reheal) { this.broadcastStats();
// reheal hack after 1 second
var self = this;
setTimeout(function(){
self.addDamage(-100, enemy, byItem, true);
}, 2500);
}
}; };
Player.prototype.spawn = function(x, y) { Player.prototype.spawn = function(x, y) {
@ -104,8 +94,6 @@ function (Parent, Nc) {
item: byItem ? byItem.options.name : "Suicide" item: byItem ? byItem.options.name : "Suicide"
}); });
Nc.trigger(Nc.ns.channel.events.game.player.killed, this, killedByPlayer); // sends endround Nc.trigger(Nc.ns.channel.events.game.player.killed, this, killedByPlayer); // sends endround
if(this.ragDoll) { if(this.ragDoll) {

2
app/Game/Client/View/DomController.js
View file

@ -186,7 +186,7 @@ function (Settings, Nc, Screenfull, Graph, PointerLockManager) {
setTimeout(function(){self.ping.innerHTML = "Reload in 3...".replace(/ /g, '&nbsp;');}, 6000); setTimeout(function(){self.ping.innerHTML = "Reload in 3...".replace(/ /g, '&nbsp;');}, 6000);
setTimeout(function(){self.ping.innerHTML = "Reload in 2...".replace(/ /g, '&nbsp;');}, 7000); setTimeout(function(){self.ping.innerHTML = "Reload in 2...".replace(/ /g, '&nbsp;');}, 7000);
setTimeout(function(){self.ping.innerHTML = "Reload in 1...".replace(/ /g, '&nbsp;');}, 8000); setTimeout(function(){self.ping.innerHTML = "Reload in 1...".replace(/ /g, '&nbsp;');}, 8000);
setTimeout(function(){self.ping.innerHTML = "Reload now. ".replace(/ /g, '&nbsp;'); location.reload(); }, 1000); setTimeout(function(){self.ping.innerHTML = "Reload now. ".replace(/ /g, '&nbsp;'); location.reload(); }, 9000);
} }
}; };

2
app/Game/Config/ItemSettings.js
View file

@ -367,7 +367,7 @@ function () {
"category": "livingroom", "category": "livingroom",
"image": "piano.gif", "image": "piano.gif",
"weight": "15", "weight": "10",
"width": "66", "width": "66",
"height": "48", "height": "48",