diff --git a/scripts/server/job/bus.js b/scripts/server/job/bus.js index e281dea4..eabd6ae2 100644 --- a/scripts/server/job/bus.js +++ b/scripts/server/job/bus.js @@ -405,14 +405,7 @@ function showCurrentBusStop(client) { function playerArrivedAtBusStop(client) { if(isLastStopOnBusRoute(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute, getPlayerData(client).jobRouteStop)) { - respawnVehicle(getPlayerData(client).jobRouteVehicle); - getPlayerData(client).payDayAmount += getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier; - 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")); - messagePlayerNormal(client, `You earned $${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier}. Your total paycheck of [#AAAAAA]${getPlayerData(client).payDayAmount} will be received in [#AAAAAA]${getTimeDifferenceDisplay(sdl.ticks-getPlayerData(client).payDayTickStart)}`); - getPlayerData(client).jobRouteVehicle = false; - getPlayerData(client).jobRoute = 0; - getPlayerData(client).jobRouteStop = 0; - getPlayerData(client).jobRouteIsland = 0; + finishSuccessfulBusRoute(client); return false; } @@ -438,4 +431,18 @@ function getBusRouteData(island, busRoute) { return busRoutes[getServerGame()][island][busRoute]; } +// =========================================================================== + +function finishSuccessfulBusRoute(client) { + respawnVehicle(getPlayerData(client).jobRouteVehicle); + let payout = toInteger(applyServerInflationMultiplier(getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout)); + getPlayerData(client).payDayAmount = getPlayerData(client).payDayAmount + payout; + 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")); + messagePlayerNormal(client, `You earned $${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier}. Your total paycheck of [#AAAAAA]${getPlayerData(client).payDayAmount} will be received in [#AAAAAA]${getTimeDifferenceDisplay(sdl.ticks-getPlayerData(client).payDayTickStart)}`); + getPlayerData(client).jobRouteVehicle = false; + getPlayerData(client).jobRoute = 0; + getPlayerData(client).jobRouteStop = 0; + getPlayerData(client).jobRouteIsland = 0; +} + // =========================================================================== \ No newline at end of file