于吉【蛊惑】流程技能改为precontent获得,防止直接失去此技能后不进行蛊惑流程,删除【缠怨】charlotte标签,添加缠怨配音和触发技能

This commit is contained in:
mengxinzxz 2023-11-04 14:32:24 +08:00
parent 6d171d9756
commit 73b31fc0f5
7 changed files with 40 additions and 11 deletions

BIN
audio/skill/chanyuan1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/chanyuan2.mp3 Normal file

Binary file not shown.

BIN
audio/skill/rechanyuan1.mp3 Normal file

Binary file not shown.

BIN
audio/skill/rechanyuan2.mp3 Normal file

Binary file not shown.

View File

@ -520,7 +520,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
old_guhuo:{ old_guhuo:{
audio:2, audio:2,
group:['old_guhuo_guess'],
enable:['chooseToUse','chooseToRespond'], enable:['chooseToUse','chooseToRespond'],
hiddenCard:function(player,name){ hiddenCard:function(player,name){
return (lib.inpile.contains(name)&&player.countCards('hs')>0); return (lib.inpile.contains(name)&&player.countCards('hs')>0);
@ -636,6 +635,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
precontent:function(){ precontent:function(){
player.logSkill('old_guhuo'); player.logSkill('old_guhuo');
player.addTempSkill('old_guhuo_guess');
var card=event.result.cards[0]; var card=event.result.cards[0];
event.result.card.suit=get.suit(card); event.result.card.suit=get.suit(card);
event.result.card.number=get.number(card); event.result.card.number=get.number(card);

View File

@ -10743,6 +10743,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
precontent:function(){ precontent:function(){
player.logSkill('reguhuo'); player.logSkill('reguhuo');
player.addTempSkill('reguhuo_guess');
var card=event.result.cards[0]; var card=event.result.cards[0];
event.result.card.suit=get.suit(card); event.result.card.suit=get.suit(card);
event.result.card.number=get.number(card); event.result.card.number=get.number(card);
@ -10766,7 +10767,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
threaten:1.3, threaten:1.3,
}, },
group:['reguhuo_shan','reguhuo_wuxie','reguhuo_guess'], group:['reguhuo_shan','reguhuo_wuxie'],
}, },
reguhuo_shan:{ reguhuo_shan:{
enable:['chooseToUse','chooseToRespond'], enable:['chooseToUse','chooseToRespond'],
@ -10803,6 +10804,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
precontent:function(){ precontent:function(){
player.logSkill('reguhuo'); player.logSkill('reguhuo');
player.addTempSkill('reguhuo_guess');
var card=event.result.cards[0]; var card=event.result.cards[0];
event.result.card.suit=get.suit(card); event.result.card.suit=get.suit(card);
event.result.card.number=get.number(card); event.result.card.number=get.number(card);
@ -10843,6 +10845,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
precontent:function(){ precontent:function(){
player.logSkill('reguhuo'); player.logSkill('reguhuo');
player.addTempSkill('reguhuo_guess');
var card=event.result.cards[0]; var card=event.result.cards[0];
event.result.card.suit=get.suit(card); event.result.card.suit=get.suit(card);
event.result.card.number=get.number(card); event.result.card.number=get.number(card);
@ -10970,7 +10973,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 1' 'step 1'
if(!result.bool) target.loseHp(); if(!result.bool) target.loseHp();
'step 2' 'step 2'
target.addSkill('rechanyuan'); target.addSkillLog('rechanyuan');
if(targets.length) event.goto(0); if(targets.length) event.goto(0);
}, },
}, },
@ -10978,13 +10981,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
reguhuo_phase:{}, reguhuo_phase:{},
rechanyuan:{ rechanyuan:{
init:function(player,skill){ init:function(player,skill){
if(player.hp<=1){
player.logSkill(skill);
player.addSkill('rechanyuan_log');
}
player.addSkillBlocker(skill); player.addSkillBlocker(skill);
}, },
onremove:function(player,skill){ onremove:function(player,skill){
player.removeSkill('rechanyuan_log');
player.removeSkillBlocker(skill); player.removeSkillBlocker(skill);
}, },
charlotte:true,
locked:true,
skillBlocker:function(skill,player){ skillBlocker:function(skill,player){
return skill!='chanyuan'&&skill!='rechanyuan'&&!lib.skill[skill].charlotte&&player.hp<=1; return skill!='chanyuan'&&skill!='rechanyuan'&&!lib.skill[skill].charlotte&&player.hp<=1;
}, },
@ -10997,8 +11003,25 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}); });
if(list.length) str+=('<br><li>失效技能:'+get.translation(list)) if(list.length) str+=('<br><li>失效技能:'+get.translation(list))
return str; return str;
},
},
audio:2,
trigger:{player:'changeHp'},
filter:function(event,player){
return (player.hp<=1)!=(player.hasSkill('rechanyuan_log'));
},
direct:true,
locked:true,
content:function(){
if(player.hp<=1){
player.logSkill('rechanyuan');
player.addSkill('rechanyuan_log');
} }
} else player.removeSkill('rechanyuan_log');
},
subSkill:{
log:{charlotte:true},
},
}, },
botu:{ botu:{
audio:2, audio:2,

View File

@ -7458,7 +7458,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
xinfu_guhuo:{ xinfu_guhuo:{
audio:'guhuo_guess', audio:'guhuo_guess',
derivation:['chanyuan'], derivation:['chanyuan'],
group:['guhuo_guess'],
enable:['chooseToUse','chooseToRespond'], enable:['chooseToUse','chooseToRespond'],
hiddenCard:function(player,name){ hiddenCard:function(player,name){
return (lib.inpile.contains(name)&&player.countCards('hs')>0&&!player.hasSkill('guhuo_phase')); return (lib.inpile.contains(name)&&player.countCards('hs')>0&&!player.hasSkill('guhuo_phase'));
@ -7554,6 +7553,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
precontent:function(){ precontent:function(){
player.logSkill('xinfu_guhuo'); player.logSkill('xinfu_guhuo');
player.addTempSkill('guhuo_guess');
var card=event.result.cards[0]; var card=event.result.cards[0];
event.result.card.suit=get.suit(card); event.result.card.suit=get.suit(card);
event.result.card.number=get.number(card); event.result.card.number=get.number(card);
@ -7709,13 +7709,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
chanyuan:{ chanyuan:{
init:function(player,skill){ init:function(player,skill){
if(player.hp==1) player.logSkill(skill);
player.addSkillBlocker(skill); player.addSkillBlocker(skill);
}, },
onremove:function(player,skill){ onremove:function(player,skill){
player.removeSkillBlocker(skill); player.removeSkillBlocker(skill);
}, },
charlotte:true,
locked:true,
skillBlocker:function(skill,player){ skillBlocker:function(skill,player){
return skill!='chanyuan'&&skill!='rechanyuan'&&!lib.skill[skill].charlotte&&player.hp==1; return skill!='chanyuan'&&skill!='rechanyuan'&&!lib.skill[skill].charlotte&&player.hp==1;
}, },
@ -7734,8 +7733,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}); });
if(list.length) str+=('<br><li>失效技能:'+get.translation(list)) if(list.length) str+=('<br><li>失效技能:'+get.translation(list))
return str; return str;
} },
} },
audio:2,
trigger:{player:'changeHp'},
filter:function(event,player){
return player.hp==1;
},
forced:true,
content:function(){},
}, },
guhuo_phase:{}, guhuo_phase:{},
}, },