Update sp.js

This commit is contained in:
Spmario233 2023-09-18 11:10:30 +08:00
parent 9b08c5b684
commit b8b25a6b21
1 changed files with 10 additions and 7 deletions

View File

@ -1096,19 +1096,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{player:'chooseToUseAfter'}, trigger:{player:'chooseToUseAfter'},
forced:true, forced:true,
charlotte:true, charlotte:true,
filter:function(event,player){ filter:(event,player)=>{
if(!event.olqifan_discard) return false; if(!event.olqifan_discard) return false;
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;
}, },
content:function(){ content:function(){
'step 0'
event.num=Math.min(3,player.getStorage('olqifan').length);
'step 1'
event.num--;
var pos=('jeh')[event.num],hs=player.countCards(pos); var pos=('jeh')[event.num],hs=player.countCards(pos);
if(hs>0) player.chooseToDiscard(hs,pos,true); if(hs>0) player.chooseToDiscard(hs,pos,true);
if(event.num>0) event.redo(); event.num++;
if(event.num<event.maxNum) event.redo();
}, },
}, },
}, },
@ -1125,7 +1122,13 @@ 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)]);
event.getParent().set('olqifan_discard',true); event.getParent().set('olqifan_discard',true);
player.addTempSkill('olqifan_discard'); player.when('chooseToUseAfter')
.filter(lib.skill.olqifan_discard.filter)
.then(()=>{
event.maxNum=Math.min(3,player.getStorage('olqifan').length);
event.num=0;
})
.then(lib.skill.olqifan_discard.content)
}, },
filterCard:function(){return false}, filterCard:function(){return false},
selectCard:-1, selectCard:-1,