diff --git a/audio/die/tw_wenchou.mp3 b/audio/die/tw_wenchou.mp3 new file mode 100644 index 000000000..9a3a30ddc Binary files /dev/null and b/audio/die/tw_wenchou.mp3 differ diff --git a/audio/die/tw_yanliang.mp3 b/audio/die/tw_yanliang.mp3 new file mode 100644 index 000000000..97a355584 Binary files /dev/null and b/audio/die/tw_yanliang.mp3 differ diff --git a/audio/die/tw_yuantan.mp3 b/audio/die/tw_yuantan.mp3 new file mode 100644 index 000000000..5946ed144 Binary files /dev/null and b/audio/die/tw_yuantan.mp3 differ diff --git a/audio/skill/twbaizu1.mp3 b/audio/skill/twbaizu1.mp3 new file mode 100644 index 000000000..66b76d5fd Binary files /dev/null and b/audio/skill/twbaizu1.mp3 differ diff --git a/audio/skill/twbaizu2.mp3 b/audio/skill/twbaizu2.mp3 new file mode 100644 index 000000000..a4743e777 Binary files /dev/null and b/audio/skill/twbaizu2.mp3 differ diff --git a/audio/skill/twduwang1.mp3 b/audio/skill/twduwang1.mp3 new file mode 100644 index 000000000..bf4c8173a Binary files /dev/null and b/audio/skill/twduwang1.mp3 differ diff --git a/audio/skill/twduwang2.mp3 b/audio/skill/twduwang2.mp3 new file mode 100644 index 000000000..8b9860e63 Binary files /dev/null and b/audio/skill/twduwang2.mp3 differ diff --git a/audio/skill/twjuexing1.mp3 b/audio/skill/twjuexing1.mp3 new file mode 100644 index 000000000..2d8ded5df Binary files /dev/null and b/audio/skill/twjuexing1.mp3 differ diff --git a/audio/skill/twjuexing2.mp3 b/audio/skill/twjuexing2.mp3 new file mode 100644 index 000000000..5ccaa619f Binary files /dev/null and b/audio/skill/twjuexing2.mp3 differ diff --git a/audio/skill/twqiaosi1.mp3 b/audio/skill/twqiaosi1.mp3 new file mode 100644 index 000000000..2ff639aea Binary files /dev/null and b/audio/skill/twqiaosi1.mp3 differ diff --git a/audio/skill/twqiaosi2.mp3 b/audio/skill/twqiaosi2.mp3 new file mode 100644 index 000000000..63375b5ad Binary files /dev/null and b/audio/skill/twqiaosi2.mp3 differ diff --git a/audio/skill/twxiayong1.mp3 b/audio/skill/twxiayong1.mp3 new file mode 100644 index 000000000..1bd635ea2 Binary files /dev/null and b/audio/skill/twxiayong1.mp3 differ diff --git a/audio/skill/twxiayong2.mp3 b/audio/skill/twxiayong2.mp3 new file mode 100644 index 000000000..1cd33b543 Binary files /dev/null and b/audio/skill/twxiayong2.mp3 differ diff --git a/audio/skill/twxiayong_tw_yanliang1.mp3 b/audio/skill/twxiayong_tw_yanliang1.mp3 new file mode 100644 index 000000000..b79596b1a Binary files /dev/null and b/audio/skill/twxiayong_tw_yanliang1.mp3 differ diff --git a/audio/skill/twxiayong_tw_yanliang2.mp3 b/audio/skill/twxiayong_tw_yanliang2.mp3 new file mode 100644 index 000000000..f7d92a941 Binary files /dev/null and b/audio/skill/twxiayong_tw_yanliang2.mp3 differ diff --git a/audio/skill/twylyanshi1.mp3 b/audio/skill/twylyanshi1.mp3 new file mode 100644 index 000000000..02c82e988 Binary files /dev/null and b/audio/skill/twylyanshi1.mp3 differ diff --git a/audio/skill/twylyanshi2.mp3 b/audio/skill/twylyanshi2.mp3 new file mode 100644 index 000000000..37bd5f7a7 Binary files /dev/null and b/audio/skill/twylyanshi2.mp3 differ diff --git a/character/tw.js b/character/tw.js index 2d96a986c..33583336d 100644 --- a/character/tw.js +++ b/character/tw.js @@ -693,32 +693,47 @@ game.import('character',function(lib,game,ui,get,ai,_status){ twxiayong:{ audio:2, audioname:['tw_yanliang'], - trigger:{global:'damageBegin1'}, - filter(event,player){ - if(event.getParent().type!='card'||event.card.name!='juedou'||!event.player.isIn()) return false; - const evt=game.getGlobalHistory('useCard',evt=>evt.card==event.card)[0]; - if(evt&&evt.targets&&(event.player!=player||player.countCards('h'))){ - if(evt.player==player){ - return evt.targets.includes(event.player)&&event.player!=player; - } - return evt.targets.includes(player)&&evt.player!=player; - } - return false; - }, - forced:true, - logTarget:'player', - async content(event,trigger,player){ - if(trigger.player===player){ - const cards=player.getCards('h',card=>{ - return lib.filter.cardDiscardable(card,player,'twxiayong'); - }); - if(cards.length>0) player.discard(cards.randomGet()); - } - else{ - trigger.increase('num'); - } + locked:true, + group:'twxiayong_effect', + subSkill:{ + effect:{ + trigger:{global:'damageBegin1'}, + filter(event,player){ + if(event.getParent().type!='card'||event.card.name!='juedou'||!event.player.isIn()) return false; + const evt=game.getGlobalHistory('useCard',evt=>evt.card==event.card)[0]; + if(evt&&evt.targets&&(event.player!=player||player.countCards('h'))){ + if(evt.player==player){ + return evt.targets.includes(event.player)&&event.player!=player; + } + return evt.targets.includes(player)&&evt.player!=player; + } + return false; + }, + forced:true, + popup:false, + async content(event,trigger,player){ + player.logSkill('twxiayong'+(trigger.player===player?'1':'2'),trigger.player); + if(trigger.player===player){ + const cards=player.getCards('h',card=>{ + return lib.filter.cardDiscardable(card,player,'twxiayong'); + }); + if(cards.length>0) player.discard(cards.randomGet()); + } + else{ + trigger.increase('num'); + } + }, + }, }, }, + twxiayong1:{ + audio:true, + audioname:['tw_yanliang'], + sourceSkill:'twxiayong', + }, + twxiayong2:{ + inherit:'twxiayong1', + }, //袁谭 twqiaosi:{ audio:2,