diff --git a/scripts/client/chatbox.js b/scripts/client/chatbox.js index 37526c4b..d74eb237 100644 --- a/scripts/client/chatbox.js +++ b/scripts/client/chatbox.js @@ -46,11 +46,13 @@ function unBindChatBoxKeys() { // =========================================================================== function receiveChatBoxMessageFromServer(messageString, colour) { - if(bottomMessageIndex => chatBoxHistory.length-1) { - message(messageString, colour); + let colouredString = replaceColoursInMessage(messageString); + + if(bottomMessageIndex >= chatBoxHistory.length-1) { + message(colouredString, colour); bottomMessageIndex = chatBoxHistory.length-1; } - addToChatBoxHistory(messageString, colour); + addToChatBoxHistory(colouredString, colour); } // =========================================================================== diff --git a/scripts/client/event.js b/scripts/client/event.js index 03ae0839..c2c9b340 100644 --- a/scripts/client/event.js +++ b/scripts/client/event.js @@ -95,6 +95,7 @@ function onProcess(event, deltaTime) { processGameSpecifics(); processNearbyPickups(); processVehiclePurchasing(); + processVehicleFires(); } // =========================================================================== diff --git a/scripts/client/utilities.js b/scripts/client/utilities.js index 64570a19..d1190946 100644 --- a/scripts/client/utilities.js +++ b/scripts/client/utilities.js @@ -808,4 +808,19 @@ function setVehiclePurchaseState(state, vehicleId, position) { vehiclePurchasePosition = position; } +// =========================================================================== + +function processVehicleFires() { + let vehicles = getElementsByType(ELEMENT_VEHICLE); + for(let i in vehicles) { + if(vehicles[i].isSyncer) { + if(!doesEntityDataExist(vehicles[i], "vrr.fire")) { + triggerNetworkEvent("vrr.vehFire", vehicles[i].id); + } else { + vehicles[i].health = 249; + } + } + } +} + // =========================================================================== \ No newline at end of file diff --git a/scripts/server/locale.js b/scripts/server/locale.js index f10c0b02..a45ef9e8 100644 --- a/scripts/server/locale.js +++ b/scripts/server/locale.js @@ -34,8 +34,6 @@ function getLocaleString(client, stringName, ...args) { submitBugReport(client, `(AUTOMATED REPORT) Locale string "${stringName}" is missing for "${getPlayerLocaleName(client)}"`); } - tempString = replaceColoursInMessage(tempString); - for(let i = 1; i <= args.length; i++) { tempString = tempString.replace(`{${i}}`, args[i-1]); } @@ -47,7 +45,6 @@ function getLocaleString(client, stringName, ...args) { function getGroupedLocaleString(client, stringName, index, ...args) { let tempString = getRawGroupedLocaleString(stringName, getPlayerData(client).locale, index); - tempString = replaceColoursInMessage(tempString); for(let i = 1; i <= args.length; i++) { tempString = tempString.replace(`{${i}}`, args[i-1]); diff --git a/scripts/server/messaging.js b/scripts/server/messaging.js index 29c7eb4d..c4d11285 100644 --- a/scripts/server/messaging.js +++ b/scripts/server/messaging.js @@ -33,19 +33,19 @@ function messageAdminAction(messageText) { * */ function messagePlayerNormal(client, messageText, colour = COLOUR_WHITE) { - if(isConsole(client) || client == null) { - logToConsole(LOG_INFO, `${removeColoursInMessage(messageText)}`); - } + //if(isConsole(client) || client == null) { + // logToConsole(LOG_INFO, `${removeColoursInMessage(messageText)}`); + //} - sendChatBoxMessageToPlayer(client, `${replaceColoursInMessage(messageText)}`, colour); + sendChatBoxMessageToPlayer(client, messageText, colour); return true; } // =========================================================================== function messageAdmins(messageText, colour = getColourByName("softRed")) { - let plainMessage = removeColoursInMessage(messageText); - console.warn(`🛡️ ${plainMessage}`); + //let plainMessage = removeColoursInMessage(messageText); + //console.warn(`🛡️ ${plainMessage}`); let clients = getClients(); for(let i in clients) { @@ -54,9 +54,9 @@ function messageAdmins(messageText, colour = getColourByName("softRed")) { } } - if(getServerConfig().discordConfig.sendAdminEvents) { - messageDiscordAdminChannel(plainMessage); - } + //if(getServerConfig().discordConfig.sendAdminEvents) { + // messageDiscordAdminChannel(plainMessage); + //} } // =========================================================================== @@ -236,17 +236,6 @@ function clearChatBox(client) { // =========================================================================== -function replaceEmojiInString(messageString) { - for(let i in emojiReplaceString) { - while(messageString.indexOf(emojiReplaceString[i][0]) != -1) { - messageString = messageString.replace(emojiReplaceString[i][0], emojiReplaceString[i][1]); - } - } - return messageString; -} - -// =========================================================================== - function messagePlayerHelpContent(client, messageString) { messagePlayerNormal(client, `{clanOrange}• {MAINCOLOUR}${messageString}`); } diff --git a/scripts/shared/gamedata.js b/scripts/shared/gamedata.js index ddccfa16..eb6c8d05 100644 --- a/scripts/shared/gamedata.js +++ b/scripts/shared/gamedata.js @@ -5447,3 +5447,4 @@ let gameData = { ], }; +// =========================================================================== \ No newline at end of file