everything in global history

character/clan.js

@@ -233,8 +233,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					var skill=event.sourceSkill||event.skill;
 					var info=get.info(skill);
 					if(info.charlotte) return false;
-					var translation=lib.translate[skill+'_info'];
-					if(translation&&!(/(?<!“)出牌阶段限一次/.test(translation))) return false;
+					var translation=get.skillInfoTranslation(skill,event.player);
+					if(!translation||!(/(?<!“)出牌阶段限一次/.test(translation))) return false;
 					return event.player.countCards('h')>0;
 				},
 				check:function(event,player){

character/extra.js

@@ -207,6 +207,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						}
 						str+='此牌离开你的装备区后，改为置入剩余武将牌牌堆。';
 						lib.translate['qiexie_'+name+'_info']=str;
+						var append='';
+						if(skills.length){
+							for(var skill of skills){
+								if(lib.skill[skill].nobracket){
+									append+='<div class="skilln">'+get.translation(skill)+'</div><div><span style="font-family: yuanli">'+get.skillInfoTranslation(skill)+'</span></div><br><br>';
+								}
+								else{
+									var translation=lib.translate[skill+'_ab']||get.translation(skill).slice(0,2);
+									append+='<div class="skill">【'+translation+'】</div><div><span style="font-family: yuanli">'+get.skillInfoTranslation(skill)+'</span></div><br><br>';
+								}
+							}
+							str=str.slice(0,str.length-8);
+						}
+						lib.translate['qiexie_'+name+'_append']=append;
 						lib.card['qiexie_'+name]=card;
 					}
 				},

character/sb.js

@@ -1094,7 +1094,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				enable:'chooseToUse',
 				mark:true,
 				skillAnimation:true,
-				animationStr:'涅盘',
+				//animationStr:'涅盘',
 				limited:true,
 				animationColor:'orange',
 				filter:function(event,player){

character/shenhua.js

@@ -5533,7 +5533,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				mark:true,
 				limited:true,
 				skillAnimation:true,
-				animationStr:'涅盘',
+				//animationStr:'涅盘',
 				animationColor:'fire',
 				init:function(player){
 					player.storage.niepan=false;
@@ -5592,7 +5592,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				enable:'chooseToUse',
 				mark:true,
 				skillAnimation:true,
-				animationStr:'涅盘',
+				//animationStr:'涅盘',
 				limited:true,
 				animationColor:'orange',
 				init:function(player){

character/sp2.js

@@ -10051,6 +10051,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			mengda:['dc_mengda','ol_mengda','pe_mengda'],
 			jsp_guanyu:['dc_jsp_guanyu','jsp_guanyu'],
 			mushun:['mushun','sp_mushun'],
+			wangjun:['dc_wangjun','wangjun'],
 		},
 		translate:{
 			lijue:"李傕",

game/game.js

@@ -52,6 +52,7 @@
 			custom:[],
 			useCard:[],
 			changeHp:[],
+			everything:[],
 		}],
 		cardtag:{
 			yingbian_zhuzhan:[],
@@ -10544,7 +10545,7 @@
 			diamond:"♦︎",
 			spade:"♠︎",
 			club:"♣︎",
-			none:'◎',
+			none:'◈',
 			ghujia:'护甲',
 			ghujia_bg:'甲',
 			heart2:"红桃",
@@ -29795,6 +29796,7 @@
 						custom:[],
 						useCard:[],
 						changeHp:[],
+						everything:[],
 					});
 					var players=game.players.slice(0).concat(game.dead);
 					for(var i=0;i<players.length;i++){
@@ -35743,6 +35745,7 @@
 					else{
 						next.parent=event;
 						_status.event=next;
+						game.getGlobalHistory('everything').push(next);
 					}
 				}
 				else if(event.finished){
@@ -52797,6 +52800,7 @@
 		//优先度判断
 		priority:function(skill){
 			var info=get.info(skill),priority=0;
+			if(!info) return 0;
 			if(info.priority){
 				priority=info.priority*100;
 			}
@@ -55683,7 +55687,7 @@
 							}
 						}
 						else if(lib.skill[skills[i]].nobracket){
-							uiintro.add('<div><div class="skilln">'+get.translation(skills[i])+'</div><div>'+lib.translate[skills[i]+'_info']+'</div></div>');
+							uiintro.add('<div><div class="skilln">'+get.translation(skills[i])+'</div><div>'+get.skillInfoTranslation(skills[i],node)+'</div></div>');
 						}
 						else{
 							uiintro.add('<div><div class="skill">【'+translation+'】</div><div>'+get.skillInfoTranslation(skills[i],node)+'</div></div>');