Merge branch 'reactivedrop_beta' into welder_icon

Author: hpdodger

reactivedrop/content/traitors_challenge/resource/challenges/traitors.txt

@@ -41,7 +41,6 @@
 		"asw_ammo_count_50calmg" "100"
 		"asw_ammo_count_medrifle_heal" "30"
 		"asw_skill" "2"
-		"rd_lock_difficulty" "1"
 		"asw_horde_override" "0"
 		"asw_wanderer_override" "0"
 		"asw_marine_ff_absorption" "0"

reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors.nut

@@ -1,4 +1,4 @@
-DEBUG <- false; // Debug flags 调试标识
+DEBUG <- true; // Debug flags 调试标识
 INT_MAX <- 2147483647; // Constant 常量
 isServer <- true; // If the code is running server side or client side 指示代码是在服务端运行的还是在客户端运行的
 IsPaused <- false; // Not actually being used 没有实际用处
@@ -236,8 +236,8 @@ function SetTraitorIcon(interval = 10) {
 			continue;
 		}
 
-    local hHud2 = Entities.FindByName(null, hPlayer.GetScriptScope().strHudName2);
-		for(local i = 6;i<21;i++) {
+		local hHud2 = Entities.FindByName(null, hPlayer.GetScriptScope().strHudName2);
+		for (local i = 6; i < 21; i++) {
 			hHud2.SetInt(i, list[i]);
 		}
 	}
@@ -1169,10 +1169,10 @@ function DeterminRoleCount() {
 					//g_bool_HasInfector = true;
 					break;
 				case 1:
-			g_bool_HasBoomer = true;
+					g_bool_HasBoomer = true;
 					break;
 				case 2:
-			g_bool_HasSilencer = true;
+					g_bool_HasSilencer = true;
 					break;
 			}
 			g_bool_HasShield = (RandomHQUniformIntDistribution(0, 8) == 0);

reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors_player_info.nut

@@ -77,12 +77,11 @@ TEXTURE_TRAITORS <- {
 xMargin <- 0;
 
 function Paint() {
-	for (local i = 6; i < 21; i++) {
-		PaintTraitorIcon(i);
-	}
-
 	//如果正在控制士兵，显示信息。
 	if (self.GetEntity(0) == GetLocalPlayer()) {
+		for (local i = 6; i < 21; i++) {
+			PaintTraitorIcon(i);
+		}
 		local message = self.GetString(0);
 		if (message == "") {
 			return;
@@ -131,7 +130,7 @@ function PaintMsg(point, role, font, message) {
 
 function PaintTraitorIcon(idx) {
 
-	if (self.GetInt(idx) <= 0 || TEXTURE_TRAITORS[idx] == -1) {
+	if (self.GetInt(idx) <= 0 || TEXTURE_TRAITORS[idx] == -1 || self.GetInt(0) <= ROLE.MAX_IAF_TEAM || self.GetInt(0) > ROLE.MAX_TRAITOR_TEAM) {
 		return;
 	}
 	local screenPos = self.ClientGetEntityScreenPos(self.GetInt(idx));