Merge pull request #851 from PZ157/PR-Branch

合曹芳加入常备主
This commit is contained in:
Spmario233 2024-01-25 22:18:19 +08:00 committed by GitHub
commit 41441e6436
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 5 deletions

View File

@ -62,7 +62,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
jsrg_simayi:['male','wei',4,['jsrgyingshi','jsrgtuigu']],
jsrg_guoxun:['male','wei',4,['jsrgeqian','jsrgfusha']],
jsrg_sunlubansunluyu:['female','wu',3,['jsrgdaimou','jsrgfangjie']],
jsrg_caofang:['male','wei','3/4',['jsrgzhaotu','jsrgjingju','jsrgweizhui']],
jsrg_caofang:['male','wei','3/4',['jsrgzhaotu','jsrgjingju','jsrgweizhui'],['zhu']],
jsrg_sunjun:['male','wu',4,['jsrgyaoyan','jsrgbazheng']],
jsrg_liuyong:['male','shu',3,['jsrgdanxin','jsrgfengxiang']],
jsrg_weiwenzhugezhi:['male','wu',4,['jsrgfuhai']],

View File

@ -2597,7 +2597,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){
'step 0'
event.targets=trigger.targets.filter(i=>!i.isLinked());
player.logSkill('sblianhuan_discard',event.targets);
if(!event.targets.length) event.finish();
else player.logSkill('sblianhuan_discard',event.targets);
'step 1'
var target=targets.shift();
var cards=target.getCards('h',card=>{

View File

@ -605,6 +605,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return player.hasCard(card=>get.type2(card)=='trick','hs');
},
check:function(card){
if(get.itemtype(card)!=='card') return true;
if(get.event().type=='dying') return 1/Math.max(0.1,get.value(card));
return 4-get.value(card);
},

View File

@ -712,10 +712,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player:"damageEnd",
},
filter:function(event,player){
return event.source&&event.source.isIn()&&!player.getStorage('xinfu_weilu_effect').includes(event.source)
return event.source&&event.source.isIn()&&!player.getStorage('xinfu_weilu_effect').includes(event.source);
},
check:function (event,player){
return (get.effect(target,{name:'losehp'},player,player)>=0);
check:function(event,player){
return get.effect(event.source,{name:'losehp'},player,player)>=0;
},
forced:true,
logTarget:"source",