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 back short M249, update mag strings

Browse Source
This commit is contained in:
A Man
2020-03-11 17:09:21 +01:00
parent c86fce94ff
commit 1105073646
5 changed files with 71 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
View File

@@ -112,7 +112,8 @@ weaponsUS[] =
{Loot_WEAPON, 5, M249_m145_EP1_DZE},
{Loot_WEAPON, 3, m240_scoped_EP1_DZE},
{Loot_WEAPON, 3, M240_DZ},
{Loot_WEAPON, 5, M249_DZ}
{Loot_WEAPON, 5, M249_DZ},
{Loot_WEAPON, 5, M249_EP1_DZ},
};
weaponsEU[] =

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

@@ -15,6 +15,7 @@ class 30Rnd_545x39_AKSD : 30Rnd_545x39_AK
{
picture = "\z\addons\dayz_communityweapons\magazines\data\m_ak74sd_ca.paa";
displayName = $STR_DZ_MAG_30RND_545x39_AKSD_NAME;
descriptionShort = $STR_DZ_MAG_30RND_AK74SD_DESC;
cartridgeName = "545x39_SD";
class ItemActions

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

@@ -109,6 +109,7 @@ class 20Rnd_762x51_SB_SCAR : CA_Magazine
model = "dayz_epoch_c\models\magazines\mk17_mag.p3d";
picture = "\dayz_epoch_c\icons\magazines\m_mk17sd_ca.paa";
displayName = $STR_DZ_MAG_20Rnd_762x51_SB_SCAR_NAME;
descriptionShort = $STR_DZ_MAG_20RND_MK17SD_DESC;
cartridgeName = "762x51_SD";

1
SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
View File

@@ -638,6 +638,7 @@ class Category_18 {
class L110A1_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};};
class L110A1_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {7,"ItemGoldBar"};};
class L110A1_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {7,"ItemGoldBar"};};
class M249_EP1_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};};
class M249_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};};
class M249_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {8,"ItemGoldBar"};};
class M249_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {8,"ItemGoldBar"};};

66
SQF/dayz_code/stringtable.xml
View File

