diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
index 1e978150d..d190021cd 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
@@ -72,6 +72,7 @@ weaponsUS[] =
// Submachine Guns
{Loot_WEAPON, 3, PDW_DZ},
{Loot_WEAPON, 3, Kriss_DZ},
+ {Loot_WEAPON, 3, Mac10_DZ},
// Assault Rifles
{Loot_WEAPON, 6, KAC_PDW_DZ},
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp
index 7fb434257..d9bc9a3c6 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp
@@ -4,6 +4,7 @@ class 30Rnd_9x19_UZI : CA_Magazine
{
model = "dayz_epoch_c\models\magazines\pdw_mag.p3d";
displayName = $STR_DZ_MAG_30RND_9X19_UZI_NAME;
+ descriptionShort = $STR_DZ_MAG_30RND_9X19_UZI_DESC;
cartridgeName = "9x19";
@@ -30,6 +31,7 @@ class 30Rnd_9x19_UZI_SD : CA_Magazine
{
model = "dayz_epoch_c\models\magazines\pdw_mag.p3d";
displayName = $STR_DZ_MAG_30RND_9X19_UZISD_NAME;
+ descriptionShort = $STR_DZ_MAG_30RND_9X19_UZISD_DESC;
picture = "\dayz_epoch_c\icons\magazines\m_uzisd_ca.paa";
cartridgeName = "9x19_SD";
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
index ebdedcec0..5adde9a45 100644
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
@@ -78,6 +78,7 @@ class Category_13 {
//Submachine Guns
class Category_14 {
class Sa61_EP1 {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};};
+ class Mac10_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};};
class TEC9_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};};
class PDW_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};};
class PDW_SD_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};};
diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
index 6374547b2..ac28f44b2 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
@@ -221,6 +221,7 @@ class CfgWeapons
class UZI_SD_EP1;
#include "Pistols\PDW.hpp"
#include "Pistols\TEC9.hpp"
+ #include "Pistols\MAC10.hpp"
class revolver_EP1;
#include "Pistols\Revolver.hpp"
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/MAC10.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/MAC10.hpp
new file mode 100644
index 000000000..a46d1ce98
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/MAC10.hpp
@@ -0,0 +1,46 @@
+class Mac10_DZ: PDW_DZ
+{
+ model = "\RH_smg\RH_mac10p.p3d";
+ picture = "\RH_smg\inv\mac10.paa";
+ UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";
+ displayName = $STR_DZ_WPN_MAC10_NAME;
+ drySound[] = {"Ca\sounds\Weapons\rifles\dry",0.003162,1,10};
+ reloadMagazineSound[] = {"\RH_smg\Sound\Mac10_reload.wss",0.056234,1,25};
+ distanceZoomMin = 107;
+ distanceZoomMax = 107;
+ modes[] = {"Single","FullAuto"};
+
+ class Single: Mode_SemiAuto
+ {
+ begin1[] = {"\RH_smg\sound\mac10.wss",1.778279,1,900};
+ soundBegin[] = {"begin1",1};
+ dispersion = 0.006;
+ reloadTime = 0.06315789;
+ recoil = "recoil_single_pistol_2outof3";
+ recoilProne = "recoil_single_pistol_prone_2outof3";
+ minRange = 2;
+ minRangeProbab = 0.1;
+ midRange = 40;
+ midRangeProbab = 0.7;
+ maxRange = 150;
+ maxRangeProbab = 0.05;
+ };
+ class FullAuto: Mode_FullAuto
+ {
+ begin1[] = {"\RH_smg\sound\mac10.wss",1.778279,1,900};
+ soundBegin[] = {"begin1",1};
+ soundContinuous = 0;
+ dispersion = 0.007;
+ reloadTime = 0.06315789;
+ recoil = "recoil_single_pistol_2outof3";
+ recoilProne = "recoil_single_pistol_prone_2outof3";
+ ffCount = 1;
+ aiRateOfFire = 0.001;
+ minRange = 2;
+ minRangeProbab = 0.2;
+ midRange = 20;
+ midRangeProbab = 0.7;
+ maxRange = 40;
+ maxRangeProbab = 0.05;
+ };
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index a434fdc22..fd0b1522d 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -12380,6 +12380,11 @@
Pistolet maszynowy z tłumikiem <br/>Kaliber: .45 ACP SD
Hangtompítós géppisztoly <br/> Kaliber: .45 ACP SD
+
+
+
+ MAC-10
+
@@ -12404,9 +12409,9 @@
30п. PDW глуш. маг.
- 30Rnd. PDW mag.
- 30п. PDW маг.
-
+ 30Rnd. PDW/Mac-10 mag.
+ 30п. PDW/Mac-10 маг.
+
30Rnd. MP5 SD mag.
30п. MP5 глуш. маг.
@@ -13356,8 +13361,29 @@
Kaliber: .45 ACP SD<br/>Patronen: 33<br/>Eingesetzt in: KRISS SD
Kalibr: .45 ACP SD<br/>Nábojů: 33<br/>Pro: KRISS SD
Kaliber: .45 ACP SD <br/> Töltények: 33<br/> Hozzá tartozó fegyver: KRISS SD
+
+
+ Caliber: 9x19mm Parabellum<br/>Rounds: 30<br/>Used in: PDW, MAC-10
+ Calibre : 9x19mm Parabellum<br/>Munitions : 30<br/>Utilisé avec: PDW, MAC-10
+ Calibre: 9x19mm Parabellum<br/>Cartuchos: 30<br/>Usado en: PDW, MAC-10
+ Calibro: 9x19mm Parabellum<br/>Munizioni: 30<br/>Usato in: PDW, MAC-10
+ Kaliber: 9x19mm Parabellum<br/>Naboje: 30<br/>Uzywany w: PDW, MAC-10
+ Патрон: 9x19mm Parabellum <br/>Количество: 30<br/>Исп. в: PDW, MAC-10
+ Kaliber: 9x19mm Parabellum<br/>Patronen: 30<br/>Eingesetzt in: PDW, MAC-10
+ Kalibr: 9x19mm Parabellum<br/>Nábojů: 30<br/>Pro: PDW, MAC-10
+ Kaliber: 9x19mm Parabellum <br/> Töltények: 30<br/> Hozzá tartozó fegyver: PDW, MAC-10
-
+
+ Caliber: 9x19mm Parabellum SD<br/>Rounds: 30<br/>Used in: PDW SD
+ Calibre : 9x19mm Parabellum SD<br/>Munitions : 30<br/>Utilisé avec: PDW SD
+ Calibre: 9x19mm Parabellum SD<br/>Cartuchos: 30<br/>Usado en: PDW SD
+ Calibro: 9x19mm Parabellum SD<br/>Munizioni: 30<br/>Usato in: PDW SD
+ Kaliber: 9x19mm Parabellum SD<br/>Naboje: 30<br/>Uzywany w: PDW SD
+ Патрон: 9x19mm Parabellum SD <br/>Количество: 30<br/>Исп. в: PDW SD
+ Kaliber: 9x19mm Parabellum SD<br/>Patronen: 30<br/>Eingesetzt in: PDW SD
+ Kalibr: 9x19mm Parabellum SD<br/>Nábojů: 30<br/>Pro: PDW SD
+ Kaliber: 9x19mm Parabellum SD <br/> Töltények: 30<br/> Hozzá tartozó fegyver: PDW SD
+