diff --git a/CardInfo.js b/CardInfo.js index 3cc0f40..0bfa0bb 100644 --- a/CardInfo.js +++ b/CardInfo.js @@ -123898,8 +123898,6 @@ var CardInfo = { layer: true, auto: 'onAttack', effect: { - source: this, - description: '2421-const-0', condition: function () { return this.getOpposingSigni(); }, @@ -123913,8 +123911,6 @@ var CardInfo = { layer: true, auto: 'onBanish', effect: { - source: this, - description: '2421-const-1', actionAsyn: function () { return this.player.selectOpponentSigniAsyn().callback(this,function (signi) { if (!signi) return; @@ -124572,7 +124568,6 @@ var CardInfo = { artsEffect: [{ actionAsyn: function () { var effects = [{ - index: 0, source: this, description: '2435-attached-0', actionAsyn: function () { @@ -124584,58 +124579,34 @@ var CardInfo = { }); }, },{ - index: 1, source: this, description: '2435-attached-1', actionAsyn: function () { this.game.tillTurnEndSet(this,this.player.opponent.lrig,'canNotAttack',true); }, },{ - index: 2; source: this, description: '2435-attached-2', actionAsyn: function () { - var cards_add = []; - var cards = this.player.mainDeck.cards.filter(function (card) { + var filter = function (card) { return card.hasClass('怪異'); - },this); - selectOptionalAsyn - return this.player.selectOptionalAsyn('SEEK',cards).callback(this,function (card) { - if (!card) return - cards_add.push(card); - var level = card.level; - cards = this.player.mainDeck.cards.filter(function (card) { - return card.hasClass('怪異') && (card.level !== level); - },this); - }).callback(this,function() { - return this.player.selectOptionalAsyn('SEEK',cards).callback(this,function (card) { - if (!card) return; - cards_add.push(card); - }); - }).callback(this,function() { - return this.player.opponent.showCardsAsyn(cards_add).callback(this,function () { - if (!cards_add.length) return; - this.game.moveCards(cards_add,this.player.handZone); - this.player.shuffle(); - }); + }; + return this.player.seekAsyn(filter,1).callback(this,function(cards) { + if (cards.length) { + filter = function (card) { + return card.hasClass('怪異') && (card.level !== cards[0].level); + }; + } + return this.player.seekAsyn(filter,1); }); }, }]; - // 玩家2次选择要发动的效果,可以重复选择。 bet后有4次。 - var chosen_effects = []; var count = costArg.bet ? 4 : 2; - return CallBack.loop(this,count,function() { - return this.player.selectAsyn('LAUNCH',effects).callback(this,function (effect) { - if (!effect) return; - chosen_effects.push(effects) - }); - }).callback(this,function() { - if (!chosen_effects.length) return; - // 按照1,2,3的顺序发动效果 - chosen_effects.sort(function (a,b) { - return a.index < b.index; - }); - return CallBack.forEach(chosen_effects,function (effect) { + effects = (costArg.bet ? [0,0,0,0,1,1,1,1,2,2,2,2] : [0,0,1,1,2,2]).map(function (index) { + return effects[index]; + },this) + return this.player.selectSomeAsyn('LAUNCH',effects,0,count).callback(this,function (effects) { + return Callback.forEach(effects,function (effect) { return effect.actionAsyn.call(this); },this); }); @@ -126105,12 +126076,12 @@ var CardInfo = { effect: { source: this, description: '2461-const-0', - condition: function () { - return (this.zone === this.player.enerZone); - }, triggerCondition: function () { return (this.game.turnPlayer === this.player.opponent); }, + condition: function () { + return (this.zone === this.player.enerZone); + }, optional: true, actionAsyn: function () { // TODO: FAQ WD17-006(孤立无炎:破坏对方所有Signi)发动,所有被驱逐的怪异都可以发动返回手牌的效果 @@ -128526,7 +128497,7 @@ var CardInfo = { return this.player.selectSomeTargetsAsyn(cards,2,2).callback(this,function (cards) { if (!cards.length) return; return Callback.forEach(cards,function(card) { - card.bounceAsyn(); + return card.bounceAsyn(); },this); }); },