Update change log

My mistake from 26c1bd9

CHANGE LOG 1.0.6.1.txt

@@ -0,0 +1,106 @@
+[NEW] Added config variable DZE_HaloSpawnHeight. @ebayShopper
+[NEW] Added config variable DZE_ServerLogHits for logging source damage, weapon, ammo and distance to server RPT.
+[NEW] Added M4SPR_DZE and VSS_vintorez_DZE which spawn with larger magazines by default. #1823 #1890 @AirwavesMan
+[NEW] Building upgrades now source parts from the player's backpack and main inventory. @icomrade
+[NEW] Server owners can configure nutrition system effects with DZE_NutritionDivisor in configVariables.sqf @icomrade
+[NEW] Added back DZE_doorManagementHarderPenalty config variable. Required wait between incorrect entries of manual door codes is multiplied by two each time, starting at five seconds. #1847 @oiad
+[NEW] Added server logging of failed unlock attempts on doors, safes and lockboxes. Also added server logging of all door locking and unlocking. #1853 @oiad
+[NEW] Added loot positions for some more Sahrani and Tavi buildings
+[NEW] Added military flashlight attachments
+[NEW] Added full screen night vision goggles, classname: "NVGoggles_DZE" (must be added to traders by server owners) @icomrade
+[NEW] Added setting to easily disable base takeover and configure which items are removable without ownership or access. See DZE_restrictRemoval in configVariables.sqf. #1886 @AirwavesMan @oiad
+[NEW] Map markers are now automatically tagged with the name of the player who placed them. This can be easily removed or customized by admins. #1871 @looter809
+[NEW] Added block in keyboard.sqf for sprint and prone through locked doors glitch. @LunaCB
+
+[CHANGED] Turbo and HoldBreath keybindings are now allowed again. @icomrade
+[CHANGED] Commented drink from hands at ponds due to client FPS impact. Players can still fill drinks at ponds by right clicking a container. #1816
+[CHANGED] Disabled vanilla antiwall, POI, infectious waterhole and infected camp map additions by default due to negative FPS impact. They can be enabled in init.sqf and server_monitor. #1816
+[CHANGED] Added shadow to dayz_rollingMessages white text so it is visible on light colored backgrounds and looks like cutText.
+[CHANGED] Reverted pain to old violent shaking effect instead of subtle gun sway. #1839 @AirwavesMan @schwanzkopfhegel
+[CHANGED] Reverted lobby and player list background colors to A2OA default instead of dark grey
+[CHANGED] Salvage vehicle actions are no longer allowed in positions defined in DZE_SafeZonePosArray
+[CHANGED] The town generator and comfrey plant spawner loops are now fully disabled when dayz_townGenerator=false; to improve client FPS. #1816
+[CHANGED] AntiTP and scheduled security are now fully disabled when dayz_antihack=0. #1816
+[CHANGED] Changed default value for the variable dayz_bleedingeffect to 2 (blood particle effect only) due to negative FPS impact. Set to 3 to enable blood stains again. #1816
+[CHANGED] Group icons have been moved to a separate slower loop which only runs when in a group, and the group system is disabled by default. See configVariables.sqf to enable. #1816
+[CHANGED] Flies now spawn ten minutes after death instead of right away. Flies are also disabled by default due to negative FPS impact. See init.sqf to enable. #1816
+[CHANGED] SpawnCheck for loot and zombies has been lowered to 200m and switched to nearObjects instead of nearestObjects (same as 1051) for better client FPS. #1816
+[CHANGED] Increased head shot damage for normal hits (non-zombie and non-melee)
+[CHANGED] Slightly increased damage from vehicle run over
+[CHANGED] Moved study body back to fn_selfActions for easy admin customization.
+[CHANGED] Players can now lock and unlock a vehicle when the key is in their backpack. This can be changed in epoch_tempKeys. #1897 @oiad
+[CHANGED] The vanilla building PVEHs have been commented out because we don't support or use the vanilla base objects currently.
+
+[FIXED] Wrong texture for z_hunter zombie. #1805 @schwanzkopfhegel @ebayShopper
+[FIXED] Refuel with generator at gas station not working. #1806 @Helios27 @ebayShopper
+[FIXED] Issue where Arma cheats could still be entered under certain conditions without pressing LeftShift at the same time as NumPadMinus. @ebayShopper
+[FIXED] Tag friendly still showing after player accepts and related issue with BackpackAntiTheft. #1807 @oiad
+[FIXED] Undefined variable dayz_clientPreload error on main menu during intro.sqs. #1810 @ndavalos @ebayShopper
+[FIXED] Giving pain killers to another player no longer removes pain from the player giving the pain killers.
+[FIXED] Occasional undefined error for text color attribute when repairing and salvaging vehicles. @ebayShopper
+[FIXED] M24 ammo prices are now 1/4 of DMR ammo prices, so no profit can be made by combining M24 rounds. @looter809 @ebayShopper
+[FIXED] Full cinderblock walls now work properly with vector building #1813. @DeVloek @icomrade
+[FIXED] Death message showing incorrectly when players suicide under certain conditions. @oiad @ebayShopper
+[FIXED] Death message sometimes showing incorrectly due to spawn delay. #1833 @schwanzkopfhegel @ebayShopper
+[FIXED] Corpses occasionally being deleted right away due to delay between PVS and bodyName setVariable. #1825 @ebayShopper
+[FIXED] WoodenArrow and other WeaponHolderBase inherited objects catching fire when destroyed due to destrType. #1815 @DeVloek @ebayShopper
+[FIXED] Arrows floating in air when shot at same position against a wall multiple times. #1815 @DeVloek @ebayShopper
+[FIXED] Swimming in ground glitch when relogging at certain positions on certain maps like Napf and Tavi. @ebayShopper
+[FIXED] No damage from hitting ground after HALO jump when DZE_HaloOpenChuteHeight was set to -1. @ebayShopper
+[FIXED] Added back missing call to Epoch player_antiWall function for preventing base glitching. #1817 @ndavalos @ebayShopper
+[FIXED] HALO fresh spawns stuck swimming in air on Napf and failing to start correctly sometimes. #1809 @oiad @ebayShopper
+[FIXED] Self actions sometimes duplicating when changing clothes and looking at a safe. @jOoPs @ebayShopper
+[FIXED] Wrong bleeding icon on vanilla status UI. @jOoPs
+[FIXED] It is no longer possible to autoRun under ponds on Chernarus, Namalsk and Napf. #1827 @schwanzkopfhegel
+[FIXED] Hive connection error after the first and only online player disconnects during the object stream at server start up. #1822 @AirwavesMan @ebayShopper
+[FIXED] Vanilla player_craftItem not exiting when action is already in progress. #1826 @schwanzkopfhegel
+[FIXED] Fire barrel kit can be crafted with partially full matchboxes now. #1830 @AirwavesMan
+[FIXED] Viral zeds stuck and not moving from their spawn location due to wrong init event handler. #1819 @DeVloek
+[FIXED] Handling of boiled water bottles < 10 oz #1838 (Also removed the requirement to have an empty tin can to boil water) @icomrade @schwanzkopfhegel
+[FIXED] Generator inventory not saving #1831 @icomrade @schwanzkopfhegel
+[FIXED] Filling fuel barrels takes the correct amount from fuel tanks now (210 instead of 40 litres). #1834 @schwanzkopfhegel @oiad
+[FIXED] Unable to sell some launchers like Javelin and Stinger which have the same classname for ammo and weapon. #1844 @ndavalos
+[FIXED] Long search delay when filling water bottles, drinking from hands and drinking from empty cans is fixed on Chernarus, Namalsk and Napf. #1835 @schwanzkopfhegel
+[FIXED] Players can not purchase a negative number of items anymore.
+[FIXED] Switching weapons properly interrupts autorun now. #1850 @DeVloek
+[FIXED] Duplicate matchbox or knife error when lighting a fire or gutting with multiple matchboxes or knives on toolbelt. #1849 @DeVloek
+[FIXED] RU crates having zero cargo capacity and wrong classname DZ_ExplosivesBoxRU in loot table. #1852 @oiad
+[FIXED] Combining M24 or 2Rnd shotgun ammo can no longer be abused to dupe mags via the method described in #1848. @DeVloek
+[FIXED] Rapid starvation or dehydration when using chainsaw, chopping wood or pushing plane. Also lowered or removed nutrition hit for several actions. #1857 @TheZog
+[FIXED] Unable to repair or salvage vehicle parts not listed in the RepairParts config, like Merlin glass and tank tracks. #1828 #1856 @ndavalos @schwanzkopfhegel @oiad
+[FIXED] Unable to remove LightPole_DZ, DeerStand_DZ, MetalGate_DZ and StickFence_DZ. #1859 @TheZog
+[FIXED] Unconscious locked input when running #1860 @icomrade @DeVloek 
+[FIXED] Running corpses when the dead player has no primary weapon @icomrade
+[FIXED] "AI" text localized on wrong client in death messages #1867 @LunaCB
+[FIXED] Trader menu server RPT logs partially localized on clients @oiad
+[FIXED] Group icons will not show for units inside the player's vehicle anymore (helis, large planes, etc.). #1865 @schwanzkopfhegel
+[FIXED] Lighting fires and building fireplaces not working on platforms raised over the sea #1866 @schwanzkopfhegel
+[FIXED] Bandit1_DZ and Bandit2_DZ were the same. Bandit1_DZ is back to the normal non-camo skin now. #1874 @DeVloek
+[FIXED] If a player force kills their game immediately after dying their body will no longer disappear. #1825 @looter809
+[FIXED] Some AI behavior was broken due to RadioProtocolEmpty. Unfortunately this reintroduces group chat spam.
+[FIXED] Players can no longer pack a tent while sleeping.
+[FIXED] Players can no longer walk under water at Topolka Dam. @Bruce-LXXVI
+[FIXED] server_PublishVehicle3 will no longer dupe a vehicle if it fails to read the vehicle back from the database. @oiad
+[FIXED] Panic sounds will no longer overlap when the player is attacked by zombies. #1861 @DeVloek
+[FIXED] Melee weapons will no longer be eaten when attempting to add them to a full toolbelt.
+[FIXED] Updated to Sa-Matra's latest Core Patch BIS Effects which fix the fire in the sky bug again. #1883 @oiad @icomrade
+[FIXED] Mark body now marks all of your bodies instead of just one. @oiad
+[FIXED] Group and body markers correctly update on the GPS mini map now.
+[FIXED] Vehicle lock and unlock actions are now refreshed correctly without needing to look away and back again. @oiad
+[FIXED] A potential undefined error on bear trap trigger. @oiad
+[FIXED] A few floating loot positions in firestation.
+[FIXED] Blocked a duping method involving changing clothes. Thanks to Sercan for reporting. @oiad
+[FIXED] Buildables now properly apply godmode if enabled during the restart window. @oiad
+[FIXED] G36C ACOG attachment
+
+[NOTE] The fixes below are included in the 1.0.6 Build C server package released December 29th, 2016 (http://dayzepoch.com/a2dayzepoch.php)
+[FIXED] Hive child 309 errors that resulted in broken saving of newly built storage object inventory. @icomrade
+[FIXED] Error with object publishing when snap building is disabled. @ebayShopper
+[FIXED] Error handling upgraded 1051 databases that resulted in a <null> value for "rh_factor" and array for "bloodtype" in character_data medical field. @ebayShopper
+[FIXED] Error in server_playerSetup that resulted in a <null> value for dayz_onBack in character_data inventory if player had no weapon on back. @ebayShopper 
+[FIXED] Doors and plots not getting cleaned up properly. See new MaintenanceObjects variable and explanation in HiveExt.ini. @icomrade
+
+[REMOVED] Antiwall glitch blocks for vanilla hospitals since Epoch uses DayZero hospitals. @jOoPs
+[REMOVED] "Take ownership" on plot pole due to it being unnecessary and causing base objects to duplicate. #1811 @BNG-Lance @Clanwarfare
+
+[INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes.

CHANGE LOG 1.0.6.txt

@@ -1,120 +0,0 @@
-[NEW] Fully updated to DayZ 1.8.7 base @icomrade @ebaydayz
-[NEW] 1.8.7 attachments system, community weapons, base objects, traps, tripwires and car bomb
-[NEW] 1.8.7 journal and crafting menu are now functional (default 'J' key)
-[NEW] 1.8.7 spawn selection, set dayz_spawnselection = 1; in init.sqf (Chernarus only)
-[NEW] 1.8.7 infected camps, points of interest and infectious waterholes map additions (Chernarus only)
-[NEW] 1.8.7 configurable blood trails, set dayz_bleedingeffect in init.sqf
-[NEW] 1.8.7 weapon switching system and hotkeys (1 = primary, 2 = pistol, 3 = melee (or rifle onBack if DZE_TwoPrimaries=2;))
-[NEW] Players can carry more than one primary weapon which allows the abillity to hide one on their back, configure using DZE_TwoPrimaries. See configVariables.sqf for details @icomrade
-[NEW] Optional news/rules feed on player login, set dayz_enableRules in init.sqf
-[NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebaydayz
-[NEW] If using the vanilla UI you may enable or disable the combat icon with DZE_VanillaUICombatIcon = true/false; @icomrade
-[NEW] Anzio 20mm sniper and RedRyder BB Gun by @arma2WillRobinson
-[NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
-[NEW] Added action to lock and unlock vehicles from inside #1103 @pj999 @ebaydayz
-[NEW] Autorun hotkey (0 = Toggle auto run) @ebaydayz
-[NEW] Lower sound effects volume hotkey (F1) and status UI icon. Automatically disabled when exiting a vehicle.
-[NEW] Snap building, use DZE_modularBuild = true; in init.sqf to enable. @raymix
-[NEW] Auto login when a player joins the server, default 10 seconds, requires description.ext update in the mission (disable in description.ext by setting defValueParam1 = 31;) @icomrade
-[NEW] Many new configuration options are available for admins. See dayz_code\configVariables.sqf and mission\init.sqf for descriptions. @ebaydayz
-[NEW] Blood types system is disabled by default. Set dayz_classicBloodBagSystem = false; in init.sqf to enable
-[NEW] Dayz_townGenerator = true; in init.sqf can enable vanilla map junk in addition to Epoch DynamicDebris. Only works on Chernarus. @ebaydayz
-[NEW] DB Backup script. @RimBlock
-[NEW] Use DayZ_UseSteamID = false; in your init.sqf to use the old PlayerUID, instead of SteamID @icomrade
-[NOTE] It's recommend to convert to the new SteamID system if possible, new servers should not use DayZ_UseSteamID = false;
-[NEW] UI Update - Graphical and code changes, enable using DZE_UI = "dark"; in init.sqf. @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/
-[NEW] Upgraded (_DZE1,2,3,4) ArmoredSUV and Kamaz classes are now available. #1518 #1538 @McKeighan
-[NEW] Added waves effect during stormy weather #974 @FramedYannick @ebaydayz
-[NEW] Optional variable to prevent stealing from backpacks by non-friendlies at traders. Set DZE_BackpackAntiTheft = true; in init.sqf @ebaydayz
-[NEW] Zupa's Advanced Trading v2.1+ is now included as part of the Epoch Code, enabled with DZE_advancedTrading = true; NOT COMPATIBLE WITH DATABASE TRADERS @icomrade @Windmolders 
-[NEW] With config based traders categories can be reused by setting the duplicate=#; value. # is the category number to copy. @ebaydayz
-[NEW] Gems are now treated as variable value currency (Advanced Trading only). Configure gem values using DZE_GemWorthArray =[]; see configVariables.sqf for more info @icomrade
-[NEW] Gem rarity is now configurable for mining using DZE_GemOccurance =[]; See configVariables.sqf for more info @icomrade
-[NEW] A Plot For Life v2.5 by RimBlock is now included and enabled by default with variable DZE_permanentPlot, see configVariables.sqf @RimBlock @icomrade
-[NEW] Build Vectors v4 by Striker is now included, only enabled with Snap building. Note there is no option to turn off Vector Building with Snap Building enabled @strikerforce @icomrade
-[NEW] Door Management v3.0 by Zupa is now included and enabled by default with variable DZE_doorManagement, see configVariables.sqf @DevZupa @Bruce-LXXVI @ebaydayz 
-[NEW] Plot Management v2.1 by Zupa is now included and enabled by default with variable DZE_permanentPlot, see configVariables.sqf @DevZupa @Bruce-LXXVI @icomrade
-[NEW] Precise Base Building v1.0.5 by Mikeeeyy is now included. @Mikeeeyy @icomrade @ebaydayz
-[NEW] You may toggle vehicle destruction effects to prevent damage from vehicle explosions (useful to prevent griefing from ramming) use DZE_NoVehicleExplosions = true; to enable #1198 @icomrade
-[NEW] Temperature factors are now configurable with DZE_TempVars see configVariables.sqf for more info @icomrade 
-[NEW] Weather effects are now configurable with DZE_WeatherVariables See DynamicWeatherEffects.sqf for info on these values @icomrade
-[NEW] Full height cinderblock wall kits are now in game, classname "full_cinder_wall_kit" #1172 @icomrade
-[NEW] You can exclude built items from the god mode base function using DZE_GodModeBaseExclude = []; which is an array of item classnames
-[NEW] Fuel stations now have limited amount of fuel each restart. Configurable with dayz_randomMaxFuelAmount in init.sqf
-[NEW] More possible causes of death added to study body: fell, ran over, shot, melee hit, zombie hit @ebaydayz
-[NEW] Player-list no longer shows who's in lobby or ingame.
-
-[CHANGED] Combattimeout now uses diag_tickTime instead of time.
-[CHANGED] AmmoBoxSmall_556/762 is replaced with DZ_AmmoBoxUS/RU/EU/CZ and MedBox0 is replaced with DZ_MedBox (new model)
-[CHANGED] UH60Wreck and UH1Wreck are replaced with CrashSite_EU/UN/US/RU (new models)
-[CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade
-[CHANGED] Removed weapons from Traders hands and made them stand with arms by their side. @SilvDev
-[CHANGED] Tweaked fuel capacity variables for vehicles. @RimBlock
-[CHANGED] Tweaked rotate_logs.bat to incorporate the day of the week for better organization @Raziel23x 
-[CHANGED] All instances of sleep were replaced with the more reliable uiSleep where possible. @icomrade
-[CHANGED] Several getPosATL changed to call FNC_GetPos for water compatibility @icomrade
-[CHANGED] Trader city objects are now spawned locally on each machine with simulation disabled for better performance. Admins can still override with custom cities in init.sqf. @ebaydayz
-[CHANGED] Player zombies are no longer attacked by other zombies. The respawn button is now enabled for them if they wish to suicide. @ebaydayz
-[CHANGED] With R3Fweight on overburdened players are now forced to move slowly instead of being knocked out. The scream was also removed. #1145 @icomrade @ebaydayz
-[CHANGED] Abort and respawn are now disabled immediately in the pause menu onLoad to compensate for low fps delay. @ebaydayz
-[CHANGED] Player_onPause is now customizable by admins along with the new unscheduled fn_pauseMenuChecks. #1340 @Rimblock @ebaydayz
-
-[FIXED] Zombies now target and attack players correctly with 1.8.7 code
-[FIXED] Server position sync bug after falling unconscious #1522 @ebaydayz
-[FIXED] Character sometimes failing to sync after changing clothes #1545
-[FIXED] Backpack wipes when changing clothes. #1361 @icomrade
-[FIXED] CH53 gear when locked #1364 @icomrade
-[FIXED] Infinite loop when crafting ore into bars #1351 @icomrade
-[FIXED] Only first kill showing on death boards #1362 #1124 @vbawol @icomrade
-[FIXED] Crossbow quivers not working #1355 @icomrade
-[FIXED] Crash_spawner & Supply_drop modules spawning inaccessible loot piles #1408 #1390 @Uro1
-[FIXED] Fire cleanup diag_log error in server_functions.sqf #1421 @ebaydayz
-[FIXED] NearestObjects position error in server_playerSync.sqf #1425 @ebaydayz
-[FIXED] Corrected ClassName type for CH53_DZE and BAF_Merlin_DZE. @Cinjun
-[FIXED] Some counts reverted to forEach. Count loops can not be nested inside other count loops #1491-#1495 @ebaydayz
-[FIXED] Dynamic_vehicle spawning non-upgradable classes of hilux1 & datsun1.  @Uro1
-[FIXED] Eating while inside a vehicle did not drop empty can  @deadeye2
-[FIXED] Zombie loot error when using loot tables in mission file  @deadeye2
-[FIXED] Trader menu expected array error #1618-1620 @ebaydayz
-[FIXED] Loading screen issue where you can walk around and see a black screen #1610 @deanreid
-[FIXED] Crafting a sledgehammer with one already in your toolbelt no longer eats your parts. #1567 #1667 @Namindu
-[FIXED] Copy key failing when player doesn't have a backpack @ebaydayz
-[FIXED] DarkUI hunger and thirst inconsistency with vanilla UI and health system @SplenectomY @icomrade #1622
-[FIXED] Fire barrels not being detected over water @pj999 @icomrade #1559 #1564
-[FIXED] Opening supply crates over water no longer drops the items on the sea floor @pj999 @icomrade #1558
-[FIXED] Plot pole required message not updating to reflect DZE_PlotPole radius @mathewjknott @icomrade #1274
-[FIXED] Slow login timer and incorrect loading screen message when login times out @icomrade
-[FIXED] Combine mags not working for Revolver and M1911 ammo @Terrien @ebaydayz #1313
-[FIXED] M113_DZ,_DZE variants config errors and gunner seat not working @McKeighan @ebaydayz #1514
-[FIXED] Smoke countermeasures are now visible @Markokil321 @icomrade #1440
-[FIXED] Keyboard input is now disabled properly while unconscious @skynetdev @ebaydayz #1613
-[FIXED] Toilet paper dupe exploit when building outhouse @Markokil321 @ebaydayz #1599
-[FIXED] Safes and lockboxes wiped when opening after restart and locking not being logged to RPT @ebaydayz #1413 #1503
-[FIXED] Greatly optimized safe gear handling. Safe inventories are no longer sent to all machines over the network on server startup and each lock. @ebaydayz
-[FIXED] User input is disabled and then gear dialog is closed during safe lock/unlock/pack to block various duping methods. #1341 @RimBlock @ebaydayz
-[FIXED] Duplicate objectUIDs occasionally causing vehicles to swap classes or be deleted across restarts @ebaydayz @icomrade #1504
-[FIXED] DZE_BuildingLimit now counts buildables only instead of all object types. Thanks jOoPs @ebaydayz
-[FIXED] Reworked death messages. Fixed messages not always showing, undefined errors and wrong distance bug. Added bled out, killed by zombie, etc. MPHit event handler (fnc_plyrHit) is no longer needed. @ebaydayz
-[FIXED] Player no longer hears radiation sound when changing clothes. @ebaydayz
-[FIXED] Ponds and lakes are now detected correctly in player_goFishing. #1678 @ebaydayz
-[FIXED] Players are now ejected and killed when their vehicle is destroyed (Fix applies to all types of vehicles). @icomrade
-[NOTE]	Servers that use trader safezones must configure the variable DZE_SafeZonePosArray with their safezone posisitons and radii, otherwise passangers of vehicles in safezones will be killed upon destruction of their vehicle
-[FIXED] Players are no longer able to brute force doors or safes by the method described in #1187 @icomrade
-[FIXED] Fix some items not displaying removal option #1135 @icomrade
-[FIXED] Study body message saying his/he on female players. @ebaydayz
-
-[UPDATED] .hpp files updated in dayz_code\Configs\CfgLoot\CfgBuildingPos. @Uro1
-[UPDATED] .bat files updated in Config-Examples @Raziel23x
-[UPDATED] Updated all config.cfg in Config-Examples, Added Default Steam Ports and Updated Layout. @Namindu
-[UPDATED] Epoch.sql, 1.0.6_Updates.sql & CfgServerTraders with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
-
-[INFO] Server owners must update to the new Hive DLL included in the 1.0.6 release, changes in the soruce code can be found here: https://github.com/vbawol/DayZhiveEpoch/pull/13
-[INFO] Many weapon, item and tool classnames changed. Admins must run SQL\1.0.6_Updates and update their config traders (see dayz_code\Configs\CfgServerTrader) @ebaydayz
-[INFO] Many duplicate functions and variables were renamed. See Documents\1.0.6 Variable Name Changes.txt @ebaydayz
-[INFO] New loot table format is incompatible with old loot tables. Admins see CfgLoot\README.txt
-[INFO] If you use any community mods included in this release (Advanced Trading, Build Vectors, Door or Plot Management, Snap Build Pro, A Plot For Life) you MUST uninstall them from your mission. The mods have been improved and many bugs have been fixed, get up-to-date copies from https://github.com/EpochModTeam/DayZ-Epoch
-[INFO] Amphibious pook and cessna (pook_h13_amphib,GNT_C185E,GNT_C185F) confirmed to have FPS issues. Using them is not recommended. #1612 @bleeding- @Markokil321
-[INFO] Auto login does not force a player who aborted from the game, back to the lobby, to login
-[INFO] Server owners and players should use the stable branch of ArmA 2 OA
-[INFO] Models/textures by Paul Tomany. @Sequisha.
-[INFO] Special thanks to http://verthosting.com for hosting our development server.

Documents/1.0.6 Variable Name Changes.txt

@@ -1,12 +1,14 @@
 1.0.5.1 --> 1.0.6 Variable Name Changes:
 
 - Duplicate functions have been renamed:
+	- dayz_gui --> sched_gui
 	- dayz_HungerThirst --> dayz_NutritionSystem
 	- dayz_objectUID3 --> dayz_objectUID2
 	- DZE_getModelName --> fn_getModelName
 	- fnc_usec_playerBleed --> fnc_usec_playerHandleBlood
 	- object_handleServerKilled --> vehicle_handleServerKilled
-	- object_setFixServer --> fnc_veh_setFixServer 
+	- object_setFixServer --> fnc_veh_setFixServer
+	- server_timeSync --> sched_sync (moved to scheduler)
 	- vehicle_handleDamage --> fnc_veh_handleDam
 	- vehicle_handleKilled -->  fnc_veh_handleKilled
 	
@@ -14,13 +16,20 @@
 	- dayz_allowedObjects --> DayZ_SafeObjects
 	- dayz_CLBase --> dz_loot_groups (similar not identical)
 	- dayz_CLChances --> dz_loot_weighted (similar not identical)
-	- dayz_combat --> no longer exists use (player getVariable["combattimeout",0] >= diag_tickTime)
+	- dayz_combat --> no longer exists use (player getVariable["inCombat",false])
 	- dayz_fullMoonNights --> dayz_ForcefullmoonNights
+	- dayz_MapArea --> no longer exists (was only used for DynamicVehicleArea and HeliCrashArea)
+	- dayz_sellDistance_vehicle, dayz_sellDistance_boat, dayz_sellDistance_air --> Z_VehicleDistance
 	- dayz_updateObjects --> DayZ_GearedObjects
+	- DynamicVehicleArea --> (getMarkerSize "center") select 1
+	- DZE_ActionInProgress --> dayz_actionInProgress
 	- DZE_CanPickup --> canPickup
 	- DZE_trees --> dayz_trees
 	- freeTarget --> OpenTarget
+	- HeliCrashArea --> (getMarkerSize "crashsites") select 1
 	- PVDZE_serverObjectMonitor --> dayz_serverObjectMonitor
+	- r_action_count --> dayz_actionInProgress (now true/false instead of 1/0)
+	- selfTransfusionTime --> player getVariable ["LastTransfusion",-(DZE_selfTransfuse_Values select 2)]
 	
 - Duplicate public variables have been renamed:
 	- dayzPlayerLogin --> PVCDZ_plr_Login

Documents/CHANGE LOG 1.0.6.txt

@@ -0,0 +1,142 @@
+[NEW] Fully updated to DayZ 1.8.8 base @icomrade @ebayShopper
+[NEW] 1.8.8 attachments, blood trails, community weapons, traps and tripwires
+[NEW] 1.8.8 journal and crafting menu are now functional (default 'J' key)
+[NEW] 1.8.8 spawn selection, set dayz_spawnselection = 1; in init.sqf to enable (Chernarus only)
+[NEW] 1.8.8 infected camps, points of interest and infectious waterholes map additions (Chernarus only)
+[NEW] 1.8.8 weapon switching and hotkeys (1 = primary, 2 = pistol, 3 = melee (or rifle onBack if DZE_TwoPrimaries=2;))
+[NEW] Players can carry more than one primary (one hidden on back). See configVariables.sqf for details @icomrade
+[NEW] Many new configuration options are available for admins. See dayz_code\configVariables.sqf and mission\init.sqf for descriptions.
+[NEW] Optional rules feed on player login, set dayz_enableRules in init.sqf
+[NEW] Streamer mode is toggleable by player in game options. Setting enabled hides server water mark and rules feed. @ebayShopper
+[NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebayShopper
+[NEW] Optional dark UI by @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/ code fixes by @SplenectomY @icomrade #1622
+[NEW] If using the vanilla UI you may enable or disable the combat icon with DZE_VanillaUICombatIcon = true/false; @icomrade
+[NEW] Anzio 20mm sniper and RedRyder BB Gun by @arma2WillRobinson
+[NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
+[NEW] Added action to lock and unlock vehicles from inside #1103 @pj999 @ebayShopper
+[NEW] Autorun hotkey ('0' key)
+[NEW] Earplugs hotkey ('F1' key)
+[NEW] Group system ('F5' key) with database save. Settings available in configVariables.sqf. CommandBar and RadioProtocol spam are now disabled via config. @icomrade @ebayShopper
+[NEW] Snap building, use DZE_modularBuild = true; in init.sqf to enable. @raymix
+[NEW] Auto login when a player joins the server, default 10 seconds, requires mission update (disable in description.ext by setting defValueParam1 = 31;) @icomrade
+[NOTE] Auto login does not force a player who aborted from the game, back to the lobby, to login
+[NEW] Blood types system is disabled by default. Set dayz_classicBloodBagSystem = false; in init.sqf to enable.
+[NEW] Dayz_townGenerator = true; in init.sqf enables vanilla map junk instead of Epoch DynamicDebris. Currently only compatible with Chernarus. @ebayShopper
+[NEW] Database backup script. See Server Files\Tools\. @RimBlock
+[NEW] Upgraded (_DZE1,2,3,4) ArmoredSUV and Kamaz classes are now available. #1518 #1538 @McKeighan
+[NEW] Added increased waves during stormy weather #974 @FramedYannick @ebayShopper
+[NEW] Optional variable to prevent stealing from backpacks by non-friendlies at traders. Set DZE_BackpackAntiTheft = true; in init.sqf @ebayShopper
+[NEW] A much improved version of Zupa's Advanced Trading 2.1+ is now the default config trader menu, NOT COMPATIBLE WITH DATABASE TRADERS @icomrade @Windmolders 
+[NEW] With config based traders categories can be reused by setting the duplicate=#; value. # is the category number to copy. @ebayShopper
+[NEW] With config based traders upgraded vehicles can now be sold for the same price as their original. #1745 @oiad
+[NEW] With config based traders the buy or sell price of any item can be set to -1 to forbid the respective trading action. @icomrade
+[NEW] Gems are now treated as variable value currency (Advanced Trading only). Configure gem values using DZE_GemWorthArray =[]; See configVariables.sqf. @icomrade
+[NEW] Gem rarity is now configurable for mining using DZE_GemOccurance =[]; See configVariables.sqf. @icomrade
+[NEW] A Plot For Life v2.5+ by RimBlock is now included and enabled by default, see configVariables.sqf @RimBlock @icomrade
+[NEW] Build Vectors v4+ by Striker is now included, only enabled with Snap building. Note there is no option to turn off Vector Building with Snap Building enabled @strikerforce @icomrade
+[NEW] Door Management v3.0+ by Zupa is now included and enabled by default with variable DZE_doorManagement, see configVariables.sqf @DevZupa @Bruce-LXXVI @ebayShopper 
+[NEW] Plot Management v2.1+ by Zupa is now included and enabled by default with variable DZE_permanentPlot, see configVariables.sqf @DevZupa @Bruce-LXXVI @icomrade
+[NEW] Precise Base Building v1.0.5+ by Mikeeeyy is now included. @Mikeeeyy @icomrade @ebayShopper
+[NEW] You may toggle vehicle destruction effects to prevent damage from vehicle explosions (useful to prevent griefing from ramming) use DZE_NoVehicleExplosions = true; to enable #1198 @icomrade
+[NEW] Temperature factors are now configurable with DZE_TempVars see configVariables.sqf. @icomrade 
+[NEW] Weather effects are now configurable with DZE_WeatherVariables. See DynamicWeatherEffects.sqf for info on these values. @icomrade
+[NEW] Full height cinderblock wall kits are now in game, classname "full_cinder_wall_kit" #1172 @icomrade
+[NEW] You can exclude built items from the god mode base function using DZE_GodModeBaseExclude = []; which is an array of item classnames
+[NEW] Fuel stations now have limited amount of fuel each restart. Configurable with dayz_randomMaxFuelAmount in init.sqf
+[NEW] More possible causes of death added to study body: fell, ran over, shot, melee, zombie @ebayShopper
+[NEW] Player-list no longer shows who's in lobby or ingame.
+[NEW] 35 new male clothing classes added. #1732 #1734 @AirWavesMan
+[NEW] Added new _DZ variants of BRDM2, AN2, HMMWV, Mi17 and Cessna classes with radar disabled. #1746 @AirWavesMan
+[NEW] Added SCAR Mk16 and Mk17 variants, L86 and AA12 to loot tables and traders. #1743 @AirWavesMan
+[NEW] Players can now manually push stuck planes backwards to free them. @ebayShopper
+[NEW] Salvage can now be disabled on locked vehicles via DZE_salvageLocked variable. #1757 @oiad
+[NEW] You may now rearm pooks and other helicopter, vehicle, pilot and driver weapons. @icomrade
+[NEW] Death messages now use a PVEH instead of the unreliable MPHit. Added localization, more causes of death, systemChat and dynamicText killfeed options. @ebayShopper
+[NEW] Parachute can now auto open at a set height during HALO jump. Altitude and speed meter can also be enabled. See configVariables.sqf. @ebayShopper
+[NEW] Added hatch, fold and ramp animation UserActions to ArmoredSUV, AH1Z, MV22 and UH1Y configs. @ebayShopper
+[NEW] VON in side and global is now blocked by default. See configVariables.sqf to change blocked VON channels. @icomrade @ebayShopper
+[NEW] Arma cheat input (LeftShift + NumPad-) is now blocked by default to prevent abuse of FPS cap and EndMission commands for duping. @icomrade
+
+[CHANGED] Combattimeout now uses diag_tickTime instead of time.
+[CHANGED] AmmoBoxSmall_556/762 is replaced with DZ_AmmoBoxUS/RU/EU/CZ and MedBox0 is replaced with DZ_MedBox (new model)
+[CHANGED] UH60Wreck and UH1Wreck are replaced with CrashSite_EU/UN/US/RU (new models)
+[CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade
+[CHANGED] Removed weapons from Traders hands and made them stand with arms by their side. @SilvDev
+[CHANGED] Tweaked fuel capacity variables for vehicles. @RimBlock
+[CHANGED] Tweaked rotate_logs.bat to incorporate the day of the week for better organization @Raziel23x 
+[CHANGED] All instances of sleep were replaced with the more reliable uiSleep where possible. @icomrade
+[CHANGED] Several getPosATL changed to call FNC_GetPos for water compatibility @icomrade
+[CHANGED] Trader city objects are now spawned locally on each machine with simulation disabled for better performance. Admins can still override with custom cities in init.sqf. @ebayShopper
+[CHANGED] With R3Fweight on overburdened players are now forced to move slowly instead of being knocked out. The scream was also removed. #1145 @icomrade @ebayShopper
+[CHANGED] Abort and respawn are now disabled immediately in the pause menu onLoad to compensate for low fps delay. @ebayShopper
+[CHANGED] Player_onPause is now customizable by admins along with the new unscheduled fn_pauseMenuChecks. #1340 @Rimblock @ebayShopper
+[CHANGED] Satchel charges, mines and launcher rounds now take one inventory slot instead of multiple for consistency with all other Epoch items. @ebayShopper
+
+[FIXED] Player zombies are no longer attacked by other zombies. The respawn button is now enabled for them if they wish to suicide. @ebayShopper
+[FIXED] Zombies now target and attack players far more accurately than in 1.0.5.1.
+[FIXED] Server position sync bug after falling unconscious. Fixes AI on server not seeing the player after knock out and position revert after relog. #1522 @ebayShopper
+[FIXED] Keyboard input is now disabled properly while unconscious @skynetdev @ebayShopper #1613
+[FIXED] Character sometimes failing to sync after changing clothes #1545
+[FIXED] Backpack wipes when changing clothes. #1361 @icomrade
+[FIXED] CH53 gear when locked #1364 @icomrade
+[FIXED] Infinite loop when crafting ore into bars #1351 @icomrade
+[FIXED] Only first kill showing on death boards #1362 #1124 @vbawol @icomrade
+[FIXED] Crossbow quivers not working #1355 @icomrade
+[FIXED] Crash_spawner & Supply_drop modules spawning inaccessible loot piles #1408 #1390 @Uro1
+[FIXED] Several script errors in dayz_server #1421 #1425 @ebayShopper
+[FIXED] Corrected ClassName type for CH53_DZE and BAF_Merlin_DZE. @Cinjun
+[FIXED] Dynamic_vehicle spawning non-upgradable classes of hilux1 & datsun1.  @Uro1
+[FIXED] Eating while inside a vehicle did not drop empty can  @deadeye2
+[FIXED] Zombie loot error when using loot tables in mission file  @deadeye2
+[FIXED] Trader menu expected array error #1618-1620 @ebayShopper
+[FIXED] Loading screen issue where you can walk around and see a black screen #1610 @deanreid
+[FIXED] Crafting a sledgehammer with one already in your toolbelt no longer eats your parts. #1567 #1667 @Namindu
+[FIXED] Copy key failing when player doesn't have a backpack @ebayShopper
+[FIXED] Fire barrels not being detected over water @pj999 @icomrade #1559 #1564
+[FIXED] Opening supply crates over water no longer drops the items on the sea floor @pj999 @icomrade #1558
+[FIXED] Plot pole required message not updating to reflect DZE_PlotPole radius @mathewjknott @icomrade #1274
+[FIXED] Slow login timer and incorrect loading screen message when login times out @icomrade
+[FIXED] Combine mags not working for Revolver and M1911 ammo @Terrien @ebayShopper #1313
+[FIXED] M113_DZ,_DZE variants config errors and gunner seat not working @McKeighan @ebayShopper #1514
+[FIXED] Smoke countermeasures are now visible @Markokil321 @icomrade #1440
+[FIXED] Toilet paper dupe exploit when building outhouse @Markokil321 @ebayShopper #1599
+[FIXED] Safes and lockboxes occasionally wiped when opening after restart and locking not being logged to RPT @ebayShopper #1413 #1503
+[FIXED] Greatly optimized safe gear handling. Safe inventories are no longer sent to all machines over the network on server startup and each lock. @ebayShopper
+[FIXED] Common duping methods exploiting safes no longer work with the new safe gear handling code. #1341 @RimBlock @ebayShopper
+[FIXED] Duplicate objectUIDs occasionally causing vehicles to swap classes or be deleted across restarts. @icomrade #1504
+[FIXED] DZE_BuildingLimit now counts buildables only instead of all object types. Thanks jOoPs @ebayShopper
+[FIXED] Player no longer hears radiation sound when changing clothes. @ebayShopper
+[FIXED] Ponds and lakes are now detected correctly in player_goFishing and player_drinkWater. #1678 @ebayShopper
+[FIXED] Players are now ejected and force killed when their vehicle is destroyed. This applies to all vehicles except cars. Cars eject, but do not force kill. @icomrade
+[NOTE]	Servers that use safezones must configure DZE_SafeZonePosArray, otherwise passengers of vehicles in safezones will be killed on destruction of their vehicle. See configVariables.sqf.
+[FIXED] Players are no longer able to brute force doors or safes by the method described in #1187 @icomrade
+[FIXED] Some buildables not displaying removal option #1135 @icomrade
+[FIXED] Study body message saying his/he on female players. @ebayShopper
+[FIXED] Destroyed ore veins and ammo crates are now deleted globally after being removed. #1730 @icomrade
+[FIXED] UH1Y and AH6X unknown animation source RPT errors. Added back observer seats to AH6X and UH1Y without thermal imaging. @icomrade
+[FIXED] Players can no longer relog over bases in a helicopter, parachute or plane to get inside. @ebayShopper
+[FIXED] Mozzie helicopter noises, and crashed mozzies bouncing into orbit. @icomrade
+[FIXED] Firing from vehicles puts you in combat now. @icomrade
+[FIXED] Players will no longer end up swimming in the ground after spawn, relog or clothes change on maps with respawn_west in the water. @ebayShopper
+[FIXED] It is no longer possible to drag players through base walls when they are unconscious. @icomrade
+[FIXED] Purchased vehicles should no longer spawn inside each other on trader helipads. @icomrade
+[FIXED] Humanity hit is now applied correctly to players shooting from vehicles. @ebayShopper
+[FIXED] Chopped down trees are now synced for JIP players, so they no longer respawn on relog. @ebayShopper
+[FIXED] Several errors with loading and unloading unconscious players from vehicles. @oiad @ebayShopper
+[FIXED] Occasional glitch death when opening parachute during HALO jump. @ebayShopper
+
+[UPDATED] .hpp files updated in dayz_code\Configs\CfgLoot\CfgBuildingPos. @Uro1
+[UPDATED] .bat files updated in Config-Examples @Raziel23x
+[UPDATED] Updated all config.cfg in Config-Examples, Added Default Steam Ports and Updated Layout. @Namindu
+[UPDATED] Epoch.sql, 1.0.6_Updates.sql & CfgServerTraders with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
+
+[INFO] Server owners must update to the new Hive DLL included in the 1.0.6 release, changes in the source code can be found here: https://github.com/vbawol/DayZhiveEpoch/pull/13
+[INFO] Many weapon and item classnames changed. Admins must update their traders. See SQL\1.0.6_Updates and dayz_code\Configs\CfgServerTrader
+[INFO] Many duplicate functions and variables were renamed. See Documents\1.0.6 Variable Name Changes.txt
+[INFO] New loot table format is incompatible with old loot tables. Admins see CfgLoot\README.txt
+[INFO] If you use any community mods included in this release (AdvancedTrading, BuildVectors, Door/PlotManagement, SnapBuild, PlotForLife, PreciseBuilding, DZGM, etc.) you MUST uninstall them from your mission. They have been improved and many bugs have been fixed. Get updated copies from https://github.com/EpochModTeam/DayZ-Epoch
+[INFO] Amphibious pook and cessna (pook_h13_amphib,GNT_C185E,GNT_C185F) are confirmed to have FPS issues. Using them is not recommended. #1612 @bleeding- @Markokil321
+[INFO] Server owners and players should use the stable branch of ArmA 2 OA
+[INFO] The A2OA Linux server version is 1.63.130836 at the time of release. Until it is updated with the core patch fixes Linux server admins will need to patch their mission:  https://github.com/DayZMod/DayZ/issues/732
+[INFO] Models/textures by Paul Tomany. @Sequisha.
+[INFO] Special thanks to http://verthosting.com for hosting our development server.

README.md

@@ -7,7 +7,7 @@ http://dayzepoch.com
 
 Based on DayZ Mod Community edition
 
-https://github.com/DayZMod/DayZ/blob/Release_1.8/Documentation/Credits.md
+https://github.com/DayZMod/DayZ/blob/1.8.8/Documentation/Credits.md
 http://dayzmod.com 
 
 
@@ -61,7 +61,7 @@ GitHub Collaborators (In order of most commits)
 * dayz10k - https://github.com/dayz10k
 * Skaronator - https://github.com/Skaronator
 * icomrade - https://github.com/icomrade
-* ebaydayz - https://github.com/ebaydayz
+* ebayShopper - https://github.com/ebayShopper
 * Axles - https://github.com/Axles
 * Armifer - https://github.com/Armifer
 * Zupa - https://github.com/Windmolders
@@ -78,7 +78,7 @@ GitHub Contributors (In order of most commits)
 * zabn - https://github.com/zabn
 * eltexonline - https://github.com/eltexonline
 * icomrade - https://github.com/icomrade
-* ebaydayz - https://github.com/ebaydayz
+* ebayShopper - https://github.com/ebayShopper
 * Namindu - https://github.com/Namindu
 * raginruffalo - https://github.com/raginruffalo
 * Markokil321 - https://github.com/Markokil321
@@ -112,6 +112,8 @@ GitHub Contributors (In order of most commits)
 * AirwavesMan - https://github.com/AirwavesMan
 * Raziel23x - https://github.com/Raziel23x
 * strikerforce - https://github.com/strikerforce
+* ndavalos - https://github.com/ndavalos
+* SmokeyBR - https://github.com/SmokeyBR
 
 --------------------------
 Special thanks

SQF/dayz_code/Configs/CfgArma.hpp

@@ -26,6 +26,7 @@ class CfgActions {
 	class DropMagazine : None { show = 0; };
 	class PutMagazine : None { show = 0; };
 	class DeactivateMine : None { show = 0; };
+	class RepairVehicle: None { show = 0; };
 /*
 "None"
 "GetInCommander"
@@ -265,6 +266,171 @@ class CfgInGameUI
 			};
 		};
 	};
+	// Hide group hotbar
+	class CommandBar {
+		left = "-0.032 + SafeZoneX";
+		top = "(SafeZoneH + SafeZoneY) - (1 - 0.851)";
+		width = 0;
+		height = 0;
+		imageDefaultWeapons = "ca\ui\data\clear_empty.paa";
+		imageNoWeapons = "ca\ui\data\clear_empty.paa";
+		imageCommander = "ca\ui\data\clear_empty.paa";
+		imageDriver = "ca\ui\data\clear_empty.paa";
+		imageGunner = "ca\ui\data\clear_empty.paa";
+		imageCargo = "ca\ui\data\clear_empty.paa";
+		dimm = 0.3;
+		colorRedTeam[] = {0,0,0,0};
+		colorBlueTeam[] = {0,0,0,0};
+		colorGreenTeam[] = {0,0,0,0};
+		colorYellowTeam[] = {0,0,0,0};
+		colorWhiteTeam[] = {0,0,0,0};	
+		class prevPage {
+			x = 0;
+			y = 0;
+			w = 0;
+			h = 0;
+			color[] = {0,0,0,0};
+			texture = "ca\ui\data\clear_empty.paa";
+		};	
+		class nextPage {
+			x = 0;
+			y = 0;
+			w = 0;
+			h = 0;
+			color[] = {0,0,0,0};
+			texture = "ca\ui\data\clear_empty.paa";
+		};
+		class UnitInfo {
+			class GroupIcon {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+			};
+			class HcGroupText {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				font = "Zeppelin32";
+				SizeEx = 0;
+			};
+			class UnitBackground {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				textureNormal = "ca\ui\data\clear_empty.paa";
+				textureSelected = "ca\ui\data\clear_empty.paa";
+				texturePlayer = "ca\ui\data\clear_empty.paa";
+				textureFocus = "ca\ui\data\clear_empty.paa";
+			};
+			class UnitFocus {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				texture = "ca\ui\data\clear_empty.paa";
+			};
+			class UnitIcon {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				colorPlayer[] = {0,0,0,0};
+				colorNoAmmo[] = {0,0,0,0};
+				colorWounded[] = {0,0,0,0};
+				colorWoundedFade[] = {0,0,0,0};
+				colorNoFuel[] = {0,0,0,0};
+			};
+			class Semaphore {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				texture = "ca\ui\data\clear_empty.paa";
+			};
+			class CommandBackground {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				texture = "ca\ui\data\clear_empty.paa";
+			};
+			class CommandText {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				font = "Zeppelin32";
+				SizeEx = 0;
+			};
+			class UnitSpecialRole {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+			};
+			class VehicleNumberBackground {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				texture = "ca\ui\data\clear_empty.paa";
+			};
+			class VehicleNumberText {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				colorText[] = {0,0,0,0};
+				font = "Zeppelin32";
+				SizeEx = 0;
+			};
+			class UnitRole {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+			};
+			class UnitNumberBackground {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				color[] = {0,0,0,0};
+				texture = "ca\ui\data\clear_empty.paa";
+			};
+			class UnitNumberText {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				colorText[] = {0,0,0,0};
+				font = "Zeppelin32";
+				SizeEx = 0;
+			};
+			class CombatMode {
+				x = 0;
+				y = 0;
+				w = 0;
+				h = 0;
+				textureMCareless = "ca\ui\data\clear_empty.paa";
+				textureMSafe = "ca\ui\data\clear_empty.paa";
+				textureMAware = "ca\ui\data\clear_empty.paa";
+				textureMCombat = "ca\ui\data\clear_empty.paa";
+				textureMStealth = "ca\ui\data\clear_empty.paa";
+			};
+		};
+	};
 };
 
 class CfgVoice {
@@ -280,15 +446,7 @@ class CfgIdentities {
 	class PZombie1
 	{
 		name = "PZombie";
-		face = "PZombie1";
+		face = "PZombieFace1";
-		glasses = "None";
-		speaker = "NoVoice";
-		pitch = 1;
-	};
-	class PZombie2
-	{
-		name = "PZombie";
-		face = "PZombie2";
 		glasses = "None";
 		speaker = "NoVoice";
 		pitch = 1;
@@ -376,11 +534,10 @@ class CfgSurvival {
 			rawfoodtype = "FoodchickenRaw";
 		};
 		class Cock: Hen {};
-		class DZ_Fin: Default {
+		class Fin: Default {
-			yield = 0;
 			rawfoodtype = "FoodDogRaw";
 		};
-		class DZ_Pastor: DZ_Fin {};
+		class Pastor: Fin {};
 		class Rabbit: Default {
 			yield = 2;
 			rawfoodtype = "FoodrabbitRaw";
@@ -613,5 +770,146 @@ class CfgSurvival {
 			sex = "male";
 			playerModel = "INS_Worker2_DZ";
 		};
+		//new Epoch 1.06
+		class Skin_USMC_Soldier_Officer_DZ: Default {
+			sex = "male";
+			playerModel = "USMC_Soldier_Officer_DZ";
+		};
+		class Skin_USMC_Soldier_MG_DZ: Default {
+			sex = "male";
+			playerModel = "USMC_Soldier_MG_DZ";
+		};
+		class Skin_USMC_Soldier_Pilot_DZ: Default {
+			sex = "male";
+			playerModel = "USMC_Soldier_Pilot_DZ";
+		};
+		class Skin_FR_TL_DZ: Default {
+			sex = "male";
+			playerModel = "FR_TL_DZ";
+		};
+		class Skin_FR_R_DZ: Default {
+			sex = "male";
+			playerModel = "FR_R_DZ";
+		};
+		class Skin_FR_Marksman_DZ: Default {
+			sex = "male";
+			playerModel = "FR_Marksman_DZ";
+		};
+		class Skin_FR_Assault_R_DZ: Default {
+			sex = "male";
+			playerModel = "FR_Assault_R_DZ";
+		};
+		class Skin_RU_Soldier_DZ: Default {
+			sex = "male";
+			playerModel = "RU_Soldier_DZ";
+		};
+		class Skin_RU_Soldier_Officer_DZ: Default {
+			sex = "male";
+			playerModel = "RU_Soldier_Officer_DZ";
+		};
+		class Skin_RUS_Soldier1_DZ: Default {
+			sex = "male";
+			playerModel = "RUS_Soldier1_DZ";
+		};
+		class Skin_RUS_Commander_DZ: Default {
+			sex = "male";
+			playerModel = "RUS_Commander_DZ";
+		};
+		class Skin_MVD_Soldier_DZ: Default {
+			sex = "male";
+			playerModel = "MVD_Soldier_DZ";
+		};
+		class Skin_Ins_Soldier_2_DZ: Default {
+			sex = "male";
+			playerModel = "Ins_Soldier_2_DZ";
+		};
+		class Skin_Ins_Commander_DZ: Default {
+			sex = "male";
+			playerModel = "Ins_Commander_DZ";
+		};
+		class Skin_Ins_Soldier_Crew_DZ: Default {
+			sex = "male";
+			playerModel = "Ins_Soldier_Crew_DZ";
+		};
+		class Skin_CDF_Soldier_DZ: Default {
+			sex = "male";
+			playerModel = "CDF_Soldier_DZ";
+		};
+		class Skin_Doctor_DZ: Default {
+			sex = "male";
+			playerModel = "Doctor_DZ";
+		};
+		class Skin_Assistant_DZ: Default {
+			sex = "male";
+			playerModel = "Assistant_DZ";
+		};
+		class Skin_Worker1_DZ: Default {
+			sex = "male";
+			playerModel = "Worker1_DZ";
+		};
+		class Skin_Worker3_DZ: Default {
+			sex = "male";
+			playerModel = "Worker3_DZ";
+		};
+		class Skin_Worker4_DZ: Default {
+			sex = "male";
+			playerModel = "Worker4_DZ";
+		};
+		class Skin_TK_CIV_Takistani01_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_CIV_Takistani01_EP1_DZ";
+		};
+		class Skin_TK_CIV_Takistani03_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_CIV_Takistani03_EP1_DZ";
+		};
+		class Skin_TK_CIV_Takistani04_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_CIV_Takistani04_EP1_DZ";
+		};
+		class Skin_TK_CIV_Takistani06_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_CIV_Takistani06_EP1_DZ";
+		};
+		class Skin_TK_INS_Soldier_AR_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_INS_Soldier_AR_EP1_DZ";
+		};
+		class Skin_TK_GUE_Soldier_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "TK_GUE_Soldier_EP1_DZ";
+		};
+		class Skin_CZ_Soldier_SL_DES_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "CZ_Soldier_SL_DES_EP1_DZ";
+		};
+		class Skin_US_Soldier_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "US_Soldier_EP1_DZ";
+		};
+		class Skin_UN_CDF_Soldier_Guard_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "UN_CDF_Soldier_Guard_EP1_DZ";
+		};
+		class Skin_UN_CDF_Soldier_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "UN_CDF_Soldier_EP1_DZ";
+		};
+		class Skin_GER_Soldier_TL_EP1_DZ: Default {
+			sex = "male";
+			playerModel = "GER_Soldier_TL_EP1_DZ";
+		};
+		class Skin_BAF_Soldier_Officer_MTP_DZ: Default {
+			sex = "male";
+			playerModel = "BAF_Soldier_Officer_MTP_DZ";
+		};
+		class Skin_BAF_Soldier_N_MTP_DZ: Default {
+			sex = "male";
+			playerModel = "BAF_Soldier_N_MTP_DZ";
+		};
+		class Skin_FR_Sapper_DZ: Default {
+			sex = "male";
+			playerModel = "FR_Sapper_DZ";
+		};
 	};
 };

SQF/dayz_code/Configs/CfgCrafting/Recipes/Ammo/WoodenArrow.hpp

@@ -7,7 +7,7 @@ class Wooden_Arrow : Recipe {
 	};
 	output[] = 
 	{
-		{"WoodenArrow","CfgMagazines",4}
+		{"1Rnd_Arrow_Wood","CfgMagazines",4}
 	};
 	required[] = 
 	{

SQF/dayz_code/Configs/CfgCrafting/Recipes/Other/nails.hpp

@@ -6,7 +6,7 @@ class Blueprint_nails : Recipe {
 	};
 	output[] = 
 	{
-		{"equip_nails","CfgMagazines",10}
+		{"equip_nails","CfgMagazines",4}
 	};
 	required[] = 
 	{

SQF/dayz_code/Configs/CfgExtra/snappoints.hpp

@@ -2,7 +2,6 @@
 Created by Raymix
 */
 
-
 class SnapBuilding {
 	//Barriers whitelist
 	class Barrier {
@@ -12,11 +11,14 @@ class SnapBuilding {
 			"Land_HBarrier1_DZ",
 			"Sandbag1_DZ",
 			"BagFenceRound_DZ",
-			"Fort_RazorWire"
+			"Fort_RazorWire",
+			"WoodFloorQuarter_DZ",
+			"WoodFloorHalf_DZ",
+			"WoodFloor_DZ",	
+			"MetalFloor_DZ"
 		};
 		radius = 5;
 	};
-	//snap points
 	class Land_HBarrier5Preview: Barrier{ //fix for broken offsets in ghost
 		points[] = {
 		{0,0,0,"Pivot"},
@@ -251,8 +253,8 @@ class SnapBuilding {
 	class CinderWall_Preview_DZ: Cinder_DZE {
 		points[] = {
 		{0,0,0,"Pivot"},
-		{-2.64, 0, 0,"Left"},
+		{-2.64, 0, -0.009,"Left"},
-		{2.64, 0, 0,"Right"},
+		{2.64, 0, -0.009,"Right"},
 		{0, 0, 1.685,"Top"},
 		{0,0,-1.685,"Bottom"}
 		};

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

@@ -39,16 +39,12 @@ class Land_stodola_open: Farm {
 class Land_Barn_W_01: Farm {
 	zedPos[] = {{5.78711,18.9463,-2.62683},{-4.4646,16.665,-2.61633},{4.93188,-17.0469,-2.59064},{-3.82788,-18.6699,-2.59021},{-2.99072,-4.16992,-2.58276},{3.95435,4.88379,-2.57434}};
 	lootPos[] = {
-		//{7.23,5.37,-5.57},{8.55,0.75,-5.57},{5.2,-1.54,-5.57},{3.35,1.97,-5.57},{-3.63,3.05,-5.58},{-7.58,-1.02,-5.57},{-6.52,2.35,-5.56},{-7.21,5.55,-5.57},{6.53,1.49,-4.64},{0.05,1.32,-5.53},
+		//{4.93188,-17.0469,-2.59064},{-3.82788,-18.6699,-2.59021},{-4.4646,16.665,-2.61633},{5.78711,18.9463,-2.62683},{3.95435,4.88379,-2.57434},{-2.99072,-4.16992,-2.58276},
 		{-4.45776,14.2153,-2.71607},{4.34277,-6.15088,-2.57279}
 	};
 	lootPosSmall[] = {{4.09351,10.3872,-2.69559},{0.10791,3.48096,-2.64446},{-4.51636,-12.2603,-2.67148},{3.54419,-15.8311,-2.63077}};
 };
 
-class land_shed_m01: Farm { //DZE ADDED
-	zedPos[] = {{0.218262,-1.78369,-0.347349}};
-};
-
 class Land_Barn_W_02: Farm {
 	zedPos[] = {{3.35938,-0.151367,-2.31305},{-2.84351,0.213867,-2.31177},{-2.94604,-5.01465,-2.28998},{2.53711,-5.89258,-2.28949},{3.16479,5.56543,-2.28406},{-5.63306,4.83105,-2.26355}};
 	//lootPos[] = {{3.17,5.57,-2.28},{2.54,-5.89,-2.29},{-2.84,0.21,-2.31},{-5.63,4.83,-2.26},{-0.21,3.44,-2.31},{-0.74,-5.93,-2.31}};
@@ -78,20 +74,52 @@ class Land_Shed_W02: Farm {
 	zedPos[] = {{0.688232,1.88281,-0.00292969}};
 	lootPos[] = {{0.688232,1.88281,-0.00292969}};
 };
-
+// ALT-MAP Support 
-//DZE ADDED BELOW
+class Land_sara_stodola: Farm { // brown wooden barn one story
-class land_jzd_kr2: Farm {
+	zedPos[] = {{-0.637695,2.9707,-2.19523},{0.459961,0.398438,-2.19523}};
-	lootPos[] = {{1.92139,-4.90527,-6.17321},{0.709961,5.00488,-6.17321},{1.8623,7.37109,1.40623},{3.00684,-3.30566,1.41873},{-3.0625,-3.38477,-2.05339},{-2.62646,10.8418,-2.05339}};
+	lootPos[] = {{5.01367,3.33118,-2.19523},{2.51758,1.05737,-2.19523},{-1.30957,-1.02954,-2.19523},{-4.24414,4.0238,-2.19523},{5.16211,-0.661621,-2.19523}};
 };
-class land_jzd_kr1: Farm {
+//land_domek_podhradi_1 in Residential.hpp
-	lootPos[] = {{-1.04834,-3.67578,-6.27279},{1.63818,0.775391,-6.27279},{-1.41992,5.10449,-6.27279},{-0.993164,2.94629,-2.15298},{0.717285,-3.79688,-2.15298}};
+class land_jzd_stodola2: Farm { // one story cement, sliding wooe doors, hay bales inside
-};
+	zedPos[] = {{5.2832,-11.1592,-2.0262},{-2.20215,-0.935547,-2.0262}};
-class land_jzd_stodola2: Farm {
 	lootPos[] = {{8.15527,11.8477,-2.0262},{5.5127,5.6377,-2.0262},{-4.16113,3.67383,-2.0262},{7.53223,-14.4741,-2.0262},{1.16992,0.390625,1.31123}};
 };
+class land_jzd_kr2: Farm { // one story cement barn
+	zedPos[] = {{2.12061,-22.3691,-6.30976},{2.86523,-3.03125,-6.17321},{0.813965,4.67188,-6.17321}};
+	lootPos[] = {{1.92139,-4.90527,-6.17321},{0.709961,5.00488,-6.17321},{1.8623,7.37109,1.40623},{3.00684,-3.30566,1.41873},{-3.0625,-3.38477,-2.05339},{-2.62646,10.8418,-2.05339}};
+};
+class land_jzd_kr1: Farm { // one story cement barn
+	zedPos[] = {{0.0078125,-1.14941,-2.14676},{-4.2085,-12.3887,-2.14676},{0.878906,-9.51953,-6.26657}};
+	lootPos[] = {{-1.04834,-3.67578,-6.27279},{1.63818,0.775391,-6.27279},{-1.41992,5.10449,-6.27279},{-0.993164,2.94629,-2.15298},{0.717285,-3.79688,-2.15298}};
+};
+//land_hut02 in Residential.hpp
+//land_hut01 in Residential.hpp
+//land_hut04 in Residential.hpp
+//Land_House_L_8_EP1 in Residential.hpp
+//Land_House_L_3_EP1 in Residential.hpp
+//Land_House_L_4_EP1 in Residential.hpp
+//Land_House_L_6_EP1 in Residential.hpp
+class land_smd_hut02: Farm { // grass hut
+	lootPos[] = {{0.338867,0.525391,-0.445763}};
+};
+class land_smd_hut01: Farm { // grass hut
+	zedPos[] = {{1.9834,-3.39844,-0.44834}};
+	lootPos[] = {{0.223633,-0.512695,-0.44834},{3.22607,1.40723,-0.44834}};
+};
+class land_smd_hut04: Farm { // grass hut
+	lootPos[] = {{0.250977,1.02734,-0.437198}};
+};
+//Land_bouda2_vnitrek in Residential.hpp
+class Land_smd_sara_stodola2: Farm { // brown open barn
+	zedPos[] = {{1.01563,-0.325195,-2.16877}};
+	lootPos[] = {{4.57617,0.255859,-2.16877},{-4.61133,-1.60156,-2.16877},{-5.38281,2.94336,-2.16877}};
+};
+// ALT-MAP Support
+
+//DZE ADDED BELOW
 class land_jzd_stodola1: Farm {
 	lootPos[] = {{-3.81592,-11.418,-2.0262},{1.73877,-6.20605,-2.0262},{-4.13477,-0.265625,-2.0262},{-1.04883,0.180664,-2.0262}};
 };
-class Land_sara_stodola: Farm {
+class land_shed_m01: Farm {
-	lootPos[] = {{5.01367,3.33118,-2.19523},{2.51758,1.05737,-2.19523},{-1.30957,-1.02954,-2.19523},{-4.24414,4.0238,-2.19523},{5.16211,-0.661621,-2.19523}};
+	zedPos[] = {{0.218262,-1.78369,-0.347349}};
-};
+};

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

@@ -1043,11 +1043,142 @@ class Land_Ind_Quarry : Industrial
 	};
 	lootPos[] = {{-4.53,-6.8,5.25},{-4.36,16.23,5.26},{0.74,-10.68,-7.48},{-2.97,-15.79,-7.48},{-7.11,3.25,-7.48},{6.12,6.62,-7.48},{6.38,9.22,-7.48},{-7.12,13.38,-7.48},{-4.55,6.12,5.29}};
 };
+// ALT-MAP Support
+class Land_MBG_Warehouse : Industrial // cement garage with roll up doors
+{
+	zombieChance =1;
+	zedPos[] = { {18.6279,-11.8701,-6.14345},{18.7441,-3.52979,-6.14345},{19.6816,10.3794,-6.14345} };
+	lootPos[] = { 
+		{18.6279,-11.8701,-6.14345},
+		{18.7441,-3.52979,-6.14345},
+		{19.6816,10.3794,-6.14345}, 	
+		{19.3037,-4.68115,-2.84345},
+		{20.1992,9.28613,-2.84345},
+		{-14.5117,-11.2427,5.15655},
+		{19.957,-11.1582,5.15655},
+		{4.71289,1.58838,5.15655}
+	};
+};
+class Land_aif_tovarna1 : Industrial // concrete, blue sliding doors, generators upstairs
+{
+	zombieChance =1;
+	zedPos[] = { {0.583008,-5.31641,-6.33001},{-9.15723,0.269531,-6.33001} };
+	lootPos[] = { {-10.3301,-8.71875,-0.352261}, {2.54883,3.63672,-0.352261},{-5.18652,-8.57422,2.39782},{2.47559,0.566406,2.39782},{-0.111328,0.832031,5.31266},{-8.40918,-5.96484,5.31261}	};
+};
+class Land_MBG_Radiotelescope : Industrial // radio telescope
+{
+	zedPos[] = { {1.30273,-5.41602,-8.95671},{-5.34375,2.29785,-9.72141},{-0.125,6.33398,-9.952} };
+};
+//Land_House_C_10_EP1 in Residential.hpp
+class land_mbg_garage_single_b: Industrial {
+	lootPos[] = {
+		{2.54492,3.97607,-1.03899},
+		{4.13672,-0.0625,-1.03899}
+	};
+	lootPosSmall[] = {
+		{4.50586,2.56982,-1.03899}
+	};
+	zedPos[] = {{2.96094,6.3374,-0.133815}};
+};
+class Land_seb_bouda_plech : Industrial // shed
+{
+	zedPos[] = {{0.587891,-0.694336,-1.25855},{-1.32471,2.75488,-1.72853}};
+	lootPos[] = {{0.518555,-1.09863,-1.24038},{0.78418,0.317871,-1.30457},{-1.39551,-1.56641,-1.72854},{1.45264,1.75,-1.72855}};
+};
+//Land_hut_old01 in Residential.hpp
+//land_bunka in Office.hpp
+class land_molovabud2 : Industrial // brick and concrete
+{
+	zedPos[] = {{0.902344,2.01514,-1.51244},{-0.229492,2.83521,-1.51244}};
+	lootPos[] = {{-1.29492,4.75195,-2.46292},{2.67529,3.74512,-2.46296},{2.27832,-6.29395,-2.46296},{-1.73779,-6.27246,-2.46292},{0.274902,-5.6543,-2.46294},
+		{-0.87793,4.93457,-2.46293},{-7.5376,4.89258,1.41187}};
+};
+class land_molovabud1: Industrial { // brick and concrete
+	lootPos[] = {{-2.4458,2.20703,1.27995},{-4.68164,1.95508,1.27995},{-7.92822,6.29199,1.27995},{-1.81055,-1.29199,1.56745}};
+};
+class land_seb_rozvodna: Industrial {
+	lootPos[] = {{-1.2168,2.9668,0.583904}};
+};
+class land_provoz2 : Industrial // brick with metal roof
+{
+	zedPos[] = {{-3.44727,-2.83105,-2.30756},{3.27734,1.92676,-2.30756}};
+	lootPos[] = {{3,0.40332,-2.51849},{-4.00488,0.662598,-2.51849},{3.23877,-2.76855,-2.30756},{-3.35352,1.86328,-2.30756}};
+};
+class land_sklad2 : Industrial // brick garage with metal roof
+{
+	zedPos[] = {{2.60986,-1.60938,-2.38225},{3.19336,2.91602,-2.38225},{-2.04541,-0.470703,-2.38225}};
+	lootPos[] = {{2.60986,-1.60938,-2.38225},{3.19336,2.91602,-2.38225},{-2.04541,-0.470703,-2.38225}};
+};
+class land_hala1 : Industrial // brick factory with tanks inside
+{
+	zedPos[] = {{2.23096,-5.30859,-3.98352},{1.9248,-3.57227,4.05042},{3.47656,1.4502,4.04957}};
+	lootPos[] = {{2.23096,-5.30859,-3.98352},{1.9248,-3.57227,4.05042},{3.47656,1.4502,4.04957}};
+};
+class land_seb_main_fac : Industrial // large concrete factory
+{
+	zedPos[] = {{2.23096,-5.30859,-3.98352},{1.9248,-3.57227,4.05042},{3.47656,1.4502,4.04957}};
+	lootPos[] = {{4.19727,-1.7002,-5.81592},{13.6123,-3.59717,-5.75059},{18.8447,-0.019043,-5.83285},{4.12305,15.0049,8.63872},{2.93262,5.25195,8.63872},
+		{19.748,12.3213,8.63872},{20.1475,5.85547,8.63872},{-6.57617,4.96094,4.16873},{-4.16797,9.9248,4.16873}};
+};
+class land_garaze: Industrial {
+	lootPos[] = {{-0.00292969,-7.72925,-2.12658},{3.7334,1.02759,-2.12658},{3.2793,6.28857,-2.12658},{6.72949,7.34131,-2.12658},{1.68848,-3.91479,-2.12658}};
+};
+class Land_vys_budova_p1 : Industrial // one story garage 1 broken wood door
+{
+	zedPos[] = {{5.57129,-4.15234,-2.09256},{4.67871,0.528564,-2.09256},{5.05273,4.5957,-2.09255}};
+	lootPos[] = {{-4.2168,-3.61816,-2.96085},{-4.59521,3.25635,-2.96088},{3.84375,2.55566,-2.96088},{1.14941,8.65527,5.59122},{-5.85205,2.18896,5.59122},
+		{-3.25635,-9.58398,5.59122},{-2.90771,-0.239746,5.59869},{-1.104,-0.294434,2.12335},{-1.09863,0.403809,-0.407806},{4.30469,-1.36182,-2.96088}};
+};
+class Land_Ind_Oil_Tower_EP1: Industrial
+{
+	lootPos[] = {{ 3.55743,-5.92773,-12.9755 },{ 4.63086,1.24902,-12.9932 },{ -0.240356,-1.08252,-12.9875 },{ 6.87689,-6.34961,-8.00889 },{ 2.31177,0.231689,-8.00478 }};
+};
+class Land_tovarna1: Industrial
+{
+	lootPos[] = {{ 2.83887,5.23889,-5.75442 },{ -2.30774,7.31934,-5.75442 },{ -11.0908,5.44897,-5.75442 },{ -11.4746,-1.5791,-5.75442 },{ -5.52405,1.68994,-5.75442 },{ 2.82605,1.4801,-5.75442 },
+		{ 2.44128,-6.50256,-5.75442 },{ -6.68335,-0.453369,2.17997 },{ -3.81812,0.690186,2.17997 },{ 2.78735,1.19409,2.17997 },{ 1.59167,-6.06665,2.17997 },{ -2.4646,-5.63696,2.17997 },{ -5.77393,-7.28271,2.17997 },{ -0.484985,-3.14197,4.82992 }};
+};
+class Land_Fort_Watchtower : Industrial // 
+{
+	zedPos[] = {{0.271973,0.984497,-2.21036}};
+	lootPos[] = {{0.126953,-0.00146484,-2.21036}};
+};
+class Land_ibr_FuelStation_Build: Industrial // gas station
+{
+	lootChance = 0.5;
+	zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"};
+	zedPos[] = {{2.19458,-0.13916,-1.33611}};
+	lootPos[] = {{-1.34521,1.40698,-1.33611},{2.27051,-0.949951,-1.33611},{-2.23193,-1.146,-1.33589},{-0.185059,0.775146,-1.33609}};
+};
+class Land_House_C_12_EP1: Industrial // makeshift repair shop w/car ramps
+{
+	zedPos[] = {{2.11182,-8.16724,1.00763},{1.85498,-3.48828,-2.63601},{-2.74854,0.133301,-2.63601},{2.65674,-5.69165,-2.63601},{-2.60742,-7.35913,1.0174}};
+	lootPos[] = {{-3.27197,-1.5813,-3.50101},{-2.09863,-6.13086,-3.52102},{-2.979,-8.6936,0.141808},{-2.66602,-3.0437,0.139957},{5.91016,-3.59204,0.132626},{2.33154,-1.00244,-3.51937}};
+	lootPosSmall[] = {{-4.03857,-2.06226,-2.43102},{-4.02344,-1.44019,-3.11102},{-3.55371,-0.618164,-3.29102},{7.38184,0.690674,-3.12101},{-2.99268,-6.54883,3.45573},{7.58105,-2.40894,0.112629},{-1.79004,-3.58325,0.128376},{-2.05713,-9.00806,0.150394}};
+};
+class LAND_garaz_bez_tanku: Industrial // barrier garage thing walk up sides
+{
+	lootPos[] = {{-2.98047,0.0463867,3.41651}};
+	lootPosSmall[] = {{-1.36499,-0.579102,3.42651}};
+	zedPos[] = {{-5.14404,-2.02295,-1.71924},{4.92676,-2.67383,-1.71924}};
+};
+class Land_leseni2x: Industrial
+{
+	lootPos[] = {{1.15625,-0.206055,2.55466}};
+};
+class Land_smd_garaz_open: Industrial // garage with 3 green doors
+{
+	lootPos[] = {{-5.10742,-0.351563,-1.22162},{-1.11328,-0.112305,-1.22162},{3.65039,-0.338867,-1.22162}};
+};
+// ALT-MAP Support
+
 //DZE ADDED BELOW
 class land_trubice: Industrial {
 	lootPos[] = {{-2.36719,2.7627,2.59438},{5.82715,3.01563,2.59438},{1.57617,0.709961,2.59438}};
 };
-class land_x_skladiste_low_tex: Industrial {
+class land_x_skladiste_low_tex: Industrial { // concrete, arc roof, broken doors
+	zedPos[] = {{12.5835,2.05273,-2.73836},{-10.9365,2.72217,-2.85032}};
+	//lootPos[] = {{12.5835,2.05273,-2.73836},{-2.45117,8.69385,-1.62253},{-10.9365,2.72217,-2.85032},{-9.50781,-9.54053,-2.85108},{-12.1572,-6.07861,-2.8506}};
 	lootPos[] = {{-8.12354,-0.32373,-2.85032},{-2.31592,-4.27539,-2.5975},{8.15527,-6.89307,-2.5975},{0.398926,4.80029,-2.82628},{-6.0249,-7.64355,-2.85032}};
 };
 class land_b_small1: Industrial {
@@ -1059,9 +1190,6 @@ class land_cast1: Industrial {
 class land_panelova: Industrial {
 	lootPos[] = {{16,-14.6357,-4.04666},{3.79102,1.25659,-4.08966},{-15.4639,-8.38086,-4.08966},{-14.3535,-0.195313,-4.08966},{-1.61719,-12.8313,-4.08966},{15.4287,-4.25635,3.37273},{9.19336,-14.6272,3.37141},{5.80957,9.09253,3.37141},{9.95508,9.7937,3.37141},{-8.11523,-2.98291,3.34401},{-15.2598,-8.56641,3.34401}};
 };
-class land_garaze: Industrial {
-	lootPos[] = {{-0.00292969,-7.72925,-2.12658},{3.7334,1.02759,-2.12658},{3.2793,6.28857,-2.12658},{6.72949,7.34131,-2.12658},{1.68848,-3.91479,-2.12658}};
-};
 class land_seb_bouda3: Industrial {
 	lootPos[] = {{2.63574,-3.0332,-1.72872},{-2.71875,-5.08691,-1.72873},{-3.00293,-1.50781,-1.72877},{-2.91357,3.86328,-1.72876},{3.12891,3.01563,-1.72879}};
 };
@@ -1077,10 +1205,9 @@ class land_seb_mine_main_opt: Industrial {
 class land_seb_mine_near: Industrial {
 	lootPos[] = {{7.87646,-5.52881,-8.8979},{9.02979,-5.5918,-8.8979},{4.37451,-7.10156,-8.8979}};
 };
-class land_molovabud1: Industrial {
+class land_f_b1: Industrial { // one story garage and ramp
-lootPos[] = {{-2.4458,2.20703,1.27995},{-4.68164,1.95508,1.27995},{-7.92822,6.29199,1.27995},{-1.81055,-1.29199,1.56745}};
+	zedPos[] = {{2.6582,-3.80225,-3.08734},{3.87988,2.10889,-3.1054}};
-};
+	//lootPos[] = {{-3.18848,-0.702148,-2.21533},{-2.42188,-4.46582,-2.21533}};
-class land_f_b1: Industrial {
 	lootPos[] = {{-4.45996,-2.84619,-2.21533},{-1.81152,-5.01123,-2.21533},{-5.32227,-5.21875,-2.21533}};
 };
 
@@ -1096,9 +1223,6 @@ class land_seb_vod_vez: Industrial {
 class land_seb_near_fac: Industrial {
 	lootPos[] = {{-10.4116,-18.0859,1.75552}};
 };
-class land_seb_rozvodna: Industrial {
-	lootPos[] = {{-1.2168,2.9668,0.583904}};
-};
 
 class Land_FuelStation_Build_PMC : Industrial //IndustrialFuel
 {
@@ -1106,13 +1230,6 @@ class Land_FuelStation_Build_PMC : Industrial //IndustrialFuel
 		{-1.51141,1.30359,-1.33611},
 		{2.23376,0.0710449,-1.33611}};
 };
-
-class Land_leseni2x: Industrial
-{
-	lootPos[] = {
-		{1.15625,-0.206055,2.55466}};
-};
-
 class land_bouda_garaz: Industrial
 {
 	lootPos[] = {
@@ -1134,35 +1251,6 @@ class land_dum_istan2_02: Industrial
 		{-0.566406,-3.44775,-4.14959},
 		{-2.00146,1.43604,-4.14959}};
 };
-class LAND_garaz_bez_tanku: Industrial
-{
-	lootPos[] = {
-		{-2.98047,0.0463867,3.41651}
-	};
-	lootPosSmall[] = {
-		{-1.36499,-0.579102,3.42651}
-	};
-	zedPos[] = {{-5.14404,-2.02295,-1.71924},{4.92676,-2.67383,-1.71924}};
-};
-
-class Land_tovarna1: Industrial
-{
-	lootPos[] = {
-		{ 2.83887,5.23889,-5.75442 },
-		{ -2.30774,7.31934,-5.75442 },
-		{ -11.0908,5.44897,-5.75442 },
-		{ -11.4746,-1.5791,-5.75442 },
-		{ -5.52405,1.68994,-5.75442 },
-		{ 2.82605,1.4801,-5.75442 },
-		{ 2.44128,-6.50256,-5.75442 },
-		{ -6.68335,-0.453369,2.17997 },
-		{ -3.81812,0.690186,2.17997 },
-		{ 2.78735,1.19409,2.17997 },
-		{ 1.59167,-6.06665,2.17997 },
-		{ -2.4646,-5.63696,2.17997 },
-		{ -5.77393,-7.28271,2.17997 },
-		{ -0.484985,-3.14197,4.82992 }};
-};
 class Land_Ind_Garage01_EP1: Industrial
 {
 	lootPos[] = {
@@ -1177,27 +1265,6 @@ class Land_Ind_Garage01_EP1: Industrial
 	};
 	zedPos[] = {{0.125488,0.557861,-0.357141},{1.11084,-1.33643,-0.36116}};
 };
-
-class land_mbg_garage_single_b: Industrial {
-	lootPos[] = {
-		{2.54492,3.97607,-1.03899},
-		{4.13672,-0.0625,-1.03899}
-	};
-	lootPosSmall[] = {
-		{4.50586,2.56982,-1.03899}
-	};
-	zedPos[] = {{2.96094,6.3374,-0.133815}};
-};
-class Land_House_C_12_EP1: Industrial
-{
-	lootPos[] = {
-		{-3.27197,-1.5813,-3.50101},{-2.09863,-6.13086,-3.52102},{-2.979,-8.6936,0.141808},{-2.66602,-3.0437,0.139957},{5.91016,-3.59204,0.132626},{2.33154,-1.00244,-3.51937}
-	};
-	lootPosSmall[] = {
-		{-4.03857,-2.06226,-2.43102},{-4.02344,-1.44019,-3.11102},{-3.55371,-0.618164,-3.29102},{7.38184,0.690674,-3.12101},{-2.99268,-6.54883,3.45573},{7.58105,-2.40894,0.112629},{-1.79004,-3.58325,0.128376},{-2.05713,-9.00806,0.150394}
-	};
-	zedPos[] = {{2.11182,-8.16724,1.00763},{1.85498,-3.48828,-2.63601},{-2.74854,0.133301,-2.63601},{2.65674,-5.69165,-2.63601},{-2.60742,-7.35913,1.0174}};
-};
 class Land_Ind_Oil_Pump_EP1: Industrial
 {
 	lootPos[] = {
@@ -1246,12 +1313,6 @@ class Land_Ind_FuelStation_Build_EP1: Industrial
 	zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"};
 	lootPos[] = {{-1.34521,1.40698,-1.33611},{2.27051,-0.949951,-1.33611},{-2.23193,-1.146,-1.33589},{-0.185059,0.775146,-1.33609}};
 };
-class Land_ibr_FuelStation_Build: Industrial //IndustrialFuel
-{
-	lootChance = 0.5;
-	zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"};
-	lootPos[] = {{-1.34521,1.40698,-1.33611},{2.27051,-0.949951,-1.33611},{-2.23193,-1.146,-1.33589},{-0.185059,0.775146,-1.33609}};
-};
 class hiluxWreck: Industrial
 {
 	zombieClass[] = {"zZombie_Base","z_hunter"};
@@ -1260,13 +1321,4 @@ class hiluxWreck: Industrial
 	minRoaming = 1;
 	maxRoaming = 2;
 	lootPos[] = {};
-};
+};
-class Land_Ind_Oil_Tower_EP1: Industrial
-{
-	lootPos[] = {
-		{ 3.55743,-5.92773,-12.9755 },
-		{ 4.63086,1.24902,-12.9932 },
-		{ -0.240356,-1.08252,-12.9875 },
-		{ 6.87689,-6.34961,-8.00889 },
-		{ 2.31177,0.231689,-8.00478 }};
-};

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

@@ -29,7 +29,8 @@ class MilitarySpecial : Military
 	lootChance = 0.4;
 	lootGroup = MilitarySpecial;
 };
-class MilitaryIndustrial: Military {
+class MilitaryIndustrial: Military 
+{
 	zombieChance = 0.3;
 	maxRoaming = 6;
 	zombieClass[] = 
@@ -41,19 +42,19 @@ class MilitaryIndustrial: Military {
 		"z_worker2",
 		"z_worker3"
 	};
-	lootChance = 0.4;
+	lootChance = 0.5;
 	lootGroup = MilitaryIndustrial;
 };
 class Land_a_stationhouse : Military
 {
 	zedPos[] = {{-0.892578,-5.7168,-9.47058},{1.5127,1.96484,-9.47058},{18.9063,-4.06738,-9.47058},{-2.69922,-7.57422,-9.46057},{-1.35645,-8.3623,-4.6489},{-3.24219,-6.61914,-4.6489},{-1.70801,-7.85449,-0.0437927},{-3.39453,-7.88281,-0.0437927},{-1.37891,-5.79102,4.41141},{-1.39648,-7.79883,4.41141}};
-	lootChance = 0.3;
+	lootChance = 0.5;
 	lootPos[] = {
 		//{-2.7,-7.57,-9.46},{-0.89,-5.72,-9.47},{-3.24,-6.62,-4.65},{-1.36,-8.36,-4.65},{-1.71,-7.85,-0.04},{-3.39,-7.88,-0.04},{-1.4,-7.8,4.41},{-1.38,-5.79,4.41},{1.51,1.96,-9.47},{18.91,-4.07,-9.47},{-14.4,3.29,-0.51},{1.33,0.89,-0.51},{-2.37,-8.4,8.49},{12.44,2.54,-9.47},{-14.83,-7.58,-0.51},{-1.8,8.87,-0.51},{6.83,0.89,-0.51},{3.65,-6.54,-4.51},{16.29,-6.57,-4.51},{18.39,2.37,-4.51},{9.28,-1.25,-4.51},{-2.08,-4.74,8.49},
 		{15.436,2.85498,-9.47058},{17.9861,-6.52832,-9.47058},{1.22583,2.24463,-9.47058},{-3.9126,-7.29834,-9.47058},{-2.28271,-6.21094,-4.6489},{-1.604,-8.68018,-0.043786},{-1.104,-5.60938,4.41139},{-3.55811,-8.56787,4.41139},{-2.99219,-8.27148,8.49209}
 	};
 	lootPosSmall[] = {
-		{14.6826,3.55029,-8.25058},{9.97266,3.48584,-9.40058},{19.1477,-6.69629,-9.36058},{19.1719,-7.47998,-9.36058},{0.513672,1.19336,-9.39058},{0.51416,3.3418,-8.63058},{0.52124,1.92334,-7.87058},{-1.63623,-8.99756,-9.39058},{-3.5647,-9.01855,-8.63058},{-0.76709,-8.99072,-7.87058},{-2.40137,-9.03027,-8.25058},{-4.50391,-5.27588,-4.6489},{-1.02393,-9.02051,0.0562134},{-0.771484,-8.3335,0.0762138},{-0.7229,-9.03076,1.19621},{-4.40308,-8.7666,4.41139},{-2.27783,-5.35303,4.41139},{-4.4541,-8.81055,8.49209},{9.12549,3.64697,-8.25058}
+		{14.6826,3.55029,-8.25058},{9.97266,3.48584,-9.40058},{18.15,-6.73,-9.36},{18.08,-6.05,-9.44},{-0.52,1,-8.63},{-0.49,2.59,-8.28},{-0.41,1.76,-9.37},{-1.63623,-8.99756,-9.39058},{-3.5647,-9.01855,-8.63058},{-0.76709,-8.99072,-7.87058},{-2.40137,-9.03027,-8.25058},{-4.50391,-5.27588,-4.6489},{-1.02393,-9.02051,0.0562134},{-0.771484,-8.3335,0.0762138},{-0.7229,-9.03076,1.19621},{-4.40308,-8.7666,4.41139},{-2.27783,-5.35303,4.41139},{-4.4541,-8.81055,8.49209},{9.12549,3.64697,-8.25058}
 	};
 };
 
@@ -159,9 +160,11 @@ class Camp: Military {
 	maxRoaming = 1;
 	zedPos[] = {{0.833496,-1.52246,-1.09949},{0.385742,0.963867,-1.08948}};
 	//lootPos[] = {{0.833496,-1.52246,-1.09949},{0.385742,0.963867,-1.08948}};
-	lootPos[] = {{0.833252,-1.52246,-1.15955},{0.38501,0.963867,-1.15955}};
+	lootPos[] = {{0.833252,-1.52246,-1.09949},{0.38501,0.963867,-1.08948}};
 };
 
+class Land_stan: Camp {};
+
 class CampEast: Military {
 	maxRoaming = 1;
 	zedPos[] = {{0.627441,1.83594,-1.31049},{-1.05713,-1.80762,-1.31049}};
@@ -219,43 +222,124 @@ class Land_Mil_Barracks_L: Military {
 	zedPos[] = {{4,-5.22,-2.21},{7.3,-4.04,-2.21},{-0.82,-4.72,-2.2}};
 	lootPos[] = {{-0.82,-4.72,-2.2},{4,-5.22,-2.21},{7.3,-4.04,-2.21}};
 };
-
+// ALT-MAP Support 
-//DZE ADDED BELOW
+class Land_budova4_in: Military // barracks broken blue front door. cannot enter inner rooms
-class land_pozorovatelna: Military {
+{
+	zedPos[] = {{-3.94531,2.27344,-1.88723},{-0.0566406,2.2666,-1.88723},{6.27148,2.5752,-1.88723}};
+	lootPos[] = {{ -6.50415,2.1416,-1.88723 },{ -1.66162,2.10168,-1.88723 },{ 2.94312,2.297,-1.88723 },{ 5.34082,-1.82922,-1.88723 }};
+};
+class Land_kostel_trosky: MilitarySpecial // church ruins
+{
+	zedPos[] = {{-0.388672,10.0176,-5.37072},{-2.97852,-0.816406,-5.55207}};
+	lootPos[] = {{0.386719,13.5918,-5.54349},{3.81055,2.98828,-5.30816}};
+};
+class Land_MBG_Killhouse_3: Military // cement 2 story 
+{
+	zedPos[] = {{-4.10547,-0.466797,0.451439},{-2.06152,3.2168,0.451439},{-10.7031,3.0293,0.451439},{-8.07715,-1.2168,0.451439}};
+	lootPos[] = {{-4.10547,-0.466797,0.451439},{-2.06152,3.2168,0.451439},{-10.7031,3.0293,0.451439},{-8.07715,-1.2168,0.451439}};
+};
+//Land_MBG_Killhouse_4 in Residential.hpp
+class Land_aif_strazni_vez: Military // metal platform-overlook 
+{
+	lootPos[] = {{0.113281,0.859375,1.46157},{-1.24023,1.25195,1.46157}};
+};
+class Land_MBG_Killhouse_2: Military // cement 2 story 
+{
+	zedPos[] = {{-4.58887,-4.49023,-2.79856},{1.78516,1.58887,3.80144}};
+	lootPos[] = {{-4.58887,-4.49023,-2.79856},{6.50488,5.86328,-2.79856},{-6.24365,-4.69336,0.501437},{-4.99805,-4.63281,3.80144},{5.48828,-3.87793,3.80144}};
+};
+//Land_A_Villa_EP1 in Office.hpp
+class Land_budova4_winter: MilitarySpecial { // winter version of military barracks
+	lootPos[] = {{-7.73389,0.300049,-1.09824},{-7.7666,1.97388,-1.09824},{-5.85645,1.92651,-1.09824},{-4.82373,0.194336,-1.09824},{-4.82715,-2.00244,-1.09824},{-8.09766,-2.28149,-1.09824},{-3.06787,2.24805,-1.09824},{-1.65283,-1.91821,-1.09824},{-1.41309,-0.034668,-1.09824},{0.266602,1.76807,-1.09824},{1.28369,0.289307,-1.09824},{1.81982,-2.28687,-1.09824},{4.37549,2.14941,-1.09824},{5.61865,1.71338,-1.09824},{5.06787,-1.74316,-1.09824},{2.54785,2.33716,-1.09824}};
+};
+class land_pozorovatelna: Military { // concrete tower
+	//lootChance = 0.3;
 	lootPos[] = {{-2.36328,-2.79248,-2.49767},{3.11426,-2.92969,-2.49767},{0.740234,2.47852,-2.49767},{-1.67578,-2.50049,7.54509},{-1.23047,1.90283,7.54509},{2.88477,2.08496,7.54509},{2.61426,-2.48096,7.54509},{0.491211,-0.290527,7.54509}};
 };
+class land_hlaska: Military // metal platform
+{
+	lootChance = 0.3;
+	lootPos[] = {{-0.802246,0.614258,3.77092},{0.917969,0.9375,3.77093}};
+};
+class Land_MBG_Killhouse_1: Military // cement block building
+{
+	lootChance = 0.25;
+	lootPos[] = {{-1.98071,5.50488,1.25144},{-2.79443,0.65625,-2.04856},{2.88354,2.7627,-2.04856}};
+};
+class land_army_hut2_int: Military // beige hut on blocks
+{
+	lootPos[] = {{ -0.421387,-0.0517578,-0.948329 },{ 1.80103,0.945313,-0.948329 },{ 2.24585,-2.6875,-0.948329 },{ -1.24561,-1.53955,-0.948329 }};
+};
+class land_army_hut_int: Military // beige hut on blocks
+{
+	lootPos[] = {{ 2.7959,-5.07373,-1.33056 },{ 2.79785,-2.1626,-1.33056 },{ -0.943359,-0.060791,-1.35981 },{ 0.689453,1.87134,-1.36167 }};
+};
+class Land_army_hut3_long_int: Military // beige hut on blocks
+{
+	lootPos[] = {{ -2.88721,-4.36035,-1.23617 },{ 0.753906,-3.90039,-1.23617 },{ -2.53711,-1.95117,-1.23617 },{ -2.27856,-0.211914,-1.23617 },{ -0.0664063,-1.70801,-1.23617 },{ 0.141113,2.31104,-1.23617 }};
+};
+//Land_ibr_terminal in Office.hpp
+class Land_smd_garaz_s_tankem: Military // garage - blockade - ladder
+{
+	zedPos[] = {{5.83203,2.34961,-2.49103}};
+	lootPos[] = {{5.83203,2.34961,-2.49103},{-0.569336,3.00684,3.4697}};
+};
+class land_smd_army_hut2_int: Military { // beige hut on blocks
+	lootPos[] = {{-0.848633,-1.24316,-0.948334},{-1.92383,-0.00390625,-0.948334},{2.7959,-0.0146484,-0.948334}};
+	lootPosSmall[] = {{0.15918,-1.26465,-0.498337},{3.0791,1.96387,-0.948334}};
+	zedPos[] = {{-3.35352,-2.65332,-0.407364},{0.475586,3.37402,-0.350555}};
+};
+class land_smd_army_hut2: Military { // beige hut on blocks
+	lootPos[] = {{0.447266,-4.6543,-1.33328}};
+	lootPosSmall[] = {{-0.257813,-5.02539,-0.623276},{3.02832,-6.1582,-1.33328}};
+	zedPos[] = {{0.552734,6.06836,-0.515976},{-3.86816,-5.6875,-1.13228}};
+};
+class Land_smd_SS_hangar_withdoor: Military
+{
+	maxRoaming = 3;
+	zedPos[] = {{10.957,-16.6943,-5.87254},{-11.3311,-15.499,-5.87254},{-9.27832,2.05566,-5.87254}};
+	lootChance = 0.4;
+	lootPos[] = {{10.957,-16.6943,-5.87254},{-11.3311,-15.499,-5.87254},{-9.27832,2.05566,-5.87254},{-11.0947,21.3438,-5.87254},{10.7002,17.6221,-5.87254},{11.4658,1.51367,-5.87254},{12.9443,-15.6855,-5.87254}};
+	lootGroup = Hangar;
+};
+class Land_smd_budova4_in: MilitarySpecial // barracks blue doors internal rooms
+{
+	zedPos[] = {{5.9375,1.33496,-1.88723}};
+	lootChance = 0.3;
+	lootPos[] = {{5.68359,-1.41211,-1.88723},{-7.21484,2.17285,-1.88723},{-4.04492,2.07227,-1.88723},{-0.4375,1.95898,-1.88723},{3.23633,2.06348,-1.88723},{0.804688,-0.614258,-1.88723},{-1.2793,-1.0791,-1.88723},{-6.87695,-1.35156,-1.88723}};
+};
+class land_smd_army_hut3_long_int: Military { // wide 3 doors bunks
+	lootPos[] = {{0.643555,5.24219,-0.0739136},{-2.78809,3.13672,-1.27391},{-2.80957,5.27441,-0.863907},{-3.13086,-3.3584,-1.27391},{-0.875977,-0.6875,-1.27391}};
+	lootPosSmall[] = {{1.6875,5.27539,-0.863907},{-0.604492,-3.36816,-0.563904},{1.91699,1.27832,-1.27391}};
+	zedPos[] = {{3.37598,0.145508,-0.938461},{-4.52734,0.833984,-1.2229}};
+};
+class land_smd_hlaska: Military { // wide 3 doors bunks
+	lootPos[] = {{-0.724609,0.822266,3.77092}};
+	lootPosSmall[] = {{1.06201,-0.864258,3.77092},{-1.04688,-0.759766,3.77092}};
+	zedPos[] = {{-0.18457,-3.13574,-2.25991}};
+};
+class Land_smd_kostel_trosky: MilitarySpecial // church ruins
+{
+	lootPos[] = {{3.83789,0.8125,-4.81671},{0.206055,12.3555,-5.09952}};
+};
+// ALT-MAP Support 
+
+//DZE ADDED BELOW
 class land_AII_last_floor: MilitarySpecial {
+	zombieClass[] = {"z_soldier","z_soldier","z_policeman"};
+	lootChance = 0.5;
+	maxRoaming = 3;
 	lootPos[] = {{-1.73975,-7.99756,11.6976},{-1.73975,-7.99756,11.6976},{-1.20801,5.45605,4.6129},{-3.82813,2.81494,5.46183}};
 };
 class land_AII_middle_floor: MilitarySpecial {
+	zombieClass[] = {"z_soldier","z_soldier","z_policeman"};
+	lootChance = 0.5;
+	maxRoaming = 3;
 	lootPos[] = {{-7.64941,4.97412,0.510368},{-7.7207,5.10498,0.510216},{-7.27979,-0.931152,0.518509},{8.47461,-2.3252,-4.63377},{9.20508,0.508301,-4.63377},{4.36768,3.7998,-4.63377},{-0.669434,2.74805,-4.63377},{-10.3594,5.03516,-4.63377},{-13.9766,9.10059,-4.63377},{-8.021,1.22314,-4.63377},{6.07227,-2.64551,-4.63377},{-8.75293,8.79297,-2.10379}};
 };
-class Land_budova4_winter: MilitarySpecial {
-	lootPos[] = {{-7.73389,0.300049,-1.09824},{-7.7666,1.97388,-1.09824},{-5.85645,1.92651,-1.09824},{-4.82373,0.194336,-1.09824},{-4.82715,-2.00244,-1.09824},{-8.09766,-2.28149,-1.09824},{-3.06787,2.24805,-1.09824},{-1.65283,-1.91821,-1.09824},{-1.41309,-0.034668,-1.09824},{0.266602,1.76807,-1.09824},{1.28369,0.289307,-1.09824},{1.81982,-2.28687,-1.09824},{4.37549,2.14941,-1.09824},{5.61865,1.71338,-1.09824},{5.06787,-1.74316,-1.09824},{2.54785,2.33716,-1.09824}};
-};
 class land_vstup: Military {
 	lootPos[] = {{-11.51,-2.64844,-1.53312},{-6.24463,-2.85059,-1.53312},{-1.16992,-2.84961,-1.53312},{2.70898,-2.85059,-1.53312}};
 };
-class land_smd_hlaska: Military {
-	lootPos[] = {
-		{-0.724609,0.822266,3.77092}
-	};
-	lootPosSmall[] = {
-		{1.06201,-0.864258,3.77092},
-		{-1.04688,-0.759766,3.77092}
-	};
-	zedPos[] = {{-0.18457,-3.13574,-2.25991}};
-};
-class land_smd_army_hut2: Military {
-	lootPos[] = {
-		{0.447266,-4.6543,-1.33328}
-	};
-	lootPosSmall[] = {
-		{-0.257813,-5.02539,-0.623276},
-		{3.02832,-6.1582,-1.33328}
-	};
-	zedPos[] = {{0.552734,6.06836,-0.515976},{-3.86816,-5.6875,-1.13228}};
-};
 class land_smd_ss_hangard_withdoor: MilitaryIndustrial {
 	lootPos[] = {
 		{0.236328,3.4209,-5.87254},{-14.0732,22.499,-5.87254},{13.1895,22.2031,-5.87254},{-13.8877,-10.5459,-5.87254},{2.10742,-19.8496,-5.87254}
@@ -274,15 +358,6 @@ class land_budova5: Military {
 	};
 	zedPos[] = {{-3.04492,2.0332,-1.40211}};
 };
-class land_smd_army_hut2_int: Military {
-	lootPos[] = {
-		{-0.848633,-1.24316,-0.948334},{-1.92383,-0.00390625,-0.948334},{2.7959,-0.0146484,-0.948334}
-	};
-	lootPosSmall[] = {
-		{0.15918,-1.26465,-0.498337},{3.0791,1.96387,-0.948334}
-	};
-	zedPos[] = {{-3.35352,-2.65332,-0.407364},{0.475586,3.37402,-0.350555}};
-};
 class land_smd_strazni_vez: Military {
 	lootPos[] = {
 		{-1.68066,-1.30273,2.00299}
@@ -293,16 +368,6 @@ class land_smd_strazni_vez: Military {
 	};
 	zedPos[] = {{-1.14844,0.125977,2.28799},{1.04102,2.45898,-1.76974}};
 };
-class land_smd_army_hut3_long_int: Military {
-	lootPos[] = {
-		{0.643555,5.24219,-0.0739136},{-2.78809,3.13672,-1.27391},{-2.80957,5.27441,-0.863907},{-3.13086,-3.3584,-1.27391},{-0.875977,-0.6875,-1.27391}
-	};
-	lootPosSmall[] = {
-		{1.6875,5.27539,-0.863907},{-0.604492,-3.36816,-0.563904},{1.91699,1.27832,-1.27391}
-	};
-	zedPos[] = {{3.37598,0.145508,-0.938461},{-4.52734,0.833984,-1.2229}};
-};
-
 class land_st_vez: MilitarySpecial {
 	lootPos[] = {{-5.56445,4.23975,-3.31476},{-5.05566,-3.17627,-3.31476},{4.12109,3.92822,2.42732},{-1.73389,2.68896,6.40834},{-4.23584,1.29736,6.40834},{-3.80322,-1.09277,6.40834},{0.430664,1.31787,6.40834},{-2.45166,-2.16748,6.40834},{-0.608398,-0.57666,-11.095},{-2.08691,1.10303,-11.0649},{0.259277,-3.89697,-3.31476},{3.9375,3.30957,-8.50825}};
 };
@@ -335,42 +400,6 @@ class land_ind_pec_03a: MilitaryIndustrial
 	};
 	zedPos[] = {{1.979,15.7012,3.48646},{5.93604,16.2686,3.48582},{6.50586,13.8198,-4.22628},{12.314,9.64258,-4.22628},{6.15381,9.78711,-4.22628},{6.34424,-2.52051,-0.953124},{-5.04004,-4.30566,-4.22628},{-5.77588,-21.0293,-4.22628}};
 };
-
-class Land_budova4_in: Military
-{
-	lootPos[] = {
-		{ -6.50415,2.1416,-1.88723 },
-		{ -1.66162,2.10168,-1.88723 },
-		{ 2.94312,2.297,-1.88723 },
-		{ 5.34082,-1.82922,-1.88723 }};
-};
-class land_army_hut_int: Military
-{
-	lootPos[] = {
-		{ 2.7959,-5.07373,-1.33056 },
-		{ 2.79785,-2.1626,-1.33056 },
-		{ -0.943359,-0.060791,-1.35981 },
-		{ 0.689453,1.87134,-1.36167 }};
-};
-class Land_army_hut3_long_int: Military
-{
-	lootPos[] = {
-		{ -2.88721,-4.36035,-1.23617 },
-		{ 0.753906,-3.90039,-1.23617 },
-		{ -2.53711,-1.95117,-1.23617 },
-		{ -2.27856,-0.211914,-1.23617 },
-		{ -0.0664063,-1.70801,-1.23617 },
-		{ 0.141113,2.31104,-1.23617 }};
-};
-class land_army_hut2_int: Military
-{
-	lootPos[] = {
-		{ -0.421387,-0.0517578,-0.948329 },
-		{ 1.80103,0.945313,-0.948329 },
-		{ 2.24585,-2.6875,-0.948329 },
-		{ -1.24561,-1.53955,-0.948329 }};
-};
-
 class Land_Mil_Barracks_EP1: Military
 {
 	lootPos[] = {};
@@ -489,7 +518,7 @@ class HMMWVWreck: Military
 	lootPos[] = {};
 };
 
-class Land_Mil_Guardhouse : Military //MOVED FROM RESIDENTIAL
+class Land_Mil_Guardhouse: Military //MOVED FROM RESIDENTIAL
 {
 	zombieClass[] =
 	{
@@ -497,6 +526,7 @@ class Land_Mil_Guardhouse : Military //MOVED FROM RESIDENTIAL
 		"z_soldier",
 		"z_policeman"
 	};
+	lootChance = 0.5;
 	maxRoaming = 3;
 	zedPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
 	lootPos[] = {

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

@@ -78,6 +78,78 @@ class Land_A_Office02 : Office
 	};
 	zedPos[] = {{4.72266,-5.74219,-8.15109},{0.961426,-5.16992,-8.15076}};
 };
+// ALT-MAP Support 
+class Land_aif_hotel : Office //multi-story hotel with balconies
+{
+	lootPos[] = {{14.0938,-4.38281,6.24485},{4.53711,12.8853,6.24484},{-20.623,-7.3584,2.74056},{-20.9375,-15.0547,-0.759435},{-20.4102,-4.95166,-4.25943},{20.8555,6.60156,-4.25943}};
+};
+class Land_aif_hotel_bio : Office // multi-story hotel with balconies
+{
+	zedPos[] = {{-18.5781,4.20801,-8.5215},{-17.8848,-6.33398,-8.52153}};
+	lootPos[] = {{-17.8848,-6.33398,-8.52153},{16.8477,-12.5811,-8.52153},{17.8984,12.9102,-8.52153},{-1.51172,11.0117,-8.52153},{-23.4453,-5.7998,-0.835522},
+	{-22.4063,-16.8887,3.01448},{-5.8418,5.27832,6.86919},{16.7227,16.8076,6.86919},{18.2676,-14.2627,6.86919},{-16.8984,-16.3701,6.86919}};
+};
+class land_mbg_apartments_big_04: Office { // multi-story cement, 3 non-enterable garages
+	lootPos[] = {
+		{10.1953,-2.47656,-3.19898},{3.14453,-0.197266,-3.19898},{0.949219,5.58789,5.94502},{-0.888672,2.47461,2.69382},{3.99414,-0.273438,2.89702},{10.7344,-0.351563,2.89702},{-10.4961,-5.46484,2.89702},{-3.25391,0.669922,2.89702},{10.6816,-2.26367,-0.15098},{-3.48828,0.31543,-0.15098},{-2.97461,-2.35547,-0.15098}
+	};
+	lootPosSmall[] = {
+		{4.52734,1.46289,-3.19898},{2.90234,5.90918,2.89702},{5.46875,-0.703125,2.89702},{-4.46875,-0.686523,2.89702},{5.17383,-1.80566,-0.15098},{-7.44531,5.68359,-0.15098}
+	};
+	zedPos[] = {{-0.0898438,4.67773,-7.08873},{0.890625,-5.13965,-6.90238}};
+};
+//land_vysoky2 in Residential.hpp
+//land_dlouhy1 in Residential.hpp
+class Land_ibrPanelak: Land_Panelak{};
+class Land_ibrPanelak2: Land_Panelak2{};
+class LAND_konecna : Office
+{
+	lootPos[] = {{14.8423,-0.987793,-1.59364},
+		{16.873,-2.86865,-1.59364},
+		{13.3672,-9.11377,-1.59364},
+		{5.09497,-9.98682,-1.59364},
+		{-24.8281,-1.17871,-1.59364},
+		{-14.0747,-7.3042,-1.59364},
+		{-19.0789,0.98291,-1.59364},
+		{4.67944,0.805176,-1.59364},
+		{-11.4639,-10.1475,-1.59364}};
+};
+// ALT-MAP Tavi
+// ALT-MAP SAHRANI
+class Land_smd_dum_olez_istan1_open2 : Office // same as Land_Panelak2
+{
+	zedPos[] = {{-3.77344,1.99414,-1.84398},{1.31641,-2.06934,-1.84399}};
+	lootPos[] = {{-5.99023,-5.60449,-1.84398},{6.73145,1.43555,-1.84399},{4.90332,-3.25098,1.37497},{-1.73145,-3.67773,1.37497},{-7.09375,-3.92773,1.37497}};
+};
+class Land_smd_hotel_riviera2 : Office // 2 story motel blue tiles
+{
+	zedPos[] = {{-9.32324,-7.52173,-0.321464},{2.03027,-6.70923,-0.321464}};
+	lootPos[] = {{-9.32324,-7.52173,-0.321464},{2.03027,-6.70923,-0.321464}};
+};
+class Land_smd_hotel_riviera1 : Office // 2 story motel blue tiles
+{
+	zedPos[] = {{-10.7217,-6.02148,-0.322234},{-4.7041,-6.77051,-0.321464},{8.9541,-6.33838,-0.321464}};
+	lootPos[] = {{-10.7217,-6.02148,-0.322234},{-4.7041,-6.77051,-0.321464},{8.9541,-6.33838,-0.321464}};
+};
+class Land_smd_hotel : Office // 4 story apartment building
+{
+	zedPos[] = {{-16.1006,0.519043,-7.74672},{-0.744141,10.0884,-7.74672}};
+	lootPos[] = {{-0.744141,10.0884,-7.74672},{14.6982,-16.9382,-7.74672},{4.86719,14.0911,-7.74672},{-20.9121,-5.11133,-0.759434},{-20.6094,-6.26953,2.74057},{-20.6172,-15.1313,2.74057},
+		{-17.0537,17.2102,6.24485},{14.3779,2.7583,6.24485},{20.75,6.71948,-0.759434},{20.9033,14.7278,-4.25943},{20.541,5.12622,-4.25943}};
+};
+class Land_smd_dum_istan4_detaily1 : Office // 4 story hotel
+{
+	zedPos[] = {{-2.51367,6.55078,-7.28588},{4.54834,6.33984,-7.28588},{2.58838,-3.21289,-4.33588}};
+	lootPos[] = {{2.58838,-3.21289,-4.33588}};
+};
+//Land_smd_dum_istan4 in Residential.hpp
+class Land_smd_hospoda_mesto : Office // pub HOSTINEC
+{
+	zedPos[] = {{4.85254,-4.82422,-5.17996},{3.28711,6.78125,-1.2485}};
+	lootPos[] = {{3.05957,-2.43555,-5.18104},{2.88574,5.32422,-5.19056},{3.27246,1.20703,-5.19001},{1.75098,-1.28906,-5.17993},{-7.48535,-4.07617,-1.2291},{2.63184,-1.78516,-1.2417}};
+};
+// ALT-MAP Support
+
 //DZE BELOW
 class LAND_ibr_bank: Office
 {
@@ -96,20 +168,6 @@ class land_bunka: Office {
 	lootPos[] = {{1.83496,0.451172,-1.51244},{-2.04492,2.11377,-1.51245},{3.07324,2.41675,-1.51245}};
 };
 
-class LAND_konecna : Office
-{
-	lootPos[] = {{14.8423,-0.987793,-1.59364},
-		{16.873,-2.86865,-1.59364},
-		{13.3672,-9.11377,-1.59364},
-		{5.09497,-9.98682,-1.59364},
-		{-24.8281,-1.17871,-1.59364},
-		{-14.0747,-7.3042,-1.59364},
-		{-19.0789,0.98291,-1.59364},
-		{4.67944,0.805176,-1.59364},
-		{-11.4639,-10.1475,-1.59364}};
-};
-class Land_ibrPanelak: Land_Panelak{};
-class Land_ibrPanelak2: Land_Panelak2{};
 class Land_ibr_terminal: Office
 {
 	lootPos[] = {
@@ -126,8 +184,10 @@ class Land_ibr_terminal: Office
 		{ -2.83545,10.9009,-0.949741 },
 		{ -2.27686,-16.4238,3.68157 }};
 };
-class Land_A_Villa_EP1: Office
+class Land_A_Villa_EP1: Office // takistani villa 2 story multi-wing 
 {
+	zedPos[] = {{5.5332,2.70361,-5.06721},{13.2578,-14.3623,-5.06719}};
+	//lootPos[] = {{-15.002,9.06104,1.97169},{10.3047,10.7178,1.97146},{17.4824,-15.3862,1.99229},{10.1855,-0.722656,-1.4844},{-2.54688,14.5698,-1.4844},{-14.8945,12.7236,-1.4844},{-8.51953,14.1064,-1.4844}};
 	lootPos[] = {
 		{ -23.3442,1.71484,-3.65929 },
 		{ 14.5498,-5.69775,-5.06722 },
@@ -208,21 +268,14 @@ class Land_MBG_Police_Station: Office
 		{ -2.3125,6.18774,1.68834 }};
 };
 
-class land_mbg_apartments_big_04: Office {
+class land_mbg_ger_estate_2: Office { // 2 stucco red/orange light by door
-	lootPos[] = {
+	//lootPos[]={{5.34766,-0.882813,-2.13187},{2.38281,-1.03418,-2.13187},{2.54688,-4.41602,-2.13187},{-7.71094,-2.73242,-2.13187},{-2.22656,5.91602,-2.13187},{-5.36328,4.46387,-2.13187}};
-		{10.1953,-2.47656,-3.19898},{3.14453,-0.197266,-3.19898},{0.949219,5.58789,5.94502},{-0.888672,2.47461,2.69382},{3.99414,-0.273438,2.89702},{10.7344,-0.351563,2.89702},{-10.4961,-5.46484,2.89702},{-3.25391,0.669922,2.89702},{10.6816,-2.26367,-0.15098},{-3.48828,0.31543,-0.15098},{-2.97461,-2.35547,-0.15098}
-	};
-	lootPosSmall[] = {
-		{4.52734,1.46289,-3.19898},{2.90234,5.90918,2.89702},{5.46875,-0.703125,2.89702},{-4.46875,-0.686523,2.89702},{5.17383,-1.80566,-0.15098},{-7.44531,5.68359,-0.15098}
-	};
-	zedPos[] = {{-0.0898438,4.67773,-7.08873},{0.890625,-5.13965,-6.90238}};
-};
-class land_mbg_ger_estate_2: Office {
 	lootPos[] = {
 		{-0.847656,-5.23291,-2.13187},{-0.615234,3.95996,-1.55187},{8.30859,0.642578,-2.02187},{7.60547,6.6792,-2.13187},{6.38867,-5.31396,-2.13187},{-4.74023,3.71582,-2.13187}
 	};
 	lootPosSmall[] = {
 		{-6.3125,-6.48145,-1.43187},{-4.81445,-2.0293,-1.43187},{-3.47852,4.58789,-2.13187},{0.107422,3.45947,-1.55187},{4.23438,-1.42188,-1.83187},{4.97461,1.09229,-1.30187},{6.53711,-2.07227,-1.29187},{6.35547,-4.70117,-1.65187},{-7.55273,3.99268,-1.65187}
 	};
+	//zedPos[] = {{2.38281,-1.03418,-2.13187}};
 	zedPos[] = {{2.12695,-8.60791,-1.5208},{1.33984,9.18945,-1.25071}};
 };

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

@@ -47,4 +47,23 @@ class Land_ruin_01: ResidentialRuins {
 	//lootPos[] = {{-4.26,-0.18,-1.46},{3.41,0.27,-1.71},{3,3.43,-1.5},{0.62,-1.74,-1.36},{4.55,-2.17,-1.73},{-5.05,3.07,-1.73}};
 	lootPos[] = {{-4.31934,-0.115234,-1.45578},{3.41309,0.270508,-1.71365},{3.00293,3.42773,-1.55765},{0.62207,-1.73779,-1.49048}};
 	zedPos[] = {{3.41309,0.271484,-1.71381},{3.00293,3.42773,-1.49768},{-4.25708,-0.181641,-1.45575},{0.622559,-1.73828,-1.36047}};
-};
+};
+// ALT-MAP Support 
+class Land_afbarabizna: ResidentialRuins {
+	lootPos[] = {{-1.29395,-2.97461,-4.22117}};
+	zedPos[] = {{-4.08594,2.62402,-4.22117},{4.95557,6.03857,-4.22117},{4.60156,5.50098,-0.168262},{-0.87793,-3.41406,-0.168266},{-0.065918,-1.86523,-0.512926}};
+};
+class Land_dum_zboreny: ResidentialRuins { //ruins
+	lootPos[] = {{3.74902,4.38379,-2.37675}};
+	zedPos[] = {{3.74902,4.38379,-2.37675},{-3.16797,3.21484,-2.37675},{-3.31787,3.25781,1.40384},{-5.35791,-1.67676,1.41383}};
+};
+class land_seb_residental: ResidentialRuins { //ruins
+	lootPos[] = {{3.74902,4.38379,-2.37675}};
+	zedPos[] = {{-4.70215,6.14648,-3.70411},{2.15479,8.1123,-3.7844},{-4.03955,6.47949,0.530872},{-4.41943,-7.93652,0.397972},{-1.40479,-7.99414,0.394527}};
+};
+//Land_House_L_9_EP1 in Residential.hpp
+class Land_dum_zboreny_total: ResidentialRuins { //ruins
+	lootPos[] = {{-4.32422,-1.71094,-2.31456}};
+};
+//Land_dulni_bs in Residential.hpp
+// ALT-MAP Support 

SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp

@@ -5,7 +5,7 @@ class CfgLoot
 	class Groups
 	{
 		//Not renamed yet
-		#define DZ_BP_VestPouch DZ_Czech_Vest_Puch
+		#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
@@ -41,6 +41,7 @@ class CfgLoot
 		#include "Groups\Weapons.hpp"
 		#include "Groups\Clothes.hpp"
 		#include "Groups\Backpacks.hpp"
+		#include "Groups\Wrecks.hpp"
 		
 		// Points of interest
 		#include "Groups\CrashSite.hpp"
@@ -56,6 +57,9 @@ class CfgLoot
 		#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
@@ -110,4 +114,4 @@ class CfgLoot
 		// Buildings
 		#include "CfgBuildingPos.hpp"
 	};
-};
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp

@@ -90,6 +90,10 @@ AmmoMilitaryLow[] =
 	{Loot_MAGAZINE,		3,		20Rnd_B_765x17_Ball},
 	{Loot_MAGAZINE,		4,		20Rnd_762x51_DMR},
 	{Loot_MAGAZINE,		4,		20Rnd_762x51_FNFAL},
+	{Loot_MAGAZINE,		3,		20Rnd_762x51_B_SCAR},
+	{Loot_MAGAZINE,		4,		20Rnd_B_AA12_Pellets},
+	{Loot_MAGAZINE,		4,		20Rnd_B_AA12_74Slug},
+//	{Loot_MAGAZINE,		3,		20Rnd_B_AA12_HE},
 	
 	//Handgrenades
 	{Loot_MAGAZINE,		5,		SmokeShell},
@@ -105,6 +109,10 @@ AmmoMilitaryHigh[] =
 	{Loot_MAGAZINE,		10,		30Rnd_556x45_Stanag},
 	{Loot_MAGAZINE,		5,		30Rnd_556x45_G36},
 	{Loot_MAGAZINE,		5,		100Rnd_556x45_BetaCMag},
+	{Loot_MAGAZINE,		5,		20Rnd_762x51_B_SCAR},
+	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_Pellets},
+	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_74Slug},
+//	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_HE},
 	
 	//Battle rifles
 	{Loot_MAGAZINE,		5,		20Rnd_762x51_DMR},
@@ -234,6 +242,7 @@ AmmoEU[] =
 	
 	//Battle rifles
 	{Loot_MAGAZINE,		4,		20Rnd_762x51_FNFAL},
+	{Loot_MAGAZINE,		5,		20Rnd_762x51_B_SCAR},
 	
 	//Machine guns
 	{Loot_MAGAZINE,		2,		100Rnd_556x45_M249},
@@ -318,7 +327,8 @@ assaultrifleammo[] = {
 	{Loot_MAGAZINE,		8,		30Rnd_556x45_Stanag},
 	{Loot_MAGAZINE,		10,		30Rnd_545x39_AK},
 	{Loot_MAGAZINE,		5,		30Rnd_556x45_StanagSD},
-	{Loot_MAGAZINE,		8,		20Rnd_762x51_FNFAL}
+	{Loot_MAGAZINE,		8,		20Rnd_762x51_FNFAL},
+	{Loot_MAGAZINE,		6,		20Rnd_762x51_B_SCAR}
 };
 machinegunammo[] = {
 	{Loot_MAGAZINE,		4,		100Rnd_556x45_BetaCMag},
@@ -337,4 +347,4 @@ machinegunammoexpl[] = {
 	{Loot_MAGAZINE,		4,		200Rnd_556x45_M249},
 	{Loot_MAGAZINE,		1,		MAAWS_HEAT},
 	{Loot_MAGAZINE,		2,		PipeBomb}
-};
+};

SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp

@@ -49,6 +49,7 @@ AmmoBoxEU1[] =
 AmmoBoxEU2[] =
 {
 	{Loot_MAGAZINE,		9,		20Rnd_762x51_FNFAL},
+	{Loot_MAGAZINE, 	5, 		20Rnd_762x51_B_SCAR},
 	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240}
 };
 
@@ -101,4 +102,4 @@ AmmoBoxUS4[] =
 	{Loot_MAGAZINE,		1,		SmokeShellRed},
 	{Loot_MAGAZINE,		1,		SmokeShellGreen},
 	{Loot_MAGAZINE,		0.3,	PipeBomb}
-};
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp

@@ -26,5 +26,7 @@ AttachmentsWest[] =
 	{Loot_MAGAZINE,		2,		Attachment_M203},
 	{Loot_MAGAZINE,		1,		Attachment_Sup556},
 	{Loot_MAGAZINE,		3,		Attachment_Sup9},
-	{Loot_MAGAZINE,		3,		Attachment_SA58RIS}
+	{Loot_MAGAZINE,		3,		Attachment_SA58RIS},
-};
+	{Loot_MAGAZINE,		3,		Attachment_MFL},
+	{Loot_MAGAZINE,		3,		Attachment_MFL_Pist}
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp

@@ -19,12 +19,12 @@ Castle[] =
 	
 	//Items
 	{Loot_MAGAZINE,		4,		ItemSandbag},
-	{Loot_MAGAZINE,		1,		equip_Crossbow_Kit},
+//	{Loot_MAGAZINE,		1,		equip_Crossbow_Kit}, //not functional yet
 	{Loot_MAGAZINE,		3,		equip_rope},
 	{Loot_MAGAZINE,		4,		PartWoodPile},
-	{Loot_MAGAZINE,		1,		ItemPadlock},
+	{Loot_MAGAZINE,		2,		ItemComboLock},
 	{Loot_MAGAZINE,		1,		ItemTent},
-	{Loot_MAGAZINE,		1,		ItemCamoNet},
+	{Loot_MAGAZINE,		1,		forest_net_kit},
 
 	//Groups
 	{Loot_GROUP,		5,		AmmoCivilian},

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp

@@ -11,7 +11,7 @@ Church[] =
 	{Loot_GROUP,		4,		backpacks},
 	
 	//Items
-	{Loot_MAGAZINE,		1,		equip_Crossbow_Kit},
+//	{Loot_MAGAZINE,		1,		equip_Crossbow_Kit}, //not functional yet
 	{Loot_MAGAZINE,		4,		ItemBookBible},
 	{Loot_MAGAZINE,		2,		equip_rag},
 	

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp

@@ -1,13 +1,14 @@
 Construction[] =
 {
-	{Loot_MAGAZINE,		9,		ItemLog},
+	{Loot_MAGAZINE,		9,		ItemLog}, // Used for crafting and vanilla buildables
 	{Loot_MAGAZINE,		9,		ItemPlank},
-	{Loot_MAGAZINE,		5,		ItemStone},
+	{Loot_MAGAZINE,		5,		ItemStone}, // Used for crafting and vanilla buildables
 	{Loot_MAGAZINE,		8,		equip_nails},
-	{Loot_MAGAZINE,		9,		equip_metal_sheet_rusted},
+//	{Loot_MAGAZINE,		3,		ItemScrews},
+//	{Loot_MAGAZINE,		9,		equip_metal_sheet_rusted},
 	{Loot_MAGAZINE,		9,		equip_metal_sheet},
 	{Loot_MAGAZINE,		1,		equip_lever},
-	{Loot_MAGAZINE,		1,		ItemPadlock},
+	{Loot_MAGAZINE,		1,		ItemComboLock},
 	
 	{Loot_WEAPON,		1,		ItemPickaxe},
 	{Loot_WEAPON,		2,		ItemPickaxeBroken},
@@ -25,8 +26,7 @@ Construction[] =
 	{Loot_MAGAZINE,		1,		equip_brick},
 	{Loot_MAGAZINE,		3,		equip_duct_tape},
 	{Loot_MAGAZINE,		2,		equip_hose},
-//	{Loot_MAGAZINE,		3,		ItemScrews},
+//	{Loot_MAGAZINE,		1,		equip_scrapelectronics},
-	{Loot_MAGAZINE,		1,		equip_scrapelectronics},
 	{Loot_MAGAZINE,		2,		equip_1inch_metal_pipe},
 	{Loot_MAGAZINE,		2,		equip_2inch_metal_pipe},
 	{Loot_MAGAZINE,		1,		MortarBucket},

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hangar.hpp

@@ -1,27 +1,30 @@
 Hangar[] =
 {
-	{Loot_GROUP,		10,		MilitarySpecial},
+	{Loot_GROUP,		8,		MilitarySpecial},
 	//Tools
-	{Loot_WEAPON,		2,		ItemEtool},
+	{Loot_WEAPON,		4,		ItemEtool},
 	
 	//Items
 	{Loot_MAGAZINE,		2,		PartVRotor},
-	{Loot_MAGAZINE,		2,		ItemSandbag},
+	{Loot_MAGAZINE,		1,		PartEngine},
-	{Loot_MAGAZINE,		2,		ItemWire},
+	{Loot_MAGAZINE,		4,		PartGeneric},
-	{Loot_MAGAZINE,		2,		ItemTankTrap},
+	{Loot_MAGAZINE,		3,		PartGlass},
+	{Loot_MAGAZINE,		3,		ItemSandbag},
+	{Loot_MAGAZINE,		3,		ItemWire},
+	{Loot_MAGAZINE,		3,		ItemTankTrap},
 	
 	//Groups
-	{Loot_GROUP,		20,		Trash},
+	{Loot_PILE,			6,		Trash, 1, 2},
-	{Loot_GROUP,		20,		Consumable},
+	{Loot_PILE,			3,		Consumable, 1, 2},
-	{Loot_GROUP,		10,		Generic},
+	{Loot_GROUP,		6,		Generic},
-	{Loot_GROUP,		5,		AttachmentsGeneric}
+	{Loot_GROUP,		3,		AttachmentsGeneric}
 };
 
 HangarSmall[] =
 {
 	{Loot_TOOL,			2,		Binocular},	
 	{Loot_WEAPON,		2,		NVGoggles},
-	{Loot_GROUP,		10,		pistols},
+	{Loot_GROUP,		8,		pistols},
 	{Loot_TOOL,			2,		Binocular_Vector},
 	{Loot_TOOL,			3,		ItemKnife},
 	{Loot_TOOL,			1.3,	ItemGPS},
@@ -31,12 +34,12 @@ HangarSmall[] =
 	{Loot_MAGAZINE,		0.5,	PipeBomb},
 	{Loot_MAGAZINE,		0.5,	MAAWS_HEAT},
 	{Loot_MAGAZINE,		2,		100Rnd_762x54_PK},
-	{Loot_GROUP,		15,		AmmoMilitaryLow},
+	{Loot_GROUP,		8,		AmmoMilitaryLow},
-	{Loot_GROUP,		10,		AmmoMilitaryHigh},
+	{Loot_GROUP,		8,		AmmoMilitaryHigh},
 	{Loot_GROUP,		8,		AttachmentsEast},
 	{Loot_GROUP,		6,		AttachmentsWest},
-	{Loot_GROUP,		10,		MedicalLow},
+	{Loot_GROUP,		8,		MedicalLow},
-	{Loot_GROUP,		10,		Trash},
+	{Loot_GROUP,		8,		Trash},
-	{Loot_GROUP,		10,		Consumable},
+	{Loot_GROUP,		8,		Consumable},
 	{Loot_GROUP,		8,		GenericSmall}
-};
+};

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

@@ -32,8 +32,8 @@ Hunting[] =
 	{Loot_MAGAZINE,		2,		ItemBandage},
 	{Loot_MAGAZINE,		1,		ItemDomeTent},
 	{Loot_MAGAZINE,		3,		TrapBear},
-	{Loot_MAGAZINE,		1,		12Rnd_Quiver_Wood},
+	{Loot_MAGAZINE,		3,		12Rnd_Quiver_Wood},
-	{Loot_MAGAZINE,		1,		1Rnd_Bolt_Tranquilizer},
+	{Loot_MAGAZINE,		2,		1Rnd_Bolt_Tranquilizer},
 	{Loot_MAGAZINE,		1,		1Rnd_Bolt_Explosive},
 	
 	{Loot_PILE,			10,		AmmoCivilian, 1, 3},

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp

@@ -3,7 +3,6 @@ Industrial[] =
 	//Tools
 	{Loot_WEAPON,		3,		ItemKnife},
 	{Loot_WEAPON,		6,		ItemToolbox},
-//	{Loot_WEAPON,		2,		ItemFlashlight},
 //	{Loot_WEAPON,		8,		ItemCrowbar},
 	{Loot_VEHICLE,		8,		WeaponHolder_ItemCrowbar},
 //	{Loot_WEAPON,		5,		ItemHatchet},
@@ -16,20 +15,20 @@ Industrial[] =
 	{Loot_WEAPON,		1,		ItemKeyKit},
 	
 	//Items
-	{Loot_MAGAZINE,		6,		ItemSandbag},
+//	{Loot_MAGAZINE,		6,		ItemSandbag},
 	{Loot_MAGAZINE,		4,		ItemJerryCan},
-	{Loot_MAGAZINE,		1,		ItemWire},
+//	{Loot_MAGAZINE,		1,		ItemWire},
-	{Loot_MAGAZINE,		4,		ItemTankTrap},
+//	{Loot_MAGAZINE,		4,		ItemTankTrap},
 	{Loot_MAGAZINE,		1,		equip_brick},
 	{Loot_MAGAZINE,		3,		equip_duct_tape},
 	{Loot_MAGAZINE,		2,		equip_hose},
 	{Loot_MAGAZINE,		6,		equip_nails},
 //	{Loot_MAGAZINE,		3,		ItemScrews},
-	{Loot_MAGAZINE,		1,		equip_scrapelectronics},
+//	{Loot_MAGAZINE,		1,		equip_scrapelectronics},
 	{Loot_MAGAZINE,		2,		equip_metal_sheet},
 	{Loot_MAGAZINE,		2,		equip_1inch_metal_pipe},
 	{Loot_MAGAZINE,		2,		equip_2inch_metal_pipe},
-	{Loot_MAGAZINE,		12,		ItemPlank},
+	{Loot_MAGAZINE,		8,		ItemPlank},
 	{Loot_MAGAZINE,		2,		MortarBucket},
 	{Loot_MAGAZINE,		3,		CinderBlocks},
 	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
@@ -38,10 +37,9 @@ Industrial[] =
 	
 	//Other
 	{Loot_GROUP,		15,		Parts},
-//	{Loot_GROUP,		7,		Military},
 	{Loot_PILE,			10,		Trash, 1, 3},
-	{Loot_PILE,			4,		Consumable, 1, 2},
+	{Loot_PILE,			3,		Consumable, 1, 2},
-	{Loot_GROUP,		8,		Generic}
+	{Loot_GROUP,		5,		Generic}
 };
 
 IndustrialSmall[] =
@@ -51,6 +49,6 @@ IndustrialSmall[] =
 	{Loot_MAGAZINE,		2,		equip_duct_tape},
 	{Loot_MAGAZINE,		6,		equip_nails},
 	{Loot_GROUP,		10,		Trash},
-	{Loot_GROUP,		4,		Consumable},
+	{Loot_GROUP,		3,		Consumable},
-	{Loot_GROUP,		8,		GenericSmall}
+	{Loot_GROUP,		5,		GenericSmall}
 };

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

@@ -28,26 +28,26 @@ Military[] =
 	{Loot_GROUP,		1,		specialclothes},
 	
 	//Containers
-	{Loot_CONTAINER,	1.3,		DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},		//545x39	AK74, RPK74
+	{Loot_CONTAINER,	1.1,		DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},		//545x39	AK74, RPK74
-	{Loot_CONTAINER,	0.7,		DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},		//762x39	AK47
+	{Loot_CONTAINER,	0.5,		DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},		//762x39	AK47
-	{Loot_CONTAINER,	0.5,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},		//762x54r	SVD, PKM
+	{Loot_CONTAINER,	0.2,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},		//762x54r	SVD, PKM
-	{Loot_CONTAINER,	1.5,		DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20},		//556x45	G36, M249
+	{Loot_CONTAINER,	1.2,		DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20},		//556x45	G36, M249
-	{Loot_CONTAINER,	1,			DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10},		//762x51	FAL, M240
+	{Loot_CONTAINER,	0.8,			DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10},		//762x51	FAL, M240
-	{Loot_CONTAINER,	1.5,		DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20},		//556x45	STANAG, M249
+	{Loot_CONTAINER,	1.2,		DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20},		//556x45	STANAG, M249
-	{Loot_CONTAINER,	1,			DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10},		//762x51	DMR, M240
+	{Loot_CONTAINER,	0.8,			DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10},		//762x51	DMR, M240
 //	{Loot_CONTAINER,	2,			DZ_MedBox, MedicalBox, 10, 20},
 	
 	//Other
 	{Loot_MAGAZINE,		5,		FoodMRE},
-	{Loot_MAGAZINE,		4,		ItemSandbag},
+//	{Loot_MAGAZINE,		4,		ItemSandbag},
 	{Loot_PILE,			15,		AmmoMilitaryLow, 1, 3},
 	{Loot_GROUP,		4,		AmmoMilitaryHigh},
 	{Loot_GROUP,		4,		AttachmentsGeneric},
 	{Loot_GROUP,		8,		AttachmentsEast},
 	{Loot_PILE,			10,		MedicalLow, 1, 2},
 	{Loot_PILE,			15,		Trash, 1, 2},
-	{Loot_PILE,			10,		Consumable, 1, 2},
+	{Loot_PILE,			10,		Consumable, 1, 2}
-	{Loot_GROUP,		10,		Generic}
+//	{Loot_GROUP,		10,		Generic}
 };
 
 MilitarySmall[] =
@@ -58,15 +58,15 @@ MilitarySmall[] =
 	{Loot_TOOL,			3,		ItemMap},
 	{Loot_TOOL,			3,		ItemKnife},
 	{Loot_GROUP,		2,		militaryclothes},
-	{Loot_GROUP,		1,		specialclothes},
+	{Loot_GROUP,		2,		specialclothes},
 	{Loot_GROUP,		15,		AmmoMilitaryLow},
 	{Loot_GROUP,		4,		AmmoMilitaryHigh},
 	{Loot_GROUP,		4,		AttachmentsGeneric},
 	{Loot_GROUP,		8,		AttachmentsEast},
 	{Loot_GROUP,		10,		MedicalLow},
 	{Loot_GROUP,		15,		Trash},
-	{Loot_GROUP,		10,		Consumable},
+	{Loot_GROUP,		10,		Consumable}
-	{Loot_GROUP,		10,		GenericSmall}
+//	{Loot_GROUP,		10,		GenericSmall}
 };
 
 MilitarySpecial[] =
@@ -97,17 +97,17 @@ MilitarySpecial[] =
 	{Loot_GROUP,		2,		specialclothes},
 	
 	//Containers
-	{Loot_CONTAINER,	2.5,		DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},	//5.45x39
+	{Loot_CONTAINER,	2.2,		DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},	//5.45x39
-	{Loot_CONTAINER,	2,			DZ_AmmoBoxUS, AmmoBoxUS1, 7, 14},	//5.56x45
+	{Loot_CONTAINER,	1.8,			DZ_AmmoBoxUS, AmmoBoxUS1, 7, 14},	//5.56x45
-	{Loot_CONTAINER,	2,			DZ_AmmoBoxRU, AmmoBoxCZ1, 7, 14},	//7.62x39
+	{Loot_CONTAINER,	1.8,			DZ_AmmoBoxRU, AmmoBoxCZ1, 7, 14},	//7.62x39
-	{Loot_CONTAINER,	1,			DZ_AmmoBoxRU, AmmoBoxCZ2, 2, 5},	//7.62x54R
+	{Loot_CONTAINER,	0.8,			DZ_AmmoBoxRU, AmmoBoxCZ2, 2, 5},	//7.62x54R
 //	{Loot_CONTAINER,	0.5,		DZ_AmmoBoxRU, AmmoBoxRU3, 3, 7},	//7.62x54R
-	{Loot_CONTAINER,	0.5,		DZ_ExplosivesBoxRU, AmmoBoxRU4, 5, 15},	//GP-25
+	{Loot_CONTAINER,	0.2,		DZ_ExplosiveBoxRU, AmmoBoxRU4, 5, 15},	//GP-25
-	{Loot_CONTAINER,	0.5,		DZ_ExplosivesBoxRU, AmmoBoxRU5, 3, 7},	//Grenades
+	{Loot_CONTAINER,	0.2,		DZ_ExplosiveBoxRU, AmmoBoxRU5, 3, 7},	//Grenades
 
 	//Other
 	{Loot_MAGAZINE,		3,		FoodMRE},
-	{Loot_MAGAZINE,		2,		ItemSandbag},
+//	{Loot_MAGAZINE,		2,		ItemSandbag},
 	{Loot_MAGAZINE,		0.5,	PipeBomb},
 	{Loot_MAGAZINE,		0.5,	MAAWS_HEAT},
 	{Loot_MAGAZINE,		2,		100Rnd_762x54_PK},
@@ -118,8 +118,8 @@ MilitarySpecial[] =
 	{Loot_GROUP,		6,		AttachmentsWest},
 	{Loot_PILE,			10,		MedicalLow, 1, 2},
 	{Loot_PILE,			10,		Trash, 1, 2},
-	{Loot_PILE,			10,		Consumable, 1, 2},
+	{Loot_PILE,			10,		Consumable, 1, 2}
-	{Loot_GROUP,		8,		Generic}
+//	{Loot_GROUP,		8,		Generic}
 };
 
 MilitarySpecialSmall[] =
@@ -143,8 +143,8 @@ MilitarySpecialSmall[] =
 	{Loot_GROUP,		6,		AttachmentsWest},
 	{Loot_GROUP,		10,		MedicalLow},
 	{Loot_GROUP,		10,		Trash},
-	{Loot_GROUP,		10,		Consumable},
+	{Loot_GROUP,		10,		Consumable}
-	{Loot_GROUP,		8,		GenericSmall}
+//	{Loot_GROUP,		8,		GenericSmall}
 };
 
 MilitaryIndustrial[] = {//DZE ADDED
@@ -153,9 +153,15 @@ MilitaryIndustrial[] = {//DZE ADDED
 	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
 	{Loot_MAGAZINE,		2,		ItemGenerator},
 	{Loot_MAGAZINE,		2,		fuel_pump_kit},
-	{Loot_GROUP, 		15, 	Military}
+	{Loot_MAGAZINE,		3,		ItemWire},
+	{Loot_MAGAZINE,		3,		ItemTankTrap},
+	{Loot_MAGAZINE,		6,		ItemSandbag},
+	{Loot_MAGAZINE,		1,		PartEngine},
+	{Loot_GROUP, 		15, 	Military},
+	{Loot_GROUP,		4,		Generic}
 };
 
 MilitaryIndustrialSmall[] = {
-	{Loot_GROUP, 		15, 	MilitarySmall}
+	{Loot_GROUP, 		15, 	MilitarySmall},
+	{Loot_GROUP,		8,		GenericSmall}
 };

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

@@ -15,17 +15,14 @@ Residential[] =
 	{Loot_WEAPON,		6,		ItemFlashlight},
 	{Loot_WEAPON,		5,		ItemKnife},
 //	{Loot_WEAPON,		3,		ItemShovel},
-	{Loot_WEAPON,		1,		ItemDIY_wood}, //DUPLICATE OF AN EPOCH BUILDABLE?????
+//	{Loot_WEAPON,		1,		ItemDIY_wood}, //DUPLICATE OF AN EPOCH BUILDABLE?????
-	{Loot_WEAPON,		1,		ItemDIY_Gate}, //DUPLICATE OF AN EPOCH BUILDABLE?????
+//	{Loot_WEAPON,		1,		ItemDIY_Gate}, //DUPLICATE OF AN EPOCH BUILDABLE?????
 	{Loot_WEAPON,		1,		Binocular},
 	
 	//Backpacks
 	{Loot_GROUP,		4,		backpacks},
 	
-	//Other
-	{Loot_MAGAZINE,		0.5,	ItemPadlock},
 	{Loot_MAGAZINE,		1,		PartPlywoodPack},
-	
 	{Loot_PILE,			6,		AmmoCivilian, 1, 2},
 	{Loot_PILE,			10,		Trash, 1, 3},
 	{Loot_PILE,			10,		Consumable, 1, 2},
@@ -45,7 +42,7 @@ ResidentialSmall[] =
 	{Loot_WEAPON,		5,		ItemCompass},
 	{Loot_WEAPON,		5,		ItemKnife},
 	{Loot_WEAPON,		1,		Binocular},
-	{Loot_MAGAZINE,		0.5,	ItemPadlock},
+	{Loot_MAGAZINE,		0.5,	ItemComboLock},
 	{Loot_GROUP,		6,		AmmoCivilian},
 	{Loot_GROUP,		10,		Trash},
 	{Loot_GROUP,		10,		Consumable},

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/ResidentialRuins.hpp

@@ -1,8 +1,8 @@
 ResidentialRuins[] =
 {
-	{Loot_MAGAZINE,		10,		ItemLog},
+	{Loot_MAGAZINE,		10,		ItemLog}, // Used for crafting and vanilla buildables
-	{Loot_MAGAZINE,		10,		ItemStone},
+	{Loot_MAGAZINE,		10,		ItemStone}, // Used for crafting and vanilla buildables
-	{Loot_MAGAZINE,		7,		equip_metal_sheet_rusted},
+//	{Loot_MAGAZINE,		7,		equip_metal_sheet_rusted},
 	{Loot_GROUP,		4,		Trash},
 	{Loot_GROUP,		3,		AttachmentsGeneric}
 };

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

@@ -7,8 +7,8 @@ Supermarket[] =
 	{Loot_WEAPON,		5,		ItemFlashlight},
 	{Loot_WEAPON,		2,		ItemKnife},
 	{Loot_WEAPON,		3,		Binocular},
-	{Loot_WEAPON,		2,		ItemDIY_wood},
+//	{Loot_WEAPON,		2,		ItemDIY_wood},
-	{Loot_WEAPON,		1,		ItemDIY_Gate},
+//	{Loot_WEAPON,		1,		ItemDIY_Gate},
 	
 	//Pistols
 	{Loot_GROUP,		10,		pistols},
@@ -28,8 +28,8 @@ Supermarket[] =
 	{Loot_MAGAZINE,		1,		ItemMixOil},
 	{Loot_MAGAZINE,		1,		PartPlywoodPack},
 	//{Loot_MAGAZINE,	0.5,	ItemDomeTent}, //IN TENTS GROUP
-	{Loot_MAGAZINE,		1,		ItemCamoNet},
+	{Loot_MAGAZINE,		1,		forest_net_kit},
-	{Loot_MAGAZINE,		0.5,	ItemPadlock},
+	{Loot_MAGAZINE,		0.1,	ItemComboLock},
 	{Loot_MAGAZINE,		3,		ItemBandage},
 	{Loot_MAGAZINE,		2,		ItemPainkiller},
 	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},
@@ -55,7 +55,7 @@ SupermarketSmall[] =
 	{Loot_WEAPON,		3,		Binocular},
 	{Loot_GROUP,		10,		pistols},
 	{Loot_MAGAZINE,		1,		ItemMixOil},
-	{Loot_MAGAZINE,		0.5,	ItemPadlock},
+	{Loot_MAGAZINE,		0.1,	ItemComboLock},
 	{Loot_MAGAZINE,		3,		ItemBandage},
 	{Loot_MAGAZINE,		2,		ItemPainkiller},
 	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},

SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp

@@ -11,7 +11,17 @@ clothes[] = {
 	{Loot_MAGAZINE,	2,	Skin_SurvivorWpink_DZ},
 	{Loot_MAGAZINE,	2,	Skin_SurvivorWurban_DZ},
 	{Loot_MAGAZINE,	1,	Skin_INS_Bardak_DZ},
-	{Loot_MAGAZINE,	1,	Skin_INS_Worker2_DZ}
+	{Loot_MAGAZINE,	1,	Skin_INS_Worker2_DZ},
+	{Loot_MAGAZINE,	2,	Skin_INS_Lopotev_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Doctor_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Assistant_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Worker1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Worker3_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Worker4_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani01_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani03_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani04_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani06_EP1_DZ}
 };
 militaryclothes[] = {
 	{Loot_MAGAZINE,	3,	Skin_Camo1_DZ},
@@ -28,7 +38,21 @@ militaryclothes[] = {
 	{Loot_MAGAZINE,	1,	Skin_CZ_Soldier_Sniper_EP1_DZ},
 	{Loot_MAGAZINE,	3,	Skin_Graves_Light_DZ},
 	{Loot_MAGAZINE,	2,	Skin_INS_Soldier_AR_DZ},
-	{Loot_MAGAZINE,	2,	Skin_INS_Soldier_CO_DZ}
+	{Loot_MAGAZINE,	2,	Skin_INS_Soldier_CO_DZ},
+	{Loot_MAGAZINE,	2,	Skin_USMC_Soldier_Officer_DZ},
+	{Loot_MAGAZINE,	2,	Skin_USMC_Soldier_MG_DZ},
+	{Loot_MAGAZINE,	2,	Skin_USMC_Soldier_Pilot_DZ},
+	{Loot_MAGAZINE,	2,	Skin_FR_TL_DZ},
+	{Loot_MAGAZINE,	2,	Skin_FR_R_DZ},
+	{Loot_MAGAZINE,	2,	Skin_FR_Sapper_DZ},
+	{Loot_MAGAZINE,	2,	Skin_FR_Marksman_DZ},
+	{Loot_MAGAZINE,	2,	Skin_FR_Assault_R_DZ},
+	{Loot_MAGAZINE,	2,	Skin_US_Soldier_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_UN_CDF_Soldier_Guard_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_UN_CDF_Soldier_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_GER_Soldier_TL_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_BAF_Soldier_Officer_MTP_DZ},
+	{Loot_MAGAZINE,	2,	Skin_BAF_Soldier_N_MTP_DZ}
 };
 specialclothes[] = {
 	{Loot_MAGAZINE,	3,	Skin_Ins_Soldier_GL_DZ},
@@ -48,7 +72,18 @@ specialclothes[] = {
 	{Loot_MAGAZINE,	2,	Skin_GUE_Soldier_2_DZ},
 	{Loot_MAGAZINE,	1,	Skin_TK_Special_Forces_MG_EP1_DZ},
 	{Loot_MAGAZINE,	1,	Skin_TK_Soldier_Sniper_EP1_DZ},
-	{Loot_MAGAZINE,	1,	Skin_TK_Commander_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_Commander_EP1_DZ},
-	{Loot_MAGAZINE,	1,	Skin_RU_Soldier_Crew_DZ},
+	{Loot_MAGAZINE,	2,	Skin_RU_Soldier_Crew_DZ},
-	{Loot_MAGAZINE,	1,	Skin_INS_Lopotev_DZ}
+	{Loot_MAGAZINE,	2,	Skin_TK_INS_Soldier_AR_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_TK_GUE_Soldier_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_CZ_Soldier_SL_DES_EP1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_RU_Soldier_DZ},
+	{Loot_MAGAZINE,	2,	Skin_RU_Soldier_Officer_DZ},
+	{Loot_MAGAZINE,	2,	Skin_RUS_Soldier1_DZ},
+	{Loot_MAGAZINE,	2,	Skin_RUS_Commander_DZ},
+	{Loot_MAGAZINE,	2,	Skin_MVD_Soldier_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Ins_Soldier_2_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Ins_Commander_DZ},
+	{Loot_MAGAZINE,	2,	Skin_Ins_Soldier_Crew_DZ},
+	{Loot_MAGAZINE,	2,	Skin_CDF_Soldier_DZ}
 };

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

@@ -34,14 +34,14 @@ CrashSiteRU[] =
 	{Loot_GROUP,		2,		specialclothes},
 	
 	//Containers
-	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_MedBox, MedicalBox, 10, 20},
 	//{Loot_CONTAINER,	2.3,	DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},		//545x39	AK74, RPK74
 	//{Loot_CONTAINER,	1.7,	DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},		//762x39	AK47
 	//{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},		//762x54r	SVD, PKM
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		ItemCamonet},
+	{Loot_MAGAZINE,		2,		forest_large_net_kit},
 	{Loot_GROUP,		7,		AttachmentsEast},
 	{Loot_GROUP,		3,		AttachmentsWest},
 	
@@ -100,7 +100,7 @@ CrashSiteUS[] =
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		ItemCamonet},
+	{Loot_MAGAZINE,		2,		forest_large_net_kit},
 	{Loot_GROUP,		10,		AttachmentsWest},
 	
 	//Piles
@@ -158,7 +158,7 @@ CrashSiteEU[] =
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		ItemCamonet},
+	{Loot_MAGAZINE,		2,		desert_net_kit},
 	{Loot_GROUP,		10,		AttachmentsWest},
 	
 	//Piles
@@ -217,7 +217,7 @@ CrashSiteUN[] =
 	
 	//Other
 	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		ItemCamonet},
+	{Loot_MAGAZINE,		2,		desert_large_net_kit},
 	{Loot_GROUP,		3,		AttachmentsEast},
 	{Loot_GROUP,		3,		AttachmentsWest},
 	

SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp

@@ -10,6 +10,11 @@ Generic[] =
 	//DZE
 	{Loot_MAGAZINE,		1,		5Rnd_17HMR},
 	{Loot_MAGAZINE,		2,		10Rnd_303British},
+	{Loot_MAGAZINE,		2,		15Rnd_W1866_Slug},
+	{Loot_MAGAZINE,		2,		5Rnd_762x54_Mosin},
+	{Loot_MAGAZINE,		2,		8Rnd_9x18_Makarov},
+	{Loot_MAGAZINE,		2,		7Rnd_45ACP_1911},
+	{Loot_MAGAZINE,		2,		6Rnd_45ACP},
 	
 //	{Loot_MAGAZINE,		1,		ItemBookBible},
 	
@@ -18,7 +23,7 @@ Generic[] =
 	{Loot_MAGAZINE,		1,		equip_duct_tape},
 	{Loot_MAGAZINE,		1,		equip_rope},
 	{Loot_MAGAZINE,		1,		equip_herb_box},
-	{Loot_MAGAZINE,		1,		equip_pvc_box},
+//	{Loot_MAGAZINE,		1,		equip_pvc_box},
 	{Loot_MAGAZINE,		1,		equip_lever},
 	{Loot_MAGAZINE,		1,		equip_rag},
 	{Loot_MAGAZINE,		1,		equip_nails},
@@ -40,8 +45,13 @@ GenericSmall[] =
 	{Loot_MAGAZINE,		1,		HandChemRed},
 	{Loot_MAGAZINE,		1,		5Rnd_17HMR},
 	{Loot_MAGAZINE,		2,		10Rnd_303British},
+	{Loot_MAGAZINE,		2,		15Rnd_W1866_Slug},
+	{Loot_MAGAZINE,		1,		5Rnd_762x54_Mosin},
+	{Loot_MAGAZINE,		2,		8Rnd_9x18_Makarov},
+	{Loot_MAGAZINE,		2,		7Rnd_45ACP_1911},
+	{Loot_MAGAZINE,		1,		6Rnd_45ACP},
 	{Loot_MAGAZINE,		1,		equip_string},
 	{Loot_MAGAZINE,		1,		equip_duct_tape},
 	{Loot_MAGAZINE,		1,		equip_rope},
 	{Loot_MAGAZINE,		1,		equip_nails}
-};
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Medical.hpp

@@ -52,6 +52,6 @@ Bloodbags[] =
 	{Loot_MAGAZINE,		2,		ItemBloodbagABPos},
 	{Loot_MAGAZINE,		2,		ItemBloodbagABNeg},
 	
-	{Loot_MAGAZINE,		3,		ItemBloodbagOPos},
+	{Loot_MAGAZINE,		2,		ItemBloodbagOPos},
-	{Loot_MAGAZINE,		2,		ItemBloodbagONeg}
+	{Loot_MAGAZINE,		1,		ItemBloodbagONeg}
 };

SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp

@@ -55,7 +55,9 @@ sniperrifles[] = {
 	{Loot_WEAPON,		0.5,	VSS_vintorez},
 	{Loot_WEAPON,		0.6,	SCAR_H_LNG_Sniper_SD},
 	{Loot_WEAPON,		1,		M14_DZ}, //M14_EP1
-	{Loot_WEAPON,		1,		DMR_DZ} //DMR
+	{Loot_WEAPON,		0.7,		DMR_DZ}, //DMR
+	{Loot_WEAPON,		0.8,	SCAR_H_LNG_Sniper}, //Mk17 Sniper
+	{Loot_WEAPON,		0.6,	M110_NVG_EP1} //M110 NVG
 };
 submachinegun[] = {
 	{Loot_WEAPON,		2,		PDW_DZ}, //UZI_EP1
@@ -76,9 +78,9 @@ assaultrifles[] = {
 	{Loot_WEAPON,		0.1,		FN_FAL_ANPVS4_DZE}, //FNFAL_ANPVS4_DZ is NV only _DZE is toggleable
 	{Loot_WEAPON,		0.5,		G36A_Camo_DZ}, //G36A_camo
 	{Loot_WEAPON,		0.5,		G36C_DZ}, //G36C
-	{Loot_WEAPON,		0.5,		G36C_camo},
+	{Loot_WEAPON,		0.4,		G36C_camo},
 	{Loot_WEAPON,		0.5,		G36K_Camo_DZ}, //G36K_camo
-	{Loot_WEAPON,		0.3,		G36_C_SD_camo},
+	{Loot_WEAPON,		0.2,		G36_C_SD_camo},
 	{Loot_WEAPON,		0.5,		M16A2_DZ}, //M16A2
 	//{Loot_WEAPON,		0.2,		M16A2_GL_DZ}, //M16A2GL //added to attachments system
 	{Loot_WEAPON,		0.1,		M16A4_ACOG_DZ}, //M16A4_ACG (has slightly different scope)
@@ -86,20 +88,33 @@ assaultrifles[] = {
 	{Loot_WEAPON,		0.4,		M4A1_CCO_DZ}, //M4A1_Aim
 	{Loot_WEAPON,		0.1,		M4A1_AIM_SD_camo},
 	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_camo},
-	{Loot_WEAPON,		0.4,		M4A3_CCO_EP1},
+	{Loot_WEAPON,		0.3,		M4A3_CCO_EP1},
 	{Loot_WEAPON,		0.4,		SA58_DZ}, //Sa58P_EP1 (identical), Sa58V_EP1 (different stock)
 	{Loot_WEAPON,		0.3,		SA58_CCO_DZ}, //No camo, no grip handle
-	{Loot_WEAPON,		0.3,		Sa58V_CCO_EP1}, //Camo with grip handle
+	{Loot_WEAPON,		0.2,		Sa58V_CCO_EP1}, //Camo with grip handle
 	{Loot_WEAPON,		0.3,		SA58_ACOG_DZ}, //No camo, no grip handle
-	{Loot_WEAPON,		0.3,		Sa58V_RCO_EP1}, // Camo with grip handle
+	{Loot_WEAPON,		0.2,		Sa58V_RCO_EP1}, // Camo with grip handle
 	{Loot_WEAPON,		0.3,		SA58_RIS_DZ}, //SA58_DZ with different rail
 	{Loot_WEAPON,		0.4,		m8_compact},
 	{Loot_WEAPON,		0.3,		m8_sharpshooter},
-	{Loot_WEAPON,		0.5,		m8_holo_sd},
+	{Loot_WEAPON,		0.3,		m8_holo_sd},
 	{Loot_WEAPON,		0.5,		m8_carbine},
 	{Loot_WEAPON,		0.2,		BAF_L85A2_RIS_SUSAT},
-	{Loot_WEAPON,		0.1,		L85_Holo_DZ}, //BAF_L85A2_RIS_Holo
+	{Loot_WEAPON,		0.3,		L85_Holo_DZ}, //BAF_L85A2_RIS_Holo
-	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_SD_Camo}
+	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_SD_Camo},
+	{Loot_WEAPON,		0.2,		BAF_L85A2_RIS_ACOG}, //L85A2 ACOG
+	//Mk16
+	{Loot_WEAPON,		0.2,		SCAR_L_CQC_CCO_SD}, //Mk16 Aimpoint SD 
+	{Loot_WEAPON,		0.3,		SCAR_L_CQC}, //Mk16 CQC 
+	{Loot_WEAPON,		0.3,		SCAR_L_CQC_Holo}, //Mk16 CQC EOTech 
+	{Loot_WEAPON,		0.2,		SCAR_L_CQC_EGLM_Holo}, //Mk16 EGLM EOTech,(40mm)
+	{Loot_WEAPON,		0.2,		SCAR_L_STD_EGLM_RCO}, //Mk16 EGLM RCO,(40mm)
+	{Loot_WEAPON,		0.3,		SCAR_L_STD_HOLO}, //Mk16 EOTech 
+	{Loot_WEAPON,		0.3,		SCAR_L_STD_Mk4CQT}, //Mk16 Mk4CQ/T 
+	//Mk17
+	{Loot_WEAPON,		0.1,		SCAR_H_CQC_CCO}, //Mk17 Aimpoint
+	{Loot_WEAPON,		0.1,		SCAR_H_CQC_CCO_SD}, //Mk17 Aimpoint SD 
+	{Loot_WEAPON,		0.1,		SCAR_H_STD_EGLM_Spect} //Mk17 EGLM ACOG,(40mm)	
 };
 machineguns[] = {
 	{Loot_WEAPON,		1.1,	RPK74_DZ}, //RPK_74
@@ -114,10 +129,12 @@ machineguns[] = {
 	{Loot_WEAPON,		1,		m240_scoped_EP1_DZE},
 	{Loot_WEAPON,		0.8,	M240_DZ},
 	{Loot_WEAPON,		0.9,	M249_DZ},
-	{Loot_WEAPON,		0.5,	Mk48_DZ} //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ)
+	{Loot_WEAPON,		0.5,	Mk48_DZ}, //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ)
+	{Loot_WEAPON,		0.9,	BAF_L86A2_ACOG} //L86A2 ACOG
 };
 militaryshotguns[] = {
 	{Loot_WEAPON,		2,		Saiga12K},
 	{Loot_WEAPON,		2,		Remington870_FL_DZ}, //Remington870_lamp
-	{Loot_WEAPON,		2,		M1014_DZ} //M1014
+	{Loot_WEAPON,		2,		M1014_DZ}, //M1014
+	{Loot_WEAPON,		1,		AA12_PMC} //AA12 Shotgun
 };

SQF/dayz_code/Configs/CfgLoot/Groups/Wrecks.hpp

@@ -0,0 +1,29 @@
+Land_iron_vein_wreck[] =
+{
+	{Loot_MAGAZINE,85,PartOre,10,10},
+	{Loot_MAGAZINE,10,PartOreSilver,0,10},
+	{Loot_MAGAZINE,5,PartOreGold,0,5}
+};
+
+Land_silver_vein_wreck[] =
+{
+	{Loot_MAGAZINE,80,PartOreSilver,10,10},
+	{Loot_MAGAZINE,15,PartOreGold,2,6},
+	{Loot_MAGAZINE,5,PartOre,0,1}
+};
+
+Land_gold_vein_wreck[] =
+{
+	{Loot_MAGAZINE,80,PartOreGold,10,10},
+	{Loot_MAGAZINE,15,PartOreSilver,2,6},
+	{Loot_MAGAZINE,5,PartOre,0,1}
+};
+
+Land_ammo_supply_wreck[] =
+{
+	{Loot_MAGAZINE,		20,		2000Rnd_762x51_M134},
+	{Loot_MAGAZINE,		20,		29Rnd_30mm_AGS30},
+	{Loot_MAGAZINE,		20,		50Rnd_127x107_DSHKM},
+	{Loot_MAGAZINE,		20,		48Rnd_40mm_MK19},
+	{Loot_MAGAZINE,		20,		100Rnd_127x99_M2}
+};

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

@@ -0,0 +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}
+};

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

@@ -1,7 +1,7 @@
 ZombieMilitary[] =
 {
 	{Loot_MAGAZINE,		1,		FoodMRE},
-	{Loot_MAGAZINE,		2,		ItemHotwireKit},
+	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
 	{Loot_GROUP,		3,		MedicalLow},
 	{Loot_GROUP,		10,		AmmoMilitaryLow},
 	{Loot_GROUP,		2,		AmmoMilitaryHigh},
@@ -12,4 +12,4 @@ ZombieMilitaryViral[] =
 {
 	{Loot_GROUP,		10,		ZombieMilitary},
 	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
-};
+};

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

@@ -0,0 +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}
+};

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

@@ -1,12 +1,10 @@
 ZombiePolice[] =
 {
 	{Loot_GROUP,		2,		Consumable},
-	{Loot_MAGAZINE,		2,		7Rnd_45ACP_1911},
+	{Loot_GROUP,		3,		AmmoCivilian},
 	{Loot_MAGAZINE,		2,		ItemDocument},
-	{Loot_MAGAZINE,		3,		6Rnd_45ACP},
+	{Loot_MAGAZINE,		0.5,		ItemHotwireKit},
-	{Loot_MAGAZINE,		1,		8Rnd_12Gauge_Buck},
+	{Loot_MAGAZINE,		1,		ItemComboLock},
-	{Loot_MAGAZINE,		1,		ItemHotwireKit},
-	{Loot_MAGAZINE,		2,		ItemComboLock},
 	{Loot_MAGAZINE,		3,		HandRoadFlare}
 };
 
@@ -14,4 +12,4 @@ ZombiePoliceViral[] =
 {
 	{Loot_GROUP,		10,		ZombiePolice},
 	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
-};
+};

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

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

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

@@ -8,12 +8,12 @@ ZombieWorker[] =
 	{Loot_MAGAZINE,		2,		ItemDocument},
 	{Loot_MAGAZINE,		2,		ItemWire},
 	{Loot_MAGAZINE,		3,		ItemTankTrap},
-	{Loot_MAGAZINE,		3,		ItemComboLock},
+	{Loot_MAGAZINE,		2,		ItemComboLock},
 	{Loot_MAGAZINE,		2,		ItemSledgeHead}
 };
 
 ZombieWorkerViral[] =
 {
-	{Loot_GROUP,		10,		ZombieCivilian},
+	{Loot_GROUP,		10,		ZombieWorker},
 	{Loot_MAGAZINE,		1,		ItemAntibiotic1}
-};
+};

