将谋攻篇武将加入characterReplace

character/clan.js

@@ -2256,7 +2256,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 		},
 		characterReplace:{
-			wuban:['dc_wuban','clan_wuban','wuban'],
+			wuban:['clan_wuban','dc_wuban','wuban'],
 		},
 		characterIntro:{
 			xunshu:'荀淑（83年～149年），字季和，为郎陵侯相，颍川颍阴人（今河南省许昌市）人。汉和帝至汉桓帝时人物，以品行高洁著称。有子八人，号八龙。年轻时有高尚的德行，学问渊博，不喜欢雕章琢句，徒在文字上用功，不注重实际的学识。因此，常常被俗儒看不起。但州里却称他有知人之明。安帝时，征召任为郎中，后来再升当涂长。离职还乡里。他的孙子荀彧是曹操部下著名的谋士。',

character/extra.js

@@ -65,11 +65,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			shen_zhugeliang:'字孔明、号卧龙，汉族，琅琊阳都人，三国时期蜀汉丞相、杰出的政治家、军事家、发明家、文学家。在世时被封为武乡侯，死后追谥忠武侯，后来东晋政权推崇诸葛亮军事才能，特追封他为武兴王。诸葛亮为匡扶蜀汉政权，呕心沥血、鞠躬尽瘁、死而后已。其代表作有《前出师表》、《后出师表》、《诫子书》等。曾发明木牛流马等，并改造连弩，可一弩十矢俱发。于234年在宝鸡五丈原逝世。',
 		},
 		characterReplace:{
-			shen_zhangliao:['shen_zhangliao','ol_zhangliao'],
+			shen_zhangliao:['ol_zhangliao','shen_zhangliao'],
 			shen_zhaoyun:['shen_zhaoyun','boss_zhaoyun'],
 			shen_guanyu:['shen_guanyu','tw_shen_guanyu'],
 			shen_sunquan:['shen_sunquan','junk_sunquan'],
-			shen_lvmeng:['tw_shen_lvmeng','shen_lvmeng'],
+			shen_lvmeng:['shen_lvmeng','tw_shen_lvmeng'],
 			shen_machao:['shen_machao','ps_shen_machao'],
 		},
 		characterFilter:{

character/huicui.js

@@ -9983,17 +9983,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		},
 		perfectPair:{},
 		characterReplace:{
-			dongbai:['re_dongbai','dongbai','jsrg_dongbai'],
+			dongbai:['dongbai','re_dongbai','jsrg_dongbai'],
 			chunyuqiong:['chunyuqiong','re_chunyuqiong','jsrg_chunyuqiong'],
-			kanze:['re_kanze','kanze'],
+			kanze:['kanze','re_kanze'],
 			chendeng:['ol_chendeng','re_chendeng','chendeng','jsrg_chendeng'],
-			miheng:['miheng','re_miheng'],
+			miheng:['re_miheng','miheng'],
 			liuba:['ol_liuba','dc_liuba','liuba'],
 			lvkuanglvxiang:['lvkuanglvxiang','dc_lvkuanglvxiang'],
-			dc_huangquan:['dc_huangquan','xf_huangquan'],
+			dc_huangquan:['xf_huangquan','dc_huangquan'],
 			yuejiu:['dc_yuejiu','yuejiu'],
 			jiling:['dc_jiling','tw_jiling','jiling'],
-			sp_jiaxu:['dc_sp_jiaxu','sp_jiaxu','yj_jiaxu'],
+			sp_jiaxu:['sp_jiaxu','dc_sp_jiaxu','yj_jiaxu'],
 			qiaorui:['qiaorui','tw_qiaorui'],
 			mamidi:['mamidi','xin_mamidi'],
 		},

character/shenhua.js

