Merge pull request #25 from Psykotikism/v8.51

v8.51

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 8.51 (December 26, 2018)
+
+Bug fixes:
+
+1. Fixed the Clone, Minion, and Respawn abilities not respecting the `Amount` settings.
+2. Fixed the Cloud ability not respecting the `Human Mode` setting.
+3. Fixed all abilities not resetting properly for human-controlled Super Tanks upon death.
+
 ## Version 8.50 (December 25, 2018)
 
 Bug fixes:

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

@@ -17,7 +17,7 @@
 #include <sdktools>
 
 #define ST_AUTHOR "Psyk0tik (Crasher_3637)"
-#define ST_VERSION "8.50"
+#define ST_VERSION "8.51"
 #define ST_URL "https://forums.alliedmods.net/showthread.php?t=302140"
 
 #define ST_TAG "[ST++]"

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

@@ -365,7 +365,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_incapacitated"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			if (g_bAbsorb[iTank])
 			{

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

@@ -390,9 +390,9 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
-			if (iAcidAbility(iTank) == 1 && bIsValidGame())
+			if (ST_CloneAllowed(iTank, g_bCloneInstalled) && iAcidAbility(iTank) == 1 && bIsValidGame())
 			{
 				vAcid(iTank, iTank);
 			}

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

@@ -361,7 +361,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveAimless(iTank);
 		}

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

@@ -339,7 +339,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveAmmo(iTank);
 		}

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

@@ -365,7 +365,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveBlind(iTank);
 		}

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

@@ -347,9 +347,9 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
-			if (iBombAbility(iTank) == 1)
+			if (ST_CloneAllowed(iTank, g_bCloneInstalled) && iBombAbility(iTank) == 1)
 			{
 				float flPos[3];
 				GetClientAbsOrigin(iTank, flPos);

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

@@ -361,7 +361,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveBury(iTank);
 		}

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

@@ -311,7 +311,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveCar(iTank);
 		}

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

@@ -370,7 +370,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveChoke(iTank);
 		}

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