SQF/dayz_code/Configs/CfgLoot/README.txt

@@ -1,6 +1,8 @@
-To use DZE_MissionLootTable = true; copy this CfgLoot folder to your mission.
+To customize the loot tables copy this CfgLoot folder to your mission.
 
-Then in description.ext add at the top:
+Then in description.ext replace this line:
+#include "\z\addons\dayz_code\Configs\CfgLoot\CfgLoot.hpp"
+with this:
 #include "CfgLoot\CfgLoot.hpp"
 
 

SQF/dayz_code/Configs/CfgMagazines/Attachments/Attachments.hpp

@@ -4,6 +4,9 @@
 #include "FL.hpp"
 #include "FL_Pist.hpp"
 
+#include "MFL.hpp"
+#include "MFL_Pist.hpp"
+
 #include "CCO.hpp"
 #include "Holo.hpp"
 #include "ACOG.hpp"
@@ -21,4 +24,4 @@
 
 #include "Ghillie.hpp"
 
-#include "SA58RIS.hpp"
+#include "SA58RIS.hpp"

SQF/dayz_code/Configs/CfgMagazines/Attachments/GP25.hpp

@@ -8,7 +8,7 @@ class Attachment_GP25 : CA_Magazine
 	picture = "\z\addons\dayz_communityweapons\attachments\gp25\data\m_gp25_ca.paa";
 	
 	displayName = $STR_DZ_ATT_GP25_NAME;
