8000 Random Changes by Drixevel-Archive · Pull Request #96 · Maxximou5/csgo-deathmatch · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Random Changes #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2019
Merged

Random Changes #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configs/deathmatch/deathmatch.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@
"weapon_mp7" "-1"
"weapon_ump45" "-1"
"weapon_bizon" "-1"
"weapon_mp5sd" "-1"
"random" "-1"
}

Expand Down
Binary file modified plugins/deathmatch.smx
View file
Open in desktop
Binary file not shown.
82 changes: 78 additions & 4 deletions scripting/deathmatch.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma newdecls required

#define PLUGIN_VERSION "2.0.9"
#define PLUGIN_VERSION "2.1.0"
#define PLUGIN_NAME "[CS:GO] Deathmatch"
#define PLUGIN_AUTHOR "Maxximou5"
#define PLUGIN_DESCRIPTION "Enables deathmatch style gameplay (respawning, gun selection, spawn protection, etc)."
Expand Down Expand Up @@ -128,6 +128,7 @@ ConVar g_cvDM_nades_flashbang;
ConVar g_cvDM_nades_he;
ConVar g_cvDM_nades_smoke;
ConVar g_cvDM_nades_tactical;
ConVar g_cvDM_blockweapondrops;

/* Plugin Variables */
bool g_bHSOnlyClient[MAXPLAYERS + 1];
Expand Down Expand Up @@ -186,6 +187,18 @@ int g_iDistanceSearchSuccesses = 0;
int g_iDistanceSearchFailures = 0;
int g_iSpawnPointSearchFailures = 0;

public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max)
{
RegPluginLibrary("deathmatch");

CreateNative("Deathmatch_DisplayOptionsMenu", Native_DisplayOptionsMenu);
CreateNative("Deathmatch_GiveSavedWeapons", Native_GiveSavedWeapons);
CreateNative("Deathmatch_UpdateSetting_Primary", Native_UpdateSetting_Primary);
CreateNative("Deathmatch_UpdateSetting_Secondary", Native_UpdateSetting_Secondary);

return APLRes_Success;
}

public void OnPluginStart()
{
/* Let's not waste our time here... */
Expand Down Expand Up @@ -273,6 +286,7 @@ public void OnPluginStart()
g_cvDM_nades_he = CreateConVar("dm_nades_he", "0", "Number of HE grenades to give each player.");
g_cvDM_nades_smoke = CreateConVar("dm_nades_smoke", "0", "Number of smoke grenades to give each player.");
g_cvDM_nades_tactical = CreateConVar("dm_nades_tactical", "0", "Number of tactical grenades to give each player.");
g_cvDM_blockweapondrops = CreateConVar("dm_blockweapondrops", "1", "Blocks weapons from being dropped.");

/* Load DM Config */
LoadConfig();
Expand Down Expand Up @@ -343,6 +357,7 @@ public void OnPluginStart()
g_cvDM_nades_he.AddChangeHook(Event_CvarChange);
g_cvDM_nades_smoke.AddChangeHook(Event_CvarChange);
g_cvDM_nades_tactical.AddChangeHook(Event_CvarChange);
g_cvDM_blockweapondrops.AddChangeHook(Event_CvarChange);

/* Listen For Client Commands */
AddCommandListener(Event_Say, "say");
Expand Down Expand Up @@ -375,7 +390,7 @@ public void OnPluginStart()

/* Create Global Timers */
CreateTimer(0.5, UpdateSpawnPointStatus, INVALID_HANDLE, TIMER_REPEAT);
CreateTimer(1.0, RemoveGroundWeapons, INVALID_HANDLE, TIMER_REPEAT);
CreateTimer(0.5, RemoveGroundWeapons, INVALID_HANDLE, TIMER_REPEAT);

/* Baked Cookies */
g_hWeapon_Primary_Cookie = RegClientCookie("dm_weapon_primary", "Primary Weapon Selection", CookieAccess_Protected);
Expand Down Expand Up @@ -1254,6 +1269,7 @@ void BuildWeaponMenuNames()
g_smWeaponMenuNames.SetString("weapon_mac10", "MAC-10");
g_smWeaponMenuNames.SetString("weapon_mp9", "MP9");
g_smWeaponMenuNames.SetString("weapon_mp7", "MP7");
g_smWeaponMenuNames.SetString("weapon_mp5sd", "MP5SD");
g_smWeaponMenuNames.SetString("weapon_ump45", "UMP-45");
g_smWeaponMenuNames.SetString("weapon_p90", "P90");
g_smWeaponMenuNames.SetString("weapon_bizon", "PP-Bizon");
Expand Down Expand Up @@ -1893,6 +1909,14 @@ public Action OnTakeDamage(int victim, int &attacker, int &inflictor, float &dam
return Plugin_Continue;
}

public Action CS_OnCSWeaponDrop(int client, int weaponIndex)
{
if (g_cvDM_blockweapondrops.BoolValue)
return Plugin_Handled;

return Plugin_Continue;
}

public void OnReloadPost(int weapon, bool bSuccessful)
{
if (g_cvDM_enabled.BoolValue && g_cvDM_replenish_ammo_reload.BoolValue)
Expand Down Expand Up @@ -2125,6 +2149,8 @@ int GetWeaponAmmoCount(char[] weaponName, bool currentClip)
return currentClip ? 30 : 120;
else if (StrEqual(weaponName, "weapon_ump45"))
return currentClip ? 25 : 100;
else if (StrEqual(weaponName, "weapon_mp5sd"))
return currentClip ? 30 : 120;
else if (StrEqual(weaponName, "weapon_bizon"))
return currentClip ? 64 : 120;
else if (StrEqual(weaponName, "weapon_glock"))
Expand Down Expand Up @@ -2314,11 +2340,11 @@ public int MenuSecondary(Menu menu, MenuAction action, int param1, int param2)
}
}

