Arma 1.82 compat (#6201)

* Arma 1.82 compat

* Add tank to required addons

addons/cargo/CfgVehicles.hpp

@@ -330,6 +330,9 @@ class CfgVehicles {
         GVAR(size) = 2; // 1 = small, 2 = large
         GVAR(canLoad) = 1;
     };
+    class Land_RepairDepot_01_base_F: ReammoBox_F { // TanksDLC - Repair Depo Thing (probably too big to safely unload)
+        GVAR(canLoad) = 0;
+    };
     //"Supply Box" - Small Pallets
     class B_supplyCrate_F: ReammoBox_F {
         GVAR(size) = 6;

addons/frag/CfgAmmo.hpp

@@ -5,8 +5,8 @@
 class CfgAmmo {
 
     // ~~~~ Bombs:
-    class LaserBombCore;
+    class ammo_Bomb_LaserGuidedBase;
-    class Bo_GBU12_LGB: LaserBombCore {
+    class Bo_GBU12_LGB: ammo_Bomb_LaserGuidedBase {
         GVAR(enabled) = 1;
 
         GVAR(classes)[] = {QGVAR(large), QGVAR(large), QGVAR(large_HD), QGVAR(large), QGVAR(huge), QGVAR(huge_HD), QGVAR(huge)};
@@ -15,7 +15,7 @@ class CfgAmmo {
         GVAR(gurney_c) = 2320;
         GVAR(gurney_k) = 1/2;
     };
-    class Bomb_04_F: LaserBombCore {
+    class Bomb_04_F: ammo_Bomb_LaserGuidedBase {
         GVAR(enabled) = 1;
 
         GVAR(classes)[] = {QGVAR(large), QGVAR(large), QGVAR(large_HD), QGVAR(large), QGVAR(huge), QGVAR(huge_HD), QGVAR(huge)};

addons/main/config.cpp

@@ -20,6 +20,7 @@ class CfgPatches {
             "A3_Data_F_Argo_Loadorder",
             "A3_Data_F_Patrol_Loadorder",
             "A3_Data_F_Orange_Loadorder",
+            "A3_Data_F_Tank_Loadorder",
 
             // Vanilla
             "a3_3den",

addons/main/script_mod.hpp

@@ -9,8 +9,8 @@
 #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 1.78
+#define REQUIRED_VERSION 1.82
-#define REQUIRED_CBA_VERSION {3,5,0}
+#define REQUIRED_CBA_VERSION {3,6,0}
 
 #ifdef COMPONENT_BEAUTIFIED
     #define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)

addons/realisticnames/CfgMagazines.hpp

@@ -246,23 +246,23 @@ class CfgMagazines {
         displayNameShort = "125mm MP-T";
     };
 
-    class 32Rnd_120mm_APFSDS_shells;
+    class 20Rnd_125mm_APFSDS;
-    class 24Rnd_125mm_APFSDS: 32Rnd_120mm_APFSDS_shells {
+    class 24Rnd_125mm_APFSDS: 20Rnd_125mm_APFSDS {
         displayNameShort = "125mm AP";
     };
 
-    class 32Rnd_120mm_APFSDS_shells_Tracer_Red;
+    class 20Rnd_125mm_APFSDS_T_Red;
-    class 24Rnd_125mm_APFSDS_T_Red: 32Rnd_120mm_APFSDS_shells_Tracer_Red {
+    class 24Rnd_125mm_APFSDS_T_Red: 20Rnd_125mm_APFSDS_T_Red {
         displayNameShort = "125mm AP-T";
     };
 
-    class 32Rnd_120mm_APFSDS_shells_Tracer_Green;
+    class 20Rnd_125mm_APFSDS_T_Green;
-    class 24Rnd_125mm_APFSDS_T_Green: 32Rnd_120mm_APFSDS_shells_Tracer_Green {
+    class 24Rnd_125mm_APFSDS_T_Green: 20Rnd_125mm_APFSDS_T_Green {
         displayNameShort = "125mm AP-T";
     };
 
-    class 32Rnd_120mm_APFSDS_shells_Tracer_Yellow;
+    class 20Rnd_125mm_APFSDS_T_Yellow;
-    class 24Rnd_125mm_APFSDS_T_Yellow: 32Rnd_120mm_APFSDS_shells_Tracer_Yellow {
+    class 24Rnd_125mm_APFSDS_T_Yellow: 20Rnd_125mm_APFSDS_T_Yellow {
         displayNameShort = "125mm AP-T";
     };
 

addons/realisticnames/CfgWeapons.hpp

@@ -413,9 +413,7 @@ class CfgWeapons {
     };
 
     // bomb
-    class Bomb_04_Plane_CAS_01_F: RocketPods {
+    class Bomb_04_Plane_CAS_01_F;
-        //displayName = "";
-    };
     class Bomb_03_Plane_CAS_02_F: Bomb_04_Plane_CAS_01_F {
         displayName = "FAB-250M-54";
     };

addons/rearm/CfgAmmo.hpp

@@ -178,17 +178,18 @@ class CfgAmmo {
         GVAR(dummy) = QGVAR(Bo_Mk82);
     };
 
-    class Bo_GBU12_LGB : LaserBombCore {
+    class ammo_Bomb_LaserGuidedBase: LaserBombCore {};
+    class Bo_GBU12_LGB: ammo_Bomb_LaserGuidedBase {
         GVAR(caliber) = 250; // Default caliber for bombs
         GVAR(dummy) = QGVAR(Bo_GBU12_LGB);
     };
 
-    class Bomb_04_F : LaserBombCore {
+    class Bomb_04_F: ammo_Bomb_LaserGuidedBase {
         GVAR(caliber) = 250; // Default caliber for bombs
         GVAR(dummy) = QGVAR(Bomb_04_F);
     };
 
-    class Bomb_03_F : Bomb_04_F {
+    class Bomb_03_F: ammo_Bomb_LaserGuidedBase {
         GVAR(dummy) = QGVAR(Bomb_03_F);
     };
 };

addons/repair/CfgVehicles.hpp

@@ -405,6 +405,16 @@ class CfgVehicles {
 
     // disable vanilla repair
     // "getNumber (_x >> ""transportRepair"") > 0" configClasses (configFile >> "CfgVehicles")
+    class ReammoBox_F;
+    class Land_RepairDepot_01_base_F: ReammoBox_F { // TanksDLC - Repair Depo Thing
+        GVAR(canRepair) = 1;
+        transportRepair = 0; 
+    };
+    class Van_02_base_F;
+    class Van_02_service_base_F: Van_02_base_F { // OrangeDLC
+        GVAR(canRepair) = 1;
+        transportRepair = 0;  
+    };
 
     class Slingload_01_Base_F;
     class B_Slingload_01_Repair_F: Slingload_01_Base_F {

addons/repair/XEH_preInit.sqf

@@ -22,14 +22,18 @@ if (isServer) then {
         if (isNil "_spareTracks") then {
             _spareTracks = [0, 1] select (_vehicle isKindOf "Tank"); // must match eden attribute default
         };
+        if (_spareTracks > 0) then {
             [_vehicle, _spareTracks, "ACE_Track"] call FUNC(addSpareParts);
+        };
 
         private _spareWheels = _vehicle getVariable QGVAR(editorLoadedWheels);
         if (isNil "_spareWheels") then {
             _spareWheels = [0, 1] select (_vehicle isKindOf "Car"); // must match eden attribute default
         };
+        if (_spareWheels > 0) then {
             [_vehicle, _spareWheels, "ACE_Wheel"] call FUNC(addSpareParts);
         };
+    };
 
     ["Tank", "initPost", _fnc_addSpareItems] call CBA_fnc_addClassEventHandler;
     ["Car", "initPost", _fnc_addSpareItems] call CBA_fnc_addClassEventHandler;

addons/repair/functions/fnc_isInRepairFacility.sqf

@@ -20,11 +20,10 @@ TRACE_1("params",_object);
 
 private _position = getPosASL _object;
 private _isInBuilding = false;
-private _repairFacility = [];
 
 private _objects = (lineIntersectsWith [_object modelToWorldVisual [0, 0, (_position select 2)], _object modelToWorldVisual [0, 0, (_position select 2) +10], _object]);
 {
-    if (((typeOf _x) in _repairFacility) || (_x getVariable ["ACE_isRepairFacility",0]) > 0) exitWith {
+    if (_x getVariable ["ACE_isRepairFacility", getNumber (configFile >> "CfgVehicles" >> typeOf _x >> QGVAR(canRepair))] > 0) exitWith {
         _isInBuilding = true;
     };
 } forEach _objects;
@@ -32,7 +31,7 @@ private _objects = (lineIntersectsWith [_object modelToWorldVisual [0, 0, (_posi
 if (!_isInBuilding) then {
     _objects = position _object nearObjects 7.5;
     {
-        if (((typeOf _x) in _repairFacility) || (_x getVariable ["ACE_isRepairFacility",0]) > 0) exitWith {
+        if (_x getVariable ["ACE_isRepairFacility", getNumber (configFile >> "CfgVehicles" >> typeOf _x >> QGVAR(canRepair))] > 0) exitWith {
             _isInBuilding = true;
         };
     } forEach _objects;