@@ -401,101 +401,118 @@ public void ST_OnChangeType(int tank)
 
 static void vCloneAbility(int tank)
 {
-	float flCloneChance = !g_bTankConfig[ST_TankType(tank)] ? g_flCloneChance[ST_TankType(tank)] : g_flCloneChance2[ST_TankType(tank)],
-		flChance = GetRandomFloat(0.1, 100.0);
-	if (iCloneAbility(tank) == 1 && flChance <= flCloneChance)
+	if (iCloneAbility(tank) == 1)
 	{
-		int iCloneMessage = !g_bTankConfig[ST_TankType(tank)] ? g_iCloneMessage[ST_TankType(tank)] : g_iCloneMessage2[ST_TankType(tank)];
-		if (g_iCloneCount[tank] < iCloneAmount(tank) || g_iCloneCount2[tank] < iHumanAmmo(tank) && iHumanAmmo(tank) > 0)
+		if (g_iCloneCount[tank] < iCloneAmount(tank))
 		{
-			float flHitPosition[3], flPosition[3], flAngles[3], flVector[3];
-			GetClientEyePosition(tank, flPosition);
-			GetClientEyeAngles(tank, flAngles);
-			flAngles[0] = -25.0;
-
-			GetAngleVectors(flAngles, flAngles, NULL_VECTOR, NULL_VECTOR);
-			NormalizeVector(flAngles, flAngles);
-			ScaleVector(flAngles, -1.0);
-			vCopyVector(flAngles, flVector);
-			GetVectorAngles(flAngles, flAngles);
-
-			Handle hTrace = TR_TraceRayFilterEx(flPosition, flAngles, MASK_SOLID, RayType_Infinite, bTraceRayDontHitSelf, tank);
-			if (TR_DidHit(hTrace))
+			if (g_iCloneCount2[tank] < iHumanAmmo(tank) && iHumanAmmo(tank) > 0)
 			{
-				TR_GetEndPosition(flHitPosition, hTrace);
-				NormalizeVector(flVector, flVector);
-				ScaleVector(flVector, -40.0);
-				AddVectors(flHitPosition, flVector, flHitPosition);
-
-				float flDistance = GetVectorDistance(flHitPosition, flPosition);
-				if (flDistance < 200.0 && flDistance > 40.0)
+				float flCloneChance = !g_bTankConfig[ST_TankType(tank)] ? g_flCloneChance[ST_TankType(tank)] : g_flCloneChance2[ST_TankType(tank)];
+				if (GetRandomFloat(0.1, 100.0) <= flCloneChance)
 				{
-					bool bTankBoss[MAXPLAYERS + 1];
-					for (int iPlayer = 1; iPlayer <= MaxClients; iPlayer++)
+					float flHitPosition[3], flPosition[3], flAngles[3], flVector[3];
+					GetClientEyePosition(tank, flPosition);
+					GetClientEyeAngles(tank, flAngles);
+					flAngles[0] = -25.0;
+
+					GetAngleVectors(flAngles, flAngles, NULL_VECTOR, NULL_VECTOR);
+					NormalizeVector(flAngles, flAngles);
+					ScaleVector(flAngles, -1.0);
+					vCopyVector(flAngles, flVector);
+					GetVectorAngles(flAngles, flAngles);
+
+					Handle hTrace = TR_TraceRayFilterEx(flPosition, flAngles, MASK_SOLID, RayType_Infinite, bTraceRayDontHitSelf, tank);
+					if (TR_DidHit(hTrace))
 					{
-						bTankBoss[iPlayer] = false;
-						if (ST_TankAllowed(iPlayer, "234"))
+						TR_GetEndPosition(flHitPosition, hTrace);
+						NormalizeVector(flVector, flVector);
+						ScaleVector(flVector, -40.0);
+						AddVectors(flHitPosition, flVector, flHitPosition);
+
+						float flDistance = GetVectorDistance(flHitPosition, flPosition);
+						if (flDistance < 200.0 && flDistance > 40.0)
 						{
-							bTankBoss[iPlayer] = true;
-						}
-					}
+							bool bTankBoss[MAXPLAYERS + 1];
+							for (int iPlayer = 1; iPlayer <= MaxClients; iPlayer++)
+							{
+								bTankBoss[iPlayer] = false;
+								if (ST_TankAllowed(iPlayer, "234"))
+								{
+									bTankBoss[iPlayer] = true;
+								}
+							}
 
-					ST_SpawnTank(tank, ST_TankType(tank));
+							ST_SpawnTank(tank, ST_TankType(tank));
 
-					int iSelectedType;
-					for (int iPlayer = 1; iPlayer <= MaxClients; iPlayer++)
-					{
-						if (ST_TankAllowed(iPlayer, "234") && !bTankBoss[iPlayer])
-						{
-							iSelectedType = iPlayer;
+							int iSelectedType;
+							for (int iPlayer = 1; iPlayer <= MaxClients; iPlayer++)
+							{
+								if (ST_TankAllowed(iPlayer, "234") && !bTankBoss[iPlayer])
+								{
+									iSelectedType = iPlayer;
 
-							break;
-						}
-					}
+									break;
+								}
+							}
 
-					if (iSelectedType > 0)
-					{
-						TeleportEntity(iSelectedType, flHitPosition, NULL_VECTOR, NULL_VECTOR);
+							if (iSelectedType > 0)
+							{
+								TeleportEntity(iSelectedType, flHitPosition, NULL_VECTOR, NULL_VECTOR);
 
-						g_bClone[iSelectedType] = true;
+								g_bClone[iSelectedType] = true;
 
-						int iCloneHealth = !g_bTankConfig[ST_TankType(tank)] ? g_iCloneHealth[ST_TankType(tank)] : g_iCloneHealth2[ST_TankType(tank)],
-							iNewHealth = (iCloneHealth > ST_MAXHEALTH) ? ST_MAXHEALTH : iCloneHealth;
-						SetEntityHealth(iSelectedType, iNewHealth);
+								int iCloneHealth = !g_bTankConfig[ST_TankType(tank)] ? g_iCloneHealth[ST_TankType(tank)] : g_iCloneHealth2[ST_TankType(tank)],
+									iNewHealth = (iCloneHealth > ST_MAXHEALTH) ? ST_MAXHEALTH : iCloneHealth;
+								SetEntityHealth(iSelectedType, iNewHealth);
 
-						g_iCloneCount[tank]++;
-						g_iCloneOwner[iSelectedType] = tank;
+								g_iCloneCount[tank]++;
+								g_iCloneOwner[iSelectedType] = tank;
 
-						if (ST_TankAllowed(tank, "5") && iHumanAbility(tank) == 1)
-						{
-							g_iCloneCount2[tank]++;
+								if (ST_TankAllowed(tank, "5") && iHumanAbility(tank) == 1)
+								{
+									g_iCloneCount2[tank]++;
 
-							ST_PrintToChat(tank, "%s %t", ST_TAG3, "CloneHuman", g_iCloneCount2[tank], iHumanAmmo(tank));
-						}
+									ST_PrintToChat(tank, "%s %t", ST_TAG3, "CloneHuman", g_iCloneCount2[tank], iHumanAmmo(tank));
+								}
 
-						if (iCloneMessage == 1)
-						{
-							char sTankName[33];
-							ST_TankName(tank, sTankName);
-							ST_PrintToChatAll("%s %t", ST_TAG2, "Clone", sTankName);
+								int iCloneMessage = !g_bTankConfig[ST_TankType(tank)] ? g_iCloneMessage[ST_TankType(tank)] : g_iCloneMessage2[ST_TankType(tank)];
+								if (iCloneMessage == 1)
+								{
+									char sTankName[33];
+									ST_TankName(tank, sTankName);
+									ST_PrintToChatAll("%s %t", ST_TAG2, "Clone", sTankName);
+								}
+							}
 						}
 					}
+
+					delete hTrace;
+				}
+				else
+				{
+					if (ST_TankAllowed(tank, "5") && iHumanAbility(tank) == 1)
+					{
+						ST_PrintToChat(tank, "%s %t", ST_TAG3, "CloneHuman2");
+					}
 				}
 			}
-
-			delete hTrace;
+			else
+			{
+				vCloneMessage(tank);
+			}
 		}
 		else
 		{
-			ST_PrintToChat(tank, "%s %t", ST_TAG3, "CloneAmmo");
+			vCloneMessage(tank);
 		}
 	}
-	else if (flChance > flCloneChance && (g_iCloneCount[tank] < iCloneAmount(tank) || g_iCloneCount2[tank] < iHumanAmmo(tank) && iHumanAmmo(tank) > 0))
+}
+
+static void vCloneMessage(int tank)
+{
+	if (ST_TankAllowed(tank, "5") && iHumanAbility(tank) == 1)
 	{
-		if (ST_TankAllowed(tank, "5") && iHumanAbility(tank) == 1)
-		{
-			ST_PrintToChat(tank, "%s %t", ST_TAG3, "CloneHuman2");
-		}
+		ST_PrintToChat(tank, "%s %t", ST_TAG3, "CloneAmmo");
 	}
 }
 

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

