From 5899ff7b327cbaf4c0e48397a98f95551de0bc64 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sun, 27 Dec 2020 22:03:17 -0600 Subject: [PATCH] Rename busRoute stuff to jobRoute (more universal) --- scripts/server/job.js | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/scripts/server/job.js b/scripts/server/job.js index 50354eb9..973532fc 100644 --- a/scripts/server/job.js +++ b/scripts/server/job.js @@ -875,20 +875,20 @@ function isPlayerWorking(client) { function startJobRoute(client) { if(doesPlayerHaveJobType(client, AG_JOB_BUS)) { let busRoute = getRandomBusRoute(getPlayerIsland(client)); - getPlayerData(client).busRoute = busRoute; - getPlayerData(client).busRouteStop = 0; - getPlayerData(client).busRouteIsland = getPlayerIsland(client); - getPlayerData(client).busRouteVehicle = getPlayerVehicle(client); + getPlayerData(client).jobRoute = busRoute; + getPlayerData(client).jobRouteStop = 0; + getPlayerData(client).jobRouteIsland = getPlayerIsland(client); + getPlayerData(client).jobRouteVehicle = getPlayerVehicle(client); getPlayerVehicle(client).colour1 = getBusRouteData(getPlayerIsland(client), busRoute).busColour; getPlayerVehicle(client).colour2 = 1; showCurrentBusStop(client); messageClientNormal(client, `🚌 You are now driving the [#AAAAAA]${getBusRouteData(getPlayerIsland(client), busRoute).name} [#FFFFFF]bus route! Drive to the green checkpoint.`); } else if(doesPlayerHaveJobType(client, AG_JOB_GARBAGE)) { let garbageRoute = getRandomBusRoute(getPlayerIsland(client)); - getPlayerData(client).garbageRoute = garbageRoute; - getPlayerData(client).garbageRouteStop = 0; - getPlayerData(client).garbageRouteIsland = getPlayerIsland(client); - getPlayerData(client).garbageRouteVehicle = getPlayerVehicle(client); + getPlayerData(client).jobRoute = garbageRoute; + getPlayerData(client).jobRouteStop = 0; + getPlayerData(client).jobRouteIsland = getPlayerIsland(client); + getPlayerData(client).jobRouteVehicle = getPlayerVehicle(client); getPlayerVehicle(client).colour1 = getGarbageRouteData(getPlayerIsland(client), garbageRoute).garbageTruckColour; getPlayerVehicle(client).colour2 = 1; showCurrentGarbageStop(client); @@ -1033,5 +1033,20 @@ function canPlayerUseJob(client, jobId) { function deleteJobLocation(jobLocationData) { destroyElement(jobLocationData.pickup); triggerNetworkEvent("ag.joblabel.del", jobLocationData.databaseId); +} -} \ No newline at end of file +// --------------------------------------------------------------------------- + +function freezeJobVehicleForRouteStop(client) { + getVehicleData(getPlayerVehicle(client)).engine = false; + getPlayerVehicle(client).engine = false; +} + +// --------------------------------------------------------------------------- + +function unFreezeJobVehicleForRouteStop(client) { + getVehicleData(getPlayerVehicle(client)).engine = true; + getPlayerVehicle(client).engine = true; +} + +// --------------------------------------------------------------------------- \ No newline at end of file