Revert "Update player_countMagazinesWBackpack.sqf"

vanilla commit:
https://github.com/DayZMod/Battleye-Filters/commit/8c43660

CHANGE LOG 1.0.6.2.txt

@@ -16,7 +16,7 @@
 [NEW] Admins can now define a maximum build height, see configVariables.sqf/DZE_BuildHeightLimit. @BigEgg17
 [NEW] Admins can now change the lootRefreshTimer for each building type from the default 15 minutes. CfgLoot.hpp must be updated if using custom loot tables.
 
-[UPDATED] Loot and zed spawn is now disabled in trader cities by default. This is configurable in mission\init.sqf via DZE_SafeZonePosArray. Added function to check positions against DZE_SafeZonePosArray "_PosInSafeZone = _positionToCheck call DZE_SafeZonePosCheck;"
+[UPDATED] Loot and zed spawn is now disabled in trader cities by default. This is configurable in mission\init.sqf via DZE_SafeZonePosArray. Added function to check positions against DZE_SafeZonePosArray "_PosInSafeZone = [_positionOrObjectToCheck] call DZE_SafeZonePosCheck;" An optional radius can be supplied as a second argument i.e: [_positionOrObjectToCheck,500]
 [UPDATED] Zombie pathing. Zeds should now run more direct to players and no longer get stuck at the position where a player entered a vehicle.
 [UPDATED] The RIS attachment can be removed from the SA58_RIS_DZ now. @LunaCB
 [UPDATED] The player now auto rejoins their group after dropping a radio and picking it back up when dayz_requireRadio=true. @SmokeyBR

CHANGE LOG 1.0.6.3.txt

@@ -0,0 +1,21 @@
+[NEW] Time between unlocking safes/lockboxes after a failed code will be exponentially higher, see configVariables.sqf\DZE_lockablesHarderPenalty @oiad
+[NEW] Added 93 new zombie models with loot groups and strings for Server Admins @Airwavesman
+
+[FIXED] Some more occurrences of zero_building interiors misaligned or at the wrong terrain height (eaaedf2, 048caa5)
+[FIXED] Player could switch into gunner's seat of ArmoredSUV while the hatch was being closed (e89eebc) #2009 @TheFirstNoob
+[FIXED] POI fires were still spawning when POI was off and town generator was on (2855997)
+[FIXED] Combo locks could be duplicated by two players removing them at the same time (564e3da)
+[FIXED] Bush b_corylus.p3d allowed chopping down for wood like a tree (42e519a)
+[FIXED] Player could shoot during unconscious wake up animation (634a01a)
+[FIXED] Rare publicVariable value restrictions for AuthKey due to RNG with basic Latin characters (d48c907) @oiad @AirwavesMan
+[FIXED] Freeze when iterating through CfgWeapons in A2OA 1.64 due to conflict with ItemKeys in dayz_epoch_b.pbo #2010 @S-fly
+[FIXED] 45Rnd_545x39_RPK error after it was removed with the 2018-04-05 A2OA CorePatch (d249227)
+[FIXED] Disabled Arma's automatic vehicle refuel, repair and rearm at WarfareBVehicleServicePoint buildings (2c4f06c) @dihan48
+[FIXED] DistanceFoot database stat was incorrect. @dihan48
+[FIXED] Wrong cargo count of Refuel Trucks after last Corepatch. @AirwavesMan
+
+[UPDATED] Spawning of Zombies and Loot in Safe Zones can now be toggled, disabled by default, see configVariables.sqf/DZE_SafeZoneZombieLoot (6248add, 141b25e) @oiad @_Lance_
+[UPDATED] Added notification when status icons are disabled
+[UPDATED] Added night vision mode back to DMR_DZ and M4SPR_DZE after it was removed with the 2018-04-05 A2OA CorePatch
+
+[INFO] Synced with DayZMod upstream up to commit fe063a8

Documents/Epoch 1.0.6.2 Classnames/Epoch 1.0.6.2 CfgVehicles.txt

@@ -0,0 +1,772 @@
+2S6M_Tunguska
+2b14_82mm
+2b14_82mm_CDF
+2b14_82mm_CZ_EP1
+2b14_82mm_GUE
+2b14_82mm_INS
+2b14_82mm_TK_EP1
+2b14_82mm_TK_GUE_EP1
+2b14_82mm_TK_INS_EP1
+A10
+A10_US_EP1
+AAV
+AGS_CDF
+AGS_CZ_EP1
+AGS_Ins
+AGS_RU
+AGS_TK_EP1
+AGS_TK_GUE_EP1
+AGS_TK_INS_EP1
+AGS_UN_EP1
+AH1Z
+AH1Z_DZ
+AH64D
+AH64D_EP1
+AH6J_EP1
+AH6J_EP1_DZ
+AH6J_EP1_DZE
+AH6X_DZ
+AH6X_EP1
+AN2_2_DZ
+AN2_DZ
+ATV_CZ_EP1
+ATV_US_EP1
+AV8B
+AV8B2
+AW159_Lynx_BAF
+An2_1_TK_CIV_EP1
+An2_2_TK_CIV_EP1
+An2_2_TK_CIV_EP1_DZ
+An2_TK_EP1
+ArmoredSUV_PMC
+ArmoredSUV_PMC_DZ
+ArmoredSUV_PMC_DZE
+ArmoredSUV_PMC_DZE1
+ArmoredSUV_PMC_DZE2
+ArmoredSUV_PMC_DZE3
+ArmoredSUV_PMC_DZE4
+BAF_ATV_D
+BAF_ATV_W
+BAF_Apache_AH1_D
+BAF_FV510_D
+BAF_FV510_W
+BAF_GMG_Tripod_D
+BAF_GMG_Tripod_W
+BAF_GMG_Tripod_W_NoDisassembly
+BAF_GPMG_Minitripod_D
+BAF_GPMG_Minitripod_W
+BAF_GPMG_Minitripod_W_NoDisassembly
+BAF_Jackal2_GMG_D
+BAF_Jackal2_GMG_W
+BAF_Jackal2_L2A1_D
+BAF_Jackal2_L2A1_W
+BAF_L2A1_Minitripod_D
+BAF_L2A1_Minitripod_W
+BAF_L2A1_Minitripod_W_NoDisassembly
+BAF_L2A1_Tripod_D
+BAF_L2A1_Tripod_W
+BAF_L2A1_Tripod_W_NoDisassembly
+BAF_Merlin_DZE
+BAF_Merlin_HC3_D
+BAF_Offroad_D
+BAF_Offroad_W
+BMP2_Ambul_CDF
+BMP2_Ambul_INS
+BMP2_CDF
+BMP2_Gue
+BMP2_HQ_CDF
+BMP2_HQ_INS
+BMP2_HQ_TK_EP1
+BMP2_INS
+BMP2_TK_EP1
+BMP2_UN_EP1
+BMP3
+BRDM2_ATGM_CDF
+BRDM2_ATGM_INS
+BRDM2_ATGM_TK_EP1
+BRDM2_CDF
+BRDM2_Gue
+BRDM2_HQ_Gue
+BRDM2_HQ_TK_GUE_EP1
+BRDM2_HQ_TK_GUE_EP1_DZ
+BRDM2_INS
+BRDM2_TK_EP1
+BRDM2_TK_GUE_EP1
+BTR40_MG_TK_GUE_EP1
+BTR40_MG_TK_INS_EP1
+BTR40_TK_GUE_EP1
+BTR40_TK_INS_EP1
+BTR60_TK_EP1
+BTR90
+BTR90_DZ
+BTR90_DZE
+BTR90_HQ
+BTR90_HQ_DZ
+BTR90_HQ_DZE
+C130J
+C130J_US_EP1
+C130J_US_EP1_DZ
+CDF_WarfareBMGNest_PK
+CH53_DZE
+CH_47F_BAF
+CH_47F_EP1
+CH_47F_EP1_DZ
+CH_47F_EP1_DZE
+CSJ_GyroC
+CSJ_GyroCover
+CSJ_GyroP
+Chukar
+Chukar_EP1
+D30_CDF
+D30_Ins
+D30_RU
+D30_TK_EP1
+D30_TK_GUE_EP1
+D30_TK_INS_EP1
+DSHKM_CDF
+DSHKM_CZ_EP1
+DSHKM_Gue
+DSHKM_Ins
+DSHKM_TK_GUE_EP1
+DSHKM_TK_INS_EP1
+DSHkM_Mini_TriPod
+DSHkM_Mini_TriPod_CDF
+DSHkM_Mini_TriPod_TK_GUE_EP1
+DSHkM_Mini_TriPod_TK_INS_EP1
+F35B
+Fishing_Boat
+Fort_Nest_M240
+GAZ_Vodnik
+GAZ_Vodnik_DZ
+GAZ_Vodnik_DZE
+GAZ_Vodnik_HMG
+GAZ_Vodnik_MedEvac
+GLT_M300_LT
+GLT_M300_ST
+GNT_C185
+GNT_C185C
+GNT_C185C_DZ
+GNT_C185E
+GNT_C185F
+GNT_C185R
+GNT_C185R_DZ
+GNT_C185T
+GNT_C185U
+GNT_C185U_DZ
+GNT_C185_DZ
+GRAD_CDF
+GRAD_INS
+GRAD_RU
+GRAD_TK_EP1
+GUE_WarfareBMGNest_PK
+HMMWV
+HMMWV_Ambulance
+HMMWV_Ambulance_CZ_DES_EP1
+HMMWV_Ambulance_DES_EP1
+HMMWV_Armored
+HMMWV_Armored_DZ
+HMMWV_Avenger
+HMMWV_Avenger_DES_EP1
+HMMWV_DES_EP1
+HMMWV_DZ
+HMMWV_M1035_DES_EP1
+HMMWV_M1151_M2_CZ_DES_EP1
+HMMWV_M1151_M2_CZ_DES_EP1_DZ
+HMMWV_M1151_M2_CZ_DES_EP1_DZE
+HMMWV_M1151_M2_DES_EP1
+HMMWV_M2
+HMMWV_M2_DZ
+HMMWV_M998A2_SOV_DES_EP1
+HMMWV_M998A2_SOV_DES_EP1_DZ
+HMMWV_M998A2_SOV_DES_EP1_DZE
+HMMWV_M998_crows_M2_DES_EP1
+HMMWV_M998_crows_MK19_DES_EP1
+HMMWV_MK19
+HMMWV_MK19_DES_EP1
+HMMWV_TOW
+HMMWV_TOW_DES_EP1
+HMMWV_Terminal_EP1
+Igla_AA_pod_East
+Igla_AA_pod_TK_EP1
+Ikarus
+Ikarus_TK_CIV_EP1
+Ins_WarfareBMGNest_PK
+JetSkiYanahui_Blue
+JetSkiYanahui_Green
+JetSkiYanahui_Red
+JetSkiYanahui_Yellow
+KORD
+KORD_TK_EP1
+KORD_UN_EP1
+KORD_high
+KORD_high_TK_EP1
+KORD_high_UN_EP1
+Ka137_MG_PMC
+Ka137_PMC
+Ka52
+Ka52Black
+Ka60_GL_PMC
+Ka60_PMC
+Kamaz
+KamazOpen
+KamazOpen_DZE
+KamazOpen_DZE1
+KamazOpen_DZE2
+KamazOpen_DZE3
+KamazOpen_DZE4
+KamazReammo
+KamazRefuel
+KamazRefuel_DZ
+KamazRefuel_DZE1
+KamazRefuel_DZE2
+KamazRefuel_DZE3
+KamazRefuel_DZE4
+KamazRepair
+Kamaz_DZE
+Kamaz_DZE1
+Kamaz_DZE2
+Kamaz_DZE3
+Kamaz_DZE4
+L39_TK_EP1
+LAV25
+LAV25_DZ
+LAV25_DZE
+LAV25_HQ
+LAV25_HQ_DZ
+LAV25_HQ_DZE
+Lada1
+Lada1_DZE1
+Lada1_DZE2
+Lada1_DZE3
+Lada1_DZE4
+Lada1_TK_CIV_EP1
+Lada1_TK_CIV_EP1_DZE1
+Lada1_TK_CIV_EP1_DZE2
+Lada1_TK_CIV_EP1_DZE3
+Lada1_TK_CIV_EP1_DZE4
+Lada2
+Lada2_DZE1
+Lada2_DZE2
+Lada2_DZE3
+Lada2_DZE4
+Lada2_TK_CIV_EP1
+Lada2_TK_CIV_EP1_DZE1
+Lada2_TK_CIV_EP1_DZE2
+Lada2_TK_CIV_EP1_DZE3
+Lada2_TK_CIV_EP1_DZE4
+LadaLM
+LadaLM_DZE1
+LadaLM_DZE2
+LadaLM_DZE3
+LadaLM_DZE4
+LandRover_CZ_EP1
+LandRover_MG_TK_EP1
+LandRover_MG_TK_EP1_DZ
+LandRover_MG_TK_EP1_DZE
+LandRover_MG_TK_INS_EP1
+LandRover_SPG9_TK_EP1
+LandRover_SPG9_TK_INS_EP1
+LandRover_Special_CZ_EP1
+LandRover_Special_CZ_EP1_DZ
+LandRover_Special_CZ_EP1_DZE
+LandRover_TK_CIV_EP1
+M1030
+M1030_US_DES_EP1
+M1126_ICV_M2_EP1
+M1126_ICV_mk19_EP1
+M1128_MGS_EP1
+M1129_MC_EP1
+M1130_CV_EP1
+M1133_MEV_EP1
+M1135_ATGMV_EP1
+M113Ambul_TK_EP1
+M113Ambul_TK_EP1_DZ
+M113Ambul_UN_EP1
+M113Ambul_UN_EP1_DZ
+M113_PMC
+M113_TK_EP1
+M113_TK_EP1_DZ
+M113_TK_EP1_DZE
+M113_UN_EP1
+M113_UN_EP1_DZ
+M113_UN_EP1_DZE
+M119
+M119_US_EP1
+M1A1
+M1A1_US_DES_EP1
+M1A2_TUSK_MG
+M1A2_US_TUSK_MG_EP1
+M240Nest_DZ
+M252
+M252_US_EP1
+M2A2_EP1
+M2A3_EP1
+M2HD_mini_TriPod
+M2HD_mini_TriPod_US_EP1
+M2StaticMG
+M2StaticMG_US_EP1
+M6_EP1
+MAZ_543_SCUD_TK_EP1
+MH60S
+MH60S_DZ
+MH60S_DZE
+MH6J_DZ
+MH6J_EP1
+MK19_TriPod
+MK19_TriPod_US_EP1
+MLRS
+MLRS_DES_EP1
+MMT_Civ
+MMT_USMC
+MQ9PredatorB
+MQ9PredatorB_US_EP1
+MTVR
+MTVR_DES_EP1
+MV22
+MV22_DZ
+Metis
+Metis_TK_EP1
+Mi171Sh_CZ_EP1
+Mi171Sh_CZ_EP1_DZ
+Mi171Sh_rockets_CZ_EP1
+Mi17_CDF
+Mi17_CDF_DZ
+Mi17_CDF_DZE
+Mi17_Civilian
+Mi17_Civilian_DZ
+Mi17_DZ
+Mi17_DZE
+Mi17_Ins
+Mi17_TK_EP1
+Mi17_TK_EP1_DZ
+Mi17_TK_EP1_DZE
+Mi17_UN_CDF_EP1
+Mi17_UN_CDF_EP1_DZ
+Mi17_UN_CDF_EP1_DZE
+Mi17_medevac_CDF
+Mi17_medevac_CDF_DZ
+Mi17_medevac_Ins
+Mi17_medevac_Ins_DZ
+Mi17_medevac_RU
+Mi17_medevac_RU_DZ
+Mi17_rockets_RU
+Mi24_D
+Mi24_D_TK_EP1
+Mi24_P
+Mi24_V
+MtvrReammo
+MtvrReammo_DES_EP1
+MtvrRefuel
+MtvrRefuel_DES_EP1
+MtvrRefuel_DES_EP1_DZ
+MtvrRefuel_DZ
+MtvrRepair
+MtvrRepair_DES_EP1
+MtvrSalvage_DES_EP1
+MtvrSupply_DES_EP1
+Offroad_DSHKM_Gue
+Offroad_DSHKM_Gue_DZ
+Offroad_DSHKM_Gue_DZE
+Offroad_DSHKM_Gue_DZE1
+Offroad_DSHKM_Gue_DZE2
+Offroad_DSHKM_Gue_DZE3
+Offroad_DSHKM_Gue_DZE4
+Offroad_DSHKM_INS
+Offroad_DSHKM_TK_GUE_EP1
+Offroad_SPG9_Gue
+Offroad_SPG9_TK_GUE_EP1
+Old_bike_TK_CIV_EP1
+Old_bike_TK_INS_EP1
+Old_moto_TK_Civ_EP1
+PBX
+Pchela1T
+Pickup_PK_GUE
+Pickup_PK_GUE_DZ
+Pickup_PK_GUE_DZE
+Pickup_PK_GUE_DZE1
+Pickup_PK_GUE_DZE2
+Pickup_PK_GUE_DZE3
+Pickup_PK_GUE_DZE4
+Pickup_PK_INS
+Pickup_PK_INS_DZ
+Pickup_PK_INS_DZE
+Pickup_PK_INS_DZE1
+Pickup_PK_INS_DZE2
+Pickup_PK_INS_DZE3
+Pickup_PK_INS_DZE4
+Pickup_PK_TK_GUE_EP1
+Pickup_PK_TK_GUE_EP1_DZ
+Pickup_PK_TK_GUE_EP1_DZE
+Pickup_PK_TK_GUE_EP1_DZE1
+Pickup_PK_TK_GUE_EP1_DZE2
+Pickup_PK_TK_GUE_EP1_DZE3
+Pickup_PK_TK_GUE_EP1_DZE4
+RHIB
+RHIB2Turret
+RHIB_DZ
+RU_WarfareBMGNest_PK
+S1203_TK_CIV_EP1
+S1203_ambulance_EP1
+SPG9_CDF
+SPG9_Gue
+SPG9_Ins
+SPG9_TK_GUE_EP1
+SPG9_TK_INS_EP1
+SUV_Blue
+SUV_Blue_DZE1
+SUV_Blue_DZE2
+SUV_Blue_DZE3
+SUV_Blue_DZE4
+SUV_Camo
+SUV_Camo_DZE1
+SUV_Camo_DZE2
+SUV_Camo_DZE3
+SUV_Camo_DZE4
+SUV_Charcoal
+SUV_Charcoal_DZE1
+SUV_Charcoal_DZE2
+SUV_Charcoal_DZE3
+SUV_Charcoal_DZE4
+SUV_DZ
+SUV_Green
+SUV_Green_DZE1
+SUV_Green_DZE2
+SUV_Green_DZE3
+SUV_Green_DZE4
+SUV_Orange
+SUV_Orange_DZE1
+SUV_Orange_DZE2
+SUV_Orange_DZE3
+SUV_Orange_DZE4
+SUV_PMC
+SUV_PMC_BAF
+SUV_Pink
+SUV_Pink_DZE1
+SUV_Pink_DZE2
+SUV_Pink_DZE3
+SUV_Pink_DZE4
+SUV_Red
+SUV_Red_DZE1
+SUV_Red_DZE2
+SUV_Red_DZE3
+SUV_Red_DZE4
+SUV_Silver
+SUV_Silver_DZE1
+SUV_Silver_DZE2
+SUV_Silver_DZE3
+SUV_Silver_DZE4
+SUV_TK_CIV_EP1
+SUV_TK_CIV_EP1_DZE1
+SUV_TK_CIV_EP1_DZE2
+SUV_TK_CIV_EP1_DZE3
+SUV_TK_CIV_EP1_DZE4
+SUV_TK_EP1
+SUV_UN_EP1
+SUV_White
+SUV_White_DZE1
+SUV_White_DZE2
+SUV_White_DZE3
+SUV_White_DZE4
+SUV_Yellow
+SUV_Yellow_DZE1
+SUV_Yellow_DZE2
+SUV_Yellow_DZE3
+SUV_Yellow_DZE4
+SeaFox
+SeaFox_EP1
+SearchLight
+SearchLight_CDF
+SearchLight_Gue
+SearchLight_INS
+SearchLight_RUS
+SearchLight_TK_EP1
+SearchLight_TK_GUE_EP1
+SearchLight_TK_INS_EP1
+SearchLight_UN_EP1
+SearchLight_US_EP1
+Skoda
+SkodaBlue
+SkodaBlue_DZE1
+SkodaBlue_DZE2
+SkodaBlue_DZE3
+SkodaBlue_DZE4
+SkodaGreen
+SkodaGreen_DZE1
+SkodaGreen_DZE2
+SkodaGreen_DZE3
+SkodaGreen_DZE4
+SkodaRed
+SkodaRed_DZE1
+SkodaRed_DZE2
+SkodaRed_DZE3
+SkodaRed_DZE4
+Skoda_DZE1
+Skoda_DZE2
+Skoda_DZE3
+Skoda_DZE4
+Smallboat_1
+Stinger_Pod
+Stinger_Pod_US_EP1
+Su25_CDF
+Su25_Ins
+Su25_TK_EP1
+Su34
+Su39
+T34
+T34_TK_EP1
+T34_TK_GUE_EP1
+T55_TK_EP1
+T55_TK_GUE_EP1
+T72_CDF
+T72_Gue
+T72_INS
+T72_RU
+T72_TK_EP1
+T90
+TOW_TriPod
+TOW_TriPod_US_EP1
+TT650_Civ
+TT650_Gue
+TT650_Ins
+TT650_TK_CIV_EP1
+TT650_TK_EP1
+TowingTractor
+Tractor
+UAZ_AGS30_CDF
+UAZ_AGS30_INS
+UAZ_AGS30_RU
+UAZ_AGS30_TK_EP1
+UAZ_CDF
+UAZ_CDF_DZE1
+UAZ_CDF_DZE2
+UAZ_CDF_DZE3
+UAZ_CDF_DZE4
+UAZ_INS
+UAZ_INS_DZE1
+UAZ_INS_DZE2
+UAZ_INS_DZE3
+UAZ_INS_DZE4
+UAZ_MG_CDF
+UAZ_MG_INS
+UAZ_MG_TK_EP1
+UAZ_MG_TK_EP1_DZ
+UAZ_MG_TK_EP1_DZE
+UAZ_RU
+UAZ_RU_DZE1
+UAZ_RU_DZE2
+UAZ_RU_DZE3
+UAZ_RU_DZE4
+UAZ_SPG9_INS
+UAZ_Unarmed_TK_CIV_EP1
+UAZ_Unarmed_TK_CIV_EP1_DZE1
+UAZ_Unarmed_TK_CIV_EP1_DZE2
+UAZ_Unarmed_TK_CIV_EP1_DZE3
+UAZ_Unarmed_TK_CIV_EP1_DZE4
+UAZ_Unarmed_TK_EP1
+UAZ_Unarmed_TK_EP1_DZE1
+UAZ_Unarmed_TK_EP1_DZE2
+UAZ_Unarmed_TK_EP1_DZE3
+UAZ_Unarmed_TK_EP1_DZE4
+UAZ_Unarmed_UN_EP1
+UAZ_Unarmed_UN_EP1_DZE1
+UAZ_Unarmed_UN_EP1_DZE2
+UAZ_Unarmed_UN_EP1_DZE3
+UAZ_Unarmed_UN_EP1_DZE4
+UH1H_2_DZ
+UH1H_2_DZE
+UH1H_DZ
+UH1H_DZE
+UH1H_TK_EP1
+UH1H_TK_GUE_EP1
+UH1Y
+UH1Y_DZ
+UH1Y_DZE
+UH60M_EP1
+UH60M_EP1_DZ
+UH60M_EP1_DZE
+UH60M_MEV_EP1
+UH60M_MEV_EP1_DZ
+USEC_ch53_E
+USMC_WarfareBMGNest_M240
+UralCivil
+UralCivil2
+UralCivil2_DZE
+UralCivil_DZ
+UralCivil_DZE
+UralOpen_CDF
+UralOpen_INS
+UralReammo_CDF
+UralReammo_INS
+UralReammo_TK_EP1
+UralRefuel_CDF
+UralRefuel_INS
+UralRefuel_TK_EP1
+UralRefuel_TK_EP1_DZ
+UralRepair_CDF
+UralRepair_INS
+UralRepair_TK_EP1
+UralSalvage_TK_EP1
+UralSupply_TK_EP1
+Ural_CDF
+Ural_INS
+Ural_TK_CIV_EP1
+Ural_UN_EP1
+Ural_ZU23_CDF
+Ural_ZU23_Gue
+Ural_ZU23_INS
+Ural_ZU23_TK_EP1
+Ural_ZU23_TK_GUE_EP1
+V3S_Civ
+V3S_Gue
+V3S_Open_TK_CIV_EP1
+V3S_Open_TK_EP1
+V3S_RA_TK_GUE_EP1_DZE
+V3S_Reammo_TK_GUE_EP1
+V3S_Refuel_TK_GUE_EP1
+V3S_Refuel_TK_GUE_EP1_DZ
+V3S_Repair_TK_GUE_EP1
+V3S_Salvage_TK_GUE_EP1
+V3S_Supply_TK_GUE_EP1
+V3S_TK_EP1
+V3S_TK_EP1_DZE
+V3S_TK_GUE_EP1
+VWGolf
+VWGolf_DZE1
+VWGolf_DZE2
+VWGolf_DZE3
+VWGolf_DZE4
+VolhaLimo_TK_CIV_EP1
+VolhaLimo_TK_CIV_EP1_DZE1
+VolhaLimo_TK_CIV_EP1_DZE2
+VolhaLimo_TK_CIV_EP1_DZE3
+VolhaLimo_TK_CIV_EP1_DZE4
+Volha_1_TK_CIV_EP1
+Volha_1_TK_CIV_EP1_DZE1
+Volha_1_TK_CIV_EP1_DZE2
+Volha_1_TK_CIV_EP1_DZE3
+Volha_1_TK_CIV_EP1_DZE4
+Volha_2_TK_CIV_EP1
+Volha_2_TK_CIV_EP1_DZE1
+Volha_2_TK_CIV_EP1_DZE2
+Volha_2_TK_CIV_EP1_DZE3
+Volha_2_TK_CIV_EP1_DZE4
+WarfareBMGNest_M240_US_EP1
+WarfareBMGNest_PK_TK_EP1
+WarfareBMGNest_PK_TK_GUE_EP1
+WarfareReammoTruck_CDF
+WarfareReammoTruck_Gue
+WarfareReammoTruck_INS
+WarfareReammoTruck_RU
+WarfareReammoTruck_USMC
+WarfareRepairTruck_Gue
+WarfareSalvageTruck_CDF
+WarfareSalvageTruck_Gue
+WarfareSalvageTruck_INS
+WarfareSalvageTruck_RU
+WarfareSalvageTruck_USMC
+WarfareSupplyTruck_CDF
+WarfareSupplyTruck_Gue
+WarfareSupplyTruck_INS
+WarfareSupplyTruck_RU
+WarfareSupplyTruck_USMC
+ZSU_CDF
+ZSU_INS
+ZSU_TK_EP1
+ZU23_CDF
+ZU23_Gue
+ZU23_Ins
+ZU23_TK_EP1
+ZU23_TK_GUE_EP1
+ZU23_TK_INS_EP1
+Zodiac
+car_hatchback
+car_hatchback_DZE1
+car_hatchback_DZE2
+car_hatchback_DZE3
+car_hatchback_DZE4
+car_sedan
+car_sedan_DZE1
+car_sedan_DZE2
+car_sedan_DZE3
+car_sedan_DZE4
+datsun1_civil_1_open
+datsun1_civil_1_open_DZE
+datsun1_civil_1_open_DZE1
+datsun1_civil_1_open_DZE2
+datsun1_civil_1_open_DZE3
+datsun1_civil_1_open_DZE4
+datsun1_civil_2_covered
+datsun1_civil_2_covered_DZE
+datsun1_civil_2_covered_DZE1
+datsun1_civil_2_covered_DZE2
+datsun1_civil_2_covered_DZE3
+datsun1_civil_2_covered_DZE4
+datsun1_civil_3_open
+datsun1_civil_3_open_DZE
+datsun1_civil_3_open_DZE1
+datsun1_civil_3_open_DZE2
+datsun1_civil_3_open_DZE3
+datsun1_civil_3_open_DZE4
+hilux1_civil_1_open
+hilux1_civil_1_open_DZE
+hilux1_civil_1_open_DZE1
+hilux1_civil_1_open_DZE2
+hilux1_civil_1_open_DZE3
+hilux1_civil_1_open_DZE4
+hilux1_civil_2_covered
+hilux1_civil_2_covered_DZE
+hilux1_civil_2_covered_DZE1
+hilux1_civil_2_covered_DZE2
+hilux1_civil_2_covered_DZE3
+hilux1_civil_2_covered_DZE4
+hilux1_civil_3_open
+hilux1_civil_3_open_DZE
+hilux1_civil_3_open_DZE1
+hilux1_civil_3_open_DZE2
+hilux1_civil_3_open_DZE3
+hilux1_civil_3_open_DZE4
+hilux1_civil_3_open_EP1
+pook_H13_amphib
+pook_H13_amphib_CDF
+pook_H13_amphib_CIV
+pook_H13_amphib_CIV_RU
+pook_H13_amphib_GUE
+pook_H13_amphib_INS
+pook_H13_amphib_PMC
+pook_H13_amphib_TAK
+pook_H13_amphib_UNO
+pook_H13_civ
+pook_H13_civ_black
+pook_H13_civ_ru
+pook_H13_civ_ru_black
+pook_H13_civ_ru_slate
+pook_H13_civ_ru_white
+pook_H13_civ_ru_yellow
+pook_H13_civ_slate
+pook_H13_civ_white
+pook_H13_civ_yellow
+pook_H13_gunship
+pook_H13_gunship_CDF
+pook_H13_gunship_GUE
+pook_H13_gunship_INS
+pook_H13_gunship_PMC
+pook_H13_gunship_TAK
+pook_H13_gunship_UNO
+pook_H13_medevac
+pook_H13_medevac_CDF
+pook_H13_medevac_CIV
+pook_H13_medevac_CIV_RU
+pook_H13_medevac_GUE
+pook_H13_medevac_INS
+pook_H13_medevac_PMC
+pook_H13_medevac_TAK
+pook_H13_medevac_UNO
+pook_H13_transport
+pook_H13_transport_CDF
+pook_H13_transport_GUE
+pook_H13_transport_INS
+pook_H13_transport_PMC
+pook_H13_transport_TAK
+pook_H13_transport_UNO
+smallboat_2
+tractorOld

