diff --git a/Card.js b/Card.js index 4c9ffa9..8087e81 100644 --- a/Card.js +++ b/Card.js @@ -964,10 +964,12 @@ Card.prototype.attackAsyn = function () { throw 'Not enough attack cost!' } } - // <バインド・ウェポンズ> + // <バインド・ウェポンズ>, <白羅星 フルムーン> if (this.type === 'SIGNI') { var attackCount = this.game.getData(this,'attackCount') || 0; this.game.setData(this,'attackCount',++attackCount); + var signiAttackCount = this.game.getData(this.player,'signiAttackCount') || 0; + this.game.setData(this.player,'signiAttackCount',++signiAttackCount); } else { var lrigAttackCount = this.game.getData(this.player,'lrigAttackCount') || 0; this.game.setData(this.player,'lrigAttackCount',++lrigAttackCount); diff --git a/CardInfo.js b/CardInfo.js index 0b61631..4086870 100644 --- a/CardInfo.js +++ b/CardInfo.js @@ -107479,6 +107479,7 @@ var CardInfo = { constEffects: [{ action: function (set,add) { this.player.signis.forEach(function (signi) { + if (signi === this) return; if (!signi.resona) return; add(signi,'effectFilters',function (card) { return (card.player === this.player) || (card.type !== 'SIGNI'); diff --git a/Mask.js b/Mask.js index b53722c..5cd3e01 100644 --- a/Mask.js +++ b/Mask.js @@ -45,9 +45,11 @@ Mask.prototype.set = function (reset) { effect.disabled = true; },this); } else { - if (!reset && inArr(this.prop,Card.abilityProps) && (target.canNotGainAbility || target.player.canNotGainAbility)) { + if (inArr(this.prop,Card.abilityProps)) { // 不能获得新能力 - return; + if (reset) return; + if (target.canNotGainAbility) return; + if (target.player && target.player.canNotGainAbility) return; } target[this.prop] = this.value; }