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

Fix vehicle job/clan rank

Browse Source
This commit is contained in:
Vortrex
2023-03-05 23:25:33 -06:00
parent f0d0384a41
commit cf38abac7f
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/server/vehicle.js
View File

@@ -90,6 +90,8 @@ class VehicleData {
this.lastActiveTime = false; this.lastActiveTime = false;
this.rank = 0;
if (dbAssoc) { if (dbAssoc) {
// General Info // General Info
this.databaseId = toInteger(dbAssoc["veh_id"]); this.databaseId = toInteger(dbAssoc["veh_id"]);
@@ -154,6 +156,7 @@ class VehicleData {
this.whoAdded = toInteger(dbAssoc["veh_who_added"]); this.whoAdded = toInteger(dbAssoc["veh_who_added"]);
this.whenAdded = toInteger(dbAssoc["veh_when_added"]); this.whenAdded = toInteger(dbAssoc["veh_when_added"]);
this.licensePlate = toInteger(dbAssoc["veh_license_plate"]); this.licensePlate = toInteger(dbAssoc["veh_license_plate"]);
this.rank = toInteger(dbAssoc["veh_rank"]);
} }
} }
}; };
@@ -286,6 +289,7 @@ function saveVehicleToDatabase(vehicleDataId) {
["veh_int", toInteger(tempVehicleData.interior)], ["veh_int", toInteger(tempVehicleData.interior)],
["veh_vw", toInteger(tempVehicleData.dimension)], ["veh_vw", toInteger(tempVehicleData.dimension)],
["veh_livery", toInteger(tempVehicleData.livery)], ["veh_livery", toInteger(tempVehicleData.livery)],
["veh_rank", toInteger(tempVehicleData.rank)],
["veh_radio_station", (getRadioStationData(tempVehicleData.streamingRadioStationIndex) != false) ? toInteger(getRadioStationData(tempVehicleData.streamingRadioStationIndex).databaseId) : -1], ["veh_radio_station", (getRadioStationData(tempVehicleData.streamingRadioStationIndex) != false) ? toInteger(getRadioStationData(tempVehicleData.streamingRadioStationIndex).databaseId) : -1],
]; ];
@@ -817,25 +821,32 @@ function doesPlayerHaveVehicleKeys(client, vehicle) {
if (vehicleData.ownerType == V_VEHOWNER_CLAN) { if (vehicleData.ownerType == V_VEHOWNER_CLAN) {
if (vehicleData.ownerId == getPlayerCurrentSubAccount(client).clan) { if (vehicleData.ownerId == getPlayerCurrentSubAccount(client).clan) {
if (vehicleData.clanRank <= getPlayerCurrentSubAccount(client).clanRank) { let clanIndex = getClanIndexFromDatabaseId(vehicleData.ownerId);
let clanRankIndex = getClanRankIndexFromDatabaseId(clanIndex, vehicleData.rank);
if (getClanRankData(getPlayerClan(client), getPlayerClanRank(client)).level >= getClanRankData(clanIndex, clanRankIndex).level) {
return true; return true;
} }
} }
} }
if (vehicleData.ownerType == V_VEHOWNER_FACTION) { //if (vehicleData.ownerType == V_VEHOWNER_FACTION) {
if (vehicleData.ownerId == getPlayerCurrentSubAccount(client).faction) { // if (vehicleData.ownerId == getPlayerCurrentSubAccount(client).faction) {
if (vehicleData.factionRank <= getPlayerCurrentSubAccount(client).factionRank) { // if (vehicleData.factionRank <= getPlayerCurrentSubAccount(client).factionRank) {
return true; // return true;
} // }
} // }
} //}
if (vehicleData.ownerType == V_VEHOWNER_JOB) { if (vehicleData.ownerType == V_VEHOWNER_JOB) {
if (vehicleData.ownerId == getPlayerCurrentSubAccount(client).job) { if (vehicleData.ownerId == getPlayerCurrentSubAccount(client).job) {
let jobIndex = getJobIndexFromDatabaseId(vehicleData.ownerId);
let jobRankIndex = getJobRankIndexFromDatabaseId(jobIndex, vehicleData.rank);
if (getJobRankData(getPlayerJob(client), getPlayerJobRank(client)).level >= getJobRankData(jobIndex, jobRankIndex).level) {
return true; return true;
} }
} }
}
if (vehicleData.rentedBy == client) { if (vehicleData.rentedBy == client) {
return true; return true;