Merge branch 'master' into master_daily

.github/ISSUE_TEMPLATE/question.md

@@ -1,11 +1,9 @@
 ---
 name: Question
-about: Ask any question here
+about: Ask any question here https://github.com/Vdauphin/HeartsAndMinds/discussions
 title: ''
-labels: question
+labels: invalid
 assignees: ''
 
 ---
-
-<!-- Use English only. -->
-<!-- You can also use https://github.com/Vdauphin/HeartsAndMinds/discussions/new with Question and answer category -->
+# Please use this: [Discussions](https://github.com/Vdauphin/HeartsAndMinds/discussions/new?category=question-and-answer)

.github/release-drafter.yml

@@ -19,7 +19,7 @@ template: |
     - [Colombian Armed Forces RHS](https://steamcommunity.com/sharedfiles/filedetails/?id=831775240), [Farcs - Colombia](https://steamcommunity.com/sharedfiles/filedetails/?id=2981558012)
     - [Operation: TREBUCHET](https://steamcommunity.com/sharedfiles/filedetails/?id=769440155), [Scion Conflict](https://steamcommunity.com/sharedfiles/filedetails/?id=2478080991), [Operation: TREBUCHET First Contact](https://steamcommunity.com/workshop/filedetails/?id=1572627279)
 
-    [Changelog](https://github.com/Vdauphin/HeartsAndMinds/milestone/94?closed=1):
+    [Changelog](https://github.com/Vdauphin/HeartsAndMinds/milestone/95?closed=1):
 
     - Mission.sqm/Param.hpp not changed.
     $CHANGES

=BTC=co@30_Hearts_and_Minds.Altis/core/def/mission.sqf

@@ -2,7 +2,7 @@
 btc_version = [
     1,
     24,
-    2
+    3
 ];
 diag_log format (["=BTC= HEARTS AND MINDS VERSION %1.%2.%3"] + btc_version);
 

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/eh/server.sqf

@@ -79,7 +79,8 @@ addMissionEventHandler ["HandleDisconnect", {
 }] call CBA_fnc_addEventHandler;
 if (btc_p_auto_db) then {
     addMissionEventHandler ["HandleDisconnect", {
-        if ((allPlayers - entities "HeadlessClient_F") isEqualTo []) then {
+        params ["_player"];
+        if ((allPlayers - entities "HeadlessClient_F" - [_player]) isEqualTo []) then {
             [] call btc_db_fnc_save;
         };
     }];

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/ied/initArea.sqf

@@ -31,19 +31,38 @@ params [
 private _pos = getPos _city;
 private _array = _city getVariable ["ieds", []];
 
+private _cities = (values btc_city_all) - [_city];
+_cities = _cities inAreaArray [_city, _area * 2, _area * 2];
+private _blackListCities = _cities select {
+    _x getVariable ["ieds", []] isNotEqualTo []
+};
+private _blackListPos = [];
+{
+    _blackListPos append ((_x getVariable "ieds") apply {_x select 0});
+} forEach _blackListCities;
+_blackListPos = _blackListPos inAreaArray [_city, _area, _area];
+
+private _blackListRoads = [];
 {
     for "_i" from 1 to _n do {
         private _sel_pos = [_pos, _area] call btc_fnc_randomize_pos;
         private _dir = random 360;
 
         private _roads = _sel_pos nearRoads 50;
-        if (_roads isEqualTo []) then {
-            _sel_pos = [_sel_pos, 0, 100, 1, false] call btc_fnc_findsafepos;
-        } else {
-            private _arr = (selectRandom _roads) call btc_ied_fnc_randomRoadPos;
+        _roads = _roads - _blackListRoads;
+        if (_roads isNotEqualTo []) then {
+            private _road = selectRandom _roads;
+            _blackListRoads pushBack _road;
+            private _arr = _road call btc_ied_fnc_randomRoadPos;
             _sel_pos = _arr select 0;
             _dir = _arr select 1;
         };
+        if (
+            _roads isEqualTo [] ||
+            {_blackListPos inAreaArray [_sel_pos, 3, 3] isNotEqualTo []}
+        ) then {
+             _sel_pos = [_sel_pos, 0, 100, 1, false] call btc_fnc_findsafepos;
+        };
 
         _array pushBack [_sel_pos, selectRandom btc_model_ieds, _dir, _x];
 

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/side/kill.sqf

@@ -129,7 +129,7 @@ private _globalVariableName = format ["btc_%1", _dogTag_taskID];
      };
 }, [_officer_dogtagData, _dogTag_taskID, _taskID, _globalVariableName, _officer, _ehDeleted]] call CBA_fnc_addEventHandlerArgs;
 
-["ace_dogtags_addDogtagItem", {
+["ace_dogtags_broadcastDogtagInfo", {
     params ["_dogTag", "_dogTagData"];
     _thisArgs params ["_officer_dogTagData", "_dogTag_taskID", "_taskID", "_globalVariableName"];
 

=BTC=co@30_Hearts_and_Minds.Altis/stringtable.xml

@@ -254,7 +254,7 @@
                 <Czech>Reputace</Czech>
             </Key>
             <Key ID="STR_BTC_HAM_DOC_REPUTATION_TEXT">
-                <Original>&lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\meet_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;System:&lt;/marker&gt;&lt;br/&gt; At the beginning you have a very low reputation level, so civilians won't help you in revealing important information about the Oplitas, they will likely lie instead. Reputation can be ask to civilian. &lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\Data_F_Orange\Logos\arma3_orange_picture_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Good actions:&lt;/marker&gt;&lt;br/&gt; Helping the local population by fighting the Oplitas, disarming IED's, heal civilians, give banana, remove tag with spraypaint , remove tag with spraypaint red, succed side mission and destroy cache/hideout will rise your reputation. &lt;br/&gt;&lt;br/&gt; &lt;img image='\a3\missions_f_orange\Data\Img\AAN\aan_3_4_co.paa' width='355' height='200' /&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\a3\Ui_f\data\GUI\Cfg\Debriefing\endDefault_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Bad actions:&lt;/marker&gt;&lt;br/&gt; Bad actions cause bad effects: killing civilians/animals surrounded or captive enemy, mutilating alive/dead civilians/animals, firing near civilians for no reason, firing to civilian car, remove wheels, remove banana, damaging/destroying buildings, breaking door lock, losing player's vehicles and player respawns will decrease your reputation. Aborting a side mission does not affect reputation. &lt;br/&gt;&lt;br/&gt; &lt;img image='\a3\missions_f_orange\Data\Img\AAN\aan_3_3_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\Data_F_Orange\Logos\arma3_orange_artwork.jpg' width='362' height='512' /&gt; </Original>
+                <Original>&lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\meet_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;System:&lt;/marker&gt;&lt;br/&gt; At the beginning you have a very low reputation level, so civilians won't help you in revealing important information about the Oplitas, they will likely lie instead. Reputation can be ask to civilian. &lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\Data_F_Orange\Logos\arma3_orange_picture_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Good actions:&lt;/marker&gt;&lt;br/&gt; Helping the local population by fighting the Oplitas, disarming IED's, heal civilians, give banana, remove tag with spraypaint, remove tag with spraypaint red, succeed side mission and destroy cache/hideout will rise your reputation. &lt;br/&gt;&lt;br/&gt; &lt;img image='\a3\missions_f_orange\Data\Img\AAN\aan_3_4_co.paa' width='355' height='200' /&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\a3\Ui_f\data\GUI\Cfg\Debriefing\endDefault_ca.paa' width='20' height='20'/&gt; &lt;marker name='blufor_base'&gt;Bad actions:&lt;/marker&gt;&lt;br/&gt; Bad actions cause bad effects: killing civilians/animals surrounded or captive enemy, mutilating alive/dead civilians/animals, firing near civilians for no reason, firing to civilian car, remove wheels, remove banana, damaging/destroying buildings, breaking door lock, losing player's vehicles and player respawns will decrease your reputation. Aborting a side mission does not affect reputation. &lt;br/&gt;&lt;br/&gt; &lt;img image='\a3\missions_f_orange\Data\Img\AAN\aan_3_3_co.paa' width='355' height='200'/&gt; &lt;br/&gt;&lt;br/&gt; &lt;img image='\A3\Data_F_Orange\Logos\arma3_orange_artwork.jpg' width='362' height='512' /&gt; </Original>
                 <Spanish>&lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\talk_ca.paa' width='20' height='20'/&gt; La reputación se puede solicitar a los civiles&lt;br/&gt; Las malas acciones causan malos efectos sobre la reputacion.&lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\meet_ca.paa' width='20' height='20'/&gt; Ayudar a la población local luchando contra los Oplitas y desarmando los artefactos explosivos improvisados aumentará tu reputación; matar civiles, mutilar civiles vivos/muertos, disparar cerca de civiles sin razón alguna, disparar a vehículos civiles, dañar/destruir edificios, perder vehículos, respawns de jugadores disminuirá tu reputación. Al principio tienes un nivel de reputación muy bajo, por lo que los civiles no te ayudarán a revelar información importante sobre los Oplitas, es probable que mientan en su lugar.&lt;br/&gt; Abortar una misión secundaria no afecta a la reputación.</Spanish>
                 <German>&lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\talk_ca.paa' width='20' height='20'/&gt; Ihr Ansehen bei der Bevölkerung können Sie bei Zivilisten erfragen &lt;br/&gt; Schlechte bzw. böse Handlungen habe zur Folge das ihr Ansehen sinkt. &lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\meet_ca.paa' width='20' height='20'/&gt; Das Unterstützen der lokalen Bevölkerung, das Entschärfen von IEDs und der aktive Kampf gegen die Oplitas wird sich positiv auf ihr Ansehen auswirken. Negative Aktionen wie zb. das Töten oder verstümmeln von Zivlisten, das grundlose Abfeueren einer Waffe in der Nähe von Zivilisten, das Zerstören oder Beschädigen von Gebäuden, der Angriff auf zivile Fahrzeuge, der Verlust von Fahrzeugen im Allgemeinen oder das Respawnen haben hingegen einen nicht so guten Effekt. Zu Beginn ist Ihr Ansehen nur recht gering, weshalb es sein kann das Zivlisten eher zruückhaltend mit Informationen sind. In manchen Fällen werden die Zivilisten Sie auch einfach belügen.&lt;br/&gt; Das Abbrechen von Nebenaufgaben hat keine Auswirkung auf Ihr Ansehen.</German>
                 <Portuguese>&lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\talk_ca.paa' width='20' height='20'/&gt; A Reputação entre a população é obtida por meio dos civis &lt;br/&gt; Ações ruins ou más fazem a reputação diminuir. &lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\meet_ca.paa' width='20' height='20'/&gt; Ajudar a população local combatendo os inimigos e desarmando os IED's aumentará sua reputação. Matar civis, mutilar civis vivos/mortos, atirar perto de civis sem motivo, atirar nos veículos civis, danificar/destruir prédios, perder veículos civis, respawns de jogadores diminuirão a reputação. No começo, o nível de reputação é muito baixo, então, os civis não irão ajudá-lo a revelar informações importantes sobre os inimigos ou provavelmente irão mentir.&lt;br/&gt; Cancelar tarefas secundárias não afeta a reputação.</Portuguese>

README.md

@@ -21,8 +21,8 @@ Post war anti insurgency dynamic mission with focus on good relations with civil
 </p>
 
 <p align="center">
-    <a href="https://github.com/Vdauphin/HeartsAndMinds/releases/tag/1.24.2">
-        <img src="https://img.shields.io/badge/Version-1.24.2-blue.svg?style=flat-square" alt="H&M Version">
+    <a href="https://github.com/Vdauphin/HeartsAndMinds/releases/tag/1.24.3">
+        <img src="https://img.shields.io/badge/Version-1.24.3-blue.svg?style=flat-square" alt="H&M Version">
     </a>
     <a href="https://somsubhra.github.io/github-release-stats/?username=vdauphin&repository=HeartsAndMinds&page=1&per_page=300">
         <img src="https://img.shields.io/github/downloads/Vdauphin/HeartsAndMinds/total.svg?style=flat-square&label=Downloads" alt="H&M Downloads">

docs/InGame-documentation.md

@@ -139,7 +139,7 @@ When you destroy an hideout or an ammo cache, all the markers related to it will
 ### System:
 At the beginning you have a very low reputation level, so civilians won't help you in revealing important information about the Oplitas, they will likely lie instead. Reputation can be ask to civilian.
 ### Good actions:
-Helping the local population by fighting the Oplitas, disarming IED's, heal civilians, give banana, remove tag with spraypaint red, succed side mission and destroy cache/hideout will rise your reputation.
+Helping the local population by fighting the Oplitas, disarming IED's, heal civilians, give banana, remove tag with spraypaint red, succeed side mission and destroy cache/hideout will rise your reputation.
 ### Bad actions:
 Bad actions cause bad effects: killing civilians/animals/surrounded or captive enemy, mutilating alive/dead civilians/animals, firing near civilians for no reason, firing to civilian car, remove wheels, remove banana, damaging/destroying buildings, breaking locked door, losing player's vehicles and player respawns will decrease your reputation. Aborting a side mission does not affect reputation.