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

added angular throwing

Browse source
This commit is contained in:
logsol 2014-12-25 00:33:00 +01:00
parent 9100215ceb
commit d24ab60756
12 changed files with 93 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Game/Channel/Control/PlayerController.js
View file

@ -33,7 +33,7 @@ function(Parent, Nc, Parser, Settings) {
};
PlayerController.prototype.handActionRequest = function(options) {
if (options) this.player.handActionRequest(options.x, options.y);
if (options) this.player.handActionRequest(options);
};
PlayerController.prototype.suicide = function() {

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

@ -13,7 +13,7 @@ function (Parent, Nc) {
Player.prototype = Object.create(Parent.prototype);
Player.prototype.handActionRequest = function(x, y) {
Player.prototype.handActionRequest = function(options) {
if(!this.doll) return false;
var item = null;
@ -22,29 +22,25 @@ function (Parent, Nc) {
if (isHolding) {
item = this.holdingItem;
} else {
item = this.doll.findCloseItem(x, y);
item = this.doll.findCloseItem(options.x, options.y);
}
if(item) {
this.handAction(x, y, isHolding, item);
this.handAction(options, isHolding, item);
}
}
Player.prototype.handAction = function(x, y, isHolding, item) {
Player.prototype.handAction = function(options, isHolding, item) {
var options = {
playerId: this.id,
itemUid: item.uid
}
options.playerId = this.id;
options.itemUid = item.uid;
if (isHolding) {
// throw
if(item.isReleasingAllowed()) {
this.throw(x, y, item);
this.throw(options, item);
options.action = "throw";
options.x = x;
options.y = y;
Nc.trigger(Nc.ns.channel.to.client.gameCommand.broadcast, "handActionResponse", options);
}
} else {