diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/ANPVS4.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/ANPVS4.hpp index 861b1f287..9acc79108 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/ANPVS4.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/ANPVS4.hpp @@ -2,7 +2,7 @@ class Attachment_ANPVS4 : CA_Magazine { scope = public; count = 1; type = 256; - model = "\z\addons\dayz_communityweapons\attachments\acog\acog.p3d"; + model = "\z\addons\dayz_epoch_w\optic\dze_scope_anpvs4.p3d"; picture = "\dayz_epoch_c\icons\attachments\attachment_anpvs4.paa"; displayName = $STR_DZE_ATTACHMENT_ANPVS4_NAME; descriptionShort = $STR_DZE_ATTACHMENT_ANPVS4_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/NSPU.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/NSPU.hpp index 0b6a42bc2..6f4e2f368 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/NSPU.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/NSPU.hpp @@ -2,7 +2,7 @@ class Attachment_NSPU : CA_Magazine { scope = public; count = 1; type = 256; - model = "\z\addons\dayz_communityweapons\attachments\pso\pso.p3d"; + model = "\z\addons\dayz_epoch_w\optic\dze_scope_nspu.p3d"; picture = "\dayz_epoch_c\icons\attachments\attachment_nspu.paa"; displayName = $STR_DZE_ATTACHMENT_NSPU_NAME; descriptionShort = $STR_DZE_ATTACHMENT_NSPU_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/NV.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/NV.hpp index b578fe41c..7b4e5b331 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/NV.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/NV.hpp @@ -2,7 +2,8 @@ class Attachment_NV : CA_Magazine { scope = public; count = 1; type = 256; - picture = "\dayz_epoch_c\icons\attachments\attachment_nv.paa"; + picture = "\dayz_epoch_c\icons\attachments\attachment_nv.paa"; + model = "\z\addons\dayz_epoch_w\optic\dze_scope_generic.p3d"; displayName = $STR_DZE_ATTACHMENT_NV_NAME; descriptionShort = $STR_DZE_ATTACHMENT_NV_DESC; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgMagazines/Attachments/TWS.hpp b/SQF/dayz_code/Configs/CfgMagazines/Attachments/TWS.hpp index e99ba546b..56fff5833 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Attachments/TWS.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Attachments/TWS.hpp @@ -2,7 +2,7 @@ class Attachment_Tws : CA_Magazine { scope = public; count = 1; type = 256; - model = "\z\addons\dayz_communityweapons\attachments\acog\acog.p3d"; + model = "\z\addons\dayz_epoch_w\optic\dze_scope_tws.p3d"; picture = "\dayz_epoch_c\icons\attachments\attachment_tws.paa"; displayName = $STR_DZE_ATTACHMENT_TWS_NAME; descriptionShort = $STR_DZE_ATTACHMENT_TWS_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp index c6b293fcd..0ff535026 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp @@ -12,4 +12,5 @@ class PipeBomb: TimeBomb { displayName = $STR_DZ_MAG_SATCHEL_NAME; // Singular "Satchel Charge" for death messages "with a x" type = WeaponSlotItem; // Only takes up one gear slot in Epoch + model = "\z\addons\dayz_epoch_w\magazine\dze_satchel.p3d"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/MetalFenceItems.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/MetalFenceItems.hpp index 5ea257400..66832ecba 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/MetalFenceItems.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/MetalFenceItems.hpp @@ -37,8 +37,8 @@ class ItemScrews: CA_Magazine //Construection,farm,indestrial,castle,residential count = 1; type = 256; displayName = $STR_BLD_name_ItemScrews;//"Box of screws for metal" - picture = "\z\addons\dayz_buildings\equip\item_screws.paa"; - model = "z\addons\dayz_buildings\models\screws.p3d"; + picture = "\z\addons\dayz_epoch_w\magazine\ui\m_screws_ca.paa"; + model = "\z\addons\dayz_epoch_w\magazine\dze_screwtray.p3d"; descriptionShort = $STR_BLD_desc_ItemScrews;//"Box of screws" }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/equip_lever.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/equip_lever.hpp index 2e1c4960d..3d737a84d 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/equip_lever.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/equip_lever.hpp @@ -2,9 +2,9 @@ class equip_lever : CA_Magazine { scope = public; count = 1; - type = WeaponSlotItem; - + type = WeaponSlotItem; picture = "\dayz_equip\textures\equip_lever.paa"; + model = "\z\addons\dayz_epoch_w\magazine\dze_handle.p3d"; descriptionShort = $STR_EQUIP_DESC_LEVER; displayName = $STR_EQUIP_NAME_LEVER; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/127x99.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/127x99.hpp index e04378a7b..94915981e 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/127x99.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/127x99.hpp @@ -16,6 +16,7 @@ class 10Rnd_127x99_m107 : CA_Magazine class 5Rnd_127x99_as50_CP : CA_Magazine { displayName = $STR_DZ_MAG_5Rnd_127x99_AS50_NAME; + model = "\z\addons\dayz_epoch_w\magazine\dze_as50_mag.p3d"; cartridgeName = "127x99"; @@ -27,6 +28,7 @@ class 5Rnd_127x99_as50_CP : CA_Magazine class 5Rnd_127x99_as50 : CA_Magazine { displayName = $STR_DZ_MAG_5Rnd_127x99_AS50_NAME; + model = "\z\addons\dayz_epoch_w\magazine\dze_as50_mag.p3d"; cartridgeName = "127x99"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp index e8b117f93..0c02e43b2 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp @@ -1,7 +1,7 @@ class 20Rnd_762x51_FNFAL : CA_Magazine { - model = "dayz_epoch_c\models\magazines\fnFal_mag.p3d"; - picture = "\dayz_epoch_c\icons\magazines\m_fnFal_ca.paa"; + 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; cartridgeName = "762x51"; @@ -91,7 +91,8 @@ class 200Rnd_762x51_M240 : 100Rnd_762x51_M240 { class 20Rnd_762x51_B_SCAR : CA_Magazine { - model = "dayz_epoch_c\models\magazines\mk17_mag.p3d"; + //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; descriptionShort = $STR_DZ_MAG_20RND_MK17_DESC; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/86x70.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/86x70.hpp index 5e652b1c0..bc248affc 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/86x70.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/86x70.hpp @@ -2,6 +2,7 @@ class 5Rnd_86x70_L115A1: CA_Magazine { displayName = $STR_DZ_MAG_5Rnd_86x70_L115A1_NAME; + model = "\z\addons\dayz_epoch_w\magazine\dze_lapua_mag.p3d"; cartridgeName = "86x70"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp index 470c31fbe..ca8b0f002 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp @@ -2,7 +2,7 @@ class 30Rnd_9x19_UZI : CA_Magazine { - model = "dayz_epoch_c\models\magazines\pdw_mag.p3d"; + model = "\z\addons\dayz_epoch_w\magazine\dze_pdw_mag.p3d"; displayName = $STR_DZ_MAG_30RND_9X19_UZI_NAME; descriptionShort = $STR_DZ_MAG_30RND_9X19_UZI_DESC; @@ -29,7 +29,7 @@ class 30Rnd_9x19_MP5 : CA_Magazine class 30Rnd_9x19_UZI_SD : CA_Magazine { - model = "dayz_epoch_c\models\magazines\pdw_mag.p3d"; + model = "\z\addons\dayz_epoch_w\magazine\dze_pdw_mag.p3d"; displayName = $STR_DZ_MAG_30RND_9X19_UZISD_NAME; descriptionShort = $STR_DZ_MAG_30RND_9X19_UZISD_DESC; picture = "\dayz_epoch_c\icons\magazines\m_uzisd_ca.paa"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp new file mode 100644 index 000000000..a2a531e88 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Grenades.hpp @@ -0,0 +1,216 @@ +// M32/M203 grenades +class 1Rnd_HE_M203: CA_Magazine { + scope = 2; + type = 16; + displayName = "$STR_DN_HE_M203"; + model = "\z\addons\dayz_epoch_w\magazine\dze_m203_he.p3d"; + picture = "\z\addons\dayz_epoch_w\magazine\ui\m_m203he_ca.paa"; + ammo = "G_40mm_HE"; + initSpeed = 80; + count = 1; + nameSound = "grenadelauncher"; + descriptionShort = "$STR_DSS_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"; + type = 256; + 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 { + scope = 2; + type = 16; + displayName = "$STR_DN_FLAREWHITE_M203"; + picture = "\Ca\weapons\Data\Equip\m_FlareWhite_CA.paa"; + model = "\z\addons\dayz_epoch_w\magazine\dze_m203_flare.p3d"; + ammo = "F_40mm_White"; + initSpeed = 80; + count = 1; + nameSound = "grenadelauncher"; + descriptionShort = "$STR_DSS_1Rnd_FLAREWHITE_M203"; +}; +class 6Rnd_FlareWhite_M203: FlareWhite_M203 +{ + count = 6; + displayName = "$STR_EP1_DN_6Rnd_FlareWhite_M203"; + descriptionShort = "$STR_EP1_DSS_6Rnd_FlareWhite_M203"; + type = 256; + 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 { + displayName = "$STR_DN_FLAREGREEN_M203"; + ammo = "F_40mm_Green"; + picture = "\Ca\weapons\Data\Equip\m_FlareGreen_CA.paa"; + descriptionShort = "$STR_DSS_1Rnd_FLAREGREEN_M203"; +}; +class 6Rnd_FlareGreen_M203: FlareGreen_M203 +{ + count = 6; + displayName = "$STR_EP1_DN_6Rnd_FlareGreen_M203"; + descriptionShort = "$STR_EP1_DSS_6Rnd_FlareGreen_M203"; + type = 256; + 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 { + displayName = "$STR_DN_FLARERED_M203"; + ammo = "F_40mm_Red"; + picture = "\Ca\weapons\Data\Equip\m_FlareRed_CA.paa"; + descriptionShort = "$STR_DSS_1Rnd_FLARERED_M203"; +}; +class 6Rnd_FlareRed_M203: FlareRed_M203 +{ + count = 6; + displayName = "$STR_EP1_DN_6Rnd_FlareRed_M203"; + descriptionShort = "$STR_EP1_DSS_6Rnd_FlareRed_M203"; + type = 256; + 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 { + displayName = "$STR_DN_FLAREYELLOW_M203"; + ammo = "F_40mm_Yellow"; + picture = "\Ca\weapons\Data\Equip\m_FlareYelow_CA.paa"; + descriptionShort = "$STR_DSS_1Rnd_FLAREYELLOW_M203"; +}; +class 6Rnd_FlareYellow_M203: FlareYellow_M203 +{ + count = 6; + displayName = "$STR_EP1_DN_6Rnd_FlareYellow_M203"; + descriptionShort = "$STR_EP1_DSS_6Rnd_FlareYellow_M203"; + type = 256; + 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 { + 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"; + ammo = "G_40mm_Smoke"; + descriptionShort = "$STR_DSS_1Rnd_SMOKE_M203"; +}; +class 6Rnd_Smoke_M203: 1Rnd_Smoke_M203 +{ + count = 6; + displayName = "$STR_EP1_DN_6Rnd_Smoke_M203"; + descriptionShort = "$STR_EP1_DSS_6Rnd_Smoke_M203"; + type = 256; + 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 { + ammo = "G_40mm_SmokeRed"; + displayName = "$STR_DN_1Rnd_SmokeRed_M203"; + descriptionShort = "$STR_DSS_1Rnd_SMOKERED_M203"; + picture = "\Ca\weapons_E\Data\icons\m_40mmSmokeRed_CA.paa"; +}; +class 6Rnd_SmokeRed_M203: 1Rnd_SmokeRed_M203 +{ + count = 6; + displayName = "$STR_EP1_DN_6Rnd_SmokeRed_M203"; + descriptionShort = "$STR_EP1_DSS_6Rnd_SmokeRed_M203"; + type = 256; + 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 { + ammo = "G_40mm_SmokeGreen"; + displayName = "$STR_DN_1Rnd_SmokeGreen_M203"; + descriptionShort = "$STR_DSS_1Rnd_SMOKEGREEN_M203"; + picture = "\Ca\weapons_E\Data\icons\m_40mmSmokeGreen_CA.paa"; +}; +class 6Rnd_SmokeGreen_M203: 1Rnd_SmokeGreen_M203 +{ + count = 6; + displayName = "$STR_EP1_DN_6Rnd_SmokeGreen_M203"; + descriptionShort = "$STR_EP1_DSS_6Rnd_SmokeGreen_M203"; + type = 256; + 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 { + ammo = "G_40mm_SmokeYellow"; + displayName = "$STR_DN_1Rnd_SmokeYellow_M203"; + descriptionShort = "$STR_DSS_1Rnd_SMOKEYELLOW_M203"; + picture = "\Ca\weapons_E\Data\icons\m_40mmSmokeYellow_CA.paa"; +}; +class 6Rnd_SmokeYellow_M203: 1Rnd_SmokeYellow_M203 +{ + count = 6; + displayName = "$STR_EP1_DN_6Rnd_SmokeYellow_M203"; + descriptionShort = "$STR_EP1_DSS_6Rnd_SmokeYellow_M203"; + type = 256; + picture = "\CA\weapons_E\Data\icons\m_6x40mmSmoke_CA.paa"; + model = "\z\addons\dayz_epoch_w\magazine\dze_6rnd_m32_mag.p3d"; +}; + +// GP-25 +class 1Rnd_HE_GP25: CA_Magazine { + scope = 2; + type = 16; + displayName = "$STR_DN_HE_GP25"; + picture = "\Ca\weapons_E\Data\icons\M_GP25_HE_CA.paa"; + model = "\z\addons\dayz_epoch_w\magazine\dze_gp_he.p3d"; + ammo = "G_40mm_HE"; + initSpeed = 80; + count = 1; + nameSound = "grenadelauncher"; + descriptionShort = "$STR_DSS_1Rnd_HE_GP25"; +}; +class FlareWhite_GP25: CA_Magazine { + scope = 2; + type = 16; + displayName = "$STR_DN_FLAREWHITE_GP25"; + picture = "\Ca\weapons_E\Data\icons\M_GP25_white_CA.paa"; + model = "\z\addons\dayz_epoch_w\magazine\dze_gp_flare.p3d"; + ammo = "F_40mm_White"; + initSpeed = 80; + count = 1; + nameSound = "grenadelauncher"; +}; +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 { + 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 { + 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 { + 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 { + 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 { + 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 { + displayName = "$STR_DN_1Rnd_SmokeGreen_GP25"; + picture = "\Ca\weapons_E\Data\icons\M_GP25_green_CA.paa"; + ammo = "G_40mm_SmokeGreen"; + descriptionShort = "$STR_DSS_1Rnd_SMOKEGREEN_GP25"; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/LauncherAmmo.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/LauncherAmmo.hpp index bb5c89333..62d199837 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/LauncherAmmo.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/LauncherAmmo.hpp @@ -78,88 +78,4 @@ class NLAW : CA_LauncherMagazine { class Dragon_EP1 : CA_LauncherMagazine { type = WeaponSlotItem; -}; - -//M32 grenades - -class 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"; - type = 256; - picture = "\CA\weapons_E\Data\icons\m_6x40mmHP_CA.paa"; -}; -class FlareWhite_M203; -class 6Rnd_FlareWhite_M203: FlareWhite_M203 -{ - count = 6; - displayName = "$STR_EP1_DN_6Rnd_FlareWhite_M203"; - descriptionShort = "$STR_EP1_DSS_6Rnd_FlareWhite_M203"; - type = 256; - picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa"; -}; -class FlareGreen_M203; -class 6Rnd_FlareGreen_M203: FlareGreen_M203 -{ - count = 6; - displayName = "$STR_EP1_DN_6Rnd_FlareGreen_M203"; - descriptionShort = "$STR_EP1_DSS_6Rnd_FlareGreen_M203"; - type = 256; - picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa"; -}; -class FlareRed_M203; -class 6Rnd_FlareRed_M203: FlareRed_M203 -{ - count = 6; - displayName = "$STR_EP1_DN_6Rnd_FlareRed_M203"; - descriptionShort = "$STR_EP1_DSS_6Rnd_FlareRed_M203"; - type = 256; - picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa"; -}; -class FlareYellow_M203; -class 6Rnd_FlareYellow_M203: FlareYellow_M203 -{ - count = 6; - displayName = "$STR_EP1_DN_6Rnd_FlareYellow_M203"; - descriptionShort = "$STR_EP1_DSS_6Rnd_FlareYellow_M203"; - type = 256; - picture = "\CA\weapons_E\Data\icons\m_6x40mmFlare_CA.paa"; -}; -class 1Rnd_Smoke_M203; -class 6Rnd_Smoke_M203: 1Rnd_Smoke_M203 -{ - count = 6; - displayName = "$STR_EP1_DN_6Rnd_Smoke_M203"; - descriptionShort = "$STR_EP1_DSS_6Rnd_Smoke_M203"; - type = 256; - picture = "\CA\weapons_E\Data\icons\m_6x40mmSmoke_CA.paa"; -}; -class 1Rnd_SmokeRed_M203; -class 6Rnd_SmokeRed_M203: 1Rnd_SmokeRed_M203 -{ - count = 6; - displayName = "$STR_EP1_DN_6Rnd_SmokeRed_M203"; - descriptionShort = "$STR_EP1_DSS_6Rnd_SmokeRed_M203"; - type = 256; - picture = "\CA\weapons_E\Data\icons\m_6x40mmSmoke_CA.paa"; -}; -class 1Rnd_SmokeGreen_M203; -class 6Rnd_SmokeGreen_M203: 1Rnd_SmokeGreen_M203 -{ - count = 6; - displayName = "$STR_EP1_DN_6Rnd_SmokeGreen_M203"; - descriptionShort = "$STR_EP1_DSS_6Rnd_SmokeGreen_M203"; - type = 256; - picture = "\CA\weapons_E\Data\icons\m_6x40mmSmoke_CA.paa"; -}; -class 1Rnd_SmokeYellow_M203; -class 6Rnd_SmokeYellow_M203: 1Rnd_SmokeYellow_M203 -{ - count = 6; - displayName = "$STR_EP1_DN_6Rnd_SmokeYellow_M203"; - descriptionShort = "$STR_EP1_DSS_6Rnd_SmokeYellow_M203"; - type = 256; - picture = "\CA\weapons_E\Data\icons\m_6x40mmSmoke_CA.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp index 61e0fbe82..515718c1a 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp @@ -33,5 +33,6 @@ #include "Shotgun.hpp" #include "Arrows.hpp" #include "LauncherAmmo.hpp" +#include "Grenades.hpp" #undef COMBINE_MAG \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp index 1ac387587..999ba3394 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp @@ -42,7 +42,7 @@ class 5Rnd_127x108_KSVK : CA_Magazine //Sa61 class 10Rnd_B_765x17_Ball: CA_Magazine { - model = "dayz_epoch_c\models\magazines\sa61_mag.p3d"; + model = "\z\addons\dayz_epoch_w\magazine\dze_sa61_mag.p3d"; displayName = "$STR_EP1_DN_10RND_B_765X17_BALL"; cartridgeName = "765x17"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp index b45e85b3d..b9c840986 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp @@ -149,7 +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"; + model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d"; displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME; cartridgeName = "12Gauge_Slug"; @@ -161,7 +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"; + model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d"; displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME; cartridgeName = "12Gauge_Pellets"; @@ -173,7 +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"; + model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d"; displayName = $STR_DZ_MAG_20Rnd_B_AA12_HE_NAME; cartridgeName = "19mm_HE"; @@ -186,7 +186,7 @@ class 20Rnd_B_AA12_HE : CA_Magazine //Saiga12 Ammo class 8Rnd_B_Saiga12_74Slug: CA_Magazine { - model = "dayz_epoch_c\models\magazines\Saiga12K_mag.p3d"; + model = "\z\addons\dayz_epoch_w\magazine\dze_Saiga12K_mag.p3d"; cartridgeName = "12Gauge_Slug"; class ItemActions @@ -197,7 +197,7 @@ class 8Rnd_B_Saiga12_74Slug: CA_Magazine class 8Rnd_B_Saiga12_Pellets: CA_Magazine { - model = "dayz_epoch_c\models\magazines\Saiga12K_mag.p3d"; + model = "\z\addons\dayz_epoch_w\magazine\dze_Saiga12K_mag.p3d"; cartridgeName = "12Gauge_Pellets"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgMagazines/Planting.hpp b/SQF/dayz_code/Configs/CfgMagazines/Planting.hpp index 8091b4099..3b819f5db 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Planting.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Planting.hpp @@ -4,8 +4,8 @@ class ItemFertilizer: CA_Magazine { displayName = $STR_CRAFT_NAME_FERTILIZER; descriptionShort = $STR_CRAFT_DESC_FERTILIZER; weight = 0.1; - model = "z\addons\dayz_communityassets\models\mre.p3d"; // TODO: model + icon - picture = "\z\addons\dayz_communityassets\pictures\equip_mre_CA.paa"; + picture = "\z\addons\dayz_epoch_w\magazine\ui\m_fertilizer_ca.paa"; + model = "\z\addons\dayz_epoch_w\magazine\dze_fertilizer.p3d"; type = 256; };