Skip to content

Commit

Permalink
Merge pull request #2211 from jonpas/integrateAsdg
Browse files Browse the repository at this point in the history
Integrated ASDG JR Optional
  • Loading branch information
ViperMaul committed Aug 27, 2015
2 parents 3db981a + d71c43b commit 5ea9814
Show file tree
Hide file tree
Showing 14 changed files with 30 additions and 55 deletions.
8 changes: 8 additions & 0 deletions addons/laserpointer/CfgJointRails.hpp
Original file line number Diff line number Diff line change
@@ -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;
};
};
1 change: 1 addition & 0 deletions addons/laserpointer/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ class CfgPatches {
#include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include "CfgJointRails.hpp"
2 changes: 1 addition & 1 deletion addons/main/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand Down
1 change: 0 additions & 1 deletion addons/optics/CfgEventHandlers.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

class Extended_PreInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preInit));
Expand Down
15 changes: 15 additions & 0 deletions addons/optics/CfgJointRails.hpp
Original file line number Diff line number Diff line change
@@ -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;
};
};
1 change: 0 additions & 1 deletion addons/optics/CfgOpticsEffect.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

class CfgOpticsEffect {
class ACE_OpticsRadBlur1 {
type = "radialblur";
Expand Down
1 change: 0 additions & 1 deletion addons/optics/CfgPreloadTextures.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#define MACRO_PRELOAD \
GVAR(BodyDay) = "*"; \
GVAR(BodyNight) = "*"; \
Expand Down
3 changes: 1 addition & 2 deletions addons/optics/CfgRscTitles.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

class RscOpticsValue;
class RscMapControl;
class RscText;
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion addons/optics/CfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

class CfgVehicles {
class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F {
Expand Down
7 changes: 3 additions & 4 deletions addons/optics/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions addons/optics/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ class CfgPatches {
#include "CfgRscTitles.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include "CfgJointRails.hpp"

#include "CfgPreloadTextures.hpp"
1 change: 0 additions & 1 deletion optionals/compat_asdg/$PBOPREFIX$

This file was deleted.

38 changes: 0 additions & 38 deletions optionals/compat_asdg/config.cpp

This file was deleted.

5 changes: 0 additions & 5 deletions optionals/compat_asdg/script_component.hpp

This file was deleted.

0 comments on commit 5ea9814

Please sign in to comment.