Documents/Epoch 1.0.6.2 Classnames/Epoch 1.0.6.2 CfgWeapons.txt

@@ -0,0 +1,490 @@
+AA12_PMC
+AK74_DZ
+AK74_GL_DZ
+AK74_GL_Kobra_DZ
+AK74_GL_Kobra_SD_DZ
+AK74_GL_PSO1_DZ
+AK74_GL_PSO1_SD_DZ
+AK74_GL_SD_DZ
+AK74_Kobra_DZ
+AK74_Kobra_SD_DZ
+AK74_PSO1_DZ
+AK74_PSO1_SD_DZ
+AK74_SD_DZ
+AKM_DZ
+AKM_Kobra_DZ
+AKM_PSO1_DZ
+AKS74U_DZ
+AKS74U_Kobra_DZ
+AKS74U_Kobra_SD_DZ
+AKS74U_SD_DZ
+AKS_74
+AKS_74_GOSHAWK
+AKS_74_NSPU
+AKS_74_U
+AKS_74_UN_kobra
+AKS_74_kobra
+AKS_74_pso
+AKS_GOLD
+AK_107_GL_kobra
+AK_107_GL_pso
+AK_107_kobra
+AK_107_pso
+AK_47_M
+AK_47_S
+AK_74
+AK_74_GL
+AK_74_GL_kobra
+Anzio_20
+Anzio_20_DZ
+BAF_AS50_TWS
+BAF_AS50_scoped
+BAF_AS50_scoped_DZ
+BAF_L110A1_Aim_DZE
+BAF_L110A1_Aim_Small
+BAF_L7A2_GPMG_Small
+BAF_L85A2_RIS_ACOG
+BAF_L85A2_RIS_CWS
+BAF_L85A2_RIS_Holo
+BAF_L85A2_RIS_SUSAT
+BAF_L85A2_RIS_TWS_DZ
+BAF_L85A2_UGL_ACOG
+BAF_L85A2_UGL_Holo
+BAF_L85A2_UGL_SUSAT
+BAF_L86A2_ACOG
+BAF_LRR_scoped
+BAF_LRR_scoped_W
+BAF_NLAW_Launcher
+Binocular
+Binocular_Vector
+Bizon_DZ
+Bizon_SD_DZ
+CDF_dogtags
+CZ550_DZ
+ChainSaw
+ChainSawB
+ChainSawG
+ChainSawP
+ChainSawR
+Cobalt_File
+Colt1911
+Crossbow_CCO_DZ
+Crossbow_CCO_FL_DZ
+Crossbow_CCO_MFL_DZ
+Crossbow_DZ
+Crossbow_FL_DZ
+Crossbow_MFL_DZ
+Crossbow_Scope_DZ
+Crossbow_Scope_FL_DZ
+Crossbow_Scope_MFL_DZ
+DMR
+DMR_DZ
+DMR_Gh_DZ
+DMR_SKN
+Document_Military_DZE
+Document_Random_DZE
+Document_Topsecret_DZE
+EvDogTags
+EvKobalt
+EvMap
+EvMoney
+EvMoscow
+EvPhoto
+FNFAL_ANPVS4_DZ
+FNFAL_CCO_DZ
+FNFAL_DZ
+FNFAL_Holo_DZ
+FN_FAL
+FN_FAL_ANPVS4
+FN_FAL_ANPVS4_DZE
+G17_DZ
+G17_FL_DZ
+G17_MFL_DZ
+G17_SD_DZ
+G17_SD_FL_DZ
+G17_SD_MFL_DZ
+G36A_Camo_DZ
+G36A_camo
+G36C
+G36C_ACOG_DZ
+G36C_ACOG_SD_DZ
+G36C_CCO_DZ
+G36C_CCO_SD_DZ
+G36C_DZ
+G36C_Holo_DZ
+G36C_Holo_SD_DZ
+G36C_SD_DZ
+G36C_camo
+G36K
+G36K_Camo_DZ
+G36K_Camo_SD_DZ
+G36K_camo
+G36_C_SD_camo
+G36_C_SD_eotech
+G36a
+Igla
+ItemCompass
+ItemCrowbar
+ItemCrowbarBent
+ItemDIY_Gate
+ItemDIY_metal
+ItemDIY_wood
+ItemEtool
+ItemFishingPole
+ItemFlashlight
+ItemFlashlightRed
+ItemGPS
+ItemHatchet
+ItemHatchetBroken
+ItemKeyKit
+ItemKnife
+ItemKnife1
+ItemKnife2
+ItemKnife3
+ItemKnife4
+ItemKnife5
+ItemKnifeBlunt
+ItemMachete
+ItemMap
+ItemMap_Debug
+ItemMatchbox
+ItemMatchboxEmpty
+ItemPickaxe
+ItemPickaxeBroken
+ItemRadio
+ItemShovel
+ItemShovelBroken
+ItemSledge
+ItemSledgeHammer
+ItemSledgeHammerBroken
+ItemToolbox
+ItemWatch
+Javelin
+KSVK_DZE
+Kostey_map_case
+Kostey_notebook
+Kostey_photos
+L110A1_CCO_DZ
+L110A1_DZ
+L110A1_Holo_DZ
+L115A3_2_DZ
+L115A3_DZ
+L85A2_ACOG_DZ
+L85A2_ACOG_FL_DZ
+L85A2_ACOG_MFL_DZ
+L85A2_ACOG_SD_DZ
+L85A2_ACOG_SD_FL_DZ
+L85A2_ACOG_SD_MFL_DZ
+L85A2_CCO_DZ
+L85A2_CCO_FL_DZ
+L85A2_CCO_MFL_DZ
+L85A2_CCO_SD_DZ
+L85A2_CCO_SD_FL_DZ
+L85A2_CCO_SD_MFL_DZ
+L85A2_DZ
+L85A2_FL_DZ
+L85A2_Holo_DZ
+L85A2_Holo_FL_DZ
+L85A2_Holo_MFL_DZ
+L85A2_Holo_SD_DZ
+L85A2_Holo_SD_FL_DZ
+L85A2_Holo_SD_MFL_DZ
+L85A2_MFL_DZ
+L85A2_SD_Base
+L85A2_SD_DZ
+L85A2_SD_FL_DZ
+L85A2_SD_MFL_DZ
+Laserdesignator
+LeeEnfield
+LeeEnfield_DZ
+M1014
+M1014_CCO_DZ
+M1014_DZ
+M1014_Holo_DZ
+M110_NVG_EP1
+M110_TWS_EP1
+M136
+M14_CCO_DZ
+M14_CCO_Gh_DZ
+M14_DZ
+M14_EP1
+M14_Gh_DZ
+M14_Holo_DZ
+M14_Holo_Gh_DZ
+M16A2
+M16A2GL
+M16A2_DZ
+M16A2_GL_DZ
+M16A4_ACG_GL
+M16A4_ACOG_DZ
+M16A4_ACOG_FL_DZ
+M16A4_ACOG_MFL_DZ
+M16A4_CCO_DZ
+M16A4_CCO_FL_DZ
+M16A4_CCO_MFL_DZ
+M16A4_DZ
+M16A4_FL_DZ
+M16A4_GL
+M16A4_GL_ACOG_DZ
+M16A4_GL_ACOG_FL_DZ
+M16A4_GL_ACOG_MFL_DZ
+M16A4_GL_CCO_DZ
+M16A4_GL_CCO_FL_DZ
+M16A4_GL_CCO_MFL_DZ
+M16A4_GL_DZ
+M16A4_GL_FL_DZ
+M16A4_GL_Holo_DZ
+M16A4_GL_Holo_FL_DZ
+M16A4_GL_Holo_MFL_DZ
+M16A4_GL_MFL_DZ
+M16A4_Holo_DZ
+M16A4_Holo_FL_DZ
+M16A4_Holo_MFL_DZ
+M16A4_MFL_DZ
+M1911_DZ
+M24
+M240_CCO_DZ
+M240_DZ
+M240_Holo_DZ
+M240_Small
+M249_CCO_DZ
+M249_DZ
+M249_EP1_DZ
+M249_EP1_Small
+M249_Holo_DZ
+M249_Small
+M249_TWS_EP1_Small
+M249_m145_EP1_DZE
+M249_m145_EP1_Small
+M24_DZ
+M24_Gh_DZ
+M24_des_EP1
+M32_EP1
+M40A3
+M40A3_DZ
+M40A3_Gh_DZ
+M47Launcher_EP1
+M4A1
+M4A1_ACOG_DZ
+M4A1_ACOG_FL_DZ
+M4A1_ACOG_MFL_DZ
+M4A1_ACOG_SD_DZ
+M4A1_ACOG_SD_FL_DZ
+M4A1_ACOG_SD_MFL_DZ
+M4A1_AIM_SD_camo
+M4A1_Aim
+M4A1_Aim_camo
+M4A1_CCO_DZ
+M4A1_CCO_FL_DZ
+M4A1_CCO_MFL_DZ
+M4A1_CCO_SD_DZ
+M4A1_CCO_SD_FL_DZ
+M4A1_CCO_SD_MFL_DZ
+M4A1_DZ
+M4A1_FL_DZ
+M4A1_GL_ACOG_DZ
+M4A1_GL_ACOG_FL_DZ
+M4A1_GL_ACOG_MFL_DZ
+M4A1_GL_ACOG_SD_DZ
+M4A1_GL_ACOG_SD_FL_DZ
+M4A1_GL_ACOG_SD_MFL_DZ
+M4A1_GL_CCO_DZ
+M4A1_GL_CCO_FL_DZ
+M4A1_GL_CCO_MFL_DZ
+M4A1_GL_CCO_SD_DZ
+M4A1_GL_CCO_SD_FL_DZ
+M4A1_GL_CCO_SD_MFL_DZ
+M4A1_GL_DZ
+M4A1_GL_FL_DZ
+M4A1_GL_Holo_DZ
+M4A1_GL_Holo_FL_DZ
+M4A1_GL_Holo_MFL_DZ
+M4A1_GL_Holo_SD_DZ
+M4A1_GL_Holo_SD_FL_DZ
+M4A1_GL_Holo_SD_MFL_DZ
+M4A1_GL_MFL_DZ
+M4A1_GL_SD_DZ
+M4A1_GL_SD_FL_DZ
+M4A1_GL_SD_MFL_DZ
+M4A1_HWS_GL
+M4A1_HWS_GL_SD_Camo
+M4A1_HWS_GL_camo
+M4A1_Holo_DZ
+M4A1_Holo_FL_DZ
+M4A1_Holo_MFL_DZ
+M4A1_Holo_SD_DZ
+M4A1_Holo_SD_FL_DZ
+M4A1_Holo_SD_MFL_DZ
+M4A1_MFL_DZ
+M4A1_RCO_GL
+M4A1_SD_DZ
+M4A1_SD_FL_DZ
+M4A1_SD_MFL_DZ
+M4A3_CCO_EP1
+M4A3_RCO_GL_EP1
+M4SPR
+M4SPR_DZE
+M60A4_EP1_DZE
+M60A4_EP1_Small
+M79_EP1
+M9
+M9SD
+M9_DZ
+M9_SD_DZ
+MAAWS
+MG36
+MG36_camo
+MP5A5
+MP5SD
+MP5_DZ
+MP5_SD_DZ
+MR43_DZ
+Makarov
+MakarovSD
+Makarov_DZ
+Makarov_SD_DZ
+Manual_camera_DZE
+Manual_electronics_DZE
+Manual_repair_DZE
+Map_Military_DZE
+Map_Survivor_DZE
+MeleeBaseBallBat
+MeleeBaseBallBatBarbed
+MeleeBaseBallBatNails
+MeleeCrowbar
+MeleeFishingPole
+MeleeFlashlight
+MeleeFlashlightRed
+MeleeHatchet
+MeleeMachete
+MeleeSledge
+MetisLauncher
+Mk13_EP1
+Mk48_CCO_DZ
+Mk48_DZ
+Mk48_Holo_DZ
+Mk_48_DES_EP1_Small
+Mk_48_Small
+Moscow_Bombing_File
+Mosin_BR_DZ
+Mosin_Belt_DZ
+Mosin_Belt_FL_DZ
+Mosin_Belt_MFL_DZ
+Mosin_DZ
+Mosin_FL_DZ
+Mosin_MFL_DZ
+Mosin_PU_Belt_DZ
+Mosin_PU_Belt_FL_DZ
+Mosin_PU_Belt_MFL_DZ
+Mosin_PU_DZ
+Mosin_PU_FL_DZ
+Mosin_PU_MFL_DZ
+NVGoggles
+NVGoggles_DZE
+Notebook_bio_DZE
+Notebook_che_DZE
+Notebook_herbs_DZE
+Notebook_phy_DZE
+Notebook_secret_DZE
+PDW_DZ
+PKM_DZ
+PK_Small
+PMC_AS50_TWS
+PMC_AS50_scoped
+PMC_documents
+Pecheneg_DZ
+Pecheneg_Small
+RPG18
+RPG7V
+RPK74_DZ
+RPK74_Kobra_DZ
+RPK74_PSO1_DZ
+RPK_74
+RPK_DZ
+RPK_Kobra_DZ
+RPK_PSO1_DZ
+RedRyder
+Remington870_DZ
+Remington870_FL_DZ
+Remington870_MFL_DZ
+Revolver_DZ
+SA58_ACOG_DZ
+SA58_ACOG_FL_DZ
+SA58_ACOG_MFL_DZ
+SA58_CCO_DZ
+SA58_CCO_FL_DZ
+SA58_CCO_MFL_DZ
+SA58_DZ
+SA58_Holo_DZ
+SA58_Holo_FL_DZ
+SA58_Holo_MFL_DZ
+SA58_RIS_DZ
+SA58_RIS_FL_DZ
+SA58_RIS_MFL_DZ
+SCAR_H_CQC_CCO
+SCAR_H_CQC_CCO_SD
+SCAR_H_LNG_Sniper
+SCAR_H_LNG_Sniper_SD
+SCAR_H_STD_EGLM_Spect
+SCAR_H_STD_TWS_SD
+SCAR_L_CQC
+SCAR_L_CQC_CCO_SD
+SCAR_L_CQC_EGLM_Holo
+SCAR_L_CQC_Holo
+SCAR_L_STD_EGLM_RCO
+SCAR_L_STD_EGLM_TWS
+SCAR_L_STD_HOLO
+SCAR_L_STD_Mk4CQT
+SMAW
+SVD
+SVD_CAMO
+SVD_DZ
+SVD_Gh_DZ
+SVD_NSPU_EP1
+SVD_PSO1_DZ
+SVD_PSO1_Gh_DZ
+SVD_des_EP1
+Sa58P_EP1
+Sa58V_CCO_EP1
+Sa58V_EP1
+Sa58V_RCO_EP1
+Sa61_EP1
+Saiga12K
+Stinger
+Strela
+UK59_Base
+UK59_DZ
+UZI_EP1
+UZI_SD_EP1
+VSS_vintorez
+VSS_vintorez_DZE
+Winchester1866_DZ
+bizon
+bizon_silenced
+glock17_EP1
+huntingrifle
+ksvk
+ksvk_Small
+m107
+m107_DZ
+m107_SKN
+m107_Small
+m107_TWS_EP1
+m107_TWS_EP1_Small
+m16a4
+m16a4_acg
+m240_scoped_EP1_DZE
+m240_scoped_EP1_Small
+m8_SAW
+m8_carbine
+m8_carbineGL
+m8_carbine_pmc
+m8_compact
+m8_compact_pmc
+m8_holo_sd
+m8_sharpshooter
+m8_tws
+m8_tws_sd
+revolver_EP1
+revolver_gold_EP1
+

Documents/Epoch 1.0.6.2 Classnames/Epoch 1.0.6.2 cfgMagazines.txt

