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

Fix veh min rank + add who/when added

Browse Source
This commit is contained in:
Vortrex
2023-03-07 21:01:23 -06:00
parent 1cc54d4dd9
commit 79e351cf8f
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/server/vehicle.js
View File

@@ -92,6 +92,9 @@ class VehicleData {
this.rank = 0; this.rank = 0;
this.whoAdded = 0;
this.whenAdded = 0;
if (dbAssoc) { if (dbAssoc) {
// General Info // General Info
this.databaseId = toInteger(dbAssoc["veh_id"]); this.databaseId = toInteger(dbAssoc["veh_id"]);
@@ -821,9 +824,7 @@ 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) {
let clanIndex = getClanIndexFromDatabaseId(vehicleData.ownerId); if (getClanRankData(getPlayerClan(client), getPlayerClanRank(client)).level >= vehicleData.rank) {
let clanRankIndex = getClanRankIndexFromDatabaseId(clanIndex, vehicleData.rank);
if (getClanRankData(getPlayerClan(client), getPlayerClanRank(client)).level >= getClanRankData(clanIndex, clanRankIndex).level) {
return true; return true;
} }
} }
@@ -839,10 +840,7 @@ function doesPlayerHaveVehicleKeys(client, vehicle) {
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); if (getJobRankData(getPlayerJob(client), getPlayerJobRank(client)).level >= vehicleData.rank) {
let jobRankIndex = getJobRankIndexFromDatabaseId(jobIndex, vehicleData.rank);
if (getJobRankData(getPlayerJob(client), getPlayerJobRank(client)).level >= getJobRankData(jobIndex, jobRankIndex).level) {
return true; return true;
} }
} }
@@ -938,8 +936,13 @@ function setVehicleRankCommand(command, params, client) {
return false; return false;
} }
if (isNaN(params)) {
messagePlayerError(client, getLocaleString(client, "MustBeNumber"));
return false;
}
let vehicle = getPlayerVehicle(client); let vehicle = getPlayerVehicle(client);
let rankId = params; let level = toInteger(params);
if (!getVehicleData(vehicle)) { if (!getVehicleData(vehicle)) {
messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled")); messagePlayerError(client, getLocaleString(client, "RandomVehicleCommandsDisabled"));
@@ -947,16 +950,11 @@ function setVehicleRankCommand(command, params, client) {
} }
if (getVehicleData(vehicle).ownerType == V_VEHOWNER_CLAN) { if (getVehicleData(vehicle).ownerType == V_VEHOWNER_CLAN) {
rankId = getClanRankFromParams(getVehicleData(vehicle).ownerId, params); getVehicleData(vehicle).rank = level
if (!getClanRankData(getVehicleData(vehicle).ownerId, rankId)) { messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} set their {vehiclePurple}${getVehicleName(vehicle)}{MAINCOLOUR} minimum rank to {ALTCOLOUR}${level}{MAINCOLOUR} of the {clanOrange}${getClanData(getVehicleData(vehicle).ownerId).name}{MAINCOLOUR} clan!`, true);
messagePlayerError(client, getLocaleString(client, "InvalidClanRank"));
return false;
}
getVehicleData(vehicle).rank = getClanRankData(getVehicleData(vehicle).ownerId, rankId).databaseId;
messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} set their {vehiclePurple}${getVehicleName(vehicle)}{MAINCOLOUR} minimum rank to {ALTCOLOUR}${getClanRankData(getVehicleData(vehicle).ownerId, rankId).name}{MAINCOLOUR} of the {clanOrange}${getClanData(getVehicleData(vehicle).ownerId).name}{MAINCOLOUR} clan!`, true);
} else if (getVehicleData(vehicle).ownerType == V_VEHOWNER_JOB) { } else if (getVehicleData(vehicle).ownerType == V_VEHOWNER_JOB) {
getVehicleData(vehicle).rank = rankId; getVehicleData(vehicle).rank = level;
messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} set their {vehiclePurple}${getVehicleName(vehicle)}{MAINCOLOUR} minimum rank to {ALTCOLOUR}${rankId}{MAINCOLOUR} of the {jobYellow}${getJobData(getJobIdFromDatabaseId(getVehicleData(vehicle).ownerId)).name}{MAINCOLOUR} job!`, true); messageAdmins(`{adminOrange}${getPlayerName(client)}{MAINCOLOUR} set their {vehiclePurple}${getVehicleName(vehicle)}{MAINCOLOUR} minimum rank to {ALTCOLOUR}${level}{MAINCOLOUR} of the {jobYellow}${getJobData(getJobIdFromDatabaseId(getVehicleData(vehicle).ownerId)).name}{MAINCOLOUR} job!`, true);
} }
getVehicleData(vehicle).needsSaved = true; getVehicleData(vehicle).needsSaved = true;
@@ -1238,7 +1236,8 @@ function getVehicleInfoCommand(command, params, client) {
[`Colour`, `${getVehicleColourInfoString(vehicleData.colour1, vehicleData.colour1IsRGBA)}, ${getVehicleColourInfoString(vehicleData.colour1, vehicleData.colour1IsRGBA)}`], [`Colour`, `${getVehicleColourInfoString(vehicleData.colour1, vehicleData.colour1IsRGBA)}, ${getVehicleColourInfoString(vehicleData.colour1, vehicleData.colour1IsRGBA)}`],
[`Last Driver`, `${vehicleData.lastDriverName}`], [`Last Driver`, `${vehicleData.lastDriverName}`],
[`Added By`, `${loadAccountFromId(vehicleData.whoAdded).name}`], [`Added By`, `${loadAccountFromId(vehicleData.whoAdded).name}`],
[`Added On`, `${new Date(vehicleData.whenAdded * 1000).toLocaleDateString("en-GB")}}`], [`Added On`, `${new Date(vehicleData.whenAdded).toLocaleDateString("en-GB")}`],
[`Rank Level`, `${vehicleData.rank}`],
]; ];
let stats = tempStats.map(stat => `{chatBoxListIndex}${stat[0]}: {ALTCOLOUR}${stat[1]}{MAINCOLOUR}`); let stats = tempStats.map(stat => `{chatBoxListIndex}${stat[0]}: {ALTCOLOUR}${stat[1]}{MAINCOLOUR}`);