Merge branch 'master' into master_daily

.github/config.yml

@@ -0,0 +1,29 @@
+# Configuration for request-info - https://github.com/behaviorbot/request-info
+
+# *OPTIONAL* Comment to reply with
+# Can be either a string :
+requestInfoReplyComment: >
+  The maintainers of this repository would appreciate it if you could provide more information.
+
+# Or an array:
+# requestInfoReplyComment:
+#  - Ah no! young blade! That was a trifle short!
+#  - Tell me more !
+#  - I am sure you can be more effusive
+
+# *OPTIONAL* Label to be added to Issues and Pull Requests with insufficient information given
+requestInfoLabelToAdd: needs-more-info
+
+# *OPTIONAL* Require Issues to contain more information than what is provided in the issue templates
+# Will fail if the issue's body is equal to a provided template
+checkIssueTemplate: true
+
+# *OPTIONAL* Require Pull Requests to contain more information than what is provided in the PR template
+# Will fail if the pull request's body is equal to the provided template
+checkPullRequestTemplate: true
+
+# *OPTIONAL* Only warn about insufficient information on these events type
+# Keys must be lowercase. Valid values are 'issue' and 'pullRequest'
+requestInfoOn:
+  pullRequest: true
+  issue: true

.github/delete-merged-branch-config.yml

@@ -0,0 +1,2 @@
+exclude:
+  - master*

.github/labeler.yml

@@ -0,0 +1,7 @@
+# Number of labels to fetch (optional). Defaults to 20
+numLabels: 40
+# These labels will not be used even if the issue contains them (optional).
+# Pass a blank array if no labels are to be excluded.
+# excludeLabels: []
+excludeLabels:
+  - pinned

.github/release-drafter.yml

@@ -0,0 +1,23 @@
+name-template: '=BTC= co@30 Hearts & Minds v$NEXT_PATCH_VERSION'
+tag-template: 'v$NEXT_PATCH_VERSION'
+exclude-lables:
+	- 'ignore changelog'
+change-template: '- * $TITLE (@$AUTHOR).'
+
+template: |
+	Requires [ACE3](http://www.armaholic.com/page.php?id=28557).
+
+	_[Optionals :](https://github.com/Vdauphin/HeartsAndMinds/files/3138932/All.Hearts.and.Minds.mods.zip)_
+	- [RHS USAF](http://www.armaholic.com/page.php?id=27149), [RHS AFRF](http://www.armaholic.com/page.php?id=27150), [RHS GREF](http://www.armaholic.com/page.php?id=30998), [RHS SAF](http://www.armaholic.com/page.php?id=32203),
+	- [RDS A2 Civilian Pack mod](https://forums.bistudio.com/topic/170165-rds-a2-civilian-pack/),
+	- [CUP units and vehicles mod](https://forums.bistudio.com/topic/179326-community-upgrade-project-cup/), [Community Factions Project](https://github.com/tupolov/cfp/releases),
+	- [3CB Factions](https://steamcommunity.com/sharedfiles/filedetails/?id=1673456286), [Project OPFOR](https://forums.bistudio.com/topic/193185-project-opfor/), [IWAR: Irregular Warfare mod](http://www.armaholic.com/page.php?id=29772), [Iraqi-Syrian Conflic](http://www.armaholic.com/page.php?id=28406), [Central African Rebels [SFF-R]](http://www.armaholic.com/page.php?id=32465),
+	- [FAP Units (Foes & Allies Pack)](http://www.armaholic.com/page.php?id=30706), [VETERAN](https://steamcommunity.com/workshop/filedetails/?id=1132375156),
+	- [=BTC= Militia mod](https://forums.bistudio.com/topic/188272-btc-militia-for-a3/#entry2983674), [Taliban Fighters by EricJ](http://www.armaholic.com/page.php?id=29543),
+	- [The Unsung Vietnam War Mod](http://www.armaholic.com/page.php?id=29948),
+	- [Iron Front 3 Lite](http://www.armaholic.com/page.php?id=24714), [Face of War WW2](http://www.armaholic.com/page.php?id=31945),
+	- [Operation: TREBUCHET](http://www.armaholic.com/page.php?id=28614), [OPCAN - OPTRE Reskin Pack](http://www.armaholic.com/page.php?id=29718).
+
+	[Changelog](https://github.com/Vdauphin/HeartsAndMinds/milestone/48?closed=1):
+
+	$CHANGES

.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

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

@@ -1,5 +1,5 @@
 btc_version = 1.193;
-diag_log format ["=BTC= HEARTS AND MINDS VERSION %1.7", btc_version];
+diag_log format ["=BTC= HEARTS AND MINDS VERSION %1.8", btc_version];
 
 //Param
 //<< Time options >>

=BTC=co@30_Hearts_and_Minds.Altis/core/doc.sqf

@@ -54,6 +54,6 @@ player createDiaryRecord [_MainCategory, [localize "STR_ACE_Interaction_DisplayN
 
 //Version
 player createDiaryRecord [_MainCategory, [localize "STR_A3_FM_Welcome4",
-    format ["<img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/> Version %1.7 <img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/>", btc_version]
+    format ["<img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/> Version %1.8 <img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\download_ca.paa' width='20' height='20'/>", btc_version]
     ]
 ];

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/city/init.sqf

@@ -66,6 +66,11 @@ for "_id" from 0 to (count _locations - 1) do {
         if ((getMarkerPos "YOUR_MARKER_AREA") inArea [_position, 500, 500, 0, false]) exitWith {};
         */
 
+        if (_radius_x < 80 || _radius_y < 80) then {
+            _radius_x = 80;
+            _radius_y = 80;
+        };
+
         [_position, _type, _name, _radius_x, _radius_y, random 1 > _is_free_probability, _id] call btc_fnc_city_create;
     };
 };

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/lift/hook.sqf

@@ -48,7 +48,7 @@ if !(_bbr isEqualTo []) then {
 };
 
 private _rope_length = 10;
-if ((_bbr isEqualTo []) OR (_ropes_check isEqualTo [])) then {
+if ((_bbr isEqualTo []) OR (_ropes_check select {!isNull _x} isEqualTo [])) then {
 
     _bbr = boundingBoxReal _cargo;
     if (abs((_bbr select 0) select 0) > 5) then {

=BTC=co@30_Hearts_and_Minds.Altis/core/fnc/mil/create_group.sqf

@@ -42,7 +42,7 @@ params [
 _wp_ratios params ["_wp_house_probability", "_wp_sentry_probability"];
 
 // Find a position
-([_city] call btc_fnc_city_findPos) params ["_rpos", "_pos_iswater"];
+([_city, _area] call btc_fnc_city_findPos) params ["_rpos", "_pos_iswater"];
 
 private _group = createGroup _enemy_side;
 private _groups = [];

README.md

@@ -5,8 +5,8 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/Vdauphin/HeartsAndMinds/releases/tag/1.19.7">
-        <img src="https://img.shields.io/badge/Version-1.19.7-blue.svg?style=flat-square" alt="H&M Version">
+    <a href="https://github.com/Vdauphin/HeartsAndMinds/releases/tag/1.19.8">
+        <img src="https://img.shields.io/badge/Version-1.19.8-blue.svg?style=flat-square" alt="H&M Version">
     </a>
     <a href="http://www.somsubhra.com/github-release-stats/?username=vdauphin&repository=HeartsAndMinds">
         <img src="https://img.shields.io/github/downloads/Vdauphin/HeartsAndMinds/total.svg?style=flat-square&label=Downloads" alt="H&M Downloads">