W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-21 23:50:48 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add taped mags for stanag, ak74, akm weapons

Browse Source 
- also add 3 SA58 DZ weapons to make them compatible with the new taped mags
 - Shorten a few german strings
This commit is contained in:
A Man
2020-04-08 17:47:02 +02:00
parent 0def480120
commit 67952e74ab
22 changed files with 165 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
View File

@@ -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},

18
SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp
View File

@@ -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;

23
SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp
View File

@@ -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;
};
};

19
SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp
View File

@@ -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;

7
SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
View File

@@ -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"};};

6
SQF/dayz_code/Configs/CfgWeapons/Rifles/AK107.hpp
View File

@@ -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
};

4
SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp
View File

@@ -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

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/AKM.hpp
View File

@@ -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";

2
SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS.hpp
View File

@@ -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 {

4
SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp
View File

@@ -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

3
SQF/dayz_code/Configs/CfgWeapons/Rifles/CZ805.hpp
View File

@@ -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
};
};

3
SQF/dayz_code/Configs/CfgWeapons/Rifles/Famas.hpp
View File

@@ -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

3
SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp
View File

@@ -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

6
SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp
View File

@@ -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
};
};

3
SQF/dayz_code/Configs/CfgWeapons/Rifles/HK416.hpp
View File

@@ -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

3
SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp
View File

@@ -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;

9
SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp
View File

@@ -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 {};

3
SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp
View File

@@ -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

3
SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK.hpp
View File

@@ -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};

1
SQF/dayz_code/Configs/CfgWeapons/Rifles/RPK74.hpp
View File

@@ -7,6 +7,7 @@ class RPK74_Kobra_DZ : RPK_74
magazines[] =
{
75Rnd_545x39_RPK,
60Rnd_545x39_AK_Taped,
30Rnd_545x39_AK
};

14
SQF/dayz_code/Configs/CfgWeapons/Rifles/SA58.hpp
View File

@@ -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};
};