From e05947f2b9fc80fb272e0b836d24313002866fb6 Mon Sep 17 00:00:00 2001 From: Alfred Llagas <34087316+Psykotikism@users.noreply.github.com> Date: Mon, 18 Jun 2018 03:45:07 -0700 Subject: [PATCH] Add files via upload --- CHANGELOG.md | 6 ++ addons/sourcemod/plugins/no_friendly-fire.smx | Bin 6601 -> 6036 bytes .../sourcemod/scripting/no_friendly-fire.sp | 88 +++++++++++------- 3 files changed, 61 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bd379a..ec9ce17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Version 6.0 (June 18, 2018) + +1. Bug fixes: + +- Fixed the nff_enabledgamemodes and nff_disabledgamemodes convars not working properly. + ## Version 5.5 (June 16, 2018) 1. Bug fixes: diff --git a/addons/sourcemod/plugins/no_friendly-fire.smx b/addons/sourcemod/plugins/no_friendly-fire.smx index f10cf12de15cd5998d5ef39cbb1fec148a135b3c..fa0b3ea703480d0dabc7d759d310406f3f62a15c 100644 GIT binary patch literal 6036 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 M6NIOGPAca9KZT>qrvLx| literal 6601 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 #pragma semicolon 1 #pragma newdecls required -#define NFF_VERSION "5.5" +#define NFF_VERSION "6.0" public Plugin myinfo = { @@ -15,9 +15,20 @@ public Plugin myinfo = }; char g_sGameName[32]; +ConVar g_cvNFFAdvanced; +ConVar g_cvNFFBurnAdvanced; +ConVar g_cvNFFBurnEasy; +ConVar g_cvNFFBurnExpert; +ConVar g_cvNFFBurnNormal; ConVar g_cvNFFDisabledGameModes; ConVar g_cvNFFEnabledGameModes; ConVar g_cvNFFEnable; +ConVar g_cvNFFEasy; +ConVar g_cvNFFExpert; +ConVar g_cvNFFGameMode; +ConVar g_cvNFFGLScale; +ConVar g_cvNFFGLScaleSelf; +ConVar g_cvNFFNormal; public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max) { @@ -31,9 +42,20 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max public void OnPluginStart() { + g_cvNFFAdvanced = FindConVar("survivor_friendly_fire_factor_hard"); + g_cvNFFBurnAdvanced = FindConVar("survivor_burn_factor_hard"); + g_cvNFFBurnEasy = FindConVar("survivor_burn_factor_easy"); + g_cvNFFBurnExpert = FindConVar("survivor_burn_factor_expert"); + g_cvNFFBurnNormal = FindConVar("survivor_burn_factor_normal"); g_cvNFFDisabledGameModes = CreateConVar("nff_disabledgamemodes", "", "Disable the plugin in these game modes.\nGame mode limit: 64\nCharacter limit for each game mode: 32\n(Empty: None)\n(Not empty: Disabled in these game modes.)"); g_cvNFFEnabledGameModes = CreateConVar("nff_enabledgamemodes", "", "Enable the plugin in these game modes.\nGame mode limit: 64\nCharacter limit for each game mode: 32\n(Empty: None)\n(Not empty: Enabled in these game modes.)"); g_cvNFFEnable = CreateConVar("nff_enable", "1", "Enable the plugin?\n(0: OFF)\n(1: ON)"); + g_cvNFFEasy = FindConVar("survivor_friendly_fire_factor_easy"); + g_cvNFFExpert = FindConVar("survivor_friendly_fire_factor_expert"); + g_cvNFFGameMode = FindConVar("mp_gamemode"); + g_cvNFFGLScale = FindConVar("grenadelauncher_ff_scale"); + g_cvNFFGLScaleSelf = FindConVar("grenadelauncher_ff_scale_self"); + g_cvNFFNormal = FindConVar("survivor_friendly_fire_factor_normal"); CreateConVar("nff_pluginversion", NFF_VERSION, "No Friendly Fire version", FCVAR_NOTIFY|FCVAR_DONTRECORD); g_cvNFFDisabledGameModes.AddChangeHook(vNFFCvarChanges); g_cvNFFEnabledGameModes.AddChangeHook(vNFFCvarChanges); @@ -51,34 +73,34 @@ void vChangeCvars() { if (g_cvNFFEnable.BoolValue && bIsSystemValid()) { - FindConVar("survivor_friendly_fire_factor_easy").SetString("0"); - FindConVar("survivor_friendly_fire_factor_normal").SetString("0"); - FindConVar("survivor_friendly_fire_factor_hard").SetString("0"); - FindConVar("survivor_friendly_fire_factor_expert").SetString("0"); - FindConVar("survivor_burn_factor_easy").SetString("0"); - FindConVar("survivor_burn_factor_normal").SetString("0"); - FindConVar("survivor_burn_factor_hard").SetString("0"); - FindConVar("survivor_burn_factor_expert").SetString("0"); + g_cvNFFEasy.SetString("0"); + g_cvNFFNormal.SetString("0"); + g_cvNFFAdvanced.SetString("0"); + g_cvNFFExpert.SetString("0"); + g_cvNFFBurnEasy.SetString("0"); + g_cvNFFBurnNormal.SetString("0"); + g_cvNFFBurnAdvanced.SetString("0"); + g_cvNFFBurnExpert.SetString("0"); if (bIsL4D2Game()) { - FindConVar("grenadelauncher_ff_scale").SetString("0"); - FindConVar("grenadelauncher_ff_scale_self").SetString("0"); + g_cvNFFGLScale.SetString("0"); + g_cvNFFGLScaleSelf.SetString("0"); } } else if (!g_cvNFFEnable.BoolValue || !bIsSystemValid()) { - FindConVar("survivor_friendly_fire_factor_easy").SetString("0"); - FindConVar("survivor_friendly_fire_factor_normal").SetString("0.1"); - FindConVar("survivor_friendly_fire_factor_hard").SetString("0.3"); - FindConVar("survivor_friendly_fire_factor_expert").SetString("0.5"); - FindConVar("survivor_burn_factor_easy").SetString("0.2"); - FindConVar("survivor_burn_factor_normal").SetString("0.2"); - FindConVar("survivor_burn_factor_hard").SetString("0.4"); - FindConVar("survivor_burn_factor_expert").SetString("1"); + g_cvNFFEasy.SetString("0"); + g_cvNFFNormal.SetString("0.1"); + g_cvNFFAdvanced.SetString("0.3"); + g_cvNFFExpert.SetString("0.5"); + g_cvNFFBurnEasy.SetString("0.2"); + g_cvNFFBurnNormal.SetString("0.2"); + g_cvNFFBurnAdvanced.SetString("0.4"); + g_cvNFFBurnExpert.SetString("1"); if (bIsL4D2Game()) { - FindConVar("grenadelauncher_ff_scale").SetString("0.12"); - FindConVar("grenadelauncher_ff_scale_self").SetString("0.12"); + g_cvNFFGLScale.SetString("0.12"); + g_cvNFFGLScaleSelf.SetString("0.12"); } } } @@ -92,26 +114,26 @@ stock bool bIsL4D2Game() stock bool bIsSystemValid() { char sGameMode[32]; - char sConVarModes[2049]; - char sModeName[64][32]; - FindConVar("mp_gamemode").GetString(sGameMode, sizeof(sGameMode)); + char sConVarModes[32]; + g_cvNFFGameMode.GetString(sGameMode, sizeof(sGameMode)); + Format(sGameMode, sizeof(sGameMode), ",%s,", sGameMode); g_cvNFFEnabledGameModes.GetString(sConVarModes, sizeof(sConVarModes)); - ExplodeString(sConVarModes, ",", sModeName, sizeof(sModeName), sizeof(sModeName[])); - for (int iMode = 0; iMode < sizeof(sModeName); iMode++) + if (strcmp(sConVarModes, "")) { - if (StrContains(sGameMode, sModeName[iMode], false) != -1 && sModeName[iMode][0] != '\0') + Format(sConVarModes, sizeof(sConVarModes), ",%s,", sConVarModes); + if (StrContains(sConVarModes, sGameMode, false) == -1) { - return true; + return false; } } g_cvNFFDisabledGameModes.GetString(sConVarModes, sizeof(sConVarModes)); - ExplodeString(sConVarModes, ",", sModeName, sizeof(sModeName), sizeof(sModeName[])); - for (int iMode = 0; iMode < sizeof(sModeName); iMode++) + if (strcmp(sConVarModes, "")) { - if (StrContains(sGameMode, sModeName[iMode], false) == -1 && sModeName[iMode][0] != '\0') + Format(sConVarModes, sizeof(sConVarModes), ",%s,", sConVarModes); + if (StrContains(sConVarModes, sGameMode, false) != -1) { - return true; + return false; } } - return false; + return true; } \ No newline at end of file