Update checkScopes.sqf (#11294)

* Update checkScopes.sqf

* Unique optics, add parent to diag

Author: PabstMirror

addons/scopes/dev/checkScopes.sqf

@@ -1,8 +1,14 @@
 // [] call compileScript ["\z\ace\addons\scopes\dev\checkScopes.sqf"];
 
 
+private _uniqueOptics = createHashMap;
 private _optics = "getNumber (_x >> 'scope') > 0" configClasses (configFile >> "CfgWeapons");
 _optics = _optics select {(getNumber (_x >> 'ItemInfo' >> 'type')) == 201};
+_optics = _optics select {
+    private _model = getText (_x >> "model");
+    private _configOffset = getNumber (_x >> "ACE_ScopeHeightAboveRail");
+    !(_uniqueOptics set [[toLower _model, _configOffset], true])
+};
 diag_log text format ["** Checking %1 scopes **", count _optics];
 
 private _fnc_checkConfig = {
@@ -33,17 +39,23 @@ private _fnc_checkConfig = {
     private _configOffset = getNumber (_config >> "ACE_ScopeHeightAboveRail");
 
     if ((abs (_actualOffset - _configOffset)) > 0.1) then {
-        diag_log text format ["Mismatch %1 - Actual %2 vs Config %3", configName _config, _actualOffset, _configOffset];
+        private _parent = configName inheritsFrom _config;
+        diag_log text format ["Mismatch %1:%2 - Actual %3 vs Config %4", configName _config, _parent, _actualOffset, _configOffset];
         [_config, true] call _fnc_checkConfig;
     };
 } forEach _optics;
 
 
 
 
+private _uniqueRifles = createHashMap;
 private _rifles = "getNumber (_x >> 'scope') > 0" configClasses (configFile >> "CfgWeapons");
 _rifles = _rifles select {(getNumber (_x >> 'type')) == 1};
-_rifles = _rifles select {(configName _x) == (getText (_x >> 'baseWeapon'))};
+_rifles = _rifles select {
+    private _model = getText (_x >> "model");
+    private _configOffset = getNumber (_x >> "ACE_RailHeightAboveBore");
+    !(_uniqueRifles set [[toLower _model, _configOffset], true])
+};
 diag_log text format ["** Checking %1 weapons **", count _rifles];
 
 private _fnc_checkConfig = {
@@ -64,15 +76,27 @@ private _fnc_checkConfig = {
     deleteVehicle _weaponObj;
     _xOffset
 };
+
 {
     private _config = _x;
-    if ((compatibleItems [configName _config, "CowsSlot"]) isEqualTo []) then { continue }; // e.g. arifle_SDAR_F has no scopes
+    private _slots = configProperties [_config >> "WeaponSlotsInfo", "isClass _x"];
+    private _opticSlot = "CowsSlot";
+    {
+        if (getText (_x >> "linkProxy") == "\a3\data_f\proxies\weapon_slots\TOP") then {
+            _opticSlot = configName _x;
+        };
+    } forEach _slots;
+    if ((compatibleItems [configName _config, _opticSlot]) isEqualTo []) then { 
+        diag_log text format ["note: %1 has no compatible items for %2", configName _config, _opticSlot];
+        continue  // e.g. arifle_SDAR_F has no scopes
+    };
     private _actualOffset = [_config, false] call _fnc_checkConfig;
     if (_actualOffset == -999) then { continue };
     private _configOffset = getNumber (_config >> "ACE_RailHeightAboveBore");
 
     if ((abs (_actualOffset - _configOffset)) > 0.1) then {
-        diag_log text format ["Mismatch %1 - Actual %2 vs Config %3", configName _config, _actualOffset, _configOffset];
+        private _parent = configName inheritsFrom _config;
+        diag_log text format ["Mismatch %1:%2 - Actual %3 vs Config %4", configName _config, _parent, _actualOffset, _configOffset];
         [_config, true] call _fnc_checkConfig;
     };
 } forEach _rifles;