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

Fix biz info and house info

Browse Source
This commit is contained in:
Vortrex
2022-05-19 18:53:22 -05:00
parent 90aeb67667
commit 6cee9a257d
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/server/business.js
View File

@@ -701,18 +701,20 @@ function getBusinessInfoCommand(command, params, client) {
return false; return false;
} }
let businessData = getBusinessData(businessId);
let ownerName = "Unknown"; let ownerName = "Unknown";
switch(getBusinessData(businessId).ownerType) { switch(businessData.ownerType) {
case VRR_BIZOWNER_CLAN: case VRR_BIZOWNER_CLAN:
ownerName = getClanData(getBusinessData(businessId).ownerId).name; ownerName = getClanData(businessData.ownerId).name;
break; break;
case VRR_BIZOWNER_JOB: case VRR_BIZOWNER_JOB:
ownerName = getJobData(getBusinessData(businessId).ownerId).name; ownerName = getJobData(businessData.ownerId).name;
break; break;
case VRR_BIZOWNER_PLAYER: case VRR_BIZOWNER_PLAYER:
let subAccountData = loadSubAccountFromId(getBusinessData(businessId).ownerId); let subAccountData = loadSubAccountFromId(businessData.ownerId);
ownerName = `${subAccountData.firstName} ${subAccountData.lastName} [${subAccountData.databaseId}]`; ownerName = `${subAccountData.firstName} ${subAccountData.lastName} [${subAccountData.databaseId}]`;
break; break;
@@ -730,11 +732,11 @@ function getBusinessInfoCommand(command, params, client) {
break; break;
} }
let businessData = getBusinessData(businessId);
let tempStats = [ let tempStats = [
[`Name`, `${businessData.name}`], [`Name`, `${businessData.name}`],
[`ID`, `${businessData.index}/${businessData.databaseId}`], [`ID`, `${businessData.index}/${businessData.databaseId}`],
[`Owner`, `${ownerName}`], [`Owner`, `${ownerName} (${getBusinessOwnerTypeText(businessData.ownerType)})`],
[`Locked`, `${getLockedUnlockedFromBool(businessData.locked)}`], [`Locked`, `${getLockedUnlockedFromBool(businessData.locked)}`],
[`BuyPrice`, `${businessData.buyPrice}`], [`BuyPrice`, `${businessData.buyPrice}`],
[`RentPrice`, `${businessData.rentPrice}`], [`RentPrice`, `${businessData.rentPrice}`],
@@ -748,7 +750,7 @@ function getBusinessInfoCommand(command, params, client) {
[`LabelHelpType`, `${businessData.labelHelpType}`], [`LabelHelpType`, `${businessData.labelHelpType}`],
]; ];
let stats = tempStats.map(stat => `{MAINCOLOUR}${stat[0]}: {ALTCOLOUR}${stat[1]}`); let stats = tempStats.map(stat => `{MAINCOLOUR}${stat[0]}: {ALTCOLOUR}${stat[1]}{MAINCOLOUR}`);
messagePlayerNormal(client, makeChatBoxSectionHeader(getLocaleString(client, "HeaderBusinessInfo", businessData.name))); messagePlayerNormal(client, makeChatBoxSectionHeader(getLocaleString(client, "HeaderBusinessInfo", businessData.name)));
let chunkedList = splitArrayIntoChunks(stats, 6); let chunkedList = splitArrayIntoChunks(stats, 6);
@@ -1837,15 +1839,15 @@ function createBusinessExitPickup(businessId) {
let businessData = getBusinessData(businessId); let businessData = getBusinessData(businessId);
if(businessData.hasInterior) { //if(!businessData.hasInterior) {
// return false;
//}
if(businessData.exitPickupModel == -1) {
return false; return false;
} }
if(businessData.entrancePickupModel == -1) { let pickupModelId = getGameConfig().pickupModels[getGame()].Exit;
return false;
}
let pickupModelId = getGameConfig().pickupModels[getGame()].Business;
if(businessData.exitPickupModel != 0) { if(businessData.exitPickupModel != 0) {
pickupModelId = businessData.exitPickupModel; pickupModelId = businessData.exitPickupModel;
@@ -1894,9 +1896,9 @@ function createBusinessExitBlip(businessId) {
let businessData = getBusinessData(businessId); let businessData = getBusinessData(businessId);
if(businessData.hasInterior) { //if(!businessData.hasInterior) {
return false; // return false;
} //}
if(businessData.exitBlipModel == -1) { if(businessData.exitBlipModel == -1) {
return false; return false;