From b81a3db9ffd7f3ed3b4fc8c07853a9059446e410 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 20 Sep 2022 02:26:12 -0500
Subject: [PATCH] Fix client house/biz stuff

---
 scripts/client/business.js | 36 +++++++++++++++++++++++++-----------
 scripts/client/house.js    | 36 +++++++++++++++++++++++++-----------
 2 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/scripts/client/business.js b/scripts/client/business.js
index 49fb1911..ac882f34 100644
--- a/scripts/client/business.js
+++ b/scripts/client/business.js
@@ -17,6 +17,8 @@ class BusinessData {
 		this.blipModel = blipModel;
 		this.pickupModel = pickupModel;
 		this.hasInterior = hasInterior;
+		this.rentPrice = 0;
+		this.buyPrice = 0;
 		this.hasItems = hasItems;
 		this.blipId = -1;
 		this.labelInfoType = 0;
@@ -25,10 +27,10 @@ class BusinessData {
 
 // ===========================================================================
 
-function receiveBusinessFromServer(businessId, name, entrancePosition, blipModel, pickupModel, hasInterior, hasItems) {
-	logToConsole(LOG_DEBUG, `[VRR.Business] Received business ${businessId} (${name}) from server`);
+function receiveBusinessFromServer(businessId, name, entrancePosition, blipModel, pickupModel, buyPrice, rentPrice, hasInterior, hasItems) {
+	logToConsole(LOG_DEBUG, `[AGRP.Business] Received business ${businessId} (${name}) from server`);
 
-	if (!areServerElementsSupported()) {
+	if (!areServerElementsSupported() || getGame() == AGRP_GAME_MAFIA_ONE) {
 		if (getBusinessData(businessId) != false) {
 			let businessData = getBusinessData(businessId);
 			businessData.name = name;
@@ -36,12 +38,24 @@ function receiveBusinessFromServer(businessId, name, entrancePosition, blipModel
 			businessData.blipModel = blipModel;
 			businessData.pickupModel = pickupModel;
 			businessData.hasInterior = hasInterior;
+			businessData.buyPrice = buyPrice;
+			businessData.rentPrice = rentPrice;
 			businessData.hasItems = hasItems;
 
-			logToConsole(LOG_DEBUG, `[VRR.Business] Business ${businessId} already exists. Checking blip ...`);
+			if (hasInterior && !hasItems) {
+				businessData.labelInfoType = AGRP_PROPLABEL_INFO_ENTER;
+			} else if (!hasInterior && hasItems) {
+				businessData.labelInfoType = AGRP_PROPLABEL_INFO_BUY;
+			} else {
+				if (businessData.buyPrice > 0) {
+					businessData.labelInfoType = AGRP_PROPLABEL_INFO_BUYBIZ;
+				}
+			}
+
+			logToConsole(LOG_DEBUG, `[AGRP.Business] Business ${businessId} already exists. Checking blip ...`);
 			if (blipModel == -1) {
 				if (businessData.blipId != -1) {
-					logToConsole(LOG_DEBUG, `[VRR.Business] Business ${businessId}'s blip has been removed by the server`);
+					logToConsole(LOG_DEBUG, `[AGRP.Business] Business ${businessId}'s blip has been removed by the server`);
 					if (getGame() == AGRP_GAME_GTA_IV) {
 						natives.removeBlipAndClearIndex(getBusinessData(businessId).blipId);
 					} else {
@@ -51,11 +65,11 @@ function receiveBusinessFromServer(businessId, name, entrancePosition, blipModel
 					//businesses.splice(businessData.index, 1);
 					//setAllBusinessDataIndexes();
 				} else {
-					logToConsole(LOG_DEBUG, `[VRR.Business] Business ${businessId}'s blip is unchanged`);
+					logToConsole(LOG_DEBUG, `[AGRP.Business] Business ${businessId}'s blip is unchanged`);
 				}
 			} else {
 				if (businessData.blipId != -1) {
-					logToConsole(LOG_DEBUG, `[VRR.Business] Business ${businessId}'s blip has been changed by the server`);
+					logToConsole(LOG_DEBUG, `[AGRP.Business] Business ${businessId}'s blip has been changed by the server`);
 					if (getGame() == AGRP_GAME_GTA_IV) {
 						natives.setBlipCoordinates(businessData.blipId, businessData.entrancePosition);
 						natives.changeBlipSprite(businessData.blipId, businessData.blipModel);
@@ -68,20 +82,20 @@ function receiveBusinessFromServer(businessId, name, entrancePosition, blipModel
 					if (blipId != -1) {
 						tempBusinessData.blipId = blipId;
 					}
-					logToConsole(LOG_DEBUG, `[VRR.Business] Business ${businessId}'s blip has been added by the server (Model ${blipModel}, ID ${blipId})`);
+					logToConsole(LOG_DEBUG, `[AGRP.Business] Business ${businessId}'s blip has been added by the server (Model ${blipModel}, ID ${blipId})`);
 				}
 			}
 		} else {
-			logToConsole(LOG_DEBUG, `[VRR.Business] Business ${businessId} doesn't exist. Adding ...`);
+			logToConsole(LOG_DEBUG, `[AGRP.Business] Business ${businessId} doesn't exist. Adding ...`);
 			let tempBusinessData = new BusinessData(businessId, name, entrancePosition, blipModel, pickupModel, hasInterior, hasItems);
 			if (blipModel != -1) {
 				let blipId = createGameBlip(tempBusinessData.blipModel, tempBusinessData.entrancePosition, tempBusinessData.name);
 				if (blipId != -1) {
 					tempBusinessData.blipId = blipId;
 				}
-				logToConsole(LOG_DEBUG, `[VRR.Business] Business ${businessId}'s blip has been added by the server (Model ${blipModel}, ID ${blipId})`);
+				logToConsole(LOG_DEBUG, `[AGRP.Business] Business ${businessId}'s blip has been added by the server (Model ${blipModel}, ID ${blipId})`);
 			} else {
-				logToConsole(LOG_DEBUG, `[VRR.Business] Business ${businessId} has no blip.`);
+				logToConsole(LOG_DEBUG, `[AGRP.Business] Business ${businessId} has no blip.`);
 			}
 			getServerData().businesses.push(tempBusinessData);
 			setAllBusinessDataIndexes();
diff --git a/scripts/client/house.js b/scripts/client/house.js
index 26a7df8c..ef809fdb 100644
--- a/scripts/client/house.js
+++ b/scripts/client/house.js
@@ -17,16 +17,18 @@ class HouseData {
 		this.blipModel = blipModel;
 		this.pickupModel = pickupModel;
 		this.hasInterior = hasInterior;
+		this.rentPrice = 0;
+		this.buyPrice = 0;
 		this.blipId = -1;
 	}
 }
 
 // ===========================================================================
 
-function receiveHouseFromServer(houseId, description, entrancePosition, blipModel, pickupModel, hasInterior) {
-	logToConsole(LOG_DEBUG, `[VRR.House] Received house ${houseId} (${name}) from server`);
+function receiveHouseFromServer(houseId, description, entrancePosition, blipModel, pickupModel, buyPrice, rentPrice, hasInterior) {
+	logToConsole(LOG_DEBUG, `[AGRP.House] Received house ${houseId} (${name}) from server`);
 
-	if (!areServerElementsSupported()) {
+	if (!areServerElementsSupported() || getGame() == AGRP_GAME_MAFIA_ONE) {
 		if (getHouseData(houseId) != false) {
 			let houseData = getHouseData(houseId);
 			houseData.description = description;
@@ -34,11 +36,23 @@ function receiveHouseFromServer(houseId, description, entrancePosition, blipMode
 			houseData.blipModel = blipModel;
 			houseData.pickupModel = pickupModel;
 			houseData.hasInterior = hasInterior;
+			houseData.buyPrice = buyPrice;
+			houseData.rentPrice = rentPrice;
 
-			logToConsole(LOG_DEBUG, `[VRR.House] House ${houseId} already exists. Checking blip ...`);
+			if (houseData.buyPrice > 0) {
+				houseData.labelInfoType = AGRP_PROPLABEL_INFO_BUYHOUSE;
+			} else {
+				if (houseData.rentPrice > 0) {
+					houseData.labelInfoType = AGRP_PROPLABEL_INFO_RENTHOUSE;
+				} else {
+					houseData.labelInfoType = AGRP_PROPLABEL_INFO_ENTER;
+				}
+			}
+
+			logToConsole(LOG_DEBUG, `[AGRP.House] House ${houseId} already exists. Checking blip ...`);
 			if (blipModel == -1) {
 				if (houseData.blipId != -1) {
-					logToConsole(LOG_DEBUG, `[VRR.House] House ${houseId}'s blip has been removed by the server`);
+					logToConsole(LOG_DEBUG, `[AGRP.House] House ${houseId}'s blip has been removed by the server`);
 					if (getGame() == AGRP_GAME_GTA_IV) {
 						natives.removeBlipAndClearIndex(getHouseData(houseId).blipId);
 					} else {
@@ -46,11 +60,11 @@ function receiveHouseFromServer(houseId, description, entrancePosition, blipMode
 					}
 					houseData.blipId = -1;
 				} else {
-					logToConsole(LOG_DEBUG, `[VRR.House] House ${houseId}'s blip is unchanged`);
+					logToConsole(LOG_DEBUG, `[AGRP.House] House ${houseId}'s blip is unchanged`);
 				}
 			} else {
 				if (houseData.blipId != -1) {
-					logToConsole(LOG_DEBUG, `[VRR.House] House ${houseId}'s blip has been changed by the server`);
+					logToConsole(LOG_DEBUG, `[AGRP.House] House ${houseId}'s blip has been changed by the server`);
 					if (getGame() == AGRP_GAME_GTA_IV) {
 						natives.setBlipCoordinates(houseData.blipId, houseData.entrancePosition);
 						natives.changeBlipSprite(houseData.blipId, houseData.blipModel);
@@ -63,20 +77,20 @@ function receiveHouseFromServer(houseId, description, entrancePosition, blipMode
 					if (blipId != -1) {
 						houseData.blipId = blipId;
 					}
-					logToConsole(LOG_DEBUG, `[VRR.House] House ${houseId}'s blip has been added by the server (Model ${blipModel}, ID ${blipId})`);
+					logToConsole(LOG_DEBUG, `[AGRP.House] House ${houseId}'s blip has been added by the server (Model ${blipModel}, ID ${blipId})`);
 				}
 			}
 		} else {
-			logToConsole(LOG_DEBUG, `[VRR.House] House ${houseId} doesn't exist. Adding ...`);
+			logToConsole(LOG_DEBUG, `[AGRP.House] House ${houseId} doesn't exist. Adding ...`);
 			let tempHouseData = new HouseData(houseId, description, entrancePosition, blipModel, pickupModel, hasInterior);
 			if (blipModel != -1) {
 				let blipId = createGameBlip(tempHouseData.blipModel, tempHouseData.entrancePosition, "House");
 				if (blipId != -1) {
 					tempHouseData.blipId = blipId;
 				}
-				logToConsole(LOG_DEBUG, `[VRR.House] House ${houseId}'s blip has been added by the server (Model ${blipModel}, ID ${blipId})`);
+				logToConsole(LOG_DEBUG, `[AGRP.House] House ${houseId}'s blip has been added by the server (Model ${blipModel}, ID ${blipId})`);
 			} else {
-				logToConsole(LOG_DEBUG, `[VRR.House] House ${houseId} has no blip.`);
+				logToConsole(LOG_DEBUG, `[AGRP.House] House ${houseId} has no blip.`);
 			}
 			getServerData().houses.push(tempHouseData);
 			setAllHouseDataIndexes();