x

character/refresh.js

@@ -1284,43 +1284,43 @@ character.refresh={
 		re_huatuo:'界华佗',
 		re_lidian:'李典',
 		qinxue:'勤学',
-		retuxi:'突袭·新',
+		retuxi:'新突袭',
-		reluoyi:'裸衣·新',
+		reluoyi:'新裸衣',
-		reluoyi2:'裸衣·新',
+		reluoyi2:'新裸衣',
-		reganglie:'刚烈·新',
+		reganglie:'新刚烈',
 		qingjian:'清俭',
-		reyingzi:'英姿·新',
+		reyingzi:'新英姿',
-		refanjian:'反间·新',
+		refanjian:'新反间',
 		refanjian_card:'弃牌',
 		refanjian_hp:'流失体力',
-		reqianxun:'谦逊·新',
+		reqianxun:'新谦逊',
-		reqianxun2:'谦逊·新',
+		reqianxun2:'新谦逊',
-		relianying:'连营·新',
+		relianying:'新连营',
 		retishen:'替身',
 		retishen2:'替身',
 		reyajiao:'涯角',
-		rejianxiong:'奸雄·新',
+		rejianxiong:'新奸雄',
 		rejianxiong_mopai:'摸牌',
 		rejianxiong_napai:'拿牌',
-		reyiji:'遗计·新',
+		reyiji:'新遗计',
-		reyiji2:'遗计·新',
+		reyiji2:'新遗计',
 		yijue:'义绝',
 		yijue2:'义绝',
-		retieji:'铁骑·新',
+		retieji:'新铁骑',
-		retieji2:'铁骑·新',
+		retieji2:'新铁骑',
-		refankui:'反馈·新',
+		refankui:'新反馈',
 		reyicong:'义从',
 		qiaomeng:'趫猛',
-		rekurou:'苦肉·新',
+		rekurou:'新苦肉',
 		zhaxiang:'诈降',
 		zhaxiang2:'诈降',
 		zhuhai:'诛害',
 		qianxin:'潜心',
 		jianyan:'荐言',
-		reguicai:'鬼才·新',
+		reguicai:'新鬼才',
 		xunxun:'恂恂',
 		wangxi:'忘隙',
-		reguose:'国色·新',
+		reguose:'新国色',
 		fenwei:'奋威',
 		chulao:'除痨',
 		rejizhi:'集智',

character/shenhua.js

@@ -2474,7 +2474,7 @@ character.shenhua={
 			direct:true,
 			content:function(){
 				"step 0";
-				player.chooseTarget('是否发动【雷击·新】？').ai=function(target){
+				player.chooseTarget('是否发动【新雷击】？').ai=function(target){
 					return ai.get.damageEffect(target,player,player,'thunder');
 				};
 				"step 1"
@@ -3120,7 +3120,7 @@ character.shenhua={
 		hongyan:'红颜',
 		buqu:'不屈',
 		leiji:'雷击',
-		spleiji:'雷击·新',
+		spleiji:'新雷击',
 		guidao:'鬼道',
 		huangtian:'黄天',
 		huangtian2:'黄天',

game/config.js

@@ -2,8 +2,10 @@ window.config={
 	forbidai:['zuoci','caiwenji'],
 	forbidsingle:['menghuo','huanggai','machao','pangde','yanwen','xiahoudun','xuzhu','luxun',
 	'xuhuang','yujin','xiaoqiao','daqiao','zhangjiao','zhangbao'],
-	forbidall:['caocao','simayi','guanyu','zhangfei','zhaoyun','ganning','lvmeng','lvbu',
+	forbidall:['xiahouyuan','huangzhong','weiyan','dianwei','zhangjiao'],
-	'xiahouyuan','huangzhong','weiyan','dianwei','gongsunzan','zhangjiao'],
+	forbidpack:{
+		refresh:['caocao','simayi','guanyu','zhangfei','zhaoyun','ganning','lvmeng','lvbu','gongsunzan']
+	},
 	forbidversus:['swd_kangnalishi'],
 	forbidstone:['zhugedan','pal_xuanxiao','hs_malfurion','lusu','chenlin',
 	'gjqt_bailitusu','yuanshao','swd_anka','swd_nicole','daqiao','re_daqiao',

game/game.js

@@ -20644,8 +20644,15 @@
 					else{
 						opacity='';
 					}
+					var skilltrans=get.translation(skills[i]);
+					if(skilltrans&&skilltrans.length==3&&skilltrans[0]=='新'){
+						skilltrans=skilltrans.slice(1);
+					}
+					else{
+						skilltrans=skilltrans.slice(0,2);
+					}
 					str+='<div class="skill" style="'+opacity+
-					'">【'+get.translation(skills[i]).slice(0,2)+'】</div><div style="'+opacity+'">'+
+					'">【'+skilltrans+'】</div><div style="'+opacity+'">'+
 					lib.translate[skills[i]+'_info']+'</div><div style="display:block;height:10px"></div>';
 				}
 			}
@@ -20780,7 +20787,13 @@
 				for(i=0;i<skills.length;i++){
 					if(lib.skill[skills[i]]&&lib.skill[skills[i]].nopop) continue;
 					if(lib.translate[skills[i]+'_info']){
-						translation=get.translation(skills[i]).slice(0,2);
+						translation=get.translation(skills[i]);
+						if(translation.length==3&&translation[0]=='新'){
+							translation=translation.slice(1);
+						}
+						else{
+							translation=translation.slice(0,2);
+						}
 						if(!skills2.contains(skills[i])){
 							uiintro.add('<div style="opacity:0.5"><div class="skill">【'+translation+'】</div><div>'+lib.translate[skills[i]+'_info']+'</div></div>');
 						}
@@ -21040,7 +21053,13 @@
 				var skills=infoitem[3];
 				for(i=0;i<skills.length;i++){
 					if(lib.translate[skills[i]+'_info']){
-						translation=get.translation(skills[i])[0]+get.translation(skills[i])[1];
+						translation=get.translation(skills[i]);
+						if(translation.length==3&&translation[0]=='新'){
+							translation=translation.slice(1);
+						}
+						else{
+							translation=translation.slice(0,2);
+						}
 						uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+lib.translate[skills[i]+'_info']+'</div></div>');
 					}
 				}
@@ -22273,6 +22292,11 @@
 						}
 					}
 				}
+				for(i in lib.config.forbidpack){
+					if(lib.config.characters.contains(i)){
+						lib.config.forbidall=lib.config.forbidall.concat(lib.config.forbidpack[i]);
+					}
+				}
 
 				var pilecfg=lib.config.customcardpile[get.config('cardpilename')];
 				if(pilecfg){

mode/guozhan.js

@@ -216,7 +216,7 @@ mode.guozhan={
 						if(lib.character[list[i]][1]==lib.character[list[j]][1]){
 							player.init(list[i],list[j],false);
 							if(back){
-								list.remove(player.name1);
+								list.remove(player.name);
 								list.remove(player.name2);
 								for(var i=0;i<list.length;i++){
 									back.push(list[i]);

mode/stone.js

@@ -2088,6 +2088,7 @@ mode.stone={
 			multitarget:true,
 			multiline:true,
 			content:function(){
+				'step 0'
 				var maxf=[],maxe=[];
 				for(var i=0;i<targets.length;i++){
 					if(targets[i].side==player.side){
@@ -2116,10 +2117,11 @@ mode.stone={
 					targets.remove(maxe.randomGet());
 				}
 				targets.sort(lib.sort.seat);
-				for(var i=0;i<targets.length;i++){
+				event.targets=targets;
-					targets[i].die()._triggered=null;
+				'step 1'
+				if(event.targets.length){
+					event.targets.shift().die();
 				}
-				ui.clear();
 			},
 			ai:{
 				order:9,
@@ -3802,12 +3804,14 @@ mode.stone={
 			},
 			selectTarget:-1,
 			content:function(){
+				'step 0'
 				targets.randomRemove();
 				targets.sort(lib.sort.seat);
-				for(var i=0;i<targets.length;i++){
+				event.list=targets;
-					targets[i].die()._triggered=null;
+				'step 1'
+				if(event.list.length){
+					event.list.shift().die();
 				}
-				ui.clear();
 			},
 			ai:{
 				order:9,
@@ -5137,11 +5141,12 @@ mode.stone={
 			content:function(){
 				'step 0'
 				targets.sort(lib.sort.seat);
-				for(var i=0;i<targets.length;i++){
+				event.list=targets;
-					targets[i].die()._triggered=null;
-				}
-				ui.clear();
 				'step 1'
+				if(event.list.length){
+					event.list.shift().die();
+				}
+				'step 2'
 				player.recover(2)
 			},
 			stoneact:5,
@@ -5525,7 +5530,7 @@ mode.stone={
 			},
 			content:function(){
 				var target=player.getLeader();
-				target.actused-=3;
+				target.actused-=4;
 				target.updateActCount();
 				player.line(target,'green');
 			}
@@ -7119,7 +7124,7 @@ mode.stone={
 				trigger.finish();
 			},
 			ai:{
-				threaten:0.5
+				threaten:0
 			}
 		},
 		stone_jingxiang:{
@@ -7145,6 +7150,9 @@ mode.stone={
 				cardEnabled:function(card){
 					if(card.name=='sha') return false;
 				}
+			},
+			ai:{
+				threaten:0
 			}
 		},
 		priest_xundao:{
@@ -9271,7 +9279,7 @@ mode.stone={
 		stone_mieshi:'灭世',
 		stone_mieshi_info:'你出场时，消灭所有其他随从，弃置己方主将的所有手牌，每有一名敌方随从死亡，便受到两点伤害',
 		stone_shixu:'时序',
-		stone_shixu_info:'你出场的回合内，己方主将获得3点行动值',
+		stone_shixu_info:'你出场的回合内，己方主将获得4点行动值',
 		stone_chenshui:'沉睡',
 		stone_chenshui_info:'己方主将的回合结束阶段，令其获得一张梦境牌',
 		stone_mowang:'魔网',
@@ -9335,8 +9343,8 @@ mode.stone={
 		spell_nuhuozhongshao_info:'对一名随从造成一点伤害，然后令其摸两张牌',
 		spell_xuanfengzhan:'旋风斩',
 		spell_xuanfengzhan_info:'对所有随从造成一点伤害',
-		spell_juemingluandou:'绝命乱半',
+		spell_juemingluandou:'绝命乱斗',
-		spell_juemingluandou_info:'随机保留一名随从，然后令所有其他随从死亡（无法触发死亡技能）',
+		spell_juemingluandou_info:'随机保留一名随从，然后令所有其他随从死亡',
 
 		spell_zhongnian:'重碾',
 		spell_zhongnian_info:'造成X点伤害，X为已受伤的友方角色数且不超过3',
@@ -9499,7 +9507,7 @@ mode.stone={
 		spell_liliangzhufu_info:'令一名随从摸两张牌',
 
 		spell_jinyingduijue:'精英对决',
-		spell_jinyingduijue_info:'双方各保留体力值最高的一名随从，然后令其他随从死亡（无法触发死亡技能）',
+		spell_jinyingduijue_info:'双方各保留体力值最高的一名随从，然后令其他随从死亡',
 		spell_shenpan:'审判',
 		spell_shenpan_info:'若你的对手随从数多于你，则随机令一名敌方随从死亡',
 		spell_shenshengfennu:'神圣愤怒',
@@ -10066,7 +10074,7 @@ mode.stone={
 		spell_binghuan:'冰环',
 		spell_binghuan_info:'将场上所有随从翻面',
 		spell_morizaihuo:'末日灾祸',
-		spell_morizaihuo_info:'令场上所有随从立即死亡（无法触发死亡技能），回复两点体力',
+		spell_morizaihuo_info:'令场上所有随从立即死亡，回复两点体力',
 		spell_zhiliaozhichu:'治疗之触',
 		spell_zhiliaozhichu_info:'令目标随从恢复所有体力值并获得嘲讽',
 		chaofeng:'嘲讽',