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

Don't check if house has interior (-1 disables blip/pickup)

Browse Source
This commit is contained in:
Vortrex
2022-05-19 18:55:51 -05:00
parent 44e56449e3
commit e35871b2e1
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/server/house.js
View File

@@ -952,9 +952,9 @@ function createHouseExitPickup(houseId) {
let houseData = getHouseData(houseId); let houseData = getHouseData(houseId);
if(houseData.hasInterior) { //if(houseData.hasInterior) {
return false; // return false;
} //}
if(houseData.exitPickupModel == -1) { if(houseData.exitPickupModel == -1) {
return false; return false;
@@ -996,9 +996,9 @@ function createHouseExitBlip(houseId) {
let houseData = getHouseData(houseId); let houseData = getHouseData(houseId);
if(houseData.hasInterior) { //if(houseData.hasInterior) {
return false; // return false;
} //}
if(houseData.exitBlipModel == -1) { if(houseData.exitBlipModel == -1) {
return false; return false;
@@ -1082,14 +1082,16 @@ function getHouseInfoCommand(command, params, client) {
return false; return false;
} }
let houseData = getHouseData(houseId);
let ownerName = "Unknown"; let ownerName = "Unknown";
switch(getHouseData(houseId).ownerType) { switch(getHouseData(houseId).ownerType) {
case VRR_HOUSEOWNER_CLAN: case VRR_HOUSEOWNER_CLAN:
ownerName = getClanData(getHouseData(houseId).ownerId).name; ownerName = getClanData(houseData).name;
break; break;
case VRR_HOUSEOWNER_PLAYER: case VRR_HOUSEOWNER_PLAYER:
let subAccountData = loadSubAccountFromId(getHouseData(houseId).ownerId); let subAccountData = loadSubAccountFromId(houseData.ownerId);
ownerName = `${subAccountData.firstName} ${subAccountData.lastName} [${subAccountData.databaseId}]`; ownerName = `${subAccountData.firstName} ${subAccountData.lastName} [${subAccountData.databaseId}]`;
break; break;
@@ -1101,16 +1103,20 @@ function getHouseInfoCommand(command, params, client) {
ownerName = "Public"; ownerName = "Public";
break; break;
case VRR_HOUSEOWNER_BIZ:
ownerName = getBusinessDataFromDatabaseId(houseData.ownerId).name;
break;
case VRR_HOUSEOWNER_JOB: case VRR_HOUSEOWNER_JOB:
ownerName = getJobData(getHouseData(houseId).ownerId).name; ownerName = getJobData(houseData.ownerId).name;
break; break;
} }
let houseData = getHouseData(businessId);
let tempStats = [ let tempStats = [
[`Name`, `${houseData.description}`], [`Name`, `${houseData.description}`],
[`ID`, `${houseData.index}/${houseData.databaseId}`], [`ID`, `${houseData.index}/${houseData.databaseId}`],
[`Owner`, `${ownerName}`], [`Owner`, `${ownerName} (${getHouseOwnerTypeText(houseData.ownerType)})`],
[`Locked`, `${getLockedUnlockedFromBool(houseData.locked)}`], [`Locked`, `${getLockedUnlockedFromBool(houseData.locked)}`],
[`BuyPrice`, `${houseData.buyPrice}`], [`BuyPrice`, `${houseData.buyPrice}`],
[`RentPrice`, `${houseData.rentPrice}`], [`RentPrice`, `${houseData.rentPrice}`],
@@ -1120,7 +1126,7 @@ function getHouseInfoCommand(command, params, client) {
[`RadioStation`, `${houseData.streamingRadioStation}`], [`RadioStation`, `${houseData.streamingRadioStation}`],
]; ];
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, "HeaderHouseInfo", houseData.description))); messagePlayerNormal(client, makeChatBoxSectionHeader(getLocaleString(client, "HeaderHouseInfo", houseData.description)));
let chunkedList = splitArrayIntoChunks(stats, 6); let chunkedList = splitArrayIntoChunks(stats, 6);