From 82b35d4a02c04723ab8d663a5202591bf75d6fe8 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Sat, 29 Mar 2014 13:19:01 -0500 Subject: [PATCH] fixed #1166 --- SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp | 7 +------ SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp | 7 +------ SQF/dayz_code/compile/player_packVault.sqf | 6 ++++++ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp index 5c3bef588..c38ad9672 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp @@ -29,10 +29,5 @@ class LockboxStorage: Land_A_tent { class WeaponHolder_ItemLockbox: WeaponHolder { scope = 2; displayName = "Lockbox"; - class transportmagazines { - class _xx_ItemLockbox { - magazine = "ItemLockbox"; - count = 1; - }; - }; + seedItem = "ItemLockbox"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp index 63f2d5fed..d702b757a 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp @@ -31,10 +31,5 @@ class VaultStorageLocked: Land_A_tent { class WeaponHolder_ItemVault: WeaponHolder { scope = 2; displayName = "Safe"; - class transportmagazines { - class _xx_ItemVault { - magazine = "ItemVault"; - count = 1; - }; - }; + seedItem = "ItemVault"; }; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_packVault.sqf b/SQF/dayz_code/compile/player_packVault.sqf index cfe5081cb..08237686f 100644 --- a/SQF/dayz_code/compile/player_packVault.sqf +++ b/SQF/dayz_code/compile/player_packVault.sqf @@ -13,6 +13,7 @@ _obj = _this; _packedClass = getText (configFile >> "CfgVehicles" >> (typeOf _obj) >> "packedClass"); _text = getText (configFile >> "CfgVehicles" >> (typeOf _obj) >> "displayName"); + // Silently exit if object no longer exists if(isNull _obj or !(alive _obj)) exitWith { DZE_ActionInProgress = false; }; @@ -81,6 +82,11 @@ if(!isNull _obj and alive _obj) then { // Empty weapon holder _holder = _bag; + // add seed item + _itemOut = getText(configFile >> "CfgVehicles" >> _packedClass >> "seedItem"); + _countOut = 1; + _holder addMagazineCargoGlobal[_itemOut, _countOut]; + //Add weapons _objWpnTypes = _weapons select 0; _objWpnQty = _weapons select 1;