Add commands for rock throws (#902)

* l4d2_tank_attack_control: Commands for rock throws

Feature:
- Three commands (!underhand !overhand !overonehand) for each rock throw sequence.

* l4d2_tank_attack_control: Update translations for commands

Author: jensewe

addons/sourcemod/plugins/optional/l4d2_tank_attack_control.smx

@@ -15,54 +15,105 @@
 //50 - underhand (+use),
 //51 - 2handed overhand (+reload)
 
+bool g_bQueuedCommandThrow[MAXPLAYERS+1];
 int g_iQueuedThrow[MAXPLAYERS + 1];
 ConVar g_hBlockPunchRock;
 ConVar g_hBlockJumpRock;
 ConVar hOverhandOnly;
-
-float throwQueuedAt[MAXPLAYERS + 1];
+bool g_bBlockJumpRock;
+bool g_bOverhandOnly;
 
 public Plugin myinfo = 
 {
 	name = "Tank Attack Control", 
-	author = "vintik, CanadaRox, Jacob, Visor",
+	author = "vintik, CanadaRox, Jacob, Visor, Forgetest",
 	description = "",
-	version = "0.7.2",
+	version = "0.8",
 	url = "https://github.com/SirPlease/L4D2-Competitive-Rework"
 }
 
-public void OnPluginStart()
+public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max)
 {
-	LoadTranslations("l4d2_tank_attack_control.phrases");
-	char sGame[256];
-	GetGameFolderName(sGame, sizeof(sGame));
-	if (!StrEqual(sGame, "left4dead2", false))
+	if (GetEngineVersion() != Engine_Left4Dead2)
 	{
-		SetFailState("Plugin supports Left 4 dead 2 only!");
+		strcopy(error, err_max, "Plugin supports Left 4 dead 2 only!");
+		return APLRes_SilentFailure;
 	}
-	
+	return APLRes_Success;
+}
+
+public void OnPluginStart()
+{
+	LoadTranslations("l4d2_tank_attack_control.phrases");
+
 	//future-proof remake of the confogl feature (could be used with lgofnoc)
 	g_hBlockPunchRock = CreateConVar("l4d2_block_punch_rock", "1", "Block tanks from punching and throwing a rock at the same time");
 	g_hBlockJumpRock = CreateConVar("l4d2_block_jump_rock", "0", "Block tanks from jumping and throwing a rock at the same time");
 	hOverhandOnly = CreateConVar("tank_overhand_only", "0", "Force tank to only throw overhand rocks.");
 
-	HookEvent("round_start", RoundStartEvent, EventHookMode_PostNoCopy);
+	g_hBlockJumpRock.AddChangeHook(OnConVarChanged);
+	hOverhandOnly.AddChangeHook(OnConVarChanged);
+	GetCvars();
+
 	HookEvent("tank_spawn", TankSpawn_Event);
+
+	RegConsoleCmd("sm_underhand", Cmd_sm_underhand);
+	RegConsoleCmd("sm_overhand", Cmd_sm_overhand);
+	RegConsoleCmd("sm_overonehand", Cmd_sm_overonehand);
 }
 
-void RoundStartEvent(Event hEvent, const char[] sEventName, bool bDontBroadcast)
+void OnConVarChanged(ConVar convar, const char[] oldValue, const char[] newValue)
 {
-	for (int i = 1; i <= MaxClients; i++) {
-		throwQueuedAt[i] = 0.0;
-	}
+	GetCvars();
+}
+
+void GetCvars()
+{
+	g_bBlockJumpRock = g_hBlockJumpRock.BoolValue;
+	g_bOverhandOnly = hOverhandOnly.BoolValue;
+}
+
+public void OnClientConnected(int client)
+{
+	g_bQueuedCommandThrow[client] = false;
+}
+
+Action Cmd_sm_underhand(int client, int args)
+{
+	if (!client || !IsClientInGame(client) || !IsTank(client))
+		return Plugin_Continue;
+
+	g_bQueuedCommandThrow[client] = true;
+	g_iQueuedThrow[client] = 2; //underhand
+	return Plugin_Handled;
+}
+
+Action Cmd_sm_overhand(int client, int args)
+{
+	if (!client || !IsClientInGame(client) || !IsTank(client))
+		return Plugin_Continue;
+	
+	g_bQueuedCommandThrow[client] = true;
+	g_iQueuedThrow[client] = 3; //two hand overhand
+	return Plugin_Handled;
+}
+
+Action Cmd_sm_overonehand(int client, int args)
+{
+	if (!client || !IsClientInGame(client) || !IsTank(client))
+		return Plugin_Continue;
+	
+	g_bQueuedCommandThrow[client] = true;
+	g_iQueuedThrow[client] = 1; //one hand overhand
+	return Plugin_Handled;
 }
 
 void TankSpawn_Event(Event event, const char[] name, bool dontBroadcast)
 {
-	int tank = GetClientOfUserId(GetEventInt(event, "userid"));
-	if (IsFakeClient(tank)) return;
+	int tank = GetClientOfUserId(event.GetInt("userid"));
+	if (!tank || !IsClientInGame(tank) || IsFakeClient(tank)) return;
 
-	if (GetConVarBool(hOverhandOnly) == false)
+	if (g_bOverhandOnly == false)
 	{
 		CPrintToChat(tank, "%t", "Title");
 		CPrintToChat(tank, "%t", "Reload");
@@ -73,38 +124,47 @@ void TankSpawn_Event(Event event, const char[] name, bool dontBroadcast)
 
 public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3], float angles[3], int &weapon)
 {
-	if (!IsClientInGame(client) || IsFakeClient(client) || GetClientTeam(client) != L4D2Team_Infected
-		|| GetEntProp(client, Prop_Send, "m_zombieClass") != L4D2Infected_Tank)
-			return Plugin_Continue;
+	bool bCommandThrow = g_bQueuedCommandThrow[client];
+	g_bQueuedCommandThrow[client] = false;
+
+	if (!IsClientInGame(client) || IsFakeClient(client) || !IsTank(client))
+		return Plugin_Continue;
 
 	//if tank
 	if ((buttons & IN_JUMP) && ShouldCancelJump(client))
 	{
 		buttons &= ~IN_JUMP;
 	}
 
-	if (GetConVarBool(hOverhandOnly) == false)
+	if (bCommandThrow)
 	{
-		if (buttons & IN_RELOAD)
-		{
-			g_iQueuedThrow[client] = 3; //two hand overhand
-			buttons |= IN_ATTACK2;
-		}
-		else if (buttons & IN_USE)
+		buttons |= IN_ATTACK2;
+	}
+	else
+	{
+		if (g_bOverhandOnly == false)
 		{
-			g_iQueuedThrow[client] = 2; //underhand
-			buttons |= IN_ATTACK2;
+			if (buttons & IN_RELOAD)
+			{
+				g_iQueuedThrow[client] = 3; //two hand overhand
+				buttons |= IN_ATTACK2;
+			}
+			else if (buttons & IN_USE)
+			{
+				g_iQueuedThrow[client] = 2; //underhand
+				buttons |= IN_ATTACK2;
+			}
+			else
+			{
+				g_iQueuedThrow[client] = 1; //one hand overhand
+			}
 		}
 		else
 		{
-			g_iQueuedThrow[client] = 1; //one hand overhand
+			g_iQueuedThrow[client] = 3; // two hand overhand
 		}
 	}
-	else
-	{
-		g_iQueuedThrow[client] = 3; // two hand overhand
-	}
-	
+
 	return Plugin_Continue;
 }
 
