W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing re-combine actions for magazines (#1741)

Browse Source 
* 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.
This commit is contained in:
A Man
2016-08-17 15:45:15 +02:00
committed by ebaydayz
parent f04d581b4d
commit 4e65c4b473
3 changed files with 112 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,4 +69,28 @@ class 200Rnd_762x51_M240 : 100Rnd_762x51_M240 {
displayName = "200Rnd. M240";
count = 200;
descriptionShort = "Caliber: 7.62x51mm NATO <br/>Rounds: 200 <br/>Used in: M240, Mk 48 Mod 0";
};
};
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
};
};

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

@@ -45,4 +45,62 @@ class 15Rnd_W1866_Slug : CA_Magazine
{
COMBINE_MAG
};
};
};
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
};
};

28
SQF/dayz_code/stringtable.xml
View File

@@ -16183,5 +16183,33 @@
<Key ID="str_fireplace_noMatches">
<English>You need matches to build a fireplace</English>
</Key>
<Key ID="STR_DZ_MAG_20Rnd_762x51_B_SCAR_NAME">
<English>20Rnd. SCAR mag.</English>
<Russian>20п. SCAR маг.</Russian>
</Key>
<Key ID="STR_DZ_MAG_20Rnd_762x51_SB_SCAR_NAME">
<English>20Rnd. SCAR SD mag.</English>
<Russian>20п. SCAR SD маг.</Russian>
</Key>
<Key ID="STR_DZ_MAG_10Rnd_127x99_m107_NAME">
<English>10Rnd. M107 mag.</English>
<Russian>10п. M107 маг.</Russian>
</Key>
<Key ID="STR_DZ_MAG_5Rnd_127x108_KSVK_NAME">
<English>5Rnd. KSVK mag.</English>
<Russian>5п. KSVK маг.</Russian>
</Key>
<Key ID="STR_DZ_MAG_5Rnd_86x70_L115A1_NAME">
<English>5Rnd. L115 mag.</English>
<Russian>5п. L115 маг.</Russian>
</Key>
<Key ID="STR_DZ_MAG_20Rnd_9x39_SP5_VSS_NAME">
<English>20Rnd. VSS mag.</English>
<Russian>20п. VSS маг.</Russian>
</Key>
<Key ID="STR_DZ_MAG_10Rnd_9x39_SP5_VSS_NAME">
<English>10Rnd. VSS mag.</English>
<Russian>10п. VSS маг.</Russian>
</Key>
</Package>
</Project>