diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp index 4c5016fc8..48eb2d751 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp @@ -90,6 +90,11 @@ 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}, +// {Loot_MAGAZINE, 3, 20Rnd_B_AA12_HE}, //Handgrenades {Loot_MAGAZINE, 5, SmokeShell}, @@ -105,6 +110,11 @@ 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}, +// {Loot_MAGAZINE, 5, 20Rnd_B_AA12_HE}, //Battle rifles {Loot_MAGAZINE, 5, 20Rnd_762x51_DMR}, @@ -234,6 +244,7 @@ AmmoEU[] = //Battle rifles {Loot_MAGAZINE, 4, 20Rnd_762x51_FNFAL}, + {Loot_MAGAZINE, 5, 20Rnd_762x51_B_SCAR}, //Machine guns {Loot_MAGAZINE, 2, 100Rnd_556x45_M249}, @@ -318,7 +329,9 @@ assaultrifleammo[] = { {Loot_MAGAZINE, 8, 30Rnd_556x45_Stanag}, {Loot_MAGAZINE, 10, 30Rnd_545x39_AK}, {Loot_MAGAZINE, 5, 30Rnd_556x45_StanagSD}, - {Loot_MAGAZINE, 8, 20Rnd_762x51_FNFAL} + {Loot_MAGAZINE, 8, 20Rnd_762x51_FNFAL}, + //Epoch 1.0.6 + {Loot_MAGAZINE, 6, 20Rnd_762x51_B_SCAR} }; machinegunammo[] = { {Loot_MAGAZINE, 4, 100Rnd_556x45_BetaCMag}, @@ -337,4 +350,4 @@ machinegunammoexpl[] = { {Loot_MAGAZINE, 4, 200Rnd_556x45_M249}, {Loot_MAGAZINE, 1, MAAWS_HEAT}, {Loot_MAGAZINE, 2, PipeBomb} -}; \ No newline at end of file +}; diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp index 64d4a36f3..5bf04b7b4 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp @@ -49,6 +49,7 @@ AmmoBoxEU1[] = AmmoBoxEU2[] = { {Loot_MAGAZINE, 9, 20Rnd_762x51_FNFAL}, + {Loot_MAGAZINE, 5, 20Rnd_762x51_B_SCAR}, {Loot_MAGAZINE, 1, 100Rnd_762x51_M240} }; @@ -101,4 +102,4 @@ AmmoBoxUS4[] = {Loot_MAGAZINE, 1, SmokeShellRed}, {Loot_MAGAZINE, 1, SmokeShellGreen}, {Loot_MAGAZINE, 0.3, PipeBomb} -}; \ 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 fe42c3d67..2102f3a7e 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -55,7 +55,10 @@ sniperrifles[] = { {Loot_WEAPON, 0.5, VSS_vintorez}, {Loot_WEAPON, 0.6, SCAR_H_LNG_Sniper_SD}, {Loot_WEAPON, 1, M14_DZ}, //M14_EP1 - {Loot_WEAPON, 1, DMR_DZ} //DMR + {Loot_WEAPON, 0.7, DMR_DZ}, //DMR + //Epoch 1.0.6 + {Loot_WEAPON, 0.8, SCAR_H_LNG_Sniper}, //Mk17 Sniper + {Loot_WEAPON, 0.6, M110_NVG_EP1} //M110 NVG }; submachinegun[] = { {Loot_WEAPON, 2, PDW_DZ}, //UZI_EP1 @@ -99,7 +102,21 @@ assaultrifles[] = { {Loot_WEAPON, 0.5, m8_carbine}, {Loot_WEAPON, 0.2, BAF_L85A2_RIS_SUSAT}, {Loot_WEAPON, 0.1, L85_Holo_DZ}, //BAF_L85A2_RIS_Holo - {Loot_WEAPON, 0.1, M4A1_HWS_GL_SD_Camo} + {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 + {Loot_WEAPON, 0.3, SCAR_L_CQC_Holo}, //Mk16 CQC EOTech + {Loot_WEAPON, 0.3, SCAR_L_CQC_EGLM_Holo}, //Mk16 EGLM EOTech,(40mm) + {Loot_WEAPON, 0.3, SCAR_L_STD_EGLM_RCO}, //Mk16 EGLM RCO,(40mm) + {Loot_WEAPON, 0.3, SCAR_L_STD_HOLO}, //Mk16 EOTech + {Loot_WEAPON, 0.3, SCAR_L_STD_Mk4CQT}, //Mk16 Mk4CQ/T + //Mk17 + {Loot_WEAPON, 0.1, SCAR_H_CQC_CCO}, //Mk17 Aimpoint + {Loot_WEAPON, 0.1, SCAR_H_CQC_CCO_SD}, //Mk17 Aimpoint SD + {Loot_WEAPON, 0.1, SCAR_H_STD_EGLM_Spect} //Mk17 EGLM ACOG,(40mm) }; machineguns[] = { {Loot_WEAPON, 1.1, RPK74_DZ}, //RPK_74 @@ -114,10 +131,14 @@ machineguns[] = { {Loot_WEAPON, 1, m240_scoped_EP1_DZE}, {Loot_WEAPON, 0.8, M240_DZ}, {Loot_WEAPON, 0.9, M249_DZ}, - {Loot_WEAPON, 0.5, Mk48_DZ} //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ) + {Loot_WEAPON, 0.5, Mk48_DZ}, //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ) + //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 + {Loot_WEAPON, 2, M1014_DZ}, //M1014 + //Epoch 1.0.6 + {Loot_WEAPON, 1, AA12_PMC} //AA12 Shotgun }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp index 7c4dc40fc..1bcc862cf 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp @@ -124,4 +124,38 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck }; }; }; -}; \ No newline at end of file +}; +//AA12 Ammo +class 20Rnd_B_AA12_74Slug : CA_Magazine +{ + displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME; + + cartridgeName = "12Gauge_Slug"; + + class ItemActions + { + COMBINE_MAG + }; +}; +class 20Rnd_B_AA12_Pellets : CA_Magazine +{ + displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME; + + cartridgeName = "12Gauge_Pellets"; + + class ItemActions + { + COMBINE_MAG + }; +}; +class 20Rnd_B_AA12_HE : CA_Magazine +{ + displayName = $STR_DZ_MAG_20Rnd_B_AA12_HE_NAME; + + cartridgeName = "19mm_HE"; + + class ItemActions + { + COMBINE_MAG + }; +}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp index 6595b097b..bbb77708f 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp @@ -9,7 +9,12 @@ class Category_577 { buy[] = {4,"ItemSilverBar10oz"}; sell[] = {2,"ItemSilverBar10oz"}; }; - class 20Rnd_762x51_SB_SCAR { + class 20Rnd_762x51_B_SCAR { + type = "trade_items"; + buy[] = {6,"ItemGoldBar"}; + sell[] = {3,"ItemGoldBar"}; + }; + class 20Rnd_762x51_SB_SCAR { type = "trade_items"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp index d9b5ad62f..317178073 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp @@ -19,11 +19,21 @@ class Category_627 { buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; }; + class SCAR_H_LNG_Sniper { + type = "trade_weapons"; + buy[] = {6,"ItemGoldBar10oz"}; + sell[] = {3,"ItemGoldBar10oz"}; + }; class SCAR_H_LNG_Sniper_SD { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; }; + class M110_NVG_EP1 { + type = "trade_weapons"; + buy[] = {7,"ItemGoldBar10oz"}; + sell[] = {4,"ItemGoldBar10oz"}; + }; class DMR_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar10oz"}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp index 5d8fa72a6..b848d37f4 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp @@ -49,6 +49,41 @@ class Category_485 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; + class SCAR_L_CQC { + type = "trade_weapons"; + buy[] = {7,"ItemGoldBar"}; + sell[] = {3,"ItemGoldBar"}; + }; + class SCAR_L_CQC_CCO_SD { + type = "trade_weapons"; + buy[] = {2,"ItemGoldBar10oz"}; + sell[] = {8,"ItemGoldBar"}; + }; + class SCAR_L_CQC_Holo { + type = "trade_weapons"; + buy[] = {8,"ItemGoldBar"}; + sell[] = {4,"ItemGoldBar"}; + }; + class SCAR_L_CQC_EGLM_Holo { + type = "trade_weapons"; + buy[] = {1,"ItemGoldBar10oz"}; + sell[] = {5,"ItemGoldBar"}; + }; + class SCAR_L_STD_EGLM_RCO { + type = "trade_weapons"; + buy[] = {2,"ItemGoldBar10oz"}; + sell[] = {7,"ItemGoldBar"}; + }; + class SCAR_L_STD_HOLO { + type = "trade_weapons"; + buy[] = {8,"ItemGoldBar"}; + sell[] = {4,"ItemGoldBar"}; + }; + class SCAR_L_STD_Mk4CQT { + type = "trade_weapons"; + buy[] = {8,"ItemGoldBar"}; + sell[] = {4,"ItemGoldBar"}; + }; class L85_Holo_DZ { type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; @@ -59,6 +94,11 @@ class Category_485 { buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; + class BAF_L85A2_RIS_ACOG { + type = "trade_weapons"; + buy[] = {1,"ItemGoldBar10oz"}; + sell[] = {5,"ItemGoldBar"}; + }; class SA58_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGun.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGun.hpp index d04ec8d17..3be1ad8b9 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGun.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGun.hpp @@ -1,4 +1,9 @@ class Category_486 { + class BAF_L86A2_ACOG { + type = "trade_weapons"; + buy[] = {1,"ItemGoldBar10oz"}; + sell[] = {5,"ItemGoldBar"}; + }; class L110A1_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp index 340070cef..e5fcf7d18 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp @@ -9,6 +9,16 @@ class Category_527 { 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"}; @@ -19,6 +29,16 @@ class Category_527 { 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"}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp index 574e1074e..918ff4a44 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp @@ -9,6 +9,11 @@ class Category_526 { 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"}; @@ -34,6 +39,21 @@ class Category_526 { 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"}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp index 683479905..62a6b0232 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp @@ -24,6 +24,11 @@ class Category_519 { buy[] = {8,"ItemGoldBar10oz"}; sell[] = {4,"ItemGoldBar10oz"}; }; + class UH60M_MEV_EP1 { + type = "trade_any_vehicle"; + buy[] = {1,"ItemBriefcase100oz"}; + sell[] = {6,"ItemGoldBar10oz"}; + }; class Mi17_Civilian_DZ { type = "trade_any_vehicle"; buy[] = {2,"ItemBriefcase100oz"}; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/ShotgunAmmo.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/ShotgunAmmo.hpp index 182b4f8fc..2dc35dad9 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/ShotgunAmmo.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/ShotgunAmmo.hpp @@ -78,4 +78,16 @@ class 8Rnd_B_Saiga12_Pellets class 15Rnd_W1866_Slug { weight = 0.5; -}; \ No newline at end of file +}; +class 20Rnd_B_AA12_Pellets +{ + weight = 1.2; +}; +class 20Rnd_B_AA12_74Slug +{ + weight = 1.2; +}; +class 20Rnd_B_AA12_HE +{ + weight = 1.5; +}; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/LMG.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/LMG.hpp index c086850e9..12ef6c30d 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/LMG.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/LMG.hpp @@ -170,4 +170,8 @@ class RPK_PSO1_DZ class UK59_DZ { weight = 4.7; -}; \ No newline at end of file +}; +class BAF_L86A2_ACOG +{ + weight = 6.7; +}; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp index 988fb1e24..7ab1ba806 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** Copyright (C) 2010 Team ~R3F~ This program is free software under the terms of the GNU General Public License version 3. You should have received a copy of the GNU General Public License @@ -159,6 +159,30 @@ class L85_Holo_DZ { weight = 5.2; }; +class BAF_L85A2_UGL_Holo +{ + weight = 6.2; +}; +class BAF_L85A2_RIS_SUSAT +{ + weight = 5.5; +}; +class BAF_L85A2_UGL_SUSAT +{ + weight = 6.2; +}; +class BAF_L85A2_RIS_ACOG +{ + weight = 5.5; +}; +class BAF_L85A2_UGL_ACOG +{ + weight = 7.1; +}; +class BAF_L85A2_RIS_CWS +{ + weight = 5.2; +}; class FN_FAL { weight = 4.5; @@ -726,4 +750,4 @@ class M14_Holo_DZ class M14_Holo_Gh_DZ { weight = 5.8; -}; \ No newline at end of file +}; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index ad63918fd..fd31d90fd 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -16211,5 +16211,14 @@ 10Rnd. VSS mag. 10п. VSS маг. + + 20Rnd. 12 Cal. Slug. + + + 20Rnd. 12 Cal. Pellets. + + + 20Rnd. 19mm HE. +