W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-18 01:30:26 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add icons for SD ammo, string updates

Browse Source
This commit is contained in:
A Man
2020-04-22 13:13:58 +02:00
parent 5d04b73327
commit b7bbf9e376
12 changed files with 262 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp
View File

@@ -1,7 +1,7 @@
class 7Rnd_45ACP_1911: CA_Magazine
{
model = "\RH_de\mags\mag_kim.p3d";
picture = "\RH_de\inv\m_colt.paa";
picture = "\dayz_epoch_c\icons\magazines\m_colt.paa";
displayName = $STR_DZ_MAG_7RND_45ACP_1911_NAME;
descriptionShort = $STR_DZ_MAG_7RND_M1911_45ACP_DESC;
@@ -48,7 +48,7 @@ class 15Rnd_45ACP_USP: 7Rnd_45ACP_1911
displayName = $STR_DZ_MAG_15RND_45ACP_USP_NAME;
descriptionShort = $STR_DZ_MAG_15RND_USP_45ACP_DESC;
model = "\RH_de\mags\mag_usp.p3d";
picture = "\RH_de\inv\m_usp.paa";
picture = "\dayz_epoch_c\icons\magazines\m_usp.paa";
count = 15;
class ItemActions
@@ -61,7 +61,7 @@ class 15Rnd_45ACP_USPSD: 15Rnd_45ACP_USP
{
displayName = $STR_DZ_MAG_15RND_45ACP_USPSD_NAME;
descriptionShort = $STR_DZ_MAG_15RND_USPSD_45ACP_DESC;
picture = "\RH_de\inv\m_usp.paa";
picture = "\dayz_epoch_c\icons\magazines\m_usp_sd.paa";
ammo = "B_45ACP_SD";
initSpeed = 278;
};
@@ -71,7 +71,7 @@ class 7Rnd_45ACP_1911SD: 15Rnd_45ACP_USPSD
displayName = $STR_DZ_MAG_7RND_45ACP_KIMBER1911SD_NAME;
descriptionShort = $STR_DZ_MAG_7RND_KIMBER1911SD_45ACP_DESC;
model = "\RH_de\mags\mag_kim.p3d";
picture = "\RH_de\inv\m_colt.paa";
picture = "\dayz_epoch_c\icons\magazines\m_colt_sd.paa";
ammo = "B_45ACP_SD";
count = 7;
};
@@ -81,7 +81,7 @@ class 33Rnd_45ACP_KRISS: 15Rnd_45ACP_USP
displayName = $STR_DZ_MAG_33RND_45ACP_KRISS_NAME;
descriptionShort = $STR_DZ_MAG_33RND_KRISS_45ACP_DESC;
model = "\RH_smg\mags\mag_kriss30.p3d";
picture = "\RH_smg\inv\m_kriss30.paa";
picture = "\dayz_epoch_c\icons\magazines\m_kriss30.paa";
count = 33;
type = 256;
};
@@ -89,7 +89,7 @@ class 33Rnd_45ACP_KRISSSD: 33Rnd_45ACP_KRISS
{
displayName = $STR_DZ_MAG_33RND_45ACP_KRISSSD_NAME;
descriptionShort = $STR_DZ_MAG_33RND_KRISSSD_45ACP_DESC;
picture = "\RH_smg\inv\m_kriss30.paa";
picture = "\dayz_epoch_c\icons\magazines\m_kriss30_sd.paa";
ammo = "B_45ACP_SD";
};
@@ -98,13 +98,13 @@ class 25Rnd_45ACP_UMP: 33Rnd_45ACP_KRISS
displayName = $STR_DZ_MAG_25RND_45_UMP_NAME;
descriptionShort = $STR_DZ_MAG_25RND_UMP_DESC;
model = "\RH_smg\mags\mag_ump.p3d";
picture = "\RH_smg\inv\m_ump.paa";
picture = "\dayz_epoch_c\icons\magazines\m_ump.paa";
count = 25;
};
class 25Rnd_45ACP_UMPSD: 25Rnd_45ACP_UMP
{
displayName = $STR_DZ_MAG_25RND_45_UMPSD_NAME;
descriptionShort = $STR_DZ_MAG_25RND_UMPSD_DESC;
picture = "\RH_smg\inv\m_ump.paa";
picture = "\dayz_epoch_c\icons\magazines\m_ump_sd.paa";
ammo = "B_45ACP_SD";
};

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

