From bd0f0a5c7d1450f4cea5615c1ccf00d556bc7547 Mon Sep 17 00:00:00 2001 From: A Man Date: Mon, 20 Apr 2020 11:39:48 +0200 Subject: [PATCH] Update AS50 ammo --- .../Configs/CfgMagazines/Magazines/127x99.hpp | 17 +++++------------ .../Configs/CfgWeapons/Rifles/MK14.hpp | 2 +- .../Configs/CfgWeapons/Rifles/XM2010.hpp | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/127x99.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/127x99.hpp index aecd0dbd0..343b6d2b4 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/127x99.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/127x99.hpp @@ -13,18 +13,6 @@ class 10Rnd_127x99_m107 : CA_Magazine }; //AS50 -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"; - - class ItemActions - { - COMBINE_MAG - }; -}; class 5Rnd_127x99_as50 : CA_Magazine { displayName = $STR_DZ_MAG_5Rnd_127x99_AS50_NAME; @@ -37,4 +25,9 @@ class 5Rnd_127x99_as50 : CA_Magazine COMBINE_MAG }; }; +class 5Rnd_127x99_as50_CP : 5Rnd_127x99_as50 +{ + ammo = "B_127x99_Ball_noTracer"; +}; + diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp index 86d78372d..2b707227d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp @@ -218,7 +218,7 @@ class MK14_SD_DZ: M14_EP1 class MK14_CCO_SD_DZ: MK14_SD_DZ { - displayName = $STR_DZ_WPN_MK14_CCO_SD_NAME; + displayName = $TR_DZ_WPN_MK14_CCO_SD_NAME; model = "\RH_mgswp\RH_mk14sdaim.p3d"; picture = "\RH_mgswp\inv\mk14sdaim.paa"; handAnim[] = {"OFP2_ManSkeleton","\RH_mgswp\anim\RH_M4cs.rtm"}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM2010.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM2010.hpp index ee7e16161..2bc29a4b3 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM2010.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/XM2010.hpp @@ -125,7 +125,7 @@ class XM2010_SD_DZ: XM2010_SD_BASE class XM2010_NV_DZ: XM2010_BASE { scope = public; - displayName = $STR_DZ_WPN_XM2010_NV_NAME; + displayName = $TR_DZ_WPN_XM2010_NV_NAME; descriptionShort = $STR_DZ_WPN_XM2010_NV_DESC; model = "\fhq_remington\XM2010\XM2010_nv.p3d"; picture = "\fhq_remington\XM2010\icons\xm2010_nv.paa";