@@ -0,0 +1,632 @@
+100Rnd_127x99_L2A1
+100Rnd_127x99_M2
+100Rnd_556x45_BetaCMag
+100Rnd_556x45_BetaCMag_airLock
+100Rnd_556x45_M249
+100Rnd_762x51_M240
+100Rnd_762x54_PK
+10Rnd_127x99_m107
+10Rnd_303British
+10Rnd_762x54_SVD
+10Rnd_9x39_SP5_VSS
+10Rnd_B_765x17_Ball
+10x_303
+12Rnd_Quiver_Wood
+150Rnd_127x107_DSHKM
+150Rnd_127x108_KORD
+15Rnd_9x19_M9
+15Rnd_9x19_M9SD
+15Rnd_W1866_Slug
+17Rnd_9x19_glock17
+17Rnd_9x19_glock17SD
+1Rnd_Arrow_Wood
+1Rnd_Bolt_Explosive
+1Rnd_Bolt_Tranquilizer
+1Rnd_HE_GP25
+1Rnd_HE_M203
+1Rnd_SMOKE_GP25
+1Rnd_SmokeGreen_GP25
+1Rnd_SmokeGreen_M203
+1Rnd_SmokeRed_GP25
+1Rnd_SmokeRed_M203
+1Rnd_SmokeYellow_GP25
+1Rnd_SmokeYellow_M203
+1Rnd_Smoke_M203
+2000Rnd_762x51_L94A1
+2000Rnd_762x51_M134
+200Rnd_556x45_L110A1
+200Rnd_556x45_M249
+200Rnd_762x51_M240
+20Rnd_556x45_Stanag
+20Rnd_762x51_B_SCAR
+20Rnd_762x51_DMR
+20Rnd_762x51_FNFAL
+20Rnd_762x51_SB_SCAR
+20Rnd_9x39_SP5_VSS
+20Rnd_B_765x17_Ball
+20Rnd_B_AA12_74Slug
+20Rnd_B_AA12_HE
+20Rnd_B_AA12_Pellets
+250Rnd_127x99_M3P
+29Rnd_30mm_AGS30
+29Rnd_30mm_AGS30_heli
+2Rnd_12Gauge_Buck
+2Rnd_12Gauge_Slug
+2Rnd_Igla
+30Rnd_545x39_AK
+30Rnd_545x39_AKSD
+30Rnd_556x45_G36
+30Rnd_556x45_G36SD
+30Rnd_556x45_Stanag
+30Rnd_556x45_StanagSD
+30Rnd_762x39_AK47
+30Rnd_762x39_SA58
+30Rnd_9x19_MP5
+30Rnd_9x19_MP5SD
+30Rnd_9x19_UZI
+30Rnd_9x19_UZI_SD
+32Rnd_40mm_GMG
+350Rnd_BB_Magazine
+3Rnd_GyroGrenade
+3rnd_Anzio_20x102mm
+400Rnd_30mm_AGS17
+48Rnd_40mm_MK19
+50Rnd_127x107_DSHKM
+50Rnd_127x108_KORD
+50Rnd_762x54_UK59
+5Rnd_127x108_KSVK
+5Rnd_127x99_as50
+5Rnd_127x99_as50_CP
+5Rnd_17HMR
+5Rnd_762x51_M24
+5Rnd_762x54_Mosin
+5Rnd_86x70_L115A1
+5x_22_LR_17_HMR
+60Rnd_762x54_DT
+64Rnd_9x19_Bizon
+64Rnd_9x19_SD_Bizon
+6Rnd_45ACP
+6Rnd_FlareGreen_M203
+6Rnd_FlareRed_M203
+6Rnd_FlareWhite_M203
+6Rnd_FlareYellow_M203
+6Rnd_HE_M203
+6Rnd_HE_M203_heli
+6Rnd_SmokeGreen_M203
+6Rnd_SmokeRed_M203
+6Rnd_SmokeYellow_M203
+6Rnd_Smoke_M203
+75Rnd_545x39_RPK
+75Rnd_762x39_RPK
+7Rnd_45ACP_1911
+8Rnd_12Gauge_Buck
+8Rnd_12Gauge_Slug
+8Rnd_9x18_Makarov
+8Rnd_9x18_MakarovSD
+8Rnd_B_Beneli_74Slug
+8Rnd_B_Beneli_Pellets
+8Rnd_B_Saiga12_74Slug
+8Rnd_B_Saiga12_Pellets
+AT13
+Attachment_ACOG
+Attachment_BELT
+Attachment_CCO
+Attachment_FL
+Attachment_FL_Pist
+Attachment_GP25
+Attachment_Ghillie
+Attachment_Holo
+Attachment_Kobra
+Attachment_M203
+Attachment_MFL
+Attachment_MFL_Pist
+Attachment_PSO1
+Attachment_SA58RIS
+Attachment_SCOPED
+Attachment_Sup545
+Attachment_Sup556
+Attachment_Sup9
+Attachment_SupBizon
+Attachment_SupMakarov
+BAF_L109A1_HE
+BAF_ied_v1
+BAF_ied_v2
+BAF_ied_v3
+BAF_ied_v4
+BagFenceRound_DZ_kit
+CSGAS
+CinderBlocks
+Dragon_EP1
+FishCookedSeaBass
+FishCookedTrout
+FishCookedTuna
+FishRawSeaBass
+FishRawTrout
+FishRawTuna
+FlareGreen_GP25
+FlareGreen_M203
+FlareRed_GP25
+FlareRed_M203
+FlareWhite_GP25
+FlareWhite_M203
+FlareYellow_GP25
+FlareYellow_M203
+FoodBaconCooked
+FoodBaconRaw
+FoodBeefCooked
+FoodBeefRaw
+FoodBioMeat
+FoodCakeCremeCakeClean
+FoodCanBadguy
+FoodCanBakedBeans
+FoodCanBeef
+FoodCanBoneboy
+FoodCanCorn
+FoodCanCurgon
+FoodCanDemon
+FoodCanDerpy
+FoodCanFraggleos
+FoodCanFrankBeans
+FoodCanGriff
+FoodCanHerpy
+FoodCanOrlok
+FoodCanPasta
+FoodCanPotatoes
+FoodCanPowell
+FoodCanRusCorn
+FoodCanRusMilk
+FoodCanRusPeas
+FoodCanRusPork
+FoodCanRusStew
+FoodCanRusUnlabeled
+FoodCanSardines
+FoodCanTylers
+FoodCanUnlabeled
+FoodCandyAnders
+FoodCandyChubby
+FoodCandyLegacys
+FoodCandyMintception
+FoodChickenCooked
+FoodChickenRaw
+FoodChipsChocolate
+FoodChipsChocolateEmpty
+FoodChipsMysticales
+FoodChipsMysticalesEmpty
+FoodChipsSulahoops
+FoodChipsSulahoopsEmpty
+FoodDogCooked
+FoodDogRaw
+FoodGoatCooked
+FoodGoatRaw
+FoodMRE
+FoodMuttonCooked
+FoodMuttonRaw
+FoodNutmix
+FoodPistachio
+FoodPumpkin
+FoodRabbitCooked
+FoodRabbitRaw
+FoodSunFlowerSeed
+HandChemBlue
+HandChemGreen
+HandChemRed
+HandGrenade
+HandGrenade_East
+HandGrenade_Stone
+HandGrenade_West
+HandRoadFlare
+IRStrobe
+IR_Strobe_Marker
+IR_Strobe_Target
+Igla
+ItemARM
+ItemAVE
+ItemAluminumBar
+ItemAluminumBar10oz
+ItemAmethyst
+ItemAntibacterialWipe
+ItemAntibiotic
+ItemAntibioticEmpty
+ItemBandage
+ItemBloodbag
+ItemBook1
+ItemBook2
+ItemBook3
+ItemBook4
+ItemBookBible
+ItemBriefcase100oz
+ItemBriefcaseEmpty
+ItemBriefcaseS100oz
+ItemBronzeBar
+ItemBurlap
+ItemC4Charge
+ItemCanvas
+ItemCarBomb
+ItemCards
+ItemCitrine
+ItemComboLock
+ItemConcreteBlock
+ItemCopperBar
+ItemCopperBar10oz
+ItemCorrugated
+ItemDesertTent
+ItemDocument
+ItemDocumentRamp
+ItemDomeTent
+ItemEmerald
+ItemEpinephrine
+ItemFertilizer
+ItemFireBarrel_kit
+ItemFuelBarrel
+ItemFuelBarrelEmpty
+ItemFuelcan
+ItemFuelcanEmpty
+ItemGenerator
+ItemGoldBar
+ItemGunRackKit
+ItemHeatPack
+ItemHempPlant
+ItemHempSeed
+ItemHotwireKit
+ItemJerryMixed
+ItemJerryMixed1
+ItemJerryMixed2
+ItemJerryMixed3
+ItemJerryMixed4
+ItemJerrycan
+ItemJerrycanEmpty
+ItemKiloBlackTea
+ItemKiloHemp
+ItemKiloTobacco
+ItemKosmosSmokes
+ItemKosmosSmokesOpen
+ItemLRK
+ItemLetter
+ItemLightBulb
+ItemLockbox
+ItemLog
+ItemMetalSheet
+ItemMethylaminBarrel
+ItemMethylaminBarrelEmpty
+ItemMixOil
+ItemMorphine
+ItemNewspaper
+ItemORP
+ItemObsidian
+ItemOilBarrel
+ItemOilBarrelEmpty
+ItemPadlock
+ItemPainkiller
+ItemPlank
+ItemPlotDeed
+ItemPole
+ItemPumpkinPlant
+ItemPumpkinSeed
+ItemRSJ
+ItemRuby
+ItemSandbag
+ItemSandbagExLarge
+ItemSandbagExLarge5x
+ItemSandbagLarge
+ItemSapphire
+ItemScaffoldingKit
+ItemScrews
+ItemSepsisBandage
+ItemSherbet
+ItemSledgeHandle
+ItemSledgeHead
+ItemSodaClays
+ItemSodaCoke
+ItemSodaDrwaste
+ItemSodaEmpty
+ItemSodaFranka
+ItemSodaGrapeDrink
+ItemSodaLemonade
+ItemSodaLirik
+ItemSodaLvg
+ItemSodaMdew
+ItemSodaMtngreen
+ItemSodaMzly
+ItemSodaOrangeSherbet
+ItemSodaPeppsy
+ItemSodaPepsi
+ItemSodaR4z0r
+ItemSodaRabbit
+ItemSodaRbull
+ItemSodaRocketFuel
+ItemSodaSacrite
+ItemSodaSmasht
+ItemStone
+ItemTNK
+ItemTankTrap
+ItemTent
+ItemTinBar
+ItemTinBar10oz
+ItemTobaccoLeafs
+ItemTopaz
+ItemTrapBearTrapFlare
+ItemTrapBearTrapSmoke
+ItemTrapTripwireCans
+ItemTrapTripwireFlare
+ItemTrapTripwireGrenade
+ItemTrapTripwireSmoke
+ItemTrashPaper
+ItemTrashPaperMusic
+ItemTrashRazor
+ItemTrashToiletpaper
+ItemVault
+ItemWaterBottle
+ItemWaterBottleDmg
+ItemWaterBottleUnfilled
+ItemWire
+ItemWoodCrateKit
+ItemWoodFloor
+ItemWoodFloorHalf
+ItemWoodFloorQuarter
+ItemWoodLadder
+ItemWoodStairs
+ItemWoodStairsSupport
+ItemWoodWall
+ItemWoodWallDoor
+ItemWoodWallDoorLg
+ItemWoodWallGarageDoor
+ItemWoodWallGarageDoorLocked
+ItemWoodWallLg
+ItemWoodWallThird
+ItemWoodWallWindow
+ItemWoodWallWindowLg
+ItemWoodWallWithDoor
+ItemWoodWallWithDoorLg
+ItemWoodWallWithDoorLgLocked
+ItemWoodWallWithDoorLocked
+ItemWorkBench
+ItemZombieParts
+Item_Connector_I
+Item_Connector_L
+Item_Connector_T
+Javelin
+Laserbatteries
+M136
+MAAWS_HEAT
+MAAWS_HEDP
+Mine
+MineE
+MortarBucket
+NLAW
+NLAW_Big
+OG7
+OG9_HE
+PG7V
+PG7VL
+PG7VR
+PG9_AT
+PMC_ied_v1
+PMC_ied_v2
+PMC_ied_v3
+PMC_ied_v4
+PartEngine
+PartFueltank
+PartGeneric
+PartGlass
+PartOre
+PartOreGold
+PartOreSilver
+PartPlankPack
+PartPlywoodPack
+PartVRotor
+PartWheel
+PartWoodLumber
+PartWoodPile
+PartWoodPlywood
+PipeBomb
+RPG18
+SMAW_HEAA
+SMAW_HEAA_Big
+SMAW_HEDP
+SMAW_HEDP_Big
+Skin_Assistant_DZ
+Skin_BAF_Soldier_N_MTP_DZ
+Skin_BAF_Soldier_Officer_MTP_DZ
+Skin_Bandit1_DZ
+Skin_Bandit2_DZ
+Skin_BanditW1_DZ
+Skin_BanditW2_DZ
+Skin_CDF_Soldier_DZ
+Skin_CZ_Soldier_SL_DES_EP1_DZ
+Skin_CZ_Soldier_Sniper_EP1_DZ
+Skin_CZ_Special_Forces_GL_DES_EP1_DZ
+Skin_Camo1_DZ
+Skin_Doctor_DZ
+Skin_Drake_Light_DZ
+Skin_FR_Assault_R_DZ
+Skin_FR_Marksman_DZ
+Skin_FR_OHara_DZ
+Skin_FR_R_DZ
+Skin_FR_Rodriguez_DZ
+Skin_FR_Sapper_DZ
+Skin_FR_TL_DZ
+Skin_Functionary1_EP1_DZ
+Skin_GER_Soldier_TL_EP1_DZ
+Skin_GUE_Commander_DZ
+Skin_GUE_Soldier_2_DZ
+Skin_GUE_Soldier_CO_DZ
+Skin_GUE_Soldier_Crew_DZ
+Skin_GUE_Soldier_MG_DZ
+Skin_GUE_Soldier_Sniper_DZ
+Skin_Graves_Light_DZ
+Skin_Haris_Press_EP1_DZ
+Skin_INS_Bardak_DZ
+Skin_INS_Lopotev_DZ
+Skin_INS_Soldier_AR_DZ
+Skin_INS_Soldier_CO_DZ
+Skin_INS_Worker2_DZ
+Skin_Ins_Commander_DZ
+Skin_Ins_Soldier_2_DZ
+Skin_Ins_Soldier_Crew_DZ
+Skin_Ins_Soldier_GL_DZ
+Skin_MVD_Soldier_DZ
+Skin_Pilot_EP1_DZ
+Skin_Priest_DZ
+Skin_RUS_Commander_DZ
+Skin_RUS_Soldier1_DZ
+Skin_RU_Policeman_DZ
+Skin_RU_Soldier_Crew_DZ
+Skin_RU_Soldier_DZ
+Skin_RU_Soldier_Officer_DZ
+Skin_Rocker1_DZ
+Skin_Rocker2_DZ
+Skin_Rocker3_DZ
+Skin_Rocker4_DZ
+Skin_Rocket_DZ
+Skin_Sniper1_DZ
+Skin_Soldier1_DZ
+Skin_Soldier_Bodyguard_AA12_PMC_DZ
+Skin_Soldier_Sniper_PMC_DZ
+Skin_Soldier_TL_PMC_DZ
+Skin_Survivor2_DZ
+Skin_SurvivorW2_DZ
+Skin_SurvivorW3_DZ
+Skin_SurvivorWcombat_DZ
+Skin_SurvivorWdesert_DZ
+Skin_SurvivorWpink_DZ
+Skin_SurvivorWurban_DZ
+Skin_TK_CIV_Takistani01_EP1_DZ
+Skin_TK_CIV_Takistani03_EP1_DZ
+Skin_TK_CIV_Takistani04_EP1_DZ
+Skin_TK_CIV_Takistani06_EP1_DZ
+Skin_TK_Commander_EP1_DZ
+Skin_TK_GUE_Soldier_EP1_DZ
+Skin_TK_INS_Soldier_AR_EP1_DZ
+Skin_TK_INS_Soldier_EP1_DZ
+Skin_TK_INS_Warlord_EP1_DZ
+Skin_TK_Soldier_Sniper_EP1_DZ
+Skin_TK_Special_Forces_MG_EP1_DZ
+Skin_UN_CDF_Soldier_EP1_DZ
+Skin_UN_CDF_Soldier_Guard_EP1_DZ
+Skin_USMC_Soldier_MG_DZ
+Skin_USMC_Soldier_Officer_DZ
+Skin_USMC_Soldier_Pilot_DZ
+Skin_US_Soldier_EP1_DZ
+Skin_Worker1_DZ
+Skin_Worker3_DZ
+Skin_Worker4_DZ
+SmokeShell
+SmokeShellBlue
+SmokeShellGreen
+SmokeShellOrange
+SmokeShellPurple
+SmokeShellRed
+SmokeShellYellow
+Stinger
+Strela
+TrapBear
+TrashJackDaniels
+TrashTinCan
+bloodBagABNEG
+bloodBagABPOS
+bloodBagANEG
+bloodBagAPOS
+bloodBagBNEG
+bloodBagBPOS
+bloodBagONEG
+bloodBagOPOS
+bloodTester
+bulk
+bulk_15Rnd_9x19_M9SD
+bulk_17Rnd_9x19_glock17
+bulk_30Rnd_556x45_StanagSD
+bulk_30Rnd_9x19_MP5SD
+bulk_FoodbaconCooked
+bulk_FoodbaconCookedFull
+bulk_ItemSandbag
+bulk_ItemSodaCoke
+bulk_ItemSodaCokeFull
+bulk_ItemSodaPepsi
+bulk_ItemSodaPepsiFull
+bulk_ItemTankTrap
+bulk_ItemTankTrapHalf
+bulk_ItemWire
+bulk_ItemWireHalf
+bulk_PartGeneric
+bulk_PartGenericHalf
+bulk_empty
+cinder_door_kit
+cinder_garage_kit
+deer_stand_kit
+desert_large_net_kit
+desert_net_kit
+emptyBloodBag
+equip_1inch_metal_pipe
+equip_2inch_metal_pipe
+equip_Crossbow_Kit
+equip_aa_battery
+equip_brick
+equip_cable_tie
+equip_comfreyleafs
+equip_crate
+equip_crossbow_stock
+equip_d_battery
+equip_duct_tape
+equip_empty_barrel
+equip_feathers
+equip_floppywire
+equip_garlic_bulb
+equip_gauze
+equip_gauzepackaged
+equip_herb_box
+equip_hobo_fishing_kit
+equip_hose
+equip_hose_clamp
+equip_laser
+equip_lever
+equip_metal_sheet
+equip_metal_sheet_rusted
+equip_nails
+equip_needle
+equip_note
+equip_paint
+equip_pvc_box
+equip_rag
+equip_rail_screws
+equip_rope
+equip_scrapelectronics
+equip_slugsinacan
+equip_string
+equip_tent_poles
+equip_tin_powder
+equip_weapon_rails
+equip_wood_pallet
+equip_woodensplint
+forest_large_net_kit
+forest_net_kit
+fuel_pump_kit
+full_cinder_wall_kit
+half_cinder_wall_kit
+light_pole_kit
+m240_nest_kit
+metal_floor_kit
+metal_panel_kit
+outhouse_kit
+park_bench_kit
+plot_pole_kit
+pook_12Rnd_Grenade_Camel
+pook_1300Rnd_762x51_M60
+pook_250Rnd_762x51
+rusty_gate_kit
+sandbag_nest_kit
+stick_fence_kit
+storage_shed_kit
+sun_shade_kit
+transfusionKit
+wholeBloodBagABNEG
+wholeBloodBagABPOS
+wholeBloodBagANEG
+wholeBloodBagAPOS
+wholeBloodBagBNEG
+wholeBloodBagBPOS
+wholeBloodBagONEG
+wholeBloodBagOPOS
+wood_ramp_kit
+wood_shack_kit
+wooden_shed_kit
+workbench_kit

Documents/Epoch 1.0.6.2 Classnames/Epoch 1.0.6.3 New Zombies.txt

@@ -0,0 +1,118 @@
+New Zombies 1.0.6.3
+
+z_soldier_usmc_soldier
+z_soldier_usmc_soldier_heavy
+z_soldier_usmc_mg
+z_soldier_usmc_pilot
+z_soldier_usmc_crew
+z_soldier_usmc_officer
+z_soldier_usmc_crewman_white
+z_soldier_usmc_crewman_blue
+z_soldier_usmc_crewman_yellow
+z_soldier_usmc_crewman_red
+z_soldier_usmc_crewman_purple
+z_soldier_usmc_crewman_green
+z_soldier_usmc_ghillie
+z_soldier_fr_tl
+z_soldier_fr_commander
+z_soldier_fr_r
+z_soldier_fr_marksman
+z_soldier_fr_sapper
+z_soldier_fr_ac
+z_soldier_fr_assault
+z_soldier_cdf_officer
+z_soldier_cdf_commander
+z_soldier_cdf_pilot
+z_soldier_cdf_crew
+z_soldier_ru_soldier
+z_soldier_ru_soldier_heavy
+z_soldier_ru_officer
+z_soldier_ru_ghillie
+z_soldier_ru_pilot
+z_soldier_ru_crewman
+z_soldier_ru_specnaz
+z_soldier_ru_commander
+z_soldier_ru_specialforces
+z_soldier_gue_soldier1
+z_soldier_gue_soldier2
+z_soldier_gue_soldier3
+z_soldier_gue_soldier4
+z_soldier_gue_commander
+z_soldier_gue_ghillie
+z_soldier_ins_soldier1
+z_soldier_ins_soldier2
+z_soldier_ins_soldier3
+z_soldier_ins_officer
+z_soldier_ins_bardak
+z_soldier_ins_lopotev
+z_citizen1
+z_citizen2
+z_citizen3
+z_citizen4
+z_lumberjack1
+z_lumberjack2
+z_lumberjack3
+z_lumberjack4
+z_profiteer1
+z_profiteer2
+z_profiteer3
+z_profiteer4
+z_rocker1
+z_rocker2
+z_rocker3
+z_rocker4
+z_hunter2
+z_hunter3
+z_hunter4
+z_assistant
+z_pilot
+z_takistani1
+z_takistani2
+z_takistani3
+z_takistani4
+z_takistani5
+z_takistani6
+z_soldier_tk_soldier1
+z_soldier_tk_soldier2
+z_soldier_tk_soldier3
+z_soldier_tk_soldier4
+z_soldier_cz_soldier_heavy
+z_soldier_cz_officer
+z_soldier_cz_pilot
+z_soldier_cz_ghillie
+z_soldier_cz_spec
+z_soldier_un_soldier_heavy
+z_soldier_ger_soldier
+z_soldier_ger_soldier_light
+z_soldier_baf_w_soldier_heavy
+z_soldier_baf_d_soldier_heavy
+z_soldier_baf_w_soldier_w_heavy
+z_soldier_baf_w_soldier
+z_soldier_baf_d_soldier
+z_soldier_baf_w_soldier_w
+z_soldier_pmc_soldier
+z_soldier_pmc_engineer
+z_soldier_pmc_bodyguard
+
+Loot Groups
+
+ZombieCrewman
+ZombieOfficer
+ZombieGhillie
+ZombieSpecialForces
+ZombieRebels
+ZombieLumberJack
+ZombieRocker
+ZombieBodyguard
+
+Stringtable Names
+
+STR_ZNAME_CREWMAN
+STR_ZNAME_OFFICER
+STR_ZNAME_GHILLIE
+STR_ZNAME_SPECIALFORCES
+STR_ZNAME_REBELS
+STR_ZNAME_LUMERJACK
+STR_ZNAME_ROCKER
+STR_ZNAME_ASSISTANT
+STR_ZNAME_BODYGUARD

SQF/dayz_code/Configs/CfgLoot/Buildings/CrashSite.hpp

@@ -6,7 +6,15 @@ class CrashSite : Default
 	zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
 };
 
-class CrashSite_RU : CrashSite {};
-class CrashSite_US : CrashSite {};
-class CrashSite_EU : CrashSite {};
-class CrashSite_UN : CrashSite {};
+class CrashSite_RU : CrashSite {
+	zombieClass[] = {"z_soldier_ru_pilot","z_soldier_ru_crewman","z_soldier_ru_pilot","z_soldier_ru_crewman","z_soldier_ru_specialforces","z_soldier_ru_soldier","z_soldier_ru_soldier_heavy"};
+};
+class CrashSite_US : CrashSite {
+	zombieClass[] = {"z_soldier_usmc_pilot","z_soldier_usmc_crew","z_soldier_usmc_mg","z_soldier_usmc_soldier_heavy","z_soldier_usmc_soldier"};
+};
+class CrashSite_EU : CrashSite {
+	zombieClass[] = {"z_soldier_cz_pilot","z_soldier_cz_soldier_heavy","z_soldier_cz_spec"};
+};
+class CrashSite_UN : CrashSite {
+	zombieClass[] = {"z_soldier_cdf_crew","z_soldier_pilot","z_soldier_cdf_pilot","z_soldier_un_soldier_heavy","z_soldier_heavy"};
+};

SQF/dayz_code/Configs/CfgLoot/Buildings/Farm.hpp

@@ -2,7 +2,7 @@ class Farm : Default
 {
 	zombieChance = 0.3;
 	maxRoaming = 3;
-	zombieClass[] = {"zZombie_Base","z_hunter","z_hunter","z_hunter","z_villager1","z_villager2","z_villager3","z_new_villager2","z_new_villager3","z_new_villager4"};
+	zombieClass[] = {"zZombie_Base","z_hunter","z_hunter2","z_hunter3","z_hunter4","z_villager1","z_villager2","z_villager3","z_new_villager2","z_new_villager3","z_new_villager4"};
 	lootChance = 0.5;
 	lootGroup = Farm;
 };
@@ -130,4 +130,4 @@ class land_zd_2: Farm // nm shed
 //DZE ADDED BELOW
 class land_shed_m01: Farm {
 	zedPos[] = {{0.218262,-1.78369,-0.347349}};
-};
+};

SQF/dayz_code/Configs/CfgLoot/Buildings/Hunting.hpp

@@ -1,19 +1,19 @@
-class Hunting : Default
-{
-	zombieChance = 0.6;
-	minRoaming = 1;
-	maxRoaming = 3;
-	zombieClass[] = {"z_hunter","z_hunter","z_hunter"};
-	lootChance = 0.8;
-	lootGroup = Hunting;
-};
-
-class Land_Misc_deerstand: Hunting
-{
-	zombieChance = 0.3;
-	maxRoaming = 3;
-	zedPos[] = {{0.419922,-0.234375,0.985291},{-0.836914,-0.929688,0.985291}};
-	lootChance = 0.5;
-	//lootPos[] = {{-0.836914,-0.929688,0.985291},{0.419922,-0.234375,0.985291}};
-	lootPos[] = {{-0.923828,-0.808594,1.08539},{0.419922,-0.237305,1.08539}};
+class Hunting : Default
+{
+	zombieChance = 0.6;
+	minRoaming = 1;
+	maxRoaming = 3;
+	zombieClass[] = {"z_hunter","z_hunter","z_hunter","z_hunter2","z_hunter2","z_hunter3","z_hunter3","z_hunter4","z_hunter4"};
+	lootChance = 0.8;
+	lootGroup = Hunting;
+};
+
+class Land_Misc_deerstand: Hunting
+{
+	zombieChance = 0.3;
+	maxRoaming = 3;
+	zedPos[] = {{0.419922,-0.234375,0.985291},{-0.836914,-0.929688,0.985291}};
+	lootChance = 0.5;
+	//lootPos[] = {{-0.836914,-0.929688,0.985291},{0.419922,-0.234375,0.985291}};
+	lootPos[] = {{-0.923828,-0.808594,1.08539},{0.419922,-0.237305,1.08539}};
 };

SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp

@@ -9,7 +9,15 @@ class Military : Default
 		"z_soldier",
 		"z_policeman",
 		"z_soldier_heavy",
-		"z_soldier_heavy"
+		"z_soldier_heavy",
+		"z_soldier_usmc_ghillie",
+		"z_soldier_cdf_officer",
+		"z_soldier_cdf_commander",
+		"z_soldier_ru_specnaz",
+		"z_soldier_ru_commander",
+		"z_soldier_ru_specialforces",
+		"z_soldier_ru_soldier",
+		"z_soldier_ru_soldier_heavy"
 	};
 	lootChance = 0.4;
 	lootGroup = Military;
@@ -24,7 +32,15 @@ class MilitarySpecial : Military
 		"z_soldier_heavy",
 		"z_soldier_heavy",
 		"z_soldier_heavy",
-		"z_soldier"
+		"z_soldier",
+		"z_soldier_usmc_ghillie",
+		"z_soldier_cdf_officer",
+		"z_soldier_cdf_commander",
+		"z_soldier_ru_specnaz",
+		"z_soldier_ru_commander",
+		"z_soldier_ru_specialforces",
+		"z_soldier_ru_soldier",
+		"z_soldier_ru_soldier_heavy"
 	};
 	lootChance = 0.4;
 	lootGroup = MilitarySpecial;
@@ -64,7 +80,8 @@ class Land_Mil_ControlTower: Military
 	{
 		"z_soldier",
 		"z_soldier",
-		"z_policeman"
+		"z_policeman",
+		"z_soldier_ru_officer"
 	};
 	zedPos[] = {{10.0703,3.76367,-9.62869},{1.75195,5.68164,-5.51373},{3.85254,3.53516,-5.50372},{6.66113,-0.625488,-1.0787},{6.72266,3.23389,-1.0787},{2.63965,-0.191406,-1.0687}};
 	lootChance = 0.4;
@@ -82,7 +99,9 @@ class Land_SS_hangar: Military
 		"z_soldier_heavy",
 		"z_worker1",
 		"z_worker2",
-		"z_worker3"
+		"z_worker3",
+		"z_soldier_ru_pilot",
+		"z_soldier_ru_crewman"
 	};
 	maxRoaming = 3;
 	zedPos[] = {{-11.7158,-18.9541,-5.87253},{11.7344,-17.165,-5.87253},{-14.2461,23.0439,-5.87253}};
@@ -116,7 +135,13 @@ class Land_Mil_House: Military
 	{
 		"z_soldier",
 		"z_soldier",
-		"z_policeman"
+		"z_policeman",
+		"z_soldier_ru_ghillie",
+		"z_soldier_ru_specnaz",
+		"z_soldier_ru_commander",
+		"z_soldier_ru_specialforces",
+		"z_soldier_ru_soldier",
+		"z_soldier_ru_soldier_heavy"
 	};
 	zedPos[] = {{11.1638,4.70117,-5.67465},{12.4565,1.42383,-5.67465},{13.6672,4.42383,-5.67465}};
 	lootPos[] = {{8.02,4.33,-5.07},{5,2.6,-5.07},{10.72,-1.85,-5.57},{2.59,-5.69,-5.07},{0.71,-6.8,-5.07},{-7.48,-7.23,-4.24},{-10.11,-4.59,-5.07},{-12.21,-2.28,-5.07},{-7.87,4.44,-0.09},{-13.76,-6.49,-0.94},{-13.96,3.4,-0.94},{-1.71,-6.68,-0.94},{-1.38,-1.7,-0.94},{-12.84,2.75,3.25},{-6.69,-6.36,3.3},{-13.78,6.93,-0.69},{-5.78,6.62,-3.7},{12.91,3.06,-5.68},{14.4,1.51,-5.68},{3.92,2.42,-5.07},{10.82,-0.49,-5.57},{-1.9,-7.37,-5.07},{-1.71,3.84,-5.07},{-1.17,1.31,-5.07}};

SQF/dayz_code/Configs/CfgLoot/Buildings/Residential.hpp

@@ -9,7 +9,25 @@ class Residential : Default
 		"z_teacher",
 		"z_villager1",
 		"z_villager2",
-		"z_villager3"
+		"z_villager3",
+		"z_citizen1",
+		"z_citizen2",
+		"z_citizen3",
+		"z_citizen4",
+		"z_lumberjack1",
+		"z_lumberjack2",
+		"z_lumberjack3",
+		"z_lumberjack4",
+		"z_profiteer1",
+		"z_profiteer2",
+		"z_profiteer3",
+		"z_profiteer4",
+		"z_rocker1",
+		"z_rocker2",
+		"z_rocker3",
+		"z_rocker4",
+		"z_assistant",
+		"z_pilot"
 	};
 	lootChance = 0.5;
 	lootGroup = Residential;
@@ -1081,4 +1099,4 @@ class UAZWreck: Residential
 	minRoaming = 1;
 	maxRoaming = 2;
 	lootPos[] = {};
-};
+};

SQF/dayz_code/Configs/CfgLoot/Buildings/Supermarket.hpp

@@ -8,12 +8,29 @@ class Supermarket : Default
 	{
 		"zZombie_Base",
 		"zZombie_Base",
+		"z_hunter",
 		"z_teacher",
-		"z_suit1",
-		"z_suit2",
-		"z_new_villager2",
-		"z_new_villager3",
-		"z_new_villager4"
+		"z_villager1",
+		"z_villager2",
+		"z_villager3",
+		"z_citizen1",
+		"z_citizen2",
+		"z_citizen3",
+		"z_citizen4",
+		"z_lumberjack1",
+		"z_lumberjack2",
+		"z_lumberjack3",
+		"z_lumberjack4",
+		"z_profiteer1",
+		"z_profiteer2",
+		"z_profiteer3",
+		"z_profiteer4",
+		"z_rocker1",
+		"z_rocker2",
+		"z_rocker3",
+		"z_rocker4",
+		"z_assistant",
+		"z_pilot"
 	};
 	lootGroup = Supermarket;
 };

SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp

