diff --git a/Sources/epoch_code/compile/inventory/EPOCH_usedItemRepack.sqf b/Sources/epoch_code/compile/inventory/EPOCH_usedItemRepack.sqf index a4f897a2..80189bbb 100644 --- a/Sources/epoch_code/compile/inventory/EPOCH_usedItemRepack.sqf +++ b/Sources/epoch_code/compile/inventory/EPOCH_usedItemRepack.sqf @@ -53,13 +53,14 @@ if(count _itemMags > 1)then{ // adjust the item if!(_chg isEqualTo 0)then{ _index = ((count _itemMags) - 1); - _usedItemArray = _itemMags select _index; + _usedItemArray = _itemMags deleteat _index; _usedItemArray params ["_mag","_count"]; _itemMags pushBack [_mag, (_count + _chg)]; - _itemMags = _itemMags - [_usedItemArray]; _player removeMagazines _mag; { - _player addMagazine _x; - [format["You have used your %1", _displayName],5,[[0,0,0,0.2],[1,1,1,1]]] call Epoch_message_stack; + if ((_x select 1) > 0) then { + _player addMagazine _x; + }; }forEach _itemMags; + [format["You have used your %1", _displayName],5,[[0,0,0,0.2],[1,1,1,1]]] call Epoch_message_stack; }; diff --git a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootContainer.sqf b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootContainer.sqf index 2d9a7fdb..9713d50e 100644 --- a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootContainer.sqf +++ b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootContainer.sqf @@ -48,7 +48,9 @@ if !(_object in EPOCH_cleanupQueue) then { [_object, _type] call EPOCH_serverLootObject; // force player to open gear on this object. - [_object, {player action["Gear", _this]}] remoteExec ["call", _player]; + if !(_type isequalto "Cargo_Container") then { + [_object, {player action["Gear", _this]}] remoteExec ["call", _player]; + }; } else { [_object, "Food"] call EPOCH_serverLootObject; // force player to open gear on this object. diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf index c33a81df..8c93705d 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf @@ -105,8 +105,9 @@ for "_i" from 1 to _maxStorageLimit do { _vehicle setVariable ["STORAGE_SLOT", str(_i), true]; - _vehicle call EPOCH_server_storageInit; - + if (isDamageAllowed _vehicle) then { + _vehicle call EPOCH_server_storageInit; + }; if (count _arr >= 5) then { _color = _arr select 4; _cfgBaseBuilding = 'CfgBaseBuilding' call EPOCH_returnConfig; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles.sqf index ff5ac7e7..555f9bd7 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles.sqf @@ -84,7 +84,7 @@ for "_i" from 1 to _maxVehicleLimit do { }; // spawn vehicle at temp location. - _vehicle = createVehicle [_class, _location, [], 0, "CAN_COLLIDE"]; + _vehicle = createVehicle [_class, [random 500, random 500,500], [], 0, "CAN_COLLIDE"]; // turn off BIS randomization _vehicle setVariable ["BIS_enableRandomization", false]; if !(isNull _vehicle) then { diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_upgrade_vehicle.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_upgrade_vehicle.sqf index 7c4c8de4..6dcaedcf 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_upgrade_vehicle.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_upgrade_vehicle.sqf @@ -50,9 +50,6 @@ _newVeh setVariable ["VEHICLE_SLOT", _slot, true]; _newVeh setVariable ["VEHICLE_BASECLASS", _baseVeh]; _newVeh call EPOCH_server_setVToken; _newVeh call EPOCH_server_vehicleInit; -_newVeh setdir _dir; -_newVeh setposasl _pos; - // set fuel level _newVeh setFuel _fuel; @@ -131,5 +128,8 @@ if !(_removemagazinesturret isequalto []) then { } foreach _removemagazinesturret; }; +_newVeh setdir _dir; +_newVeh setposasl _pos; + // save new vehicle to db _newveh call EPOCH_Server_Save_Vehicle; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf index 2435f2e0..516a7ae7 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicle.sqf @@ -21,7 +21,7 @@ _serverSettingsConfig = configFile >> "CfgEpochServer"; _removeweapons = [_serverSettingsConfig, "removevehweapons", []] call EPOCH_fnc_returnConfigEntry; _removemagazinesturret = [_serverSettingsConfig, "removevehmagazinesturret", []] call EPOCH_fnc_returnConfigEntry; _disableVehicleTIE = [_serverSettingsConfig, "disableVehicleTIE", true] call EPOCH_fnc_returnConfigEntry; -_vehObj = createVehicle[_vehClass, _position, [], 0, _can_collide]; +_vehObj = createVehicle[_vehClass, [random 500,random 500, 500], [], 0, "CAN_COLLIDE"]; // turn off BIS randomization _vehObj setVariable ["BIS_enableRandomization", false]; if !(isNull _vehObj) then{ diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicles.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicles.sqf index 012206d9..ba9f66f5 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicles.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_spawn_vehicles.sqf @@ -112,7 +112,7 @@ for "_i" from 1 to _spawnCount do { } else { if (_allCitysDync isEqualTo []) then { - _position = [epoch_centerMarkerPosition, 0, EPOCH_dynamicVehicleArea, 10, 0, 1000, 0] call BIS_fnc_findSafePos; + _position = [epoch_centerMarkerPosition, 0, EPOCH_dynamicVehicleArea, 3, 0, 1000, 0] call BIS_fnc_findSafePos; } else { _selectedCity = _allCitysDync deleteAt (floor random(count _allCitysDync)); _cityPos = getArray(_selectedCity >> "position"); diff --git a/Sources/epoch_server_settings/configs/maps/altis.h b/Sources/epoch_server_settings/configs/maps/altis.h index 36ead027..9911f7a1 100644 --- a/Sources/epoch_server_settings/configs/maps/altis.h +++ b/Sources/epoch_server_settings/configs/maps/altis.h @@ -14,7 +14,7 @@ */ class Altis : Default { - worldSize = 20000; + worldSize = 25000; plantLimit = 10; // vehicles - Max vehicle slots is calculated from per vehicle limits below. Warning! Higher the number lower the performance. vehicleSpawnTypes[] = {