diff --git a/README.md b/README.md index 6c074155..c4b2c637 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Starting a FAQ here. Can get expanded later - GroundSpawnChance - MinGroundContainers - MaxGroundContainers - - @epochhove\addons\epoch_server_settings\configs\CfgMainTable.h -> Change the Loot for each Container / Buildingtype + - @epochhive\addons\epoch_server_settings\configs\CfgMainTable.h -> Change the Loot for each Container / Buildingtype - lootMin - lootMax - I have added an item to the loot, but it will not spawn (rpt log say "have no price") diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index aea9189d..8de105c2 100644 Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo differ diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo index aa093797..87dd52b1 100644 Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo differ diff --git a/Sources/epoch_server/compile/epoch_bases/EPOCH_saveBuilding.sqf b/Sources/epoch_server/compile/epoch_bases/EPOCH_saveBuilding.sqf index 8c15b001..a79b10df 100644 --- a/Sources/epoch_server/compile/epoch_bases/EPOCH_saveBuilding.sqf +++ b/Sources/epoch_server/compile/epoch_bases/EPOCH_saveBuilding.sqf @@ -22,7 +22,7 @@ if !(isNull _this) then { _cfgBaseBuilding = 'CfgBaseBuilding' call EPOCH_returnConfig; _this setDamage 0; _class = typeOf _this; - _worldspace = [getposworld _this, vectordir _this, vectorup _this, true]; + _worldspace = [getposworld _this call EPOCH_precisionPos, vectordir _this, vectorup _this, true]; _objHiveKey = format["%1:%2", (call EPOCH_fn_InstanceID), _objSlot]; _animPhases = []; { diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf index 4d711b85..a468f52b 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf @@ -80,10 +80,22 @@ params [["_vehicle",objnull],["_items",[]]]; case 4: { _type = _x select 0; _subContainers = (everycontainer _vehicle) select {(_x select 0) isequalto _type && magazinesAmmoCargo (_x select 1) isequalto [] && weaponsItemsCargo (_x select 1) isequalto []}; - if !(_subContainers isequalto []) - then { + if !(_subContainers isequalto []) then { _subContainer = _subContainers select 0 select 1; [_subContainer,_x select 1] call EPOCH_server_CargoFill; + } + else { + if (_type isKindOf "Bag_Base") then { + _vehicle addBackpackCargoGlobal [_type, 1]; + } + else { + _vehicle addItemCargoGlobal [_type, 1]; + }; + _subContainers = (everycontainer _vehicle) select {(_x select 0) isequalto _type && magazinesAmmoCargo (_x select 1) isequalto [] && weaponsItemsCargo (_x select 1) isequalto []}; + if !(_subContainers isequalto []) then { + _subContainer = _subContainers select 0 select 1; + [_subContainer,_x select 1] call EPOCH_server_CargoFill; + }; }; }; }; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_storage.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_storage.sqf index 39b5adb1..a86045b4 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_storage.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_storage.sqf @@ -32,7 +32,7 @@ if (!isNull _vehicle) then { _colorSlot = _vehicle getVariable ["STORAGE_TEXTURE",0]; _storageOwners = _vehicle getVariable["STORAGE_OWNERS",[]]; _locked = if (_vehicle getVariable["EPOCH_Locked", true]) then {1} else {-1}; - _worldspace = [getposworld _vehicle, vectordir _vehicle, vectorup _vehicle, true]; + _worldspace = [getposworld _vehicle call EPOCH_precisionPos, vectordir _vehicle, vectorup _vehicle, true]; _VAL = [_class, _worldspace, _damage, _inventory, _colorSlot, _storageOwners, _locked]; ["Storage", _vehHiveKey, EPOCH_expiresBuilding, _VAL] call EPOCH_fnc_server_hiveSETEX; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_vehicle.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_vehicle.sqf index 58613361..976aad06 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_vehicle.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_save_vehicle.sqf @@ -37,7 +37,7 @@ if (!isNull _vehicle) then { _Textures = getObjectTextures _vehicle; }; - _VAL = [typeOf _vehicle,[getposworld _vehicle,vectordir _vehicle,vectorup _vehicle,true],damage _vehicle,_hitpoints,fuel _vehicle,_inventory,[true,magazinesAllTurrets _vehicle],_colorSlot,_baseType, getPlateNumber _vehicle, _Textures]; + _VAL = [typeOf _vehicle,[getposworld _vehicle call EPOCH_precisionPos,vectordir _vehicle,vectorup _vehicle,true],damage _vehicle,_hitpoints,fuel _vehicle,_inventory,[true,magazinesAllTurrets _vehicle],_colorSlot,_baseType, getPlateNumber _vehicle, _Textures]; ["Vehicle", _vehHiveKey, EPOCH_expiresVehicle, _VAL] call EPOCH_fnc_server_hiveSETEX; }; }; diff --git a/Sources/epoch_server_settings/configs/CfgLootTable.h b/Sources/epoch_server_settings/configs/CfgLootTable.h index abfbf701..ac15c317 100644 --- a/Sources/epoch_server_settings/configs/CfgLootTable.h +++ b/Sources/epoch_server_settings/configs/CfgLootTable.h @@ -1773,10 +1773,7 @@ class CfgLootTable items[] = { { { "V_TacChestrig_grn_F", "item" }, 1 }, { { "V_TacChestrig_oli_F", "item" }, 1 }, - { { "V_TacChestrig_cbr_F", "item" }, 1 }, - { { "V_TacChestrig_grn_F", "item" }, 1 }, - { { "V_TacChestrig_grn_F", "item" }, 1 }, - { { "V_TacChestrig_grn_F", "item" }, 1 } + { { "V_TacChestrig_cbr_F", "item" }, 1 } }; }; class Backpacks_Low_Base