Universal temp locker

This commit is contained in:
Vortrex
2022-06-17 09:39:27 -05:00
parent 731d0d6905
commit 53eaddbfce
2 changed files with 45 additions and 36 deletions

View File

@@ -18,7 +18,7 @@ const VRR_ITEM_OWNER_HOUSE = 6; // Item is in a house
const VRR_ITEM_OWNER_SAFE = 7; // Item is in a safe (safes can be anywhere)
const VRR_ITEM_OWNER_ITEM = 8; // Item is in another item (trashbag, briefcase, wallet, suitcase, crate/box, barrel, etc)
const VRR_ITEM_OWNER_GROUND = 9; // Item is on the ground
const VRR_ITEM_OWNER_JOBLOCKER = 10; // Item is in player's job locker
const VRR_ITEM_OWNER_TEMPLOCKER = 10; // Item is in player's temp locker (used for paintball, jobs, etc)
const VRR_ITEM_OWNER_LOCKER = 10; // Item is in player's locker
// ===========================================================================
@@ -103,6 +103,13 @@ const VRR_ITEM_ACTION_TAKE = 6; // Taking item (from trunk, das
// ===========================================================================
// Player Temporary Locker Types
const VRR_TEMP_LOCKER_TYPE_NONE = 0; // None
const VRR_TEMP_LOCKER_TYPE_JOB = 1; // Job locker
const VRR_TEMP_LOCKER_TYPE_PAINTBALL = 2; // Paintball locker
// ===========================================================================
class ItemData {
constructor(dbAssoc = false) {
this.databaseId = 0;
@@ -1749,11 +1756,11 @@ function deleteItem(itemId, whoDeleted = -1) {
}
break;
case VRR_ITEM_OWNER_JOBLOCKER:
case VRR_ITEM_OWNER_TEMPLOCKER:
ownerTypeString = "Job Locker";
owner = getPlayerFromCharacterId(getItemData(itemId).ownerId);
if (getPlayerData(owner) != false) {
getPlayerData(owner).jobLockerCache.splice(getPlayerData(owner).jobLockerCache.indexOf(itemId), 1);
getPlayerData(owner).tempLockerCache.splice(getPlayerData(owner).tempLockerCache.indexOf(itemId), 1);
}
break;
@@ -2220,9 +2227,9 @@ function saveItemTypeToDatabase(itemTypeId) {
// ===========================================================================
function storePlayerItemsInJobLocker(client) {
function storePlayerItemsInTempLocker(client) {
for (let i = 0; i < 9; i++) {
getPlayerData(client).jobLockerCache[i] = getPlayerData(client).hotBarItems[i];
getPlayerData(client).tempLockerCache[i] = getPlayerData(client).hotBarItems[i];
getPlayerData(client).hotBarItems[i] = -1;
}
@@ -2232,7 +2239,7 @@ function storePlayerItemsInJobLocker(client) {
// ===========================================================================
function restorePlayerJobLockerItems(client) {
function restorePlayerTempLockerItems(client) {
for (let i in getPlayerData(client).jobEquipmentCache) {
if (getPlayerData(client).jobEquipmentCache[i] != -1) {
deleteItem(getPlayerData(client).jobEquipmentCache[i]);
@@ -2240,12 +2247,13 @@ function restorePlayerJobLockerItems(client) {
}
for (let i = 0; i < 9; i++) {
getPlayerData(client).hotBarItems[i] = getPlayerData(client).jobLockerCache[i];
getPlayerData(client).jobLockerCache[i] = -1;
getPlayerData(client).hotBarItems[i] = getPlayerData(client).tempLockerCache[i];
getPlayerData(client).tempLockerCache[i] = -1;
}
cachePlayerHotBarItems(client);
updatePlayerHotBar(client);
getPlayerData(client).tempLockerType = VRR_TEMP_LOCKER_TYPE_NONE;
}
// ===========================================================================