AB - correct mildot reticle LRPS/AMS/KHS (#3664)

* correct mildot reticle LRPS/AMS/KHS correct mildot reticle LRPS/AMS/KHS * replace 1 tab with 1 space replace 1 tab with 1 space * fix tab * ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes, same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ (4meter for 1000meter), LRPS : variable magnification / SOS : 2 magnifications
acemod · May 7, 2016 · fd8167b · fd8167b
1 parent 4a8e727
commit fd8167b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 21 deletions.
diff --git a/addons/optics/CfgWeapons.hpp b/addons/optics/CfgWeapons.hpp
@@ -228,6 +228,12 @@ class CfgWeapons {
             class OpticsModes: OpticsModes {
                 class Snip: Snip {
                     modelOptics[] = {QUOTE(PATHTOF(models\ace_optics_reticle90.p3d)),QUOTE(PATHTOF(models\ace_optics_reticle90.p3d))};
+                    useModelOptics = 1;
+                    opticsZoomInit = 0.0116;
+                    opticsZoomMax = 0.0464;
+                    opticsZoomMin = 0.0116;
+                    discreteFOV[] = {0.0464, 0.0116};
+                    opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1","ACE_OpticsRadBlur1"};
                     opticsDisablePeripherialVision = 0;
                 };
                 class Iron: Iron {};
@@ -275,9 +281,9 @@ class CfgWeapons {
                 class Snip: Snip {
                     modelOptics[] = {QUOTE(PATHTOF(models\ace_optics_reticle90.p3d)),QUOTE(PATHTOF(models\ace_optics_reticle90.p3d))};
                     useModelOptics = 1;
-                    opticsZoomInit = 0.01234;
-                    opticsZoomMax = 0.04673;
-                    opticsZoomMin = 0.01234;
+                    opticsZoomInit = 0.0116;
+                    opticsZoomMax = 0.0464;
+                    opticsZoomMin = 0.0116;
                     discreteFOV[] = {};
                     opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1","ACE_OpticsRadBlur1"};
                     opticsDisablePeripherialVision = 0;

diff --git a/addons/scopes/CfgWeapons.hpp b/addons/scopes/CfgWeapons.hpp
@@ -3,89 +3,105 @@ class CfgWeapons {
     class InventoryOpticsItem_Base_F;
 
     class optic_LRPS : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
+        ACE_ScopeAdjust_Vertical[] = {-4, 30};
+        ACE_ScopeAdjust_Horizontal[] = {-6, 6};
         ACE_ScopeAdjust_VerticalIncrement = 0.1;
         ACE_ScopeAdjust_HorizontalIncrement = 0.1;
         class ItemInfo : InventoryOpticsItem_Base_F {
             class OpticsModes {
                 class Snip {
-                    discreteDistance[] = { 100 };
+                    opticsZoomMin = 0.011;
+                    opticsZoomMax = 0.045;
+                    opticsZoomInit = 0.045;
+                    discretefov[] = {0.045, 0.011};
+                    discreteDistance[] = {100};
                     discreteDistanceInitIndex = 0;
                 };
             };
         };
     };
 
     class optic_SOS : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
+        ACE_ScopeAdjust_Vertical[] = {-4, 30};
+        ACE_ScopeAdjust_Horizontal[] = {-6, 6};
         ACE_ScopeAdjust_VerticalIncrement = 0.1;
         ACE_ScopeAdjust_HorizontalIncrement = 0.1;
         class ItemInfo : InventoryOpticsItem_Base_F {
             class OpticsModes {
                 class Snip {
-                    discreteDistance[] = { 100 };
+                    discreteDistance[] = {100};
                     discreteDistanceInitIndex = 0;
                 };
             };
         };
     };
 
     class optic_DMS : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 20 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
+        ACE_ScopeAdjust_Vertical[] = {-4, 20};
+        ACE_ScopeAdjust_Horizontal[] = {-6, 6};
         ACE_ScopeAdjust_VerticalIncrement = 0.1;
         ACE_ScopeAdjust_HorizontalIncrement = 0.1;
         class ItemInfo : InventoryOpticsItem_Base_F {
             class OpticsModes {
                 class Snip {
-                    discreteDistance[] = { 100 };
+                    discreteDistance[] = {100};
                     discreteDistanceInitIndex = 0;
                 };
             };
         };
     };
 
     class optic_AMS_base : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
+        ACE_ScopeAdjust_Vertical[] = {-4, 30};
+        ACE_ScopeAdjust_Horizontal[] = {-6, 6};
         ACE_ScopeAdjust_VerticalIncrement = 0.1;
         ACE_ScopeAdjust_HorizontalIncrement = 0.1;
         class ItemInfo : InventoryOpticsItem_Base_F {
             class OpticsModes {
                 class AMS {
-                    discreteDistance[] = { 100 };
+                    opticsZoomMin = 0.0285;
+                    opticsZoomMax = 0.085;
+                    opticsZoomInit = 0.085;
+                    discretefov[] = {0.085, 0.0285};
+                    discreteDistance[] = {100};
                     discreteDistanceInitIndex = 0;
                 };
             };
         };
     };
 
     class optic_KHS_base : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
+        ACE_ScopeAdjust_Vertical[] = {-4, 30};
+        ACE_ScopeAdjust_Horizontal[] = {-6, 6};
         ACE_ScopeAdjust_VerticalIncrement = 0.1;
         ACE_ScopeAdjust_HorizontalIncrement = 0.1;
         class ItemInfo : InventoryOpticsItem_Base_F {
             class OpticsModes {
                 class KHS {
-                    discreteDistance[] = { 100 };
+                    opticsZoomMin = 0.026;
+                    opticsZoomMax = 0.06;
+                    opticsZoomInit = 0.06;
+                    discretefov[] = {0.06, 0.026};
+                    discreteDistance[] = {100};
                     discreteDistanceInitIndex = 0;
                 };
             };
         };
     };
 
     class optic_KHS_old : ItemCore {
-        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
-        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
+        ACE_ScopeAdjust_Vertical[] = {-4, 30};
+        ACE_ScopeAdjust_Horizontal[] = {-6, 6};
         ACE_ScopeAdjust_VerticalIncrement = 0.1;
         ACE_ScopeAdjust_HorizontalIncrement = 0.1;
         class ItemInfo : InventoryOpticsItem_Base_F {
             class OpticsModes {
                 class KHS {
-                    discreteDistance[] = { 100 };
+                    opticsZoomMin = 0.026;
+                    opticsZoomMax = 0.06;
+                    opticsZoomInit = 0.06;
+                    discretefov[] = {0.06, 0.026};
+                    discreteDistance[] = {100};
                     discreteDistanceInitIndex = 0;
                 };
             };