From cf9ecf7a8a24825b0fc01ae7e0c7850824726f11 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 13 Dec 2021 20:43:28 -0600
Subject: [PATCH] Add AC game script admin cmds

---
 scripts/server/anticheat.js | 164 +++++++++++++++++++++++++++++++++++-
 scripts/server/command.js   |  12 +--
 scripts/server/config.js    |  40 ---------
 3 files changed, 169 insertions(+), 47 deletions(-)

diff --git a/scripts/server/anticheat.js b/scripts/server/anticheat.js
index 8f197d0e..6c04c2f6 100644
--- a/scripts/server/anticheat.js
+++ b/scripts/server/anticheat.js
@@ -74,4 +74,166 @@ function clearPlayerStateToEnterExitProperty(client) {
 	}
 }
 
-// ===========================================================================
\ No newline at end of file
+// ===========================================================================
+
+/**
+ * This is a command handler function.
+ *
+ * @param {string} command - The command name used by the player
+ * @param {string} params - The parameters/args string used with the command by the player
+ * @param {Client} client - The client/player that used the command
+ * @return {bool} Whether or not the command was successful
+ *
+ */
+ function addAntiCheatBlackListedScriptCommand(command, params, client) {
+	if(areParamsEmpty(params)) {
+		messagePlayerSyntax(client, getCommandSyntaxText(command));
+		return false;
+	}
+
+    let scriptName = params;
+    let tempBlackListedGameScriptData = new BlackListedGameScriptData(false);
+    tempBlackListedGameScriptData.scriptName = scriptName;
+    tempBlackListedGameScriptData.serverId = getServerId();
+    tempBlackListedGameScriptData.enabled = true;
+	tempBlackListedGameScriptData.needsSaved = true;
+	getServerConfig().antiCheat.blackListedGameScripts.push(tempBlackListedGameScriptData);
+
+    if(getServerConfig().antiCheat.gameScriptBlackListEnabled) {
+        sendPlayerGameScriptState(null, scriptName, VRR_GAMESCRIPT_DENY);
+    }
+
+	messagePlayerSuccess(client, `You added {ALTCOLOUR}${scriptName} {MAINCOLOUR} to the anticheat game script blacklist`);
+	return true;
+}
+
+// ===========================================================================
+
+/**
+ * This is a command handler function.
+ *
+ * @param {string} command - The command name used by the player
+ * @param {string} params - The parameters/args string used with the command by the player
+ * @param {Client} client - The client/player that used the command
+ * @return {bool} Whether or not the command was successful
+ *
+ */
+ function addAntiCheatWhiteListedScriptCommand(command, params, client) {
+	if(areParamsEmpty(params)) {
+		messagePlayerSyntax(client, getCommandSyntaxText(command));
+		return false;
+	}
+
+    let scriptName = params;
+    let tempWhiteListedGameScriptData = new WhiteListedGameScriptData(false);
+    tempWhiteListedGameScriptData.scriptName = scriptName;
+    tempWhiteListedGameScriptData.serverId = getServerId();
+    tempWhiteListedGameScriptData.enabled = true;
+	tempWhiteListedGameScriptData.needsSaved = true;
+	getServerConfig().antiCheat.whiteListedGameScripts.push(tempWhiteListedGameScriptData);
+
+    if(getServerConfig().antiCheat.gameScriptWhiteListEnabled) {
+        sendPlayerGameScriptState(null, scriptName, VRR_GAMESCRIPT_ALLOW);
+    }
+
+	messagePlayerSuccess(client, `You added {ALTCOLOUR}${scriptName} {MAINCOLOUR} to the anticheat game script whitelist`);
+	return true;
+}
+
+// ===========================================================================
+
+/**
+ * This is a command handler function.
+ *
+ * @param {string} command - The command name used by the player
+ * @param {string} params - The parameters/args string used with the command by the player
+ * @param {Client} client - The client/player that used the command
+ * @return {bool} Whether or not the command was successful
+ *
+ */
+ function removeAntiCheatWhiteListedScriptCommand(command, params, client) {
+	if(areParamsEmpty(params)) {
+		messagePlayerSyntax(client, getCommandSyntaxText(command));
+		return false;
+	}
+
+    let whiteListScriptId = getAntiCheatWhiteListedScriptFromParams(params);
+
+	getServerConfig().antiCheat.whiteListedGameScripts.splice(whiteListScriptId, 1);
+
+    if(getServerConfig().antiCheat.gameScriptWhiteListEnabled) {
+        sendPlayerGameScriptState(null, scriptName, VRR_GAMESCRIPT_NONE);
+    }
+
+	messagePlayerSuccess(client, `You removed {ALTCOLOUR}${scriptName} {MAINCOLOUR} from the anticheat game script whitelist`);
+	return true;
+}
+
+// ===========================================================================
+
+/**
+ * This is a command handler function.
+ *
+ * @param {string} command - The command name used by the player
+ * @param {string} params - The parameters/args string used with the command by the player
+ * @param {Client} client - The client/player that used the command
+ * @return {bool} Whether or not the command was successful
+ *
+ */
+ function removeAntiCheatBlackListedScriptCommand(command, params, client) {
+	if(areParamsEmpty(params)) {
+		messagePlayerSyntax(client, getCommandSyntaxText(command));
+		return false;
+	}
+
+    let blackListScriptId = getAntiCheatBlackListedScriptFromParams(params);
+
+	getServerConfig().antiCheat.blackListedGameScripts.splice(blackListScriptId, 1);
+
+    if(getServerConfig().antiCheat.gameScriptBlackListEnabled) {
+        sendPlayerGameScriptState(null, scriptName, VRR_GAMESCRIPT_NONE);
+    }
+
+	messagePlayerSuccess(client, `You removed {ALTCOLOUR}${scriptName} {MAINCOLOUR} from the anticheat game script blacklist`);
+	return true;
+}
+
+// ===========================================================================
+
+/**
+ * This is a command handler function.
+ *
+ * @param {string} command - The command name used by the player
+ * @param {string} params - The parameters/args string used with the command by the player
+ * @param {Client} client - The client/player that used the command
+ * @return {bool} Whether or not the command was successful
+ *
+ */
+ function toggleAntiCheatScriptWhiteListCommand(command, params, client) {
+	getServerConfig().antiCheat.gameScriptWhiteListEnabled = !getServerConfig().antiCheat.gameScriptWhiteListEnabled;
+	getServerConfig().needsSaved = true;
+
+    messageAdminAction(`${getPlayerName(client)} {MAINCOLOUR}turned anticheat game script whitelist ${getBoolRedGreenInlineColour(getServerConfig().antiCheat.gameScriptWhiteListEnabled)}${toUpperCase(getOnOffFromBool(getServerConfig().antiCheat.gameScriptWhiteListEnabled))}`);
+    updateServerRules();
+	return true;
+}
+
+// ===========================================================================
+
+/**
+ * This is a command handler function.
+ *
+ * @param {string} command - The command name used by the player
+ * @param {string} params - The parameters/args string used with the command by the player
+ * @param {Client} client - The client/player that used the command
+ * @return {bool} Whether or not the command was successful
+ *
+ */
+function toggleAntiCheatScriptBlackListCommand(command, params, client) {
+	getServerConfig().antiCheat.gameScriptBlackListEnabled = !getServerConfig().antiCheat.gameScriptBlackListEnabled;
+	getServerConfig().needsSaved = true;
+
+    messageAdminAction(`${getPlayerName(client)} {MAINCOLOUR}turned anticheat game script blacklist ${getBoolRedGreenInlineColour(getServerConfig().antiCheat.gameScriptBlackListEnabled)}${toUpperCase(getOnOffFromBool(getServerConfig().antiCheat.gameScriptBlackListEnabled))}`);
+    updateServerRules();
+	return true;
+}
\ No newline at end of file
diff --git a/scripts/server/command.js b/scripts/server/command.js
index b4458ed6..ef575bcd 100644
--- a/scripts/server/command.js
+++ b/scripts/server/command.js
@@ -68,12 +68,12 @@ function loadCommands() {
             commandData("stopanim", stopPlayerAnimationCommand, "", getStaffFlagValue("None"), true, true, "Stops your current animation"),
         ],
         antiCheat: [
-            //commandData("addacscriptwl", addAntiCheatWhiteListedScriptCommand, "<script name>", getStaffFlagValue("Developer"), true, true),
-            //commandData("delacscriptwl", removeAntiCheatWhiteListedScriptCommand, "<script name>", getStaffFlagValue("Developer"), true, true),
-            //commandData("addacscriptbl", addAntiCheatBlackListedScriptCommand, "<script name>", getStaffFlagValue("Developer"), true, true),
-            //commandData("delacscriptbl", removeAntiCheatBlackListedScriptCommand, "<script name>", getStaffFlagValue("Developer"), true, true),
-            //commandData("setacscriptbl", toggleAntiCheatScriptBlackListCommand, "<0/1 state>", getStaffFlagValue("Developer"), true, true),
-            //commandData("setacscriptwl", toggleAntiCheatScriptWhiteListCommand, "<0/1 state>", getStaffFlagValue("Developer"), true, true),
+            commandData("addacscriptwl", addAntiCheatWhiteListedScriptCommand, "<script name>", getStaffFlagValue("Developer"), true, true),
+            commandData("delacscriptwl", removeAntiCheatWhiteListedScriptCommand, "<script name>", getStaffFlagValue("Developer"), true, true),
+            commandData("addacscriptbl", addAntiCheatBlackListedScriptCommand, "<script name>", getStaffFlagValue("Developer"), true, true),
+            commandData("delacscriptbl", removeAntiCheatBlackListedScriptCommand, "<script name>", getStaffFlagValue("Developer"), true, true),
+            commandData("setacscriptbl", toggleAntiCheatScriptBlackListCommand, "<0/1 state>", getStaffFlagValue("Developer"), true, true),
+            commandData("setacscriptwl", toggleAntiCheatScriptWhiteListCommand, "<0/1 state>", getStaffFlagValue("Developer"), true, true),
             //commandData("setac", toggleGlobalAntiCheatCommand, "<0/1 state>", getStaffFlagValue("Developer"), true, true),
             //commandData("ac", getGlobalAntiCheatStatusCommand, "<0/1 state>", getStaffFlagValue("Developer"), true, true),
         ],
