Repair - Patch to detect GM Wheel position and selection (#10871)

* initial take at fixing GM wheel detection

* fix spelling misakes in comments

Author: lambdatiger

addons/common/functions/fnc_getWheelHitPointsWithSelections.sqf

@@ -19,7 +19,6 @@
 params ["_vehicle"];
 TRACE_1("params",_vehicle);
 
-// TODO: Fix for GM vehicles
 GVAR(wheelSelections) getOrDefaultCall [typeOf _vehicle, {
     // Get the vehicles wheel config
     private _wheels = configOf _vehicle >> "Wheels";
@@ -33,6 +32,7 @@ GVAR(wheelSelections) getOrDefaultCall [typeOf _vehicle, {
 
         private _wheelHitPoints = [];
         private _wheelHitPointSelections = [];
+        private _isGM = 1 == getNumber (configOf _vehicle >> "isgmContent");
 
         {
             private _wheelName = configName _x;
@@ -54,6 +54,20 @@ GVAR(wheelSelections) getOrDefaultCall [typeOf _vehicle, {
                 };
             } forEach _hitPointSelections;
 
+            if (_isGM) then {
+                _wheelHitPointSelection = _wheelBone + "_axis";
+                { // modified Commy's method, they tag "hitpoint_" onto their hitpoints when they have them
+                    if ((_wheelBoneNameResized != "") && {_x find _wheelBoneNameResized == 9}) exitWith {  // same as above. Requirement for physx.
+                        _wheelHitPoint = _hitPoints select _forEachIndex;
+                        TRACE_3("wheel found [GM]",_wheelName,_wheelHitPoint,_wheelHitPointSelection);
+                    };
+                } forEach _hitPointSelections;
+                if (_wheelHitPoint == "" && _vehicle isKindOf "Car") then { // takes longer but a guarantee to find the hitpoint name
+                    private _class = format ["""%1"" in getText (_x >> ""visual"")",_wheelName] configClasses (configOf _vehicle >> "Hitpoints");
+                    _wheelHitPoint = toLowerANSI configName (_class#0);
+                        TRACE_3("wheel found [GM Config)]",_wheelName,_wheelHitPoint,_wheelHitPointSelection);
+                };
+            };
 
             if (_vehicle isKindOf "Car") then {
                 // Backup method, search for the closest hitpoint to the wheel's center selection pos.

addons/repair/functions/fnc_addRepairActions.sqf

@@ -38,6 +38,11 @@ private _selectionsToIgnore = _vehicle call FUNC(getSelectionsToIgnore);
 
 // get hitpoints of wheels with their selections
 ([_vehicle] call EFUNC(common,getWheelHitPointsWithSelections)) params ["_wheelHitPoints", "_wheelHitSelections"];
+private _isGM = 1 == getNumber (configOf _vehicle >> "isgmContent");
+if (_isGM) then { // the hitpoint selection does not properly overlap
+    _hitPoints append _wheelHitPoints;
+    _hitSelections append _wheelHitSelections;
+};
 
 private _hitPointsAddedNames = [];
 private _hitPointsAddedStrings = [];
@@ -61,7 +66,11 @@ private _turretPaths = ((fullCrew [_vehicle, "gunner", true]) + (fullCrew [_vehi
     };
 
     if (_selection in _wheelHitSelections) then {
-        private _position = compile format ["_target selectionPosition ['%1', 'HitPoints', 'AveragePoint'];", _selection];
+        private _position = if (_isGM) then {
+            compile format ["_target selectionPosition ['%1', 'Memory', 'AveragePoint'];", _selection];
+        } else {
+            compile format ["_target selectionPosition ['%1', 'HitPoints', 'AveragePoint'];", _selection];
+        };
 
         TRACE_3("Adding Wheel Actions",_hitpoint,_forEachIndex,_selection);
 

addons/repair/functions/fnc_getSelectionsToIgnore.sqf

@@ -25,6 +25,7 @@ if (_type in _initializedClasses) exitWith {_initializedClasses get _type};
 private _vehCfg = configOf _vehicle;
 private _hitpointGroups = getArray (_vehCfg >> QGVAR(hitpointGroups));
 private _turretPaths = ((fullCrew [_vehicle, "gunner", true]) + (fullCrew [_vehicle, "commander", true])) apply {_x # 3};
+private _isGM = 1 == getNumber (configOf _vehicle >> "isgmContent");
 
 (getAllHitPointsDamage _vehicle) params [["_hitPoints", []], ["_hitSelections", []]];
 // get hitpoints of wheels with their selections
@@ -43,6 +44,16 @@ private _processedSelections = [];
         continue
     };
 
+    if (_isGM && {"wheel" in _selection}) then {
+        TRACE_3("Skipping GM wheels",_hitpoint,_forEachIndex,_selection);
+        /*#ifdef DEBUG_MODE_FULL
+        systemChat format ["Skipping duplicate wheel, hitpoint %1, index %2, selection %3", _hitpoint, _forEachIndex, _selection];
+        #endif*/
+        _indexesToIgnore pushBack _forEachIndex;
+        _processedSelections pushBack _selection;
+        continue
+    };
+
     if (_isWheelOrTrack && {_selection in _processedSelections || {_selection isEqualTo ""}}) then { // skip duplicate or empty selection wheel/track
         TRACE_3("Skipping duplicate Wheel/Track or empty selection",_hitpoint,_forEachIndex,_selection);
         /*#ifdef DEBUG_MODE_FULL