修复遗漏prefix

character/diy.js

@@ -18975,8 +18975,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			nshanlang:'酣浪',
 			nshanlang_info:'准备阶段，你可以和至多三名角色拼点。然后若这些角色中有拼点牌唯一最大的角色，则你可以令该角色从牌堆中获得一张不符合“四象天阵”的牌。',
 			
-			junk_zhangrang:'四花张让',
-			junk_zhangrang_ab:'张让',
 			junktaoluan:'滔乱',
 			junktaoluan3:'滔乱',
 			junktaoluan4:'滔乱',
@@ -18996,12 +18994,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			junkquandao_info:'锁定技。当你使用【杀】或普通锦囊牌时，若你手牌中的【杀】或普通锦囊牌的数量之差X不为0，则你弃置X张数量较多的一种牌，然后你摸一张牌。',
 			junkchigang:'持纲',
 			junkchigang_info:'转换技，锁定技。判定阶段开始前，你取消此阶段。然后你获得一个额外的：阴，摸牌阶段；阳，出牌阶段。',
-			junk_liubei:'削弱刘备',
-			junk_liubei_ab:'刘备',
 			junkrende:'仁德',
 			junkrende_info:'出牌阶段限一次，你可以将任意张手牌交给其他角色。若你给出的牌多于一张，则你回复1点体力。',
-			junk_huangyueying:'削弱黄月英',
-			junk_huangyueying_ab:'黄月英',
 			junkjizhi:'集智',
 			junkjizhi_info:'当你使用非转化的普通锦囊牌时，你可以展示牌堆顶的一张牌A。若A不为基本牌，则你获得A。否则你选择一项：⒈将A置入弃牌堆。⒉将一张手牌置于牌堆顶，然后获得A。',
 			junkqicai:'奇才',
@@ -19013,19 +19007,26 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			junklangmie_info:'其他角色的结束阶段开始时，你可以选择一项：⒈若其本回合内使用过某种类型的牌超过一张，则你弃置一张牌并摸两张牌。⒉若其本回合累计造成过的伤害大于1，则你弃置一张牌，然后对其造成1点伤害。',
 			junkshicai:"恃才",
 			junkshicai_info:"当你使用牌结束完毕后，若此牌与你本回合使用的牌类型均不同，则你可以将此牌置于牌堆顶，然后摸一张牌。",
-			ol_guohuai_ab:'郭淮',
+			junk_zhangrang:'新杀张让',
-			old_jiakui:'通渠贾逵',
+			junk_zhangrang_prefix:'新杀',
-			ol_guohuai:'三血郭淮',
+			old_jiakui:'手杀贾逵',
-			old_jiakui_ab:'贾逵',
+			old_jiakui_prefix:'手杀',
-			old_bulianshi_ab:'步练师',
+			ol_guohuai:'OL郭淮',
-			old_bulianshi:'削弱步练师',
+			ol_guohuai_prefix:'OL',
-			ol_maliang:'削弱马良',
+			old_bulianshi:'RE步练师',
-			ol_maliang_ab:'马良',
+			old_bulianshi_prefix:'RE',
-			junk_lidian:'削弱李典',
+			ol_maliang:'OL马良',
-			junk_lidian_ab:'李典',
+			ol_maliang_prefix:'OL',
-			junk_duanwei:'削弱段煨',
+			junk_lidian:'OL李典',
-			junk_duanwei_ab:'段煨',
+			junk_lidian_prefix:'OL',
+			junk_duanwei:'新杀段煨',
+			junk_duanwei_prefix:'新杀',
 			junk_xuyou:'手杀许攸',
+			junk_xuyou_prefix:'手杀',
+			junk_liubei:'旧界刘备',
+			junk_liubei_prefix:'旧界',
+			junk_huangyueying:'旧界黄月英',
+			junk_huangyueying_prefix:'旧界',
 			
 			diy_tieba:'吧友设计',
 			diy_xushi:'玩点论杀·虚实篇',
@@ -19129,7 +19130,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			远野美凪:['Toono','Minagi'],
 			樱庭星罗:['Sakuraba','Seira'],
 			坂上智代:['Sakagami','Tomoyo'],
-			冈崎汐:['Okazaki','Ushio']
+			冈崎汐:['Okazaki','Ushio'],
+			神山识:['Kamiyama','Shiki'],
+			佐藤雏:['Satou','Hina'],
 		},
 	};
 });

character/extra.js

@@ -7222,6 +7222,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			"new_guixin":"归心",
 			"new_guixin_info":"当你受到1点伤害后，你可以按照你选择的区域优先度随机获得每名其他角色区域里的一张牌，然后你翻面。",
 			ol_zhangliao:'OL神张辽',
