From a59b4104f1f20bc3f14762e34f88fc78f199614b Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 29 Sep 2022 11:11:14 -0500 Subject: [PATCH] Wrong locale util name --- scripts/server/chat.js | 2 +- scripts/server/item.js | 8 ++++---- scripts/server/job.js | 36 +++++++++++++++++++++--------------- scripts/server/property.js | 4 ++-- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/scripts/server/chat.js b/scripts/server/chat.js index d1d187c4..152c9328 100644 --- a/scripts/server/chat.js +++ b/scripts/server/chat.js @@ -219,7 +219,7 @@ function privateMessageCommand(command, params, client) { messagePlayerPrivateMessage(targetClient, client, messageText); if (hasPlayerSeenActionTip(targetClient, "ReplyToDirectMessage")) { - messagePlayerTip(targetClient, getIndexedLocaleString(targetClient, "ActionTips", "ReplyToDirectMessage", "{ALTCOLOUR}/reply{MAINCOLOUR}")); + messagePlayerTip(targetClient, getGroupedLocaleString(targetClient, "ActionTips", "ReplyToDirectMessage", "{ALTCOLOUR}/reply{MAINCOLOUR}")); } } diff --git a/scripts/server/item.js b/scripts/server/item.js index 546f9266..33d054f4 100644 --- a/scripts/server/item.js +++ b/scripts/server/item.js @@ -1925,25 +1925,25 @@ function playerSwitchItem(client, newHotBarSlot) { switch (getItemTypeData(getItemData(newHotBarItem).itemTypeIndex).useType) { case AGRP_ITEM_USE_TYPE_AMMO_CLIP: if (!hasPlayerSeenActionTip(client, "AmmoClipItemUsage")) { - messagePlayerTip(client, getIndexedLocaleString(client, "AmmoClipItemUsage", getKeyOrCommandForPlayerMessage(client, "use"))); + messagePlayerTip(client, getGroupedLocaleString(client, "AmmoClipItemUsage", getKeyOrCommandForPlayerMessage(client, "use"))); } break; case AGRP_ITEM_USE_TYPE_VEHREPAIR: if (!hasPlayerSeenActionTip(client, "VehicleRepairKitItemUsage")) { - messagePlayerTip(client, getIndexedLocaleString(client, "VehicleRepairKitItemUsage", getKeyOrCommandForPlayerMessage(client, "use"))); + messagePlayerTip(client, getGroupedLocaleString(client, "VehicleRepairKitItemUsage", getKeyOrCommandForPlayerMessage(client, "use"))); } break; case AGRP_ITEM_USE_TYPE_VEHCOLOUR: if (!hasPlayerSeenActionTip(client, "VehicleColourKitItemUsage")) { - messagePlayerTip(client, getIndexedLocaleString(client, "VehicleColourKitItemUsage", getKeyOrCommandForPlayerMessage(client, "use"))); + messagePlayerTip(client, getGroupedLocaleString(client, "VehicleColourKitItemUsage", getKeyOrCommandForPlayerMessage(client, "use"))); } break; case AGRP_ITEM_USE_TYPE_VEHUPGRADE_PART: if (!hasPlayerSeenActionTip(client, "VehiclePartItemUsage")) { - messagePlayerTip(client, getIndexedLocaleString(client, "VehiclePartItemUsage", getKeyOrCommandForPlayerMessage(client, "use"), getItemTypeData(getItemData(newHotBarItem).itemTypeIndex).name)); + messagePlayerTip(client, getGroupedLocaleString(client, "VehiclePartItemUsage", getKeyOrCommandForPlayerMessage(client, "use"), getItemTypeData(getItemData(newHotBarItem).itemTypeIndex).name)); } break; } diff --git a/scripts/server/job.js b/scripts/server/job.js index 2b448231..28984962 100644 --- a/scripts/server/job.js +++ b/scripts/server/job.js @@ -987,7 +987,7 @@ function startWorkingCommand(command, params, client) { if (doesJobLocationHaveAnyRoutes(closestJobLocation)) { if (hasPlayerSeenActionTip(client, "EnterJobVehicleForRoute")) { - messagePlayerTip(client, getIndexedLocaleString(client, "ActionTips", "EnterJobVehicleForRoute")); + messagePlayerTip(client, getGroupedLocaleString(client, "ActionTips", "EnterJobVehicleForRoute")); } } return true; @@ -1406,9 +1406,9 @@ function jobEquipmentCommand(command, params, client) { meActionToNearbyPlayers(client, `grabs the ${jobEquipmentData.name} equipment from the locker`); if (!hasPlayerSeenActionTip(client, "JobEquipmentInventory")) { if (doesPlayerHaveKeyBindForCommand(client, "inv")) { - messagePlayerTip(client, getIndexedLocaleString(client, "ActionTips", "JobEquipmentInventory", toUpperCase(getKeyNameFromId(getPlayerKeyBindForCommand(client, "inv").key)))); + messagePlayerTip(client, getGroupedLocaleString(client, "ActionTips", "JobEquipmentInventory", toUpperCase(getKeyNameFromId(getPlayerKeyBindForCommand(client, "inv").key)))); } else { - messagePlayerTip(client, getIndexedLocaleString(client, "ActionTips", "JobEquipmentInventory", "/inv")); + messagePlayerTip(client, getGroupedLocaleString(client, "ActionTips", "JobEquipmentInventory", "/inv")); } markPlayerActionTipSeen(client, "JobEquipmentInventory"); } @@ -3141,21 +3141,20 @@ function createJobLocationPickup(jobId, locationId) { return false; } - if (!isGameFeatureSupported("pickup")) { - return false; - } - let tempJobData = getJobData(jobId); + logToConsole(LOG_VERBOSE, `[AGRP.Job]: Creating pickup for location ${locationId} of the ${tempJobData.name} job`); + if (tempJobData.pickupModel != -1) { - let pickupModelId = getGameConfig().pickupModels[getGame()].Job; + let pickupModelId = -1; + if (isGameFeatureSupported("pickup")) { + pickupModelId = getGameConfig().pickupModels[getGame()].Job; - if (tempJobData.pickupModel != 0) { - pickupModelId = tempJobData.pickupModel; + if (tempJobData.pickupModel != 0) { + pickupModelId = tempJobData.pickupModel; + } } - logToConsole(LOG_VERBOSE, `[AGRP.Job]: Creating pickup for location ${locationId} of the ${tempJobData.name} job`); - if (areServerElementsSupported()) { let pickup = createGamePickup(pickupModelId, tempJobData.locations[locationId].position, getGameConfig().pickupTypes[getGame()].job); if (pickup != false) { @@ -3170,7 +3169,16 @@ function createJobLocationPickup(jobId, locationId) { addToWorld(pickup); } } else { - // sendJobToPlayer(null, jobId, tempJobData.name, tempJobData.locations[locationId].position, pickupModel); + let blipModelId = -1; + if (isGameFeatureSupported("blip")) { + blipModelId = getGameConfig().blipSprites[getGame()].Job; + + if (getJobData(jobId).blipModel != 0) { + blipModelId = getJobData(jobId).blipModel; + } + } + + sendJobToPlayer(null, jobId, tempJobData.name, tempJobData.locations[locationId].position, blipModelId, pickupModelId); } } } @@ -3218,8 +3226,6 @@ function createJobLocationBlip(jobId, locationId) { updateJobBlipsForPlayer(clients[i]); } } - } else { - sendJobToPlayer(null, jobId, tempJobData.name, tempJobData.locations[locationId].position, blipModelId); } } diff --git a/scripts/server/property.js b/scripts/server/property.js index be92ba21..c377b1dd 100644 --- a/scripts/server/property.js +++ b/scripts/server/property.js @@ -2130,9 +2130,9 @@ function buyFromBusinessCommand(command, params, client) { if (!hasPlayerSeenActionTip(client, "ViewInventory")) { if (doesPlayerHaveKeyBindsDisabled(client) && doesPlayerHaveKeyBindForCommand("inv")) { let keyData = getPlayerKeyBindForCommand("inv"); - messagePlayerActionTip(client, getIndexedLocaleString(client, "ActionTips", "ViewInventory", `{ALTCOLOUR}${getKeyNameFromId(keyData.key)}{MAINCOLOUR}`)); + messagePlayerActionTip(client, getGroupedLocaleString(client, "ActionTips", "ViewInventory", `{ALTCOLOUR}${getKeyNameFromId(keyData.key)}{MAINCOLOUR}`)); } else { - messagePlayerActionTip(client, getIndexedLocaleString(client, "ActionTips", "ViewInventory", `{ALTCOLOUR}/inv{MAINCOLOUR}`)); + messagePlayerActionTip(client, getGroupedLocaleString(client, "ActionTips", "ViewInventory", `{ALTCOLOUR}/inv{MAINCOLOUR}`)); } }