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})`); diff --git a/scripts/client/chatbox.js b/scripts/client/chatbox.js index d74eb237..64e454f6 100644 --- a/scripts/client/chatbox.js +++ b/scripts/client/chatbox.js @@ -46,6 +46,7 @@ function unBindChatBoxKeys() { // =========================================================================== function receiveChatBoxMessageFromServer(messageString, colour) { + logToConsole(LOG_DEBUG, `[VRR.ChatBox]: Received chatbox message from server: ${messageString}`); let colouredString = replaceColoursInMessage(messageString); if(bottomMessageIndex >= chatBoxHistory.length-1) { diff --git a/scripts/client/event.js b/scripts/client/event.js index 38789b58..2bc8a09d 100644 --- a/scripts/client/event.js +++ b/scripts/client/event.js @@ -95,7 +95,7 @@ function onProcess(event, deltaTime) { processGameSpecifics(); processNearbyPickups(); processVehiclePurchasing(); - processVehicleFires(); + //processVehicleFires(); } // =========================================================================== @@ -224,4 +224,11 @@ function onLocalPlayerSwitchWeapon(oldWeapon, newWeapon) { function onCameraProcess(event) { } +// =========================================================================== + +function onChatOutput(event, messageText, colour) { + //event.preventDefault(); + //receiveChatBoxMessageFromServer(messageText, colour); +} + // =========================================================================== \ No newline at end of file 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) { diff --git a/scripts/server/business.js b/scripts/server/business.js index b6bb7d66..3e9faaa2 100644 --- a/scripts/server/business.js +++ b/scripts/server/business.js @@ -1765,9 +1765,9 @@ function buyFromBusinessCommand(command, params, client) { if(!doesPlayerHaveKeyBindsDisabled(client) && doesPlayerHaveKeyBindForCommand("inv")) { let keyData = getPlayerKeyBindForCommand("inv"); - messagePlayerNewbieTip(client, getLocaleString(client, "ViewInventoryKeyPressTip"), `{ALTCOLOUR}${getKeyNameFromId(keyData.key)}{MAINCOLOUR}`); + messagePlayerNewbieTip(client, getLocaleString(client, "ViewInventoryKeyPressTip", `{ALTCOLOUR}${getKeyNameFromId(keyData.key)}{MAINCOLOUR}`)); } else { - messagePlayerNewbieTip(client, getLocaleString(client, "ViewInventoryKeyPressTip"), `{ALTCOLOUR}/inv{MAINCOLOUR}`); + messagePlayerNewbieTip(client, getLocaleString(client, "ViewInventoryKeyPressTip", `{ALTCOLOUR}/inv{MAINCOLOUR}`)); } } diff --git a/scripts/server/chat.js b/scripts/server/chat.js index fbb63857..554dbeaa 100644 --- a/scripts/server/chat.js +++ b/scripts/server/chat.js @@ -13,29 +13,36 @@ function initChatScript() { return true; } +// =========================================================================== + function processPlayerChat(client, messageText) { - if(!getPlayerData(client)) { - messagePlayerError(client, "You need to login before you can chat!"); - return false; - } + if(!isConsole(client)) { + if(!getPlayerData(client)) { + messagePlayerError(client, "You need to login before you can chat!"); + return false; + } - if(!isPlayerLoggedIn(client)) { - messagePlayerError(client, "You need to login before you can chat!"); - return false; - } + if(!isPlayerLoggedIn(client)) { + messagePlayerError(client, "You need to login before you can chat!"); + return false; + } - if(!isPlayerSpawned(client)) { - messagePlayerError(client, "You need to spawn before you can chat!"); - return false; - } + if(!isPlayerSpawned(client)) { + messagePlayerError(client, "You need to spawn before you can chat!"); + return false; + } - if(isPlayerMuted(client)) { - messagePlayerError(client, "You are muted and can't chat!"); - return false; - } - - messageText = messageText.substring(0, 128); + if(isPlayerMuted(client)) { + messagePlayerError(client, "You are muted and can't chat!"); + return false; + } + messageText = messageText.substring(0, 128); + messagePlayerNormal(null, `💬 ${getCharacterFullName(client)}: ${messageText}`); + } else { + messagePlayerNormal(null, `🛡️ (ADMIN) - ${messageText}`); + } + /* let clients = getClients(); for(let i in clients) { @@ -46,8 +53,8 @@ function processPlayerChat(client, messageText) { messagePlayerNormal(clients[i], `💬 ${getCharacterFullName(client)}: [#FFFFFF]${translatedText}${original}`, clients[i], getColourByName("mediumGrey")); } */ - messagePlayerNormal(null, `💬 ${getCharacterFullName(client)}: ${messageText}`); - messageDiscordChatChannel(`💬 ${getCharacterFullName(client)}: ${messageText}`); + + //messageDiscordChatChannel(`💬 ${getCharacterFullName(client)}: ${messageText}`); } // =========================================================================== diff --git a/scripts/server/client.js b/scripts/server/client.js index ba41871d..5bd79c7c 100644 --- a/scripts/server/client.js +++ b/scripts/server/client.js @@ -520,9 +520,8 @@ function sendPlayerRemoveFromVehicle(client) { // =========================================================================== -function sendChatBoxMessageToPlayer(client, message, colour) { - sendNetworkEventToPlayer("vrr.m", client, message, colour) - //messageClient(message, client, colour); +function sendChatBoxMessageToPlayer(client, messageText, colour) { + messageClient(messageText, client, colour); } // =========================================================================== 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!"); } diff --git a/scripts/server/messaging.js b/scripts/server/messaging.js index c4d11285..e990d2be 100644 --- a/scripts/server/messaging.js +++ b/scripts/server/messaging.js @@ -37,7 +37,15 @@ function messagePlayerNormal(client, messageText, colour = COLOUR_WHITE) { // logToConsole(LOG_INFO, `${removeColoursInMessage(messageText)}`); //} - sendChatBoxMessageToPlayer(client, messageText, colour); + messageText = replaceColoursInMessage(messageText); + + if(client == null) { + message(messageText, colour); + } else { + messageClient(messageText, client, colour); + } + + //sendChatBoxMessageToPlayer(client, messageText, colour); return true; }