From 4e65c4b4734fd0551d02a49024e4d7f179a0009f Mon Sep 17 00:00:00 2001 From: A Man Date: Wed, 17 Aug 2016 15:45:15 +0200 Subject: [PATCH] Add missing re-combine actions for magazines (#1741) * Updating strings for missing magazins Adding new magazine names to make it similar to the dayz 1.8.7. names. Adding Mk17 M17 SD M107 KSVK L115 VSS * Adding missing magazines and re-combine option Mk17 Mk17 SD * Adding missing magazines and re-combine option M107 KSVK L115 VSS * Update stringtable.xml Moved new strings to epoch package * Update 762x51.hpp Adding the SD indicator. I think the SB instead of SD is too confusing. So everyone knows it is SD ammo. --- .../Configs/CfgMagazines/Magazines/762x51.hpp | 26 +++++++- .../Configs/CfgMagazines/Magazines/Misc.hpp | 60 ++++++++++++++++++- SQF/dayz_code/stringtable.xml | 28 +++++++++ 3 files changed, 112 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp index b0367a8c1..78f009b98 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp @@ -69,4 +69,28 @@ class 200Rnd_762x51_M240 : 100Rnd_762x51_M240 { displayName = "200Rnd. M240"; count = 200; descriptionShort = "Caliber: 7.62x51mm NATO
Rounds: 200
Used in: M240, Mk 48 Mod 0"; -}; \ No newline at end of file +}; + +class 20Rnd_762x51_B_SCAR : CA_Magazine +{ + displayName = $STR_DZ_MAG_20Rnd_762x51_B_SCAR_NAME; + + cartridgeName = "762x51"; + + class ItemActions + { + COMBINE_MAG + }; +}; + +class 20Rnd_762x51_SB_SCAR : CA_Magazine +{ + displayName = $STR_DZ_MAG_20Rnd_762x51_SB_SCAR_NAME; + + cartridgeName = "762x51_SD"; + + class ItemActions + { + COMBINE_MAG + }; +}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp index 98911f763..f9a9dde90 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp @@ -45,4 +45,62 @@ class 15Rnd_W1866_Slug : CA_Magazine { COMBINE_MAG }; -}; \ No newline at end of file +}; + +class 10Rnd_127x99_m107 : CA_Magazine +{ + displayName = $STR_DZ_MAG_10Rnd_127x99_m107_NAME; + + cartridgeName = "127x99"; + + class ItemActions + { + COMBINE_MAG + }; +}; + +class 5Rnd_127x108_KSVK : CA_Magazine +{ + displayName = $STR_DZ_MAG_5Rnd_127x108_KSVK_NAME; + + cartridgeName = "127x108"; + + class ItemActions + { + COMBINE_MAG + }; +}; + +class 5Rnd_86x70_L115A1: CA_Magazine +{ + displayName = $STR_DZ_MAG_5Rnd_86x70_L115A1_NAME; + + cartridgeName = "86x70"; + + class ItemActions + { + COMBINE_MAG + }; +}; +class 10Rnd_9x39_SP5_VSS: CA_Magazine +{ + displayName = $STR_DZ_MAG_10Rnd_9x39_SP5_VSS_NAME; + + cartridgeName = "9x39"; + + class ItemActions + { + COMBINE_MAG + }; +}; +class 20Rnd_9x39_SP5_VSS: CA_Magazine +{ + displayName = $STR_DZ_MAG_20Rnd_9x39_SP5_VSS_NAME; + + cartridgeName = "9x39"; + + class ItemActions + { + COMBINE_MAG + }; +}; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 4e9d12218..ad63918fd 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -16183,5 +16183,33 @@ You need matches to build a fireplace + + 20Rnd. SCAR mag. + 20п. SCAR маг. + + + 20Rnd. SCAR SD mag. + 20п. SCAR SD маг. + + + 10Rnd. M107 mag. + 10п. M107 маг. + + + 5Rnd. KSVK mag. + 5п. KSVK маг. + + + 5Rnd. L115 mag. + 5п. L115 маг. + + + 20Rnd. VSS mag. + 20п. VSS маг. + + + 10Rnd. VSS mag. + 10п. VSS маг. +