From 3b6a8cc83800cd4a34613c50ca6bbf8e2f3411fd Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 10 Mar 2022 09:18:01 -0600 Subject: [PATCH 1/5] Set business blips as short range --- scripts/client/business.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/client/business.js b/scripts/client/business.js index 48b74bb9..69a73600 100644 --- a/scripts/client/business.js +++ b/scripts/client/business.js @@ -52,14 +52,16 @@ function receiveBusinessFromServer(businessId, name, entrancePosition, blipModel logToConsole(LOG_DEBUG, `[VRR.Business] Business ${businessId}'s blip has been changed by the server`); natives.setBlipCoordinates(businessData.blipId, businessData.entrancePosition); natives.changeBlipSprite(businessData.blipId, businessData.blipModel); - natives.setBlipMarkerLongDistance(businessData.blipId, true); + natives.setBlipMarkerLongDistance(businessData.blipId, false); + natives.setBlipAsShortRange(tempBusinessData.blipId, true); natives.changeBlipNameFromAscii(businessData.blipId, `${businessData.name.substr(0, 24)}${(businessData.name.length > 24) ? " ...": ""}`); } else { let blipId = natives.addBlipForCoord(entrancePosition); if(blipId) { businessData.blipId = blipId; natives.changeBlipSprite(businessData.blipId, businessData.blipModel); - natives.setBlipMarkerLongDistance(businessData.blipId, true); + natives.setBlipMarkerLongDistance(businessData.blipId, false); + natives.setBlipAsShortRange(tempBusinessData.blipId, true); natives.changeBlipNameFromAscii(businessData.blipId, `${businessData.name.substr(0, 24)}${(businessData.name.length > 24) ? " ...": ""}`); } logToConsole(LOG_DEBUG, `[VRR.Business] Business ${businessId}'s blip has been added by the server (Model ${blipModel}, ID ${blipId})`); @@ -73,7 +75,8 @@ function receiveBusinessFromServer(businessId, name, entrancePosition, blipModel if(blipId) { tempBusinessData.blipId = blipId; natives.changeBlipSprite(tempBusinessData.blipId, blipModel); - natives.setBlipMarkerLongDistance(tempBusinessData.blipId, true); + natives.setBlipMarkerLongDistance(tempBusinessData.blipId, false); + natives.setBlipAsShortRange(tempBusinessData.blipId, true); natives.changeBlipNameFromAscii(tempBusinessData.blipId, `${name.substr(0, 24)}${(name.length > 24) ? " ...": ""}`); } logToConsole(LOG_DEBUG, `[VRR.Business] Business ${businessId}'s blip has been added by the server (Model ${blipModel}, ID ${blipId})`); From 1a8b4a439733b81ae50a435f35ebf9b4b12ba89b Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 10 Mar 2022 09:18:17 -0600 Subject: [PATCH 2/5] Don't process vehicle fires (needs finished) --- scripts/client/event.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/client/event.js b/scripts/client/event.js index c654229e..a281fa9d 100644 --- a/scripts/client/event.js +++ b/scripts/client/event.js @@ -95,6 +95,7 @@ function onProcess(event, deltaTime) { processGameSpecifics(); processNearbyPickups(); processVehiclePurchasing(); + //processVehicleFires(); } // =========================================================================== From ae9503cba1196147649e160efe06ef1025338a1d Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 10 Mar 2022 09:18:32 -0600 Subject: [PATCH 3/5] Don't sync vehicle pos to server for IV (needs finished) --- scripts/client/sync.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/client/sync.js b/scripts/client/sync.js index b67e4da9..3a2a3704 100644 --- a/scripts/client/sync.js +++ b/scripts/client/sync.js @@ -13,10 +13,10 @@ function processSync(event, deltaTime) { sendNetworkEventToServer("vrr.plr.pos", localPlayer.position); sendNetworkEventToServer("vrr.plr.rot", localPlayer.heading); - if(localPlayer.vehicle != null) { - sendNetworkEventToServer("vrr.veh.pos", getVehicleForNetworkEvent(localPlayer.vehicle), localPlayer.vehicle.position); - sendNetworkEventToServer("vrr.veh.rot", getVehicleForNetworkEvent(localPlayer.vehicle), localPlayer.vehicle.heading); - } + //if(localPlayer.vehicle != null) { + // sendNetworkEventToServer("vrr.veh.pos", getVehicleForNetworkEvent(localPlayer.vehicle), localPlayer.vehicle.position); + // sendNetworkEventToServer("vrr.veh.rot", getVehicleForNetworkEvent(localPlayer.vehicle), localPlayer.vehicle.heading); + //} } if(localPlayer.health <= 0) { From b06d573ad53d59511dc891da13c111b391a0e032 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 10 Mar 2022 09:18:48 -0600 Subject: [PATCH 4/5] Don't use discord chat msg (needs finished) --- scripts/server/chat.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/server/chat.js b/scripts/server/chat.js index fbb63857..29678550 100644 --- a/scripts/server/chat.js +++ b/scripts/server/chat.js @@ -13,6 +13,8 @@ function initChatScript() { return true; } +// =========================================================================== + function processPlayerChat(client, messageText) { if(!getPlayerData(client)) { messagePlayerError(client, "You need to login before you can chat!"); @@ -47,7 +49,7 @@ function processPlayerChat(client, messageText) { } */ messagePlayerNormal(null, `💬 ${getCharacterFullName(client)}: ${messageText}`); - messageDiscordChatChannel(`💬 ${getCharacterFullName(client)}: ${messageText}`); + //messageDiscordChatChannel(`💬 ${getCharacterFullName(client)}: ${messageText}`); } // =========================================================================== From 2dc6d65a50a609a2d39167aa352b6f441381acff Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 10 Mar 2022 09:19:01 -0600 Subject: [PATCH 5/5] Use server cvars for some config stuff --- scripts/server/config.js | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/scripts/server/config.js b/scripts/server/config.js index 829c0be9..7e286638 100644 --- a/scripts/server/config.js +++ b/scripts/server/config.js @@ -80,29 +80,27 @@ function initConfigScript() { logToConsole(LOG_DEBUG, "[VRR.Config]: Loading global config ..."); loadGlobalConfig(); - logToConsole(LOG_DEBUG, "[VRR.Config]: Loading server config ..."); + logToConsole(LOG_INFO, "[VRR.Config]: Loading server config ..."); 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")); + logToConsole(LOG_INFO, "[VRR.Config]: Applying server config ..."); + getServerConfig().fallingSnow = intToBool(toInteger(server.getCVar("fallingsnow"))); + getServerConfig().groundSnow = intToBool(toInteger(server.getCVar("groundsnow"))); + getServerConfig().useGUI = intToBool(toInteger(server.getCVar("gui"))); + getServerConfig().showLogo = false; + getServerConfig().testerOnly = intToBool(toInteger(server.getCVar("testeronly"))); + getServerConfig().discordEnabled = false; + getServerConfig().createJobPickups = intToBool(toInteger(server.getCVar("jobpickups"))); + getServerConfig().createBusinessPickups = intToBool(toInteger(server.getCVar("businesspickups"))); + getServerConfig().createHousePickups = intToBool(toInteger(server.getCVar("housepickups"))); + getServerConfig().createJobBlips = intToBool(toInteger(server.getCVar("jobblips"))); + getServerConfig().createBusinessBlips = intToBool(toInteger(server.getCVar("businessblips"))); + getServerConfig().createHouseBlips = intToBool(toInteger(server.getCVar("houseblips"))); + getServerConfig().useRealTime = intToBool(toInteger(server.getCVar("realtime"))); + getServerConfig().antiCheat.enabled = intToBool(toInteger(server.getCVar("anticheat"))); applyConfigToServer(serverConfig); - - logToConsole(LOG_DEBUG, "[VRR.Config]: All config loaded and applied successfully!"); + logToConsole(LOG_DEBUG, "[VRR.Config]: Server config applied successfully!"); logToConsole(LOG_INFO, "[VRR.Config]: Config script initialized!"); }