diff --git a/audio/skill/buqu1.mp3 b/audio/skill/buqu1.mp3 new file mode 100644 index 000000000..8102e991b Binary files /dev/null and b/audio/skill/buqu1.mp3 differ diff --git a/audio/skill/buqu2.mp3 b/audio/skill/buqu2.mp3 new file mode 100644 index 000000000..21a440ebd Binary files /dev/null and b/audio/skill/buqu2.mp3 differ diff --git a/audio/skill/diyleiji1.mp3 b/audio/skill/diyleiji1.mp3 new file mode 100644 index 000000000..79f256f23 Binary files /dev/null and b/audio/skill/diyleiji1.mp3 differ diff --git a/audio/skill/diyleiji2.mp3 b/audio/skill/diyleiji2.mp3 new file mode 100644 index 000000000..ef0bd7440 Binary files /dev/null and b/audio/skill/diyleiji2.mp3 differ diff --git a/audio/skill/fenji1.mp3 b/audio/skill/fenji1.mp3 new file mode 100644 index 000000000..03dc17c8b Binary files /dev/null and b/audio/skill/fenji1.mp3 differ diff --git a/audio/skill/fenji2.mp3 b/audio/skill/fenji2.mp3 new file mode 100644 index 000000000..d586c93fd Binary files /dev/null and b/audio/skill/fenji2.mp3 differ diff --git a/audio/skill/guidao1.mp3 b/audio/skill/guidao1.mp3 new file mode 100644 index 000000000..a2faf86cf Binary files /dev/null and b/audio/skill/guidao1.mp3 differ diff --git a/audio/skill/guidao2.mp3 b/audio/skill/guidao2.mp3 new file mode 100644 index 000000000..fb8e196a1 Binary files /dev/null and b/audio/skill/guidao2.mp3 differ diff --git a/audio/skill/huangtian21.mp3 b/audio/skill/huangtian21.mp3 new file mode 100644 index 000000000..647113457 Binary files /dev/null and b/audio/skill/huangtian21.mp3 differ diff --git a/audio/skill/huangtian22.mp3 b/audio/skill/huangtian22.mp3 new file mode 100644 index 000000000..1c02dbfa4 Binary files /dev/null and b/audio/skill/huangtian22.mp3 differ diff --git a/audio/skill/jushou.mp3 b/audio/skill/jushou.mp3 new file mode 100644 index 000000000..88596b7b5 Binary files /dev/null and b/audio/skill/jushou.mp3 differ diff --git a/audio/skill/kuanggu1.mp3 b/audio/skill/kuanggu1.mp3 new file mode 100644 index 000000000..32c43b501 Binary files /dev/null and b/audio/skill/kuanggu1.mp3 differ diff --git a/audio/skill/kuanggu2.mp3 b/audio/skill/kuanggu2.mp3 new file mode 100644 index 000000000..880999a39 Binary files /dev/null and b/audio/skill/kuanggu2.mp3 differ diff --git a/audio/skill/leiji1.mp3 b/audio/skill/leiji1.mp3 new file mode 100644 index 000000000..79f256f23 Binary files /dev/null and b/audio/skill/leiji1.mp3 differ diff --git a/audio/skill/leiji2.mp3 b/audio/skill/leiji2.mp3 new file mode 100644 index 000000000..ef0bd7440 Binary files /dev/null and b/audio/skill/leiji2.mp3 differ diff --git a/audio/skill/liegong1.mp3 b/audio/skill/liegong1.mp3 new file mode 100644 index 000000000..989804867 Binary files /dev/null and b/audio/skill/liegong1.mp3 differ diff --git a/audio/skill/liegong2.mp3 b/audio/skill/liegong2.mp3 new file mode 100644 index 000000000..27572cba2 Binary files /dev/null and b/audio/skill/liegong2.mp3 differ diff --git a/audio/skill/shensu11.mp3 b/audio/skill/shensu11.mp3 new file mode 100644 index 000000000..910646a27 Binary files /dev/null and b/audio/skill/shensu11.mp3 differ diff --git a/audio/skill/shensu12.mp3 b/audio/skill/shensu12.mp3 new file mode 100644 index 000000000..81a50ea1d Binary files /dev/null and b/audio/skill/shensu12.mp3 differ diff --git a/audio/skill/shensu21.mp3 b/audio/skill/shensu21.mp3 new file mode 100644 index 000000000..5d8c116da Binary files /dev/null and b/audio/skill/shensu21.mp3 differ diff --git a/audio/skill/shensu22.mp3 b/audio/skill/shensu22.mp3 new file mode 100644 index 000000000..b037adb07 Binary files /dev/null and b/audio/skill/shensu22.mp3 differ diff --git a/audio/skill/tianxiang1.mp3 b/audio/skill/tianxiang1.mp3 new file mode 100644 index 000000000..ecf7b2c49 Binary files /dev/null and b/audio/skill/tianxiang1.mp3 differ diff --git a/audio/skill/tianxiang2.mp3 b/audio/skill/tianxiang2.mp3 new file mode 100644 index 000000000..778e75cb9 Binary files /dev/null and b/audio/skill/tianxiang2.mp3 differ diff --git a/character/diy.js b/character/diy.js index 60ecc8c05..2f50a4741 100644 --- a/character/diy.js +++ b/character/diy.js @@ -432,6 +432,7 @@ character.diy={ }, }, diyleiji:{ + audio:2, trigger:{player:'respond'}, filter:function(event,player){ return event.card.name=='shan'; diff --git a/character/wind.js b/character/wind.js index 964f3b87c..87998b92e 100644 --- a/character/wind.js +++ b/character/wind.js @@ -1,3 +1,4 @@ +'use strict'; character.wind={ character:{ xiahouyuan:['male','wei',4,['shensu'],['fullskin']], @@ -16,6 +17,7 @@ character.wind={ group:['shensu1','shensu2'] }, shensu1:{ + audio:2, trigger:{player:'phaseBegin'}, direct:true, content:function(){ @@ -40,6 +42,7 @@ character.wind={ } }, shensu2:{ + audio:2, trigger:{player:'phaseUseBefore'}, direct:true, filter:function(event,player){ @@ -87,6 +90,7 @@ character.wind={ }, }, jushou:{ + audio:true, trigger:{player:'phaseEnd'}, content:function(){ player.turnOver(); @@ -94,6 +98,7 @@ character.wind={ } }, liegong:{ + audio:2, trigger:{player:'shaBegin'}, filter:function(event,player){ var length=event.target.num('h'); @@ -104,6 +109,7 @@ character.wind={ } }, kuanggu:{ + audio:2, trigger:{source:'damageEnd'}, forced:true, filter:function(event,player){ @@ -114,6 +120,7 @@ character.wind={ } }, tianxiang:{ + audio:2, trigger:{player:'damageBefore'}, direct:true, filter:function(event,player){ @@ -205,6 +212,7 @@ character.wind={ } }, buqu:{ + audio:2, trigger:{player:'dieBefore'}, forced:true, filter:function(event,player){return player.maxHp>0}, @@ -249,6 +257,7 @@ character.wind={ } }, fenji:{ + audio:2, trigger:{global:'discardAfter'}, filter:function(event){ if(_status.currentPhase!=event.player){ @@ -269,6 +278,7 @@ character.wind={ }, }, leiji:{ + audio:2, trigger:{player:'respond'}, filter:function(event,player){ return event.card.name=='shan'; @@ -320,6 +330,7 @@ character.wind={ } }, guidao:{ + audio:2, trigger:{global:'judge'}, filter:function(event,player){ return player.num('he',{color:'black'})>0; @@ -387,6 +398,7 @@ character.wind={ global:'huangtian2' }, huangtian2:{ + audio:2, enable:'phaseUse', discard:false, line:true, @@ -404,6 +416,7 @@ character.wind={ return target==game.zhu; }, usable:1, + forceaudio:true, content:function(){ target.gain(cards); }, diff --git a/game/config.js b/game/config.js index 7812dac50..f69e4868e 100644 --- a/game/config.js +++ b/game/config.js @@ -238,8 +238,8 @@ window.config={ right_click:'pause', sort:'type_sort', - cards:['standard','ex','extra','refresh','guozhan'], - characters:['standard','wind','fire','woods','mountain','sp','yijiang','refresh','extra','guozhan'], + cards:['standard','ex','extra','refresh'], + characters:['standard','wind','fire','woods','mountain','refresh'], plays:[], mode:'identity', diff --git a/game/game.js b/game/game.js index 36d5bdad7..5b6a3c186 100644 --- a/game/game.js +++ b/game/game.js @@ -1305,7 +1305,8 @@ "step 0" var info=get.info(event.skill); event._skill=event.skill; - if(lib.config.background_speak&&!lib.skill.global.contains(event.skill)){ + if(lib.config.background_speak&& + (!lib.skill.global.contains(event.skill)||lib.skill[event.skill].forceaudio)){ if(typeof info.audio=='number'){ game.playAudio('skill',event.skill+Math.ceil(info.audio*Math.random())); } diff --git a/game/package.js b/game/package.js index 870e3f06b..fe546e750 100644 --- a/game/package.js +++ b/game/package.js @@ -4,11 +4,11 @@ character.pack={ fire:'火包', woods:'林包', mountain:'山包', + refresh:'界限突破', extra:'神将', sp:'SP', guozhan:'国战', yijiang:'一将成名', - refresh:'界限突破', jiange:'守卫剑阁', zhuogui:'捉鬼驱邪', diy:'DIY',