diff --git a/game/game.js b/game/game.js index 4e1af65fb..363faa90c 100644 --- a/game/game.js +++ b/game/game.js @@ -30033,14 +30033,6 @@ card[2]='sha'; card[3]='thunder'; } - // else if(card[2]=='kamisha'){ - // card[2]='sha'; - // card[3]='kami'; - // } - // else if(card[2]=='icesha'){ - // card[2]='sha'; - // card[3]='ice'; - // } else if(card[2]=='cisha'){ card[2]='sha'; card[3]='stab'; @@ -30066,9 +30058,7 @@ } var cardnum=card[1]||''; if(parseInt(cardnum)==cardnum) cardnum=parseInt(cardnum); - if(cardnum>0&&cardnum<14){ - cardnum=['A','2','3','4','5','6','7','8','9','10','J','Q','K'][cardnum-1]; - } + if(!lib.card[card[2]]){ lib.card[card[2]]={}; } @@ -30084,6 +30074,39 @@ } delete info.global; } + this.suit=card[0]; + this.number=parseInt(card[1])||0; + this.name=card[2]; + + if(_status.connectMode&&!game.online&&lib.cardOL&&!this.cardid){ + this.cardid=get.id(); + lib.cardOL[this.cardid]=this; + } + if(!_status.connectMode&&!_status.video){ + this.cardid=get.id(); + } + + this.$init(card); + + if(this.inits){ + for(var i=0;i0&&cardnum<14){ + cardnum=['A','2','3','4','5','6','7','8','9','10','J','Q','K'][cardnum-1]; + } if(this.name){ this.classList.remove('epic'); this.classList.remove('legend'); @@ -30322,9 +30345,6 @@ } } this.node.name2.innerHTML=get.translation(card[0])+cardnum+' '+name; - this.suit=card[0]; - this.number=parseInt(card[1])||0; - this.name=card[2]; this.classList.add('card'); if(card[3]){ let natures=get.natureList(card[3]); @@ -30336,12 +30356,6 @@ delete this.nature; } if(info.subtype) this.classList.add(info.subtype); - if(this.inits){ - for(var i=0;i