diff --git a/audio/die/ganfurenmifuren.mp3 b/audio/die/ganfurenmifuren.mp3 new file mode 100644 index 000000000..cdbd76dce Binary files /dev/null and b/audio/die/ganfurenmifuren.mp3 differ diff --git a/audio/die/liuchongluojun.mp3 b/audio/die/liuchongluojun.mp3 new file mode 100644 index 000000000..8ba529569 Binary files /dev/null and b/audio/die/liuchongluojun.mp3 differ diff --git a/audio/skill/dcchanjuan1.mp3 b/audio/skill/dcchanjuan1.mp3 new file mode 100644 index 000000000..80640eb49 Binary files /dev/null and b/audio/skill/dcchanjuan1.mp3 differ diff --git a/audio/skill/dcchanjuan2.mp3 b/audio/skill/dcchanjuan2.mp3 new file mode 100644 index 000000000..02baac7e1 Binary files /dev/null and b/audio/skill/dcchanjuan2.mp3 differ diff --git a/audio/skill/dcjini1.mp3 b/audio/skill/dcjini1.mp3 new file mode 100644 index 000000000..1a5e933ee Binary files /dev/null and b/audio/skill/dcjini1.mp3 differ diff --git a/audio/skill/dcjini2.mp3 b/audio/skill/dcjini2.mp3 new file mode 100644 index 000000000..cf51ec6c1 Binary files /dev/null and b/audio/skill/dcjini2.mp3 differ diff --git a/audio/skill/dcminze1.mp3 b/audio/skill/dcminze1.mp3 new file mode 100644 index 000000000..db6516a18 Binary files /dev/null and b/audio/skill/dcminze1.mp3 differ diff --git a/audio/skill/dcminze2.mp3 b/audio/skill/dcminze2.mp3 new file mode 100644 index 000000000..f725c0d2e Binary files /dev/null and b/audio/skill/dcminze2.mp3 differ diff --git a/audio/skill/dcxunbie1.mp3 b/audio/skill/dcxunbie1.mp3 new file mode 100644 index 000000000..fc39b8b32 Binary files /dev/null and b/audio/skill/dcxunbie1.mp3 differ diff --git a/audio/skill/dcxunbie2.mp3 b/audio/skill/dcxunbie2.mp3 new file mode 100644 index 000000000..c07b3718e Binary files /dev/null and b/audio/skill/dcxunbie2.mp3 differ diff --git a/character/sp2.js b/character/sp2.js index ca977cb64..ae8b0a4a8 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -397,7 +397,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, //散装版糜夫人 dcguixiu:{ - audio:2, + audio:'guixiu', trigger:{ player:'phaseBegin', }, @@ -413,7 +413,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, subSkill:{ rec:{ - audio:'dcguixiu', + audio:'guixiu', trigger:{ player:'logSkillAfter', }, @@ -428,12 +428,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } }, dccunsi:{ - audio:2, + audio:'cunsi', enable:'phaseUse', limited:true, skillAnimation:true, animationColor:'orange', filterTarget:true, + derivation:'dcyongjue', content:function(){ 'step 0' player.awakenSkill('dccunsi'); @@ -448,7 +449,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } }, dcyongjue:{ - audio:2, + audio:'yongjue', trigger:{ player:'useCard', }, @@ -499,7 +500,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }, //散装版甘夫人 dcshushen:{ - audio:2, + audio:'shushen', trigger:{ player:'recoverEnd', }, @@ -546,7 +547,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } }, dcshenzhi:{ - audio:2, + audio:'shenzhi', trigger:{ player:'phaseZhunbeiBegin', }, @@ -21813,6 +21814,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ group:'reyixiang_card', subSkill:{ card:{ + audio:'yixiang', + audioname:['re_taoqian'], trigger:{target:'useCardToTargeted'}, forced:true, filter:function(event,player){ diff --git a/character/tw.js b/character/tw.js index 01847359d..055ca4368 100644 --- a/character/tw.js +++ b/character/tw.js @@ -314,6 +314,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ else{ if(lib.filter.canBeDiscarded(card,target,player)){ target.discard(card,'notBySelf'); + target.draw(); } } } @@ -445,6 +446,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ filter:function(event,player){ if(!player.isPhaseUsing()) return false; if(player==event.player) return false; + if(!event.player.isIn()) return false; return event.card.name=='sha'||get.type(event.card)=='trick'&&get.tag(event.card,'damage'); }, logTarget:'player', @@ -4328,7 +4330,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ preHidden:true, content:function(){ 'step 0' - var forced=event.getParent(2).name=='twshuangren_end'; + var forced=event.getParent(2).name=='twshuangren_end'&&game.hasPlayer(current=>{ + return player.canCompare(current); + }); var str='与一名角色拼点,若你:赢,你可以视为对至多两名至其的距离不大于1的角色使用一张【杀】;没赢,其可以视为对你使用一张【杀】'; player.chooseTarget(forced?'双刃:选择一名角色':get.prompt('twshuangren'),str,forced,(card,player,target)=>{ return player.canCompare(target);