mirrors/webxoss-core
1
0
Fork 1
mirror of https://github.com/webxoss/webxoss-core.git synced 2024-11-20 06:49:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #29 from webxoss/fix

Browse source 
fix WX12-047 WX12-048
This commit is contained in:
webxoss 2017-02-09 22:00:39 +08:00 • committed by GitHub
commit 33a09df928
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Card.js
View file

@ -101,6 +101,7 @@ function Card (game,player,zone,pid,side) {
this.charm = null; // 魅饰卡
this._data = null; // 私有的数据储存,约定: 只能在 CardInfo.js 自身的代码里访问
this.fieldData = {}; // 离场即清空的数据
this.fieldTurnData = {}; // 离场或回合结束即清空的数据
// 时点
this.onMove = new Timming(game);
@ -449,7 +450,7 @@ Card.prototype.canAttack = function () {
// <バインド・ウェポンズ>
if (this.type === 'SIGNI') {
var attackCount = this.fieldData.attackCount || 0;
var attackCount = this.fieldTurnData.attackCount || 0;
if (attackCount >= this.player.signiAttackCountLimit) return false;
} else {
var lrigAttackCount = this.game.getData(this.player,'lrigAttackCount') || 0;
@ -759,6 +760,7 @@ Card.prototype.moveTo = function (zone,arg) {
leaveFieldEvent = moveEvent;
card.frozen = false;
card.fieldData = {};
card.fieldTurnData = {};
charm = card.charm;
card.charm = null;
removeFromArr(card,card.player.signis);
@ -1019,8 +1021,8 @@ Card.prototype.attackAsyn = function () {
}
// <バインド・ウェポンズ>, <白羅星　フルムーン>
if (this.type === 'SIGNI') {
var attackCount = this.fieldData.attackCount || 0;
this.fieldData.attackCount++;
var attackCount = this.fieldTurnData.attackCount || 0;
this.fieldTurnData.attackCount = ++attackCount;
var signiAttackCount = this.game.getData(this.player,'signiAttackCount') || 0;
this.game.setData(this.player,'signiAttackCount',++signiAttackCount);
} else {

4
CardInfo.js
View file

@ -98877,7 +98877,7 @@ var CardInfo = {
source: this,
description: '1629-const-1',
condition: function () {
return this.fieldData.attackCount > 0;
return this.fieldTurnData.attackCount > 0;
},
actionAsyn: function () {
return this.player.discardAsyn(1);
@ -98952,7 +98952,7 @@ var CardInfo = {
source: this,
description: '1630-const-1',
condition: function () {
return this.fieldData.attackCount > 0;
return this.fieldTurnData.attackCount > 0;
},
actionAsyn: function () {
return this.player.discardAsyn(1);

3
Phase.js
View file

@ -333,6 +333,9 @@ Phase.prototype.endPhase = function () {
Phase.prototype.wixoss = function () {
this.additionalTurn = !!this.game.getData(this.player,'additionalTurn');
this.game.clearData();
this.game.cards.forEach(function (card) {
card.fieldTurnData = {}
});
this.status = '';
this.player.usedActionEffects.length = 0;
this.player.opponent.usedActionEffects.length = 0;