ulith/webxoss-fixed
1
0
Fork 0
forked from mirrors/webxoss-core
Code Activity

Fix PR-307 WD13-010 activatedInTrashZone banishAttackingSigni

Browse source
This commit is contained in:
WEBXOSS 2016-12-18 23:33:55 +08:00
parent ff87b1401c
commit cfa1f97fd1
3 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Card.js
View file

@ -449,7 +449,7 @@ Card.prototype.canAttack = function () {
// <バインド・ウェポンズ> // <バインド・ウェポンズ>
if (this.type === 'SIGNI') { if (this.type === 'SIGNI') {
var attackCount = this.game.getData(this,'attackCount') || 0; var attackCount = this.fieldData.attackCount || 0;
if (attackCount >= this.player.signiAttackCountLimit) return false; if (attackCount >= this.player.signiAttackCountLimit) return false;
} else { } else {
var lrigAttackCount = this.game.getData(this.player,'lrigAttackCount') || 0; var lrigAttackCount = this.game.getData(this.player,'lrigAttackCount') || 0;
@ -1019,8 +1019,8 @@ Card.prototype.attackAsyn = function () {
} }
// <バインド・ウェポンズ>, <白羅星　フルムーン> // <バインド・ウェポンズ>, <白羅星　フルムーン>
if (this.type === 'SIGNI') { if (this.type === 'SIGNI') {
var attackCount = this.game.getData(this,'attackCount') || 0; var attackCount = this.fieldData.attackCount || 0;
this.game.setData(this,'attackCount',++attackCount); this.fieldData.attackCount++;
var signiAttackCount = this.game.getData(this.player,'signiAttackCount') || 0; var signiAttackCount = this.game.getData(this.player,'signiAttackCount') || 0;
this.game.setData(this.player,'signiAttackCount',++signiAttackCount); this.game.setData(this.player,'signiAttackCount',++signiAttackCount);
} else { } else {
@ -1114,17 +1114,7 @@ Card.prototype.attackAsyn = function () {
return opponent.crashAsyn(1,crashArg); return opponent.crashAsyn(1,crashArg);
} }
}); });
}).callback(this,function () {
// "这场战斗结束之后,就回老家结婚" (划掉)
// "战斗结束后,将进行攻击的 SIGNI 驱逐"
if (event.banishAttackingSigniSource) {
return this.game.blockAsyn(event.banishAttackingSigniSource,card,card.banishAsyn);
}
}); });
} else {
if (event.banishAttackingSigniSource) {
return this.game.blockAsyn(event.banishAttackingSigniSource,card,card.banishAsyn);
}
} }
}); });
} else { } else {
@ -1143,6 +1133,12 @@ Card.prototype.attackAsyn = function () {
} }
} }
}); });
}).callback(this,function () {
// "这场战斗结束之后,就回老家结婚" (划掉)
// "战斗结束后,将进行攻击的 SIGNI 驱逐"
if (event.banishAttackingSigniSource) {
return this.game.blockAsyn(event.banishAttackingSigniSource,card,card.banishAsyn);
}
}).callback(this,function () { }).callback(this,function () {
if (event.prevented) { if (event.prevented) {
return this.game.blockAsyn(this,function () { return this.game.blockAsyn(this,function () {

2
CardInfo.js
View file

@ -121861,7 +121861,7 @@ var CardInfo = {
], ],
costChange: function () { costChange: function () {
if (this.game.turnPlayer === this.player.opponent) return { if (this.game.turnPlayer === this.player.opponent) return {
colorless: 3 costColorless: 3
}; };
var obj = Object.create(this); var obj = Object.create(this);
obj.costChange = null; obj.costChange = null;

2
Player.js
View file

@ -797,7 +797,7 @@ Player.prototype.canUseActionEffect = function (effect,arg) {
if (effect.source.zone !== this.handZone && effect.activatedInHand) return false; if (effect.source.zone !== this.handZone && effect.activatedInHand) return false;
// inTrashZone // inTrashZone
if (effect.source.zone === this.trashZone && !effect.activatedInTrashZone) return false; if (effect.source.zone === this.trashZone && !effect.activatedInTrashZone) return false;
if (effect.source.zone !== this.handZone && effect.activatedInHand) return false; if (effect.source.zone !== this.trashZone && effect.activatedInTrashZone) return false;
// attackPhase && spellCutIn // attackPhase && spellCutIn
if (!arg.ignoreTimming) { if (!arg.ignoreTimming) {
if (arg.spellCutIn) { if (arg.spellCutIn) {