Improved player-build houses functionality

- Player-built houses can now be deleted by selling them
- Fixed some buildable houses not being recognised as such (e.g. "Land_GarageShelter_01_F") by comparing the classname to the list of buildable houses defined in fn_initVar
- The lease status of player-built houses now persists properly across sessions
- Obsolete building IDs from previous sessions no longer clutter up the players' "leased" and "leasedata" arrays (automatic cleanup on loadGame)
- Enforced all new custom variables (including "OT_forceSaveUnowned" from the previous commits) to be broadcasted across the network (for consistency)

Author: Cre8or

addons/overthrow_main/functions/UI/dialogs/fn_mainMenu.sqf

@@ -85,7 +85,6 @@ if(typename _b isEqualTo "ARRAY") then {
 	_txt = "";
 
 	if(_building call OT_fnc_hasOwner) then {
-
 		_owner = _building call OT_fnc_getOwner;
 		_ownername = players_NS getVariable format["name%1",_owner];
 		if(isNil "_ownername") then {_ownername = "Someone"};
@@ -309,7 +308,9 @@ if(typename _b isEqualTo "ARRAY") then {
 		};
 	};
 
-	if(!((typeof _building) in OT_allRealEstate + [OT_flag_IND])) then {
+	// Fetch the list of buildable houses
+	private _buildableHouses = (OT_Buildables param [9, []]) param [2, []];
+	if(!((typeof _building) in OT_allRealEstate + [OT_flag_IND]) and {!(typeOf _building in _buildableHouses)}) then {
 		ctrlEnable [1609,false];
 		ctrlEnable [1610,false];
 		ctrlEnable [1608,false];

addons/overthrow_main/functions/actions/fn_build.sqf

@@ -267,6 +267,7 @@ buildOnMouseUp = {
 			if(_money < modePrice) then {
 				"You cannot afford that" call OT_fnc_notifyMinor;
 			}else{
+
 				_created = objNULL;
 				playSound "3DEN_notificationDefault";
 				player setVariable ["money",_money-modePrice,true];
@@ -279,6 +280,7 @@ buildOnMouseUp = {
 						clearItemCargoGlobal _x;
 						[_x,getplayeruid player] call OT_fnc_setOwner;
 						_x call OT_fnc_initObjectLocal;
+
 					}foreach(_objects);
 					_created = _objects select 0;
 					deleteVehicle modeTarget;
@@ -288,6 +290,12 @@ buildOnMouseUp = {
 					modeTarget = objNull;
 				};
 
+				// If the object is a house, mark it as being player-built (will be used to save the leasing status)
+				private _buildableHouses = (OT_Buildables param [9, []]) param [2, []];
+				if ((typeof _created) in _buildableHouses) then {
+					_created setVariable ["OT_house_isPlayerBuilt", true, true];
+				};
+
 				if(modeCode != "") then {
 					_created setVariable ["OT_init",modeCode,true];
 					[_created,modeValue,modeCode] remoteExec ["OT_fnc_initBuilding",2];

addons/overthrow_main/functions/actions/fn_buyBuilding.sqf

@@ -43,20 +43,32 @@ if(_handled) then {
 		[player,"Building Purchased",format["Bought: %1 in %2 for $%3",getText(configFile >> "CfgVehicles" >> (typeof _building) >> "displayName"),(getpos _building) call OT_fnc_nearestTown,_price]] call BIS_fnc_createLogRecord;
 		_building addEventHandler ["Dammaged",OT_fnc_buildingDamagedHandler];
 	}else{
-		if ((typeof _building) in OT_allRealEstate) then {
+		// Fetch the list of buildable houses
+		private _buildableHouses = (OT_Buildables param [9, []]) param [2, []];
+		if((typeof _building) in OT_allRealEstate or {((typeOf _building) in _buildableHouses)}) then {
 			private _id = [_building] call OT_fnc_getBuildID;
 			[_building,nil] call OT_fnc_setOwner;
 			private _leased = player getVariable ["leased",[]];
 			_leased deleteAt (_leased find _id);
 			player setVariable ["leased",_leased,true];
+
+			private _leasedata = player getVariable ["leasedata",[]];
+			private _leasedataID = (_leasedata apply {_x select 0}) findIf {_x == _id};
+			_leasedata deleteAt _leasedataID;
+			player setVariable ["leasedata",_leasedata,true];
+
 			deleteMarker _mrkid;
 			_owned deleteAt (_owned find _id);
 			[player,"Building Sold",format["Sold: %1 in %2 for $%3",getText(configFile >> "CfgVehicles" >> (typeof _building) >> "displayName"),(getpos _building) call OT_fnc_nearestTown,_sell]] call BIS_fnc_createLogRecord;
 			[_sell] call OT_fnc_money;
+
+		// Fallback for unknown buildings
 		}else{
-			deleteVehicle _building;
 			_owned deleteAt (_owned find ([_building] call OT_fnc_getBuildID));
 		};
+
+		// Always attempt to remove the building, because it might be played-placed (for map-placed buildings, this won't do anything)
+		deleteVehicle _building;
 	};
 
 	player setVariable ["owned",_owned,true];

addons/overthrow_main/functions/actions/fn_leaseBuilding.sqf

@@ -56,6 +56,12 @@ if(typename _b isEqualTo "ARRAY") then {
 };
 if(_err) exitWith {};
 if(_handled) then {
+
+	// If the house is player-built, we set its lease variable to true
+	if (_building getVariable ["OT_house_isPlayerBuilt", false]) then {
+		_building setVariable ["OT_house_isLeased", true, true];
+	};
+
 	private _id = ([_building] call OT_fnc_getBuildID);
 	_leased = player getvariable ["leased",[]];
 	_leased pushback _id;

addons/overthrow_main/functions/factions/GUER/fn_GUERLoop.sqf

@@ -364,7 +364,7 @@ if ((date select 4) != _lastmin) then {
 						if(count _p > 0) then {
 							_veh = _currentCls createVehicle _p;
 							//[_veh,(server getVariable ["generals",[]]) select 0] call OT_fnc_setOwner;
-							_veh setVariable ["OT_forceSaveUnowned", true, false];		// Save this vehicle even if it is unowned (we know somebody must have requested it at the factory, so they'll come back and claim it... eventually)
+							_veh setVariable ["OT_forceSaveUnowned", true, true];		// Save this vehicle even if it is unowned (we know somebody must have requested it at the factory, so they'll come back and claim it... eventually)
 							clearWeaponCargoGlobal _veh;
 							clearMagazineCargoGlobal _veh;
 							clearBackpackCargoGlobal _veh;

addons/overthrow_main/functions/save/fn_loadGame.sqf

@@ -162,7 +162,7 @@ sleep 0.3;
 				};
 				*/
 
-				if(count _x > 7) then {
+				if(count _x > 7) then {		// index range 0..6
 					(_x select 7) params ["_fuel","_dmg"];
 					//Fuel in tank
 					_veh setFuel _fuel;
@@ -198,6 +198,21 @@ sleep 0.3;
 					};
 				};
 
+				// If the object is a player-built house, fetch its variables
+				private _houseParams = _x param [8, []];
+				if !(_houseParams isEqualTo []) then {
+					_veh setVariable ["OT_house_isPlayerBuilt", true, true];
+
+					private _isLeased = _houseParams param [0, false];
+					if (_isLeased) then {
+						_veh setVariable ["OT_house_isLeased", true, true];
+
+						private _leasedBuilt = [_owner,"leasedBuilt",[]] call OT_fnc_getOfflinePlayerAttribute;
+						_leasedBuilt pushBack _veh;
+						[_owner,"leasedBuilt",_leasedBuilt] call OT_fnc_setOfflinePlayerAttribute;
+					};
+				};
+
 				if (_posFormat == 1) then {
 					_veh setPosWorld _pos;		// format 1 is the new posWorld format
 				} else {
@@ -223,7 +238,7 @@ sleep 0.3;
 
 				// If this vehicle doesn't have an owner, set the forceSaveunowned flag to true so it gets saved again (until somebody owns it)
 				if (_owner isEqualTo "") then {
-					 _veh setVariable ["OT_forceSaveUnowned", true, false];
+					 _veh setVariable ["OT_forceSaveUnowned", true, true];
 				// Otherwise, set the owner (as per usual)
 				} else {
 					[_veh,_owner] call OT_fnc_setOwner;
@@ -432,6 +447,7 @@ private _built = (allMissionObjects "Static");
 	private _vars = players_NS getVariable [_uid,[]];
 	private _leased = [_uid,"leased",[]] call OT_fnc_getOfflinePlayerAttribute;
 	private _leasedata = [];
+	private _leasedNew = [];
 	{
 		_x params ["_name","_val"];
 		if(_name isEqualTo "owned") then {
@@ -459,12 +475,24 @@ private _built = (allMissionObjects "Static");
 					};
 					if(_x in _leased) then {
 						_leasedata pushback [_x,typeof _bdg,_pos,_pos call OT_fnc_nearestTown];
+						_leasedNew pushBack _x;
 					};
 				};
 			}foreach(_val);
 		};
 	}foreach(_vars);
+
+	// Add the built houses
+	{
+		private _ID = [_x] call OT_fnc_getBuildID;
+		private _pos = position _x;
+		_leasedata pushBack [_ID, typeof _x,_pos,_pos call OT_fnc_nearestTown];
+		_leasedNew pushBack _ID;
+	} forEach ([_uid,"leasedBuilt",[]] call OT_fnc_getOfflinePlayerAttribute);
+
 	[_uid,"leasedata",_leasedata] call OT_fnc_setOfflinePlayerAttribute;
+	[_uid,"leased",_leasedNew] call OT_fnc_setOfflinePlayerAttribute;		// Overwrite the "leased" data to get rid of the IDs that point to buildings which no longer exist (player-built houses)
+	[_uid,"leasedBuilt",[]] call OT_fnc_setOfflinePlayerAttribute;
 }foreach(players_NS getvariable ["OT_allPlayers",[]]);
 sleep 2; //let the variables propagate
 server setVariable ["StartupType","LOAD",true];

addons/overthrow_main/functions/save/fn_saveGame.sqf

@@ -140,13 +140,13 @@ private _vehicles = (_tocheck) apply {
 		};
 	};
 	private _params = [
-		_type,
-		[getPosWorld _x,_simCheck, 1],		// 1 stands for the new posWorld format
-		[vectorDir _x,vectorUp _x],
-		_s,
-		["", _x call OT_fnc_getOwner] select (_x call OT_fnc_hasOwner),		// Save an empty string if the object doesn't have an owner (yet)
-		_x getVariable ["name",""],
-		_x getVariable ["OT_init",""]
+/* 0 */		_type,
+/* 1 */		[getPosWorld _x,_simCheck, 1],		// 1 stands for the new posWorld format
+/* 2 */		[vectorDir _x,vectorUp _x],
+/* 3 */		_s,
+/* 4 */		["", _x call OT_fnc_getOwner] select (_x call OT_fnc_hasOwner),		// Save an empty string if the object doesn't have an owner (yet)
+/* 5 */		_x getVariable ["name",""],
+/* 6 */		_x getVariable ["OT_init",""]
 	];
 	if(_type isKindOf ["AllVehicles", _cfgVeh] && {!(_x getVariable ["OT_garrison",false])}) then {
 		private _veh = _x;
@@ -161,7 +161,12 @@ private _vehicles = (_tocheck) apply {
 		if(!(_attachedClass isEqualTo "") && { alive _attached }) then {
 			_att = [_attachedClass,(_attached weaponsTurret [0]) apply { [_x,_attached ammo _x] }];
 		};
-		_params pushback [fuel _x,getAllHitPointsDamage _x,_x call ace_refuel_fnc_getFuel,_x getVariable ["OT_locked",false],_ammo,_att];
+/* 7 */		_params set [7, [fuel _x,getAllHitPointsDamage _x,_x call ace_refuel_fnc_getFuel,_x getVariable ["OT_locked",false],_ammo,_att]];
+	};
+
+	// If the house is player-built, save some extra variables
+	if (_x getVariable ["OT_house_isPlayerBuilt", false]) then {
+/* 8 */		_params set [8, [_x getVariable ["OT_house_isLeased", false]]];
 	};
 	_params
 };