diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp index ce1561c8c..3fd8a8c61 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp @@ -126,7 +126,6 @@ class Land_DZE_WoodDoorLocked_Base: DZE_Housebase { lockable = 3; }; - class CinderWallDoor_DZ_Base: DZE_Housebase { model = "\z\addons\dayz_epoch\models\steel_garage_door.p3d"; /* path to the object */ displayName = "Block Garage Door Base"; /* entry in Stringtable.csv */ @@ -139,6 +138,20 @@ class CinderWallDoor_DZ_Base: DZE_Housebase { scope = 2; /* Display it in the editor? 1 = No, 2 = Yes */ offset[] = {0,1.5,0}; maintainBuilding[] = {{"MortarBucket",1}}; +}; + +class CinderWallDoorLocked_DZ_Base: DZE_Housebase { + model = "\z\addons\dayz_epoch\models\steel_garage_door.p3d"; /* path to the object */ + displayName = "Block Garage Door Base"; /* entry in Stringtable.csv */ + nameSound = ""; + mapSize = 8; /* Size of the icon */ + icon = "\ca\data\data\Unknown_object.paa"; /* Path to the picture shown in the editor. */ + accuracy = 1000; + armor = 1600; /* "Lifepoints", if you like to call it that way.*/ + destrType = "DestructBuilding"; /* type of destruction, when armor = 0 */ + scope = 2; /* Display it in the editor? 1 = No, 2 = Yes */ + offset[] = {0,1.5,0}; + maintainBuilding[] = {{"MortarBucket",1}}; lockable = 3; }; @@ -448,7 +461,7 @@ class Land_DZE_GarageWoodDoorLocked: Land_DZE_WoodDoorLocked_Base { }; -class CinderWallDoorLocked_DZ: CinderWallDoor_DZ_Base { +class CinderWallDoorLocked_DZ: CinderWallDoorLocked_DZ_Base { model = "\z\addons\dayz_epoch\models\steel_garage_locked.p3d"; displayName = "Block Garage Door Locked"; GhostPreview = "CinderWallDoorway_Preview_DZ"; diff --git a/SQF/dayz_code/Configs/cfgLoot.hpp b/SQF/dayz_code/Configs/cfgLoot.hpp index 1be46a1b1..b942a7541 100644 --- a/SQF/dayz_code/Configs/cfgLoot.hpp +++ b/SQF/dayz_code/Configs/cfgLoot.hpp @@ -381,18 +381,24 @@ class CfgLoot { "7Rnd_45ACP_1911", "6Rnd_45ACP", "15Rnd_W1866_Slug", - "8Rnd_B_Beneli_74Slug", + "8Rnd_B_Beneli_Pellets", "HandRoadFlare", - "8Rnd_9x18_MakarovSD" + "8Rnd_9x18_MakarovSD", + "ItemComboLock", + "SmokeShell", + "FoodMRE" }, { 0.3, - 0.2, - 0.1, + 0.08, + 0.08, 0.14, 0.15, - 0.1, - 0.01 + 0.08, + 0.01, + 0.07, + 0.05, + 0.04 } }; hunter[] = { diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index b85e623c1..6f33bd338 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -1640,7 +1640,7 @@ class CfgVehicles { scope = 2; destrType = "DestructBuilding"; cost = 100; - offset[] = {0,1.5,0}; + offset[] = {0,2,0}; model="\z\addons\dayz_epoch\models\steel_garage_frame.p3d"; icon = "\ca\data\data\Unknown_object.paa"; mapSize = 2; diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 1958e8f55..8a4c3da03 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -467,7 +467,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu }; - if ((_cursorTarget isKindOf "ModularItems") or (_cursorTarget isKindOf "Land_DZE_WoodDoor_Base")) then { + if ((_cursorTarget isKindOf "ModularItems") or (_cursorTarget isKindOf "Land_DZE_WoodDoor_Base") or (_cursorTarget isKindOf "CinderWallDoor_DZ_Base")) then { if ((s_player_lastTarget select 0) != _cursorTarget) then { if (s_player_upgrade_build > 0) then { player removeAction s_player_upgrade_build; diff --git a/SQF/dayz_code/compile/player_unlockDoor.sqf b/SQF/dayz_code/compile/player_unlockDoor.sqf index f75f5eb25..d38410218 100644 --- a/SQF/dayz_code/compile/player_unlockDoor.sqf +++ b/SQF/dayz_code/compile/player_unlockDoor.sqf @@ -27,6 +27,10 @@ if(!isNull dayz_selectedDoor) then { _obj animate ["Open_hinge", 1]; }; + if(_obj animationPhase "Open_latch" == 0) then { + _obj animate ["Open_latch", 1]; + }; + } else { DZE_Lock_Door = ""; [player,"combo_locked",0,false] call dayz_zombieSpeak; diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index 8bb7eccdd..828124420 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -104,6 +104,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf index 6e77746eb..e6c0283ec 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -104,6 +104,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index 67b15e828..c9926e084 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -104,6 +104,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index 13ea4bee9..0d2572753 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -104,6 +104,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index a322f6b22..52d40c856 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -116,6 +116,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index e1b826b81..84025949b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -117,6 +117,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index 6b726dde7..b83c8ef4b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -84,5 +84,5 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 67b15e828..c9926e084 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -104,6 +104,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf b/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf index be0be643e..dc4b58850 100644 --- a/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf @@ -75,5 +75,5 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index 709e83f85..05c0c6468 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -104,6 +104,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf index 854dc8865..5d8b19188 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -104,6 +104,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index 2c2416c84..926849ffa 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -104,6 +104,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf index 3123e1885..6c4c0103f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -104,6 +104,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf index 378b9ed78..1fae993e7 100644 --- a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf @@ -105,6 +105,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index 48b606da7..77b94892c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -105,6 +105,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf index e6652dfe9..3560cd8a9 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -104,6 +104,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf" diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf index 05bd4c1a8..87b81eea9 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -104,6 +104,6 @@ if (!isDedicated) then { _void = [] execVM "R3F_Realism\R3F_Realism_Init.sqf"; //Lights - [] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; + //[] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf"; }; #include "\z\addons\dayz_code\system\REsec.sqf"