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

Fix WX14-026 && excludeWhenTurnEnd

Browse source
This commit is contained in:
WEBXOSS 2016-12-11 13:14:47 +08:00
parent db0c16a10f
commit efe4dd7cb3
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CardInfo.js
View file

@ -115415,7 +115415,7 @@ var CardInfo = {
"【出】：あなたは手札を１枚捨てる。この方法で捨てたカードが＜鉱石＞または＜宝石＞のシグニで、あなたのルリグが赤の場合、ターン終了時まで、このシグニは【アサシン】を得る。"
],
startUpEffectTexts_zh_CN: [
"【出】：你将1张手牌舍弃。通过这个方法舍弃的卡为<矿石>或者<宝石>SIGNI，且你的LRIG为红色的场合，直到回合结束为止，这只SIGNI获得【枪兵】。"
"【出】：你将1张手牌舍弃。通过这个方法舍弃的卡为<矿石>或者<宝石>SIGNI，且你的LRIG为红色的场合，直到回合结束为止，这只SIGNI获得【暗杀者】。"
],
startUpEffectTexts_en: [
"[On-Play]: Discard 1 card from your hand. If the card that was discarded this way was an <Ore> or <Gem> SIGNI, and your LRIG is red, until end of turn, this SIGNI gets [Assassin]."
@ -115428,7 +115428,7 @@ var CardInfo = {
return card.hasClass('鉱石') || card.hasClass('宝石');
},this);
if (flag) {
this.game.tillTurnEndSet(this,this,'lancer',true);
this.game.tillTurnEndSet(this,this,'assassin',true);
}
});
}

13
Phase.js
View file

@ -276,18 +276,20 @@ Phase.prototype.endPhase = function () {
this.game.effectManager.triggeredEffects.length = 0; // 1回合1次的效果.
this.game.handleFrameEnd();
Callback.immediately().callback(this,function () {
// 处理"回合结束时,把XXX放到废弃区".
// 处理"回合结束时,把XXX放到废弃区" + "回合结束时,把XXX除外".
// 同时触发"回合结束时"时点.
var cards = concat(this.player.signis,this.player.opponent.signis).filter(function (signi) {
if (signi.fieldData.excludeWhenTurnEnd) {
signi.fieldData.excludeWhenTurnEnd = false;
return true;
}
if (signi.fieldData.trashWhenTurnEnd) {
signi.fieldData.trashWhenTurnEnd = false;
return true;
}
},this);
var cards_exclude = concat(this.player.signis,this.player.opponent.signis).filter(function (signi) {
if (signi.fieldData.excludeWhenTurnEnd) {
signi.fieldData.excludeWhenTurnEnd = false;
return true;
}
},this);
[this.player,this.player.opponent].forEach(function (player) {
if (player._trashLifeClothCount) {
cards = cards.concat(player.lifeClothZone.getTopCards(player._trashLifeClothCount));
@ -306,6 +308,7 @@ Phase.prototype.endPhase = function () {
// player.onTurnEnd2 指弃牌之前.
this.player.onTurnEnd2.trigger();
this.game.trashCards(cards);
this.game.excludeCards(cards_exclude);
});
}).callback(this,function () {
// 弃牌