From 1105073646aa25c936354060681cdeecf2ae3731 Mon Sep 17 00:00:00 2001 From: A Man Date: Wed, 11 Mar 2020 17:09:21 +0100 Subject: [PATCH] Add back short M249, update mag strings --- .../Configs/CfgLoot/Groups/Weapons.hpp | 3 +- .../Configs/CfgMagazines/Magazines/545x39.hpp | 1 + .../Configs/CfgMagazines/Magazines/762x51.hpp | 1 + .../CfgServerTrader/Category/Weapons.hpp | 1 + SQF/dayz_code/stringtable.xml | 110 +++++++++++------- 5 files changed, 71 insertions(+), 45 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index abd8912a2..154234830 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -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[] = diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp index 5dee5f2bb..7d122d5c6 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/545x39.hpp @@ -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 diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp index 20165df19..e8b117f93 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp @@ -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"; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index ba7522635..564462296 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -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"};}; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index a76d71331..5d515f4f6 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -13261,26 +13261,26 @@ Kaliber 12 Schrotmunition<br/>8<br/>Verwendet in: M1014, Remington 870 - Kaliber: 9x19 mm Parabellum <br/>Patronen: 30 <br/>Eingesetzt in: MP5, Scorpion Evo 3 - Caliber: 9x19 mm Parabellum <br/>Rounds: 30 <br/>Used in: MP5, Scorpion Evo 3 - Calibro: 9x19 mm Parabellum <br/>Munizioni: 30 <br/>Si usa in: MP5, Scorpion Evo 3 - Calibre: 9x19 mm Parabellum <br/>Cargas: 30 <br/>Uso: MP5, Scorpion Evo 3 - Calibre: 9x19 mm Parabellum <br/>Munitions: 30 <br/>Utilisé avec: MP5, Scorpion Evo 3 - Kalibr: 9x19 mm Parabellum <br/>Nábojů: 30 <br/>Pro: MP5, Scorpion Evo 3 SD - Патрон: 9x19 мм парабеллум <br/>Количество: 30 <br/>Используется в: MP5, Scorpion Evo 3 - Kaliber: 9x19 mm Parabellum <br/>Naboje: 30 <br/>Używane w: MP5, Scorpion Evo 3 - Kaliber: 9x19 mm Parabellum <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: MP5, Scorpion Evo 3 + Kaliber: 9x19mm Parabellum <br/>Patronen: 30 <br/>Eingesetzt in: MP5, Scorpion Evo 3 + Caliber: 9x19mm Parabellum <br/>Rounds: 30 <br/>Used in: MP5, Scorpion Evo 3 + Calibro: 9x19mm Parabellum <br/>Munizioni: 30 <br/>Si usa in: MP5, Scorpion Evo 3 + Calibre: 9x19mm Parabellum <br/>Cargas: 30 <br/>Uso: MP5, Scorpion Evo 3 + Calibre: 9x19mm Parabellum <br/>Munitions: 30 <br/>Utilisé avec: MP5, Scorpion Evo 3 + Kalibr: 9x19mm Parabellum <br/>Nábojů: 30 <br/>Pro: MP5, Scorpion Evo 3 SD + Патрон: 9x19мм парабеллум <br/>Количество: 30 <br/>Используется в: MP5, Scorpion Evo 3 + Kaliber: 9x19mm Parabellum <br/>Naboje: 30 <br/>Używane w: MP5, Scorpion Evo 3 + Kaliber: 9x19mm Parabellum <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: MP5, Scorpion Evo 3 - Kaliber: 9x19 mm Parabellum SD<br/>Patronen: 30 <br/>Eingesetzt in: MP5SD, Scorpion Evo 3 SD - Caliber: 9x19 mm Parabellum SD<br/>Rounds: 30 <br/>Used in: MP5SD, Scorpion Evo 3 SD - Calibro: 9x19 mm Parabellum SD<br/>Munizioni: 30 <br/>Si usa in: MP5SD, Scorpion Evo 3 SD - Calibre: 9x19 mm Parabellum SD<br/>Cargas: 30 <br/>Uso: MP5SD, Scorpion Evo 3 SD - Calibre: 9x19 mm Parabellum SD<br/>Munitions: 30 <br/>Utilisé avec: MP5SD, Scorpion Evo 3 SD - Kalibr: 9x19 mm Parabellum SD<br/>Nábojů: 30 <br/>Pro: MP5SD, Scorpion Evo 3 SD - Патрон: 9x19 мм парабеллум SD<br/>Количество: 30 <br/>Используется в: MP5SD, Scorpion Evo 3 SD - Kaliber: 9x19 mm Parabellum SD<br/>Naboje: 30 <br/>Używane w: MP5SD, Scorpion Evo 3 SD - Kaliber: 9x19 mm Parabellum SD<br/> Töltények: 30 <br/> Hozzá tartozó fegyver: MP5SD, Scorpion Evo 3 SD + Kaliber: 9x19mm Parabellum SD<br/>Patronen: 30 <br/>Eingesetzt in: MP5SD, Scorpion Evo 3 SD + Caliber: 9x19mm Parabellum SD<br/>Rounds: 30 <br/>Used in: MP5SD, Scorpion Evo 3 SD + Calibro: 9x19mm Parabellum SD<br/>Munizioni: 30 <br/>Si usa in: MP5SD, Scorpion Evo 3 SD + Calibre: 9x19mm Parabellum SD<br/>Cargas: 30 <br/>Uso: MP5SD, Scorpion Evo 3 SD + Calibre: 9x19mm Parabellum SD<br/>Munitions: 30 <br/>Utilisé avec: MP5SD, Scorpion Evo 3 SD + Kalibr: 9x19mm Parabellum SD<br/>Nábojů: 30 <br/>Pro: MP5SD, Scorpion Evo 3 SD + Патрон: 9x19мм парабеллум SD<br/>Количество: 30 <br/>Используется в: MP5SD, Scorpion Evo 3 SD + Kaliber: 9x19mm Parabellum SD<br/>Naboje: 30 <br/>Używane w: MP5SD, Scorpion Evo 3 SD + Kaliber: 9x19mm Parabellum SD<br/> Töltények: 30 <br/> Hozzá tartozó fegyver: MP5SD, Scorpion Evo 3 SD 60Rnd. Stanag Mag @@ -13290,27 +13290,38 @@ Caliber: 5.56x45mm <br/>Rounds: 60, duct-taped <br/>Used in: G36, M16, M4, M249, MK-12 and L110 Kaliber: 5.56x45mm <br/>Patronen: 60, zusammengeklebt <br/>Eingesetzt in: G36, M16, M4, M249, MK-12 und L110 - - Kaliber: 5,45x39mm <br/>Patronen: 30 <br/>Eingesetzt in: AK-74, AK-74 Kobra, AKS-74U, AK-107 und RPK-74 - Caliber: 5.45x39mm <br/>Rounds: 30 <br/>Used in: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74 - Calibro: 5,45x39 mm <br/>Munizioni: 30 <br/>Si usa in: AK-74, AK-74 Kobra, AKS-74U, AK-107 e RPK-74 - Calibre: 5,45x39 mm <br/>Cargas: 30 <br/>Uso: AK-74, AK-74 Kobra, AKS-74U, AK-107 y RPK-74 - Calibre: 5.45x39 mm <br/>Munitions: 30 <br/>Utilisé avec: AK-74, AK-74 Kobra, AKS-74U, AK-107 et RPK-74 - Kalibr: 5,45x39mm <br/>Nábojů: 30 <br/>Pro: AK-74, AK-74 Kobra, AKS-74U, AK-107 a RPK-74 - Патрон: 5.45x39 мм <br/>Количество: 30 <br/>Используется в: АК-74, АКС-74, АКС-74У, АК-107, РПК-74 - Kaliber: 5,45x39mm <br/>Naboje: 30 <br/>Używane w: AK-74, AK-74 Kobra, AKS-74U, AK-107 i RPK-74 - Kaliber: 5.45x39mm <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74 + + Kaliber: 5.45x39mm <br/>Patronen: 30 <br/>Eingesetzt in: AK-74, AK-107 und RPK-74 + Caliber: 5.45x39mm <br/>Rounds: 30 <br/>Used in: AK-74, AK-107 and RPK-74 + Calibro: 5.45x39mm <br/>Munizioni: 30 <br/>Si usa in: AK-74, AK-107 e RPK-74 + Calibre: 5.45x39mm <br/>Cargas: 30 <br/>Uso: AK-74, AK-107 y RPK-74 + Calibre: 5.45x39mm <br/>Munitions: 30 <br/>Utilisé avec: AK-74, AK-107 et RPK-74 + Kalibr: 5.45x39mm <br/>Nábojů: 30 <br/>Pro: AK-74, AK-107 a RPK-74 + Патрон: 5.45x39мм <br/>Количество: 30 <br/>Используется в: АК-74, АК-107, РПК-74 + Kaliber: 5.45x39mm <br/>Naboje: 30 <br/>Używane w: AK-74, AK-107 i RPK-74 + Kaliber: 5.45x39mm <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: AK-74, AK-107 and RPK-74 + + Kaliber: 5.45x39mm SD <br/>Patronen: 30 <br/>Eingesetzt in: AK-74 SD + Caliber: 5.45x39mm SD <br/>Rounds: 30 <br/>Used in: AK-74 SD + Calibro: 5.45x39mm SD <br/>Munizioni: 30 <br/>Si usa in: AK-74 SD + Calibre: 5.45x39mm SD <br/>Cargas: 30 <br/>Uso: AK-74 SD + Calibre: 5.45x39mm SD <br/>Munitions: 30 <br/>Utilisé avec: AK-74 SD + Kalibr: 5.45x39mm SD <br/>Nábojů: 30 <br/>Pro: AK-74 SD + Патрон: 5.45x39мм <br/>Количество: 30 <br/>Используется в: AK-74 SD + Kaliber: 5.45x39mm SD <br/>Naboje: 30 <br/>Używane w: AK-74 SD + Kaliber: 5.45x39mm SD <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: AK-74 SD + - Kaliber: 5,45x39mm <br/>Patronen: 75 <br/>Eingesetzt in: AK-74, AK-74 Kobra, AKS-74U, AK-107 und RPK-74 - Caliber: 5.45x39mm <br/>Rounds: 75 <br/>Used in: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74 - Calibro: 5,45x39 mm <br/>Munizioni: 75 <br/>Si usa in: AK-74, AK-74 Kobra, AKS-74U, AK-107 e RPK-74 - Calibre: 5,45x39 mm <br/>Cargas: 75 <br/>Uso: AK-74, AK-74 Kobra, AKS-74U, AK-107 y RPK-74 - Calibre: 5.45x39 mm <br/>Munitions: 75 <br/>Utilisé avec: AK-74, AK-74 Kobra, AKS-74U, AK-107 et RPK-74 - Kalibr: 5,45x39mm <br/>Nábojů: 75 <br/>Pro: AK-74, AK-74 Kobra, AKS-74U, AK-107 a RPK-74 - Патрон: 5.45x39 мм <br/>Количество: 75 <br/>Используется в: АК-74, АКС-74, АКС-74У, АК-107, РПК-74 - Kaliber: 5,45x39mm <br/>Naboje: 75 <br/>Używane w: AK-74, AK-74 Kobra, AKS-74U, AK-107 i RPK-74 - Kaliber: 5.45x39mm <br/> Töltények: 75 <br/> Hozzá tartozó fegyver: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74 + Kaliber: 5.45x39mm <br/>Patronen: 75 <br/>Eingesetzt in: AK-74, AK-107 und RPK-74 + Caliber: 5.45x39mm <br/>Rounds: 75 <br/>Used in: AK-74, AK-107 and RPK-74 + Calibro: 5.45x39mm <br/>Munizioni: 75 <br/>Si usa in: AK-74, AK-107 e RPK-74 + Calibre: 5.45x39mm <br/>Cargas: 75 <br/>Uso: AK-74, AK-107 y RPK-74 + Calibre: 5.45x39mm <br/>Munitions: 75 <br/>Utilisé avec: AK-74, AK-107 et RPK-74 + Kalibr: 5.45x39mm <br/>Nábojů: 75 <br/>Pro: AK-74, AK-107 a RPK-74 + Патрон: 5.45x39мм <br/>Количество: 75 <br/>Используется в: АК-74, АК-107, РПК-74 + Kaliber: 5.45x39mm <br/>Naboje: 75 <br/>Używane w: AK-74, AK-107 i RPK-74 + Kaliber: 5.45x39mm <br/> Töltények: 75 <br/> Hozzá tartozó fegyver: AK-74, AK-107 and RPK-74 100Rnd. Beta C-Mag @@ -13322,21 +13333,32 @@ Calibre: 5.56x45mm <br/>Cargas: 100 <br/>Uso: G36, MG36, M16, M4, M249, MK-12, M8 y L110 Calibre: 5.56x45mm <br/>Munitions: 100 <br/>Utilisé avec: G36, MG36, M16, M4, M249, MK-12, M8 et L110 Kalibr: 5.56x45mm <br/>Nábojů: 100 <br/>Pro: G36, MG36, M16, M4, M249, MK-12, M8 a L110 - Патрон: 5.56x45 мм <br/>Количество: 100 <br/>Используется в: G36, MG36, M16, M4, M249, MK-12, M8, L110 + Патрон: 5.56x45мм <br/>Количество: 100 <br/>Используется в: G36, MG36, M16, M4, M249, MK-12, M8, L110 Kaliber: 5.56x45mm <br/>Naboje: 100 <br/>Używane w: G36, MG36, M16, M4, M249, MK-12, M8 i L110 Kaliber: 5.56x45mm <br/> Töltények: 100 <br/> Hozzá tartozó fegyver: G36, MG36, M16, M4, M249, MK-12, M8 and L110 Caliber: 7.62x51mm NATO<br/>Rounds: 20<br/>Used in: MK17, M110, CZ 805B - Calibre: 7,62 x 51 mm OTAN<br/>Munitions : 20<br/>Utilisé avec: MK17, M110, CZ 805B - Calibre: 7.62x51 mm OTAN<br/>Cartuchos: 20<br/>Usado en: MK17, M110, CZ 805B - Calibro: 7,62x51 mm NATO<br/>Munizioni: 20<br/>Usato in: MK17, M110, CZ 805B - Kaliber: 7,62x51 mm NATO<br/>Naboje: 20<br/>Uzywany w: MK17, M110, CZ 805B - Патрон: 7.62x51 мм НАТО<br/>Количество: 20<br/>Исп. в: MK17, M110, CZ 805B - Kaliber: 7,62x51mm NATO<br/>Patronen: 20<br/>Eingesetzt in: MK17, M110, CZ 805B + Calibre: 7.62x51mm OTAN<br/>Munitions : 20<br/>Utilisé avec: MK17, M110, CZ 805B + Calibre: 7.62x51mm OTAN<br/>Cartuchos: 20<br/>Usado en: MK17, M110, CZ 805B + Calibro: 7.62x51mm NATO<br/>Munizioni: 20<br/>Usato in: MK17, M110, CZ 805B + Kaliber: 7.62x51mm NATO<br/>Naboje: 20<br/>Uzywany w: MK17, M110, CZ 805B + Патрон: 7.62x51мм НАТО<br/>Количество: 20<br/>Исп. в: MK17, M110, CZ 805B + Kaliber: 7.62x51mm NATO<br/>Patronen: 20<br/>Eingesetzt in: MK17, M110, CZ 805B Kalibr: 7.62x51mm NATO<br/>Nábojů: 20<br/>Pro: MK17, M110, CZ 805B Kaliber: 7.62x51mm NATO <br/> Töltények: 20 <br/> Hozzá tartozó fegyver: MK17, M110, CZ 805B + + Caliber: 7.62x51mm NATO SD <br/>Rounds: 20<br/>Used in: MK17 SD + Calibre: 7.62x51mm OTAN SD <br/>Munitions : 20<br/>Utilisé avec: MK17 SD + Calibre: 7.62x51mm OTAN<br/>Cartuchos: 20<br/>Usado en: MK17 SD + Calibro: 7.62x51mm NATO SD <br/>Munizioni: 20<br/>Usato in: MK17 SD + Kaliber: 7.62x51mm NATO SD <br/>Naboje: 20<br/>Uzywany w: MK17 SD + Патрон: 7.62x51мм НАТО SD <br/>Количество: 20<br/>Исп. в: MK17 SD + Kaliber: 7.62x51mm NATO SD <br/>Patronen: 20<br/>Eingesetzt in: MK17 SD + Kalibr: 7.62x51mm NATO SD <br/>Nábojů: 20<br/>Pro: MK17 SD + Kaliber: 7.62x51mm NATO <br/> Töltények: 20 <br/> Hozzá tartozó fegyver: MK17 SD + 40Rnd. MP7 mag. 40п. MP7 маг.