void GiveSavedWeapons(int client, bool primary, bool secondary)
void GiveSavedWeapons(int client, bool primary, bool secondary, bool reset_bot = true)
{
if (g_cvDM_loadout_style.IntValue >= 2 && IsPlayerAlive(client))
RemoveClientWeapons(client, primary, secondary);
if (IsFakeClient(client))
if (reset_bot && IsFakeClient(client))
SetClientGunModeSettings(client);

if (g_cvDM_loadout_style.IntValue >= 2)
Expand Down Expand Up @@ -3411,3 +3437,51 @@ public void GiveSkinnedWeapon(int client, const char[] weapon)
if (g_cvDM_fast_equip.BoolValue)
RequestFrame(Frame_FastSwitch, GetClientSerial(client));
}

public int Native_DisplayOptionsMenu(Handle plugin, int numParams)
{
int client = GetNativeCell(1);

if (client < 1 || client > MaxClients || !IsClientInGame(client))
ThrowNativeError(SP_ERROR_NATIVE, "Client is invalid.");

if (g_cvDM_gun_menu_mode.IntValue != 1 && g_cvDM_gun_menu_mode.IntValue != 2 && g_cvDM_gun_menu_mode.IntValue != 3)
ThrowNativeError(SP_ERROR_NATIVE, "Native is disabled.");

DisplayOptionsMenu(client);
}

public int Native_GiveSavedWeapons(Handle plugin, int numParams)
{
int client = GetNativeCell(1);

if (client < 1 || client > MaxClients || !IsClientInGame(client))
ThrowNativeError(SP_ERROR_NATIVE, "Client is invalid.");

if (g_cvDM_gun_menu_mode.IntValue == 1 || g_cvDM_gun_menu_mode.IntValue == 4)
GiveSavedWeapons(client, true, true, false);
else if (g_cvDM_gun_menu_mode.IntValue == 2)
GiveSavedWeapons(client, true, false, false);
else if (g_cvDM_gun_menu_mode.IntValue == 3)
GiveSavedWeapons(client, false, true, false);
}

public int Native_UpdateSetting_Primary(Handle plugin, int numParams)
{
int client = GetNativeCell(1);

if (client < 1 || client > MaxClients || !IsClientInGame(client))
ThrowNativeError(SP_ERROR_NATIVE, "Client is invalid.");

GetNativeString(2, g_cPrimaryWeapon[client], sizeof(g_cPrimaryWeapon[]));
}

public int Native_UpdateSetting_Secondary(Handle plugin, int numParams)
{
int client = GetNativeCell(1);

if (client < 1 || client > MaxClients || !IsClientInGame(client))
ThrowNativeError(SP_ERROR_NATIVE, "Client is invalid.");

GetNativeString(2, g_cSecondaryWeapon[client], sizeof(g_cSecondaryWeapon[]));
}
30 changes: 30 additions & 0 deletions scripting/include/deathmatch.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#if defined _deathmatch_included
#endinput
#endif
#define _deathmatch_included

native void Deathmatch_DisplayOptionsMenu(int client);
native void Deathmatch_GiveSavedWeapons(int client);
native void Deathmatch_UpdateSetting_Primary(int client, char[] primary);
native void Deathmatch_UpdateSetting_Secondary(int client, char[] secondary);

#if !defined REQUIRE_PLUGIN
public void __pl_deathmatch_SetNTVOptional()
{
MarkNativeAsOptional("Deathmatch_DisplayOptionsMenu");
MarkNativeAsOptional("Deathmatch_GiveSavedWeapons");
MarkNativeAsOptional("Deathmatch_UpdateSetting_Primary");
MarkNativeAsOptional("Deathmatch_UpdateSetting_Secondary");
}
#endif

public SharedPlugin __pl_deathmatch =
{
name = "deathmatch",
file = "deathmatch.smx",
#if defined REQUIRE_PLUGIN
required = 1
#else
required = 0
#endif
};
0