Skip to content

Commit

Permalink
AB compat rail/scope height update (#5650)
Browse files Browse the repository at this point in the history 
* Compat rail/scope height update

* fix
  • Loading branch information
@dedmen @jonpas
dedmen authored and jonpas committed Oct 23, 2017
1 parent 3484942 commit a614744
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 65 deletions.
64 changes: 27 additions & 37 deletions optionals/compat_r3f/CfgWeapons.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class CfgWeapons {
class Pistol_Base_F;
class Rifle_Base_F;
class R3F_Famas_F1: Rifle_Base_F {
ACE_RailHeightAboveBore = 10.6;
ACE_RailHeightAboveBore = 10.1796;
ACE_barrelTwist = 304.8; // 1:12"
ACE_barrelLength = 488.0;
muzzles[] = {"this"};
Expand All @@ -13,28 +13,28 @@ class CfgWeapons {
muzzles[] = {"this","Lance_Grenades"};
};
class R3F_Famas_surb: R3F_Famas_F1 {
ACE_RailHeightAboveBore = 5.4;
ACE_RailHeightAboveBore = 5.08219;
ACE_barrelTwist = 228.6; // 1:9"
ACE_barrelLength = 450.0; // Beretta barrel
};
class R3F_Famas_surb_M203: R3F_Famas_surb {
muzzles[] = {"this","Lance_Grenades"};
};
class R3F_Famas_G2: R3F_Famas_F1 {
ACE_RailHeightAboveBore = 10.6;
ACE_RailHeightAboveBore = 10.1808;
ACE_barrelTwist = 228.6; // 1:9"
ACE_barrelLength = 488.0;
};
class R3F_Famas_G2_M203: R3F_Famas_G2 {
muzzles[] = {"this","Lance_Grenades"};
};
class R3F_Famas_felin: R3F_Famas_G2 {
ACE_RailHeightAboveBore = 5.4;
ACE_RailHeightAboveBore = 5.14504;
ACE_barrelTwist = 177.8; // 1:7"
ACE_barrelLength = 450.0; // Beretta barrel
};
class R3F_FRF2: Rifle_Base_F {
ACE_RailHeightAboveBore = 2.2;
ACE_RailHeightAboveBore = 1.79013;
ACE_barrelTwist = 294.6;
ACE_barrelLength = 650.0;
class Single: Mode_SemiAuto {
Expand All @@ -43,7 +43,7 @@ class CfgWeapons {
muzzles[] = {"this"};
};
class R3F_PGM_Hecate_II: Rifle_Base_F {
ACE_RailHeightAboveBore = 2.0;
ACE_RailHeightAboveBore = 1.84858;
ACE_barrelTwist = 381.0;
ACE_barrelLength = 700.0;
class Single: Mode_SemiAuto {
Expand All @@ -52,7 +52,7 @@ class CfgWeapons {
muzzles[] = {"this"};
};
class R3F_M107: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.6;
ACE_RailHeightAboveBore = 3.13099;
ACE_barrelTwist = 381.0;
ACE_barrelLength = 736.6;
class Single: Mode_SemiAuto {
Expand All @@ -61,7 +61,7 @@ class CfgWeapons {
muzzles[] = {"this"};
};
class R3F_TAC50: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.2;
ACE_RailHeightAboveBore = 2.99563;
ACE_barrelTwist = 381.0;
ACE_barrelLength = 736.6;
class Single: Mode_SemiAuto {
Expand All @@ -70,45 +70,41 @@ class CfgWeapons {
muzzles[] = {"this"};
};
class R3F_Minimi: Rifle_Base_F {
ACE_RailHeightAboveBore = 4.0;
ACE_RailHeightAboveBore = 3.81385;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 347.98;
muzzles[] = {"this"};
initSpeed = 915; // R3F config
};
class R3F_Minimi_762: R3F_Minimi {
ACE_RailHeightAboveBore = 4.0;
ACE_RailHeightAboveBore = 3.80834;
ACE_barrelTwist = 304.8;
ACE_barrelLength = 502.92;
initSpeed = 820; // R3F config
};
class R3F_SIG551: Rifle_Base_F {
ACE_RailHeightAboveBore = 4.2;
ACE_RailHeightAboveBore = 3.95288;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 363.0;
muzzles[] = {"this"};
};
class R3F_HK417M: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.4;
ACE_RailHeightAboveBore = 3.23377;
ACE_barrelTwist = 279.4;
ACE_barrelLength = 406.0;
muzzles[] = {"this"};
};
class R3F_HK417S_HG: R3F_HK417M {
ACE_RailHeightAboveBore = 3.4;
ACE_barrelTwist = 279.4;
ACE_barrelLength = 305.0;
};
class R3F_HK417L: R3F_HK417M {
ACE_RailHeightAboveBore = 3.4;
ACE_barrelTwist = 279.4;
ACE_barrelLength = 508.0;
class Single: Mode_SemiAuto {
dispersion = 0.00029; // 1 MOA, default 0.00020
};
};
class R3F_HK416M: Rifle_Base_F {
ACE_RailHeightAboveBore = 3.4;
ACE_RailHeightAboveBore = 2.84776;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 368.3;
muzzles[] = {"this"};
Expand All @@ -118,24 +114,20 @@ class CfgWeapons {
};
class R3F_HK416M_HG: R3F_HK416M {};
class R3F_HK416S_HG: R3F_HK416M_HG {
ACE_RailHeightAboveBore = 3.4;
ACE_barrelTwist = 177.8;
ACE_barrelLength = 279.4;
};
class R3F_MP5SD: Rifle_Base_F {
ACE_RailHeightAboveBore = 4.5;
ACE_RailHeightAboveBore = 4.21816;
ACE_barrelTwist = 254.0;
ACE_barrelLength = 144.78;
muzzles[] = {"this"};
};
class R3F_MP5A5: R3F_MP5SD {
ACE_RailHeightAboveBore = 4.5;
ACE_barrelTwist = 254.0;
ACE_barrelLength = 226.06;
muzzles[] = {"this"};
};
class R3F_M4S90: Rifle_Base_F {
ACE_RailHeightAboveBore = 2.2;
ACE_RailHeightAboveBore = 1.86213;
ACE_twistDirection = 0;
ACE_barrelTwist = 0;
ACE_barrelLength = 144.78;
Expand All @@ -151,17 +143,17 @@ class CfgWeapons {
ACE_barrelLength = 121.0;
muzzles[] = {"this"};
initSpeed = -1.0; // default 410
};
};
class ItemCore;
class InventoryOpticsItem_Base_F;
class R3F_AIMPOINT: ItemCore {
ACE_ScopeHeightAboveRail = 3.0;
ACE_ScopeHeightAboveRail = 3.1916;
};
class R3F_EOTECH: ItemCore {
ACE_ScopeHeightAboveRail = 3.8;
ACE_ScopeHeightAboveRail = 4.25923;
};
class R3F_J4: ItemCore {
ACE_ScopeHeightAboveRail = 3.0;
ACE_ScopeHeightAboveRail = 3.20641;
ACE_ScopeAdjust_Vertical[] = {-8, 8};
ACE_ScopeAdjust_Horizontal[] = {-8, 8};
ACE_ScopeAdjust_VerticalIncrement = 0.2;
Expand All @@ -176,13 +168,13 @@ class CfgWeapons {
};
};
class R3F_FELIN: ItemCore {
ACE_ScopeHeightAboveRail = 4.2;
ACE_ScopeHeightAboveRail = 8.13689;
};
class R3F_FELIN_FRF2: ItemCore {
ACE_ScopeHeightAboveRail = 4.0;
ACE_ScopeHeightAboveRail = 4.28091;
};
class R3F_J8: ItemCore {
ACE_ScopeHeightAboveRail = 4.4;
ACE_ScopeHeightAboveRail = 4.474;
ACE_ScopeAdjust_Vertical[] = {-10, 10};
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -197,7 +189,6 @@ class CfgWeapons {
};
};
class R3F_J8_MILDOT: R3F_J8 { // Scope rail 30 MOA
ACE_ScopeHeightAboveRail = 4.4;
ACE_ScopeAdjust_Vertical[] = {-2, 18};
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -213,7 +204,7 @@ class CfgWeapons {
};
class R3F_J10: ItemCore {
ACE_ScopeZeroRange = 1400; // Inaccurate reticle, designed to work with the vanilla ballistic.
ACE_ScopeHeightAboveRail = 4.4;
ACE_ScopeHeightAboveRail = 4.474;
ACE_ScopeAdjust_Vertical[] = {-10, 10};
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -229,7 +220,6 @@ class CfgWeapons {
};
class R3F_J10_MILDOT: R3F_J10 { // Scope rail 30 MOA
ACE_ScopeZeroRange = 100;
ACE_ScopeHeightAboveRail = 4.4;
ACE_ScopeAdjust_Vertical[] = {-2, 18};
ACE_ScopeAdjust_Horizontal[] = {-10, 10};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -244,7 +234,7 @@ class CfgWeapons {
};
};
class R3F_ZEISS: ItemCore {
ACE_ScopeHeightAboveRail = 4.6;
ACE_ScopeHeightAboveRail = 4.96547;
ACE_ScopeAdjust_Vertical[] = {0, 23};
ACE_ScopeAdjust_Horizontal[] = {-7, 7};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -259,7 +249,7 @@ class CfgWeapons {
};
};
class R3F_NF: ItemCore {
ACE_ScopeHeightAboveRail = 4.2;
ACE_ScopeHeightAboveRail = 4.30469;
ACE_ScopeAdjust_Vertical[] = {0, 30};
ACE_ScopeAdjust_Horizontal[] = {-11, 11};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -274,7 +264,7 @@ class CfgWeapons {
};
};
class R3F_NF42: ItemCore {
ACE_ScopeHeightAboveRail = 4.2;
ACE_ScopeHeightAboveRail = 4.30469;
ACE_ScopeAdjust_Vertical[] = {0, 24};
ACE_ScopeAdjust_Horizontal[] = {-9, 9};
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -289,7 +279,7 @@ class CfgWeapons {
};
};
class R3F_OB50: ItemCore {
ACE_ScopeHeightAboveRail = 4.0;
ACE_ScopeHeightAboveRail = 4.13217;
};
class InventoryMuzzleItem_Base_F;
class R3F_SILENCIEUX_HK416: ItemCore {
Expand Down
25 changes: 18 additions & 7 deletions optionals/compat_rh_acc/CfgWeapons.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,18 @@ class CfgWeapons {
/* Scopes */
class InventoryOpticsItem_Base_F;

// This would require MOA turrets
/*class RH_shortdot : ItemCore {
ACE_ScopeAdjust_Vertical[] = { -1, 25 };
ACE_ScopeAdjust_Horizontal[] = { -13, 13 };
ACE_ScopeAdjust_VerticalIncrement = 0.5;
ACE_ScopeAdjust_Unit = "MOA";
};*/
class RH_shortdot : ItemCore {
ACE_ScopeHeightAboveRail = 4.40511;
/* // This would require MOA turrets
ACE_ScopeAdjust_Vertical[] = { -1, 25 };
ACE_ScopeAdjust_Horizontal[] = { -13, 13 };
ACE_ScopeAdjust_VerticalIncrement = 0.5;
ACE_ScopeAdjust_Unit = "MOA";
*/
};

class RH_accupoint : ItemCore {
ACE_ScopeHeightAboveRail = 3.726;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -29,6 +32,7 @@ class CfgWeapons {
};

class RH_m3lr : ItemCore {
ACE_ScopeHeightAboveRail = 3.5751;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -44,6 +48,7 @@ class CfgWeapons {
};

class RH_leu_mk4 : ItemCore {
ACE_ScopeHeightAboveRail = 4.64216;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -59,6 +64,7 @@ class CfgWeapons {
};

class RH_c79 : ItemCore {
ACE_ScopeHeightAboveRail = 4.16731;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -74,6 +80,7 @@ class CfgWeapons {
};

class RH_c79_2d : ItemCore {
ACE_ScopeHeightAboveRail = 4.16731;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -89,6 +96,7 @@ class CfgWeapons {
};

class RH_anpvs10 : ItemCore {
ACE_ScopeHeightAboveRail = 2.64379;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -104,6 +112,7 @@ class CfgWeapons {
};

class RH_pas13cm : ItemCore {
ACE_ScopeHeightAboveRail = 10.601;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -119,6 +128,7 @@ class CfgWeapons {
};

class RH_pas13cmg : ItemCore {
ACE_ScopeHeightAboveRail = 10.601;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand All @@ -134,6 +144,7 @@ class CfgWeapons {
};

class RH_pas13ch : ItemCore {
ACE_ScopeHeightAboveRail = 10.6017;
ACE_ScopeAdjust_Vertical[] = { -4, 30 };
ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
ACE_ScopeAdjust_VerticalIncrement = 0.1;
Expand Down
Loading

0 comments on commit a614744

Please sign in to comment.