-	descriptionShort = $STR_DZ_ATT_GP25_NAME;
+	descriptionShort = $STR_DZ_ATT_GP25_DESC;
 	
 	class ItemActions
 	{
@@ -18,4 +18,4 @@ class Attachment_GP25 : CA_Magazine
 			script = "; [_id,1] call player_attachAttachment";
 		};
 	};
-};
+};

SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL.hpp

@@ -0,0 +1,21 @@
+class Attachment_MFL : CA_Magazine
+{
+	scope = public;
+	count = 1;
+	type = WeaponSlotItem;
+	
+	model = "\z\addons\dayz_communityweapons\attachments\flashlight_rifle\flashlight_rifle.p3d";
+	picture = "\z\addons\dayz_communityweapons\attachments\flashlight_rifle\data\m_flashlight_rifle_ca.paa";
+	
+	displayName = $STR_DZ_ATT_MFL_RFL_NAME;
+	descriptionShort = $STR_DZ_ATT_MFL_RFL_DESC;
+	
+	class ItemActions
+	{
+		class AttachToPrimary
+		{
+			text = $STR_DZ_ATT_ACT_TO_PRIMARY;
+			script = "; [_id,1] call player_attachAttachment";
+		};
+	};
+};

SQF/dayz_code/Configs/CfgMagazines/Attachments/MFL_Pist.hpp