@@ -7708,45 +7708,45 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 		},
 		characterReplace:{
-			caoren:['caoren','new_caoren','old_caoren'],
+			caoren:['caoren','old_caoren','sb_caoren','new_caoren'],
 			sp_caoren:['sp_caoren','jsp_caoren'],
-			xiahouyuan:['ol_xiahouyuan','re_xiahouyuan','xiahouyuan'],
-			huangzhong:['ol_huangzhong','re_huangzhong','huangzhong'],
-			weiyan:['ol_weiyan','re_weiyan','weiyan'],
+			xiahouyuan:['re_xiahouyuan','ol_xiahouyuan','xiahouyuan'],
+			huangzhong:['re_huangzhong','ol_huangzhong','sb_huangzhong','huangzhong'],
+			weiyan:['re_weiyan','ol_weiyan','weiyan'],
 			zhoutai:['zhoutai','xin_zhoutai','old_zhoutai'],
-			xiaoqiao:['ol_xiaoqiao','re_xiaoqiao','xiaoqiao','old_xiaoqiao'],
+			xiaoqiao:['xiaoqiao','ol_xiaoqiao','re_xiaoqiao','old_xiaoqiao'],
 			yuji:['xin_yuji','re_yuji','yuji'],
-			zhangjiao:['re_zhangjiao','sp_zhangjiao','zhangjiao'],
-			dianwei:['ol_dianwei','re_dianwei','dianwei'],
-			xunyu:['ol_xunyu','re_xunyu','xunyu'],
-			sp_zhugeliang:['ol_sp_zhugeliang','re_sp_zhugeliang','sp_zhugeliang'],
-			pangtong:['ol_pangtong','re_pangtong','pangtong'],
+			zhangjiao:['sp_zhangjiao','re_zhangjiao','sb_zhangjiao','zhangjiao'],
+			dianwei:['dianwei','ol_dianwei','re_dianwei'],
+			xunyu:['xunyu','ol_xunyu','re_xunyu'],
+			sp_zhugeliang:['sp_zhugeliang','ol_sp_zhugeliang','re_sp_zhugeliang'],
+			pangtong:['pangtong','ol_pangtong','re_pangtong','sb_pangtong'],
 			re_jsp_pangtong:['re_jsp_pangtong','sp_pangtong'],
-			taishici:['re_taishici','taishici'],
-			re_yuanshao:['ol_yuanshao','re_yuanshao','xin_yuanshao'],
-			pangde:['ol_pangde','re_pangde','pangde'],
-			yanwen:['ol_yanwen','re_yanwen','yanwen'],
+			taishici:['taishici','re_taishici'],
+			re_yuanshao:['re_yuanshao','ol_yuanshao','xin_yuanshao','sb_yuanshao'],
+			pangde:['re_pangde','ol_pangde','pangde'],
+			yanwen:['yanwen','ol_yanwen','re_yanwen'],
 			caopi:['caopi','re_caopi','ps_caopi'],
-			xuhuang:['ol_xuhuang','re_xuhuang','xuhuang'],
-			menghuo:['re_menghuo','menghuo'],
-			zhurong:['re_zhurong','ol_zhurong','zhurong'],
-			sunjian:['ol_sunjian','re_sunjian','sunjian'],
-			jiaxu:['re_jiaxu','jiaxu','ns_jiaxu','ps_jiaxu'],
-			dongzhuo:['ol_dongzhuo','sp_dongzhuo','re_dongzhuo','dongzhuo','yj_dongzhuo'],
-			dengai:['re_dengai','ol_dengai','dengai'],
+			xuhuang:['re_xuhuang','ol_xuhuang','sb_xuhuang','xuhuang'],
+			menghuo:['menghuo','re_menghuo','sb_menghuo'],
+			zhurong:['zhurong','ol_zhurong','re_zhurong','sb_zhurong'],
+			sunjian:['sunjian','ol_sunjian','re_sunjian'],
+			jiaxu:['jiaxu','re_jiaxu','ns_jiaxu','ps_jiaxu'],
+			dongzhuo:['dongzhuo','ol_dongzhuo','re_dongzhuo','sp_dongzhuo','yj_dongzhuo'],
+			dengai:['dengai','ol_dengai','re_dengai'],
 			sp_ol_zhanghe:['sp_ol_zhanghe','yj_zhanghe','sp_zhanghe','jsrg_zhanghe'],
-			jiangwei:['ol_jiangwei','re_jiangwei','jiangwei'],
-			liushan:['ol_liushan','re_liushan','liushan'],
-			sunce:['re_sunben','re_sunce','sunce'],
-			zhangzhang:['ol_zhangzhang','re_zhangzhang','zhangzhang'],
-			zuoci:['re_zuoci','zuoci'],
-			caiwenji:['ol_caiwenji','re_caiwenji','caiwenji'],
-			xuyou:['sp_xuyou','xuyou','jsrg_xuyou','yj_xuyou','junk_xuyou'],
-			guanqiujian:['guanqiujian','tw_guanqiujian','re_guanqiujian','old_guanqiujian'],
-			chendao:['chendao','old_chendao','ns_chendao'],
+			jiangwei:['jiangwei','ol_jiangwei','re_jiangwei','sb_jiangwei'],
+			liushan:['liushan','ol_liushan','re_liushan'],
+			sunce:['sunce','re_sunce','re_sunben','sb_sunce'],
+			zhangzhang:['zhangzhang','ol_zhangzhang','re_zhangzhang'],
+			zuoci:['zuoci','re_zuoci'],
+			caiwenji:['caiwenji','ol_caiwenji','re_caiwenji'],
+			xuyou:['xuyou','sp_xuyou','jsrg_xuyou','yj_xuyou','junk_xuyou'],
+			guanqiujian:['guanqiujian','re_guanqiujian','tw_guanqiujian','old_guanqiujian'],
+			chendao:['chendao','ns_chendao','old_chendao'],
 			zhugezhan:['zhugezhan','old_zhugezhan'],
-			ol_lusu:['ol_lusu','re_lusu'],
-			zhanghe:['re_zhanghe','zhanghe'],
+			ol_lusu:['re_lusu','ol_lusu'],
+			zhanghe:['zhanghe','re_zhanghe','sb_zhanghe'],
 			yl_luzhi:['yl_luzhi','tw_yl_luzhi'],
 			sunliang:['sunliang','xin_sunliang'],
 		},

