diff --git a/audio/die/dianwei.mp3 b/audio/die/dianwei.mp3 index 5b4a712e8..4786c1cde 100644 Binary files a/audio/die/dianwei.mp3 and b/audio/die/dianwei.mp3 differ diff --git a/audio/die/pangtong.mp3 b/audio/die/pangtong.mp3 index 0e00bf743..0380afc74 100644 Binary files a/audio/die/pangtong.mp3 and b/audio/die/pangtong.mp3 differ diff --git a/audio/die/taishici.mp3 b/audio/die/taishici.mp3 index ce5a3db1f..68b51f778 100644 Binary files a/audio/die/taishici.mp3 and b/audio/die/taishici.mp3 differ diff --git a/audio/die/xin_fazheng.mp3 b/audio/die/xin_fazheng.mp3 new file mode 100644 index 000000000..e6443765e Binary files /dev/null and b/audio/die/xin_fazheng.mp3 differ diff --git a/audio/die/xin_xushu.mp3 b/audio/die/xin_xushu.mp3 new file mode 100644 index 000000000..88ee4a4b0 Binary files /dev/null and b/audio/die/xin_xushu.mp3 differ diff --git a/audio/die/yanwen.mp3 b/audio/die/yanwen.mp3 index 253667174..76533587c 100644 Binary files a/audio/die/yanwen.mp3 and b/audio/die/yanwen.mp3 differ diff --git a/audio/die/yuanshao.mp3 b/audio/die/yuanshao.mp3 index 40efb95f4..49074551c 100644 Binary files a/audio/die/yuanshao.mp3 and b/audio/die/yuanshao.mp3 differ diff --git a/audio/skill/bazhen1.mp3 b/audio/skill/bazhen1.mp3 index 65085badc..43da4a7d2 100755 Binary files a/audio/skill/bazhen1.mp3 and b/audio/skill/bazhen1.mp3 differ diff --git a/audio/skill/bazhen2.mp3 b/audio/skill/bazhen2.mp3 index 3b582a6c1..5d805f25a 100755 Binary files a/audio/skill/bazhen2.mp3 and b/audio/skill/bazhen2.mp3 differ diff --git a/audio/skill/huoji1.mp3 b/audio/skill/huoji1.mp3 index 117c15875..e41397339 100755 Binary files a/audio/skill/huoji1.mp3 and b/audio/skill/huoji1.mp3 differ diff --git a/audio/skill/huoji2.mp3 b/audio/skill/huoji2.mp3 index 935aa5edd..50ef4a50f 100755 Binary files a/audio/skill/huoji2.mp3 and b/audio/skill/huoji2.mp3 differ diff --git a/audio/skill/kanpo1.mp3 b/audio/skill/kanpo1.mp3 index 49713052c..fc993a908 100755 Binary files a/audio/skill/kanpo1.mp3 and b/audio/skill/kanpo1.mp3 differ diff --git a/audio/skill/kanpo2.mp3 b/audio/skill/kanpo2.mp3 index dfe6cc93a..3e50f7503 100755 Binary files a/audio/skill/kanpo2.mp3 and b/audio/skill/kanpo2.mp3 differ diff --git a/audio/skill/lianhuan1.mp3 b/audio/skill/lianhuan1.mp3 new file mode 100644 index 000000000..797d8db17 Binary files /dev/null and b/audio/skill/lianhuan1.mp3 differ diff --git a/audio/skill/lianhuan11.mp3 b/audio/skill/lianhuan11.mp3 deleted file mode 100755 index 3e04ba4c1..000000000 Binary files a/audio/skill/lianhuan11.mp3 and /dev/null differ diff --git a/audio/skill/lianhuan12.mp3 b/audio/skill/lianhuan12.mp3 deleted file mode 100755 index 1a1ae544a..000000000 Binary files a/audio/skill/lianhuan12.mp3 and /dev/null differ diff --git a/audio/skill/lianhuan2.mp3 b/audio/skill/lianhuan2.mp3 new file mode 100644 index 000000000..f9a882efa Binary files /dev/null and b/audio/skill/lianhuan2.mp3 differ diff --git a/audio/skill/lianhuan21.mp3 b/audio/skill/lianhuan21.mp3 deleted file mode 100755 index fa00b1464..000000000 Binary files a/audio/skill/lianhuan21.mp3 and /dev/null differ diff --git a/audio/skill/lianhuan22.mp3 b/audio/skill/lianhuan22.mp3 deleted file mode 100755 index a45f1f15f..000000000 Binary files a/audio/skill/lianhuan22.mp3 and /dev/null differ diff --git a/audio/skill/luanji1.mp3 b/audio/skill/luanji1.mp3 index 4aae5f3a6..214cd3050 100755 Binary files a/audio/skill/luanji1.mp3 and b/audio/skill/luanji1.mp3 differ diff --git a/audio/skill/luanji2.mp3 b/audio/skill/luanji2.mp3 index f5032f7aa..a1bddefbe 100755 Binary files a/audio/skill/luanji2.mp3 and b/audio/skill/luanji2.mp3 differ diff --git a/audio/skill/niepan1.mp3 b/audio/skill/niepan1.mp3 index 616e96354..bd1ff3549 100755 Binary files a/audio/skill/niepan1.mp3 and b/audio/skill/niepan1.mp3 differ diff --git a/audio/skill/niepan2.mp3 b/audio/skill/niepan2.mp3 index eb9e987ac..5fab190c7 100755 Binary files a/audio/skill/niepan2.mp3 and b/audio/skill/niepan2.mp3 differ diff --git a/audio/skill/qiangxi1.mp3 b/audio/skill/qiangxi1.mp3 index f9a6357ce..84270af42 100755 Binary files a/audio/skill/qiangxi1.mp3 and b/audio/skill/qiangxi1.mp3 differ diff --git a/audio/skill/qiangxi2.mp3 b/audio/skill/qiangxi2.mp3 index 32b923058..1acebbfb1 100755 Binary files a/audio/skill/qiangxi2.mp3 and b/audio/skill/qiangxi2.mp3 differ diff --git a/audio/skill/shuangxiong.mp3 b/audio/skill/shuangxiong.mp3 deleted file mode 100755 index ad341846d..000000000 Binary files a/audio/skill/shuangxiong.mp3 and /dev/null differ diff --git a/audio/skill/shuangxiong1.mp3 b/audio/skill/shuangxiong1.mp3 index ad341846d..0d02fcd46 100644 Binary files a/audio/skill/shuangxiong1.mp3 and b/audio/skill/shuangxiong1.mp3 differ diff --git a/audio/skill/shuangxiong2.mp3 b/audio/skill/shuangxiong2.mp3 index 8eccc4791..f5d5f0e3f 100755 Binary files a/audio/skill/shuangxiong2.mp3 and b/audio/skill/shuangxiong2.mp3 differ diff --git a/audio/skill/shuangxiong2_re_yanwen.mp3 b/audio/skill/shuangxiong2_re_yanwen.mp3 deleted file mode 100644 index 91548b71c..000000000 Binary files a/audio/skill/shuangxiong2_re_yanwen.mp3 and /dev/null differ diff --git a/audio/skill/shuangxiong1_re_yanwen.mp3 b/audio/skill/shuangxiong_re_yanwen1.mp3 similarity index 100% rename from audio/skill/shuangxiong1_re_yanwen.mp3 rename to audio/skill/shuangxiong_re_yanwen1.mp3 diff --git a/audio/skill/shuangxiong_re_yanwen.mp3 b/audio/skill/shuangxiong_re_yanwen2.mp3 similarity index 100% rename from audio/skill/shuangxiong_re_yanwen.mp3 rename to audio/skill/shuangxiong_re_yanwen2.mp3 diff --git a/audio/skill/tianyi1.mp3 b/audio/skill/tianyi1.mp3 index f656d6f99..f5fe07100 100755 Binary files a/audio/skill/tianyi1.mp3 and b/audio/skill/tianyi1.mp3 differ diff --git a/audio/skill/tianyi2.mp3 b/audio/skill/tianyi2.mp3 index 4ecfe958a..e4dc622ee 100755 Binary files a/audio/skill/tianyi2.mp3 and b/audio/skill/tianyi2.mp3 differ diff --git a/audio/skill/xinenyuan.mp3 b/audio/skill/xinenyuan.mp3 deleted file mode 100644 index c2b1784e6..000000000 Binary files a/audio/skill/xinenyuan.mp3 and /dev/null differ diff --git a/audio/skill/xinenyuan1.mp3 b/audio/skill/xinenyuan1.mp3 new file mode 100644 index 000000000..bd65c8e83 Binary files /dev/null and b/audio/skill/xinenyuan1.mp3 differ diff --git a/audio/skill/xinenyuan2.mp3 b/audio/skill/xinenyuan2.mp3 index 727ad702a..3eca98867 100644 Binary files a/audio/skill/xinenyuan2.mp3 and b/audio/skill/xinenyuan2.mp3 differ diff --git a/audio/skill/xinxuanhuo1.mp3 b/audio/skill/xinxuanhuo1.mp3 index 79a5639dc..79c45cb43 100644 Binary files a/audio/skill/xinxuanhuo1.mp3 and b/audio/skill/xinxuanhuo1.mp3 differ diff --git a/audio/skill/xinxuanhuo2.mp3 b/audio/skill/xinxuanhuo2.mp3 index 9b99c324d..e7391c305 100644 Binary files a/audio/skill/xinxuanhuo2.mp3 and b/audio/skill/xinxuanhuo2.mp3 differ diff --git a/character/refresh.js b/character/refresh.js index e557e099f..3b91346d3 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -11388,12 +11388,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){ check:function (card){return 8-get.value(card)}, }, reshuangxiong:{ + audio:"shuangxiong", + audioname:['re_yanwen'], + group:['reshuangxiong1',"reshuangxiong2"], + }, + reshuangxiong1:{ + audio:"shuangxiong1", + audioname:['re_yanwen'], trigger:{ player:"phaseDrawBegin1", }, - group:"reshuangxiong2", - audio:"shuangxiong", - audioname:['re_yanwen'], check:function (event,player){ if(player.countCards('h')>player.hp) return true; if(player.countCards('h')>3) return true; @@ -11402,7 +11406,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ filter:function(event,player){ return !event.numFixed; }, - content:function (){ + prompt2:function(){ + return '放弃摸牌，然后展示牌堆顶的两张牌并选择获得其中的一张。本回合内可以将与此牌颜色不同的一张手牌当做【决斗】使用'; + }, + content:function(){ "step 0" trigger.changeToZero(); event.cards=get.cards(2); @@ -11450,10 +11457,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var card2=event.card2; player.gain(card2,'gain2'); player.addTempSkill('shuangxiong2'); - player.storage.shuangxiong=get.color(card2); + player.markAuto('shuangxiong2',[get.color(card2,false)]); }, }, - "reshuangxiong2":{ + reshuangxiong2:{ trigger:{ player:"damageEnd", }, @@ -14790,9 +14797,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ rekanpo:"看破", rekanpo_info:"你可以将一张黑色牌当作【无懈可击】使用。", reshuangxiong:"双雄", - "reshuangxiong_info":"摸牌阶段，你可以放弃摸牌。若如此做，你展示牌堆顶的两张牌并选择获得其中的一张。然后，你本回合内可以将与此牌颜色不同的一张手牌当做【决斗】使用。当你受到【决斗】造成的伤害时，你可以获得对方于此决斗中打出的所有【杀】。", - "reshuangxiong2":"双雄", - "reshuangxiong2_info":"", + reshuangxiong1:"双雄", + reshuangxiong2:"双雄", + reshuangxiong_info:"摸牌阶段，你可以放弃摸牌。若如此做，你展示牌堆顶的两张牌并选择获得其中的一张。然后，你本回合内可以将与此牌颜色不同的一张手牌当做【决斗】使用。当你受到【决斗】造成的伤害时，你可以获得对方于此决斗中打出的所有【杀】。", reguanxing:'观星', reguanxing_info:'准备阶段，你可以观看牌堆顶的五张牌（存活角色小于4时改为三张），并将其以任意顺序置于牌堆项或牌堆底，若你将〖观星〗的牌都放在了牌堆底，则你可以在结束阶段再次发动〖观星〗。', diff --git a/character/shenhua.js b/character/shenhua.js index 58cecb125..a37bad210 100755 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -27,7 +27,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ // yuji:['male','qun',3,['guhuo']], // xin_yuji:['male','qun',3,['guhuo']], - sp_zhugeliang:['male','shu',3,['huoji','bazhen','kanpo']], + sp_zhugeliang:['male','shu',3,['bazhen','huoji','kanpo']], pangtong:['male','shu',3,['lianhuan','oldniepan']], xunyu:['male','wei',3,['quhu','jieming'],['clan:颍川荀氏']], dianwei:['male','wei',4,['qiangxix']], @@ -143,7 +143,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ skill:{ //庞统写法修改 lianhuan:{ - audio:'lianhuan1', + audio:2, hiddenCard:(player,name)=>{ return name=='tiesuo'&&player.hasCard(card=>get.suit(card)=='club','sh'); }, @@ -215,8 +215,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.recast(cards); }, }, - lianhuan1:{audio:2}, - lianhuan2:{audio:2}, //新杀小加强 陈到 dcwanglie:{ audio:'drlt_wanglie', @@ -6024,6 +6022,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){ charlotte:true, }, shuangxiong:{ + audio:2, + audioname:['re_yanwen'], + group:'shuangxiong1', + }, + shuangxiong1:{ audio:true, audioname:['re_yanwen'], trigger:{player:'phaseDrawBegin1'}, @@ -6036,39 +6039,53 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return !event.numFixed; }, preHidden:true, + prompt2:()=>'进行一次判定，本回合可以将一张与此牌颜色不同的手牌当作【决斗】使用', content:function(){ - player.judge().set('callback',lib.skill.shuangxiong.callback); + player.judge().set('callback',lib.skill.shuangxiong1.callback); trigger.changeToZero(); }, callback:function(){ player.gain(card,'gain2'); player.addTempSkill('shuangxiong2'); - player.storage.shuangxiong=event.judgeResult.color; + player.markAuto('shuangxiong2',[event.judgeResult.color]); }, }, shuangxiong2:{ + charlotte:true, + onremove:true, audio:true, audioname:['re_yanwen'], enable:'chooseToUse', - prompt:function(){ - var player=_status.event.player; - var str='将一张'+(player.storage.shuangxiong!='red'?'红':'黑')+'色手牌当做【决斗】使用'; - return str; - }, viewAs:{name:'juedou'}, position:'hs', - onremove:true, + viewAsFilter:function(player){ + return player.hasCard(card=>lib.skill.shuangxiong2.filterCard(card,player),'hs'); + }, filterCard:function(card,player){ - return get.color(card)!=player.storage.shuangxiong; + var color=get.color(card),colors=player.getStorage('shuangxiong2'); + for(var i of colors){ + if(color!=i) return true; + } + return false; + }, + prompt:function(){ + var colors=_status.event.player.getStorage('shuangxiong2'); + var str='将一张颜色'; + for(var i=0;i0) str+='或'; + str+='不为'; + str+=get.translation(colors[i]); + } + str+='的牌当做【决斗】使用'; + return str; }, check:function(card){ - return 8-get.value(card); + var player=_status.event.player; + var raw=player.getUseValue(card,null,true); + var eff=player.getUseValue(get.autoViewAs({name:'juedou'},[card])); + return eff-raw; }, - ai:{ - basic:{ - order:10 - } - } + ai:{order:7}, }, luanji:{ audio:2, @@ -8073,6 +8090,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ qiangxi:'强袭', tianyi:'天义', shuangxiong:'双雄', + shuangxiong1:'双雄', shuangxiong2:'双雄', luanji:'乱击', xueyi:'血裔', diff --git a/character/yijiang.js b/character/yijiang.js index 360a92148..94363534b 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -30,7 +30,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ zhugeshang:['male','shu',3,['sangu','yizu']], kebineng:['male','qun',4,['kousheng']], lukai:['male','wu',4,['lkbushi','lkzhongzhuang']], - xin_fazheng:['male','shu',3,['xinenyuan','xinxuanhuo'],['die_audio']], + xin_fazheng:['male','shu',3,['xinxuanhuo','xinenyuan']], guanzhang:['male','shu',4,['fuhun']], wangyi:['female','wei',3,['zhenlie','miji']], caozhang:['male','wei',4,['new_jiangchi']], @@ -12866,6 +12866,27 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } }, xinenyuan:{ + audio:2, + group:['xinenyuan1','xinenyuan2'], + }, + xinenyuan1:{ + audio:true, + trigger:{player:'gainEnd'}, + filter:function(event,player){ + return event.source&&event.source.isIn()&&event.source!=player&&event.cards.length>=2; + }, + logTarget:'source', + check:function(event,player){ + return get.attitude(player,event.source)>0; + }, + prompt2:function(event,player){ + return '令'+get.translation(event.source)+'摸一张牌'; + }, + content:function(){ + trigger.source.draw(); + }, + }, + xinenyuan2:{ audio:true, trigger:{player:'damageEnd'}, check:function(event,player){ @@ -12880,17 +12901,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return event.source&&event.source!=player&&event.num>0&&event.source.isIn(); }, logTarget:'source', + prompt2:function(event,player){ + return '令'+get.translation(event.source)+'交给你一张手牌或失去1点体力'; + }, content:function(){ - "step 0" + 'step 0' event.num=trigger.num; - "step 1" + 'step 1' trigger.source.chooseCard('选择一张手牌交给'+get.translation(player)+'，或点“取消”失去1点体力').set('ai',function(card){ var player=_status.event.getParent().player,source=_status.event.player; if(get.effect(source,{name:'losehp'},source,source)>=0) return 0; if(get.attitude(player,source)>0) return 11-get.value(card); return 7-get.value(card); }); - "step 2" + 'step 2' if(result.bool){ trigger.source.give(result.cards,player); } @@ -12910,24 +12934,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ if(player.hasSkillTag('jueqing',false,target)) return [1,-1.5]; if(!target.hasFriend()) return; if(get.tag(card,'damage')) return [1,0,0,-0.7]; - } - } + }, + }, }, - group:'xinenyuan2' - }, - xinenyuan2:{ - audio:true, - trigger:{player:'gainEnd'}, - filter:function(event,player){ - return event.source&&event.source.isIn()&&event.source!=player&&event.cards.length>=2; - }, - logTarget:'source', - check:function(event,player){ - return get.attitude(player,event.source)>0; - }, - content:function(){ - trigger.source.draw(); - } }, enyuan:{ audio:'enyuan1', @@ -14414,6 +14423,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ jianying:'渐营', jianying_info:'当你于出牌阶段内使用与此阶段你使用的上一张牌点数或花色相同的牌时，你可以摸一张牌。', xinenyuan:'恩怨', + xinenyuan1:'恩怨', xinenyuan2:'恩怨', xinenyuan_info:'当你获得一名其他角色两张或更多的牌后，你可以令其摸一张牌；当你受到1点伤害后，你可以令伤害来源选择一项：1、将一张手牌交给你；2、失去1点体力。', xinxuanhuo:'眩惑',