From dccf8d961d74435eb934c32d61fc1d6d32283de8 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 12:02:21 -0600 Subject: [PATCH 01/34] Add radar and area name to hud state --- scripts/client/server.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/client/server.js b/scripts/client/server.js index db892867..7146c918 100644 --- a/scripts/client/server.js +++ b/scripts/client/server.js @@ -139,6 +139,8 @@ function setPlayer2DRendering(hudState, labelState, smallGameMessageState, score natives.displayCash(hudState); natives.displayAmmo(hudState); natives.displayHud(hudState); + natives.displayRadar(hudState); + natives.displayAreaName(hudState); } else { if(typeof setHUDEnabled != "undefined") { setHUDEnabled(hudState); From 8d1a5c81ea75de9061a9adb8bd720e34f30511bf Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 12:02:33 -0600 Subject: [PATCH 02/34] Remove HUD stuff from initial game setup --- scripts/client/startup.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/client/startup.js b/scripts/client/startup.js index e2685005..549d2483 100644 --- a/scripts/client/startup.js +++ b/scripts/client/startup.js @@ -121,12 +121,12 @@ function setUpInitialGame() { natives.setPickupsFixCars(false); // HUD and Display - natives.displayCash(false); - natives.displayAmmo(false); - natives.displayHud(false); - natives.displayRadar(false); - natives.displayAreaName(false); - natives.displayPlayerNames(false); + //natives.displayCash(false); + //natives.displayAmmo(false); + //natives.displayHud(false); + //natives.displayRadar(false); + //natives.displayAreaName(false); + //natives.displayPlayerNames(false); natives.setPoliceRadarBlips(false); natives.removeTemporaryRadarBlipsForPickups(); natives.displayNonMinigameHelpMessages(false); From 22ecb9ea50c7da58f3fe47d0ab05f4f4b62b1f16 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 12:02:43 -0600 Subject: [PATCH 03/34] Cleanup --- scripts/server/account.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/server/account.js b/scripts/server/account.js index 87be5779..549fcdff 100644 --- a/scripts/server/account.js +++ b/scripts/server/account.js @@ -1126,6 +1126,7 @@ function initClient(client) { updatePlayerSnowState(client); showConnectCameraToPlayer(client); + messageClient(`Please wait ...`, client, getColourByName("softGreen")); setTimeout(function() { From ac59e8d9b3d0da76384729f25b90eebc27c77c8f Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 12:02:55 -0600 Subject: [PATCH 04/34] Set rendering states on connect camera --- scripts/server/utilities.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/server/utilities.js b/scripts/server/utilities.js index 92917103..b4f71220 100644 --- a/scripts/server/utilities.js +++ b/scripts/server/utilities.js @@ -283,6 +283,7 @@ function showConnectCameraToPlayer(client) { //setPlayerDimension(client, 0); setPlayerCameraLookAt(client, getServerConfig().connectCameraPosition, getServerConfig().connectCameraLookAt); } + setPlayer2DRendering(client, false, false, false, false, false, false); } // =========================================================================== From 2d12b7f30771497ed35d6a8a7b21d01bb7a67b5b Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 12:52:24 -0600 Subject: [PATCH 05/34] Fix IV businesses --- scripts/client/business.js | 30 ++++++++++++++++++++++++++---- scripts/client/main.js | 6 +++--- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/scripts/client/business.js b/scripts/client/business.js index 245826e2..10fb2e10 100644 --- a/scripts/client/business.js +++ b/scripts/client/business.js @@ -8,8 +8,9 @@ // =========================================================================== class BusinessData { - constructor(index, name, entrancePosition, blipModel, pickupModel, hasInterior, hasItems) { - this.index = index; + constructor(businessId, name, entrancePosition, blipModel, pickupModel, hasInterior, hasItems) { + this.index = -1; + this.businessId = businessId; this.name = name; this.entrancePosition = entrancePosition; this.blipModel = blipModel; @@ -28,6 +29,7 @@ function receiveBusinessFromServer(businessId, name, entrancePosition, blipModel if(blipModel == -1) { natives.removeBlipAndClearIndex(getBusinessData(businessId).blipId); businesses.splice(getBusinessData(businessId).index, 1); + setAllBusinessDataIndexes(); } else { natives.setBlipCoordinates(getBusinessData(businessId).blipId, getBusinessData(businessId).entrancePosition); natives.changeBlipSprite(getBusinessData(businessId).blipId, getBusinessData(businessId).blipModel); @@ -35,18 +37,38 @@ function receiveBusinessFromServer(businessId, name, entrancePosition, blipModel } } else { if(blipModel != -1) { + let tempBusinessData = new BusinessData(businessId, name, entrancePosition, blipModel, pickupModel, hasInterior, hasItems); let blipId = natives.addBlipForCoord(entrancePosition); if(blipId) { - let tempBusinessData = new BusinessData(businessId, name, entrancePosition, blipModel, pickupModel, hasInterior, hasItems); tempBusinessData.blipId = blipId; natives.changeBlipSprite(blipId, blipModel); natives.setBlipMarkerLongDistance(blipId, true); natives.changeBlipNameFromAscii(blipId, `${name.substr(0, 24)}${(name.length > 24) ? " ...": ""}`); - businesses.push(tempBusinessData); } + businesses.push(tempBusinessData); + setAllBusinessDataIndexes(); } } } } +// =========================================================================== + +/** + * @param {number} businessId - The ID of the business (initially provided by server) + * @return {BusinessData} The business's data (class instance) + */ +function getBusinessData(businessId) { + let tempBusinessData = businesses.find((b) => b.businessId == businessId); + return (typeof tempBusinessData != "undefined") ? tempBusinessData : false; +} + +// =========================================================================== + +function setAllBusinessDataIndexes() { + for(let i in businesses) { + businesses[i].index = i; + } +} + // =========================================================================== \ No newline at end of file diff --git a/scripts/client/main.js b/scripts/client/main.js index 7e56d8ce..6c1719b9 100644 --- a/scripts/client/main.js +++ b/scripts/client/main.js @@ -69,8 +69,8 @@ let forceWantedLevel = 0; // Pre-cache all allowed skins let allowedSkins = getAllowedSkins(getGame()); -let businesses = {}; -let houses = {}; -let jobs = {}; +let businesses = []; +let houses = []; +let jobs = []; // =========================================================================== \ No newline at end of file From cdc54be6925df4935973327d7cdb8246470a2f32 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 12:55:57 -0600 Subject: [PATCH 06/34] Fix wrong arg in parked car native --- scripts/client/startup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/client/startup.js b/scripts/client/startup.js index 549d2483..58d85b31 100644 --- a/scripts/client/startup.js +++ b/scripts/client/startup.js @@ -140,7 +140,7 @@ function setUpInitialGame() { // Population natives.dontSuppressAnyCarModels(5.0); natives.dontSuppressAnyPedModels(5.0); - natives.forceGenerateParkedCarsTooCloseToOthers(5.0); + natives.forceGenerateParkedCarsTooCloseToOthers(true); natives.setParkedCarDensityMultiplier(5.0); natives.setRandomCarDensityMultiplier(5.0); natives.setPedDensityMultiplier(5.0); From 1039ac8cfd8abc6f4a1a707cba91dc7cceaf9172 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 12:56:12 -0600 Subject: [PATCH 07/34] Fix wrong delimiter used in some staff cmd args --- scripts/server/staff.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/server/staff.js b/scripts/server/staff.js index adc48e5c..e0946934 100644 --- a/scripts/server/staff.js +++ b/scripts/server/staff.js @@ -46,7 +46,7 @@ function setStaffTitleCommand(command, params, client) { return false; } - let splitParams = params.split(""); + let splitParams = params.split(" "); let targetClient = getPlayerFromParams(getParam(params, " ", 1)); let staffTitle = splitParams.slice(1).join(" "); @@ -999,20 +999,16 @@ function forcePlayerSkinCommand(command, params, client) { // return false; //} - let splitParams = params.split(""); + let splitParams = params.split(" "); let targetClient = getPlayerFromParams(splitParams[0]); let skinIndex = getSkinModelIndexFromParams(splitParams.slice(1).join(" "), getGame()); - console.warn(targetClient.name); - console.warn(splitParams.slice(1).join(" ")); - console.warn(skinIndex); - if(!targetClient) { messagePlayerError(client, getLocaleString(client, "InvalidPlayer")); return false; } - if(skinIndex == false) { + if(!skinIndex) { messagePlayerError(client, getLocaleString(client, "InvalidSkin")); return false; } @@ -1036,7 +1032,7 @@ function setPlayerHealthCommand(command, params, client) { // return false; //} - let splitParams = params.split(""); + let splitParams = params.split(" "); let targetClient = getParam(params, " ", 1); let health = getParam(params, " ", 2); From 48ae78084e53e9ff5c9b5fb70fc80c9f08010c78 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 15:01:11 -0600 Subject: [PATCH 08/34] Disable skin change --- scripts/client/server.js | 5 +++-- scripts/client/skin-select.js | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/client/server.js b/scripts/client/server.js index 7146c918..2bd4bf32 100644 --- a/scripts/client/server.js +++ b/scripts/client/server.js @@ -303,8 +303,9 @@ function setLocalPlayerInfiniteRun(state) { function setLocalPlayerSkin(skinId) { if(getGame() == VRR_GAME_GTA_IV) { - //natives.changePlayerModel(natives.getPlayerId(), skinId); - localPlayer.skin = allowedSkins[skinSelectorIndex][0]; + natives.changePlayerModel(natives.getPlayerId(), skinId); + //localPlayer.skin = allowedSkins[skinSelectorIndex][0]; + //localPlayer.modelIndex = allowedSkins[skinSelectorIndex][0]; } else { localPlayer.skin = skinId; } diff --git a/scripts/client/skin-select.js b/scripts/client/skin-select.js index 2f3149e7..2b361383 100644 --- a/scripts/client/skin-select.js +++ b/scripts/client/skin-select.js @@ -55,7 +55,8 @@ function processSkinSelectKeyPress(keyCode) { skinSelectMessageTextTop = allowedSkins[skinSelectorIndex][1]; if(getGame() == VRR_GAME_GTA_IV) { //natives.changePlayerModel(natives.getPlayerId(), allowedSkins[skinSelectorIndex][0]); - localPlayer.skin = allowedSkins[skinSelectorIndex][0]; + //localPlayer.skin = allowedSkins[skinSelectorIndex][0]; + //localPlayer.modelIndex = allowedSkins[skinSelectorIndex][0]; } else { localPlayer.skin = allowedSkins[skinSelectorIndex][0]; } @@ -69,7 +70,8 @@ function processSkinSelectKeyPress(keyCode) { skinSelectMessageTextTop = allowedSkins[skinSelectorIndex][1]; if(getGame() == VRR_GAME_GTA_IV) { //natives.changePlayerModel(natives.getPlayerId(), allowedSkins[skinSelectorIndex][0]); - localPlayer.skin = allowedSkins[skinSelectorIndex][0]; + //localPlayer.skin = allowedSkins[skinSelectorIndex][0]; + //localPlayer.modelIndex = allowedSkins[skinSelectorIndex][0]; } else { localPlayer.skin = allowedSkins[skinSelectorIndex][0]; } From 9ce663c1cdc6812b3316e3f26e91e89612f39073 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 15:01:22 -0600 Subject: [PATCH 09/34] Don't set population stuff --- scripts/client/startup.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/client/startup.js b/scripts/client/startup.js index 58d85b31..bd38327f 100644 --- a/scripts/client/startup.js +++ b/scripts/client/startup.js @@ -138,14 +138,14 @@ function setUpInitialGame() { natives.setPlayersDropMoneyInNetworkGame(false); // Population - natives.dontSuppressAnyCarModels(5.0); - natives.dontSuppressAnyPedModels(5.0); - natives.forceGenerateParkedCarsTooCloseToOthers(true); - natives.setParkedCarDensityMultiplier(5.0); - natives.setRandomCarDensityMultiplier(5.0); - natives.setPedDensityMultiplier(5.0); - natives.setCarDensityMultiplier(5.0); - natives.setScenarioPedDensityMultiplier(5.0, 5.0); + //natives.dontSuppressAnyCarModels(5.0); + //natives.dontSuppressAnyPedModels(5.0); + //natives.forceGenerateParkedCarsTooCloseToOthers(true); + //natives.setParkedCarDensityMultiplier(5.0); + //natives.setRandomCarDensityMultiplier(5.0); + //natives.setPedDensityMultiplier(5.0); + //natives.setCarDensityMultiplier(5.0); + //natives.setScenarioPedDensityMultiplier(5.0, 5.0); natives.switchRandomTrains(true); natives.switchRandomBoats(true); natives.switchAmbientPlanes(true); From dfb0578044fa130b01a01ea11e24d17663951baf Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 15:01:30 -0600 Subject: [PATCH 10/34] Fix for server settings --- scripts/server/config.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/server/config.js b/scripts/server/config.js index 815f7df1..829c0be9 100644 --- a/scripts/server/config.js +++ b/scripts/server/config.js @@ -84,6 +84,22 @@ function initConfigScript() { serverConfig = loadServerConfigFromGameAndPort(server.game, server.port, getMultiplayerMod()); logToConsole(LOG_DEBUG, "[VRR.Config]: Applying server config ..."); + + getServerConfig().fallingSnow = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("FallingSnow")); + getServerConfig().groundSnow = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("GroundSnow")); + getServerConfig().useGUI = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("GUI")); + getServerConfig().showLogo = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("Logo")); + getServerConfig().testerOnly = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("Testing")); + getServerConfig().discordEnabled = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("DiscordBot")); + getServerConfig().createJobPickups = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("JobPickups")); + getServerConfig().createBusinessPickups = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("BusinessPickups")); + getServerConfig().createHousePickups = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("HousePickups")); + getServerConfig().createJobBlips = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("JobBlips")); + getServerConfig().createBusinessBlips = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("BusinessBlips")); + getServerConfig().createHouseBlips = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("HouseBlips")); + getServerConfig().useRealTime = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("RealTime")); + getServerConfig().antiCheat.enabled = hasBitFlag(getServerConfig().settings, getServerSettingsFlagValue("Anticheat")); + applyConfigToServer(serverConfig); logToConsole(LOG_DEBUG, "[VRR.Config]: All config loaded and applied successfully!"); @@ -131,22 +147,6 @@ function loadServerConfigFromId(tempServerId) { if(dbQuery.numRows > 0) { let dbAssoc = fetchQueryAssoc(dbQuery); let tempServerConfigData = new ServerData(dbAssoc); - - tempServerConfigData.fallingSnow = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("FallingSnow")); - tempServerConfigData.groundSnow = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("GroundSnow")); - tempServerConfigData.useGUI = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("GUI")); - tempServerConfigData.showLogo = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("Logo")); - tempServerConfigData.testerOnly = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("Testing")); - tempServerConfigData.discordEnabled = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("DiscordBot")); - tempServerConfigData.createJobPickups = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("JobPickups")); - tempServerConfigData.createBusinessPickups = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("BusinessPickups")); - tempServerConfigData.createHousePickups = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("HousePickups")); - tempServerConfigData.createJobBlips = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("JobBlips")); - tempServerConfigData.createBusinessBlips = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("BusinessBlips")); - tempServerConfigData.createHouseBlips = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("HouseBlips")); - tempServerConfigData.useRealTime = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("RealTime")); - tempServerConfigData.antiCheat.enabled = hasBitFlag(tempServerConfigData.settings, getServerSettingsFlagValue("Anticheat")); - freeDatabaseQuery(dbQuery); return tempServerConfigData; } From 9a09dcbe3cb21ca269dfb0ff127cc7f797f7ea34 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 15:01:36 -0600 Subject: [PATCH 11/34] Testing --- scripts/server/subaccount.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/server/subaccount.js b/scripts/server/subaccount.js index e9a16789..af332474 100644 --- a/scripts/server/subaccount.js +++ b/scripts/server/subaccount.js @@ -375,6 +375,11 @@ function selectCharacter(client, characterId = -1) { spawnPlayer(client, spawnPosition, spawnHeading, getGameConfig().skins[getGame()][skin][0], spawnInterior, spawnDimension); } else if(getGame() == VRR_GAME_GTA_IV) { spawnPlayer(client, spawnPosition, spawnHeading, getGameConfig().skins[getGame()][skin][0], spawnInterior, spawnDimension); + //setPlayerSkin(client, skin); + //setPlayerPosition(client, spawnPosition); + //setPlayerHeading(client, spawnHeading); + //setPlayerInterior(client, spawnInterior); + //setPlayerDimension(client, spawnDimension); } else if(getGame() >= VRR_GAME_MAFIA_ONE) { spawnPlayer(client, getGameConfig().skins[getGame()][skin][0], spawnPosition, spawnHeading); } From 9274a83cf16668e9d5f5b7c4554c3c59121c1580 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 15:01:47 -0600 Subject: [PATCH 12/34] Add melee weapon data --- scripts/shared/gamedata.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/shared/gamedata.js b/scripts/shared/gamedata.js index 75a543ac..b7487a02 100644 --- a/scripts/shared/gamedata.js +++ b/scripts/shared/gamedata.js @@ -3320,10 +3320,18 @@ let gameData = { ], meleeWeapons: [ [], - [1], - [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], - [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], - [], + [1], // III + [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], // VC + [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], // SA + [], // UG + [1, 3], // IV + [], // Invalid + [], // Invalid + [], // Invalid + [], // M1 + [], // M2 + [], // M3 + [], // M1DE ], blipSprites: [ false, From b74e3b1152b5d130a0ab3e186bf7fc6de92ad887 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 8 Mar 2022 15:09:03 -0600 Subject: [PATCH 13/34] More locale strings --- locale/chinese.json | 4 +++- locale/english.json | 4 +++- locale/polish.json | 4 +++- locale/russian.json | 4 +++- locale/spanish.json | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/locale/chinese.json b/locale/chinese.json index 57eab3d4..5286e7db 100644 --- a/locale/chinese.json +++ b/locale/chinese.json @@ -391,5 +391,7 @@ "NotATester": "You are not a tester!", "AccessDenied": "AccessDenied", "InvalidSkin": "That skin is invalid!", - "HeaderInteriorTypes": "Interiors" + "HeaderInteriorTypes": "Interiors List", + "ViewInventoryKeyPressTip": "Press {1} to see your items", + "ViewInventoryCommandTip": "Use {1} to see your items" } diff --git a/locale/english.json b/locale/english.json index db17cb30..5f68c88e 100644 --- a/locale/english.json +++ b/locale/english.json @@ -391,5 +391,7 @@ "NotATester": "You are not a tester!", "AccessDenied": "AccessDenied", "InvalidSkin": "That skin is invalid!", - "HeaderInteriorTypes": "Interiors" + "HeaderInteriorTypes": "Interiors List", + "ViewInventoryKeyPressTip": "Press {1} to see your items", + "ViewInventoryCommandTip": "Use {1} to see your items" } diff --git a/locale/polish.json b/locale/polish.json index 02a57f7c..e38d5e1f 100644 --- a/locale/polish.json +++ b/locale/polish.json @@ -391,5 +391,7 @@ "NotATester": "You are not a tester!", "AccessDenied": "AccessDenied", "InvalidSkin": "That skin is invalid!", - "HeaderInteriorTypes": "Interiors" + "HeaderInteriorTypes": "Interiors List", + "ViewInventoryKeyPressTip": "Press {1} to see your items", + "ViewInventoryCommandTip": "Use {1} to see your items" } diff --git a/locale/russian.json b/locale/russian.json index b9a0ade7..82a535d2 100644 --- a/locale/russian.json +++ b/locale/russian.json @@ -390,5 +390,7 @@ "NotATester": "Вы не тестировщик!", "AccessDenied": "Доступ запрещен", "InvalidSkin": "That skin is invalid!", - "HeaderInteriorTypes": "Interiors" + "HeaderInteriorTypes": "Interiors List", + "ViewInventoryKeyPressTip": "Press {1} to see your items", + "ViewInventoryCommandTip": "Use {1} to see your items" } diff --git a/locale/spanish.json b/locale/spanish.json index 070a9811..7562b925 100644 --- a/locale/spanish.json +++ b/locale/spanish.json @@ -395,5 +395,7 @@ "NotATester": "You are not a tester!", "AccessDenied": "AccessDenied", "InvalidSkin": "That skin is invalid!", - "HeaderInteriorTypes": "Interiors" + "HeaderInteriorTypes": "Interiors List", + "ViewInventoryKeyPressTip": "Press {1} to see your items", + "ViewInventoryCommandTip": "Use {1} to see your items" } From 9887536bcc37237dea082bd21f2d2ee01cada170 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Wed, 9 Mar 2022 00:12:44 -0600 Subject: [PATCH 14/34] Start working on checkpoint display --- scripts/client/label.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/client/label.js b/scripts/client/label.js index a8d2664d..d794b549 100644 --- a/scripts/client/label.js +++ b/scripts/client/label.js @@ -251,8 +251,10 @@ function processLabelRendering() { if(localPlayer != null) { if(!areServerElementsSupported()) { //for(let i in businesses) { - // if(pickups[i].getData("vrr.label.type") != null) { - // if(getDistance(localPlayer.position, pickups[i].position) <= renderLabelDistance) { + // if(getDistance(localPlayer.position, businesses[i].entrancePosition) <= 75.0) { + // natives.drawColouredCylinder(businesses[i].entrancePosition, 0.0, 0.0, 0, 153, 255); + // } + //} // natives.getScreenViewportId // natives.getGameViewportId From a5afefaf39b706354a53f62022e0f9b6033e2888 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Wed, 9 Mar 2022 00:12:54 -0600 Subject: [PATCH 15/34] Add client house script --- meta.xml | 1 + scripts/client/house.js | 82 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 scripts/client/house.js diff --git a/meta.xml b/meta.xml index dd4d6d07..79e7de37 100644 --- a/meta.xml +++ b/meta.xml @@ -119,6 +119,7 @@