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

Fix bug in useAttackPhaseActionEffect && Fix Anne Cards

Browse source
This commit is contained in:
WEBXOSS 2016-12-05 23:09:00 +08:00
parent d39a7c79a3
commit 838ecd8925
2 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
CardInfo.js
View file

@ -116336,8 +116336,8 @@ var CardInfo = {
description: '1890-const-0', description: '1890-const-0',
optional: true, optional: true,
triggerCondition: function (event) { triggerCondition: function (event) {
if (!this.lrig.hasClass('アン')) return false;
if (this.zone !== this.player.trashZone) return false; if (this.zone !== this.player.trashZone) return false;
if (!this.player.lrig.hasClass('アン')) return false;
if (event.card.type === 'LRIG') { if (event.card.type === 'LRIG') {
return event.preventedByGuard; return event.preventedByGuard;
} }
@ -116440,8 +116440,8 @@ var CardInfo = {
artsEffectTexts_zh_CN: [ artsEffectTexts_zh_CN: [
"连锁 【绿】【蓝】\n" + "连锁 【绿】【蓝】\n" +
"从以下4项中选择最多2项。\n" + "从以下4项中选择最多2项。\n" +
"①将对战对手的之多2只SIGNI横置。\n" + "①将对战对手的至多2只SIGNI横置。\n" +
"②从你的能量区将之多2张卡加入手牌。\n" + "②从你的能量区将至多2张卡加入手牌。\n" +
"③从你的卡组顶将2张卡放置到能量区。\n" + "③从你的卡组顶将2张卡放置到能量区。\n" +
"④你抽2张卡。", "④你抽2张卡。",
"将对战对手的至多2只SIGNI横置。", "将对战对手的至多2只SIGNI横置。",
@ -120477,7 +120477,7 @@ var CardInfo = {
"kana": "コードピルルクアペクス", "kana": "コードピルルクアペクス",
"rarity": "LR", "rarity": "LR",
"cardType": "LRIG", "cardType": "LRIG",
"color": "green/black", "color": "blue/black",
"level": 5, "level": 5,
"limit": 12, "limit": 12,
"power": 0, "power": 0,
@ -122030,40 +122030,40 @@ var CardInfo = {
cardText_zh_CN: "", cardText_zh_CN: "",
cardText_en: "" cardText_en: ""
}, },
"1959": { // "1959": {
"pid": 1959, // "pid": 1959,
cid: 1956, // cid: 1956,
"timestamp": 1479021159712, // "timestamp": 1479021159712,
"wxid": "PR-311", // "wxid": "PR-311",
name: "無二の征服　アレクサンド(WIXOSSお楽しみパック 2016年8-9月 Ver.)", // name: "無二の征服　アレクサンド(WIXOSSお楽しみパック 2016年8-9月 Ver.)",
name_zh_CN: "無二の征服　アレクサンド(WIXOSSお楽しみパック 2016年8-9月 Ver.)", // name_zh_CN: "無二の征服　アレクサンド(WIXOSSお楽しみパック 2016年8-9月 Ver.)",
name_en: "Alexand, Peerless Conquest(WIXOSSお楽しみパック 2016年8-9月 Ver.)", // name_en: "Alexand, Peerless Conquest(WIXOSSお楽しみパック 2016年8-9月 Ver.)",
"kana": "ムニノセイフクアレクサンド", // "kana": "ムニノセイフクアレクサンド",
"rarity": "PR", // "rarity": "PR",
"cardType": "SIGNI", // "cardType": "SIGNI",
"color": "red", // "color": "red",
"level": 2, // "level": 2,
"limit": 0, // "limit": 0,
"power": 8000, // "power": 8000,
"limiting": "", // "limiting": "",
"imgUrl": "http://www.takaratomy.co.jp/products/wixoss/wxwp/images/card/PR/PR-311.jpg", // "imgUrl": "http://www.takaratomy.co.jp/products/wixoss/wxwp/images/card/PR/PR-311.jpg",
"illust": "村上ゆいち", // "illust": "村上ゆいち",
"classes": [ // "classes": [
"精像", // "精像",
"武勇" // "武勇"
], // ],
"costWhite": 0, // "costWhite": 0,
"costBlack": 0, // "costBlack": 0,
"costRed": 0, // "costRed": 0,
"costBlue": 0, // "costBlue": 0,
"costGreen": 0, // "costGreen": 0,
"costColorless": 0, // "costColorless": 0,
"guardFlag": false, // "guardFlag": false,
"multiEner": false, // "multiEner": false,
cardText: "新たな力が戦いの狼煙をあげる。", // cardText: "新たな力が戦いの狼煙をあげる。",
cardText_zh_CN: "", // cardText_zh_CN: "",
cardText_en: "" // cardText_en: ""
}, // },
"1960": { "1960": {
"pid": 1960, "pid": 1960,
cid: 1957, cid: 1957,

3
Player.js
View file

@ -667,6 +667,7 @@ Player.prototype.handleArtsAsyn = function (card,ignoreCost) {
// アンコール费用,约定: 除了颜色费用，其它属性直接覆盖 // アンコール费用,约定: 除了颜色费用，其它属性直接覆盖
if (!card.encore) return; if (!card.encore) return;
var encoredCost = Object.create(costObj); var encoredCost = Object.create(costObj);
encoredCost.source = card;
var enerCostProps = [ var enerCostProps = [
'costColorless', 'costColorless',
'costWhite', 'costWhite',
@ -949,7 +950,7 @@ Player.prototype.useAttackPhaseActionEffect = function () {
return card.actionEffects.some(function (effect) { return card.actionEffects.some(function (effect) {
return this.canUseActionEffect(effect); return this.canUseActionEffect(effect);
},this); },this);
}); },this);
if (!cards.length) return Callback.never(); if (!cards.length) return Callback.never();
return this.selectAsyn('USE_ACTION_EFFECT',cards).callback(this,function (card) { return this.selectAsyn('USE_ACTION_EFFECT',cards).callback(this,function (card) {
var effects = card.actionEffects.filter(function (effect) { var effects = card.actionEffects.filter(function (effect) {