+			ol_zhangliao_prefix:'OL神',
 			olduorui:'夺锐',
 			olduorui2:'夺锐',
 			olduorui_info:'当你于出牌阶段内对一名角色造成伤害后，你可以选择该角色武将牌上的一个技能。若如此做，你结束出牌阶段，且你令此技能于其下个回合结束之前无效。',

character/huicui.js

@@ -10275,7 +10275,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			dcsilve_info:'游戏开始时，你选择一名其他角色（对其他角色不可见），称为“私掠”角色。然后你获得以下效果：①当“私掠”角色造成伤害后，若你本回合未因此效果得到过受伤角色的牌，你可以获得受伤角色一张牌；②当“私掠”角色受到其他角色造成的伤害后，若伤害来源存活，你须对伤害来源使用一张【杀】（无距离限制），否则你弃置一张手牌。',
 			dcshuaijie:'衰劫',
 			dcshuaijie_info:'限定技。出牌阶段，若你的体力值与装备区里的牌数均大于“私掠”角色，或没有角色有“私掠”，你可以减1点体力上限，然后选择一项：1.获得“私掠”角色至多三张牌；2.从牌堆随机获得三张类型各不同的牌。最后将你的“私掠”角色改为你。',
-			dc_sp_jiaxu:'魏贾诩',
+			dc_sp_jiaxu:'新杀SP贾诩',
+			dc_sp_jiaxu_prefix:'新杀SP',
 			dcjianshu:'间书',
 			dcjianshu_info:'出牌阶段限一次。你可以将一张黑色手牌交给一名其他角色，并选择另一名其他角色，你令前者与后者拼点。赢的角色随机弃置一张牌，没赢的角色失去1点体力。若有角色因此死亡，你令你〖间书〗于此阶段发动的次数上限+1。',
 			dcyongdi:'拥嫡',
@@ -10284,7 +10285,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			dcjuying:'踞营',
 			dcjuying_info:'出牌阶段结束时，若你于此阶段内使用【杀】的次数未达到上限，你可以选择任意项：1.下回合使用【杀】的次数上限+1；2.本回合手牌上限+2；3.摸三张牌。若你选择的项数超过了你的体力值，你弃置一张牌。',
 			dc_huanghao:'新杀黄皓',
-			dc_huanghao_ab:'黄皓',
+			dc_huanghao_prefix:'新杀',
 			dcqinqing:'寝情',
 			dcqinqing_info:'结束阶段，你可以弃置一名攻击范围内包含一号位的其他角色一张牌。然后若其手牌数大于一号位，你摸一张牌。',
 			dccunwei:'存畏',

character/offline.js

