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

Updating strings for AK74, RPK74, MG36 magazines

Browse Source 
This fixes the error message of duplicated stringtable entry from a commit before.
This commit is contained in:
A Man
2019-10-30 10:01:14 +01:00
parent f1d50386df
commit d233346563
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp
View File

@@ -2,6 +2,7 @@ class 30Rnd_545x39_AK : CA_Magazine
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_ak74_ca.paa";
displayName = $STR_DZ_MAG_30RND_545x39_AK_NAME;
descriptionShort = $STR_DZ_MAG_30RND_AK74_DESC;
cartridgeName = "545x39";
class ItemActions
@@ -27,7 +28,7 @@ class 75Rnd_545x39_RPK : CA_Magazine
model = "\ca\weapons\mag_univ.p3d";
picture = "\CA\weapons\AK\data\equip\M_RPK_74_CA.paa";
displayName = $STR_DZ_MAG_75RND_545X39_RPK_NAME;
descriptionShort = $STR_DSS_75Rnd_RPK;
descriptionShort = $STR_DZ_MAG_75RND_RPK74_DESC;
count = 75;
tracersEvery = 4;

4
SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp
View File

@@ -19,7 +19,7 @@ class 100Rnd_556x45_M249 : 200Rnd_556x45_M249
class 100Rnd_556x45_BetaCMag: CA_Magazine {
scope = public;
displayName = "MG36 Mag.";
displayName = $STR_DZ_MAG_100RND_556x45_MG36_NAME;
ammo = "B_556x45_Ball";
count = 100;
initSpeed = 920;
@@ -27,7 +27,7 @@ class 100Rnd_556x45_BetaCMag: CA_Magazine {
type="256";
tracersEvery = 4;
lastRoundsTracer = 4;
descriptionShort = "Caliber: 5.56x45 mm NATO Rounds: 100 Used in: MG36, X8 SAW";
descriptionShort = $STR_DZ_MAG_100RND_MG36_DESC;
};

24
SQF/dayz_code/stringtable.xml
View File

@@ -17263,9 +17263,8 @@
<Russian>Лист табака с табачной плантации</Russian>
</Key>
<!--New Epoch 1.0.6.3 weapon, attachment and magazine strings-->
<Key
ID="str_dss_30rnd_ak"> <!--Overwrites the Arma 2 description -->
<!--New Epoch 1.0.6.3 weapon, attachment and magazine strings-->
<Key ID="STR_DZ_MAG_30RND_AK74_DESC">
<German>Kaliber: 5,45x39mm &lt;br/&gt;Schuss: 30 &lt;br/&gt;Eingesetzt in: AK-74, AK-74 Kobra, AKS-74U, AK-107 und RPK-74</German>
<English>Caliber: 5.45x39mm &lt;br/&gt;Rounds: 30 &lt;br/&gt;Used in: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74</English>
<Italian>Calibro: 5,45x39 mm &lt;br/&gt;Munizioni: 30 &lt;br/&gt;Si usa in: AK-74, AK-74 Kobra, AKS-74U, AK-107 e RPK-74</Italian>
@@ -17276,8 +17275,7 @@
<Polish>Kaliber: 5,45x39mm &lt;br/&gt;Naboje: 30 &lt;br/&gt;Używane w: AK-74, AK-74 Kobra, AKS-74U, AK-107 i RPK-74</Polish>
<Hungarian>Kaliber: 5.45x39mm &lt;br/&gt; Töltények: 30 &lt;br/&gt; Hozzá tartozó fegyver: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74</Hungarian>
</Key>
<Key
ID="str_dss_75rnd_rpk"> <!--Overwrites the Arma 2 description -->
<Key ID="STR_DZ_MAG_75RND_RPK74_DESC">
<German>Kaliber: 5,45x39mm &lt;br/&gt;Schuss: 75 &lt;br/&gt;Eingesetzt in: AK-74, AK-74 Kobra, AKS-74U, AK-107 und RPK-74</German>
<English>Caliber: 5.45x39mm &lt;br/&gt;Rounds: 75 &lt;br/&gt;Used in: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74</English>
<Italian>Calibro: 5,45x39 mm &lt;br/&gt;Munizioni: 75 &lt;br/&gt;Si usa in: AK-74, AK-74 Kobra, AKS-74U, AK-107 e RPK-74</Italian>
@@ -17288,6 +17286,22 @@
<Polish>Kaliber: 5,45x39mm &lt;br/&gt;Naboje: 75 &lt;br/&gt;Używane w: AK-74, AK-74 Kobra, AKS-74U, AK-107 i RPK-74</Polish>
<Hungarian>Kaliber: 5.45x39mm &lt;br/&gt; Töltények: 75 &lt;br/&gt; Hozzá tartozó fegyver: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74</Hungarian>
</Key>
<Key ID="STR_DZ_MAG_100RND_556x45_MG36_NAME">
<English>100Rnd. MG36 drum mag.</English>
<German>100 Schuss MG36 Trommelmagazin</German>
<Russian>100п. МГ-36 барабан</Russian>
</Key>
<Key ID="STR_DZ_MAG_100RND_MG36_DESC">
<German>Kaliber: 5.56x45mm &lt;br/&gt;Schuss: 100 &lt;br/&gt;Eingesetzt in: G36, MG36, M16, M4, M249, MK-12, M8 und L110</German>
<English>Caliber: 5.56x45mm &lt;br/&gt;Rounds: 100 &lt;br/&gt;Used in: G36, MG36, M16, M4, M249, MK-12, M8 and L110</English>
<Italian>Calibro: 5.56x45mm &lt;br/&gt;Munizioni: 100 &lt;br/&gt;Si usa in: G36, MG36, M16, M4, M249, MK-12, M8 e L110</Italian>
<Spanish>Calibre: 5.56x45mm &lt;br/&gt;Cargas: 100 &lt;br/&gt;Uso: G36, MG36, M16, M4, M249, MK-12, M8 y L110</Spanish>
<French>Calibre : 5.56x45mm &lt;br/&gt;Munitions : 100 &lt;br/&gt;Utilisé avec : G36, MG36, M16, M4, M249, MK-12, M8 et L110</French>
<Czech>Kalibr: 5.56x45mm &lt;br/&gt;Nábojů: 100 &lt;br/&gt;Pro: G36, MG36, M16, M4, M249, MK-12, M8 a L110</Czech>
<Russian>Патрон: 5.56x45 мм &lt;br/&gt;Количество: 100 &lt;br/&gt;Используется в: G36, MG36, M16, M4, M249, MK-12, M8, L110</Russian>
<Polish>Kaliber: 5.56x45mm &lt;br/&gt;Naboje: 100 &lt;br/&gt;Używane w: G36, MG36, M16, M4, M249, MK-12, M8 i L110</Polish>
<Hungarian>Kaliber: 5.56x45mm &lt;br/&gt; Töltények: 100 &lt;br/&gt; Hozzá tartozó fegyver: G36, MG36, M16, M4, M249, MK-12, M8 and L110</Hungarian>
</Key>
<!-- AK107 -->
<Key ID="STR_DZ_WPN_AK107_NAME">