diff --git a/AUTHORS.txt b/AUTHORS.txt index 4038d565e63..3cf263bb2a4 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -178,6 +178,7 @@ SzwedzikPL Tachi tbeswick96 Tessa Elieff +ThomasAngel Timi007 Toaster Tonic diff --git a/addons/compat_aegis/compat_aegis_realisticnames/CfgWeapons.hpp b/addons/compat_aegis/compat_aegis_realisticnames/CfgWeapons.hpp new file mode 100644 index 00000000000..56e58f11f37 --- /dev/null +++ b/addons/compat_aegis/compat_aegis_realisticnames/CfgWeapons.hpp @@ -0,0 +1,139 @@ +class CfgWeapons { + class arifle_CTAR_base_F; + class Aegis_arifle_CTAR_tan_f: arifle_CTAR_base_F { + displayName = SUBCSTRING(Aegis_arifle_CTAR_tan_f); + }; + + class arifle_CTAR_GL_base_F; + class Aegis_arifle_CTAR_GL_tan_f: arifle_CTAR_GL_base_F { + displayName = SUBCSTRING(Aegis_arifle_CTAR_GL_tan_f); + }; + + class arifle_CTARS_base_F; + class Aegis_arifle_CTARS_tan_f: arifle_CTARS_base_F { + displayName = SUBCSTRING(Aegis_arifle_CTARS_tan_f); + }; + + class LMG_03_base_F; + class LMG_03_snd_F: LMG_03_base_F { + displayName = SUBCSTRING(LMG_03_snd_F); + }; + class LMG_03_khk_F: LMG_03_base_F { + displayName = SUBCSTRING(LMG_03_khk_F); + }; + + class LMG_Mk200_F; + class LMG_Mk200_khk_F: LMG_Mk200_F { + displayName = SUBCSTRING(LMG_Mk200_khk_F); + }; + class LMG_Mk200_plain_F: LMG_Mk200_F { + displayName = SUBCSTRING(LMG_Mk200_plain_F); + }; + + class srifle_DMR_02_F; + class srifle_DMR_02_tna_F: srifle_DMR_02_F { + displayName = SUBCSTRING(srifle_DMR_02_tna_F); + }; + + class srifle_DMR_05_blk_F; + class srifle_DMR_05_ghex_F: srifle_DMR_05_blk_F { + displayName = SUBCSTRING(srifle_DMR_05_ghex_F); + }; + + class srifle_DMR_06_camo_F; + class srifle_DMR_06_black_F: srifle_DMR_06_camo_F { + displayName = SUBCSTRING(srifle_DMR_06_black_F); + }; + + class srifle_EBR_F; + class srifle_EBR_blk_F: srifle_EBR_F { + displayName = SUBCSTRING(srifle_EBR_blk_F); + }; + class srifle_EBR_khk_F: srifle_EBR_F { + displayName = SUBCSTRING(srifle_EBR_khk_F); + }; + + class arifle_Mk20_plain_F; + class arifle_Mk20_black_F: arifle_Mk20_plain_F { + displayName = SUBCSTRING(arifle_Mk20_black_F); + }; + class arifle_Mk20_hex_F: arifle_Mk20_plain_F { + displayName = SUBCSTRING(arifle_Mk20_hex_F); + }; + + class arifle_Mk20C_plain_F; + class arifle_Mk20C_black_F: arifle_Mk20C_plain_F { + displayName = SUBCSTRING(arifle_Mk20C_black_F); + }; + class arifle_Mk20C_hex_F: arifle_Mk20C_plain_F { + displayName = SUBCSTRING(arifle_Mk20C_hex_F); + }; + + class arifle_Mk20_GL_plain_F; + class arifle_Mk20_GL_black_F: arifle_Mk20_GL_plain_F { + displayName = SUBCSTRING(arifle_Mk20_GL_black_F); + }; + class arifle_Mk20_GL_hex_F: arifle_Mk20_GL_plain_F { + displayName = SUBCSTRING(arifle_Mk20_GL_hex_F); + }; + + class MMG_01_hex_F; + class MMG_01_black_F: MMG_01_hex_F { + displayName = SUBCSTRING(MMG_01_black_F); + }; + class MMG_01_ghex_F: MMG_01_hex_F { + displayName = SUBCSTRING(MMG_01_ghex_F); + }; + + class srifle_DMR_01_F; + class srifle_DMR_01_black_F: srifle_DMR_01_F { + displayName = SUBCSTRING(srifle_DMR_01_black_F); + }; + + class Aegis_arifle_SPAR_02_Inf_base_F; + class Aegis_arifle_SPAR_02_inf_blk_F: Aegis_arifle_SPAR_02_Inf_base_F { + displayName = ECSTRING(realisticnames,arifle_SPAR_02_blk); + }; + class Aegis_arifle_SPAR_02_inf_khk_F: Aegis_arifle_SPAR_02_Inf_base_F { + displayName = ECSTRING(realisticnames,arifle_SPAR_02_khk); + }; + class Aegis_arifle_SPAR_02_inf_snd_F: Aegis_arifle_SPAR_02_Inf_base_F { + displayName = ECSTRING(realisticnames,arifle_SPAR_02_snd); + }; + + class MMG_02_black_F; + class MMG_02_khaki_F: MMG_02_black_F { + displayName = SUBCSTRING(MMG_02_khaki_F); + }; + + class arifle_TRG21_F; + class arifle_TRG21_black_F: arifle_TRG21_F { + displayName = SUBCSTRING(arifle_TRG21_black_F); + }; + + class arifle_TRG20_F; + class arifle_TRG20_black_F: arifle_TRG20_F { + displayName = SUBCSTRING(arifle_TRG20_black_F); + }; + + class arifle_TRG21_GL_F; + class arifle_TRG21_GL_black_F: arifle_TRG21_GL_F { + displayName = SUBCSTRING(arifle_TRG21_GL_black_F); + }; + + class SMG_01_F; + class SMG_01_black_F: SMG_01_F { + displayName = SUBCSTRING(SMG_01_black_F); + }; + class SMG_01_khk_F: SMG_01_F { + displayName = SUBCSTRING(SMG_01_khk_F); + }; + + class LMG_Zafir_F; + class LMG_Zafir_black_F: LMG_Zafir_F { + displayName = SUBCSTRING(LMG_Zafir_black_F); + }; + class LMG_Zafir_ghex_F: LMG_Zafir_F { + displayName = SUBCSTRING(LMG_Zafir_ghex_F); + }; +}; diff --git a/addons/compat_aegis/compat_aegis_realisticnames/config.cpp b/addons/compat_aegis/compat_aegis_realisticnames/config.cpp index add9f50a3a4..427b43ef56d 100644 --- a/addons/compat_aegis/compat_aegis_realisticnames/config.cpp +++ b/addons/compat_aegis/compat_aegis_realisticnames/config.cpp @@ -10,6 +10,10 @@ class CfgPatches { "A3_Aegis_Armor_F_Aegis_APC_Wheeled_01", "A3_Aegis_Armor_F_Aegis_APC_Tracked_02", "A3_Aegis_Armor_F_Aegis_APC_Tracked_03", + "A3_Aegis_Weapons_F_Aegis", + "A3_Aegis_Weapons_F_Aegis_Rifles_CTAR", + "A3_Aegis_Weapons_F_Aegis_Machineguns_LMG_03", + "A3_Aegis_Weapons_F_Aegis_Rifles_SPAR_02", "ace_realisticnames" }; skipWhenMissingDependencies = 1; @@ -24,3 +28,4 @@ class CfgPatches { }; #include "CfgVehicles.hpp" +#include "CfgWeapons.hpp" diff --git a/addons/compat_aegis/compat_aegis_realisticnames/stringtable.xml b/addons/compat_aegis/compat_aegis_realisticnames/stringtable.xml index 6d7dfa47a12..f507df18f24 100644 --- a/addons/compat_aegis/compat_aegis_realisticnames/stringtable.xml +++ b/addons/compat_aegis/compat_aegis_realisticnames/stringtable.xml @@ -33,5 +33,496 @@ BM-2T "潜行者"（医疗） BM-2T Stalker (Sıhhiye) + + QBZ-95-1 (Sand) + QBZ-95-1 (Písková) + QBZ-95-1 (Sable) + QBZ-95-1 (Arena) + QBZ-95-1 (Песочный) + QBZ-95-1 (Piaskowy) + QBZ-95-1 (Sandfarben) + QBZ-95-1 (Sabbia) + QBZ-95-1 (Homok) + QBZ-95-1 (Deserto) + QBZ-95-1 (サンド) + QBZ-95-1 (모래) + QBZ-95-1式自動步槍 (沙色) + 95-1式自动步枪（沙色） + QBZ-95-1 (Kum) + + + QBZ-95-1 GL (Sand) + QBZ-95-1 GL (Písková) + QBZ-95-1 GL (Sable) + QBZ-95-1 GL (Arena) + QBZ-95-1 GL (Песочный) + QBZ-95-1 GL (Piaskowy) + QBZ-95-1 GL (Sandfarben) + QBZ-95-1 GL (Sabbia) + QBZ-95-1 GL (Homok) + QBZ-95-1 GL (Deserto) + QBZ-95-1 GL (サンド) + QBZ-95-1 GL (모래) + QBZ-95-1榴弹发射器 (沙色) + 95-1榴弹发射器（沙色） + QBZ-95-1 GL (Kum) + + + QBZ-95-1 LSW (Sand) + QBZ-95-1 LSW (Písková) + QBZ-95-1 LSW (Sable) + QBZ-95-1 LSW (Arena) + QBZ-95-1 LSW (Песочный) + QBZ-95-1 LSW (Piaskowy) + QBZ-95-1 LSW (Sandfarben) + QBZ-95-1 LSW (Sabbia) + QBZ-95-1 LSW (Homok) + QBZ-95-1 LSW (Deserto) + QBZ-95-1 LSW (サンド) + QBZ-95-1 LSW (모래) + QBZ-95-1式輕機槍 (沙色) + 95-1式班用机枪（沙色） + QBZ-95-1 LSW (Kum) + + + FN Minimi SPW (Khaki) + FN Minimi SPW (Khaki) + FN Minimi SPW (Caqui) + FN Minimi SPW (Khaki) + FN Minimi SPW (Khaki) + FN Minimi SPW (Kaki) + FN Minimi SPW (хаки) + FN Minimi SPW (Cáqui) + FN Minimi SPW (Khaki) + FN Minimi SPW (Cachi) + FN ミニミ SPW (カーキ) + FN 미니미 SPW (카키) + FN Minimi班用自動機槍（卡其） + FN Minimi 班用自动机枪（卡其色） + FN Minimi SPW (Haki) + + + FN Minimi SPW (Sand) + FN Minimi SPW (Sandfarben) + FN Minimi SPW (Arena) + FN Minimi SPW (Piaskowy) + FN Minimi SPW (Písková) + FN Minimi SPW (Sable) + FN Minimi SPW (Песочный) + FN Minimi SPW (Deserto) + FN Minimi SPW (Homok) + FN Minimi SPW (Sabbia) + FN ミニミ SPW (サンド) + FN 미니미 SPW (모래) + FN Minimi班用自動機槍 (沙色) + FN Minimi 班用自动机枪（沙色） + FN Minimi SPW (Kum) + + + Stoner 99 LMG (Khaki) + Stoner 99 LMG (Khaki) + Stoner 99 LMG (Caqui) + Stoner 99 LMG (Khaki) + Stoner 99 LMG (Khaki) + Stoner 99 LMG (Kaki) + Stoner 99 LMG (хаки) + Stoner 99 LMG (Cáqui) + Stoner 99 Könnyűgéppuska (Khaki) + Stoner 99 LMG (Cachi) + ストーナー99 LMG (カーキ) + 스토너 99 LMG (카키) + 斯通納99輕機槍（卡其） + 斯通纳99轻机枪（卡其色） + Stoner 99 LMG (Haki) + + + Stoner 99 LMG (Sand) + Stoner 99 LMG (Sandfarben) + Stoner 99 LMG (Arena) + Stoner 99 LMG (Piaskowy) + Stoner 99 LMG (Písková) + Stoner 99 LMG (Sable) + Stoner 99 LMG (Песочный) + Stoner 99 LMG (Deserto) + Stoner 99 Könnyűgéppuska (Homok) + Stoner 99 LMG (Sabbia) + ストーナー99 LMG (サンド) + 스토너 99 LMG (모래) + 斯通納99輕機槍 (沙色) + 斯通纳99轻机枪（沙色） + Stoner 99 LMG (Kum) + + + Noreen "Bad News" ULR (Tropic) + Noreen "Bad News" ULR (Tropisch) + Noreen "Bad News" ULR (Tropická kamufláž) + Noreen "Bad News" ULR (zwrotnik) + Noreen "Bad News" ULR (Tropique) + Noreen "Bad News" ULR (Tropikus) + Noreen "Bad News" ULR (Trópico) + Noreen "Bad News" ULR (тропик) + Noreen "Bad News" ULR (Trópico) + Noreen "Bad News" ULR (Tropico) + ノレーン "バッド ニュース" ULR (熱帯ジャングル迷彩) + 노린 "배드뉴스" ULR (열대) + 諾琳"壞消息"極距狙擊步槍 (熱帶迷彩) + 诺琳 "坏消息" 极距狙击步枪（热带迷彩） + Noreen "Bad News" ULR (Tropic) + + + Cyrus (Green Hex) + Cyrus (Zelený Hex) + Cyrus (Hex Vert) + Cyrus (Hex Verde) + Cyrus (зелёный гекс) + Cyrus (Hex Grün) + Cyrus (Zielony hex) + Cyrus (Hex Verde) + Cyrus (Zöld Hex) + Cyrus (Verde Hex) + サイラス (緑六角形迷彩) + 사이러스 (초록육각) + "居鲁士"狙擊步槍 (綠色數位蜂巢迷彩) + "居鲁士"（绿色蜂巢迷彩） + Cyrus (Yeşil Hex) + + + M14 (Black) + M14 (Černá) + M14 (Noir) + M14 (Negro) + M14 (чёрный) + M14 (czarny) + M14 (Schwarz) + M14 (Nero) + M14 (Fekete) + M14 (Preto) + M14 (ブラック) + M14 (검정) + M14 (黑色) + M14（黑色） + M14 (Siyah) + + + Mk14 Mod 1 EBR (Black) + Mk14 Mod 1 EBR (Schwarz) + Mk14 Mod 1 EBR (Černá) + Mk14 Mod 1 EBR (czarny) + Mk14 Mod 1 EBR (Noir) + Mk14 Mod 1 EBR (Fekete) + Mk14 Mod 1 EBR (Negro) + Mk14 Mod 1 EBR (чёрный) + Mk14 Mod 1 EBR (Preto) + Mk14 Mod 1 EBR (Nero) + Mk14 Mod 1 EBR (ブラック) + Mk.14 Mod 1 EBR (검정) + Mk14一型增強型戰鬥步槍 (黑色) + Mk14 Mod 1 EBR（黑色） + Mk14 Mod 1 EBR (Siyah) + + + Mk14 Mod 1 EBR (Khaki) + Mk14 Mod 1 EBR (Khaki) + Mk14 Mod 1 EBR (Khaki) + Mk14 Mod 1 EBR (Khaki) + Mk14 Mod 1 EBR (Kaki) + Mk14 Mod 1 EBR (Khaki) + Mk14 Mod 1 EBR (Caqui) + Mk14 Mod 1 EBR (хаки) + Mk14 Mod 1 EBR (Cáqui) + Mk14 Mod 1 EBR (Cachi) + Mk14 Mod 1 EBR (カーキ) + Mk.14 Mod 1 EBR (카키) + Mk14一型增強型戰鬥步槍（卡其） + Mk14 Mod 1 EBR（卡其色） + Mk14 Mod 1 EBR (Haki) + + + F2000 (Black) + F2000 (Schwarz) + F2000 (Černá) + F2000 (czarny) + F2000 (Noir) + F2000 (Fekete) + F2000 (Negro) + F2000 (чёрный) + F2000 (Preto) + F2000 (Nero) + F2000 (ブラック) + F2000 (검정) + F2000突擊步槍 (黑色) + F2000（黑色） + F2000 (Siyah) + + + F2000 (Hex) + F2000 (Hex) + F2000 (Hex) + F2000 (Hex) + F2000 (гекс) + F2000 (Hex) + F2000 (hex) + F2000 (Hex) + F2000 (Hex) + F2000 (Hex) + F2000 (六角形迷彩) + F2000 (육각) + F2000突擊步槍 (數位蜂巢迷彩) + F2000（蜂巢迷彩） + F2000 (Hex) + + + F2000 Tactical (Black) + F2000 Tactical (Schwarz) + F2000 Tactical (Černá) + F2000 Tactical (czarny) + F2000 Tactical (Noir) + F2000 Tactical (Fekete) + F2000 Tactical (Negro) + F2000 Tactical (чёрный) + F2000 Tactical (Preto) + F2000 Tactical (Nero) + F2000 タクティカル (ブラック) + F2000 택티컬 (검정) + F2000戰術型突擊步槍 (黑色) + F2000 战术型（黑色） + F2000 Tactical (Siyah) + + + F2000 Tactical (Hex) + F2000 Tactical (Hex) + F2000 Tactical (Hex) + F2000 Tactical (Hex) + F2000 Tactical (гекс) + F2000 Tactical (Hex) + F2000 Tactical (hex) + F2000 Tactical (Hex) + F2000 Tactical (Hex) + F2000 Tactical (Hex) + F2000 タクティカル (六角形迷彩) + F2000 택티컬 (육각) + F2000戰術型突擊步槍 (數位蜂巢迷彩) + F2000 战术型（蜂巢迷彩） + F2000 Tactical (Hex) + + + F2000 EGLM (Black) + F2000 EGLM (Schwarz) + F2000 EGLM (Černá) + F2000 EGLM (czarny) + F2000 EGLM (Noir) + F2000 EGLM (Fekete) + F2000 EGLM (Negro) + F2000 EGLM (чёрный) + F2000 EGLM (Preto) + F2000 EGLM (Nero) + F2000 EGLM (ブラック) + F2000 EGLM (검정) + F2000突擊步槍 (黑色) + F2000 EGLM（黑色） + F2000 EGLM (Siyah) + + + F2000 EGLM (Hex) + F2000 EGLM (Hex) + F2000 EGLM (Hex) + F2000 EGLM (Hex) + F2000 EGLM (гекс) + F2000 EGLM (Hex) + F2000 EGLM (hex) + F2000 EGLM (Hex) + F2000 EGLM (Hex) + F2000 EGLM (Hex) + F2000 EGLM (六角形迷彩) + F2000 EGLM (육각) + F2000突擊步槍 (數位蜂巢迷彩) + F2000 EGLM（蜂巢迷彩） + F2000 EGLM (Hex) + + + HK121 (Black) + HK121 (Schwarz) + HK121 (Černá) + HK121 (czarny) + HK121 (Noir) + HK121 (Fekete) + HK121 (Negro) + HK121 (чёрный) + HK121 (Preto) + HK121 (Nero) + HK121 (ブラック) + HK121 (검정) + HK121中型機槍 (黑色) + HK121（黑色） + HK121 (Siyah) + + + HK121 (Green Hex) + HK121中型機槍 (綠色數位蜂巢迷彩) + HK121（绿色蜂巢迷彩） + HK121 (緑六角形迷彩) + HK121 (Hex Verde) + HK121 (Zielony Hex) + HK121 (зелёный гекс) + HK121 (Verde Hex) + HK121 (Hex Verte) + HK121 (Zelený Hex) + HK121 (Yeşil Hex) + HK121 (Verde Hex) + HK121 (Hex Grün) + HK121 (초록육각) + + + VS-121 (Black) + VS-121 (Schwarz) + VS-121 (Černá) + VS-121 (czarny) + VS-121 (Noir) + VS-121 (Fekete) + VS-121 (Negro) + VS-121 (чёрный) + VS-121 (Preto) + VS-121 (Nero) + VS-121 (ブラック) + VS-121 (검정) + VS-121狙擊步槍 (黑色) + VS-121（黑色） + VS-121 (Siyah) + + + LWMMG (Khaki) + LWMMG (Khaki) + LWMMG (Khaki) + LWMMG (Khaki) + LWMMG (Kaki) + LWMMG (Khaki) + LWMMG (Caqui) + LWMMG (хаки) + LWMMG (Cáqui) + LWMMG (Cachi) + LWMMG (カーキ) + LWMMG (카키) + 輕量化中型機槍（卡其） + LWMMG（卡其色） + LWMMG (Haki) + + + TAR-21 (Black) + TAR-21 (Schwarz) + TAR-21 (Černá) + TAR-21 (czarny) + TAR-21 (Noir) + TAR-21 (Fekete) + TAR-21 (Negro) + TAR-21 (чёрный) + TAR-21 (Preto) + TAR-21 (Nero) + TAR-21 (ブラック) + TAR-21 (검정) + TAR-21突擊步槍 (黑色) + TAR-21（黑色） + TAR-21 (Siyah) + + + CTAR-21 (Black) + CTAR-21 (Schwarz) + CTAR-21 (Černá) + CTAR-21 (czarny) + CTAR-21 (Noir) + CTAR-21 (Fekete) + CTAR-21 (Negro) + CTAR-21 (чёрный) + CTAR-21 (Preto) + CTAR-21 (Nero) + CTAR-21 (ブラック) + CTAR-21 (검정) + CTAR-21突擊步槍 (黑色) + CTAR-21（黑色） + CTAR-21 (Siyah) + + + GTAR-21 EGLM (Black) + GTAR-21 EGLM (Schwarz) + GTAR-21 EGLM (Černá) + GTAR-21 EGLM (czarny) + GTAR-21 EGLM (Noir) + GTAR-21 EGLM (Fekete) + GTAR-21 EGLM (Negro) + GTAR-21 EGLM (чёрный) + GTAR-21 EGLM (Preto) + GTAR-21 EGLM (Nero) + GTAR-21 EGLM (ブラック) + GTAR-21 EGLM (검정) + GTAR-21突擊步槍 (黑色) + GTAR-21 EGLM（黑色） + GTAR-21 EGLM (Siyah) + + + Vector SMG (Black) + Vector SMG (Schwarz) + Vector SMG (Černá) + Vector SMG (czarny) + Vector SMG (Noir) + Vector SMG (Fekete) + Vector SMG (Negro) + Vector SMG (чёрный) + Vector SMG (Preto) + Vector SMG (Nero) + ベクター SMG (ブラック) + 벡터 SMG (검정) + "維克特"衝鋒槍 (黑色) + Vector 冲锋枪（黑色） + Vector SMG (Siyah) + + + Vector SMG (Khaki) + Vector SMG (Khaki) + Vector SMG (Khaki) + Vector SMG (Khaki) + Vector SMG (Kaki) + Vector SMG (Khaki) + Vector SMG (Caqui) + Vector SMG (хаки) + Vector SMG (Cáqui) + Vector SMG (Cachi) + ベクター SMG (カーキ) + 벡터 SMG (카키) + "維克特"衝鋒槍（卡其） + Vector 冲锋枪（卡其色） + Vector SMG (Haki) + + + Negev NG7 (Black) + Negev NG7 (Schwarz) + Negev NG7 (Černá) + Negev NG7 (czarny) + Negev NG7 (Noir) + Negev NG7 (Fekete) + Negev NG7 (Negro) + Negev NG7 (чёрный) + Negev NG7 (Preto) + Negev NG7 (Nero) + ネゲフ NG7 (ブラック) + 네게브 NG7 (검정) + 內蓋夫NG7機槍 (黑色) + 内格夫 NG7（黑色） + Negev NG7 (Siyah) + + + Negev NG7 (Green Hex) + 內蓋夫NG7機槍 (綠色數位蜂巢迷彩) + 内格夫 NG7（绿色蜂巢迷彩） + ネゲフ NG7 (緑六角形迷彩) + Negev NG7 (Hex Verde) + Negev NG7 (Zielony Hex) + Negev NG7 (зелёный гекс) + Negev NG7 (Verde Hex) + Negev NG7 (Hex Verte) + Negev NG7 (Zelený Hex) + Negev NG7 (Yeşil Hex) + Negev NG7 (Verde Hex) + Negev NG7 (Hex Grün) + 네게브 NG7 (초록육각) +