@@ -1,119 +1,129 @@
-#include "LootDefines.hpp"
-
-class CfgLoot
-{
-	class Groups
-	{
-		//Not renamed yet
-		#define DZ_BP_VestPouch DZ_Czech_Vest_Pouch
-		#define DZ_BP_Patrol DZ_Patrol_Pack_EP1
-		#define DZ_BP_Assault DZ_Assault_Pack_EP1
-		#define DZ_BP_Survival DZ_TK_Assault_Pack_EP1
-		#define DZ_BP_Alice DZ_ALICE_Pack_EP1
-		#define DZ_BP_British DZ_British_ACU
-		#define DZ_BP_Czech DZ_CivilBackpack_EP1
-		#define DZ_BP_Coyote DZ_Backpack_EP1
-
-		#define ItemBloodbagAPos bloodBagAPOS
-		#define ItemBloodbagANeg bloodBagANEG
-		#define ItemBloodbagBPos bloodBagBPOS
-		#define ItemBloodbagBNeg bloodBagBNEG
-		#define ItemBloodbagABPos bloodBagABPOS
-		#define ItemBloodbagABNeg bloodBagABNEG
-		#define ItemBloodbagOPos bloodBagOPOS
-		#define ItemBloodbagONeg bloodBagONEG
-		
-		#define ItemBloodTester bloodTester
-		#define ItemTransfusionKit transfusionKit
-		#define ItemBloodbagEmpty emptyBloodBag
-		
-		// General groups
-		#include "Groups\Ammo.hpp"
-		#include "Groups\AmmoBox.hpp"
-		#include "Groups\Attachments.hpp"
-		#include "Groups\Medical.hpp"
-		#include "Groups\Generic.hpp"
-		#include "Groups\Trash.hpp"
-		#include "Groups\Consumable.hpp"
-		#include "Groups\ConsumableItems.hpp"
-		#include "Groups\Fuel.hpp"
-		#include "Groups\Parts.hpp"
-		//DZE
-		#include "Groups\Weapons.hpp"
-		#include "Groups\Clothes.hpp"
-		#include "Groups\Backpacks.hpp"
-		#include "Groups\Wrecks.hpp"
-		
-		// Points of interest
-		#include "Groups\CrashSite.hpp"
-		#include "Groups\CarePackage.hpp"
-		#include "Groups\InfectedCamp.hpp"
-				
-		// Buildings
-		#include "CfgBuildingLoot.hpp"
-
-		// Zombies
-		#include "Groups\Zombies\Civilian.hpp"
-		#include "Groups\Zombies\Hunter.hpp"
-		#include "Groups\Zombies\Police.hpp"
-		#include "Groups\Zombies\Military.hpp"
-		#include "Groups\Zombies\Worker.hpp" //DZE
-		#include "Groups\Zombies\Suit.hpp" //DZE
-		#include "Groups\Zombies\Doctor.hpp" //DZE
-		#include "Groups\Zombies\Pilot.hpp" //DZE
-		
-		#undef DZ_BP_VestPouch
-		#undef DZ_BP_Patrol
-		#undef DZ_BP_Assault
-		#undef DZ_BP_Survival
-		#undef DZ_BP_Alice
-		#undef DZ_BP_British
-		#undef DZ_BP_Czech
-		#undef DZ_BP_Coyote
-
-		#undef ItemBloodbagAPos
-		#undef ItemBloodbagANeg
-		#undef ItemBloodbagBPos
-		#undef ItemBloodbagBNeg
-		#undef ItemBloodbagABPos
-		#undef ItemBloodbagABNeg
-		#undef ItemBloodbagOPos
-		#undef ItemBloodbagONeg
-		
-		#undef ItemBloodTester
-		#undef ItemTransfusionKit
-		#undef ItemBloodbagEmpty
-	};
-	
-	class Buildings
-	{
-		class Default
-		{
-			zombieChance = 0.2;
-			minRoaming = 0;
-			maxRoaming = 2;
-			zombieClass[] =
-			{
-			//	"zZombie_Base",
-				"z_hunter",
-				"z_teacher",
-				"z_suit1",
-				"z_suit2",
-				"z_worker1",
-				"z_worker2",
-				"z_worker3",
-				"z_villager1",
-				"z_villager2",
-				"z_villager3"
-			};
-			
-			lootChance = 0;
-			lootRefreshTimer = 900;
-			lootGroup = "";
-			lootPos[] = {};
-		};
-	
-		// Buildings
-		#include "CfgBuildingPos.hpp"
-	};
+#include "LootDefines.hpp"
+
+class CfgLoot
+{
+	class Groups
+	{
+		//Not renamed yet
+		#define DZ_BP_VestPouch DZ_Czech_Vest_Pouch
+		#define DZ_BP_Patrol DZ_Patrol_Pack_EP1
+		#define DZ_BP_Assault DZ_Assault_Pack_EP1
+		#define DZ_BP_Survival DZ_TK_Assault_Pack_EP1
+		#define DZ_BP_Alice DZ_ALICE_Pack_EP1
+		#define DZ_BP_British DZ_British_ACU
+		#define DZ_BP_Czech DZ_CivilBackpack_EP1
+		#define DZ_BP_Coyote DZ_Backpack_EP1
+
+		#define ItemBloodbagAPos bloodBagAPOS
+		#define ItemBloodbagANeg bloodBagANEG
+		#define ItemBloodbagBPos bloodBagBPOS
+		#define ItemBloodbagBNeg bloodBagBNEG
+		#define ItemBloodbagABPos bloodBagABPOS
+		#define ItemBloodbagABNeg bloodBagABNEG
+		#define ItemBloodbagOPos bloodBagOPOS
+		#define ItemBloodbagONeg bloodBagONEG
+		
+		#define ItemBloodTester bloodTester
+		#define ItemTransfusionKit transfusionKit
+		#define ItemBloodbagEmpty emptyBloodBag
+		
+		// General groups
+		#include "Groups\Ammo.hpp"
+		#include "Groups\AmmoBox.hpp"
+		#include "Groups\Attachments.hpp"
+		#include "Groups\Medical.hpp"
+		#include "Groups\Generic.hpp"
+		#include "Groups\Trash.hpp"
+		#include "Groups\Consumable.hpp"
+		#include "Groups\ConsumableItems.hpp"
+		#include "Groups\Fuel.hpp"
+		#include "Groups\Parts.hpp"
+		//DZE
+		#include "Groups\Weapons.hpp"
+		#include "Groups\Clothes.hpp"
+		#include "Groups\Backpacks.hpp"
+		#include "Groups\Wrecks.hpp"
+		
+		// Points of interest
+		#include "Groups\CrashSite.hpp"
+		#include "Groups\CarePackage.hpp"
+		#include "Groups\InfectedCamp.hpp"
+				
+		// Buildings
+		#include "CfgBuildingLoot.hpp"
+
+		// Zombies
+		#include "Groups\Zombies\Civilian.hpp"
+		#include "Groups\Zombies\Hunter.hpp"
+		#include "Groups\Zombies\Police.hpp"
+		#include "Groups\Zombies\Military.hpp"
+		#include "Groups\Zombies\Worker.hpp" //DZE
+		#include "Groups\Zombies\Suit.hpp" //DZE
+		#include "Groups\Zombies\Doctor.hpp" //DZE
+		#include "Groups\Zombies\Pilot.hpp" //DZE
+		//New 1.0.6.3
+		#include "Groups\Zombies\Bodyguard.hpp" //DZE
+		#include "Groups\Zombies\Crewman.hpp" //DZE
+		#include "Groups\Zombies\Ghillie.hpp" //DZE
+		#include "Groups\Zombies\Lumberjack.hpp" //DZE
+		#include "Groups\Zombies\Officer.hpp" //DZE
+		#include "Groups\Zombies\Rebels.hpp" //DZE
+		#include "Groups\Zombies\Rocker.hpp" //DZE
+		#include "Groups\Zombies\SpecialForces.hpp" //DZE
+		
+		
+		#undef DZ_BP_VestPouch
+		#undef DZ_BP_Patrol
+		#undef DZ_BP_Assault
+		#undef DZ_BP_Survival
+		#undef DZ_BP_Alice
+		#undef DZ_BP_British
+		#undef DZ_BP_Czech
+		#undef DZ_BP_Coyote
+
+		#undef ItemBloodbagAPos
+		#undef ItemBloodbagANeg
+		#undef ItemBloodbagBPos
+		#undef ItemBloodbagBNeg
+		#undef ItemBloodbagABPos
+		#undef ItemBloodbagABNeg
+		#undef ItemBloodbagOPos
+		#undef ItemBloodbagONeg
+		
+		#undef ItemBloodTester
+		#undef ItemTransfusionKit
+		#undef ItemBloodbagEmpty
+	};
+	
+	class Buildings
+	{
+		class Default
+		{
+			zombieChance = 0.2;
+			minRoaming = 0;
+			maxRoaming = 2;
+			zombieClass[] =
+			{
+			//	"zZombie_Base",
+				"z_hunter",
+				"z_teacher",
+				"z_suit1",
+				"z_suit2",
+				"z_worker1",
+				"z_worker2",
+				"z_worker3",
+				"z_villager1",
+				"z_villager2",
+				"z_villager3"
+			};
+			
+			lootChance = 0;
+			lootRefreshTimer = 900;
+			lootGroup = "";
+			lootPos[] = {};
+		};
+	
+		// Buildings
+		#include "CfgBuildingPos.hpp"
+	};
 };

SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Bodyguard.hpp

@@ -0,0 +1,15 @@
+ZombieBodyguard[] =
+{
+	{Loot_MAGAZINE,		1,		FoodMRE},
+	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
+	{Loot_GROUP,		3,		MedicalLow},
+	{Loot_GROUP,		10,		AmmoMilitaryLow},
+	{Loot_GROUP,		2,		AmmoMilitaryHigh},
+	{Loot_GROUP,		2,		Consumable}
+};
+
+ZombieBodyguardViral[] =
+{
+	{Loot_GROUP,		10,		ZombieBodyguard},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Crewman.hpp

@@ -0,0 +1,15 @@
+ZombieCrewman[] =
+{
+	{Loot_MAGAZINE,		1,		FoodMRE},
+	{Loot_MAGAZINE,		0.5,	ItemHotwireKit},
+	{Loot_GROUP,		3,		MedicalLow},
+	{Loot_GROUP,		10,		AmmoMilitaryLow},
+	{Loot_GROUP,		2,		AmmoMilitaryHigh},
+	{Loot_GROUP,		2,		Consumable}
+};
+
+ZombieCrewmanViral[] =
+{
+	{Loot_GROUP,		10,		ZombieCrewman},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Doctor.hpp

@@ -1,16 +1,16 @@
-ZombieDoctor[] =
-{
-	{Loot_MAGAZINE,		5,		ItemMorphine},
-	{Loot_MAGAZINE,		3,		ItemBloodTester},
-	{Loot_MAGAZINE,		5,		ItemHeatPack},
-	{Loot_MAGAZINE,		2,		ItemBloodbagEmpty},
-	{Loot_GROUP,		2,		Antibiotics},
-	{Loot_GROUP,		6,		Bloodbags},
-	{Loot_GROUP,		7,		MedicalLow}
-};
-
-ZombieDoctorViral[] =
-{
-	{Loot_GROUP,		10,		ZombieMedical},
-	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+ZombieDoctor[] =
+{
+	{Loot_MAGAZINE,		5,		ItemMorphine},
+	{Loot_MAGAZINE,		3,		ItemBloodTester},
+	{Loot_MAGAZINE,		5,		ItemHeatPack},
+	{Loot_MAGAZINE,		2,		ItemBloodbagEmpty},
+	{Loot_GROUP,		2,		Antibiotics},
+	{Loot_GROUP,		6,		Bloodbags},
+	{Loot_GROUP,		7,		MedicalLow}
+};
+
+ZombieDoctorViral[] =
+{
+	{Loot_GROUP,		10,		ZombieDoctor},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
 };

SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Ghillie.hpp

@@ -0,0 +1,15 @@
+ZombieGhillie[] =
+{
+	{Loot_MAGAZINE,		1,		FoodMRE},
+	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
+	{Loot_GROUP,		3,		MedicalLow},
+	{Loot_GROUP,		10,		AmmoMilitaryLow},
+	{Loot_GROUP,		2,		AmmoMilitaryHigh},
+	{Loot_GROUP,		2,		Consumable}
+};
+
+ZombieGhillieViral[] =
+{
+	{Loot_GROUP,		10,		ZombieGhillie},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Lumberjack.hpp

@@ -0,0 +1,19 @@
+ZombieLumberJack[] =
+{
+	{Loot_GROUP,		10,		Consumable},
+	{Loot_GROUP,		2,		AmmoCivilian},
+	{Loot_MAGAZINE,		3,		ItemBandage},
+	{Loot_MAGAZINE,		2,		ItemPainkiller},
+	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},
+	{Loot_MAGAZINE,		2,		ItemDocument},
+	{Loot_MAGAZINE,		2,		ItemWire},
+	{Loot_MAGAZINE,		3,		ItemTankTrap},
+	{Loot_MAGAZINE,		2,		ItemComboLock},
+	{Loot_MAGAZINE,		2,		ItemSledgeHead}
+};
+
+ZombieLumberJackViral[] =
+{
+	{Loot_GROUP,		10,		ZombieLumberJack},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Officer.hpp

@@ -0,0 +1,15 @@
+ZombieOfficer[] =
+{
+	{Loot_MAGAZINE,		1,		FoodMRE},
+	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
+	{Loot_GROUP,		3,		MedicalLow},
+	{Loot_GROUP,		10,		AmmoMilitaryLow},
+	{Loot_GROUP,		2,		AmmoMilitaryHigh},
+	{Loot_GROUP,		2,		Consumable}
+};
+
+ZombieOfficerViral[] =
+{
+	{Loot_GROUP,		10,		ZombieOfficer},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Pilot.hpp

@@ -1,15 +1,15 @@
-ZombiePilot[] =
-{
-	{Loot_MAGAZINE,		1,		FoodMRE},
-	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
-	{Loot_GROUP,		3,		MedicalLow},
-	{Loot_GROUP,		10,		AmmoMilitaryLow},
-	{Loot_GROUP,		2,		AmmoMilitaryHigh},
-	{Loot_GROUP,		2,		Consumable}
-};
-
-ZombiePilotViral[] =
-{
-	{Loot_GROUP,		10,		ZombieMilitary},
-	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
-};
+ZombiePilot[] =
+{
+	{Loot_MAGAZINE,		1,		FoodMRE},
+	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
+	{Loot_GROUP,		3,		MedicalLow},
+	{Loot_GROUP,		10,		AmmoMilitaryLow},
+	{Loot_GROUP,		2,		AmmoMilitaryHigh},
+	{Loot_GROUP,		2,		Consumable}
+};
+
+ZombiePilotViral[] =
+{
+	{Loot_GROUP,		10,		ZombiePilot},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Rebels.hpp

@@ -0,0 +1,15 @@
+ZombieRebels[] =
+{
+	{Loot_MAGAZINE,		1,		FoodMRE},
+	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
+	{Loot_GROUP,		3,		MedicalLow},
+	{Loot_GROUP,		10,		AmmoMilitaryLow},
+	{Loot_GROUP,		2,		AmmoMilitaryHigh},
+	{Loot_GROUP,		2,		Consumable}
+};
+
+ZombieRebelsViral[] =
+{
+	{Loot_GROUP,		10,		ZombieRebels},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Rocker.hpp

@@ -0,0 +1,15 @@
+ZombieRocker[] =
+{
+	{Loot_GROUP,		6,		Consumable},
+	{Loot_GROUP,		1,		AmmoCivilian},
+	{Loot_MAGAZINE,		3,		ItemBandage},
+	{Loot_MAGAZINE,		2,		ItemPainkiller},
+	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},
+	{Loot_MAGAZINE,		3,		ItemDocument}
+};
+
+ZombieRockerViral[] =
+{
+	{Loot_GROUP,		10,		ZombieRocker},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/SpecialForces.hpp

@@ -0,0 +1,15 @@
+ZombieSpecialForces[] =
+{
+	{Loot_MAGAZINE,		1,		FoodMRE},
+	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
+	{Loot_GROUP,		3,		MedicalLow},
+	{Loot_GROUP,		10,		AmmoMilitaryLow},
+	{Loot_GROUP,		2,		AmmoMilitaryHigh},
+	{Loot_GROUP,		2,		Consumable}
+};
+
+ZombieSpecialForcesViral[] =
+{
+	{Loot_GROUP,		10,		ZombieSpecialForces},
+	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
+};

SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp

@@ -1184,12 +1184,14 @@ class ItemOilBarrelEmpty : ItemOilBarrel
 {
 	displayName = $STR_EPOCH_EMPTYOILBARREL;
 	descriptionShort = $STR_EPOCH_EMPTYOILBARREL_DESC;
+	picture = "\z\addons\dayz_epoch\pictures\equip_oildrum_e_CA.paa";
 };	
 
 class ItemMethylaminBarrelEmpty : ItemOilBarrel
 {
 	displayName = $STR_EPOCH_EMPTYMETHYLAMINEBARREL;
 	descriptionShort = $STR_EPOCH_EMPTYMETHYLAMINEBARREL_DESC;
+	picture = "\z\addons\dayz_epoch\pictures\equip_oildrum_e_CA.paa";
 };
 
 class ItemMethylaminBarrel : ItemOilBarrel

SQF/dayz_code/Configs/CfgMagazines/DZE/ModularBuilding.hpp

@@ -35,6 +35,7 @@ class half_cinder_wall_kit: CA_Magazine {
 		};
 	};
 };
+
 class full_cinder_wall_kit: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -53,6 +54,7 @@ class full_cinder_wall_kit: CA_Magazine {
 		};
 	};
 };
+
 class cinder_door_kit: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -71,6 +73,26 @@ class cinder_door_kit: CA_Magazine {
 		};
 	};
 };
+
+class cinder_door_kit_locked: CA_Magazine {
+	scope = public;
+	count = 1;
+	type = 256;
+	displayName = $STR_EPOCH_BLOCKDOORLOCKED;
+	descriptionShort = $STR_EPOCH_BLOCKDOORWAY_LOCKED_DESC;
+	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	weight = 340;
+	class ItemActions {
+		class Build {
+			text = $STR_ACTIONS_BUILD;
+			script = "spawn player_build;";
+			require[] = {"ItemToolbox"};
+			create = "CinderWallDoorSmallLocked_DZ";
+		};
+	};
+};
+
 class cinder_garage_kit: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -90,6 +112,25 @@ class cinder_garage_kit: CA_Magazine {
 	};
 };
 
+class cinder_garage_kit_locked: CA_Magazine {
+	scope = public;
+	count = 1;
+	type = 256;
+	displayName = $STR_EPOCH_BLOCKGARAGEDOORLOCKED;
+	descriptionShort = $STR_EPOCH_BLOCKGARAGEDOORWAY_LOCKED_DESC;
+	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	weight = 340;
+	class ItemActions {
+		class Build {
+			text = $STR_ACTIONS_BUILD;
+			script = "spawn player_build;";
+			require[] = {"ItemToolbox"};
+			create = "CinderWallDoorLocked_DZ";
+		};
+	};
+};
+
 class ItemWoodFloor: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -108,6 +149,7 @@ class ItemWoodFloor: CA_Magazine {
 		};
 	};
 };
+
 class ItemWoodFloorHalf: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -134,6 +176,7 @@ class ItemWoodFloorHalf: CA_Magazine {
 		};
 	};
 };
+
 class ItemWoodFloorQuarter: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -187,6 +230,7 @@ class ItemWoodStairs: CA_Magazine {
 		};
 	};
 };
+
 class ItemWoodStairsSupport: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -267,6 +311,7 @@ class ItemWoodWall: CA_Magazine {
 		};
 	};
 };
+
 class ItemWoodWallThird: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -293,6 +338,7 @@ class ItemWoodWallThird: CA_Magazine {
 		};
 	};
 };
+
 class ItemWoodWallWindow: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -338,6 +384,7 @@ class ItemWoodWallDoor: CA_Magazine {
 		};
 	};
 };
+
 class ItemWoodWallWithDoor: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -364,6 +411,7 @@ class ItemWoodWallWithDoor: CA_Magazine {
 		};
 	};
 };
+
 class ItemWoodWallWithDoorLocked: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -409,6 +457,7 @@ class ItemWoodWallGarageDoor: CA_Magazine {
 		};
 	};
 };
+
 class ItemWoodWallGarageDoorLocked: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -470,6 +519,7 @@ class ItemWoodWallLg: CA_Magazine {
 		};
 	};
 };
+
 class ItemWoodWallWindowLg: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -515,6 +565,7 @@ class ItemWoodWallDoorLg: CA_Magazine {
 		};
 	};
 };
+
 class ItemWoodWallWithDoorLg: CA_Magazine {
 	scope = public;
 	count = 1;
@@ -541,6 +592,7 @@ class ItemWoodWallWithDoorLg: CA_Magazine {
 		};
 	};
 };
+
 class ItemWoodWallWithDoorLgLocked: CA_Magazine {
 	scope = public;
 	count = 1;

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGunAmmo.hpp

@@ -29,11 +29,6 @@ class Category_622 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
-	class 45Rnd_545x39_RPK {
-		type = "trade_items";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
-	};
 	class 75Rnd_545x39_RPK {
 		type = "trade_items";
 		buy[] = {2,"ItemGoldBar"};

SQF/dayz_code/Configs/CfgTownGenerator/CfgTownGeneratorDefault.hpp

@@ -4406,7 +4406,7 @@ class Berezino {
 	class Object241 { type = "Rubbish1"; position[] = {11941.8, 9125.61, 0}; direction = 167; onFire = 0; };
 	class Object242 { type = "Rubbish4"; position[] = {11996, 9193.29, 0}; direction = 226; onFire = 0; };
 	class Object243 { type = "Body2"; position[] = {11960.5, 9168.33, 0}; direction = 258; onFire = 0; };
-	class Object244 { type = "HMMWVWreck"; position[] = {11940.3, 9113.78, 0}; direction = 280; onFire = 0; };
+	class Object244 { type = "HMMWVWreck"; position[] = {11940.8, 9115.5, 0}; direction = 285; onFire = 0; };
 	class Object245 { type = "Rubbish1"; position[] = {12100.5, 9070.32, 0}; direction = 264; onFire = 0; };
 	class Object246 { type = "Rubbish1"; position[] = {11984.7, 9037.48, 0}; direction = 264; onFire = 0; };
 	class Object247 { type = "Body1"; position[] = {11938.9, 9120.4, 0}; direction = 237; onFire = 0; };

SQF/dayz_code/Configs/CfgVehicles/Buildings/WarfareBBaseStructure.hpp

@@ -0,0 +1,9 @@
+class WarfareBBaseStructure;
+
+class Base_WarfareBVehicleServicePoint: WarfareBBaseStructure
+{
+	//Disable Arma's automatic vehicle rearm, refuel and repair. Also needed on Refuel, Repair and Reammo trucks
+	transportAmmo = 0;
+	transportFuel = 0;
+	transportRepair = 0;
+};

SQF/dayz_code/Configs/CfgVehicles/Car/ArmoredSUV.hpp

@@ -275,7 +275,7 @@ class ArmoredSUV_Base_PMC: Car
 			radius = 1;
 			onlyForPlayer = 1;
 			condition = "isNull (this turretUnit [0]) && (this animationPhase 'HideGun_01' == 0)";
-			statement = "this spawn {_this animate ['HideGun_01',1]; uiSleep 1; _this animate ['CloseCover1',1]; _this animate ['CloseCover2',1];};";
+			statement = "this animate ['HideGun_01',1]; this spawn {uiSleep 1; _this animate ['CloseCover1',1]; _this animate ['CloseCover2',1];};";
 		};
 	};
 };

SQF/dayz_code/Configs/CfgVehicles/Car/CAR_HATCHBACK.hpp

@@ -1,6 +1,6 @@
  class car_hatchback: SkodaBase {
 	crew = "";
-	displayname = $STR_VEH_NAME_OLD_HATCHBACK;
+	displayname = $STR_DN_HATCHBACK;
 	faction = "CIV";
 	maxspeed = 125;
 	scope = public;

SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp

@@ -1,6 +1,6 @@
 class car_sedan : SkodaBase {
 	crew = "";
-	displayname = $STR_VEH_NAME_SEDAN;
+	displayname = $STR_DN_SEDAN;
 	faction = "CIV";
 	maxspeed = 125;
 	scope = public;

SQF/dayz_code/Configs/CfgVehicles/Car/Kamaz.hpp

@@ -89,6 +89,9 @@ class KamazRefuel_DZ: KamazRefuel {
 	crew = "";
 	typicalCargo[] = {};
 	hiddenSelections[] = {};
+	transportMaxWeapons = 50;
+	transportMaxMagazines = 200;
+	transportmaxbackpacks = 8;	
 	class TransportMagazines{};
 	class TransportWeapons{};
 	fuelCapacity = 10400;

SQF/dayz_code/Configs/CfgVehicles/Car/Mtvr.hpp

@@ -21,6 +21,9 @@ class MtvrRefuel_base : MtvrRefuel
 	expansion = 1;
 	crew = "";
 	typicalCargo[] = {};
+	transportMaxWeapons = 50;
+	transportMaxMagazines = 200;
+	transportmaxbackpacks = 8;	
 	class TransportMagazines {};
 	class TransportWeapons {};
 };
@@ -44,8 +47,11 @@ class MtvrRefuel_DZ: MtvrRefuel {
 	crew = "";
 	typicalCargo[] = {};
 	hiddenSelections[] = {};
+	transportMaxWeapons = 50;
+	transportMaxMagazines = 200;
+	transportmaxbackpacks = 8;	
 	class TransportMagazines{};
 	class TransportWeapons{};
 	transportFuel = 0; //Required to disable A2 built in auto refuel for fuel trucks
 	fuelCapacity = 10000;
-};
+};

SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp

@@ -93,8 +93,11 @@ class UralRefuel_TK_EP1_DZ: UralRefuel_TK_EP1 {
 	crew = "";
 	typicalCargo[] = {};
 	hiddenSelections[] = {};
+	transportMaxWeapons = 50;
+	transportMaxMagazines = 200;
+	transportmaxbackpacks = 8;	
 	class TransportMagazines{};
 	class TransportWeapons{};
 	transportFuel = 0; //Required to disable A2 built in auto refuel for fuel trucks
 	fuelCapacity = 10000;
-};
+};

SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp

@@ -72,8 +72,11 @@ class V3S_Refuel_TK_GUE_EP1_DZ: V3S_Refuel_TK_GUE_EP1 {
 	crew = "";
 	typicalCargo[] = {};
 	hiddenSelections[] = {};
+	transportMaxWeapons = 50;
+	transportMaxMagazines = 200;
+	transportmaxbackpacks = 8;	
 	class TransportMagazines{};
 	class TransportWeapons{};
 	transportFuel = 0; //Required to disable A2 built in auto refuel for fuel trucks
 	fuelCapacity = 10000;
-};
+};

SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp

@@ -495,6 +495,7 @@ class CfgVehicles
 	#include "Buildings\Land_telek1.hpp"
 	#include "Buildings\Land_VASICore.hpp"
 	#include "Buildings\Land_Vysilac_FM.hpp"
+	#include "Buildings\WarfareBBaseStructure.hpp"
 	#include "Buildings\WaterSources.hpp"
 	#include "Buildings\Land_houseV_2T2.hpp"
 

SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp

@@ -277,7 +277,7 @@ class CfgWeapons
 	
 	#include "Tools\Radio.hpp"
 	#include "Item\ItemKeyKit.hpp"
-	//#include "Item\ItemKeys.hpp" //Moved to epoch_b.pbo
+	#include "Item\ItemKeys.hpp"
 	#include "Item\Documents.hpp"
 	
 	

SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp

@@ -38,7 +38,6 @@ class AK74_Kobra_SD_DZ : AKS_74_UN_kobra
 	{
 		30Rnd_545x39_AKSD,
 		30Rnd_545x39_AK, //Allow both SD and non-SD
-		45Rnd_545x39_RPK,
 		75Rnd_545x39_RPK
 	};
 	

SQF/dayz_code/Configs/CfgWeapons/Rifles/DMR.hpp

@@ -14,7 +14,8 @@ class DMR_DZ : DMR
 		//recoilProne = "recoil_single_primary_prone_4outof10";
 	};
 	
