diff --git a/scripts/server/job/bus.js b/scripts/server/job/bus.js index 28f373f5..7e4bb60e 100644 --- a/scripts/server/job/bus.js +++ b/scripts/server/job/bus.js @@ -406,8 +406,8 @@ function showCurrentBusStop(client) { function playerArrivedAtBusStop(client) { if(isLastStopOnBusRoute(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute, getPlayerData(client).jobRouteStop)) { respawnVehicle(getPlayerData(client).jobRouteVehicle); - messagePlayerNormal(client, `You finished the ${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} bus route! You earned $${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout} and your bus has been returned to the bus depot.`, getColourByName("yellow")); - getPlayerCurrentSubAccount(client).cash += getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout; + messagePlayerNormal(client, `You finished the ${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} bus route! You earned $${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier} and your bus has been returned to the bus depot.`, getColourByName("yellow")); + getPlayerCurrentSubAccount(client).cash += getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier; updatePlayerCash(client); getPlayerData(client).jobRouteVehicle = false; getPlayerData(client).jobRoute = 0; diff --git a/scripts/server/job/garbage.js b/scripts/server/job/garbage.js index 88f7859a..088d61b6 100644 --- a/scripts/server/job/garbage.js +++ b/scripts/server/job/garbage.js @@ -15,6 +15,7 @@ let garbageRoutes = [ { // ROUTE 0 name: "Portland #1", island: 0, + payout: 150, positions: [ toVector3(1169.8, -45.54, 10.4), toVector3(928, -59.1, 8.61), @@ -37,6 +38,7 @@ let garbageRoutes = [ { // ROUTE 0 name: "Staunton #1", island: 1, + payout: 150, positions: [ toVector3(49.85, -1539.9, 26.6), toVector3(49.71, -1458.1, 26.6), @@ -116,8 +118,8 @@ function showCurrentGarbageStop(client) { function playerArrivedAtGarbageStop(client) { if(isLastStopOnGarbageRoute(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute, getPlayerData(client).jobRouteStop)) { respawnVehicle(getPlayerData(client).jobRouteVehicle); - messagePlayerNormal(client, `You finished the ${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} garbage route! You earned $${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout} and your trashmaster has been returned to the garbage depot.`, getColourByName("yellow")); - getPlayerCurrentSubAccount(client).cash += getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout; + messagePlayerNormal(client, `You finished the ${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} garbage route! You earned $${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier} and your trashmaster has been returned to the garbage depot.`, getColourByName("yellow")); + getPlayerCurrentSubAccount(client).cash += getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier; updatePlayerCash(client); getPlayerData(client).jobRouteVehicle = false; getPlayerData(client).jobRoute = 0; diff --git a/scripts/server/job/police.js b/scripts/server/job/police.js index 32e946dc..a8593480 100644 --- a/scripts/server/job/police.js +++ b/scripts/server/job/police.js @@ -233,9 +233,9 @@ function policeDetainCommand(command, params, client) { function playerArivedAtPolicePatrolPoint(client) { if(isLastStopOnPolicePatrolRoute(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute, getPlayerData(client).jobRouteStop)) { - messagePlayerNormal(client, `You finished the ${getPatrolRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} patrol route! You earned $${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout}`, getColourByName("yellow")); + messagePlayerNormal(client, `You finished the ${getPatrolRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} patrol route! You earned $${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier}`, getColourByName("yellow")); messagePlayerNormal(client, `You can either continue driving the patrol route again, or use /stoproute to end your patrol.`, getColourByName("yellow")); - getPlayerCurrentSubAccount(client).cash += getPolicePatrolRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout; + getPlayerCurrentSubAccount(client).cash += getPolicePatrolRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).payout*getServerData().inflationMultiplier; updatePlayerCash(client); getPlayerData(client).jobRouteVehicle = false; getPlayerData(client).jobRoute = 0;