diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp index 37447b3b7..5dee5f2bb 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp @@ -25,7 +25,7 @@ class 30Rnd_545x39_AKSD : 30Rnd_545x39_AK class 75Rnd_545x39_RPK : CA_Magazine { - model = "\ca\weapons\mag_univ.p3d"; + model = "dayz_epoch_c\models\magazines\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 4c95e0a54..74fdda118 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp @@ -23,6 +23,7 @@ class 100Rnd_556x45_BetaCMag: CA_Magazine { ammo = "B_556x45_Ball"; count = 100; initSpeed = 920; + model = "dayz_epoch_c\models\magazines\MG36_mag.p3d"; picture = "\ca\weapons\g36\data\equip\M_MG36_CA.paa"; type="256"; tracersEvery = 4; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp index b27793f62..f02bff0ef 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x39.hpp @@ -24,7 +24,7 @@ class 30Rnd_762x39_AK47 : CA_Magazine class 75Rnd_762x39_RPK : 30Rnd_762x39_AK47 { - model = "ca\weapons\mag_univ.p3d"; + model = "dayz_epoch_c\models\magazines\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/CfgMagazines/Magazines/762x51.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp index 78f009b98..66941c6e4 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp @@ -1,5 +1,6 @@ class 20Rnd_762x51_FNFAL : CA_Magazine { + model = "dayz_epoch_c\models\magazines\fnFal_mag.p3d"; displayName = $STR_DZ_MAG_20RND_762X51_FNFAL_NAME; cartridgeName = "762x51"; @@ -73,6 +74,7 @@ class 200Rnd_762x51_M240 : 100Rnd_762x51_M240 { class 20Rnd_762x51_B_SCAR : CA_Magazine { + model = "dayz_epoch_c\models\magazines\mk17_mag.p3d"; displayName = $STR_DZ_MAG_20Rnd_762x51_B_SCAR_NAME; cartridgeName = "762x51"; @@ -85,6 +87,7 @@ class 20Rnd_762x51_B_SCAR : CA_Magazine class 20Rnd_762x51_SB_SCAR : CA_Magazine { + model = "dayz_epoch_c\models\magazines\mk17_mag.p3d"; displayName = $STR_DZ_MAG_20Rnd_762x51_SB_SCAR_NAME; cartridgeName = "762x51_SD"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp index a56f84bac..a98057a61 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp @@ -2,6 +2,7 @@ class 30Rnd_9x19_UZI : CA_Magazine { + model = "dayz_epoch_c\models\magazines\pdw_mag.p3d"; displayName = $STR_DZ_MAG_30RND_9X19_UZI_NAME; cartridgeName = "9x19"; @@ -26,6 +27,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; cartridgeName = "9x19_SD"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp index f9a9dde90..e5588e911 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp @@ -26,27 +26,7 @@ class 10Rnd_303British : 10x_303 }; }; -//Winchester 1866 -class 15Rnd_W1866_Slug : CA_Magazine -{ - scope = public; - - 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; - - ammo = B_1866_Slug; - count = 15; - initSpeed = 396; - displayNameShort = "Slug"; - - class ItemActions - { - COMBINE_MAG - }; -}; - +//M107 class 10Rnd_127x99_m107 : CA_Magazine { displayName = $STR_DZ_MAG_10Rnd_127x99_m107_NAME; @@ -58,7 +38,7 @@ class 10Rnd_127x99_m107 : CA_Magazine COMBINE_MAG }; }; - +//KSVK class 5Rnd_127x108_KSVK : CA_Magazine { displayName = $STR_DZ_MAG_5Rnd_127x108_KSVK_NAME; @@ -70,7 +50,7 @@ class 5Rnd_127x108_KSVK : CA_Magazine COMBINE_MAG }; }; - +//L115 class 5Rnd_86x70_L115A1: CA_Magazine { displayName = $STR_DZ_MAG_5Rnd_86x70_L115A1_NAME; @@ -82,8 +62,10 @@ class 5Rnd_86x70_L115A1: CA_Magazine COMBINE_MAG }; }; +//VSS class 10Rnd_9x39_SP5_VSS: CA_Magazine { + model = "dayz_epoch_c\models\magazines\VSS_vintorez_mag.p3d"; displayName = $STR_DZ_MAG_10Rnd_9x39_SP5_VSS_NAME; cartridgeName = "9x39"; @@ -93,8 +75,10 @@ class 10Rnd_9x39_SP5_VSS: CA_Magazine COMBINE_MAG }; }; +//VSS class 20Rnd_9x39_SP5_VSS: CA_Magazine { + model = "dayz_epoch_c\models\magazines\VSS_vintorez_mag.p3d"; displayName = $STR_DZ_MAG_20Rnd_9x39_SP5_VSS_NAME; cartridgeName = "9x39"; @@ -104,3 +88,21 @@ class 20Rnd_9x39_SP5_VSS: CA_Magazine COMBINE_MAG }; }; +//Sa61 +class 10Rnd_B_765x17_Ball: CA_Magazine +{ + model = "dayz_epoch_c\models\magazines\sa61_mag.p3d"; + displayName = "$STR_EP1_DN_10RND_B_765X17_BALL"; + + cartridgeName = "765x17"; + + class ItemActions + { + COMBINE_MAG + }; +}; +//Sa61 +class 20Rnd_B_765x17_Ball: 10Rnd_B_765x17_Ball +{ + displayName = "$STR_EP1_DN_20RND_B_765X17_BALL"; +}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp index 1bcc862cf..b45e85b3d 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp @@ -1,5 +1,26 @@ /* Slugs */ +//Winchester 1866 +class 15Rnd_W1866_Slug : CA_Magazine +{ + scope = public; + + 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; + + ammo = B_1866_Slug; + count = 15; + initSpeed = 396; + displayNameShort = "Slug"; + + class ItemActions + { + COMBINE_MAG + }; +}; + class 8Rnd_B_Beneli_74Slug; class 8Rnd_12Gauge_Slug : 8Rnd_B_Beneli_74Slug { @@ -128,6 +149,7 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck //AA12 Ammo class 20Rnd_B_AA12_74Slug : CA_Magazine { + model = "dayz_epoch_c\models\magazines\AA12_mag.p3d"; displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME; cartridgeName = "12Gauge_Slug"; @@ -139,6 +161,7 @@ class 20Rnd_B_AA12_74Slug : CA_Magazine }; class 20Rnd_B_AA12_Pellets : CA_Magazine { + model = "dayz_epoch_c\models\magazines\AA12_mag.p3d"; displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME; cartridgeName = "12Gauge_Pellets"; @@ -150,6 +173,7 @@ class 20Rnd_B_AA12_Pellets : CA_Magazine }; class 20Rnd_B_AA12_HE : CA_Magazine { + model = "dayz_epoch_c\models\magazines\AA12_mag.p3d"; displayName = $STR_DZ_MAG_20Rnd_B_AA12_HE_NAME; cartridgeName = "19mm_HE"; @@ -159,3 +183,25 @@ class 20Rnd_B_AA12_HE : CA_Magazine COMBINE_MAG }; }; +//Saiga12 Ammo +class 8Rnd_B_Saiga12_74Slug: CA_Magazine +{ + model = "dayz_epoch_c\models\magazines\Saiga12K_mag.p3d"; + cartridgeName = "12Gauge_Slug"; + + class ItemActions + { + COMBINE_MAG + }; +}; + +class 8Rnd_B_Saiga12_Pellets: CA_Magazine +{ + model = "dayz_epoch_c\models\magazines\Saiga12K_mag.p3d"; + cartridgeName = "12Gauge_Pellets"; + + class ItemActions + { + COMBINE_MAG + }; +};