diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
index 7fcb3e702..36016f718 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
@@ -168,10 +168,10 @@ MilitaryCZ[] =
MilitarySmallCZ[] =
{
{Loot_WEAPON, 6, Sa61_EP1},
- {Loot_WEAPON, 3, CZ_75_P_07_DUTY},
- {Loot_WEAPON, 3, CZ_75_D_COMPACT},
- {Loot_WEAPON, 3, CZ_75_SP_01_PHANTOM},
- {Loot_WEAPON, 2, CZ_75_SP_01_PHANTOM_SD},
+ {Loot_WEAPON, 3, CZ75P_DZ},
+ {Loot_WEAPON, 3, CZ75D_DZ},
+ {Loot_WEAPON, 3, CZ75SP_DZ},
+ {Loot_WEAPON, 2, CZ75SP_SD_DZ},
{Loot_GROUP, 5, ToolsMilitary},
{Loot_GROUP, 3, militaryclothes},
{Loot_MAGAZINE, 1, PipeBomb},
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
index eb1be9bbb..6f7885413 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
@@ -144,9 +144,9 @@ weaponsCZ[] =
{Loot_WEAPON, 3, M110_NVG_EP1}, // Technically a US rifle, but the CZ group does not have a DMR type rifle.
// Submachine Guns
- {Loot_WEAPON, 7, Evo_ACR},
- {Loot_WEAPON, 7, Evo_mrad_ACR},
- {Loot_WEAPON, 5, evo_sd_ACR},
+ {Loot_WEAPON, 7, Scorpion_Evo3_DZ},
+ {Loot_WEAPON, 7, Scorpion_Evo3_CCO_DZ},
+ {Loot_WEAPON, 5, Scorpion_Evo3_CCO_SD_DZ},
// Assault Rifles
{Loot_WEAPON, 6, SA58_DZ},
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp
index 1165ebd67..b9b39c4ee 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp
@@ -16,6 +16,7 @@ class 30Rnd_9x19_UZI : CA_Magazine
class 30Rnd_9x19_MP5 : CA_Magazine
{
displayName = $STR_DZ_MAG_30RND_9X19_MP5_NAME;
+ descriptionShort = $STR_DZ_MAG_30RND_MP5_DESC;
cartridgeName = "9x19";
@@ -28,7 +29,7 @@ class 30Rnd_9x19_MP5 : CA_Magazine
class 30Rnd_9x19_UZI_SD : CA_Magazine
{
model = "dayz_epoch_c\models\magazines\pdw_mag.p3d";
- displayName = $STR_DZ_MAG_30RND_9X19_UZISD_NAME;
+ displayName = $STR_DZ_MAG_30RND_9X19_UZISD_NAME;
cartridgeName = "9x19_SD";
@@ -43,6 +44,7 @@ class 30Rnd_9x19_MP5SD : CA_Magazine
model = "\ca\CommunityConfigurationProject_E\Gameplay_ActualModelsOfWeaponMagazinesVisibleOnTheGround\p3d\30Rnd_9x19_MP5.p3d";
picture = "\z\addons\dayz_communityweapons\magazines\data\m_mp5sd_ca.paa";
displayName = $STR_DZ_MAG_30RND_9X19_MP5SD_NAME;
+ descriptionShort = $STR_DZ_MAG_30RND_MP5SD_DESC;
cartridgeName = "9x19_SD";
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
index c3220f156..7c0032bd0 100644
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
@@ -47,6 +47,9 @@ class Category_14 {
class PDW_SD_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};};
class MP5_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {2,"ItemSilverBar10oz"};};
class MP5_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {22,"ItemSilverBar10oz"};};
+ class Scorpion_Evo3_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {2,"ItemSilverBar10oz"};};
+ class Scorpion_Evo3_CCO_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {2,"ItemSilverBar10oz"};};
+ class Scorpion_Evo3_CCO_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {22,"ItemSilverBar10oz"};};
class Bizon_DZ {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
class Bizon_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};};
};
diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
index 6d8f8ff57..9a22dd6de 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp
@@ -141,6 +141,7 @@ class CfgWeapons
class MP5A5;
class MP5SD;
#include "Rifles\MP5.hpp"
+ #include "Rifles\CZScorpion.hpp"
class M16A2;
class M16A2GL;
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZScorpion.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZScorpion.hpp
new file mode 100644
index 000000000..88809e354
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZScorpion.hpp
@@ -0,0 +1,34 @@
+class Evo_ACR;
+class Scorpion_Evo3_DZ: Evo_ACR {
+ displayName = $STR_DZ_WPN_SC_EVO3_NAME;
+ descriptionShort = $STR_DZ_WPN_SC_EVO3_DESC;
+ magazines[] = {"30Rnd_9x19_MP5","30Rnd_9x19_MP5SD"};
+};
+
+class Evo_mrad_ACR;
+class Scorpion_Evo3_CCO_DZ: Evo_mrad_ACR {
+ displayName = $STR_DZ_WPN_SC_EVO3_CCO_NAME;
+ descriptionShort = $STR_DZ_WPN_SC_EVO3_DESC;
+ magazines[] = {"30Rnd_9x19_MP5","30Rnd_9x19_MP5SD"};
+
+ class Attachments
+ {
+ Attachment_Sup9 = "Scorpion_Evo3_CCO_SD_DZ";
+ };
+};
+
+class evo_sd_ACR;
+class Scorpion_Evo3_CCO_SD_DZ: evo_sd_ACR {
+ displayName = $STR_DZ_WPN_SC_EVO3_CCO_SD_NAME;
+ descriptionShort = $STR_DZ_WPN_SC_EVO3_SD_DESC;
+ magazines[] = {"30Rnd_9x19_MP5SD"};
+
+ class ItemActions
+ {
+ class RemoveSuppressor
+ {
+ text = $STR_ATTACHMENT_RMVE_Silencer;
+ script = "; ['Attachment_Sup9',_id,'Scorpion_Evo3_CCO_DZ'] call player_removeAttachment";
+ };
+ };
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 4849231b4..15c9b5614 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -11539,6 +11539,7 @@
Снайперская винтовка <br/>Патрон: 7.62x51mm
Scharfschützengewehr <br/>Kaliber: 7.62x51mm
+
CZ 75P
@@ -11555,7 +11556,40 @@
Semi-automatic Pistol <br/>Caliber: 9x19mm
Halbautomatische Pistole <br/>Kaliber: 9x19mm
-
+
+
+
+
+ Scorpion Evo 3
+
+
+ Scorpion Evo 3 CCO
+
+
+ Scorpion Evo 3 CCO SD
+
+
+ Maschinenpistole <br/>Kaliber: 9x19mm
+ Submachine gun <br/>Caliber: 9x19mm
+ Fucile mitragliatore <br/>Calibro: 9x19 mm
+ Metralleta <br/>Calibre: 9x19 mm
+ Pistolet-mitrailleur <br/>Calibre : 9x19 mm
+ Samopal <br/>Kalibr: 9x19mm
+ Пистолет-пулемет <br/>Патрон: 9x19мм
+ Pistolet maszynowy <br/>Kaliber: 9x19mm
+ Géppisztoly <br/> Kaliber: 9x19mm
+
+
+ Schallgedämpfte Maschinenpistole <br/>Kaliber: 9x19mm
+ Silenced submachine gun <br/>Caliber: 9x19mm
+ Fucile mitragliatore con silenziatore <br/>Calibro: 9x19 mm
+ Metralleta con silenciador <br/>Calibre: 9x19 mm
+ Pistolet-mitrailleur à silencieux <br/>Calibre : 9x19 mm
+ Samopal s tlumičem <br/>Kalibr: 9x19mm
+ Пистолет-пулемет с ПБС <br/>Патрон: 9х19 мм
+ Pistolet maszynowy z tłumikiem <br/>Kaliber: 9x19mm
+ Hangtompítós géppisztoly <br/> Kaliber: 9x19mm
+
@@ -11839,8 +11873,30 @@
Calibre: 12<br/>Munitions: 8<br/>Pour: M1014, Remington 870
Ráže: 12<br/>Munice: 8<br/>Pro: M1014, Remington 870
Kaliber 12 Schrotmunition<br/>8<br/>Verwendet in: M1014, Remington 870
-
-
+
+
+ Kaliber: 9x19 mm Parabellum <br/>Schuss: 30 <br/>Eingesetzt in: MP5, Scorpion Evo 3
+ Caliber: 9x19 mm Parabellum <br/>Rounds: 30 <br/>Used in: MP5, Scorpion Evo 3
+ Calibro: 9x19 mm Parabellum <br/>Munizioni: 30 <br/>Si usa in: MP5, Scorpion Evo 3
+ Calibre: 9x19 mm Parabellum <br/>Cargas: 30 <br/>Uso: MP5, Scorpion Evo 3
+ Calibre : 9x19 mm Parabellum <br/>Munitions : 30 <br/>Utilisé avec : MP5, Scorpion Evo 3
+ Kalibr: 9x19 mm Parabellum <br/>Nábojů: 30 <br/>Pro: MP5, Scorpion Evo 3 SD
+ Патрон: 9x19 мм парабеллум <br/>Количество: 30 <br/>Используется в: MP5, Scorpion Evo 3
+ Kaliber: 9x19 mm Parabellum <br/>Naboje: 30 <br/>Używane w: MP5, Scorpion Evo 3
+ Kaliber: 9x19 mm Parabellum <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: MP5, Scorpion Evo 3
+
+
+ Kaliber: 9x19 mm Parabellum <br/>Schuss: 30 <br/>Eingesetzt in: MP5SD, Scorpion Evo 3 SD
+ Caliber: 9x19 mm Parabellum <br/>Rounds: 30 <br/>Used in: MP5SD, Scorpion Evo 3 SD
+ Calibro: 9x19 mm Parabellum <br/>Munizioni: 30 <br/>Si usa in: MP5SD, Scorpion Evo 3 SD
+ Calibre: 9x19 mm Parabellum <br/>Cargas: 30 <br/>Uso: MP5SD, Scorpion Evo 3 SD
+ Calibre : 9x19 mm Parabellum <br/>Munitions : 30 <br/>Utilisé avec : MP5SD, Scorpion Evo 3 SD
+ Kalibr: 9x19 mm Parabellum <br/>Nábojů: 30 <br/>Pro: MP5SD, Scorpion Evo 3 SD
+ Патрон: 9x19 мм парабеллум <br/>Количество: 30 <br/>Используется в: MP5SD, Scorpion Evo 3 SD
+ Kaliber: 9x19 mm Parabellum <br/>Naboje: 30 <br/>Używane w: MP5SD, Scorpion Evo 3 SD
+ Kaliber: 9x19 mm Parabellum <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: MP5SD, Scorpion Evo 3 SD
+
+