character/shiji.js

@@ -6374,28 +6374,28 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			wujing:['sunce','sunben','wuguotai'],
 		},
 		characterReplace:{
-			wangcan:['tw_wangcan','wangcan','sp_wangcan'],
-			sunshao:['sp_sunshao','sunshao'],
-			xunchen:['re_xunchen','xunchen','tw_xunchen','sp_xunchen'],
+			wangcan:['wangcan','sp_wangcan','tw_wangcan'],
+			sunshao:['sunshao','sp_sunshao'],
+			xunchen:['xunchen','re_xunchen','sp_xunchen','tw_xunchen'],
 			xinpi:['xinpi','sp_xinpi'],
 			duyu:['duyu','dc_duyu','sp_duyu','pk_sp_duyu'],
-			zhangwen:['sp_zhangwen','zhangwen'],
-			ol_bianfuren:['ol_bianfuren','tw_bianfuren','sp_bianfuren'],
+			zhangwen:['zhangwen','sp_zhangwen'],
+			ol_bianfuren:['ol_bianfuren','sp_bianfuren','tw_bianfuren'],
 			wangshuang:['wangshuang','sp_wangshuang'],
 			huaman:['huaman','sp_huaman'],
-			gaolan:['dc_gaolan','gaolan','sp_gaolan'],
-			cuiyan:['sp_cuiyan','cuiyan'],
-			wujing:['tw_wujing','wujing'],
+			gaolan:['gaolan','dc_gaolan','sp_gaolan'],
+			cuiyan:['cuiyan','sp_cuiyan'],
+			wujing:['wujing','tw_wujing'],
 			zhouchu:['jin_zhouchu','zhouchu','tw_zhouchu'],
 			liuzhang:['liuzhang','tw_liuzhang'],
-			chenzhen:['tw_chenzhen','sp_chenzhen'],
-			feiyi:['tw_feiyi','feiyi'],
-			wangling:['tw_wangling','wangling'],
-			qiaogong:['tw_qiaogong','qiaogong'],
-			sp_chendong:['tw_chendong','sp_chendong','chendong'],
-			sp_jiangqing:['tw_jiangqing','sp_jiangqing','jiangqing'],
+			chenzhen:['sp_chenzhen','tw_chenzhen'],
+			feiyi:['feiyi','tw_feiyi'],
+			wangling:['wangling','tw_wangling'],
+			qiaogong:['qiaogong','tw_qiaogong'],
+			sp_chendong:['sp_chendong','tw_chendong','chendong'],
+			sp_jiangqing:['sp_jiangqing','tw_jiangqing','jiangqing'],
             kongrong:['sp_kongrong','jsrg_kongrong','kongrong'],
-			mifuren:['dc_mifuren','sp_mifuren'],
+			dc_mifuren:['dc_mifuren','sp_mifuren'],
 		},
 		translate:{
 			liuba_prefix:'手杀',

character/sp.js

@@ -24406,53 +24406,53 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			shixie:['shixie','dc_shixie'],
 			caoshuang:['caoshuang','ns_caoshuang'],
 			caoang:['caoang','yj_caoang','tw_caoang'],
-			caohong:['tw_re_caohong','caohong','tw_caohong','yj_caohong'],
-			xiahouba:['xiahouba','tw_xiahouba','dc_xiahouba'],
+			caohong:['caohong','tw_re_caohong','tw_caohong','yj_caohong'],
+			xiahouba:['xiahouba','dc_xiahouba','tw_xiahouba'],
 			maliang:['maliang','re_maliang','tw_maliang','ol_maliang','old_maliang'],
 			dingfeng:['dingfeng','tw_dingfeng','old_dingfeng'],
 			zumao:['zumao','tw_zumao'],
-			beimihu:['tw_beimihu','beimihu'],
-			panfeng:['re_panfeng','panfeng','std_panfeng'],
+			tw_beimihu:['beimihu','tw_beimihu'],
+			panfeng:['panfeng','re_panfeng','std_panfeng'],
 			sunluyu:['sunluyu','re_sunluyu'],
 			jin_simazhao:['jin_simazhao','simazhao','sp_simazhao'],
 			jin_wangyuanji:['jin_wangyuanji','wangyuanji','sp_wangyuanji'],
-			wangyun:['re_wangyun','wangyun','dc_wangyun','jsrg_wangyun','old_wangyun','pe_wangyun'],
+			wangyun:['wangyun','dc_wangyun','re_wangyun','jsrg_wangyun','old_wangyun','pe_wangyun'],
 			zhangliang:['re_zhangliang','zhangliang'],
 			lingju:['lingju','old_lingju'],
 			guansuo:['guansuo','ol_guansuo'],
 			zhangxingcai:['zhangxingcai','old_zhangxingcai'],
 			lisu:['ol_lisu','lisu'],
-			fuwan:['fuwan','sp_fuwan','tw_fuwan'],
+			fuwan:['fuwan','tw_fuwan','sp_fuwan'],
 			huaxin:['ol_huaxin','huaxin','sp_huaxin'],
-			xujing:['dc_xujing','xujing','tw_xujing','sp_xujing'],
-			zhaoxiang:['zhaoxiang','tw_zhaoxiang','dc_zhaoxiang'],
-			dengzhi:['ol_dengzhi','re_dengzhi','tw_dengzhi','dengzhi'],
-			wangrong:['wangrong','ol_wangrong'],
-			zongyu:['tw_zongyu','sp_zongyu','zongyu'],
+			xujing:['xujing','dc_xujing','sp_xujing','tw_xujing'],
+			zhaoxiang:['zhaoxiang','dc_zhaoxiang','tw_zhaoxiang'],
+			dengzhi:['ol_dengzhi','re_dengzhi','dengzhi','tw_dengzhi'],
+			wangrong:['ol_wangrong','wangrong'],
+			zongyu:['zongyu','sp_zongyu','tw_zongyu'],
 			ol_dongzhao:['ol_dongzhao','tw_dongzhao'],
-			mayunlu:['tw_mayunlu','mayunlu'],
+			mayunlu:['mayunlu','tw_mayunlu'],
 			zhuling:['ol_zhuling','dc_zhuling','zhuling'],
-			zangba:['tw_zangba','zangba'],
+			zangba:['zangba','tw_zangba'],
 			zhangbao:['zhangbao','re_zhangbao'],
 			jianggan:['jianggan','sp_jianggan'],
 			dc_jiben:['dc_jiben','sp_jiben'],
-			yangyi:['ol_yangyi','tw_yangyi','yangyi'],
-			tianyu:['tw_tianyu','tianyu'],
+			yangyi:['ol_yangyi','yangyi','tw_yangyi'],
+			tianyu:['tianyu','tw_tianyu'],
 			huangchengyan:['huangchengyan','dc_huangchengyan'],
-			puyuan:['puyuan','ol_puyuan'],
-			huangzu:['dc_huangzu','huangzu'],
-			huojun:['dc_huojun','huojun','tw_huojun'],
-			zhaoyǎn:['dc_zhaoyǎn','zhaoyǎn'],
-			furong:['ol_furong','tw_furong','furong'],
-			daxiaoqiao:['tw_daxiaoqiao','daxiaoqiao','dc_daxiaoqiao'],
-			zhugeguo:['tw_zhugeguo','zhugeguo'],
-			wanglang:['wanglang','ol_wanglang','old_wanglang'],
-			tengfanglan:['dc_tengfanglan','tengfanglan'],
+			puyuan:['ol_puyuan','puyuan'],
+			huangzu:['huangzu','dc_huangzu'],
+			huojun:['huojun','dc_huojun','tw_huojun'],
+			zhaoyǎn:['zhaoyǎn','dc_zhaoyǎn'],
+			furong:['ol_furong','furong','tw_furong'],
+			daxiaoqiao:['daxiaoqiao','dc_daxiaoqiao','tw_daxiaoqiao'],
+			zhugeguo:['zhugeguo','tw_zhugeguo'],
+			wanglang:['ol_wanglang','wanglang','old_wanglang'],
+			tengfanglan:['tengfanglan','dc_tengfanglan'],
 			zhangyì:['ol_zhangyì','zhangyì'],
 			yuantanyuanshang:['yuantanyuanshang','yuantanyuanxiyuanshang'],
-			ruiji:['dc_ruiji','ruiji'],
+			ruiji:['ruiji','dc_ruiji'],
 			jsp_huangyueying:['jsp_huangyueying','re_jsp_huangyueying'],
-			ganfuren:['dc_ganfuren','ganfuren'],
+			ganfuren:['ganfuren','dc_ganfuren'],
 			wenqin:['wenqin','pe_wenqin'],
 			zhouqun:['ol_zhouqun','zhouqun'],
 			qianzhao:['ol_qianzhao','qianzhao'],

character/sp2.js

@@ -10097,21 +10097,21 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			lijue:['lijue','ns_lijue'],
 			fanchou:['fanchou','tw_fanchou','ns_fanchou'],
 			zhangji:['zhangji','ns_zhangji'],
-			zhangchangpu:['zhangchangpu','sp_zhangchangpu','ol_zhangchangpu'],
+			zhangchangpu:['ol_zhangchangpu','zhangchangpu','sp_zhangchangpu'],
 			huangfusong:['huangfusong','sp_huangfusong','jsrg_huangfusong','old_huangfusong'],
 			dingyuan:['ol_dingyuan','dingyuan'],
 			quyi:['quyi','re_quyi'],
-			hansui:['hansui','xin_hansui','re_hansui'],
+			hansui:['hansui','re_hansui','xin_hansui'],
 			jin_simashi:['jin_simashi','simashi'],
 			jin_yanghuiyu:['jin_yanghuiyu','yanghuiyu'],
-			taoqian:['taoqian','re_taoqian'],
+			taoqian:['re_taoqian','taoqian'],
 			sp_liubei:['jsrg_liubei','sp_liubei'],
 			dongcheng:['re_dongcheng','dongcheng'],
-			hucheer:['tw_hucheer','re_hucheer','hucheer'],
+			hucheer:['re_hucheer','hucheer','tw_hucheer'],
 			nanhualaoxian:['re_nanhualaoxian','nanhualaoxian','jsrg_nanhualaoxian'],
 			pangdegong:['re_pangdegong','pangdegong'],
-			zhujun:['sp_zhujun','ol_zhujun','zhujun','jsrg_zhujun'],
-			tw_liuhong:['tw_liuhong','liuhong','jsrg_liuhong'],
+			zhujun:['ol_zhujun','zhujun','sp_zhujun','jsrg_zhujun'],
+			tw_liuhong:['liuhong','tw_liuhong','jsrg_liuhong'],
 			re_hejin:['hejin','re_hejin','tw_hejin','jsrg_hejin'],
 			hujinding:['dc_hujinding','hujinding'],
 			caosong:['caosong','sp_caosong'],
@@ -10121,9 +10121,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			caoanmin:['caoanmin','ns_caoanmin'],
 			duanwei:['duanwei','junk_duanwei'],
 			xushao:['xushao','jsrg_xushao'],
-			huban:['dc_huban','ol_huban'],
-			mengda:['dc_mengda','ol_mengda','pe_mengda'],
-			jsp_guanyu:['jsrg_guanyu','dc_jsp_guanyu','jsp_guanyu'],
+			huban:['ol_huban','dc_huban'],
+			mengda:['ol_mengda','dc_mengda','pe_mengda'],
+			jsp_guanyu:['jsp_guanyu','dc_jsp_guanyu','jsrg_guanyu'],
 			mushun:['mushun','sp_mushun'],
 			wangjun:['dc_wangjun','wangjun'],
 			zoushi:['re_zoushi','jsrg_zoushi'],

character/standard.js

@@ -2477,39 +2477,39 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 		},
 		characterReplace:{
-			caocao:['re_caocao','caocao','dc_caocao'],
-			guojia:['re_guojia','guojia','ps1059_guojia','ps2070_guojia'],
-			simayi:['re_simayi','simayi','ps_simayi','ps2068_simayi'],
+			caocao:['caocao','re_caocao','sb_caocao','dc_caocao'],
+			guojia:['guojia','re_guojia','ps1059_guojia','ps2070_guojia'],
+			simayi:['simayi','re_simayi','ps_simayi','ps2068_simayi'],
 			jin_simayi:['jin_simayi','junk_simayi','ps_jin_simayi'],
-			zhenji:['re_zhenji','yj_zhenji','zhenji'],
-			xuzhu:['re_xuzhu','xuzhu'],
-			zhangliao:['re_zhangliao','zhangliao'],
+			zhenji:['zhenji','re_zhenji','sb_zhenji','yj_zhenji'],
+			xuzhu:['xuzhu','re_xuzhu'],
+			zhangliao:['zhangliao','re_zhangliao'],
 			sp_zhangliao:['sp_zhangliao','yj_zhangliao','jsrg_zhangliao'],
-			xiahoudun:['re_xiahoudun','xin_xiahoudun','xiahoudun'],
-			liubei:['re_liubei','liubei','dc_liubei','junk_liubei'],
-			guanyu:['re_guanyu','guanyu','ps_guanyu'],
-			zhangfei:['re_zhangfei','tw_zhangfei','xin_zhangfei','old_zhangfei','zhangfei','yj_zhangfei'],
-			zhaoyun:['re_zhaoyun','old_zhaoyun','zhaoyun','ps2063_zhaoyun','ps2067_zhaoyun'],
+			xiahoudun:['xiahoudun','re_xiahoudun','xin_xiahoudun'],
+			liubei:['liubei','re_liubei','sb_liubei','dc_liubei','junk_liubei'],
+			guanyu:['guanyu','re_guanyu','ps_guanyu'],
+			zhangfei:['zhangfei','re_zhangfei','old_zhangfei','xin_zhangfei','sb_zhangfei','tw_zhangfei','yj_zhangfei'],
+			zhaoyun:['zhaoyun','re_zhaoyun','old_zhaoyun','sb_zhaoyun','ps2063_zhaoyun','ps2067_zhaoyun'],
 			sp_zhaoyun:['sp_zhaoyun','jsp_zhaoyun'],
-			machao:['re_machao','machao','ps_machao'],
-			sp_machao:['sp_machao','old_machao','dc_sp_machao'],
-			zhugeliang:['re_zhugeliang','zhugeliang','ps2066_zhugeliang','ps_zhugeliang'],
-			huangyueying:['re_huangyueying','huangyueying','junk_huangyueying'],
-			sunquan:['re_sunquan','sunquan','dc_sunquan'],
-			zhouyu:['re_zhouyu','zhouyu','ps1062_zhouyu','ps2080_zhouyu'],
-			luxun:['re_luxun','luxun'],
-			lvmeng:['re_lvmeng','lvmeng'],
-			huanggai:['re_huanggai','huanggai'],
-			daqiao:['re_daqiao','daqiao'],
-			sunshangxiang:['re_sunshangxiang','sunshangxiang'],
-			ganning:['re_ganning','ganning','yongjian_ganning'],
+			machao:['machao','re_machao','sb_machao','ps_machao'],
+			sp_machao:['sp_machao','dc_sp_machao','old_machao'],
+			zhugeliang:['zhugeliang','re_zhugeliang','ps2066_zhugeliang','ps_zhugeliang'],
+			huangyueying:['huangyueying','re_huangyueying','junk_huangyueying'],
+			sunquan:['sunquan','re_sunquan','sb_sunquan','dc_sunquan'],
+			zhouyu:['zhouyu','re_zhouyu','sb_zhouyu','ps1062_zhouyu','ps2080_zhouyu'],
+			luxun:['luxun','re_luxun'],
+			lvmeng:['lvmeng','re_lvmeng','sb_lvmeng'],
+			huanggai:['huanggai','re_huanggai','sb_huanggai'],
+			daqiao:['daqiao','re_daqiao','sb_daqiao'],
+			sunshangxiang:['sunshangxiang','re_sunshangxiang','sb_sunshangxiang'],
+			ganning:['ganning','re_ganning','sb_ganning','yongjian_ganning'],
 			yj_ganning:['yj_ganning','sp_ganning'],
-			lvbu:['re_lvbu','lvbu','jsrg_lvbu','ps_lvbu'],
-			diaochan:['re_diaochan','diaochan'],
-			huatuo:['re_huatuo','old_huatuo','huatuo'],
-			huaxiong:['re_huaxiong','old_huaxiong','huaxiong','ol_huaxiong'],
-			yuanshu:['yl_yuanshu','yuanshu','re_yuanshu','old_yuanshu','ol_yuanshu'],
-			gongsunzan:['dc_gongsunzan','re_gongsunzan','xin_gongsunzan','gongsunzan'],
+			lvbu:['lvbu','re_lvbu','jsrg_lvbu','ps_lvbu'],
+			diaochan:['diaochan','re_diaochan','sb_diaochan'],
+			huatuo:['huatuo','re_huatuo','old_huatuo'],
+			huaxiong:['huaxiong','re_huaxiong','old_huaxiong','sb_huaxiong','ol_huaxiong'],
+			yuanshu:['yuanshu','re_yuanshu','yl_yuanshu','old_yuanshu','ol_yuanshu'],
+			gongsunzan:['gongsunzan','re_gongsunzan','dc_gongsunzan','xin_gongsunzan'],
 			re_lidian:['re_lidian','old_re_lidian','junk_lidian'],
 		},
 		translate:{

character/xianding.js

@@ -12230,9 +12230,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gexuan:['gexuan','tw_gexuan'],
 			panshu:['panshu','re_panshu'],
 			yangwan:['yangwan','sp_yangwan'],
-			sunyi:['re_sunyi','tw_sunyi','sunyi'],
-			fengfangnv:['re_fengfangnv','fengfangnv'],
-			luotong:['luotong','dc_luotong'],
+			sunyi:['re_sunyi','sunyi','tw_sunyi'],
+			fengfangnv:['fengfangnv','re_fengfangnv'],
+			luotong:['dc_luotong','luotong'],
 			dc_wangchang:['dc_wangchang','tw_wangchang'],
 			guozhao:['guozhao','xin_guozhao'],
 		},