@@ -3,6 +3,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	return {
 		name:'offline',
 		connect:true,
+		connectBanned:['zhangliang'],
 		characterSort:{
 			offline:{
 				offline_star:["sp_xiahoushi","jsp_zhaoyun","huangjinleishi","sp_pangtong","sp_daqiao","sp_ganning","sp_xiahoudun","sp_lvmeng","sp_zhangfei","sp_liubei","old_machao","zhangliang","jsp_caoren"],

character/old.js

@@ -3,7 +3,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	return {
 		name:'old',
 		connect:true,
-		connectBanned:['zhangliang'],
 		characterSort:{
 			old:{
 				old_standard:['ol_yuanshu'],
@@ -1091,8 +1090,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			fazheng:'旧法正',
 			fazheng_prefix:'旧',
 			junk_simayi:'旧晋司马懿',
-			junk_simayi_prefix:'旧',
+			junk_simayi_prefix:'旧晋',
-			junk_simayi_ab:'司马懿',
 			madai:'旧马岱',
 			madai_prefix:'旧',
 			old_yangzhi:'旧杨芷',
@@ -1114,7 +1112,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			old_liubiao:'旧刘表',
 			old_liubiao_prefix:'旧',
 			oldre_liubiao:'RE刘表',
-			oldre_liubiao_ab:'刘表',
+			oldre_liubiao_prefix:'RE',
 			oldzishou:'自守',
 			oldzishou_info:'摸牌阶段，若你已受伤，你可令额定摸牌数+X（X为你已损失的体力值），然后跳过下一个出牌阶段。',
 			old_huanghao:'旧黄皓',

character/sb.js

@@ -42,7 +42,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		characterSort:{
 			sb:{
 				sb_zhi:['sb_sunquan','sb_zhouyu','sb_zhangjiao','sb_caocao','sb_zhenji','sb_liubei','sb_daqiao','sb_liubiao'],
-				sb_shi:['sb_xuhuang','sb_machao','sb_fazheng','sb_chengong','sb_diaochan','sb_pangtong'],
+				sb_shi:['sb_xuhuang','sb_machao','sb_fazheng','sb_chengong','sb_diaochan','sb_pangtong','sb_zhanghe'],
 				sb_tong:['liucheng','sp_yangwan','sb_xiahoushi','sb_zhangfei','sb_zhaoyun','sb_sunce','sb_zhurong'],
 				sb_yu:['sb_yujin','sb_lvmeng','sb_huangzhong','sb_huanggai','sb_zhouyu','sb_caoren','sb_ganning'],
 				sb_neng:['sb_huaxiong','sb_sunshangxiang','sb_jiangwei','sb_yuanshao','sb_menghuo'],

character/shenhua.js

@@ -7764,8 +7764,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			"zhugezhan":"诸葛瞻",
 			"lukang":"陆抗",
 			"haozhao":"郝昭",
-			"yl_yuanshu":"雷袁术",
+			yl_yuanshu:"新杀袁术",
-			yl_yuanshu_ab:"袁术",
+			yl_yuanshu_prefix:"新杀",
 			"zhangxiu":"张绣",
 			"chendao":"陈到",
 			"guanqiujian":"毌丘俭",

character/sp.js

@@ -24565,8 +24565,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			sp_machao_prefix:'SP',
 			sp_jiangwei:'SP姜维',
 			sp_jiangwei_prefix:'SP',
-			zhangbao:'OL张宝',
+			zhangbao:'张宝',
-			zhangbao_prefix:'OL',
 			yangxiou:'杨修',
 			shixie:'士燮',
 			mayunlu:'马云騄',

character/sp2.js

@@ -10137,7 +10137,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			sp_liuqi:'刘琦',
 			xf_tangzi:"唐咨",
 			xf_huangquan:"OL黄权",
+			xf_huangquan_prefix:"OL",
 			xf_sufei:"OL苏飞",
+			xf_sufei_prefix:"OL",
 			"xinfu_langxi":"狼袭",
 			"xinfu_langxi_info":"准备阶段，你可以对一名体力小于或等于你的其他角色造成0～2点随机伤害。",
 			"xinfu_yisuan":"亦算",
@@ -10632,8 +10634,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			dclibang_info:'出牌阶段限一次。你可以弃置一张牌，正面向上获得两名其他角色的各一张牌。然后你判定，若结果与这两张牌的颜色均不同，你交给其中一名角色两张牌或失去1点体力，否则你获得判定牌并视为对其中一名角色使用一张【杀】。',
 			dcwujie:'无节',
 			dcwujie_info:'锁定技。①你使用无色牌无任何次数限制且无距离限制。②当其他角色执行杀死你的奖惩而摸牌或弃牌时，取消之。',
-			dc_jsp_guanyu:'魏关羽',
+			dc_jsp_guanyu:'新杀SP关羽',
-			dc_jsp_guanyu_prefix:'魏',
+			dc_jsp_guanyu_prefix:'新杀SP',
 			dcdanji:'单骑',
 			dcdanji_info:'觉醒技。准备阶段，若你的手牌数大于体力值，你减1点体力上限，将体力回复至体力上限，然后获得〖马术〗和〖怒嗔〗。',
 			dcnuchen:'怒嗔',

character/xianding.js

@@ -12361,7 +12361,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			syjiqiao_info:'出牌阶段开始时，你可将牌堆顶的X张牌置于你的武将牌上（X为你的体力上限）。当你于此出牌阶段内使用的牌结算结束后，你可以获得其中的一张牌，然后若剩余牌中红色牌和黑色牌的数量：不相等，你失去1点体力；相等，你回复1点体力。出牌阶段结束时，你将这些牌置入弃牌堆。',
 			syxiongyi:'凶疑',
 			syxiongyi_info:'限定技。当你处于濒死状态时，若剩余武将牌堆中：有“徐氏”，则你可以将体力值回复至3点，并将此武将牌替换为“徐氏”；没有“徐氏”，则你可以将体力值回复至1点并获得〖魂姿〗。',
-			re_zhangbao:'张宝',
+			re_zhangbao:'新杀张宝',
+			re_zhangbao_prefix:'新杀',
 			xinzhoufu:'咒缚',
 			xinzhoufu2:'咒缚',
 			xinzhoufu_info:'出牌阶段限一次。你可以将一张手牌置于一名其他角色的武将牌上并称为“咒”，且当其判定时，将其“咒”作为判定牌。',

game/game.js

@@ -33717,6 +33717,11 @@
 					return `<span style="opacity:0.7">旧</span>`;
 				},
 			}],
+			['旧界',{
+				getSpan:(prefix,name)=>{
+					return `<span style="opacity:0.7;color:#fdd559" data-nature="soilmm">旧界</span>`;
+				},
+			}],
 			['★SP',{
 				showName:'★',
 			}],
@@ -33759,6 +33764,16 @@
 					return get.prefixSpan('旧')+get.prefixSpan('神')
 				},
 			}],
+			['旧晋',{
+				getSpan:(prefix,name)=>{
+					return get.prefixSpan('旧')+get.prefixSpan('晋')
+				},
+			}],
+			['新杀SP',{
+				getSpan:(prefix,name)=>{
+					return get.prefixSpan('新杀')+get.prefixSpan('SP')
+				},
+			}],
 			['SP',{
 				getSpan:(prefix,name)=>{
 					return `<span style="writing-mode:lr;-webkit-writing-mode:lr;font-family:MotoyaLMaru;transform:scaleY(0.85)">SP</span>`;
@@ -33769,6 +33784,11 @@
 					return `<span style="writing-mode:lr;-webkit-writing-mode:lr;font-family:MotoyaLMaru;transform:scaleY(0.85)">OL</span>`;
 				},
 			}],
+			['RE',{
+				getSpan:(prefix,name)=>{
+					return `<span style="writing-mode:lr;-webkit-writing-mode:lr;font-family:MotoyaLMaru;transform:scaleY(0.85)">RE</span>`;
+				},
+			}],
 			['界SP',{
 				getSpan:(prefix,name)=>{
 					return get.prefixSpan('界')+get.prefixSpan('SP')

mode/brawl.js

@@ -1883,8 +1883,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						var list=[['guanyu','guanping','guansuo','guanyinping'],
 						['caocao','caopi','caozhi','caorui'],['liubei','liushan','liuchen'],
 						['re_xiahouyuan','xiahouba','xiahoushi'],['sunjian','sunquan','sunce'],
-						['sp_zhangjiao','zhangliang','zhangbao'],['zhugeliang','zhugeguo','zhugejin','zhugeke'],
+						['sp_zhangjiao','re_zhangliang','zhangbao'],['zhugeliang','zhugeguo','zhugejin','zhugeke'],
-						['mateng','machao','madai','mayunlu']];
+						['mateng','machao','old_madai','mayunlu']];
 						list.randomSort();
 						var list2=[];
 						for(var i=0;i<list.length;i++){
@@ -1937,14 +1937,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					var map3=[];
 					var list1=['司','夏','诸','皇'];
 					var list2=['马','侯','葛','甫'];
-					var exclude=['界','新','大','旧','☆','神','晋','族','谋'];
 					for(var i in lib.character){
 						if(lib.filter.characterDisabled(i)) continue;
 						if(lib.character[i][1]=='key') continue;
-						var surname=lib.translate[i];
+						var surname=get.rawName2(i);
 						for(var j=0;j<surname.length;j++){
-							if((surname[j]+surname[j+1])=='手杀'){j++;continue}
-							if(exclude.contains(surname[j])) continue;
 							if(!/[a-z]/i.test(surname[j])){
 								var index=list1.indexOf(surname[j]);
 								if(index!=-1&&surname[j+1]==list2[index]){
@@ -1962,7 +1959,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						map[surname].push(i);
 					}
 					for(var i in map){
-						if(map[i].length<4){
+						if(map[i].length<6){
 							delete map[i];
 						}
 						else{
@@ -1996,7 +1993,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						else{
 							_status.brawl.enemylist=list;
 						}
-						return list.randomRemove(2);
+						return list.randomRemove(3);
 					}
 				}
 			},
@@ -2014,7 +2011,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				},
 				showcase:function(init){
 					var node=this;
-					var list=['caoxiu','wenpin','caohong','zhanghe','re_xiahouyuan','re_xuhuang','re_xuzhu'];
+					var list=['re_caoxiu','re_wenpin','tw_re_caohong','re_zhanghe','ol_xiahouyuan','ol_xuhuang','re_xuzhu'];
 					list.randomSort();
 					list.push('re_caocao');
 					var func=function(){
@@ -2114,7 +2111,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						}
 					},
 					submode:'normal',
-					list:['caoxiu','wenpin','caohong','zhanghe','re_xiahouyuan','re_xuhuang','re_xuzhu'],
+					list:['re_caoxiu','re_wenpin','tw_re_caohong','re_zhanghe','ol_xiahouyuan','ol_xuhuang','re_xuzhu'],
 					chooseCharacterFixed:true,
 					chooseCharacterAi:function(player){
 						if(player==game.zhu){