Merge pull request #23 from Psykotikism/v8.49

v8.49

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## Version 8.49 (December 6, 2018)
+
+Bug fixes:
+
+1. Fixed the `sm_tank` command not spawning disabled Super Tanks.
+
+Changes:
+
+1. The `sm_tank` command can now spawn more than 1 Super Tank at a time. (New syntax: `sm_tank "type 1-500 OR name" "amount: 1-32" "0: spawn at crosshair|1: spawn automatically"`)
+
 ## Version 8.48 (November 30, 2018)
 
 Bug fixes:

INFORMATION.md

@@ -204,7 +204,8 @@
 			// Not Empty: Tank's custom name
 			"Tank Name"				"Tank #1"
 
-			// Enable the Super Tank.
+			// The game can spawn the Super Tank.
+			// Note: The Super Tank will still appear on the Super Tanks++ menu and other Super Tanks can still transform into the Super Tank.
 			// --
 			// 0: OFF
 			// 1: ON

README.md

@@ -40,13 +40,13 @@ Super Tanks++ enhances the experience and fun that players get from Tank fights
 
 ### Uninstalling/Upgrading to Newer Versions
 1. Delete `super_tanks++` folder from:
- - `addons/sourcemod/data folder`
- - `addons/sourcemod/plugins folder` (`super_tanks++.smx` and all of its modules)
- - `addons/sourcemod/scripting folder` (`super_tanks++.sp` and all of its modules)
+ - `addons/sourcemod/plugins` folder (`super_tanks++.smx` and all of its modules)
+ - `addons/sourcemod/scripting` folder (`super_tanks++.sp` and all of its modules)
 2. Delete `super_tanks++.txt` from `addons/sourcemod/gamedata` folder.
 3. Delete `super_tanks++.inc` from `addons/sourcemod/scripting/include` folder.
 4. Delete `st_clone.inc` from `addons/sourcemod/scripting/include` folder.
 5. Delete `super_tanks++.phrases.txt` from `addons/sourcemod/translations` folder.
+6. Backup `super_tanks++` folder in `addons/sourcemod/data` folder.
 6. Follow the Installation guide above. (Only for upgrading to newer versions.)
 
 ### Disabling

addons/sourcemod/scripting/include/super_tanks++.inc

@@ -16,7 +16,7 @@
 #define _supertanksplusplus_included
 
 #define ST_AUTHOR "Psyk0tik (Crasher_3637)"
-#define ST_VERSION "8.48"
+#define ST_VERSION "8.49"
 #define ST_URL "https://forums.alliedmods.net/showthread.php?t=302140"
 
 #define ST_TAG "[ST++]"
@@ -1224,15 +1224,16 @@ stock void ST_PrintToChat(int client, char[] message, any ...)
 		ThrowError("Client %d is not in game", client);
 	}
 
-	ReplaceString(message, strlen(message), "{default}", "\x01");
-	ReplaceString(message, strlen(message), "{mint}", "\x03");
-	ReplaceString(message, strlen(message), "{yellow}", "\x04");
-	ReplaceString(message, strlen(message), "{olive}", "\x05");
-
 	char sBuffer[255], sMessage[255];
 	SetGlobalTransTarget(client);
 	Format(sBuffer, sizeof(sBuffer), "\x01%s", message);
 	VFormat(sMessage, sizeof(sMessage), sBuffer, 3);
+
+	ReplaceString(sMessage, sizeof(sMessage), "{default}", "\x01");
+	ReplaceString(sMessage, sizeof(sMessage), "{mint}", "\x03");
+	ReplaceString(sMessage, sizeof(sMessage), "{yellow}", "\x04");
+	ReplaceString(sMessage, sizeof(sMessage), "{olive}", "\x05");
+
 	PrintToChat(client, sMessage);
 }
 
@@ -1246,6 +1247,7 @@ stock void ST_PrintToChatAll(char[] message, any ...)
 		{
 			SetGlobalTransTarget(iPlayer);
 			VFormat(sBuffer, sizeof(sBuffer), message, 2);
+
 			ST_PrintToChat(iPlayer, sBuffer);
 		}
 	}

addons/sourcemod/scripting/super_tanks++/super_tanks++.sp

@@ -842,10 +842,10 @@ public void vEventHandler(Event event, const char[] name, bool dontBroadcast)
 					{
 						vSetColor(iTank, g_iType);
 						g_bSpawned[iTank] = true;
-
-						g_iType = 0;
 					}
 