@@ -0,0 +1,21 @@
+class Attachment_MFL_Pist : CA_Magazine
+{
+	scope = public;
+	count = 1;
+	type = WeaponSlotItem;
+	
+	model = "\z\addons\dayz_communityweapons\attachments\flashlight_pistol\flashlight_pistol.p3d";
+	picture = "\z\addons\dayz_communityweapons\attachments\flashlight_pistol\data\m_flashlight_pistol_ca.paa";
+	
+	displayName = $STR_DZ_ATT_MFL_PST_NAME;
+	descriptionShort = $STR_DZ_ATT_MFL_PST_DESC;
+	
+	class ItemActions
+	{
+		class AttachToSecondary
+		{
+			text = $STR_DZ_ATT_ACT_TO_SECONDARY;
+			script = "; [_id,0] call player_attachAttachment";
+		};
+	};
+};

SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp

@@ -3,7 +3,8 @@ class CfgMagazines
 	//External references
 	class CA_Magazine;
 	class HandGrenade;
-	
+	class TimeBomb;
+	class CA_LauncherMagazine;
 	
 	
 	//Weapon magazines

SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp

@@ -21,7 +21,7 @@ class SkinBase : CA_Magazine
 		
 		class tearClothes
 		{
-			text = "Tear Clothes";
+			text = $STR_TEAR_CLOTHES;
 			script = "spawn player_tearClothes;";
 		};
 		class Crafting {

SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp

@@ -213,8 +213,8 @@ class Skin_TK_Soldier_Sniper_EP1_DZ: SkinBase {
 };
 class Skin_TK_Commander_EP1_DZ: SkinBase {
 	scope = public;
-	displayName = $STR_EPOCH_SKINS_GENERAL;
+	displayName = $STR_GENERAL;
-	descriptionShort = $STR_EPOCH_SKINS_GENERAL;
+	descriptionShort = $STR_GENERAL;
 };
 class Skin_RU_Soldier_Crew_DZ: SkinBase {
 	scope = public;
@@ -245,4 +245,180 @@ class Skin_INS_Worker2_DZ: SkinBase {
 	scope = public;
 	displayName = $STR_EPOCH_SKINS_STEVE;
 	descriptionShort = $STR_EPOCH_SKINS_STEVE;
-};
+};
+//new Epoch 1.06
+class Skin_USMC_Soldier_Officer_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_USMCOFFICER;
+	descriptionShort = $STR_EPOCH_SKINS_USMCOFFICER;
+};
+class Skin_USMC_Soldier_MG_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_USMCSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_USMCSOLDIER;
+};
+class Skin_USMC_Soldier_Pilot_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_USMCPILOT;
+	descriptionShort = $STR_EPOCH_SKINS_USMCPILOT;
+};
+class Skin_FR_TL_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CAMOTEAMLEADER;
+	descriptionShort = $STR_EPOCH_SKINS_CAMOTEAMLEADER;
+};
+class Skin_FR_R_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CAMORECON;
+	descriptionShort = $STR_EPOCH_SKINS_CAMORECON;
+};
+class Skin_FR_Marksman_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CAMOMARKSMAN;
+	descriptionShort = $STR_EPOCH_SKINS_CAMOMARKSMAN;
+};
+class Skin_FR_Assault_R_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CAMOASSAULT;
+	descriptionShort = $STR_EPOCH_SKINS_CAMOASSAULT;
+};
+class Skin_RU_Soldier_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_RUSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_RUSOLDIER;
+};
+class Skin_RU_Soldier_Officer_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_RUOFFICER;
+	descriptionShort = $STR_EPOCH_SKINS_RUOFFICER;
+};
+class Skin_RUS_Soldier1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_RUCAMO;
+	descriptionShort = $STR_EPOCH_SKINS_RUCAMO;
+};
+class Skin_RUS_Commander_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_RUCOMMANDER;
+	descriptionShort = $STR_EPOCH_SKINS_RUCOMMANDER;
+};
+class Skin_MVD_Soldier_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_MVDSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_MVDSOLDIER;
+};
+class Skin_Ins_Soldier_2_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TERRORISTCAMO;
+	descriptionShort = $STR_EPOCH_SKINS_TERRORISTCAMO;
+};
+class Skin_Ins_Commander_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_INSCOMMANDER;
+	descriptionShort = $STR_EPOCH_SKINS_INSCOMMANDER;
+};
+class Skin_Ins_Soldier_Crew_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_INSCREWMAN;
+	descriptionShort = $STR_EPOCH_SKINS_INSCREWMAN;
+};
+class Skin_CDF_Soldier_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CDFSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_CDFSOLDIER;
+};
+class Skin_Assistant_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_ASSISTANT;
+	descriptionShort = $STR_EPOCH_SKINS_ASSISTANT;
+};
+class Skin_Doctor_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_DOCTOR;
+	descriptionShort = $STR_EPOCH_SKINS_DOCTOR;
+};
+class Skin_Worker1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_WORKER1;
+	descriptionShort = $STR_EPOCH_SKINS_WORKER1;
+};
+class Skin_Worker3_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_WORKER2;
+	descriptionShort = $STR_EPOCH_SKINS_WORKER2;
+};
+class Skin_Worker4_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_WORKER3;
+	descriptionShort = $STR_EPOCH_SKINS_WORKER3;
+};
+class Skin_TK_CIV_Takistani01_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKCITIZEN1;
+	descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN1;
+};
+class Skin_TK_CIV_Takistani03_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKCITIZEN2;
+	descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN2;
+};
+class Skin_TK_CIV_Takistani04_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKCITIZEN3;
+	descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN3;
+};
+class Skin_TK_CIV_Takistani06_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKCITIZEN4;
+	descriptionShort = $STR_EPOCH_SKINS_TKCITIZEN4;
+};
+class Skin_TK_INS_Soldier_AR_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_TKSOLDIER;
+};
+class Skin_TK_GUE_Soldier_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_TKGUESOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_TKGUESOLDIER;
+};
+class Skin_CZ_Soldier_SL_DES_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_CZSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_CZSOLDIER;
+};
+class Skin_US_Soldier_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_USSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_USSOLDIER;
+};
+class Skin_UN_CDF_Soldier_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_UNSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_UNSOLDIER;
+};
+class Skin_UN_CDF_Soldier_Guard_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_UNCOMMANDER;
+	descriptionShort = $STR_EPOCH_SKINS_UNCOMMANDER;
+};
+class Skin_GER_Soldier_TL_EP1_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_GERRECON;
+	descriptionShort = $STR_EPOCH_SKINS_GERRECON;
+};
+class Skin_BAF_Soldier_Officer_MTP_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_BAFOFFICER;
+	descriptionShort = $STR_EPOCH_SKINS_BAFOFFICER;
+};
+class Skin_BAF_Soldier_N_MTP_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_BAFSOLDIER;
+	descriptionShort = $STR_EPOCH_SKINS_BAFSOLDIER;
+};
+class Skin_FR_Sapper_DZ: SkinBase {
+	scope = public;
+	displayName = $STR_EPOCH_SKINS_FRSAPPER;
+	descriptionShort = $STR_EPOCH_SKINS_FRSAPPER;
+};

SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp

@@ -40,8 +40,8 @@ class ItemSodaMtngreen : ItemSoda
 	
 	model = "z\addons\dayz_communityassets\models\soda_mtngreen_clean_full.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_soda_mtngreen_clean_full_ca.paa";
-	displayName = $STR_EQUIP_NAME_37;
+	displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_0;
-	descriptionShort = $STR_EQUIP_NAME_37;
+	descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_0;
 	
 	Nutrition[] = {90,0,500,0};
 	

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

@@ -9,6 +9,7 @@ class bulk: CA_Magazine {
 	weight = 5;
 };
 class bulk_empty: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_EMPTY;
 	descriptionShort = $STR_EPOCH_BULK_DESC_EMPTY;
 	weight = 5;
 	class ItemActions {
@@ -65,6 +66,7 @@ class bulk_empty: bulk {
 };
 
 class bulk_ItemSodaCoke: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_SODACOKE_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_SODACOKE_HALF;
 	weight = 6;
 	class ItemActions {
@@ -84,6 +86,7 @@ class bulk_ItemSodaCoke: bulk {
 	};
 };
 class bulk_ItemSodaCokeFull: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_SODACOKE_FULL;
 	descriptionShort = $STR_EPOCH_BULK_DESC_SODACOKE_FULL;
 	weight = 7;
 	class ItemActions {
@@ -96,6 +99,7 @@ class bulk_ItemSodaCokeFull: bulk {
 };
 
 class bulk_ItemSodaPepsi: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_SODAPEPSI_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_SODAPEPSI_HALF;
 	weight = 6;
 	class ItemActions {
@@ -115,6 +119,7 @@ class bulk_ItemSodaPepsi: bulk {
 	};
 };
 class bulk_ItemSodaPepsiFull: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_SODAPEPSI_FULL;
 	descriptionShort = $STR_EPOCH_BULK_DESC_SODAPEPSI_FULL;
 	weight = 7;
 	class ItemActions {
@@ -127,6 +132,7 @@ class bulk_ItemSodaPepsiFull: bulk {
 };
 
 class bulk_FoodbaconCooked: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_BACON_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_BACON_HALF;
 	weight = 5;
 	class ItemActions {
@@ -146,6 +152,7 @@ class bulk_FoodbaconCooked: bulk {
 	};
 };
 class bulk_FoodbaconCookedFull: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_BACON_FULL;
 	descriptionshort = $STR_EPOCH_BULK_DESC_BACON_FULL;
 	weight = 5;
 	class ItemActions {
@@ -159,6 +166,7 @@ class bulk_FoodbaconCookedFull: bulk {
 
 // Ammo
 class bulk_17Rnd_9x19_glock17: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_G17;
 	descriptionShort = $STR_EPOCH_BULK_DESC_G17;
 	weight = 17;
 	class ItemActions {
@@ -170,6 +178,7 @@ class bulk_17Rnd_9x19_glock17: bulk {
 	};
 };
 class bulk_15Rnd_9x19_M9SD: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_M9SD;
 	descriptionShort = $STR_EPOCH_BULK_DESC_M9SD;
 	weight = 17;
 	class ItemActions {
@@ -181,6 +190,7 @@ class bulk_15Rnd_9x19_M9SD: bulk {
 	};
 };
 class bulk_30Rnd_9x19_MP5SD: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_MP5SD;
 	descriptionShort = $STR_EPOCH_BULK_DESC_MP5SD;
 	weight = 18;
 	class ItemActions {
@@ -192,6 +202,7 @@ class bulk_30Rnd_9x19_MP5SD: bulk {
 	};
 };
 class bulk_30Rnd_556x45_StanagSD: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_STANAGSD;
 	descriptionShort = $STR_EPOCH_BULK_DESC_STANAGSD;
 	weight = 20;
 	class ItemActions {
@@ -204,6 +215,7 @@ class bulk_30Rnd_556x45_StanagSD: bulk {
 };
 
 class bulk_ItemSandbag: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_SANDBAG;
 	descriptionShort = $STR_EPOCH_BULK_DESC_SANDBAG;
 	weight = 60;
 	class ItemActions {
@@ -216,6 +228,7 @@ class bulk_ItemSandbag: bulk {
 };
 
 class bulk_ItemTankTrap: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_TANKTRAP_FULL;
 	descriptionShort = $STR_EPOCH_BULK_DESC_TANKTRAP_FULL;
 	weight = 25;
 	class ItemActions {
@@ -227,6 +240,7 @@ class bulk_ItemTankTrap: bulk {
 	};
 };
 class bulk_ItemTankTrapHalf: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_TANKTRAP_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_TANKTRAP_HALF;
 	weight = 12.5;
 	class ItemActions {
@@ -247,6 +261,7 @@ class bulk_ItemTankTrapHalf: bulk {
 };
 
 class bulk_ItemWire: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_WIREKIT_FULL;
 	descriptionShort = $STR_EPOCH_BULK_DESC_WIREKIT_FULL;
 	weight = 25;
 	class ItemActions {
@@ -258,6 +273,7 @@ class bulk_ItemWire: bulk {
 	};
 };
 class bulk_ItemWireHalf: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_WIREKIT_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_WIREKIT_HALF;
 	weight = 12.5;
 	class ItemActions {
@@ -278,6 +294,7 @@ class bulk_ItemWireHalf: bulk {
 };
 
 class bulk_PartGeneric: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_GENERIC_FULL;
 	descriptionShort = $STR_EPOCH_BULK_DESC_GENERIC_FULL;
 	weight = 60;
 	class ItemActions {
@@ -289,6 +306,7 @@ class bulk_PartGeneric: bulk {
 	};
 };
 class bulk_PartGenericHalf: bulk {
+	displayName = $STR_EPOCH_BULK_DISP_GENERIC_HALF;
 	descriptionShort = $STR_EPOCH_BULK_DESC_GENERIC_HALF;
 	weight = 30;
 	class ItemActions {
@@ -306,4 +324,4 @@ class bulk_PartGenericHalf: bulk {
 			input[] = {{"bulk_PartGenericHalf",1},{"PartGeneric",6}};
 		};
 	};
-};
+};

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

@@ -264,4 +264,266 @@ class ItemWaterbottle9oz : ItemWaterbottle {
 			script = "spawn player_fillWater;";
 		};
 	};
-};
+};
+//inherit from ItemWaterbottle because that's how the crafting script checks required input
+class ItemWaterbottle1ozBoiled : ItemWaterbottle {
+	displayName = $STR_EPOCH_WATERBOTTLE1OZBOILED;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE1OZBOILED_DESC;
+	infectionChance = 0;
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_1oz_ca.paa";
+	wateroz = 1;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,100,0};
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
+	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle2ozBoiled : ItemWaterbottle {
+	displayName = $STR_EPOCH_WATERBOTTLE2OZBOILED;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE2OZBOILED_DESC;
+	infectionChance = 0;
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_2oz_ca.paa";
+	wateroz = 2;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,200,0};
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
+	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle3ozBoiled : ItemWaterbottle {
+	displayName = $STR_EPOCH_WATERBOTTLE3OZBOILED;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE3OZBOILED_DESC;
+	infectionChance = 0;
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_3oz_ca.paa";
+	wateroz = 3;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,300,0};
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
+	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle4ozBoiled : ItemWaterbottle {
+	displayName = $STR_EPOCH_WATERBOTTLE4OZBOILED;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE4OZBOILED_DESC;
+	infectionChance = 0;
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_4oz_ca.paa";
+	wateroz = 4;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,400,0};
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
+	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle5ozBoiled : ItemWaterbottle {
+	displayName = $STR_EPOCH_WATERBOTTLE5OZBOILED;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE5OZBOILED_DESC;
+	infectionChance = 0;
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_5oz_ca.paa";
+	wateroz = 5;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,500,0};
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
+	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle6ozBoiled : ItemWaterbottle {
+	displayName = $STR_EPOCH_WATERBOTTLE6OZBOILED;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE6OZBOILED_DESC;
+	infectionChance = 0;
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_6oz_ca.paa";
+	wateroz = 6;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,600,0};
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
+	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle7ozBoiled : ItemWaterbottle {
+	displayName = $STR_EPOCH_WATERBOTTLE7OZBOILED;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE7OZBOILED_DESC;
+	infectionChance = 0;
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_7oz_ca.paa";
+	wateroz = 7;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,700,0};
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
+	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle8ozBoiled : ItemWaterbottle {
+	displayName = $STR_EPOCH_WATERBOTTLE8OZBOILED;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE8OZBOILED_DESC;
+	infectionChance = 0;
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_8oz_ca.paa";
+	wateroz = 8;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,800,0};
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
+	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};
+class ItemWaterbottle9ozBoiled : ItemWaterbottle {
+	displayName = $STR_EPOCH_WATERBOTTLE9OZBOILED;
+	descriptionShort = $STR_EPOCH_WATERBOTTLE9OZBOILED_DESC;
+	infectionChance = 0;
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_9oz_ca.paa";
+	wateroz = 9;
+	containerWater = "ItemWaterBottle";
+	containerWaterSafe = "ItemWaterBottleSafe";
+	containerWaterInfected = "ItemWaterBottleInfected";
+	Nutrition[] = {0,0,900,0};
+	consumeOutput = "ItemWaterBottleUnfilled";
+	containerEmpty = "ItemWaterBottleUnfilled";
+	class ItemActions {
+		class Consume
+		{
+			text = $STR_ACTIONS_DRINK2;
+			script = "spawn player_consume";
+		};
+		class Empty
+		{
+			text = $STR_EQUIP_NAME_13_EMPTY;
+			script = "spawn player_emptyContainer";
+		};
+		class Fill {
+			text = "$STR_ACTIONS_FILL_W";
+			script = "spawn player_fillWater;";
+		};
+	};
+};

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

@@ -288,7 +288,7 @@ class ItemPlotDeed: CA_Magazine {
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
-			output[] = {{"30m_plot_kit",1}};
+			output[] = {{"plot_pole_kit",1}};
 			input[] = {{"ItemPlotDeed",1},{"ItemGoldBar10oz",2}};
 		};
 	};
@@ -356,7 +356,6 @@ class ItemNewspaper: CA_Magazine {
 		class Obituaries {
 			text = $STR_EPOCH_TORNNEWSPAPER_ACTION;
 			script = "spawn player_deathBoard;";
-
 		};
 	};
 };
@@ -407,4 +406,4 @@ class ItemBloodbag: CA_Magazine
 			script = "spawn player_useMeds;";
 		};
 	};
