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

Overhaul of "client" to "player"

Browse Source
This commit is contained in:
Vortrex
2020-12-29 04:26:15 -06:00
parent eeff21929c
commit 1c7532523c
34 changed files with 920 additions and 911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/server/job/bus.js
View File

@@ -553,7 +553,7 @@ function showCurrentBusStop(client) {
function arrivedAtBusStop(client) {
if(isLastStopOnBusRoute(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute, getPlayerData(client).jobRouteStop)) {
respawnVehicle(getPlayerData(client).jobRouteVehicle);
messageClientNormal(client, `You finished the ${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} bus route! Your bus has been returned to the bus depot.`, getColourByName("yellow"));
messagePlayerNormal(client, `You finished the ${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} bus route! Your bus has been returned to the bus depot.`, getColourByName("yellow"));
getPlayerData(client).jobRouteVehicle = false;
getPlayerData(client).jobRoute = 0;
getPlayerData(client).jobRouteStop = 0;

2
scripts/server/job/garbage.js
View File

@@ -116,7 +116,7 @@ function showCurrentGarbageStop(client) {
function arrivedAtGarbageStop(client) {
if(isLastStopOnGarbageRoute(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute, getPlayerData(client).jobRouteStop)) {
respawnVehicle(getPlayerData(client).jobRouteVehicle);
messageClientNormal(client, `You finished the ${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} garbage route! Your trashmaster has been returned to the garbage depot.`, getColourByName("yellow"));
messagePlayerNormal(client, `You finished the ${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} garbage route! Your trashmaster has been returned to the garbage depot.`, getColourByName("yellow"));
getPlayerData(client).jobRouteVehicle = false;
getPlayerData(client).jobRoute = 0;
getPlayerData(client).jobRouteStop = 0;

48
scripts/server/job/police.js
View File

@@ -10,22 +10,22 @@
function policeTazerCommand(command, params, client) {
if(!canPlayerUseJobs(client)) {
messageClientError(client, "You are not allowed to use jobs.");
messagePlayerError(client, "You are not allowed to use jobs.");
return false;
}
if(!canPlayerUsePoliceJob(client)) {
messageClientError(client, "You are not allowed to use the police job.");
messagePlayerError(client, "You are not allowed to use the police job.");
return false;
}
if(!isPlayerWorking(client)) {
messageClientError(client, "You are not working! Use /startwork first.");
messagePlayerError(client, "You are not working! Use /startwork first.");
return false;
}
if(!doesPlayerHaveJobType(client, AG_JOB_POLICE)) {
messageClientError(client, "You don't have a police job.");
messagePlayerError(client, "You don't have a police job.");
return false;
}
@@ -36,22 +36,22 @@ function policeTazerCommand(command, params, client) {
function policeCuffCommand(command, params, client) {
if(!canPlayerUseJobs(client)) {
messageClientError(client, "You are not allowed to use jobs.");
messagePlayerError(client, "You are not allowed to use jobs.");
return false;
}
if(!canPlayerUsePoliceJob(client)) {
messageClientError(client, "You are not allowed to use the police job.");
messagePlayerError(client, "You are not allowed to use the police job.");
return false;
}
if(!isPlayerWorking(client)) {
messageClientError(client, "You are not working! Use /startwork first.");
messagePlayerError(client, "You are not working! Use /startwork first.");
return false;
}
if(!doesPlayerHaveJobType(client, AG_JOB_POLICE)) {
messageClientError(client, "You don't have a police job.");
messagePlayerError(client, "You don't have a police job.");
return false;
}
@@ -62,22 +62,22 @@ function policeCuffCommand(command, params, client) {
function policeArrestCommand(command, params, client) {
if(!canPlayerUseJobs(client)) {
messageClientError(client, "You are not allowed to use jobs.");
messagePlayerError(client, "You are not allowed to use jobs.");
return false;
}
if(!canPlayerUsePoliceJob(client)) {
messageClientError(client, "You are not allowed to use the police job.");
messagePlayerError(client, "You are not allowed to use the police job.");
return false;
}
if(!isPlayerWorking(client)) {
messageClientError(client, "You are not working! Use /startwork first.");
messagePlayerError(client, "You are not working! Use /startwork first.");
return false;
}
if(!doesPlayerHaveJobType(client, AG_JOB_POLICE)) {
messageClientError(client, "You don't have a police job.");
messagePlayerError(client, "You don't have a police job.");
return false;
}
@@ -88,22 +88,22 @@ function policeArrestCommand(command, params, client) {
function policeSearchCommand(command, params, client) {
if(!canPlayerUseJobs(client)) {
messageClientError(client, "You are not allowed to use jobs.");
messagePlayerError(client, "You are not allowed to use jobs.");
return false;
}
if(!canPlayerUsePoliceJob(client)) {
messageClientError(client, "You are not allowed to use the police job.");
messagePlayerError(client, "You are not allowed to use the police job.");
return false;
}
if(!isPlayerWorking(client)) {
messageClientError(client, "You are not working! Use /startwork first.");
messagePlayerError(client, "You are not working! Use /startwork first.");
return false;
}
if(!doesPlayerHaveJobType(client, AG_JOB_POLICE)) {
messageClientError(client, "You don't have a police job.");
messagePlayerError(client, "You don't have a police job.");
return false;
}
@@ -114,22 +114,22 @@ function policeSearchCommand(command, params, client) {
function policeDragCommand(command, params, client) {
if(!canPlayerUseJobs(client)) {
messageClientError(client, "You are not allowed to use jobs.");
messagePlayerError(client, "You are not allowed to use jobs.");
return false;
}
if(!canPlayerUsePoliceJob(client)) {
messageClientError(client, "You are not allowed to use the police job.");
messagePlayerError(client, "You are not allowed to use the police job.");
return false;
}
if(!isPlayerWorking(client)) {
messageClientError(client, "You are not working! Use /startwork first.");
messagePlayerError(client, "You are not working! Use /startwork first.");
return false;
}
if(!doesPlayerHaveJobType(client, AG_JOB_POLICE)) {
messageClientError(client, "You don't have a police job.");
messagePlayerError(client, "You don't have a police job.");
return false;
}
@@ -140,22 +140,22 @@ function policeDragCommand(command, params, client) {
function policeDetainCommand(command, params, client) {
if(!canPlayerUseJobs(client)) {
messageClientError(client, "You are not allowed to use jobs.");
messagePlayerError(client, "You are not allowed to use jobs.");
return false;
}
if(!canPlayerUsePoliceJob(client)) {
messageClientError(client, "You are not allowed to use the police job.");
messagePlayerError(client, "You are not allowed to use the police job.");
return false;
}
if(!isPlayerWorking(client)) {
messageClientError(client, "You are not working! Use /startwork first.");
messagePlayerError(client, "You are not working! Use /startwork first.");
return false;
}
if(!doesPlayerHaveJobType(client, AG_JOB_POLICE)) {
messageClientError(client, "You don't have a police job.");
messagePlayerError(client, "You don't have a police job.");
return false;
}

8
scripts/server/job/taxi.js
View File

@@ -10,22 +10,22 @@
function taxiSetFareCommand(command, params, client) {
if(!canPlayerUseJobs(client)) {
messageClientError(client, "You are not allowed to use jobs.");
messagePlayerError(client, "You are not allowed to use jobs.");
return false;
}
if(!canPlayerUseTaxiJob(client)) {
messageClientError(client, "You are not allowed to use the taxi job.");
messagePlayerError(client, "You are not allowed to use the taxi job.");
return false;
}
if(!isPlayerWorking(client)) {
messageClientError(client, "You are not working! Use /startwork first.");
messagePlayerError(client, "You are not working! Use /startwork first.");
return false;
}
if(!doesPlayerHaveJobType(client, AG_JOB_TAXI)) {
messageClientError(client, "You don't have a taxi job.");
messagePlayerError(client, "You don't have a taxi job.");
return false;
}