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

Add discord echo for starting/stopping job route

Browse Source
This commit is contained in:
Vortrex
2022-05-24 01:18:34 -05:00
parent 095abe2e20
commit 4766890f2f
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/server/job.js
View File

@@ -496,7 +496,7 @@ function startWorkingCommand(command, params, client) {
} }
messagePlayerSuccess(client, `💼 You are now working for the {jobYellow}${jobData.name}{MAINCOLOUR} job`); messagePlayerSuccess(client, `💼 You are now working for the {jobYellow}${jobData.name}{MAINCOLOUR} job`);
messageDiscordEventChannel(`💼 ${getCharacterFullName(client)} is now working for the {jobYellow}${jobData.name}{MAINCOLOUR} job`); messageDiscordEventChannel(`💼 ${getCharacterFullName(client)} started working for the {jobYellow}${jobData.name}{MAINCOLOUR} job`);
startWorking(client); startWorking(client);
//messagePlayerNewbieTip(client, `Enter a job vehicle to get started!`); //messagePlayerNewbieTip(client, `Enter a job vehicle to get started!`);
@@ -650,6 +650,7 @@ function stopWorking(client) {
restorePlayerJobLockerItems(client); restorePlayerJobLockerItems(client);
respawnJobVehicle(client); respawnJobVehicle(client);
sendPlayerStopJobRoute(client); sendPlayerStopJobRoute(client);
messageDiscordEventChannel(`💼 ${getPlayerName(client)} has stopped working as a ${getJobData(jobId).name}`);
let jobId = getPlayerJob(client); let jobId = getPlayerJob(client);
switch(getJobType(jobId)) { switch(getJobType(jobId)) {
@@ -1760,7 +1761,7 @@ function startJobRoute(client, forceRoute = -1) {
return false; return false;
} }
logToConsole(LOG_DEBUG, `${getPlayerDisplayForConsole(client)} is starting job route ${jobRoute} for job ${jobId}`); logToConsole(LOG_DEBUG, `${getPlayerDisplayForConsole(client)} is starting job route ${getJobRouteData(jobId, jobRoute).name} (${jobRoute}) for the ${getJobData(jobId).name} (${jobId}) job`);
getPlayerData(client).jobRoute = jobRoute; getPlayerData(client).jobRoute = jobRoute;
getPlayerData(client).jobRouteLocation = 0; getPlayerData(client).jobRouteLocation = 0;
@@ -1770,6 +1771,12 @@ function startJobRoute(client, forceRoute = -1) {
getPlayerVehicle(client).colour2 = getJobRouteData(jobId, jobRoute).vehicleColour2; getPlayerVehicle(client).colour2 = getJobRouteData(jobId, jobRoute).vehicleColour2;
messagePlayerNormal(client, replaceJobRouteStringsInMessage(getJobRouteData(jobId, jobRoute).startMessage, jobId, jobRoute)); messagePlayerNormal(client, replaceJobRouteStringsInMessage(getJobRouteData(jobId, jobRoute).startMessage, jobId, jobRoute));
// Don't announce routes that an admin just created
if(forceRoute == -1) {
messageDiscordEventChannel(`💼 ${getCharacterFullName(client)} started the ${getJobRouteData(jobId, jobRoute).name} route for the ${getJobData(jobId).name} job`);
}
if(getJobRouteData(jobId, jobRoute).locations.length > 0) { if(getJobRouteData(jobId, jobRoute).locations.length > 0) {
showCurrentJobLocation(client); showCurrentJobLocation(client);
} else { } else {
@@ -1781,9 +1788,10 @@ function startJobRoute(client, forceRoute = -1) {
function stopJobRoute(client, successful = false, alertPlayer = true) { function stopJobRoute(client, successful = false, alertPlayer = true) {
let jobId = getPlayerJob(client); let jobId = getPlayerJob(client);
let routeId = getPlayerJobRoute(client);
if(alertPlayer) { if(alertPlayer) {
messagePlayerAlert(client, replaceJobRouteStringsInMessage(getJobRouteData(jobId, getPlayerJobRoute(client)).finishMessage), jobId, getPlayerJobRoute(client)); messagePlayerAlert(client, replaceJobRouteStringsInMessage(getJobRouteData(jobId, routeId).finishMessage, jobId, routeId));
} }
if(successful == true) { if(successful == true) {
@@ -1791,6 +1799,8 @@ function stopJobRoute(client, successful = false, alertPlayer = true) {
return false; return false;
} }
messageDiscordEventChannel(`💼 ${getCharacterFullName(client)} failed to finish the ${getJobRouteData(jobId, getPlayerJobRoute(client)).name} route for the ${getJobData(jobId).name} job and didn't earn anything.`);
stopReturnToJobVehicleCountdown(client); stopReturnToJobVehicleCountdown(client);
sendPlayerStopJobRoute(client); sendPlayerStopJobRoute(client);
respawnVehicle(getPlayerData(client).jobRouteVehicle); respawnVehicle(getPlayerData(client).jobRouteVehicle);
@@ -3000,6 +3010,7 @@ function finishSuccessfulJobRoute(client) {
let payout = toInteger(applyServerInflationMultiplier(jobRouteData.pay)); let payout = toInteger(applyServerInflationMultiplier(jobRouteData.pay));
getPlayerData(client).payDayAmount = getPlayerData(client).payDayAmount + payout; getPlayerData(client).payDayAmount = getPlayerData(client).payDayAmount + payout;
messageDiscordEventChannel(`💼 ${getCharacterFullName(client)} finished the ${getJobRouteData(jobId, getPlayerJobRoute(client)).name} route for the ${getJobData(jobId).name} job and earned $${getJobRouteData(jobId, jobRouteId).pay}!`);
messagePlayerSuccess(client, replaceJobRouteStringsInMessage(jobRouteData.finishMessage, jobId, jobRouteData.index)); messagePlayerSuccess(client, replaceJobRouteStringsInMessage(jobRouteData.finishMessage, jobId, jobRouteData.index));
stopReturnToJobVehicleCountdown(client); stopReturnToJobVehicleCountdown(client);