From 8e96b01cebb4bd937181db4b0caf392b05452d70 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Mon, 21 Mar 2022 10:31:03 -0500 Subject: [PATCH] Comments and organization --- scripts/client/gui.js | 15 --------------- scripts/client/job.js | 1 + scripts/shared/const.js | 2 +- scripts/shared/gamedata.js | 9 +++++++++ scripts/shared/utilities.js | 19 ++++++++++++++++++- 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/scripts/client/gui.js b/scripts/client/gui.js index 676fde38..52b88f8b 100644 --- a/scripts/client/gui.js +++ b/scripts/client/gui.js @@ -37,21 +37,6 @@ let guiDownKey = false; // =========================================================================== -let placesOfOrigin = [ - "Liberty City", - "Vice City", - "Los Santos", - "San Fierro", - "Las Venturas", - "San Andreas", - "Blaine County", - "Red County", - "Bone County", - "Other", -]; - -// =========================================================================== - let characterData = []; let currentCharacter = 0; diff --git a/scripts/client/job.js b/scripts/client/job.js index ce5575da..f9b057ca 100644 --- a/scripts/client/job.js +++ b/scripts/client/job.js @@ -53,6 +53,7 @@ function showJobRouteLocation(position, colour) { logToConsole(LOG_DEBUG, `[VRR.Job] Showing job route location`); if(getMultiplayerMod() == VRR_MPMOD_GTAC) { if(game.game == VRR_GAME_GTA_SA) { + // Server-side spheres don't show in GTA SA for some reason. jobRouteLocationSphere = game.createPickup(1318, position, 1); } else { jobRouteLocationSphere = game.createSphere(position, 3); diff --git a/scripts/shared/const.js b/scripts/shared/const.js index 0c4c18ce..3f0f0fc5 100644 --- a/scripts/shared/const.js +++ b/scripts/shared/const.js @@ -3,7 +3,7 @@ // https://github.com/VortrexFTW/gtac_roleplay // =========================================================================== // FILE: const.js -// DESC: Provides constants +// DESC: Provides shared constants // TYPE: Shared (JavaScript) // =========================================================================== diff --git a/scripts/shared/gamedata.js b/scripts/shared/gamedata.js index 54038dcd..39c746de 100644 --- a/scripts/shared/gamedata.js +++ b/scripts/shared/gamedata.js @@ -1,6 +1,14 @@ // =========================================================================== +// Vortrex's Roleplay Resource +// https://github.com/VortrexFTW/gtac_roleplay +// =========================================================================== +// FILE: gamedata.js +// DESC: Provides arrays of game data +// TYPE: Shared (JavaScript) +// =========================================================================== let supportedFeatures = { + // Invalid, GTAIII, GTAVC, GTASA, Invalid, GTAIV, Invalid, Invalid, Invalid, M1, M2, M3, M1DE time: [null, true, true, true, false, true, true, null, null, null, false, false, false, false], weather: [null, true, true, true, false, true, true, null, null, null, false, false, false, false], serverElements: [null, true, true, true, false, false, false, null, null, null, true, true, true, true], @@ -18,6 +26,7 @@ let supportedFeatures = { // =========================================================================== +// Connected MP mods only let extraContentResource = [ "", "connectedrp-gta3", diff --git a/scripts/shared/utilities.js b/scripts/shared/utilities.js index cfce224a..fae48e45 100644 --- a/scripts/shared/utilities.js +++ b/scripts/shared/utilities.js @@ -2,7 +2,7 @@ // Vortrex's Roleplay Resource // https://github.com/VortrexFTW/gtac_roleplay // =========================================================================== -// FILE: v.js +// FILE: utilities.js // DESC: Provides shared utilities // TYPE: Shared (JavaScript) // =========================================================================== @@ -267,6 +267,8 @@ let serverColours = { }, }; +// =========================================================================== + let serverEmoji = [ [":hash:", "#"], [":zero:", "0"], @@ -1125,6 +1127,21 @@ let serverEmoji = [ // =========================================================================== +let placesOfOrigin = [ + "Liberty City", + "Vice City", + "Los Santos", + "San Fierro", + "Las Venturas", + "San Andreas", + "Blaine County", + "Red County", + "Bone County", + "Other", +]; + +// =========================================================================== + function getGameConfig() { return gameData; }