Merge branch 'reactivedrop_beta' into welder_icon

Author: hpdodger

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

@@ -6,6 +6,7 @@
 		"_rd_traitors_challenge_enabled" "1"
 		"rd_player_bots_allowed" "0"
 		"rd_add_index_to_name" "1"
+		"rd_restrict_aspect_width" "1.77777777"
 		"rd_draw_restricted_rectangles_coop" "1"
 
 		"rd_auto_fast_restart" "1"

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

@@ -1,4 +1,4 @@
-DEBUG <- true; // Debug flags 调试标识
+DEBUG <- false; // Debug flags 调试标识
 INT_MAX <- 2147483647; // Constant 常量
 isServer <- true; // If the code is running server side or client side 指示代码是在服务端运行的还是在客户端运行的
 IsPaused <- false; // Not actually being used 没有实际用处
@@ -190,7 +190,14 @@ function SetTraitorIcon(interval = 10) {
 	if (g_int_Counter % interval != 0) {
 		return;
 	}
-	foreach(hMarine in g_marine_Total) {
+
+
+	local list = {};
+	for (local i = 6; i < 21; i++) {
+		list[i] <- 0;
+	}
+	local i = 11;
+	foreach(hMarine in g_marine_Traitor) {
 		if (hMarine == null || !hMarine.IsValid()) {
 			continue;
 		}
@@ -205,30 +212,34 @@ function SetTraitorIcon(interval = 10) {
 			case ROLE.INFECTED_SNIPER:
 			case ROLE.INFECTED_DEMO:
 			case ROLE.INFECTED_DESERTER:
-				NetProps.SetPropInt(hMarine, "m_iEmote", NetProps.GetPropInt(hMarine, "m_iEmote") | (1 << 8));
+				list[i] = hMarine.entindex();
+				i++;
 				break;
 			case ROLE.TRAITOR_LEADER:
-				NetProps.SetPropInt(hMarine, "m_iEmote", NetProps.GetPropInt(hMarine, "m_iEmote") | (1 << 9));
+				list[6] = hMarine.entindex();
 				break;
 			case ROLE.INFECTOR:
-				NetProps.SetPropInt(hMarine, "m_iEmote", NetProps.GetPropInt(hMarine, "m_iEmote") | (1 << 10));
+				list[7] = hMarine.entindex();
 				break;
 			case ROLE.BOOMER:
-				NetProps.SetPropInt(hMarine, "m_iEmote", NetProps.GetPropInt(hMarine, "m_iEmote") | (1 << 11));
+				list[8] = hMarine.entindex();
 				break;
 			case ROLE.SILENCER:
-				NetProps.SetPropInt(hMarine, "m_iEmote", NetProps.GetPropInt(hMarine, "m_iEmote") | (1 << 12));
+				list[9] = hMarine.entindex();
 				break;
 			case ROLE.MIMIC:
-				NetProps.SetPropInt(hMarine, "m_iEmote", NetProps.GetPropInt(hMarine, "m_iEmote") | (1 << 13));
-				break;
+				list[10] = hMarine.entindex();
 		}
 	}
 	foreach(hPlayer in g_player_TraitorHistory) {
 		if (hPlayer == null || !hPlayer.IsValid()) {
 			continue;
 		}
-		NetProps.SetPropInt(hPlayer, "m_iFrags", 99);
+
+    local hHud2 = Entities.FindByName(null, hPlayer.GetScriptScope().strHudName2);
+		for(local i = 6;i<21;i++) {
+			hHud2.SetInt(i, list[i]);
+		}
 	}
 }
 
@@ -1158,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);
@@ -1461,6 +1472,9 @@ function CreatePlayerHud(hPlayer) {
 	hHud1.SetEntity(0, hPlayer);
 	local strHud1 = "HUD_" + UniqueString();
 	hHud1.SetName(strHud1);
+	for (local i = 6; i < 21; i++) {
+		hHud1.SetInt(i, 0);
+	}
 
 	hPlayer.GetScriptScope().strHudName1 <- strHud1;
 	hHud1.SetInt(0, ROLE.SPECTATOR);
@@ -1488,6 +1502,9 @@ function CreatePlayerHud(hPlayer) {
 	hHud2.SetEntity(0, hPlayer);
 	local strHud2 = "HUD_" + UniqueString();
 	hHud2.SetName(strHud2);
+	for (local i = 6; i < 21; i++) {
+		hHud2.SetInt(i, 0);
+	}
 
 	hPlayer.ValidateScriptScope();
 	hPlayer.GetScriptScope().strHudName2 <- strHud2;
@@ -1516,6 +1533,9 @@ function CreatePlayerHud(hPlayer) {
 	hHud4.SetEntity(0, hPlayer);
 	local strHud4 = "HUD_" + UniqueString();
 	hHud4.SetName(strHud4);
+	for (local i = 6; i < 21; i++) {
+		hHud4.SetInt(i, 0);
+	}
 
 	hPlayer.GetScriptScope().strHudName4 <- strHud4;
 	hHud4.SetInt(0, ROLE.SPECTATOR);
@@ -1543,6 +1563,9 @@ function CreatePlayerHud(hPlayer) {
 	hHud3.SetEntity(0, hPlayer);
 	local strhHud3 = "HUD_" + UniqueString();
 	hHud3.SetName(strhHud3);
+	for (local i = 6; i < 21; i++) {
+		hHud3.SetInt(i, 0);
+	}
 
 	hPlayer.ValidateScriptScope();
 	hPlayer.GetScriptScope().strHudName3 <- strhHud3;

reactivedrop/content/traitors_challenge/scripts/vscripts/challenge_traitors_events/ontakedamage_alive_any.nut

@@ -46,14 +46,14 @@ function OnTakeDamage_Alive_Any(victim, inflictor, attacker, weapon, damage, dam
 					factor3 = 0.10;
 					break;
 				case "asw_weapon_devastator": //毁灭者霰弹
-					factor1 = 0.33;
-					factor2 = 0.23;
-					factor3 = 0.46;
+					factor1 = 0.31;
+					factor2 = 0.21;
+					factor3 = 0.41;
 					break;
 				case "asw_weapon_vindicator": //复仇者霰弹
-					factor1 = 0.16;
-					factor2 = 0.12;
-					factor3 = 0.20;
+					factor1 = 0.20;
+					factor2 = 0.15;
+					factor3 = 0.25;
 					break;
 				default:
 					factor1 = 0.08;
@@ -105,9 +105,9 @@ function OnTakeDamage_Alive_Any(victim, inflictor, attacker, weapon, damage, dam
 					factor3 = 0.40;
 					break;
 				case "asw_weapon_minigun": //迷你机枪
-					factor1 = 0.26;
-					factor2 = 0.20;
-					factor3 = 0.32;
+					factor1 = 0.24;
+					factor2 = 0.18;
+					factor3 = 0.30;
 					break;
 				case "asw_weapon_deagle": //斗牛犬
 					factor1 = 0.26;
@@ -137,9 +137,9 @@ function OnTakeDamage_Alive_Any(victim, inflictor, attacker, weapon, damage, dam
 					factor3 = 0.145;
 					break;
 				case "asw_weapon_medrifle": //医疗冲锋枪
-					factor1 = 0.55;
-					factor2 = 0.45;
-					factor3 = 0.65;
+					factor1 = 0.50;
+					factor2 = 0.40;
+					factor3 = 0.60;
 					break;
 				case "asw_weapon_laser_mines": //激光地雷
 					damage = 6;

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

@@ -4,6 +4,16 @@
 	int	 2  - 行号
 	int	 3  - 投降，当前人数
 	int	 4  - 投降，总人数
+
+	int  6  - TRAITOR_LEADER 对应的marine index
+	int  7  - INFECTOR 对应的marine index
+	int  8  - BOOMER 对应的marine index
+	int  9  - SILENCER 对应的marine index
+	int  10 - MIMIC 对应的marine index
+	int  11 - TRAITOR 对应的marine index
+	...
+	int  20 - TRAITOR 对应的marine index
+
 	int	 63 - 标识，1和2代表显示的是内鬼提示1和提示2。3代表显示的是内鬼开始投票，4代表投票中，5代表投票停止
 
 	float   0  - HUD信息显示的起始时间
@@ -45,9 +55,32 @@ IncludeScript("challenge_traitors_enums.nut");
 
 FONT_DEFAULTLARGE <- self.LookupFont("DefaultMedium");
 
+TEXTURE_TRAITOR <- self.LookupTexture("vgui/swarm/Emotes/EmoteTraitor");
+TEXTURE_TRAITORS <- {
+	[6] = self.LookupTexture("vgui/swarm/Emotes/EmoteTraitorLeader"),
+	[7] = self.LookupTexture("vgui/swarm/Emotes/EmoteInfector"),
+	[8] = self.LookupTexture("vgui/swarm/Emotes/EmoteBoomer"),
+	[9] = self.LookupTexture("vgui/swarm/Emotes/EmoteSilencer"),
+	[10] = self.LookupTexture("vgui/swarm/Emotes/EmoteMimic"),
+	[11] = TEXTURE_TRAITOR,
+	[12] = TEXTURE_TRAITOR,
+	[13] = TEXTURE_TRAITOR,
+	[14] = TEXTURE_TRAITOR,
+	[15] = TEXTURE_TRAITOR,
+	[16] = TEXTURE_TRAITOR,
+	[17] = TEXTURE_TRAITOR,
+	[18] = TEXTURE_TRAITOR,
+	[19] = TEXTURE_TRAITOR,
+	[20] = TEXTURE_TRAITOR,
+};
+
 xMargin <- 0;
 
 function Paint() {
+	for (local i = 6; i < 21; i++) {
+		PaintTraitorIcon(i);
+	}
+
 	//如果正在控制士兵，显示信息。
 	if (self.GetEntity(0) == GetLocalPlayer()) {
 		local message = self.GetString(0);
@@ -96,6 +129,33 @@ function PaintMsg(point, role, font, message) {
 
 }
 
+function PaintTraitorIcon(idx) {
+
+	if (self.GetInt(idx) <= 0 || TEXTURE_TRAITORS[idx] == -1) {
+		return;
+	}
+	local screenPos = self.ClientGetEntityScreenPos(self.GetInt(idx));
+	if (screenPos.z < 0.5) { //无效屏幕坐标
+		return;
+	}
+
+	local xPos = screenPos.x;
+	local yPos = screenPos.y;
+
+	local fScale = (ScreenHeight() / 768.0) * 0.4;
+	local HalfW = 128.0 * fScale * 0.5;
+	local HalfH = 128.0 * fScale * 0.5;
+	yPos += 100 * (ScreenHeight() / 768.0);
+
+	local points = [
+		{x = xPos - HalfW, y = yPos - HalfH, s = 0, t = 0},
+		{x = xPos + HalfW, y = yPos - HalfH, s = 1, t = 0},
+		{x = xPos + HalfW, y = yPos + HalfH, s = 1, t = 1},
+		{x = xPos - HalfW, y = yPos + HalfH, s = 0, t = 1}
+	];
+	self.PaintPolygon(points, 255, 255, 255, 255, TEXTURE_TRAITORS[idx]);
+}
+
 function interp(i, t) {
 	local t0 = self.GetFloat(0 + 3 * i);
 	local t1 = self.GetFloat(3 + 3 * i);

src/game/client/swarm/asw_in_mouse.cpp

@@ -1,6 +1,7 @@
 #include "cbase.h"
 #include "asw_input.h"
 #include "vgui/asw_vgui_ingame_panel.h"
+#include "asw_hud_master.h"
 #include "asw_hud_crosshair.h"
 #include "c_asw_player.h"
 #include "c_asw_marine.h"
@@ -15,13 +16,6 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
-// restricted area variables
-extern int g_nRestrictedAreaLeft;
-extern int g_nRestrictedAreaRight;
-extern int g_nScreenAreaWidth;
-extern int g_nScreenAreaHeight;
-extern bool g_bUltraWideScreen;
-
 ConVar glow_outline_color_active( "glow_outline_color_active", "153 153 204", FCVAR_NONE );
 ConVar glow_outline_color_inactive( "glow_outline_color_inactive", "77 77 77", FCVAR_NONE );
 
@@ -92,17 +86,15 @@ void CASWInput::ApplyMouse( int nSlot, QAngle& viewangles, CUserCmd *cmd, float
 	int current_posx, current_posy;
 	GetMousePos(current_posx, current_posy);
 
-	// restrict cursor to 16:9 area to prevent ultra-wide fov cheat
-	C_ASW_Player* asw_player = C_ASW_Player::GetLocalASWPlayer();
+	if ( ASWInput()->ControllerModeActiveMouse() )
+		return;
 
-	if (asw_player && !asw_player->GetSpectatingNPC()) 
+	CASW_Hud_Master *pHUDMaster = GET_HUDELEMENT( CASW_Hud_Master );
+	if ( pHUDMaster )
 	{
-		current_posx = clamp(current_posx, g_nRestrictedAreaLeft, g_nRestrictedAreaRight);
+		current_posx = clamp( current_posx, pHUDMaster->m_nMouseMinX, pHUDMaster->m_nMouseMaxX );
 	}
 
-	if ( ASWInput()->ControllerModeActiveMouse() )
-		return;
-
 	if ( MarineControllingTurret() )
 	{
 		// accelerate up the mouse intertia

src/game/client/swarm/c_asw_buzzer.cpp

@@ -29,6 +29,11 @@ END_RECV_TABLE()
 C_ASW_Buzzer::C_ASW_Buzzer()
 {
 	m_pEngineSound1 = NULL;
+
+	// reactivedrop: workaround to fix aliens red blood
+	// m_bloodColor is not networked
+	// so setting SetBloodColor() on server doesn't affect client 
+	SetBloodColor( BLOOD_COLOR_GREEN );
 }
 
 C_ASW_Buzzer::~C_ASW_Buzzer()

src/game/client/swarm/c_asw_marine_resource.cpp

@@ -54,6 +54,7 @@ IMPLEMENT_CLIENTCLASS_DT( C_ASW_Marine_Resource, DT_ASW_Marine_Resource, CASW_Ma
 	RecvPropIntWithMinusOneFlag( RECVINFO( m_iScore ) ),
 	RecvPropFloat( RECVINFO( m_flFinishedMissionTime ) ),
 	RecvPropDataTable( RECVINFO_DT( m_EquippedItemData ), 0, &REFERENCE_RECV_TABLE( DT_RD_ItemInstances_Marine_Resource ) ),
+	RecvPropInt( RECVINFO( m_iChallengeScratch ) ),
 END_RECV_TABLE();
 
 extern ConVar asw_leadership_radius;
@@ -81,6 +82,7 @@ C_ASW_Marine_Resource::C_ASW_Marine_Resource()
 	m_flFinishedMissionTime = -1;
 	memset( m_iWeaponsInSlots, -1, sizeof( m_iWeaponsInSlots ) );
 	memset( m_iWeaponsInSlotsLastSeen, -1, sizeof( m_iWeaponsInSlotsLastSeen ) );
+	m_iChallengeScratch = 0;
 }
 
 C_ASW_Marine_Resource::~C_ASW_Marine_Resource()

src/game/client/swarm/c_asw_marine_resource.h

@@ -114,12 +114,13 @@ class C_ASW_Marine_Resource : public C_BaseEntity
 	float m_flScoreLastChanged;
 	int m_iPrevScore;
 	int m_iCurScore;
+	int m_iChallengeScratch;
 
 	CNetworkVarEmbedded( CRD_ItemInstances_Marine_Resource, m_EquippedItemData );
 	void ClearInvalidEquipData();
 
 private:
-	C_ASW_Marine_Resource( const C_ASW_Marine_Resource & ); // not defined, not accessible
+	C_ASW_Marine_Resource( const C_ASW_Marine_Resource & ) = delete;
 };
 
 #endif /* _INCLUDED_C_ASW_MARINE_RESOURCE_H */

src/game/client/swarm/c_asw_objective.cpp

@@ -132,8 +132,3 @@ const char *C_ASW_Objective::GetInfoIcon( int i )
 	}
 	return NULL;
 }
-
-// allows this objective to paint its status on the HUD
-void C_ASW_Objective::PaintObjective( float &current_y )
-{
-}

src/game/client/swarm/c_asw_objective.h

@@ -18,9 +18,6 @@ class C_ASW_Objective : public C_BaseEntity
 	const char *GetInfoIcon( int i );
 	const char *GetObjectiveIconName( void );
 
-	// allows this objective to paint its status on the HUD
-	virtual void PaintObjective( float &current_y );
-
 	virtual bool IsObjectiveComplete() { return m_bComplete; }
 	virtual bool IsObjectiveFailed() { return m_bFailed; }
 	virtual bool IsObjectiveOptional() { return m_bOptional; }