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

Fix PR-309 WX14-002 WX14-075 WX14-045 WX14-050 WX14-066 WX14-011

Browse source
This commit is contained in:
WEBXOSS 2016-12-06 14:06:56 +08:00
parent 0acb42a949
commit 9f7df4f0a9
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
CardInfo.js
View file

@ -115332,7 +115332,7 @@ var CardInfo = {
actionAsyn: function () { actionAsyn: function () {
return this.banishSigniAsyn().callback(this,function () { return this.banishSigniAsyn().callback(this,function () {
this.player.opponent.draw(1); this.player.opponent.draw(1);
this.player.enerCharge(1); this.player.opponent.enerCharge(1);
}); });
} }
}] }]
@ -117110,7 +117110,7 @@ var CardInfo = {
var c = costArg.others; var c = costArg.others;
if (!c) return; if (!c) return;
var filter = function (card) { var filter = function (card) {
return (card.cid !== 1899) && (card.level <= 4) && card.hasClass('天使') && card.hasSameColorWith(c); return (card.cid !== 1899) && (card.level <= 4) && card.hasSameColorWith(c);
}; };
return this.player.seekAsyn(filter,1); return this.player.seekAsyn(filter,1);
} }
@ -117418,7 +117418,7 @@ var CardInfo = {
"timestamp": 1479021151502, "timestamp": 1479021151502,
"wxid": "WX14-075", "wxid": "WX14-075",
name: "探究の死相　†ハニエル†", name: "探究の死相　†ハニエル†",
name_zh_CN: "探究的死相 †堕落汉尼尔†", name_zh_CN: "探究的死相 †堕落汉尼尔†",
name_en: "†Haniel†, Death's Shadow of Seeking", name_en: "†Haniel†, Death's Shadow of Seeking",
"kana": "タンキュウノシソウフォールンハニエル", "kana": "タンキュウノシソウフォールンハニエル",
"rarity": "C", "rarity": "C",
@ -117464,6 +117464,7 @@ var CardInfo = {
},this); },this);
return this.player.selectOptionalAsyn('REVEAL',cards,true).callback(this,function (card) { return this.player.selectOptionalAsyn('REVEAL',cards,true).callback(this,function (card) {
if (!card) return this.trashAsyn(); if (!card) return this.trashAsyn();
return this.player.opponent.showCardsAsyn([card]);
}); });
} }
}], }],
@ -119294,7 +119295,7 @@ var CardInfo = {
description: '1927-const-0', description: '1927-const-0',
optional: true, optional: true,
triggerCondition: function (event) { triggerCondition: function (event) {
if (evnet.card.type !== 'SIGNI') return false; if (event.card.type !== 'SIGNI') return false;
if (event.card.isEffectFiltered()) return false; if (event.card.isEffectFiltered()) return false;
return true; return true;
}, },
@ -120389,10 +120390,10 @@ var CardInfo = {
description: '1937-const-0', description: '1937-const-0',
triggerCondition: function (event) { triggerCondition: function (event) {
if (!this.game.phase.isAttackPhase()) return false; if (!this.game.phase.isAttackPhase()) return false;
var effect = this.game.getEffectSource(); var source = this.game.getEffectSource();
if (!effect) return false; if (!source) return false;
if (!inArr(effect.card.type,['LRIG','SIGNI'])) return false; if (!inArr(event.card.type,['LRIG','SIGNI'])) return false;
if (!inArr(effect.oldZone,[this.player.handZone,this.player.mainDeck])) return false; if (!inArr(event.oldZone,[this.player.handZone,this.player.mainDeck])) return false;
if (event.newZone !== this.player.enerZone) return false; if (event.newZone !== this.player.enerZone) return false;
return true; return true;
}, },
@ -120542,8 +120543,15 @@ var CardInfo = {
costExceed: 2, costExceed: 2,
actionAsyn: function () { actionAsyn: function () {
var cards = this.player.trashZone.cards.filter(function (card) { var cards = this.player.trashZone.cards.filter(function (card) {
return (card.type === 'SPELL') && (card.hasColor('blue') || card.hasColor('black')); var flag = (card.type === 'SPELL') && (card.hasColor('blue') || card.hasColor('black'));
}); if (!flag) return false;
var obj = Object.create(card);
obj.costBlue -= 1;
if (obj.costBlue < 0) obj.costBlue = 0;
obj.costBlack -= 1;
if (obj.costBlack < 0) obj.costBlack = 0;
return this.player.enoughCost(obj);
},this);
return this.player.selectOptionalAsyn('TARGET',cards).callback(this,function (card) { return this.player.selectOptionalAsyn('TARGET',cards).callback(this,function (card) {
var obj = Object.create(card); var obj = Object.create(card);
obj.costBlue -= 1; obj.costBlue -= 1;
@ -121935,7 +121943,6 @@ var CardInfo = {
], ],
constEffects: [{ constEffects: [{
duringGame: true, duringGame: true,
activatedInTrashZone: true,
fixed: true, fixed: true,
action: function (set,add) { action: function (set,add) {
var effect = this.game.newEffect({ var effect = this.game.newEffect({
@ -121943,14 +121950,14 @@ var CardInfo = {
description: '1957-const-0', description: '1957-const-0',
optional: true, optional: true,
triggerCondition: function (event) { triggerCondition: function (event) {
return (event.oldZone === this.player.trashZone); return (this.zone === this.player.trashZone) && (event.oldZone === this.player.trashZone);
}, },
condition: function () { condition: function () {
return this.canSummon(); return this.canSummon();
}, },
actionAsyn: function () { actionAsyn: function () {
return this.summonAsyn().callback(this,function () { return this.summonAsyn().callback(this,function () {
this.filedData.excludeWhenTurnEnd = true; this.fieldData.excludeWhenTurnEnd = true;
}); });
} }
}); });
@ -123570,7 +123577,7 @@ var CardInfo = {
return this.player.selectAsyn('TRASH',cards_B).callback(this,function (card) { return this.player.selectAsyn('TRASH',cards_B).callback(this,function (card) {
if (!card) return; if (!card) return;
cards_trash.push(card); cards_trash.push(card);
return this.game.trashCardsAsyn(); return this.game.trashCardsAsyn(cards_trash);
}); });
}); });
}, },