TW郭淮bugfix

This commit is contained in:
mengxinzxz 2023-10-14 14:57:05 +08:00 committed by GitHub
parent 9534b7a5fa
commit 2fc8bf45b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 22 deletions

View File

@ -10350,7 +10350,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:"mark", content:"mark",
}, },
audio:2, audio:2,
trigger:{player:"useCard"}, trigger:{player:"useCardAfter"},
filter:function(event,player){ filter:function(event,player){
var evt=event.getParent('phaseUse'); var evt=event.getParent('phaseUse');
if(!evt||evt.player!=player) return false; if(!evt||evt.player!=player) return false;
@ -10381,13 +10381,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){ content:function(){
'step 0' 'step 0'
var choiceList=['令'+get.translation(trigger.source)+'本回合不能再使用或打出牌']; var choiceList=['令'+get.translation(trigger.source)+'本回合不能再使用或打出牌'];
if (trigger.source.countCards('h')) choiceList.push('令'+get.translation(trigger.source)+'弃置两张牌'); if (trigger.source.countCards('he')) choiceList.push('令'+get.translation(trigger.source)+'弃置两张牌');
player.chooseControl('cancel2').set('prompt2',get.prompt2('yuzhang')).set('choiceList',choiceList).set('ai',function(){ player.chooseControl('cancel2').set('prompt2',get.prompt2('yuzhang')).set('choiceList',choiceList).set('ai',function(){
var player=_status.event.player,source=_status.event.source; var player=_status.event.player,source=_status.event.source;
if(get.attitude(player,event.source)>0) return 'cancel2'; if(get.attitude(player,event.source)>=0) return 'cancel2';
if(source.hasSkillTag('noh')||source.hasSkillTag('noe')||source.countCards('h')>=4) return 0; if(source.hasSkillTag('noh')||source.hasSkillTag('noe')||source.countCards('h')>=4) return 0;
if(source.hp>1&&source.countCards('h')>1) return 1; if(source.hp>1&&source.countCards('he')>1) return 1;
return 'cancel2'; return [0,1].randomGet();
}).set('source',trigger.source); }).set('source',trigger.source);
'step 1' 'step 1'
if(result.control!='cancel2'){ if(result.control!='cancel2'){
@ -10402,17 +10402,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
skip:{ skip:{
audio:'yuzhang', audio:'yuzhang',
trigger:{ trigger:{
player:["phaseJudgeBefore","phaseDrawBefore","phaseUseBefore","phaseDiscardBefore"], player:['phaseZhunbeiBefore',"phaseJudgeBefore","phaseDrawBefore","phaseUseBefore","phaseDiscardBefore",'phaseJieshuBefore'],
}, },
filter:function(event,player){ filter:function(event,player){
return player.hasMark('twjingce'); return player.hasMark('twjingce');
}, },
"prompt2":function(event,player){ prompt2:function(event,player){
var str='弃置一枚“策”并跳过' var str='弃置一枚“策”并跳过';
if(event.name=='phaseJudge') str+='判定'; var list=lib.skill.yuzhang.subSkill.skip.trigger.player.slice();
if(event.name=='phaseDraw') str+='摸牌'; list=list.map(i=>i.slice(0,-6));
if(event.name=='phaseUse') str+='出牌'; str+=['准备','判定','摸牌','出牌','弃牌','结束'][list.indexOf(event.name)];
if(event.name=='phaseDiscard') str+='弃牌';
str+='阶段'; str+='阶段';
return str; return str;
}, },
@ -10424,26 +10423,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
player.removeMark('twjingce',1); player.removeMark('twjingce',1);
trigger.cancel(); trigger.cancel();
}, },
sub:true,
}, },
dontuse:{ dontuse:{
charlotte:true, charlotte:true,
mark:true, mark:true,
mod:{ mod:{
cardEnabled:function(card){ cardEnabled2:function(card){
return false;
},
cardRespondable:function(card){
return false;
},
cardSavable:function(card){
return false; return false;
}, },
}, },
intro:{ intro:{
content:"不能使用或打出牌", content:"不能使用或打出牌",
}, },
sub:true,
}, },
}, },
}, },
@ -14250,7 +14241,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
tw_guohuai:'TW郭淮', tw_guohuai:'TW郭淮',
tw_guohuai_prefix:'TW', tw_guohuai_prefix:'TW',
twjingce:"精策", twjingce:"精策",
twjingce_info:"当你于出牌阶段使用第X张牌你可以摸两张牌X为你的体力值。若此阶段你此前摸过牌或本回合造成过伤害你获得一枚“策”标记。", twjingce_info:"当你于出牌阶段使用第X张牌结算完毕后你可以摸两张牌X为你的体力值。若此阶段你此前摸过牌或本回合造成过伤害,你获得一枚“策”标记。",
yuzhang:"御嶂", yuzhang:"御嶂",
yuzhang_info:"你可以弃置一枚“策”标记,然后跳过一个阶段。当你受到伤害后,你可弃置一枚“策”标记,然后选择一项:⒈令伤害来源弃置两张牌;⒉令伤害来源本回合不能再使用或打出牌。", yuzhang_info:"你可以弃置一枚“策”标记,然后跳过一个阶段。当你受到伤害后,你可弃置一枚“策”标记,然后选择一项:⒈令伤害来源弃置两张牌;⒉令伤害来源本回合不能再使用或打出牌。",
tw_caozhao:'曹肇', tw_caozhao:'曹肇',