From 2f320af519fb31f9fdaba4ae524805c57c7e0707 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sun, 20 Mar 2022 13:54:05 -0500 Subject: [PATCH] Remove server settings flag keys --- scripts/server/bitflag.js | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/scripts/server/bitflag.js b/scripts/server/bitflag.js index cf97f612..212899c9 100644 --- a/scripts/server/bitflag.js +++ b/scripts/server/bitflag.js @@ -21,7 +21,6 @@ let serverBitFlags = { npcTriggerTypeFlags: {}, npcTriggerConditionTypesFlags: {}, npcTriggerResponseTypeFlags: {}, - serverSettings: {} }; // =========================================================================== @@ -119,6 +118,8 @@ let serverBitFlagKeys = { "NoRandomTips", "NoActionTips", ], + + // Not going to be used. Use trigger, condition, and response stuff in trigger.js npcTriggerTypeKeys: [ "None", "FarProximity", // Comes within a far distance of NPC @@ -219,26 +220,6 @@ let serverBitFlagKeys = { "ShowItemsAfterPurchase", "BuyCommandAfterEnterBusiness", ], - serverSettingsKeys: [ - "None", - "GUI", - "ServerLogo", - "FallingSnow", - "GroundSnow", - "Anticheat", - "CheckGameScripts", - "GameScriptBlackList", - "GameScriptWhiteList", - "JobBlips", - "JobPickups", - "BusinessBlips", - "BusinessPickups", - "HouseBlips", - "HousePickups", - "DiscordBot", - "RealTime", - "Testing", - ], }; // =========================================================================== @@ -255,7 +236,6 @@ function initBitFlagScript() { serverBitFlags.npcTriggerTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerTypeKeys); serverBitFlags.npcTriggerConditionTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerConditionTypeKeys); serverBitFlags.npcTriggerResponseTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerResponseTypeKeys); - serverBitFlags.serverSettings = createBitFlagTable(serverBitFlagKeys.serverSettingsKeys); logToConsole(LOG_INFO, "[VRR.BitFlag]: Bit flag script initialized successfully!"); return true; } @@ -410,20 +390,6 @@ function getModerationFlagValue(flagName) { // =========================================================================== -function getServerSettingsFlagValue(flagName) { - if(flagName == "All") { - return -1; - } - - if(typeof serverBitFlags.serverSettings[flagName] == "undefined") { - return false; - } - - return serverBitFlags.serverSettings[flagName]; -} - -// =========================================================================== - function givePlayerStaffFlag(client, flagName) { if(!getStaffFlagValue(flagName)) { return false;