hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4.0-prep

Browse Source
This commit is contained in:
Vortrex
2022-03-09 00:22:33 -06:00
parent 5a35c7c414 c9e4979750
commit c9057e1a53
6 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/client/chatbox.js
View File

@@ -46,11 +46,13 @@ function unBindChatBoxKeys() {
// =========================================================================== // ===========================================================================
function receiveChatBoxMessageFromServer(messageString, colour) { function receiveChatBoxMessageFromServer(messageString, colour) {
if(bottomMessageIndex => chatBoxHistory.length-1) { let colouredString = replaceColoursInMessage(messageString);
message(messageString, colour);
if(bottomMessageIndex >= chatBoxHistory.length-1) {
message(colouredString, colour);
bottomMessageIndex = chatBoxHistory.length-1; bottomMessageIndex = chatBoxHistory.length-1;
} }
addToChatBoxHistory(messageString, colour); addToChatBoxHistory(colouredString, colour);
} }
// =========================================================================== // ===========================================================================

1
scripts/client/event.js
View File

@@ -95,6 +95,7 @@ function onProcess(event, deltaTime) {
processGameSpecifics(); processGameSpecifics();
processNearbyPickups(); processNearbyPickups();
processVehiclePurchasing(); processVehiclePurchasing();
processVehicleFires();
} }
// =========================================================================== // ===========================================================================

15
scripts/client/utilities.js
View File

@@ -808,4 +808,19 @@ function setVehiclePurchaseState(state, vehicleId, position) {
vehiclePurchasePosition = 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;
}
}
}
}
// =========================================================================== // ===========================================================================

3
scripts/server/locale.js
View File

@@ -34,8 +34,6 @@ function getLocaleString(client, stringName, ...args) {
submitBugReport(client, `(AUTOMATED REPORT) Locale string "${stringName}" is missing for "${getPlayerLocaleName(client)}"`); submitBugReport(client, `(AUTOMATED REPORT) Locale string "${stringName}" is missing for "${getPlayerLocaleName(client)}"`);
} }
tempString = replaceColoursInMessage(tempString);
for(let i = 1; i <= args.length; i++) { for(let i = 1; i <= args.length; i++) {
tempString = tempString.replace(`{${i}}`, args[i-1]); tempString = tempString.replace(`{${i}}`, args[i-1]);
} }
@@ -47,7 +45,6 @@ function getLocaleString(client, stringName, ...args) {
function getGroupedLocaleString(client, stringName, index, ...args) { function getGroupedLocaleString(client, stringName, index, ...args) {
let tempString = getRawGroupedLocaleString(stringName, getPlayerData(client).locale, index); let tempString = getRawGroupedLocaleString(stringName, getPlayerData(client).locale, index);
tempString = replaceColoursInMessage(tempString);
for(let i = 1; i <= args.length; i++) { for(let i = 1; i <= args.length; i++) {
tempString = tempString.replace(`{${i}}`, args[i-1]); tempString = tempString.replace(`{${i}}`, args[i-1]);

29
scripts/server/messaging.js
View File

@@ -33,19 +33,19 @@ function messageAdminAction(messageText) {
* *
*/ */
function messagePlayerNormal(client, messageText, colour = COLOUR_WHITE) { function messagePlayerNormal(client, messageText, colour = COLOUR_WHITE) {
if(isConsole(client) || client == null) { //if(isConsole(client) || client == null) {
logToConsole(LOG_INFO, `${removeColoursInMessage(messageText)}`); // logToConsole(LOG_INFO, `${removeColoursInMessage(messageText)}`);
} //}
sendChatBoxMessageToPlayer(client, `${replaceColoursInMessage(messageText)}`, colour); sendChatBoxMessageToPlayer(client, messageText, colour);
return true; return true;
} }
// =========================================================================== // ===========================================================================
function messageAdmins(messageText, colour = getColourByName("softRed")) { function messageAdmins(messageText, colour = getColourByName("softRed")) {
let plainMessage = removeColoursInMessage(messageText); //let plainMessage = removeColoursInMessage(messageText);
console.warn(`🛡️ ${plainMessage}`); //console.warn(`🛡️ ${plainMessage}`);
let clients = getClients(); let clients = getClients();
for(let i in clients) { for(let i in clients) {
@@ -54,9 +54,9 @@ function messageAdmins(messageText, colour = getColourByName("softRed")) {
} }
} }
if(getServerConfig().discordConfig.sendAdminEvents) { //if(getServerConfig().discordConfig.sendAdminEvents) {
messageDiscordAdminChannel(plainMessage); // 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) { function messagePlayerHelpContent(client, messageString) {
messagePlayerNormal(client, `{clanOrange}• {MAINCOLOUR}${messageString}`); messagePlayerNormal(client, `{clanOrange}• {MAINCOLOUR}${messageString}`);
} }

1
scripts/shared/gamedata.js
View File

@@ -5447,3 +5447,4 @@ let gameData = {
], ],
}; };
// ===========================================================================