Never Ending BUGFIX

This commit is contained in:
Spmario233 2023-09-27 22:32:41 +08:00
parent 03ef363680
commit 3e25256914
10 changed files with 27 additions and 29 deletions

View File

@ -2189,7 +2189,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:2,
clanSkill:true,
audioname:['clan_wuxian','clan_wuban','clan_wukuang'],
trigger:{player:'phaseZhunbeiBegin'},
trigger:{player:'phaseBegin'},
isMax:function(player){
var num=player.getHandcardLimit();
return !game.hasPlayer(function(current){
@ -2283,7 +2283,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
clanguixiang:'贵相',
clanguixiang_info:'锁定技。你的非出牌阶段开始前若此阶段即将成为你本回合内的第X个阶段X为你的手牌上限则你终止此阶段改为进行一个出牌阶段。',
clanmuyin:'穆荫',
clanmuyin_info:'宗族技。准备阶段,你可以选择一名手牌上限不为全场最多的陈留吴氏角色。该角色的手牌上限+1。',
clanmuyin_info:'宗族技。回合开始时,你可以选择一名手牌上限不为全场最多的陈留吴氏角色。该角色的手牌上限+1。',
chenliuwushi:'陈留·吴氏',
clan_wuban:'族吴班',
clanzhanding:'斩钉',

View File

@ -190,14 +190,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
const character=node.link,characterInfo=get.character(node.link);
let capt=get.translation(character);
if(characterInfo){
const infoSex=characterInfo[0];
if(infoSex) capt+=`  ${infoSex=='none'?'无':lib.translate[infoSex]}`;
const infoGroup=characterInfo[1];
if(infoGroup){
const group=get.is.double(character,true);
if(group) capt+=`  ${group.map(value=>get.translation(value)).join('/')}`;
else capt+=`  ${lib.translate[infoGroup]}`;
}
const infoHp=get.infoMaxHp(characterInfo[2]);
capt+=`  范围:${infoHp}`;
}
uiintro.add(capt);

View File

@ -3051,7 +3051,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{target:'useCardToTargeted'},
forced:true,
filter:function(event,player){
return get.type2(event.card)=='trick'&&(event.targets.length==1||player.countCards('he')>0);
return player!=event.player&&get.type2(event.card)=='trick'&&(event.targets.length==1||player.countCards('he')>0);
},
content:function(){
if(trigger.targets.length==1) player.draw();
@ -10138,7 +10138,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dcqinqing:'寝情',
dcqinqing_info:'结束阶段,你可以弃置一名攻击范围内包含一号位的其他角色一张牌。然后若其手牌数大于一号位,你摸一张牌。',
dccunwei:'存畏',
dccunwei_info:'锁定技。当你成为锦囊牌的目标后,若你是唯一目标,你摸一张牌;否则你弃置一张牌。',
dccunwei_info:'锁定技。当你成为其他角色使用的锦囊牌的目标后,若你是唯一目标,你摸一张牌;否则你弃置一张牌。',
dc_zhaotongzhaoguang:'赵统赵广',
dcqingren:'青刃',
dcqingren_info:'结束阶段你可以摸X张牌X为你本回合发动〖翊赞〗的次数。',

View File

@ -11122,8 +11122,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){
'step 0'
trigger.cancel();
var cards=trigger.cards.filterInD();
if(cards.length) player.gain(cards,'gain2','log');
if(trigger.cards){
var cards=trigger.cards.filterInD();
if(cards.length) player.gain(cards,'gain2','log');
}
'step 1'
player.loseMaxHp();
},

View File

@ -2013,7 +2013,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
prompt:function(event){
var player=_status.event.player;
return '将一张'+get.translation(player.storage.pshuxiao_use.suit)+'牌或点数为'+get.strNumber(player.storage.pshuxiao_use.number)+'的牌当'+(player.storage.pshuxiao_use.card.nature?player.storage.pshuxiao_use.card.nature:'')+'【'+get.translation(player.storage.pshuxiao_use.card.name)+'】使用';
return '将一张'+get.translation(player.storage.pshuxiao_use.suit)+'牌或点数为'+get.strNumber(player.storage.pshuxiao_use.number)+'的牌当'+(player.storage.pshuxiao_use.card)+'使用';
}
}
}

View File

@ -4492,7 +4492,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
reyanyu2:{
trigger:{player:'phaseUseEnd'},
direct:true,
filter:(event,player)=>player.hasHistory('useSkill',evt=>evt.skill=='reyanyu'&&evt.event.getParent(2)==event),
filter:(event,player)=>player.hasHistory('useSkill',evt=>evt.skill=='reyanyu'&&evt.event.getParent(2)==event)&&game.hasPlayer(target=>target.hasSex('male')&&target!=player),
content:function(){
'step 0'
event.num=Math.min(3,player.getHistory('useSkill',evt=>evt.skill=='reyanyu'&&evt.event.getParent(2)==trigger).length);

View File

@ -607,10 +607,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
lose:false,
delay:false,
filter:function(event,player){
return player.countCards('hes',{suit:'diamond'})>0;
return player.hasCard(card=>get.suit(card)=='diamond','hes')||game.hasPlayer(current=>current.hasJudge('lebu'));
},
position:'hes',
filterCard:{suit:'diamond'},
filterCard:function(card,player){
if(get.suit(card)!='diamond') return false;
var mod=game.checkMod(ui.selected.cards[0],player,'unchanged','cardEnabled2',player);
if(!mod) return false;
return true;
},
selectCard:[0,1],
filterTarget:function(card,player,target){
if(!ui.selected.cards.length){
@ -618,10 +623,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return false;
}
if(player==target) return false;
var mod=game.checkMod(ui.selected.cards[0],player,'unchanged','cardEnabled2',player);
if(!mod) return false;
return player.canUse({name:'lebu',cards:ui.selected.cards},target);
return player.canUse(get.autoViewAs({name:'lebu'},ui.selected.cards),target);
},
complexSelect:true,
check:function(card){
return 7-get.value(card);
},

View File

@ -13461,9 +13461,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var hs=player.getCards('h');
for(var i=0;i<hs.length;i++){
var hi=hs[i];
if(hi.name=='tao'||game.hasPlayer(function(current){
return target.canUse(hi,current)&&get.effect(current,hi,target,target);
})) return 1;
if(hi.name=='tao'||target.hasValueTarget(hi,null,true)) return 1;
}
return get.damageEffect(target,player,target);
},
@ -14565,7 +14563,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
twchongwang_info:'主公技,其他群势力角色的出牌阶段开始时,其可以交给你一张牌,然后你与其使用【杀】或伤害性锦囊牌指定目标时不能指定对方为目标直至你的下回合结束(每名角色限发动一次)。',
tw_zhangzhao:'张昭',
twlijian:'力荐',
twlijian_info:'昂扬技。其他角色的弃牌阶段结束时,你可以令其获得任意本阶段进入弃牌堆的牌然后你获得其余的牌若其得到的牌数大于你你可以对其造成1点伤害。<br>激昂:八张牌进入弃牌堆。',
twlijian_info:'昂扬技。其他角色的弃牌阶段结束时,你可以令其获得任意本阶段进入弃牌堆的牌(可不选)然后你获得其余的牌若其得到的牌数大于你你可以对其造成1点伤害。<br>激昂:八张牌进入弃牌堆。',
twchungang:'纯刚',
twchungang_info:'锁定技。一名其他角色于摸牌阶段外得到超过一张牌时,你令其弃置一张牌。',
tw_zhanghong:'张纮',

View File

@ -9246,10 +9246,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{player:'phaseUseEnd'},
direct:true,
filter:function(event,player){
return player.getHistory('lose',function(evt){
var evt2=evt.getParent();
return evt2.name=='useSkill'&&evt2.skill=='yanyu'&&evt.getParent(3)==event;
}).length>=2;
return player.getHistory('useSkill',function(evt){
return evt.skill=='yanyu'&&evt.event.getParent(2)==event;
}).length>=2&&game.hasPlayer(target=>target.hasSex('male')&&target!=player);
},
content:function(){
'step 0'

View File

@ -57182,6 +57182,7 @@
}
},
number:function(card,player){
if(!card) return;
//狗卡你是真敢出啊
var number=null;
if(card.hasOwnProperty('number')){