+					g_iType = 0;
+
 					char sNumbers[3][4], sFinaleWaves[12];
 					sFinaleWaves = !g_bGeneralConfig ? g_sFinaleWaves : g_sFinaleWaves2;
 					ReplaceString(sFinaleWaves, sizeof(sFinaleWaves), " ", "");
@@ -900,12 +900,15 @@ public Action cmdTank(int client, int args)
 		return Plugin_Handled;
 	}
 
-	char sType[32], sMode[32];
+	char sType[32], sAmount[32], sMode[32];
 
 	GetCmdArg(1, sType, sizeof(sType));
 	int iType = StringToInt(sType);
 
-	GetCmdArg(2, sMode, sizeof(sMode));
+	GetCmdArg(2, sAmount, sizeof(sAmount));
+	int iAmount = StringToInt(sAmount);
+
+	GetCmdArg(3, sMode, sizeof(sMode));
 	int iMode = StringToInt(sMode);
 
 	iType = iClamp(iType, iGetMinType(), iGetMaxType());
@@ -922,14 +925,18 @@ public Action cmdTank(int client, int args)
 
 		return Plugin_Handled;
 	}
-	else if ((IsCharNumeric(iType) && (iType < iGetMinType() || iType > iGetMaxType())) || iMode < 0 || iMode > 1 || args > 2)
+	else if (iAmount == 0)
 	{
-		ReplyToCommand(client, "%s Usage: sm_tank <type %i-%i> <0: spawn at crosshair|1: spawn automatically>", ST_TAG2, iGetMinType(), iGetMaxType());
+		iAmount = 1;
+	}
+	else if ((IsCharNumeric(iType) && (iType < iGetMinType() || iType > iGetMaxType())) || iAmount > 32 || iMode < 0 || iMode > 1 || args > 3)
+	{
+		ReplyToCommand(client, "%s Usage: sm_tank <type %i-%i> <amount: 1-32> <0: spawn at crosshair|1: spawn automatically>", ST_TAG2, iGetMinType(), iGetMaxType());
 
 		return Plugin_Handled;
 	}
 
-	if (IsCharNumeric(iType) && iTankEnabled(iType) == 0)
+	if (IsCharNumeric(iType) && iSpawnEnabled(iType) == 0)
 	{
 		char sTankName[33];
 		sTankName = !g_bTankConfig[iType] ? g_sTankName[iType] : g_sTankName2[iType];
@@ -939,12 +946,12 @@ public Action cmdTank(int client, int args)
 		return Plugin_Handled;
 	}
 
-	vTank(client, sType, iMode);
+	vTank(client, sType, iAmount, iMode);
 
 	return Plugin_Handled;
 }
 
-static void vTank(int admin, char[] type, int mode = 0)
+static void vTank(int admin, char[] type, int amount = 1, int mode = 0)
 {
 	int iType = StringToInt(type);
 	if (iType != 0)
@@ -982,7 +989,7 @@ static void vTank(int admin, char[] type, int mode = 0)
 
 	if (bIsTankAllowed(admin))
 	{
-		vSpawnTank(admin, mode);
+		vSpawnTank(admin, g_iType, amount, mode);
 	}
 	else
 	{
@@ -1001,17 +1008,17 @@ static void vTank(int admin, char[] type, int mode = 0)
 			}
 			else
 			{
-				vSpawnTank(admin, mode);
+				vSpawnTank(admin, g_iType, amount, mode);
 			}
 		}
 		else
 		{
-			vSpawnTank(admin, mode);
+			vSpawnTank(admin, g_iType, amount, mode);
 		}
 	}
 }
 
-static void vSpawnTank(int admin, int mode = 0)
+static void vSpawnTank(int admin, int type, int amount, int mode = 0)
 {
 	char sParameter[32];
 
@@ -1021,7 +1028,11 @@ static void vSpawnTank(int admin, int mode = 0)
 		case 1: sParameter = "tank auto";
 	}
 
-	vCheatCommand(admin, bIsValidGame() ? "z_spawn_old" : "z_spawn", sParameter);
+	for (int iAmount = 0; iAmount < amount; iAmount++)
+	{
+		vCheatCommand(admin, bIsValidGame() ? "z_spawn_old" : "z_spawn", sParameter);
+		g_iType = type;
+	}
 }
 
 static void vTankMenu(int admin, int item)