Add spawn command (#8)

* Add spawn selector * Add `spawn` command * Avoid crash if spawn number is empty * Not allow spawn if not in a team * Update spawn roadmap --------- Co-authored-by: marqdevx <[email protected]>
marqdevx · Oct 29, 2023 · fbf11df · fbf11df
1 parent 97b7428
commit fbf11df
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,8 @@ This plugin adds the minimum requirements for competitive teams that need a more
     - [ ] include map name
 - Practice
   - [X] Map
-  - [ ] Spawns
+  - [X] Spawns
+    - [ ] Only show competitive spawns
   - [ ] Remove smokes
   - [ ] Move to spec
   - [ ] Noclip

diff --git a/src/adminsystem.cpp b/src/adminsystem.cpp
@@ -35,6 +35,8 @@ extern CEntitySystem *g_pEntitySystem;
 
 CAdminSystem* g_pAdminSystem;
 
+bool practiceMode = false;
+
 CUtlMap<uint32, FnChatCommandCallback_t> g_CommandList(0, 0, DefLessFunc(uint32));
 
 CON_COMMAND_F(c_reload_admins, "Reload admin config", FCVAR_SPONLY | FCVAR_LINKED_CONCOMMAND)
@@ -84,8 +86,9 @@ CON_COMMAND_CHAT(scrim, "Scrim mode")
 		return;
 	}
 
-
 
+	practiceMode = false;
+
 	char buf[256];
 	//V_snprintf(buf, sizeof(buf), "exec %s", args[1]);
 
@@ -111,6 +114,8 @@ CON_COMMAND_CHAT(pracc, "Practice mode")
 		return;
 	}
 
+	practiceMode = true;
+
 	char buf[256];
 	//V_snprintf(buf, sizeof(buf), "exec %s", args[1]);
 

diff --git a/src/commands.cpp b/src/commands.cpp
@@ -38,6 +38,8 @@
 extern CEntitySystem *g_pEntitySystem;
 extern IVEngineServer2 *g_pEngineServer2;
 
+extern bool practiceMode;
+
 void ParseChatCommand(const char *pMessage, CCSPlayerController *pController)
 {
 	if (!pController)
@@ -132,6 +134,69 @@ CON_COMMAND_CHAT(unpause, "Request unpause")
 	g_pEngineServer2->ServerCommand("mp_unpause_match");
 }
 
+CON_COMMAND_CHAT(spawn, "teleport to desired spawn")
+{
+	if (!player)
+		return;
+
+	if (!practiceMode){
+		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX"Only available on practice mode");
+		return;
+	}
+
+	if (args.ArgC() < 2)
+	{
+		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Usage: !spawn <spawn number>");
+		return;
+	}
+
+	char teamName[256];
+	if(player->m_iTeamNum == CS_TEAM_T){
+		V_snprintf(teamName, sizeof(teamName), "info_player_terrorist");
+	}else if(player->m_iTeamNum == CS_TEAM_CT){
+		V_snprintf(teamName, sizeof(teamName), "info_player_counterterrorist");
+	}else{
+		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX"You cannot teleport in spectator!");
+		return;
+	}
+
+	//Count spawnpoints (info_player_counterterrorist & info_player_terrorist)
+	SpawnPoint* spawn = nullptr;
+	CUtlVector<SpawnPoint*> spawns;
+	while (nullptr != (spawn = (SpawnPoint*)UTIL_FindEntityByClassname(spawn, teamName)))
+	{
+		if (spawn->m_bEnabled())
+		{
+			// ClientPrint(player, HUD_PRINTTALK, "Spawn %i: %f / %f / %f", spawns.Count(), spawn->GetAbsOrigin().x, spawn->GetAbsOrigin().y, spawn->GetAbsOrigin().z);
+			spawns.AddToTail(spawn);
+		}
+	}
+
+	//Pick and get position of random spawnpoint
+	//Spawns selection from 1 to spawns.Count()
+	int targetSpawn = atoi(args[1]) - 1;
+	int spawnIndex = targetSpawn % spawns.Count();
+	Vector spawnpos = spawns[spawnIndex]->GetAbsOrigin();
+
+	//Here's where the mess starts
+	CBasePlayerPawn *pPawn = player->GetPawn();
+	if (!pPawn)
+	{
+		return;
+	}
+	if (pPawn->m_iHealth() <= 0)
+	{
+		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX"You cannot teleport when dead!");
+		return;
+	}
+
+	int totalSpawns = spawns.Count();
+
+	pPawn->SetAbsOrigin(spawnpos);
+
+	ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX"You have been teleported to spawn. %i/%i", spawnIndex +1, totalSpawns);			
+}
+
 /*
 
 CON_COMMAND_CHAT(getorigin, "get your origin")