Merge pull request #531 from S-N-O-R-L-A-X/PR-Branch

两个小fix

character/extra.js

@@ -7697,7 +7697,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			shen_machao_prefix:'神',
 			shouli:'狩骊',
 			shouli_backup:'狩骊',
-			shouli_info:'①游戏开始时，你令场上所有角色从你的下家起，依次使用牌堆中的一张不为赠物的坐骑牌。②你可以将场上的一张进攻坐骑牌当做【杀】（无任何次数限制），防御坐骑牌当做【闪】使用或打出。若此坐骑牌的拥有者不为你，则其非锁定技于本回合内失效。且当你或其于本回合内受到伤害时，此伤害+1且改为雷属性。',
+			shouli_info:'①锁定技，游戏开始时，你令场上所有角色从你的下家起，依次使用牌堆中的一张不为赠物的坐骑牌。②你可以将场上的一张进攻坐骑牌当做【杀】（无任何次数限制），防御坐骑牌当做【闪】使用或打出。若此坐骑牌的拥有者不为你，则其非锁定技于本回合内失效。且当你或其于本回合内受到伤害时，此伤害+1且改为雷属性。',
 			hengwu:'横骛',
 			hengwu_info:'当你使用或打出有花色的牌时，若你的手牌区内没有与此牌花色相同的牌，则你可以摸X张牌（X为场上装备区内花色与此牌相同的牌数）。',
 			hengwu_append:'<span style="font-family: yuanli">棘手，怀念，摧毁！</span>',

character/refresh.js

@@ -11685,7 +11685,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:"wusheng",
 				audioname:['re_guanyu','guanzhang','jsp_guanyu','guansuo','re_guanzhang','dc_jsp_guanyu'],
 				audioname2:{
-					ol_guansuo:'wusheng_guansuo',
+					dc_guansuo:'wusheng_guansuo',
 				},
 				enable:["chooseToRespond","chooseToUse"],
 				filterCard:function(card,player){
@@ -14771,7 +14771,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			qianxin_info:'觉醒技，当你造成一次伤害后，若你已受伤，你须减1点体力上限，并获得技能“荐言”。',
 			jianyan_info:'出牌阶段限一次，你可以声明一种牌的类别或颜色，并亮出牌库中第一张符合你声明的牌，然后你令一名男性角色获得此牌',
 			rekurou_info:'出牌阶段限一次，你可以弃置一张牌，然后失去1点体力。',
-			zhaxiang_info:'锁定技 每当你失去1点体力后，你摸三张牌。然后若此时是你的出牌阶段，则直到回合结束，你使用红色【杀】无距离限制且不能被【闪】响应，你可以额外使用一张【杀】。',
+			zhaxiang_info:'锁定技，每当你失去1点体力后，你摸三张牌。然后若此时是你的出牌阶段，则直到回合结束，你使用红色【杀】无距离限制且不能被【闪】响应，你可以额外使用一张【杀】。',
 			qiaomeng_info:'当你使用黑色【杀】对一名角色造成伤害后，你可以弃置该角色装备区里的一张牌，若此牌是坐骑牌，你于此牌置入弃牌堆后获得之。',
 			reyicong_info:'锁定技，你计算与其他角色的距离时-1。若你的体力值不大于2，则其他角色计算与你的距离时+1。',
 			refankui_info:'每当你受到1点伤害后，你可以获得伤害来源的一张牌。',

character/sp.js

@@ -24814,7 +24814,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			wangyun:['wangyun','dc_wangyun','re_wangyun','jsrg_wangyun','old_wangyun','pe_wangyun'],
 			zhangliang:['re_zhangliang','zhangliang'],
 			lingju:['lingju','old_lingju'],
-			guansuo:['guansuo','ol_guansuo'],
+			guansuo:['guansuo','dc_guansuo'],
 			zhangxingcai:['zhangxingcai','old_zhangxingcai'],
 			lisu:['ol_lisu','lisu'],
 			fuwan:['fuwan','tw_fuwan','sp_fuwan'],

character/sp2.js

@@ -5546,7 +5546,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					else event.finish();
 					'step 2'
 					var list=game.filterPlayer(function(current){
-						return current.name=='ol_guansuo'||current.name2=='ol_guansuo';
+						return current.name=='dc_guansuo'||current.name2=='dc_guansuo';
 					});
 					if(list.length) game.asyncDraw(list);
 					else event.finish();
@@ -5868,7 +5868,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				charlotte:true,
 				filter:function(event,player){
 					return event.decadexushen==true&&!game.hasPlayer(function(current){
-						return current.name=='ol_guansuo'||current.name2=='ol_guansuo';
+						return current.name=='dc_guansuo'||current.name2=='dc_guansuo';
 					});
 				},
 				content:function(){
@@ -5894,11 +5894,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					}
 					else event.goto(4);
 					'step 3'
-					target.reinit(result.control,'ol_guansuo');
-					if(target.name=='ol_guansuo'&&target.group!='shu') target.changeGroup('shu');
+					target.reinit(result.control,'dc_guansuo');
+					if(target.name=='dc_guansuo'&&target.group!='shu') target.changeGroup('shu');
 					if(_status.characterlist){
 						_status.characterlist.add(result.control);
-						_status.characterlist.remove('ol_guansuo');
+						_status.characterlist.remove('dc_guansuo');
 					}
 					'step 4'
 					target.draw(3);

character/xianding.js

@@ -7,7 +7,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			wu_luxun:['male','wu',3,['dcxiongmu','dczhangcai','dcruxian']],
 			dc_xujing:['male','shu',3,['dcshangyu','dccaixia']],
 			dc_zhaoxiang:['female','shu',4,['refanghun','refuhan']],
-			ol_guansuo:['male','shu',4,['xinzhengnan','xiefang']],
+			dc_guansuo:['male','shu',4,['xinzhengnan','xiefang']],
 			dc_shixie:['male','qun',3,['rebiluan','ollixia']],
 			dc_sp_machao:['male','qun',4,['zhuiji','dc_olshichou']],
 			old_huangfusong:['male','qun',4,['xinfenyue']],
@@ -95,7 +95,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				sp2_doukou:['re_xinxianying','huaman','xuelingyun','dc_ruiji','duanqiaoxiao','tianshangyi'],
 				sp2_jichu:['zhaoang','dc_liuye','dc_wangyun','yanghong','huanfan','xizheng'],
 				sp2_yuxiu:['dongguiren','dc_tengfanglan','zhangjinyun','zhoubuyi','dc_xujing'],
-				sp2_qifu:['ol_guansuo','dc_zhaoxiang'],
+				sp2_qifu:['dc_guansuo','dc_zhaoxiang'],
 				sp2_gaoshan:['wanglang','liuhui'],
 				sp2_wumiao:['wu_zhugeliang','wu_luxun'],
 			}
