update sp2.js
This commit is contained in:
parent
b1bf033c36
commit
9ae9cd556a
|
@ -1098,7 +1098,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
forced:true,
|
forced:true,
|
||||||
charlotte:true,
|
charlotte:true,
|
||||||
filter:(event,player)=>{
|
filter:(event,player)=>{
|
||||||
return true;
|
|
||||||
var num=player.getStorage('olqifan').length,pos=('jeh').slice(0,num);
|
var num=player.getStorage('olqifan').length,pos=('jeh').slice(0,num);
|
||||||
return num>0&&player.countCards(pos)>0;
|
return num>0&&player.countCards(pos)>0;
|
||||||
},
|
},
|
||||||
|
@ -1123,10 +1122,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
event.result.card=card;
|
event.result.card=card;
|
||||||
player.markAuto('olqifan',[get.type2(card,false)]);
|
player.markAuto('olqifan',[get.type2(card,false)]);
|
||||||
var id=get.id();
|
var id=get.id();
|
||||||
event.getParent().set('olqifan_discard',id);
|
|
||||||
player.when('chooseToUseAfter')
|
player.when('chooseToUseAfter')
|
||||||
|
.filter((evt)=>evt==event.getParent())
|
||||||
.filter(lib.skill.olqifan_discard.filter)
|
.filter(lib.skill.olqifan_discard.filter)
|
||||||
.filter((event)=>event.olqifan_discard==id)
|
|
||||||
.then(()=>{
|
.then(()=>{
|
||||||
event.maxNum=Math.min(3,player.getStorage('olqifan').length);
|
event.maxNum=Math.min(3,player.getStorage('olqifan').length);
|
||||||
event.num=0;
|
event.num=0;
|
||||||
|
|
|
@ -2045,7 +2045,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
var target=trigger.target;
|
var target=trigger.target;
|
||||||
event.target=target;
|
event.target=target;
|
||||||
trigger.targets.remove(target);
|
trigger.targets.remove(target);
|
||||||
trigger.triggeredTargets1.remove(target);
|
//trigger.triggeredTargets1.remove(target);
|
||||||
trigger.untrigger();
|
trigger.untrigger();
|
||||||
game.delayx();
|
game.delayx();
|
||||||
'step 1'
|
'step 1'
|
||||||
|
|
Loading…
Reference in New Issue