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

fix WX05-046 WX14-006A WX14-006B

Browse source
This commit is contained in:
WEBXOSS 2016-12-09 21:41:16 +08:00
parent 9c6fc6b2a8
commit f7b22833ff
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
CardInfo.js
View file

@ -39530,7 +39530,9 @@ var CardInfo = {
}); });
}, },
actionAsyn: function () { actionAsyn: function () {
return this.player.rearrangeOpponentSignisAsyn(); return this.player.rearrangeOpponentSignisAsyn().callback(this,function () {
this.player.draw(1);
});
} }
}], }],
// ====================== // ======================
@ -119773,10 +119775,10 @@ var CardInfo = {
if (concat(cards_A,cards_B,cards_C).length < 3) return null; if (concat(cards_A,cards_B,cards_C).length < 3) return null;
var canSummonWithout = function (signis) { var canSummonWithout = function (signis) {
var signis = this.player.signis.filter(function (signi) { var cards = this.player.signis.filter(function (signi) {
return !inArr(signi,signis); return !inArr(signi,signis);
},this); },this);
return this.canSummonWith(signis); return this.canSummonWith(cards);
}.bind(this); }.bind(this);
var afterCanSummonAsyn = function () { var afterCanSummonAsyn = function () {
@ -119826,11 +119828,11 @@ var CardInfo = {
var signis = []; var signis = [];
// 废弃1只就可以出场的情况 // 废弃1只就可以出场的情况
cards_A.forEach(function (signi) { cards_A.forEach(function (signi) {
if (this.canSummonWithout([signi])) add([signi]) if (canSummonWithout([signi])) add([signi])
},this); },this);
// 废弃2只才能出场的情况 // 废弃2只才能出场的情况
if (cards_A.length === 2) { if (cards_A.length === 2) {
if (this.canSummonWithout(cards_A)) add(cards_A); if (canSummonWithout(cards_A)) add(cards_A);
} }
if (cards_A.length === 3) { if (cards_A.length === 3) {
this.player.signis.forEach(function (signi) { this.player.signis.forEach(function (signi) {
@ -119839,7 +119841,7 @@ var CardInfo = {
return card !== signi; return card !== signi;
})); }));
} }
}); },this);
} }
if (cards.length) { if (cards.length) {
return function () { return function () {
@ -119847,10 +119849,10 @@ var CardInfo = {
return this.player.selectAsyn('TRASH',cards).callback(this,function (card) { return this.player.selectAsyn('TRASH',cards).callback(this,function (card) {
cards_trash.push(card); cards_trash.push(card);
removeFromArr(card,cards_A); removeFromArr(card,cards_A);
if (this.canSummonWithout([card])) return; if (canSummonWithout([card])) return;
// 必须再废弃1只 // 必须再废弃1只
var cards = cards_A.map(function (signi) { var cards = cards_A.filter(function (signi) {
return this.canSummonWithout([card,signi]); return canSummonWithout([card,signi]);
},this); },this);
return this.player.selectAsyn('TRASH',cards).callback(this,function (card) { return this.player.selectAsyn('TRASH',cards).callback(this,function (card) {
cards_trash.push(card); cards_trash.push(card);
@ -120057,7 +120059,7 @@ var CardInfo = {
], ],
startUpEffectTexts_zh_CN: [ startUpEffectTexts_zh_CN: [
"【出】：对战对手的检查区中存在魔法卡的场合，从以下两项中选择1项。这个出现时能力在那个魔法效果之前发动。\n" + "【出】：对战对手的检查区中存在魔法卡的场合，从以下两项中选择1项。这个出现时能力在那个魔法效果之前发动。\n" +
"①从你的卡组顶将3张卡放置到废弃区。\n" + "①从你的卡组顶将3张卡放置到能量区。\n" +
"②从对战对手的废弃区中将至多1张SIGNI和至多1张魔法卡从游戏中除外。", "②从对战对手的废弃区中将至多1张SIGNI和至多1张魔法卡从游戏中除外。",
], ],
startUpEffectTexts_en: [ startUpEffectTexts_en: [
@ -120073,7 +120075,8 @@ var CardInfo = {
description: '1934-attached-0', description: '1934-attached-0',
actionAsyn: function () { actionAsyn: function () {
var cards = this.player.mainDeck.getTopCards(3); var cards = this.player.mainDeck.getTopCards(3);
this.game.trashCards(cards); if (!cards.length) return;
this.game.moveCards(cards,this.player.enerZone);
} }
},{ },{
source: this, source: this,

2
webxoss-client

@ -1 +1 @@
Subproject commit a3310a668d0f3b6232e19ace4e6a3ef993ed3667 Subproject commit 875e069cf6313a156ce40b7e9d07047066553e9f