-	//visionMode[] = {"Normal"};
+	//A2OA DMR does not allow NVG after 2018-04-05 CorePatch
+	visionMode[] = {"Normal", "NVG"};
 	
 	class Attachments
 	{

SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp

@@ -7,7 +7,6 @@ class RPK74_Kobra_DZ : RPK_74
 	magazines[] =
 	{
 		75Rnd_545x39_RPK, //75 was moved to first in array
-		45Rnd_545x39_RPK,
 		30Rnd_545x39_AK,
 		30Rnd_545x39_AKSD
 	};

SQF/dayz_code/Configs/CfgWeapons/Weapon/Sniper/M4SPR.hpp

@@ -3,4 +3,7 @@ class M4SPR_DZE: M4SPR
 {
 	//Moved 30Rnd Stanag to first in array
 	magazines[] = {"30Rnd_556x45_Stanag", "20Rnd_556x45_Stanag", "30Rnd_556x45_StanagSD", "30Rnd_556x45_G36", "100Rnd_556x45_BetaCMag", "30Rnd_556x45_G36SD"};
+	
+	//A2OA M4SPR does not allow NVG after 2018-04-05 CorePatch
+	visionMode[] = {"Normal", "NVG"};
 };

SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf

@@ -30,7 +30,7 @@ _sellVehicle = {
 			_hitpoints = DZE_myVehicle call vehicle_getHitpoints;
 			{
 				if (["Wheel",_x,false] call fnc_inString) then {
-					_damage = [DZE_myVehicle,_x] call object_getHit;
+					_damage = ([DZE_myVehicle,_x] call object_getHit) select 0;
 					_tireDmg = _tireDmg + _damage;
 					_tires = _tires + 1;
 				};

SQF/dayz_code/actions/dog/tame_dog.sqf

@@ -31,7 +31,7 @@ if (_hasMeat) then {
 	_textRemoved = getText(configFile >> "CfgMagazines" >> _meat >> "displayName");
 
 	// add failure rate based on skill level variable (days alive) 
-	_chanceToFail = (((random 1) + (dayz_Survived/100)) > 0.5);
+	_chanceToFail = (((random 1) + ((dayz_Survived select 0)/100)) > 0.5);
 
 	if (!_chanceToFail) then {
 		if (!moveToCompleted _dog) then {

SQF/dayz_code/actions/modular_build.sqf

@@ -487,7 +487,7 @@ if (_canBuild select 0) then {
 			if(_num_removed == 1) then {
 				["Working",0,[20,10,5,0]] call dayz_NutritionSystem;
 				call player_forceSave;
-				format[localize "str_build_01",_text] call dayz_rollingMessages;
+				[format[localize "str_build_01",_text],1] call dayz_rollingMessages;
 
 				_tmpbuilt setVariable ["OEMPos",_location,true]; //store original location as a variable
 

SQF/dayz_code/actions/object_disassembly.sqf

@@ -1,5 +1,5 @@
 private ["_cursorTarget","_onLadder","_isWater","_alreadyRemoving","_characterID","_objectID","_objectUID","_ownerArray","_dir",
-	"_realObjectStillThere","_upgrade","_entry","_parent","_requiredParts","_requiredTools","_model","_toolsOK","_displayname",
+	"_realObjectStillThere","_upgrade","_entry","_parent","_requiredParts","_requiredTools","_model","_needTool","_displayname",
 	"_whpos","_wh","_object","_vector","_dis","_puid","_variables"];
 
 
@@ -51,12 +51,12 @@ for "_i" from 1 to 20 do {
 	diag_log format["%1 - %2 - %3 - %4 - %5",_parent,_requiredParts,_requiredTools,_model,_displayname];
 
     // check the tools needed
-    _toolsOK = true;
+    _needTool = "";
     {
-        if (!(_x IN items player)) exitWith { _toolsOK = false; };
+        if !(_x in items player) exitWith { _needTool = getText(configFile >> "CfgWeapons" >> _x >> "displayName"); };
     } count _requiredTools;
 	
-    if (!_toolsOK) exitWith { format [localize "str_disassembleMissingTool",getText (configFile >> "CfgWeapons" >> _x >> "displayName"),_displayname] call dayz_rollingMessages; };
+    if (_needTool != "") exitWith { format[localize "str_disassembleMissingTool",_needTool] call dayz_rollingMessages; };
 
     if (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "disableWeapons") == 0) then {
         player playActionNow "Medic";

SQF/dayz_code/actions/player_breakin.sqf

@@ -48,23 +48,7 @@ while {_isOk} do {
 //check chance, for a maximum amount of 5 loops allowing 5 possiable chances to breakin we also now divide the max chance by the amount of trys. 
 	_sledgeChance = [((_values select 1) / _limit)] call fn_chance;
 	_crowBarChance = [((_values select 2) / _limit)] call fn_chance;
-	
-//Check if we have the tools to start
-	_hasSledgeHammer = "ItemSledge" in items player;
-	_hasCrowbar = "ItemCrowbar" in items player;
-
-	if (!_hasSledgeHammer) exitWith {
-		_proceed = nil;
-		localize "STR_BLD_BREAKIN_NEED_SLEDGE" call dayz_rollingMessages;
-		uiSleep 1;
-	};
-
-	if (!_hasCrowbar) exitWith {
-		_proceed = nil;
-		localize "STR_BLD_BREAKIN_NEED_CROWBAR" call dayz_rollingMessages;
-		uiSleep 1;
-	};
-	
+		
 //Run SFX	
 	_dis=20;
 	_sfx = "repair";
@@ -74,8 +58,12 @@ while {_isOk} do {
 //Run animation loop
 	_finished = ["Medic",1] call fn_loopAction;
 	
+	//Make sure player did not drop sledge or crowbar
+	_hasSledgeHammer = "ItemSledge" in items player;
+	_hasCrowbar = "ItemCrowbar" in items player;
+	
 //Everything happened as it should
-	if(_finished) then {
+	if (_finished && _hasSledgeHammer && _hasCrowbar) then {
 		//Add to Counter
 		_counter = _counter + 1;
 	} else {

SQF/dayz_code/actions/player_buildingDowngrade.sqf

@@ -1,8 +1,8 @@
 /*
 	DayZ Base Building Upgrades
-	Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
+	Made for DayZ Epoch please ask permission to use/edit/distribute email vbawol@veteranbastards.com.
 */
-private ["_location","_dir","_classname","_text","_object","_objectID","_objectUID","_newclassname","_refund","_obj","_upgrade","_objectCharacterID","_ownerID","_i","_invResult","_itemOut","_countOut","_abortInvAdd","_addedItems","_finished"];
+private ["_location","_dir","_classname","_text","_object","_objectID","_objectUID","_newclassname","_refund","_obj","_upgrade","_objectCharacterID","_ownerID","_i","_invResult","_itemOut","_countOut","_abortInvAdd","_addedItems","_finished","_playerNear"];
 
 if (dayz_actionInProgress) exitWith {localize "str_epoch_player_48" call dayz_rollingMessages;};
 dayz_actionInProgress = true;
@@ -10,49 +10,41 @@ dayz_actionInProgress = true;
 player removeAction s_player_downgrade_build;
 s_player_downgrade_build = 1;
 
-// get cursortarget from addaction
 _obj = _this select 3;
 
-// Current charID
-_objectCharacterID 	= _obj getVariable ["CharacterID","0"];
+_objectCharacterID = _obj getVariable ["CharacterID","0"];
 
+if (DZE_Lock_Door != _objectCharacterID) exitWith {dayz_actionInProgress = false; s_player_downgrade_build = -1; localize "str_epoch_player_49" call dayz_rollingMessages;};
 
-if (DZE_Lock_Door != _objectCharacterID) exitWith {dayz_actionInProgress = false; localize "str_epoch_player_49" call dayz_rollingMessages;};
+_playerNear = {isPlayer _x} count (([_obj] call FNC_GetPos) nearEntities ["CAManBase", 10]) > 1;
+if (_playerNear) exitWith {dayz_actionInProgress = false; s_player_downgrade_build = -1; localize "str_pickup_limit_5" call dayz_rollingMessages;};
 
-// Find objectID
 _objectID 	= _obj getVariable ["ObjectID","0"];
-
-// Find objectUID
 _objectUID	= _obj getVariable ["ObjectUID","0"];
 
-if (_objectID == "0" && _objectUID == "0") exitWith {dayz_actionInProgress = false; s_player_upgrade_build = -1; localize "str_epoch_player_50" call dayz_rollingMessages;};
+if (_objectID == "0" && _objectUID == "0") exitWith {dayz_actionInProgress = false; s_player_downgrade_build = -1; localize "str_epoch_player_50" call dayz_rollingMessages;};
 
-// Get classname
 _classname = typeOf _obj;
 
-// Find display name
 _text = getText (configFile >> "CfgVehicles" >> _classname >> "displayName");
-
-// Find next upgrade
 _upgrade = getArray (configFile >> "CfgVehicles" >> _classname >> "downgradeBuilding");
 
 if ((count _upgrade) > 0) then {
 	_newclassname = _upgrade select 0;
 	_refund = _upgrade select 1;
-	
+
 	[player,20,true,(getPosATL player)] spawn player_alertZombies;
-	
+
 	_finished = ["Medic",1] call fn_loopAction;
 	if (!_finished) exitWith {};
-	
+
 	["Working",0,[3,2,4,0]] call dayz_NutritionSystem;
 
 	_invResult = false;
 	_abortInvAdd = false;
 	_i = 0;
 	_addedItems = [];
-	//Remove melee magazines (BIS_fnc_invAdd fix)
-	false call dz_fn_meleeMagazines;
+	false call dz_fn_meleeMagazines; // Remove melee magazines (BIS_fnc_invAdd fix)
 
 	{
 		_itemOut = _x select 0;
@@ -70,16 +62,12 @@ if ((count _upgrade) > 0) then {
 		};
 
 		if (_abortInvAdd) exitWith {};
-
 	} count _refund;
 	true call dz_fn_meleeMagazines;
 
-	// all parts added proceed
 	if(_i != 0) then {
-		// Get position
 		_location	= _obj getVariable["OEMPos",(getposATL _obj)];
 
-		// Get direction
 		_dir = getDir _obj;
 		_vector = [(vectorDir _obj),(vectorUp _obj)];
 
@@ -91,17 +79,10 @@ if ((count _upgrade) > 0) then {
 
 		_classname = _newclassname;
 
-		// Create new object
 		_object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"];
-
-		// Set direction
 		_object setDir _dir;
 		_object setVariable["memDir",_dir,true];
-		
-		// Set vector
 		_object setVectorDirAndUp _vector;
-
-		// Set location
 		_object setPosATL _location;
 
 		format[localize "str_epoch_player_142",_text] call dayz_rollingMessages;
@@ -109,7 +90,7 @@ if ((count _upgrade) > 0) then {
 		if (DZE_GodModeBase && {!(_classname in DZE_GodModeBaseExclude)}) then {
 			_object addEventHandler ["HandleDamage",{false}];
 		};
-		
+
 		if (DZE_permanentPlot) then {
 			_ownerID = _obj getVariable["ownerPUID","0"];
 			_object setVariable ["ownerPUID",_ownerID,true];

SQF/dayz_code/actions/player_chopWood.sqf

@@ -1,5 +1,7 @@
+if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; };
+dayz_actionInProgress = true;
 
-private ["_dis","_sfx","_breaking","_countOut","_counter","_isOk","_proceed","_finished","_itemOut","_tree","_distance2d","_chanceResult"];
+private ["_dis","_sfx","_breaking","_countOut","_counter","_isOk","_proceed","_finished","_itemOut","_tree","_distance2d","_chanceResult","_weapons"];
 
 call gear_ui_init;
 closeDialog 1;
@@ -17,8 +19,6 @@ _tree = objNull;
 if (!isNull _tree) then {
 	_distance2d = [player, _tree] call BIS_fnc_distance2D;	
 	if (_distance2d > 5) exitWith {localize "str_player_23" call dayz_rollingMessages;};
-    //Remove melee magazines (BIS_fnc_invAdd fix) (add new melee ammo to array if needed)
-    {player removeMagazines _x} forEach ["Hatchet_Swing","Crowbar_Swing","Machete_Swing","Fishing_Swing"];
 
     // Start chop tree loop
     _counter = 0;
@@ -29,7 +29,6 @@ if (!isNull _tree) then {
 	_chanceResult = dayz_HarvestingChance call fn_chance;
 
     while {_isOk} do {
-        //setup alert and speak
         _dis=20;
         _sfx = "chopwood";
         [player,_sfx,0,false,_dis] call dayz_zombieSpeak;
@@ -37,8 +36,11 @@ if (!isNull _tree) then {
 		
 		//play action
 		_finished = ["Medic",1] call fn_loopAction;
-
-        if(!_finished) exitWith {
+		_weapons = weapons player;
+		_weapons set [count _weapons,dayz_onBack];
+		
+		//Make sure player did not drop hatchet
+        if (!_finished or !("MeleeHatchet" in _weapons or ("ItemHatchet" in _weapons))) exitWith {
             _isOk = false;
             _proceed = false;
         };
@@ -56,6 +58,7 @@ if (!isNull _tree) then {
                     } else {
                         if (dayz_onBack == "MeleeHatchet") then {
                             dayz_onBack = "";
+							if (!isNull findDisplay 106) then {findDisplay 106 displayCtrl 1209 ctrlSetText "";};
                         };
                     };
                 };
@@ -97,13 +100,8 @@ if (!isNull _tree) then {
     if !(_proceed) then {            
         localize "str_player_24_Stoped" call dayz_rollingMessages;
     };
-    //adding melee mags back if needed
-    switch (primaryWeapon player) do {
-        case "MeleeHatchet": {player addMagazine 'Hatchet_Swing';};
-        case "MeleeCrowbar": {player addMagazine 'Crowbar_Swing';};
-        case "MeleeMachete": {player addMagazine 'Machete_Swing';};
-        case "MeleeFishingPole": {player addMagazine 'Fishing_Swing';};
-    };
 } else {
 	localize "str_player_23" call dayz_rollingMessages;
 };
+
+dayz_actionInProgress = false;

SQF/dayz_code/actions/player_mineStone.sqf

@@ -1,4 +1,4 @@
-private ["_mineChance","_item","_dis","_sfx","_breaking","_counter","_rocks","_findNearestRock","_objName","_countOut","_isOk","_proceed","_finished","_itemOut"];
+private ["_mineChance","_item","_dis","_sfx","_breaking","_counter","_rocks","_findNearestRock","_objName","_countOut","_isOk","_proceed","_finished","_itemOut","_weapons"];
 
 _item = _this;
 call gear_ui_init;
@@ -30,20 +30,22 @@ if (!isNull _findNearestRock) then {
 	_mineChance = dayz_HarvestingChance call fn_chance;
 
     while {_isOk} do {
-        //setup alert and speak
         _dis=20;
         _sfx = "minestone";
         [player,_sfx,0,false,_dis] call dayz_zombieSpeak;
         [player,_dis,true,(getPosATL player)] call player_alertZombies;
 
         _finished = ["Medic",1] call fn_loopAction;
-
-        if(!_finished) exitWith {
+		_weapons = weapons player;
+		_weapons set [count _weapons,dayz_onBack];
+		
+		//Make sure player did not drop pickaxe
+        if (!_finished or !("MeleePickaxe" in _weapons or ("ItemPickaxe" in _weapons))) exitWith {
             _isOk = false;
             _proceed = false;
         };
 
-        if(_finished) then {
+        if (_finished) then {
 			["Working",0,[100,15,10,0]] call dayz_NutritionSystem;
 			
             _breaking = false;
@@ -57,6 +59,7 @@ if (!isNull _findNearestRock) then {
                     } else {
                         if (dayz_onBack == "MeleePickaxe") then {
                             dayz_onBack = "";
+							if (!isNull findDisplay 106) then {findDisplay 106 displayCtrl 1209 ctrlSetText "";};
                         };
                     };
                 };

SQF/dayz_code/actions/plotManagement/plotObjects.sqf

@@ -4,7 +4,7 @@ disableSerialization;
 _range = DZE_PlotPole select 0;
 _target = (([player] call FNC_getPos) nearEntities ["Plastic_Pole_EP1_DZ",15]) select 0;
 // Also count safes, lockboxes, vanilla buildables, tents and stashes against DZE_BuildingLimit
-_buildables = DZE_maintainClasses + DZE_LockableStorage + ["DZ_buildables","DZ_storage_base"];
+_buildables = DZE_maintainClasses + DZE_LockableStorage + ["DZ_storage_base"];
 _count = count (nearestObjects [_target,_buildables,_range]);
 
 _colour = "#ffffff";

SQF/dayz_code/actions/repair.sqf

@@ -34,12 +34,14 @@ if ("ItemToolbox" in items player && (_part in magazines player)) then {
 	// Added Nutrition-Factor for work
 	["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
 
-	_damage = [_vehicle,_hitpoint] call object_getHit;
+	_hits = [_vehicle,_hitpoint] call object_getHit;
+	_damage = _hits select 0;
+
 	_vehicle removeAction _id;
 	//dont waste loot on undamaged parts
 	if (_damage > 0) then {
 		//Fix the part
-		_selection = getText(configFile >> "cfgVehicles" >> _type >> "HitPoints" >> _hitpoint >> "name");
+		_selection = _hits select 1;
 
 		[_vehicle, _selection, 0, true] call fnc_veh_handleRepair;
 		_vehicle setvelocity [0,0,1];

SQF/dayz_code/actions/repair_vehicle.sqf

@@ -8,7 +8,8 @@ _hitpoints = _vehicle call vehicle_getHitpoints;
 
 {
 	_hitpoint = _x;
-	_damage = [_vehicle,_x] call object_getHit;
+	_hits = [_vehicle,_x] call object_getHit;
+	_damage = _hits select 0;
 
 	_cmpt = toArray (_x);
 	_cmpt set [0,20];

SQF/dayz_code/actions/salvage.sqf

@@ -31,7 +31,8 @@ if (_hasToolbox) then {
 		["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
 		//Remove melee magazines (BIS_fnc_invAdd fix)
 		false call dz_fn_meleeMagazines;
-		_damage = [_vehicle,_hitpoint] call object_getHit;
+		_hits = [_vehicle,_hitpoint] call object_getHit;
+		_damage = _hits select 0;
 		if (_damage < 1 && {_damage > 0}) then { //Tempfix for issue where certain hitpoints on some vehicles do not get damaged and allow infinite removal
 			_BreakableParts = ["HitGlass1","HitGlass2","HitGlass3","HitGlass4","HitGlass5","HitGlass6","HitLGlass","HitRGlass","HitEngine","HitFuel","HitHRotor"];
 			if (_hitpoint in _BreakableParts) then {
@@ -48,7 +49,7 @@ if (_hasToolbox) then {
 			};
 			
 			if (_isOK) then {
-				_selection = getText(configFile >> "cfgVehicles" >> _type >> "HitPoints" >> _hitpoint >> "name");
+				_selection = _hits select 1;
 				/*if ((_hitpoint == "HitEngine") or (_hitpoint == "HitFuel")) then {
 					[_vehicle, _selection, 0.89] call fnc_veh_handleDam;
 				} else {*/

SQF/dayz_code/actions/salvage_vehicle.sqf

@@ -41,8 +41,8 @@ if (_is6WheelType) then {
 
 {
 	_hitpoint = _x;
-	_damage = [_vehicle,_x] call object_getHit;
-	
+	_hits = [_vehicle,_x] call object_getHit;
+	_damage = _hits select 0;
 	if !(_x in _RemovedPartsArray) then {
 		//if (_x in ["HitFuel","HitEngine"] && _damage >= 0.89) then {_damage = 1;};
 		_cmpt = toArray (_x);

SQF/dayz_code/actions/trade_any_bicycle.sqf

@@ -154,11 +154,10 @@ if (_finished) then {
 				// total damage 
 				_tireDmg = 0;
 
-				_damage = 0;
 				{					
 					if(["Wheel",_x,false] call fnc_inString) then {		
 						_damage = [_obj,_x] call object_getHit;
-						_tireDmg = _tireDmg + _damage;
+						_tireDmg = _tireDmg + (_damage select 0);
 						_tires = _tires + 1;
 					};
 				} count _hitpoints;

SQF/dayz_code/actions/trade_any_bicycle_old.sqf

@@ -128,11 +128,10 @@ if (_qty >= _qty_in) then {
 					// total damage 
 					_tireDmg = 0;
 
-					_damage = 0;
 					{					
 						if(["Wheel",_x,false] call fnc_inString) then {		
 							_damage = [_obj,_x] call object_getHit;
-							_tireDmg = _tireDmg + _damage;
+							_tireDmg = _tireDmg + (_damage select 0);
 							_tires = _tires + 1;
 						};
 					} count _hitpoints;

SQF/dayz_code/actions/trade_any_vehicle.sqf

@@ -161,11 +161,10 @@ if (_finished) then {
 				// total damage
 				_tireDmg = 0;
 
-				_damage = 0;
 				{
 					if(["Wheel",_x,false] call fnc_inString) then {
 						_damage = [_obj,_x] call object_getHit;
-						_tireDmg = _tireDmg + _damage;
+						_tireDmg = _tireDmg + (_damage select 0);
 						_tires = _tires + 1;
 					};
 				} count _hitpoints;

SQF/dayz_code/actions/trade_any_vehicle_free.sqf

@@ -156,11 +156,10 @@ if (_finished) then {
 				// total damage
 				_tireDmg = 0;
 
-				_damage = 0;
 				{
 					if(["Wheel",_x,false] call fnc_inString) then {
 						_damage = [_obj,_x] call object_getHit;
-						_tireDmg = _tireDmg + _damage;
+						_tireDmg = _tireDmg + (_damage select 0);
 						_tires = _tires + 1;
 					};
 				} count _hitpoints;

SQF/dayz_code/actions/trade_any_vehicle_old.sqf

@@ -136,11 +136,10 @@ if (_qty >= _qty_in) then {
 					// total damage 
 					_tireDmg = 0;
 
-					_damage = 0;
 					{					
 						if(["Wheel",_x,false] call fnc_inString) then {		
 							_damage = [_obj,_x] call object_getHit;
-							_tireDmg = _tireDmg + _damage;
+							_tireDmg = _tireDmg + (_damage select 0);
 							_tires = _tires + 1;
 						};
 					} count _hitpoints;

SQF/dayz_code/actions/vault_combination_1.sqf

@@ -5,13 +5,17 @@ dayz_actionInProgress = true;
 
 dayz_selectedVault = _this select 3;
 dayz_combination = "";
-		
-if(!isNull dayz_selectedVault) then {
 
+if (dayz_lastCodeFail > diag_tickTime) exitWith {
+	dayz_actionInProgress = false;
+	format [localize "STR_EPOCH_PLAYER_19_WAIT",round(dayz_lastCodeFail - diag_tickTime)] call dayz_rollingMessages;
+};
+
+if (!isNull dayz_selectedVault) then {
 	if ((typeOf dayz_selectedVault) == "VaultStorageLocked" || (typeOf dayz_selectedVault) == "VaultStorage") then {
-		_ok = createdialog "SafeKeyPad";
+		_ok = createDialog "SafeKeyPad";
 	} else {
-		_ok = createdialog "KeypadUI";
+		_ok = createDialog "KeypadUI";
 	};
 };
 

SQF/dayz_code/compile/dze_buildChecks.sqf

@@ -1,5 +1,5 @@
 //Checks if item is near a plot, if the player is plot owner or friendly, if there are too many items, and if the player has required tools
-private ["_isAdmin","_requireplot","_distance","_canBuild","_friendlies","_nearestPole","_ownerID","_pos","_item","_classname","_isPole","_isLandFireDZ","_IsNearPlot","_buildables","_center","_toolCheck","_plotcheck","_buildcheck","_isfriendly","_isowner","_require","_text","_near","_hasPole"];
+private ["_isAdmin","_requireplot","_distance","_canBuild","_friendlies","_nearestPole","_ownerID","_pos","_item","_classname","_isPole","_isLandFireDZ","_IsNearPlot","_buildables","_center","_toolCheck","_plotcheck","_buildcheck","_isfriendly","_isowner","_require","_text","_near","_plotPoles"];
 
 _pos = _this select 0;
 _item =	_this select 1;
@@ -36,7 +36,7 @@ _isPole = (_classname == "Plastic_Pole_EP1_DZ");
 _isLandFireDZ = (_classname == "Land_Fire_DZ");
 
 _canBuild = false;
-_hasPole = false;
+_plotPoles = 0;
 _nearestPole = objNull;
 _ownerID = 0;
 _friendlies = [];
@@ -44,10 +44,10 @@ _friendlies = [];
 if (_isPole) then {
 	_plotcheck = [player, true] call FNC_find_plots;
 	_distance = DZE_PlotPole select 1;
-	if (DZE_limitPlots && !_isAdmin) then {
+	if (DZE_limitPlots > 0 && !_isAdmin) then {
 		{
-			if (_x getVariable["ownerPUID","0"] == dayz_playerUID || (_x getVariable["CharacterID","0"] == dayz_characterID)) exitWith {
-				_hasPole = true;
+			if (_x getVariable["ownerPUID","0"] == dayz_playerUID || (_x getVariable["CharacterID","0"] == dayz_characterID)) then {
+				_plotPoles = _plotPoles +1;
 			};
 		} count (entities "Plastic_Pole_EP1_DZ");
 	};
@@ -61,7 +61,7 @@ _nearestPole = _plotcheck select 2;
 
 if (_isPole && {_IsNearPlot > 0}) exitWith {dayz_actionInProgress = false; format[localize "str_epoch_player_44",_distance] call dayz_rollingMessages; [_canBuild, _isPole];};
 
-if (_hasPole) exitWith {dayz_actionInProgress = false; localize "STR_EPOCH_PLAYER_133" call dayz_rollingMessages; [_canBuild, _isPole];};
+if (DZE_limitPlots > 0 && {_plotPoles >= DZE_LimitPlots}) exitWith {dayz_actionInProgress = false; format[localize "STR_EPOCH_PLAYER_133",DZE_limitPlots] call dayz_rollingMessages; [_canBuild, _isPole];};
 
 if (_IsNearPlot == 0) then {
 	if (_requireplot == 0 || {_isLandFireDZ}) then {
@@ -101,7 +101,7 @@ if (!_canBuild) exitWith {
 if (DZE_BuildHeightLimit > 0 && {([player] call fnc_getPos) select 2 > DZE_BuildHeightLimit}) exitWith {dayz_actionInProgress = false; format[localize "STR_EPOCH_PLAYER_168",DZE_BuildHeightLimit] call dayz_rollingMessages; [false, _isPole];};
 
 // Also count safes, lockboxes, vanilla buildables, tents and stashes against DZE_BuildingLimit
-_buildables = DZE_maintainClasses + DZE_LockableStorage + ["DZ_buildables","DZ_storage_base"];
+_buildables = DZE_maintainClasses + DZE_LockableStorage + ["DZ_storage_base"];
 _center = if (isNull _nearestPole) then {_pos} else {_nearestPole};
 if ((count (nearestObjects [_center,_buildables,_distance])) >= DZE_BuildingLimit) exitWith {dayz_actionInProgress = false; format[localize "str_epoch_player_41",_distance] call dayz_rollingMessages; [false, _isPole];};
 

SQF/dayz_code/compile/fn_damageActions.sqf

@@ -22,11 +22,9 @@ if (_inVehicle) then {
 	_driver = driver (vehicle player);
 	if (str (_assignedRole) != str (r_player_lastSeat)) then {
 		call r_player_removeActions2;
-		if (_vehicle isKindOf "ArmoredSUV_Base_PMC" && {_vehicle animationPhase "HideGun_01" == 1} && {_vehicle emptyPositions "Gunner" == 0}) then {
+		if (_vehicle isKindOf "ArmoredSUV_Base_PMC" && {_vehicle animationPhase "HideGun_01" != 0} && {_vehicle emptyPositions "Gunner" == 0}) then {
+			//If player enters gunner's seat while hatch is closed then move them out
 			(_vehicle turretUnit [0]) action ["moveToCargo",_vehicle,(count assignedCargo _vehicle)];
-			_vehicle animate ["HideGun_01",0];
-			_vehicle animate ["CloseCover1",0];
-			_vehicle animate ["CloseCover2",0];
 		};
 	};
 	if (!r_player_unconscious && !r_action2) then {

SQF/dayz_code/compile/fn_selfActions.sqf

@@ -13,7 +13,7 @@ private ["_canPickLight","_text","_unlock","_lock","_totalKeys","_temp_keys","_t
 "_isModular","_isModularDoor","_isHouse","_isGateOperational","_isGateLockable","_isFence","_isLockableGate","_isUnlocked","_isOpen","_isClosed","_ownerArray","_ownerBuildLock",
 "_ownerPID","_speed","_dog","_vehicle","_inVehicle","_cursorTarget","_primaryWeapon","_currentWeapon","_magazinesPlayer","_onLadder","_canDo",
 "_nearLight","_vehicleOwnerID","_hasHotwireKit","_isPZombie","_dogHandle","_allowedDistance","_id","_upgrade","_weaponsPlayer","_hasCrowbar",
-"_allowed","_hasAccess","_uid","_myCharID","_isLocked"];
+"_allowed","_hasAccess","_uid","_myCharID","_isLocked","_isClose"];
 
 _vehicle = vehicle player;
 _inVehicle = (_vehicle != player);
@@ -23,7 +23,6 @@ _currentWeapon = currentWeapon player;
 _magazinesPlayer = magazines player;
 _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
 _canDo = (!r_drag_sqf && !r_player_unconscious && !_onLadder);
-//_canDrink = count nearestObjects [getPosATL player, ["Land_pumpa","Land_water_tank"], 2] > 0;
 _uid = getPlayerUID player;
 _nearLight = nearestObject [player,"LitObject"];
 _canPickLight = false;
@@ -31,6 +30,7 @@ _myCharID = player getVariable ["CharacterID","0"];
 _vehicleOwnerID = _vehicle getVariable ["CharacterID","0"];
 _hasHotwireKit = "ItemHotwireKit" in _magazinesPlayer;
 _isPZombie = player isKindOf "PZombie_VB";
+_isClose = (player distance _cursorTarget < 3);
 _dogHandle = player getVariable ["dogID",0];
 
 if (!isNull _nearLight) then {
@@ -199,7 +199,7 @@ if (_isPZombie) then {
 	if (s_player_pzombiesvision < 0) then {
 		s_player_pzombiesvision = player addAction [localize "STR_EPOCH_ACTIONS_NIGHTVIS", "\z\addons\dayz_code\actions\pzombie\pz_vision.sqf", [], 4, false, true, "nightVision", "_this == _target"];
 	};
-	if (!isNull _cursorTarget && (player distance _cursorTarget < 3)) then {
+	if (!isNull _cursorTarget && _isClose) then {
 		_isZombie = _cursorTarget isKindOf "zZombie_base";
 		_isHarvested = _cursorTarget getVariable["meatHarvested",false];
 		_isMan = _cursorTarget isKindOf "Man"; //includes animals and zombies
@@ -381,7 +381,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
 	
 	if (_isAlive) then {
 		_restrict = _typeOfCursorTarget in DZE_restrictRemoval;
-	
+
 		//Allow player to remove objects with no ownership or access required
 		if (!_restrict && (_isDestructable || _typeOfCursorTarget in DZE_isWreck || _typeOfCursorTarget in DZE_isWreckBuilding || _typeOfCursorTarget in DZE_isRemovable)) then {
 			if (_hasToolbox && _hasCrowbar) then {
@@ -667,7 +667,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
 		};
 
 		_attached = _cursorTarget getVariable["attached",false];
-		if (_found && {_allowTow} && {!_isLocked} && {!_isPZombie} && {typeName _attached != "OBJECT"}) then {
+		if (_found && {_allowTow} && {!_isLocked} && {typeName _attached != "OBJECT"}) then {
 			if (s_player_heli_lift < 0) then {
 				s_player_heli_lift = player addAction [localize "STR_EPOCH_ACTIONS_ATTACHTOHELI", "\z\addons\dayz_code\actions\player_heliLift.sqf",[_liftHeli,_cursorTarget], -10, false, true];
 			};
@@ -735,7 +735,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
 	};
 
 	//Allow owner to unlock vault
-	if ((_typeOfCursorTarget in DZE_LockableStorage) && {_characterID != "0"} && {player distance _cursorTarget < 3} && {!keypadCancel}) then {
+	if ((_typeOfCursorTarget in DZE_LockableStorage) && {_characterID != "0"} && {_isClose} && {!keypadCancel}) then {
 		if (s_player_unlockvault < 0) then {
 			if (_typeOfCursorTarget in DZE_LockedStorage) then {
 				if (_characterID == dayz_combination || _ownerID == _uid) then {
@@ -760,7 +760,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
 	};
 
 	//Allow owner to pack vault
-	if ((_typeOfCursorTarget in DZE_UnLockedStorage) && {_characterID != "0"} && {player distance _cursorTarget < 3}  && {!keypadCancel}) then {
+	if ((_typeOfCursorTarget in DZE_UnLockedStorage) && {_characterID != "0"} && {_isClose}  && {!keypadCancel}) then {
 		if (s_player_lockvault < 0) then {
 			if (_characterID == dayz_combination || _ownerID == _uid) then {
 				s_player_lockvault = player addAction [format[localize "STR_EPOCH_ACTIONS_LOCK",_text], "\z\addons\dayz_code\actions\vault_lock.sqf",_cursorTarget, 0, false, true];
@@ -920,7 +920,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
 	*/
 
 	// All Traders
-	if (_isMan && {!(isPlayer _cursorTarget)} && {_typeOfCursorTarget in serverTraders} && {!_isPZombie}) then {
+	if (_isMan && {!(isPlayer _cursorTarget)} && {_typeOfCursorTarget in serverTraders}) then {
 		if (s_player_parts_crtl < 0) then {
 			_humanity = player getVariable ["humanity",0];
 			_traderMenu = call compile format["menu_%1;",_typeOfCursorTarget];		

SQF/dayz_code/compile/fn_unconscious.sqf

@@ -90,6 +90,9 @@ if (player == vehicle player) then {
 "dynamicBlur" ppEffectAdjust [0]; "dynamicBlur" ppEffectCommit 5;
 "colorCorrections" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, 1],  [1, 1, 1, 1]];"colorCorrections" ppEffectCommit 5;
 
+//Prevent firing while weapon is still shown on back. AmovPpneMstpSnonWnonDnon_healed has disableWeapons=0 in config (should be =1)
+waitUntil {uiSleep 1; !(animationState player in ["ainjppnemstpsnonwnondnon_rolltofront","amovppnemstpsnonwnondnon_healed","amovppnemstpsnonwnondnon"])};
+
 //once more to be safe
 disableUserInput false; disableUserInput false;
 disableUserInput true; disableUserInput true;

SQF/dayz_code/compile/keyboard.sqf

@@ -69,7 +69,13 @@ if (isNil "keyboard_keys") then {
 		_handled = true;
 	};
 	_statusUI = {
-		profileNamespace setVariable ["statusUI",(if (profileNamespace getVariable ["statusUI",1] == 1) then {0} else {1})];
+		if (profileNamespace getVariable ["statusUI",1] == 1) then {
+			profileNamespace setVariable ["statusUI",0];
+			[format[localize "STR_UI_STATUS_ICONS" + " %1",localize "STR_DISABLED"],1] call dayz_rollingMessages;
+		} else {
+			profileNamespace setVariable ["statusUI",1];
+			[format[localize "STR_UI_STATUS_ICONS" + " %1",localize "STR_ENABLED"],1] call dayz_rollingMessages;
+		};		
 		saveProfileNamespace;
 		call ui_changeDisplay;
 		_handled = true;

SQF/dayz_code/compile/object_getHit.sqf

@@ -1,8 +1,8 @@
+private["_unit","_hp","_selection","_strH","_dam"];
 _unit = _this select 0;
 _hp = _this select 1;
 
 _selection = getText (configFile >> "CfgVehicles" >> (typeOf _unit) >> "HitPoints" >> _hp >> "name");
-_strH = "hit_" + (_selection);
-_dam = _unit getVariable [_strH,0];
+_dam = _unit getHit _selection;
 
-_dam
+[_dam, _selection];

SQF/dayz_code/compile/object_speak.sqf

@@ -1,4 +1,4 @@
-private ["_type","_local","_unit"];
+private ["_chance","_dis","_isWoman","_local","_num","_rnd","_sound","_type","_unit"];
 
 _unit = _this select 0;
 _type = _this select 1;

SQF/dayz_code/compile/player_countMagazines.sqf

@@ -4,13 +4,14 @@
 	return all player magazines with ammo count
 */
 
-private ["_dialog","_created","_magazineArray"];
+private ["_control","_created","_dialog","_i","_item","_magazineArray","_max","_val"];
+
 disableSerialization;
 
 _dialog = findDisplay 106;
 _created = false;
 
-if ( isNull _dialog ) then {
+if (isNull _dialog) then {
 	//Load Minimal gearMenu
 	createGearDialog [player, "RscDisplayGearMinimal"];
 	_dialog = findDisplay 106;
@@ -19,8 +20,7 @@ if ( isNull _dialog ) then {
 
 _magazineArray = [];
 
-for "_i" from 109 to 120 do
-{
+for "_i" from 109 to 120 do {
 	_control = _dialog displayCtrl _i;
 	_item = gearSlotData _control;
 	_val = gearSlotAmmoCount _control;
@@ -34,8 +34,7 @@ for "_i" from 109 to 120 do
 	};
 };
 
-for "_i" from 122 to 129 do
-{
+for "_i" from 122 to 129 do {
 	_control = _dialog displayCtrl _i;
 	_item = gearSlotData _control;
 	_val = gearSlotAmmoCount _control;
@@ -49,8 +48,8 @@ for "_i" from 122 to 129 do
 	};
 };
 
-if ( _created ) then {
+if (_created) then {
 	closeDialog 0;
 };
 
-_magazineArray
+_magazineArray

SQF/dayz_code/compile/player_countMagazinesWBackpack.sqf

@@ -4,7 +4,8 @@
 	return all player magazines with ammo count
 	Modified to save backpack magazine count by icomrade - Base for fix by Ziellos2k
 */
-private ["_control","_item","_val","_max","_count","_magazineArray","_dialog"];
+private ["_control","_count","_dialog","_i","_item","_magazineArray","_max","_val"];
+
 disableUserInput true;
 disableUserInput true;
 disableSerialization;
@@ -70,4 +71,4 @@ if ((typeOf (unitBackPack player)) != "") then {
 (findDisplay 106) closeDisplay 0;
 if (gear_done) then {sleep 0.001;};
 
-_magazineArray;
+_magazineArray

SQF/dayz_code/compile/player_unlockDoor.sqf

@@ -6,15 +6,14 @@
 */
 private ["_display","_displayCombo","_displayEye","_doorMethod","_hasAccess","_notNearestPlayer","_obj","_objectCharacterID"];
 
-if (!isNil "DZE_DYN_UnlockDoorInprogress") exitWith {localize "str_epoch_player_21" call dayz_rollingMessages;};
-
-DZE_DYN_UnlockDoorInprogress = true;
+if (dayz_actionInProgress) exitWith {localize "str_epoch_player_21" call dayz_rollingMessages;};
+dayz_actionInProgress = true;
 
 _doorMethod = "";
 _displayCombo = findDisplay 41144;
 _displayEye = findDisplay 61144;
-if(!isNull _displayEye) then {_display = _displayEye; _doorMethod = "Eye";};
-if(!isNull _displayCombo) then {_display = _displayCombo; _doorMethod = "Combo";};
+if (!isNull _displayEye) then {_display = _displayEye; _doorMethod = "Eye";};
+if (!isNull _displayCombo) then {_display = _displayCombo; _doorMethod = "Combo";};
 
 if (!isNull dayz_selectedDoor) then {
 	_obj = dayz_selectedDoor;
@@ -41,7 +40,8 @@ if (!isNull dayz_selectedDoor) then {
 		};
 
 		if (isNil "dayz_UnlockTime") then {dayz_UnlockTime = 5;};
-		if (DZE_doorManagementHarderPenalty && {(diag_tickTime - dayz_lastCodeFail) > 120}) then {dayz_UnlockTime = 5;};
+		if (DZE_doorManagementHarderPenalty && {((diag_tickTime - dayz_lastCodeFail) + dayz_unlockTime / 2) > 120}) then {dayz_UnlockTime = 5;};
+		
 
 		if (DZE_Lock_Door == _objectCharacterID) then {
 			[player,"combo_unlock",0,false] call dayz_zombieSpeak;
@@ -60,13 +60,13 @@ if (!isNull dayz_selectedDoor) then {
 			};
 			dayz_UnlockTime = 5;
 			dayz_lastCodeFail = 0;
-			
+
 			PVDZE_handleSafeGear = [player,_obj,5,if (_doorMethod == "EYE") then {"EYESCAN"} else {DZE_Lock_Door}];
 			publicVariableServer "PVDZE_handleSafeGear";
 		} else {
 			PVDZE_handleSafeGear = [player,_obj,6,if (_doorMethod == "EYE") then {"EYESCAN"} else {DZE_Lock_Door}];
 			publicVariableServer "PVDZE_handleSafeGear";
-			
+
 			DZE_Lock_Door = "";
 			[player,"combo_locked",0,false] call dayz_zombieSpeak;
 			[player,20,true,(getPosATL player)] spawn player_alertZombies;
@@ -90,4 +90,4 @@ if (!isNull dayz_selectedDoor) then {
 } else {
 	_display closeDisplay 2;
 };
-DZE_DYN_UnlockDoorInprogress = nil;
+dayz_actionInProgress = false;

SQF/dayz_code/compile/player_unlockVault.sqf

@@ -24,7 +24,6 @@ if !(_objType in DZE_LockedStorage) exitWith {
 _playerNear = _obj call dze_isnearest_player;
 if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_epoch_player_20" call dayz_rollingMessages;};
 
-// Silently exit if object no longer exists
 if (isNull _obj || !(alive _obj)) exitWith { dayz_actionInProgress = false; };
 
 _unlockedClass = getText (configFile >> "CfgVehicles" >> _objType >> "unlockedClass");
@@ -34,25 +33,37 @@ _ownerID = _obj getVariable["CharacterID","0"];
 _ComboMatch = (_ownerID == dayz_combination);
 if (DZE_permanentPlot) then {_ownerID = _obj getVariable["ownerPUID","0"];};
 
+if (isNil "dayz_UnlockTime") then {dayz_UnlockTime = 5;};
+if (DZE_lockablesHarderPenalty && {((diag_tickTime - dayz_lastCodeFail) + dayz_unlockTime / 2) > 120}) then {dayz_UnlockTime = 5;};
+
 if (_ComboMatch || (_ownerID == dayz_playerUID)) then {
-	(findDisplay 106) closeDisplay 0; // Close gear
+	(findDisplay 106) closeDisplay 0;
 	dze_waiting = nil;
-	
+	dayz_UnlockTime = 5;
+	dayz_lastCodeFail = 0;
+
 	[_unlockedClass,objNull] call fn_waitForObject;
-	
+
 	PVDZE_handleSafeGear = [player,_obj,0];
 	publicVariableServer "PVDZE_handleSafeGear";
 	//wait for response from server to verify safe was logged before proceeding
 	waitUntil {!isNil "dze_waiting"};
-	
+
 	format[localize "STR_BLD_UNLOCKED",_text] call dayz_rollingMessages;
 } else {
 	PVDZE_handleSafeGear = [player,_obj,3,dayz_combination];
 	publicVariableServer "PVDZE_handleSafeGear";
-	
+
 	[player,"repair",0,false] call dayz_zombieSpeak;
 	[player,25,true,(getPosATL player)] spawn player_alertZombies;
-	format[localize "STR_BLD_WRONG_COMBO",_text] call dayz_rollingMessages;
+	if (DZE_lockablesHarderPenalty) then {
+		dayz_lastCodeFail = (diag_tickTime + dayz_UnlockTime);
+		dayz_UnlockTime = dayz_UnlockTime * 2;
+	} else {
+		dayz_lastCodeFail = (diag_tickTime + dayz_UnlockTime);
+	};
+
+	format [localize "str_epoch_player_19",round(dayz_lastCodeFail - diag_tickTime)] call dayz_rollingMessages;
 };
 s_player_unlockvault = -1;
 dayz_actionInProgress = false;

SQF/dayz_code/compile/player_zombieAttack.sqf

@@ -133,8 +133,7 @@ if (_isVehicle) then {
 		};
 		
 		if (_wound in [ "glass1",  "glass2",  "glass3",  "glass4",  "glass5",  "glass6" ]) then {
-			_strH = "hit_" + (_wound);
-			_dam = _vehicle getVariable [_strH,0];
+			_dam = _vehicle getHit _wound;
 			_total = (_dam + _damage);
 			
 			//handle vehicle dmg

SQF/dayz_code/compile/player_zombieSwarmAttack.sqf

@@ -40,16 +40,13 @@ if (_vehicle != player) then {
 	[_unit,"hit",0,false] call dayz_zombieSpeak;
 
 	if (_wound IN [ "glass1",  "glass2",  "glass3",  "glass4",  "glass5",  "glass6" ]) then {
-		_strH = "hit_" + (_wound);
-		_dam = _vehicle getVariable [_strH,0];
-		_total = (_dam + _damage);
+		_dam = _vehicle getHit _wound;
 		
-		_woundDamage = _unit getVariable ["hit_"+_wound, 0];
-		// we limit how vehicle could be damaged by Z. Above 0.8, the vehicle could explode, which is ridiculous.
-		_damage =  (if (_woundDamage < 0.8 OR {(!(_wound IN dayZ_explosiveParts))}) then {0.1} else {0.01});
+		// we limit how _dam could be damaged by Z. Above 0.8, the vehicle could explode, which is ridiculous.
+		_damage =  (if (_dam < 0.8 OR {(!(_wound IN dayZ_explosiveParts))}) then {0.1} else {0.01});
 		// Add damage to vehicle. the "sethit" command will be done by the gameengine for which vehicle is local
 		//diag_log(format["%1: Part ""%2"" damaged from vehicle, damage:+%3", __FILE__, _wound, _damage]);
-		_total = [_vehicle,  _wound,  _woundDamage + _damage,  _unit,  "zombie", true] call fnc_veh_handleDam;
+		_total = [_vehicle,  _wound,  _damage,  _unit,  "zombie", true] call fnc_veh_handleDam;
 	};
 } else {
 	if ((_unit distance player) <= 3) then {

SQF/dayz_code/compile/veh_handleDam.sqf

@@ -14,19 +14,12 @@ or by zombie_attack
 - return : updated damage for that part
 broadcast: boolean. if true, then the request will be sent to all players if the vehicle is not local.
 ************************************************************/
-private["_unit","_selection","_strH","_total","_damage","_needUpdate","_totalDmg"];
+private["_unit","_selection","_total","_damage","_needUpdate","_totalDmg"];
 
 _unit = _this select 0;
 _selection = _this select 1;
 _total = _this select 2;
-
-if (_selection != "") then {
-	_strH = "hit_" + _selection;
-	_totalDmg = false;
-} else {
-	_strH = "totalDmg";
-	_totalDmg = true;
-};
+_totalDmg = if (_selection != "") then {false} else {true};
 
 if (_total >= 0.98) then {
         _total = 1.0;
@@ -34,9 +27,6 @@ if (_total >= 0.98) then {
 
 if (local _unit) then {
 	if (_total > 0) then {
-		if (!_totalDmg) then {
-			_unit setVariable [_strH, _total, true];
-		};
 		_unit setHit [_selection, _total];
 
 		PVDZ_veh_Save = [_unit,"damage",false,_totalDmg];

SQF/dayz_code/compile/veh_handleRepair.sqf

@@ -25,15 +25,12 @@ _hitpointnames = [];
 
 if ((isNil "_selection") OR {(!(_selection in _hitpointnames))}) exitWith {_this select 2};
 
-_SVname = "hit_" + _selection;
-
 _log = format["%1 vehicle:%2#%3 part:""%4"" current_part_damage:%5", __FILE__,
 typeOf _unit, _unit getVariable ["ObjectID",""],
-_selection, _unit getVariable [_SVname, 0] ];
+_selection, _unit getHit _selection ];
 
 if (local _unit) then {
 	// only local unit can set the damage of a vehicle part
-	_unit setVariable [_SVname, 0, true];
 	_unit setHit [_selection, 0];
 	_log = format["%1. setH!t[%2,0]", _log, _selection];
 	if (!isServer) then {

SQF/dayz_code/compile/veh_setFixServer.sqf

@@ -1,13 +1,11 @@
-private["_unit","_selection","_strH","_damage","_total"];
+private["_unit","_selection","_damage","_total"];
 _unit =			_this select 0;
 _selection =	_this select 1;
 _damage =		_this select 2;
 
 if (_selection != "" and local _unit) then {
-	_strH = "hit_" + (_selection);
 	_unit setHit[_selection,_damage];
 	//player sidechat str _damage;
-	_unit setVariable [_strH,_damage,true];
 	if (_damage == 0) then {
 		[_unit,"repair"] call server_updateObject;
 	} else {

SQF/dayz_code/compile/vehicle_getHitpoints.sqf

@@ -1,25 +1,27 @@
-private ["_cfgHitPoints", "_hps", "_funcGetHitPoints"];
+private ["_cfgHitPoints", "_hps"];
 _cfgHitPoints = configFile >> "CfgVehicles" >> (typeOf _this) >> "HitPoints";
 _hps = [];
 
 _funcGetHitPoints = 
 {
-	for "_i" from 0 to ((count _this) - 1) do 
+	for "_i" from 0 to ((count (_this select 1)) - 1) do 
 	{
 		private ["_hp"];
-		_hp = configName (_this select _i);
+		_hp = configName ((_this select 1) select _i);
 		
 		if (!(_hp in _hps)) then 
 		{
-			_hps set [count _hps, _hp];
+			_HPCheck = (_this select 0) getHit (getText((_this select 1) >> _hp >> "name"));
+			if (!isNil "_HPCheck") then {
+				_hps set [count _hps, _hp];
+			};
 		};
 	};
 };
 
-//Explore inheritance structure fully
 while {(configName _cfgHitPoints) != ""} do 
 {
-	_cfgHitPoints call _funcGetHitPoints;
+	[_this, _cfgHitPoints] call _funcGetHitPoints;
 	_cfgHitPoints = inheritsFrom _cfgHitPoints;
 };
 

SQF/dayz_code/configVariables.sqf

@@ -25,8 +25,6 @@ DZE_UI = "vanilla"; //"vanilla","epoch","dark"  UI status icons style. Dark acco
 DZE_VanillaUICombatIcon = true; //Display or hide combat UI icon if using DZE_UI = "vanilla"; otherwise it has no affect.
 timezoneswitch = 0; // Changes murderMenu times with this offset in hours.
 DZE_NoVehicleExplosions = false; //Disable vehicle explosions to prevent damage to objects by ramming. Doesn't work with amphibious pook which should not be used due to FPS issues.
-DZE_SafeZoneNoBuildItems = []; // Array of object class names not allowed to be built near the zones in DZE_SafeZonePosArray (see mission\init.sqf). Can be nested arrays for custom distances. i.e ["VaultStorageLocked","LockboxStorageLocked",["Plastic_Pole_EP1_DZ",1300]] etc.
-DZE_SafeZoneNoBuildDistance = 150; // Distance from zones in DZE_SafeZonePosArray (see mission\init.sqf) to disallow building near.
 DZE_NoBuildNear = []; //Array of object class names that are blacklisted to build near. i.e ["Land_Mil_ControlTower","Land_SS_hangar"] etc.
 DZE_NoBuildNearDistance = 150; // Distance from blacklisted objects to disallow building near.
 DZE_BuildHeightLimit = 0; // 0 = No building height limit | >0 = Height limit in meters | Changing this to 30 would limit the maximum built height to 30 meters.
@@ -35,6 +33,12 @@ DZE_salvageLocked = true; //Enable or disable salvaging of locked vehicles, usef
 DZE_DisabledChannels = [(localize "str_channel_side"),(localize "str_channel_global"),(localize "str_channel_command")]; //List of disabled voice channels. Other channels are: "str_channel_group","str_channel_direct","str_channel_vehicle"
 DZE_NutritionDivisor = [1, 1, 1, 1]; //array of DIVISORS that regulate the rate of [calories, thirst, hunger, temperature] use when "working" (keep in mind that temperature raises with actions) - min values 0.1 - Larger values slow the effect, smaller values accelerate it
 DZE_ZombieSpeed = [0,0]; //Default agro speed is 6 per zombie config, set array elements 0 and 1 the same for non-variable speed, set to 0 to disable. array format = [min, max];  Ex: [2, 6]; results in a range of speed between 2 and 6 (2 is the old DZE_slowZombies hard-coded speed)
+DZE_lockablesHarderPenalty = true; // Enforce an exponential wait on attempts between unlocking a safe/lockbox from a failed code.
+
+// SafeZone
+DZE_SafeZoneZombieLoot = false;  // Enable spawning of Zombies and loot in positions listed in DZE_SafeZonePosArray?
+DZE_SafeZoneNoBuildItems = []; // Array of object class names not allowed to be built near the zones in DZE_SafeZonePosArray (see mission\init.sqf). Can be nested arrays for custom distances. i.e ["VaultStorageLocked","LockboxStorageLocked",["Plastic_Pole_EP1_DZ",1300]] etc.
+DZE_SafeZoneNoBuildDistance = 150; // Distance from zones in DZE_SafeZonePosArray (see mission\init.sqf) to disallow building near.
 
 // Death Messages
 DZE_DeathMsgChat = "none"; //"none","global","side","system" Display death messages in selected chat channel.
@@ -80,7 +84,7 @@ DZE_plotManagementMustBeClose = false; //Players must be within 10m of pole to b
 DZE_PlotManagementAdmins = []; //Array of admin PlayerUIDs. UIDs in this list are able to access every pole's management menu and delete or build any buildable with a pole nearby.
 DZE_MaxPlotFriends = 10; //Max friends allowed on a plot. There is no character limit in the inventory field of the database, but lower values limit the max global setVariable size to improve performance.
 DZE_maintainCurrencyRate = 100; //The currency rate of what maintaining an item will be, for instance: at 100, 10 items will have a worth of 1000 (1 10oz gold or 1k coins) see actions/maintain_area.sqf for more examples.
-DZE_limitPlots = false; // Limit the amount of plot poles per person to 1, UIDS in the DZE_PlotManagementAdmins array are exempt.
+DZE_limitPlots = 0; // Limit the amount of plot poles per person, Use 0 to disable. UIDS in the DZE_PlotManagementAdmins array are exempt.
 DZE_isRemovable = ["Plastic_Pole_EP1_DZ"]; //Items that can be removed with a crowbar with no ownership or access required. To forbid base take overs remove plot pole from this list and add it to DZE_restrictRemoval. It is not necessary to add wrecks or items that inherit from 'BuiltItems' to this list.
 DZE_restrictRemoval = ["Fence_corrugated_DZ","M240Nest_DZ","ParkBench_DZ","FireBarrel_DZ","Scaffolding_DZ","CanvasHut_DZ","LightPole_DZ","DeerStand_DZ","MetalGate_DZ","StickFence_DZ"]; //Items that can be removed with a crowbar only with proper ownership or access. It is not necessary to add doors, storage or items that inherit from 'ModularItems' to this list. Items that inherit from 'BuiltItems' can be added to this list if desired.
 

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/LMGAmmo.hpp

@@ -31,10 +31,6 @@ class 75Rnd_545x39_RPK
 {
 	weight = 1.25;
 };
-class 45Rnd_545x39_RPK
-{
-	weight = 1;
-};
 class 75Rnd_762x39_RPK
 {
 	weight = 1.5;

SQF/dayz_code/init/compiles.sqf

@@ -849,12 +849,15 @@ dayz_engineSwitch = {
 };
 
 DZE_SafeZonePosCheck = {
-	private ["_position","_skipPos"];
+	private ["_customRadius","_position","_skipPos"];
 	_position = _this select 0;
+	_customRadius = count _this > 1;
 	_skipPos = false;
 
-	{
-		if ((_position distance (_x select 0)) < (if (count _this > 1) then {_this select 1} else {_x select 1})) exitWith {_skipPos = true;};
-	} forEach DZE_SafeZonePosArray;
+	if (!DZE_SafeZoneZombieLoot or _customRadius) then {
+		{
+			if ((_position distance (_x select 0)) < (if (_customRadius) then {_this select 1} else {_x select 1})) exitWith {_skipPos = true;};
+		} forEach DZE_SafeZonePosArray;
+	};
 	_skipPos;
 };

SQF/dayz_code/init/variables.sqf

@@ -61,7 +61,7 @@ DayZ_RestingAnims = ["amovpsitmstpsnonwpstdnon_ground","amovpsitmstpsnonwpstdnon
 dayz_typedBags = ["bloodTester","bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"];
 dayz_playerAchievements = []; //[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
 dayz_plant = ["pumpkin.p3d","p_helianthus.p3d","p_fiberplant_ep1.p3d"];
-dayz_trees = ["ind_timbers.p3d","t_picea2s_snow.p3d","b_corylus.p3d","t_quercus3s.p3d","t_larix3s.p3d","t_pyrus2s.p3d","str_briza_kriva.p3d","dd_borovice.p3d","les_singlestrom_b.p3d","les_singlestrom.p3d","smrk_velky.p3d","smrk_siroky.p3d","smrk_maly.p3d","les_buk.p3d","str krovisko vysoke.p3d","str_fikovnik_ker.p3d","str_fikovnik.p3d","str vrba.p3d","hrusen2.p3d","str dub jiny.p3d","str lipa.p3d","str briza.p3d","p_akat02s.p3d","jablon.p3d","p_buk.p3d","str_topol.p3d","str_topol2.p3d","p_osika.p3d","t_picea3f.p3d","t_picea2s.p3d","t_picea1s.p3d","t_fagus2w.p3d","t_fagus2s.p3d","t_fagus2f.p3d","t_betula1f.p3d","t_betula2f.p3d","t_betula2s.p3d","t_betula2w.p3d","t_alnus2s.p3d","t_acer2s.p3d","t_populus3s.p3d","t_quercus2f.p3d","t_sorbus2s.p3d","t_malus1s.p3d","t_salix2s.p3d","t_picea1s_w.p3d","t_picea2s_w.p3d","t_ficusb2s_ep1.p3d","t_populusb2s_ep1.p3d","t_populusf2s_ep1.p3d","t_amygdalusc2s_ep1.p3d","t_pistacial2s_ep1.p3d","t_pinuse2s_ep1.p3d","t_pinuss3s_ep1.p3d","t_prunuss2s_ep1.p3d","t_pinusn2s.p3d","t_pinusn1s.p3d","t_pinuss2f.p3d","t_poplar2f_dead_pmc.p3d","misc_torzotree_pmc.p3d","misc_burnspruce_pmc.p3d","brg_cocunutpalm8.p3d","brg_umbrella_acacia01b.p3d","brg_jungle_tree_canopy_1.p3d","brg_jungle_tree_canopy_2.p3d","brg_cocunutpalm4.p3d","brg_cocunutpalm3.p3d","palm_01.p3d","palm_02.p3d","palm_03.p3d","palm_04.p3d","palm_09.p3d","palm_10.p3d","brg_cocunutpalm2.p3d","brg_jungle_tree_antiaris.p3d","brg_cocunutpalm1.p3d","str habr.p3d","brg_bird_1.p3d","brg_bird_2.p3d","brg_bird_3.p3d","brg_umbrella_acacia02b.p3d","brg_africandoumpalm_1.p3d","brg_umbrella_acacia04b.p3d","brg_datepalm_4.p3d","brg_datepalm_1.p3d","brg_umbrella_acacia03b.p3d","brg_bottle_4.p3d","brg_aloe1.p3d","brg_umbrella_acacia03.p3d","brg_umbrella_acacia01.p3d","brg_umbrella_acacia04.p3d","brg_aloe2.p3d","brg_umbrella_acacia02.p3d","brg_aloe3.p3d","brg_bottle_1.p3d","brg_datepalm_3.p3d","brg_datepalm_2.p3d","brg_baobab_1.p3d","brg_bottle_2.p3d","brg_bottle_3.p3d","t_fraxinus2s.p3d","t_carpinus2s.p3d"];
+dayz_trees = ["ind_timbers.p3d","t_picea2s_snow.p3d","t_quercus3s.p3d","t_larix3s.p3d","t_pyrus2s.p3d","str_briza_kriva.p3d","dd_borovice.p3d","les_singlestrom_b.p3d","les_singlestrom.p3d","smrk_velky.p3d","smrk_siroky.p3d","smrk_maly.p3d","les_buk.p3d","str krovisko vysoke.p3d","str_fikovnik_ker.p3d","str_fikovnik.p3d","str vrba.p3d","hrusen2.p3d","str dub jiny.p3d","str lipa.p3d","str briza.p3d","p_akat02s.p3d","jablon.p3d","p_buk.p3d","str_topol.p3d","str_topol2.p3d","p_osika.p3d","t_picea3f.p3d","t_picea2s.p3d","t_picea1s.p3d","t_fagus2w.p3d","t_fagus2s.p3d","t_fagus2f.p3d","t_betula1f.p3d","t_betula2f.p3d","t_betula2s.p3d","t_betula2w.p3d","t_alnus2s.p3d","t_acer2s.p3d","t_populus3s.p3d","t_quercus2f.p3d","t_sorbus2s.p3d","t_malus1s.p3d","t_salix2s.p3d","t_picea1s_w.p3d","t_picea2s_w.p3d","t_ficusb2s_ep1.p3d","t_populusb2s_ep1.p3d","t_populusf2s_ep1.p3d","t_amygdalusc2s_ep1.p3d","t_pistacial2s_ep1.p3d","t_pinuse2s_ep1.p3d","t_pinuss3s_ep1.p3d","t_prunuss2s_ep1.p3d","t_pinusn2s.p3d","t_pinusn1s.p3d","t_pinuss2f.p3d","t_poplar2f_dead_pmc.p3d","misc_torzotree_pmc.p3d","misc_burnspruce_pmc.p3d","brg_cocunutpalm8.p3d","brg_umbrella_acacia01b.p3d","brg_jungle_tree_canopy_1.p3d","brg_jungle_tree_canopy_2.p3d","brg_cocunutpalm4.p3d","brg_cocunutpalm3.p3d","palm_01.p3d","palm_02.p3d","palm_03.p3d","palm_04.p3d","palm_09.p3d","palm_10.p3d","brg_cocunutpalm2.p3d","brg_jungle_tree_antiaris.p3d","brg_cocunutpalm1.p3d","str habr.p3d","brg_bird_1.p3d","brg_bird_2.p3d","brg_bird_3.p3d","brg_umbrella_acacia02b.p3d","brg_africandoumpalm_1.p3d","brg_umbrella_acacia04b.p3d","brg_datepalm_4.p3d","brg_datepalm_1.p3d","brg_umbrella_acacia03b.p3d","brg_bottle_4.p3d","brg_aloe1.p3d","brg_umbrella_acacia03.p3d","brg_umbrella_acacia01.p3d","brg_umbrella_acacia04.p3d","brg_aloe2.p3d","brg_umbrella_acacia02.p3d","brg_aloe3.p3d","brg_bottle_1.p3d","brg_datepalm_3.p3d","brg_datepalm_2.p3d","brg_baobab_1.p3d","brg_bottle_2.p3d","brg_bottle_3.p3d","t_fraxinus2s.p3d","t_carpinus2s.p3d"];
 
 Dayz_meatraw =
 [
@@ -390,7 +390,7 @@ if(isNil "dayz_infectiouswaterholes") then {
 	dayz_infectiouswaterholes = true; //Enable infected waterholes
 };
 if(isNil "dayz_POIs") then {
-    dayz_POIs = true; //Enable POI's
+    dayz_POIs = true; //Enable POIs
 };
 if(isNil "dayz_ForcefullmoonNights") then {
 	dayz_ForcefullmoonNights = false; // Forces night time to be full moon.
@@ -399,12 +399,19 @@ if(isNil "dayz_randomMaxFuelAmount") then {
 	dayz_randomMaxFuelAmount = 500; //Puts a random amount of fuel in all fuel stations.
 };
 if(isNil "dayz_townGenerator") then {
-	dayz_townGenerator = true; // Spawn map junk. Currently only compatible with Chernarus. Need to add coordinates for other maps.
+	dayz_townGenerator = true; // Spawn map junk
 };
 if(isNil "dayz_townGeneratorBlackList") then {
 	dayz_townGeneratorBlackList = []; // Town generator will not spawn junk within 150m of these positions.
 };
 
+if (toLower worldName != "chernarus") then {
+	//Currently only compatible with Chernarus
+	dayz_infectiousWaterholes = false;
+	dayz_POIs = false;
+	dayz_townGenerator = false;
+};
+
 //Replace server individual settings with ranked settings
 if(isNil "dayz_presets") then { dayz_presets = "Vanilla"; };
 
@@ -503,7 +510,7 @@ DZE_replaceMagazines = [["vil_20Rnd_762x51_G3"],["vil_20Rnd_762x51_G3"]];
 DZE_LockableStorage = ["VaultStorage","VaultStorageLocked","LockboxStorageLocked","LockboxStorage"];
 DZE_LockedStorage = ["VaultStorageLocked","LockboxStorageLocked"];
 DZE_UnLockedStorage = ["VaultStorage","LockboxStorage"];
-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","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","DeerStand_DZ","Scaffolding_DZ","FireBarrel_DZ","M240Nest_DZ"];
+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","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","DeerStand_DZ","Scaffolding_DZ","FireBarrel_DZ","M240Nest_DZ","GunRack_DZ","WoodCrate_DZ","OutHouse_DZ","StorageShed_DZ","WoodShack_DZ","Wooden_shed_DZ"];
 DZE_DoorsLocked = ["Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallDoorLocked_DZ","CinderWallDoorSmallLocked_DZ"];
 DZE_isWreck = ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"];
 DZE_isWreckBuilding = ["Land_wreck_cinder","Land_wood_wreck_quarter","Land_wood_wreck_floor","Land_wood_wreck_third","Land_wood_wreck_frame","Land_iron_vein_wreck","Land_silver_vein_wreck","Land_gold_vein_wreck","Land_ammo_supply_wreck"];

SQF/dayz_code/stringtable.xml

@@ -8124,18 +8124,6 @@
 		</Key>
 	</Package>
 	<Package name="vehicles">
-		<Key ID="STR_VEH_NAME_OLD_HATCHBACK">
-			<English>Honda Accord hatchback</English>
-			<Russian>Старый хэтчбэк</Russian>
-			<Czech>Stará Honda Accord v hatchback verzi</Czech>
-			<German>Alter Kleinwagen</German>
-		</Key>
-		<Key ID="STR_VEH_NAME_SEDAN">
-			<English>Sedan</English>
-			<Russian>Седан</Russian>
-			<Spanish>Sedán</Spanish>
-			<German>Limousine</German>
-		</Key>
 		<Key ID="STR_VEH_NAME_HMMWV">
 			<English>HMMWV</English>
 			<Russian>Хамви</Russian>
@@ -8464,7 +8452,7 @@
 			<Czech>Infikovaný</Czech>
 		</Key>
 		<Key ID="STR_ZNAME_INFECTEDVIRAL">
-			<English>Viral infected</English>
+			<English>Viral Infected</English>
 			<Spanish>Infectado Viral</Spanish>
 			<Russian>Опасный инфицированный</Russian>
 			<French>Viral infecté</French>
@@ -8472,7 +8460,7 @@
 			<German>Viral Infizierter</German>
 		</Key>
 		<Key ID="STR_ZNAME_POLICEMAN">
-			<English>Infected policeman</English>
+			<English>Infected Policeman</English>
 			<German>Infizierter Polizist</German>
 			<Spanish>Policía Infectado</Spanish>
 			<Russian>Инфицированный милиционер</Russian>
@@ -8480,7 +8468,7 @@
 			<Czech>Infikovaný policajt</Czech>
 		</Key>
 		<Key ID="STR_ZNAME_SUIT">
-			<English>Infected clerk</English>
+			<English>Infected Clerk</English>
 			<German>Infizierter Beamter</German>
 			<Spanish>Oficinista Infectado</Spanish>
 			<Russian>Инфицированный клерк</Russian>
@@ -8488,7 +8476,7 @@
 			<Czech>Infikovaný úředník</Czech>
 		</Key>
 		<Key ID="STR_ZNAME_WORKER">
-			<English>Infected worker</English>
+			<English>Infected Worker</English>
 			<German>Infizierter Arbeiter</German>
 			<Spanish>Trabajador Infectado</Spanish>
 			<Russian>Инфицированный работяга</Russian>
@@ -8496,7 +8484,7 @@
 			<Czech>Infikovaný dělník</Czech>
 		</Key>
 		<Key ID="STR_ZNAME_DOCTOR">
-			<English>Infected doctor</English>
+			<English>Infected Doctor</English>
 			<German>Infizierter Arzt</German>
 			<Spanish>Doctor Infectado</Spanish>
 			<Russian>Инфицированный доктор</Russian>
@@ -8504,7 +8492,7 @@
 			<Czech>Infikovaný doktor</Czech>
 		</Key>
 		<Key ID="STR_ZNAME_TEACHER">
-			<English>Infected teacher</English>
+			<English>Infected Teacher</English>
 			<German>Infizierter Lehrer</German>
 			<Spanish>Maestro Infectado</Spanish>
 			<Russian>Инфицированный учитель</Russian>
@@ -8512,7 +8500,7 @@
 			<Czech>Infikovaný učitel</Czech>
 		</Key>
 		<Key ID="STR_ZNAME_HUNTER">
-			<English>Infected hunter</English>
+			<English>Infected Hunter</English>
 			<German>Infizierter Jäger</German>
 			<Spanish>Cazador Infectado</Spanish>
 			<Russian>Инфицированный охотник</Russian>
@@ -8520,13 +8508,49 @@
 			<Czech>Infikovaný myslivec</Czech>
 		</Key>
 		<Key ID="STR_ZNAME_PRIEST">
-			<English>Infected priest</English>
+			<English>Infected Priest</English>
 			<German>Infizierter Priester</German>
 			<Spanish>Sacerdote Infectado</Spanish>
 			<Russian>Инфицированный священник</Russian>
 			<French>Prêtre infecté</French>
 			<Czech>Infikovaný kněz</Czech>
 		</Key>
+		<Key ID="STR_ZNAME_CREWMAN">
+			<English>Infected Crewman</English>
+			<German>Infiziertes Besatzungsmitglied</German>
+		</Key>	
+		<Key ID="STR_ZNAME_OFFICER">
+			<English>Infected Officer</English>
+			<German>Infizierter Offizier</German>
+		</Key>	
+		<Key ID="STR_ZNAME_GHILLIE">
+			<English>Infected Sniper</English>
+			<German>Infizierter Scharfschütze</German>
+		</Key>		
+		<Key ID="STR_ZNAME_SPECIALFORCES">
+			<English>Infected Special Forces</English>
+			<German>Infizierte Spezialeinheit</German>
+		</Key>	
+		<Key ID="STR_ZNAME_REBELS">
+			<English>Infected Rebel</English>
+			<German>Infizierter Rebell</German>
+		</Key>		
+		<Key ID="STR_ZNAME_LUMERJACK">
+			<English>Infected Lumberjack</English>
+			<German>Infizierter Holzfäller</German>
+		</Key>	
+		<Key ID="STR_ZNAME_ROCKER">
+			<English>Infected Rocker</English>
+			<German>Infizierter Rocker</German>
+		</Key>	
+		<Key ID="STR_ZNAME_ASSISTANT">
+			<English>Infected Assistant</English>
+			<German>Infizierter Assistant</German>
+		</Key>		
+		<Key ID="STR_ZNAME_BODYGUARD">
+			<English>Infected Bodyguard</English>
+			<German>Infizierter Leibwächter</German>
+		</Key>
 	</Package>
 	<Package name="construction">
 		<Key ID="STR_BLD_name_ItemWorkBench">
@@ -11998,9 +12022,9 @@
 			<Czech>%1 je naplněno do %2 procent kapacity.</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_133">
-			<English>You can only have one active plot pole where you are the plot owner.</English>
-			<German>Du darfst maximal ein Grundstück besitzen, auf welchem du der Eigentümer bist.</German>
-			<Russian>Вы можете быть владельцем только одного строительного столба.</Russian>
+			<English>You can only own %1 plot pole(s)</English>
+			<German>Du kannst nur %1 Grundstück(e) besitzen.</German>
+			<Russian>Вам может принадлежать только %1 участок(а,ов) земли.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_134">
 			<English>You do not have access to build on this plot.</English>
@@ -12049,7 +12073,7 @@
 			<Czech>Stavím %1 fáze %2 z %3, pohněte se pro zrušení.</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_140">
-			<English>You have setup your %2. Combination is %1</English>
+			<English>You have setup your %2. The combination is %1</English>
 			<German>Du hast erfolgreich ein(e) %2 aufgebaut. Die Kombination lautet: %1</German>
 			<Russian>Вы установили свой %2. Комбинация %1</Russian>
 			<Dutch>Je hebt je %2 geplaatst. De combinatie is %1</Dutch>
@@ -12138,7 +12162,7 @@
 			<Russian>Улучшить %1 не представляется возможным.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_PLAYER_158">
-			<English>You have upgraded %2. Combination is %1</English>
+			<English>You have upgraded %2. The combination is: %1</English>
 			<German>Du hast %2 geupgradet. Die Kombination lautet: %1</German>
 			<Russian>Вы улучшили %2. Комбинация %1</Russian>
 			<Dutch>Je hebt een %2 geupgrade. De combinatie is %1</Dutch>
@@ -14804,7 +14828,7 @@
 		</Key>
 		<Key ID="STR_EPOCH_PLYWOODPACK">
 			<English>Plywood Pack</English>
-			<German>Sperrholzpacket</German>
+			<German>Sperrholzpaket</German>
 			<Russian>Упаковка фанеры</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_PLYWOODPACK_DESC">
@@ -15607,7 +15631,7 @@
 			<Russian>Дверной проём</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_BLOCKDOORWAY_DESC">
-			<English>Cinder block doorway.</English>
+			<English>Cinder block wall with metal single access door.</English>
 			<German>Ein Türdurchgang aus Beton.</German>
 			<Russian>Дверной проём в стене из шлакоблоков.</Russian>
 		</Key>
@@ -15618,14 +15642,17 @@
 		<Key ID="STR_EPOCH_BLOCKDOORLOCKED">
 			<English>Cinder Door (locked)</English>
 			<German>Betontür (verschlossen)</German>
-		</Key>			
+		</Key>
+		<Key ID="STR_EPOCH_BLOCKDOORWAY_LOCKED_DESC">
+			<English>Cinder block wall with locked metal single access door.</English>
+		</Key>
 		<Key ID="STR_EPOCH_BLOCKGARAGEDOORWAY">
 			<English>Cinder Garage Doorway</English>
 			<German>Beton-Garagentürrahmen</German>
 			<Russian>Дверной проём (гаражный)</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_BLOCKGARAGEDOORWAY_DESC">
-			<English>Cinder block garage doorway.</English>
+			<English>Cinder block wall with metal garage doorway.</English>
 			<German>Ein Garagentürrahmen aus Beton.</German>
 			<Russian>Гаражный дверной проём в стене из шлакоблоков.</Russian>
 		</Key>
@@ -15636,7 +15663,10 @@
 		<Key ID="STR_EPOCH_BLOCKGARAGEDOORLOCKED">
 			<English>Cinder Garage Door (locked)</English>
 			<German>Beton-Garagentür (verschlossen)</German>
-		</Key>		
+		</Key>
+		<Key ID="STR_EPOCH_BLOCKGARAGEDOORWAY_LOCKED_DESC">
+			<English>Cinder block wall with locked metal garage doorway.</English>
+		</Key>
 		<Key ID="STR_EPOCH_FLOORCEILING">
 			<English>Floor/Ceiling</English>
 			<German>Holzboden/Decke</German>

SQF/dayz_code/system/mission/chernarus/hideGlitchObjects.sqf

@@ -25,8 +25,11 @@ private "_object";
 	//Clip into zero_building Land_HouseV_1L2
 	[[3672,2435,0],327675], //kbud.p3d outhouse
 	
-	//Buildings too high above terrain level to enter
+	//Custom building interiors too high/low above/below terrain level to enter
+	[[6079,4911,0],223850], //Land_Shed_W4 zero_building
 	[[7261,2799,0],342775], //Land_Shed_W4 zero_building
+	[[12871,8031,0],294946], //Land_HouseV_3I3 zero_building
+	[[12971,8022,0],295117], //Land_HouseV_3I3 zero_building
 	//Land_houseV_2T2 back stairs too high, temporary until Streatman model update
 	[[8679,2428,0],358075],
 	[[13351,5442,0],306657],
@@ -35,9 +38,12 @@ private "_object";
 
 //Respawn at correct position
 [[
+	["Land_Shed_W4",[6078.64,4911.5,-0.55],0],
 	["Land_Shed_W4",[7261.45,2799.33,0],317.308],
-	["Fence_corrugated_plate",[7262.15,2805.85,0],142.308],
+	["Fence_corrugated_plate",[7262.15,2805.85,0],142.308], //Cover floating fences nearby
 	["Fence_corrugated_plate",[7265.2,2808.42,0],137.308],
+	["Land_HouseV_3I3",[12870.7,8031.49,0],180],
+	["Land_HouseV_3I3",[12971,8022.49,0],268],
 	//Land_houseV_2T2 back stairs too high, temporary until Streatman model update
 	["Land_houseV_2T2",[8678.94,2427.98,-0.3],245],
 	["Land_houseV_2T2",[13350.6,5441.92,-0.1],0],

SQF/dayz_code/system/mission/chernarus/poi/GvozdnoMilitaryBase.sqf

@@ -820,6 +820,8 @@ if (true) then
   _this setDir 71.406975;
   _this setVehicleInit "this setVectorUp [0,0,1];";
   _this setPos [7836.5088, 12622.839, 0.36634916];
+  _this addEventHandler ["HandleDamage",{0}]; //Forbid destruction (mi8wreck and static objects on top are left floating)
+  _this enableSimulation false;
 };
 
 _vehicle_446 = objNull;

SQF/dayz_code/system/player_spawn_2.sqf

@@ -58,9 +58,6 @@ while {1 == 1} do {
 		_mylastPos = _tempPos;
 	};
 
-	if (!isNil "_mylastPos") then {
-		dayz_mylastPos = _mylastPos;
-	};
 	dayz_areaAffect = _size;
 
 	if (_speed > 0.1) then {

SQF/dayz_code/system/scheduler/sched_gui.sqf

@@ -12,6 +12,7 @@ sched_gui = {
 		if (profileNamespace getVariable ["statusUI",1] == 1) then {
 			3 cutRsc [if (toLower DZE_UI == "vanilla") then {"playerStatusGUI"} else {"playerStatusGUI_epoch"},"PLAIN",3]; // show the whole HUD
 		} else {
+			[] spawn {uiSleep 2; systemChat (localize "STR_UI_STATUS_ICONS_TOOLTIP");};
 			//This can be removed after friendlies system is removed from player_updateGUI
 			uiNamespace setVariable ["DAYZ_GUI_display",displayNull];
 		};

SQF/dayz_epoch_b/config.cpp

@@ -6,9 +6,4 @@ class CfgPatches {
 		dayzVersion = "1.0.6";
 		requiredAddons[] = {"dayz_code"};
 	};
-};
-class CfgWeapons
-{
-	class ItemCore;
-	#include "ItemKeys.hpp"
 };

SQF/dayz_server/compile/server_playerLogin.sqf

@@ -172,6 +172,7 @@ if (toLower worldName == "chernarus") then {
 		[[2581,3456,0],1019127], //lavicka_2.p3d bench
 		//Clip into zero_building Land_HouseV_3I3
 		[[2800,5202,0],187548], //popelnice.p3d trash can
+		[[12876,8031,0],294873], //popelnice.p3d trash can
 		//Clip into zero_building Land_HouseV_1L2
 		[[3656,2429,0],327885], //plot_rust_draty.p3d fence
 		[[3656,2429,0],328107], //plot_rust_draty.p3d fence

SQF/dayz_server/compile/server_playerSetup.sqf

@@ -166,7 +166,6 @@ if (count _stats > 0) then {
 };
 
 if (_randomSpot) then {
-	private ["_counter","_position","_isNear","_isZero","_mkr"];
 	if (!isDedicated) then {endLoadingScreen;};
 	_IslandMap = (toLower worldName in ["caribou","cmr_ovaron","dayznogova","dingor","dzhg","fallujah","fapovo","fdf_isle1_a","isladuala","lingor","mbg_celle2","namalsk","napf","oring","panthera2","ruegen","sara","sauerland","smd_sahrani_a2","tasmania2010","tavi","trinity","utes"]);
 
@@ -213,13 +212,12 @@ if (_randomSpot) then {
 //record player pos locally for server checking
 _playerObj setVariable ["characterID",_characterID,true];
 _playerObj setVariable ["humanity",_humanity,true];
-_playerObj setVariable ["lastPos",getPosATL _playerObj];
+_playerObj setVariable ["lastPos",_position];
 
 _clientID = owner _playerObj;
 _randomKey = [];
-_randomInput = toArray "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890!@#$^*";
 for "_i" from 0 to 12 do {
-	_randomKey set [count _randomKey, (_randomInput call BIS_fnc_selectRandom)];
+	_randomKey set [_i, (ceil(random 128)) + 256]; //Latin Extended-A characters not filtered in publicvariableval.txt
 };
 _randomKey = toString _randomKey;
 _findIndex = dayz_serverPUIDArray find _playerID;
@@ -248,4 +246,4 @@ if (count _inventory > 2) then {
 [_playerID,_characterID,1,(_playerObj call fa_plr2str),((_worldspace select 1) call fa_coor2str)] call dayz_recordLogin;
 
 PVDZ_plr_Login1 = null;
-PVDZ_plr_Login2 = null;
+PVDZ_plr_Login2 = null;

SQF/dayz_server/compile/server_updateObject.sqf

@@ -115,24 +115,24 @@ _object_damage = {
 	_damage = damage _object;
 	_array = [];
 	_allFixed = true;
-	
+
 	{
 		_hit = [_object,_x] call object_getHit;
-		_selection = getText (configFile >> "CfgVehicles" >> _class >> "HitPoints" >> _x >> "name");
-		if (_hit > 0) then {
+		if ((_hit select 0) > 0) then {
+					  
 			_allFixed = false;
-			_array set [count _array,[_selection,_hit]];
-			//diag_log format ["Section Part: %1, Dmg: %2",_selection,_hit]; 
+			_array set [count _array,[(_hit select 1),(_hit select 0)]];
+			//diag_log format ["Section Part: %1, Dmg: %2",(_hit select 1),(_hit select 0)];
 		} else {
-			_array set [count _array,[_selection,0]]; 
+			_array set [count _array,[(_hit select 1),0]];
 		};
 	} forEach _hitpoints;
-	
+
 	if (_allFixed && !_totalDmg) then {_object setDamage 0;};
-	
-	if (_forced) then {        
+
+	if (_forced) then {
 		if (_object in needUpdate_objects) then {needUpdate_objects = needUpdate_objects - [_object];};
-		_recorddmg = true;	       
+		_recorddmg = true;
 	} else {
 		//Prevent damage events for the first 10 seconds of the servers live.
 		if (diag_ticktime - _lastUpdate > 10) then {
@@ -143,7 +143,7 @@ _object_damage = {
 			};
 		};
 	};
-	
+
 	if (_recorddmg) then {
 		if (_objectID == "0") then {
 			_key = format["CHILD:306:%1:",_objectUID] + str _array + ":" + str _damage + ":";
@@ -153,8 +153,8 @@ _object_damage = {
 		#ifdef OBJECT_DEBUG
 		diag_log ("HIVE: WRITE: "+ str(_key));
 		#endif
-		
-		_key call server_hiveWrite;   
+
+		_key call server_hiveWrite;
 	};
 };
 
@@ -200,7 +200,7 @@ _object_killed = {
 		};
 		default {""};
 	};
-	
+
 	if (_exitReason != "") exitWith {diag_log _exitReason};	
 	_object setDamage 1;
 	

SQF/dayz_server/compile/server_verifySender.sqf

@@ -32,4 +32,4 @@ _exitReason = switch true do {
 	default {""};
 };
 
-_exitReason
+_exitReason

SQF/dayz_server/init/server_functions.sqf

@@ -13,8 +13,8 @@ call compile preprocessFileLineNumbers "\z\addons\dayz_code\loot\compile.sqf";
 
 BIS_Effects_Burn = {};
 dayz_disconnectPlayers = [];
-dayz_serverKey = [];
-for "_i" from 0 to 12 do {
+dayz_serverKey = [59]; //makes sure client is kicked by publicvariableval.txt if they try to send it
+for "_i" from 1 to 12 do {
 	dayz_serverKey set [_i, ceil(random 128)];
 };
 dayz_serverKey = toString dayz_serverKey;

SQF/dayz_server/system/lit_fireplaces.sqf

@@ -1,5 +1,35 @@
 // (c) facoptere@gmail.com, licensed to DayZMod for the community
-private ["_blocked","_flame","_position"];
+private ["_blocked","_fires","_flame","_position"];
+
+_fires = [];
+
+if (dayz_townGenerator) then {
+	_fires = _fires + [
+		[11911.8,9101.2,0.597935], [11983,9162.89,0.597931], [12013.1,9159.38,0.597931], [12197.2,9499.66,0.603302], [12210.8,9728.83,0.597929],
+		[12218.7,9752.14,0.597929], [12247,9746.97,0.597929], [12271.7,9719.5,0.597929], [12407.3,9549.83,0.599188], [4889.27,2234.81,0.272388],
+		[4892.66,2235.29,0.272345], [6043.67,7781.65,0.597931], [6177.52,2125.36,0.598278], [6291.18,7808.69,0.597961], [6317.3,7835.18,0.597961],
+		[6428.26,2244.95,0.59796], [6513.29,2298.32,0.597929], [6536.12,2639.35,0.597929], [6545.71,2630.16,0.597929], [6663.22,2286.33,0.597929],
+		[6706.46,3012.04,0.59866], [6725.35,2576.59,0.597929], [6754.5,2780.37,0.597929], [6760.03,2727.7,0.597929], [6789.35,2692.69,0.597929],
+		[6796.09,2726.09,0.597929], [6810.51,2499.86,0.597929], [6822.79,2482.01,0.597929], [6832.25,2500.24,0.597929], [6833.6,3176.97,0.59797],
+		[6835.19,2694.23,0.597929], [6856.71,2522.75,0.597929], [6864.41,2464.66,0.597929], [7065.12,2622.94,0.597929], [7095.99,2740.68,0.597929]
+	];
+};
+
+if (dayz_POIs) then {
+	_fires = _fires + [
+		[11580.2,3391.72,-1.20629], [11604.4,3389.41,0.0161071], [11664.6,3415.82,-0.524297], [11678.4,3421.32,-0.526046], [11681.4,3409.25,0.028707],
+		[11700.9,3416.6,-0.433657], [11707.7,3431.61,0.597957], [11817.8,12693.7,-0.131821], [11844.7,12749.8,-0.109467], [11845.2,12747.7,-0.119843],
+		[11846.3,12751.1,-0.234741], [11862.3,12748.1,-0.31282], [11863,12748.5,-0.302368], [11863.9,12749.1,-0.279175], [12698.9,9523.05,0.039454],
+		[12700.7,9515.4,7.22985], [12701.1,9516.98,7.29042], [12704,9511.34,0.0394101], [12706.2,9510.56,0.0394883], [12706,9513.22,0.0393739],
+		[12707.3,9520.42,0.03929], [12707.4,9537.02,0.0394235], [12710.4,9548.67,9.79484], [12712.2,9544.37,9.98028], [12714.3,9535.06,-0.634063],
+		[12715.2,9539.4,0.039432], [12715.5,9536.36,0.0393863], [12718.4,9550.81,-0.633002], [12718.6,9550.53,0.0454731], [12721.6,9502.26,0.0394025],
+		[1689.3,11754.5,-0.640869], [1693.15,11750.4,0.0564575], [1698.03,11751.3,0.0558929], [1700.78,11733,0.0564728], [1704.94,11761.2,0.0585327],
+		[1705.92,11728.9,0.0565643], [1709.39,11727.4,0.0566864], [1713.98,11724.6,0.0566711], [1724.37,11729.1,0.054306], [1725.6,11729.7,0.0551147],
+		[1727.1,11727.7,0.0535278], [1727.33,11724.1,-0.64357], [1728.14,11729.9,-0.644043], [1729.12,11729.2,0.0558777], [1730.91,11729.7,-0.644058],
+		[1731.99,11728.5,0.0557709], [1746.26,11721.7,0.0542297], [1782.34,11754.6,0.598038]
+	];
+};
+
 {
 	_blocked = false;
 	_position = _x;
@@ -7,28 +37,10 @@ private ["_blocked","_flame","_position"];
 	if (!_blocked && (random 1 < 0.33)) then {
 		_flame = "flamable_DZ" createVehicle [0,0,0]; //200x faster https://community.bistudio.com/wiki/Code_Optimisation#createVehicle.28Local.29
 		_flame setPosATL _x;
-		_flame inflame true;  
+		_flame inflame true;
 		_flame setVariable ["permaLoot",true]; // = won't be removed by the cleaner, cf. sched_lootpiles.sqf
 	};
 	uiSleep 0.001;
-} count [ 
-	[11580.2,3391.72,-1.20629], [11604.4,3389.41,0.0161071], [11664.6,3415.82,-0.524297], [11678.4,3421.32,-0.526046], [11681.4,3409.25,0.028707], 
-	[11700.9,3416.6,-0.433657], [11707.7,3431.61,0.597957], [11817.8,12693.7,-0.131821], [11844.7,12749.8,-0.109467], [11845.2,12747.7,-0.119843], 
-	[11846.3,12751.1,-0.234741], [11862.3,12748.1,-0.31282], [11863,12748.5,-0.302368], [11863.9,12749.1,-0.279175], [11911.8,9101.2,0.597935], 
-	[11983,9162.89,0.597931], [12013.1,9159.38,0.597931], [12197.2,9499.66,0.603302], [12210.8,9728.83,0.597929], [12218.7,9752.14,0.597929], 
-	[12247,9746.97,0.597929], [12271.7,9719.5,0.597929], [12407.3,9549.83,0.599188], [12698.9,9523.05,0.039454], [12700.7,9515.4,7.22985], 
-	[12701.1,9516.98,7.29042], [12704,9511.34,0.0394101], [12706.2,9510.56,0.0394883], [12706,9513.22,0.0393739], [12707.3,9520.42,0.03929], 
-	[12707.4,9537.02,0.0394235], [12710.4,9548.67,9.79484], [12712.2,9544.37,9.98028], [12714.3,9535.06,-0.634063], [12715.2,9539.4,0.039432], 
-	[12715.5,9536.36,0.0393863], [12718.4,9550.81,-0.633002], [12718.6,9550.53,0.0454731], [12721.6,9502.26,0.0394025], [1689.3,11754.5,-0.640869], 
-	[1693.15,11750.4,0.0564575], [1698.03,11751.3,0.0558929], [1700.78,11733,0.0564728], [1704.94,11761.2,0.0585327], [1705.92,11728.9,0.0565643], 
-	[1709.39,11727.4,0.0566864], [1713.98,11724.6,0.0566711], [1724.37,11729.1,0.054306], [1725.6,11729.7,0.0551147], [1727.1,11727.7,0.0535278], 
-	[1727.33,11724.1,-0.64357], [1728.14,11729.9,-0.644043], [1729.12,11729.2,0.0558777], [1730.91,11729.7,-0.644058], [1731.99,11728.5,0.0557709], 
-	[1746.26,11721.7,0.0542297], [1782.34,11754.6,0.598038], [4889.27,2234.81,0.272388], [4892.66,2235.29,0.272345], [6043.67,7781.65,0.597931], 
-	[6177.52,2125.36,0.598278], [6291.18,7808.69,0.597961], [6317.3,7835.18,0.597961], [6428.26,2244.95,0.59796], [6513.29,2298.32,0.597929], 
-	[6536.12,2639.35,0.597929], [6545.71,2630.16,0.597929], [6663.22,2286.33,0.597929], [6706.46,3012.04,0.59866], [6725.35,2576.59,0.597929], 
-	[6754.5,2780.37,0.597929], [6760.03,2727.7,0.597929], [6789.35,2692.69,0.597929], [6796.09,2726.09,0.597929], [6810.51,2499.86,0.597929], 
-	[6822.79,2482.01,0.597929], [6832.25,2500.24,0.597929], [6833.6,3176.97,0.59797], [6835.19,2694.23,0.597929],
-	[6856.71,2522.75,0.597929], [6864.41,2464.66,0.597929], [7065.12,2622.94,0.597929], [7095.99,2740.68,0.597929] 
-];
+} count _fires;
 
 //[6847.45,2360.25,0.597929] removed for now, see https://github.com/DayZMod/DayZ/issues/869

SQF/dayz_server/system/server_monitor.sqf

@@ -273,9 +273,7 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith {
 			{
 				_selection = _x select 0;
 				_dam = if (!_isAir && {_selection in dayZ_explosiveParts}) then {(_x select 1) min 0.8;} else {_x select 1;};
-				_strH = "hit_" + (_selection);
-				_object setHit[_selection,_dam];
-				_object setVariable [_strH,_dam,true];
+				_object setHit [_selection,_dam];
 			} foreach _hitpoints;
 			[_object,"damage"] call server_updateObject;
 
@@ -428,7 +426,7 @@ publicVariable "sm_done";
 [] execVM "\z\addons\dayz_server\compile\server_spawnCarePackages.sqf";
 [] execVM "\z\addons\dayz_server\compile\server_spawnCrashSites.sqf";
 
-if (dayz_townGenerator) then {execVM "\z\addons\dayz_server\system\lit_fireplaces.sqf";};
+execVM "\z\addons\dayz_server\system\lit_fireplaces.sqf";
 
 "PVDZ_sec_atp" addPublicVariableEventHandler {
 	_x = _this select 1;

Server Files/DZE_Server_Config/BattlEye/publicvariableval.txt

@@ -1,6 +1,5 @@
 //new
 5 \{
-5 \(
 5 ;
 5 &
 5 %

Server Files/DZE_Server_Config/BattlEye/scripts.txt

@@ -1,7 +1,7 @@
 //new2
 5 addAction !raddAction !"\"addAction\", " !", \"\\z\\addons\\dayz_code\\" !"],DZE_build_vector_file,[vectorActionState,"
-5 addBackpack !"addBackpackCargoGlobal [_x,(_objWpnQty select _counter)];\n_counter = _counter + 1;\n} count _objWpnTypes;" !"addBackpack _item;\n};\n};\nformat[localize \"str_c" !"case 3: {_holder addBackpackCargoGlobal [_item,_amount];};\n};\n\n\n" !"}) then {\n_newUnit addBackpack _newBackpackType;\n\nd" !"(_this select 0)) then\n{\n(_this select 0) addBackpack (_x select 1);\n};\n};" !"(_this select 0) addBackpackCargoGlobal [_x select 1, 1];\n};\n};\n} cou" !"addBackpack _backpackType; \ndayz_myBackpack =	unitBackpack player;\n\n\n\n_backpackWpnT" !"};\n} count _wpns;\n\nif (_bcpk != \"\") then {\nplayer addBackpack" !"1 == \"trade_backpacks\") then {\nDZE_myVehicle addBackpack" !"7 addBackpackCargoGlobal  [_create,_qty];\n};\nif (surfaceIsWater" !"case 5: {_item addBackpackCargoGlobal [_itemOut,_countOut]};\n};\n} else"
-5 addMagazine !raddMagazine !"\"addMagazine\", " !"if (isClass (configfile >> \"cfgmagazines\" >> (_item))) then {_unit addMagazine _item;};\n};\n};\n};\n};" !"_vehicle addMagazineTurret [_ammo,_turret];\nplayer removeMagazine" !"if (dayz_actionInProgress) exitWith {" !"addMagazine _x;\n};\n} foreach _items;\nformat[loc" !"addMagazine 'Hatchet_Swing'" !"addMagazine \"ItemAntibiotic\" + str(_remain" !"sumeDrop\") == 0) then\n{\nplayer addMagazine" !"ion) do {\ncase \"CfgWeapons\":\n{\nplayer addWeapon _item;\n};\ncase \"CfgMagazines\":\n{\nplayer addMagazine" !"addMagazine [\"12Rnd_Quiver_Wood\",_qty_quiv" !" >> \"containerEmpty\")" !"plant) select 1;\n{\n_item addMagazine" !"addMagazineCargoGlobal [_itemtodrop,1];\n\nformat[localize \"str_f" !"addMagazine _attachment;\n\n\n(findDisplay 10" !"addMagazine getText (configFile >> \"CfgMagazines\" >> _x >> _water" !"};\n};\n\n\nswitch _type do {\ncase 1: {_holder addMagazine" !"do {\n_animalbody addMagazine _rawfoodtype" !"addMagazine _item;\n};\n};\n_idc = _idc" !"_newUnit addMagazine [_x select 0,_x select 1]" !"addMagazine _x } count MeleeMagazines;\n} e" !"_meleeNum < 1) then {\nplayer addMagazine" !"addMagazine _qtyRemaining;\n};\n};\ntrue" !"bag\";\n};\n};\n(_this select 0) addMagazine" !"addMagazineCargoGlobal [_item, 1];\nif (surfaceIsWater (_this s" !"addMagazine \"wholeBloodBagBNEG\";\n};\n};" !"_qty > 0) then {\n_firePlace addMagazine" !"ONEG\" }; \n};\ndayz_myBackpack addMagazine" !"addMagazine _x;\n_countmags = _countmags  +1;\n};\n} count _gmag" !"E\"];\n_lootpile addMagazineCargoGlobal [\"TrapBear\", 1]" !"With\n{\nplayer addMagazine (_this select 1" !"lder addMagazineCargoGlobal [_x,(_objWpnQty select _counter)];\n_counter = _counter + 1;\n};\n} co" !"soldItem\"];\n{\n_object addMagazine" !"systemChat localize \"STR_EPOCH_TRADE_" !"if (_silver_1oz > 0) then {\nif (_silver_1oz == 1) then {\nplayer addMagazine"
+5 addBackpack !"addBackpackCargoGlobal [_x,(_objWpnQty select _counter)];\n_counter = _counter + 1;\n} count _objWpnTypes;" !"addBackpack _item;\n};\n};\nformat[localize \"str_c" !"case 3: {_holder addBackpackCargoGlobal [_item,_amount];};\n};\n\n\n" !"}) then {\n_newUnit addBackpack _newBackpackType;\n\nd" !"(_this select 0)) then\n{\n(_this select 0) addBackpack (_x select 1);\n};\n};" !"(_this select 0) addBackpackCargoGlobal [_x select 1, 1];\n};\n};\n} cou" !"addBackpack _backpackType; \ndayz_myBackpack =	unitBackpack player;\n\n\n\n_backpackWpnT" !"};\n} count _wpns;\n\nif (_bcpk != \"\") then {\nplayer addBackpack" !"1 == \"trade_backpacks\") then {\nDZE_myVehicle addBackpack" !"7 addBackpackCargoGlobal  [_create,_qty];\n};\nif (surfaceIsWater" !"case 5: {_item addBackpackCargoGlobal [_itemOut,_countOut]}; \n};\n} else"
+5 addMagazine !raddMagazine !"\"addMagazine\", " !"if (isClass (configfile >> \"cfgmagazines\" >> (_item))) then {_unit addMagazine _item;};\n};\n};\n};\n};" !"_vehicle addMagazineTurret [_ammo,_turret];\nplayer removeMagazine" !"if (dayz_actionInProgress) exitWith {" !"addMagazine _x;\n};\n} foreach _items;\nformat[loc" !"addMagazine \"ItemAntibiotic\" + str(_remain" !"sumeDrop\") == 0) then\n{\nplayer addMagazine" !"ion) do {\ncase \"CfgWeapons\":\n{\nplayer addWeapon _item;\n};\ncase \"CfgMagazines\":\n{\nplayer addMagazine" !"addMagazine [\"12Rnd_Quiver_Wood\",_qty_quiv" !" >> \"containerEmpty\")" !"plant) select 1;\n{\n_item addMagazine" !"addMagazineCargoGlobal [_itemtodrop,1];\n\nformat[localize \"str_f" !"addMagazine _attachment;\n\n\n(findDisplay 10" !"addMagazine getText (configFile >> \"CfgMagazines\" >> _x >> _water" !"};\n};\n\n\nswitch _type do {\ncase 1: {_holder addMagazine" !"do {\n_animalbody addMagazine _rawfoodtype" !"addMagazine _item;\n};\n};\n_idc = _idc" !"_newUnit addMagazine [_x select 0,_x select 1]" !"addMagazine _x } count MeleeMagazines;\n} e" !"_meleeNum < 1) then {\nplayer addMagazine" !"addMagazine _qtyRemaining;\n};\n};\ntrue" !"bag\";\n};\n};\n(_this select 0) addMagazine" !"addMagazineCargoGlobal [_item, 1];\nif (surfaceIsWater (_this s" !"addMagazine \"wholeBloodBagBNEG\";\n};\n};" !"_qty > 0) then {\n_firePlace addMagazine" !"ONEG\" }; \n};\ndayz_myBackpack addMagazine" !"addMagazine _x;\n_countmags = _countmags  +1;\n};\n} count _gmag" !"E\"];\n_lootpile addMagazineCargoGlobal [\"TrapBear\", 1]" !"With\n{\nplayer addMagazine (_this select 1" !"lder addMagazineCargoGlobal [_x,(_objWpnQty select _counter)];\n_counter = _counter + 1;\n};\n} co" !"soldItem\"];\n{\n_object addMagazine" !"systemChat localize \"STR_EPOCH_TRADE_" !"if (_silver_1oz > 0) then {\nif (_silver_1oz == 1) then {\nplayer addMagazine"
 5 addWeapon !raddWeapon !"\"addWeapon\", " !"if (isClass (configfile >> \"cfgweapons\" >> (_item))) then {_unit addWeapon _item;}\nelse" !",0]] call dayz_NutritionSystem;\n" !"Remove) == 1}) then {\nplayer addWeapon _create;" !"Display 0;\n\n\nif (_weaponInUse) then\n{\n_muz" !"failChance) then {\nswitch (_selection) do {\ncase \"CfgWeapons\":\n{\nplayer addWeapon" !"addWeapon _fixedItem;\nformat[localize \"str_f" !"_wepcounts = (getWeaponCargo _plant) select 1;\n{\n_item addWeapon" !"addWeapon _repair;\n} else {\n\n[_repair" !"player addWeapon dayz_onBack\n] select 0;\n};\n\n" !"player addWeapon _addWeapon;\n\nif (vehicle player != player) then {\n_display = find" !"};\n};\n\n\nswitch _type do {\ncase 1: {_holder addMagazineCargoGlobal [_item,_amount];};\ncase 2: {_holder addWeapon" !"l fn_chance) then {\nplayer removeWeapon _x;\nplayer addWeapon _rem" !"else {\n_body addWeapon dayz_onBack;\n};\n};\n\n\n_infect" !"\" >> _x)) then {\nplayer addWeapon _x;\n};\n} count _wpns;\n};" !"lder addWeaponCargoGlobal [_x,(_objWpnQty select _counter)];\n_counter = _counter + 1;\n} co" !"WpnQtys = [];\nif (count _backpackWpn > 0) then {\n_backpackWpnTypes = _backpackWpn sel" !"addWeapon (\"Item\"+str(_remain)+\"Matchbox" !"{\nswitch (_x select 0) do\n{\ncase 		2:\n{\n(_this select 0) addWeapon" !"E\"];\n_vehicle addWeaponCargoGlobal [_lootInfo select 1, 1" !"addWeaponCargoGlobal [_bcpkWpn, 1];\n};\n};\n};\n};" !"s;\n};\n\n\nplayer addWeapon \"Loot" !"With\n{\nplayer addWeapon (_this select 1" !"\") then {\n_newUnit addWeapon _secweapon;\n};\n\n" !"soldItem\"];\n{\n_object addWeapon" !"then {\nsystemChat format[localize \"STR_EPOCH_" !"DuplicateTool;\n} else {\nplayer addWeapon"
 5 allDead !"} count allDead;\n\n\nif (dayz_oldBodyCount > _bodyCount) then {"
 5 allGroups !"publicVariableServer \"PVDZ_Server_UpdateGroup\";\n};\n} count allGroups;"
@@ -16,7 +16,7 @@
 5 closeDisplay !"'closeDisplay'" !"closeDisplay 0" !"closeDisplay 2" !"if (!isNil \"closeDisplay\") then {"
 1 compile !"ca\\communityconfiguration" !"ca\\Data\\" !"ca\\missions" !"ca\\modules" !"ca\\ui\\" !"ca\\Warfare2\\" !"scriptName \"Functions\\systems\\fn_inv" !"scriptName \"MP\\data\\script" !"code = compile preprocessFileLineNumbers (BIS_PathMPscriptCommands" !"t = missionConfigFile >> \"onMinimapScript" !="_this call (call compile GetText (configFile >> \"CfgAmmo\" >> _amm >> \"muzzleEffect\"));" !"z\\addons\\dayz_code\\" !"_menu ctrlSetEventHandler [\"ButtonClick\",_compile];\n};\n_pos set [3" !"{ _x set [1, compile (_x select 1)]; }" !"silver_1oz_b);\n\n{ \nif (!isNil {call compile" !"Var = compile format[\"epoch_death_board_record_"
 5 createAgent !="_agent = createAgent [_type, _position, [], _radius, \"CAN_COLLIDE\"];" !="_agent = if (_type == \"Pastor\") then {createAgent [_type, _Pos, [], 0, \"NONE\"]} else {createAgent [_type, _Pos, [], 0, \"FORM\"]};" !="_dog = createAgent [_type, _Pos, [], 0, \"NONE\"];"
-5 createDialog !="_region = createDialog \"RscDisplaySpawnSelecter\";" !="_gender = createDialog 'RscDisplayGenderSelect';" !="_dialog = createDialog \"bloodTest\";" !="createDialog 'RscDisplayCraftingMenu';" !="createDialog \"DAYZ_PADLOCK\";" !"createDialog 'horde_journal_" !"Z_ResetContainer = true;\ncreateDialog \"AdvancedTrading\";" !"createDialog \"DoorManagement\";\ncall DoorNearbyHumans;" !="createDialog \"ComboLockUI\";" !"createdialog \"PlotManagement\";\ncall PlotNearbyHumans;" !"_trader_data = (_this select 3);\n\n_dialog = createdialog \"TraderDialog\";" !"_ok = createdialog \"KeypadUI\";" !"EpochDeathBoardLoad = {\ncreatedialog \"EpochDeathBoardDialog\";" !="if(DZE_doorManagement) then {createdialog \"DoorAccess\";} else {createdialog \"ComboLockUI\";};" !"\ndisableSerialization;\ncreateDialog \"DZ_GroupDialog\";"
+5 createDialog !="_region = createDialog \"RscDisplaySpawnSelecter\";" !="_gender = createDialog 'RscDisplayGenderSelect';" !="_dialog = createDialog \"bloodTest\";" !="createDialog 'RscDisplayCraftingMenu';" !="createDialog \"DAYZ_PADLOCK\";" !"createDialog 'horde_journal_" !"Z_ResetContainer = true;\ncreateDialog \"AdvancedTrading\";" !"createDialog \"DoorManagement\";\ncall DoorNearbyHumans;" !="createDialog \"ComboLockUI\";" !"createdialog \"PlotManagement\";\ncall PlotNearbyHumans;" !"_trader_data = (_this select 3);\n\n_dialog = createdialog \"TraderDialog\";" !"_ok = createDialog \"KeypadUI\";" !"EpochDeathBoardLoad = {\ncreatedialog \"EpochDeathBoardDialog\";" !="if(DZE_doorManagement) then {createdialog \"DoorAccess\";} else {createdialog \"ComboLockUI\";};" !"\ndisableSerialization;\ncreateDialog \"DZ_GroupDialog\";"
 5 createDisplay
 5 createMarker !"\"createMarkerLocal\"," !"rcreateMarkerLocal" !"if (isnil 'BIS_GITA_fnc_createMarkers' || false) then {" !"_marker = createMarkerLocal [format[\"groupMember"
 5 createUnit !="_newUnit = _group createUnit [_class,respawn_west_original,[],0,\"NONE\"];" !="BIS_MPF_logic = BIS_MPF_dummygroup createUnit [\"Logic\", [1000,10,0], [], 0, \"NONE\"];"

Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf

@@ -80,7 +80,8 @@ onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFin
 with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon
 
 if (!isDedicated) then {
-	enableSaving [false, false];	startLoadingScreen ["","RscDisplayLoadCustom"];
+	enableSaving [false, false];
+	startLoadingScreen ["","RscDisplayLoadCustom"];
 	progressLoadingScreen 0;
 	dayz_loadScreenMsg = localize 'str_login_missionFile';
 	progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf";
@@ -107,13 +108,13 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
-	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
+	if (dayz_POIs) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\takistan.sqf"; //Add trader agents
 	
 	//Get the server to setup what waterholes are going to be infected and then broadcast to everyone.
-	if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";};
+	if (dayz_infectiousWaterholes) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";};
 	
 	// Lootable objects from CfgTownGeneratorDefault.hpp
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\MainLootableObjects.sqf"; };

Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf

@@ -80,7 +80,8 @@ onPreloadFinished "diag_log [diag_tickTime,'onPreloadFinished']; dayz_preloadFin
 with uiNameSpace do {RscDMSLoad=nil;}; // autologon at next logon
 
 if (!isDedicated) then {
-	enableSaving [false, false];	startLoadingScreen ["","RscDisplayLoadCustom"];
+	enableSaving [false, false];
+	startLoadingScreen ["","RscDisplayLoadCustom"];
 	progressLoadingScreen 0;
 	dayz_loadScreenMsg = localize 'str_login_missionFile';
 	progress_monitor = [] execVM "\z\addons\dayz_code\system\progress_monitor.sqf";
@@ -107,13 +108,13 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
-	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
+	if (dayz_POIs) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\mountains_acr.sqf"; //Add trader agents
 	
 	//Get the server to setup what waterholes are going to be infected and then broadcast to everyone.
-	if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";};
+	if (dayz_infectiousWaterholes) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";};
 	
 	// Lootable objects from CfgTownGeneratorDefault.hpp
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\MainLootableObjects.sqf"; };