l4d2_extraplayeritems: I hope this is the final version

scripting/l4d2_extraplayeritems.sp

@@ -1,7 +1,7 @@
 #pragma semicolon 1
 #pragma newdecls required
 
-//#define DEBUG
+#define DEBUG
 
 #define PLUGIN_VERSION "1.0"
 #define MAX_ENTITY_LIMIT 2000
@@ -21,8 +21,9 @@ public Plugin myinfo =
 	url = ""
 };
 
-static ConVar hExtraItemBasePercentage;
-static int extraKitsAmount = -1, totalSurvivorCount, isFailureRound;
+static ConVar hExtraItemBasePercentage, hAddExtraKits;
+static int extraKitsAmount, extraKitsStarted, isFailureRound;
+static bool isCheckpointReached, isLateLoaded;
 
 /*
 on first start: Everyone has a kit, new comers also get a kit.
@@ -31,6 +32,19 @@ Then on heal at the point, you get an extra kit. After a map transition when a p
 Any left over kits will be used on heals until depleted. 
 */
 
+/*
+extra utilities:
+Far away player detection (ahead), start countdown if they continue to be farther away then a majority of the group (% based on Surv. count)
+	-> probably dynamic array if using % system.
+Far away player detection (behind), tell players in chat.
+*/
+public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max) {
+	if(late) 
+		isLateLoaded = true;
+	
+} 
+
+
 public void OnPluginStart()
 {
 	EngineVersion g_Game = GetEngineVersion();
@@ -44,30 +58,79 @@ public void OnPluginStart()
 	HookEvent("round_end", Event_RoundEnd);
 	HookEvent("player_entered_checkpoint", Event_EnterSaferoom);
 	HookEvent("heal_success", Event_HealFinished);
+	HookEvent("map_transition", Event_MapTransition);
 
 	hExtraItemBasePercentage = CreateConVar("l4d2_extraitem_chance", "0.056", "The base chance (multiplied by player count) of an extra item being spawned.", FCVAR_NONE, true, 0.0, true, 1.0);
+	hAddExtraKits = CreateConVar("l4d2_extraitems_kitmode", "0", "Decides how extra kits should be added. 0 -> Overwrites previous extra kits, 1 -> Adds onto previous extra kits");
 
 	AutoExecConfig(true, "l4d2_extraplayeritems");
+
+	RegAdminCmd("sm_epi_setkits", Command_SetKitAmount, ADMFLAG_CHEATS, "Sets the amount of extra kits that will be provided");
+	#if defined DEBUG
+		RegAdminCmd("sm_epi_kits", Command_GetKitAmount, ADMFLAG_CHEATS);
+		RegAdminCmd("sm_epi_items", Command_RunExtraItems, ADMFLAG_CHEATS);
+	#endif
 }
 
+/////////////////////////////////////
+/// COMMANDS
+////////////////////////////////////
+
+public Action Command_SetKitAmount(int client, int args) {
+	char arg[32];
+	GetCmdArg(1, arg, sizeof(arg));
+	int number = StringToInt(arg);
+	if(number > 0 || number == -1) {
+		extraKitsAmount = number;
+		extraKitsStarted = extraKitsAmount;
+		ReplyToCommand(client, "Set extra kits amount to %d", number);
+	}else{
+		ReplyToCommand(client, "Must be a number greater than 0. -1 to disable");
+	}
+	return Plugin_Handled;
+}
+
+#if defined DEBUG
+public Action Command_GetKitAmount(int client, int args) {
+	ReplyToCommand(client, "Extra kits available: %d | Survivors: %d", extraKitsAmount, GetSurvivorsCount());
+	return Plugin_Handled;
+}
+public Action Command_RunExtraItems(int client, int args) {
+	ReplyToCommand(client, "Running extra item count increaser...");
+	CreateTimer(0.1, Timer_AddExtraCounts);
+	return Plugin_Handled;
+}
+#endif
 /////////////////////////////////////
 /// EVENTS
 ////////////////////////////////////
 
 //Called on the first spawn in a mission. 
