From 0088b277084374b50e9ed0e67107d3f6a5a887b9 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Thu, 31 Mar 2016 22:45:59 -0400 Subject: [PATCH] Update weapon classnames --- CHANGE LOG 1.0.6.txt | 8 +- .../CfgLoot/Groups/Buildings/Church.hpp | 2 +- .../CfgLoot/Groups/Buildings/Construction.hpp | 3 +- .../CfgLoot/Groups/Buildings/DZE_Other.hpp | 8 +- .../Configs/CfgLoot/Groups/Buildings/Farm.hpp | 4 +- .../CfgLoot/Groups/Buildings/Hangar.hpp | 4 +- .../CfgLoot/Groups/Buildings/Industrial.hpp | 4 +- .../CfgLoot/Groups/Buildings/Military.hpp | 76 +---- .../CfgLoot/Groups/Buildings/Office.hpp | 4 +- .../CfgLoot/Groups/Buildings/Residential.hpp | 13 +- .../CfgLoot/Groups/Buildings/Supermarket.hpp | 8 +- .../CfgLoot/Groups/Buildings/Toilet.hpp | 2 +- .../Configs/CfgLoot/Groups/CrashSite.hpp | 61 +--- .../Configs/CfgLoot/Groups/Generic.hpp | 10 +- .../Configs/CfgLoot/Groups/Medical.hpp | 16 +- .../Configs/CfgLoot/Groups/Weapons.hpp | 103 +++---- .../R3F_Realism/R3F_Weight/R3F_CfgWeight.h | 202 ++++++++++++- SQF/dayz_code/init/variables.sqf | 2 +- .../Category/BanditWeapons.hpp | 6 +- .../Category/FriendlyAssaultRifle.hpp | 72 ++--- .../Category/FriendlyLightMachineGun.hpp | 8 +- .../Category/FriendlyPistols.hpp | 28 +- .../FriendlyShotgunsandSingleshot.hpp | 20 +- .../Category/FriendlySniperRifle.hpp | 24 +- .../Category/FriendlySubmachineGuns.hpp | 16 +- .../CfgServerTrader/Category/HeroWeapons.hpp | 6 +- .../Category/NeutralAssaultRifle.hpp | 72 ++--- .../Category/NeutralBlackMarketWeapons.hpp | 6 +- .../Category/NeutralLightMachineGun.hpp | 8 +- .../Category/NeutralPistols.hpp | 28 +- .../Category/NeutralShotgunsandSingleshot.hpp | 20 +- .../Category/NeutralSniperRifle.hpp | 24 +- .../Category/NeutralSubmachineGuns.hpp | 16 +- Server Files/SQL/1.0.6_Updates.sql | 266 +++++++++++++++++- 34 files changed, 738 insertions(+), 412 deletions(-) diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index b07a3495a..6d41433e2 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -1,19 +1,19 @@ [NEW] Fully updated to DayZ 1.8.7 code base @icomrade @ebaydayz Some notable changes include (not a full list): - - Blood types system is disabled by default. Set DZE_UseBloodTypes = true; in init.sqf to enable + - New loot table format is incompatible with old loot tables. See CfgLoot\README + - Several weapon, item and tool classnames changed. See SQL\1.0.6_Updates for a full list + - Status UI icons are toggleable between "vanilla","epoch","dark" set i.e. DZE_UI = "epoch"; in init.sqf + - Blood type system is disabled by default. Set DZE_UseBloodTypes = true; in init.sqf to enable - Bandit heartbeat sound is disabled by default. Set DZE_HeartBeat = true; in init.sqf to enable - Knife dulling is disabled by default. Set dayz_knifeDulling = true; in init.sqf to enable - Match stick counting is disabled by default. Set dayz_matchboxCount = true; in init.sqf to enable - Water bottle breaking is disabled by default. Set dayz_waterBottleBreaking = true; in init.sqf to enable - - New loot table format is incompatible with old loot tables. See CfgLoot\README - Mission.sqm and description.ext now use compact format - Keyboard eventhandler updated, dayz_spaceInterupt is no longer used - Optional news/rules feed on player login, set dayz_enableRules in init.sqf - Weapon switch hotkeys added (1 = primary, 2 = pistol, 3 = melee) - Journal is now functional for displaying stats - - ItemFish, Shotgun ammo and several other item classnames changed. See SQL\1.0.6_Updates - - Status UI icons are toggleable between "vanilla","epoch","dark" set i.e. DZE_UI = "epoch"; in init.sqf - Dupicate functions have been renamed: - dayz_HungerThirst --> dayz_NutritionSystem - dayz_objectUID3 --> dayz_objectUID2 diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp index bc37e70b4..16b4eb652 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp @@ -18,7 +18,7 @@ Church[] = //Groups {Loot_GROUP, 10, Trash}, {Loot_GROUP, 5, AmmoCivilian}, - //{Loot_GROUP, 2, AttachmentsGeneric}, + {Loot_GROUP, 2, AttachmentsGeneric}, {Loot_GROUP, 4, Generic}, {Loot_WEAPON, 3, ItemMatchbox}, {Loot_GROUP, 8, Consumable} diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp index ab5c59a6d..0156b1540 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp @@ -7,12 +7,13 @@ Construction[] = {Loot_MAGAZINE, 9, equip_metal_sheet_rusted}, {Loot_MAGAZINE, 9, equip_metal_sheet}, {Loot_MAGAZINE, 1, equip_lever}, + {Loot_MAGAZINE, 1, ItemPadlock}, {Loot_WEAPON, 1, ItemPickaxe}, {Loot_WEAPON, 2, ItemPickaxeBroken}, {Loot_WEAPON, 1, ItemSledgeHammer}, {Loot_WEAPON, 2, ItemSledgeHammerBroken}, - {Loot_WEAPON, 2, ItemShovel}, +// {Loot_WEAPON, 2, ItemShovel}, {Loot_WEAPON, 1, ItemKeyKit}, //Items diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp index ce7314b2e..5097a9d80 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp @@ -4,7 +4,7 @@ DynamicDebris[] = {Loot_WEAPON, 4, ItemMatchbox}, {Loot_WEAPON, 4, ItemFlashlight}, {Loot_WEAPON, 3, Colt1911}, - {Loot_WEAPON, 4, Makarov}, + {Loot_WEAPON, 4, Makarov_DZ}, //Makarov {Loot_WEAPON, 2, ItemMap}, {Loot_WEAPON, 5, ItemKnife}, {Loot_WEAPON, 5, ItemToolbox}, @@ -21,9 +21,9 @@ DynamicDebrisMilitary[] = {Loot_WEAPON, 4, ItemMatchbox}, {Loot_WEAPON, 4, ItemFlashlight}, {Loot_WEAPON, 4, ItemEtool}, - {Loot_WEAPON, 3, Colt1911}, - {Loot_WEAPON, 4, Makarov}, - {Loot_WEAPON, 2, MakarovSD}, + {Loot_WEAPON, 3, M1911_DZ}, //Colt1911 + {Loot_WEAPON, 4, Makarov_DZ}, //Makarov + {Loot_WEAPON, 2, Makarov_SD_DZ}, //MakarovSD {Loot_WEAPON, 2, ItemMap}, {Loot_WEAPON, 5, ItemKnife}, {Loot_WEAPON, 5, ItemToolbox}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp index fc4dff822..a6e2902be 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp @@ -7,7 +7,7 @@ Farm[] = //Tools {Loot_WEAPON, 5, ItemMachete}, // {Loot_WEAPON, 6, ItemHatchet}, - {Loot_WEAPON, 6, ItemHatchet}, + {Loot_VEHICLE, 6, WeaponHolder_ItemHatchet}, {Loot_WEAPON, 5, ItemKnife}, //Items @@ -30,7 +30,7 @@ Farm[] = //Groups {Loot_GROUP, 10, Trash}, {Loot_GROUP, 15, AmmoCivilian}, - //{Loot_GROUP, 3, AttachmentsGeneric}, + {Loot_GROUP, 3, AttachmentsGeneric}, {Loot_GROUP, 8, Consumable}, {Loot_WEAPON, 3, ItemMatchbox}, {Loot_GROUP, 8, Generic} diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hangar.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hangar.hpp index 4073b8469..7b8b44ecb 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hangar.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hangar.hpp @@ -13,6 +13,6 @@ Hangar[] = //Groups {Loot_GROUP, 20, Trash}, {Loot_GROUP, 20, Consumable}, - {Loot_GROUP, 10, Generic} - //{Loot_GROUP, 5, AttachmentsGeneric} + {Loot_GROUP, 10, Generic}, + {Loot_GROUP, 5, AttachmentsGeneric} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp index b1acd91ef..a739bc265 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp @@ -5,9 +5,9 @@ Industrial[] = {Loot_WEAPON, 6, ItemToolbox}, {Loot_WEAPON, 2, ItemFlashlight}, // {Loot_WEAPON, 8, ItemCrowbar}, - {Loot_WEAPON, 8, ItemCrowbar}, + {Loot_VEHICLE, 8, WeaponHolder_ItemCrowbar}, // {Loot_WEAPON, 5, ItemHatchet}, - {Loot_WEAPON, 5, ItemHatchet}, + {Loot_VEHICLE, 5, WeaponHolder_ItemHatchet}, {Loot_WEAPON, 1, ItemPickaxe}, {Loot_WEAPON, 2, ItemPickaxeBroken}, {Loot_WEAPON, 1, ItemSledgeHammer}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp index f2f60bb02..aa1301abc 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp @@ -7,27 +7,7 @@ Military[] = {Loot_GROUP, 8, submachinegun}, {Loot_GROUP, 13, assaultrifles}, {Loot_GROUP, 4, machineguns}, - /* - //Submachineguns - {Loot_WEAPON, 1, PDW_DZ}, - {Loot_WEAPON, 3, Bizon_DZ}, - {Loot_WEAPON, 2, MP5_DZ}, - //USE OLD CLASSES - //Assault rifles - {Loot_WEAPON, 2, M16A2_DZ}, - {Loot_WEAPON, 1, M16A2_GL_DZ}, - {Loot_WEAPON, 1.5, M16A4_DZ}, - {Loot_WEAPON, 0.5, M4A1_DZ}, - {Loot_WEAPON, 3, G36C_DZ}, - {Loot_WEAPON, 3, AK74_DZ}, - {Loot_WEAPON, 3, AKS74U_DZ}, - {Loot_WEAPON, 1, AKM_DZ}, - {Loot_WEAPON, 1, SA58_DZ}, - //Shotguns - {Loot_WEAPON, 2, Remington870_DZ}, - {Loot_WEAPON, 1, M1014_DZ}, - */ //Tools {Loot_TOOL, 3, Binocular}, {Loot_TOOL, 4, ItemFlashlightRed}, @@ -54,8 +34,8 @@ Military[] = {Loot_MAGAZINE, 5, ItemSandbag}, {Loot_PILE, 15, AmmoMilitaryLow, 1, 3}, {Loot_GROUP, 4, AmmoMilitaryHigh}, - //{Loot_GROUP, 4, AttachmentsGeneric}, - //{Loot_GROUP, 8, AttachmentsEast}, + {Loot_GROUP, 4, AttachmentsGeneric}, + {Loot_GROUP, 8, AttachmentsEast}, {Loot_PILE, 10, MedicalLow, 1, 2}, {Loot_PILE, 15, Trash, 1, 2}, {Loot_PILE, 10, Consumable, 1, 2}, @@ -64,44 +44,7 @@ Military[] = MilitarySpecial[] = { - /* - //Pistols - {Loot_WEAPON, 3, Makarov_DZ}, - {Loot_WEAPON, 1, MakarovSD}, - {Loot_WEAPON, 2, M1911_DZ}, - {Loot_WEAPON, 2, M9_DZ}, - {Loot_WEAPON, 1, M9SD}, - {Loot_WEAPON, 2, G17_DZ}, - {Loot_WEAPON, 2, Revolver_DZ}, - {Loot_WEAPON, 0.5, revolver_gold_EP1}, - - //Submachineguns - {Loot_WEAPON, 2, PDW_DZ}, - {Loot_WEAPON, 3, Bizon_DZ}, - {Loot_WEAPON, 2, MP5_DZ}, - - //Assault rifles - {Loot_WEAPON, 3, M16A2_DZ}, - {Loot_WEAPON, 2, M16A2_GL_DZ}, - {Loot_WEAPON, 2, M16A4_DZ}, - {Loot_WEAPON, 1, M4A1_DZ}, -// {Loot_WEAPON, 3, G36C_DZ}, - {Loot_WEAPON, 2, AK74_DZ}, - {Loot_WEAPON, 2, AKS74U_DZ}, - {Loot_WEAPON, 2, AKM_DZ}, - {Loot_WEAPON, 2, SA58_DZ}, - {Loot_WEAPON, 1, SA58_RIS_DZ}, - - //Shotguns - {Loot_WEAPON, 1, Remington870_DZ}, - {Loot_WEAPON, 2, M1014_DZ}, - - //Machine guns - {Loot_WEAPON, 1, RPK74_DZ}, - {Loot_WEAPON, 0.5, UK59_DZ}, -// {Loot_WEAPON, 0.5, PKM_DZ}, - */ - {Loot_WEAPON, 2, NVGoggles}, + {Loot_WEAPON, 2, NVGoggles}, {Loot_GROUP, 10, pistols}, {Loot_GROUP, 5, shotgunsingleshot}, {Loot_GROUP, 9, sniperrifles}, @@ -144,9 +87,9 @@ MilitarySpecial[] = {Loot_MAGAZINE, 2, 100Rnd_762x54_PK}, {Loot_PILE, 15, AmmoMilitaryLow, 1, 4}, {Loot_PILE, 10, AmmoMilitaryHigh, 1, 3}, - //{Loot_GROUP, 2, AttachmentsGeneric}, - //{Loot_GROUP, 8, AttachmentsEast}, - //{Loot_GROUP, 6, AttachmentsWest}, + {Loot_GROUP, 2, AttachmentsGeneric}, + {Loot_GROUP, 8, AttachmentsEast}, + {Loot_GROUP, 6, AttachmentsWest}, {Loot_PILE, 10, MedicalLow, 1, 2}, {Loot_PILE, 10, Trash, 1, 2}, {Loot_PILE, 10, Consumable, 1, 2}, @@ -155,8 +98,9 @@ MilitarySpecial[] = MilitaryIndustrial[] = {//DZE ADDED {Loot_GROUP, 15, Parts}, - {ItemFuelBarrelEmpty, 3, FoodMRE}, - {ItemGenerator, 3, FoodMRE}, - {fuel_pump_kit, 1, FoodMRE}, + {Loot_MAGAZINE, 5, FoodMRE}, + {Loot_MAGAZINE, 3, ItemFuelBarrelEmpty}, + {Loot_MAGAZINE, 2, ItemGenerator}, + {Loot_MAGAZINE, 2, fuel_pump_kit}, {Loot_GROUP, 15, Military} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp index 467372033..87a207558 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp @@ -38,6 +38,6 @@ Office[] = {Loot_GROUP, 8, Consumable}, {Loot_GROUP, 6, Trash}, {Loot_GROUP, 8, Generic}, - {Loot_GROUP, 10, AmmoCivilian} - //{Loot_GROUP, 5, AttachmentsGeneric} + {Loot_GROUP, 10, AmmoCivilian}, + {Loot_GROUP, 5, AttachmentsGeneric} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp index 30f165858..e784ca5a7 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp @@ -1,12 +1,5 @@ Residential[] = { - //Weapons //Don't use new weapon classes - //{Loot_WEAPON, 4, Makarov_DZ}, - //{Loot_WEAPON, 3, M1911_DZ}, - //{Loot_WEAPON, 3, Revolver_DZ}, - //{Loot_WEAPON, 2, MR43_DZ}, - //{Loot_WEAPON, 2, Winchester1866_DZ}, - //{Loot_WEAPON, 1, LeeEnfield_DZ}, {Loot_WEAPON, 1, Mosin_DZ}, {Loot_WEAPON, 6, MeleeBaseBallBat}, @@ -21,7 +14,7 @@ Residential[] = {Loot_WEAPON, 5, ItemCompass}, {Loot_WEAPON, 6, ItemFlashlight}, {Loot_WEAPON, 5, ItemKnife}, - {Loot_WEAPON, 3, ItemShovel}, +// {Loot_WEAPON, 3, ItemShovel}, {Loot_WEAPON, 1, ItemDIY_wood}, //DUPLICATE OF AN EPOCH BUILDABLE????? {Loot_WEAPON, 1, ItemDIY_Gate}, //DUPLICATE OF AN EPOCH BUILDABLE????? {Loot_WEAPON, 1, Binocular}, @@ -31,12 +24,12 @@ Residential[] = //Other {Loot_MAGAZINE, 0.5, ItemPadlock}, - {Loot_MAGAZINE, 1, PartPlywoodPack}, + {Loot_MAGAZINE, 1, PartPlywoodPack}, {Loot_PILE, 6, AmmoCivilian, 1, 2}, {Loot_PILE, 10, Trash, 1, 3}, {Loot_PILE, 10, Consumable, 1, 2}, - //{Loot_GROUP, 4, AttachmentsGeneric}, + {Loot_GROUP, 4, AttachmentsGeneric}, {Loot_GROUP, 5, clothes}, {Loot_GROUP, 3, specialclothes}, {Loot_GROUP, 3, tents}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp index abc887a1f..73ee6936f 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp @@ -24,10 +24,10 @@ Supermarket[] = {Loot_GROUP, 5, backpacks}, //Items - //{Loot_MAGAZINE, 1, ItemTent}, //USE TENTS GROUP + //{Loot_MAGAZINE, 1, ItemTent}, //IN TENTS GROUP {Loot_MAGAZINE, 1, ItemMixOil}, {Loot_MAGAZINE, 1, PartPlywoodPack}, - {Loot_MAGAZINE, 0.5, ItemDomeTent}, + //{Loot_MAGAZINE, 0.5, ItemDomeTent}, //IN TENTS GROUP {Loot_MAGAZINE, 1, ItemCamoNet}, {Loot_MAGAZINE, 0.5, ItemPadlock}, {Loot_MAGAZINE, 3, ItemBandage}, @@ -39,9 +39,9 @@ Supermarket[] = {Loot_GROUP, 40, Consumable}, {Loot_GROUP, 20, Generic}, {Loot_GROUP, 10, AmmoCivilian}, - //{Loot_GROUP, 3, AttachmentsGeneric}, + {Loot_GROUP, 3, AttachmentsGeneric}, {Loot_GROUP, 3, tents}, {Loot_WEAPON, 3, ItemMatchbox}, +// {Loot_GROUP, 3, MedicalLow}, {Loot_GROUP, 10, Trash} -// {Loot_GROUP, 3, MedicalLow} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Toilet.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Toilet.hpp index 6be8d27dc..7971a54f2 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Toilet.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Toilet.hpp @@ -1,6 +1,6 @@ Toilet[] = { - {Loot_WEAPON, 1, Item5Matchbox}, + {Loot_WEAPON, 1, ItemMatchbox}, {Loot_WEAPON, 2, ItemFlashlight}, {Loot_MAGAZINE, 2, equip_rag}, {Loot_MAGAZINE, 3, TrashJackDaniels}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp index 1da879127..319c6558a 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp @@ -14,19 +14,6 @@ CrashSiteType[] = CrashSiteRU[] = { - //Weapons Don't use new classes - /*{Loot_WEAPON, 2, Makarov_DZ}, - {Loot_WEAPON, 4, PDW_DZ}, - {Loot_WEAPON, 4, Bizon_DZ}, - {Loot_WEAPON, 3, AKS74U_DZ}, - {Loot_WEAPON, 3, AK74_DZ}, - {Loot_WEAPON, 4, AKM_DZ}, - {Loot_WEAPON, 4, RPK74_DZ}, - {Loot_WEAPON, 2, RPK_DZ}, - {Loot_WEAPON, 0.7, PKM_DZ}, - {Loot_WEAPON, 0.7, SVD_DZ}, - {Loot_WEAPON, 1, M40A3_DZ}, - {Loot_WEAPON, 0.7, FNFAL_DZ}, */ {Loot_GROUP, 10, assaultrifles}, {Loot_GROUP, 4, submachinegun}, {Loot_GROUP, 7, sniperrifles}, @@ -57,8 +44,8 @@ CrashSiteRU[] = //Other {Loot_MAGAZINE, 1, PartVRotor}, {Loot_MAGAZINE, 2, ItemCamonet}, - //{Loot_GROUP, 7, AttachmentsEast}, - //{Loot_GROUP, 3, AttachmentsWest}, + {Loot_GROUP, 7, AttachmentsEast}, + {Loot_GROUP, 3, AttachmentsWest}, //Piles {Loot_PILE, 15, CrashSiteRUPile, 2, 4} @@ -88,15 +75,6 @@ CrashSiteRUPile[] = CrashSiteUS[] = { //Weapons - /*{Loot_WEAPON, 4, M9_DZ}, - {Loot_WEAPON, 6, MP5_DZ}, - {Loot_WEAPON, 6, M4A1_DZ}, - {Loot_WEAPON, 8, M16A4_DZ}, - {Loot_WEAPON, 0.9, M249_DZ}, - {Loot_WEAPON, 0.7, Mk48_DZ}, - {Loot_WEAPON, 1, M14_DZ}, - {Loot_WEAPON, 0.5, DMR_DZ}, - {Loot_WEAPON, 1, M24_DZ},*/ {Loot_GROUP, 10, assaultrifles}, {Loot_GROUP, 4, submachinegun}, {Loot_GROUP, 7, sniperrifles}, @@ -127,7 +105,7 @@ CrashSiteUS[] = //Other {Loot_MAGAZINE, 1, PartVRotor}, {Loot_MAGAZINE, 2, ItemCamonet}, - //{Loot_GROUP, 10, AttachmentsWest}, + {Loot_GROUP, 10, AttachmentsWest}, //Piles {Loot_PILE, 15, CrashSiteUSPile, 2, 4} @@ -157,19 +135,6 @@ CrashSiteUSPile[] = CrashSiteEU[] = { //Weapons - /* - {Loot_WEAPON, 4, G17_DZ}, - {Loot_WEAPON, 6, MP5_DZ}, - {Loot_WEAPON, 5, G36C_DZ}, - {Loot_WEAPON, 5, L85_Holo_DZ}, - {Loot_WEAPON, 1.5, G36K_Camo_DZ}, - {Loot_WEAPON, 2.5, G36A_Camo_DZ}, - {Loot_WEAPON, 1, FNFAL_DZ}, - {Loot_WEAPON, 0.5, FNFAL_ANPVS4_DZ}, - {Loot_WEAPON, 0.7, M240_DZ}, - {Loot_WEAPON, 0.9, L110A1_DZ}, - {Loot_WEAPON, 1, M24_DZ}, - */ {Loot_GROUP, 10, assaultrifles}, {Loot_GROUP, 4, submachinegun}, {Loot_GROUP, 7, sniperrifles}, @@ -200,7 +165,7 @@ CrashSiteEU[] = //Other {Loot_MAGAZINE, 1, PartVRotor}, {Loot_MAGAZINE, 2, ItemCamonet}, - //{Loot_GROUP, 10, AttachmentsWest}, + {Loot_GROUP, 10, AttachmentsWest}, //Piles {Loot_PILE, 15, CrashSiteEUPile, 2, 4} @@ -230,20 +195,6 @@ CrashSiteEUPile[] = CrashSiteUN[] = { //Weapons - /* - {Loot_WEAPON, 2, Makarov_DZ}, - {Loot_WEAPON, 2, M9_DZ}, - {Loot_WEAPON, 2, G17_DZ}, - {Loot_WEAPON, 2, Bizon_DZ}, - {Loot_WEAPON, 2, MP5_DZ}, - {Loot_WEAPON, 3, AK74_DZ}, - {Loot_WEAPON, 3, AKS74U_DZ}, - {Loot_WEAPON, 2, M4A1_DZ}, - {Loot_WEAPON, 3, M16A4_DZ}, - {Loot_WEAPON, 3, G36C_DZ}, - {Loot_WEAPON, 2, L85_Holo_DZ}, - {Loot_WEAPON, 1, RPK74_DZ}, - */ {Loot_GROUP, 10, assaultrifles}, {Loot_GROUP, 4, submachinegun}, {Loot_GROUP, 7, sniperrifles}, @@ -275,8 +226,8 @@ CrashSiteUN[] = //Other {Loot_MAGAZINE, 1, PartVRotor}, {Loot_MAGAZINE, 2, ItemCamonet}, - //{Loot_GROUP, 3, AttachmentsEast}, - //{Loot_GROUP, 3, AttachmentsWest}, + {Loot_GROUP, 3, AttachmentsEast}, + {Loot_GROUP, 3, AttachmentsWest}, //Piles {Loot_PILE, 20, CrashSiteUNPile, 2, 4} diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp index a733b6be0..b8841ec13 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp @@ -27,7 +27,11 @@ Generic[] = }; //DZE tents[] = { - {Loot_MAGAZINE, 1.1, WeaponHolder_ItemTentOld}, - {Loot_MAGAZINE, 1, WeaponHolder_ItemTentDomed}, - {Loot_MAGAZINE, 1, WeaponHolder_ItemTentDomed2} + //VANILLA + {Loot_MAGAZINE, 0.5, ItemDomeTent}, + {Loot_MAGAZINE, 1, ItemTent}, + //EPOCH + {Loot_MAGAZINE, 1.1, ItemTentOld}, + {Loot_MAGAZINE, 1, ItemTentDomed}, + {Loot_MAGAZINE, 1, ItemTentDomed2} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Medical.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Medical.hpp index f2a6a7e10..fd5f926d0 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Medical.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Medical.hpp @@ -43,15 +43,15 @@ Antibiotics[] = Bloodbags[] = { - {Loot_MAGAZINE, 8, ItemBloodbagAPos}, - {Loot_MAGAZINE, 7, ItemBloodbagANeg}, + {Loot_MAGAZINE, 5, ItemBloodbagAPos}, + {Loot_MAGAZINE, 4, ItemBloodbagANeg}, - {Loot_MAGAZINE, 8, ItemBloodbagBPos}, - {Loot_MAGAZINE, 7, ItemBloodbagBNeg}, + {Loot_MAGAZINE, 5, ItemBloodbagBPos}, + {Loot_MAGAZINE, 4, ItemBloodbagBNeg}, - {Loot_MAGAZINE, 5, ItemBloodbagABPos}, - {Loot_MAGAZINE, 5, ItemBloodbagABNeg}, + {Loot_MAGAZINE, 2, ItemBloodbagABPos}, + {Loot_MAGAZINE, 2, ItemBloodbagABNeg}, - {Loot_MAGAZINE, 15, ItemBloodbagOPos}, - {Loot_MAGAZINE, 25, ItemBloodbagONeg} + {Loot_MAGAZINE, 3, ItemBloodbagOPos}, + {Loot_MAGAZINE, 2, ItemBloodbagONeg} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index e17881d09..da879adfd 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -6,98 +6,98 @@ //{Loot_GROUP, 2, assaultrifles}, //{Loot_GROUP, 2, militaryshotguns}, pistols[] = { - {Loot_WEAPON, 2, Makarov}, - {Loot_WEAPON, 2, Colt1911}, - {Loot_WEAPON, 1.5, revolver_EP1}, - {Loot_WEAPON, 1, glock17_EP1}, - {Loot_WEAPON, 1, MakarovSD}, - {Loot_WEAPON, 0.7, M9}, - {Loot_WEAPON, 0.5, M9SD}, + {Loot_WEAPON, 2, Makarov_DZ}, //Makarov + {Loot_WEAPON, 2, M1911_DZ}, //Colt1911 + {Loot_WEAPON, 1.5, Revolver_DZ}, //revolver_EP1 + {Loot_WEAPON, 1, G17_DZ}, //glock17_EP1 + {Loot_WEAPON, 1, Makarov_SD_DZ}, //MakarovSD + {Loot_WEAPON, 0.7, M9_DZ}, //M9 + {Loot_WEAPON, 0.5, M9_SD_DZ}, //M9SD {Loot_WEAPON, 0.1, revolver_gold_EP1} }; shotgunsingleshot[] = { - {Loot_WEAPON, 2, Winchester1866_DZ}, - {Loot_WEAPON, 1.7, LeeEnfield}, - {Loot_WEAPON, 1.7, MR43}, + {Loot_WEAPON, 2, Winchester1866_DZ}, //Winchester1866 + {Loot_WEAPON, 1.7, LeeEnfield_DZ}, //LeeEnfield + {Loot_WEAPON, 1.7, MR43_DZ}, //MR43 {Loot_WEAPON, 1, Saiga12K}, - {Loot_WEAPON, 1, Remington870_DZ}, + {Loot_WEAPON, 1, Remington870_DZ}, //Remington870_lamp {Loot_WEAPON, 1, Crossbow_DZ}, //{Loot_WEAPON, 1, RedRyder}, - {Loot_WEAPON, 1, M1014} + {Loot_WEAPON, 1, M1014_DZ} //M1014 }; farmweapons[] = { {Loot_GROUP, 5, shotgunsingleshot}, - {Loot_WEAPON, 2, huntingrifle}, + {Loot_WEAPON, 2, CZ550_DZ}, //huntingrifle {Loot_WEAPON, 0.3, Chainsaw}, - //{Loot_WEAPON, 2, CZ550_DZ}, //Huntingrifle //{Loot_WEAPON, 2, RedRyder}, {Loot_WEAPON, 3, Mosin_DZ} }; sniperrifles[] = { {Loot_WEAPON, 1, AK_107_PSO}, {Loot_WEAPON, 0.9, M4SPR}, - {Loot_WEAPON, 0.9, M40A3}, - {Loot_WEAPON, 0.7, SVD_CAMO}, + {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}, - {Loot_WEAPON, 1, huntingrifle}, + {Loot_WEAPON, 0.7, SVD_DZ}, //SVD + {Loot_WEAPON, 1, CZ550_DZ}, //huntingrifle {Loot_WEAPON, 0.8, M24_des_EP1}, - {Loot_WEAPON, 0.8, M24}, + {Loot_WEAPON, 0.8, M24_DZ}, //M24 {Loot_WEAPON, 0.7, BAF_LRR_scoped}, {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_EP1}, - {Loot_WEAPON, 1, DMR} + {Loot_WEAPON, 1, M14_DZ}, //M14_EP1 + {Loot_WEAPON, 1, DMR_DZ} //DMR }; submachinegun[] = { - {Loot_WEAPON, 2, UZI_EP1}, - {Loot_WEAPON, 1.5, bizon}, + {Loot_WEAPON, 2, PDW_DZ}, //UZI_EP1 + {Loot_WEAPON, 1.5, Bizon_DZ}, //bizon {Loot_WEAPON, 1.5, Sa61_EP1}, - {Loot_WEAPON, 1, MP5A5}, - {Loot_WEAPON, 1, bizon_silenced}, + {Loot_WEAPON, 1, MP5_DZ}, //MP5A5 + {Loot_WEAPON, 1, Bizon_SD_DZ}, //bizon_silenced {Loot_WEAPON, 0.8, UZI_SD_EP1}, - {Loot_WEAPON, 0.7, MP5SD} + {Loot_WEAPON, 0.7, MP5_SD_DZ} //MP5SD }; assaultrifles[] = { - {Loot_WEAPON, 0.5, AKS_74_kobra}, - {Loot_WEAPON, 0.5, AKS_74_U}, + {Loot_WEAPON, 0.5, AKS74U_Kobra_DZ}, //AKS_74_kobra + {Loot_WEAPON, 0.5, AKS74U_DZ}, //AKS_74_U {Loot_WEAPON, 0.1, AKS_GOLD}, - {Loot_WEAPON, 0.5, AK_47_M}, - {Loot_WEAPON, 0.5, AK_74}, - {Loot_WEAPON, 0.3, FN_FAL}, - {Loot_WEAPON, 0.1, FN_FAL_ANPVS4}, - {Loot_WEAPON, 0.5, G36A_camo}, - {Loot_WEAPON, 0.5, G36C}, + {Loot_WEAPON, 0.5, AKM_DZ}, //AK_47_M + {Loot_WEAPON, 0.5, AK74_DZ}, //AK_74 + {Loot_WEAPON, 0.3, FNFAL_DZ}, //FN_FAL + {Loot_WEAPON, 0.1, FNFAL_ANPVS4_DZ}, //FN_FAL_ANPVS4 + {Loot_WEAPON, 0.5, G36A_Camo_DZ}, //G36A_camo + {Loot_WEAPON, 0.5, G36C_DZ}, //G36C {Loot_WEAPON, 0.5, G36C_camo}, - {Loot_WEAPON, 0.5, G36K_camo}, + {Loot_WEAPON, 0.5, G36K_Camo_DZ}, //G36K_camo {Loot_WEAPON, 0.3, G36_C_SD_camo}, - {Loot_WEAPON, 0.5, M16A2}, - {Loot_WEAPON, 0.2, M16A2GL}, - {Loot_WEAPON, 0.1, M16A4_ACG}, - {Loot_WEAPON, 0.5, M4A1}, - {Loot_WEAPON, 0.4, M4A1_Aim}, + {Loot_WEAPON, 0.5, M16A2_DZ}, //M16A2 + {Loot_WEAPON, 0.2, M16A2_GL_DZ}, //M16A2GL + {Loot_WEAPON, 0.1, M16A4_DZ}, //M16A4_ACG + {Loot_WEAPON, 0.5, M4A1_DZ}, //M4A1 + {Loot_WEAPON, 0.4, M4A1_CCO_DZ}, //M4A1_Aim {Loot_WEAPON, 0.1, M4A1_AIM_SD_camo}, {Loot_WEAPON, 0.1, M4A1_HWS_GL_camo}, {Loot_WEAPON, 0.4, M4A3_CCO_EP1}, - {Loot_WEAPON, 0.4, Sa58P_EP1}, - {Loot_WEAPON, 0.3, Sa58V_CCO_EP1}, - {Loot_WEAPON, 0.4, Sa58V_EP1}, - {Loot_WEAPON, 0.3, Sa58V_RCO_EP1}, + {Loot_WEAPON, 0.4, SA58_DZ}, //Sa58P_EP1,Sa58V_EP1 + {Loot_WEAPON, 0.3, SA58_CCO_DZ}, //Sa58V_CCO_EP1 + {Loot_WEAPON, 0.3, SA58_ACOG_DZ}, //Sa58V_RCO_EP1 + {Loot_WEAPON, 0.3, SA58_RIS_DZ}, {Loot_WEAPON, 0.4, m8_compact}, {Loot_WEAPON, 0.3, m8_sharpshooter}, {Loot_WEAPON, 0.5, m8_holo_sd}, {Loot_WEAPON, 0.5, m8_carbine}, {Loot_WEAPON, 0.2, BAF_L85A2_RIS_SUSAT}, - {Loot_WEAPON, 0.1, BAF_L85A2_RIS_Holo}, + {Loot_WEAPON, 0.1, L85_Holo_DZ}, //BAF_L85A2_RIS_Holo {Loot_WEAPON, 0.1, M4A1_HWS_GL_SD_Camo} }; machineguns[] = { - {Loot_WEAPON, 1.1, RPK_74}, + {Loot_WEAPON, 1.1, RPK74_DZ}, //RPK_74 {Loot_WEAPON, 1.1, M8_SAW}, - {Loot_WEAPON, 1, Pecheneg_DZ}, - {Loot_WEAPON, 1, PK_DZ}, + {Loot_WEAPON, 1, PKM_DZ}, //Pecheneg_DZ + {Loot_WEAPON, 1, UK59_DZ}, //PK_DZ + {Loot_WEAPON, 0.9, L110A1_DZ}, {Loot_WEAPON, 1, MG36_camo}, {Loot_WEAPON, 1, M60A4_EP1_DZE}, {Loot_WEAPON, 1, MG36}, @@ -105,10 +105,11 @@ machineguns[] = { {Loot_WEAPON, 1, m240_scoped_EP1_DZE}, {Loot_WEAPON, 0.8, M240_DZ}, {Loot_WEAPON, 0.8, M249_EP1_DZ}, - {Loot_WEAPON, 0.5, Mk_48} + {Loot_WEAPON, 0.9, M249_DZ}, + {Loot_WEAPON, 0.5, Mk48_DZ} //Mk_48_DZ }; militaryshotguns[] = { {Loot_WEAPON, 2, Saiga12K}, - {Loot_WEAPON, 2, Remington870_FL_DZ}, - {Loot_WEAPON, 2, M1014} + {Loot_WEAPON, 2, Remington870_FL_DZ}, //Remington870_lamp + {Loot_WEAPON, 2, M1014_DZ} //M1014 }; \ No newline at end of file diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index cafb6b1c0..104d45783 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -84,6 +84,10 @@ class CfgWeight { weight = 5.5; }; + class M14_DZ + { + weight = 5.5; + }; class FN_FAL { weight = 4.5; @@ -92,14 +96,30 @@ class CfgWeight { weight=5.5; }; + class FNFAL_DZ + { + weight = 4.5; + }; + class FNFAL_ANPVS4_DZ + { + weight=5.5; + }; class glock17_EP1 { weight = 0.7; }; + class G17_DZ + { + weight = 0.7; + }; class G36A_camo { weight = 3.6; }; + class G36A_Camo_DZ + { + weight = 3.6; + }; class G36C_camo { weight = 2.8; @@ -108,6 +128,10 @@ class CfgWeight { weight = 3; }; + class G36K_Camo_DZ + { + weight = 3; + }; class G36_C_SD_camo { weight = 3.6; @@ -116,6 +140,10 @@ class CfgWeight { weight = 1; }; + class Revolver_DZ + { + weight = 1; + }; class revolver_gold_EP1 { weight = 1; @@ -128,6 +156,10 @@ class CfgWeight { weight = 1.7; }; + class PDW_DZ + { + weight = 1.7; + }; class Sa61_EP1 { weight = 1.3; @@ -204,6 +236,10 @@ class CfgWeight { weight = 3.3; }; + class SA58_ACOG_DZ + { + weight = 3.3; + }; class Sa58V_EP1 { weight = 3.1; @@ -212,10 +248,22 @@ class CfgWeight { weight = 3.2; }; + class SA58_CCO_DZ + { + weight = 3.2; + }; class Sa58P_EP1 { weight = 3.1; }; + class SA58_DZ + { + weight = 3.1; + }; + class SA58_RIS_DZ + { + weight = 3.1; + }; class MAAWS { weight = 7.5; @@ -232,10 +280,18 @@ class CfgWeight { weight = 3.8; }; + class M16A4_DZ + { + weight = 3.8; + }; class M16A2 { weight = 3.8; }; + class M16A2_DZ + { + weight = 3.8; + }; class M16A4_ACG_GL { weight = 5.2; @@ -244,13 +300,14 @@ class CfgWeight { weight = 5.2; }; + class L85_Holo_DZ + { + weight = 5.2; + }; class FN_FAL_ANPVS4 { weight = 5.7; - }; - - - + }; class M16A4_GL { weight = 5.2; @@ -259,6 +316,10 @@ class CfgWeight { weight = 5.2; }; + class M16A2_GL_DZ + { + weight = 5.2; + }; class M4A1_AIM_SD_camo { weight = 3; @@ -271,10 +332,18 @@ class CfgWeight { weight = 3; }; + class M4A1_CCO_DZ + { + weight = 3; + }; class M4A1 { weight = 3; }; + class M4A1_DZ + { + weight = 3; + }; class M4A1_HWS_GL_Camo { weight = 4.5; @@ -311,6 +380,14 @@ class CfgWeight { weight = 2.6; }; + class MP5_SD_DZ + { + weight = 2.6; + }; + class MP5_DZ + { + weight = 2.6; + }; class G36_C_SD_eotech { weight = 3.6; @@ -327,17 +404,19 @@ class CfgWeight { weight = 14; }; - class G36a { weight = 3.6; }; - + class G36 + { + weight = 3; + }; class G36C { weight = 2.8; }; - class G36 + class G36C_DZ { weight = 3; }; @@ -345,19 +424,38 @@ class CfgWeight { weight = 3.8; }; + class M1014_DZ + { + weight = 3.8; + }; class Remington870_lamp { weight = 4.0; }; + class Remington870_DZ + { + weight = 4.0; + }; + class Remington870_FL_DZ + { + weight = 4.0; + }; class MR43 { weight = 3.5; }; + class MR43_DZ + { + weight = 3.5; + }; class Winchester1866 { weight = 2.8; }; - + class Winchester1866_DZ + { + weight = 2.8; + }; class M240 { weight = 13; @@ -388,6 +486,10 @@ class CfgWeight { weight = 8.2; }; + class Mk48_DZ + { + weight = 8.2; + }; class M8_SAW { weight = 4.5; @@ -408,14 +510,26 @@ class CfgWeight { weight = 5.5; }; + class DMR_DZ + { + weight = 5.5; + }; class M24 { weight = 6; }; + class M24_DZ + { + weight = 6; + }; class M40A3 { weight = 7.5; }; + class M40A3_DZ + { + weight = 7.5; + }; class M107 { weight = 14; @@ -424,14 +538,26 @@ class CfgWeight { weight = 1.1; }; + class M1911_DZ + { + weight = 1.1; + }; class M9 { weight = 1; }; + class M9_DZ + { + weight = 1; + }; class M9SD { weight = 1.2; }; + class M9_SD_DZ + { + weight = 1.2; + }; class 8Rnd_12Gauge_Slug { weight = 0.3; @@ -504,6 +630,22 @@ class CfgWeight { weight = 2.7; }; + class AK74_DZ + { + weight = 2.7; + }; + class AKM_DZ + { + weight = 2.7; + }; + class AKS74U_DZ + { + weight = 2.7; + }; + class AKS74U_Kobra_DZ + { + weight = 2.7; + }; class AKS_74_GOSHAWK { weight = 3.5; @@ -528,6 +670,10 @@ class CfgWeight { weight = 4; }; + class LeeEnfield_DZ + { + weight = 4; + }; class AK_107_kobra { weight = 3.8; @@ -580,10 +726,18 @@ class CfgWeight { weight = 9; }; + class UK59_DZ + { + weight = 9; + }; class RPK_74 { weight = 4.7; }; + class RPK74_DZ + { + weight = 4.7; + }; class Pecheneg { weight = 9; @@ -592,10 +746,18 @@ class CfgWeight { weight = 9; }; + class PKM_DZ + { + weight = 9; + }; class Huntingrifle { weight = 4; }; + class CZ550_DZ + { + weight = 4; + }; class ksvk { weight = 12; @@ -608,10 +770,18 @@ class CfgWeight { weight = 6.2; }; + class SVD_DZ + { + weight = 6.2; + }; class SVD_Camo { weight = 6.3; }; + class SVD_Gh_DZ + { + weight = 6.3; + }; class Makarov { weight = 0.75; @@ -620,6 +790,14 @@ class CfgWeight { weight = 0.9; }; + class Makarov_DZ + { + weight = 0.75; + }; + class Makarov_SD_DZ + { + weight = 0.9; + }; class Saiga12K { weight = 3.5; @@ -632,6 +810,14 @@ class CfgWeight { weight = 2.3; }; + class Bizon_DZ + { + weight = 2.1; + }; + class Bizon_SD_DZ + { + weight = 2.3; + }; class VSS_Vintorez { weight = 3.2; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index f0adc460e..735e33b10 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -490,7 +490,7 @@ DZE_fueltruckarray = ["KamazRefuel_DZ","UralRefuel_TK_EP1_DZ","MtvrRefuel_DES_EP DZE_Lock_Door = ""; DZE_HeliAllowTowFrom = ["CH_47F_EP1_DZE","CH_47F_EP1_DZ","CH_47F_BAF","CH_47F_EP1","BAF_Merlin_DZE","CH53_DZE"]; DZE_HeliAllowToTow = ["hilux1_civil_1_open","HMMWV_Base","Lada_base","Offroad_DSHKM_base","Pickup_PK_base","SkodaBase","tractor","VWGolf","Volha_TK_CIV_Base_EP1","S1203_TK_CIV_EP1","SUV_Base_EP1","ArmoredSUV_Base_PMC","UAZ_Base","LandRover_Base","Ship"]; -DZE_REPLACE_WEAPONS = [["Crossbow"],["Crossbow_DZ"]]; +DZE_REPLACE_WEAPONS = [["Crossbow","DMR","M14_EP1","SVD","SVD_CAMO"],["Crossbow_DZ","DMR_DZ","M14_DZ","SVD_DZ","SVD_CAMO_DZ"]]; DZE_LockableStorage = ["VaultStorage","VaultStorageLocked","LockboxStorageLocked","LockboxStorage"]; DZE_LockedStorage = ["VaultStorageLocked","LockboxStorageLocked"]; DZE_UnLockedStorage = ["VaultStorage","LockboxStorage"]; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditWeapons.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditWeapons.hpp index 3d15c9976..7b3954d02 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditWeapons.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditWeapons.hpp @@ -9,7 +9,7 @@ class Category_627 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class FN_FAL_ANPVS4 { + class FNFAL_ANPVS4_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; @@ -24,12 +24,12 @@ class Category_627 { buy[] = {4,"ItemGoldBar10oz"}; sell[] = {2,"ItemGoldBar10oz"}; }; - class FN_FAL { + class FNFAL_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk_48_DZ { + class Mk48_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyAssaultRifle.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyAssaultRifle.hpp index 528d63e47..c8f5c4581 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyAssaultRifle.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyAssaultRifle.hpp @@ -1,10 +1,10 @@ class Category_485 { - class G36A_camo { + class G36A_Camo_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class G36C { + class G36C_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -14,27 +14,27 @@ class Category_485 { buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class G36K_camo { + class G36K_Camo_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class M16A2 { + class M16A2_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class M16A2GL { + class M16A2_GL_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class M16A4_ACG { + class M16A4_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class M4A1 { + class M4A1_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -49,52 +49,52 @@ class Category_485 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class M4A1_Aim { + class M4A1_CCO_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class Sa58P_EP1 { + class SA58_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class Sa58V_CCO_EP1 { + class SA58_CCO_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class Sa58V_EP1 { + class SA58_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class Sa58V_RCO_EP1 { + class SA58_ACOG_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class AKS_74_kobra { + class AKS74U_Kobra_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class AKS_74_U { + class AKS74U_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class AK_47_M { + class AKM_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {6,"ItemGoldBar"}; }; - class AK_74 { + class AK74_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class FN_FAL { + class FNFAL_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; @@ -104,19 +104,19 @@ class Category_485 { buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class BAF_L85A2_RIS_Holo { + class L85_Holo_DZ { type = "trade_weapons"; buy[] = {9,"ItemGoldBar"}; sell[] = {6,"ItemGoldBar"}; }; }; class Category_615 { - class G36A_camo { + class G36A_Camo_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class G36C { + class G36C_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -126,27 +126,27 @@ class Category_615 { buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class G36K_camo { + class G36K_Camo_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class M16A2 { + class M16A2_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class M16A2GL { + class M16A2_GL_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class M16A4_ACG { + class M16A4_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class M4A1 { + class M4A1_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -161,52 +161,52 @@ class Category_615 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class M4A1_Aim { + class M4A1_CCO_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class Sa58P_EP1 { + class SA58_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class Sa58V_CCO_EP1 { + class SA58_CCO_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class Sa58V_EP1 { + class SA58_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class Sa58V_RCO_EP1 { + class SA58_ACOG_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class AKS_74_kobra { + class AKS74U_Kobra_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class AKS_74_U { + class AKS74U_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class AK_47_M { + class AKM_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {6,"ItemGoldBar"}; }; - class AK_74 { + class AK74_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class FN_FAL { + class FNFAL_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; @@ -216,7 +216,7 @@ class Category_615 { buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class BAF_L85A2_RIS_Holo { + class L85_Holo_DZ { type = "trade_weapons"; buy[] = {9,"ItemGoldBar"}; sell[] = {6,"ItemGoldBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyLightMachineGun.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyLightMachineGun.hpp index f36630ea7..246330608 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyLightMachineGun.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyLightMachineGun.hpp @@ -9,12 +9,12 @@ class Category_486 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk_48_DZ { + class Mk48_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; }; - class Pecheneg_DZ { + class PKM_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; @@ -31,12 +31,12 @@ class Category_616 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk_48_DZ { + class Mk48_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; }; - class Pecheneg_DZ { + class PKM_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyPistols.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyPistols.hpp index c57b3f495..341dbeee5 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyPistols.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyPistols.hpp @@ -1,25 +1,25 @@ class Category_489 { - class M9SD { + class M9_SD_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class glock17_EP1 { + class G17_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; }; - class Colt1911 { + class M1911_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class M9 { + class M9_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {2,"ItemSilverBar10oz"}; }; - class MakarovSD { + class Makarov_SD_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; @@ -29,39 +29,39 @@ class Category_489 { buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Makarov { + class Makarov_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class revolver_EP1 { + class Revolver_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; }; class Category_617 { - class M9SD { + class M9_SD_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class glock17_EP1 { + class G17_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; }; - class Colt1911 { + class M1911_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class M9 { + class M9_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {2,"ItemSilverBar10oz"}; }; - class MakarovSD { + class Makarov_SD_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; @@ -71,12 +71,12 @@ class Category_617 { buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Makarov { + class Makarov_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class revolver_EP1 { + class Revolver_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp index 09b324d16..e334216db 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp @@ -1,10 +1,10 @@ class Category_574 { - class Winchester1866 { + class Winchester1866_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class MR43 { + class MR43_DZ { type = "trade_weapons"; buy[] = {1,"ItemSilverBar10oz"}; sell[] = {8,"ItemSilverBar"}; @@ -14,29 +14,29 @@ class Category_574 { buy[] = {1,"ItemSilverBar10oz"}; sell[] = {5,"ItemSilverBar"}; }; - class M1014 { + class M1014_DZ { type = "trade_weapons"; buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Remington870_lamp { + class Remington870_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class LeeEnfield { + class LeeEnfield_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; }; class Category_620 { - class Winchester1866 { + class Winchester1866_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class MR43 { + class MR43_DZ { type = "trade_weapons"; buy[] = {1,"ItemSilverBar10oz"}; sell[] = {8,"ItemSilverBar"}; @@ -46,17 +46,17 @@ class Category_620 { buy[] = {1,"ItemSilverBar10oz"}; sell[] = {5,"ItemSilverBar"}; }; - class M1014 { + class M1014_DZ { type = "trade_weapons"; buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Remington870_lamp { + class Remington870_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class LeeEnfield { + class LeeEnfield_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifle.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifle.hpp index 5ecb8793b..0c4adf46e 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifle.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifle.hpp @@ -1,20 +1,20 @@ class Category_487 { - class SVD_CAMO { + class SVD_Gh_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M40A3 { + class M40A3_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M14_EP1 { + class M14_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; }; - class huntingrifle { + class CZ550_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; @@ -24,7 +24,7 @@ class Category_487 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class SVD { + class SVD_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; @@ -34,7 +34,7 @@ class Category_487 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M24 { + class M24_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; @@ -46,22 +46,22 @@ class Category_487 { }; }; class Category_619 { - class SVD_CAMO { + class SVD_Gh_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M40A3 { + class M40A3_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M14_EP1 { + class M14_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; }; - class huntingrifle { + class CZ550_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; @@ -71,7 +71,7 @@ class Category_619 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class SVD { + class SVD_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; @@ -81,7 +81,7 @@ class Category_619 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M24 { + class M24_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySubmachineGuns.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySubmachineGuns.hpp index 811049208..d64b6d244 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySubmachineGuns.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySubmachineGuns.hpp @@ -1,10 +1,10 @@ class Category_488 { - class bizon_silenced { + class Bizon_SD_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class UZI_EP1 { + class PDW_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -14,7 +14,7 @@ class Category_488 { buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; }; - class MP5A5 { + class MP5_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {2,"ItemSilverBar10oz"}; @@ -24,19 +24,19 @@ class Category_488 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class MP5SD { + class MP5_SD_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; }; class Category_618 { - class bizon_silenced { + class Bizon_SD_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class UZI_EP1 { + class PDW_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -46,7 +46,7 @@ class Category_618 { buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; }; - class MP5A5 { + class MP5_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {2,"ItemSilverBar10oz"}; @@ -56,7 +56,7 @@ class Category_618 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class MP5SD { + class MP5_SD_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroWeapons.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroWeapons.hpp index a8d732217..206323ff0 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroWeapons.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroWeapons.hpp @@ -9,7 +9,7 @@ class Category_477 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class FN_FAL_ANPVS4 { + class FNFAL_ANPVS4_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; @@ -24,12 +24,12 @@ class Category_477 { buy[] = {4,"ItemGoldBar10oz"}; sell[] = {2,"ItemGoldBar10oz"}; }; - class FN_FAL { + class FNFAL_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk_48_DZ { + class Mk48_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralAssaultRifle.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralAssaultRifle.hpp index 3b63e7157..d2b791b59 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralAssaultRifle.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralAssaultRifle.hpp @@ -1,10 +1,10 @@ class Category_602 { - class G36A_camo { + class G36A_Camo_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class G36C { + class G36C_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -14,27 +14,27 @@ class Category_602 { buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class G36K_camo { + class G36K_Camo_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class M16A2 { + class M16A2_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class M16A2GL { + class M16A2_GL_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class M16A4_ACG { + class M16A4_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class M4A1 { + class M4A1_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -49,52 +49,52 @@ class Category_602 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class M4A1_Aim { + class M4A1_CCO_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class Sa58P_EP1 { + class SA58_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class Sa58V_CCO_EP1 { + class SA58_CCO_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class Sa58V_EP1 { + class SA58_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class Sa58V_RCO_EP1 { + class SA58_ACOG_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class AKS_74_kobra { + class AKS74U_Kobra_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class AKS_74_U { + class AKS74U_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class AK_47_M { + class AKM_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {6,"ItemGoldBar"}; }; - class AK_74 { + class AK74_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class FN_FAL { + class FNFAL_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; @@ -104,19 +104,19 @@ class Category_602 { buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class BAF_L85A2_RIS_Holo { + class L85_Holo_DZ { type = "trade_weapons"; buy[] = {9,"ItemGoldBar"}; sell[] = {6,"ItemGoldBar"}; }; }; class Category_637 { - class G36A_camo { + class G36A_Camo_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class G36C { + class G36C_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -126,27 +126,27 @@ class Category_637 { buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class G36K_camo { + class G36K_Camo_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class M16A2 { + class M16A2_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class M16A2GL { + class M16A2_GL_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class M16A4_ACG { + class M16A4_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class M4A1 { + class M4A1_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -161,52 +161,52 @@ class Category_637 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class M4A1_Aim { + class M4A1_CCO_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class Sa58P_EP1 { + class SA58_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class Sa58V_CCO_EP1 { + class SA58_CCO_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class Sa58V_EP1 { + class SA58_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class Sa58V_RCO_EP1 { + class SA58_ACOG_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class AKS_74_kobra { + class AKS74U_Kobra_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class AKS_74_U { + class AKS74U_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class AK_47_M { + class AKM_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {6,"ItemGoldBar"}; }; - class AK_74 { + class AK74_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class FN_FAL { + class FNFAL_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; @@ -216,7 +216,7 @@ class Category_637 { buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class BAF_L85A2_RIS_Holo { + class L85_Holo_DZ { type = "trade_weapons"; buy[] = {9,"ItemGoldBar"}; sell[] = {6,"ItemGoldBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp index cf7dbba98..d085b42dc 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp @@ -39,7 +39,7 @@ class Category_526 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class SVD { + class SVD_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; @@ -54,7 +54,7 @@ class Category_526 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class RPK_74 { + class RPK74_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; @@ -79,7 +79,7 @@ class Category_526 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class bizon { + class Bizon_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralLightMachineGun.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralLightMachineGun.hpp index 4b133231d..dc1b1d897 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralLightMachineGun.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralLightMachineGun.hpp @@ -9,12 +9,12 @@ class Category_603 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk_48_DZ { + class Mk48_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; }; - class Pecheneg_DZ { + class PKM_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; @@ -31,12 +31,12 @@ class Category_638 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk_48_DZ { + class Mk48_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; }; - class Pecheneg_DZ { + class PKM_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralPistols.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralPistols.hpp index 631392e28..90a11f389 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralPistols.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralPistols.hpp @@ -1,25 +1,25 @@ class Category_606 { - class M9SD { + class M9_SD_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class glock17_EP1 { + class G17_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; }; - class Colt1911 { + class M1911_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class M9 { + class M9_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {2,"ItemSilverBar10oz"}; }; - class MakarovSD { + class Makarov_SD_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; @@ -29,39 +29,39 @@ class Category_606 { buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Makarov { + class Makarov_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class revolver_EP1 { + class Revolver_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; }; class Category_674 { - class M9SD { + class M9_SD_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class glock17_EP1 { + class G17_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; }; - class Colt1911 { + class M1911_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class M9 { + class M9_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {2,"ItemSilverBar10oz"}; }; - class MakarovSD { + class Makarov_SD_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; @@ -71,12 +71,12 @@ class Category_674 { buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Makarov { + class Makarov_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class revolver_EP1 { + class Revolver_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshot.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshot.hpp index 1e086e785..96415ce72 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshot.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshot.hpp @@ -1,10 +1,10 @@ class Category_607 { - class Winchester1866 { + class Winchester1866_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class MR43 { + class MR43_DZ { type = "trade_weapons"; buy[] = {1,"ItemSilverBar10oz"}; sell[] = {8,"ItemSilverBar"}; @@ -14,29 +14,29 @@ class Category_607 { buy[] = {1,"ItemSilverBar10oz"}; sell[] = {5,"ItemSilverBar"}; }; - class M1014 { + class M1014_DZ { type = "trade_weapons"; buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Remington870_lamp { + class Remington870_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class LeeEnfield { + class LeeEnfield_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; }; class Category_641 { - class Winchester1866 { + class Winchester1866_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; }; - class MR43 { + class MR43_DZ { type = "trade_weapons"; buy[] = {1,"ItemSilverBar10oz"}; sell[] = {8,"ItemSilverBar"}; @@ -46,17 +46,17 @@ class Category_641 { buy[] = {1,"ItemSilverBar10oz"}; sell[] = {5,"ItemSilverBar"}; }; - class M1014 { + class M1014_DZ { type = "trade_weapons"; buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Remington870_lamp { + class Remington870_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class LeeEnfield { + class LeeEnfield_DZ { type = "trade_weapons"; buy[] = {2,"ItemSilverBar10oz"}; sell[] = {1,"ItemSilverBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifle.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifle.hpp index 60fb522d4..18c1b62b0 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifle.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifle.hpp @@ -1,20 +1,20 @@ class Category_605 { - class SVD_CAMO { + class SVD_Gh_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M40A3 { + class M40A3_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M14_EP1 { + class M14_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; }; - class huntingrifle { + class CZ550_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; @@ -24,7 +24,7 @@ class Category_605 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class SVD { + class SVD_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; @@ -34,7 +34,7 @@ class Category_605 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M24 { + class M24_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; @@ -46,22 +46,22 @@ class Category_605 { }; }; class Category_640 { - class SVD_CAMO { + class SVD_Gh_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M40A3 { + class M40A3_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M14_EP1 { + class M14_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; }; - class huntingrifle { + class CZ550_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; @@ -71,7 +71,7 @@ class Category_640 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class SVD { + class SVD_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; @@ -81,7 +81,7 @@ class Category_640 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M24 { + class M24_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSubmachineGuns.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSubmachineGuns.hpp index d57f29a85..e67ab3ba4 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSubmachineGuns.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSubmachineGuns.hpp @@ -1,10 +1,10 @@ class Category_604 { - class bizon_silenced { + class Bizon_SD_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class UZI_EP1 { + class PDW_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -14,7 +14,7 @@ class Category_604 { buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; }; - class MP5A5 { + class MP5_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {2,"ItemSilverBar10oz"}; @@ -24,19 +24,19 @@ class Category_604 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class MP5SD { + class MP5_SD_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; }; class Category_642 { - class bizon_silenced { + class Bizon_SD_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class UZI_EP1 { + class PDW_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -46,7 +46,7 @@ class Category_642 { buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; }; - class MP5A5 { + class MP5_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {2,"ItemSilverBar10oz"}; @@ -56,7 +56,7 @@ class Category_642 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class MP5SD { + class MP5_SD_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; diff --git a/Server Files/SQL/1.0.6_Updates.sql b/Server Files/SQL/1.0.6_Updates.sql index 8fc4eef4d..d4fd32a10 100644 --- a/Server Files/SQL/1.0.6_Updates.sql +++ b/Server Files/SQL/1.0.6_Updates.sql @@ -1,13 +1,5 @@ -- ---------------------------- --- Run to replace legacy bloodbag with universal type if using DZE_UseBloodTypes = true; --- ---------------------------- --- UPDATE `Traders_DATA` SET `item` = '["bloodBagONEG",1]' WHERE `item` = '["ItemBloodbag",1]'; --- UPDATE character_data SET Backpack = REPLACE(Backpack, 'ItemBloodbag', 'bloodBagONEG') WHERE INSTR(Backpack, 'ItemBloodbag') > 0; --- UPDATE character_data SET Inventory = REPLACE(Inventory, 'ItemBloodbag', 'bloodBagONEG') WHERE INSTR(Inventory, 'ItemBloodbag') > 0; --- UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemBloodbag', 'bloodBagONEG') WHERE INSTR(Inventory, 'ItemBloodbag') > 0; - --- ---------------------------- --- ItemMatchbox_DZE was removed, use dayz_matchboxCount config variable for match stick count +-- ItemMatchbox_DZE was removed because it was identical to ItemMatchbox, use dayz_matchboxCount config variable for match stick count -- ---------------------------- UPDATE `Traders_DATA` SET `item` = '["ItemMatchbox",1]' WHERE `item` = '["ItemMatchbox_DZE",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'ItemMatchbox_DZE', 'ItemMatchbox') WHERE INSTR(Backpack, 'ItemMatchbox_DZE') > 0; @@ -102,4 +94,258 @@ UPDATE object_data SET Inventory = REPLACE(Inventory, '5x_22_LR_17_HMR', '5Rnd_1 UPDATE `Traders_DATA` SET `item` = '["10Rnd_303British",1]' WHERE `item` = '["10x_303",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, '10x_303', '10Rnd_303British') WHERE INSTR(Backpack, '10x_303') > 0; UPDATE character_data SET Inventory = REPLACE(Inventory, '10x_303', '10Rnd_303British') WHERE INSTR(Inventory, '10x_303') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, '10x_303', '10Rnd_303British') WHERE INSTR(Inventory, '10x_303') > 0; \ No newline at end of file +UPDATE object_data SET Inventory = REPLACE(Inventory, '10x_303', '10Rnd_303British') WHERE INSTR(Inventory, '10x_303') > 0; + +-- ---------------------------- +-- ---------------------------- +-- ---------------------------- +-- ---------------------------- +-- Updated weapon names with attachment support from 1.8.7 +-- ---------------------------- +-- ---------------------------- +-- ---------------------------- +-- ---------------------------- + +UPDATE `Traders_DATA` SET `item` = '["AK74_DZ",1]' WHERE `item` = '["AK_74",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'AK_74', 'AK74_DZ') WHERE INSTR(Backpack, 'AK_74') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'AK_74', 'AK74_DZ') WHERE INSTR(Inventory, 'AK_74') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'AK_74', 'AK74_DZ') WHERE INSTR(Inventory, 'AK_74') > 0; + +UPDATE `Traders_DATA` SET `item` = '["AKM_DZ",1]' WHERE `item` = '["AK_47_M",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'AK_47_M', 'AKM_DZ') WHERE INSTR(Backpack, 'AK_47_M') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'AK_47_M', 'AKM_DZ') WHERE INSTR(Inventory, 'AK_47_M') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'AK_47_M', 'AKM_DZ') WHERE INSTR(Inventory, 'AK_47_M') > 0; + +UPDATE `Traders_DATA` SET `item` = '["AKS74U_DZ",1]' WHERE `item` = '["AKS_74_U",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'AKS_74_U', 'AKS74U_DZ') WHERE INSTR(Backpack, 'AKS_74_U') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'AKS_74_U', 'AKS74U_DZ') WHERE INSTR(Inventory, 'AKS_74_U') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'AKS_74_U', 'AKS74U_DZ') WHERE INSTR(Inventory, 'AKS_74_U') > 0; + +UPDATE `Traders_DATA` SET `item` = '["AKS74U_Kobra_DZ",1]' WHERE `item` = '["AKS_74_kobra",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'AKS_74_kobra', 'AKS74U_Kobra_DZ') WHERE INSTR(Backpack, 'AKS_74_kobra') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'AKS_74_kobra', 'AKS74U_Kobra_DZ') WHERE INSTR(Inventory, 'AKS_74_kobra') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'AKS_74_kobra', 'AKS74U_Kobra_DZ') WHERE INSTR(Inventory, 'AKS_74_kobra') > 0; + +UPDATE `Traders_DATA` SET `item` = '["Bizon_DZ",1]' WHERE `item` = '["bizon",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'bizon', 'Bizon_DZ') WHERE INSTR(Backpack, 'bizon') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'bizon', 'Bizon_DZ') WHERE INSTR(Inventory, 'bizon') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'bizon', 'Bizon_DZ') WHERE INSTR(Inventory, 'bizon') > 0; + +UPDATE `Traders_DATA` SET `item` = '["Bizon_SD_DZ",1]' WHERE `item` = '["bizon_silenced",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'bizon_silenced', 'Bizon_SD_DZ') WHERE INSTR(Backpack, 'bizon_silenced') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'bizon_silenced', 'Bizon_SD_DZ') WHERE INSTR(Inventory, 'bizon_silenced') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'bizon_silenced', 'Bizon_SD_DZ') WHERE INSTR(Inventory, 'bizon_silenced') > 0; + +UPDATE `Traders_DATA` SET `item` = '["CZ550_DZ",1]' WHERE `item` = '["huntingrifle",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'huntingrifle', 'CZ550_DZ') WHERE INSTR(Backpack, 'huntingrifle') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'huntingrifle', 'CZ550_DZ') WHERE INSTR(Inventory, 'huntingrifle') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'huntingrifle', 'CZ550_DZ') WHERE INSTR(Inventory, 'huntingrifle') > 0; + +UPDATE `Traders_DATA` SET `item` = '["DMR_DZ",1]' WHERE `item` = '["DMR",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'DMR', 'DMR_DZ') WHERE INSTR(Backpack, 'DMR') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'DMR', 'DMR_DZ') WHERE INSTR(Inventory, 'DMR') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'DMR', 'DMR_DZ') WHERE INSTR(Inventory, 'DMR') > 0; + +UPDATE `Traders_DATA` SET `item` = '["FNFAL_ANPVS4_DZ",1]' WHERE `item` = '["FN_FAL_ANPVS4",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'FN_FAL_ANPVS4', 'FNFAL_ANPVS4_DZ') WHERE INSTR(Backpack, 'FN_FAL_ANPVS4') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'FN_FAL_ANPVS4', 'FNFAL_ANPVS4_DZ') WHERE INSTR(Inventory, 'FN_FAL_ANPVS4') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'FN_FAL_ANPVS4', 'FNFAL_ANPVS4_DZ') WHERE INSTR(Inventory, 'FN_FAL_ANPVS4') > 0; + +UPDATE `Traders_DATA` SET `item` = '["FNFAL_DZ",1]' WHERE `item` = '["FN_FAL",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'FN_FAL', 'FNFAL_DZ') WHERE INSTR(Backpack, 'FN_FAL') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'FN_FAL', 'FNFAL_DZ') WHERE INSTR(Inventory, 'FN_FAL') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'FN_FAL', 'FNFAL_DZ') WHERE INSTR(Inventory, 'FN_FAL') > 0; + +UPDATE `Traders_DATA` SET `item` = '["G17_DZ",1]' WHERE `item` = '["glock17_EP1",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'glock17_EP1', 'G17_DZ') WHERE INSTR(Backpack, 'glock17_EP1') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'glock17_EP1', 'G17_DZ') WHERE INSTR(Inventory, 'glock17_EP1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'glock17_EP1', 'G17_DZ') WHERE INSTR(Inventory, 'glock17_EP1') > 0; + +UPDATE `Traders_DATA` SET `item` = '["G36A_Camo_DZ",1]' WHERE `item` = '["G36A_camo",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'G36A_camo', 'G36A_Camo_DZ') WHERE INSTR(Backpack, 'G36A_camo') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'G36A_camo', 'G36A_Camo_DZ') WHERE INSTR(Inventory, 'G36A_camo') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'G36A_camo', 'G36A_Camo_DZ') WHERE INSTR(Inventory, 'G36A_camo') > 0; + +UPDATE `Traders_DATA` SET `item` = '["G36C_DZ",1]' WHERE `item` = '["G36C",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'G36C', 'G36C_DZ') WHERE INSTR(Backpack, 'G36C') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'G36C', 'G36C_DZ') WHERE INSTR(Inventory, 'G36C') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'G36C', 'G36C_DZ') WHERE INSTR(Inventory, 'G36C') > 0; + +UPDATE `Traders_DATA` SET `item` = '["G36K_Camo_DZ",1]' WHERE `item` = '["G36K_camo",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'G36K_camo', 'G36K_Camo_DZ') WHERE INSTR(Backpack, 'G36K_camo') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'G36K_camo', 'G36K_Camo_DZ') WHERE INSTR(Inventory, 'G36K_camo') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'G36K_camo', 'G36K_Camo_DZ') WHERE INSTR(Inventory, 'G36K_camo') > 0; + +UPDATE `Traders_DATA` SET `item` = '["L85_Holo_DZ",1]' WHERE `item` = '["BAF_L85A2_RIS_Holo",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'BAF_L85A2_RIS_Holo', 'L85_Holo_DZ') WHERE INSTR(Backpack, 'BAF_L85A2_RIS_Holo') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'BAF_L85A2_RIS_Holo', 'L85_Holo_DZ') WHERE INSTR(Inventory, 'BAF_L85A2_RIS_Holo') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'BAF_L85A2_RIS_Holo', 'L85_Holo_DZ') WHERE INSTR(Inventory, 'BAF_L85A2_RIS_Holo') > 0; + +UPDATE `Traders_DATA` SET `item` = '["LeeEnfield_DZ",1]' WHERE `item` = '["LeeEnfield",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'LeeEnfield', 'LeeEnfield_DZ') WHERE INSTR(Backpack, 'LeeEnfield') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'LeeEnfield', 'LeeEnfield_DZ') WHERE INSTR(Inventory, 'LeeEnfield') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'LeeEnfield', 'LeeEnfield_DZ') WHERE INSTR(Inventory, 'LeeEnfield') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M1014_DZ",1]' WHERE `item` = '["M1014",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M1014', 'M1014_DZ') WHERE INSTR(Backpack, 'M1014') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M1014', 'M1014_DZ') WHERE INSTR(Inventory, 'M1014') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M1014', 'M1014_DZ') WHERE INSTR(Inventory, 'M1014') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M14_DZ",1]' WHERE `item` = '["M14_EP1",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M14_EP1', 'M14_DZ') WHERE INSTR(Backpack, 'M14_EP1') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M14_EP1', 'M14_DZ') WHERE INSTR(Inventory, 'M14_EP1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M14_EP1', 'M14_DZ') WHERE INSTR(Inventory, 'M14_EP1') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M16A2_DZ",1]' WHERE `item` = '["M16A2",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M16A2', 'M16A2_DZ') WHERE INSTR(Backpack, 'M16A2') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M16A2', 'M16A2_DZ') WHERE INSTR(Inventory, 'M16A2') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M16A2', 'M16A2_DZ') WHERE INSTR(Inventory, 'M16A2') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M16A2_GL_DZ",1]' WHERE `item` = '["M16A2GL",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M16A2GL', 'M16A2_GL_DZ') WHERE INSTR(Backpack, 'M16A2GL') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M16A2GL', 'M16A2_GL_DZ') WHERE INSTR(Inventory, 'M16A2GL') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M16A2GL', 'M16A2_GL_DZ') WHERE INSTR(Inventory, 'M16A2GL') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M16A4_DZ",1]' WHERE `item` = '["M16A4_ACG",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M16A4_ACG', 'M16A4_DZ') WHERE INSTR(Backpack, 'M16A4_ACG') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M16A4_ACG', 'M16A4_DZ') WHERE INSTR(Inventory, 'M16A4_ACG') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M16A4_ACG', 'M16A4_DZ') WHERE INSTR(Inventory, 'M16A4_ACG') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M1911_DZ",1]' WHERE `item` = '["Colt1911",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Colt1911', 'M1911_DZ') WHERE INSTR(Backpack, 'Colt1911') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Colt1911', 'M1911_DZ') WHERE INSTR(Inventory, 'Colt1911') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Colt1911', 'M1911_DZ') WHERE INSTR(Inventory, 'Colt1911') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M24_DZ",1]' WHERE `item` = '["M24",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M24', 'M24_DZ') WHERE INSTR(Backpack, 'M24') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M24', 'M24_DZ') WHERE INSTR(Inventory, 'M24') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M24', 'M24_DZ') WHERE INSTR(Inventory, 'M24') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M40A3_DZ",1]' WHERE `item` = '["M40A3",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M40A3', 'M40A3_DZ') WHERE INSTR(Backpack, 'M40A3') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M40A3', 'M40A3_DZ') WHERE INSTR(Inventory, 'M40A3') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M40A3', 'M40A3_DZ') WHERE INSTR(Inventory, 'M40A3') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M4A1_CCO_DZ",1]' WHERE `item` = '["M4A1_Aim",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M4A1_Aim', 'M4A1_CCO_DZ') WHERE INSTR(Backpack, 'M4A1_Aim') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M4A1_Aim', 'M4A1_CCO_DZ') WHERE INSTR(Inventory, 'M4A1_Aim') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M4A1_Aim', 'M4A1_CCO_DZ') WHERE INSTR(Inventory, 'M4A1_Aim') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M4A1_DZ",1]' WHERE `item` = '["M4A1",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M4A1', 'M4A1_DZ') WHERE INSTR(Backpack, 'M4A1') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M4A1', 'M4A1_DZ') WHERE INSTR(Inventory, 'M4A1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M4A1', 'M4A1_DZ') WHERE INSTR(Inventory, 'M4A1') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M9_DZ",1]' WHERE `item` = '["M9",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M9', 'M9_DZ') WHERE INSTR(Backpack, 'M9') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M9', 'M9_DZ') WHERE INSTR(Inventory, 'M9') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M9', 'M9_DZ') WHERE INSTR(Inventory, 'M9') > 0; + +UPDATE `Traders_DATA` SET `item` = '["M9_SD_DZ",1]' WHERE `item` = '["M9SD",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M9SD', 'M9_SD_DZ') WHERE INSTR(Backpack, 'M9SD') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M9SD', 'M9_SD_DZ') WHERE INSTR(Inventory, 'M9SD') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M9SD', 'M9_SD_DZ') WHERE INSTR(Inventory, 'M9SD') > 0; + +UPDATE `Traders_DATA` SET `item` = '["Makarov_DZ",1]' WHERE `item` = '["Makarov",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Makarov', 'Makarov_DZ') WHERE INSTR(Backpack, 'Makarov') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Makarov', 'Makarov_DZ') WHERE INSTR(Inventory, 'Makarov') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Makarov', 'Makarov_DZ') WHERE INSTR(Inventory, 'Makarov') > 0; + +UPDATE `Traders_DATA` SET `item` = '["Makarov_SD_DZ",1]' WHERE `item` = '["MakarovSD",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'MakarovSD', 'Makarov_SD_DZ') WHERE INSTR(Backpack, 'MakarovSD') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'MakarovSD', 'Makarov_SD_DZ') WHERE INSTR(Inventory, 'MakarovSD') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'MakarovSD', 'Makarov_SD_DZ') WHERE INSTR(Inventory, 'MakarovSD') > 0; + +UPDATE `Traders_DATA` SET `item` = '["Mk48_DZ",1]' WHERE `item` = '["Mk_48_DZ",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Mk_48_DZ', 'Mk48_DZ') WHERE INSTR(Backpack, 'Mk_48_DZ') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Mk_48_DZ', 'Mk48_DZ') WHERE INSTR(Inventory, 'Mk_48_DZ') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Mk_48_DZ', 'Mk48_DZ') WHERE INSTR(Inventory, 'Mk_48_DZ') > 0; + +UPDATE `Traders_DATA` SET `item` = '["MP5_DZ",1]' WHERE `item` = '["MP5A5",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'MP5A5', 'MP5_DZ') WHERE INSTR(Backpack, 'MP5A5') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'MP5A5', 'MP5_DZ') WHERE INSTR(Inventory, 'MP5A5') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'MP5A5', 'MP5_DZ') WHERE INSTR(Inventory, 'MP5A5') > 0; + +UPDATE `Traders_DATA` SET `item` = '["MP5_SD_DZ",1]' WHERE `item` = '["MP5SD",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'MP5SD', 'MP5_SD_DZ') WHERE INSTR(Backpack, 'MP5SD') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'MP5SD', 'MP5_SD_DZ') WHERE INSTR(Inventory, 'MP5SD') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'MP5SD', 'MP5_SD_DZ') WHERE INSTR(Inventory, 'MP5SD') > 0; + +UPDATE `Traders_DATA` SET `item` = '["MR43_DZ",1]' WHERE `item` = '["MR43",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'MR43', 'MR43_DZ') WHERE INSTR(Backpack, 'MR43') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'MR43', 'MR43_DZ') WHERE INSTR(Inventory, 'MR43') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'MR43', 'MR43_DZ') WHERE INSTR(Inventory, 'MR43') > 0; + +UPDATE `Traders_DATA` SET `item` = '["PDW_DZ",1]' WHERE `item` = '["UZI_EP1",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'UZI_EP1', 'PDW_DZ') WHERE INSTR(Backpack, 'UZI_EP1') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'UZI_EP1', 'PDW_DZ') WHERE INSTR(Inventory, 'UZI_EP1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'UZI_EP1', 'PDW_DZ') WHERE INSTR(Inventory, 'UZI_EP1') > 0; + +UPDATE `Traders_DATA` SET `item` = '["PKM_DZ",1]' WHERE `item` = '["Pecheneg_DZ",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Pecheneg_DZ', 'PKM_DZ') WHERE INSTR(Backpack, 'Pecheneg_DZ') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Pecheneg_DZ', 'PKM_DZ') WHERE INSTR(Inventory, 'Pecheneg_DZ') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Pecheneg_DZ', 'PKM_DZ') WHERE INSTR(Inventory, 'Pecheneg_DZ') > 0; + +UPDATE `Traders_DATA` SET `item` = '["Remington870_DZ",1]' WHERE `item` = '["Remington870_lamp",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Remington870_lamp', 'Remington870_DZ') WHERE INSTR(Backpack, 'Remington870_lamp') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Remington870_lamp', 'Remington870_DZ') WHERE INSTR(Inventory, 'Remington870_lamp') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Remington870_lamp', 'Remington870_DZ') WHERE INSTR(Inventory, 'Remington870_lamp') > 0; + +UPDATE `Traders_DATA` SET `item` = '["Revolver_DZ",1]' WHERE `item` = '["revolver_EP1",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'revolver_EP1', 'Revolver_DZ') WHERE INSTR(Backpack, 'revolver_EP1') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'revolver_EP1', 'Revolver_DZ') WHERE INSTR(Inventory, 'revolver_EP1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'revolver_EP1', 'Revolver_DZ') WHERE INSTR(Inventory, 'revolver_EP1') > 0; + +UPDATE `Traders_DATA` SET `item` = '["RPK74_DZ",1]' WHERE `item` = '["RPK_74",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'RPK_74', 'RPK74_DZ') WHERE INSTR(Backpack, 'RPK_74') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'RPK_74', 'RPK74_DZ') WHERE INSTR(Inventory, 'RPK_74') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'RPK_74', 'RPK74_DZ') WHERE INSTR(Inventory, 'RPK_74') > 0; + +UPDATE `Traders_DATA` SET `item` = '["SA58_ACOG_DZ",1]' WHERE `item` = '["Sa58V_RCO_EP1",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Sa58V_RCO_EP1', 'SA58_ACOG_DZ') WHERE INSTR(Backpack, 'Sa58V_RCO_EP1') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Sa58V_RCO_EP1', 'SA58_ACOG_DZ') WHERE INSTR(Inventory, 'Sa58V_RCO_EP1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Sa58V_RCO_EP1', 'SA58_ACOG_DZ') WHERE INSTR(Inventory, 'Sa58V_RCO_EP1') > 0; + +UPDATE `Traders_DATA` SET `item` = '["SA58_CCO_DZ",1]' WHERE `item` = '["Sa58V_CCO_EP1",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Sa58V_CCO_EP1', 'SA58_CCO_DZ') WHERE INSTR(Backpack, 'Sa58V_CCO_EP1') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Sa58V_CCO_EP1', 'SA58_CCO_DZ') WHERE INSTR(Inventory, 'Sa58V_CCO_EP1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Sa58V_CCO_EP1', 'SA58_CCO_DZ') WHERE INSTR(Inventory, 'Sa58V_CCO_EP1') > 0; + +UPDATE `Traders_DATA` SET `item` = '["SA58_DZ",1]' WHERE `item` = '["Sa58P_EP1",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Sa58P_EP1', 'SA58_DZ') WHERE INSTR(Backpack, 'Sa58P_EP1') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Sa58P_EP1', 'SA58_DZ') WHERE INSTR(Inventory, 'Sa58P_EP1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Sa58P_EP1', 'SA58_DZ') WHERE INSTR(Inventory, 'Sa58P_EP1') > 0; + +UPDATE `Traders_DATA` SET `item` = '["SA58_DZ",1]' WHERE `item` = '["Sa58V_EP1",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Sa58V_EP1', 'SA58_DZ') WHERE INSTR(Backpack, 'Sa58V_EP1') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Sa58V_EP1', 'SA58_DZ') WHERE INSTR(Inventory, 'Sa58V_EP1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Sa58V_EP1', 'SA58_DZ') WHERE INSTR(Inventory, 'Sa58V_EP1') > 0; + +UPDATE `Traders_DATA` SET `item` = '["SVD_DZ",1]' WHERE `item` = '["SVD",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'SVD', 'SVD_DZ') WHERE INSTR(Backpack, 'SVD') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'SVD', 'SVD_DZ') WHERE INSTR(Inventory, 'SVD') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'SVD', 'SVD_DZ') WHERE INSTR(Inventory, 'SVD') > 0; + +UPDATE `Traders_DATA` SET `item` = '["SVD_Gh_DZ",1]' WHERE `item` = '["SVD_CAMO",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'SVD_CAMO', 'SVD_Gh_DZ') WHERE INSTR(Backpack, 'SVD_CAMO') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'SVD_CAMO', 'SVD_Gh_DZ') WHERE INSTR(Inventory, 'SVD_CAMO') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'SVD_CAMO', 'SVD_Gh_DZ') WHERE INSTR(Inventory, 'SVD_CAMO') > 0; + +UPDATE `Traders_DATA` SET `item` = '["UK59_DZ",1]' WHERE `item` = '["PK_DZ",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'PK_DZ', 'UK59_DZ') WHERE INSTR(Backpack, 'PK_DZ') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'PK_DZ', 'UK59_DZ') WHERE INSTR(Inventory, 'PK_DZ') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'PK_DZ', 'UK59_DZ') WHERE INSTR(Inventory, 'PK_DZ') > 0; + +UPDATE `Traders_DATA` SET `item` = '["Winchester1866_DZ",1]' WHERE `item` = '["Winchester1866",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Winchester1866', 'Winchester1866_DZ') WHERE INSTR(Backpack, 'Winchester1866') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Winchester1866', 'Winchester1866_DZ') WHERE INSTR(Inventory, 'Winchester1866') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Winchester1866', 'Winchester1866_DZ') WHERE INSTR(Inventory, 'Winchester1866') > 0; + + +-- ---------------------------- +-- Run to replace legacy bloodbag with universal type if using DZE_UseBloodTypes = true; +-- ---------------------------- +-- UPDATE `Traders_DATA` SET `item` = '["bloodBagONEG",1]' WHERE `item` = '["ItemBloodbag",1]'; +-- UPDATE character_data SET Backpack = REPLACE(Backpack, 'ItemBloodbag', 'bloodBagONEG') WHERE INSTR(Backpack, 'ItemBloodbag') > 0; +-- UPDATE character_data SET Inventory = REPLACE(Inventory, 'ItemBloodbag', 'bloodBagONEG') WHERE INSTR(Inventory, 'ItemBloodbag') > 0; +-- UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemBloodbag', 'bloodBagONEG') WHERE INSTR(Inventory, 'ItemBloodbag') > 0; \ No newline at end of file