Merge pull request #904 from CBATeam/jr_182

Update JR for 1.82
CBATeam · Apr 14, 2018 · c3d2192 · c3d2192
2 parents 372e3ad + eb9495e
commit c3d2192
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/addons/jr/cfgweapons.hpp b/addons/jr/cfgweapons.hpp
@@ -25,6 +25,14 @@ class CfgWeapons {
             };
         };
     };
+    class launch_MRAWS_base_F: Launcher_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.15, 0.5};
+                iconScale = 0.25;
+            };
+        };
+    };
 
     class EBR_base_F: Rifle_Long_Base_F {
         class WeaponSlotsInfo;

diff --git a/addons/jr/config.cpp b/addons/jr/config.cpp
@@ -17,7 +17,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"A3_Weapons_F", "A3_Weapons_F_Mark", "A3_Weapons_F_Exp", "CBA_jr_prep"};
+        requiredAddons[] = {"CBA_jr_prep"};
         version = VERSION;
         authors[] = {"Robalo"};
     };

diff --git a/addons/jr_prep/config.cpp b/addons/jr_prep/config.cpp
@@ -8,7 +8,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"A3_Weapons_F", "A3_Weapons_F_Mark", "A3_Weapons_F_Exp"};
+        requiredAddons[] = {"A3_Data_F_Tank_Loadorder"};
         version = VERSION;
     };
 };
@@ -35,6 +35,11 @@ class CfgWeapons {
             delete PointerSlot;
         };
     };
+    class launch_MRAWS_base_F : Launcher_Base_F {
+        class WeaponSlotsInfo : WeaponSlotsInfo {
+            delete PointerSlot;
+        };
+    };
 
     class EBR_base_F: Rifle_Long_Base_F {
         class WeaponSlotsInfo;