Merge branch 'master' into Minor-brain-improvements

Author: jokoho48

.gitignore

@@ -6,17 +6,11 @@ keys/*
 releases/*
 *.pbo
 *.bisign
-
 build.bat
-
 lint.bat
-
 sqf/*
-
 tools/nodejs_tools/node_modules
-
 .vscode/
-
 *.sqfc
-
-.hemttout/
+.hemttout/
+.hemttprivatekey

addons/danger/XEH_preInit.sqf

@@ -41,7 +41,17 @@ if (isNil QGVAR(dangerUntil)) then {
                 && {_x getVariable [QGVAR(enableGroupReinforce), false]}
                 && {(_x getVariable [QGVAR(enableGroupReinforceTime), -1]) < time }
             ) then {
-                [_leader, [getPosASL _unit, (_leader targetKnowledge _target) select 6] select (_leader knowsAbout _target > 1.5)] call FUNC(tacticsReinforce);
+                
+                // get pos of enemy if available
+                private _pos = [getPosASL _unit, (_unit targetKnowledge _target) select 6] select (_unit knowsAbout _target > 1.5);
+
+                // check for zero pos
+                if (_pos isEqualTo [0, 0, 0]) then {_pos = getPosASL _unit;};
+                
+                // find free space
+                private _adjustPos = _pos findEmptyPosition [5, 35, "Land_BagBunker_Large_F"];
+                if (_adjustPos isNotEqualTo []) then {_pos = _adjustPos;};
+                [_leader, _pos] call FUNC(tacticsReinforce);
             };
 
             // reorientate group

addons/danger/config.cpp

@@ -2,7 +2,7 @@
 class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
-        units[] = {QGVAR(SetRadio), QGVAR(DisableAI), QGVAR(DisableGroupAI)};
+        units[] = {QGVAR(SetRadio), QGVAR(DisableAI), QGVAR(ConfigureGroupAI)};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"lambs_main"};

addons/danger/functions/fnc_brainEngage.sqf

@@ -47,8 +47,7 @@ if (
     isNull _target
     || _stealth
     || _holdFire
-    || (speed _target) > 20
-    || {(_unit knowsAbout _target) isEqualTo 0}
+    || {(speed _target) > 20 || (_unit knowsAbout _target) isEqualTo 0}
     || {(getUnitState _unit) isEqualTo "PLANNING"}
 ) exitWith {
     _timeout
@@ -66,11 +65,11 @@ if (
 ) exitWith {
     _unit setVariable ["ace_medical_ai_lastFired", CBA_missionTime]; // ACE3
     [_unit, _target] call EFUNC(main,doAssault);
-    _timeout + 0.4
+    _timeout
 };
 
 // set low stance
-if ((getSuppression _unit) isEqualTo 0) then {
+if ((getSuppression _unit) isNotEqualTo 0 && (stance _unit) isEqualTo "STAND") then {
     _unit setUnitPosWeak "MIDDLE";
 };
 
@@ -92,7 +91,6 @@ if (
         _posASL set [2, 0.5];
         _posASL = AGLToASL _posASL
     };
-    _unit forceSpeed 1;
     [_unit, _posASL vectorAdd [0, 0, 0.8], true] call EFUNC(main,doSuppress);
     _timeout + 3
 };

addons/danger/functions/fnc_brainVehicle.sqf

@@ -83,8 +83,7 @@ if (_artillery) exitWith {
 
     // mortars fire rounds
     private _mortarTime = _vehicle getVariable [QEGVAR(main,mortarTime), 0];
-    if (_attack && {_vehicle isKindOf "StaticMortar"} && {unitReady _vehicle} && {_mortarTime < time} && {isTouchingGround _dangerCausedBy}) then {
-
+    if (_attack && {_vehicle isKindOf "StaticMortar"} && {unitReady _vehicle} && {_mortarTime < time} && {isTouchingGround _dangerCausedBy} && {!(_dangerCausedBy isKindOf "ArtilleryTarget")}) then {
         // delay
         _timeout = _timeout + 2;
         _vehicle doWatch _dangerPos;
@@ -109,7 +108,7 @@ if (_artillery) exitWith {
         };
 
         // check night
-        if ( RND(0.2) && { _unit call EFUNC(main,isNight) } && { _flareIndex isNotEqualTo -1 } ) then {
+        if ( RND(0.2) && { ((getPos _unit) getEnvSoundController "night") isEqualTo 1 } && { _flareIndex isNotEqualTo -1 } ) then {
             _dangerPos = _dangerPos getPos [-50 + random 100, (_vehicle getDir _dangerPos) - 45 + random 90];
             _shell = _ammo select _flareIndex;
             _dangerRound = false;
@@ -120,7 +119,7 @@ if (_artillery) exitWith {
         if ( _dangerRound || { !(_dangerPos inRangeOfArtillery [[_vehicle], _shell]) } ) exitWith {};
 
         // execute fire command
-        _vehicle commandArtilleryFire [_dangerPos getPos [30 + random 80, (_dangerPos getDir _vehicle) - 10 + random 20], _shell, 1 + random 2];
+        _vehicle commandArtilleryFire [_dangerPos getPos [30 + random 100, (_dangerPos getDir _vehicle) - 20 + random 40], _shell, 1 + random 2];
         _vehicle setVariable [QEGVAR(main,mortarTime), time + 24 + random 66];
         _unit setVariable [QEGVAR(main,currentTask), "Mortar Fire", EGVAR(main,debug_functions)];
         if (_repeatRounds) then {
@@ -131,8 +130,8 @@ if (_artillery) exitWith {
                         _vehicle commandArtilleryFire [_dangerPos, _shell, ( 2 + random 1 ) min ((gunner _vehicle) ammo (currentMuzzle (gunner _vehicle)))];
                     };
                 },
-                [_vehicle, _dangerPos, _shell],
-                18 + random 6
+                [_vehicle, _dangerPos getPos [15 + random 100, (_vehicle getDir _dangerPos) - 10 + random 20], _shell],
+                18 + random 8
             ] call CBA_fnc_waitAndExecute;
         };
     };

addons/danger/functions/fnc_contact.sqf

@@ -77,14 +77,14 @@ if (count _units > 2) then {
 ] call CBA_fnc_waitAndExecute;
 
 // units stealthy or indoor units stay inside
-if (_stealth || {[_unit] call EFUNC(main,isIndoor)}) then {
+if ((_unit checkAIFeature "PATH") && (_stealth || {[_unit] call EFUNC(main,isIndoor)})) then {
     private _buildings = [leader _unit, 35, true, true] call EFUNC(main,findBuildings);
     _group setVariable [QEGVAR(main,groupMemory), _buildings, false];
 };
 
 // drop low
 {
-    if ((unitPos _x) isEqualTo "Auto") then {_x setUnitPosWeak "DOWN";};
+    if ((unitPos _x) isEqualTo "Auto") then {_x setUnitPosWeak "MIDDLE";};
 } forEach _units;
 
 // leader seeks cover

addons/danger/functions/fnc_tacticsAssault.sqf

@@ -68,7 +68,7 @@ if (_units isEqualTo []) then {
 if (_units isEqualTo []) exitWith {false};
 
 // sort potential targets
-private _buildings = [_target, 28, true, true, true] call EFUNC(main,findBuildings);
+private _buildings = [_target, 28, true, true] call EFUNC(main,findBuildings);
 
 // more than 25 building positions. Reduce size!
 if (count _buildings > 25) then {

addons/danger/functions/fnc_tacticsAssess.sqf

@@ -66,7 +66,7 @@ if !(_enemies isEqualTo [] || {_unitCount < random 4}) then {
     private _eyePos = eyePos _unit;
 
     // communicate
-    [_unit, selectRandom _enemies] call EFUNC(main,doShareInformation);
+    [_unit, _enemies select 0] call EFUNC(main,doShareInformation);
 
     // vehicle response
     private _tankTarget = _enemies findIf {
@@ -218,7 +218,7 @@ if !(GVAR(disableAIFindStaticWeapons)) then {
 };
 
 // no plan ~ exit with no executable plan
-if (_plan isEqualTo [] || {_pos isEqualTo []}) exitWith {
+if (_plan isEqualTo [] || {_pos isEqualTo []} || {_pos isEqualTo [0, 0, 0]}) exitWith {
 
     // holding tactics
     [_unit] call FUNC(tacticsHold);
@@ -246,27 +246,27 @@ _plan = selectRandom _plan;
 switch (_plan) do {
     case TACTICS_FLANK: {
         // flank
-        [{_this call FUNC(tacticsFlank)}, [_group, _pos], 22 + random 8] call CBA_fnc_waitAndExecute;
+        [{call FUNC(tacticsFlank)}, [_group, _pos], 22 + random 8] call CBA_fnc_waitAndExecute;
     };
     case TACTICS_GARRISON: {
         // garrison ~ nb units not carried here - nkenny
-        [{_this call FUNC(tacticsGarrison)}, [_group, _pos], 10 + random 6] call CBA_fnc_waitAndExecute;
+        [{call FUNC(tacticsGarrison)}, [_group, _pos], 10 + random 6] call CBA_fnc_waitAndExecute;
     };
     case TACTICS_ASSAULT: {
         // rush ~ assault
-        [{_this call FUNC(tacticsAssault)}, [_group, _pos], 6 + random 8] call CBA_fnc_waitAndExecute;
+        [{call FUNC(tacticsAssault)}, [_group, _pos], 6 + random 8] call CBA_fnc_waitAndExecute;
     };
     case TACTICS_SUPPRESS: {
         // suppress
-        [{_this call FUNC(tacticsSuppress)}, [_group, _pos], 2 + random 2] call CBA_fnc_waitAndExecute;
+        [{call FUNC(tacticsSuppress)}, [_group, _pos], 2 + random 2] call CBA_fnc_waitAndExecute;
     };
     case TACTICS_ATTACK: {
         // group attacks as one
-        [{_this call FUNC(tacticsAttack)}, [_group, _pos], 1 + random 1] call CBA_fnc_waitAndExecute;
+        [{call FUNC(tacticsAttack)}, [_group, _pos], 1 + random 1] call CBA_fnc_waitAndExecute;
     };
     default {
         // hide from armor
-        [{_this call FUNC(tacticsHide)}, [_group, _pos, true], 1 + random 3] call CBA_fnc_waitAndExecute;
+        [{call FUNC(tacticsHide)}, [_group, _pos, true], 1 + random 3] call CBA_fnc_waitAndExecute;
     };
 };
 

addons/danger/functions/fnc_tacticsFlank.sqf

@@ -118,6 +118,7 @@ _group setFormDir (_unit getDir _target);
 _group setFormation "FILE";
 {
     _x setUnitPos "DOWN";
+    _x forceSpeed -1;
     _x setVariable [QGVAR(forceMove), true];
 } forEach (_units select {isNull objectParent _x});
 

addons/danger/stringtable.xml

@@ -32,7 +32,7 @@
             <English>Unit counts as carrying backpack radio for information sharing\n\nWARNING checking this will add mod dependency</English>
             <Czech>S jednotkou se počítá jako by nosila batoh s rádiem pro šíření informací\n\nVAROVÁNÍ zaškrtnutí přidá závislost na tento mód</Czech>
             <Italian>L'unità conta come trasportare la radio nello zaino per la condivisione delle informazioni\n\nATTENZIONE controllando questo si aggiungerà la dipendenza dalla mod</Italian>
-            <Polish>Jednostka widziana jest jako posiadająca radio długie w plecaku w celu dzielenia się informacji\n\nUWAGA zaznaczenie tej opcji doda zależności modów.  </Polish>
+            <Polish>Jednostka widziana jest jako posiadająca radio długie w plecaku w celu dzielenia się informacji\n\nUWAGA zaznaczenie tej opcji doda zależności modów.</Polish>
             <Russian>Устройство считается переносчиком радиостанции для обмена информацией\n\nПРЕДУПРЕЖДЕНИЕ, включение этого пункта  добавит зависимость от мода</Russian>
             <German>Definiert die Einheit als würde sie ein Rucksack Funkgerät besitzten.\n\nWARNUNG! Das Setzten dieser Einstellung erstellt Mod-Abhängikeiten.</German>
             <Chinesesimp>数以为计的单位将携带背包中的无线电以共享信息\n\n警告检查此项将增加mod依赖性</Chinesesimp>
@@ -234,7 +234,7 @@
             <Chinesesimp>单位认为自己处于攻击范围内的范围</Chinesesimp>
         </Key>
         <Key ID="STR_Lambs_Danger_Settings_DisableAutonomousFlares">
-            <English>Disable units using flares for illumination </English>
+            <English>Disable units using flares for illumination</English>
             <Czech>Vypíná schopnost jednotek používat světlice k osvětlení</Czech>
             <Italian>Disabilita le unità che utilizzano i bagliori per l'illuminazione</Italian>
             <Polish>Wyłącz autonomiczne używanie flar przez AI</Polish>
@@ -280,10 +280,10 @@
         </Key>
         <Key ID="STR_Lambs_Danger_Settings_DisableDangerFSM_ToolTip">
             <English>Toggle advanced danger.fsm features on player group</English>
-            <Czech>Přepíná pokročilé funkce danger.fsm ve skupině hráčů </Czech>
+            <Czech>Přepíná pokročilé funkce danger.fsm ve skupině hráčů</Czech>
             <Italian>Attiva/disattiva le funzionalità avanzate di danger.fsm nel gruppo di giocatori</Italian>
             <Polish>Przełącz zaawansowane opcje danger.fsm na grupie gracza</Polish>
-            <Russian>Переключить особый danger.fsm для группы игрока </Russian>
+            <Russian>Переключить особый danger.fsm для группы игрока</Russian>
             <German>Erweiterte danger.fsm Funktionen für Spielergruppe umschalten</German>
             <Chinesesimp>为玩家所在小组切换高级danger.fsm功能</Chinesesimp>
         </Key>
@@ -307,7 +307,7 @@
         </Key>
         <Key ID="STR_Lambs_Danger_Settings_DisableReactPlayerGroup">
             <English>Disable reaction state on player group</English>
-            <Czech>Vypne reakční stav ve skupině hráčů </Czech>
+            <Czech>Vypne reakční stav ve skupině hráčů</Czech>
             <Italian>Disabilita lo stato di reazione sul gruppo di giocatori</Italian>
             <Polish>Wyłącz stan reakcji dla grupy gracza</Polish>
             <Russian>Отключить состояние реакции для группы игрока</Russian>
@@ -370,7 +370,7 @@
         </Key>
         <Key ID="STR_Lambs_Danger_Settings_DisableUnitsHiding_ToolTip">
             <English>Toggles the concealment move by AI for units not equipped to damage tanks and aircraft. Disabling this setting will make groups more responsive</English>
-            <Czech>Přepíná schopnost jednotek UI skrytý pohyb, které nejsou vybaveny k poškození tanků a letadel. Deaktivace tohoto nastavení způsobí, že skupiny budou lépe reagovat </Czech>
+            <Czech>Přepíná schopnost jednotek UI skrytý pohyb, které nejsou vybaveny k poškození tanků a letadel. Deaktivace tohoto nastavení způsobí, že skupiny budou lépe reagovat</Czech>
             <Italian>Attiva/disattiva la mossa di occultamento dell'IA per le unità non equipaggiate per danneggiare carri armati e aerei. La disabilitazione di questa impostazione renderà i gruppi più reattivi</Italian>
             <Polish>Przełącza ruch maskujący przez AI dla jednostek, które nie mają możliwości uszkodzenia czołgów lub pojazdów latających. Wyłączenie tej opcji sprawi, że grupy będą bardziej responsywne</Polish>
             <Russian>Переключает действие укрытия ИИ для юнитов, не оборудованных для поражения танков и самолетов. Отключение этого параметра сделает группы более отзывчивыми</Russian>