-};
+};

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

@@ -12,7 +12,7 @@ class ItemCanvas: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_190;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"ItemTent",1}};
@@ -21,7 +21,7 @@ class ItemCanvas: CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_191;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"ItemDesertTent",1}};
@@ -30,7 +30,7 @@ class ItemCanvas: CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_192;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"ItemDomeTent",1}};
@@ -39,7 +39,7 @@ class ItemCanvas: CA_Magazine
 		class Crafting3
 		{
 			text = $STR_EPOCH_PLAYER_193;
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"sun_shade_kit",1}};
@@ -48,7 +48,7 @@ class ItemCanvas: CA_Magazine
 		class Crafting4
 		{
 			text = $STR_EPOCH_PLAYER_194;
-			script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"ItemBurlap",1}};
@@ -70,7 +70,7 @@ class ItemBurlap: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_195;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sand"}; // todo add sand requirement
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"ItemSandbag",1}};
@@ -92,7 +92,7 @@ class ItemLightBulb: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_196;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"light_pole_kit",1}};
@@ -147,7 +147,7 @@ class ItemCorrugated : CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_215;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"wooden_shed_kit",1}};
@@ -156,7 +156,7 @@ class ItemCorrugated : CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_217;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"outhouse_kit",1}};
@@ -165,7 +165,7 @@ class ItemCorrugated : CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_216;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"storage_shed_kit",1}};
@@ -187,7 +187,7 @@ class ItemPole: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_218;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"fire"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"ItemCorrugated",1}};
@@ -196,7 +196,7 @@ class ItemPole: CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_219;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"rusty_gate_kit",1}};
@@ -205,7 +205,7 @@ class ItemPole: CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_220;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"metal_panel_kit",1}};
@@ -214,7 +214,7 @@ class ItemPole: CA_Magazine
 		class Crafting3
 		{
 			text = $STR_EPOCH_PLAYER_305;
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"ItemScaffoldingKit",1}};
@@ -303,7 +303,7 @@ class ItemFuelBarrelEmpty: ItemFuelBarrel
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_276;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox","ItemMatchbox"};
 			output[] = {{"ItemFireBarrel_kit",1}};
