W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-19 22:52:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change scope and type of configs from name to numbers

Browse Source 
This got discussed earlier. Since epoch got merged with DayZ Mod we have a different name for the scope and type of configs.  A proper config should use numbers for those entries. This is the same how arma configs are written.  The basicDefines.hpp has all the needed information stored.

Also, this removes the weight entries from the magazines since we have them in a separate folder, so admins can edit them.
This commit is contained in:
A Man
2020-05-29 02:04:06 +02:00
parent 4040b784b5
commit d9b9874532
291 changed files with 3439 additions and 3069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/22lfB.hpp
View File

@@ -1,6 +1,6 @@
class 10Rnd_22lfB_RUGERMK2: CA_Magazine
{
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_10RND_C22_RUGERMK2_NAME;
descriptionShort = $STR_DZ_MAG_10RND_RUGERMK2_C22_DESC;
picture = "\RH_de\inv\m_mk2.paa";

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/357Magnum.hpp
View File

@@ -1,6 +1,6 @@
class 6Rnd_357Magnum: CA_Magazine
{
scope = public;
scope = 2;
type = 16;
displayName = $STR_DZ_MAG_6RND_357MAGNUM_NAME;
descriptionShort = $STR_DZ_MAG_6RND_357MAGNUM_DESC;

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/408CheyTac.hpp
View File

@@ -1,5 +1,5 @@
class 5Rnd_408_CheyTac : CA_Magazine {
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_5RND_408_CHEYTAC_NAME;
descriptionShort = $STR_DZ_MAG_5RND_CHEYTAC_DESC;
picture ="\z\addons\dayz_epoch_w\m200\data\m_cheytac_CA.paa";

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/44Magnum.hpp
View File

@@ -1,6 +1,6 @@
class 6Rnd_44Magnum: CA_Magazine
{
scope = public;
scope = 2;
type = 16;
displayName = $STR_DZ_MAG_6RND_44MAGNUM_NAME;
descriptionShort = $STR_DZ_MAG_6RND_44MAGNUM_DESC;

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/50AE.hpp
View File

@@ -1,6 +1,6 @@
class 7Rnd_50AE_Deagle: CA_Magazine
{
scope = public;
scope = 2;
type = 16;
displayName = $STR_DZ_MAG_7RND_50AE_DESERT_EAGLE_NAME;
descriptionShort = $STR_DZ_MAG_7RND_50AE_DESERT_EAGLE_DESC;

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

@@ -45,12 +45,10 @@ class 75Rnd_545x39_RPK : CA_Magazine
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;
descriptionShort = $STR_DZ_MAG_75RND_RPK74_DESC;
count = 75;
tracersEvery = 4;
lastRoundsTracer = 4;
lastRoundsTracer = 4;
cartridgeName = "545x39";
class ItemActions

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

@@ -1,9 +1,8 @@
class 200Rnd_556x45_M249: CA_Magazine
{
displayName = $STR_DZ_MAG_200RND_556X45_M249_NAME;
cartridgeName = "556x45";
type = WeaponSlotItem; // Only takes up one gear slot in Epoch
type = 256;
class ItemActions
{
@@ -24,14 +23,14 @@ class 100Rnd_556x45_M249 : 200Rnd_556x45_M249
};
class 100Rnd_556x45_BetaCMag: CA_Magazine {
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_100RND_556x45_BetaCMag_NAME;
ammo = "B_556x45_Ball";
count = 100;
initSpeed = 920;
model = "\z\addons\dayz_epoch_w\magazine\dze_MG36_mag.p3d";
picture = "\ca\weapons\g36\data\equip\M_MG36_CA.paa";
type = WeaponSlotItem;
type = 256;
tracersEvery = 4;
lastRoundsTracer = 4;
descriptionShort = $STR_DZ_MAG_100RND_BetaCMag_DESC;
@@ -42,13 +41,11 @@ class 100Rnd_556x45_BetaCMag: CA_Magazine {
};
};
/* STANAG <-> G36 */
class 20Rnd_556x45_Stanag;
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;
@@ -78,7 +75,6 @@ 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";
class ItemActions
@@ -106,7 +102,6 @@ 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";
class ItemActions
@@ -133,8 +128,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;
descriptionShort = $STR_DZE_MAG_30RND_556x45_G36SD_DESC;
cartridgeName = "556x45_SD";
class ItemActions
@@ -163,6 +157,7 @@ class 60Rnd_556x45_Stanag_Taped : 30Rnd_556x45_Stanag {
count = 60;
picture = "\dayz_epoch_c\icons\magazines\m_stanag_taped.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_stannag_twinmag.p3d";
class ItemActions
{
COMBINE_MAG
@@ -177,6 +172,7 @@ class 60Rnd_556x45_StanagSD_Taped : 30Rnd_556x45_StanagSD {
count = 60;
picture = "\dayz_epoch_c\icons\magazines\m_stanag_taped_sd.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_stannag_twinmag.p3d";
class ItemActions
{
COMBINE_MAG
@@ -193,8 +189,7 @@ class 30Rnd_556x45_Aug : 30Rnd_556x45_Stanag {
class ItemActions
{
COMBINE_MAG
COMBINE_MAG
delete ReloadMag;
};
};

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

@@ -1,7 +1,7 @@
//P90
class 50Rnd_57x28_P90: CA_Magazine
{
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_50RND_P90_NAME;
descriptionShort = $STR_DZ_MAG_50RND_P90_DESC;
model = "\RH_smg\mags\mag_p90.p3d";

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/6x35.hpp
View File

@@ -1,6 +1,6 @@
class 30Rnd_6x35_KAC: CA_Magazine
{
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_30RND_KACPDW_NAME;
descriptionShort = $STR_DZ_MAG_30RND_KACPDW_DESC;
picture = "\RH_pdw\inv\m_30pdw_ca.paa";

5
SQF/dayz_code/Configs/CfgMagazines/Magazines/762x25.hpp
View File

@@ -1,6 +1,6 @@
class 8Rnd_762x25_TT33 : CA_Magazine
{
scope = public;
scope = 2;
type = 16;
displayName = $STR_DZ_MAG_8RND_762x25_TT33_NAME;
descriptionShort = $STR_DZ_MAG_8RND_TT33_762x25_DESC;
@@ -8,8 +8,7 @@ class 8Rnd_762x25_TT33 : CA_Magazine
model = "\RH_de\mags\mag_tt33.p3d";
ammo = "B_762x25_Ball";
count = 8;
initSpeed = 400;
initSpeed = 400;
cartridgeName = "762x25";
class ItemActions

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

@@ -5,8 +5,7 @@ class 30Rnd_762x39_AK47 : CA_Magazine
model = "z\addons\dayz_communityweapons\magazines\ak47.p3d";
picture = "\z\addons\dayz_communityweapons\magazines\data\m_ak47_ca.paa";
displayName = $STR_DZ_MAG_30RND_762X39_AK47_NAME;
descriptionShort = $STR_DZ_MAG_30RND_AK47M_DESC;
descriptionShort = $STR_DZ_MAG_30RND_AK47M_DESC;
cartridgeName = "762x39";
class ItemActions
@@ -45,8 +44,7 @@ class 75Rnd_762x39_RPK : 30Rnd_762x39_AK47
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;
descriptionShort = $STR_DZ_MAG_75RND_762X39_RPK_DESC;
count = 75;
tracersEvery = 4;
lastRoundsTracer = 4;
@@ -61,8 +59,7 @@ class 30Rnd_762x39_SA58 : CA_Magazine
{
model = "z\addons\dayz_communityweapons\magazines\vz58.p3d";
displayName = $STR_DZ_MAG_30RND_762X39_SA58_NAME;
descriptionShort = $STR_DZ_MAG_30RND_SA58_DESC;
descriptionShort = $STR_DZ_MAG_30RND_SA58_DESC;
cartridgeName = "762x39";
class ItemActions
@@ -84,8 +81,7 @@ class 30Rnd_762x39_RK95 : 30Rnd_762x39_AK47
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;
descriptionShort = $STR_DZ_MAG_30RND_RK95_DESC;
cartridgeName = "762x39";
class ItemActions
@@ -101,8 +97,7 @@ class 30Rnd_762x39_RK95SD : 30Rnd_762x39_RK95
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";
ammo = "B_762x39_SD";
cartridgeName = "762x39_SD";
};

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

@@ -2,8 +2,7 @@ class 20Rnd_762x51_FNFAL : CA_Magazine
{
picture = "\z\addons\dayz_epoch_w\magazine\ui\m_fnfal_mag.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_fnFal_mag.p3d";
displayName = $STR_DZ_MAG_20RND_762X51_FNFAL_NAME;
displayName = $STR_DZ_MAG_20RND_762X51_FNFAL_NAME;
cartridgeName = "762x51";
class ItemActions
@@ -25,8 +24,7 @@ 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;
descriptionShort = $STR_DZ_MAG_20RND_DMR_DESC;
cartridgeName = "762x51";
class ItemActions
@@ -48,8 +46,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";
ammo = "Rem_762x51_SD";
cartridgeName = "762x51_SD";
class ItemActions
@@ -63,8 +60,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;
descriptionShort = $STR_DZ_MAG_5RND_762x51_M24_DESC;
cartridgeName = "762x51";
class ItemActions
@@ -84,10 +80,9 @@ 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;
descriptionShort = $STR_DZ_MAG_100RND_762x51_M240_DESC;
cartridgeName = "762x51";
type = WeaponSlotItem; // Only takes up one gear slot in Epoch
type = 256;
class ItemActions
{
@@ -100,8 +95,7 @@ class 20Rnd_762x51_B_SCAR : CA_Magazine
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;
descriptionShort = $STR_DZ_MAG_20RND_MK17_DESC;
descriptionShort = $STR_DZ_MAG_20RND_MK17_DESC;
cartridgeName = "762x51";
class ItemActions
@@ -117,8 +111,7 @@ class 20Rnd_762x51_SB_SCAR : CA_Magazine
displayName = $STR_DZ_MAG_20Rnd_762x51_SB_SCAR_NAME;
descriptionShort = $STR_DZ_MAG_20RND_MK17SD_DESC;
ammo = "Rem_762x51_SD";
initSpeed = 750;
initSpeed = 750;
cartridgeName = "762x51_SD";
class ItemActions
@@ -132,8 +125,7 @@ class 10Rnd_762x51_CZ750 : 5Rnd_762x51_M24
count = 10;
picture = "\Ca\Weapons_ACR\Data\UI\picture_CZ750_mag_CA.paa";
displayName = $STR_DZ_MAG_10Rnd_762x51_CZ750_NAME;
descriptionShort = $STR_DZ_MAG_10RND_CZ750_DESC;
descriptionShort = $STR_DZ_MAG_10RND_CZ750_DESC;
cartridgeName = "762x51";
class ItemActions
@@ -145,7 +137,7 @@ class 10Rnd_762x51_CZ750 : 5Rnd_762x51_M24
class 20Rnd_762x51_RSASS: CA_Magazine
{
scope = public;
scope = 2;
initSpeed = 900;
picture = "\FHQ_Remington\ammo\ui\i_20rndpmag.paa";
model = "\FHQ_Remington\RSASS\magazine.p3d";
@@ -193,7 +185,7 @@ class 20Rnd_762x51_HK417SD: 20Rnd_762x51_HK417
class 6Rnd_762x51_WA2000: CA_Magazine
{
scope = public;
scope = 2;
initSpeed = 900;
picture = "\z\addons\dayz_epoch_w\wa2000\data\m_wa2000_CA.paa";
model = "\z\addons\dayz_epoch_w\wa2000\h4_wa2000_mag.p3d";

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

@@ -2,10 +2,9 @@ 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;
descriptionShort = $STR_DZ_MAG_100RND_762x54_PK_DESC;
cartridgeName = "762x54";
type = WeaponSlotItem; // Only takes up one gear slot in Epoch
type = 256;
class ItemActions
{
@@ -15,8 +14,7 @@ class 100Rnd_762x54_PK : CA_Magazine
class 50Rnd_762x54_UK59 : 100Rnd_762x54_PK
{
count = 50;
count = 50;
model = "z\addons\dayz_communityweapons\magazines\uk59.p3d";
picture = "\z\addons\dayz_communityweapons\magazines\data\m_uk59_ca.paa";
displayName = $STR_DZ_MAG_50RND_762X54_UK59_NAME;
@@ -25,8 +23,7 @@ class 50Rnd_762x54_UK59 : 100Rnd_762x54_PK
class 10Rnd_762x54_SVD : CA_Magazine
{
displayName = $STR_DZ_MAG_10RND_762x54_SVD_NAME;
displayName = $STR_DZ_MAG_10RND_762x54_SVD_NAME;
cartridgeName = "762x54";
class ItemActions
@@ -41,8 +38,7 @@ class 5Rnd_762x54_Mosin : 10Rnd_762x54_SVD
model = "\dayz_equip\models\mag5rnd.p3d";
picture = "\z\addons\dayz_communityweapons\models\mosin_nagant\images\ammo.paa";
displayName = $STR_DZ_MAG_5RND_762X54_MOSIN_NAME;
descriptionShort = $STR_DZ_MAG_5RND_762X54_MOSIN_DESC;
descriptionShort = $STR_DZ_MAG_5RND_762X54_MOSIN_DESC;
cartridgeName = "762x54";
class ItemActions

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

@@ -1,14 +1,13 @@
class 5Rnd_762x67_XM2010: CA_Magazine
{
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_5RND_XM2010_NAME;
descriptionShort = $STR_DZ_MAG_5RND_XM2010_DESC;
count = 5;
ammo = "Rem_300Win_Ball";
initSpeed = 850;
picture = "\FHQ_Remington\ammo\ui\i_xm2010.paa";
model = "\FHQ_Remington\XM2010\magazine.p3d";
model = "\FHQ_Remington\XM2010\magazine.p3d";
cartridgeName = "762x67";
class ItemActions

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/9x17.hpp
View File

@@ -1,6 +1,6 @@
class 7Rnd_9x17_PPK : CA_Magazine
{
scope = public;
scope = 2;
type = 16;
displayName = $STR_DZ_MAG_7RND_9x17_PPK_NAME;
descriptionShort = $STR_DZ_MAG_7RND_PPK_9x17_DESC;

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

@@ -32,8 +32,9 @@ class 20Rnd_9x39_SP5_VSS: CA_Magazine
};
//Groza-9
class 20Rnd_9x39_Groza9: CA_Magazine {
scope = public;
class 20Rnd_9x39_Groza9: CA_Magazine
{
scope = 2;
displayName = $STR_DZ_MAG_20RND_Groza9_NAME;
descriptionShort = $STR_DZ_MAG_20RND_Groza9_DESC;
picture = "\RH_aks\inv\m_oc.paa";
@@ -48,7 +49,8 @@ class 20Rnd_9x39_Groza9: CA_Magazine {
};
};
class 20Rnd_9x39_Groza9SD: 20Rnd_9x39_Groza9 {
class 20Rnd_9x39_Groza9SD: 20Rnd_9x39_Groza9
{
displayName = $STR_DZ_MAG_20RND_Groza9SD_NAME;
descriptionShort = $STR_DZ_MAG_20RND_Groza9SD_DESC;
picture = "\dayz_epoch_c\icons\magazines\m_oc_sd.paa";

40
SQF/dayz_code/Configs/CfgMagazines/Magazines/Arrows.hpp
View File

@@ -1,7 +1,7 @@
class 1Rnd_Arrow_Wood : CA_Magazine
{
scope = public;
scope = 2;
type = 256;
model = "\dayz_weapons\models\bolt_gear";
picture = "\z\addons\dayz_communityassets\pictures\equip_warrow_ca.paa";
displayName = $STR_ITEMWOODENARROW_CODE_NAME;
@@ -23,13 +23,11 @@ class 1Rnd_Arrow_Wood : CA_Magazine
class 12Rnd_Quiver_Wood : 1Rnd_Arrow_Wood
{
type = WeaponSlotItem;
type = 256;
model = "\z\addons\dayz_communityassets\models\quiver";
picture = "\z\addons\dayz_communityassets\pictures\equip_quiver_ca.paa";
descriptionShort = $STR_ITEMQUIVER_CODE_DESC;
displayName = $STR_ITEMQUIVER_CODE_NAME;
displayName = $STR_ITEMQUIVER_CODE_NAME;
count = 12;
class ItemActions
@@ -46,36 +44,24 @@ class 12Rnd_Quiver_Wood : 1Rnd_Arrow_Wood
class 1Rnd_Bolt_Tranquilizer : CA_Magazine
{
scope = public;
type = WeaponSlotItem;
count = 1;
scope = 2;
type = 256;
count = 1;
model = "z\addons\community_crossbow\models\ammo.p3d";
picture = "\z\addons\community_crossbow\textures\bolt_tranq.paa";
displayName = $STR_DZ_MAG_BOLT_TRQ_NAME;
descriptionShort = $STR_DZ_MAG_BOLT_TRQ_DESC;
descriptionShort = $STR_DZ_MAG_BOLT_TRQ_DESC;
ammo = "tranquiliser_bolt";
};
class 1Rnd_Bolt_Explosive : CA_Magazine
{
scope = public;
type = WeaponSlotItem;
count = 1;
scope = 2;
type = 256;
count = 1;
picture = "\z\addons\community_crossbow\textures\bolt_expl.paa";
model = "z\addons\community_crossbow\models\ammo.p3d";
displayName = $STR_DZ_MAG_BOLT_EXP_NAME;
descriptionShort = $STR_DZ_MAG_BOLT_EXP_DESC;
descriptionShort = $STR_DZ_MAG_BOLT_EXP_DESC;
ammo = "explosive_bolt";
};
/*
//TODO: Remove legacy
class WoodenArrow : 1Rnd_Arrow_Wood {};
class Quiver : 12Rnd_Quiver_Wood {};
class Tranquiliser_Bolt : 1Rnd_Bolt_Tranquilizer {};
class Crossbow_EX_Bolt : 1Rnd_Bolt_Explosive {};
*/
};

57
SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp
View File

@@ -1,5 +1,6 @@
// M32/M203 grenades
class 1Rnd_HE_M203: CA_Magazine {
class 1Rnd_HE_M203: CA_Magazine
{
scope = 2;
type = 16;
displayName = "$STR_DN_HE_M203";
@@ -11,7 +12,8 @@ class 1Rnd_HE_M203: CA_Magazine {
nameSound = "grenadelauncher";
descriptionShort = "$STR_DSS_1Rnd_HE_M203";
};
class 6Rnd_HE_M203: 1Rnd_HE_M203 {
class 6Rnd_HE_M203: 1Rnd_HE_M203
{
count = 6;
displayName = "$STR_EP1_DN_6Rnd_HE_M203";
descriptionShort = "$STR_EP1_DSS_6Rnd_HE_M203";
@@ -19,7 +21,8 @@ class 6Rnd_HE_M203: 1Rnd_HE_M203 {
picture = "\CA\weapons_E\Data\icons\m_6x40mmHP_CA.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d";
};
class FlareWhite_M203: CA_Magazine {
class FlareWhite_M203: CA_Magazine
{
scope = 2;
type = 16;
displayName = "$STR_DN_FLAREWHITE_M203";
@@ -40,7 +43,8 @@ class 6Rnd_FlareWhite_M203: FlareWhite_M203
picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d";
};
class FlareGreen_M203: FlareWhite_M203 {
class FlareGreen_M203: FlareWhite_M203
{
displayName = "$STR_DN_FLAREGREEN_M203";
ammo = "F_40mm_Green";
picture = "\Ca\weapons\Data\Equip\m_FlareGreen_CA.paa";
@@ -55,7 +59,8 @@ class 6Rnd_FlareGreen_M203: FlareGreen_M203
picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d";
};
class FlareRed_M203: FlareWhite_M203 {
class FlareRed_M203: FlareWhite_M203
{
displayName = "$STR_DN_FLARERED_M203";
ammo = "F_40mm_Red";
picture = "\Ca\weapons\Data\Equip\m_FlareRed_CA.paa";
@@ -70,7 +75,8 @@ class 6Rnd_FlareRed_M203: FlareRed_M203
picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d";
};
class FlareYellow_M203: FlareWhite_M203 {
class FlareYellow_M203: FlareWhite_M203
{
displayName = "$STR_DN_FLAREYELLOW_M203";
ammo = "F_40mm_Yellow";
picture = "\Ca\weapons\Data\Equip\m_FlareYelow_CA.paa";
@@ -85,7 +91,8 @@ class 6Rnd_FlareYellow_M203: FlareYellow_M203
picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d";
};
class 1Rnd_Smoke_M203: 1Rnd_HE_M203 {
class 1Rnd_Smoke_M203: 1Rnd_HE_M203
{
displayName = "$STR_MN_SMOKE_M203";
picture = "\Ca\weapons_E\Data\icons\m_40mmSmoke_CA.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_m203_smoke.p3d";
@@ -101,7 +108,8 @@ class 6Rnd_Smoke_M203: 1Rnd_Smoke_M203
picture = "\CA\weapons_E\Data\icons\m_6x40mmSmoke_CA.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d";
};
class 1Rnd_SmokeRed_M203: 1Rnd_Smoke_M203 {
class 1Rnd_SmokeRed_M203: 1Rnd_Smoke_M203
{
ammo = "G_40mm_SmokeRed";
displayName = "$STR_DN_1Rnd_SmokeRed_M203";
descriptionShort = "$STR_DSS_1Rnd_SMOKERED_M203";
@@ -116,7 +124,8 @@ class 6Rnd_SmokeRed_M203: 1Rnd_SmokeRed_M203
picture = "\CA\weapons_E\Data\icons\m_6x40mmSmoke_CA.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d";
};
class 1Rnd_SmokeGreen_M203: 1Rnd_Smoke_M203 {
class 1Rnd_SmokeGreen_M203: 1Rnd_Smoke_M203
{
ammo = "G_40mm_SmokeGreen";
displayName = "$STR_DN_1Rnd_SmokeGreen_M203";
descriptionShort = "$STR_DSS_1Rnd_SMOKEGREEN_M203";
@@ -131,7 +140,8 @@ class 6Rnd_SmokeGreen_M203: 1Rnd_SmokeGreen_M203
picture = "\CA\weapons_E\Data\icons\m_6x40mmSmoke_CA.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d";
};
class 1Rnd_SmokeYellow_M203: 1Rnd_Smoke_M203 {
class 1Rnd_SmokeYellow_M203: 1Rnd_Smoke_M203
{
ammo = "G_40mm_SmokeYellow";
displayName = "$STR_DN_1Rnd_SmokeYellow_M203";
descriptionShort = "$STR_DSS_1Rnd_SMOKEYELLOW_M203";
@@ -148,7 +158,8 @@ class 6Rnd_SmokeYellow_M203: 1Rnd_SmokeYellow_M203
};
// GP-25
class 1Rnd_HE_GP25: CA_Magazine {
class 1Rnd_HE_GP25: CA_Magazine
{
scope = 2;
type = 16;
displayName = "$STR_DN_HE_GP25";
@@ -160,7 +171,8 @@ class 1Rnd_HE_GP25: CA_Magazine {
nameSound = "grenadelauncher";
descriptionShort = "$STR_DSS_1Rnd_HE_GP25";
};
class FlareWhite_GP25: CA_Magazine {
class FlareWhite_GP25: CA_Magazine
{
scope = 2;
type = 16;
displayName = "$STR_DN_FLAREWHITE_GP25";
@@ -172,44 +184,51 @@ class FlareWhite_GP25: CA_Magazine {
count = 1;
nameSound = "grenadelauncher";
};
class FlareGreen_GP25: FlareWhite_GP25 {
class FlareGreen_GP25: FlareWhite_GP25
{
displayName = "$STR_DN_FLAREGREEN_GP25";
ammo = "F_40mm_Green";
picture = "\Ca\weapons_E\Data\icons\M_GP25_green_CA.paa";
descriptionShort = "$STR_DSS_1Rnd_FLAREGREEN_GP25";
};
class FlareRed_GP25: FlareWhite_GP25 {
class FlareRed_GP25: FlareWhite_GP25
{
displayName = "$STR_DN_FLARERED_GP25";
ammo = "F_40mm_Red";
picture = "\Ca\weapons_E\Data\icons\M_GP25_red_CA.paa";
descriptionShort = "$STR_DSS_1Rnd_FLARERED_GP25";
};
class FlareYellow_GP25: FlareWhite_GP25 {
class FlareYellow_GP25: FlareWhite_GP25
{
displayName = "$STR_DN_FLAREYELLOW_GP25";
ammo = "F_40mm_Yellow";
picture = "\Ca\weapons_E\Data\icons\M_GP25_yellow_CA.paa";
descriptionShort = "$STR_DSS_1Rnd_FLAREYELLOW_GP25";
};
class 1Rnd_SMOKE_GP25: 1Rnd_HE_GP25 {
class 1Rnd_SMOKE_GP25: 1Rnd_HE_GP25
{
displayName = "$STR_MN_SMOKE_GP25";
picture = "\Ca\weapons_E\Data\icons\M_GP25_white_CA.paa";
model = "\z\addons\dayz_epoch_w\magazine\dze_gp_smoke.p3d";
ammo = "G_40mm_Smoke";
descriptionShort = "$STR_DSS_1Rnd_SMOKE_GP25";
};
class 1Rnd_SmokeRed_GP25: 1Rnd_SMOKE_GP25 {
class 1Rnd_SmokeRed_GP25: 1Rnd_SMOKE_GP25
{
displayName = "$STR_DN_1Rnd_SmokeRed_GP25";
picture = "\Ca\weapons_E\Data\icons\M_GP25_red_CA.paa";
ammo = "G_40mm_SmokeRed";
descriptionShort = "$STR_DSS_1Rnd_SMOKERED_GP25";
};
class 1Rnd_SmokeYellow_GP25: 1Rnd_SMOKE_GP25 {
class 1Rnd_SmokeYellow_GP25: 1Rnd_SMOKE_GP25
{
displayName = "$STR_DN_1Rnd_SmokeYellow_GP25";
picture = "\Ca\weapons_E\Data\icons\M_GP25_yellow_CA.paa";
ammo = "G_40mm_SmokeYellow";
descriptionShort = "$STR_DSS_1Rnd_SMOKEYELLOW_GP25";
};
class 1Rnd_SmokeGreen_GP25: 1Rnd_SMOKE_GP25 {
class 1Rnd_SmokeGreen_GP25: 1Rnd_SMOKE_GP25
{
displayName = "$STR_DN_1Rnd_SmokeGreen_GP25";
picture = "\Ca\weapons_E\Data\icons\M_GP25_green_CA.paa";
ammo = "G_40mm_SmokeGreen";

40
SQF/dayz_code/Configs/CfgMagazines/Magazines/LauncherAmmo.hpp
View File

@@ -1,81 +1,81 @@
// Use single slot for everything, let R3F weight handle load
class M136 : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class Javelin : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class AT13 : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class PG7V : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class PG7VL : PG7V {
type = WeaponSlotItem;
type = 256;
};
class PG7VR : PG7V {
type = WeaponSlotItem;
type = 256;
};
class OG7 : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class PG9_AT : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class OG9_HE : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class Stinger : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class SMAW_HEDP : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class SMAW_HEAA : SMAW_HEDP {
type = WeaponSlotItem;
type = 256;
};
class MAAWS_HEDP : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class MAAWS_HEAT : MAAWS_HEDP {
type = WeaponSlotItem;
type = 256;
};
class Strela : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class RPG18 : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class Igla : Strela {
type = WeaponSlotItem;
type = 256;
};
class 2Rnd_Igla : Igla {
type = WeaponSlotItem;
type = 256;
};
class NLAW : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};
class Dragon_EP1 : CA_LauncherMagazine {
type = WeaponSlotItem;
type = 256;
};

22
SQF/dayz_code/Configs/CfgMagazines/Magazines/Melee.hpp
View File

@@ -1,13 +1,13 @@
class Melee_Swing : CA_Magazine
{
type = WeaponNoSlot;
type = 0;
count = 100000;
initSpeed = 100;
};
class Hatchet_Swing : Melee_Swing
{
scope = public;
scope = 2;
//TODO: test which one is shown and delete the rest
displayName = "Hatchet";
@@ -18,8 +18,7 @@ class Hatchet_Swing : Melee_Swing
class Crowbar_Swing : Melee_Swing
{
scope = public;
scope = 2;
displayName = "Crowbar";
displayNameMagazine = "Crowbar";
shortNameMagazine = "Crowbar";
@@ -28,8 +27,7 @@ class Crowbar_Swing : Melee_Swing
class Machete_Swing : Melee_Swing
{
scope = public;
scope = 2;
displayName = "Machete";
displayNameMagazine = "Machete";
shortNameMagazine = "Machete";
@@ -38,8 +36,7 @@ class Machete_Swing : Melee_Swing
class Fishing_Swing : Melee_Swing
{
scope = public;
scope = 2;
displayName = "Fishing";
displayNameMagazine = "Fishing";
shortNameMagazine = "Fishing";
@@ -55,8 +52,7 @@ class Sledge_Swing : Melee_Swing {
class Bat_Swing : Melee_Swing
{
scope = public;
scope = 2;
displayName = "BaseBallBat";
displayNameMagazine = "BaseBallBat";
shortNameMagazine = "BaseBallBat";
@@ -65,8 +61,7 @@ class Bat_Swing : Melee_Swing
class BatBarbed_Swing : Melee_Swing
{
scope = public;
scope = 2;
displayName = "BaseBallBatBarbed";
displayNameMagazine = "BaseBallBatBarbed";
shortNameMagazine = "BaseBallBatBarbed";
@@ -75,8 +70,7 @@ class BatBarbed_Swing : Melee_Swing
class BatNails_Swing : Melee_Swing
{
scope = public;
scope = 2;
displayName = "BaseBallBatNails";
displayNameMagazine = "BaseBallBatNails";
shortNameMagazine = "BaseBallBatNails";

9
SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp
View File

@@ -3,8 +3,7 @@ class 5x_22_LR_17_HMR;
class 5Rnd_17HMR : 5x_22_LR_17_HMR
{
displayName = $STR_DZ_MAG_5RND_17HMR_NAME;
descriptionShort = $STR_DZ_MAG_5RND_17HMR_DESC;
descriptionShort = $STR_DZ_MAG_5RND_17HMR_DESC;
model = "\dayz_equip\models\mag5rnd.p3d";
class ItemActions
@@ -29,8 +28,7 @@ class 10Rnd_303British : 10x_303
//KSVK
class 5Rnd_127x108_KSVK : CA_Magazine
{
displayName = $STR_DZ_MAG_5Rnd_127x108_KSVK_NAME;
displayName = $STR_DZ_MAG_5Rnd_127x108_KSVK_NAME;
cartridgeName = "127x108";
class ItemActions
@@ -43,8 +41,7 @@ class 5Rnd_127x108_KSVK : CA_Magazine
class 10Rnd_B_765x17_Ball: CA_Magazine
{
model = "\z\addons\dayz_epoch_w\magazine\dze_sa61_mag.p3d";
displayName = "$STR_EP1_DN_10RND_B_765X17_BALL";
displayName = "$STR_EP1_DN_10RND_B_765X17_BALL";
cartridgeName = "765x17";
class ItemActions

31
SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp
View File

@@ -3,17 +3,14 @@
//Winchester 1866
class 15Rnd_W1866_Slug : CA_Magazine
{
scope = public;
scope = 2;
model = "\z\addons\dayz_communityassets\models\winammo.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_winammo_ca.paa";
displayName = $STR_DZ_MAG_15RND_W1866_NAME;
descriptionShort = $STR_DZ_MAG_15RND_W1866_DESC;
descriptionShort = $STR_DZ_MAG_15RND_W1866_DESC;
ammo = B_1866_Slug;
count = 15;
initSpeed = 396;
displayNameShort = "Slug";
class ItemActions
{
@@ -27,8 +24,7 @@ class 8Rnd_12Gauge_Slug : 8Rnd_B_Beneli_74Slug
model = "\z\addons\dayz_communityassets\models\greenshotgunslugs.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_greenshotgunslugs_ca.paa";
displayName = $STR_DZ_MAG_8RND_12GAUGE_SLUG_NAME;
descriptionShort = $STR_DZ_MAG_8RND_12GAUGE_SLUG_DESC;
descriptionShort = $STR_DZ_MAG_8RND_12GAUGE_SLUG_DESC;
cartridgeName = "12Gauge_Slug";
class ItemActions
@@ -56,8 +52,7 @@ class 2Rnd_12Gauge_Slug : 8Rnd_12Gauge_Slug
model = "\z\addons\dayz_communityassets\models\2shells_slugshot.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_2shells_slugshot_CA.paa";
displayName = $STR_DZ_MAG_2RND_12GAUGE_SLUG_NAME;
descriptionShort = $STR_DZ_MAG_2RND_12GAUGE_SLUG_DESC;
descriptionShort = $STR_DZ_MAG_2RND_12GAUGE_SLUG_DESC;
count = 2;
class ItemActions
@@ -120,8 +115,7 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck
model = "\z\addons\dayz_communityassets\models\2shells_slugshot.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_2shells_pellet_ca.paa";
displayName = $STR_DZ_MAG_2RND_12GAUGE_BUCK_NAME;
descriptionShort = $STR_DZ_MAG_2RND_12GAUGE_BUCK_DESC;
descriptionShort = $STR_DZ_MAG_2RND_12GAUGE_BUCK_DESC;
count = 2;
class ItemActions
@@ -146,12 +140,12 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck
};
};
};
//AA12 Ammo
class 20Rnd_B_AA12_74Slug : CA_Magazine
{
model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d";
displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME;
displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME;
cartridgeName = "12Gauge_Slug";
class ItemActions
@@ -159,11 +153,11 @@ class 20Rnd_B_AA12_74Slug : CA_Magazine
COMBINE_MAG
};
};
class 20Rnd_B_AA12_Pellets : CA_Magazine
{
model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d";
displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME;
displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME;
cartridgeName = "12Gauge_Pellets";
class ItemActions
@@ -171,11 +165,11 @@ class 20Rnd_B_AA12_Pellets : CA_Magazine
COMBINE_MAG
};
};
class 20Rnd_B_AA12_HE : CA_Magazine
{
model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d";
displayName = $STR_DZ_MAG_20Rnd_B_AA12_HE_NAME;
displayName = $STR_DZ_MAG_20Rnd_B_AA12_HE_NAME;
cartridgeName = "19mm_HE";
class ItemActions
@@ -183,6 +177,7 @@ class 20Rnd_B_AA12_HE : CA_Magazine
COMBINE_MAG
};
};
//Saiga12 Ammo
class 8Rnd_B_Saiga12_74Slug: CA_Magazine
{
@@ -216,4 +211,4 @@ class 20Rnd_B_Usas12_Pellets: 8Rnd_B_Saiga12_Pellets {
displayName = $STR_DZ_MAG_20RND_USAS12_PELLETS_NAME;
descriptionShort = $STR_DZ_MAG_20RND_USAS12_PELLETS_DESC;
count = 20;
};
};

16
SQF/dayz_code/Configs/CfgMagazines/Magazines/VehicleAmmo.hpp
View File

@@ -16,6 +16,7 @@ class 200Rnd_762x51_M240 : 100Rnd_762x51_M240 {
displayName = $STR_DZ_MAG_200RND_M240_NAME;
count = 200;
descriptionShort = $STR_DZ_MAG_200RND_M240_DESC;
class ItemActions
{
delete CombineMag;
@@ -95,7 +96,7 @@ class 200Rnd_762x54_GPMG: 200Rnd_762x54_PKT
ammo = "B_762x51_Ball";
};
class 29Rnd_30mm_AGS30 : Vehicle_ammo_base {
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_29RND_AGS30_NAME;
descriptionShort = $STR_DZ_MAG_29RND_AGS30_DESC;
model = "\z\addons\dayz_epoch\models\30mm_mag.p3d";
@@ -120,7 +121,7 @@ class 400Rnd_30mm_AGS17: 29Rnd_30mm_AGS30
};
class 48Rnd_40mm_MK19 : Vehicle_ammo_base {
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_48RND_MK19_NAME;
descriptionShort = $STR_DZ_MAG_48RND_MK19_DESC;
model = "\z\addons\dayz_epoch\models\40mm_mag.p3d";
@@ -140,7 +141,7 @@ class 32Rnd_40mm_GMG: 48Rnd_40mm_MK19
class 4000Rnd_762x51_M134 : Vehicle_ammo_base {
count = 4000;
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_4000RND_M134_NAME;
descriptionShort = $STR_DZ_MAG_4000RND_M134_DESC;
picture = "\z\addons\dayz_epoch\pictures\equip_m134_mag_ca.paa";
@@ -166,7 +167,7 @@ class 2000Rnd_762x51_L94A1: 2000Rnd_762x51_M134
};
class 100Rnd_127x99_M2 : Vehicle_ammo_base {
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_100RND_M2_NAME;
descriptionShort = $STR_DZ_MAG_100RND_M2_DESC;
model = "\z\addons\dayz_epoch\models\50cal_mag.p3d";
@@ -181,7 +182,7 @@ class 100Rnd_127x99_M2 : Vehicle_ammo_base {
};
class 50Rnd_127x107_DSHKM : Vehicle_ammo_base {
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_50RND_DSHKM_NAME;
descriptionShort = $STR_DZ_MAG_50RND_DSHKM_DESC;
picture = "\z\addons\dayz_epoch\pictures\equip_Dshkm_mag_ca.paa";
@@ -196,7 +197,7 @@ class 50Rnd_127x107_DSHKM : Vehicle_ammo_base {
};
class 150Rnd_127x107_DSHKM : 50Rnd_127x107_DSHKM {
scope = public;
scope = 2;
displayName = $STR_DZ_MAG_150RND_DSHKM_NAME;
descriptionShort = $STR_DZ_MAG_150RND_DSHKM_DESC;
count = 150;
@@ -267,8 +268,7 @@ class pook_12Rnd_Grenade_Camel: Vehicle_ammo_base
maxLeadSpeed = 200;
nameSound = "grenade";
picture = "\z\addons\dayz_epoch\pictures\equip_40mm_mag_ca.paa";
model = "\z\addons\dayz_epoch\models\40mm_mag.p3d";
model = "\z\addons\dayz_epoch\models\40mm_mag.p3d";
};
//mozzie