From 71d4bec43609a0ce520a18551f0e301c68559d6b Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Fri, 7 Oct 2022 16:04:49 -0500
Subject: [PATCH] Show more action tips

---
 scripts/server/item.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/scripts/server/item.js b/scripts/server/item.js
index 33d054f4..b15df96d 100644
--- a/scripts/server/item.js
+++ b/scripts/server/item.js
@@ -1313,6 +1313,8 @@ function playerUseItem(client, hotBarSlot) {
 
 	logToConsole(LOG_DEBUG, `[AGRP.Item] ${getPlayerDisplayForConsole(client)} used a ${itemTypeData.name} (use type ${itemTypeData.useType} - ${typeof itemTypeData.useType}) item (ID: ${itemData.index}/${itemData.databaseId}, TypeID: ${itemTypeData.index}/${itemTypeData.databaseId})`);
 
+	markPlayerActionTipSeen(client, "UseItemKeyAfterEquipping");
+
 	switch (toInteger(itemTypeData.useType)) {
 		case AGRP_ITEM_USE_TYPE_SKIN: {
 			getPlayerData(client).itemActionItem = itemIndex;
@@ -1554,6 +1556,12 @@ function playerUseItem(client, hotBarSlot) {
 		case AGRP_ITEM_USE_TYPE_WALKIETALKIE: {
 			itemData.enabled = !itemData.enabled;
 			meActionToNearbyPlayers(client, `turns ${toLowerCase(getOnOffFromBool(itemData.enabled))} their walkie-talkie`);
+
+			if (itemData.enabled) {
+				if (!hasPlayerSeenActionTip(client, "RadioCommandAfterEnablingWalkieTalkie")) {
+					messagePlayerInfo(client, getGroupedLocaleString(client, "ActionTips", "RadioCommandAfterEnablingWalkieTalkie", `{ALTCOLOUR}/r{MAINCOLOUR}`));
+				}
+			}
 			break;
 		}
 
@@ -1946,6 +1954,18 @@ function playerSwitchItem(client, newHotBarSlot) {
 				messagePlayerTip(client, getGroupedLocaleString(client, "VehiclePartItemUsage", getKeyOrCommandForPlayerMessage(client, "use"), getItemTypeData(getItemData(newHotBarItem).itemTypeIndex).name));
 			}
 			break;
+
+		case AGRP_ITEM_USE_TYPE_WALKIETALKIE:
+			if (!hasPlayerSeenActionTip(client, "UseItemKeyAfterEquippingWalkieTalkie")) {
+				messagePlayerInfo(client, getGroupedLocaleString(client, "ActionTips", "UseItemKeyAfterEquippingWalkieTalkie", (doesPlayerHaveKeyBindForCommand(client, "use")) ? `{ALTCOLOUR}U{MAINCOLOUR}` : `{ALTCOLOUR}/use{MAINCOLOUR}`));
+			}
+			break;
+
+		default:
+			if (!hasPlayerSeenActionTip(client, "UseItemKeyAfterEquipping")) {
+				messagePlayerInfo(client, getGroupedLocaleString(client, "ActionTips", "UseItemKeyAfterEquipping", (doesPlayerHaveKeyBindForCommand(client, "use")) ? `{ALTCOLOUR}U{MAINCOLOUR}` : `{ALTCOLOUR}/use{MAINCOLOUR}`));
+			}
+			break;
 	}
 
 	getPlayerData(client).activeHotBarSlot = newHotBarSlot;