Skip to content

Commit

Permalink
Add Option to use Bumpmines as Innocent (#466)
Browse files Browse the repository at this point in the history 
* Add Option to use Bumpmines as Innocent

Add Option to use Bumpmines as Innocent

* changed default and added T/D Versions

changed default and added T/D Versions

* Fix for #466 to work

* Added Mrkl21full's Code Cleaning Changes
  • Loading branch information
@Saueee
Saueee committed Apr 13, 2020
1 parent 87d214d commit bf696f1
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 19 deletions.
2 changes: 2 additions & 0 deletions addons/sourcemod/scripting/include/ttt_weapons.inc
View file
Expand Up @@ -40,3 +40,5 @@
#define SPANNER_T_ITEM_SHORT "spanner_t"
#define BREACHCHARGE_ITEM_SHORT "breach"
#define BUMPMINE_ITEM_SHORT "bumpmine"
#define BUMPMINE_D_ITEM_SHORT "bumpmine_d"
#define BUMPMINE_T_ITEM_SHORT "bumpmine_t"
71 changes: 52 additions & 19 deletions addons/sourcemod/scripting/ttt/ttt_weapons.sp
View file
Expand Up @@ -106,6 +106,7 @@ ConVar g_cKevHelm_Type = null;
ConVar g_cHammer_Type = null;
ConVar g_cAxe_Type = null;
ConVar g_cSpanner_Type = null;
ConVar g_cBumpmine_Type = null;

ConVar g_cAWP_Min_Shots = null;
ConVar g_cAWP_Max_Shots = null;
Expand Down Expand Up @@ -170,6 +171,7 @@ public void OnPluginStart()
g_cHammer_Type = AutoExecConfig_CreateConVar("hammer_type", "1", "Type of hammer configuration to use. 0 = Everyone, 1 = Traitor + Detective (Default), 2 = Traitor Only");
g_cAxe_Type = AutoExecConfig_CreateConVar("axe_type", "1", "Type of Axe configuration to use. 0 = Everyone, 1 = Traitor + Detective (Default), 2 = Traitor Only");
g_cSpanner_Type = AutoExecConfig_CreateConVar("spanner_type", "1", "Type of Spanner configuration to use. 0 = Everyone, 1 = Traitor + Detective (Default), 2 = Traitor Only");
g_cBumpmine_Type = AutoExecConfig_CreateConVar("bumpmine_type", "2", "Type of Bumpmine configuration to use. 0 = Everyone, 1 = Traitor + Detective, 2 = Traitor Only (Default)");

g_cKev_Long = AutoExecConfig_CreateConVar("kevlar_name", "Kevlar", "The name of the kevlar in the shop menu.");
g_cHeavy_Long = AutoExecConfig_CreateConVar("heavy_name", "Heavy", "The name of the heavy in the shop menu.");
Expand Down Expand Up @@ -308,6 +310,8 @@ public void OnPluginEnd()
TTT_RemoveShopItem(AWP_ITEM_SHORT);
TTT_RemoveShopItem(BREACHCHARGE_ITEM_SHORT);
TTT_RemoveShopItem(BUMPMINE_ITEM_SHORT);
TTT_RemoveShopItem(BUMPMINE_D_ITEM_SHORT);
TTT_RemoveShopItem(BUMPMINE_T_ITEM_SHORT);
TTT_RemoveShopItem(USP_ITEM_SHORT);
TTT_RemoveShopItem(MP5SD_ITEM_SHORT);
TTT_RemoveShopItem(AK_ITEM_SHORT);
Expand Down Expand Up @@ -430,8 +434,20 @@ void RegisterItem()
TTT_RegisterShopItem(BREACHCHARGE_ITEM_SHORT, sBuffer, g_cBreachCharge_Price.IntValue, TTT_TEAM_TRAITOR, g_cBreachCharge_Prio.IntValue, g_cBreachCharge_Count.IntValue, g_cBreachCharge_Limit.IntValue, OnItemPurchased);

g_cBumpmine_Long.GetString(sBuffer, sizeof(sBuffer));
TTT_RegisterShopItem(BUMPMINE_ITEM_SHORT, sBuffer, g_cBumpmine_Price.IntValue, TTT_TEAM_TRAITOR, g_cBumpmine_Prio.IntValue, g_cBumpmine_Count.IntValue, g_cBumpmine_Limit.IntValue, OnItemPurchased);

if (g_cBumpmine_Type.IntValue == 0)
{
TTT_RegisterShopItem(BUMPMINE_ITEM_SHORT, sBuffer, g_cBumpmine_Price.IntValue, TTT_TEAM_UNASSIGNED, g_cBumpmine_Prio.IntValue, g_cBumpmine_Count.IntValue, g_cBumpmine_Limit.IntValue, OnItemPurchased);
}
else if (g_cBumpmine_Type.IntValue == 1)
{
TTT_RegisterShopItem(BUMPMINE_T_ITEM_SHORT, sBuffer, g_cBumpmine_Price.IntValue, TTT_TEAM_TRAITOR, g_cBumpmine_Prio.IntValue, g_cBumpmine_Count.IntValue, g_cBumpmine_Limit.IntValue, OnItemPurchased);
TTT_RegisterShopItem(BUMPMINE_D_ITEM_SHORT, sBuffer, g_cBumpmine_Price.IntValue, TTT_TEAM_DETECTIVE, g_cBumpmine_Prio.IntValue, g_cBumpmine_Count.IntValue, g_cBumpmine_Limit.IntValue, OnItemPurchased);
}
else if (g_cBumpmine_Type.IntValue == 2)
{
TTT_RegisterShopItem(BUMPMINE_T_ITEM_SHORT, sBuffer, g_cBumpmine_Price.IntValue, TTT_TEAM_TRAITOR, g_cBumpmine_Prio.IntValue, g_cBumpmine_Count.IntValue, g_cBumpmine_Limit.IntValue, OnItemPurchased);
}

g_cUSP_Long.GetString(sBuffer, sizeof(sBuffer));
TTT_RegisterShopItem(USP_ITEM_SHORT, sBuffer, g_cUSP_Price.IntValue, TTT_TEAM_TRAITOR, g_cUSP_Prio.IntValue, g_cUSP_Count.IntValue, g_cUSP_Limit.IntValue, OnItemPurchased);

Expand Down Expand Up @@ -801,31 +817,27 @@ public Action OnItemPurchased(int client, const char[] itemshort, int count, int
TTT_SetClientCredits(client, TTT_GetClientCredits(client) + g_cBreachCharge_Price.IntValue);
}
}
else if (strcmp(itemshort, BUMPMINE_ITEM_SHORT, false) == 0)
else if (strcmp(itemshort, BUMPMINE_ITEM_SHORT, false) == 0 || strcmp(itemshort, BUMPMINE_D_ITEM_SHORT, false) == 0 || strcmp(itemshort, BUMPMINE_T_ITEM_SHORT, false) == 0)
{
if (TTT_GetClientRole(client) != TTT_TEAM_TRAITOR)
{
return Plugin_Stop;
}

strcopy(sItem, sizeof(sItem), itemshort);

if (GetPlayerWeaponSlot(client, CS_SLOT_PRIMARY) != -1)
if (TTT_GetClientRole(client) == TTT_TEAM_INNOCENT)
{
SDKHooks_DropWeapon(client, GetPlayerWeaponSlot(client, CS_SLOT_PRIMARY));
if (g_cBumpmine_Type.IntValue == 0)
{
GiveBumpmine(client);
}
}

int iBC = GivePlayerItem(client, "weapon_bumpmine");

if (iBC != -1)
if (TTT_GetClientRole(client) == TTT_TEAM_DETECTIVE)
{
EquipPlayerWeapon(client, iBC);
SetEntProp(iBC, Prop_Send, "m_iPrimaryReserveAmmoCount", 0);
SetEntProp(iBC, Prop_Data, "m_iClip1", GetRandomInt(g_cBumpmine_Min.IntValue, g_cBumpmine_Max.IntValue));
if (g_cBumpmine_Type.IntValue == 0 || g_cBumpmine_Type.IntValue == 2)
{
GiveBumpmine(client);
}
}
else
if (TTT_GetClientRole(client) == TTT_TEAM_TRAITOR)
{
TTT_SetClientCredits(client, TTT_GetClientCredits(client) + g_cBumpmine_Price.IntValue);
GiveBumpmine(client);
}
}
else if (strcmp(itemshort, KF_ITEM_SHORT, false) == 0)
Expand Down Expand Up @@ -930,6 +942,27 @@ public Action OnItemPurchased(int client, const char[] itemshort, int count, int
return Plugin_Continue;
}

void GiveBumpmine(int client)
{
if (GetPlayerWeaponSlot(client, CS_SLOT_PRIMARY) != -1)
{
SDKHooks_DropWeapon(client, GetPlayerWeaponSlot(client, CS_SLOT_PRIMARY));
}

int iBC = GivePlayerItem(client, "weapon_bumpmine");

if (iBC != -1)
{
EquipPlayerWeapon(client, iBC);
SetEntProp(iBC, Prop_Send, "m_iPrimaryReserveAmmoCount", 0);
SetEntProp(iBC, Prop_Data, "m_iClip1", GetRandomInt(g_cBumpmine_Min.IntValue, g_cBumpmine_Max.IntValue));
}
else
{
TTT_SetClientCredits(client, TTT_GetClientCredits(client) + g_cBumpmine_Price.IntValue);
}
}

void GiveArmor(int client, int armor = 100)
{
g_iPlayer[client].Kevlar++;
Expand Down

0 comments on commit bf696f1

Please sign in to comment.