Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Realistic Names - Add Contact DLC & PIP optics #8413

Merged
merged 4 commits into from
Oct 7, 2021
Merged

Realistic Names - Add Contact DLC & PIP optics #8413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e061901
Add Contact DLC optics
LinkIsGrim Sep 1, 2021
f742696
add DMS variants
LinkIsGrim Sep 1, 2021
8ebd4f7
fix bracket, add pip optics
LinkIsGrim Sep 1, 2021
6100144
Merge branch 'master' into pr/8413
PabstMirror Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 81 additions & 42 deletions addons/realisticnames/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,10 @@ class CfgWeapons {
};

class launch_Vorona_base_F;
class launch_O_Vorona_brown_F : launch_Vorona_base_F {
class launch_O_Vorona_brown_F: launch_Vorona_base_F {
displayName = CSTRING(launch_Vorona_brown);
};
class launch_O_Vorona_green_F : launch_Vorona_base_F {
class launch_O_Vorona_green_F: launch_Vorona_base_F {
displayName = CSTRING(launch_Vorona_green);
};

Expand Down Expand Up @@ -433,7 +433,7 @@ class CfgWeapons {
class Missile_AGM_01_Plane_CAS_02_F: Missile_AGM_02_Plane_CAS_01_F {
displayName = "Kh-25MTP";
};
class missiles_Vorona : MissileLauncher {
class missiles_Vorona: MissileLauncher {
displayName = CSTRING(missiles_vorona);
};

Expand Down Expand Up @@ -524,8 +524,8 @@ class CfgWeapons {
};
};

class HMG_127_APC : HMG_127 {};
class ACE_HMG_127_KORD : HMG_127_APC {
class HMG_127_APC: HMG_127 {};
class ACE_HMG_127_KORD: HMG_127_APC {
displayName = "6P49 Kord";
};

Expand Down Expand Up @@ -572,7 +572,7 @@ class CfgWeapons {
displayName = "Mini-Spike";
};

class missiles_SAAMI : MissileLauncher {
class missiles_SAAMI: MissileLauncher {
displayName = "FIM-92F";
};

Expand Down Expand Up @@ -612,7 +612,7 @@ class CfgWeapons {
displayName = "2A46";
};

class cannon_125mm_advanced : cannon_125mm {
class cannon_125mm_advanced: cannon_125mm {
displayName = "2A82-1M";
};

Expand All @@ -633,7 +633,7 @@ class CfgWeapons {
class ACE_LMG_coax_ext_MG3: LMG_coax_ext {
displayName = "Rheinmetall MG3";
};
class ACE_LMG_coax_DenelMG4 : LMG_coax {
class ACE_LMG_coax_DenelMG4: LMG_coax {
displayName = "Denel MG4";
};

Expand Down Expand Up @@ -682,15 +682,15 @@ class CfgWeapons {
};
};

class autocannon_30mm_RCWS : autocannon_Base_F {
class autocannon_30mm_RCWS: autocannon_Base_F {
displayName = "2A42";
};

class cannon_20mm : autocannon_Base_F {
class AP : autocannon_Base_F {};
class HE : autocannon_Base_F {};
class cannon_20mm: autocannon_Base_F {
class AP: autocannon_Base_F {};
class HE: autocannon_Base_F {};
};
class ACE_cannon_20mm_Rh202 : cannon_20mm {
class ACE_cannon_20mm_Rh202: cannon_20mm {
displayName = "MK20 Rh 202";
class AP: AP {
displayName = "MK20 Rh 202";
Expand All @@ -708,51 +708,75 @@ class CfgWeapons {
displayName = "UTG Defender 126";
};

class optic_hamr : ItemCore {
class optic_hamr: ItemCore {
displayName = CSTRING(optic_hamr);
};
class optic_Hamr_khk_F : optic_hamr {
class optic_Hamr_khk_F: optic_hamr {
displayName = CSTRING(optic_hamr_khk);
};
class ACE_optic_Hamr_2D : optic_Hamr {
class ACE_optic_Hamr_2D: optic_Hamr {
displayName = CSTRING(optic_hamr_2d);
};
class ACE_optic_Hamr_PIP: ACE_optic_Hamr_2D {
displayName = CSTRING(optic_hamr_pip);
};

class optic_Arco : ItemCore {
class optic_Arco: ItemCore {
displayName = CSTRING(optic_arco);
};
class optic_Arco_blk_F : optic_Arco {
class optic_Arco_blk_F: optic_Arco {
displayName = CSTRING(optic_arco_blk);
};
class optic_Arco_ghex_F : optic_Arco {
class optic_Arco_ghex_F: optic_Arco {
displayName = CSTRING(optic_arco_ghex);
};
class ACE_optic_Arco_2D : optic_Arco {
class ACE_optic_Arco_2D: optic_Arco {
displayName = CSTRING(optic_arco_2d);
};
class ACE_optic_Arco_PIP: ACE_optic_Arco_2D {
displayName = CSTRING(optic_arco_pip);
};
class optic_Arco_lush_F: optic_Arco {
displayName = CSTRING(optic_arco_lush);
};
class optic_Arco_arid_F: optic_Arco {
displayName = CSTRING(optic_arco_arid);
};
class optic_Arco_AK_blk_F: optic_Arco_blk_F {
displayName = CSTRING(optic_arco_ak_blk);
};
class optic_Arco_AK_lush_F: optic_Arco_lush_F {
displayName = CSTRING(optic_arco_ak_lush);
};
class optic_Arco_AK_arid_F: optic_Arco_arid_F {
displayName = CSTRING(optic_arco_ak_arid);
};

class optic_ERCO_blk_f : optic_Arco {
class optic_ERCO_blk_f: optic_Arco {
displayName = CSTRING(optic_erco_blk);
};
class optic_ERCO_khk_f : optic_ERCO_blk_f {
class optic_ERCO_khk_f: optic_ERCO_blk_f {
displayName = CSTRING(optic_erco_khk);
};
class optic_ERCO_snd_f : optic_ERCO_blk_f {
class optic_ERCO_snd_f: optic_ERCO_blk_f {
displayName = CSTRING(optic_erco_snd);
};

class optic_LRPS : ItemCore {
class optic_LRPS: ItemCore {
displayName = CSTRING(optic_lrps);
};
class optic_LRPS_ghex_F : optic_LRPS {
class optic_LRPS_ghex_F: optic_LRPS {
displayName = CSTRING(optic_lrps_ghex);
};
class optic_LRPS_tna_F : optic_LRPS {
class optic_LRPS_tna_F: optic_LRPS {
displayName = CSTRING(optic_lrps_tna);
};
class ACE_optic_LRPS_2D : optic_LRPS {
class ACE_optic_LRPS_2D: optic_LRPS {
displayName = CSTRING(optic_lrps_2d);
};
class ACE_optic_LRPS_PIP: ACE_optic_LRPS_2D {
displayName = CSTRING(optic_lrps_pip);
};

class optic_AMS_base;
class optic_AMS: optic_AMS_base {
Expand All @@ -779,53 +803,68 @@ class CfgWeapons {
displayName = CSTRING(optic_khs_tan);
};

class optic_DMS : ItemCore {
class optic_DMS: ItemCore {
displayName = CSTRING(optic_dms);
};
class optic_DMS_ghex_F : optic_DMS {
class optic_DMS_ghex_F: optic_DMS {
displayName = CSTRING(optic_dms_ghex);
};
class optic_DMS_weathered_F: optic_DMS {
displayName = CSTRING(optic_dms_weathered);
};
class optic_DMS_weathered_Kir_F: optic_DMS_weathered_F {
displayName = CSTRING(optic_dms_weathered_kir);
};

class optic_holosight : ItemCore {
class optic_holosight: ItemCore {
displayName = CSTRING(optic_holosight);
};
class optic_Holosight_blk_F : optic_holosight {
class optic_Holosight_blk_F: optic_holosight {
displayName = CSTRING(optic_holosight_blk);
};
class optic_Holosight_khk_F : optic_holosight {
class optic_Holosight_khk_F: optic_holosight {
displayName = CSTRING(optic_holosight_khk);
};
class optic_Holosight_smg : ItemCore {
class optic_Holosight_lush_F: optic_holosight {
displayName = CSTRING(optic_holosight_lush);
};
class optic_Holosight_arid_F: optic_holosight {
displayName = CSTRING(optic_holosight_arid);
};
class optic_Holosight_smg: ItemCore {
displayName = CSTRING(optic_holosight_smg);
};
class optic_Holosight_smg_blk_F : optic_Holosight_smg {
class optic_Holosight_smg_blk_F: optic_Holosight_smg {
displayName = CSTRING(optic_holosight_smg_blk);
};
class optic_Holosight_smg_khk_F : optic_Holosight_smg {
class optic_Holosight_smg_khk_F: optic_Holosight_smg {
displayName = CSTRING(optic_holosight_smg_khk);
};

class optic_MRCO : ItemCore {
class optic_MRCO: ItemCore {
displayName = CSTRING(optic_MRCO);
};
class ACE_optic_MRCO_2D : optic_MRCO {
class ACE_optic_MRCO_2D: optic_MRCO {
displayName = CSTRING(optic_MRCO_2d);
};
class ACE_optic_MRCO_PIP: ACE_optic_MRCO_2D {
displayName = CSTRING(optic_MRCO_pip);
};

class optic_Yorris : ItemCore {
class optic_Yorris: ItemCore {
displayName = CSTRING(optic_Yorris);
};

class optic_ACO : ItemCore {
class optic_ACO: ItemCore {
displayName = CSTRING(optic_ACO);
};
class optic_ACO_grn : ItemCore {
class optic_ACO_grn: ItemCore {
displayName = CSTRING(optic_ACO_grn);
};
class optic_ACO_smg : ItemCore {
class optic_ACO_smg: ItemCore {
displayName = CSTRING(optic_ACO_smg);
};
class optic_ACO_grn_smg : ItemCore {
class optic_ACO_grn_smg: ItemCore {
displayName = CSTRING(optic_ACO_grn_smg);
};

Expand Down
85 changes: 85 additions & 0 deletions addons/realisticnames/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3837,6 +3837,21 @@
<Turkish>Leupold Mark 4 HAMR (2D)</Turkish>
<Spanish>Leupold Mark 4 HAMR (2D)</Spanish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_hamr_pip">
<English>Leupold Mark 4 HAMR (PIP)</English>
<German>Leupold Mark 4 HAMR (PIP)</German>
<Chinese>Leupold Mark 4 HAMR (PIP)</Chinese>
<Chinesesimp>Leupold Mark 4 HAMR (PIP)</Chinesesimp>
<Japanese>Leupold Mark 4 HAMR (PIP)</Japanese>
<Italian>Leupold Mark 4 HAMR (PIP)</Italian>
<Polish>Leupold Mark 4 HAMR (PIP)</Polish>
<Russian>Leupold Mark 4 HAMR (PIP)</Russian>
<Portuguese>Leupold Mark 4 HAMR (PIP)</Portuguese>
<French>Leupold Mark 4 HAMR (PIP)</French>
<Czech>Leupold Mark 4 HAMR (PIP)</Czech>
<Turkish>Leupold Mark 4 HAMR (PIP)</Turkish>
<Spanish>Leupold Mark 4 HAMR (PIP)</Spanish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_arco">
<English>ELCAN SpecterOS (Tan)</English>
<German>ELCAN SpecterOS (Beige)</German>
Expand Down Expand Up @@ -3896,6 +3911,36 @@
<Turkish>ELCAN SpecterOS (2D)</Turkish>
<Spanish>ELCAN SpecterOS (2D)</Spanish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_arco_pip">
<English>ELCAN SpecterOS (PIP)</English>
<German>ELCAN SpecterOS (PIP)</German>
<Chinese>ELCAN SpecterOS (PIP)</Chinese>
<Chinesesimp>ELCAN SpecterOS (PIP)</Chinesesimp>
<Japanese>ELCAN SpecterOS (PIP)</Japanese>
<Italian>ELCAN SpecterOS (PIP)</Italian>
<Polish>ELCAN SpecterOS (PIP)</Polish>
<Russian>ELCAN SpecterOS (PIP)</Russian>
<Portuguese>ELCAN SpecterOS (PIP)</Portuguese>
<French>ELCAN SpecterOS (PIP)</French>
<Czech>ELCAN SpecterOS (PIP)</Czech>
<Turkish>ELCAN SpecterOS (PIP)</Turkish>
<Spanish>ELCAN SpecterOS (PIP)</Spanish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_arco_lush">
<English>ELCAN SpecterOS (Lush)</English>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_arco_arid">
<English>ELCAN SpecterOS (Arid)</English>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_arco_ak_blk">
<English>ELCAN SpecterOS 7.62 (Black)</English>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_arco_ak_lush">
<English>ELCAN SpecterOS 7.62 (Lush)</English>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_arco_ak_arid">
<English>ELCAN SpecterOS 7.62 (Arid)</English>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_erco_blk">
<English>SIG BRAVO4 / ROMEO3 (Black)</English>
<German>SIG BRAVO4 / ROMEO3 (Schwarz)</German>
Expand Down Expand Up @@ -3998,6 +4043,20 @@
<Turkish>Nightforce NXS (2D)</Turkish>
<Spanish>Nightforce NXS (2D)</Spanish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_lrps_pip">
<English>Nightforce NXS (PIP)</English>
<Chinese>Nightforce NXS (PIP)</Chinese>
<Chinesesimp>Nightforce NXS (PIP)</Chinesesimp>
<Japanese>Nightforce NXS (PIP)</Japanese>
<Italian>Nightforce NXS (PIP)</Italian>
<Polish>Nightforce NXS (PIP)</Polish>
<Russian>Nightforce NXS (PIP)</Russian>
<Portuguese>Nightforce NXS (PIP)</Portuguese>
<French>Nightforce NXS (PIP)</French>
<Czech>Nightforce NXS (PIP)</Czech>
<Turkish>Nightforce NXS (PIP)</Turkish>
<Spanish>Nightforce NXS (PIP)</Spanish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_ams">
<English>US Optics MR-10 (Black)</English>
<Chinese>US Optics MR-10 (Black)</Chinese>
Expand Down Expand Up @@ -4124,6 +4183,12 @@
<Turkish>Burris XTR II (Yeşil Hex)</Turkish>
<Spanish>Burris XTR II (Verde Hex)</Spanish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_dms_weathered">
<English>Burris XTR II (Old)</English>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_dms_weathered_kir">
<English>Burris XTR II (ASP-1 Kir)</English>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_holosight">
<English>EOTech XPS3 (Tan)</English>
<German>EOTech XPS3 (Beige)</German>
Expand Down Expand Up @@ -4169,6 +4234,12 @@
<Turkish>EOTech XPS3 (Haki)</Turkish>
<Spanish>EOTech XPS3 (Caqui)</Spanish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_holosight_lush">
<English>EOTech XPS3 (Lush)</English>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_holosight_arid">
<English>EOTech XPS3 (Arid)</English>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_holosight_smg">
<English>EOTech XPS3 SMG (Tan)</English>
<German>EOTech XPS3 SMG (Beige)</German>
Expand Down Expand Up @@ -4242,6 +4313,20 @@
<Turkish>IOR-Valdada Pitbull 2 (2D)</Turkish>
<Spanish>IOR-Valdada Pitbull 2 (2D)</Spanish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_mrco_pip">
<English>IOR-Valdada Pitbull 2 (PIP)</English>
<Chinese>IOR-Valdada Pitbull 2 (PIP)</Chinese>
<Chinesesimp>IOR-Valdada Pitbull 2 (PIP)</Chinesesimp>
<Japanese>IOR-Valdada ピットブル 2 (PIP)</Japanese>
<Italian>IOR-Valdada Pitbull 2 (PIP)</Italian>
<Polish>IOR-Valdada Pitbull 2 (PIP)</Polish>
<Russian>IOR-Valdada Pitbull 2 (PIP)</Russian>
<Portuguese>IOR-Valdada Pitbull 2 (PIP)</Portuguese>
<French>IOR-Valdada Pitbull 2 (PIP)</French>
<Czech>IOR-Valdada Pitbull 2 (PIP)</Czech>
<Turkish>IOR-Valdada Pitbull 2 (PIP)</Turkish>
<Spanish>IOR-Valdada Pitbull 2 (PIP)</Spanish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_Yorris">
<English>Burris FastFire 2</English>
<Chinese>Burris FastFire 2</Chinese>
Expand Down