@@ -50,6 +50,7 @@ class 30Rnd_556x45_Stanag : 20Rnd_556x45_Stanag
{
//model = "\dayz_equip\models\mag30.p3d";
displayName = $STR_DZ_MAG_30RND_556x45_STANAG_NAME;
descriptionShort = $STR_DZE_MAG_30RND_556x45_STANAG_DESC;
cartridgeName = "556x45";
@@ -76,6 +77,7 @@ class 30Rnd_556x45_Stanag : 20Rnd_556x45_Stanag
class 30Rnd_556x45_G36 : 30Rnd_556x45_Stanag
{
displayName = $STR_DZ_MAG_30RND_556x45_G36_NAME;
descriptionShort = $STR_DZE_MAG_30RND_556x45_G36_DESC;
cartridgeName = "556x45";
@@ -103,6 +105,7 @@ class 30Rnd_556x45_StanagSD : 30Rnd_556x45_Stanag
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_30stanagsd_ca.paa";
displayName = $STR_DZ_MAG_30RND_556x45_STANAGSD_NAME;
descriptionShort = $STR_DZE_MAG_30RND_556x45_STANAGSD_DESC;
cartridgeName = "556x45_SD";
@@ -130,6 +133,7 @@ class 30Rnd_556x45_G36SD : 30Rnd_556x45_G36
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_g36sd_ca.paa";
displayName = $STR_DZ_MAG_30RND_556x45_G36SD_NAME;
descriptionShort = $STR_DZE_MAG_30RND_556x45_G36SD_DESC;
cartridgeName = "556x45_SD";

4
SQF/dayz_code/Configs/CfgMagazines/Magazines/57x28.hpp
View File

@@ -5,7 +5,7 @@ class 50Rnd_57x28_P90: CA_Magazine
displayName = $STR_DZ_MAG_50RND_P90_NAME;
descriptionShort = $STR_DZ_MAG_50RND_P90_DESC;
model = "\RH_smg\mags\mag_p90.p3d";
picture = "\RH_smg\inv\m_p90.paa";
picture = "\dayz_epoch_c\icons\magazines\m_p90.paa";
count = 50;
ammo = "B_57x28_Ball";
@@ -21,7 +21,7 @@ class 50Rnd_57x28_P90SD: 50Rnd_57x28_P90
{
displayName = $STR_DZ_MAG_50RND_P90SD_NAME;
descriptionShort = $STR_DZ_MAG_50RND_P90SD_DESC;
picture = "\RH_smg\inv\m_p90.paa";
picture = "\dayz_epoch_c\icons\magazines\m_p90_sd.paa";
ammo = "B_57x28_SD";
cartridgeName = "5.7x28_SD";

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/680x43.hpp
View File

@@ -19,7 +19,7 @@ class ACR_30Rnd_680x43_SD: ACR_30Rnd_680x43
{
displayName = $STR_DZ_MAG_30RND_ACRSD_NAME;
descriptionShort = $STR_DZ_MAG_30RND_ACRSD_DESC;
picture = "\FHQ_Remington\ammo\ui\i_30rndpmag.paa";
picture = "\FHQ_Remington\ammo\ui\i_30rndpmag_sd.paa";
ammo = "B_680x43_SD";
initSpeed = 420;
};

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

@@ -81,8 +81,8 @@ class 30Rnd_762x39_SA58 : CA_Magazine
class 30Rnd_762x39_RK95 : 30Rnd_762x39_AK47
{
model = "\RH_aks\mags\mag_ak47.p3d";
picture = "\RH_aks\inv\m_ak.paa";
model = "\RH_aks\mags\mag_rk.p3d";
picture = "\dayz_epoch_c\icons\magazines\m_rk95.paa";
displayName = $STR_DZ_MAG_30RND_RK95_NAME;
descriptionShort = $STR_DZ_MAG_30RND_RK95_DESC;
@@ -98,7 +98,7 @@ class 30Rnd_762x39_RK95 : 30Rnd_762x39_AK47
class 30Rnd_762x39_RK95SD : 30Rnd_762x39_RK95
{
picture = "\RH_aks\inv\m_ak.paa";
picture = "\dayz_epoch_c\icons\magazines\m_rk95_sd.paa";
displayName = $STR_DZ_MAG_30RND_RK95SD_NAME;
descriptionShort = $STR_DZ_MAG_30RND_RK95SD_DESC;
ammo = "B_762x39_SD";

12
SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp
View File

@@ -23,6 +23,7 @@ class 20Rnd_762x51_G3 : 20Rnd_762x51_FNFAL
class 20Rnd_762x51_DMR : CA_Magazine
{
model = "\dayz_equip\models\mag20.p3d";
picture = "\dayz_epoch_c\icons\magazines\m_us_dmr_ca.paa";
displayName = $STR_DZ_MAG_20RND_762X51_DMR_NAME;
descriptionShort = $STR_DZ_MAG_20RND_DMR_DESC;
@@ -46,6 +47,7 @@ class 20Rnd_762x51_DMRSD : 20Rnd_762x51_DMR
{
displayName = $STR_DZ_MAG_20RND_762X51_DMRSD_NAME;
descriptionShort = $STR_DZ_MAG_20RND_DMRSD_DESC;
picture = "\dayz_epoch_c\icons\magazines\m_us_dmr_ca_sd.paa";
ammo = "Rem_762x51_SD";
cartridgeName = "762x51_SD";
@@ -61,6 +63,7 @@ class 5Rnd_762x51_M24 : CA_Magazine
{
model = "\dayz_equip\models\mag5rnd.p3d";
displayName = $STR_DZ_MAG_5RND_762X51_M24_NAME;
descriptionShort = $STR_DZ_MAG_5RND_762x51_M24_DESC;
cartridgeName = "762x51";
@@ -81,6 +84,7 @@ class 5Rnd_762x51_M24 : CA_Magazine
class 100Rnd_762x51_M240: CA_Magazine
{
displayName = $STR_DZ_MAG_100RND_762X51_M240_NAME;
descriptionShort = $STR_DZ_MAG_100RND_762x51_M240_DESC;
cartridgeName = "762x51";
type = WeaponSlotItem; // Only takes up one gear slot in Epoch
@@ -99,7 +103,6 @@ class 200Rnd_762x51_M240 : 100Rnd_762x51_M240 {
class 20Rnd_762x51_B_SCAR : CA_Magazine
{
//model = "dayz_epoch_c\models\magazines\mk17_mag.p3d";
model = "\z\addons\dayz_epoch_w\magazine\dze_mk17_mag.p3d";
picture = "\dayz_epoch_c\icons\magazines\m_mk17_ca.paa";
displayName = $STR_DZ_MAG_20Rnd_762x51_B_SCAR_NAME;
@@ -164,7 +167,7 @@ class 20Rnd_762x51_RSASS: CA_Magazine
class 20Rnd_762x51_RSASS_SD: 20Rnd_762x51_RSASS
{
picture = "\FHQ_Remington\ammo\ui\i_20rndpmag.paa";
picture = "\FHQ_Remington\ammo\ui\i_20rndpmag_sd.paa";
initSpeed = 850;
displayName = $STR_DZ_MAG_20RND_RSASSSD_NAME;
descriptionShort = $STR_DZ_MAG_20RND_RSASSSD_DESC;
@@ -174,19 +177,18 @@ class 20Rnd_762x51_RSASS_SD: 20Rnd_762x51_RSASS
class 20Rnd_762x51_HK417: 20Rnd_762x51_RSASS
{
picture = "\RH_hk416\inv\m_hk417.paa";
picture = "\dayz_epoch_c\icons\magazines\m_hk417.paa";
displayName = $STR_DZ_MAG_20RND_HK417_NAME;
descriptionShort = $STR_DZ_MAG_20RND_HK417_DESC;
count = 20;
cartridgeName = "762x51";
ammo = "Rem_762x51_Ball";
};
class 20Rnd_762x51_HK417SD: 20Rnd_762x51_HK417
{
initSpeed = 850;
picture = "\dayz_epoch_c\icons\magazines\m_hk417_sd.paa";
displayName = $STR_DZ_MAG_20RND_HK417SD_NAME;
descriptionShort = $STR_DZ_MAG_20RND_HK417SD_DESC;
cartridgeName = "762x51_SD";

1
SQF/dayz_code/Configs/CfgMagazines/Magazines/762x54r.hpp
View File

@@ -2,6 +2,7 @@ class 100Rnd_762x54_PK : CA_Magazine
{
model = "z\addons\dayz_communityweapons\magazines\pk.p3d";
displayName = $STR_DZ_MAG_100RND_762x54_PK_NAME;
descriptionShort = $STR_DZ_MAG_100RND_762x54_PK_DESC;
cartridgeName = "762x54";
type = WeaponSlotItem; // Only takes up one gear slot in Epoch

1
SQF/dayz_code/Configs/CfgMagazines/Magazines/762x67.hpp
View File

@@ -23,4 +23,5 @@ class 5Rnd_762x67_XM2010_SD: 5Rnd_762x67_XM2010
displayName = $STR_DZ_MAG_5RND_XM2010SD_NAME;
descriptionShort = $STR_DZ_MAG_5RND_XM2010SD_DESC;
ammo = "Rem_300Win_SD";
picture = "\FHQ_Remington\ammo\ui\i_xm2010_sd.paa";
};

1
SQF/dayz_code/Configs/CfgMagazines/Magazines/86x70.hpp
View File

@@ -26,6 +26,7 @@ class 7Rnd_86x70_MSR_SD: 7Rnd_86x70_MSR
initSpeed = 850;
displayName = $STR_DZ_MAG_7RND_MSRSD_NAME;
descriptionShort = $STR_DZ_MAG_7RND_MSRSD_DESC;
picture = "\FHQ_Remington\ammo\ui\i_msr_sd.paa";
};
class 10Rnd_86x70_MRAD: 5Rnd_86x70_L115A1

8
SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp
View File

@@ -295,7 +295,7 @@ class 8Rnd_9x19_MK22: 15Rnd_9x19_M9
displayName = $STR_DZ_MAG_8RND_9x19_MK22_NAME;
descriptionShort = $STR_DZ_MAG_8RND_MK22_9x19_DESC;
model = "\RH_de\mags\mag_mk22.p3d";
picture = "\RH_de\inv\m_mk22.paa";
picture = "\dayz_epoch_c\icons\magazines\m_mk22.paa";
count = 8;
class ItemActions
@@ -310,7 +310,7 @@ class 8Rnd_9x19_MK22SD: 15Rnd_9x19_M9SD
displayName = $STR_DZ_MAG_8RND_9x19_MK22SD_NAME;
descriptionShort = $STR_DZ_MAG_8RND_MK22SD_9x19_DESC;
model = "\RH_de\mags\mag_mk22.p3d";
picture = "\RH_de\inv\m_mk22.paa";
picture = "\dayz_epoch_c\icons\magazines\m_mk22_sd.paa";
count = 8;
class ItemActions
@@ -379,13 +379,13 @@ class 30Rnd_9x19_TMP : 30Rnd_9x19_MP5
displayName = $STR_DZ_MAG_30RND_9X19_TMP_NAME;
descriptionShort = $STR_DZ_MAG_30RND_TMP_DESC;
model = "\RH_smg\mags\mag_uzi.p3d";
picture = "\RH_smg\inv\m_uzi.paa";
picture = "\dayz_epoch_c\icons\magazines\m_uzi.paa";
};
class 30Rnd_9x19_TMPSD : 30Rnd_9x19_MP5SD
{
model = "\RH_smg\mags\mag_uzi.p3d";
picture = "\RH_smg\inv\m_uzi.paa";
picture = "\dayz_epoch_c\icons\magazines\m_uzi_sd.paa";
displayName = $STR_DZ_MAG_30RND_9X19_TMPSD_NAME;
descriptionShort = $STR_DZ_MAG_30RND_TMPSD_DESC;
};

8
SQF/dayz_code/Configs/CfgMagazines/Magazines/9x39.hpp
View File

@@ -1,7 +1,8 @@
//VSS
class 10Rnd_9x39_SP5_VSS: CA_Magazine
{
model = "dayz_epoch_c\models\magazines\VSS_vintorez_mag.p3d";
picture = "\dayz_epoch_c\icons\magazines\m_vssx10_ca.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_VSS_vintorez_mag.p3d";
displayName = $STR_DZ_MAG_10Rnd_9x39_SP5_VSS_NAME;
descriptionShort = $STR_DZ_MAG_10RND_939_VSSVAL_DESC;
@@ -15,7 +16,8 @@ class 10Rnd_9x39_SP5_VSS: CA_Magazine
class 20Rnd_9x39_SP5_VSS: CA_Magazine
{
model = "dayz_epoch_c\models\magazines\VSS_vintorez_mag.p3d";
picture = "\dayz_epoch_c\icons\magazines\m_vssx20_ca.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_VSS_vintorez_mag.p3d";
displayName = $STR_DZ_MAG_20Rnd_9x39_SP5_VSS_NAME;
descriptionShort = $STR_DZ_MAG_20RND_939_VSSVAL_DESC;
@@ -47,7 +49,7 @@ class 20Rnd_9x39_Groza9: CA_Magazine {
class 20Rnd_9x39_Groza9SD: 20Rnd_9x39_Groza9 {
displayName = $STR_DZ_MAG_20RND_Groza9SD_NAME;
descriptionShort = $STR_DZ_MAG_20RND_Groza9SD_DESC;
picture = "\RH_aks\inv\m_oc.paa";
picture = "\dayz_epoch_c\icons\magazines\m_oc_sd.paa";
cartridgeName = "9x39_SD";
ammo = "B_9x39_OC14_SD";
};