Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fragCleanup

Browse Source
This commit is contained in:
ulteq 2015-04-27 11:22:49 +02:00
commit 579936c781
4 changed files with 170 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -33,6 +33,7 @@ Aggr094 <bastards4glory@gmail.com>
Anthariel <Contact@storm-simulation.com>
BlackQwar
Brakoviejo
Brisse <brisse@outlook.com>
Clon1998 <ps.patti1998@gmail.com>
Codingboy
Crusty

7
addons/realisticnames/CfgWeapons.hpp
View File

@ -193,7 +193,7 @@ class CfgWeapons {
};
// marksmen marksman
/*class DMR_02_base_F: Rifle_Long_Base_F {
class DMR_02_base_F: Rifle_Long_Base_F {
displayName = "$STR_ACE_RealisticNames_DMR_02"; //MAR-10 .338";
};
@ -208,7 +208,6 @@ class CfgWeapons {
class srifle_DMR_02_sniper_F: srifle_DMR_02_F {
displayName = "$STR_ACE_RealisticNames_srifle_DMR_02_sniper"; //MAR-10 .338 (Sand)";
};
*/
class DMR_03_base_F: Rifle_Long_Base_F {
displayName = "$STR_ACE_RealisticNames_DMR_03"; //Mk-I EMR 7.62 mm";
};
@ -236,7 +235,6 @@ class CfgWeapons {
class srifle_DMR_03_spotter_F: srifle_DMR_03_F {
displayName = "$STR_ACE_RealisticNames_srifle_DMR_03_spotter"; //NATO DMR (provisional) spotter";
};
/*
class DMR_04_base_F: Rifle_Long_Base_F {
displayName = "$STR_ACE_RealisticNames_DMR_04"; //ASP-1 Kir 12.7 mm";
};
@ -264,7 +262,6 @@ class CfgWeapons {
class srifle_DMR_05_tan_f: srifle_DMR_05_blk_F {
displayName = "$STR_ACE_RealisticNames_srifle_DMR_05_tan"; //Cyrus 9.3 mm (Tan)";
};
*/
class DMR_06_base_F: Rifle_Long_Base_F {
displayName = "$STR_ACE_RealisticNames_DMR_06"; //Mk14 7.62 mm";
};
@ -278,7 +275,6 @@ class CfgWeapons {
};
// marksmen mgs
/*
class MMG_01_base_F: Rifle_Long_Base_F {
displayName = "$STR_ACE_RealisticNames_MMG_01"; //Navid 9.3 mm";
};
@ -290,7 +286,6 @@ class CfgWeapons {
class MMG_01_tan_F: MMG_01_hex_F {
displayName = "$STR_ACE_RealisticNames_MMG_01_tan"; //Navid 9.3 mm (Tan)";
};
*/
class MMG_02_base_F: Rifle_Long_Base_F {
displayName = "$STR_ACE_RealisticNames_MMG_02"; //SPMG .338";
};

308
addons/realisticnames/stringtable.xml
View File

@ -1482,214 +1482,214 @@
<Russian>VS-121</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_DMR_02">
<English>TODO: MAR-10 .338</English>
<Czech>TODO: MAR-10 .338</Czech>
<French>MAR-10 .338</French>
<Spanish>TODO: MAR-10 .338</Spanish>
<Russian>TODO: MAR-10 .338</Russian>
<English>MAR-10</English>
<Czech>MAR-10</Czech>
<French>MAR-10</French>
<Spanish>MAR-10</Spanish>
<Russian>MAR-10</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_02">
<English>TODO: MAR-10 .338 (Black)</English>
<Czech>TODO: MAR-10 .338 (Black)</Czech>
<French>MAR-10 .338 (Noir)</French>
<Spanish>TODO: MAR-10 .338 (Negro)</Spanish>
<Russian>TODO: MAR-10 .338 (черный)</Russian>
<English>MAR-10 (Black)</English>
<Czech>MAR-10 (Black)</Czech>
<French>MAR-10 (Noir)</French>
<Spanish>MAR-10 (Negro)</Spanish>
<Russian>MAR-10 (черный)</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_02_camo">
<English>TODO: MAR-10 .338 (Camo)</English>
<Czech>TODO: MAR-10 .338 (Camo)</Czech>
<French>MAR-10 .338 (Camo)</French>
<Spanish>TODO: MAR-10 .338 (Camuflaje)</Spanish>
<Russian>TODO: MAR-10 .338 (камо)</Russian>
<English>MAR-10 (Camo)</English>
<Czech>MAR-10 (Camo)</Czech>
<French>MAR-10 (Camo)</French>
<Spanish>MAR-10 (Camuflaje)</Spanish>
<Russian>MAR-10 (камо)</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_02_sniper">
<English>TODO: MAR-10 .338 (Sand)</English>
<Czech>TODO: MAR-10 .338 (Sand)</Czech>
<French>MAR-10 .338 (Beige)</French>
<Spanish>TODO: MAR-10 .338 (Arena)</Spanish>
<Russian>TODO: MAR-10 .338 (песочный)</Russian>
<English>MAR-10 (Sand)</English>
<Czech>MAR-10 (Sand)</Czech>
<French>MAR-10 (Beige)</French>
<Spanish>MAR-10 (Arena)</Spanish>
<Russian>MAR-10 (песочный)</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_DMR_03">
<English>SG 556 7.62 mm</English>
<Czech>SG 556 7.62 mm</Czech>
<French>SG 556 7.62 mm</French>
<Spanish>SG 556 7.62 mm</Spanish>
<Russian>SG 556 7.62 мм</Russian>
<Polish>SG 556 7,62 mm</Polish>
<English>SG 556</English>
<Czech>SG 556</Czech>
<French>SG 556</French>
<Spanish>SG 556</Spanish>
<Russian>SG 556</Russian>
<Polish>SG 556</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_03">
<English>SG 556 7.62 mm (Black)</English>
<Czech>SG 556 7.62 mm (Black)</Czech>
<French>SG 556 7.62 mm (Noir)</French>
<Spanish>SG 556 7.62 mm (Negro)</Spanish>
<Russian>SG 556 7.62 мм (черный)</Russian>
<Polish>SG 556 7,62 mm (czarny)</Polish>
<English>SG 556 (Black)</English>
<Czech>SG 556 (Black)</Czech>
<French>SG 556 (Noir)</French>
<Spanish>SG 556 (Negro)</Spanish>
<Russian>SG 556 (черный)</Russian>
<Polish>SG 556 (czarny)</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_03_khaki">
<English>SG 556 7.62 mm (Khaki)</English>
<Czech>SG 556 7.62 mm (Khaki)</Czech>
<French>SG 556 7.62 mm (Kaki)</French>
<Spanish>SG 556 7.62 mm (Caqui)</Spanish>
<Russian>SG 556 7.62 мм (хаки)</Russian>
<Polish>SG 556 7,62 mm (khaki)</Polish>
<English>SG 556 (Khaki)</English>
<Czech>SG 556 (Khaki)</Czech>
<French>SG 556 (Kaki)</French>
<Spanish>SG 556 (Caqui)</Spanish>
<Russian>SG 556 (хаки)</Russian>
<Polish>SG 556 (khaki)</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_03_tan">
<English>SG 556 7.62 mm (Sand)</English>
<Czech>SG 556 7.62 mm (Sand)</Czech>
<French>SG 556 7.62 mm (Beige)</French>
<Spanish>SG 556 7.62 mm (Arena)</Spanish>
<Russian>SG 556 7.62 мм (песочный)</Russian>
<Polish>SG 556 7,62 mm (piaskowy)</Polish>
<English>SG 556 (Sand)</English>
<Czech>SG 556 (Sand)</Czech>
<French>SG 556 (Beige)</French>
<Spanish>SG 556 (Arena)</Spanish>
<Russian>SG 556 (песочный)</Russian>
<Polish>SG 556 (piaskowy)</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_03_multicam">
<English>SG 556 7.62 mm (Camo)</English>
<Czech>SG 556 7.62 mm (Camo)</Czech>
<French>SG 556 7.62 mm (Camo)</French>
<Spanish>SG 556 7.62 mm (Camuflaje)</Spanish>
<Russian>SG 556 7.62 мм (камо)</Russian>
<Polish>SG 556 7,62 mm (kamuflaż)</Polish>
<English>SG 556 (Camo)</English>
<Czech>SG 556 (Camo)</Czech>
<French>SG 556 (Camo)</French>
<Spanish>SG 556 (Camuflaje)</Spanish>
<Russian>SG 556 (камо)</Russian>
<Polish>SG 556 (kamuflaż)</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_03_woodland">
<English>SG 556 7.62 mm (Woodland)</English>
<Czech>SG 556 7.62 mm (Woodland)</Czech>
<French>SG 556 7.62 mm (Woodland)</French>
<Spanish>SG 556 7.62 mm (Bosque)</Spanish>
<Russian>SG 556 7.62 мм (лесной)</Russian>
<Polish>SG 556 7,62 mm (leśny)</Polish>
<English>SG 556 (Woodland)</English>
<Czech>SG 556 (Woodland)</Czech>
<French>SG 556 (Woodland)</French>
<Spanish>SG 556 (Bosque)</Spanish>
<Russian>SG 556 (лесной)</Russian>
<Polish>SG 556 (leśny)</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_03_spotter">
<English>SG 556 7.62 mm (provisional) spotter</English>
<Czech>SG 556 7.62 mm (provisional) spotter</Czech>
<French>SG 556 7.62 mm (provisoire) Observateur</French>
<Spanish>SG 556 7.62 mm (provisional) observador</Spanish>
<Russian>SG 556 7.62 мм (provisional) корректировщик</Russian>
<Polish>SG 556 7,62 mm (prowizoryczny) obserwator</Polish>
<English>SG 556 (provisional) spotter</English>
<Czech>SG 556 (provisional) spotter</Czech>
<French>SG 556 (provisoire) Observateur</French>
<Spanish>SG 556 (provisional) observador</Spanish>
<Russian>SG 556 (provisional) корректировщик</Russian>
<Polish>SG 556 (prowizoryczny) obserwator</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_DMR_04">
<English>TODO: ASP-1 Kir 12.7 mm</English>
<Czech>TODO: ASP-1 Kir 12.7 mm</Czech>
<French>ASP-1 Kir 12.7 mm</French>
<Spanish>TODO: ASP-1 Kir 12.7 mm</Spanish>
<Russian>TODO: ASP-1 Kir 12.7 мм</Russian>
<English>ASP-1 Kir</English>
<Czech>ASP-1 Kir</Czech>
<French>ASP-1 Kir</French>
<Spanish>ASP-1 Kir</Spanish>
<Russian>ASP-1 Kir</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_04">
<English>TODO: ASP-1 Kir 12.7 mm (Black)</English>
<Czech>TODO: ASP-1 Kir 12.7 mm (Black)</Czech>
<French>ASP-1 Kir 12.7 mm (Noir)</French>
<Spanish>TODO: ASP-1 Kir 12.7 mm (Negro)</Spanish>
<Russian>TODO: ASP-1 Kir 12.7 мм (черный)</Russian>
<English>ASP-1 Kir (Black)</English>
<Czech>ASP-1 Kir (Black)</Czech>
<French>ASP-1 Kir (Noir)</French>
<Spanish>ASP-1 Kir (Negro)</Spanish>
<Russian>ASP-1 Kir (черный)</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_04_Tan">
<English>TODO: ASP-1 Kir 12.7 mm (Tan)</English>
<Czech>TODO: ASP-1 Kir 12.7 mm (Tan)</Czech>
<French>ASP-1 Kir 12.7 mm (Tan)</French>
<Spanish>TODO: ASP-1 Kir 12.7 mm (Tan)</Spanish>
<Russian>TODO: ASP-1 Kir 12.7 мм (бронзовый)</Russian>
<English>ASP-1 Kir (Tan)</English>
<Czech>ASP-1 Kir (Tan)</Czech>
<French>ASP-1 Kir (Tan)</French>
<Spanish>ASP-1 Kir (Tan)</Spanish>
<Russian>ASP-1 Kir (бронзовый)</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_DMR_05">
<English>TODO: Cyrus 9.3 mm</English>
<Czech>TODO: Cyrus 9.3 mm</Czech>
<French>Cyrus 9.3 mm</French>
<Spanish>TODO: Cyrus 9.3 mm</Spanish>
<Russian>TODO: Cyrus 9.3 мм</Russian>
<English>Cyrus</English>
<Czech>Cyrus</Czech>
<French>Cyrus</French>
<Spanish>Cyrus</Spanish>
<Russian>Cyrus</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_05_blk">
<English>TODO: Cyrus 9.3 mm (Black)</English>
<Czech>TODO: Cyrus 9.3 mm (Black)</Czech>
<French>Cyrus 9.3 mm (Noir)</French>
<Spanish>TODO: Cyrus 9.3 mm (Negro)</Spanish>
<Russian>TODO: Cyrus 9.3 мм (черный)</Russian>
<English>Cyrus (Black)</English>
<Czech>Cyrus (Black)</Czech>
<French>Cyrus (Noir)</French>
<Spanish>Cyrus (Negro)</Spanish>
<Russian>Cyrus (черный)</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_05_hex">
<English>TODO: Cyrus 9.3 mm (Hex)</English>
<Czech>TODO: Cyrus 9.3 mm (Hex)</Czech>
<French>Cyrus 9.3 mm (Hex)</French>
<Spanish>TODO: Cyrus 9.3 mm (Hex)</Spanish>
<Russian>TODO: Cyrus 9.3 мм (гекс)</Russian>
<English>Cyrus (Hex)</English>
<Czech>Cyrus (Hex)</Czech>
<French>Cyrus (Hex)</French>
<Spanish>Cyrus (Hex)</Spanish>
<Russian>Cyrus (гекс)</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_05_tan">
<English>TODO: Cyrus 9.3 mm (Tan)</English>
<Czech>TODO: Cyrus 9.3 mm (Tan)</Czech>
<French>Cyrus 9.3 mm (Tan)</French>
<Spanish>TODO: Cyrus 9.3 mm (Tan)</Spanish>
<Russian>TODO: Cyrus 9.3 мм (бронза)</Russian>
<English>Cyrus (Tan)</English>
<Czech>Cyrus (Tan)</Czech>
<French>Cyrus (Tan)</French>
<Spanish>Cyrus (Tan)</Spanish>
<Russian>Cyrus (бронза)</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_DMR_06">
<English>M14 7.62 mm</English>
<Czech>M14 7.62 mm</Czech>
<French>M14 7.62 mm</French>
<Spanish>M14 7.62 mm</Spanish>
<Russian>M14 7.62 мм</Russian>
<Polish>M14 7,62 mm</Polish>
<English>M14</English>
<Czech>M14</Czech>
<French>M14</French>
<Spanish>M14</Spanish>
<Russian>M14</Russian>
<Polish>M14</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_06_camo">
<English>M14 7.62 mm (Camo)</English>
<Czech>M14 7.62 mm (Camo)</Czech>
<French>M14 7.62 mm (Camo)</French>
<Spanish>M14 7.62 mm (Camuflaje)</Spanish>
<Russian>M14 7.62 мм (Камо)</Russian>
<Polish>M14 7,62 mm (kamuflaż)</Polish>
<English>M14 (Camo)</English>
<Czech>M14 (Camo)</Czech>
<French>M14 (Camo)</French>
<Spanish>M14 (Camuflaje)</Spanish>
<Russian>M14 (Камо)</Russian>
<Polish>M14 (kamuflaż)</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_srifle_DMR_06_olive">
<English>M14 7.62 mm (Olive)</English>
<Czech>M14 7.62 mm (Olive)</Czech>
<French>M14 7.62 mm (Olive)</French>
<Spanish>M14 7.62 mm (Oliva)</Spanish>
<Russian>M14 7.62 мм (Олива)</Russian>
<Polish>M14 7,62 mm (oliwkowy)</Polish>
<English>M14 (Olive)</English>
<Czech>M14 (Olive)</Czech>
<French>M14 (Olive)</French>
<Spanish>M14 (Oliva)</Spanish>
<Russian>M14 (Олива)</Russian>
<Polish>M14 (oliwkowy)</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_MMG_01">
<English>TODO: Navid 9.3 mm</English>
<Czech>TODO: Navid 9.3 mm</Czech>
<French>Navid 9.3 mm</French>
<Spanish>TODO: Navid 9.3 mm</Spanish>
<Russian>TODO: Navid 9.3 мм</Russian>
<English>Navid</English>
<Czech>Navid</Czech>
<French>Navid</French>
<Spanish>Navid</Spanish>
<Russian>Navid</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_MMG_01_hex">
<English>TODO: Navid 9.3 mm (Hex)</English>
<Czech>TODO: Navid 9.3 mm (Hex)</Czech>
<French>Navid 9.3 mm (Hex)</French>
<Spanish>TODO: Navid 9.3 mm (Hex)</Spanish>
<Russian>TODO: Navid 9.3 мм (гекс)</Russian>
<English>Navid (Hex)</English>
<Czech>Navid (Hex)</Czech>
<French>Navid (Hex)</French>
<Spanish>Navid (Hex)</Spanish>
<Russian>Navid (гекс)</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_MMG_01_tan">
<English>TODO: Navid 9.3 mm (Tan)</English>
<Czech>TODO: Navid 9.3 mm (Tan)</Czech>
<French>Navid 9.3 mm (Tan)</French>
<Spanish>TODO: Navid 9.3 mm (Tan)</Spanish>
<Russian>TODO: Navid 9.3 мм (бронза)</Russian>
<English>Navid (Tan)</English>
<Czech>Navid (Tan)</Czech>
<French>Navid (Tan)</French>
<Spanish>Navid (Tan)</Spanish>
<Russian>Navid (бронза)</Russian>
</Key>
<Key ID="STR_ACE_RealisticNames_MMG_02">
<English>LWMMG .338</English>
<Czech>LWMMG .338</Czech>
<French>LWMMG .338</French>
<Spanish>LWMMG .338</Spanish>
<Russian>LWMMG .338</Russian>
<Polish>LWMMG .338</Polish>
<English>LWMMG</English>
<Czech>LWMMG</Czech>
<French>LWMMG</French>
<Spanish>LWMMG</Spanish>
<Russian>LWMMG</Russian>
<Polish>LWMMG</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_MMG_02_camo">
<English>LWMMG .338 (MTP)</English>
<Czech>LWMMG .338 (MTP)</Czech>
<French>LWMMG .338 (MTP)</French>
<Spanish>LWMMG .338 (MTP)</Spanish>
<Russian>LWMMG .338 (MTP)</Russian>
<Polish>LWMMG .338 (MTP)</Polish>
<English>LWMMG (MTP)</English>
<Czech>LWMMG (MTP)</Czech>
<French>LWMMG (MTP)</French>
<Spanish>LWMMG (MTP)</Spanish>
<Russian>LWMMG (MTP)</Russian>
<Polish>LWMMG (MTP)</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_MMG_02_black">
<English>LWMMG .338 (Black)</English>
<Czech>LWMMG .338 (Black)</Czech>
<French>LWMMG .338 (Noir)</French>
<Spanish>LWMMG .338 (Negro)</Spanish>
<Russian>LWMMG .338 (Черный)</Russian>
<Polish>LWMMG .338 (czarny)</Polish>
<English>LWMMG (Black)</English>
<Czech>LWMMG (Black)</Czech>
<French>LWMMG (Noir)</French>
<Spanish>LWMMG (Negro)</Spanish>
<Russian>LWMMG (Черный)</Russian>
<Polish>LWMMG (czarny)</Polish>
</Key>
<Key ID="STR_ACE_RealisticNames_MMG_02_sand">
<English>LWMMG .338 (Sand)</English>
<Czech>LWMMG .338 (Sand)</Czech>
<French>SPMG .338 (Beige)</French>
<Spanish>LWMMG .338 (Arena)</Spanish>
<Russian>LWMMG .338 (Песочный)</Russian>
<Polish>LWMMG .338 (piaskowy)</Polish>
<English>LWMMG (Sand)</English>
<Czech>LWMMG (Sand)</Czech>
<French>SPMG (Beige)</French>
<Spanish>LWMMG (Arena)</Spanish>
<Russian>LWMMG (Песочный)</Russian>
<Polish>LWMMG (piaskowy)</Polish>
</Key>
</Package>
</Project>

14
addons/scopes/CfgWeapons.hpp
View File

@ -71,4 +71,18 @@ class CfgWeapons {
};
};
};
class optic_KHS_old : ItemCore {
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_Increment = 0.1;
class ItemInfo : InventoryOpticsItem_Base_F {
class OpticsModes {
class KHS {
discreteDistance[] = { 100 };
discreteDistanceInitIndex = 0;
};
};
};
};
};