character/xinghuoliaoyuan.js

@@ -1565,11 +1565,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 		},
 		characterReplace:{
-			duji:['re_duji','duji','ns_duji'],
-			sp_taishici:['re_sp_taishici','sp_taishici'],
+			duji:['duji','re_duji','ns_duji'],
+			sp_taishici:['sp_taishici','re_sp_taishici'],
 			mazhong:['mazhong','re_mazhong'],
-			wenpin:['re_wenpin','wenpin'],
-			liuyan:['jsrg_liuyan','ol_liuyan','liuyan'],
+			wenpin:['wenpin','re_wenpin'],
+			liuyan:['liuyan','jsrg_liuyan','ol_liuyan'],
 		},
 		translate:{
 			xinghuoliaoyuan:'星火燎原',

character/yijiang.js

@@ -13889,73 +13889,73 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 		},
 		characterReplace:{
-			caozhi:['re_caozhi','dc_caozhi','caozhi','ps_caozhi'],
-			zhangchunhua:['re_zhangchunhua','zhangchunhua','mini_zhangchunhua'],
-			yujin:['yujin_yujin','ol_yujin','xin_yujin','yujin','re_yujin'],
-			dc_xushu:['dc_xushu','re_xushu'],
+			caozhi:['caozhi','dc_caozhi','re_caozhi','ps_caozhi'],
+			zhangchunhua:['zhangchunhua','re_zhangchunhua'],
+			yujin:['yujin','yujin_yujin','ol_yujin','sb_yujin','xin_yujin','re_yujin'],
+			dc_xushu:['re_xushu','dc_xushu'],
 			xushu:['xin_xushu','xushu'],
-			fazheng:['re_fazheng','tw_re_fazheng','xin_fazheng','fazheng'],
+			fazheng:['xin_fazheng','re_fazheng','sb_fazheng','tw_re_fazheng','fazheng'],
 			masu:['xin_masu','re_masu','masu'],
-			xusheng:['xin_xusheng','re_xusheng','xusheng','old_xusheng'],
-			wuguotai:['xin_wuguotai','re_wuguotai','wuguotai'],
-			lingtong:['xin_lingtong','re_lingtong','lingtong','old_lingtong'],
-			gaoshun:['xin_gaoshun','re_gaoshun','gaoshun','old_gaoshun'],
-			zhonghui:['re_zhonghui','xin_zhonghui','zhonghui','old_zhonghui','pe_zhonghui'],
-			wangyi:['re_wangyi','wangyi','old_wangyi'],
-			caozhang:['re_caozhang','xin_caozhang','caozhang'],
-			guanzhang:['re_guanzhang','guanzhang','old_guanzhang'],
-			madai:['tw_madai','re_madai','old_madai','madai'],
-			liaohua:['xin_liaohua','re_liaohua','liaohua'],
-			bulianshi:['re_bulianshi','dc_bulianshi','bulianshi','old_bulianshi'],
-			handang:['tw_handang','xin_handang','re_handang','handang','old_handang'],
-			chengpu:['re_chengpu','tw_chengpu','ns_chengpu','chengpu','xin_chengpu'],
-			liubiao:['re_liubiao','xin_liubiao','liubiao','oldre_liubiao','old_liubiao'],
-			manchong:['re_manchong','manchong'],
-			caochong:['re_caochong','caochong','old_caochong'],
-			guohuai:['guohuai','tw_guohuai','re_guohuai','xin_guohuai','ol_guohuai'],
-			jianyong:['re_jianyong','xin_jianyong','jianyong'],
-			panzhangmazhong:['xin_panzhangmazhong','re_panzhangmazhong','panzhangmazhong'],
-			yufan:['xin_yufan','re_yufan','yufan'],
-			zhuran:['re_zhuran','xin_zhuran','zhuran','old_zhuran'],
-			liru:['re_liru','dc_liru','xin_liru','liru','yj_liru'],
-			fuhuanghou:['re_fuhuanghou','xin_fuhuanghou','fuhuanghou','old_fuhuanghou'],
-			chenqun:['dc_chenqun','chenqun','re_chenqun','old_chenqun'],
-			hanhaoshihuan:['re_hanhaoshihuan','hanhaoshihuan'],
-			caozhen:['re_caozhen','xin_caozhen','caozhen','old_caozhen'],
-			wuyi:['re_wuyi','xin_wuyi','wuyi'],
+			xusheng:['xusheng','xin_xusheng','re_xusheng','old_xusheng'],
+			wuguotai:['wuguotai','xin_wuguotai','re_wuguotai'],
+			lingtong:['lingtong','xin_lingtong','re_lingtong','old_lingtong'],
+			gaoshun:['gaoshun','xin_gaoshun','re_gaoshun','old_gaoshun'],
+			zhonghui:['zhonghui','xin_zhonghui','re_zhonghui','old_zhonghui','pe_zhonghui'],
+			wangyi:['wangyi','re_wangyi','old_wangyi'],
+			caozhang:['caozhang','re_caozhang','xin_caozhang'],
+			guanzhang:['guanzhang','re_guanzhang','old_guanzhang'],
+			madai:['old_madai','re_madai','tw_madai','madai'],
+			liaohua:['liaohua','re_liaohua','xin_liaohua'],
+			bulianshi:['bulianshi','dc_bulianshi','re_bulianshi','old_bulianshi'],
+			handang:['handang','xin_handang','re_handang','tw_handang','old_handang'],
+			chengpu:['chengpu','re_chengpu','xin_chengpu','tw_chengpu','ns_chengpu'],
+			liubiao:['liubiao','xin_liubiao','re_liubiao','sb_liubiao','oldre_liubiao','old_liubiao'],
+			manchong:['manchong','re_manchong'],
+			caochong:['caochong','re_caochong','old_caochong'],
+			guohuai:['guohuai','re_guohuai','xin_guohuai','tw_guohuai','ol_guohuai'],
+			jianyong:['jianyong','re_jianyong','xin_jianyong'],
+			panzhangmazhong:['panzhangmazhong','re_panzhangmazhong','xin_panzhangmazhong'],
+			yufan:['yufan','xin_yufan','re_yufan'],
+			zhuran:['zhuran','re_zhuran','xin_zhuran','old_zhuran'],
+			liru:['xin_liru','dc_liru','re_liru','yj_liru','+liru'],
+			fuhuanghou:['fuhuanghou','re_fuhuanghou','xin_fuhuanghou','old_fuhuanghou'],
+			chenqun:['chenqun','dc_chenqun','re_chenqun','old_chenqun'],
+			hanhaoshihuan:['hanhaoshihuan','re_hanhaoshihuan'],
+			caozhen:['caozhen','re_caozhen','xin_caozhen','old_caozhen'],
+			wuyi:['wuyi','re_wuyi','xin_wuyi'],
 			sunluban:['re_sunluban','xin_sunluban','sunluban'],
 			zhuhuan:['re_zhuhuan','xin_zhuhuan','zhuhuan','old_zhuhuan'],
-			caoxiu:['re_caoxiu','tw_caoxiu','xin_caoxiu','caoxiu','old_caoxiu'],
-			xiahoushi:['re_xiahoushi','xiahoushi'],
-			zhangyi:['xin_zhangyi','re_zhangyi','zhangyi'],
-			quancong:['old_quancong','re_quancong','xin_quancong','quancong'],
-			sunxiu:['re_sunxiu','xin_sunxiu','sunxiu'],
-			zhuzhi:['re_zhuzhi','zhuzhi','xin_zhuzhi','old_zhuzhi'],
-			liuyu:['dc_liuyu','liuyu','ol_liuyu'],
+			caoxiu:['caoxiu','re_caoxiu','xin_caoxiu','tw_caoxiu','old_caoxiu'],
+			xiahoushi:['xiahoushi','re_xiahoushi','sb_xiahoushi'],
+			zhangyi:['zhangyi','re_zhangyi','xin_zhangyi'],
+			quancong:['quancong','re_quancong','xin_quancong','old_quancong'],
+			sunxiu:['sunxiu','re_sunxiu','xin_sunxiu'],
+			zhuzhi:['zhuzhi','re_zhuzhi','xin_zhuzhi','old_zhuzhi'],
+			liuyu:['liuyu','dc_liuyu','ol_liuyu'],
 			zhangrang:['zhangrang','ol_zhangrang','junk_zhangrang'],
-			jikang:['re_jikang','jikang','dc_jikang'],
-			xinxianying:['re_xinxianying','xinxianying','ol_xinxianying','sp_xinxianying'],
-			gongsunyuan:['re_gongsunyuan','gongsunyuan'],
-			zhoucang:['re_zhoucang','xin_zhoucang','zhoucang'],
-			guotufengji:['re_guotufengji','guotufengji'],
-			guanping:['re_guanping','guanping'],
-			caifuren:['xin_caifuren','re_caifuren','caifuren'],
-			guyong:['guyong','re_guyong','tw_guyong','xin_guyong'],
-			yj_jushou:['re_jushou','xin_jushou','yj_jushou'],
-			guohuanghou:['re_guohuanghou','guohuanghou'],
-			liuchen:['re_liuchen','liuchen'],
-			liufeng:['re_liufeng','liufeng'],
-			sundeng:['re_sundeng','sundeng','ns_sundeng'],
-			caiyong:['re_caiyong','caiyong'],
-			chengong:['re_chengong','chengong'],
-			xunyou:['re_xunyou','xunyou'],
-			xuezong:['tw_xuezong','xuezong'],
+			jikang:['jikang','re_jikang','dc_jikang'],
+			xinxianying:['xinxianying','re_xinxianying','ol_xinxianying','sp_xinxianying'],
+			gongsunyuan:['gongsunyuan','re_gongsunyuan'],
+			zhoucang:['zhoucang','re_zhoucang','xin_zhoucang'],
+			guotufengji:['guotufengji','re_guotufengji'],
+			guanping:['guanping','re_guanping'],
+			caifuren:['caifuren','re_caifuren','xin_caifuren'],
+			guyong:['guyong','re_guyong','xin_guyong','tw_guyong'],
+			yj_jushou:['yj_jushou','re_jushou','xin_jushou'],
+			guohuanghou:['guohuanghou','re_guohuanghou'],
+			liuchen:['liuchen','re_liuchen'],
+			liufeng:['liufeng','re_liufeng'],
+			sundeng:['sundeng','re_sundeng','ns_sundeng'],
+			caiyong:['caiyong','re_caiyong'],
+			chengong:['chengong','re_chengong','sb_chengong'],
+			xunyou:['xunyou','re_xunyou'],
+			xuezong:['xuezong','tw_xuezong'],
             huanghao:['huanghao','dc_huanghao','old_huanghao'],
-			caorui:['re_caorui','caorui','old_caorui'],
-			sunziliufang:['dc_sunziliufang','sunziliufang'],
+			caorui:['caorui','re_caorui','old_caorui'],
+			sunziliufang:['sunziliufang','dc_sunziliufang'],
 			liyan:['liyan','old_liyan'],
-			zhangsong:['re_zhangsong','zhangsong'],
-			zhongyao:['re_zhongyao','zhongyao'],
+			zhangsong:['zhangsong','re_zhangsong'],
+			zhongyao:['zhongyao','re_zhongyao'],
 		},
 		translate:{
 			old_huaxiong:'将华雄',

character/yingbian.js

@@ -3583,7 +3583,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			xuangongzhu:['duyu'],
 		},
 		characterReplace:{
-			yanghu:['dc_yanghu','jin_yanghu','sp_yanghu'],
+			yanghu:['jin_yanghu','dc_yanghu','sp_yanghu'],
 			jiachong:['jin_jiachong','jiachong'],
 			yangyan:['yangyan','old_yangyan'],
 			yangzhi:['yangzhi','old_yangzhi'],