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

Optimizations

Browse Source
This commit is contained in:
Vortrex
2022-05-17 08:55:55 -05:00
parent 9a346b2b41
commit 46cb86d25b
3 changed files with 146 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
scripts/server/business.js
View File

@@ -1712,21 +1712,33 @@ function createAllBusinessBlips() {
* *
*/ */
function createBusinessEntrancePickup(businessId) { function createBusinessEntrancePickup(businessId) {
if(!areServerElementsSupported()) {
return false;
}
if(!getServerConfig().createBusinessPickups) { if(!getServerConfig().createBusinessPickups) {
return false; return false;
} }
if(getBusinessData(businessId).entrancePickupModel != -1) { let businessData = getBusinessData(businessId);
let pickupModelId = getGameConfig().pickupModels[getGame()].Business;
if(getServerData().businesses[businessId].entrancePickupModel != 0) { //if(businessData.hasInterior) {
pickupModelId = getBusinessData(businessId).entrancePickupModel; // return false;
//}
if(businessData.entrancePickupModel == -1) {
return false;
} }
logToConsole(LOG_VERBOSE, `[VRR.Job]: Creating entrance pickup for business ${getBusinessData(businessId).name} (model ${pickupModelId})`); let pickupModelId = getGameConfig().pickupModels[getGame()].Business;
if(areServerElementsSupported()) { if(businessData.entrancePickupModel != 0) {
let entrancePickup = createGamePickup(pickupModelId, getBusinessData(businessId).entrancePosition, getGameConfig().pickupTypes[getGame()].business); pickupModelId = businessData.entrancePickupModel;
}
logToConsole(LOG_VERBOSE, `[VRR.Job]: Creating entrance pickup for business ${businessData.name} (model ${pickupModelId})`);
let entrancePickup = createGamePickup(pickupModelId, businessData.entrancePosition, getGameConfig().pickupTypes[getGame()].business);
if(entrancePickup != null) { if(entrancePickup != null) {
if(businessData.entranceDimension != -1) { if(businessData.entranceDimension != -1) {
setElementDimension(entrancePickup, businessData.entranceDimension); setElementDimension(entrancePickup, businessData.entranceDimension);
@@ -1745,12 +1757,6 @@ function createBusinessEntrancePickup(businessId) {
getBusinessData(businessId).entrancePickup = entrancePickup; getBusinessData(businessId).entrancePickup = entrancePickup;
updateBusinessPickupLabelData(businessId); updateBusinessPickupLabelData(businessId);
} }
} else {
sendBusinessToPlayer(null, businessId, getBusinessData(businessId), getBusinessData(businessId).entrancePosition, getBusinessData(businessId).entranceBlipModel, getBusinessData(businessId).entrancePickupModel, getBusinessData(businessId).hasInterior, false);
}
return true;
}
return false; return false;
} }
@@ -1775,17 +1781,23 @@ function createBusinessEntranceBlip(businessId) {
let businessData = getBusinessData(businessId); let businessData = getBusinessData(businessId);
if(businessData.entranceBlipModel != -1) { //if(businessData.hasInterior) {
// return false;
//}
if(businessData.entranceBlipModel == -1) {
return false;
}
let blipModelId = getGameConfig().blipSprites[getGame()].Business; let blipModelId = getGameConfig().blipSprites[getGame()].Business;
if(getServerData().businesses[businessId].entranceBlipModel != 0) { if(businessData.entranceBlipModel != 0) {
blipModelId = businessData.entranceBlipModel; blipModelId = businessData.entranceBlipModel;
} }
logToConsole(LOG_VERBOSE, `[VRR.Job]: Creating entrance blip for business ${businessData.name} (model ${blipModelId})`); logToConsole(LOG_VERBOSE, `[VRR.Job]: Creating entrance blip for business ${businessData.name} (model ${blipModelId})`);
if(areServerElementsSupported()) {
let entranceBlip = createGameBlip(businessData.entrancePosition, blipModelId, getColourByType("businessBlue"));
let entranceBlip = createGameBlip(businessData.entrancePosition, blipModelId, getColourByType("businessBlue"));
if(entranceBlip != null) { if(entranceBlip != null) {
if(businessData.entranceDimension != -1) { if(businessData.entranceDimension != -1) {
setElementDimension(entranceBlip, businessData.entranceDimension); setElementDimension(entranceBlip, businessData.entranceDimension);
@@ -1803,11 +1815,6 @@ function createBusinessEntranceBlip(businessId) {
setElementTransient(entranceBlip, false); setElementTransient(entranceBlip, false);
businessData.entranceBlip = entranceBlip; businessData.entranceBlip = entranceBlip;
} }
} else {
sendBusinessToPlayer(null, businessId, businessData.name, businessData.entrancePosition, blipModelId, businessData.entrancePickupModel, businessData.hasInterior, false);
}
}
} }
// =========================================================================== // ===========================================================================
@@ -1820,6 +1827,10 @@ function createBusinessEntranceBlip(businessId) {
* *
*/ */
function createBusinessExitPickup(businessId) { function createBusinessExitPickup(businessId) {
if(!areServerElementsSupported()) {
return false;
}
if(!getServerConfig().createBusinessPickups) { if(!getServerConfig().createBusinessPickups) {
return false; return false;
} }
@@ -1827,16 +1838,21 @@ function createBusinessExitPickup(businessId) {
let businessData = getBusinessData(businessId); let businessData = getBusinessData(businessId);
if(businessData.hasInterior) { if(businessData.hasInterior) {
if(businessData.exitPickupModel != -1) { return false;
let pickupModelId = getGameConfig().pickupModels[getGame()].Exit; }
if(getServerData().businesses[businessId].exitPickupModel != 0) { if(businessData.entrancePickupModel == -1) {
return false;
}
let pickupModelId = getGameConfig().pickupModels[getGame()].Business;
if(businessData.exitPickupModel != 0) {
pickupModelId = businessData.exitPickupModel; pickupModelId = businessData.exitPickupModel;
} }
logToConsole(LOG_VERBOSE, `[VRR.Job]: Creating exit pickup for business ${businessData.name} (model ${pickupModelId})`); logToConsole(LOG_VERBOSE, `[VRR.Job]: Creating exit pickup for business ${businessData.name} (model ${pickupModelId})`);
if(areServerElementsSupported()) {
let exitPickup = createGamePickup(pickupModelId, businessData.exitPosition, getGameConfig().pickupTypes[getGame()].business); let exitPickup = createGamePickup(pickupModelId, businessData.exitPosition, getGameConfig().pickupTypes[getGame()].business);
if(exitPickup != null) { if(exitPickup != null) {
if(businessData.exitDimension != -1) { if(businessData.exitDimension != -1) {
@@ -1857,9 +1873,6 @@ function createBusinessExitPickup(businessId) {
updateBusinessPickupLabelData(businessId); updateBusinessPickupLabelData(businessId);
} }
} }
}
}
}
// =========================================================================== // ===========================================================================
@@ -1871,6 +1884,10 @@ function createBusinessExitPickup(businessId) {
* *
*/ */
function createBusinessExitBlip(businessId) { function createBusinessExitBlip(businessId) {
if(!areServerElementsSupported()) {
return false;
}
if(!getServerConfig().createBusinessBlips) { if(!getServerConfig().createBusinessBlips) {
return false; return false;
} }
@@ -1878,14 +1895,19 @@ function createBusinessExitBlip(businessId) {
let businessData = getBusinessData(businessId); let businessData = getBusinessData(businessId);
if(businessData.hasInterior) { if(businessData.hasInterior) {
if(businessData.exitBlipModel != -1) { return false;
}
if(businessData.exitBlipModel == -1) {
return false;
}
let blipModelId = getGameConfig().blipSprites[getGame()].Business; let blipModelId = getGameConfig().blipSprites[getGame()].Business;
if(getServerData().businesses[businessId].exitBlipModel != 0) { if(businessData.exitBlipModel != 0) {
blipModelId = businessData.exitBlipModel; blipModelId = businessData.exitBlipModel;
} }
if(areServerElementsSupported()) {
logToConsole(LOG_VERBOSE, `[VRR.Job]: Creating exit blip for business ${businessData.name} (model ${blipModelId})`); logToConsole(LOG_VERBOSE, `[VRR.Job]: Creating exit blip for business ${businessData.name} (model ${blipModelId})`);
let exitBlip = createGameBlip(businessData.exitPosition, blipModelId, 1, getColourByName("businessBlue")); let exitBlip = createGameBlip(businessData.exitPosition, blipModelId, 1, getColourByName("businessBlue"));
@@ -1907,9 +1929,6 @@ function createBusinessExitBlip(businessId) {
businessData.exitBlip = exitBlip; businessData.exitBlip = exitBlip;
} }
} }
}
}
}
// =========================================================================== // ===========================================================================
@@ -2475,17 +2494,14 @@ function cacheAllBusinessItems() {
// Caches all items for a business by businessId // Caches all items for a business by businessId
function cacheBusinessItems(businessId) { function cacheBusinessItems(businessId) {
getBusinessData(businessId).floorItemCache.splice(0, getBusinessData(businessId).floorItemCache.length); clearArray(getBusinessData(businessId).floorItemCache);
getBusinessData(businessId).storageItemCache.splice(0, getBusinessData(businessId).storageItemCache.length); clearArray(getBusinessData(businessId).storageItemCache);
let businessData = getBusinessData(businessId);
logToConsole(LOG_VERBOSE, `[VRR.Business] Caching business items for business ${businessId} (${businessData.name}) ...`);
getBusinessData(businessId).floorItemCache = getServerData().items.filter(item => item.ownerType == VRR_ITEM_OWNER_BIZFLOOR && item.ownerId == businessData.databaseId);
getBusinessData(businessId).storageItemCache = getServerData().items.filter(item => item.ownerType == VRR_ITEM_OWNER_BIZSTORAGE && item.ownerId == businessData.databaseId);
logToConsole(LOG_VERBOSE, `[VRR.Business] Caching business items for business ${businessId} (${getBusinessData(businessId).name}) ...`);
for(let i in getServerData().items) {
if(getItemData(i).ownerType == VRR_ITEM_OWNER_BIZFLOOR && getItemData(i).ownerId == getBusinessData(businessId).databaseId) {
getBusinessData(businessId).floorItemCache.push(i);
} else if(getItemData(i).ownerType == VRR_ITEM_OWNER_BIZSTORAGE && getItemData(i).ownerId == getBusinessData(businessId).databaseId) {
getBusinessData(businessId).storageItemCache.push(i);
}
}
logToConsole(LOG_VERBOSE, `[VRR.Business] Successfully cached ${getBusinessData(businessId).floorItemCache.length} floor items and ${getBusinessData(businessId).storageItemCache} storage items for business ${businessId} (${getBusinessData(businessId).name})!`); logToConsole(LOG_VERBOSE, `[VRR.Business] Successfully cached ${getBusinessData(businessId).floorItemCache.length} floor items and ${getBusinessData(businessId).storageItemCache} storage items for business ${businessId} (${getBusinessData(businessId).name})!`);
} }

21
scripts/server/house.js
View File

@@ -841,7 +841,7 @@ function createAllHouseBlips() {
// =========================================================================== // ===========================================================================
function createHouseEntrancePickup(houseId) { function createHouseEntrancePickup(houseId) {
if(areServerElementsSupported()) { if(!areServerElementsSupported()) {
return false; return false;
} }
@@ -885,7 +885,7 @@ function createHouseEntrancePickup(houseId) {
// =========================================================================== // ===========================================================================
function createHouseEntranceBlip(houseId) { function createHouseEntranceBlip(houseId) {
if(areServerElementsSupported()) { if(!areServerElementsSupported()) {
return false; return false;
} }
@@ -938,7 +938,7 @@ function createHouseEntranceBlip(houseId) {
// =========================================================================== // ===========================================================================
function createHouseExitPickup(houseId) { function createHouseExitPickup(houseId) {
if(areServerElementsSupported()) { if(!areServerElementsSupported()) {
return false; return false;
} }
@@ -966,9 +966,9 @@ function createHouseExitPickup(houseId) {
pickupModelId = houseData.exitPickupModel; pickupModelId = houseData.exitPickupModel;
} }
let exitPickup = createGamePickup(pickupModelId, getHouseData(houseId).exitPosition, getGameConfig().pickupTypes[getGame()].house); let exitPickup = createGamePickup(pickupModelId, houseData.exitPosition, getGameConfig().pickupTypes[getGame()].house);
if(exitPickup != null) { if(exitPickup != null) {
setElementDimension(exitPickup, getHouseData(houseId).exitDimension); setElementDimension(exitPickup, houseData.exitDimension);
setElementOnAllDimensions(exitPickup, false); setElementOnAllDimensions(exitPickup, false);
setElementStreamInDistance(exitPickup, getGlobalConfig().housePickupStreamInDistance); setElementStreamInDistance(exitPickup, getGlobalConfig().housePickupStreamInDistance);
setElementStreamOutDistance(exitPickup, getGlobalConfig().housePickupStreamOutDistance); setElementStreamOutDistance(exitPickup, getGlobalConfig().housePickupStreamOutDistance);
@@ -977,13 +977,12 @@ function createHouseExitPickup(houseId) {
getHouseData(houseId).exitPickup = exitPickup; getHouseData(houseId).exitPickup = exitPickup;
updateHousePickupLabelData(houseId); updateHousePickupLabelData(houseId);
} }
} }
// =========================================================================== // ===========================================================================
function createHouseExitBlip(houseId) { function createHouseExitBlip(houseId) {
if(areServerElementsSupported()) { if(!areServerElementsSupported()) {
return false; return false;
} }
@@ -1005,13 +1004,13 @@ function createHouseExitBlip(houseId) {
return false; return false;
} }
let blipModelId = getGameConfig().blipSprites[getGame()].House; let blipModelId = getGameConfig().blipSprites[getGame()].Exit;
if(getServerData().houses[houseId].exitBlipModel != 0) { if(getServerData().houses[houseId].exitBlipModel != 0) {
blipModelId = getHouseData(houseId).exitBlipModel; blipModelId = houseData.exitBlipModel;
} }
let exitBlip = createGameBlip(blipModelId, getHouseData(houseId).exitPosition, 1, getColourByName("houseGreen")); let exitBlip = createGameBlip(houseData.exitPosition, blipModelId, 1, getColourByName("houseGreen"));
if(exitBlip != null) { if(exitBlip != null) {
if(houseData.exitDimension != -1) { if(houseData.exitDimension != -1) {
setElementDimension(exitBlip, houseData.exitDimension); setElementDimension(exitBlip, houseData.exitDimension);
@@ -1567,7 +1566,7 @@ function updateHousePickupLabelData(houseId) {
setEntityData(houseData.entrancePickup, "vrr.owner.type", VRR_PICKUP_HOUSE_ENTRANCE, false); setEntityData(houseData.entrancePickup, "vrr.owner.type", VRR_PICKUP_HOUSE_ENTRANCE, false);
setEntityData(houseData.entrancePickup, "vrr.owner.id", houseId, false); setEntityData(houseData.entrancePickup, "vrr.owner.id", houseId, false);
setEntityData(houseData.entrancePickup, "vrr.label.type", VRR_LABEL_HOUSE, true); setEntityData(houseData.entrancePickup, "vrr.label.type", VRR_LABEL_HOUSE, true);
//setEntityData(houseData.entrancePickup, "vrr.label.name", houseData.description, true); setEntityData(houseData.entrancePickup, "vrr.label.name", houseData.description, true);
setEntityData(houseData.entrancePickup, "vrr.label.locked", houseData.locked, true); setEntityData(houseData.entrancePickup, "vrr.label.locked", houseData.locked, true);
if(houseData.buyPrice > 0) { if(houseData.buyPrice > 0) {
setEntityData(houseData.entrancePickup, "vrr.label.price", houseData.buyPrice, true); setEntityData(houseData.entrancePickup, "vrr.label.price", houseData.buyPrice, true);

26
scripts/server/item.js
View File

@@ -1383,13 +1383,9 @@ function setAllItemTypeDataIndexes() {
// =========================================================================== // ===========================================================================
function cacheAllGroundItems() { function cacheAllGroundItems() {
getServerData().groundItemCache = []; clearArray(getServerData().groundItemCache);
getServerData().groundItemCache = getServerData().items.filter(item => item.ownerType == VRR_ITEM_OWNER_GROUND);
for(let i in getServerData().items) { getServerData().groundPlantCache = getServerData().items.filter(item => item.ownerType == VRR_ITEM_OWNER_PLANT);
if(getServerData().items[i].ownerType == VRR_ITEM_OWNER_GROUND) {
getServerData().groundItemCache.push(i);
}
}
} }
// =========================================================================== // ===========================================================================
@@ -1425,19 +1421,11 @@ function cachePlayerHotBarItems(client) {
return false; return false;
} }
for(let i = 0 ; i < 9 ; i++) { clearArray(getPlayerData(client).hotBarItems);
getPlayerData(client).hotBarItems[i] = -1; getPlayerData(client).hotBarItems = getServerData().items.filter(item => item.ownerType == VRR_ITEM_OWNER_PLAYER && item.ownerId == getPlayerCurrentSubAccount(client).databaseId);
}
for(let i in getServerData().items) { if(getPlayerData(client).hotBarItems.length < getGlobalConfig().maxPlayerItemSlots) {
if(getItemData(i).ownerType == VRR_ITEM_OWNER_PLAYER) { getPlayerData(client).hotBarItems.concat(Array(getGlobalConfig().maxPlayerItemSlots-getPlayerData(client).hotBarItems.length).fill(-1));
if(getItemData(i).ownerId == getPlayerCurrentSubAccount(client).databaseId) {
let firstSlot = getPlayerFirstEmptyHotBarSlot(client);
if(firstSlot != -1) {
getPlayerData(client).hotBarItems[firstSlot] = i;
}
}
}
} }
} }