diff --git a/scripts/server/config.js b/scripts/server/config.js
index a11f6858..78cd89a2 100644
--- a/scripts/server/config.js
+++ b/scripts/server/config.js
@@ -609,46 +609,6 @@ function toggleServerLogoCommand(command, params, client) {
 
 // ===========================================================================
 
-/**
- * This is a command handler function.
- *
- * @param {string} command - The command name used by the player
- * @param {string} params - The parameters/args string used with the command by the player
- * @param {Client} client - The client/player that used the command
- * @return {bool} Whether or not the command was successful
- *
- */
-function toggleAntiCheatScriptWhitelist(command, params, client) {
-	getServerConfig().antiCheat.gameScriptWhiteListEnabled = !getServerConfig().antiCheat.gameScriptWhiteListEnabled;
-	getServerConfig().needsSaved = true;
-
-    messageAdminAction(`${getPlayerName(client)} {MAINCOLOUR}turned anticheat game script whitelist ${getBoolRedGreenInlineColour(getServerConfig().antiCheat.gameScriptWhiteListEnabled)}${toUpperCase(getOnOffFromBool(getServerConfig().antiCheat.gameScriptWhiteListEnabled))}`);
-    updateServerRules();
-	return true;
-}
-
-// ===========================================================================
-
-/**
- * This is a command handler function.
- *
- * @param {string} command - The command name used by the player
- * @param {string} params - The parameters/args string used with the command by the player
- * @param {Client} client - The client/player that used the command
- * @return {bool} Whether or not the command was successful
- *
- */
-function toggleAntiCheatScriptBlacklist(command, params, client) {
-	getServerConfig().antiCheat.gameScriptBlackListEnabled = !getServerConfig().antiCheat.gameScriptBlackListEnabled;
-	getServerConfig().needsSaved = true;
-
-    messageAdminAction(`${getPlayerName(client)} {MAINCOLOUR}turned anticheat game script blacklist ${getBoolRedGreenInlineColour(getServerConfig().antiCheat.gameScriptBlackListEnabled)}${toUpperCase(getOnOffFromBool(getServerConfig().antiCheat.gameScriptBlackListEnabled))}`);
-    updateServerRules();
-	return true;
-}
-
-// ===========================================================================
-
 /**
  * This is a command handler function.
  *