From ffccff6a380d2f0c953141067da15c74f8126978 Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Mon, 26 Apr 2021 10:13:09 +0200 Subject: [PATCH] Fix wrong lockbox sound --- SQF/dayz_code/actions/changeCode.sqf | 2 +- SQF/dayz_code/compile/player_unlockVault.sqf | 2 +- SQF/dayz_code/init/variables.sqf | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/actions/changeCode.sqf b/SQF/dayz_code/actions/changeCode.sqf index cc57427ed..4ec5e0cdf 100644 --- a/SQF/dayz_code/actions/changeCode.sqf +++ b/SQF/dayz_code/actions/changeCode.sqf @@ -13,7 +13,7 @@ _cursorTarget = _this select 3; _typeOf = typeOf (_cursorTarget); _isSafe = _typeOf in ["VaultStorage","VaultStorage2","TallSafe"]; -_isLockBox = _typeOf in ["LockboxStorage","LockboxStorage2","LockboxStorageWinter","LockboxStorageWinter2"]; +_isLockBox = _typeOf in DZE_LockboxesUnlocked; _isStorage = (_isSafe || _isLockBox); _isDoor = _typeOf in DZE_DoorsLocked; diff --git a/SQF/dayz_code/compile/player_unlockVault.sqf b/SQF/dayz_code/compile/player_unlockVault.sqf index 470aa28ff..c0a20f74f 100644 --- a/SQF/dayz_code/compile/player_unlockVault.sqf +++ b/SQF/dayz_code/compile/player_unlockVault.sqf @@ -37,7 +37,7 @@ if (_ComboMatch || (_ownerID == dayz_playerUID)) then { [_unlockedClass,objNull] call fn_waitForObject; - if (_unlockedClass == "LockboxStorage") then { + if (_unlockedClass in DZE_LockboxesUnlocked) then { [player,(getPosATL player),20,"lockboxopen"] spawn fnc_alertZombies; } else { [player,(getPosATL player),20,"safeopen"] spawn fnc_alertZombies; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index ebe757556..4e7d05519 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -278,6 +278,7 @@ if (!isDedicated) then { dayz_plantTypes = ["","MAP_pumpkin","MAP_p_Helianthus","fiberplant"]; DZE_LockableStorage = ["VaultStorage","VaultStorage2","VaultStorageLocked","VaultStorage2Locked","LockboxStorageLocked","LockboxStorage2Locked","LockboxStorage","LockboxStorage2","LockboxStorageWinterLocked","LockboxStorageWinter2Locked","LockboxStorageWinter","LockboxStorageWinter2","TallSafe","TallSafeLocked"]; DZE_UpgradableStorage = ["StorageShed_DZ","WoodShack_DZ","Wooden_shed_DZ","GunRack_DZ","WoodCrate_DZ","VaultStorageLocked","LockboxStorageLocked","LockboxStorageWinterLocked"]; + DZE_LockboxesUnlocked = ["LockboxStorage","LockboxStorage2","LockboxStorageWinter","LockboxStorageWinter2"]; DZE_REPLACE_WEAPONS = [["Crossbow","DMR","M14_EP1","SVD","SVD_CAMO","M4SPR","VSS_vintorez"],["Crossbow_DZ","DMR_DZ","M14_CCO_DZ","SVD_PSO1_DZ","SVD_PSO1_Gh_DZ","M4SPR_DZE","VSS_vintorez_DZE"]]; DZE_replaceMagazines = [["vil_20Rnd_762x51_G3"],["vil_20Rnd_762x51_G3"]]; DZE_maintainClasses = ["ModularItems","DZE_Housebase","LightPole_DZ","BuiltItems","Generator_DZ","DZ_buildables","Plastic_Pole_EP1_DZ","Fence_corrugated_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","StickFence_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","WinterCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","WinterLargeCamoNet_DZ","DeerStand_DZ","Scaffolding_DZ","FireBarrel_DZ","M240Nest_DZ","Notebook_DZ","Water_Pump_DZ","Greenhouse_DZ","Bed_DZ","Table_DZ","VaultStorageBroken","VaultStorageBroken2","TallSafeBroken","LockboxStorageBroken","LockboxStorage2Broken","LockboxStorageWinterBroken","LockboxStorageWinter2Broken","Garage_Green_DZ","Garage_White_DZ","Garage_Brown_DZ","Garage_Grey_DZ","Helipad_Civil_DZ","Helipad_Rescue_DZ","Helipad_Army_DZ","Helipad_Cross_DZ","Helipad_ParkBorder_DZ","CCTV_DZ"];