1.0.6.2 cleanup

Removed two exceptions that are no longer used

CHANGE LOG 1.0.6.2.txt

@@ -0,0 +1,109 @@
+[NEW] Newest version of DayZero enterable buildings provided by Tansien and Zac https://zombies.nu/. This fixes broken barracks shadows and adds several new interiors. #1601
+[NEW] Land_houseV_2T2 is now enterable. Interior modeled by @Streatman
+[NEW] Added loot positions for new enterable buildings
+[NEW] Added L85 attachments totaling 24 variants, new models by @Streatman. Class L85_Holo_DZ no longer exists and must be updated to L85A2_DZ in custom scripts and SQL, see 1.0.6.2_Updates.sql
+[NEW] SVD scope attachments can now be removed, new models by @Streatman
+[NEW] Added option to toggle status icons in "Game Options" menu and via F3 hotkey. Note this will also toggle Epoch "friendly" tags because they are the same display.
+[NEW] Added DZE_limitPlots so admins can limit plot poles to one per UID, disabled by default. @oiad
+[NEW] Pumpkin, sunflower, and hemp plants spawned with createVehicle can be harvested with a knife now. #1928 @F507DMT
+[NEW] The journal and dayz_survived variable now contain actual play time [array] instead of days since the character was created [number].
+[NEW] Added secondary iron sight to CZ550 modeled by @Streatman
+[NEW] Added bolt animations to CZ550 and LeeEnfield modeled by @Streatman
+[NEW] Added some basic compatibility for falconsan's Ruegen map (beta version released February 2016)
+[NEW] Admins can now define what parts are returned from modular building parts, see configVariables.sqf/DZE_modularConfig @oiad @BigEgg17
+[NEW] Added basic server-side authentication to hive object creation/deletion for improved security. Affects Server_(DeleteObj|PublishObj|PublishVeh|SwapObj|UpdateObject), admins and script makers should review the changes if using PVDZ_obj_(Destroy|Publish), PVDZ_veh_Save, PVDZE_obj_Swap, PVDZE_veh_(Publish|Upgrade) or server_deleteObj and verify custom code is compliant with these changes (github.com/EpochModTeam/DayZ-Epoch/commit/42e0047)
+[NEW] Added BAF_L85A2_RIS_TWS_DZ to emulate the old behavior of the now NV only BAF_L85A2_RIS_CWS. This weapon is not used by default. Server owners can implement it if desired. #1983
+[NEW] Admins can now define a maximum build height, see configVariables.sqf/DZE_BuildHeightLimit. @BigEgg17
+[NEW] Admins can now change the lootRefreshTimer for each building type from the default 15 minutes. CfgLoot.hpp must be updated if using custom loot tables.
+
+[UPDATED] Loot and zed spawn is now disabled in trader cities by default. This is configurable in mission\init.sqf via DZE_SafeZonePosArray. Added function to check positions against DZE_SafeZonePosArray "_PosInSafeZone = _positionToCheck call DZE_SafeZonePosCheck;"
+[UPDATED] Zombie pathing. Zeds should now run more direct to players and no longer get stuck at the position where a player entered a vehicle.
+[UPDATED] The RIS attachment can be removed from the SA58_RIS_DZ now. @LunaCB
+[UPDATED] The player now auto rejoins their group after dropping a radio and picking it back up when dayz_requireRadio=true. @SmokeyBR
+[UPDATED] Owners can no longer be removed by added friends in plot and door management. @oiad
+[UPDATED] A new hidden version of the gear menu is now used for force saves so players do not see the dialog flash on screen.
+[UPDATED] Anyone can now lock a modular door without knowing the combination or having any special access. #1944 @ndavalos
+[UPDATED] Locking and unlocking safes no longer plays the medic animation. #1942 @SmokeyBR
+[UPDATED] Locking and unlocking safes now uses call instead of spawn on the server. This fixes the user input lock and safes appearing to disappear momentarily when server FPS is low.
+[UPDATED] Added cleanup of destroyed vehicles and CraterLong after 5 minutes in sched_corpses.sqf.
+[UPDATED] Reverted group menu color scheme to A2OA default for consistency with game dialogs
+[UPDATED] All Zupa dialogs have been updated to use consistent title bar color, button colors, text style and background. The trader menu background is now semi-transparent for increased visibility of surroundings.
+[UPDATED] DZE_ZombieSpeed = [min, max]; has replaced the, now removed, DZE_slowZombies variable. set DZE_ZombieSpeed = [2,2]; for DZE_slowZombies = true; behavior. see configvariables.sqf for more info
+[UPDATED] Reverted increased waves in stormy weather to Chernarus default settings.
+[UPDATED] Removed server control panel, because it is abused by players and not currently used by admins
+[UPDATED] Moved large format strings in dayz_server to str formatText to avoid A2 2048 format character limit
+[UPDATED] Vehicles can now only be sold from the "Gear" sell menu. This prevents accidental selling when using the "sell all" feature on backpacks and vehicle inventories.
+[UPDATED] Added all upgraded weapons to the traders as sell only for the sell price of the base weapon plus the sell price of attachments. This allows them to be sold without removing attachments first. #1982 @worldwidesorrow
+[UPDATED] Increased the coverage angle of headlights on land vehicles and added a headlight to the old bicycle
+[UPDATED] The huey searchlight and gunner seat now have improved visibility in first person view.
+[UPDATED] The AH6X_DZ now uses a new model which removes the camera and computer, adds a search light and fixes unknown animation source turret errors.
+[UPDATED] Removed policecar from dayz_vehicles due to model errors, SQL must be updated if this vehicle was used, see 1.0.6.2_Updates.sql
+[UPDATED] Player is no longer set in combat for throwing a flare or chemlight
+[UPDATED] CSJ_Gyro push script so it no longer spams global setPos. This allows MaxSetPosPerInterval to be filtered in BEServer.cfg.
+[UPDATED] Updated DatabaseMySQL.dll to MySQL version 5.7.20, server admins should update to MySQL server 5.7.20 or above. Updated tbb.dll and tbbmalloc.dll to Intel TBB 2018 Update 2
+[UPDATED] Some DZ weapons which had magazine types restricted (AK, G17, M249, PDW) can now use all compatible A2 magazines. Silenced DZ weapons can now use both SD and non-SD magazines again.
+[UPDATED] Added example basic.cfg and BEServer.cfg files to server configs
+
+[FIXED] Purchased and upgraded vehicles will now spawn quicker and no longer be destroyed by sched_safetyVehicle when server FPS is low. HiveExt.dll and SQL must be updated. See 1.0.6.2_Updates.sql
+[FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc
+[FIXED] Trees at POI can be chopped down now. Other trees spawned with createVehicle can be added to dayz_treeTypes in variables.sqf to allow chopping them down.
+[FIXED] Vanilla POI were updated with new locations and moved back to global spawn again. This synchronizes the POI buildings and trees destroyed/chopped status for all clients.
+[FIXED] All traps now need to be armed after placing. This fixes them not triggering right after building.
+[FIXED] Smoke and grenade tripwires now require a grenade to rearm after triggering.
+[FIXED] Player no longer does medic animation after triggering a single use trap.
+[FIXED] Removing a trap with no room in your gear will no longer delete the trap.
+[FIXED] Player_forceSave is now called correctly when the abort menu is opened. It was previously using the wrong variable and time.
+[FIXED] The unconscious wake up animation can no longer be skipped by using a bandage or other right click actions.
+[FIXED] Sharpening a knife will no longer delete one if the player already had a fully sharpened knife on their toolbelt (duplicate weapon).
+[FIXED] Swimming in air or ground after relog, clothes change and respawn on certain maps. #1913 @Cherdenko
+[FIXED] Arma cheats (LeftShift + NumPad-) enterable on map display and create marker text box. #1915 @BigEgg17
+[FIXED] It is no longer possible to duplicate melee weapons by double clicking to drop and right clicking at the same time. @F507DMT
+[FIXED] Death messages and damage sometimes showing RunOver when they should not due to a variable not resetting after being runover. @oiad
+[FIXED] CFGMoves/Animation CTD on server. @icomrade Thanks Choc for reporting
+[FIXED] DayZ_RollingMessage FPS impact. #1926 @BigEgg17
+[FIXED] Random skin selection on new character creation with DZE_defaultSkin = [["Male skin1","Male skin2"],["Female skin1","Female skin2"]];
+[FIXED] Corpse markers are now deleted for bodies that are hidden.
+[FIXED] Unable to eat FoodPumpkin
+[FIXED] Unable to sell classic 'ItemBloodbag' at traders @oiad
+[FIXED] Unable to sell upgraded _DZE[1-4] vehicle variants if their base vehicle class is removed from the trader configs
+[FIXED] The player building a shed, tent or other unlocked storage was unable to use its gear and M240 nests were non-functional until relog when DZE_GodModeBase=true; @oiad
+[FIXED] Death message killer inaccurate when player is caused to bleed by one unit and then killed by a different unit shortly after. @oiad
+[FIXED] Group saving issue which could potentially join a player to a random group or not save group properly after death.
+[FIXED] Harvested pumpkin, sunflower, and hemp plants no longer respawn after relog (allowed infinite harvesting).
+[FIXED] Multiple players can no longer harvest the same plant at once. #1928 @F507DMT
+[FIXED] Purchased boats sometimes not spawning on helipad even when it is free of obstructions.
+[FIXED] Unable to fill water at some ponds and wells on Napf and Namalsk due to missing or misplaced waterHoleProxy.
+[FIXED] Potential undefined error for dayz_characterID on login. @oiad
+[FIXED] Actions like cook, gather meat, repair, etc. are now interrupted properly if the player vaults, moves or enters a vehicle during the medic animation. #1942 @SmokeyBR
+[FIXED] Readded crossbow reload sound
+[FIXED] Using setDamage or setHit to kill a player via script will no longer cause a double death.
+[FIXED] The dramatic recoil camera shake effect from a nearby bullet hit is now reset correctly instead of remaining permanent.
+[FIXED] Added temporary fix for missing AS50 ammo error with beta branch core patch. #1955 @AirwavesMan
+[FIXED] Melee and tranquilizer bolt knockouts were usually instant or far shorter than the intended time of 20s-80s.
+[FIXED] Multiple dupe fixes - SERVER ADMINS, DO NOT IMPLEMENT SCRIPTS WHICH KICK PLAYERS TO THE LOBBY (ENDMISSION, FAILMISSION, etc.), YOU MUST KICK THEM ENTIRELY OUT OF THE SERVER! (EX: by BE restriction, but with the stock scripts.txt forceEnd, failmission, and endmission should kick the player anyway)
+[FIXED] Certain classes (i.e. Satchel Charge) which are both magazines and weapons were not retained through skin change #1981 @AirwavesMan
+[FIXED] Blocked another A2OA script execution bug from improperly cleared eventhandlers. See dayz_code\system\antihack.sqf. Thanks to Dihan for reporting
+[FIXED] Missing shadows on some _DZ weapons. Thanks @Streatman
+[FIXED] Launchers and launcher ammo are now detected correctly in the sell menu when a player has a launcher and ammo with the same classname.
+[FIXED] Wrong bleeding icon on Epoch legacy status UI
+[FIXED] A locked door can now be auto unlocked right after placement by the player who built it
+[FIXED] A rare error in keyboard.sqf for certain combination binds.
+[FIXED] Floating loot positions in hotel (Land_HouseB_Tenement)
+[FIXED] Updates to humanity and player stats after a skin change not always saving in hive (server_getDiff)
+[FIXED] Bad vehicle type crew error for RHIB2Turret on A2OA main menu intro scene
+[FIXED] Fresh spawns running on login if they died while running
+[FIXED] Death camera height incorrect when player dies above terrain level
+[FIXED] Duplicate weapon error when player dies with the same weapon in hands and on back
+[FIXED] Vehicle getOut event handler no longer runs on M240 Nest and other static weapons.
+[FIXED] Autorun no longer freezes players when they spam the key or attempt to reactivate it near a body of water.
+
+[NOTE] Fixes below were included in hotfix 1.0.6.1A (March 10th 2017) and are now in the default files.
+[FIXED] Fixed food and drink going down 10x faster from melee and other "working" actions. 
+[FIXED] Glitch where group icons scaled very large momentarily while moving off screen.
+[NEW] Added temporary check for mission file overwrite exploit. This can be removed after Bohemia patches it.
+
+[INFO] Server admins must update HiveExt.dll.
+[INFO] HiveExt.dll has been updated to return character_data duration in the 101 call for the dayz_survived stat. Source is available at github.com/vbawol/DayZhiveEpoch/pull/13 @icomrade
+[INFO] HiveExt.dll REQUIRES A NEW PROCEDURE BE ADDED TO YOUR DATABASE FOR IMPROVED VEHICLE/OBJECT SPAWNING LOGIC, SEE 1.0.6.2_UPDATES.SQL!
+[INFO] The server config directory should be located outside the server's A2OA directory for security. This is now done in the example server configs by default.
+[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,142 +0,0 @@
-[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.

Documents/1.0.6 Variable Name Changes.txt

@@ -1,6 +1,7 @@
 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

Documents/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.

README.md

@@ -14,6 +14,7 @@ http://dayzmod.com
 --------------------------
 Included Custom Addons
 --------------------------
+* DayZero Enterable Buildings - https://zombies.nu/
 * AutoGyro - by CSJ http://www.armaholic.com/page.php?id=2359
 * Taxi by [GLT]Myke http://www.armaholic.com/page.php?id=12289
 * Blackhawk and Seahawk Wrecks by [GLT]Myke http://www.armaholic.com/page.php?id=10670
@@ -27,7 +28,6 @@ Included Custom Addons
 * gdtmod_grass 1.00 by HeinBloed - http://www.gdt-server.net/
 * Bell 47/H-13 Helicopter by hcpookie - http://www.armaholic.com/page.php?id=22143
 * USEC CH53 by Rocket - http://dayz.com
-* More enterable buildings - Dayzero - https://zombies.nu/
 * Anzio 20mm Rifle by WillRobinson - http://www.armaholic.com/page.php?id=30175
 * RedRyder BB Gun by WillRobinson - https://github.com/arma2WillRobinson/Red-Ryder
 
@@ -112,15 +112,20 @@ GitHub Contributors (In order of most commits)
 * AirwavesMan - https://github.com/AirwavesMan
 * Raziel23x - https://github.com/Raziel23x
 * strikerforce - https://github.com/strikerforce
+* dreamforceinc - https://github.com/dreamforceinc
+* F507DMT - https://github.com/F507DMT 
+* ndavalos - https://github.com/ndavalos
+* SmokeyBR - https://github.com/SmokeyBR
 
 --------------------------
 Special thanks
 --------------------------
 * BIS for a incredible and versatile game and engine. http://www.bistudio.com/
 * Rocket - DAYZ! http://dayzmod.com | http://dayzgame.com 
+* Rajkosto - DayZ Hive DLL - https://github.com/rajkosto/hive
 * DayZ Community Developers - https://github.com/DayZMod
 * ziellos2k - Tag Friendly code. https://github.com/ziellos2k
-* Dayz Hive DLL - https://github.com/rajkosto/hive
+* Tansien and Zac - for providing and creating DayZero Enterable Buildings https://zombies.nu/
 * Munchiefest - Beta Tester, Wiki Editor, Ideas - http://www.twitch.tv/munchiefest
 * Chelsey - Beta Tester, New female textures.
 * OrangeSherbet - Beta Tester - http://www.twitch.tv/orangesherbet

SQF/dayz_anim/CfgBanned/CfgWeapons.hpp

@@ -9,7 +9,7 @@ class CfgWeapons {
 	class RifleCore;
 	class FakeWeapon: RifleCore
 	{
-		scope = protected;
+		scope = 1;
 		stopThis = true;
 		type = 0;
 		cursor = "";
@@ -36,8 +36,11 @@ class CfgWeapons {
 	//class M24: FakeWeapon {};
 	//class M40A3: FakeWeapon {};
 	//class M240: FakeWeapon {};
+	class M240_Small: FakeWeapon {};
 	//class Mk_48: FakeWeapon {};
+	class Mk_48_Small: FakeWeapon {};
 	//class M249: FakeWeapon {};
+	class M249_Small: FakeWeapon {};
 	//class M4A1: FakeWeapon {};
 	//class M4A1_Aim: FakeWeapon {};
 	//class M4A1_Aim_camo: FakeWeapon {};
@@ -50,12 +53,14 @@ class CfgWeapons {
 	//class MP5SD: FakeWeapon {};
 	//class MP5A5: FakeWeapon {};
 	//class PK: FakeWeapon {};
+	class PK_Small: FakeWeapon {};
 	class Pecheneg: FakeWeapon {};
 	//class SVD: FakeWeapon {};
 	//class SVD_CAMO: FakeWeapon {};
 
 	//class Launcher: FakeWeapon {};
 	class ksvk: FakeWeapon {};
+	class ksvk_Small: FakeWeapon {};
 	class M136: FakeWeapon {};
 	class Javelin: FakeWeapon {};
 	class Stinger: FakeWeapon {};
@@ -208,12 +213,14 @@ class CfgWeapons {
 	//class AKS_74_U: FakeWeapon {};
 	//class AKS_74_UN_kobra: FakeWeapon {};
 	//class RPK_74: FakeWeapon {};
+	class RPK_74_Large: FakeWeapon {};
 	//class bizon: FakeWeapon {};
 	//class bizon_silenced: FakeWeapon {};
 	//class Colt1911: FakeWeapon {};
 	//class DMR: FakeWeapon {};
 	//class M1014: FakeWeapon {};
 	class m107: FakeWeapon {}; //old .50cal
+	class m107_Small: FakeWeapon {};
 	class M252: FakeWeapon {};
 	class 2B14: FakeWeapon {};
 	class Saiga12K: FakeWeapon {};
@@ -225,6 +232,7 @@ class CfgWeapons {
 	class m8_compact: FakeWeapon {};
 	class m8_sharpshooter: FakeWeapon {};
 	class m8_SAW: FakeWeapon {};
+	class m8_SAW_Large: FakeWeapon {};
 	//class huntingrifle: FakeWeapon {};
 	class RPG18: FakeWeapon {};
 	class SMAW: FakeWeapon {};
@@ -246,6 +254,7 @@ class CfgWeapons {
 	class CRV7_FAT: FakeWeapon {};
 	class M621: FakeWeapon {};
 	class BAF_AS50_scoped: FakeWeapon {}; //old .50cal
+	class BAF_AS50_scoped_Large: FakeWeapon {};
 	class BAF_AS50_TWS: FakeWeapon {};
 	class BAF_LRR_scoped: FakeWeapon {}; 
 	class BAF_LRR_scoped_W: FakeWeapon {};
@@ -262,6 +271,7 @@ class CfgWeapons {
 	class BAF_L86A2_ACOG: FakeWeapon {};
 	class BAF_L110A1: FakeWeapon {};
 	//class BAF_L110A1_Aim: FakeWeapon {};
+	class BAF_L110A1_Aim_Small: FakeWeapon {};
 	class BAF_L7A2_GPMG: FakeWeapon {};
 	class BAF_ied_v1: FakeWeapon {};
 	class BAF_ied_v2: FakeWeapon {};
@@ -287,10 +297,15 @@ class CfgWeapons {
 	class revolver_gold_EP1: FakeWeapon {};
 	//class glock17_EP1: FakeWeapon {};
 	//class M60A4_EP1: FakeWeapon {};
+	class M60A4_EP1_Small: FakeWeapon {};
 	//class Mk_48_DES_EP1: FakeWeapon {};
+	class Mk_48_DES_EP1_Small: FakeWeapon {};
 	//class M249_EP1: FakeWeapon {};
+	class M249_EP1_Small: FakeWeapon {};
 	class M249_TWS_EP1: FakeWeapon {};
+	class M249_TWS_EP1_Small: FakeWeapon {};
 	class M249_m145_EP1: FakeWeapon {};
+	class M249_m145_EP1_Small: FakeWeapon {};
 	//class M24_des_EP1: FakeWeapon {};
 	//class SVD_des_EP1: FakeWeapon {};
 	//class SVD_NSPU_EP1: FakeWeapon {};
@@ -318,6 +333,7 @@ class CfgWeapons {
 	class G36K: FakeWeapon {};
 	class MG36: FakeWeapon {};
 	class MG36_camo: FakeWeapon {};
+	class MG36_camo_Large: FakeWeapon {};
 	class GrenadeLauncher_EP1: FakeWeapon {};
 	class M32_EP1: FakeWeapon {};
 	class M79_EP1: FakeWeapon {};
@@ -328,6 +344,7 @@ class CfgWeapons {
 	class M110_NVG_EP1: FakeWeapon {};
 	//class M14_EP1: FakeWeapon {};
 	//class m240_scoped_EP1: FakeWeapon {};
+	class m240_scoped_EP1_Small: FakeWeapon {};
 	class M47Launcher_EP1: FakeWeapon {};
 	class MAAWS: FakeWeapon {};
 	class SCAR_Base: FakeWeapon {};
@@ -353,7 +370,9 @@ class CfgWeapons {
 	class M32_heli: FakeWeapon {};
 	class AA12_PMC: FakeWeapon {};
 	class PMC_AS50_scoped: FakeWeapon {};
+	class PMC_AS50_scoped_Large: FakeWeapon {};
 	class PMC_AS50_TWS: FakeWeapon {};
+	class PMC_AS50_TWS_Large: FakeWeapon {};
 	class m8_carbine_pmc: FakeWeapon {};
 	class m8_compact_pmc: FakeWeapon {};
 	class m8_holo_sd: FakeWeapon {};

SQF/dayz_code/Configs/CfgArma.hpp

@@ -20,7 +20,7 @@ class CfgActions {
 	class PutBag : None { show = 0; };
 	class DropBag : None { show = 0; };
 	class AddBag : None { show = 0; };
-	//class TakeMine : None { show = 0; };
+	class TakeMine : None { show = 0; };
 	class DropWeapon : None { show = 0; };
 	class PutWeapon : None { show = 0; };
 	class DropMagazine : None { show = 0; };

SQF/dayz_code/Configs/CfgCrafting/CfgCrafting.hpp

@@ -12,20 +12,6 @@ class CfgCrafting {
 	#include "Recipes\Weapons\BaseBallBatBarbed.hpp"
 	#include "Recipes\Weapons\Crossbow.hpp"
 
-	//Not Ready
-	/*
-	#include "Recipes\Weapons\M9SD.hpp"
-	#include "Recipes\Weapons\M4A1_AIM.hpp"
-	#include "Recipes\Weapons\MAKAROVSD.hpp"
-	#include "Recipes\Weapons\bizonSD.hpp"
-	#include "Recipes\Weapons\SVD_CAMO.hpp"
-	#include "Recipes\Weapons\M4A1_Aim_CAMO.hpp"
-	#include "Recipes\Weapons\M4A1_HWS_GL_CAMO.hpp"
-	#include "Recipes\Weapons\G36C_camo.hpp"
-	#include "Recipes\Weapons\G36A_camo.hpp"
-	#include "Recipes\Weapons\G36K_camo.hpp"
-	*/
-
 	//Medical
 	#include "Recipes\Medical\Bandage.hpp"
 	#include "Recipes\Medical\sepsisBandage.hpp"

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/G36A_camo.hpp

@@ -1,17 +0,0 @@
-class Blueprint_G36A_camo : Recipe {
-	displayName = $STR_CRAFT_NAME_G36A_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_G36A_CAMO;
-	input[] = 
-	{
-		{"G36A","CfgWeapons",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"G36A_CAMO","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/G36C_camo.hpp

@@ -1,17 +0,0 @@
-class Blueprint_G36C_camo : Recipe {
-	displayName = $STR_CRAFT_NAME_G36C_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_G36C_CAMO;
-	input[] = 
-	{
-		{"G36C","CfgWeapons",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"G36C_CAMO","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/G36K_camo.hpp

@@ -1,17 +0,0 @@
-class Blueprint_G36K_camo : Recipe {
-	displayName = $STR_CRAFT_NAME_G36K_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_G36K_CAMO;
-	input[] = 
-	{
-		{"G36K","CfgWeapons",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"G36K_CAMO","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/M4A1_AIM.hpp

@@ -1,19 +0,0 @@
-class Blueprint_M4A1_AIM : Recipe {
-	displayName = $STR_CRAFT_NAME_M4A1_AIM;
-	descriptionShort = $STR_CRAFT_DESC_M4A1_AIM;
-	input[] = 
-	{
-		{"M4A1","CfgWeapons",1},
-		{"Attachment_AIM","CfgMagazines",1},
-		{"equip_rail_screws","CfgMagazines",2},
-		{"equip_weapon_rails","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"M4A1_AIM","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/M4A1_Aim_CAMO.hpp

@@ -1,17 +0,0 @@
-class Blueprint_M4A1_Aim_CAMO : Recipe {
-	displayName = $STR_CRAFT_NAME_M4A1_Aim_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_M4A1_Aim_CAMO;
-	input[] = 
-	{
-		{"M4A1_Aim","CfgWeapons",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"M4A1_Aim_CAMO","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/M4A1_HWS_GL_CAMO.hpp

@@ -1,17 +0,0 @@
-class Blueprint_M4A1_HWS_GL_CAMO : Recipe {
-	displayName = $STR_CRAFT_NAME_M4A1_HWS_GL_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_M4A1_HWS_GL_CAMO;
-	input[] = 
-	{
-		{"M4A1_HWS_GL","CfgWeapons",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"M4A1_HWS_GL_CAMO","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/M9SD.hpp

@@ -1,17 +0,0 @@
-class Blueprint_M9SD : Recipe {
-	displayName = $STR_CRAFT_NAME_M9SD;
-	descriptionShort = $STR_CRAFT_DESC_M9SD;
-	input[] = 
-	{
-		{"M9","CfgWeapons",1},
-		{"Attachment_Silencer","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"M9SD","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/MAKAROVSD.hpp

@@ -1,17 +0,0 @@
-class Blueprint_MAKAROVSD : Recipe {
-	displayName = $STR_CRAFT_NAME_MAKAROVSD;
-	descriptionShort = $STR_CRAFT_DESC_MAKAROVSD;
-	input[] = 
-	{
-		{"Makarov","CfgWeapons",1},
-		{"Attachment_Silencer","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"MakarovSD","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/SVD_CAMO.hpp

@@ -1,18 +0,0 @@
-class Blueprint_SVD_CAMO : Recipe {
-	displayName = $STR_CRAFT_NAME_SVD_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_SVD_CAMO;
-	input[] = 
-	{
-		{"SVD_DZ","CfgWeapons",1},
-		{"Skin_Sniper1_DZ","CfgMagazines",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"SVD_CAMO_DZ","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/bizonSD.hpp

@@ -1,17 +0,0 @@
-class Blueprint_bizonSD : Recipe {
-	displayName = $STR_CRAFT_NAME_bizonSD;
-	descriptionShort = $STR_CRAFT_DESC_bizonSD;
-	input[] = 
-	{
-		{"bizon","CfgWeapons",1},
-		{"Attachment_Silencer","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"bizon_silenced","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

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

@@ -18,4 +18,11 @@ class Land_BoatSmall_2b : Default
 	lootChance = 0.1;
 	lootPos[] = {{0.00390625,-0.250977,-0.348389}};
 	lootGroup = Boat;
-};
+};
+// ALT-MAP
+class land_molo : Default
+{
+	lootChance = 0.3;
+	lootPos[] = {{-0.94043,2.16602,3.30015}};
+	lootGroup = Boat;
+};

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

@@ -139,11 +139,20 @@ class Land_Church_05R : Church
 		{-4.85,8.19,-8}
 	};
 };
-//DZE ADDED BELOW
-class land_kostelik_final_2122: Church {
+//ALT-MAP suport
+class land_kostelik_final_2122: Church //nm whitewashed wooden slats
+{
 	lootPos[] = {{5.41992,-3.45703,-5.57918},{-0.963379,4.74414,-5.57919},{1.09082,-2.79297,-5.57919},{-1.39063,-5.18555,-5.57918}};
 };
-
+class Land_A_Mosque_small_2_EP1: Church // tak
+{
+	lootPos[] = { { 1.33496,-0.726074,-2.48535 }, { -0.794922,-1.74414,-2.48538 } };
+};
+class Land_A_Minaret_EP1 : Church // tak
+{
+	lootPos[] =	{ {0.158691,0.131836,5.13947}, {1.86914,-2.97461,5.1394} 	};
+};
+//DZE ADDED BELOW
 class Land_A_Mosque_big_hq_EP1: Church {
 	lootPos[] = {{4.06592,-6.90674,-9.31999},{5.25195,4.07666,-9.31999},{5.70264,7.5376,-4.04752},{-4.78857,-7.00684,-4.04753},{3.93262,9.41846,0.567287},{0.882324,-0.134766,-9.31999}};
 };
@@ -162,10 +171,3 @@ class Land_A_Mosque_small_1_EP1: Church
 		{ 6.66406,4.11719,-1.9437 },
 		{ 0.49707,-1.33301,-1.69603 }};
 };
-
-class Land_A_Mosque_small_2_EP1: Church
-{
-	lootPos[] = {
-		{ 1.33496,-0.726074,-2.48535 },
-		{ -0.794922,-1.74414,-2.48538 }};
-};

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

@@ -45,10 +45,6 @@ class Land_Barn_W_01: Farm {
 	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,28 +74,60 @@ class Land_Shed_W02: Farm {
 	zedPos[] = {{0.688232,1.88281,-0.00292969}};
 	lootPos[] = {{0.688232,1.88281,-0.00292969}};
 };
-
-//DZE ADDED BELOW
+// ALT-MAP Support 
+class Land_sara_stodola: Farm { // brown wooden barn one story
+	zedPos[] = {{-0.637695,2.9707,-2.19523},{0.459961,0.398438,-2.19523}};
+	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}};
+};
+//land_domek_podhradi_1 in Residential.hpp
+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}};
+	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[] = {{3.86279,9.33008,-2.05339},{-2.43359,-9.56152,-2.0534},{2.12061,-22.3691,-6.30976},{2.13379,17.9229,-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[] = {{-2.42578,6.77832,-2.14676},{0.0078125,-1.14941,-2.14676},{-4.2085,-12.3887,-2.14676},{0.878906,-9.51953,-6.26657},{-0.756348,0.71875,-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}};
 };
-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}};
-	//lootPos[] = {{5.2832,-11.1592,-2.0262},{4.56445,10.0796,-2.0262},{-2.20215,-0.935547,-2.0262},{4.02734,4.24463,-2.0262}};
-	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}};
+//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_jzd_stodola1: Farm {
+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
+class land_jzd_stodola1: Farm // nm
+{
 	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 { // brown wooden barn one story
-	zedPos[] = {{-0.637695,2.9707,-2.19523},{0.459961,0.398438,-2.19523}};
-	//lootPos[] = {{2.72266,-1.14648,-2.19523},{4.06152,3.59375,-2.19523},{-3.32324,3.92969,-2.19523},{-3.99219,-0.698242,-2.19523}};
-	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}};
+//land_plynom in Residential.hpp
+class land_zd_2: Farm // nm shed
+{
+	zedPos[] = {{-0.195313,0.174805,-1.82467}};
+	lootPos[] = {{0.630859,0.280273,-1.82467}, {-1.48145,1.44141,-1.82466}};
 };
+//land_zd_1 in Residential.hpp
+//land_marsh1 in Residential.hpp
+//DZE ADDED BELOW
+class land_shed_m01: Farm {
+	zedPos[] = {{0.218262,-1.78369,-0.347349}};
+};

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

@@ -10,6 +10,7 @@ class Hospital : Default
 
 class Land_A_Hospital : Hospital
 {
+	//lootChance = 0.2;
 	lootPos[] = {
 		//{0.79834,-1.16895,-7.33966},{-7.2334,-2.63574,-7.33966},{-16.3687,-2.4043,-7.33966},{-12.2847,-3.19434,-7.33966},{4.24268,-3.59375,-7.33966},{-3.2666,-0.925781,-7.33966},{6.85693,-2.75098,-7.33966},{11.0151,-3.9541,-7.33966},{16.8198,-4.71094,-7.33966},{-1.6875,5.47168,-7.4494},{12.7476,0.144531,3.29184},{10.2661,-1.21582,3.29184},
 		{17.665,-4.67188,-7.2566},{-20.7139,-1.48047,-7.2566},{-15.6924,8.60889,-7.2566},{-15.6064,1.95557,-6.8266},{-16.2139,2.27051,-7.2566},{-8.68652,4.19189,-3.7576},{14.2441,-3.98535,-3.7576},{21.5693,5.16455,1.19051},{18.3779,2.40869,6.2524},{-15.3359,-1.25439,3.40458},{-20.3252,0.410156,-3.82761}

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

@@ -316,17 +316,19 @@ class Land_Misc_PowerStation : Industrial
 
 class Land_Shed_W01 : Industrial
 {
-	zedPos[] =
-	{
-		{-1.52832,-0.249023,-1.41138}
-	};
 	lootPos[] =
 	{
-		//{-1.52832,-0.249023,-1.41138}
 		{-1.46289,-0.12207,-1.41129}
 	};
 };
 
+class Land_Shed_W4 : Industrial
+{
+	maxRoaming = 3;
+	zedPos[] = {};
+	lootPos[] = {{-1.8,2.3,-1.32},{-2.1,-1.85,-1.32},{1.85,2.83,-1.32},{0.85,-0.56,-1.32}};
+};
+
 class Land_Tovarna2 : Industrial
 {
 	zedPos[] =
@@ -1043,6 +1045,168 @@ 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
+class Land_Ind_Oil_Pump_EP1: Industrial  // tak oil pump
+{
+	lootPos[] = {{ 1.49048,-1.99609,-2.08473 }};
+};
+class land_provoz1: Industrial // nm brick garage
+{
+	zedPos[] = {{-0.134766,2.26465,-2.30756},{3.37305,1.97266,-2.30756},{-4.29297,-1.39258,-2.30756},{4.35107,-1.93945,-2.30756}};
+	lootPos[] = {{1.60449,1.63086,-2.30756},{-2.98193,2.74121,-2.30756},{-1.59277,-2.30273,-2.30756},{1.97852,-2.03613,-2.30756}};
+};
+class land_b_small1: Industrial // nm cinder blocks 
+{
+	lootPos[] = {{-3.14185,1.36816,-1.50033},{-0.0275879,-1.74707,-1.50033},{-3.59619,-3.18945,-1.50033},{-0.729004,-4.95996,-1.50033}};
+};
+class land_seb_nasypka: Industrial // nm cement + metal
+{
+	zedPos[] = {{7.96338,0.114258,-6.50023}};
+	lootPos[] = {{-0.00878906,8.66797,-6.59387},{-0.1875,4.55859,-6.59387},{10.5996,4.24609,-6.52272},{10.7554,1.3623,-6.52408},{9.08057,-6.9873,-0.134289},{2.66699,-7.53906,-0.134289}};
+};
+class land_kontejner_des: Industrial // nm dumpster
+{
+	lootPos[] = {{-2.17334,-0.0615234,-0.729944}};
+};
+class land_f_b2: Industrial { // nm
+	lootPos[] = {{1.58398,0.899414,-4.24147},{-1.33301,-0.991211,-4.24147},{1.91113,-1.68262,-4.24147}};
+};
+class land_bud2: Industrial { // nm
+	lootPos[] = {{-2.32031,-1.25,-1.76814},{-1.58008,-2.3125,-1.77484}};
+};
+class land_seb_mine_main_opt: Industrial { // nm
+	lootPos[] = {{0.590332,4.68115,-0.991421},{-1.86768,4.13525,-0.992432},{0.14209,2.53271,-0.995407},{-3.43457,2.68115,-0.995136},{-3.01416,2.59521,-5.08478},{0.776855,-2.89209,-5.11486},{-6.06885,3.33838,7.8684},{-6.38086,-2.05469,7.8684},{-1.7251,-3.09668,7.8684},{-5.64111,-0.92334,14.6913},{-6.23584,2.76465,14.6913}};
+};
+class land_seb_mine_near: Industrial { // nm
+	lootPos[] = {{7.87646,-5.52881,-8.8979},{9.02979,-5.5918,-8.8979},{4.37451,-7.10156,-8.8979}};
+};
 //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}};
@@ -1052,36 +1216,15 @@ class land_x_skladiste_low_tex: Industrial { // concrete, arc roof, broken doors
 	//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 {
-	lootPos[] = {{-3.14185,1.36816,-1.50033},{-0.0275879,-1.74707,-1.50033},{-3.59619,-3.18945,-1.50033},{-0.729004,-4.95996,-1.50033}};
-};
 class land_cast1: Industrial {
 	lootPos[] = {{-5.39551,6.56055,-4.38392},{-5.68555,9.04297,-4.38393},{-5.57251,9.08203,-4.38393},{-3.05396,14.5527,-4.38392},{2.97681,13.9014,-4.38392},{-0.227783,11.8418,-4.38393},{1.44995,3.27246,-3.50372},{2.53198,-5.45508,-3.5118},{-4.85596,-2.20898,-3.4266},{1.04224,0.729492,-1.06585}};
 };
 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}};
 };
-class land_f_b2: Industrial {
-	lootPos[] = {{1.58398,0.899414,-4.24147},{-1.33301,-0.991211,-4.24147},{1.91113,-1.68262,-4.24147}};
-};
-class land_bud2: Industrial {
-	lootPos[] = {{-2.32031,-1.25,-1.76814},{-1.58008,-2.3125,-1.77484}};
-};
-class land_seb_mine_main_opt: Industrial {
-	lootPos[] = {{0.590332,4.68115,-0.991421},{-1.86768,4.13525,-0.992432},{0.14209,2.53271,-0.995407},{-3.43457,2.68115,-0.995136},{-3.01416,2.59521,-5.08478},{0.776855,-2.89209,-5.11486},{-6.06885,3.33838,7.8684},{-6.38086,-2.05469,7.8684},{-1.7251,-3.09668,7.8684},{-5.64111,-0.92334,14.6913},{-6.23584,2.76465,14.6913}};
-};
-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 {
-	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_f_b1: Industrial { // one story garage and ramp
 	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}};
@@ -1100,9 +1243,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
 {
@@ -1110,13 +1250,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[] = {
@@ -1138,35 +1271,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[] = {
@@ -1181,32 +1285,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[] = {
-		{ 1.49048,-1.99609,-2.08473 }};
-};
 class Land_IndPipe2_bigL_L_EP1: Industrial
 {
 	lootPos[] = {
@@ -1250,12 +1328,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"};
@@ -1264,13 +1336,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

@@ -54,7 +54,7 @@ class Land_a_stationhouse : Military
 		{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}
 	};
 };
 
@@ -68,13 +68,8 @@ class Land_Mil_ControlTower: Military
 	};
 	zedPos[] = {{10.0703,3.76367,-9.62869},{1.75195,5.68164,-5.51373},{3.85254,3.53516,-5.50372},{6.66113,-0.625488,-1.0787},{6.72266,3.23389,-1.0787},{2.63965,-0.191406,-1.0687}};
 	lootChance = 0.4;
-	lootPos[] = {
-		//{10.07,3.76,-9.63},{5.07,3.65,-5.5},{1.75,5.68,-5.51},{7.49,-1.47,-1.04},{2.46,-0.83,-1.07},{7.61,2.05,-0.35},{2.26,2.17,-1.07},{2.56,5.72,-9.63},{6.56,-3.82,-1.06},{9.87,4.04,-1.06},{7.28,-1.69,2.98},
-		{7.33203,-1.104,-1.0787},{2.00684,-0.88623,-1.0787},{6.10938,3.34473,-1.0787},{1.90332,3.67188,-5.51367},{8.71387,3.8042,-9.6387}
-	};
-	lootPosSmall[] = {
-		{7.32324,-1.55957,2.98267},{5.49023,-1.72949,-0.378693},{4.7334,-1.66064,-0.378693},{7.44922,2.03809,-0.378693},{5.86035,3.98438,-0.248688},{6.21289,4.02539,-1.0087},{4.96875,-1.39941,-0.638702},{1.08008,3.98389,-5.51367},{10.0879,3.5459,-9.64868}
-	};
+	lootPos[] = {{3.41,-3.29,-5.5},{9.5,-3.63,-5.5},{8.25,-2.09,-9.64},{2.12,-3.94,-9.64},{-0.01,1.93,-9.64},{-1.96,-3.36,-9.64},{-8.37,-3.53,-9.64},{-6.19,-0.04,-8.83},{-5.49,-3.16,-8.83},{-1.92,0.06,-10.19},{-1.92,0.06,-10.19},{-2.12,-0.01,-9.64},{9.35,6.05,-9.65},{2.6,3.76,-5.5},{7.58,2.04,-0.38},{2.22,-0.87,-1.07},{5.15,-1.88,-0.39}};
+	lootPosSmall[] = {{9.83,4.49,-7.38},{5.56,4.05,-5.51},{6.06,4.1,-0.63},{2.51,-1.96,0.79},{0.35,-3.75,-9.52},{-3.36,-3.44,-9.64},{-6.2,0.03,-9.64},{-10.23,0.02,-8.81},{-7.6,-3.87,-9.64},{5.26,-0.93,-7.57},{0.01,6.07,-9.65},{8.2,-0.53,-4.69},{6.53,-0.91,-4.98},{3.22,-1.21,-5.5}};
 };
 
 class Land_SS_hangar: Military
@@ -111,8 +106,8 @@ class Land_A_TVTower_Base: Military
 		"z_policeman"
 	};
 	zedPos[] = {{-0.95166,1.48047,-2.31586},{-2.01782,-4.24121,-2.30939},{-0.982422,-1.92383,-2.25586}};
-	//lootPos[] = {{-0.982422,-1.92383,-2.25586},{-2.01782,-4.24121,-2.30939},{-0.95166,1.48047,-2.31586}};
-	lootPos[] = {{-0.982422,-1.92627,-2.21573},{-2.01782,-4.2417,-2.21918},{-0.759277,1.42139,-2.21573}};
+	lootPos[] = {{-2.68,-5.79,-22.67},{-2.58,1.46,-22.67},{1.4,-5.85,-22.67},{-1.22,2.99,-20.71},{2.12,2.16,-14.76},{-3.99,-3.58,-14.36},{-4.13,2.92,-10.61},{1.22,1.67,-6.03},{-3.95,-3.39,-6.4},{-4.45,0.97,-2.31},{-4.52,0.61,2.78},{0.82,-0.5,7.21},{-1.82,3.73,2.78}};
+	lootPosSmall[] = {{-1.01,-5.33,-22.67},{-1.56,2.79,-21.65},{-0.7,-4.81,-14.76},{-1.25,3.07,-12.37},{2.57,-0.52,-6.39},{-4.24,-1.23,3.96},{0.68,2.37,2.78},{-1.67,0.13,7.11}};
 };
 
 class Land_Mil_House: Military
@@ -124,13 +119,8 @@ class Land_Mil_House: Military
 		"z_policeman"
 	};
 	zedPos[] = {{11.1638,4.70117,-5.67465},{12.4565,1.42383,-5.67465},{13.6672,4.42383,-5.67465}};
-	lootPos[] = {
-		//{12.4565,1.42383,-5.67465},{11.1638,4.70117,-5.67465},{13.6672,4.42383,-5.67465},
-		{-14.3345,1.24414,-4.94623},{-7.87842,1.45117,-4.15622},{-7.77686,-5.34277,-0.88623},{-4.43506,-5.33594,-0.88623}
-	};
-	lootPosSmall[] = {
-		{-10.4692,4.4082,-4.94623},{-10.3696,1.2627,-4.46622},{-6.47998,4.92871,-4.98621},{-13.3208,-0.803711,-4.98621},{-13.791,-6.27832,-0.88623},{-13.2046,-5.36426,-0.196228},{-9.45166,-6.02832,-0.88623},{-0.253418,-4.12402,-0.88623},{-4.75635,-0.0224609,-0.88623},{-6.02002,-0.0410156,-0.426239},{-2.28857,0.575195,-0.876221}
-	};
+	lootPos[] = {{8.02,4.33,-5.07},{5,2.6,-5.07},{10.72,-1.85,-5.57},{2.59,-5.69,-5.07},{0.71,-6.8,-5.07},{-7.48,-7.23,-4.24},{-10.11,-4.59,-5.07},{-12.21,-2.28,-5.07},{-7.87,4.44,-0.09},{-13.76,-6.49,-0.94},{-13.96,3.4,-0.94},{-1.71,-6.68,-0.94},{-1.38,-1.7,-0.94},{-12.84,2.75,3.25},{-6.69,-6.36,3.3},{-13.78,6.93,-0.69},{-5.78,6.62,-3.7},{12.91,3.06,-5.68},{14.4,1.51,-5.68},{3.92,2.42,-5.07},{10.82,-0.49,-5.57},{-1.9,-7.37,-5.07},{-1.71,3.84,-5.07},{-1.17,1.31,-5.07}};
+	lootPosSmall[] = {{9.8,1.45,-4.97},{9.74,2.38,-3.8},{9.74,2.35,-4.96},{9.77,3.22,-4.93},{9,4.78,-5.07},{9.73,-0.19,-4.95},{3.47,1,-5.07},{4.15,-5.17,-4.97},{1.95,-5.85,-4.95},{1.96,-5.01,-4.57},{-2.92,-3.78,-5.07},{-4.83,-6.98,-5.07},{-3.2,-7.07,-5.07},{-8.16,-6.95,-5.07},{-4.08,1.73,-0.81},{-4.08,2.51,-0.82},{-7.22,4.41,-0.94},{-7.15,1.57,-0.94},{-8.26,-4.42,-0.94},{-7.24,-4.68,-0.94},{-1,-3.76,-0.94},{-14.76,-0.43,-2.85},{-14.74,-1.45,-2.85}};
 };
 
 class Land_Mil_Barracks_i: MilitarySpecial
@@ -223,6 +213,11 @@ class Land_Mil_Barracks_L: Military {
 	lootPos[] = {{-0.82,-4.72,-2.2},{4,-5.22,-2.21},{7.3,-4.04,-2.21}};
 };
 // ALT-MAP Support 
+class Land_budova4_in: Military // barracks broken blue front door. cannot enter inner rooms
+{
+	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}};
@@ -233,6 +228,7 @@ 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}};
@@ -242,63 +238,210 @@ 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}};
 };
-class Land_buova4_winter: MilitarySpecial // winter version of military barracks
-{
-	zedPos[] = {{-1.95361,2.57813,-1.1084},{5.46289,2.5791,-1.1084},{1.29346,-2.16211,-1.09839},{-1.78369,-0.166992,-1.09839},{-5.39355,-2.11719,-1.09839},{-5.4707,2.58203,-1.09839},{-1.80664,-1.97559,-1.09827},{5.38965,-1.75781,-1.09827},{-9.1499,-2.55859,-1.09827},{1.4668,-0.129883,-1.09814},{-4.77881,0.0498047,-1.09814},{-8.32617,-0.144531,-1.09814}};
-	lootChance = 0.3;
-	lootPos[] = {{-0.39,-2.02,-1.1},{-5.67,1.68,-1.1},{-1.95,2.58,-1.11},{5.46,2.58,-1.11},{6.37,-1.22,-0.93},{-0.24,-1.04,0.1},{-3.53,-0.38,-1.1},{-5.39,-2.23,-1.1},{-6.78,-1.34,-0.7},{-9.07,-0.53,-1.1},{2.97,-0.92,-1.1},{1.11,-2.35,-1.1}};
+//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}};
 };
-// ALT-MAP Support 
-
-//DZE ADDED BELOW
-class land_pozorovatelna: Military { // concrete tower
-	//lootChance = 0.3;
-	//lootPos[] = {{-0.717773,-3.02612,-2.49767},{2.99414,2.67017,-2.49767},{0.761719,-2.20044,7.54509},{-0.482422,1.19702,7.54508},{1.85156,1.9812,7.54508}};
-	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_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_AII_last_floor: MilitarySpecial {
+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 
+class Land_Mil_hangar_EP1: MilitaryIndustrial // tak hangar
+{
+	zombieClass[] = 
+	{
+		"z_soldier_pilot",
+		"z_soldier_heavy",
+		"z_soldier_pilot",
+		"z_soldier_heavy",
+		"z_worker1",
+		"z_worker2",
+		"z_worker3"
+	};
+	maxRoaming = 3;
+	lootPos[] = {{-9.83203,-12.4097,-5.38129},{10.5488,-12.1318,-5.38129},{13.002,0.0214844,-5.38129},{-13.3887,0.25,-5.38129},{13.3203,20.5176,-5.38129},{-13.1865,19.9839,-5.38129},{0.0195313,21.5078,-5.38129},{0.49707,11.5469,-5.38129},{-0.836914,-0.634277,-5.38129},{0.177734,-11.6821,-5.38129}};
+};
+class Land_Mil_ControlTower_EP1: Military // tak atc
+{
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
+	lootChance = 0.4;
+	lootPos[] = {
+		{ 5.53369,3.64355,-5.46368 },
+		{ 7.67236,3.68115,-1.0687 },
+		{ 7.53271,-1.70068,-1.0687 },
+		{ 4.55225,1.64111,2.92148 },
+		{ 10.1292,3.6958,-9.62869 },
+		{ 0.491943,6.1543,-9.62869},
+		{ 7.54956,1.74512,-0.378696},
+		{5.40234,-1.71289,-0.378696}};
+};
+class Land_Mil_Barracks_i_EP1: MilitarySpecial // tak barracks
+{
+	lootChance = 0.2;
+	maxRoaming = 2;
+	lootPos[] = {
+		{5.15625,-2.30371,-1.09824},
+		{1.05664,-2.45508,-1.09824},
+		{-0.841797,-2.36133,-1.09824},
+		{-4.03516,-2.31836,-1.09824},
+		{-8.49609,-2.33838,-1.09824}};
+};
+class Land_Mil_House_EP1: Military // tak
+{
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
+	vehPos[] = {
+		{ 13.439,3.25244,-5.71244,84 }};
+	lootPos[] = {
+		{11.7949,4.3147,-5.81439}
+	};
+	lootPosSmall[] = {
+		{-1.54785,5.46997,-5.00406},
+		{-2.61816,5.46362,-5.0097}
+	};
+	zedPos[] = {{-2.13477,6.69116,-4.56909},{5.58887,6.41284,-4.44098}};
+};
+
+class land_st_vez: MilitarySpecial // nm tower
+{
+	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}};
+};
+class Land_mi8_crashed: Military // nm wreck
+{
+	lootPos[] = {{0.238281, -2.89746, -1.65002}, {0.0, -4.06982, -1.7}, {-0.245117, -6.06982, -1.74091}};
+};
+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 {
+
+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_AII_upper_part: Military
+{
+	lootPos[] = {{-0.616211, -3.80762, -2.31434}, {-2.62158, -1.05127, -2.32196}, {-2.30322, 2.0415, -2.32196}};
 };
+
+class Land_Mil_Guardhouse_EP1: Military //Not enterable, Takistan version
+{
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
+	lootPos[] = {{-3.05859,1.76514,-1.59003},{-3.16895,3.45361,-1.59003},{-3.19922,-0.323242,-1.59003}};
+};
+
+class Land_Mil_Guardhouse: Military //Enterable zero_building
+{
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
+	lootChance = 0.5;
+	maxRoaming = 3;
+	zedPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
+	lootPos[] = {
+		//{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}
+		{4.65381,-3.61914,-1.46277},{2.99756,3.54102,-0.712769}
+	};
+	lootPosSmall[] = {
+		{-0.798828,-3.51758,-1.46277},{3.73047,-3.95996,-1.32278},{-0.283203,-3.15723,-1.32278},{-0.996582,3.81445,-1.14279},{-1.33008,2.26563,-0.762787},{0.289063,3.66211,-0.0827942},{-1.17383,-0.112305,-1.48279}
+	};
+};
+
+//DZE ADDED BELOW
 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}
@@ -317,15 +460,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}
@@ -336,19 +470,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}};
-};
 
 class Land_A_Stationhouse_ep1: Land_a_stationhouse{};
 class land_ibr_hangar: MilitaryIndustrial
@@ -378,44 +499,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 // barracks broken blue front door. cannot enter inner rooms
-{
-	zedPos[] = {{-3.94531,2.27344,-1.88723},{-0.0566406,2.2666,-1.88723},{6.27148,2.5752,-1.88723}};
-	//lootPos[] = {{-5.49609,2.13135,-1.88723},{-1.57031,2.29199,-1.88723},{2.43945,2.21387,-1.88723},{5.92383,-2.44678,-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_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[] = {};
@@ -431,62 +514,6 @@ class Land_vez: Military
 	lootPos[] = {{-0.0585938,1.51367,1.36331}};
 	zedPos[] = {{-0.116699,-0.801758,-2.81857}};
 };
-
-class Land_Mil_ControlTower_EP1: Military
-{
-	zombieClass[] =
-	{
-		"z_soldier",
-		"z_soldier",
-		"z_policeman"
-	};
-	lootChance = 0.4;
-	lootPos[] = {
-		{ 5.53369,3.64355,-5.46368 },
-		{ 7.67236,3.68115,-1.0687 },
-		{ 7.53271,-1.70068,-1.0687 },
-		{ 4.55225,1.64111,2.92148 },
-		{ 10.1292,3.6958,-9.62869 },
-		{ 0.491943,6.1543,-9.62869},
-		{ 7.54956,1.74512,-0.378696},
-		{5.40234,-1.71289,-0.378696}};
-};
-class Land_Mil_hangar_EP1: MilitaryIndustrial
-{
-	zombieClass[] = 
-	{
-		"z_soldier_pilot",
-		"z_soldier_heavy",
-		"z_soldier_pilot",
-		"z_soldier_heavy",
-		"z_worker1",
-		"z_worker2",
-		"z_worker3"
-	};
-	maxRoaming = 3;
-	lootPos[] = {{-9.83203,-12.4097,-5.38129},{10.5488,-12.1318,-5.38129},{13.002,0.0214844,-5.38129},{-13.3887,0.25,-5.38129},{13.3203,20.5176,-5.38129},{-13.1865,19.9839,-5.38129},{0.0195313,21.5078,-5.38129},{0.49707,11.5469,-5.38129},{-0.836914,-0.634277,-5.38129},{0.177734,-11.6821,-5.38129}};
-};
-class Land_Mil_Guardhouse_EP1: Military
-{
-	zombieClass[] =
-	{
-		"z_soldier",
-		"z_soldier",
-		"z_policeman"
-	};
-	lootPos[] = {{-3.05859,1.76514,-1.59003},{-3.16895,3.45361,-1.59003},{-3.19922,-0.323242,-1.59003}};
-};
-class Land_Mil_Barracks_i_EP1: MilitarySpecial
-{
-	lootChance = 0.2;
-	maxRoaming = 2;
-	lootPos[] = {
-		{5.15625,-2.30371,-1.09824},
-		{1.05664,-2.45508,-1.09824},
-		{-0.841797,-2.36133,-1.09824},
-		{-4.03516,-2.31836,-1.09824},
-		{-8.49609,-2.33838,-1.09824}};
-};
 class Land_fortified_nest_big_EP1: Military
 {
 	lootPos[] = {
@@ -495,26 +522,6 @@ class Land_fortified_nest_big_EP1: Military
 		{-0.991211,1.11621,-0.740341},
 		{-2.87109,-3.94238,-0.740341}};
 };
-
-class Land_Mil_House_EP1: Military
-{
-	zombieClass[] =
-	{
-		"z_soldier",
-		"z_soldier",
-		"z_policeman"
-	};
-	vehPos[] = {
-		{ 13.439,3.25244,-5.71244,84 }};
-	lootPos[] = {
-		{11.7949,4.3147,-5.81439}
-	};
-	lootPosSmall[] = {
-		{-1.54785,5.46997,-5.00406},
-		{-2.61816,5.46362,-5.0097}
-	};
-	zedPos[] = {{-2.13477,6.69116,-4.56909},{5.58887,6.41284,-4.44098}};
-};
 class datsun02Wreck: Military
 {
 	zombieClass[] = {"zZombie_Base","z_hunter"};
@@ -533,45 +540,6 @@ class HMMWVWreck: Military
 	maxRoaming = 2;
 	lootPos[] = {};
 };
-
-class Land_Mil_Guardhouse: Military //MOVED FROM RESIDENTIAL
-{
-	zombieClass[] =
-	{
-		"z_soldier",
-		"z_soldier",
-		"z_policeman"
-	};
-	lootChance = 0.5;
-	maxRoaming = 3;
-	zedPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
-	lootPos[] = {
-		//{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}
-		{4.65381,-3.61914,-1.46277},{2.99756,3.54102,-0.712769}
-	};
-	lootPosSmall[] = {
-		{-0.798828,-3.51758,-1.46277},{3.73047,-3.95996,-1.32278},{-0.283203,-3.15723,-1.32278},{-0.996582,3.81445,-1.14279},{-1.33008,2.26563,-0.762787},{0.289063,3.66211,-0.0827942},{-1.17383,-0.112305,-1.48279}
-	};
-};
-
-class UH1Wreck_DZ: Military {
-	zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
-	zombieChance = 0.3;
-	lootChance = 0.6;
-	minRoaming = 4;
-	maxRoaming = 8;
-	lootPos[] = {};
-};
-
-class UH60Wreck_DZ: Military {
-	zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
-	zombieChance = 0.3;
-	lootChance = 0.6;
-	minRoaming = 4;
-	maxRoaming = 8;
-	lootPos[] = {};
-};
-
 class UH60_NAVY_Wreck_DZ: Military {
 	zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
 	zombieChance = 0.3;

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

@@ -11,10 +11,10 @@ class Land_HouseB_Tenement : Office
 	//lootPos[] = {{5.40576,9.89453,-20.7845},{5.98975,14.168,-20.7845},{12.9604,14.0723,-20.7845},{14.6064,8.92383,-20.7845},{-12.0771,0.645508,-20.7845},{-0.924805,5.26563,-20.7845}};
 	lootPos[] = {
 		//{5.41,9.89,-20.78},{5.99,14.17,-20.78},{12.96,14.07,-20.78},{14.61,8.92,-20.78},{-12.08,0.65,-20.78},{-0.92,5.27,-20.78},{1.27,-0.62,-20.78},{-2.28,2.08,-20.78},{-10.07,4.64,-20.78},{5.35,3.42,-20.78},{13.35,3.37,-20.78},{2.53,-5.75,-20.78},
-		{2.39063,4.80322,-19.8245},{-10.2041,-0.48877,-20.3445},{4.65625,-2.125,-20.3445},{7.27734,11.5957,-20.8045},{-4.50854,5.10645,-19.8245},{5.11865,12.0298,-20.8045},{13.5625,12.1631,-20.8045}
+		{8.22,6.3,-20.67},{-3.17,0.92,-20.67},{-10.87,-0.99,-20.18},{11.08,11.29,-20.66},{7.27734,11.5957,-20.8045},{5.11865,12.0298,-20.8045},{13.5625,12.1631,-20.8045}
 	};
 	lootPosSmall[] = {
-		{-1.7771,4.57861,-19.8245},{-0.338623,4.80322,-19.8245},{-11.0986,-0.365234,-20.3445},{2.38574,5.15869,-20.2245},{14.2202,4.91895,-20.3945},{6.7251,11.6895,-20.3445},{3.2915,-1.90088,-20.3445},{12.9602,10.0479,-20.8045},{13.3726,0.939453,-20.8045}
+		{-4.57,4.42,-19.59},{-1.08,4.15,-19.67},{13.53,2.95,-20.66},{-0.94,4.73,-20.66},{-11.28,4.61,-20.66},{4.33,4.15,-20.67},{13.41,11.21,-20.22},{6.7251,11.6895,-20.3445},{3.9,-0.99,-20.66},{12.9602,10.0479,-20.8045},{13.3726,0.939453,-20.8045}
 	};
 	zedPos[] = {{-0.924805,5.26563,-20.7845},{-12.0771,0.645508,-20.7845},{12.9604,14.0723,-20.7845},{14.6064,8.92383,-20.7845},{5.40576,9.89453,-20.7845},{5.98975,14.168,-20.7845}};
 };
@@ -66,6 +66,10 @@ class Land_A_Office01 : Office
 	};
 	zedPos[] = {{0.242188,6.06348,-4.52798},{11.8037,-1.77832,-4.52798},{13.8174,-0.731445,-4.52798},{14.5811,-4.1123,-4.52798},{-2.50391,-2.46875,-4.52798},{4.11133,6.11328,-4.52798},{4.11279,-0.686523,-4.52798},{4.31641,3.74121,-4.52798},{5.08887,0.219727,-4.52798},{-7.76221,5.59082,-4.52798},{1.18945,6.07129,-2.02802},{12.8701,4.70996,-2.02802},{15.3721,3.42383,-2.02802},{1.81152,0.994141,-2.02802},{2.23145,3.76563,-2.02802},{4.93164,4.32031,-2.02802},{7.13867,-2.50684,-2.02802},{8.3457,-1.10645,-2.02802},{4.7666,-4.55859,-2.02487},{9.94727,-3.74023,-2.008},{-4.89111,-2.54785,-1.99799},{-14.5596,-3.40625,-1.98798},{-15.2705,5.92871,-1.94794},{13.6729,6.59668,0.451965},{-10.9063,6.04199,0.451996},{-2.12988,4.5166,0.472015},{7.6416,6.3877,0.472015},{-6.30762,3.30078,0.482025},{13.1924,-2.58594,0.492004},{-1.45654,-2.2832,6.19489},{3.09229,2.4375,6.2049}};
 };
+//land_vysoky1 in Residential.hpp
+//land_dlouhy2 in Residential.hpp
+//land_hotel_p2 in Residential.hpp
+//land_hotel_p1 in Residential.hpp
 
 class Land_A_Office02 : Office
 {
@@ -89,7 +93,66 @@ class Land_aif_hotel_bio : Office // multi-story hotel with balconies
 	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}};
 };
-// ALT-MAP Support 
+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
@@ -109,20 +172,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[] = {
@@ -223,17 +272,6 @@ class Land_MBG_Police_Station: Office
 		{ -2.3125,6.18774,1.68834 }};
 };
 
-class land_mbg_apartments_big_04: Office { // multi-story cement, 3 non-enterable garages
-	//lootPos[] = {{-3.8877,1.5293,-3.19898},{4.02832,0.519531,-3.19898},{3.97266,1.04883,-0.15098},{-3.33691,1.17188,-0.15098},{3.7002,0.867188,2.89702},{-3.55762,0.628906,2.89702},{-6.69922,2.30859,5.94502},{8.12402,-1.16211,5.94502}};
-	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.592773,-0.105469,-7.46618},{0.290039,1.49023,-7.43577}};
-	zedPos[] = {{-0.0898438,4.67773,-7.08873},{0.890625,-5.13965,-6.90238}};
-};
 class land_mbg_ger_estate_2: Office { // 2 stucco red/orange light by door
 	//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}};
 	lootPos[] = {

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

@@ -61,4 +61,9 @@ 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}};
 };
-// ALT-MAP Support 
+//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

@@ -36,11 +36,13 @@ class CfgLoot
 		#include "Groups\Trash.hpp"
 		#include "Groups\Consumable.hpp"
 		#include "Groups\ConsumableItems.hpp"
+		#include "Groups\Fuel.hpp"
 		#include "Groups\Parts.hpp"
 		//DZE
 		#include "Groups\Weapons.hpp"
 		#include "Groups\Clothes.hpp"
 		#include "Groups\Backpacks.hpp"
+		#include "Groups\Wrecks.hpp"
 		
 		// Points of interest
 		#include "Groups\CrashSite.hpp"
@@ -106,6 +108,7 @@ class CfgLoot
 			};
 			
 			lootChance = 0;
+			lootRefreshTimer = 900;
 			lootGroup = "";
 			lootPos[] = {};
 		};

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

@@ -90,7 +90,6 @@ AmmoMilitaryLow[] =
 	{Loot_MAGAZINE,		3,		20Rnd_B_765x17_Ball},
 	{Loot_MAGAZINE,		4,		20Rnd_762x51_DMR},
 	{Loot_MAGAZINE,		4,		20Rnd_762x51_FNFAL},
-	//Epoch 1.0.6
 	{Loot_MAGAZINE,		3,		20Rnd_762x51_B_SCAR},
 	{Loot_MAGAZINE,		4,		20Rnd_B_AA12_Pellets},
 	{Loot_MAGAZINE,		4,		20Rnd_B_AA12_74Slug},
@@ -110,7 +109,6 @@ AmmoMilitaryHigh[] =
 	{Loot_MAGAZINE,		10,		30Rnd_556x45_Stanag},
 	{Loot_MAGAZINE,		5,		30Rnd_556x45_G36},
 	{Loot_MAGAZINE,		5,		100Rnd_556x45_BetaCMag},
-	//Epoch 1.0.6
 	{Loot_MAGAZINE,		5,		20Rnd_762x51_B_SCAR},
 	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_Pellets},
 	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_74Slug},
@@ -330,7 +328,6 @@ assaultrifleammo[] = {
 	{Loot_MAGAZINE,		10,		30Rnd_545x39_AK},
 	{Loot_MAGAZINE,		5,		30Rnd_556x45_StanagSD},
 	{Loot_MAGAZINE,		8,		20Rnd_762x51_FNFAL},
-	//Epoch 1.0.6
 	{Loot_MAGAZINE,		6,		20Rnd_762x51_B_SCAR}
 };
 machinegunammo[] = {

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

@@ -50,7 +50,8 @@ AmmoBoxEU2[] =
 {
 	{Loot_MAGAZINE,		9,		20Rnd_762x51_FNFAL},
 	{Loot_MAGAZINE, 	5, 		20Rnd_762x51_B_SCAR},
-	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240}
+	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240},
+	{Loot_MAGAZINE,		4,		5Rnd_86x70_L115A1}
 };
 
 //7.62x39mm
@@ -102,4 +103,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,7 +19,7 @@ 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,		2,		ItemComboLock},

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

@@ -3,8 +3,9 @@ Construction[] =
 	{Loot_MAGAZINE,		9,		ItemLog}, // Used for crafting and vanilla buildables
 	{Loot_MAGAZINE,		9,		ItemPlank},
 	{Loot_MAGAZINE,		5,		ItemStone}, // Used for crafting and vanilla buildables
-	{Loot_MAGAZINE,		8,		equip_nails},
-	//{Loot_MAGAZINE,		9,		equip_metal_sheet_rusted},
+	{Loot_MAGAZINE,		4,		equip_nails},
+//	{Loot_MAGAZINE,		4,		ItemScrews},
+//	{Loot_MAGAZINE,		9,		equip_metal_sheet_rusted},
 	{Loot_MAGAZINE,		9,		equip_metal_sheet},
 	{Loot_MAGAZINE,		1,		equip_lever},
 	{Loot_MAGAZINE,		1,		ItemComboLock},
@@ -19,19 +20,16 @@ Construction[] =
 	
 	//Items
 	{Loot_MAGAZINE,		6,		ItemSandbag},
-	{Loot_MAGAZINE,		4,		ItemJerryCan},
 	{Loot_MAGAZINE,		1,		ItemWire},
 	{Loot_MAGAZINE,		4,		ItemTankTrap},
 	{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,		2,		equip_1inch_metal_pipe},
 	{Loot_MAGAZINE,		2,		equip_2inch_metal_pipe},
 	{Loot_MAGAZINE,		1,		MortarBucket},
 	{Loot_MAGAZINE,		2,		CinderBlocks},
-	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
 	{Loot_MAGAZINE,		3,		ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	
@@ -41,5 +39,7 @@ Construction[] =
 	{Loot_PILE,			4,		Consumable, 1, 2},
 	{Loot_GROUP,		10,		Trash},
 	//{Loot_GROUP,		6,		Parts},
+	{Loot_GROUP,		4,		JerryCan},
+	{Loot_GROUP,		3,		FuelBarrel},
 	{Loot_GROUP,		3,		Generic}
 };

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

@@ -11,7 +11,7 @@ DynamicDebris[] =
 	{Loot_WEAPON,		5,		ItemHatchet},
 	{Loot_WEAPON,		5,		ItemCompass},
 	{Loot_PILE,			12,		Consumable, 1, 2},
-	{Loot_MAGAZINE,		7,		ItemJerryCan},
+	{Loot_GROUP,		7,		JerryCan},
 	{Loot_GROUP,		15,		Parts}
 };
 
@@ -30,7 +30,7 @@ DynamicDebrisMilitary[] =
 	{Loot_WEAPON,		5,		ItemHatchet},
 	{Loot_WEAPON,		5,		ItemCompass},
 	{Loot_PILE,			12,		Consumable, 1, 2},
-	{Loot_MAGAZINE,		7,		ItemJerryCan},
+	{Loot_GROUP,		7,		JerryCan},
 	{Loot_MAGAZINE,		7,		ItemSandbag},
 	{Loot_GROUP,		8,		Military},
 	{Loot_GROUP,		15,		Parts}
@@ -38,7 +38,7 @@ DynamicDebrisMilitary[] =
 SupplyDrop[] = {
 	{Loot_WEAPON,		5,		ItemSledge},
 	{Loot_PILE,			12,		Consumable, 1, 2},
-	{Loot_MAGAZINE,		7,		ItemJerryCan},
+	{Loot_GROUP,		7,		JerryCan},
 	{Loot_MAGAZINE,		7,		bulk_ItemTankTrap},
 	{Loot_MAGAZINE,		7,		PartPlywoodPack},
 	{Loot_MAGAZINE,		7,		PartPlankPack},

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

@@ -12,17 +12,14 @@ Farm[] =
 	
 	//Items
 	{Loot_MAGAZINE,		4,		ItemSandbag},
-	{Loot_MAGAZINE,		3,		ItemJerryCan},
-	{Loot_MAGAZINE,		4,		ItemFuelCan},
 	{Loot_MAGAZINE,		1,		TrapBear},
 	{Loot_MAGAZINE,		8,		PartWoodPile},
 	{Loot_MAGAZINE,		3,		equip_rope},
 	{Loot_MAGAZINE,		3,		equip_duct_tape},
-	{Loot_MAGAZINE,		6,		equip_nails},
+	{Loot_MAGAZINE,		3,		equip_nails},
 	{Loot_MAGAZINE,		4,		equip_string},
 	{Loot_MAGAZINE,		2,		equip_lever},
 	{Loot_MAGAZINE,		2,		PartPlankPack},
-	{Loot_MAGAZINE,		2,		ItemFuelBarrelEmpty},
 	{Loot_MAGAZINE,		1,		ItemLightBulb},
 	{Loot_MAGAZINE,		1,		ItemSledgeHead},
 	{Loot_MAGAZINE,		1.5,	ItemSledgeHandle},
@@ -33,6 +30,9 @@ Farm[] =
 	{Loot_GROUP,		3,		AttachmentsGeneric},
 	{Loot_GROUP,		8,		Consumable},
 	{Loot_WEAPON,		3,		ItemMatchbox},
+	{Loot_GROUP,		3,		JerryCan},
+	{Loot_GROUP,		4,		FuelCan},
+	{Loot_GROUP,		2,		FuelBarrel},
 	{Loot_GROUP,		8,		Generic}
 };
 

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

@@ -16,13 +16,12 @@ Industrial[] =
 	
 	//Items
 //	{Loot_MAGAZINE,		6,		ItemSandbag},
-	{Loot_MAGAZINE,		4,		ItemJerryCan},
 //	{Loot_MAGAZINE,		1,		ItemWire},
 //	{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,		equip_nails},
 //	{Loot_MAGAZINE,		3,		ItemScrews},
 //	{Loot_MAGAZINE,		1,		equip_scrapelectronics},
 	{Loot_MAGAZINE,		2,		equip_metal_sheet},
@@ -31,7 +30,6 @@ Industrial[] =
 	{Loot_MAGAZINE,		8,		ItemPlank},
 	{Loot_MAGAZINE,		2,		MortarBucket},
 	{Loot_MAGAZINE,		3,		CinderBlocks},
-	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
 	{Loot_MAGAZINE,		3,		ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	
@@ -39,6 +37,8 @@ Industrial[] =
 	{Loot_GROUP,		15,		Parts},
 	{Loot_PILE,			10,		Trash, 1, 3},
 	{Loot_PILE,			3,		Consumable, 1, 2},
+	{Loot_GROUP,		4,		JerryCan},
+	{Loot_GROUP,		3,		FuelBarrel},
 	{Loot_GROUP,		5,		Generic}
 };
 

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

@@ -102,8 +102,8 @@ MilitarySpecial[] =
 	{Loot_CONTAINER,	1.8,			DZ_AmmoBoxRU, AmmoBoxCZ1, 7, 14},	//7.62x39
 	{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.2,		DZ_ExplosivesBoxRU, AmmoBoxRU4, 5, 15},	//GP-25
-	{Loot_CONTAINER,	0.2,		DZ_ExplosivesBoxRU, AmmoBoxRU5, 3, 7},	//Grenades
+	{Loot_CONTAINER,	0.2,		DZ_ExplosiveBoxRU, AmmoBoxRU4, 5, 15},	//GP-25
+	{Loot_CONTAINER,	0.2,		DZ_ExplosiveBoxRU, AmmoBoxRU5, 3, 7},	//Grenades
 
 	//Other
 	{Loot_MAGAZINE,		3,		FoodMRE},
@@ -150,7 +150,7 @@ MilitarySpecialSmall[] =
 MilitaryIndustrial[] = {//DZE ADDED
 	{Loot_GROUP,		15,		Parts},
 	{Loot_MAGAZINE,		5,		FoodMRE},
-	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
+	{Loot_GROUP,		3,		FuelBarrel},
 	{Loot_MAGAZINE,		2,		ItemGenerator},
 	{Loot_MAGAZINE,		2,		fuel_pump_kit},
 	{Loot_MAGAZINE,		3,		ItemWire},

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

@@ -33,7 +33,7 @@ Supermarket[] =
 	{Loot_MAGAZINE,		3,		ItemBandage},
 	{Loot_MAGAZINE,		2,		ItemPainkiller},
 	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},
-	{Loot_MAGAZINE,		5,		equip_nails},
+	{Loot_MAGAZINE,		1,		equip_nails},
 	
 	//Groups
 	{Loot_GROUP,		40,		Consumable},

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

@@ -1,10 +1,5 @@
 Consumable[] =
 {
-/*	{Loot_MAGAZINE,		8,		ItemBandage},
-	{Loot_MAGAZINE,		4,		ItemHeatPack},
-	{Loot_MAGAZINE,		3,		ItemPainkiller},
-	{Loot_MAGAZINE,		3,		ItemAntibacterialWipe},*/
-	
 	{Loot_MAGAZINE,		3,		ItemWaterBottleUnfilled}, //TODO: replace with canteen to better fit Epoch lootPosSmall
 	{Loot_MAGAZINE,		3,		ItemWaterBottleSafe},
 	{Loot_MAGAZINE,		3,		ItemWaterBottle},

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

@@ -0,0 +1,17 @@
+JerryCan[] =
+{
+	{Loot_MAGAZINE,		1,		ItemJerryCan},
+	{Loot_MAGAZINE,		1,		ItemJerryCanEmpty}
+};
+ 
+FuelCan[] =
+{
+	{Loot_MAGAZINE,		1,		ItemFuelcan},
+	{Loot_MAGAZINE,		1,		ItemFuelcanEmpty}
+}; 
+
+FuelBarrel[] =
+{
+	{Loot_MAGAZINE,		1,		ItemFuelBarrel},
+	{Loot_MAGAZINE,		1,		ItemFuelBarrelEmpty}
+};

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

@@ -26,9 +26,10 @@ Generic[] =
 //	{Loot_MAGAZINE,		1,		equip_pvc_box},
 	{Loot_MAGAZINE,		1,		equip_lever},
 	{Loot_MAGAZINE,		1,		equip_rag},
-	{Loot_MAGAZINE,		1,		equip_nails},
-	{Loot_MAGAZINE,		1,		ItemFuelCan},
-	{Loot_MAGAZINE,		1,		PartWoodPile}
+	{Loot_MAGAZINE,		0.3,	equip_nails},
+	{Loot_MAGAZINE,		1,		PartWoodPile},
+	
+	{Loot_GROUP,		1,		FuelCan}
 };
 
 tents[] = {

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

@@ -43,20 +43,19 @@ sniperrifles[] = {
 	{Loot_WEAPON,		1,		AK_107_PSO},
 	{Loot_WEAPON,		0.9,	M4SPR},
 	{Loot_WEAPON,		0.9,	M40A3_DZ}, //M40A3
-	{Loot_WEAPON,		0.7,	SVD_Gh_DZ}, //SVD_CAMO
-	{Loot_WEAPON,		0.7,	SVD_des_EP1},
-	{Loot_WEAPON,		0.7,	SVD_DZ}, //SVD
+	{Loot_WEAPON,		0.7,	SVD_PSO1_Gh_DZ},
+	{Loot_WEAPON,		0.7,	SVD_PSO1_DZ},
 	{Loot_WEAPON,		1,		CZ550_DZ}, //huntingrifle
 	{Loot_WEAPON,		0.8,	M24_des_EP1},
 	{Loot_WEAPON,		0.8,	M24_DZ}, //M24
-	{Loot_WEAPON,		0.7,	BAF_LRR_scoped},
+	{Loot_WEAPON,		0.6,	BAF_LRR_scoped},
+	{Loot_WEAPON,		0.6,	BAF_LRR_scoped_W},
 	{Loot_WEAPON,		0.5,	M107_DZ},
 	{Loot_WEAPON,		0.5,	KSVK_DZE},
 	{Loot_WEAPON,		0.5,	VSS_vintorez},
 	{Loot_WEAPON,		0.6,	SCAR_H_LNG_Sniper_SD},
 	{Loot_WEAPON,		1,		M14_DZ}, //M14_EP1
 	{Loot_WEAPON,		0.7,		DMR_DZ}, //DMR
-	//Epoch 1.0.6
 	{Loot_WEAPON,		0.8,	SCAR_H_LNG_Sniper}, //Mk17 Sniper
 	{Loot_WEAPON,		0.6,	M110_NVG_EP1} //M110 NVG
 };
@@ -96,15 +95,12 @@ assaultrifles[] = {
 	{Loot_WEAPON,		0.3,		SA58_ACOG_DZ}, //No camo, no 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.3,		m8_holo_sd},
-	{Loot_WEAPON,		0.5,		m8_carbine},
-	{Loot_WEAPON,		0.2,		BAF_L85A2_RIS_SUSAT},
-	{Loot_WEAPON,		0.3,		L85_Holo_DZ}, //BAF_L85A2_RIS_Holo
+	{Loot_WEAPON,		0.3,		m8_compact},
+	{Loot_WEAPON,		0.2,		m8_sharpshooter},
+	{Loot_WEAPON,		0.2,		m8_holo_sd},
+	{Loot_WEAPON,		0.3,		m8_carbine},
+	{Loot_WEAPON,		0.5,		L85A2_DZ},
 	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_SD_Camo},
-	//Epoch 1.0.6
-	{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 
@@ -132,13 +128,11 @@ machineguns[] = {
 	{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)
-	//Epoch 1.0.6
 	{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
-	//Epoch 1.0.6
 	{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/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/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

@@ -36,7 +36,18 @@ class CfgMagazines
 	
 	//Consumables: food, drinks etc.
 	#include "Consumables\Consumables.hpp"
-
+	
+	/*class 5Rnd_86x70_L115A1: CA_Magazine //.338 Lapua Magnum
+	{
+		scope = 2;
+		displayName = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10;
+		descriptionShort = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10_0;
+		ammo=B_86x70_Ball_noTracer;
+		count=5;
+		initSpeed = 936; //TODO
+		picture="\CA\weapons_BAF\data\UI\M_lrr_CA.paa"; 
+		// descriptionShort = $STR_DSS_10RND_M107; TODO
+	};*/
 	
 	
 	//EPOCH ADDITIONS

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

@@ -29,7 +29,7 @@ class ConsumableBase : CA_Magazine
 	{
 		class Consume
 		{
-			text = "Consume";
+			text = $STR_EAT_FOOD;
 			script = "spawn player_consume";
 		};
 	};

SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_carbomb.hpp

@@ -1,15 +1,14 @@
-
 class ItemCarBomb : CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Car Bomb";
+	displayName = $STR_ITEM_NAME_equip_carbomb;
 	model = "\ca\weapons\explosive.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\carbomb.paa";
-	descriptionShort = "Can be attached to a vehicles engine and then automaticly explode when the next player enters the drivers seat!";
+	descriptionShort = $STR_ITEM_DESC_equip_carbomb;
 	class ItemActions {
 		class Use {
-			text = "Attach Carbomb";
+			text = $STR_ACTIONS_attach_carbomb;
 			script = "spawn player_attach_bomb;";
 		};
 	};

SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_tent_poles.hpp

@@ -2,7 +2,7 @@ class equip_tent_poles : CA_Magazine {
 	scope = public;
 	count = 1;
 	displayName = $STR_ITEM_NAME_equip_tent_poles;
-	descriptionShort = $STR_ITEM_DESC_tent_poles;
+	descriptionShort = $STR_ITEM_DESC_equip_tent_poles;
 	model = "z\addons\dayz_communityassets\models\1m_pole_6.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_1m_pole_6_ca.paa";
 	type = 256;

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

@@ -18,6 +18,11 @@ class FoodPumpkin : FoodEdible {
 	picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa";
 	class ItemActions
 	{
+		class Consume
+		{
+			text = $STR_EAT_FOOD;
+			script = "spawn player_consume";
+		};
 		class Crafting
 		{
 		text = $STR_FOOD_NAME_PUMPKIN_CRAFT;
@@ -38,4 +43,4 @@ class FoodSunFlowerSeed : FoodEdible {
 	weight = 0.1;
 	model = "z\addons\dayz_communityassets\models\pistachio.p3d"; // TODO: model + icon
 	picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa";
-};
+};

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

@@ -389,21 +389,4 @@ class ItemHotwireKit: CA_Magazine {
 	picture = "\z\addons\dayz_epoch\pictures\equip_hotwire_ca.paa";
 	descriptionShort = $STR_EPOCH_HOTWIREKIT_DESC;
 	weight = 2;
-};
-
-class ItemBloodbag: CA_Magazine
-{
-	scope = public;
-	count = 1;
-	type = 256;
-	displayName = "$STR_EQUIP_NAME_16";
-	model = "\dayz_equip\models\bloodbag.p3d";
-	picture = "\dayz_equip\textures\equip_bloodbag_ca.paa";
-	descriptionShort = "$STR_EQUIP_DESC_16";
-	class ItemActions {
-		class use {
-			text = $STR_EPOCH_BLOODBAG_ACTION;
-			script = "spawn player_useMeds;";
-		};
-	};
-};
+};

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

@@ -1152,7 +1152,7 @@ class ItemKiloHemp : CA_Magazine
 	scope = public;
 	count = 1;
 	displayName = $STR_EPOCH_KILOOFHEMP;
-	descriptionShort = $STR_EPOCH_KILOOFHEMP;
+	descriptionShort = $STR_EPOCH_KILOOFHEMP_DESC;
 	weight = 1;
 	model = "z\addons\dayz_epoch\models\kilohemp.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_kilohemp_CA.paa";
@@ -1171,7 +1171,7 @@ class ItemKiloHemp : CA_Magazine
 		class Crafting1
 		{
 			text = $STR_EPOCH_PLAYER_269a;
-			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+			script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {""};
 			requiretools[] = {"ItemKnife"};
 			output[] = {{"ItemHempSeed",5}};
@@ -1179,3 +1179,61 @@ class ItemKiloHemp : CA_Magazine
 		};
 	};
 };
+
+class ItemOilBarrelEmpty : ItemOilBarrel
+{
+	displayName = $STR_EPOCH_EMPTYOILBARREL;
+	descriptionShort = $STR_EPOCH_EMPTYOILBARREL_DESC;
+};	
+
+class ItemMethylaminBarrelEmpty : ItemOilBarrel
+{
+	displayName = $STR_EPOCH_EMPTYMETHYLAMINEBARREL;
+	descriptionShort = $STR_EPOCH_EMPTYMETHYLAMINEBARREL_DESC;
+};
+
+class ItemMethylaminBarrel : ItemOilBarrel
+{
+	displayName = $STR_EPOCH_METHYLAMINEBARREL;
+	descriptionShort = $STR_EPOCH_METHYLAMINEBARREL_DESC;
+};
+
+class ItemC4Charge : CA_Magazine
+{
+	scope = public;
+	count = 1;
+	type = 256;
+	displayName = $STR_EPOCH_C4_CHARGE;
+	descriptionShort = $STR_EPOCH_C4_CHARGE_DESC;
+	model = "\ca\weapons\explosive.p3d";
+	picture = "\z\addons\dayz_communityassets\pictures\carbomb.paa";
+};
+
+class ItemKiloTobacco : CA_Magazine
+{
+	scope = public;
+	count = 1;
+	displayName = $STR_EPOCH_KILOTOBACCO;
+	descriptionShort = $STR_EPOCH_KILOTOBACCO_DESC;
+	weight = 1;
+	model = "z\addons\dayz_epoch\models\kilohemp.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_kilohemp_CA.paa";
+	type = 256;
+};
+
+class ItemKiloBlackTea : ItemKiloTobacco
+{
+	displayName = $STR_EPOCH_KILOBLACKTEA;
+	descriptionShort = $STR_EPOCH_KILOBLACKTEA_DESC;
+};
+
+class ItemTobaccoLeafs : CA_Magazine
+{
+	scope = public;
+	count = 1;
+	displayName = $STR_EPOCH_TOBACCO_LEAF;
+	descriptionShort = $STR_EPOCH_TOBACCO_LEAF_DESC;
+	model = "\z\addons\dayz_communityassets\models\comfrey.p3d";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_comfrey_CA.paa";
+	type = 256;
+};

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

@@ -34,7 +34,7 @@
 		class Build
 		{
 			text = $STR_BUILD_CAMONET;
-			script = "; ['ItemCamoNetGrey','Build'] spawn player_build;";
+			script = "; ['ItemCamoNetGrey','Build'] spawn player_buildPlaceables;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemCamoNetGrey"};
 			create = "CamoNet_DZ";

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

@@ -36,12 +36,13 @@ class ItemScrews: CA_Magazine //Construection,farm,indestrial,castle,residential
 	scope = 2;
 	count = 1;
 	type = 256;
-	displayName = "Loose Screws";//"Box of screws for metal"
+	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 ItemBagScrews: CA_Magazine//Construection,indestrial,supermarket
 {
 	scope = 2;
@@ -61,7 +62,6 @@ class ItemBagScrews: CA_Magazine//Construection,indestrial,supermarket
 	
 };
 
-/*
 ItemScrews //Construection,farm,indestrial,castle,residential
 ItemBagScrews //(LowChance)Construection,(LowChance)indestrial,supermarket
 ItemRSJ //Construection,farm,indestrial,castle

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

@@ -25,7 +25,7 @@ class ItemSandbag : CA_Magazine
 		class Build2
 		{
 			text = $STR_CREATE_STASH;
-			script = "; [_id,'Build2'] spawn player_build;";
+			script = "; [_id,'Build2'] spawn player_buildPlaceables;";
 			require[] = {"ItemEtool"};
 			consume[] = {"ItemSandbag"};
 			create = "StashSmall";

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

@@ -17,6 +17,7 @@ class ItemTent : CA_Magazine
 			require[] = {};
 			consume[] = {"ItemTent"};
 			create = "TentStorage";
+			//ghost = "TentStorage_Ghost";
 			//Bypass collision test
 			bypassCollision = "true";
 		};
@@ -61,6 +62,7 @@ class ItemDomeTent : CA_Magazine
 			require[] = {};
 			consume[] = {"ItemDomeTent"};
 			create = "DomeTentStorage";
+			//ghost = "DomeTentStorage_Ghost";
 			//Bypass collision test
 			bypassCollision = "true";
 		};

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

@@ -17,7 +17,7 @@ class ItemWire : CA_Magazine
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemWire"};
-			create = "Fort_RazorWire"; // 1.8.7 uses Wire_cat1
+			create = "Fort_RazorWire"; // vanilla uses Wire_cat1
 			byPass = "byPassRoadCheck";
 		};
 	};

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

@@ -59,7 +59,7 @@ 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

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

@@ -9,10 +9,11 @@ class ItemWorkBench : CA_Magazine
 	descriptionShort = $STR_BLD_desc_ItemWorkBench;//"A Folded Workbench, required for House Building and Some Crafting"
 	vehicle = "WorkBench";
 	sfx = "tentunpack";
+	
 	class ItemActions {
 		class Build {
 			text = $STR_BLD_build_ItemWorkBench;//"place WorkBench"
-			script = "; ['ItemWorkBench','Build'] spawn player_build;";
+			script = "; ['ItemWorkBench','Build'] spawn player_buildPlaceables;";
 			require[] = {};
 			consume[] = {"ItemWorkBench"};
 			create = "WorkBench";

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

@@ -0,0 +1,5 @@
+class 5Rnd_127x99_as50;
+class 5Rnd_127x99_as50_CP : 5Rnd_127x99_as50
+{
+		ammo = "B_127x99_Ball_noTracer";
+};

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

@@ -18,5 +18,6 @@
 #include "Shotgun.hpp"
 #include "Arrows.hpp"
 #include "LauncherAmmo.hpp"
+#include "127x99.hpp" //Remove after A2OA stable branch exceeds Version 1.63.131129
 
 #undef COMBINE_MAG

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

@@ -204,3 +204,21 @@ class emptyBloodBag : CA_Magazine
 		};
 	};
 };
+
+//Classic blood bag
+class ItemBloodbag: CA_Magazine
+{
+	scope = public;
+	count = 1;
+	type = 256;
+	displayName = "$STR_EQUIP_NAME_16";
+	model = "\dayz_equip\models\bloodbag.p3d";
+	picture = "\dayz_equip\textures\equip_bloodbag_ca.paa";
+	descriptionShort = "$STR_EQUIP_DESC_16";
+	class ItemActions {
+		class use {
+			text = $STR_BLD_use;
+			script = "spawn player_useMeds;";
+		};
+	};
+};

SQF/dayz_code/Configs/CfgMagazines/Planting.hpp

@@ -21,7 +21,7 @@ class ItemPumpkinSeed: CA_Magazine {
 	class ItemActions {
 		class Crafting
 		{
-			text = "Craft Pumpkin Plant";
+			text = $STR_CRAFT_PUMPKIN_PLANT;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {""};
 			requiretools[] = {"ItemKnife"};
@@ -42,8 +42,8 @@ class ItemPumpkinPlant: CA_Magazine {
 	type = 256;
 	class ItemActions {
 		class Build {
-			text = "Plant Pumpkin";
-			buildText = "pumpkin plant";
+			text = $STR_CRAFT_PLANT_PUMPKIN_PLANT;
+			buildText = $STR_CRAFT_NAME_PUMPKIN_PLANT;
 			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			create = "Grave";			// TODO: model for Pumpkin Stage 1
@@ -63,7 +63,7 @@ class ItemHempSeed: CA_Magazine {
 	class ItemActions {
 		class Crafting
 		{
-			text = "Craft Hemp Plant";
+			text = $STR_CRAFT_HEMP_PLANT;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {""};
 			requiretools[] = {"ItemKnife"};
@@ -84,8 +84,8 @@ class ItemHempPlant: CA_Magazine {
 	type = 256;
 	class ItemActions {
 		class Build {
-			text = "Plant Hemp";
-			buildText = "hemp plant";
+			text = $STR_CRAFT_PLANT_HEMP_PLANT;
+			buildText = $STR_CRAFT_NAME_HEMP_PLANT;
 			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			create = "MAP_c_fern";			// TODO: model for Hemp Stage 1

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

@@ -14,10 +14,10 @@ class ItemSodaEmpty : HandGrenade
 		class Drink
 		{
 			text = $STR_ACTIONS_DRINK2;
-			script = "spawn player_drinkWater;";
+			script = ";[_id] spawn player_fillWater;";
 		};
 		class Crafting {
-			text = "Melt into Bars";
+			text = $STR_EPOCH_MELT_BARS;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"fire"};
 			requiretools[] = {"ItemToolbox"};
@@ -43,10 +43,10 @@ class TrashTinCan : HandGrenade
 		class Drink
 		{
 			text = $STR_ACTIONS_DRINK2;
-			script = "spawn player_drinkWater;";
+			script = ";[_id] spawn player_fillWater;";
 		};
 		class Crafting {
-			text = "Melt into Bars";
+			text = $STR_EPOCH_MELT_BARS;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"fire"};
 			requiretools[] = {"ItemToolbox"};

SQF/dayz_code/Configs/CfgPlayerStats/defines.hpp

@@ -25,7 +25,7 @@
 
 class horde_RscPicture
 {
-    access = 0;
+    //access = 0;
     type = CT_STATIC;
     style = ST_PICTURE;
     idc = -1;
@@ -59,7 +59,7 @@ class horde_RscText
  
 class horde_RscStructuredText
 {
-    access = 0;
+    //access = 0;
     type = CT_STRUCTURED_TEXT;
     style = ST_CENTER;
 	font = "Zeppelin33";
@@ -77,7 +77,7 @@ class horde_RscStructuredText
 
 class horde_RscButton
 {
-	access = 0;
+	//access = 0;
 	type = CT_BUTTON;
 	style = ST_LEFT;
 	x = 0;

SQF/dayz_code/Configs/CfgPlayerStats/sound.hpp

@@ -16,7 +16,7 @@ class CfgSounds
 	class horde_sound_close_book: Vas_yessir
 	{
 		name = "horde_sound_close_book";
-		sound[] = {"\z\addons\dayz_communityassets\sounds\close.wss", 1, 1};
+		sound[] = {"\z\addons\dayz_communityassets\sounds\close.wss", 0.5, 1};
 		titles[] = {};
 	};
 };

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

@@ -1,37 +1,52 @@
-class Category_577 {
-	class 100Rnd_762x51_M240 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 30Rnd_556x45_StanagSD {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	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"};
-	};
-	class 20Rnd_762x51_FNFAL {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class 20Rnd_762x51_DMR {
-		type = "trade_items";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class 5Rnd_86x70_L115A1 {
-		type = "trade_items";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-};
+class Category_577 {
+	class 100Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 200Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 30Rnd_556x45_StanagSD {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	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"};
+	};
+	class 20Rnd_762x51_FNFAL {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class 20Rnd_762x51_DMR {
+		type = "trade_items";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class 5Rnd_86x70_L115A1 {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class 10Rnd_127x99_M107 {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class 3rnd_Anzio_20x102mm {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+};

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

@@ -1,32 +1,32 @@
-class Category_569 {
-	class LandRover_MG_TK_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {6,"ItemGoldBar10oz"};
-		sell[] = {3,"ItemGoldBar10oz"};
-	};	
-	class LandRover_Special_CZ_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {1,"ItemBriefcase100oz"};
-		sell[] = {5,"ItemGoldBar10oz"};
-	};
-	class UAZ_MG_TK_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {6,"ItemGoldBar10oz"};
-		sell[] = {3,"ItemGoldBar10oz"};
-	};
-	class GAZ_Vodnik_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {2,"ItemBriefcase100oz"};
-		sell[] = {1,"ItemBriefcase100oz"};
-	};	
-	class HMMWV_M998A2_SOV_DES_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {1,"ItemBriefcase100oz"};
-		sell[] = {5,"ItemGoldBar10oz"};
-	};
-	class HMMWV_M1151_M2_CZ_DES_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemBriefcase100oz"};
-		sell[] = {1,"ItemBriefcase100oz"};
-	};
-};
+class Category_569 {
+	class LandRover_MG_TK_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {6,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};	
+	class LandRover_Special_CZ_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {1,"ItemBriefcase100oz"};
+		sell[] = {5,"ItemGoldBar10oz"};
+	};
+	class UAZ_MG_TK_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {6,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};
+	class GAZ_Vodnik_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemBriefcase100oz"};
+		sell[] = {1,"ItemBriefcase100oz"};
+	};	
+	class HMMWV_M998A2_SOV_DES_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {1,"ItemBriefcase100oz"};
+		sell[] = {5,"ItemGoldBar10oz"};
+	};
+	class HMMWV_M1151_M2_CZ_DES_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemBriefcase100oz"};
+		sell[] = {1,"ItemBriefcase100oz"};
+	};
+};

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

@@ -1,57 +1,97 @@
-class Category_627 {
-	class G36_C_SD_camo { //Holo SD desert camo
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class M4A1_AIM_SD_camo { //CCO SD green camo
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class FNFAL_DZ {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class FN_FAL_ANPVS4_DZE {
-		type = "trade_weapons";
-		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"};
-		sell[] = {3,"ItemGoldBar10oz"};
-	};
-	class BAF_LRR_scoped {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class M240_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class Mk48_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-};
+class Category_627 {
+	class G36_C_SD_camo { //Holo SD desert camo
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M4A1_AIM_SD_camo { //CCO SD green camo
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class FNFAL_ANPVS4_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class FN_FAL_ANPVS4_DZE { // _DZE has toggleable night vision
+		type = "trade_weapons";
+		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"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};
+	class DMR_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {31,"ItemGoldBar"};
+	};
+	class BAF_LRR_scoped { //Tan Lapua
+		type = "trade_weapons";
+		buy[] = {7,"ItemGoldBar10oz"};
+		sell[] = {4,"ItemGoldBar10oz"};
+	};
+	class BAF_LRR_scoped_W { //Green Lapua
+		type = "trade_weapons";
+		buy[] = {7,"ItemGoldBar10oz"};
+		sell[] = {4,"ItemGoldBar10oz"};
+	};
+	class m107_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar10oz"};
+	};
+	class Anzio_20_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar10oz"};
+	};
+	class M240_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M240_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M240_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class Mk48_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class Mk48_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class Mk48_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+};

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

@@ -1,146 +1,791 @@
-class Category_485 {
-	class G36C_DZ {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class G36C_camo { //Iron sight desert camo
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class G36A_Camo_DZ {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class G36K_Camo_DZ {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class M16A2_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class M16A4_DZ {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class M4A1_DZ {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class M4A1_HWS_GL_camo { //GL Holo Green Camo
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class M4A1_HWS_GL_SD_Camo {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class M4A3_CCO_EP1 { //CCO FL Desert Camo
-		type = "trade_weapons";
-		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"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class BAF_L85A2_RIS_SUSAT {
-		type = "trade_weapons";
-		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"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class Sa58V_CCO_EP1 {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class Sa58V_RCO_EP1 {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class AKS74U_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class AKM_DZ {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class AK74_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class FNFAL_DZ {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class FN_FAL_ANPVS4_DZE {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-};
-
-class Category_615 {
-	duplicate = 485;
-};
+class Category_485 {
+	class G36C_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class G36C_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class G36C_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class G36C_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class G36C_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class G36C_CCO_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class G36C_Holo_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class G36C_ACOG_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class G36C_camo { //Iron sight desert camo
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class G36A_Camo_DZ {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class G36K_Camo_DZ {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class G36K_Camo_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M16A2_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class M16A2_GL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class M16A4_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class M16A4_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M16A4_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M16A4_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_GL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M16A4_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class M16A4_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M16A4_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M16A4_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M16A4_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M16A4_GL_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M16A4_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M16A4_GL_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_GL_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_GL_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_GL_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M16A4_GL_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M16A4_GL_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M16A4_GL_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M16A4_GL_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M16A4_GL_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M16A4_GL_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class M4A1_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class M4A1_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M4A1_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M4A1_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M4A1_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M4A1_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_CCO_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_CCO_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M4A1_CCO_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M4A1_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M4A1_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_Holo_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_Holo_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M4A1_Holo_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M4A1_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_ACOG_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_ACOG_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class M4A1_ACOG_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M4A1_GL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M4A1_GL_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M4A1_GL_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_GL_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_GL_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M4A1_GL_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_GL_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_GL_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M4A1_GL_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_GL_CCO_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_GL_CCO_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class M4A1_GL_CCO_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M4A1_GL_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_GL_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M4A1_GL_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_GL_Holo_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_GL_Holo_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class M4A1_GL_Holo_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M4A1_GL_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_GL_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M4A1_GL_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_GL_ACOG_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M4A1_GL_ACOG_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {13,"ItemGoldBar"};
+	};
+	class M4A1_GL_ACOG_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {14,"ItemGoldBar"};
+	};
+	class M4A1_HWS_GL_camo { //GL Holo Green Camo
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M4A1_HWS_GL_SD_Camo {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A3_CCO_EP1 { //CCO FL Desert Camo
+		type = "trade_weapons";
+		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 L85A2_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class L85A2_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class L85A2_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class L85A2_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class L85A2_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class L85A2_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class L85A2_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class L85A2_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class L85A2_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class L85A2_CCO_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class L85A2_CCO_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class L85A2_CCO_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class L85A2_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class L85A2_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class L85A2_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class L85A2_Holo_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class L85A2_Holo_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class L85A2_Holo_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class L85A2_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class L85A2_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class L85A2_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class L85A2_ACOG_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class L85A2_ACOG_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class L85A2_ACOG_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class SA58_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class SA58_RIS_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class SA58_RIS_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class SA58_RIS_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class SA58_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class SA58_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SA58_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SA58_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class SA58_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SA58_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SA58_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SA58_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class SA58_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class Sa58V_CCO_EP1 { //Desert camo no attachment support
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class Sa58V_RCO_EP1 { //Desert camo no attachment support
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class AKS74U_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class AKS74U_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class AKS74U_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class AKS74U_Kobra_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class AKM_DZ {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class AKM_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class AKM_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class AK74_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class AK74_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class AK74_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class AK74_GL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class AK74_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class AK74_Kobra_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class AK74_PSO1_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class AK74_GL_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class AK74_GL_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class AK74_GL_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class AK74_GL_Kobra_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class AK74_GL_PSO1_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class FNFAL_DZ {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class FNFAL_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class FNFAL_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+};
+
+class Category_615 {
+	duplicate = 485;
+};

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

@@ -1,56 +1,66 @@
-class Category_538 {
-	class DZ_Czech_Vest_Pouch {
-		type = "trade_backpacks";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {2,"ItemSilverBar"};
-	};
-	class DZ_Patrol_Pack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {8,"ItemSilverBar"};
-		sell[] = {4,"ItemSilverBar"};
-	};
-	class DZ_Assault_Pack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class DZ_TerminalPack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class DZ_ALICE_Pack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {6,"ItemSilverBar10oz"};
-		sell[] = {3,"ItemSilverBar10oz"};
-	};
-	class DZ_TK_Assault_Pack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {8,"ItemSilverBar10oz"};
-		sell[] = {4,"ItemSilverBar10oz"};
-	};
-	class DZ_British_ACU {
-		type = "trade_backpacks";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class DZ_GunBag_EP1 {
-		type = "trade_backpacks";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class DZ_CivilBackpack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class DZ_Backpack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-};
-
-class Category_688 {
-	duplicate = 538;
-};
+class Category_538 {
+	class DZ_Czech_Vest_Pouch {
+		type = "trade_backpacks";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class DZ_Patrol_Pack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {8,"ItemSilverBar"};
+		sell[] = {4,"ItemSilverBar"};
+	};
+	class DZ_Assault_Pack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class DZ_TerminalPack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class DZ_ALICE_Pack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {6,"ItemSilverBar10oz"};
+		sell[] = {3,"ItemSilverBar10oz"};
+	};
+	class DZ_TK_Assault_Pack_EP1 {
+		type = "trade_backpacks";
+		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"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class DZ_GunBag_EP1 {
+		type = "trade_backpacks";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class DZ_CivilBackpack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class DZ_Backpack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class DZ_LargeGunBag_EP1 {
+		type = "trade_backpacks";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+};
+
+class Category_688 {
+	duplicate = 538;
+};

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

@@ -1,61 +1,116 @@
-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"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class M249_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class M249_m145_EP1_DZE {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {9,"ItemGoldBar"};
-	};
-	class M240_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class Mk48_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class RPK_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class RPK74_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class UK59_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class PKM_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class Pecheneg_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-};
-
-class Category_616 {
-	duplicate = 486;
-};
+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"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class L110A1_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class L110A1_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M249_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M249_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M249_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M240_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M240_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M240_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class Mk48_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class Mk48_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class Mk48_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class RPK_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class RPK_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class RPK_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {14,"ItemGoldBar"};
+	};
+	class RPK74_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class RPK74_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class RPK74_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class UK59_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class PKM_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class Pecheneg_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+};
+
+class Category_616 {
+	duplicate = 486;
+};

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

@@ -1,41 +1,56 @@
-class Category_622 {
-	class 100Rnd_556x45_M249 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 200Rnd_556x45_M249 {
-		type = "trade_items";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class 100Rnd_762x51_M240 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 50Rnd_762x54_UK59 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 75Rnd_545x39_RPK {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 75Rnd_762x39_RPK {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 100Rnd_762x54_PK {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-};
-
-class Category_481 {
-	duplicate = 622;
-};
+class Category_622 {
+	class 100Rnd_556x45_M249 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 200Rnd_556x45_M249 {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class 200Rnd_556x45_L110A1 {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class 100Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 200Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 50Rnd_762x54_UK59 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 45Rnd_545x39_RPK {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};
+	class 75Rnd_545x39_RPK {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 75Rnd_762x39_RPK {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 100Rnd_762x54_PK {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+};
+
+class Category_481 {
+	duplicate = 622;
+};

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

@@ -1,118 +1,123 @@
-class Category_541 {
-	class ItemAntibiotic {
-		type = "trade_items";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class ItemBandage {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class ItemAntibacterialWipe {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	// bloodBagONEG is automatically swapped with ItemBloodbag if dayz_classicBloodBagSystem = true; Other typed bags and bloodTester are ignored.
-	class bloodBagONEG {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {2,"ItemSilverBar"};
-	};
-	class bloodBagANEG {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagAPOS {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagBNEG {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagBPOS {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagABNEG {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagABPOS {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagOPOS {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodTester {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class transfusionKit {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class emptyBloodBag {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class ItemEpinephrine {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class ItemHeatPack {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class ItemMorphine {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class ItemPainkiller {
-		type = "trade_items";
-		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"};
-	};
+class Category_541 {
+	class ItemAntibiotic {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class ItemBandage {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemAntibacterialWipe {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	// bloodBagONEG is automatically swapped with ItemBloodbag if dayz_classicBloodBagSystem = true; Other typed bags and bloodTester are ignored.
+	class bloodBagONEG {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class bloodBagANEG {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagAPOS {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagBNEG {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagBPOS {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagABNEG {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagABPOS {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagOPOS {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodTester {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class transfusionKit {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class emptyBloodBag {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemEpinephrine {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemHeatPack {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemMorphine {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemPainkiller {
+		type = "trade_items";
+		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"};
+	};
+	class ItemKiloHemp {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar"};
+	};
 };

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

@@ -1,46 +1,51 @@
-class Category_491 {
-	class LandRover_CZ_EP1 {
-		type = "trade_any_vehicle";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class LandRover_TK_CIV_EP1 {
-		type = "trade_any_vehicle";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class HMMWV_M1035_DES_EP1 {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class HMMWV_Ambulance {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class HMMWV_Ambulance_CZ_DES_EP1 {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class HMMWV_DES_EP1 {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class HMMWV_DZ {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class GAZ_Vodnik_MedEvac {
-		type = "trade_any_vehicle";
-		buy[] = {1,"ItemBriefcase100oz"};
-		sell[] = {5,"ItemGoldBar10oz"};
-	};
-};
-
-class Category_599 {
-	duplicate = 491;
-};
+class Category_491 {
+	class LandRover_CZ_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class LandRover_TK_CIV_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class HMMWV_M1035_DES_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class HMMWV_Ambulance {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class HMMWV_Ambulance_CZ_DES_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class HMMWV_DES_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class HMMWV_DZ {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class BTR40_TK_INS_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class GAZ_Vodnik_MedEvac {
+		type = "trade_any_vehicle";
+		buy[] = {1,"ItemBriefcase100oz"};
+		sell[] = {5,"ItemGoldBar10oz"};
+	};
+};
+
+class Category_599 {
+	duplicate = 491;
+};

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

@@ -1,46 +1,46 @@
-class Category_625 {
-	class 15Rnd_9x19_M9 {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class 15Rnd_9x19_M9SD {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 17Rnd_9x19_glock17 {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class 17Rnd_9x19_glock17SD {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 6Rnd_45ACP {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 7Rnd_45ACP_1911 {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 8Rnd_9x18_Makarov {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 8Rnd_9x18_MakarovSD {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-};
-
-class Category_484 {
-	duplicate = 625;
+class Category_625 {
+	class 15Rnd_9x19_M9 {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class 15Rnd_9x19_M9SD {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 17Rnd_9x19_glock17 {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class 17Rnd_9x19_glock17SD {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 6Rnd_45ACP {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 7Rnd_45ACP_1911 {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 8Rnd_9x18_Makarov {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 8Rnd_9x18_MakarovSD {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+};
+
+class Category_484 {
+	duplicate = 625;
 };

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

@@ -1,36 +1,71 @@
-class Category_489 {
-	class M9_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
-	};	
-	class G17_DZ {
-		type = "trade_weapons";
-		buy[] = {5,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class Makarov_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class Revolver_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class revolver_gold_EP1 {
-		type = "trade_weapons";
-		buy[] = {3,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class M1911_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-};
-
-class Category_617 {
-	duplicate = 489;
-};
+class Category_489 {
+	class M9_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};
+	class M9_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {25,"ItemSilverBar10oz"};
+	};	
+	class G17_DZ {
+		type = "trade_weapons";
+		buy[] = {5,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class G17_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemSilverBar10oz"};
+	};
+	class G17_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {22,"ItemSilverBar10oz"};
+	};
+	class G17_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {22,"ItemSilverBar10oz"};
+	};
+	class G17_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {32,"ItemSilverBar10oz"};
+	};
+	class G17_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {42,"ItemSilverBar10oz"};
+	};
+	class Makarov_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class Makarov_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {21,"ItemSilverBar10oz"};
+	};
+	class Revolver_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class revolver_gold_EP1 {
+		type = "trade_weapons";
+		buy[] = {3,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class M1911_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+};
+
+class Category_617 {
+	duplicate = 489;
+};

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

@@ -1,46 +1,161 @@
-class Category_574 {
-	class Crossbow_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class RedRyder {
-		type = "trade_weapons";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class MR43_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {8,"ItemSilverBar"};
-	};
-	class Winchester1866_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class M1014_DZ {
-		type = "trade_weapons";
-		buy[] = {3,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class Remington870_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class LeeEnfield_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class Mosin_DZ {
-		type = "trade_weapons";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-};
-
-class Category_620 {
-	duplicate = 574;
-};
+class Category_574 {
+	class Crossbow_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class Crossbow_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class Crossbow_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Crossbow_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class Crossbow_Scope_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class Crossbow_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class Crossbow_Scope_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class Crossbow_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class Crossbow_Scope_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class RedRyder {
+		type = "trade_weapons";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class MR43_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {8,"ItemSilverBar"};
+	};
+	class Winchester1866_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class M1014_DZ {
+		type = "trade_weapons";
+		buy[] = {3,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class M1014_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M1014_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class Remington870_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Remington870_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class Remington870_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class LeeEnfield_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class Mosin_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class Mosin_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemSilverBar10oz"};
+	};
+	class Mosin_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {22,"ItemSilverBar10oz"};
+	};
+	class Mosin_Belt_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {22,"ItemSilverBar10oz"};
+	};
+	class Mosin_Belt_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {32,"ItemSilverBar10oz"};
+	};
+	class Mosin_Belt_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {42,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {32,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {42,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {52,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_Belt_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {52,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_Belt_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {62,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_Belt_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {72,"ItemSilverBar10oz"};
+	};
+};
+
+class Category_620 {
+	duplicate = 574;
+};

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

@@ -1,61 +1,61 @@
-class Category_623 {
-	class 1Rnd_Bolt_Tranquilizer {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 1Rnd_Bolt_Explosive {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {2,"ItemSilverBar"};
-	};
-	class 12Rnd_Quiver_Wood {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {2,"ItemSilverBar"};
-	};
-	class 350Rnd_BB_Magazine {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 2Rnd_12Gauge_Buck {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 2Rnd_12Gauge_Slug {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 8Rnd_12Gauge_Slug {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {4,"ItemSilverBar"};
-	};
-	class 8Rnd_12Gauge_Buck {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {4,"ItemSilverBar"};
-	};
-	class 15Rnd_W1866_Slug {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 10Rnd_303British {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 5Rnd_762x54_Mosin {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-};
-
-class Category_573 {
-	duplicate = 623;
-};
+class Category_623 {
+	class 1Rnd_Bolt_Tranquilizer {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 1Rnd_Bolt_Explosive {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class 12Rnd_Quiver_Wood {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class 350Rnd_BB_Magazine {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 2Rnd_12Gauge_Buck {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 2Rnd_12Gauge_Slug {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 8Rnd_12Gauge_Slug {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {4,"ItemSilverBar"};
+	};
+	class 8Rnd_12Gauge_Buck {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {4,"ItemSilverBar"};
+	};
+	class 15Rnd_W1866_Slug {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 10Rnd_303British {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 5Rnd_762x54_Mosin {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+};
+
+class Category_573 {
+	duplicate = 623;
+};

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

@@ -1,46 +1,96 @@
-class Category_487 {
-	class M4SPR {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class M14_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class CZ550_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class M24_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class M24_des_EP1 { // desert camo
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class M40A3_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class SVD_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class SVD_des_EP1 { // desert camo
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-};
-
-class Category_619 {
-	duplicate = 487;
-};
+class Category_487 {
+	class M4SPR {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M14_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M14_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class M14_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M14_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M14_CCO_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {13,"ItemGoldBar"};
+	};
+	class M14_Holo_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {13,"ItemGoldBar"};
+	};
+	class CZ550_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class M24_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M24_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M24_des_EP1 { // desert camo
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M40A3_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M40A3_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SVD_DZ { // iron sights
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SVD_Gh_DZ { // iron sights and ghillie
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SVD_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class SVD_PSO1_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class SVD_des_EP1 { // desert camo
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+};
+
+class Category_619 {
+	duplicate = 487;
+};

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

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

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

@@ -1,41 +1,41 @@
-class Category_626 {
-	class 20Rnd_B_765x17_Ball {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 30Rnd_9x19_UZI {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 30Rnd_9x19_UZI_SD {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 30Rnd_9x19_MP5 {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 30Rnd_9x19_MP5SD {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class 64Rnd_9x19_Bizon {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 64Rnd_9x19_SD_Bizon {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-};
-
-class Category_483 {
-	duplicate = 626;
-};
+class Category_626 {
+	class 20Rnd_B_765x17_Ball {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 30Rnd_9x19_UZI {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 30Rnd_9x19_UZI_SD {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 30Rnd_9x19_MP5 {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 30Rnd_9x19_MP5SD {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class 64Rnd_9x19_Bizon {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 64Rnd_9x19_SD_Bizon {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+};
+
+class Category_483 {
+	duplicate = 626;
+};

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

@@ -1,31 +1,41 @@
-class Category_488 {
-	class Sa61_EP1 {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
-	};
-	class PDW_DZ {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class UZI_SD_EP1 {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class MP5_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class Bizon_DZ {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-};
-
-class Category_618 {
-	duplicate = 488;
-};
+class Category_488 {
+	class Sa61_EP1 {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};
+	class PDW_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class UZI_SD_EP1 {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class MP5_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class MP5_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {22,"ItemSilverBar10oz"};
+	};
+	class Bizon_DZ {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class Bizon_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+};
+
+class Category_618 {
+	duplicate = 488;
+};

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

@@ -34,6 +34,13 @@ class Category_679 {
 		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/NeutralBlackMarketAmmo.hpp

@@ -1,62 +1,77 @@
-class Category_527 {
-	class 8Rnd_B_Saiga12_74Slug {
-		type = "trade_items";
-		buy[] = {5,"ItemSilverBar"};
-		sell[] = {3,"ItemSilverBar"};
-	};
-	class 8Rnd_B_Saiga12_Pellets {
-		type = "trade_items";
-		buy[] = {5,"ItemSilverBar"};
-		sell[] = {3,"ItemSilverBar"};
-	};
-	class 20Rnd_B_AA12_Pellets {
-		type = "trade_items";
-		buy[] = {8,"ItemSilverBar"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class 20Rnd_B_AA12_74Slug {
-		type = "trade_items";
-		buy[] = {8,"ItemSilverBar"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class 30Rnd_556x45_Stanag {
-		type = "trade_items";
-		buy[] = {5,"ItemSilverBar"};
-		sell[] = {3,"ItemSilverBar"};
-	};
-	class 30Rnd_556x45_StanagSD {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	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"};
-	};
-	class 100Rnd_556x45_BetaCMag {
-		type = "trade_items";
-		buy[] = {6,"ItemSilverBar10oz"};
-		sell[] = {3,"ItemSilverBar10oz"};
-	};
-	class 100Rnd_762x51_M240 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 20Rnd_9x39_SP5_VSS {
-		type = "trade_items";
-		buy[] = {3,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 5Rnd_127x108_KSVK {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-};
+class Category_527 {
+	class 8Rnd_B_Saiga12_74Slug {
+		type = "trade_items";
+		buy[] = {5,"ItemSilverBar"};
+		sell[] = {3,"ItemSilverBar"};
+	};
+	class 8Rnd_B_Saiga12_Pellets {
+		type = "trade_items";
+		buy[] = {5,"ItemSilverBar"};
+		sell[] = {3,"ItemSilverBar"};
+	};
+	class 20Rnd_B_AA12_Pellets {
+		type = "trade_items";
+		buy[] = {8,"ItemSilverBar"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class 20Rnd_B_AA12_74Slug {
+		type = "trade_items";
+		buy[] = {8,"ItemSilverBar"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class 30Rnd_556x45_Stanag {
+		type = "trade_items";
+		buy[] = {5,"ItemSilverBar"};
+		sell[] = {3,"ItemSilverBar"};
+	};
+	class 30Rnd_556x45_StanagSD {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	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"};
+	};
+	class 100Rnd_556x45_BetaCMag {
+		type = "trade_items";
+		buy[] = {6,"ItemSilverBar10oz"};
+		sell[] = {3,"ItemSilverBar10oz"};
+	};
+	class 100Rnd_556x45_M249 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 200Rnd_556x45_M249 {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class 100Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 200Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 20Rnd_9x39_SP5_VSS {
+		type = "trade_items";
+		buy[] = {3,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 5Rnd_127x108_KSVK {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+};

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

@@ -1,87 +1,92 @@
-class Category_526 {
-	class MeleeBaseBallBat {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class Saiga12K {
-		type = "trade_weapons";
-		buy[] = {5,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class AA12_PMC {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class m8_compact {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class m8_sharpshooter {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class m8_holo_sd {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class m8_carbine {
-		type = "trade_weapons";
-		buy[] = {5,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class M8_SAW {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class SCAR_H_CQC_CCO {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class SCAR_H_CQC_CCO_SD {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class SCAR_H_STD_EGLM_Spect {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class MG36 {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class MG36_camo {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class M60A4_EP1_DZE {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class m240_scoped_EP1_DZE {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class VSS_vintorez {
-		type = "trade_weapons";
-		buy[] = {3,"ItemGoldBar10oz"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class KSVK_DZE {
-		type = "trade_weapons";
-		buy[] = {3,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-};
+class Category_526 {
+	class MeleeBaseBallBat {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class Saiga12K {
+		type = "trade_weapons";
+		buy[] = {5,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class AA12_PMC {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class m8_compact {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class m8_sharpshooter {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class m8_holo_sd {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class m8_carbine {
+		type = "trade_weapons";
+		buy[] = {5,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class M8_SAW {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SCAR_H_CQC_CCO {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SCAR_H_CQC_CCO_SD {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SCAR_H_STD_EGLM_Spect {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class MG36 {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class MG36_camo {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M249_m145_EP1_DZE {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M60A4_EP1_DZE {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class m240_scoped_EP1_DZE {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class VSS_vintorez {
+		type = "trade_weapons";
+		buy[] = {3,"ItemGoldBar10oz"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class KSVK_DZE {
+		type = "trade_weapons";
+		buy[] = {3,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+};

SQF/dayz_code/Configs/CfgServerTrader/README.txt

@@ -0,0 +1,6 @@
+To customize config traders copy this CfgServerTrader folder to your mission.
+
+Then in description.ext replace this line:
+#include "\z\addons\dayz_code\Configs\CfgServerTrader\CfgServerTrader.hpp"
+with this:
+#include "CfgServerTrader\CfgServerTrader.hpp"

SQF/dayz_code/Configs/CfgTownGenerator/CfgTownGeneratorDefault.hpp

@@ -2222,7 +2222,6 @@ class Zelenogorsk {
 	class Object24 { type = "SKODAWreck"; position[] = {2761.44, 5442.06, 0}; direction = 196; onFire = 0; };
 	class Object25 { type = "Fort_Barricade"; position[] = {2215.06, 5154.03, 0}; direction = 129; onFire = 0; };
 	class Object26 { type = "Rubbish1"; position[] = {2831.18, 5463.18, 0}; direction = 204; onFire = 0; };
-	class Object27 { type = "datsun01Wreck"; position[] = {2214.82, 5153.37, 0}; direction = 122; onFire = 0; };
 	class Object28 { type = "Fort_Barricade"; position[] = {2722.08, 5128.01, 0}; direction = 112; onFire = 0; };
 	class Object29 { type = "datsun02Wreck"; position[] = {2731.03, 5062.87, 0}; direction = 110; onFire = 0; };
 	class Object30 { type = "Land_Misc_Rubble_EP1"; position[] = {3202.4, 5156.94, 0}; direction = 300; onFire = 0; };
@@ -2234,7 +2233,6 @@ class Zelenogorsk {
 	class Object36 { type = "Rubbish5"; position[] = {2759.29, 5326.47, 0}; direction = 19; onFire = 0; };
 	class Object37 { type = "SKODAWreck"; position[] = {2626.12, 5118.43, 0}; direction = 140; onFire = 0; };
 	class Object38 { type = "Rubbish3"; position[] = {2646.66, 5926.84, 0}; direction = 327; onFire = 0; };
-	class Object39 { type = "RoadBarrier_long"; position[] = {2236.18, 5146.44, 0}; direction = 275; onFire = 0; };
 	class Object40 { type = "Fort_Barricade"; position[] = {2874.81, 5256.3, 0}; direction = 105; onFire = 0; };
 	class Object41 { type = "datsun02Wreck"; position[] = {2991.58, 5561.9, 0}; direction = 34; onFire = 0; };
 	class Object42 { type = "Land_Misc_Garb_Heap_EP1"; position[] = {2257.37, 5151.29, 0}; direction = 21; onFire = 0; };
@@ -2244,7 +2242,6 @@ class Zelenogorsk {
 	class Object46 { type = "Land_Misc_Rubble_EP1"; position[] = {2661.45, 5575.91, 0}; direction = 8; onFire = 0; };
 	class Object47 { type = "datsun02Wreck"; position[] = {2589.71, 4850.21, 0}; direction = 165; onFire = 0; };
 	class Object48 { type = "Rubbish3"; position[] = {3129.71, 5196.39, 0}; direction = 283; onFire = 0; };
-	class Object49 { type = "Fort_Barricade"; position[] = {2224.11, 5152.66, 0}; direction = 122; onFire = 0; };
 	class Object50 { type = "RoadBarrier_long"; position[] = {3407.76, 4908.85, 0}; direction = 227; onFire = 0; };
 	class Object51 { type = "Rubbish1"; position[] = {2731.81, 5353.15, 0}; direction = 336; onFire = 0; };
 	class Object52 { type = "Fort_Barricade"; position[] = {2262.95, 5374.37, 0}; direction = 178; onFire = 0; };
@@ -2257,11 +2254,9 @@ class Zelenogorsk {
 	class Object59 { type = "Rubbish3"; position[] = {2266.61, 5161.07, 0}; direction = 36; onFire = 0; };
 	class Object60 { type = "HMMWVWreck"; position[] = {2812.47, 5270.69, 0}; direction = 97; onFire = 0; };
 	class Object61 { type = "Fort_Barricade"; position[] = {2753.43, 5325.69, 0}; direction = 279; onFire = 0; };
-	class Object62 { type = "SKODAWreck"; position[] = {2234.22, 5141.31, 0}; direction = 288; onFire = 0; };
 	class Object63 { type = "Rubbish5"; position[] = {2625.31, 5070.09, 0}; direction = 242; onFire = 0; };
 	class Object64 { type = "datsun01Wreck"; position[] = {3397.79, 4906.4, 0}; direction = 308; onFire = 0; };
 	class Object65 { type = "Land_Misc_Rubble_EP1"; position[] = {2820.04, 5243.38, 0}; direction = 4; onFire = 0; };
-	class Object66 { type = "hiluxWreck"; position[] = {2225.07, 5151.34, 0}; direction = 113; onFire = 0; };
 	class Object67 { type = "Land_Misc_Garb_Heap_EP1"; position[] = {2724.28, 5192.38, 0}; direction = 18; onFire = 0; };
 	class Object68 { type = "Land_CncBlock_D"; position[] = {2820.7, 5453.61, 0}; direction = 39; onFire = 0; };
 	class Object69 { type = "Rubbish4"; position[] = {3370.46, 4931.3, 0}; direction = 305; onFire = 0; };
@@ -2270,7 +2265,6 @@ class Zelenogorsk {
 	class Object72 { type = "Rubbish1"; position[] = {3551.27, 5070.84, 0}; direction = 26; onFire = 0; };
 	class Object73 { type = "UralWreck"; position[] = {2730.68, 5202.66, 0}; direction = 18; onFire = 0; };
 	class Object74 { type = "Land_Misc_Garb_Heap_EP1"; position[] = {2813.97, 5230.95, 0}; direction = 179; onFire = 0; };
-	class Object75 { type = "Fort_Barricade"; position[] = {2244.23, 5144.63, 0}; direction = 209; onFire = 0; };
 	class Object76 { type = "RoadBarrier_long"; position[] = {2706.65, 5277.55, 0}; direction = 291; onFire = 0; };
 	class Object77 { type = "UAZWreck"; position[] = {2531.19, 6250.84, 0}; direction = 354; onFire = 0.833768; };
 	class Object78 { type = "hiluxWreck"; position[] = {2716.33, 5463.63, 0}; direction = 23; onFire = 0; };
@@ -4352,21 +4346,13 @@ class Berezino {
 	class Object173 { type = "Rubbish1"; position[] = {11978, 9090.7, 0}; direction = 264; onFire = 0; };
 	class Object174 { type = "Body"; position[] = {11981, 9141.68, 0}; direction = 130; onFire = 0; };
 	class Object175 { type = "Body2"; position[] = {12000.9, 9066, 0}; direction = 330; onFire = 0; };
-	class Object176 { type = "Land_BagFenceLong"; position[] = {11989.1, 9154.88, 0}; direction = 312; onFire = 0; };
 	class Object177 { type = "Land_Misc_Rubble_EP1"; position[] = {12027.1, 9056.95, 0}; direction = 142; onFire = 0; };
 	class Object178 { type = "HMMWVWreck"; position[] = {12019.1, 9169.68, 0}; direction = 96; onFire = 0.259646; };
-	class Object179 { type = "Land_BagFenceLong"; position[] = {11985, 9152.74, 0}; direction = 42; onFire = 0; };
 	class Object180 { type = "Rubbish5"; position[] = {12012.9, 9170.08, 0}; direction = 264; onFire = 0; };
-	class Object181 { type = "Land_BagFenceLong"; position[] = {11988.7, 9158.63, 0}; direction = 224; onFire = 0; };
-	class Object182 { type = "Land_BagFenceLong"; position[] = {11983.6, 9153.96, 0}; direction = 42; onFire = 0; };
 	class Object183 { type = "Land_Misc_Rubble_EP1"; position[] = {12074.2, 9079.12, 0}; direction = 142; onFire = 0; };
 	class Object184 { type = "Land_Misc_Rubble_EP1"; position[] = {12027.7, 9173.92, 0}; direction = 259; onFire = 0; };
-	class Object185 { type = "Land_BagFenceLong"; position[] = {11982.2, 9155.23, 0}; direction = 42; onFire = 0; };
 	class Object186 { type = "Body1"; position[] = {12000.7, 9057.93, 0}; direction = 59; onFire = 0; };
 	class Object187 { type = "Land_ladder_half"; position[] = {11987.6, 9160.85, 0}; direction = 223; onFire = 0; };
-	class Object188 { type = "Land_BagFenceLong"; position[] = {11981.7, 9158.49, 0}; direction = 134; onFire = 0; };
-	class Object189 { type = "Land_BagFenceLong"; position[] = {11983.1, 9159.85, 0}; direction = 134; onFire = 0; };
-	class Object190 { type = "Land_BagFenceLong"; position[] = {11984.4, 9161.2, 0}; direction = 134; onFire = 0; };
 	class Object191 { type = "Fort_RazorWire"; position[] = {11970.5, 9147.41, 0}; direction = 131; onFire = 0; };
 	class Object192 { type = "Rubbish4"; position[] = {11979.6, 9159.24, 0}; direction = 226; onFire = 0; };
 	class Object193 { type = "Hedgehog"; position[] = {11994.3, 9170.49, 0}; direction = 0; onFire = 0; };

SQF/dayz_code/Configs/CfgTownGenerator/chernarusWaters.hpp

@@ -2362,5 +2362,4 @@
 			onFire = 0;
 		};
 
-	};
-
+	};

SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp

@@ -267,21 +267,20 @@ class Boat : Ship
 };
 class RHIB: Boat
 {
-	displayName = "RHIB";
-	crew = "";
+	displayName = $STR_DN_RHIB;
 	typicalCargo[] = {};
 	class TransportMagazines {};
 	class TransportWeapons {};
 };
 class RHIB2Turret: RHIB
 {
-	displayName = "RHIB (Mk19)";
+	displayName = $STR_DN_RHIB2;
 };
 
 class RHIB_DZ : Boat
 {
 	scope = public;
-	displayName = "RHIB";
+	displayName = $STR_DN_RHIB;
 	vehicleClass = "Ship";
 	accuracy = 0.5;
 	crew = "";
@@ -498,7 +497,7 @@ class RHIB_DZ : Boat
 		  "100Rnd_127x99_M2",
 		  "100Rnd_127x99_M2"
 		};
-		gunnerName = "front gunner";
+		gunnerName = $STR_POSITION_FRONTGUNNER;
 		gunnerOpticsModel = "\ca\weapons\optika_empty";
 		gunnerForceOptics = 0;
 		startEngine = 0;
@@ -533,7 +532,7 @@ class RHIB_DZ : Boat
 	};
 	class Library
 	{
-	  libTextDesc = "The Naval Special Warfare Rigid Hull Inflatable Boat is a fast, high-buoyancy all weather boat designed to transport a fully equipped team of eight-men and three crew members. It is also fully transportable by C-130 Hercules.";
+	  libTextDesc = $STR_LIB_RHIB;
 	};
 	extCameraPosition[] = {
 	  0,

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

@@ -0,0 +1,172 @@
+class Land_houseV_2T2 : Land_HouseV_1I2
+{
+	model="z\addons\dayz_buildings\a2_HouseV_2t2\d_HouseV_2t2.p3d";
+	class AnimationSources
+	{
+		class dvere_1_source
+		{
+			source="user";
+			initPhase=0;
+			animPeriod=1;
+		};
+		class dvere_2_source : dvere_1_source {};	
+		class dvere_3_source : dvere_1_source {};
+		class dvere_4_source : dvere_1_source {};
+		class dvere_5_source : dvere_1_source {};
+		class dvere_6_source : dvere_1_source {};
+		class dvere_7_source : dvere_1_source {};
+		class dvere_8_source : dvere_1_source {};
+		class dvere_9_source : dvere_1_source {};
+		class dvere_10_source: dvere_1_source {};
+	};
+	class UserActions
+	{
+		class OpenDoors1
+		{
+			displayName=$STR_DN_OUT_o_DOOR;
+			position=akce_dvere1;
+			radius=1.5;
+			onlyForPlayer=false;
+			condition="this animationPhase ""dvere1"" < 0.5";
+			statement="this animate [""dvere1"", 1]";
+		};
+		class CloseDoors1
+		{
+			displayName=$STR_DN_OUT_C_DOOR;
+			position=akce_dvere1;
+			radius=1.5;
+			onlyForPlayer=false;
+			condition="this animationPhase ""dvere1"" >= 0.5";
+			statement="this animate [""dvere1"", 0]";
+		};
+		class OpenDoors2 : OpenDoors1
+		{
+			position=akce_dvere2;
+			condition="this animationPhase ""dvere2"" < 0.5";
+			statement="this animate [""dvere2"", 1]";
+		};
+		class CloseDoors2 : CloseDoors1
+		{
+			position=akce_dvere2;
+			condition="this animationPhase ""dvere2"" >= 0.5";
+			statement="this animate [""dvere2"", 0]";
+		};
+		class OpenDoors3 : OpenDoors1
+		{
+			position=akce_dvere3;
+			condition="this animationPhase ""dvere3"" < 0.5";
+			statement="this animate [""dvere3"", 1]";
+		};
+		class CloseDoors3 : CloseDoors1
+		{
+			position=akce_dvere3;
+			condition="this animationPhase ""dvere3"" >= 0.5";
+			statement="this animate [""dvere3"", 0]";
+		};
+		class OpenDoors4 : OpenDoors1
+		{
+			position=akce_dvere4;
+			condition="this animationPhase ""dvere4"" < 0.5";
+			statement="this animate [""dvere4"", 1]";
+		};
+		class CloseDoors4 : CloseDoors1
+		{
+			position=akce_dvere4;
+			condition="this animationPhase ""dvere4"" >= 0.5";
+			statement="this animate [""dvere4"", 0]";
+		};
+		class OpenDoors5 : OpenDoors1
+		{
+			position=akce_dvere5;
+			condition="this animationPhase ""dvere5"" < 0.5";
+			statement="this animate [""dvere5"", 1]";
+		};
+		class CloseDoors5 : CloseDoors1
+		{	
+			position=akce_dvere5;
+			condition="this animationPhase ""dvere5"" >= 0.5";
+			statement="this animate [""dvere5"", 0]";
+		};
+		class OpenDoors6 : OpenDoors1
+		{
+			position=akce_dvere6;
+			condition="this animationPhase ""dvere6"" < 0.5";
+			statement="this animate [""dvere6"", 1]";
+		};
+		class CloseDoors6 : CloseDoors1
+		{	
+			position=akce_dvere6;
+			condition="this animationPhase ""dvere6"" >= 0.5";
+			statement="this animate [""dvere6"", 0]";
+		};
+		class OpenDoors7 : OpenDoors1
+		{
+			position=akce_dvere7;
+			condition="this animationPhase ""dvere7"" < 0.5";
+			statement="this animate [""dvere7"", 1]";
+		};
+		class CloseDoors7 : CloseDoors1
+		{
+			position=akce_dvere7;
+			condition="this animationPhase ""dvere7"" >= 0.5";
+			statement="this animate [""dvere7"", 0]";
+		};
+		class OpenDoors8 : OpenDoors1
+		{
+			position=akce_dvere8;
+			condition="this animationPhase ""dvere8"" < 0.5";
+			statement="this animate [""dvere8"", 1]";
+		};
+		class CloseDoors8 : CloseDoors1
+		{	
+			position=akce_dvere8;
+			condition="this animationPhase ""dvere8"" >= 0.5";
+			statement="this animate [""dvere8"", 0]";
+		};
+		class OpenDoors9 : OpenDoors1
+		{
+			position=akce_dvere910;
+			condition="this animationPhase ""dvere9"" < 0.5 or this animationPhase ""dvere10"" < 0.5";
+			statement="this animate [""dvere9"", 1];this animate [""dvere10"", 1]";
+		};
+		class CloseDoors9 : CloseDoors1
+		{
+			position=akce_dvere910;
+			condition="this animationPhase ""dvere9"" >= 0.5 or this animationPhase ""dvere10"" >= 0.5";
+			statement="this animate [""dvere9"", 0];this animate [""dvere10"", 0]";
+		};
+	/*	class OpenDoors10 : OpenDoors1
+		{
+			position=akce_dvere910;
+			condition="this animationPhase ""dvere10"" < 0.5";
+			statement="this animate [""dvere10"", 1]";
+		};
+		class CloseDoors10 : CloseDoors1
+		{
+			position=akce_dvere910;
+			condition="this animationPhase ""dvere10"" >= 0.5";
+			statement="this animate [""dvere10"", 0]";
+		};
+	*/	
+	};
+	actionBegin1 = "OpenDoors1";
+	actionEnd1   = "OpenDoors1";
+	actionBegin2 = "OpenDoors2";
+	actionEnd2   = "OpenDoors2";
+	actionBegin3 = "OpenDoors3";
+	actionEnd3   = "OpenDoors3";
+	actionBegin4 = "OpenDoors4";
+	actionEnd4   = "OpenDoors4";
+	actionBegin5 = "OpenDoors5";
+	actionEnd5   = "OpenDoors5";
+	actionBegin6 = "OpenDoors6";
+	actionEnd6   = "OpenDoors6";
+	actionBegin7 = "OpenDoors7";
+	actionEnd7   = "OpenDoors7";
+	actionBegin8 = "OpenDoors8";
+	actionEnd8   = "OpenDoors8";
+	actionBegin9 = "OpenDoors9";
+	actionEnd9   = "OpenDoors9";
+//	actionBegin10= "OpenDoors10";
+//	actionEnd10  = "OpenDoors10";
+};

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

@@ -0,0 +1,35 @@
+#define ACTION_DRINK class Drink\
+{\
+	displayName = $STR_ACTIONS_DRINK2;\
+	displayNameDefault = $STR_ACTIONS_DRINK2;\
+	priority = 3;\
+	radius = 3;\
+	position = "";\
+	showWindow = 1;\
+	onlyForPlayer = 1;\
+	shortcut = "";\
+	condition = "(['Drink',this] call userActionConditions)";\
+	statement = "['hands'] spawn player_fillWater;";\
+};
+
+class Land_pumpa: House
+{
+	class UserActions {ACTION_DRINK};
+};
+
+class Land_Misc_Well_C_EP1: House_EP1
+{
+	class UserActions {ACTION_DRINK};
+};
+
+class Land_Misc_Well_L_EP1: House_EP1
+{
+	class UserActions {ACTION_DRINK};
+};
+
+class Land_Barrel_water: Thing
+{
+	class UserActions {ACTION_DRINK};
+};
+
+#undef ACTION_DRINK

SQF/dayz_code/Configs/CfgVehicles/CamoNetting.hpp

@@ -27,7 +27,7 @@
 			position="action";
 			radius = 3.0;
 			onlyForPlayer = 1;
-			condition = "alive this";
+			condition = "!dayz_actionInProgress && (alive this)";
 			statement = "this spawn object_dismantle;";
 		};
 	};

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

@@ -12,7 +12,13 @@ class car_sedan : SkodaBase {
 		ItemORP[] = {"car_sedan_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
 	};
 };
-
+/* //Removed from dayz_vehicles
+class policecar: car_sedan {
+	class Upgrades {
+		ItemORP[] = {};
+	};
+};
+*/
 // Performance 1
 class car_sedan_DZE1: car_sedan {
 	original = "car_sedan";

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

@@ -92,7 +92,7 @@ class KamazRefuel_DZ: KamazRefuel {
 	class TransportMagazines{};
 	class TransportWeapons{};
 	fuelCapacity = 10400;
-	//For future Developement = transportFuel = 10400;			// refueltruck
+	transportFuel = 0; //Required to disable A2 built in auto refuel for fuel trucks
 };
 class KamazRefuel_DZE1: KamazRefuel_DZ {
 	original = "KamazRefuel_DZ";

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

@@ -34,7 +34,7 @@ class MtvrRefuel_DES_EP1_DZ : MtvrRefuel_base {
 	hiddenSelectionsTextures[] = { "\CA\wheeled_E\MTVR\Data\MTVR_body_desert_co.paa", "\CA\wheeled_E\MTVR\Data\MTVR_body2_desert_co.paa", "\CA\wheeled_E\MTVR\Data\MTVR_interier_desert_co.paa", "\CA\wheeled_E\MTVR\Data\MTVR_Fuel_desert_CO.paa" };
 	class TransportMagazines{};
 	class TransportWeapons{};
-	transportFuel = 0;
+	transportFuel = 0; //Required to disable A2 built in auto refuel for fuel trucks
 	fuelCapacity = 10000;
 };
 
@@ -46,6 +46,6 @@ class MtvrRefuel_DZ: MtvrRefuel {
 	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
-	transportFuel = 0;
+	transportFuel = 0; //Required to disable A2 built in auto refuel for fuel trucks
 	fuelCapacity = 10000;
 };