diff --git a/addons/smallarms/CfgMagazines.hpp b/addons/smallarms/CfgMagazines.hpp index ac55a86f6b..1f245b150d 100644 --- a/addons/smallarms/CfgMagazines.hpp +++ b/addons/smallarms/CfgMagazines.hpp @@ -4,107 +4,50 @@ class CfgMagazines { // Magazine updates: // 1. Update all magazines with tracer mix to use 1 in 5 mix. Full tracer mags should not be changed! // 2. Remove tracers at bottom of magazine. - // 3. Do string updates. // 6.5mm ////////////////////////////////////////// class 30Rnd_65x39_caseless_mag : CA_Magazine { // MX!! - displayname = "6.5mm 30Rnd Mag"; - displaynameshort = "6.5mm"; - tracersEvery = 0; lastRoundsTracer = 0; }; - class 30Rnd_65x39_caseless_mag_Tracer : 30Rnd_65x39_caseless_mag { // MX!! - displayname = "6.5mm 30Rnd Tracer Mag"; - displaynameshort = "6.5mm Tracer"; - }; - class 30Rnd_65x39_caseless_green : 30Rnd_65x39_caseless_mag { // Katiba!! - displayname = "6.5mm 30Rnd Mag"; - displaynameshort = "6.5mm"; - tracersEvery = 0; lastRoundsTracer = 0; }; - class 30Rnd_65x39_caseless_green_Tracer : 30Rnd_65x39_caseless_green { // Katiba!! - displayname = "6.5mm 30Rnd Tracer Magazine"; - displaynameshort = "6.5mm Tracer"; - }; - - class 100Rnd_65x39_caseless_mag : CA_Magazine { - displayname = "6.5mm 100Rnd Mag"; - displaynameshort = "6.5mm"; - + class 100Rnd_65x39_caseless_mag : CA_Magazine { // Katiba!! tracersEvery = 5; lastRoundsTracer = 3; }; - class 100Rnd_65x39_caseless_mag_Tracer : 100Rnd_65x39_caseless_mag { - displayname = "6.5mm 100Rnd Tracer Mag"; - displaynameshort = "6.5mm Tracer"; - }; - class 200Rnd_65x39_cased_Box : 100Rnd_65x39_caseless_mag { - displayname = "6.5mm 200Rnd Box"; - displaynameshort = "6.5mm"; - tracersEvery = 5; lastRoundsTracer = 3; }; - class 200Rnd_65x39_cased_Box_Tracer: 200Rnd_65x39_cased_Box { - displayname = "6.5mm 200Rnd Tracer Box"; - displaynameshort = "6.5mm Tracer"; - }; // 7.62mm ////////////////////////////////////////// - class 20Rnd_762x51_Mag: CA_Magazine { - displayname = "7.62mm 20Rnd Mag"; - displaynameshort = "7.62mm"; - }; - class 150Rnd_762x51_Box : CA_Magazine { - displayname = "7.62mm 150Rnd Box"; - tracersEvery = 5; lastRoundsTracer = 3; }; - class 150Rnd_762x51_Box_Tracer : 150Rnd_762x51_Box { - displayname = "7.62mm 150Rnd Tracer Box"; - }; - - // Anti-materiel /////////////////////////////// - - class 7Rnd_408_Mag: CA_Magazine { - displayname = ".408 7Rnd Mag"; - }; - - class 5Rnd_127x108_Mag: CA_Magazine { - displayname = "12.7mm 5Rnd Mag"; - }; - // SMG & Pistol //////////////////////////// class 30Rnd_9x21_Mag : CA_Magazine { - displayname = "9mm 30Rnd Mag"; - displaynameshort = "9mm"; - lastRoundsTracer = 0; }; class 16Rnd_9x21_Mag: 30Rnd_9x21_Mag { - displayname = "9mm 17Rnd Mag"; - displaynameshort = "9mm"; + displayname = CSTRING(17Rnd_9x19_Name); count = 17; }; class 30Rnd_45ACP_Mag_SMG_01 : 30Rnd_9x21_Mag { - displayname = ".45 25Rnd Mag"; + displayname = CSTRING(25Rnd_45_Name); displaynameshort = ".45"; picture = "\A3\weapons_f\data\ui\M_30Rnd_9x21_CA.paa"; @@ -115,14 +58,22 @@ class CfgMagazines { lastRoundsTracer = 0; }; + class 30Rnd_45ACP_Mag_SMG_01_Tracer_Green: 30Rnd_45ACP_Mag_SMG_01 { + displayname = CSTRING(25Rnd_45_Tracer_Green_Name); + }; + + class 30Rnd_45ACP_Mag_SMG_01_Tracer_Red: 30Rnd_45ACP_Mag_SMG_01 { + displayname = CSTRING(25Rnd_45_Tracer_Red_Name); + }; + + class 30Rnd_45ACP_Mag_SMG_01_Tracer_Yellow: 30Rnd_45ACP_Mag_SMG_01 { + displayname = CSTRING(25Rnd_45_Tracer_Yellow_Name); + }; + class 9Rnd_45ACP_Mag : 30Rnd_45ACP_Mag_SMG_01 { - displayname = ".45 8Rnd Mag"; + displayname = CSTRING(8Rnd_45_Name); displaynameshort = ".45"; count = 8; }; - - class 30Rnd_45ACP_Mag_SMG_01_Tracer_Green: 30Rnd_45ACP_Mag_SMG_01 { - displayname = ".45 25Rnd Tracer Mag"; - }; -}; \ No newline at end of file +}; diff --git a/addons/smallarms/stringtable.xml b/addons/smallarms/stringtable.xml new file mode 100644 index 0000000000..f6f78fe6cb --- /dev/null +++ b/addons/smallarms/stringtable.xml @@ -0,0 +1,66 @@ + + + + + 9 mm 17Rnd Mag + 9 mm 17 發彈匣 + Mag. 17 balles 9 mm + Cargador de 17 proyectiles de 9 mm + Caricatore 17 colpi 9 mm + 17-nab. mag. 9 mm + Магазин, 17 патр. 9 мм + 17-Schuss-9mm-Magazin + 9 mm, 17ks zásobník + Carregador 17Mun. 9 mm + 9mm 17발 탄창 + 9 毫米 17 发弹匣 + 9mm 17Rnd マガジン + 9 mm 17 Merm. Şarjör + + + .45 ACP 25Rnd Mag + 25-nab. mag. .45 ACP + Mag. 25 balles .45 ACP + Cargador de 25 proyectiles de .45 ACP + 25-Schuss-.45-ACP-Magazin + .45 ACP, 25ks zásobník + .45 ACP 25 Merm. Şarjör + + + .45 ACP 25Rnd Tracers (Green) Mag + 25-nab. mag. .45 ACP (zielony smugacz) + Mag. 25 traçantes (vertes) .45 ACP + Cargador de 25 balas trazadoras (verde) de .45 ACP + 25-Schuss-.45-ACP-Vermin-Magazin (Leuchtspur Grün) + .45 ACP, 25ks zásobník stopovky (zelené) + .45 ACP 25 Merm. İzli (Yeşil) Şarjör + + + .45 ACP 25Rnd Tracers (Red) Mag + 25-nab. mag. .45 ACP (czerwony smugacz) + Mag. 25 traçantes (rouges) .45 ACP + Cargador de 25 balas trazadoras (rojo) de .45 ACP + 25-Schuss-.45-ACP-Vermin-Magazin (Leuchtspur Rot) + .45 ACP, 25ks zásobník stopovky (červené) + .45 ACP 25 Merm. İzli (Kırmızı) Şarjör + + + .45 ACP 25Rnd Tracers (Yellow) Mag + 25-nab. mag. .45 ACP (żółty smugacz) + Mag. 25 traçantes (jaunes) .45 ACP + Cargador de 25 balas trazadoras (amarillo) de .45 ACP + 25-Schuss-.45-ACP-Vermin-Magazin (Nachlade-Leuchtspur Gelb) + .45 ACP, 25ks zásobník stopovky (žluté) + .45 ACP 25 Merm. İzli (Sarı) Şarjör + + + .45 ACP 8Rnd Mag + 8-nab. mag. .45 ACP + Mag. 8 balles .45 ACP + Cargador de 8 proyectiles de .45 ACP + 8-Schuss-.45-ACP-Magazin + .45 ACP, 8ks zásobník + .45 ACP 8 Merm. Şarjör + + +