0.3.8.0436

omit active simulSwap target from is build allowed check
return items if object it removed

Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf

@@ -40,6 +40,11 @@ if (_buildingCountLimit == 0) then { _buildingCountLimit = 200; };
 
 // input
 params ["_objType"];
+_obj = objNull;
+if (_objType isEqualType objNull) then {
+	_obj = _objType;
+	_objType = typeOf _objType;
+};
 
 _staticClass = getText(configfile >> "CfgVehicles" >> _objType >> "staticClass");
 _simulClass = getText(configfile >> "CfgVehicles" >> _objType >> "simulClass");
@@ -83,9 +88,12 @@ if !(_buildingAllowed)exitWith{ false };
 // Max object
 if (!_ownedJammerExists) then{
 	_limitNearby = getNumber(configfile >> "CfgVehicles" >> _staticClass >> "limitNearby");
+
 	if (_limitNearby > 0) then{
-		_objectCount = count nearestObjects[player, [_staticClass, _simulClass], _buildingJammerRange];
+		// remove current target from objects
-		if (_objectCount > _limitNearby) then{
+		_objectCount = count (nearestObjects[player, [_staticClass, _simulClass], _buildingJammerRange] - [_obj]);
+		// TODO: not properly limiting simulated objects
+		if (_objectCount >= _limitNearby) then{
 			_buildingAllowed = false;
 			[format["<t size = '1.6' color = '#99ffffff'>Building Disallowed: Limit %1</t>", _limitNearby], 5] call Epoch_dynamicText;
 		};

Sources/epoch_code/compile/building/EPOCH_simulSwap.sqf

@@ -93,10 +93,15 @@ if (isText(_config)) then {
 		_rejectMove = false;
 		if ((diag_tickTime - _lastCheckTime) > 10) then {
 			_lastCheckTime = diag_tickTime;
-			_rejectMove = !(_objType call EPOCH_isBuildAllowed);
+			_rejectMove = !(EPOCH_target call EPOCH_isBuildAllowed);
 		};
 		if (_rejectMove) exitWith{
-			EPOCH_target = objNull;
+			// remove object and refund items
+			deleteVehicle EPOCH_target;
+			_removeParts = getArray(('CfgBaseBuilding' call EPOCH_returnConfig) >> _objType >> "removeParts");
+			{
+				[_x select 0,_x select 1] call EPOCH_fnc_addItemOverflow;
+			} forEach _removeParts;
 		};
 		_playerdistance = player distance EPOCH_target;
 		if (_playerdistance < 10) then {

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=435; 
+build=436; 

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=435; 
+build=436; 

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=435; 
+build=436; 

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=435; 
+build=436; 

build.txt

@@ -1 +1 @@
-435 
+436