@@ -301,6 +301,18 @@ public void ST_OnConfigsLoaded(const char[] savepath, bool main)
 	delete kvSuperTanks;
 }
 
+public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
+{
+	if (StrEqual(name, "player_death"))
+	{
+		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
+		if (ST_TankAllowed(iTank, "024"))
+		{
+			vRemoveCloud(iTank);
+		}
+	}
+}
+
 public void ST_OnAbilityActivated(int tank)
 {
 	if (ST_TankAllowed(tank) && (!ST_TankAllowed(tank, "5") || iHumanAbility(tank) == 0) && ST_CloneAllowed(tank, g_bCloneInstalled) && iCloudAbility(tank) == 1 && !g_bCloud[tank])
@@ -521,7 +533,7 @@ public Action tTimerCloud(Handle timer, DataPack pack)
 	}
 
 	float flTime = pack.ReadFloat();
-	if (ST_TankAllowed(iTank, "5") && iHumanAbility(iTank) == 1 && (flTime + flHumanDuration(iTank)) < GetEngineTime() && !g_bCloud2[iTank])
+	if (ST_TankAllowed(iTank, "5") && iHumanAbility(iTank) == 1 && iHumanMode(iTank) == 0 && (flTime + flHumanDuration(iTank)) < GetEngineTime() && !g_bCloud2[iTank])
 	{
 		vReset2(iTank);
 		vReset3(iTank);

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

@@ -365,7 +365,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveDrug(iTank);
 		}

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

@@ -365,7 +365,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveDrunk(iTank);
 		}

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

@@ -364,7 +364,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveElectric(iTank);
 		}

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

@@ -363,7 +363,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveEnforce(iTank);
 		}

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

@@ -347,9 +347,9 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
-			if (iFireAbility(iTank) == 1)
+			if (ST_CloneAllowed(iTank, g_bCloneInstalled) && iFireAbility(iTank) == 1)
 			{
 				float flPos[3];
 				GetClientAbsOrigin(iTank, flPos);

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

@@ -318,7 +318,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "0245") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveFlash(iTank);
 		}

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

@@ -376,7 +376,7 @@ public void ST_OnEventFired(Event event, const char[] name, bool dontBroadcast)
 	if (StrEqual(name, "player_death"))
 	{
 		int iTankId = event.GetInt("userid"), iTank = GetClientOfUserId(iTankId);
-		if (ST_TankAllowed(iTank, "024") && ST_CloneAllowed(iTank, g_bCloneInstalled))
+		if (ST_TankAllowed(iTank, "024"))
 		{
 			vRemoveFling(iTank);
 		}