diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp index f61d8a10a..f54fb8e97 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp @@ -46,6 +46,10 @@ AmmoCZ[] = { {Loot_MAGAZINE, 1, 10Rnd_762x51_CZ750}, {Loot_MAGAZINE, 3, 20Rnd_762x51_B_SCAR}, + // Shotgun + {Loot_MAGAZINE, 1, 20Rnd_B_Usas12_74Slug}, + {Loot_MAGAZINE, 1, 20Rnd_B_Usas12_Pellets}, + // Submachine guns {Loot_MAGAZINE, 3, 30Rnd_9x19_MP5}, {Loot_MAGAZINE, 3, 30Rnd_9x19_MP5SD}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 44110e18a..2f497c936 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -215,6 +215,9 @@ weaponsCZ[] = {Loot_WEAPON, 2, CZ75SP_DZ}, {Loot_WEAPON, 1, CZ75SP_SD_DZ}, + // Bolt action rifles and shotguns + {Loot_WEAPON, 5, USAS12_DZ}, + // Sniper Rifles {Loot_WEAPON, 3, CZ750_DZ}, {Loot_WEAPON, 3, M110_NV_DZ}, // Technically a US rifle, but the CZ group does not have a DMR type rifle. diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp index b9c840986..2ca88c5bd 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp @@ -205,3 +205,15 @@ class 8Rnd_B_Saiga12_Pellets: CA_Magazine COMBINE_MAG }; }; + +class 20Rnd_B_Usas12_74Slug: 8Rnd_B_Saiga12_74Slug { + displayName = $STR_DZ_MAG_20RND_USAS12_SLUG_NAME; + descriptionShort = $STR_DZ_MAG_20RND_USAS12_SLUG_DESC; + count = 20; +}; + +class 20Rnd_B_Usas12_Pellets: 8Rnd_B_Saiga12_Pellets { + displayName = $STR_DZ_MAG_20RND_USAS12_PELLETS_NAME; + descriptionShort = $STR_DZ_MAG_20RND_USAS12_PELLETS_DESC; + count = 20; +}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp index f839676fb..b171ee358 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp @@ -4,6 +4,7 @@ class Category_11 { class MeleeBaseballbatNails {type = "trade_weapons";buy[] = {-2,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};}; class Saiga12K {type = "trade_weapons";buy[] = {3,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class AA12_PMC {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {5,"ItemGoldBar"};}; + class USAS12_DZ {type = "trade_weapons";buy[] = {7,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; class revolver_gold_EP1 {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; class Colt_Anaconda_Gold_DZ {type = "trade_weapons";buy[] = {9,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar10oz"};}; class SVD_Gold_DZ {type = "trade_weapons";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; @@ -13,6 +14,8 @@ class Category_11 { class MAAWS {type = "trade_weapons";buy[] = {-8,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar10oz"};}; class 8Rnd_B_Saiga12_74Slug {type = "trade_items";buy[] = {5,"ItemSilverBar"};sell[] = {3,"ItemSilverBar"};}; class 8Rnd_B_Saiga12_Pellets {type = "trade_items";buy[] = {5,"ItemSilverBar"};sell[] = {3,"ItemSilverBar"};}; + class 20Rnd_B_Usas12_74Slug {type = "trade_items";buy[] = {8,"ItemSilverBar"};sell[] = {5,"ItemSilverBar"};}; + class 20Rnd_B_Usas12_Pellets {type = "trade_items";buy[] = {8,"ItemSilverBar"};sell[] = {5,"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 1Rnd_Bolt_Explosive {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 4f70c7a3d..fee0d291c 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -198,6 +198,7 @@ class CfgWeapons #include "Rifles\MR43.hpp" #include "Rifles\Winchester1866.hpp" #include "Rifles\Remington870.hpp" + #include "Rifles\Usas12.hpp" #include "Rifles\Crossbow.hpp" #include "Rifles\L115A3.hpp" #include "Rifles\MSR.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Usas12.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Usas12.hpp new file mode 100644 index 000000000..aebf82400 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Usas12.hpp @@ -0,0 +1,61 @@ +class Saiga12K; +class USAS12_DZ: Saiga12K +{ + scope = public; + displayName = $STR_DZ_WPN_USAS12_NAME; + descriptionShort = $STR_DZ_WPN_USAS12_DESC; + model = "\z\addons\dayz_epoch_w\usas12\h4_usas12.p3d"; + picture ="\z\addons\dayz_epoch_w\usas12\data\w_usas_ca.paa"; + magazines[] = {20Rnd_B_Usas12_74Slug, 20Rnd_B_Usas12_Pellets}; + optics = 1; + modelOptics = "-"; + distanceZoomMin = 50; + distanceZoomMax = 50; + bullet1[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_metal_1", db-20, 1,15}; + bullet2[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_metal_2", db-20, 1,15}; + bullet3[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_metal_3", db-15, 1,15}; + bullet4[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_metal_4", db-15, 1,15}; + bullet5[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_dirt_1", db-20, 1,15}; + bullet6[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_dirt_2", db-20, 1,15}; + bullet7[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_dirt_3", db-20, 1,15}; + bullet8[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_dirt_4", db-20, 1,15}; + bullet9[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_dirt_1", db-40, 1,15}; + bullet10[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_dirt_2", db-40, 1,15}; + bullet11[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_dirt_3", db-40, 1,15}; + bullet12[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun_patrona_dirt_4", db-40, 1,15}; + soundBullet[] = {bullet1, 0.083, bullet2, 0.083, bullet3, 0.083, bullet4, 0.083, bullet5, 0.083, bullet6, 0.083, bullet7, 0.083, bullet8, 0.083, bullet9, 0.083, bullet10, 0.083, bullet11, 0.083, bullet12, 0.083}; + fireSpreadAngle = 0.7848246; + modes[] = {"Single", "FullAuto"}; + class Single: Mode_SemiAuto + { + begin1[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun1", db5, 1,1200}; + begin2[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun4", db5, 1,1200}; + soundBegin[] = {begin1,0.5, begin2,0.5}; + dispersion = 0.002; + reloadTime = 0.2; + recoil = "recoil_single_primary_6outof10"; + recoilProne = "recoil_single_primary_prone_6outof10"; + minRange = 0; + minRangeProbab = 0.50; + midRange = 60; + midRangeProbab = 0.20; + maxRange = 100; + maxRangeProbab = 0.03; + }; + class FullAuto: Mode_FullAuto + { + begin1[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun1", db5, 1,1200}; + begin2[] = {"Ca\Sounds_PMC\Weapons_PMC\SHOTGUN\shotgun4", db5, 1,1200}; + soundBegin[] = {begin1,0.5, begin2,0.5}; + dispersion = 0.003; + reloadTime = 0.2; + recoil = "recoil_single_primary_6outof10"; + recoilProne = "recoil_single_primary_prone_6outof10"; + minRange = 0; + minRangeProbab = 0.60; + midRange = 40; + midRangeProbab = 0.15; + maxRange = 70; + maxRangeProbab = 0.02; + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index e121c47ea..95c8e91ab 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -13449,7 +13449,16 @@ Пистолет-пулемет <br/>Патрон: 9x19мм Parabellum Pistolet maszynowy <br/>Kaliber: 9x19mm Parabellum Géppisztoly <br/> Kaliber: 9x19mm Parabellum - + + + + + USAS-12 + + + Automatic Shotgun <br/>Caliber: Caliber 12 + Selbstladeschrotflinte <br/>Kaliber: Kaliber 12 + @@ -14821,7 +14830,8 @@ Kaliber: 7.62x51mm SD <br/> Töltények: 20 <br/> Hozzá tartozó fegyver: MK 14 SD, M21A5 SD - 30Rnd. Steyr Aug mag + 30Rnd. Steyr Aug mag. + 30п. Steyr Aug маг. Kaliber: 5.56x45mm <br/>Patronen: 30 <br/>Eingesetzt in: Steyr Aug A3 @@ -14835,7 +14845,8 @@ Kaliber: 5.56x45mm <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: Steyr Aug A3 - 5Rnd. Chey Tac mag + 5Rnd. Chey Tac mag. + 5п. Chey Tac маг. Kaliber: .408 Chey Tac <br/>Patronen: 5 <br/>Eingesetzt in: M200 Chey Tac @@ -14937,6 +14948,37 @@ Kaliber: 9x19mm Parabellum<br/>Patronen: 70<br/>Eingesetzt in: Suomi M-31 Kalibr: 9x19mm Parabellum<br/>Nábojů: 70<br/>Pro: Suomi M-31 Kaliber: 9x19mm Parabellum<br/> Töltények: 70<br/> Hozzá tartozó fegyver: Suomi M-31 + + + 20Rnd. USAS-12 Slug + 20п. USAS-12 Slug + + + Caliber: Caliber 12 Slug <br/>Rounds: 20<br/>Used in: USAS-12 + Calibre: Calibre 12 Slug <br/>Munitions : 20<br/>Utilisé avec: USAS-12 + Calibre: Calibre 12 Slug <br/>Cartuchos: 20<br/>Usado en: USAS-12 + Calibro: Calibro 12 Slug <br/>Munizioni: 20<br/>Usato in: USAS-12 + Kaliber: Kaliber 12 Slug <br/>Naboje: 20<br/>Uzywany w: USAS-12 + Патрон: Патрон 12 <br/>Количество: 20<br/>Исп. в: USAS-12 + Kaliber: Kaliber 12 Slug <br/>Patronen: 20<br/>Eingesetzt in: USAS-12 + Kalibr: Kalibr 12 Slug <br/>Nábojů: 20<br/>Pro: USAS-12 + Kaliber: Kaliber 12 Slug <br/> Töltények: 20<br/> Hozzá tartozó fegyver: USAS-12 + + + 20Rnd. USAS-12 Pellets + 20Rnd. USAS-12 Schrot + 20п. USAS-12 Pellets + + + Caliber: Caliber 12 Pellets <br/>Rounds: 20<br/>Used in: USAS-12 + Calibre: Calibre 12 Pellets <br/>Munitions : 20<br/>Utilisé avec: USAS-12 + Calibre: Calibre 12 Pellets <br/>Cartuchos: 20<br/>Usado en: USAS-12 + Calibro: Calibro 12 Pellets <br/>Munizioni: 20<br/>Usato in: USAS-12 + Kaliber: Kaliber 12 Pellets <br/>Naboje: 20<br/>Uzywany w: USAS-12 + Патрон: Патрон 12 <br/>Количество: 20<br/>Исп. в: USAS-12 + Kaliber: Kaliber 12 Schrot <br/>Patronen: 20<br/>Eingesetzt in: USAS-12 + Kalibr: Kalibr 12 Pellets <br/>Nábojů: 20<br/>Pro: USAS-12 + Kaliber: Kaliber 12 Pellets <br/> Töltények: 20<br/> Hozzá tartozó fegyver: USAS-12