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

Realistic Names - Add 2D optics #7571

Merged
merged 2 commits into from
Apr 6, 2020
Merged

Realistic Names - Add 2D optics #7571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0597762
Add 2D optics to realistic names.
Mike-MF Mar 3, 2020
c0cd327
require ace_optics
Mike-MF Mar 3, 2020
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
12 changes: 12 additions & 0 deletions addons/realisticnames/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,9 @@ class CfgWeapons {
class optic_Hamr_khk_F : optic_hamr {
displayName = CSTRING(optic_hamr_khk);
};
class ACE_optic_Hamr_2D : optic_Hamr {
displayName = CSTRING(optic_hamr_2d);
};

class optic_Arco : ItemCore {
displayName = CSTRING(optic_arco);
Expand All @@ -709,6 +712,9 @@ class CfgWeapons {
class optic_Arco_ghex_F : optic_Arco {
displayName = CSTRING(optic_arco_ghex);
};
class ACE_optic_Arco_2D : optic_Arco {
displayName = CSTRING(optic_arco_2d);
};

class optic_ERCO_blk_f : optic_Arco {
displayName = CSTRING(optic_erco_blk);
Expand All @@ -729,6 +735,9 @@ class CfgWeapons {
class optic_LRPS_tna_F : optic_LRPS {
displayName = CSTRING(optic_lrps_tna);
};
class ACE_optic_LRPS_2D : optic_LRPS {
displayName = CSTRING(optic_lrps_2d);
};

class optic_AMS_base;
class optic_AMS: optic_AMS_base {
Expand Down Expand Up @@ -784,6 +793,9 @@ class CfgWeapons {
class optic_MRCO : ItemCore {
displayName = CSTRING(optic_MRCO);
};
class ACE_optic_MRCO_2D : optic_MRCO {
displayName = CSTRING(optic_MRCO_2d);
};

class optic_Yorris : ItemCore {
displayName = CSTRING(optic_Yorris);
Expand Down
2 changes: 1 addition & 1 deletion addons/realisticnames/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
requiredAddons[] = {"ace_common", "ace_optics"};
author = ECSTRING(common,ACETeam);
authors[] = {"KoffeinFlummi","TaoSensai","commy2"};
url = ECSTRING(main,URL);
Expand Down
54 changes: 54 additions & 0 deletions addons/realisticnames/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3699,6 +3699,20 @@
<Czech>Leupold Mark 4 HAMR (Khaki)</Czech>
<Turkish>Leupold Mark 4 HAMR (Haki)</Turkish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_hamr_2d">
<English>Leupold Mark 4 HAMR (2D)</English>
<German>Leupold Mark 4 HAMR (2D)</German>
<Chinese>Leupold Mark 4 HAMR (2D)</Chinese>
<Chinesesimp>Leupold Mark 4 HAMR (2D)</Chinesesimp>
<Japanese>Leupold Mark 4 HAMR (2D)</Japanese>
<Italian>Leupold Mark 4 HAMR (2D)</Italian>
<Polish>Leupold Mark 4 HAMR (2D)</Polish>
<Russian>Leupold Mark 4 HAMR (2D)</Russian>
<Portuguese>Leupold Mark 4 HAMR (2D)</Portuguese>
<French>Leupold Mark 4 HAMR (2D)</French>
<Czech>Leupold Mark 4 HAMR (2D)</Czech>
<Turkish>Leupold Mark 4 HAMR (2D)</Turkish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_arco">
<English>ELCAN SpecterOS (Tan)</English>
<German>ELCAN SpecterOS (Beige)</German>
Expand Down Expand Up @@ -3740,6 +3754,20 @@
<Czech>ELCAN SpecterOS (Zelený Hex)</Czech>
<Turkish>ELCAN SpecterOS (Yeşil Hex)</Turkish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_arco_2d">
<English>ELCAN SpecterOS (2D)</English>
<German>ELCAN SpecterOS (2D)</German>
<Chinese>ELCAN SpecterOS (2D)</Chinese>
<Chinesesimp>ELCAN SpecterOS (2D)</Chinesesimp>
<Japanese>ELCAN SpecterOS (2D)</Japanese>
<Italian>ELCAN SpecterOS (2D)</Italian>
<Polish>ELCAN SpecterOS (2D)</Polish>
<Russian>ELCAN SpecterOS (2D)</Russian>
<Portuguese>ELCAN SpecterOS (2D)</Portuguese>
<French>ELCAN SpecterOS (2D)</French>
<Czech>ELCAN SpecterOS (2D)</Czech>
<Turkish>ELCAN SpecterOS (2D)</Turkish>
</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 @@ -3822,6 +3850,19 @@
<Czech>Nightforce NXS (Džungle)</Czech>
<Turkish>Nightforce NXS (Orman)</Turkish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_lrps_2d">
<English>Nightforce NXS (2D)</English>
<Chinese>Nightforce NXS (2D)</Chinese>
<Chinesesimp>Nightforce NXS (2D)</Chinesesimp>
<Japanese>Nightforce NXS (2D)</Japanese>
<Italian>Nightforce NXS (2D)</Italian>
<Polish>Nightforce NXS (2D)</Polish>
<Russian>Nightforce NXS (2D)</Russian>
<Portuguese>Nightforce NXS (2D)</Portuguese>
<French>Nightforce NXS (2D)</French>
<Czech>Nightforce NXS (2D)</Czech>
<Turkish>Nightforce NXS (2D)</Turkish>
</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 @@ -4036,6 +4077,19 @@
<Czech>IOR-Valdada Pitbull 2</Czech>
<Turkish>IOR-Valdada Pitbull 2</Turkish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_mrco_2d">
<English>IOR-Valdada Pitbull 2 (2D)</English>
<Chinese>IOR-Valdada Pitbull 2 (2D)</Chinese>
<Chinesesimp>IOR-Valdada Pitbull 2 (2D)</Chinesesimp>
<Japanese>IOR-Valdada ピットブル 2 (2D)</Japanese>
<Italian>IOR-Valdada Pitbull 2 (2D)</Italian>
<Polish>IOR-Valdada Pitbull 2 (2D)</Polish>
<Russian>IOR-Valdada Pitbull 2 (2D)</Russian>
<Portuguese>IOR-Valdada Pitbull 2 (2D)</Portuguese>
<French>IOR-Valdada Pitbull 2 (2D)</French>
<Czech>IOR-Valdada Pitbull 2 (2D)</Czech>
<Turkish>IOR-Valdada Pitbull 2 (2D)</Turkish>
</Key>
<Key ID="STR_ACE_RealisticNames_optic_Yorris">
<English>Burris FastFire 2</English>
<Chinese>Burris FastFire 2</Chinese>
Expand Down