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

Rebrand

Browse Source
This commit is contained in:
Vortrex
2021-06-05 17:31:17 -05:00
parent 75c264eace
commit 7b44801a20
61 changed files with 1075 additions and 1078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
scripts/server/job.js
View File

@@ -8,7 +8,7 @@
// ===========================================================================
function initJobScript() {
logToConsole(LOG_INFO, "[Asshat.Job]: Initializing job script ...");
logToConsole(LOG_INFO, "[VRR.Job]: Initializing job script ...");
getServerData().jobs = loadJobsFromDatabase();
if(getServerConfig().createJobPickups) {
@@ -20,14 +20,14 @@ function initJobScript() {
}
setAllJobDataIndexes();
logToConsole(LOG_INFO, "[Asshat.Job]: Job script initialized successfully!");
logToConsole(LOG_INFO, "[VRR.Job]: Job script initialized successfully!");
return true;
}
// ===========================================================================
function loadJobsFromDatabase() {
logToConsole(LOG_DEBUG, "[Asshat.Job]: Loading jobs from database ...");
logToConsole(LOG_DEBUG, "[VRR.Job]: Loading jobs from database ...");
let tempJobs = [];
let dbConnection = connectToDatabase();
@@ -44,7 +44,7 @@ function loadJobsFromDatabase() {
tempJobData.equipment = loadJobEquipmentsFromDatabase(tempJobData.databaseId);
tempJobData.uniforms = loadJobUniformsFromDatabase(tempJobData.databaseId);
tempJobs.push(tempJobData);
logToConsole(LOG_DEBUG, `[Asshat.Job]: Job '${tempJobData.name}' loaded from database successfully!`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job '${tempJobData.name}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
@@ -52,7 +52,7 @@ function loadJobsFromDatabase() {
disconnectFromDatabase(dbConnection);
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: ${tempJobs.length} jobs loaded from database successfully!`);
logToConsole(LOG_DEBUG, `[VRR.Job]: ${tempJobs.length} jobs loaded from database successfully!`);
return tempJobs;
}
@@ -83,7 +83,7 @@ function loadAllJobLocationsFromDatabase() {
// ===========================================================================
function loadJobEquipmentsFromDatabase(jobDatabaseId) {
logToConsole(LOG_DEBUG, `[Asshat.Job]: Loading job equipments for job ${jobDatabaseId} from database ...`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Loading job equipments for job ${jobDatabaseId} from database ...`);
let tempJobEquipments = [];
let dbConnection = connectToDatabase();
@@ -98,7 +98,7 @@ function loadJobEquipmentsFromDatabase(jobDatabaseId) {
let tempJobEquipmentData = new serverClasses.jobEquipmentData(dbAssoc);
tempJobEquipmentData.items = loadJobEquipmentItemsFromDatabase(tempJobEquipmentData.databaseId);
tempJobEquipments.push(tempJobEquipmentData);
logToConsole(LOG_DEBUG, `[Asshat.Job]: Job equipment '${tempJobEquipmentData.name}' loaded from database successfully!`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job equipment '${tempJobEquipmentData.name}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
@@ -106,14 +106,14 @@ function loadJobEquipmentsFromDatabase(jobDatabaseId) {
disconnectFromDatabase(dbConnection);
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: ${tempJobEquipments.length} job equipments for job ${jobDatabaseId} loaded from database successfully!`);
logToConsole(LOG_DEBUG, `[VRR.Job]: ${tempJobEquipments.length} job equipments for job ${jobDatabaseId} loaded from database successfully!`);
return tempJobEquipments;
}
// ===========================================================================
function loadJobLocationsFromDatabase(jobDatabaseId) {
logToConsole(LOG_DEBUG, `[Asshat.Job]: Loading job locations for job ${jobDatabaseId} from database ...`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Loading job locations for job ${jobDatabaseId} from database ...`);
let tempJobLocations = [];
let dbConnection = connectToDatabase();
@@ -127,7 +127,7 @@ function loadJobLocationsFromDatabase(jobDatabaseId) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempJobLocationData = new serverClasses.jobLocationData(dbAssoc);
tempJobLocations.push(tempJobLocationData);
logToConsole(LOG_DEBUG, `[Asshat.Job]: Job location '${tempJobLocationData.databaseId}' loaded from database successfully!`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job location '${tempJobLocationData.databaseId}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
@@ -135,14 +135,14 @@ function loadJobLocationsFromDatabase(jobDatabaseId) {
disconnectFromDatabase(dbConnection);
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: ${tempJobLocations.length} job locations for job ${jobDatabaseId} loaded from database successfully!`);
logToConsole(LOG_DEBUG, `[VRR.Job]: ${tempJobLocations.length} job locations for job ${jobDatabaseId} loaded from database successfully!`);
return tempJobLocations;
}
// ===========================================================================
function loadJobUniformsFromDatabase(jobDatabaseId) {
logToConsole(LOG_DEBUG, `[Asshat.Job]: Loading job uniforms for job ${jobDatabaseId} from database ...`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Loading job uniforms for job ${jobDatabaseId} from database ...`);
let tempJobUniforms = [];
let dbConnection = connectToDatabase();
@@ -156,7 +156,7 @@ function loadJobUniformsFromDatabase(jobDatabaseId) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempJobUniformData = new serverClasses.jobUniformData(dbAssoc);
tempJobUniforms.push(tempJobUniformData);
logToConsole(LOG_DEBUG, `[Asshat.Job]: Job uniform '${tempJobUniformData.databaseId}' loaded from database successfully!`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job uniform '${tempJobUniformData.databaseId}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
@@ -164,14 +164,14 @@ function loadJobUniformsFromDatabase(jobDatabaseId) {
disconnectFromDatabase(dbConnection);
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: ${tempJobUniforms.length} job uniforms for job ${jobDatabaseId} loaded from database successfully!`);
logToConsole(LOG_DEBUG, `[VRR.Job]: ${tempJobUniforms.length} job uniforms for job ${jobDatabaseId} loaded from database successfully!`);
return tempJobUniforms;
}
// ===========================================================================
function loadJobEquipmentItemsFromDatabase(jobEquipmentDatabaseId) {
logToConsole(LOG_DEBUG, `[Asshat.Job]: Loading job equipment items for job equipment ${jobEquipmentDatabaseId} from database ...`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Loading job equipment items for job equipment ${jobEquipmentDatabaseId} from database ...`);
let tempJobEquipmentItems = [];
let dbConnection = connectToDatabase();
@@ -185,7 +185,7 @@ function loadJobEquipmentItemsFromDatabase(jobEquipmentDatabaseId) {
while(dbAssoc = fetchQueryAssoc(dbQuery)) {
let tempJobEquipmentItemData = new serverClasses.jobEquipmentItemData(dbAssoc);
tempJobEquipmentItems.push(tempJobEquipmentItemData);
logToConsole(LOG_DEBUG, `[Asshat.Job]: Job equipment item '${tempJobEquipmentItemData.databaseId}' loaded from database successfully!`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Job equipment item '${tempJobEquipmentItemData.databaseId}' loaded from database successfully!`);
}
}
freeDatabaseQuery(dbQuery);
@@ -193,28 +193,28 @@ function loadJobEquipmentItemsFromDatabase(jobEquipmentDatabaseId) {
disconnectFromDatabase(dbConnection);
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: ${tempJobEquipmentItems.length} job equipment items for equipment ${jobEquipmentDatabaseId} loaded from database successfully!`);
logToConsole(LOG_DEBUG, `[VRR.Job]: ${tempJobEquipmentItems.length} job equipment items for equipment ${jobEquipmentDatabaseId} loaded from database successfully!`);
return tempJobEquipmentItems;
}
// ===========================================================================
function createAllJobBlips() {
logToConsole(LOG_DEBUG, `[Asshat.Job] Spawning all job location blips ...`);
logToConsole(LOG_DEBUG, `[VRR.Job] Spawning all job location blips ...`);
for(let i in getServerData().jobs) {
for(let j in getServerData().jobs[i].locations) {
getServerData().jobs[i].locations[j].blip = gta.createBlip((getServerData().jobs[i].blipModel!=0) ? getServerData().jobs[i].blipModel : 0, getServerData().jobs[i].locations[j].position, 2, getColourByName("yellow"));
addToWorld(getServerData().jobs[i].locations[j].blip);
logToConsole(LOG_DEBUG, `[Asshat.Job] Job '${getServerData().jobs[i].name}' location blip ${j} spawned!`);
logToConsole(LOG_DEBUG, `[VRR.Job] Job '${getServerData().jobs[i].name}' location blip ${j} spawned!`);
}
}
logToConsole(LOG_DEBUG, `[Asshat.Job] All job location blips spawned!`);
logToConsole(LOG_DEBUG, `[VRR.Job] All job location blips spawned!`);
}
// ===========================================================================
function createAllJobPickups() {
logToConsole(LOG_DEBUG, `[Asshat.Job] Spawning all job location pickups ...`);
logToConsole(LOG_DEBUG, `[VRR.Job] Spawning all job location pickups ...`);
let pickupCount = 0;
for(let i in getServerData().jobs) {
if(getServerData().jobs[i].pickupModel != 0) {
@@ -222,19 +222,19 @@ function createAllJobPickups() {
pickupCount++;
getServerData().jobs[i].locations[j].pickup = gta.createPickup(getServerData().jobs[i].pickupModel, getServerData().jobs[i].locations[j].position);
getServerData().jobs[i].locations[j].pickup.onAllDimensions = false;
setEntityData(getServerData().jobs[i].locations[j].pickup, "ag.owner.type", AG_PICKUP_JOB, false);
setEntityData(getServerData().jobs[i].locations[j].pickup, "ag.owner.type", VRR_PICKUP_JOB, false);
setEntityData(getServerData().jobs[i].locations[j].pickup, "ag.owner.id", j, false);
setEntityData(getServerData().jobs[i].locations[j].pickup, "ag.label.type", AG_LABEL_JOB, true);
setEntityData(getServerData().jobs[i].locations[j].pickup, "ag.label.type", VRR_LABEL_JOB, true);
setEntityData(getServerData().jobs[i].locations[j].pickup, "ag.label.name", getServerData().jobs[i].name, true);
setEntityData(getServerData().jobs[i].locations[j].pickup, "ag.label.jobType", getServerData().jobs[i].databaseId, true);
getServerData().jobs[i].locations[j].pickup.dimension = getServerData().jobs[i].locations[j].dimension;
addToWorld(getServerData().jobs[i].locations[j].pickup);
logToConsole(LOG_DEBUG, `[Asshat.Job] Job '${getServerData().jobs[i].name}' location pickup ${j} spawned!`);
logToConsole(LOG_DEBUG, `[VRR.Job] Job '${getServerData().jobs[i].name}' location pickup ${j} spawned!`);
}
}
}
logToConsole(LOG_DEBUG, `[Asshat.Job] All job location pickups (${pickupCount}) spawned!`);
logToConsole(LOG_DEBUG, `[VRR.Job] All job location pickups (${pickupCount}) spawned!`);
}
// ===========================================================================
@@ -250,7 +250,7 @@ function showJobInformationToPlayer(client, jobType) {
}
switch(jobType) {
case AG_JOB_POLICE:
case VRR_JOB_POLICE:
if(!canPlayerUsePoliceJob(client)) {
return false;
}
@@ -263,7 +263,7 @@ function showJobInformationToPlayer(client, jobType) {
messagePlayerInfo(client, "- When finished, use /stopwork to stop working.");
break;
case AG_JOB_MEDICAL:
case VRR_JOB_MEDICAL:
messagePlayerInfo(client, "== Job Help =================================");
messagePlayerInfo(client, "- Paramedics help people by healing them.");
messagePlayerInfo(client, "- Use /startwork at the hospital to work as a Paramedic.");
@@ -272,7 +272,7 @@ function showJobInformationToPlayer(client, jobType) {
messagePlayerInfo(client, "- When finished, use /stopwork to stop working.");
break;
case AG_JOB_FIRE:
case VRR_JOB_FIRE:
if(!canClientUseFireJob(client)) {
return false;
}
@@ -284,7 +284,7 @@ function showJobInformationToPlayer(client, jobType) {
messagePlayerInfo(client, "- When finished, use /stopwork to stop working.");
break;
case AG_JOB_BUS:
case VRR_JOB_BUS:
messagePlayerInfo(client, "== Job Help =================================");
messagePlayerInfo(client, "- Bus Drivers transport people around the city on a route");
messagePlayerInfo(client, "- Use /startwork at the bus depot to work as a Bus Driver.");
@@ -293,7 +293,7 @@ function showJobInformationToPlayer(client, jobType) {
messagePlayerInfo(client, "- When finished, use /stopwork to stop working.");
break;
case AG_JOB_TAXI:
case VRR_JOB_TAXI:
messagePlayerInfo(client, "== Job Help =================================");
messagePlayerInfo(client, "- Taxi Drivers transport people around the city");
messagePlayerInfo(client, "- Use /startwork at the taxi depot to work as a Taxi Driver.");
@@ -303,7 +303,7 @@ function showJobInformationToPlayer(client, jobType) {
messagePlayerInfo(client, "- When finished, use /stopwork to stop working.");
break;
case AG_JOB_GARBAGE:
case VRR_JOB_GARBAGE:
messagePlayerInfo(client, "== Job Help =================================");
messagePlayerInfo(client, "- Garbage Collectors pick up the trash around the city.");
messagePlayerInfo(client, "- Use /startwork at the garbage depot to work as a Garbage Collector.");
@@ -314,10 +314,10 @@ function showJobInformationToPlayer(client, jobType) {
messagePlayerInfo(client, "- When finished, use /stopwork to stop working.");
break;
case AG_JOB_WEAPON:
case VRR_JOB_WEAPON:
break;
case AG_JOB_DRUG:
case VRR_JOB_DRUG:
break;
default:
@@ -341,7 +341,7 @@ function takeJobCommand(command, params, client) {
return false;
}
if(getPlayerCurrentSubAccount(client).job > AG_JOB_NONE) {
if(getPlayerCurrentSubAccount(client).job > VRR_JOB_NONE) {
messagePlayerError(client, `[#FFFFFF]You already have a job! Use [#AAAAAA]/quitjob [#FFFFFF]to quit your current job.`);
return false;
}
@@ -371,7 +371,7 @@ function startWorkingCommand(command, params, client) {
return false;
}
if(getPlayerCurrentSubAccount(client).job == AG_JOB_NONE) {
if(getPlayerCurrentSubAccount(client).job == VRR_JOB_NONE) {
messagePlayerError(client, "You don't have a job!");
messagePlayerInfo(client, "You can get a job by going the yellow points on the map.");
return false;
@@ -428,34 +428,34 @@ function startWorking(client) {
let jobId = getPlayerCurrentSubAccount(client).job;
switch(getJobIndexFromDatabaseId(jobId)) {
case AG_JOB_POLICE:
case VRR_JOB_POLICE:
messagePlayerInfo(client, "Use /uniform and /equip to get your equipment.");
break;
case AG_JOB_MEDICAL:
case VRR_JOB_MEDICAL:
messagePlayerInfo(client, "Use /uniform and /equip to get your equipment.");
break;
case AG_JOB_FIRE:
case VRR_JOB_FIRE:
messagePlayerInfo(client, "Use /uniform and /equip to get your equipment.");
break;
case AG_JOB_BUS:
case VRR_JOB_BUS:
messagePlayerInfo(client, "Get in a bus to get started.");
break;
case AG_JOB_TAXI:
case VRR_JOB_TAXI:
messagePlayerInfo(client, "Get in a taxi to get started.");
break;
case AG_JOB_GARBAGE:
case VRR_JOB_GARBAGE:
messagePlayerInfo(client, "Get in a trash truck to get started.");
break;
case AG_JOB_WEAPON:
case VRR_JOB_WEAPON:
break;
case AG_JOB_DRUG:
case VRR_JOB_DRUG:
break;
default:
@@ -494,10 +494,10 @@ function givePlayerJobEquipment(client, equipmentId) {
for(let i in getJobData(jobId).equipment[equipmentId].items) {
let value = getJobData(jobId).equipment[equipmentId].items[i].value
if(getItemTypeData(getItemTypeIndexFromDatabaseId(getJobData(jobId).equipment[equipmentId].items[i].itemType)).useType == AG_ITEM_USETYPE_WALKIETALKIE) {
if(getItemTypeData(getItemTypeIndexFromDatabaseId(getJobData(jobId).equipment[equipmentId].items[i].itemType)).useType == VRR_ITEM_USETYPE_WALKIETALKIE) {
value = getJobData(jobId).walkieTalkieFrequency;
}
let itemId = createItem(getItemTypeIndexFromDatabaseId(getJobData(jobId).equipment[equipmentId].items[i].itemType), value, AG_ITEM_OWNER_PLAYER, getPlayerCurrentSubAccount(client).databaseId);
let itemId = createItem(getItemTypeIndexFromDatabaseId(getJobData(jobId).equipment[equipmentId].items[i].itemType), value, VRR_ITEM_OWNER_PLAYER, getPlayerCurrentSubAccount(client).databaseId);
getItemData(itemId).needsSaved = false;
let freeSlot = getPlayerFirstEmptyHotBarSlot(client);
getPlayerData(client).hotBarItems[freeSlot] = itemId;
@@ -546,34 +546,34 @@ function stopWorking(client) {
let jobId = getPlayerCurrentSubAccount(client).job;
switch(getJobType(jobId)) {
case AG_JOB_POLICE:
case VRR_JOB_POLICE:
messagePlayerInfo(client, "Your uniform, equipment, and police car have been returned to the police station");
break;
case AG_JOB_MEDICAL:
case VRR_JOB_MEDICAL:
messagePlayerInfo(client, "Your uniform and ambulance have been returned to the hospital");
break;
case AG_JOB_FIRE:
case VRR_JOB_FIRE:
messagePlayerInfo(client, "Your uniform and fire truck have been returned to the fire station");
break;
case AG_JOB_BUS:
case VRR_JOB_BUS:
messagePlayerInfo(client, "Your bus has been returned to the bus depot");
break;
case AG_JOB_TAXI:
case VRR_JOB_TAXI:
messagePlayerInfo(client, "Your taxi has been returned to the taxi depot");
break;
case AG_JOB_GARBAGE:
case VRR_JOB_GARBAGE:
messagePlayerInfo(client, "Your trash truck has been returned to the city landfill");
break;
case AG_JOB_WEAPON:
case VRR_JOB_WEAPON:
break;
case AG_JOB_DRUG:
case VRR_JOB_DRUG:
break;
default:
@@ -619,7 +619,7 @@ function jobUniformCommand(command, params, client) {
//messagePlayerSuccess(client, `You have been given a [#AAAAAA]${uniforms[uniformId-1].name} [#FFFFFF]uniform and you can put it on from your inventory.`);
meActionToNearbyPlayers(client, `puts on ${getProperDeterminerForName(getJobData(jobId).uniforms[uniformId-1].name)} ${getJobData(jobId).uniforms[uniformId-1].name} uniform`);
//let itemId = createItem(getItemTypeFromParams("Outfit"), getJobData(jobId).uniforms[uniformId-1].skin, AG_ITEM_OWNER_PLAYER, getPlayerCurrentSubAccount(client).databaseId);
//let itemId = createItem(getItemTypeFromParams("Outfit"), getJobData(jobId).uniforms[uniformId-1].skin, VRR_ITEM_OWNER_PLAYER, getPlayerCurrentSubAccount(client).databaseId);
//let freeSlot = getPlayerFirstEmptyHotBarSlot(client);
//getPlayerData(client).hotBarItems[freeSlot] = itemId;
//getPlayerData(client).jobEquipmentCache.push(itemId);
@@ -992,7 +992,7 @@ function jobStartRouteCommand(command, params, client) {
return false;
}
if(!doesPlayerHaveJobType(client, AG_JOB_BUS) && !doesPlayerHaveJobType(client, AG_JOB_GARBAGE)) {
if(!doesPlayerHaveJobType(client, VRR_JOB_BUS) && !doesPlayerHaveJobType(client, VRR_JOB_GARBAGE)) {
messagePlayerError(client, "Your job doesn't use a route!");
return false;
}
@@ -1020,7 +1020,7 @@ function jobStopRouteCommand(command, params, client) {
return false;
}
if(!doesPlayerHaveJobType(client, AG_JOB_BUS) && !doesPlayerHaveJobType(client, AG_JOB_GARBAGE)) {
if(!doesPlayerHaveJobType(client, VRR_JOB_BUS) && !doesPlayerHaveJobType(client, VRR_JOB_GARBAGE)) {
messagePlayerError(client, "Your job doesn't use a route!");
return false;
}
@@ -1059,7 +1059,7 @@ function isPlayerWorking(client) {
// ===========================================================================
function startJobRoute(client) {
if(doesPlayerHaveJobType(client, AG_JOB_BUS)) {
if(doesPlayerHaveJobType(client, VRR_JOB_BUS)) {
let busRoute = getRandomBusRoute(getPlayerIsland(client));
getPlayerData(client).jobRoute = busRoute;
getPlayerData(client).jobRouteStop = 0;
@@ -1069,7 +1069,7 @@ function startJobRoute(client) {
getPlayerVehicle(client).colour2 = 1;
showCurrentBusStop(client);
messagePlayerNormal(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)) {
} else if(doesPlayerHaveJobType(client, VRR_JOB_GARBAGE)) {
let garbageRoute = getRandomBusRoute(getPlayerIsland(client));
getPlayerData(client).jobRoute = garbageRoute;
getPlayerData(client).jobRouteStop = 0;
@@ -1088,7 +1088,7 @@ function stopJobRoute(client, successful = false, alertPlayer = true) {
stopReturnToJobVehicleCountdown(client);
sendPlayerStopJobRoute(client);
if(doesPlayerHaveJobType(client, AG_JOB_BUS)) {
if(doesPlayerHaveJobType(client, VRR_JOB_BUS)) {
respawnVehicle(getPlayerData(client).jobRouteVehicle);
getPlayerData(client).jobRouteVehicle = false;
getPlayerData(client).jobRoute = false;
@@ -1098,7 +1098,7 @@ function stopJobRoute(client, successful = false, alertPlayer = true) {
if(alertPlayer) {
messagePlayerAlert(client, `You stopped the ${getBusRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} bus route! Your bus has been returned to the bus depot.`, getColourByName("yellow"));
}
} else if(doesPlayerHaveJobType(client, AG_JOB_GARBAGE)) {
} else if(doesPlayerHaveJobType(client, VRR_JOB_GARBAGE)) {
respawnVehicle(getPlayerData(client).jobRouteVehicle);
getPlayerData(client).jobRouteVehicle = false;
getPlayerData(client).jobRoute = false;
@@ -1108,7 +1108,7 @@ function stopJobRoute(client, successful = false, alertPlayer = true) {
if(alertPlayer) {
messagePlayerAlert(client, `You stopped the ${getGarbageRouteData(getPlayerData(client).jobRouteIsland, getPlayerData(client).jobRoute).name} garbage route! Your trashmaster has been returned to the bus depot.`, getColourByName("yellow"));
}
} else if(doesPlayerHaveJobType(client, AG_JOB_POLICE)) {
} else if(doesPlayerHaveJobType(client, VRR_JOB_POLICE)) {
respawnVehicle(getPlayerData(client).jobRouteVehicle);
getPlayerData(client).jobRouteVehicle = false;
getPlayerData(client).jobRoute = false;
@@ -1293,7 +1293,7 @@ function saveJobToDatabase(jobData) {
return false;
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: Saving job ${jobData.name} to database ...`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Saving job ${jobData.name} to database ...`);
let dbConnection = connectToDatabase();
if(dbConnection) {
let safeName = escapeDatabaseString(dbConnection, jobData.name);
@@ -1324,7 +1324,7 @@ function saveJobToDatabase(jobData) {
disconnectFromDatabase(dbConnection);
return true;
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: Saved job ${jobData.name} to database!`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Saved job ${jobData.name} to database!`);
return false;
}
@@ -1337,7 +1337,7 @@ function saveJobToDatabase(jobData) {
return false;
}
console.log(`[Asshat.Job]: Saving job ${jobData.name} to database ...`);
console.log(`[VRR.Job]: Saving job ${jobData.name} to database ...`);
let dbConnection = connectToDatabase();
if(dbConnection) {
let safeName = escapeDatabaseString(dbConnection, jobData.name);
@@ -1353,7 +1353,7 @@ function saveJobToDatabase(jobData) {
disconnectFromDatabase(dbConnection);
return true;
}
console.log(`[Asshat.Job]: Saved job ${jobData.name} to database!`);
console.log(`[VRR.Job]: Saved job ${jobData.name} to database!`);
return false;
}
@@ -1366,7 +1366,7 @@ function saveJobLocationToDatabase(jobLocationData) {
return false;
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: Saving job location ${jobLocationData.databaseId} to database ...`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Saving job location ${jobLocationData.databaseId} to database ...`);
let dbConnection = connectToDatabase();
if(dbConnection) {
// If job location hasn't been added to database, ID will be 0
@@ -1382,7 +1382,7 @@ function saveJobLocationToDatabase(jobLocationData) {
disconnectFromDatabase(dbConnection);
return true;
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: Saved job location ${jobLocationData.databaseId} to database`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Saved job location ${jobLocationData.databaseId} to database`);
return false;
}
@@ -1395,7 +1395,7 @@ function saveJobEquipmentToDatabase(jobEquipmentData) {
return false;
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: Saving job equipment ${jobEquipmentData.databaseId} to database ...`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Saving job equipment ${jobEquipmentData.databaseId} to database ...`);
let dbConnection = connectToDatabase();
if(dbConnection) {
let safeName = escapeDatabaseString(dbConnection, jobEquipmentData.name);
@@ -1411,7 +1411,7 @@ function saveJobEquipmentToDatabase(jobEquipmentData) {
disconnectFromDatabase(dbConnection);
return true;
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: Saved job equipment ${jobEquipmentData.databaseId} to database`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Saved job equipment ${jobEquipmentData.databaseId} to database`);
return false;
}
@@ -1424,7 +1424,7 @@ function saveJobEquipmentItemToDatabase(jobEquipmentItemData) {
return false;
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: Saving job equipment weapon ${jobEquipmentItemData.databaseId} to database ...`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Saving job equipment weapon ${jobEquipmentItemData.databaseId} to database ...`);
let dbConnection = connectToDatabase();
if(dbConnection) {
// If job equipment item hasn't been added to database, ID will be 0
@@ -1439,7 +1439,7 @@ function saveJobEquipmentItemToDatabase(jobEquipmentItemData) {
disconnectFromDatabase(dbConnection);
return true;
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: Saved job equipment weapon ${jobEquipmentItemData.databaseId} to database`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Saved job equipment weapon ${jobEquipmentItemData.databaseId} to database`);
return false;
}
@@ -1452,7 +1452,7 @@ function saveJobUniformToDatabase(jobUniformData) {
return false;
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: Saving job uniform ${jobUniformData.databaseId} to database ...`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Saving job uniform ${jobUniformData.databaseId} to database ...`);
let dbConnection = connectToDatabase();
if(dbConnection) {
let safeName = escapeDatabaseString(dbConnection, jobUniformData.name);
@@ -1468,7 +1468,7 @@ function saveJobUniformToDatabase(jobUniformData) {
disconnectFromDatabase(dbConnection);
return true;
}
logToConsole(LOG_DEBUG, `[Asshat.Job]: Saved job uniform ${jobUniformData.databaseId} to database`);
logToConsole(LOG_DEBUG, `[VRR.Job]: Saved job uniform ${jobUniformData.databaseId} to database`);
return false;
}
@@ -1527,9 +1527,9 @@ function createJobLocationPickup(jobId, locationId) {
getJobData(jobId).locations[locationId].pickup = gta.createPickup(pickupModelId, getJobData(jobId).locations[locationId].position, getGameConfig().pickupTypes[getServerGame()].job);
getJobData(jobId).locations[locationId].pickup.dimension = getJobData(jobId).locations[locationId].dimension;
setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.owner.type", AG_PICKUP_JOB, false);
setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.owner.type", VRR_PICKUP_JOB, false);
setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.owner.id", locationId, false);
setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.label.type", AG_LABEL_JOB, true);
setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.label.type", VRR_LABEL_JOB, true);
setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.label.name", getJobData(jobId).name, true);
setEntityData(getServerData().jobs[jobId].locations[locationId].pickup, "ag.label.jobType", getJobData(jobId).databaseId, true);
addToWorld(getJobData(jobId).locations[locationId].pickup);
@@ -1630,11 +1630,11 @@ function playerArrivedAtJobRouteStop(client) {
return false;
}
if(doesPlayerHaveJobType(client, AG_JOB_BUS)) {
if(doesPlayerHaveJobType(client, VRR_JOB_BUS)) {
playerArrivedAtBusStop(client);
} else if(doesPlayerHaveJobType(client, AG_JOB_GARBAGE)) {
} else if(doesPlayerHaveJobType(client, VRR_JOB_GARBAGE)) {
playerArrivedAtGarbageStop(client);
} else if(doesPlayerHaveJobType(client, AG_JOB_POLICE)) {
} else if(doesPlayerHaveJobType(client, VRR_JOB_POLICE)) {
playerArrivedAtPolicePatrolPoint(client);
}
}