From eb16901df6902da24563ad78b8020830494f2f84 Mon Sep 17 00:00:00 2001 From: J3aLeiNe Date: Thu, 7 Apr 2016 14:41:41 +0200 Subject: [PATCH 1/4] correct mildot reticle LRPS/AMS/KHS correct mildot reticle LRPS/AMS/KHS --- addons/scopes/CfgWeapons.hpp | 52 +++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/addons/scopes/CfgWeapons.hpp b/addons/scopes/CfgWeapons.hpp index 442d4c39d06..d7ac71d6b62 100644 --- a/addons/scopes/CfgWeapons.hpp +++ b/addons/scopes/CfgWeapons.hpp @@ -3,14 +3,18 @@ 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; }; }; @@ -18,14 +22,14 @@ class CfgWeapons { }; 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; }; }; @@ -33,14 +37,14 @@ class CfgWeapons { }; 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; }; }; @@ -48,14 +52,18 @@ class CfgWeapons { }; 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; }; }; @@ -63,14 +71,18 @@ class CfgWeapons { }; 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; }; }; @@ -78,14 +90,18 @@ class CfgWeapons { }; 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; }; }; From 6dc3eaedc84597bb4eb3c8576becdb24acc9dc63 Mon Sep 17 00:00:00 2001 From: J3aLeiNe Date: Thu, 7 Apr 2016 15:31:29 +0200 Subject: [PATCH 2/4] replace 1 tab with 1 space replace 1 tab with 1 space --- addons/scopes/CfgWeapons.hpp | 56 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/addons/scopes/CfgWeapons.hpp b/addons/scopes/CfgWeapons.hpp index d7ac71d6b62..42aa0a5fcb4 100644 --- a/addons/scopes/CfgWeapons.hpp +++ b/addons/scopes/CfgWeapons.hpp @@ -10,12 +10,12 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class Snip { - opticsZoomMin = 0.011; - opticsZoomMax = 0.045; - opticsZoomInit = 0.045; - discretefov[] = {0.045, 0.011}; - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + opticsZoomMin = 0.011; + opticsZoomMax = 0.045; + opticsZoomInit = 0.045; + discretefov[] = {0.045, 0.011}; + discreteDistance[] = {100}; + discreteDistanceInitIndex = 0; }; }; }; @@ -29,8 +29,8 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class Snip { - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + discreteDistance[] = {100}; + discreteDistanceInitIndex = 0; }; }; }; @@ -44,8 +44,8 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class Snip { - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + discreteDistance[] = {100}; + discreteDistanceInitIndex = 0; }; }; }; @@ -59,12 +59,12 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class AMS { - opticsZoomMin = 0.0285; - opticsZoomMax = 0.085; - opticsZoomInit = 0.085; - discretefov[] = {0.085, 0.0285}; - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + opticsZoomMin = 0.0285; + opticsZoomMax = 0.085; + opticsZoomInit = 0.085; + discretefov[] = {0.085, 0.0285}; + discreteDistance[] = {100}; + discreteDistanceInitIndex = 0; }; }; }; @@ -78,12 +78,12 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class KHS { - opticsZoomMin = 0.026; - opticsZoomMax = 0.06; - opticsZoomInit = 0.06; - discretefov[] = {0.06, 0.026}; - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + opticsZoomMin = 0.026; + opticsZoomMax = 0.06; + opticsZoomInit = 0.06; + discretefov[] = {0.06, 0.026}; + discreteDistance[] = {100}; + discreteDistanceInitIndex = 0; }; }; }; @@ -97,12 +97,12 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class KHS { - opticsZoomMin = 0.026; - opticsZoomMax = 0.06; - opticsZoomInit = 0.06; - discretefov[] = {0.06, 0.026}; - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + opticsZoomMin = 0.026; + opticsZoomMax = 0.06; + opticsZoomInit = 0.06; + discretefov[] = {0.06, 0.026}; + discreteDistance[] = {100}; + discreteDistanceInitIndex = 0; }; }; }; From b86baa6551fd8c4bab3c63ba585a00453c2800e4 Mon Sep 17 00:00:00 2001 From: J3aLeiNe Date: Thu, 7 Apr 2016 18:41:09 +0200 Subject: [PATCH 3/4] fix tab --- addons/scopes/CfgWeapons.hpp | 62 ++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/addons/scopes/CfgWeapons.hpp b/addons/scopes/CfgWeapons.hpp index 42aa0a5fcb4..b42e3442826 100644 --- a/addons/scopes/CfgWeapons.hpp +++ b/addons/scopes/CfgWeapons.hpp @@ -1,7 +1,7 @@ class CfgWeapons { class ItemCore; class InventoryOpticsItem_Base_F; - + class optic_LRPS : ItemCore { ACE_ScopeAdjust_Vertical[] = {-4, 30}; ACE_ScopeAdjust_Horizontal[] = {-6, 6}; @@ -10,12 +10,12 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class Snip { - opticsZoomMin = 0.011; - opticsZoomMax = 0.045; - opticsZoomInit = 0.045; - discretefov[] = {0.045, 0.011}; - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + opticsZoomMin = 0.011; + opticsZoomMax = 0.045; + opticsZoomInit = 0.045; + discretefov[] = {0.045, 0.011}; + discreteDistance[] = {100}; + discreteDistanceInitIndex = 0; }; }; }; @@ -29,8 +29,8 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class Snip { - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + discreteDistance[] = {100}; + discreteDistanceInitIndex = 0; }; }; }; @@ -44,13 +44,13 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class Snip { - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + discreteDistance[] = {100}; + discreteDistanceInitIndex = 0; }; }; }; }; - + class optic_AMS_base : ItemCore { ACE_ScopeAdjust_Vertical[] = {-4, 30}; ACE_ScopeAdjust_Horizontal[] = {-6, 6}; @@ -59,17 +59,17 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class AMS { - opticsZoomMin = 0.0285; - opticsZoomMax = 0.085; - opticsZoomInit = 0.085; - discretefov[] = {0.085, 0.0285}; - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + 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}; @@ -78,12 +78,12 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class KHS { - opticsZoomMin = 0.026; - opticsZoomMax = 0.06; - opticsZoomInit = 0.06; - discretefov[] = {0.06, 0.026}; - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + opticsZoomMin = 0.026; + opticsZoomMax = 0.06; + opticsZoomInit = 0.06; + discretefov[] = {0.06, 0.026}; + discreteDistance[] = {100}; + discreteDistanceInitIndex = 0; }; }; }; @@ -97,12 +97,12 @@ class CfgWeapons { class ItemInfo : InventoryOpticsItem_Base_F { class OpticsModes { class KHS { - opticsZoomMin = 0.026; - opticsZoomMax = 0.06; - opticsZoomInit = 0.06; - discretefov[] = {0.06, 0.026}; - discreteDistance[] = {100}; - discreteDistanceInitIndex = 0; + opticsZoomMin = 0.026; + opticsZoomMax = 0.06; + opticsZoomInit = 0.06; + discretefov[] = {0.06, 0.026}; + discreteDistance[] = {100}; + discreteDistanceInitIndex = 0; }; }; }; From cbb045884c3ce32b5cdf9578d1862f36c19885fd Mon Sep 17 00:00:00 2001 From: J3aLeiNe Date: Sun, 24 Apr 2016 10:27:08 +0200 Subject: [PATCH 4/4] ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- addons/optics/CfgWeapons.hpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/optics/CfgWeapons.hpp b/addons/optics/CfgWeapons.hpp index 1be66d3aa25..2089a1dc808 100644 --- 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;