神话·风配音调整为后重配版(OL版)，法正徐庶配音改为新配音

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时改为三张），并将其以任意顺序置于牌堆项或牌堆底，若你将〖观星〗的牌都放在了牌堆底，则你可以在结束阶段再次发动〖观星〗。',

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;i<colors.length;i++){
+						if(i>0) 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:'血裔',

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:'眩惑',