@@ -375,7 +375,7 @@ class wood_ramp_kit: CA_Magazine
 		};
 	};
 };
-class 30m_plot_kit: CA_Magazine
+class plot_pole_kit: CA_Magazine
 {
 	scope = public;
 	count = 1;
@@ -418,7 +418,7 @@ class metal_panel_kit: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_228;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop","fire"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar","ItemSledge"};
 			output[] = {{"metal_floor_kit",1}};
@@ -454,8 +454,8 @@ class desert_large_net_kit: CA_Magazine
 	type = 256;
 	displayName = $STR_EPOCH_LARGEDESERTCAMONET;
 	descriptionShort = $STR_EPOCH_LARGECAMONET_DESC;
-	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
+	model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d";
-	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa";
 	weight = 25;
 	class ItemActions
 	{
@@ -475,8 +475,8 @@ class forest_large_net_kit: CA_Magazine
 	type = 256;
 	displayName = $STR_EPOCH_LARGEFORESTCAMONET;
 	descriptionShort = $STR_EPOCH_LARGECAMONET_DESC;
-	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
+	model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d";
-	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa";
 	weight = 25;
 	class ItemActions
 	{
@@ -496,8 +496,8 @@ class desert_net_kit: CA_Magazine
 	type = 256;
 	displayName = $STR_EPOCH_DESERTCAMONET;
 	descriptionShort = $STR_EPOCH_CAMONET_DESC;
-	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
+	model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d";
-	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa";
 	weight = 25;
 	class ItemActions
 	{
@@ -511,7 +511,7 @@ class desert_net_kit: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_229;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"desert_large_net_kit",1}};
@@ -526,8 +526,8 @@ class forest_net_kit: CA_Magazine
 	type = 256;
 	displayName = $STR_EPOCH_FORESTCAMONET;
 	descriptionShort = $STR_EPOCH_CAMONET_DESC;
-	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
+	model = "\z\addons\dayz_communityassets\models\packed_net_green.p3d";
-	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_packed_net_green_ca.paa";
 	weight = 25;
 	class ItemActions
 	{
@@ -541,7 +541,7 @@ class forest_net_kit: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_229;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"forest_large_net_kit",1}};
@@ -859,7 +859,7 @@ class PartPlankPack: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_251;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sawmill"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"PartWoodLumber",3}};
@@ -882,7 +882,7 @@ class CinderBlocks: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_252;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"half_cinder_wall_kit",1}};
@@ -891,7 +891,7 @@ class CinderBlocks: CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_253;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"cinder_garage_kit",1}};
@@ -900,7 +900,7 @@ class CinderBlocks: CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_234;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"cinder_door_kit",1}};
@@ -909,7 +909,7 @@ class CinderBlocks: CA_Magazine
 		class Crafting3
 		{
 			text = $STR_EPOCH_PLAYER_252_1;
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"full_cinder_wall_kit",1}};
@@ -943,13 +943,12 @@ class PartPlywoodPack: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_251;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sawmill"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"PartWoodPlywood",3}};
 			input[] = {{"PartPlywoodPack",1}};
 		};
-
 	};
 };
 class PartWoodLumber: CA_Magazine
@@ -966,7 +965,7 @@ class PartWoodLumber: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_254;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sawmill"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"PartWoodPlywood",1}};
@@ -976,7 +975,7 @@ class PartWoodLumber: CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_255;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"bulk_empty",1}};
@@ -986,7 +985,7 @@ class PartWoodLumber: CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_256;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"deer_stand_kit",1}};
@@ -996,7 +995,7 @@ class PartWoodLumber: CA_Magazine
 		class Crafting3
 		{
 			text = $STR_EPOCH_PLAYER_257;
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodStairs",1}};
@@ -1006,7 +1005,7 @@ class PartWoodLumber: CA_Magazine
 		class Crafting4
 		{
 			text = $STR_EPOCH_PLAYER_258;
-			script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodLadder",1}};
@@ -1016,7 +1015,7 @@ class PartWoodLumber: CA_Magazine
 		class Crafting5
 		{
 			text = $STR_EPOCH_PLAYER_259;
-			Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sawmill"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"PartPlankPack",1}};
@@ -1025,7 +1024,7 @@ class PartWoodLumber: CA_Magazine
 		class Crafting6
 		{
 			text = $STR_EPOCH_PLAYER_277;
-			Script = ";['Crafting6','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			Script = ";['Crafting6','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemGunRackKit",1}};
@@ -1034,7 +1033,7 @@ class PartWoodLumber: CA_Magazine
 		class Crafting7
 		{
 			text = $STR_EPOCH_PLAYER_304;
-			Script = ";['Crafting7','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			Script = ";['Crafting7','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodCrateKit",1}};
@@ -1056,17 +1055,16 @@ class PartWoodPlywood: CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_260;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"workbench_kit",1}};
 			input[] = {{"PartWoodPlywood",1},{"PartWoodLumber",2}};
-
 		};
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_261;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"wood_shack_kit",1}};
@@ -1075,7 +1073,7 @@ class PartWoodPlywood: CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_262;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"ItemWoodFloorQuarter",1}};
@@ -1084,7 +1082,7 @@ class PartWoodPlywood: CA_Magazine
 		class Crafting3
 		{
 			text = $STR_EPOCH_PLAYER_263;
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemCrowbar"};
 			output[] = {{"ItemWoodWallThird",1}};
@@ -1093,13 +1091,12 @@ class PartWoodPlywood: CA_Magazine
 		class Crafting4
 		{
 			text = $STR_EPOCH_PLAYER_264;
-			Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sawmill"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"PartPlywoodPack",1}};
 			input[] = {{"PartWoodPlywood",3}};
 		};
-
 	};
 };
 class ItemSledgeHead : CA_Magazine
@@ -1117,7 +1114,7 @@ class ItemSledgeHead : CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_275;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {};
@@ -1141,7 +1138,7 @@ class ItemSledgeHandle : CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_275;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
 			output[] = {};
@@ -1165,7 +1162,7 @@ class ItemKiloHemp : CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_269b;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"ItemCanvas",1}};
@@ -1174,7 +1171,7 @@ class ItemKiloHemp : CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_269a;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {""};
 			requiretools[] = {"ItemKnife"};
 			output[] = {{"ItemHempSeed",5}};

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

@@ -131,7 +131,6 @@ class ItemWoodFloorHalf: CA_Magazine {
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodFloor",1}};
 			input[] = {{"ItemWoodFloorHalf",2}};
-
 		};
 	};
 };
@@ -158,7 +157,6 @@ class ItemWoodFloorQuarter: CA_Magazine {
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodFloorHalf",1}};
 			input[] = {{"ItemWoodFloorQuarter",2}};
-
 		};
 	};
 };
@@ -186,7 +184,6 @@ class ItemWoodStairs: CA_Magazine {
 			requiretools[] = {"ItemToolbox"};
 			output[] = {{"ItemWoodStairsSupport",1}};
 			input[] = {{"ItemWoodStairs",1},{"PartWoodLumber",2}};
-
 		};
 	};
 };

SQF/dayz_code/Configs/CfgMagazines/Items/BearTrap.hpp

@@ -14,7 +14,7 @@ class TrapBear : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"TrapBear"};
 			create = "BearTrap_DZ";

SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp

@@ -1,4 +1,4 @@
-class ItemCamoNet : CA_Magazine
+/*class ItemCamoNet : CA_Magazine //Duplicate of Epoch forest_net_kit
 {
 	scope = public;
 	count = 1;
@@ -14,13 +14,13 @@ class ItemCamoNet : CA_Magazine
 		class Build
 		{
 			text = $STR_BUILD_CAMONET;
-			script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemCamoNet"};
 			create = "CamoNet_DZ";
 		};
 	};
-};
+};*/
 
 /*class ItemCamoNetGrey : ItemCamoNet
 {
@@ -34,7 +34,7 @@ class ItemCamoNet : CA_Magazine
 		class Build
 		{
 			text = $STR_BUILD_CAMONET;
-			script = "; ['ItemCamoNetGrey','Build'] spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "; ['ItemCamoNetGrey','Build'] spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemCamoNetGrey"};
 			create = "CamoNet_DZ";

SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp

@@ -0,0 +1,15 @@
+class Mine: TimeBomb
+{
+	type = WeaponSlotItem; // Only takes up one gear slot in Epoch
+};
+
+class MineE: TimeBomb
+{
+	type = WeaponSlotItem; // Only takes up one gear slot in Epoch
+};
+
+class PipeBomb: TimeBomb
+{
+	displayName = $STR_DZ_MAG_SATCHEL_NAME; // Singular "Satchel Charge" for death messages "with a x"
+	type = WeaponSlotItem; // Only takes up one gear slot in Epoch
+};

SQF/dayz_code/Configs/CfgMagazines/Items/Generator.hpp

@@ -15,7 +15,7 @@ class ItemGenerator : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemGenerator"};
 			create = "Generator_DZ";

SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp

@@ -8,7 +8,7 @@
 
 //Simple buildables
 #include "Tent.hpp"
-#include "CamoNet.hpp"
+//#include "CamoNet.hpp" //Duplicate of Epoch camo nets in DZE\Misc.hpp
 #include "TankTrap.hpp"
 #include "WireFence.hpp"
 #include "BearTrap.hpp"
@@ -23,4 +23,5 @@
 #include "equip_brick.hpp"
 #include "equip_lever.hpp"
 #include "WaterBottle.hpp"
-//#include "Canteen.hpp"
+//#include "Canteen.hpp"
+#include "Explosives.hpp"

SQF/dayz_code/Configs/CfgMagazines/Items/MetalFenceItems.hpp

@@ -1,40 +1,70 @@
-class ItemMetalSheet: CA_Magazine
+class ItemMetalSheet: CA_Magazine //Construection,farm,indestrial,castle
 {
-	scope = public;
+	scope = 2;
 	count = 1;
 	type = 256;
 	displayName = $STR_BLD_name_ItemMetalSheet;//"Corrugated Sheet"
 	picture = "\z\addons\dayz_buildings\equip\item_sheetmetal.paa";
 	model = "z\addons\dayz_buildings\models\sheet_metal.p3d";
 	descriptionShort = $STR_BLD_desc_ItemMetalSheet;//"Metal Sheeting"
-};		
+};
-class ItemConcreteBlock: CA_Magazine
+		
+class ItemConcreteBlock: CA_Magazine //Construection,indestrial
 {
-	scope = public;
+	scope = 2;
 	count = 1;
 	type = 256;
 	displayName = $STR_BLD_name_ItemConcreteBlock;//"Concrete Block"
 	picture = "\z\addons\dayz_buildings\equip\concreteblock.paa";
 	model = "z\addons\dayz_buildings\models\concreteblock.p3d";
 	descriptionShort = $STR_BLD_desc_ItemConcreteBlock;//"Concrete Block"
-};	
+};
-class ItemRSJ: CA_Magazine
+	
+class ItemRSJ: CA_Magazine //Construection,farm,indestrial,castle
 {
-	scope = public;
+	scope = 2;
 	count = 1;
 	type = 256;
 	displayName = $STR_BLD_name_ItemRSJ;//"Steel Beam"
 	picture = "\z\addons\dayz_buildings\equip\item_rsj.paa";
 	model = "z\addons\dayz_buildings\models\rsj.p3d";
 	descriptionShort = $STR_BLD_desc_ItemRSJ;//"Steel RSJ Support Beam"
-};	
+};
-class ItemScrews: CA_Magazine
+
+class ItemScrews: CA_Magazine //Construection,farm,indestrial,castle,residential
 {
-	scope = public;
+	scope = 2;
+	count = 1;
+	type = 256;
+	displayName = "Loose Screws";//"Box of screws for metal"
+	picture = "\z\addons\dayz_buildings\equip\item_screws.paa";
+	model = "z\addons\dayz_buildings\models\screws.p3d";
+	descriptionShort = $STR_BLD_desc_ItemScrews;//"Box of screws"
+};
+
+class ItemBagScrews: CA_Magazine//Construection,indestrial,supermarket
+{
+	scope = 2;
 	count = 1;
 	type = 256;
 	displayName = $STR_BLD_name_ItemScrews;//"Box of screws for metal"
 	picture = "\z\addons\dayz_buildings\equip\item_screws.paa";
 	model = "z\addons\dayz_buildings\models\screws.p3d";
 	descriptionShort = $STR_BLD_desc_ItemScrews;//"Box of screws"
-};
+	
+	class ItemActions {
+		class Spilt {
+			text = "Spilt Box";
+			script = "; [_this] call fn_spiltBag;";
+		};
+	};
+	
+};
+
+/*
+ItemScrews //Construection,farm,indestrial,castle,residential
+ItemBagScrews //(LowChance)Construection,(LowChance)indestrial,supermarket
+ItemRSJ //Construection,farm,indestrial,castle
+ItemConcreteBlock //Construection,indestrial
+ItemMetalSheet //Construection,farm,indestrial,castle
+*/

SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp

@@ -1,4 +1,4 @@
-class ItemPadlock: CA_Magazine
+class ItemPadlock: CA_Magazine //Vanilla lock, left in config for potential admin use, but all scripts changed to use Epoch ItemComboLock
 {
 	scope = public;
 	count = 1;

SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp

@@ -14,26 +14,29 @@ class ItemSandbag : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			consume[] = {"ItemSandbag"};
 			create = "Sandbag1_DZ";
+			//bypass RoadCheck
 			byPass = "byPassRoadCheck";
 		};
 		/*
 		class Build2
 		{
 			text = $STR_CREATE_STASH;
-			script = "; [_id,'Build2'] spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "; [_id,'Build2'] spawn player_build;";
 			require[] = {"ItemEtool"};
 			consume[] = {"ItemSandbag"};
 			create = "StashSmall";
+			//Bypass collision test
+			bypassCollision = "true";
 		}; 
 		*/
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_273;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"ItemSandbagLarge",1}};
@@ -42,7 +45,7 @@ class ItemSandbag : CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_274;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"sandbag_nest_kit",1}};
@@ -51,7 +54,7 @@ class ItemSandbag : CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_298;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"BagFenceRound_DZ_kit",1}};
@@ -61,7 +64,7 @@ class ItemSandbag : CA_Magazine
 		class Crafting3
 		{
 			text = "Craft M240 Nest";
-			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemEtool","ItemToolbox","M240_DZ"};
 			output[] = {{"m240_nest_kit",1}};
@@ -72,20 +75,16 @@ class ItemSandbag : CA_Magazine
 	};
 };
 
-
-
-
 // EPOCH ADDITIONS
 
 class BagFenceRound_DZ_kit : CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Round Sandbag Fence";
+	displayName = $STR_EQUIP_NAME_21_ROUND;
+	descriptionShort = $STR_EQUIP_DESC_21;
 	model = "\dayz_equip\models\sandbags.p3d";
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
-	descriptionShort = $STR_EQUIP_DESC_21;
-
 	class ItemActions {
 		class Build {
 			text = $STR_EPOCH_PLAYER_299;
@@ -96,7 +95,7 @@ class BagFenceRound_DZ_kit : CA_Magazine {
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_195;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"ItemSandbag",1}};
@@ -110,8 +109,8 @@ class sandbag_nest_kit: CA_Magazine
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Sandbag Nest";
+	displayName = $STR_EQUIP_NAME_21_NEST;
-	descriptionShort = "Sandbag Nest: A buildable fortification object, can be removed.";
+	descriptionShort = $STR_EQUIP_DESC_21_NEST;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
 	weight = 50;
@@ -131,22 +130,22 @@ class ItemSandbagLarge : CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "H-barrier cube";
+	displayName = $STR_EQUIP_NAME_21_HBARRIER;
+	descriptionShort = $STR_EQUIP_DESC_21_HBARRIER;
 	model = "\dayz_equip\models\sandbags.p3d"; // TODO model
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
-	descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes.";
 	weight = 50;
 	class ItemActions {
 		class Build {
-			text = "Build H-barrier cube";
+			text = $STR_EPOCH_PLAYER_273_3;
 			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			create = "Land_HBarrier1_DZ";
 		};
 		class Crafting
 		{
-			text = "Craft Triple H-barrier";
+			text = $STR_EPOCH_PLAYER_273_1;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"ItemSandbagExLarge",1}};
@@ -159,22 +158,22 @@ class ItemSandbagExLarge : CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "3 x H-barrier cube";
+	displayName = $STR_EQUIP_NAME_21_3XHBARRIER;
+	descriptionShort = $STR_EQUIP_DESC_21_HBARRIER;
 	model = "\dayz_equip\models\sandbags.p3d"; // TODO model
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
-	descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes.";
 	weight = 150;
 	class ItemActions {
 		class Build {
-			text = "Build Triple H-barrier";
+			text = $STR_EPOCH_PLAYER_273_4;
 			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			create = "Land_HBarrier3_DZ";
 		};
 		class Crafting
 		{
-			text = "Craft 5x H-barrier";
+			text = $STR_EPOCH_PLAYER_273_2;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemEtool","ItemToolbox"};
 			output[] = {{"ItemSandbagExLarge5x",1}};
@@ -187,14 +186,14 @@ class ItemSandbagExLarge5x : CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "5 x H-barrier cube";
+	displayName = $STR_EQUIP_NAME_21_5XHBARRIER;
+	descriptionShort = $STR_EQUIP_DESC_21_HBARRIER;
 	model = "\dayz_equip\models\sandbags.p3d"; // TODO model
 	picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
-	descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes.";
 	weight = 200;
 	class ItemActions {
 		class Build {
-			text = "Build 5x H-barrier";
+			text = $STR_EPOCH_PLAYER_273_5;
 			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			create = "Land_HBarrier5_DZ";

SQF/dayz_code/Configs/CfgMagazines/Items/TankTrap.hpp

@@ -14,7 +14,7 @@ class ItemTankTrap : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemTankTrap"};
 			create = "Hedgehog_DZ";

SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp

@@ -8,21 +8,22 @@ class ItemTent : CA_Magazine
 	picture = "\dayz_equip\textures\equip_tentbag_ca.paa";
 	displayName = $STR_EQUIP_NAME_20;
 	descriptionShort = $STR_EQUIP_DESC_20;
-
 	class ItemActions
 	{
 		class Build
 		{
 			text = $STR_PITCH_TENT;
-			script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "spawn player_build;";
 			require[] = {};
 			consume[] = {"ItemTent"};
 			create = "TentStorage";
+			//Bypass collision test
+			bypassCollision = "true";
 		};
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_270;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"desert_net_kit",1}};
@@ -31,7 +32,7 @@ class ItemTent : CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_271;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"forest_net_kit",1}};
@@ -56,15 +57,17 @@ class ItemDomeTent : CA_Magazine
 		class Build
 		{
 			text = $STR_PITCH_DOME_TENT;
-			script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "spawn player_build;";
 			require[] = {};
 			consume[] = {"ItemDomeTent"};
 			create = "DomeTentStorage";
+			//Bypass collision test
+			bypassCollision = "true";
 		};
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_271;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"forest_net_kit",1}};
@@ -73,8 +76,6 @@ class ItemDomeTent : CA_Magazine
 	};
 };
 
-
-
 // EPOCH ADDITION
 
 class ItemDesertTent : CA_Magazine
@@ -92,7 +93,7 @@ class ItemDesertTent : CA_Magazine
 		class Build
 		{
 			text = $STR_PITCH_DESERT_TENT;
-			script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "spawn player_build;";
 			require[] = {};
 			consume[] = {"ItemDesertTent"};
 			create = "DesertTentStorage";
@@ -100,7 +101,7 @@ class ItemDesertTent : CA_Magazine
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_270;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"desert_net_kit",1}};

SQF/dayz_code/Configs/CfgMagazines/Items/TripWire.hpp

@@ -14,7 +14,7 @@ class ItemTrapTripwireCans : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemTrapTripwireCans"};
 			create = "Trap_Cans";

SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp

