From e7a48b3ddf775fc0da1413df0418e9546bd15cf8 Mon Sep 17 00:00:00 2001
From: Spmario233 <Spmario233@163.com>
Date: Sat, 19 Aug 2023 00:25:08 +0800
Subject: [PATCH] everything in global history

---
 character/clan.js    |   4 ++--
 character/extra.js   |  14 ++++++++++++++
 character/sb.js      |   2 +-
 character/shenhua.js |   4 ++--
 character/sp2.js     |   1 +
 font/suits.ttf       | Bin 7880 -> 7988 bytes
 game/game.js         |   8 ++++++--
 7 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/character/clan.js b/character/clan.js
index 505af2ff3..120e927f4 100644
--- a/character/clan.js
+++ b/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){
diff --git a/character/extra.js b/character/extra.js
index ae24a2ef5..dbfdd87ac 100755
--- a/character/extra.js
+++ b/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;
 					}
 				},
diff --git a/character/sb.js b/character/sb.js
index c6b4800d6..d2207cd1d 100644
--- a/character/sb.js
+++ b/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){
diff --git a/character/shenhua.js b/character/shenhua.js
index bab2f2bcd..4e1552b73 100755
--- a/character/shenhua.js
+++ b/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){
diff --git a/character/sp2.js b/character/sp2.js
index 26b17cbcb..0ebb28359 100644
--- a/character/sp2.js
+++ b/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:"李傕",
diff --git a/font/suits.ttf b/font/suits.ttf
index dd15c8f523218470f408a2bd6728a80258bc3e20..b87937b605810c193b2def09dfc49772e0af3533 100644
GIT binary patch
delta 640
zcmXX@OK1~O6g}@vGM`jUByF&gj8SWhAT-9REkq?Y8f?%m;!4D3h-p&Hq@zjGbXAuw
z>S}PKAa)Vl_$fw|uB5mym7*ILDhRezbY($n5h00pVi#x5+;i?b-1lz%__Gt!U;te7
zu>r%$-f;0kRRY*eQd4PNGxqNcd;_?Pw4rpl<WFQTCII(+K-e~FWc6F8ug=i_C7|O&
zRx29l#Q{KFrSqNH{M6`xE{_17Iv}QU8SP5<<GELqwT1knxm;#ib0x$D5@ICu<n&VI
zoFM(B`a9LZ{CHYZ&d8hs=BW1QTE(zEz%uzcs{I8`&upy3z5u=;X{U_wVyXP|=^71?
zCx6noo-yKk*RKK2KDuGPOcQj?Di!kokl$0*!=;M*v!VjKyd>;szlL}N8}H)lBhJY0
zJuhXFfhYWK(&A<N&^<H6j!BMor^75TAFG)&EW-EI%{MHNqy9&PAB081SHg-6<{`c<
zuA)jI!X~`!3?N2|wFNKjAV@3{Gf-e4+iC&CsaES#^yBPiKeaHi7Ucq~4GLp!n-BtO
z4?W#tOtA9BllD85D4~P)q==Hjt9*&SZG@ZiEY8k0UogJCvDWzYUu^X8B};71zvf#l
z!(8y5cb0M48p@{7Fr9dBs=g^-6cfl2iYUR4L+Hmr;xIyl!{&2elEIYK-CYhEk28VU
fn4O7CVlq>h!;Gi{vNTZ`3m+NmHz(C$&hq~N^3;)!

delta 521
zcmXX?L1+^}6n(SVZnD^#NYW)jvWB)sD?;lY6d`&Li((EDa_hln8@IdQZnHK^*q$n$
zJk)~>1;JAVJt>OqML|61p)Ea&3L+|k2dN0^HNFip%>4Q9{r~3A+dR8<W(5L3j)w{~
znp0Ny#{&}(w}`gdfgNJx=m?-N73bQ$s8V-l>p-4-YX3s$2DfLft@3^z*!Rx0yCJ49
z379b(3a-Dr@M1Ij3osr5TG4attHn{jPpx6{Cq2(uv2%6pIROe_!V9AKz_98u|IXa-
zJ8fGtGJM^*n+OJW9I6lTnLKMyS+oP^@8OxBK<Q1Q5q7#!?#S+I4v--qgiB6%Vf^=X
zAY0-O{T?S6UDr9B$)PdP3#=&4e@s6k@RWcta6`L+J1^Ic&1GwU#$F{lz!T+OGl`#k
z?Sq^ar_#!xQkRROEOz9os43N!+!57_c#J)4;~TyR18YeSQvY{p&;!(nB(9g}d4*Bs
zVqSIobf((s_usEWY+P2N!p4?yP?MA8OW7D#k}g$;h63Koo8{$04YU!VgLybuqS6Ui
pIL>Hcn%j~^vnd0!lGkaCB2q#XLqZd2krBGQZ=R;B@~hck_y@}2Y|{V$

diff --git a/game/game.js b/game/game.js
index 8c266ae83..937c57028 100644
--- a/game/game.js
+++ b/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>');