YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

c

This commit is contained in:
libccy 2017-02-25 12:17:03 +08:00
parent e5d35123c9
commit 88fde2ae78
2 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
character/sp.js
View File

@ -3260,11 +3260,13 @@ character.sp={
'step 0' 'step 0'
player.choosePlayerCard('hej',target,true); player.choosePlayerCard('hej',target,true);
'step 1' 'step 1'
if(result.bool&&result.links&&result.links.length){
target.$give(result.links,player); target.$give(result.links,player);
target.lose(result.links,ui.special); target.lose(result.links,ui.special);
player.storage.yinling.push(result.links[0]); player.storage.yinling.push(result.links[0]);
player.markSkill('yinling'); player.markSkill('yinling');
player.syncStorage('yinling'); player.syncStorage('yinling');
}
}, },
ai:{ ai:{
order:10.1, order:10.1,

27
game/game.js
View File

@ -11724,12 +11724,6 @@
else if(next.card==undefined){ else if(next.card==undefined){
if(next.cards){ if(next.cards){
next.card=next.cards[0]; next.card=next.cards[0];
if(!next.skill){
var info=get.info(next.card);
if(info.autoViewAs){
next.card={name:info.autoViewAs,suit:next.card.suit,number:next.card.number};
}
}
} }
} }
if(!next.targets){ if(!next.targets){
@ -11737,7 +11731,10 @@
} }
if(next.card){ if(next.card){
var info=get.info(next.card); var info=get.info(next.card);
if(info){ if(info.autoViewAs){
next.card={name:info.autoViewAs};
info=get.info(next.card);
}
if(info.changeTarget){ if(info.changeTarget){
info.changeTarget(next.player,next.targets); info.changeTarget(next.player,next.targets);
} }
@ -11749,6 +11746,8 @@
next.addedTarget=next.addedTargets[0]; next.addedTarget=next.addedTargets[0];
} }
} }
if(get.itemtype(next.card)!='card'&&next.cards.length){
next.card.cards=next.cards.slice(0);
} }
} }
for(var i=0;i<next.targets.length;i++){ for(var i=0;i<next.targets.length;i++){
@ -35836,6 +35835,9 @@
} }
return suit; return suit;
} }
else if(get.itemtype(card.cards)=='cards'){
return get.suit(card.cards);
}
else{ else{
if(get.owner(card)){ if(get.owner(card)){
return game.checkMod(card,card.suit,'suit',get.owner(card).get('s')); return game.checkMod(card,card.suit,'suit',get.owner(card).get('s'));
@ -35851,6 +35853,9 @@
} }
return color; return color;
} }
else if(get.itemtype(card.cards)=='cards'){
return get.color(card.cards);
}
else{ else{
if(get.suit(card)=='spade'||get.suit(card)=='club') return 'black'; if(get.suit(card)=='spade'||get.suit(card)=='club') return 'black';
if(get.suit(card)=='heart'||get.suit(card)=='diamond') return 'red'; if(get.suit(card)=='heart'||get.suit(card)=='diamond') return 'red';
@ -35994,7 +35999,11 @@
card:function(original){ card:function(original){
if(_status.event.skill){ if(_status.event.skill){
var card=get.info(_status.event.skill).viewAs; var card=get.info(_status.event.skill).viewAs;
if(card) return card; if(card){
card=get.copy(card);
card.cards=ui.selected.cards.slice(0);
}
return card;
} }
if(_status.event._get_card){ if(_status.event._get_card){
return _status.event._get_card; return _status.event._get_card;
@ -36004,7 +36013,7 @@
if(card){ if(card){
var info=get.info(card); var info=get.info(card);
if(info.autoViewAs){ if(info.autoViewAs){
card={name:info.autoViewAs,suit:card.suit,number:card.number}; card={name:info.autoViewAs,cards:ui.selected.cards.slice(0)};
} }
} }
return card; return card;