@@ -14,7 +14,7 @@ class ItemWire : CA_Magazine
 		class Build
 		{
 			text = $STR_ACTION_BUILD;
-			script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemWire"};
 			create = "Fort_RazorWire"; // 1.8.7 uses Wire_cat1

SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp

@@ -59,13 +59,13 @@ class PartWoodPile : CA_Magazine
 	class ItemActions {
 		class Build {
 			text = $STR_ACTIONS_MAKEFIRE;
-			script = "spawn player_makeFire;";
+			script = "spawn player_makeFire;"; //Do not use player_build because we have no ghost preview model for Land_Fire_DZ yet
 			use[] = {"PartWoodPile"};
 		};
 		class Crafting
 		{
 			text = $STR_EPOCH_PLAYER_242;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"sawmill"};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"PartWoodLumber",1}};
@@ -74,7 +74,7 @@ class PartWoodPile : CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_243;
-			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemKnife"};
 			output[] = {{"WoodenArrow",3}};
@@ -84,7 +84,7 @@ class PartWoodPile : CA_Magazine
 		class Crafting2
 		{
 			text = $STR_EPOCH_PLAYER_244;
-			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; // r_action_count = r_action_count + 1;
+			script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {};
 			requiretools[] = {"ItemToolbox","ItemKnife"};
 			output[] = {{"stick_fence_kit",1}};

SQF/dayz_code/Configs/CfgMagazines/Items/Workbench.hpp

@@ -12,7 +12,7 @@ class ItemWorkBench : CA_Magazine
 	class ItemActions {
 		class Build {
 			text = $STR_BLD_build_ItemWorkBench;//"place WorkBench"
-			script = "spawn player_build;"; //r_action_count = r_action_count + 1; set in sqf
+			script = "; ['ItemWorkBench','Build'] spawn player_build;";
 			require[] = {};
 			consume[] = {"ItemWorkBench"};
 			create = "WorkBench";

SQF/dayz_code/Configs/CfgMagazines/Items/equip_brick.hpp

@@ -8,13 +8,4 @@ class equip_brick : CA_Magazine
 	picture = "\z\addons\dayz_communityassets\pictures\equip_brick.paa";
 	displayName = $STR_ITEM_NAME_equip_brick;
 	descriptionShort = $STR_ITEM_DESC_equip_brick;
-	
-	class ItemActions
-	{
-		class FixKnife
-		{
-			text = $STR_ACTIONS_FIX_KNIFE;
-			script = "; ['ItemKnifeBlunt','ItemKnife'] spawn player_sharpen;";
-		};
-	};
 };

SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp

@@ -69,4 +69,28 @@ class 200Rnd_762x51_M240 : 100Rnd_762x51_M240 {
 	displayName = "200Rnd. M240";
 	count = 200;
 	descriptionShort = "Caliber: 7.62x51mm NATO <br/>Rounds: 200 <br/>Used in: M240, Mk 48 Mod 0";
-};
+};
+
+class 20Rnd_762x51_B_SCAR : CA_Magazine
+{
+	displayName = $STR_DZ_MAG_20Rnd_762x51_B_SCAR_NAME;
+	
+	cartridgeName = "762x51";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};
+
+class 20Rnd_762x51_SB_SCAR : CA_Magazine
+{
+	displayName = $STR_DZ_MAG_20Rnd_762x51_SB_SCAR_NAME;
+	
+	cartridgeName = "762x51_SD";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};

SQF/dayz_code/Configs/CfgMagazines/Magazines/Arrows.hpp

@@ -72,8 +72,10 @@ class 1Rnd_Bolt_Explosive : CA_Magazine
 	ammo = "explosive_bolt";
 };
 
-//TODO: Remove legacy
+/*
-class WoodenArrow : 1Rnd_Arrow_Wood {};
+	//TODO: Remove legacy
-class Quiver : 12Rnd_Quiver_Wood {};
+	class WoodenArrow : 1Rnd_Arrow_Wood {};
-class Tranquiliser_Bolt : 1Rnd_Bolt_Tranquilizer {};
+	class Quiver : 12Rnd_Quiver_Wood {};
-class Crossbow_EX_Bolt : 1Rnd_Bolt_Explosive {};
+	class Tranquiliser_Bolt : 1Rnd_Bolt_Tranquilizer {};
+	class Crossbow_EX_Bolt : 1Rnd_Bolt_Explosive {};
+*/

SQF/dayz_code/Configs/CfgMagazines/Magazines/LauncherAmmo.hpp

@@ -0,0 +1,81 @@
+// Use single slot for everything, let R3F weight handle load
+
+class M136 : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class Javelin : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class AT13 : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class PG7V : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class PG7VL : PG7V {
+	type = WeaponSlotItem;
+};
+
+class PG7VR : PG7V {
+	type = WeaponSlotItem;
+};
+
+class OG7 : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class PG9_AT : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class OG9_HE : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class Stinger : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class SMAW_HEDP : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class SMAW_HEAA : SMAW_HEDP {
+	type = WeaponSlotItem;
+};
+
+class MAAWS_HEDP : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class MAAWS_HEAT : MAAWS_HEDP {
+	type = WeaponSlotItem;
+};
+
+class Strela : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class RPG18 : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class Igla : Strela {
+	type = WeaponSlotItem;
+};
+
+class 2Rnd_Igla : Igla {
+	type = WeaponSlotItem;
+};
+
+class NLAW : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};
+
+class Dragon_EP1 : CA_LauncherMagazine {
+	type = WeaponSlotItem;
+};

SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp

@@ -3,7 +3,7 @@
 #define COMBINE_MAG class CombineMag\
 {\
 	text = $STR_MAG_COMBINE;\
-	script = "spawn player_combineMag; r_action_count = r_action_count + 1;";\
+	script = "spawn player_combineMag;";\
 };
 
 #include "9x18.hpp"			//Makarov
@@ -17,5 +17,6 @@
 #include "Misc.hpp"			//CZ550, Lee-Enfield, Winchester 1866
 #include "Shotgun.hpp"
 #include "Arrows.hpp"
+#include "LauncherAmmo.hpp"
 
 #undef COMBINE_MAG

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

@@ -45,4 +45,62 @@ class 15Rnd_W1866_Slug : CA_Magazine
 	{
 		COMBINE_MAG
 	};
-};
+};
+
+class 10Rnd_127x99_m107 : CA_Magazine
+{
+	displayName = $STR_DZ_MAG_10Rnd_127x99_m107_NAME;
+	
+	cartridgeName = "127x99";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};
+
+class 5Rnd_127x108_KSVK : CA_Magazine
+{
+	displayName = $STR_DZ_MAG_5Rnd_127x108_KSVK_NAME;
+	
+	cartridgeName = "127x108";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};
+
+class 5Rnd_86x70_L115A1: CA_Magazine
+{
+	displayName = $STR_DZ_MAG_5Rnd_86x70_L115A1_NAME;
+	
+	cartridgeName = "86x70";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};
+class 10Rnd_9x39_SP5_VSS: CA_Magazine
+{
+	displayName = $STR_DZ_MAG_10Rnd_9x39_SP5_VSS_NAME;
+	
+	cartridgeName = "9x39";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};
+class 20Rnd_9x39_SP5_VSS: CA_Magazine
+{
+	displayName = $STR_DZ_MAG_20Rnd_9x39_SP5_VSS_NAME;
+	
+	cartridgeName = "9x39";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};

SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp

@@ -124,4 +124,38 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck
 			};
 		};
 	};
-};
+};
+//AA12 Ammo
+class 20Rnd_B_AA12_74Slug : CA_Magazine
+{
+	displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME;
+	
+	cartridgeName = "12Gauge_Slug";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};
+class 20Rnd_B_AA12_Pellets : CA_Magazine
+{
+	displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME;
+	
+	cartridgeName = "12Gauge_Pellets";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};
+class 20Rnd_B_AA12_HE : CA_Magazine
+{
+	displayName = $STR_DZ_MAG_20Rnd_B_AA12_HE_NAME;
+	
+	cartridgeName = "19mm_HE";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};

SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp

@@ -71,8 +71,6 @@ class bloodBagOPOS : bloodBagBase
 	descriptionShort = $STR_BLD_desc_bloodBagOPOS;
 };
 
-
-
 //Whole blood bags -- Can only be obtained by taking blood from another player.
 class wholeBloodBagBase : bloodBagBase
 {

SQF/dayz_code/Configs/CfgMagazines/Planting.hpp

@@ -1,8 +1,8 @@
 class ItemFertilizer: CA_Magazine {
 	scope = public;
 	count = 1;
-	displayName = "Fertilizer";
+	displayName = $STR_CRAFT_NAME_FERTILIZER;
-	descriptionShort = "Fertilizer";
+	descriptionShort = $STR_CRAFT_DESC_FERTILIZER;
 	weight = 0.1;
 	model = "z\addons\dayz_communityassets\models\mre.p3d";	// TODO: model + icon
 	picture = "\z\addons\dayz_communityassets\pictures\equip_mre_CA.paa";
@@ -12,8 +12,8 @@ class ItemFertilizer: CA_Magazine {
 class ItemPumpkinSeed: CA_Magazine {
 	scope = public;
 	count = 1;
-	displayName = "A Pumpkin Seed";
+	displayName = $STR_CRAFT_NAME_PUMPKIN_SEED;
-	descriptionShort = "A Pumpkin Seed";
+	descriptionShort = $STR_CRAFT_DESC_PUMPKIN_SEED;
 	weight = 0.1;
 	model = "\z\addons\dayz_epoch\models\doc_child1.p3d";	// TODO: model + icon
 	picture = "\z\addons\dayz_epoch\pictures\equip_child1_ca.paa";
@@ -34,8 +34,8 @@ class ItemPumpkinSeed: CA_Magazine {
 class ItemPumpkinPlant: CA_Magazine {
 	scope = public;
 	count = 1;
-	displayName = "A Pumpkin Plant";
+	displayName = $STR_CRAFT_NAME_PUMPKIN_PLANT;
-	descriptionShort = "A Pumpkin Plant";
+	descriptionShort = $STR_CRAFT_DESC_PUMPKIN_PLANT;
 	weight = 0.1;
 	model = "\z\addons\dayz_epoch\models\doc_child1.p3d";	// TODO: model + icon
 	picture = "\z\addons\dayz_epoch\pictures\equip_child1_ca.paa";
@@ -54,8 +54,8 @@ class ItemPumpkinPlant: CA_Magazine {
 class ItemHempSeed: CA_Magazine {
 	scope = public;
 	count = 1;
-	displayName = "A Hemp Seed";
+	displayName = $STR_CRAFT_NAME_HEMP_SEED;
-	descriptionShort = "A Hemp Seed";
+	descriptionShort = $STR_CRAFT_DESC_HEMP_SEED;
 	weight = 0.1;
 	model = "\z\addons\dayz_epoch\models\doc_child2.p3d";	// TODO: model + icon
 	picture = "\z\addons\dayz_epoch\pictures\equip_child2_ca.paa";
@@ -76,8 +76,8 @@ class ItemHempSeed: CA_Magazine {
 class ItemHempPlant: CA_Magazine {
 	scope = public;
 	count = 1;
-	displayName = "A Hemp Plant";
+	displayName = $STR_CRAFT_NAME_HEMP_PLANT;
-	descriptionShort = "A Hemp Plant";
+	descriptionShort = $STR_CRAFT_DESC_HEMP_PLANT;
 	weight = 0.1;
 	model = "\z\addons\dayz_epoch\models\doc_child2.p3d";	// TODO: model + icon
 	picture = "\z\addons\dayz_epoch\pictures\equip_child2_ca.paa";

SQF/dayz_code/Configs/CfgMagazines/Throwable.hpp

@@ -15,7 +15,7 @@ class HandRoadFlare : HandGrenade
 		class CombineMag
 		{
 			text = $STR_MAG_COMBINE;
-			script = "spawn player_combineMag; r_action_count = r_action_count + 1;";
+			script = "spawn player_combineMag;";
 		};
 	};
 };
@@ -37,7 +37,7 @@ class HandChemBlue : HandGrenade
 		class CombineMag
 		{
 			text = $STR_MAG_COMBINE;
-			script = "spawn player_combineMag; r_action_count = r_action_count + 1;";
+			script = "spawn player_combineMag;";
 		};
 	};
 };
@@ -59,7 +59,7 @@ class HandChemGreen : HandGrenade
 		class CombineMag
 		{
 			text = $STR_MAG_COMBINE;
-			script = "spawn player_combineMag; r_action_count = r_action_count + 1;";
+			script = "spawn player_combineMag;";
 		};
 	};
 };
@@ -81,7 +81,7 @@ class HandChemRed : HandGrenade
 		class CombineMag
 		{
 			text = $STR_MAG_COMBINE;
-			script = "spawn player_combineMag; r_action_count = r_action_count + 1;";
+			script = "spawn player_combineMag;";
 		};
 	};
 };

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

@@ -105,3 +105,39 @@ class ItemTrashToiletpaper : CA_Magazine
 	displayName = $STR_JUNK_NAME_TOILETPAPER;
 	descriptionShort = $STR_JUNK_DESC_TOILETPAPER;
 };
+
+class FoodChipsSulahoopsEmpty : CA_Magazine
+{
+	scope = public;
+	count = 1;
+	type = WeaponSlotItem;
+	
+	model = "z\addons\dayz_communityassets\models\bag_chips_small_sulahoops_opened.p3d";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_sulahoops_opened_ca.paa";
+	displayName = $STR_FOOD_NAME_CHIPS_EMPTY;
+	descriptionShort = $STR_FOOD_DESC_CHIPS_EMPTY;
+};
+
+class FoodChipsMysticalesEmpty : CA_Magazine
+{
+	scope = public;
+	count = 1;
+	type = WeaponSlotItem;
+	
+	model = "z\addons\dayz_communityassets\models\bag_chips_small_mysticales_opened.p3d";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_mysticales_opened_ca.paa";
+	displayName = $STR_FOOD_NAME_CHIPS_EMPTY;
+	descriptionShort = $STR_FOOD_DESC_CHIPS_EMPTY;
+};
+
+class FoodChipsChocolateEmpty : CA_Magazine
+{
+	scope = public;
+	count = 1;
+	type = WeaponSlotItem;
+	
+	model = "z\addons\dayz_communityassets\models\bag_chips_small_chocolate_opened.p3d";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_chocolate_empty_ca.paa";
+	displayName = $STR_FOOD_NAME_CHIPS_EMPTY;
+	descriptionShort = $STR_FOOD_DESC_CHIPS_EMPTY;
+};

SQF/dayz_code/Configs/CfgMagazines/Trash/TinCan.hpp

@@ -172,28 +172,4 @@ class FoodCanRusCornEmpty : TrashTinCan
 	picture = "\z\addons\dayz_communityassets\pictures\equip_can_small_rus_corn_clean_empty_ca.paa";
 	displayName = $STR_FOOD_NAME_CAN_EMPTY;
 	descriptionShort = $STR_FOOD_DESC_CAN_EMPTY;
-};
+};
-
-class FoodChipsSulahoopsEmpty : TrashTinCan
-{
-	model = "z\addons\dayz_communityassets\models\bag_chips_small_sulahoops_opened.p3d";
-	picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_sulahoops_opened_ca.paa";
-	displayName = $STR_FOOD_NAME_CHIPS_EMPTY;
-	descriptionShort = $STR_FOOD_DESC_CHIPS_EMPTY;
-};
-
-class FoodChipsMysticalesEmpty : TrashTinCan
-{
-	model = "z\addons\dayz_communityassets\models\bag_chips_small_mysticales_opened.p3d";
-	picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_mysticales_opened_ca.paa";
-	displayName = $STR_FOOD_NAME_CHIPS_EMPTY;
-	descriptionShort = $STR_FOOD_DESC_CHIPS_EMPTY;
-};
-
-class FoodChipsChocolateEmpty : TrashTinCan
-{
-	model = "z\addons\dayz_communityassets\models\bag_chips_small_chocolate_opened.p3d";
-	picture = "\z\addons\dayz_communityassets\pictures\equip_bag_chips_small_chocolate_empty_ca.paa";
-	displayName = $STR_FOOD_NAME_CHIPS_EMPTY;
-	descriptionShort = $STR_FOOD_DESC_CHIPS_EMPTY;
-};

SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp

@@ -14,7 +14,7 @@ class ItemSodaEmpty : HandGrenade
 		class Drink
 		{
 			text = $STR_ACTIONS_DRINK2;
-			script = "spawn player_drinkWater;";
+			script = ";[_id] spawn player_fillWater;";
 		};
 		class Crafting {
 			text = "Melt into Bars";
@@ -43,7 +43,7 @@ class TrashTinCan : HandGrenade
 		class Drink
 		{
 			text = $STR_ACTIONS_DRINK2;
-			script = "spawn player_drinkWater;";
+			script = ";[_id] spawn player_fillWater;";
 		};
 		class Crafting {
 			text = "Melt into Bars";

SQF/dayz_code/Configs/CfgMagazines/VehicleAmmo.hpp

@@ -66,4 +66,62 @@ class 50Rnd_127x107_DSHKM : CA_Magazine {
 	lastRoundsTracer = 5; 
 	nameSound = "mgun"; 
 	weight = 4;
+};
+//Pook stuff
+class pook_1300Rnd_762x51_M60: CA_Magazine
+{
+	scope = 2;
+	displayName = "Pook 1300Rnd. 7.62";
+	descriptionShort = "Caliber: 7.62x51mm <br/>Rounds: 1300 <br/>Used in: Pook H13 Gunship";
+	ammo = "pook_762x51_M60";
+	count = 1300;
+	tracersEvery = 5;
+	maxLeadSpeed = 200;
+	nameSound = "mgun";
+	picture = "\z\addons\dayz_epoch\pictures\equip_m134_mag_ca.paa";
+	model = "\z\addons\dayz_epoch\models\m134_mag.p3d";
+	type = "256";
+	weight = 20;
+	
+};
+class pook_250Rnd_762x51: CA_Magazine
+{
+	scope = 2;
+	displayName = "Pook 250Rnd. M240";
+	picture = "\CA\weapons\data\equip\m_m240_ca.paa";
+	count = 250;
+	type = "256";
+	ammo = "B_762x51_Ball";
+	initSpeed = 900;
+	tracersEvery = 4;
+	lastRoundsTracer = 4;
+	nameSound = "mgun";
+	descriptionShort = "Caliber: 7.62x51mm NATO <br/>Rounds: 250 <br/>Used in: Pook H13 Transport";
+	model = "\ca\CommunityConfigurationProject_E\Gameplay_ActualModelsOfWeaponMagazinesVisibleOnTheGround\p3d\100Rnd_762x51_M240.p3d";
+	weight = 8;
+};
+class pook_12Rnd_Grenade_Camel: CA_Magazine
+{
+	scope = 2;
+	ammo = "pook_camel_HE";
+	count = 12;
+	displayName = "12Rnd. Pook Grenade";
+	initSpeed = 3;
+	maxLeadSpeed = 200;
+	nameSound = "grenade";
+	type = "256";
+	picture = "\CA\weapons_E\Data\icons\m_6x40mmHP_CA.paa";
+};
+//mozzie
+class 3Rnd_GyroGrenade: CA_Magazine
+{
+	scope = 2;
+	displayName = "3Rnd. Autogyro Grenade";
+	ammo = "GyroGrenade";
+	count = 3;
+	initSpeed = 3;
+	maxLeadSpeed = 200;
+	nameSound = "grenade";
+	type = "256";
+	picture = "\CA\weapons_E\Data\icons\m_6x40mmHP_CA.paa";
 };

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

@@ -19,11 +19,21 @@ class Category_693 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
+	class Attachment_MFL_Pist {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
 	class Attachment_FL {
 		type = "trade_items";
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
+	class Attachment_MFL {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
 	class Attachment_CCO {
 		type = "trade_items";
 		buy[] = {4,"ItemGoldBar"};

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

@@ -9,7 +9,12 @@ class Category_577 {
 		buy[] = {4,"ItemSilverBar10oz"};
 		sell[] = {2,"ItemSilverBar10oz"};
 	};
-		class 20Rnd_762x51_SB_SCAR {
+	class 20Rnd_762x51_B_SCAR {
+		type = "trade_items";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class 20Rnd_762x51_SB_SCAR {
 		type = "trade_items";
 		buy[] = {1,"ItemGoldBar"};
 		sell[] = {5,"ItemSilverBar10oz"};
@@ -21,8 +26,8 @@ class Category_577 {
 	};
 	class 20Rnd_762x51_DMR {
 		type = "trade_items";
-		buy[] = {6,"ItemGoldBar"};
+		buy[] = {8,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
 	};
 	class 5Rnd_86x70_L115A1 {
 		type = "trade_items";

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

@@ -59,4 +59,65 @@ class Category_575 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
+	class Skin_RU_Soldier_Crew_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	//new Epoch 1.06
+	class Skin_TK_INS_Soldier_AR_EP1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_TK_GUE_Soldier_EP1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_RU_Soldier_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_RU_Soldier_Officer_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_RUS_Soldier1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_RUS_Commander_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_MVD_Soldier_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_Ins_Soldier_2_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_Ins_Commander_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_Ins_Soldier_Crew_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_CDF_Soldier_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
 };

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

@@ -19,11 +19,21 @@ class Category_627 {
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
+	class SCAR_H_LNG_Sniper {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};
 	class SCAR_H_LNG_Sniper_SD {
 		type = "trade_weapons";
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
+	class M110_NVG_EP1 {
+		type = "trade_weapons";
+		buy[] = {7,"ItemGoldBar10oz"};
+		sell[] = {4,"ItemGoldBar10oz"};
+	};
 	class DMR_DZ {
 		type = "trade_weapons";
 		buy[] = {6,"ItemGoldBar10oz"};

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

@@ -49,6 +49,41 @@ class Category_485 {
 		buy[] = {1,"ItemGoldBar10oz"};
 		sell[] = {5,"ItemGoldBar"};
 	};
+	class SCAR_L_CQC {
+		type = "trade_weapons";
+		buy[] = {7,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class SCAR_L_CQC_CCO_SD {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class SCAR_L_CQC_Holo {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class SCAR_L_CQC_EGLM_Holo {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class SCAR_L_STD_EGLM_RCO {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SCAR_L_STD_HOLO {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class SCAR_L_STD_Mk4CQT {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
 	class L85_Holo_DZ {
 		type = "trade_weapons";
 		buy[] = {6,"ItemGoldBar"};
@@ -59,6 +94,11 @@ class Category_485 {
 		buy[] = {6,"ItemGoldBar"};
 		sell[] = {3,"ItemGoldBar"};
 	};
+	class BAF_L85A2_RIS_ACOG {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
 	class SA58_DZ {
 		type = "trade_weapons";
 		buy[] = {2,"ItemGoldBar"};

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

@@ -1,5 +1,5 @@
 class Category_538 {
-	class DZ_Czech_Vest_Puch {
+	class DZ_Czech_Vest_Pouch {
 		type = "trade_backpacks";
 		buy[] = {4,"ItemSilverBar"};
 		sell[] = {2,"ItemSilverBar"};
@@ -29,6 +29,11 @@ class Category_538 {
 		buy[] = {8,"ItemSilverBar10oz"};
 		sell[] = {4,"ItemSilverBar10oz"};
 	};
+	class DZ_CompactPack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};	
 	class DZ_British_ACU {
 		type = "trade_backpacks";
 		buy[] = {4,"ItemGoldBar"};

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

@@ -44,16 +44,21 @@ class Category_678 {
 		buy[] = {6,"ItemSilverBar"};
 		sell[] = {3,"ItemSilverBar"};
 	};
+	class equip_lever {
+		type = "trade_items";
+		buy[] = {6,"ItemSilverBar"};
+		sell[] = {3,"ItemSilverBar"};
+	};
 	class equip_nails {
 		type = "trade_items";
 		buy[] = {2,"ItemSilverBar"};
 		sell[] = {1,"ItemSilverBar"};
 	};
-	class equip_scrapelectronics {
+	/* class equip_scrapelectronics {
 		type = "trade_items";
 		buy[] = {4,"ItemGoldBar"};
 		sell[] = {2,"ItemGoldBar"};
-	};
+	}; */
 	class equip_metal_sheet {
 		type = "trade_items";
 		buy[] = {2,"ItemSilverBar10oz"};
@@ -94,7 +99,7 @@ class Category_678 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
-	class 30m_plot_kit {
+	class plot_pole_kit {
 		type = "trade_items";
 		buy[] = {6,"ItemGoldBar10oz"};
 		sell[] = {6,"ItemGoldBar10oz"};
@@ -109,6 +114,11 @@ class Category_678 {
 		buy[] = {1,"ItemBriefcase100oz"};
 		sell[] = {1,"ItemBriefcase100oz"};
 	};
+	class ItemMixOil {
+		type = "trade_items";
+		buy[] = {8,"ItemSilverBar"};
+		sell[] = {4,"ItemSilverBar"};
+	};
 };
 
 class Category_680 {

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

@@ -49,7 +49,7 @@ class Category_564 {
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
-	class Kamaz {
+	class Kamaz_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};

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

@@ -79,8 +79,59 @@ class Category_628 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
+	class Skin_INS_Lopotev_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	//new Epoch 1.06
+	class Skin_Doctor_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_Assistant_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_Worker1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_Worker3_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_Worker4_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_TK_CIV_Takistani01_EP1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_TK_CIV_Takistani03_EP1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_TK_CIV_Takistani04_EP1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_TK_CIV_Takistani06_EP1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
 };
 
 class Category_689 {
 	duplicate = 628;
-};
+};

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

@@ -1,4 +1,9 @@
 class Category_486 {
+	class BAF_L86A2_ACOG {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
 	class L110A1_DZ {
 		type = "trade_weapons";
 		buy[] = {1,"ItemGoldBar10oz"};

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

@@ -90,4 +90,29 @@ class Category_541 {
 		buy[] = {1,"ItemSilverBar"};
 		sell[] = {1,"ItemSilverBar"};
 	};
+	class equip_string {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class equip_gauze {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class equip_gauzepackaged {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class equip_rag {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class equip_herb_box {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
 };

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

@@ -6,13 +6,13 @@ class Category_624 {
 	};
 	class 5Rnd_762x51_M24 {
 		type = "trade_items";
-		buy[] = {1,"ItemSilverBar10oz"};
+		buy[] = {2,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar"};
+		sell[] = {1,"ItemGoldBar"};
 	};
 	class 20Rnd_762x51_DMR {
 		type = "trade_items";
-		buy[] = {6,"ItemGoldBar"};
+		buy[] = {8,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
 	};
 	class 10Rnd_762x54_SVD {
 		type = "trade_items";

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

@@ -16,7 +16,7 @@ class Category_679 {
 	};
 	class ItemGPS {
 		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
 		sell[] = {1,"ItemGoldBar"};
 	};
 	class Binocular {
@@ -26,14 +26,21 @@ class Category_679 {
 	};
 	class Binocular_Vector {
 		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
 		sell[] = {1,"ItemGoldBar"};
 	};
 	class NVGoggles {
 		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
 		sell[] = {1,"ItemGoldBar"};
 	};
+	/*
+	class NVGoggles_DZE {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	*/
 	class ItemFlashlight {
 		type = "trade_weapons";
 		buy[] = {2,"ItemSilverBar"};

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

@@ -49,11 +49,6 @@ class Category_677 {
 		buy[] = {2,"ItemSilverBar"};
 		sell[] = {1,"ItemSilverBar"};
 	};
-	class ItemMixOil {
-		type = "trade_items";
-		buy[] = {8,"ItemSilverBar"};
-		sell[] = {4,"ItemSilverBar"};
-	};
 };
 
 class Category_682 {

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

@@ -64,4 +64,80 @@ class Category_476 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
+	//new Epoch 1.06
+	class Skin_USMC_Soldier_Officer_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_USMC_Soldier_MG_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_USMC_Soldier_Pilot_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_FR_TL_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_FR_R_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_FR_Sapper_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};	
+	class Skin_FR_Marksman_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_FR_Assault_R_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_CZ_Soldier_SL_DES_EP1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_US_Soldier_EP1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_UN_CDF_Soldier_Guard_EP1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_UN_CDF_Soldier_EP1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_GER_Soldier_TL_EP1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_BAF_Soldier_Officer_MTP_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_BAF_Soldier_N_MTP_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
 };

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

@@ -1,25 +1,35 @@
 class Category_517 {
-	class GNT_C185U {
+	class GNT_C185U_DZ {
 		type = "trade_any_vehicle";
 		buy[] = {4,"ItemGoldBar10oz"};
 		sell[] = {2,"ItemGoldBar10oz"};
 	};
-	class GNT_C185 {
+	class GNT_C185_DZ {
 		type = "trade_any_vehicle";
 		buy[] = {4,"ItemGoldBar10oz"};
 		sell[] = {2,"ItemGoldBar10oz"};
 	};
-	class GNT_C185R {
+	class GNT_C185R_DZ {
 		type = "trade_any_vehicle";
 		buy[] = {4,"ItemGoldBar10oz"};
 		sell[] = {2,"ItemGoldBar10oz"};
 	};
-	class GNT_C185C {
+	class GNT_C185C_DZ {
 		type = "trade_any_vehicle";
 		buy[] = {4,"ItemGoldBar10oz"};
 		sell[] = {2,"ItemGoldBar10oz"};
 	};
-	class AN2_DZ {
+	class AN2_DZ { //Green
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class AN2_2_DZ { //Red and white
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class An2_2_TK_CIV_EP1_DZ { //Green and white
 		type = "trade_any_vehicle";
 		buy[] = {4,"ItemGoldBar10oz"};
 		sell[] = {2,"ItemGoldBar10oz"};