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

Fix walkie talkie utils

Browse Source
This commit is contained in:
Vortrex
2021-01-15 03:44:51 -06:00
parent 28d4b34826
commit 1a5940a9d2
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/server/item/walkie-talkie.js
View File

@@ -29,13 +29,15 @@ function getPlayerActiveWalkieTalkieFrequency(client) {
function walkieTalkieTransmit(radioFrequency, messageText, transmittingPlayer) { function walkieTalkieTransmit(radioFrequency, messageText, transmittingPlayer) {
walkieTalkieOutgoingToNearbyPlayers(transmittingPlayer, messageText); walkieTalkieOutgoingToNearbyPlayers(transmittingPlayer, messageText);
let clients = getPlayingClients(); let clients = getClients();
for(let i in clients) { for(let i in clients) {
if(!samePlayer(transmittingPlayer, clients[i])) { if(isPlayerSpawned(clients[i])) {
if(getPlayerActiveWalkieTalkieFrequency(clients[i]) == radioFrequency) { if(!isSamePlayer(transmittingPlayer, clients[i])) {
walkieTalkieIncomingToNearbyPlayers(clients[i], messageText); if(getPlayerActiveWalkieTalkieFrequency(clients[i]) == radioFrequency) {
} walkieTalkieIncomingToNearbyPlayers(clients[i], messageText);
} }
}
}
} }
} }
@@ -44,7 +46,7 @@ function walkieTalkieTransmit(radioFrequency, messageText, transmittingPlayer) {
function walkieTalkieOutgoingToNearbyPlayers(client, messageText) { function walkieTalkieOutgoingToNearbyPlayers(client, messageText) {
let clients = getPlayersInRange(getPlayerPosition(client), getGlobalConfig().talkDistance); let clients = getPlayersInRange(getPlayerPosition(client), getGlobalConfig().talkDistance);
for(let i in clients) { for(let i in clients) {
messagePlayerNormal(`[#CCCCCC]${getCharacterFullName(client)} [#AAAAAA](to radio): [#FFFFFF]${messageText}`); messagePlayerNormal(clients[i], `[#CCCCCC]${getCharacterFullName(client)} [#AAAAAA](to radio): [#FFFFFF]${messageText}`);
} }
} }
@@ -53,7 +55,7 @@ function walkieTalkieOutgoingToNearbyPlayers(client, messageText) {
function walkieTalkieIncomingToNearbyPlayers(client, messageText) { function walkieTalkieIncomingToNearbyPlayers(client, messageText) {
let clients = getPlayersInRange(getPlayerPosition(client), getGlobalConfig().walkieTalkieSpeakerDistance); let clients = getPlayersInRange(getPlayerPosition(client), getGlobalConfig().walkieTalkieSpeakerDistance);
for(let i in clients) { for(let i in clients) {
messagePlayerNormal(`[#CCCCCC]${getCharacterFullName(client)} [#AAAAAA](from radio): [#FFFFFF]${messageText}`); messagePlayerNormal(clients[i], `[#CCCCCC]${getCharacterFullName(client)} [#AAAAAA](from radio): [#FFFFFF]${messageText}`);
} }
} }
@@ -100,4 +102,15 @@ function setWalkieTalkieFrequencyCommand(command, params, client) {
messagePlayerSuccess(client, `You set the frequency of you walkie talkie in slot ${getPlayerData(client).activeHotbarSlot} to ${getItemValueDisplay(getPlayerActiveItem(client))}`) messagePlayerSuccess(client, `You set the frequency of you walkie talkie in slot ${getPlayerData(client).activeHotbarSlot} to ${getItemValueDisplay(getPlayerActiveItem(client))}`)
} }
// ---------------------------------------------------------------------------
function walkieTalkieChatCommand(command, params, client) {
if(areParamsEmpty(params)) {
messagePlayerSyntax(client, getCommandSyntaxText(command));
return false;
}
walkieTalkieTransmit(getPlayerActiveWalkieTalkieFrequency(client), params, client);
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------