From cd04ff2aa3eeb1621b76b7263195c82c0f31ca16 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 2 May 2022 15:30:56 -0500
Subject: [PATCH] Use confirm prompt for giving house to clan

---
 scripts/server/gui.js   | 47 ++++++++++++++++++++++++++++++++++++++++-
 scripts/server/house.js | 18 ++--------------
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/scripts/server/gui.js b/scripts/server/gui.js
index 6afae940..f788dac3 100644
--- a/scripts/server/gui.js
+++ b/scripts/server/gui.js
@@ -82,7 +82,6 @@ function playerPromptAnswerYes(client) {
 					getPlayerData(client).businessOrderBusiness = false;
 					getPlayerData(client).businessOrderItem = -1;
 					getPlayerData(client).businessOrderValue = -1;
-
 				}
 			} else {
 				showPlayerErrorGUI(client, ``, `Business Order Canceled`);
@@ -116,6 +115,52 @@ function playerPromptAnswerYes(client) {
 			//messageAdmins(`{ALTCOLOUR}${getPlayerName(client)} {MAINCOLOUR}set their {vehiclePurple}${getVehicleName(vehicle)} {MAINCOLOUR}owner to the {clanOrange}${getClanData(clanId).name} {MAINCOLOUR}clan`);
 			break;
 
+		case VRR_PROMPT_GIVEHOUSETOCLAN:
+			let house = getPlayerHouse(client);
+			if(!house) {
+				messagePlayerError(client, getLocaleString(client, "InvalidHouse"));
+				return false;
+			}
+
+			if(getHouseData(houseId).ownerType != VRR_VEHOWNER_PLAYER) {
+				messagePlayerError(client, getLocaleString(client, "MustOwnHouse"));
+				return false;
+			}
+
+			if(getHouseData(houseId).ownerId != getPlayerCurrentSubAccount(client).databaseId) {
+				messagePlayerError(client, getLocaleString(client, "MustOwnHouse"));
+				return false;
+			}
+
+			getHouseData(houseId).ownerType = VRR_VEHOWNER_CLAN;
+			getHouseData(houseId).ownerId = getPlayerCurrentSubAccount(client).clan;
+			messagePlayerSuccess(client, getLocaleString(client, "GaveHouseToClan"));
+			//messageAdmins(`{ALTCOLOUR}${getPlayerName(client)} {MAINCOLOUR}set their {vehiclePurple}${getVehicleName(vehicle)} {MAINCOLOUR}owner to the {clanOrange}${getClanData(clanId).name} {MAINCOLOUR}clan`);
+			break;
+
+		case VRR_PROMPT_GIVEBIZTOCLAN:
+			let business = getPlayerBusiness(client);
+			if(!business) {
+				messagePlayerError(client, getLocaleString(client, "InvalidBusiness"));
+				return false;
+			}
+
+			if(getBusinessData(business).ownerType != VRR_VEHOWNER_PLAYER) {
+				messagePlayerError(client, getLocaleString(client, "MustOwnBusiness"));
+				return false;
+			}
+
+			if(getBusinessData(business).ownerId != getPlayerCurrentSubAccount(client).databaseId) {
+				messagePlayerError(client, getLocaleString(client, "MustOwnBusiness"));
+				return false;
+			}
+
+			getBusinessData(business).ownerType = VRR_VEHOWNER_CLAN;
+			getBusinessData(business).ownerId = getPlayerCurrentSubAccount(client).clan;
+			messagePlayerSuccess(client, getLocaleString(client, "GaveBusinessToClan"));
+			//messageAdmins(`{ALTCOLOUR}${getPlayerName(client)} {MAINCOLOUR}set their {vehiclePurple}${getVehicleName(vehicle)} {MAINCOLOUR}owner to the {clanOrange}${getClanData(clanId).name} {MAINCOLOUR}clan`);
+			break;
+
 		default:
 			break;
 	}
diff --git a/scripts/server/house.js b/scripts/server/house.js
index bafd48dc..178f6ee0 100644
--- a/scripts/server/house.js
+++ b/scripts/server/house.js
@@ -251,22 +251,8 @@ function setHouseClanCommand(command, params, client) {
 		return false;
 	}
 
-	let clanRankId = getClanRankFromParams(clanId, params);
-
-	if(!getClanRankData(clanId, clanRankId)) {
-		messagePlayerError(client, getLocaleString(client, "ClanRankInvalid"));
-		return false;
-	}
-
-	if(doesPlayerHaveClanPermission(client, getClanFlagValue("ManageHouses"))) {
-		messagePlayerError(client, getLocaleString(client, "CantModifyHouse"));
-		return false;
-	}
-
-	if(getClanRankData(clanId, clanRankId).level > getPlayerCurrentSubAccount(client).clanRank) {
-		messagePlayerError(client, "That rank is above your level!");
-		return false;
-	}
+	showPlayerPrompt(client, getLocaleString(client, "SetHouseClanConfirmMessage"), getLocaleString(client, "SetHouseClanConfirmTitle"), getLocaleString(client, "Yes"), getLocaleString(client, "No"));
+	getPlayerData(client).promptType = VRR_PROMPT_GIVEHOUSETOCLAN;
 
 	getHouseData(houseId).clanRank = getClanRankData(clanId, clanRankId).level;
 	getHouseData(houseId).needsSaved = true;