diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
index 509ad1893..ef20d4833 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
@@ -223,8 +223,8 @@ weaponsCZ[] =
// Assault Rifles
{Loot_WEAPON, 6, SA58_DZ},
- {Loot_WEAPON, 6, Sa58V_CCO_EP1},
- {Loot_WEAPON, 6, Sa58V_RCO_EP1},
+ {Loot_WEAPON, 6, Sa58V_Camo_CCO_DZ},
+ {Loot_WEAPON, 6, Sa58V_Camo_ACOG_DZ},
{Loot_WEAPON, 6, SA58_RIS_DZ},
{Loot_WEAPON, 6, CZ805_A1_DZ},
{Loot_WEAPON, 6, CZ805_A1_GL_DZ},
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp
index 7d122d5c6..3955ef157 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp
@@ -11,6 +11,14 @@ class 30Rnd_545x39_AK : CA_Magazine
};
};
+class 60Rnd_545x39_AK_Taped : 30Rnd_545x39_AK {
+ displayName = $STR_DZE_MAG_60RND_545x39_AK74_NAME;
+ descriptionShort = $STR_DZE_MAG_60RND_545x39_AK74_DESC;
+ count = 60;
+ picture = "\z\addons\dayz_epoch_w\magazine\ui\m_aktwin_mag.paa";
+ model = "\z\addons\dayz_epoch_w\magazine\dze_ak47_twinmag.p3d";
+};
+
class 30Rnd_545x39_AKSD : 30Rnd_545x39_AK
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_ak74sd_ca.paa";
@@ -24,9 +32,17 @@ class 30Rnd_545x39_AKSD : 30Rnd_545x39_AK
};
};
+class 60Rnd_545x39_AKSD_Taped : 30Rnd_545x39_AKSD {
+ displayName = $STR_DZE_MAG_60RND_545x39_AK74SD_NAME;
+ descriptionShort = $STR_DZE_MAG_60RND_545x39_AK74SD_DESC;
+ count = 60;
+ picture = "\z\addons\dayz_epoch_w\magazine\ui\m_aktwin_mag.paa";
+ model = "\z\addons\dayz_epoch_w\magazine\dze_ak47_twinmag.p3d";
+};
+
class 75Rnd_545x39_RPK : CA_Magazine
{
- model = "dayz_epoch_c\models\magazines\RPK_mag.p3d";
+ model = "\z\addons\dayz_epoch_w\magazine\dze_RPK_mag.p3d";
picture = "\CA\weapons\AK\data\equip\M_RPK_74_CA.paa";
displayName = $STR_DZ_MAG_75RND_545X39_RPK_NAME;
descriptionShort = $STR_DZ_MAG_75RND_RPK74_DESC;
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp
index 7b85160f5..7e58ae3e5 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp
@@ -29,7 +29,7 @@ class 100Rnd_556x45_BetaCMag: CA_Magazine {
ammo = "B_556x45_Ball";
count = 100;
initSpeed = 920;
- model = "dayz_epoch_c\models\magazines\MG36_mag.p3d";
+ model = "\z\addons\dayz_epoch_w\magazine\dze_MG36_mag.p3d";
picture = "\ca\weapons\g36\data\equip\M_MG36_CA.paa";
type = WeaponSlotItem;
tracersEvery = 4;
@@ -157,12 +157,27 @@ class 60Rnd_556x45_Stanag_Taped : 30Rnd_556x45_Stanag {
displayName = $STR_DZE_MAG_60RND_556x45_STANAG_NAME;
descriptionShort = $STR_DZE_MAG_60RND_556x45_STANAG_DESC;
count = 60;
- //picture = "\ice_apo_weapons\data\double_ca.paa"; - will be replaced soon
+ picture = "\z\addons\dayz_epoch_w\magazine\ui\m_stan_twin_ca.paa";
+ model = "\z\addons\dayz_epoch_w\magazine\dze_stannag_twinmag.p3d";
class ItemActions
{
COMBINE_MAG
- class ReloadMag {};
+ delete ReloadMag;
+ };
+};
+
+class 60Rnd_556x45_StanagSD_Taped : 30Rnd_556x45_StanagSD {
+ displayName = $STR_DZE_MAG_60RND_556x45_STANAGSD_NAME;
+ descriptionShort = $STR_DZE_MAG_60RND_556x45_STANAGSD_DESC;
+ count = 60;
+ picture = "\z\addons\dayz_epoch_w\magazine\ui\m_stan_twin_ca.paa";
+ model = "\z\addons\dayz_epoch_w\magazine\dze_stannag_twinmag.p3d";
+ class ItemActions
+ {
+ COMBINE_MAG
+
+ delete ReloadMag;
};
};
@@ -176,6 +191,6 @@ class 30Rnd_556x45_Aug : 30Rnd_556x45_Stanag {
{
COMBINE_MAG
- class ReloadMag {};
+ delete ReloadMag;
};
};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp
index 39686f590..3f844ca0d 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp
@@ -23,9 +23,26 @@ class 30Rnd_762x39_AK47 : CA_Magazine
};
};
+
+class 60Rnd_762x39_AK47_Taped : 30Rnd_762x39_AK47
+{
+ picture = "\z\addons\dayz_epoch_w\magazine\ui\m_akmtwin_mag.paa";
+ model = "\z\addons\dayz_epoch_w\magazine\dze_akm_twin_mag.p3d";
+ displayName = $STR_DZ_MAG_60RND_762X39_AK47_NAME;
+ descriptionShort = $STR_DZE_MAG_60RND_762X39_AK47_DESC;
+ count = 60;
+
+ class ItemActions
+ {
+ COMBINE_MAG
+
+ delete ReloadMag;
+ };
+};
+
class 75Rnd_762x39_RPK : 30Rnd_762x39_AK47
{
- model = "dayz_epoch_c\models\magazines\RPK_mag.p3d";
+ model = "\z\addons\dayz_epoch_w\magazine\dze_RPK_mag.p3d";
picture = "\z\addons\dayz_communityweapons\magazines\data\m_rpk_ca.paa";
displayName = $STR_DZ_MAG_75RND_762X39_RPK_NAME;
descriptionShort = $STR_DZ_MAG_75RND_762X39_RPK_DESC;
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
index 205ffd178..5c4b44e74 100644
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
@@ -411,9 +411,9 @@ class Category_16 {
class SA58_ACOG_FL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};};
class SA58_ACOG_MFL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {9,"ItemGoldBar"};};
//Desert camo no attachment support
- class Sa58V_CCO_EP1 {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};};
+ class Sa58V_Camo_CCO_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};};
//Desert camo no attachment support
- class Sa58V_RCO_EP1 {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
+ class Sa58V_Camo_ACOG_DZ {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
class AKM_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};};
class AKM_Kobra_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {5,"ItemGoldBar"};};
class AKM_PSO1_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};};
@@ -507,7 +507,8 @@ class Category_16 {
class MK17_GL_Holo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {18,"ItemGoldBar"};};
class MK17_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {14,"ItemGoldBar"};};
class MK17_GL_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {16,"ItemGoldBar"};};
- class MK17_ACOG_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {18,"ItemGoldBar"};}; class CZ805_B_GL_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
+ class MK17_ACOG_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {18,"ItemGoldBar"};};
+ class CZ805_B_GL_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
class HK417_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};};
class HK417_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
class HK417_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};};
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK107.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK107.hpp
index 7179f6852..c59300eae 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK107.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK107.hpp
@@ -7,6 +7,7 @@ class AK107_Kobra_DZ : AK_107_kobra
magazines[] =
{
30Rnd_545x39_AK,
+ 60Rnd_545x39_AK_Taped,
75Rnd_545x39_RPK
};
@@ -34,6 +35,7 @@ class AK107_DZ : AK_107_CP
magazines[] =
{
30Rnd_545x39_AK,
+ 60Rnd_545x39_AK_Taped,
75Rnd_545x39_RPK
};
@@ -56,6 +58,7 @@ class AK107_GL_DZ : AK_107_GL_CP
magazines[] =
{
30Rnd_545x39_AK,
+ 60Rnd_545x39_AK_Taped,
75Rnd_545x39_RPK
};
@@ -83,6 +86,7 @@ class AK107_PSO_DZ : AK_107_pso
magazines[] =
{
30Rnd_545x39_AK,
+ 60Rnd_545x39_AK_Taped,
75Rnd_545x39_RPK
};
@@ -109,6 +113,7 @@ class AK107_GL_PSO_DZ : AK_107_GL_pso
magazines[] =
{
30Rnd_545x39_AK,
+ 60Rnd_545x39_AK_Taped,
75Rnd_545x39_RPK
};
@@ -137,6 +142,7 @@ class AK107_GL_Kobra_DZ : AK_107_GL_kobra
magazines[] =
{
30Rnd_545x39_AK,
+ 60Rnd_545x39_AK_Taped,
75Rnd_545x39_RPK
};
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp
index 1e6c47938..748128ba5 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp
@@ -10,6 +10,7 @@ class AK74_Kobra_DZ : AK_74
magazines[] =
{
30Rnd_545x39_AK,
+ 60Rnd_545x39_AK_Taped,
75Rnd_545x39_RPK
};
@@ -38,7 +39,8 @@ class AK74_Kobra_SD_DZ : AKS_74_UN_kobra
magazines[] =
{
- 30Rnd_545x39_AKSD
+ 30Rnd_545x39_AKSD,
+ 60Rnd_545x39_AKSD_Taped
};
class Attachments
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKM.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKM.hpp
index 8d1dd1f17..f61bd7ca8 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKM.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKM.hpp
@@ -4,7 +4,7 @@ class AKM_DZ : AK_47_M
picture = "\z\addons\dayz_communityweapons\akm\data\w_akm_ca.paa";
displayName = $STR_DZ_WPN_AKM_NAME;
- //magazines[] = {30Rnd_762x39_AK47}; //Allow default A2 mags
+ magazines[] = {30Rnd_762x39_AK47,60Rnd_762x39_AK47_Taped};
//iron sight zeroing
weaponInfoType = "RscWeaponZeroing";
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS.hpp
index c01583559..391bfdb53 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS.hpp
@@ -1,7 +1,7 @@
class AKS_Gold_DZ: AKM_DZ {
displayName = $STR_DZ_WPN_AKS_GOLD_NAME;
model = "\RH_aks\RH_aks47g.p3d";
- picture = "\RH_aks\inv\aks47g.paa";
+ picture = "\RH_aks\inv\aks47g.paa";
};
class AKS_Silver_DZ: AKM_DZ {
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp
index 54addf8cd..c1fc86101 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp
@@ -8,6 +8,7 @@ class AKS74U_Kobra_DZ : AKS_74_U
magazines[] =
{
30Rnd_545x39_AK,
+ 60Rnd_545x39_AK_Taped,
75Rnd_545x39_RPK
};
@@ -35,7 +36,8 @@ class AKS74U_Kobra_SD_DZ : AKS_74_UN_kobra
magazines[] =
{
- 30Rnd_545x39_AKSD
+ 30Rnd_545x39_AKSD,
+ 60Rnd_545x39_AKSD_Taped
};
class ItemActions
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp
index 1e1043016..0e7e83cf3 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp
@@ -47,7 +47,8 @@ class CZ805_A2_SD_DZ: CZ805_A2_SD_ACR {
magazines[] =
{
30Rnd_556x45_G36SD,
- 30Rnd_556x45_StanagSD
+ 30Rnd_556x45_StanagSD,
+ 60Rnd_556x45_StanagSD_Taped
};
};
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp
index eb07e8e3c..f1e2e883b 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp
@@ -134,7 +134,8 @@ class Famas_SD_DZ: M4A1_AIM_SD_camo
magazines[] =
{
30Rnd_556x45_StanagSD,
- 30Rnd_556x45_G36SD
+ 30Rnd_556x45_G36SD,
+ 60Rnd_556x45_StanagSD_Taped
};
class Attachments
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp
index ae4fa32b7..ef4acfb97 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp
@@ -89,7 +89,8 @@ class G36K_Camo_SD_DZ : G36_C_SD_eotech
magazines[] =
{
30Rnd_556x45_G36SD,
- 30Rnd_556x45_StanagSD
+ 30Rnd_556x45_StanagSD,
+ 60Rnd_556x45_StanagSD_Taped
};
//G36 Optic
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp
index 27b5679ea..26dadb439 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp
@@ -67,7 +67,8 @@ class G36C_SD_DZ : G36_C_SD_eotech
magazines[] =
{
30Rnd_556x45_G36SD,
- 30Rnd_556x45_StanagSD
+ 30Rnd_556x45_StanagSD,
+ 60Rnd_556x45_StanagSD_Taped
};
class Attachments
@@ -246,7 +247,8 @@ class G36C_Camo_Holo_SD_DZ : G36_C_SD_camo
magazines[] =
{
30Rnd_556x45_G36SD,
- 30Rnd_556x45_StanagSD
+ 30Rnd_556x45_StanagSD,
+ 60Rnd_556x45_StanagSD_Taped
};
};
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK416.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK416.hpp
index 5e8fcc2e1..5d252aaf4 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK416.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/HK416.hpp
@@ -136,7 +136,8 @@ class HK416_SD_DZ : M4A1_AIM_SD_camo
magazines[] =
{
30Rnd_556x45_StanagSD,
- 30Rnd_556x45_G36SD
+ 30Rnd_556x45_G36SD,
+ 60Rnd_556x45_StanagSD_Taped
};
class Attachments
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp
index 99d0d782d..e5a89116b 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp
@@ -147,7 +147,8 @@ class L85A2_SD_Base : L85A2_DZ
magazines[] =
{
30Rnd_556x45_StanagSD,
- 30Rnd_556x45_G36SD
+ 30Rnd_556x45_G36SD,
+ 60Rnd_556x45_StanagSD_Taped
};
fireLightDuration = 0;
fireLightIntensity = 0;
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp
index 92317c04c..9ea855f7f 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp
@@ -169,7 +169,8 @@ class M4A1_SD_DZ : M4A1_AIM_SD_camo
magazines[] =
{
30Rnd_556x45_StanagSD,
- 30Rnd_556x45_G36SD
+ 30Rnd_556x45_G36SD,
+ 60Rnd_556x45_StanagSD_Taped
};
class Attachments
@@ -1603,7 +1604,8 @@ class M4A1_Camo_CCO_SD_DZ: M4A1_AIM_SD_camo {
magazines[] =
{
30Rnd_556x45_StanagSD,
- 30Rnd_556x45_G36SD
+ 30Rnd_556x45_G36SD,
+ 60Rnd_556x45_StanagSD_Taped
};
class Attachments {};
@@ -1639,7 +1641,8 @@ class M4A1_Camo_Holo_GL_SD_DZ: M4A1_HWS_GL_SD_Camo {
magazines[] =
{
30Rnd_556x45_StanagSD,
- 30Rnd_556x45_G36SD
+ 30Rnd_556x45_G36SD,
+ 60Rnd_556x45_StanagSD_Taped
};
class Attachments {};
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp
index ee4cf7219..fc6ad851c 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp
@@ -137,7 +137,8 @@ class Masada_SD_DZ : M4A1_AIM_SD_camo
magazines[] =
{
30Rnd_556x45_StanagSD,
- 30Rnd_556x45_G36SD
+ 30Rnd_556x45_G36SD,
+ 60Rnd_556x45_StanagSD_Taped
};
class Attachments
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK.hpp
index 6d58acf31..894aca73d 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK.hpp
@@ -11,7 +11,8 @@ class RPK_DZ : AK_47_M
{
75Rnd_762x39_RPK,
30Rnd_762x39_AK47,
- 30Rnd_762x39_SA58
+ 30Rnd_762x39_SA58,
+ 60Rnd_762x39_AK47_Taped
};
modes[] = {FullAuto,Single};
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp
index 3f614621d..ab57ee30b 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp
@@ -7,6 +7,7 @@ class RPK74_Kobra_DZ : RPK_74
magazines[] =
{
75Rnd_545x39_RPK,
+ 60Rnd_545x39_AK_Taped,
30Rnd_545x39_AK
};
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SA58.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SA58.hpp
index 68e68d01d..97353380c 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SA58.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SA58.hpp
@@ -27,7 +27,7 @@ class SA58_DZ : Sa58V_EP1
displayName = $STR_DZ_WPN_SA58_NAME;
modes[] = {Single, FullAuto};
- //magazines[] = {30Rnd_762x39_SA58}; //Allow default A2 mags
+ magazines[] = {30Rnd_762x39_SA58,30Rnd_762x39_AK47,60Rnd_762x39_AK47_Taped};
weaponInfoType = "RscWeaponZeroing";
discreteDistance[] = {100,200,300,400,500,600,700,800};
@@ -374,3 +374,15 @@ class SA58_ACOG_MFL_DZ : SA58_ACOG_DZ
};
};
};
+
+class Sa58V_DZ: Sa58V_EP1 {
+ magazines[] = {30Rnd_762x39_SA58,30Rnd_762x39_AK47,60Rnd_762x39_AK47_Taped};
+};
+class Sa58V_CCO_EP1;
+class Sa58V_Camo_CCO_DZ: Sa58V_CCO_EP1 {
+ magazines[] = {30Rnd_762x39_SA58,30Rnd_762x39_AK47,60Rnd_762x39_AK47_Taped};
+};
+class Sa58V_RCO_EP1;
+class Sa58V_Camo_ACOG_DZ: Sa58V_RCO_EP1 {
+ magazines[] = {30Rnd_762x39_SA58,30Rnd_762x39_AK47,60Rnd_762x39_AK47_Taped};
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 332453af4..a50f0fec4 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -13441,6 +13441,14 @@
30Rnd. AK-47M mag.
30п. АК-47М маг.
+
+ 60Rnd. AK-47M mag.
+ 60п. АК-47М маг.
+
+
+ Caliber: 7.62x39mm <br/>Rounds: 60, duct-taped <br/>Used in: AK-47M, SA-58, RPK
+ Kaliber: 7.62x39mm <br/>Patronen: 60, zusammengeklebt <br/>Eingesetzt in: AK-47M, SA-58, RPK
+
30Rnd. SA-58 mag.
30п. SA-58 маг.
@@ -13480,12 +13488,12 @@
100Rnd. M240 belt
- 100 Schuss M240 Gurt
+ 100Rnd. M240 Gurt
100п. M240 лента
100Rnd. PK belt
- 100 Schuss PK Gurt
+ 100Rnd. PK Gurt
100п. ПК лента
@@ -13517,7 +13525,7 @@
50Rnd. UK-59 belt
- 50 Schuss UK-59 Gurt
+ 50Rnd. UK-59 Gurt
50п. UK-59 лента
@@ -13528,7 +13536,7 @@
75Rnd. RPK drum mag.
- 75 Schuss RPK Trommelmagazin
+ 75Rnd. RPK Trommelmagazin
75п. РПК барабан
@@ -13539,23 +13547,23 @@
75Rnd. RPK-74 drum mag.
- 75 Schuss RPK-74 Trommelmagazin
+ 75Rnd. RPK-74 Trommelmagazin
75п. РПК-74 барабан
100Rnd. M249 belt
- 100 Schuss M249 Gurt
+ 100Rnd. M249 Gurt
100п. M249 лента
200Rnd. M249 belt
- 200 Schuss M249 Gurt
+ 200Rnd. M249 Gurt
200п. M249 лента
200Rnd. L110 belt
- 200 Schuss L110 Gurt
+ 200Rnd. L110 Gurt
200п. L110 лента
@@ -13582,7 +13590,7 @@
15Rnd. 1866 ammo
- 15 Schuss 1866er Flintenlaufgeschoss
+ 15Rnd. 1866er
15п. для 1866
15 Rondas. Balas para 1866
15 balles pour 1866
@@ -13600,7 +13608,6 @@
2Rnd. Slug
2 balles
2 patrony Slug
- 2 Schuss Flintenlaufgeschoss
Caliber: 12 gauge <br/>Rounds: 2 <br/>Used in: M1014, Remington 870, Double-barreled Shotgun
@@ -13616,7 +13623,7 @@
2Rnd. Perdigones
2 cartouches
2 patrony broků
- 2 Schuss Schrot
+ 2Rnd. 12Cal. Schrot
Caliber: 12 gauge <br/>Rounds: 2<br/>Used in: M1014, Remington 870, Double-barreled Shotgun
@@ -13632,7 +13639,6 @@
8Rnd. Slug
8 balles
8 patrony Slug
- 8 Schuss Flintenlaufgeschoss
Caliber: 12 gauge <br/>Rounds: 8 <br/>Used in: M1014, Remington 870
@@ -13648,7 +13654,7 @@
8Rnd. Perdigones
8 cartouches
8 patrony broků
- 8 Schuss Schrot
+ 8Rnd. 12Cal. Schrot
Caliber: 12 gauge <br/>Rounds: 8<br/>Used in: M1014, Remington 870
@@ -13681,13 +13687,33 @@
Kaliber: 9x19mm Parabellum SD<br/> Töltények: 30 <br/> Hozzá tartozó fegyver: MP5SD, Scorpion Evo 3 SD
- 60Rnd. Stanag Mag
- 60 Schuss Stanag Mag
+ 60Rnd. Stanag mag
-
- Caliber: 5.56x45mm <br/>Rounds: 60, duct-taped <br/>Used in: G36, M16, M4, M249, MK-12 and L110
- Kaliber: 5.56x45mm <br/>Patronen: 60, zusammengeklebt <br/>Eingesetzt in: G36, M16, M4, M249, MK-12 und L110
+
+ 60Rnd. Stanag SD mag
+
+ Caliber: 5.56x45mm <br/>Rounds: 60, duct-taped <br/>Used in: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21
+ Kaliber: 5.56x45mm <br/>Patronen: 60, zusammengeklebt <br/>Eingesetzt in: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21
+
+
+ Caliber: 5.56x45mm SD<br/>Rounds: 60, duct-taped <br/>Used in: G36 SD, M4 SD, XM8 SD, Famas SD, HK416 SD, Masada SD, MK16 SD, CZ805 SD
+ Kaliber: 5.56x45mm SD<br/>Patronen: 60, zusammengeklebt <br/>Eingesetzt in: G36 SD, M4 SD, XM8 SD, Famas SD, HK416 SD, Masada SD, MK16 SD, CZ805 SD
+
+
+ 60Rnd. AK-74 mag
+
+
+ Caliber: 5.45x39mm <br/>Rounds: 60, duct-taped <br/>Used in: AK-74, AK-107 and RPK-74
+ Kaliber: 5.45x39mm <br/>Patronen: 60, zusammengeklebt <br/>Eingesetzt in: AK-74, AK-107 und RPK-74
+
+
+ 60Rnd. AK-74 SD mag
+
+
+ Caliber: 5.45x39mm SD<br/>Rounds: 60, duct-taped <br/>Used in: AK-74 SD
+ Kaliber: 5.45x39mm SD<br/>Patronen: 60, zusammengeklebt <br/>Eingesetzt in: AK-74 SD
+
Kaliber: 5.45x39mm <br/>Patronen: 30 <br/>Eingesetzt in: AK-74, AK-107 und RPK-74
Caliber: 5.45x39mm <br/>Rounds: 30 <br/>Used in: AK-74, AK-107 and RPK-74
@@ -13725,15 +13751,15 @@
100Rnd. Beta C-Mag
- Kaliber: 5.56x45mm <br/>Patronen: 100 <br/>Eingesetzt in: G36, MG36, M16, M4, M249, MK-12, M8 und L110
- Caliber: 5.56x45mm <br/>Rounds: 100 <br/>Used in: G36, MG36, M16, M4, M249, MK-12, M8 and L110
- Calibro: 5.56x45mm <br/>Munizioni: 100 <br/>Si usa in: G36, MG36, M16, M4, M249, MK-12, M8 e L110
- Calibre: 5.56x45mm <br/>Cargas: 100 <br/>Uso: G36, MG36, M16, M4, M249, MK-12, M8 y L110
- Calibre: 5.56x45mm <br/>Munitions: 100 <br/>Utilisé avec: G36, MG36, M16, M4, M249, MK-12, M8 et L110
- Kalibr: 5.56x45mm <br/>Nábojů: 100 <br/>Pro: G36, MG36, M16, M4, M249, MK-12, M8 a L110
- Патрон: 5.56x45мм <br/>Количество: 100 <br/>Используется в: G36, MG36, M16, M4, M249, MK-12, M8, L110
- Kaliber: 5.56x45mm <br/>Naboje: 100 <br/>Używane w: G36, MG36, M16, M4, M249, MK-12, M8 i L110
- Kaliber: 5.56x45mm <br/> Töltények: 100 <br/> Hozzá tartozó fegyver: G36, MG36, M16, M4, M249, MK-12, M8 and L110
+ Kaliber: 5.56x45mm <br/>Patronen: 100 <br/>Eingesetzt in: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21
+ Caliber: 5.56x45mm <br/>Rounds: 100 <br/>Used in: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21
+ Calibro: 5.56x45mm <br/>Munizioni: 100 <br/>Si usa in: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21
+ Calibre: 5.56x45mm <br/>Cargas: 100 <br/>Uso: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21
+ Calibre: 5.56x45mm <br/>Munitions: 100 <br/>Utilisé avec: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21
+ Kalibr: 5.56x45mm <br/>Nábojů: 100 <br/>Pro: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21
+ Патрон: 5.56x45мм <br/>Количество: 100 <br/>Используется в: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21
+ Kaliber: 5.56x45mm <br/>Naboje: 100 <br/>Używane w: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21
+ Kaliber: 5.56x45mm <br/> Töltények: 100 <br/> Hozzá tartozó fegyver: G36, MG36, M16, M4, M249, MK-12, XM8, Famas, HK416, L85, L86, MK16, PDR, Masada, L110, HK53, CZ805, CTAR21
Caliber: 7.62x51mm NATO<br/>Rounds: 20<br/>Used in: MK17, M110, CZ 805B