From 228aa6ffd3b5e922caf7145851c3553bda6753ed Mon Sep 17 00:00:00 2001
From: copcap <copcap@outlook.com>
Date: Fri, 3 Nov 2023 14:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E5=8F=97?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E5=BD=B1=E5=93=8D=E7=9A=84=E6=8A=80=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/collab.js |  1 +
 character/extra.js  | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/character/collab.js b/character/collab.js
index d159b30ea..88d027277 100644
--- a/character/collab.js
+++ b/character/collab.js
@@ -1479,6 +1479,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							if(stat==0) return Math.random()<0.7;
 							return false;
 					}
+					return false;
 				},
 				prompt:function(event,player){
 					return '焚心：是否与'+get.translation(event.player)+'交换身份？';
diff --git a/character/extra.js b/character/extra.js
index 6059245a1..1a9452e55 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -114,8 +114,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 							num+=current.countMark('jxlianpo_mark_fan');
 							return num;
 						}),
-						nei:(game.hasPlayer(current=>current.identity=='nei')?0:1)+game.countPlayer(current=>{
-							return current.countMark('jxlianpo_mark_nei');
+						nei:game.countPlayer(current=>{
+							let num=0;
+							if(current.identity=='nei') num++;
+							num+=current.countMark('jxlianpo_mark_nei');
+							return num;
+						}),
+						commoner:game.countPlayer(current=>{
+							let num=0;
+							if(current.identity=='commoner') num++;
+							num+=current.countMark('jxlianpo_mark_commoner');
+							return num;
 						}),
 					};
 					let population=0,identities=[];
@@ -139,9 +148,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				intro:{
 					content:()=>`场上最大阵营为${lib.skill.jxlianpo.getMax().map(i=>{
 						if(i=='zhu') return '主忠';
-						if(i=='fan') return '反贼';
-						if(i=='nei') return '内奸';
-						return '';
+						return get.translation(i+'2');
 					}).join('、')}`,
 				},
 				$createButton:function(item,type,position,noclick,node){