@@ -12827,8 +12827,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			dc_sp_machao_prefix:'群',
 			dc_shixie:'新杀士燮',
 			dc_shixie_prefix:'新杀',
-			ol_guansuo:'新杀关索',
-			ol_guansuo_prefix:'新杀',
+			dc_guansuo:'新杀关索',
+			dc_guansuo_prefix:'新杀',
 			dc_zhaoxiang:'新杀赵襄',
 			dc_zhaoxiang_prefix:'新杀',
 			dc_xujing:'许靖',

character/yijiang.js

@@ -2505,7 +2505,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:'dangxian',
 				audioname:['guansuo','xin_liaohua','re_liaohua'],
 				audioname2:{
-					ol_guansuo:'dangxian_guansuo',
+					dc_guansuo:'dangxian_guansuo',
 				},
 				content:function(){
 					trigger.phaseList.splice(trigger.num,0,'phaseUse|xindangxian');
@@ -10178,7 +10178,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:'zhiman',
 				audioname:['guansuo','re_masu'],
 				audioname2:{
-					ol_guansuo:'zhiman_guansuo',
+					dc_guansuo:'zhiman_guansuo',
 				},
 				trigger:{source:'damageBegin2'},
 				filter:function(event,player){

game/asset.js

@@ -6552,6 +6552,7 @@ window.noname_asset_list=[
 	'image/character/dc_ganfuren.jpg',
 	'image/character/dc_gaolan.jpg',
 	'image/character/dc_gongsunzan.jpg',
+	'image/character/dc_guansuo.jpg',
 	'image/character/dc_huangchengyan.jpg',
 	'image/character/dc_huanghao.jpg',
 	'image/character/dc_huangquan.jpg',
@@ -7334,7 +7335,6 @@ window.noname_asset_list=[
 	'image/character/ol_dongzhao.jpg',
 	'image/character/ol_dongzhuo.jpg',
 	'image/character/ol_furong.jpg',
-	'image/character/ol_guansuo.jpg',
 	'image/character/ol_guohuai.jpg',
 	'image/character/ol_huangzhong.jpg',
 	'image/character/ol_huaxin.jpg',

mode/guozhan.js

@@ -14687,7 +14687,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			huangjintianbingfu:'黄巾天兵符',
 			huangjintianbingfu_ab:'兵符',
 			huangjintianbingfu_bg:'符',
-			huangjintianbingfu_info:'锁定技 ：当你计算群势力角色数时，每一张“天兵”均可视为一名群势力角色。<br>当你失去体力时，你可改为将一张“天兵”置入弃牌堆。<br>与你势力相同的角色可将一张“天兵”当作【杀】使用或打出。',
+			huangjintianbingfu_info:'锁定技，当你计算群势力角色数时，每一张“天兵”均可视为一名群势力角色。<br>当你失去体力时，你可改为将一张“天兵”置入弃牌堆。<br>与你势力相同的角色可将一张“天兵”当作【杀】使用或打出。',
 			wuhujiangdaqi:'五虎将大旗',
 			wuhujiangdaqi_ab:'将旗',
 			wuhujiangdaqi_bg:'旗',