From b46927015c454b8eb6c4cb7899eb236db5c6f2a5 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Fri, 24 May 2019 00:41:01 +0200 Subject: [PATCH 1/3] Change descriptionShort of legacy Zafir mags --- addons/jam/CfgMagazines.hpp | 14 ++++++++++++++ addons/jam/config.cpp | 1 + addons/jam/stringtable.xml | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 addons/jam/CfgMagazines.hpp diff --git a/addons/jam/CfgMagazines.hpp b/addons/jam/CfgMagazines.hpp new file mode 100644 index 000000000..24bf6b838 --- /dev/null +++ b/addons/jam/CfgMagazines.hpp @@ -0,0 +1,14 @@ +class CfgMagazines { + class CA_Magazine; + class 150Rnd_762x51_Box: CA_Magazine { + descriptionShort = "$STR_CBA_JAM_150rnd_762x51_box_description"; + }; + + class 150Rnd_762x51_Box_Tracer: 150Rnd_762x51_Box { + descriptionShort = "$STR_CBA_JAM_150rnd_762x51_box_tracer_description"; + }; + + class 150Rnd_762x54_Box: 150Rnd_762x51_Box { + descriptionShort = "$STR_A3_CfgMagazines_150Rnd_762x51_Box_Tracer1"; // Was inherited from 150Rnd_762x51_Box in vanilla + }; +}; diff --git a/addons/jam/config.cpp b/addons/jam/config.cpp index 4a8602068..beb25a618 100644 --- a/addons/jam/config.cpp +++ b/addons/jam/config.cpp @@ -16,5 +16,6 @@ class CfgPatches { }; }; +#include "CfgMagazines.hpp" #include "CfgMagazineWells.hpp" #include "CfgWeapons.hpp" diff --git a/addons/jam/stringtable.xml b/addons/jam/stringtable.xml index 595f74d3e..d147cf259 100644 --- a/addons/jam/stringtable.xml +++ b/addons/jam/stringtable.xml @@ -9,5 +9,39 @@ Community Base Addons - Birleştirilmiş Cephane Şarjörleri Community Base Addons - 統合的弾倉 + + Caliber: 7.62x51 mm Tracer - Green<br/>Rounds: 150 + 口徑：7.62x51 mm 曳光彈－綠<br/>個數：150 + Calibre : 7,62x51 mm traçant - Vert<br/>Munitions : 150 + Calibre: 7,62x51 mm trazadora (verde)<br/>Cargas: 150 + Calibro: tracciante 7,62x51 mm - verde<br />Munizioni: 150 + Kaliber: 7,62x51 mm smugowy - zielony<br/>Pociski: 150 + Калибр: 7,62x51 мм Трассер - зеленый<br/>Количество патронов: 150 + Kaliber: 7,62x51 mm Leuchtspur - grün<br/>Patronen: 150 + Ráže: 7.62x51 mm stopovky - zelené<br/>Munice: 150 + Caliber: 7.62x51 mm Tracer - Green<br/>Rounds: 150 + Calibre: Traçante 7,62 x 51 mm – Verde<br/>Balas: 150r + 구경: 7.62x51mm 예광탄 - 녹색<br />탄 수: 150 + 口径：7.62x51 毫米曳光弹 - 绿色<br/>容弹量：150 + 口径：7.62x51 mm トレーサー - 緑<br/>弾薬：150 + Kalibre: 7.62x51 mm İzli - Yeşil<br/>Mermi: 150 + + + Caliber: 7.62x51 mm<br/>Rounds: 150 + 口徑：7.62x51 mm<br/>個數：150<br />用於：Zafir + Calibre : 7,62x51 mm<br/>Munitions : 150 + Calibre: 7,62x51 mm<br/>Cargas: 150 + Calibro: 7,62x51 mm<br/>Munizioni: 150 + Kaliber: 7,62x51 mm<br/>Pociski: 150 + Калибр: 7,62x51 мм<br/>Количество патронов: 150 + Kaliber: 7,62x51 mm<br/>Patronen: 150 + Ráže: 7.62x51 mm<br/>Munice: 150 + Caliber: 7.62x51 mm<br/>Rounds: 150 + Calibre: 7,62 x 51 mm<br/>Balas: 150r + 구경: 7.62x51mm<br />탄 수: 150 + 口径：7.62x51 毫米<br/>容弹量：150 + 口径：7.62x51 mm<br/>弾薬：150 + Kalibre: 7.62x51 mm<br/>Mermi: 150 + From b34c448e693b07381f76489ba53f605696df2e24 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Fri, 24 May 2019 10:22:45 +0200 Subject: [PATCH 2/3] Remove reference to Zafir in Chinese Co-Authored-By: commy2 --- addons/jam/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/jam/stringtable.xml b/addons/jam/stringtable.xml index d147cf259..2fac4385e 100644 --- a/addons/jam/stringtable.xml +++ b/addons/jam/stringtable.xml @@ -28,7 +28,7 @@ Caliber: 7.62x51 mm<br/>Rounds: 150 - 口徑：7.62x51 mm<br/>個數：150<br />用於：Zafir + 口徑：7.62x51 mm<br/>個數：150 Calibre : 7,62x51 mm<br/>Munitions : 150 Calibre: 7,62x51 mm<br/>Cargas: 150 Calibro: 7,62x51 mm<br/>Munizioni: 150 From 0bb352de71e7b57dffe55607408ee9bf0adf09f5 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Fri, 24 May 2019 10:24:41 +0200 Subject: [PATCH 3/3] Remove "original" entries, move english to top --- addons/jam/stringtable.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/jam/stringtable.xml b/addons/jam/stringtable.xml index 2fac4385e..c95e7fabb 100644 --- a/addons/jam/stringtable.xml +++ b/addons/jam/stringtable.xml @@ -10,7 +10,7 @@ Community Base Addons - 統合的弾倉 - Caliber: 7.62x51 mm Tracer - Green<br/>Rounds: 150 + Caliber: 7.62x51 mm Tracer - Green<br/>Rounds: 150 口徑：7.62x51 mm 曳光彈－綠<br/>個數：150 Calibre : 7,62x51 mm traçant - Vert<br/>Munitions : 150 Calibre: 7,62x51 mm trazadora (verde)<br/>Cargas: 150 @@ -19,7 +19,6 @@ Калибр: 7,62x51 мм Трассер - зеленый<br/>Количество патронов: 150 Kaliber: 7,62x51 mm Leuchtspur - grün<br/>Patronen: 150 Ráže: 7.62x51 mm stopovky - zelené<br/>Munice: 150 - Caliber: 7.62x51 mm Tracer - Green<br/>Rounds: 150 Calibre: Traçante 7,62 x 51 mm – Verde<br/>Balas: 150r 구경: 7.62x51mm 예광탄 - 녹색<br />탄 수: 150 口径：7.62x51 毫米曳光弹 - 绿色<br/>容弹量：150 @@ -27,7 +26,7 @@ Kalibre: 7.62x51 mm İzli - Yeşil<br/>Mermi: 150 - Caliber: 7.62x51 mm<br/>Rounds: 150 + Caliber: 7.62x51 mm<br/>Rounds: 150 口徑：7.62x51 mm<br/>個數：150 Calibre : 7,62x51 mm<br/>Munitions : 150 Calibre: 7,62x51 mm<br/>Cargas: 150 @@ -36,7 +35,6 @@ Калибр: 7,62x51 мм<br/>Количество патронов: 150 Kaliber: 7,62x51 mm<br/>Patronen: 150 Ráže: 7.62x51 mm<br/>Munice: 150 - Caliber: 7.62x51 mm<br/>Rounds: 150 Calibre: 7,62 x 51 mm<br/>Balas: 150r 구경: 7.62x51mm<br />탄 수: 150 口径：7.62x51 毫米<br/>容弹量：150