@@ -119,11 +179,10 @@ public Action L4D_OnCThrowActivate(int ability)
 
 	if (GetClientButtons(client) & IN_ATTACK)
 	{
-		if (GetConVarBool(g_hBlockPunchRock))
+		if (g_hBlockPunchRock.BoolValue)
 			return Plugin_Handled;
 	}
 
-	throwQueuedAt[client] = GetGameTime();
 	return Plugin_Continue;
 }
 
@@ -140,9 +199,52 @@ public Action L4D2_OnSelectTankAttack(int client, int &sequence)
 
 bool ShouldCancelJump(int client)
 {
-	if (!GetConVarBool(g_hBlockJumpRock))
+	if (!g_bBlockJumpRock)
 	{
 		return false;
 	}
-	return (1.5 > GetGameTime() - throwQueuedAt[client]);
+	return IsTankThrowingRock(client);
 }
+
+bool IsTankThrowingRock(int client)
+{
+	int ability = GetEntPropEnt(client, Prop_Send, "m_customAbility");
+	if (ability == -1)
+		return false;
+	
+	return CThrow__IsActive(ability) || CThrow__SelectingTankAttack(ability);
+}
+
+bool IsTank(int client)
+{
+	return GetClientTeam(client) == L4D2Team_Infected && GetEntProp(client, Prop_Send, "m_zombieClass") == L4D2Infected_Tank;
+}
+
+CountdownTimer CThrow__GetThrowTimer(int ability)
+{
+	static int s_iOffs_m_throwTimer = -1;
+	if (s_iOffs_m_throwTimer == -1)
+		s_iOffs_m_throwTimer = FindSendPropInfo("CThrow", "m_hasBeenUsed") + 4;
+	
+	return view_as<CountdownTimer>(
+		GetEntityAddress(ability) + view_as<Address>(s_iOffs_m_throwTimer)
+	);
+}
+
+bool CThrow__IsActive(int ability)
+{
+	CountdownTimer ct = CThrow__GetThrowTimer(ability);
+	if (!CTimer_HasStarted(ct))
+		return false;
+	
+	return !CTimer_IsElapsed(ct);
+}
+
+bool CThrow__SelectingTankAttack(int ability)
+{
+	static int s_iOffs_m_bSelectingAttack = -1;
+	if (s_iOffs_m_bSelectingAttack == -1)
+		s_iOffs_m_bSelectingAttack = FindSendPropInfo("CThrow", "m_hasBeenUsed") + 28;
+	
+	return GetEntData(ability, s_iOffs_m_bSelectingAttack, 1) > 0;
+}

addons/sourcemod/scripting/l4d2_tank_attack_control.sp

@@ -6,14 +6,14 @@
 	}
 	"Reload"
 	{
-		"en"	"{olive}Reload{default} = {blue}2 Handed Overhand{default}"
+		"en"	"{olive}Reload{default}/{olive}!overhand{default} = {blue}2 Handed Overhand{default}"
 	}
 	"Use"
 	{
-		"en"	"{olive}Use{default} = {blue}Underhand{default}"
+		"en"	"{olive}Use{default}/{olive}!underhand{default} = {blue}Underhand{default}"
 	}
 	"M2"
 	{
-		"en"	"{olive}M2{default} = {blue}1 Handed Overhand{default}"
+		"en"	"{olive}M2{default}/{olive}!overonehand{default} = {blue}1 Handed Overhand{default}"
 	}
 }