Compat R3F : updated with the last version 3.6 (#6664)

* requiredAddons_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

optionals/compat_r3f/CfgAmmo.hpp

@@ -2,6 +2,7 @@ class CfgAmmo {
     class Default;
     class BulletBase;
     class R3F_9x19_Ball: BulletBase { // https://github.com/acemod/ACE3/blob/master/addons/ballistics/CfgAmmo.hpp#L370
+        hit = 6; // R3F default value 13, BI default value 5
         typicalSpeed = 350; // R3F config
         airFriction = -0.00201185; // ACE3 value, default -0.001413
         ACE_caliber = 9.017;

optionals/compat_r3f/CfgMagazines.hpp

@@ -1,7 +1,7 @@
 class CfgMagazines {
     class CA_magazine;
     class R3F_securite_mag: CA_magazine {
-        scope = 0; // default 2
+        scope = 1; // Game Update 1.84: "Tweaked: Magazines can now be hidden in Virtual Arsenal by setting their scope to 1", R3F default value 2
     };
     class R3F_15Rnd_9x19_PAMAS: CA_magazine {
         initSpeed = 350; // R3F config
@@ -9,6 +9,9 @@ class CfgMagazines {
     class R3F_15Rnd_9x19_HKUSP: CA_magazine {
         initSpeed = 350; // R3F config
     };
+    class R3F_17Rnd_9x19_G17: CA_magazine {
+        initSpeed = 350; // R3F config
+    };
     class R3F_30Rnd_9x19_MP5: CA_magazine {
         initSpeed = 400; // R3F config
     };

optionals/compat_r3f/CfgWeapons.hpp

@@ -23,10 +23,10 @@ class CfgWeapons {
     class R3F_Famas_F1_M203: R3F_Famas_F1 {
         muzzles[] = {"this","Lance_Grenades"};
     };
-    class R3F_Famas_surb: R3F_Famas_F1 {
+    class R3F_Famas_surb: R3F_Famas_F1 { // R3F FAMAS Surbaissé, should be FAMAS Valorisé : http://narval34.free.fr/fiche_tech_famas.pdf
         ACE_RailHeightAboveBore = 5.08219;
-        ACE_barrelTwist = 228.6; // 1:9"
+        ACE_barrelTwist = 228.6; // 1:9" FAMAS Surbaissé, should be 1:7" FAMAS Valorisé
-        ACE_barrelLength = 450.0; // Beretta barrel
+        ACE_barrelLength = 450.0; // 3D model with Beretta barrel : FAMAS Valorisé
     };
     class R3F_Famas_surb_M203: R3F_Famas_surb {
         muzzles[] = {"this","Lance_Grenades"};
@@ -230,12 +230,27 @@ class CfgWeapons {
         ACE_barrelLength = 125.0;
         muzzles[] = {"this"};
         initSpeed = -1.0; // default 410
+        class Single: Mode_SemiAuto {
+            dispersion=0.0025; // 8.59 MOA (a square of 6.25/6.25cm at 25 meters), R3F default value 0.025 (85.94 MOA)
+        };
     };
     class R3F_HKUSP: Pistol_Base_F {
         ACE_barrelTwist = 250.0;
         ACE_barrelLength = 121.0;
         muzzles[] = {"this"};
         initSpeed = -1.0; // default 410
+        class Single: Mode_SemiAuto {
+            dispersion=0.002; // 6.88 MOA (a square of 5/5cm at 25 meters), R3F default value 0.02 (68.75 MOA)
+        };
+    };
+    class R3F_G17: Pistol_Base_F {
+        ACE_barrelTwist = 250.0;
+        ACE_barrelLength = 114.0;
+        muzzles[] = {"this"};
+        initSpeed = -1.0; // default 410
+        class Single: Mode_SemiAuto {
+            dispersion=0.0029; // R3F default value, 9.97 MOA (a square of 7.25/7.25cm at 25 meters)
+        };
     };
     class ItemCore;
     class InventoryOpticsItem_Base_F;
@@ -265,6 +280,31 @@ class CfgWeapons {
     };
     class R3F_FELIN_FRF2: ItemCore {
         ACE_ScopeHeightAboveRail = 4.28091;
+        class ItemInfo: InventoryOpticsItem_Base_F {
+            class OpticsModes {
+                class Felin {};
+                class Oeilleton: Felin {
+                    opticsID=2;
+                    opticsDisplayName="";
+                    useModelOptics=0;
+                    opticsPPEffects[]={};
+                    opticsFlare=0;
+                    opticsDisablePeripherialVision=0;
+                    opticsZoomMin=0.25;
+                    opticsZoomMax=1.25;
+                    opticsZoomInit=0.75;
+                    memoryPointCamera="eye_Oeilleton";
+                    visionMode[]={};
+                    discretefov[]={};
+                    discreteDistance[]={200};
+                    discreteDistanceInitIndex=0;
+                    distanceZoomMin=200;
+                    distanceZoomMax=200;
+                    discreteInitIndex=0;
+                    cameraDir="";
+                };
+            };
+        };
     };
     class R3F_J8: ItemCore { // http://www.scrome.com/assets/templates/flexibility/pdf/Scrome_Marksman_Scope_LTE_Datasheet_GB.pdf
         ACE_ScopeHeightAboveRail = 4.474; // Inaccurate BDC reticle, designed to work with the vanilla ballistic and R3F values.
@@ -492,6 +532,6 @@ class ACE_ATragMX_Presets {
     };
     class R3F_HK417L {
         // Profile Name, Muzzle Velocity, Zero Range, Scope Base Angle, AirFriction, Bore Height, Scope Unit, Scope Click Unit, Scope Click Number, Maximum Elevation, Dialed Elevation, Dialed Windage, Mass, Bullet Diameter, Rifle Twist, BC, Drag Model, Atmosphere Model, Muzzle Velocity vs. Temperature Interpolation, C1 Ballistic Coefficient vs. Distance Interpolation
-        preset[] = {"R3F HK417L M80", 820, 100, 0.0884448, -0.00103711, 7.62, 0, 2, 10, 120, 0, 0, 9.461, 7.82, 27.94, 0.398, 1, "ICAO", {{-15, 801},{0, 808},{10, 815},{15, 820},{25, 834},{30, 843},{35, 854}}, {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}}};
+        preset[] = {"R3F HK417L M80", 820, 100, 0.0884448, -0.00103711, 7.62, 0, 2, 10, 120, 0, 0, 9.461, 7.82, 27.94, 0.398, 1, "ICAO", {{-15, 801},{0, 808},{10, 815},{15, 820},{25, 834},{30, 843},{35, 854}}, {{200, 0.398}, {400, 0.398}, {600, 0.398}, {800, 0.39}, {1000, 0.383}, {1200, 0.379}, {1400, 0.378}}};
     };
 };

optionals/compat_r3f/config.cpp

@@ -6,7 +6,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"r3f_armes_c", "r3f_armes", "r3f_acc"};
+        requiredAddons[] = {"r3f_armes_c", "R3F_G17_addons", "r3f_acc"};
         author = ECSTRING(common,ACETeam);
         authors[] = {"Ruthberg"};
         url = ECSTRING(main,URL);