Merge pull request #2211 from jonpas/integrateAsdg

Integrated ASDG JR Optional

addons/laserpointer/CfgJointRails.hpp

@@ -0,0 +1,8 @@
+class asdg_SlotInfo;
+class asdg_FrontSideRail: asdg_SlotInfo {
+    class compatibleItems {
+        ACE_acc_pointer_red = 1;
+        ACE_acc_pointer_green = 1;
+        ACE_acc_pointer_green_IR = 1;
+    };
+};

addons/laserpointer/config.cpp

@@ -16,3 +16,4 @@ class CfgPatches {
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
+#include "CfgJointRails.hpp"

addons/main/config.cpp

@@ -541,7 +541,7 @@ class CfgPatches {
             "a3_weapons_f_vests",
             "a3data",
             "map_vr",
-            "extended_eventhandlers", "CBA_UI", "CBA_XEH", "CBA_XEH_A3"
+            "extended_eventhandlers", "cba_ui", "cba_xeh", "cba_xeh_a3", "cba_jr"
         };
         author[] = {"ACE Team"};
         authorUrl = "";

addons/optics/CfgEventHandlers.hpp

@@ -1,4 +1,3 @@
-
 class Extended_PreInit_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_FILE(XEH_preInit));

addons/optics/CfgJointRails.hpp

@@ -0,0 +1,15 @@
+class asdg_OpticRail;
+class asdg_OpticRail1913: asdg_OpticRail {
+    class compatibleItems {
+        ACE_optic_Hamr_2D = 1;
+        ACE_optic_Hamr_PIP = 1;
+        ACE_optic_Arco_2D = 1;
+        ACE_optic_Arco_PIP = 1;
+        ACE_optic_MRCO_2D = 1;
+        ACE_optic_MRCO_PIP = 1;
+        ACE_optic_SOS_2D = 1;
+        ACE_optic_SOS_PIP = 1;
+        ACE_optic_LRPS_2D = 1;
+        ACE_optic_LRPS_PIP = 1;
+    };
+};

addons/optics/CfgOpticsEffect.hpp

@@ -1,4 +1,3 @@
-
 class CfgOpticsEffect {
     class ACE_OpticsRadBlur1 {
         type = "radialblur";

addons/optics/CfgPreloadTextures.hpp

@@ -1,4 +1,3 @@
-
 #define MACRO_PRELOAD \
     GVAR(BodyDay) = "*"; \
     GVAR(BodyNight) = "*"; \

addons/optics/CfgRscTitles.hpp

@@ -1,4 +1,3 @@
-
 class RscOpticsValue;
 class RscMapControl;
 class RscText;
@@ -111,7 +110,7 @@ class RscInGameUI {
             idc = 1713011;
             x = "safeZoneXAbs + safeZoneWAbs - (safezoneX - safeZoneXABS) * ((getResolution select 4)/(16/3))";
              colorBackground[] = {0,0,0,1};
-        };     
+        };
     };
 
     class ACE_RscWeapon_Hamr: ACE_RscWeapon_base {

addons/optics/CfgVehicles.hpp

@@ -1,4 +1,3 @@
-
 class CfgVehicles {
     class Box_NATO_Support_F;
     class ACE_Box_Misc: Box_NATO_Support_F {

addons/optics/CfgWeapons.hpp

@@ -1,18 +1,17 @@
-
 class CfgWeapons {
     class ItemCore;
     class InventoryOpticsItem_Base_F;
     class Default;
-    
+
     class Binocular: Default {
         forceOptics = 0;             // Allow using compass with Binocular
         opticsZoomMin = 0.056889;     // 5.25x power
         opticsZoomMax = 0.056889;     // 9 px/mil
-        modelOptics = "\z\ace\addons\optics\models\NWD_M22_5x"; // 7° horizontal field of view
+        modelOptics = "\z\ace\addons\optics\models\NWD_M22_5x"; // 7 degrees horizontal field of view
         visionMode[] = {"Normal"}; // Can't use nvgs with binoculars any more than you can with scopes
         // Fix AI using Binocs on short range - #18737
         // minRange = 300; // 300 = uses Rangefinder often (runs a few meters, stops, uses RF, repeats)
-        minRange = 500; //500 = seem almost never use it..? 
+        minRange = 500; //500 = seem almost never use it..?
         minRangeProbab = 0.001;
         midRange = 1000;
         midRangeProbab = 0.01;

addons/optics/config.cpp

@@ -30,5 +30,6 @@ class CfgPatches {
 #include "CfgRscTitles.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
+#include "CfgJointRails.hpp"
 
 #include "CfgPreloadTextures.hpp"

optionals/compat_asdg/$PBOPREFIX$

@@ -1 +0,0 @@
-z\ace\addons\compat_asdg

optionals/compat_asdg/config.cpp

@@ -1,38 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
-    class ADDON {
-        units[] = {};
-        weapons[] = {};
-        requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"asdg_jointrails","ace_laserpointer","ace_optics"};
-        author[]={"OnkelDisMaster"};
-        authorUrl = "http://2.xn--gebirgsjgerkompanie-nwb.de/";
-        VERSION_CONFIG;
-    };
-};
-
-class asdg_SlotInfo;
-class asdg_FrontSideRail: asdg_SlotInfo {
-    class compatibleItems {
-        ACE_acc_pointer_red = 1;
-        ACE_acc_pointer_green = 1;
-        ACE_acc_pointer_green_IR = 1;
-    };
-};
-
-class asdg_OpticRail;
-class asdg_OpticRail1913: asdg_OpticRail {
-    class compatibleItems {
-        ACE_optic_Hamr_2D = 1;
-        ACE_optic_Hamr_PIP = 1;
-        ACE_optic_Arco_2D = 1;
-        ACE_optic_Arco_PIP = 1;
-        ACE_optic_MRCO_2D = 1;
-        ACE_optic_MRCO_PIP = 1;
-        ACE_optic_SOS_2D = 1;
-        ACE_optic_SOS_PIP = 1;
-        ACE_optic_LRPS_2D = 1;
-        ACE_optic_LRPS_PIP = 1;
-    };
-};

optionals/compat_asdg/script_component.hpp

@@ -1,5 +0,0 @@
-#define COMPONENT asdg_comp
-
-#include "\z\ace\addons\main\script_mod.hpp"
-
-#include "\z\ace\addons\main\script_macros.hpp"