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

Fix some job route msg outputs

Browse Source
This commit is contained in:
Vortrex
2022-02-13 19:36:02 -06:00
parent 2ae4bbf116
commit 379626f25f
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/server/job.js
View File

@@ -665,6 +665,10 @@ function stopWorking(client) {
case VRR_JOB_DRUG: case VRR_JOB_DRUG:
break; break;
case VRR_JOB_GENERIC:
messagePlayerInfo(client, "Your vehicle has been respawned at your job location");
break;
default: default:
break; break;
} }
@@ -744,20 +748,18 @@ function jobUniformCommand(command, params, client) {
} }
let uniformId = toInteger(params) || 1; let uniformId = toInteger(params) || 1;
if(uniformId < 1 || uniformId > uniforms.length) { if(uniformId < 0 || uniformId > uniforms.length) {
messagePlayerError(client, getLocaleString(client, "InvalidJobUniform")); messagePlayerError(client, getLocaleString(client, "InvalidJobUniform"));
return false; return false;
} }
setPlayerSkin(client, jobData.uniforms[uniformId-1].skin); if(uniformId == 0) {
setPlayerSkin(client, getPlayerCurrentSubAccount(client).skin);
//messagePlayerSuccess(client, `You have been given a {ALTCOLOUR}${uniforms[uniformId-1].name} {MAINCOLOUR}uniform and you can put it on from your inventory.`); meActionToNearbyPlayers(client, `takes off their uniform`);
meActionToNearbyPlayers(client, `puts on ${getProperDeterminerForName(jobData.uniforms[uniformId-1].name)} ${jobData.uniforms[uniformId-1].name} uniform`); } else {
//let itemId = createItem(getItemTypeFromParams("Outfit"), getJobData(jobId).uniforms[uniformId-1].skin, VRR_ITEM_OWNER_PLAYER, getPlayerCurrentSubAccount(client).databaseId); setPlayerSkin(client, jobData.uniforms[uniformId-1].skin);
//let freeSlot = getPlayerFirstEmptyHotBarSlot(client); meActionToNearbyPlayers(client, `puts on ${getProperDeterminerForName(jobData.uniforms[uniformId-1].name)} ${jobData.uniforms[uniformId-1].name} uniform`);
//getPlayerData(client).hotBarItems[freeSlot] = itemId; }
//getPlayerData(client).jobEquipmentCache.push(itemId);
//updatePlayerHotBar(client);
} }
// =========================================================================== // ===========================================================================
@@ -1681,7 +1683,7 @@ function startJobRoute(client, forceRoute = -1) {
getPlayerVehicle(client).colour1 = getJobRouteData(jobId, jobRoute).vehicleColour1; getPlayerVehicle(client).colour1 = getJobRouteData(jobId, jobRoute).vehicleColour1;
getPlayerVehicle(client).colour2 = getJobRouteData(jobId, jobRoute).vehicleColour2; getPlayerVehicle(client).colour2 = getJobRouteData(jobId, jobRoute).vehicleColour2;
messagePlayerNormal(client, getJobRouteData(jobId, jobRoute).startMessage); messagePlayerNormal(client, replaceJobRouteStringsInMessage(getJobRouteData(jobId, jobRoute).startMessage, jobId, jobRoute));
if(getJobRouteData(jobId, jobRoute).locations.length > 0) { if(getJobRouteData(jobId, jobRoute).locations.length > 0) {
showCurrentJobLocation(client); showCurrentJobLocation(client);
} else { } else {
@@ -2417,19 +2419,19 @@ function playerArrivedAtJobRouteLocation(client) {
return false; return false;
} }
showGameMessage(client, removeColoursInMessage(getJobRouteData(jobId, getPlayerJobRoute(client)).locationArriveMessage), getJobData(jobId).colour, 3500); showGameMessage(client, replaceJobRouteStringsInMessage(removeColoursInMessage(getJobRouteData(jobId, getPlayerJobRoute(client)).locationArriveMessage), jobId, getPlayerJobRoute(client)), getJobData(jobId).colour, 3500);
if(getJobRouteLocationData(jobId, getPlayerJobRoute(client),getPlayerJobRouteLocation(client)).stopDelay > 0) { if(getJobRouteLocationData(jobId, getPlayerJobRoute(client),getPlayerJobRouteLocation(client)).stopDelay > 0) {
freezePlayerJobVehicleForRouteLocation(client); freezePlayerJobVehicleForRouteLocation(client);
getPlayerData(client).jobRouteLocation = getNextLocationOnJobRoute(jobId, getPlayerJobRoute(client), getPlayerJobRouteLocation(client)); getPlayerData(client).jobRouteLocation = getNextLocationOnJobRoute(jobId, getPlayerJobRoute(client), getPlayerJobRouteLocation(client));
setTimeout(function() { setTimeout(function() {
showCurrentJobLocation(client); showCurrentJobLocation(client);
showGameMessage(client, removeColoursInMessage(getJobRouteData(jobId, getPlayerJobRoute(client)).locationNextMessage), getJobData(jobId).colour, 3500); showGameMessage(client, replaceJobRouteStringsInMessage(removeColoursInMessage(getJobRouteData(jobId, getPlayerJobRoute(client)).locationNextMessage), jobId, getPlayerJobRoute(client)), getJobData(jobId).colour, 3500);
unFreezePlayerJobVehicleForRouteLocation(client); unFreezePlayerJobVehicleForRouteLocation(client);
}, getJobRouteLocationData(jobId, getPlayerJobRoute(client),getPlayerJobRouteLocation(client)).stopDelay); }, getJobRouteLocationData(jobId, getPlayerJobRoute(client),getPlayerJobRouteLocation(client)).stopDelay);
} else { } else {
getPlayerData(client).jobRouteLocation = getNextLocationOnJobRoute(jobId, getPlayerJobRoute(client), getPlayerJobRouteLocation(client)); getPlayerData(client).jobRouteLocation = getNextLocationOnJobRoute(jobId, getPlayerJobRoute(client), getPlayerJobRouteLocation(client));
showCurrentJobLocation(client); showCurrentJobLocation(client);
showGameMessage(client, removeColoursInMessage(getJobRouteData(jobId, getPlayerJobRoute(client)).locationNextMessage), getJobData(jobId).colour, 3500); showGameMessage(client, replaceJobRouteStringsInMessage(removeColoursInMessage(getJobRouteData(jobId, getPlayerJobRoute(client)).locationNextMessage), jobId, getPlayerJobRoute(client)), getJobData(jobId).colour, 3500);
} }
} }
@@ -2630,7 +2632,7 @@ function deleteJobRouteCommand(command, params, client) {
let jobRoute = getPlayerData(client).jobRoute; let jobRoute = getPlayerData(client).jobRoute;
if(!areParamsEmpty(client)) { if(!areParamsEmpty(client)) {
jobRoute = getJobRouteFromParams(params); jobRoute = getJobRouteFromParams(params, jobId);
} }
let jobRouteData = getServerData().jobs[jobId].routes[jobRoute]; let jobRouteData = getServerData().jobs[jobId].routes[jobRoute];