-bool startingKitsGiven = false;
 public Action Event_PlayerFirstSpawn(Event event, const char[] name, bool dontBroadcast) { 
-	if(L4D_IsFirstMapInScenario() && !startingKitsGiven) {
-		CreateTimer(0.5, Timer_GiveStartingKits);
-	}
-}
-public Action Timer_GiveStartingKits(Handle hdl) {
-	for(int i = 1; i < MaxClients + 1; i++) {
-		if(IsClientConnected(i) && IsClientInGame(i) && IsPlayerAlive(i) && GetClientTeam(i) == 2){
-			if(!DoesClientHaveKit(i)) {
-				CheatCommand(i, "give", "first_aid_kit", "");
-			} 
+	int client = GetClientOfUserId(event.GetInt("userid"));
+	if(L4D_IsFirstMapInScenario() && GetClientTeam(client) == 2) {
+		//Check if all clients are ready, and survivor count is > 4. 
+		//TODO: Possibly stop redudant double loops (ready check & survivor count)0
+		if(AreAllClientsReady() && GetSurvivorsCount() > 4) {
+			int skipLeft = 4;
+			for(int i = 1; i < MaxClients + 1; i++) {
+				if(IsClientConnected(i) && IsClientInGame(i) && GetClientTeam(i) == 2) {
+					//Skip at least the first 4 players, as they will pickup default kits. 
+					//If player somehow already has it ,also skip them.
+					if(skipLeft > 0 || DoesClientHaveKit(i)) {
+						skipLeft--;
+						continue;
+					}else{
+						CheatCommand(i, "give", "first_aid_kit", "");
+					}
+				}
+			}
+			//do for loop, skip 4 people
 		}
+	}else{
+		if(!DoesClientHaveKit(client) && GetClientTeam(client) == 2) {
+			CheatCommand(client, "give", "first_aid_kit", "");
+		} 
 	}
 }
 
@@ -77,39 +140,38 @@ public Action Event_PlayerSpawn(Event event, const char[] name, bool dontBroadca
 	if(GetClientTeam(client) == 2 && extraKitsAmount > 0) {
 		if(!DoesClientHaveKit(client)) {
 			CheatCommand(client, "give", "first_aid_kit", "");
-			extraKitsAmount--;
-			if(extraKitsAmount == 0) {
-				extraKitsAmount = -1;
-			}
+			UseExtraKit();
 		} 
 	}
 }
 
 //TODO: Possibly switch to game_init or game_newmap ?
 public void OnMapStart() {
-	//If it is the first map, reset count as this is before any players. Needs to ignore after a round_end
-	if(L4D_IsFirstMapInScenario()) {
-		if(isFailureRound) 
-			isFailureRound = false;
-		else {
-			totalSurvivorCount = 0;
-			startingKitsGiven = false;
-		}
+	//If previous round was a failure, restore the amount of kits that were left directly after map transition
+	if(isFailureRound) {
+		extraKitsAmount = extraKitsStarted;
+		isFailureRound = false;
 	}
 
-	if(totalSurvivorCount > 4 && GetEntityCount() < MAX_ENTITY_LIMIT)
+	if(!isLateLoaded && GetSurvivorsCount() > 4 && GetEntityCount() < MAX_ENTITY_LIMIT)
 		CreateTimer(20.0, Timer_AddExtraCounts);
 }
-
 public void Event_EnterSaferoom(Event event, const char[] name, bool dontBroadcast) {
 	
 	int client = GetClientOfUserId(event.GetInt("userid"));
-	if(client > 0) {
-		if(extraKitsAmount == -1 && L4D_IsInLastCheckpoint(client)) {
-			int survivors = GetSurvivorsCount();
-			if(survivors > 4) {
-				extraKitsAmount = survivors - 4;
-				PrintToServer("Player entered saferoom. An extra %d kits will be provided", extraKitsAmount);
+	if(client > 0 && !isCheckpointReached) {
+		PrintToConsoleAll("saferoom | EKA %d | Client %d | SafeRoom %b", extraKitsAmount, client, L4D_IsInLastCheckpoint(client));
+		if(L4D_IsInLastCheckpoint(client)) {
+			isCheckpointReached = true;
+			int extraPlayers = GetSurvivorsCount() - 4;
+			if(extraPlayers > 0) {
+				//If hAddExtraKits TRUE: Append to previous, FALSE: Overwrite
+				if(hAddExtraKits.BoolValue) 
+					extraKitsAmount += extraPlayers;
+				else
+					extraKitsAmount = extraPlayers;
+				extraKitsStarted = extraKitsAmount;
+				PrintToServer(">>> Player entered saferoom. An extra %d kits will be provided", extraKitsAmount);
 			}
 		}
 	}
@@ -118,17 +180,19 @@ public void Event_EnterSaferoom(Event event, const char[] name, bool dontBroadca
 public Action Event_RoundEnd(Event event, const char[] name, bool dontBroadcast) {
 	if(!isFailureRound) isFailureRound = true;
 }
+public Action Event_MapTransition(Event event, const char[] name, bool dontBroadcast) {
+	isCheckpointReached = false;
+	isLateLoaded = false;
+	//If any kits were consumed before map transition, decrease from reset-amount (for if a round fails)
+	extraKitsStarted = extraKitsAmount;
+}
 
 
 public Action Event_HealFinished(Event event, const char[] name, bool dontBroadcast) {
 	int client = GetClientOfUserId(event.GetInt("userid"));
-	//if statement 
 	if(extraKitsAmount > 0) {
 		CheatCommand(client, "give", "first_aid_kit", "");
-		extraKitsAmount--;
-		if(extraKitsAmount == 0) {
-			extraKitsAmount = -1;
-		}
+		UseExtraKit();
 	}
 }
 
@@ -138,27 +202,38 @@ public Action Event_HealFinished(Event event, const char[] name, bool dontBroadc
 /// TIMERS
 ////////////////////////////////////
 
+//TODO: In future, possibly have a total percentage of spawns that are affected instead on a per-level
+//TODO: In future, also randomize what items are selected? Two loops:
+/*
+	first loop pushes any valid _spawns into dynamic array
+	while / for loop that runs until X amount affected (based on % of GetEntityCount()).
+	
+	Prioritize first aid kits somehow? Or split two groups: "utility" (throwables, kits, pill/shots), and "weapon" (all other spawns) 
+*/
 public Action Timer_AddExtraCounts(Handle hd) {
-	float percentage = hExtraItemBasePercentage.FloatValue * totalSurvivorCount;
-	PrintToServer("Populating extra items based on player count (%d) | Percentage %d", totalSurvivorCount, percentage);
+	int survivors = GetSurvivorsCount();
+	float percentage = hExtraItemBasePercentage.FloatValue * survivors;
+	PrintToServer("Populating extra items based on player count (%d) | Percentage %f%%", survivors, percentage * 100);
 	char classname[32];
 	int entityCount = GetEntityCount();
+	int affected = 0;
 	for(int i = MaxClients + 1; i < 2048; i++) {
 		if(IsValidEntity(i) && entityCount < MAX_ENTITY_LIMIT) {
 			GetEntityClassname(i, classname, sizeof(classname));
-			if(StrContains(classname, "_spawn", true) > -1 && !StrEqual(classname, "info_zombie_spawn", true)) {
-				if(StrEqual(classname, "weapon_melee_spawn")) {
-
-				}
+			if(StrContains(classname, "_spawn", true) > -1 
+				&& !StrEqual(classname, "info_zombie_spawn", true)
+				&& StrContains(classname, "scavenge", true) == -1
+			) {
 				int count = GetEntProp(i, Prop_Data, "m_itemCount");
-				if(GetRandomFloat() < percentage) {
-					PrintToServer("Debug: Incrementing spawn count for %s from %d", classname, count);
+				if(count > 0 && GetRandomFloat() < percentage) {
 					SetEntProp(i, Prop_Data, "m_itemCount", ++count);
+					++affected;
 				}
 				entityCount++;
 			}
 		}
 	}
+	PrintToServer("Incremented counts for %d items", affected);
 }
 
 /////////////////////////////////////
@@ -169,12 +244,22 @@ stock int GetSurvivorsCount() {
 	int count = 0;
 	for(int i = 1; i < MaxClients + 1; i++) {
 		if(IsClientConnected(i) && IsClientInGame(i) && GetClientTeam(i) == 2) {
-			count++;
+			++count;
 		}
 	}
+	PrintToServer("debug >>> survivors %d", count);
 	return count;
 }
 
+stock bool AreAllClientsReady() {
+	for(int i = 1; i < MaxClients + 1; i++) {
+		if(IsClientConnected(i) && !IsClientInGame(i)) {
+			return false;
+		}
+	}
+	return true;
+}
+
 stock bool DoesClientHaveKit(int client) {
 	char wpn[32];
 	if(GetClientWeaponName(client, 3, wpn, sizeof(wpn))) {
@@ -183,4 +268,10 @@ stock bool DoesClientHaveKit(int client) {
 		}
 	}
 	return false;
+}
+
+stock void UseExtraKit() {
+	if(--extraKitsAmount <= 0) {
+		extraKitsAmount = 0;
+	}
 }