星袁绍、庞山民调整

This commit is contained in:
mengxinzxz 2024-02-11 11:28:04 +08:00
parent 7687b73d91
commit c712bdb101
2 changed files with 11 additions and 11 deletions

View File

@ -1169,14 +1169,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return _status.currentPhase; return _status.currentPhase;
}, },
prompt2:function(event,player){ prompt2:function(event,player){
const num=player.hasSkill('dccaisi_more')?2:1; const num=player.countMark('dccaisi_more')+1;
return `${player==_status.currentPhase?'牌堆':'弃牌'}堆中随机获得${get.cnNumber(num)}张非基本牌`; return `${player==_status.currentPhase?'牌堆':'弃牌'}堆中随机获得${get.cnNumber(num)}张非基本牌`;
}, },
content:function*(event,map){ content:function*(event,map){
const player=map.player,trigger=map.trigger; const player=map.player,trigger=map.trigger;
const position=player==_status.currentPhase?'cardPile':'discardPile'; const position=player==_status.currentPhase?'cardPile':'discardPile';
let cards=[],num=player.hasSkill('dccaisi_more')?2:1; let cards=[],num=player.countMark('dccaisi_more')+1;
player.removeSkill('dccaisi_more');
while(num>0){ while(num>0){
num--; num--;
let card=get[position](card=>get.type(card)!='basic'&&!cards.includes(card)); let card=get[position](card=>get.type(card)!='basic'&&!cards.includes(card));
@ -1189,8 +1188,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
game.log(`但是${position=='discardPile'?'弃':''}牌堆里没有非基本牌!`); game.log(`但是${position=='discardPile'?'弃':''}牌堆里没有非基本牌!`);
} }
player.addTempSkill('dccaisi_more'); player.addTempSkill('dccaisi_more');
player.addMark('dccaisi_more',1,false);
}, },
subSkill:{more:{charlotte:true}}, subSkill:{more:{charlotte:true,onremove:true}},
}, },
dczhuoli:{ dczhuoli:{
audio:2, audio:2,
@ -12055,7 +12055,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dcshizong_info:'当你需要使用一张基本牌时你可以交给一名其他角色X张牌然后其可以将一张牌置于牌堆底视为你使用之。若其不为当前回合角色此技能失效直到回合结束X为你本回合发动〖恃纵〗的次数。', dcshizong_info:'当你需要使用一张基本牌时你可以交给一名其他角色X张牌然后其可以将一张牌置于牌堆底视为你使用之。若其不为当前回合角色此技能失效直到回合结束X为你本回合发动〖恃纵〗的次数。',
pangshanmin:'庞山民', pangshanmin:'庞山民',
dccaisi:'才思', dccaisi:'才思',
dccaisi_info:'当你于回合内/回合外使用基本牌结算结束后,若你本回合以此法得到的牌数小于你的体力上限,你可以从牌堆/弃牌堆随机获得一张非基本牌,然后本回合下次发动此技能获得的牌数+1。', dccaisi_info:'当你于回合内/回合外使用基本牌结算结束后,若你本回合以此法得到的牌数小于你的体力上限,你可以从牌堆/弃牌堆随机获得一张非基本牌,然后本回合发动此技能获得的牌数+1。',
dczhuoli:'擢吏', dczhuoli:'擢吏',
dczhuoli_info:'锁定技。一名角色的回合结束时若你本回合使用或获得的牌数大于体力值你加1点体力上限不能超过存活角色数回复1点体力。', dczhuoli_info:'锁定技。一名角色的回合结束时若你本回合使用或获得的牌数大于体力值你加1点体力上限不能超过存活角色数回复1点体力。',
yue_caiyong:'乐蔡邕', yue_caiyong:'乐蔡邕',

View File

@ -162,7 +162,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
const type=get.type(card,player); const type=get.type(card,player);
if(type!='basic'&&type!='trick') return false; if(type!='basic'&&type!='trick') return false;
return lib.filter.cardUsable(card,player)&&game.hasPlayer(target=>{ return lib.filter.cardUsable(card,player)&&game.hasPlayer(target=>{
return lib.filter.targetEnabled2(card,player,target)&&lib.filter.targetInRange(card,player,target); return lib.filter.targetEnabled2(card,player,target)/*&&lib.filter.targetInRange(card,player,target)*/;
}); });
}); });
if(!cards.length) return false; if(!cards.length) return false;
@ -177,7 +177,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
const type=get.type(card,player); const type=get.type(card,player);
if(type!='basic'&&type!='trick') return false; if(type!='basic'&&type!='trick') return false;
return lib.filter.cardUsable(card,player)&&game.hasPlayer(target=>{ return lib.filter.cardUsable(card,player)&&game.hasPlayer(target=>{
return lib.filter.targetEnabled2(card,player,target)&&lib.filter.targetInRange(card,player,target); return lib.filter.targetEnabled2(card,player,target)/*&&lib.filter.targetInRange(card,player,target)*/;
}); });
}); });
if(!cards.includes(card)) return false; if(!cards.includes(card)) return false;
@ -195,14 +195,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
else if(typeof select=='function') range=select(card,player); else if(typeof select=='function') range=select(card,player);
game.checkMod(card,player,range,'selectTarget',player); game.checkMod(card,player,range,'selectTarget',player);
const cards=player.getCards('h',cardx=>card!=cardx&&get.suit(card,player)==get.suit(cardx,player)); const cards=player.getCards('h',cardx=>card!=cardx&&get.suit(card,player)==get.suit(cardx,player));
let targets=game.filterPlayer(target=>lib.filter.targetEnabled2(card,player,target)&&lib.filter.targetInRange(card,player,target)&&get.effect(target,card,player,player)>0); let targets=game.filterPlayer(target=>lib.filter.targetEnabled2(card,player,target)/*&&lib.filter.targetInRange(card,player,target)*/&&get.effect(target,card,player,player)>0);
const max=range[1],max2=Math.min(cards.length,targets.length); const max=range[1],max2=Math.min(cards.length,targets.length);
if(max>max2) return 0; if(max>max2) return 0;
targets=targets.sort((a,b)=>get.effect(b,card,player,player)-get.effect(a,card,player,player)).slice(0,max2); targets=targets.sort((a,b)=>get.effect(b,card,player,player)-get.effect(a,card,player,player)).slice(0,max2);
const sum=targets.reduce((num,target)=>num+get.effect(target,card,player,player),0); const sum=targets.reduce((num,target)=>num+get.effect(target,card,player,player),0);
if(max==-1){ if(max==-1){
if(game.filterPlayer(target=>{ if(game.filterPlayer(target=>{
return lib.filter.targetEnabled2(card,player,target)&&lib.filter.targetInRange(card,player,target); return lib.filter.targetEnabled2(card,player,target)/*&&lib.filter.targetInRange(card,player,target)*/;
}).reduce((num,target)=>num+get.effect(target,card,player,player),0)>sum) return 0; }).reduce((num,target)=>num+get.effect(target,card,player,player),0)>sum) return 0;
} }
return sum; return sum;
@ -217,7 +217,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
const cardx=new lib.element.VCard({name:get.name(card,player),nature:get.nature(card,player),cards:cards}); const cardx=new lib.element.VCard({name:get.name(card,player),nature:get.nature(card,player),cards:cards});
const {result:{bool,targets}}=await player.chooseTarget((card,player,target)=>{ const {result:{bool,targets}}=await player.chooseTarget((card,player,target)=>{
//return player.canUse(get.event('cardx'),target); //return player.canUse(get.event('cardx'),target);
return lib.filter.targetEnabled2(get.event('cardx'),player,target)&&lib.filter.targetInRange(get.event('cardx'),player,target); return lib.filter.targetEnabled2(get.event('cardx'),player,target)/*&&lib.filter.targetInRange(get.event('cardx'),player,target)*/;
},true).set('cardx',cardx).set('selectTarget',[1,cards.length]) },true).set('cardx',cardx).set('selectTarget',[1,cards.length])
.set('prompt','请选择'+(game.hasNature(cardx)?get.translation(get.nature(cardx)):'')+'【'+get.translation(cardx)+'】('+get.translation(cards)+')的目标') .set('prompt','请选择'+(game.hasNature(cardx)?get.translation(get.nature(cardx)):'')+'【'+get.translation(cardx)+'】('+get.translation(cards)+')的目标')
.set('ai',target=>{ .set('ai',target=>{
@ -11391,7 +11391,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
starxiaoyan:'硝焰', starxiaoyan:'硝焰',
starxiaoyan_info:'锁定技游戏开始时你对所有其他角色各造成1点火属性伤害然后这些角色可依次交给你一张牌并回复1点体力。', starxiaoyan_info:'锁定技游戏开始时你对所有其他角色各造成1点火属性伤害然后这些角色可依次交给你一张牌并回复1点体力。',
starzongshi:'纵势', starzongshi:'纵势',
starzongshi_info:'出牌阶段,你可以展示一张可展示目标的基本牌或普通锦囊牌,然后你将手牌中所有与此牌花色相同的其他牌当作此牌使用,且此牌至多指定转化牌数的目标。', starzongshi_info:'出牌阶段,你可以展示一张可展示目标的基本牌或普通锦囊牌,然后你将手牌中所有与此牌花色相同的其他牌当作此牌使用(无距离限制),且此牌至多指定转化牌数的目标。',
starjiaowang:'骄妄', starjiaowang:'骄妄',
starjiaowang_info:'锁定技非首轮游戏开始时若上一轮没有角色死亡因〖硝焰〗死亡的角色除外则你失去1点体力并发动〖硝焰〗。', starjiaowang_info:'锁定技非首轮游戏开始时若上一轮没有角色死亡因〖硝焰〗死亡的角色除外则你失去1点体力并发动〖硝焰〗。',
staraoshi:'傲势', staraoshi:'傲势',