diff --git a/dayz_code/actions/vault_lock.sqf b/dayz_code/actions/vault_lock.sqf index 9348cdd70..1d56d6b8b 100644 --- a/dayz_code/actions/vault_lock.sqf +++ b/dayz_code/actions/vault_lock.sqf @@ -1,4 +1,3 @@ private["_obj","_bag","_pos"]; -hintSilent format["DEBUG: %1",_this]; _obj = _this select 3; -_obj spawn player_unlockVault; +_obj spawn player_lockVault; diff --git a/dayz_code/actions/vault_unlock.sqf b/dayz_code/actions/vault_unlock.sqf index 9348cdd70..d0fd9babf 100644 --- a/dayz_code/actions/vault_unlock.sqf +++ b/dayz_code/actions/vault_unlock.sqf @@ -1,4 +1,3 @@ private["_obj","_bag","_pos"]; -hintSilent format["DEBUG: %1",_this]; _obj = _this select 3; _obj spawn player_unlockVault; diff --git a/dayz_code/compile/player_lockVault.sqf b/dayz_code/compile/player_lockVault.sqf index 2286aee4a..4928ab796 100644 --- a/dayz_code/compile/player_lockVault.sqf +++ b/dayz_code/compile/player_lockVault.sqf @@ -14,7 +14,7 @@ s_player_lockvault = -1; if(_ownerID == dayz_characterID) then { _alreadyPacking = _obj getVariable["packing",0]; - if (_alreadyPacking == 1) exitWith {cutText ["That vault is already being unlocked." , "PLAIN DOWN"]}; + if (_alreadyPacking == 1) exitWith {cutText ["That vault is already being locked." , "PLAIN DOWN"]}; _obj setVariable["packing",1]; @@ -71,7 +71,7 @@ if(_ownerID == dayz_characterID) then { _countr = _countr + 1; } forEach _objWpnTypes; - cutText ["Your vault has been unlocked", "PLAIN DOWN"]; + cutText ["Your vault has been locked", "PLAIN DOWN"]; } else { - cutText ["You cannot unlock this vault, it is not yours", "PLAIN DOWN"]; + cutText ["You cannot lock this vault, it is not yours", "PLAIN DOWN"]; }; \ No newline at end of file diff --git a/dayz_code/init/compiles.sqf b/dayz_code/init/compiles.sqf index b5c777fe7..71335dbcf 100644 --- a/dayz_code/init/compiles.sqf +++ b/dayz_code/init/compiles.sqf @@ -28,8 +28,8 @@ if (!isDedicated) then { player_fired = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_fired.sqf"; //Runs when player fires. Alerts nearby Zeds depending on calibre and audial rating player_packTent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_packTent.sqf"; player_packVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_packVault.sqf"; - player_unlockVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\vault_unlock.sqf"; - player_lockVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\vault_lock.sqf"; + player_unlockVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockVault.sqf"; + player_lockVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_lockVault.sqf"; control_zombieAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\control_zombieAgent.sqf"; player_updateGui = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_updateGui.sqf"; player_crossbowBolt = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_crossbowBolt.sqf"; diff --git a/dayz_equip/config.cpp b/dayz_equip/config.cpp index 0aacea45b..5fd2fc33a 100644 --- a/dayz_equip/config.cpp +++ b/dayz_equip/config.cpp @@ -1584,7 +1584,6 @@ class CfgVehicles { class NonStrategic; class BuiltItems: NonStrategic{}; - class BuiltItemsVault: NonStrategic{}; class TrapItems: NonStrategic{}; class Wire_cat1: BuiltItems { @@ -1605,17 +1604,6 @@ class CfgVehicles displayName = "Wire (CAT2)"; model = "\dayz_equip\models\wire_cat2.p3d"; }; - class VaultStorageLocked: BuiltItemsVault - { - scope = 2; - destrType = "DestructNo"; - cost = 100; - model = "\dayz_equip\models\safe1.p3d"; - mapSize = 2; - armor = 2000; - displayName = "Locked Vault"; - vehicleClass = "Fortifications"; - }; class Hedgehog_DZ: BuiltItems { scope = 2; @@ -1931,11 +1919,27 @@ class CfgVehicles displayName = "Vault"; model = "\dayz_equip\models\safe1.p3d"; destrType = "DestructNo"; - armor = 5000; + armor = 2000; transportMaxMagazines = 200; transportMaxWeapons = 10; transportMaxBackpacks = 5; }; + class VaultStorageLocked: Land_A_tent + { + vehicleClass = "Survival"; + displayName = "Locked Vault"; + model = "\dayz_equip\models\safe1.p3d"; + destrType = "DestructNo"; + armor = 2000; + memoryPointSupply = ""; + supplyRadius = 0; + transportMaxWeapons = 0; + transportMaxMagazines = 0; + transportMaxBackpacks = 0; + transportAmmo = 0; + transportRepair = 0; + transportFuel = 0; + }; class CardboardBox: ReammoBox {