@@ -13291,26 +13291,37 @@
<German>Kaliber: 5.56x45mm &lt;br/&gt;Patronen: 60, zusammengeklebt &lt;br/&gt;Eingesetzt in: G36, M16, M4, M249, MK-12 und L110</German>
</Key>
<Key ID="STR_DZ_MAG_30RND_AK74_DESC">
<German>Kaliber: 5,45x39mm &lt;br/&gt;Patronen: 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>
<Spanish>Calibre: 5,45x39 mm &lt;br/&gt;Cargas: 30 &lt;br/&gt;Uso: AK-74, AK-74 Kobra, AKS-74U, AK-107 y RPK-74</Spanish>
<French>Calibre: 5.45x39 mm &lt;br/&gt;Munitions: 30 &lt;br/&gt;Utilisé avec: AK-74, AK-74 Kobra, AKS-74U, AK-107 et RPK-74</French>
<Czech>Kalibr: 5,45x39mm &lt;br/&gt;Nábojů: 30 &lt;br/&gt;Pro: AK-74, AK-74 Kobra, AKS-74U, AK-107 a RPK-74</Czech>
<Russian>Патрон: 5.45x39 мм &lt;br/&gt;Количество: 30 &lt;br/&gt;Используется в: АК-74, АКС-74, АКС-74У, АК-107, РПК-74</Russian>
<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>
<German>Kaliber: 5.45x39mm &lt;br/&gt;Patronen: 30 &lt;br/&gt;Eingesetzt in: AK-74, AK-107 und RPK-74</German>
<English>Caliber: 5.45x39mm &lt;br/&gt;Rounds: 30 &lt;br/&gt;Used in: AK-74, AK-107 and RPK-74</English>
<Italian>Calibro: 5.45x39mm &lt;br/&gt;Munizioni: 30 &lt;br/&gt;Si usa in: AK-74, AK-107 e RPK-74</Italian>
<Spanish>Calibre: 5.45x39mm &lt;br/&gt;Cargas: 30 &lt;br/&gt;Uso: AK-74, AK-107 y RPK-74</Spanish>
<French>Calibre: 5.45x39mm &lt;br/&gt;Munitions: 30 &lt;br/&gt;Utilisé avec: AK-74, AK-107 et RPK-74</French>
<Czech>Kalibr: 5.45x39mm &lt;br/&gt;Nábojů: 30 &lt;br/&gt;Pro: AK-74, AK-107 a RPK-74</Czech>
<Russian>Патрон: 5.45x39мм &lt;br/&gt;Количество: 30 &lt;br/&gt;Используется в: АК-74, АК-107, РПК-74</Russian>
<Polish>Kaliber: 5.45x39mm &lt;br/&gt;Naboje: 30 &lt;br/&gt;Używane w: AK-74, 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-107 and RPK-74</Hungarian>
</Key>
<Key ID="STR_DZ_MAG_30RND_AK74SD_DESC">
<German>Kaliber: 5.45x39mm SD &lt;br/&gt;Patronen: 30 &lt;br/&gt;Eingesetzt in: AK-74 SD</German>
<English>Caliber: 5.45x39mm SD &lt;br/&gt;Rounds: 30 &lt;br/&gt;Used in: AK-74 SD</English>
<Italian>Calibro: 5.45x39mm SD &lt;br/&gt;Munizioni: 30 &lt;br/&gt;Si usa in: AK-74 SD</Italian>
<Spanish>Calibre: 5.45x39mm SD &lt;br/&gt;Cargas: 30 &lt;br/&gt;Uso: AK-74 SD</Spanish>
<French>Calibre: 5.45x39mm SD &lt;br/&gt;Munitions: 30 &lt;br/&gt;Utilisé avec: AK-74 SD</French>
<Czech>Kalibr: 5.45x39mm SD &lt;br/&gt;Nábojů: 30 &lt;br/&gt;Pro: AK-74 SD</Czech>
<Russian>Патрон: 5.45x39мм &lt;br/&gt;Количество: 30 &lt;br/&gt;Используется в: AK-74 SD</Russian>
<Polish>Kaliber: 5.45x39mm SD &lt;br/&gt;Naboje: 30 &lt;br/&gt;Używane w: AK-74 SD</Polish>
<Hungarian>Kaliber: 5.45x39mm SD &lt;br/&gt; Töltények: 30 &lt;br/&gt; Hozzá tartozó fegyver: AK-74 SD</Hungarian>
</Key>
<Key ID="STR_DZ_MAG_75RND_RPK74_DESC">
<German>Kaliber: 5,45x39mm &lt;br/&gt;Patronen: 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>
<Spanish>Calibre: 5,45x39 mm &lt;br/&gt;Cargas: 75 &lt;br/&gt;Uso: AK-74, AK-74 Kobra, AKS-74U, AK-107 y RPK-74</Spanish>
<French>Calibre: 5.45x39 mm &lt;br/&gt;Munitions: 75 &lt;br/&gt;Utilisé avec: AK-74, AK-74 Kobra, AKS-74U, AK-107 et RPK-74</French>
<Czech>Kalibr: 5,45x39mm &lt;br/&gt;Nábojů: 75 &lt;br/&gt;Pro: AK-74, AK-74 Kobra, AKS-74U, AK-107 a RPK-74</Czech>
<Russian>Патрон: 5.45x39 мм &lt;br/&gt;Количество: 75 &lt;br/&gt;Используется в: АК-74, АКС-74, АКС-74У, АК-107, РПК-74</Russian>
<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>
<German>Kaliber: 5.45x39mm &lt;br/&gt;Patronen: 75 &lt;br/&gt;Eingesetzt in: AK-74, AK-107 und RPK-74</German>
<English>Caliber: 5.45x39mm &lt;br/&gt;Rounds: 75 &lt;br/&gt;Used in: AK-74, AK-107 and RPK-74</English>
<Italian>Calibro: 5.45x39mm &lt;br/&gt;Munizioni: 75 &lt;br/&gt;Si usa in: AK-74, AK-107 e RPK-74</Italian>
<Spanish>Calibre: 5.45x39mm &lt;br/&gt;Cargas: 75 &lt;br/&gt;Uso: AK-74, AK-107 y RPK-74</Spanish>
<French>Calibre: 5.45x39mm &lt;br/&gt;Munitions: 75 &lt;br/&gt;Utilisé avec: AK-74, AK-107 et RPK-74</French>
<Czech>Kalibr: 5.45x39mm &lt;br/&gt;Nábojů: 75 &lt;br/&gt;Pro: AK-74, AK-107 a RPK-74</Czech>
<Russian>Патрон: 5.45x39мм &lt;br/&gt;Количество: 75 &lt;br/&gt;Используется в: АК-74, АК-107, РПК-74</Russian>
<Polish>Kaliber: 5.45x39mm &lt;br/&gt;Naboje: 75 &lt;br/&gt;Używane w: AK-74, 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-107 and RPK-74</Hungarian>
</Key>
<Key ID="STR_DZ_MAG_100RND_556x45_BetaCMag_NAME">
<English>100Rnd. Beta C-Mag</English>
@@ -13328,15 +13339,26 @@
</Key>
<Key ID="STR_DZ_MAG_20RND_MK17_DESC">
<English>Caliber: 7.62x51mm NATO&lt;br/&gt;Rounds: 20&lt;br/&gt;Used in: MK17, M110, CZ 805B</English>
<French>Calibre: 7,62 x 51 mm OTAN&lt;br/&gt;Munitions : 20&lt;br/&gt;Utilisé avec: MK17, M110, CZ 805B</French>
<French>Calibre: 7.62x51mm OTAN&lt;br/&gt;Munitions : 20&lt;br/&gt;Utilisé avec: MK17, M110, CZ 805B</French>
<Spanish>Calibre: 7.62x51mm OTAN&lt;br/&gt;Cartuchos: 20&lt;br/&gt;Usado en: MK17, M110, CZ 805B</Spanish>
<Italian>Calibro: 7,62x51 mm NATO&lt;br/&gt;Munizioni: 20&lt;br/&gt;Usato in: MK17, M110, CZ 805B</Italian>
<Polish>Kaliber: 7,62x51 mm NATO&lt;br/&gt;Naboje: 20&lt;br/&gt;Uzywany w: MK17, M110, CZ 805B</Polish>
<Italian>Calibro: 7.62x51mm NATO&lt;br/&gt;Munizioni: 20&lt;br/&gt;Usato in: MK17, M110, CZ 805B</Italian>
<Polish>Kaliber: 7.62x51mm NATO&lt;br/&gt;Naboje: 20&lt;br/&gt;Uzywany w: MK17, M110, CZ 805B</Polish>
<Russian>Патрон: 7.62x51мм НАТО&lt;br/&gt;Количество: 20&lt;br/&gt;Исп. в: MK17, M110, CZ 805B</Russian>
<German>Kaliber: 7,62x51mm NATO&lt;br/&gt;Patronen: 20&lt;br/&gt;Eingesetzt in: MK17, M110, CZ 805B</German>
<German>Kaliber: 7.62x51mm NATO&lt;br/&gt;Patronen: 20&lt;br/&gt;Eingesetzt in: MK17, M110, CZ 805B</German>
<Czech>Kalibr: 7.62x51mm NATO&lt;br/&gt;Nábojů: 20&lt;br/&gt;Pro: MK17, M110, CZ 805B</Czech>
<Hungarian>Kaliber: 7.62x51mm NATO &lt;br/&gt; Töltények: 20 &lt;br/&gt; Hozzá tartozó fegyver: MK17, M110, CZ 805B</Hungarian>
</Key>
<Key ID="STR_DZ_MAG_20RND_MK17SD_DESC">
<English>Caliber: 7.62x51mm NATO SD &lt;br/&gt;Rounds: 20&lt;br/&gt;Used in: MK17 SD</English>
<French>Calibre: 7.62x51mm OTAN SD &lt;br/&gt;Munitions : 20&lt;br/&gt;Utilisé avec: MK17 SD</French>
<Spanish>Calibre: 7.62x51mm OTAN&lt;br/&gt;Cartuchos: 20&lt;br/&gt;Usado en: MK17 SD</Spanish>
<Italian>Calibro: 7.62x51mm NATO SD &lt;br/&gt;Munizioni: 20&lt;br/&gt;Usato in: MK17 SD</Italian>
<Polish>Kaliber: 7.62x51mm NATO SD &lt;br/&gt;Naboje: 20&lt;br/&gt;Uzywany w: MK17 SD</Polish>
<Russian>Патрон: 7.62x51мм НАТО SD &lt;br/&gt;Количество: 20&lt;br/&gt;Исп. в: MK17 SD</Russian>
<German>Kaliber: 7.62x51mm NATO SD &lt;br/&gt;Patronen: 20&lt;br/&gt;Eingesetzt in: MK17 SD</German>
<Czech>Kalibr: 7.62x51mm NATO SD &lt;br/&gt;Nábojů: 20&lt;br/&gt;Pro: MK17 SD</Czech>
<Hungarian>Kaliber: 7.62x51mm NATO &lt;br/&gt; Töltények: 20 &lt;br/&gt; Hozzá tartozó fegyver: MK17 SD</Hungarian>
</Key>
<Key ID="STR_DZ_MAG_40RND_MP7_NAME">
<English>40Rnd. MP7 mag.</English>
<Russian>40п. MP7 маг.</Russian>