Upgraded AI Response System to Alien Swarm + Mapbase combo

-Fixed CBaseMultiplayerPlayer leaking expressers
Petercov · Oct 6, 2019 · ecdf50c · ecdf50c
1 parent 888c1e8
commit ecdf50c
Show file tree

Hide file tree

Showing 60 changed files with 8,343 additions and 3,827 deletions.
diff --git a/game/spp_shared/content/hl2epX_extra/scripts/talker/player/humans.txt b/game/spp_shared/content/hl2epX_extra/scripts/talker/player/humans.txt
@@ -480,13 +480,13 @@ rule PlayerCitizenStartCombatTurretCeiling
 
 response PlayerResponseFollow
 {
-	scene		"scenes/npc/$gender01/squad_away03.vcd"		weight 4
-	scene		"scenes/npc/$gender01/squad_follow02.vcd"
-	scene		"scenes/npc/$gender01/squad_follow03.vcd"
-	scene		"scenes/npc/$gender01/squad_away01.vcd"		weight 3
-	scene		"scenes/npc/$gender01/squad_away02.vcd"
+	scene		"scenes/npc/$gender01/squad_away03.vcd"		weight 4 then any TLK_PLAYER_LEAD foo:0 0.5
+	scene		"scenes/npc/$gender01/squad_follow02.vcd" then any TLK_PLAYER_LEAD foo:0 0.5
+	scene		"scenes/npc/$gender01/squad_follow03.vcd" then any TLK_PLAYER_LEAD foo:0 0.5
+	scene		"scenes/npc/$gender01/squad_away01.vcd"		weight 3 then any TLK_PLAYER_LEAD foo:0 0.5
+	scene		"scenes/npc/$gender01/squad_away02.vcd" then any TLK_PLAYER_LEAD foo:0 0.5
 //Trav|Edt - add more Follow scenes
-	scene	"scenes/npc/$gender01/overhere01.vcd"
+	scene	"scenes/npc/$gender01/overhere01.vcd" then any TLK_PLAYER_LEAD foo:0 0.5
 }
 
 rule PlayerFollow

diff --git a/src/game/client/client_base.vpc b/src/game/client/client_base.vpc
@@ -672,7 +672,6 @@ $Project
 				"$SRCDIR\public\dt_utlvector_recv.cpp"				\
 				"$SRCDIR\public\filesystem_helpers.cpp"				\
 				"$SRCDIR\public\interpolatortypes.cpp"				\
-				"$SRCDIR\game\shared\interval.cpp"					\
 				"$SRCDIR\common\language.cpp"						\
 				"$SRCDIR\public\networkvar.cpp"						\
 				"$SRCDIR\common\randoverride.cpp"					\
@@ -1245,6 +1244,7 @@ $Project
 		$File	"$SRCDIR\public\vgui_controls\WizardSubPanel.h"
 		$File	"$SRCDIR\public\worldsize.h"
 		$File	"$SRCDIR\public\zip_uncompressed.h"
+		$File	"$SRCDIR\public\tier1\interval.h"
 		//Haptics
 		$File   "$SRCDIR\public\haptics\ihaptics.h"	[$WIN32]
 		$File   "$SRCDIR\public\haptics\haptic_utils.h"	[$WIN32]
@@ -1301,7 +1301,6 @@ $Project
 		$File	"$SRCDIR\game\shared\igamesystem.h"
 		$File	"$SRCDIR\game\shared\imovehelper.h"
 		$File	"$SRCDIR\game\shared\in_buttons.h"
-		$File	"$SRCDIR\game\shared\interval.h"
 		$File	"$SRCDIR\game\shared\iplayeranimstate.h"
 		$File	"$SRCDIR\game\shared\ipredictionsystem.h"
 		$File	"$SRCDIR\game\shared\itempents.h"