Merge unstable 2.3.0 into master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,45 @@
+---
+name: Bug report
+about: Report a bug that you have found.
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the bug (If you can't reproduce it, just give details of what happened beforehand. Anything you think could be relevant):
+
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment (please complete the following information):**
+Version: 
+Map (specify if Altis Blufor): 
+
+[ ] LAN Hosted
+[ ] Private dedicated server
+[ ] Private dedicated server with Headless client(s)
+[ ] Community Server 1
+[ ] Community Server 2
+[ ] Community Test Server
+[ ] Community Test Server 2
+
+Modset:
+
+Time the bug occurred (Please leave in GMT+0):
+If **Not** on a community server, please leave the time zone of your client for LAN, or the server for dedicated: 
+
+**Additional context**
+Add any other context about the problem here.
+
+
+
+If you were LAN hosting, please attach your client .RPT file from when the bug occurred, If on a private dedicated server, please attach the server's .RPT from when the bug occurred.

.github/ISSUE_TEMPLATE/change-request.md

@@ -0,0 +1,20 @@
+---
+name: Change request
+about: Request a change to an existing element of the mission.
+title: ''
+labels: Suggestion, change
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest a new idea for the mission.
+title: ''
+labels: Suggestion, enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/game-balance.md

@@ -0,0 +1,20 @@
+---
+name: Game Balance
+about: Suggest changes to the balance of the mission
+title: ''
+labels: Suggestion, Balance
+assignees: ''
+
+---
+
+**What, in your opinion, is currently wrong with the balance?**
+A clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

@@ -1,6 +1,7 @@
 ## What type of PR is this.
 1. [ ] Bug
-2. [ ] Enhancement
+2. [ ] Change
+3. [ ] Enhancement
 
 ### What have you changed and why?
 Information:
@@ -11,12 +12,16 @@ closes #XXXX
 
 ### Please verify the following and ensure all checks are completed.
 
-1. [ ] Have you loaded the Mission in Singleplayer?
-2. [ ] Have you loaded the Mission in a Dedicated Server?
+1. [ ] Have you loaded the mission in singleplayer?
+2. [ ] Have you loaded the mission in LAN host?
+3. [ ] Have you loaded the mission on a dedicated server?
 
 ### Is further testing or are further changes required?
 1. [ ] No
 2. [ ] Yes (Please provide further detail below.)
 
+### How can the changes be tested?
+Steps: 
+
 ********************************************************
 Notes:

.gitignore

@@ -11,6 +11,11 @@ A3-Antistasi/mission.sqm
 A3-Antistasi/roadsDB*.sqf
 A3-Antistasi/PIC.jpg
 A3-Antistasi/ak.jpg
+A3-Antistasi/Navigation/
+A3-Antistasi/Pictures/Mission/
 
 #Ignore packaged missions
-PreparedMissions/
+PreparedMissions/
+
+#Ignore test templates
+Map-Templates/Antistasi-TEST-**

A3-Antistasi/FSMs/ConvoyTravel.fsm

@@ -2,15 +2,15 @@
 /*%FSM<HEAD>*/
 /*
 item0[] = {"Start",0,250,-258.071289,-342.907776,-168.071396,-292.907776,0.000000,"Start"};
-item1[] = {"End_and_Rejoin",1,4346,64.791161,-139.450836,154.791199,-89.450851,0.000000,"End and Rejoin"};
+item1[] = {"End_and_Rejoin",1,250,64.791161,-139.450836,154.791199,-89.450851,0.000000,"End and Rejoin"};
 item2[] = {"HasArrived",4,218,-256.153625,-77.311310,-166.153625,-27.311371,10.000000,"HasArrived"};
 item3[] = {"Abort",4,218,-91.228699,-251.971512,-1.228698,-201.971497,100.000000,"Abort"};
 item4[] = {"Head_to__Next_Po",2,250,-256.894318,-166.599014,-166.894302,-116.599007,0.000000,"Head to " \n "Next Pos"};
 item5[] = {"True",8,218,-257.487732,-253.817780,-167.487717,-203.817780,0.000000,"True"};
 item6[] = {"At_Next_Pos",4,218,-403.907898,-167.404144,-313.907928,-117.404137,5.000000,"At Next Pos"};
 item7[] = {"Veh_stuck",4,218,-92.573151,-109.810966,-2.573151,-59.810974,0.000000,"Veh stuck"};
 item8[] = {"Veh_or_Crew_Dead",4,218,-91.259125,-177.638184,-1.259125,-127.638184,20.000000,"Veh or Crew" \n "Dead"};
-item9[] = {"End_and_Unload",1,250,-256.463623,15.090240,-166.463593,65.090225,0.000000,"End and Unload"};
+item9[] = {"End_and_Unload",1,4346,-256.463623,15.090240,-166.463593,65.090225,0.000000,"End and Unload"};
 item10[] = {"Hard_Abort",4,218,-92.573059,-344.041931,-2.573059,-294.041931,100.000000,"Hard Abort"};
 item11[] = {"End_and_Abort",1,250,66.121887,-341.269958,156.121918,-291.269989,0.000000,"End and Abort"};
 link0[] = {0,5};
@@ -28,7 +28,7 @@ link11[] = {7,1};
 link12[] = {8,1};
 link13[] = {10,11};
 globals[] = {0.000000,0,0,0,0,640,480,1,52,6316128,1,-539.552429,231.053772,136.200928,-476.403259,1112,884,1};
-window[] = {2,-1,-1,-1,-1,889,130,1570,130,3,1130};
+window[] = {2,-1,-1,-1,-1,837,78,1518,78,3,1130};
 *//*%FSM</HEAD>*/
 class FSM
 {
@@ -109,14 +109,16 @@ class FSM
                          "	(units _cargoGroup) joinSilent _crewGroup;" \n
                          "	deleteGroup _cargoGroup;" \n
                          "};" \n
-                         "[_crewGroup] spawn A3A_fnc_groupDespawner;" \n
                          "" \n
                          "// Send back to base" \n
                          "private _wp3 = _crewGroup addWaypoint [getMarkerPos (_markers # 0), 100];" \n
                          "_wp3 setWaypointType ""MOVE"";" \n
-                         "_wp3 setWaypointBehaviour ""SAFE"";" \n
+                         "_wp3 setWaypointBehaviour ""AWARE"";" \n
                          "_crewGroup setCurrentWaypoint _wp3;" \n
                          "" \n
+                         "[_crewGroup] spawn A3A_fnc_groupDespawner;" \n
+                         "[_vehicle] spawn A3A_fnc_vehDespawner;" \n
+                         "" \n
                          ""/*%FSM</STATEINIT""">*/;
                         precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
                         class Links
@@ -216,24 +218,25 @@ class FSM
                          "if !(isNull _vehicle) then { _vehicle setVariable[""fsmresult"", 1] };" \n
                          "" \n
                          "private _crewGroup = _splitCrew call A3A_fnc_joinMultipleGroups;" \n
+                         "private _side = side _crewGroup;" \n
                          "" \n
                          "// Don't force all vehicles to drive into the outpost" \n
                          "private _wp0 = _crewGroup addWaypoint [_destination, 50];" \n
                          "_wp0 setWaypointCompletionRadius 50;" \n
                          "_wp0 setWaypointType ""TR UNLOAD"";" \n
-                         "_wp0 setWaypointStatements [""true"", ""{ unassignVehicle _x; } forEach (assignedCargo (vehicle this));""];" \n
+                         "_wp0 setWaypointStatements [""true"", ""if !(local this) exitWith {}; { unassignVehicle _x; } forEach (assignedCargo (vehicle this));""];" \n
                          "_crewGroup setCurrentWaypoint _wp0;" \n
                          "" \n
                          "if (_cargoGroup != grpNull) then {" \n
                          "	// Move cargo group towards centre of outpost" \n
                          "	private _wp2 = _cargoGroup addWaypoint [_destination, 10];" \n
                          "	_wp2 setWaypointType ""MOVE"";" \n
-                         "	_wp2 setWaypointStatements [""true"", ""(group this) spawn A3A_fnc_attackDrillAI;""];" \n
+                         "	_wp2 setWaypointStatements [""true"", ""if !(local this) exitWith {}; (group this) spawn A3A_fnc_attackDrillAI;""];" \n
                          "	_cargoGroup setCurrentWaypoint _wp2;" \n
                          "};" \n
                          "" \n
                          "// Despawning before the unload is completed is fine. We've arrived." \n
-                         "if (_convoyType isEqualTo ""reinforce"") then {" \n
+                         "if (_convoyType isEqualTo ""reinforce"" && (_side == sidesX getVariable _markers#1)) then {" \n
                          "" \n
                          "	// add units to garrison immediately, otherwise it'll keep sending them" \n
                          "	private _garrison = [typeOf _vehicle, [], []];" \n
@@ -243,9 +246,10 @@ class FSM
                          "" \n
                          "	// synchronize despawning with the target marker" \n
                          "	// remove this once addGarrison takes control of the units" \n
-                         "	[_crewGroup, _cargoGroup, _markers # 1] spawn {" \n
-                         "		params[""_crew"", ""_cargo"", ""_marker""];" \n
+                         "	[_vehicle, _crewGroup, _cargoGroup, _markers # 1, _side] spawn {" \n
+                         "		params[""_vehicle"", ""_crew"", ""_cargo"", ""_marker"", ""_side""];" \n
                          "		waitUntil {sleep 5; (spawner getVariable _marker == 2)};" \n
+                         "		if (_vehicle getVariable ""ownerSide"" == _side) then { deleteVehicle _vehicle };" \n
                          "		{ deleteVehicle _x } forEach units _cargo;" \n
                          "		{ deleteVehicle _x } forEach units _crew;" \n
                          "		deleteGroup _cargo;" \n
@@ -255,6 +259,7 @@ class FSM
                          "	// otherwise just use the stock despawning" \n
                          "	[_crewGroup] spawn A3A_fnc_groupDespawner;" \n
                          "	[_cargoGroup] spawn A3A_fnc_groupDespawner;" \n
+                         "	[_vehicle] spawn A3A_fnc_vehDespawner;" \n
                          "};"/*%FSM</STATEINIT""">*/;
                         precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
                         class Links

A3-Antistasi/FSMs/ConvoyTravelAir.fsm

@@ -39,7 +39,7 @@ link19[] = {12,4};
 link20[] = {13,11};
 link21[] = {14,11};
 globals[] = {0.000000,0,0,0,0,640,480,1,70,6316128,1,-725.928467,294.090576,352.494415,-458.383972,1112,884,1};
-window[] = {2,-1,-1,-32000,-32000,889,130,1570,130,3,1130};
+window[] = {2,-1,-1,-1,-1,863,104,1544,104,3,1130};
 *//*%FSM</HEAD>*/
 class FSM
 {
@@ -128,11 +128,12 @@ class FSM
                          "	deleteGroup _cargoGroup;" \n
                          "};" \n
                          "[_crewGroup] spawn A3A_fnc_groupDespawner;" \n
+                         "[_vehicle] spawn A3A_fnc_vehDespawner;" \n
                          "" \n
                          "// Send back to base" \n
                          "private _wp3 = _crewGroup addWaypoint [_originPos, 100];" \n
                          "_wp3 setWaypointType ""MOVE"";" \n
-                         "_wp3 setWaypointBehaviour ""SAFE"";" \n
+                         "_wp3 setWaypointBehaviour ""AWARE"";" \n
                          "_crewGroup setCurrentWaypoint _wp3;"/*%FSM</STATEINIT""">*/;
                         precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
                         class Links
@@ -301,7 +302,7 @@ class FSM
                          "" \n
                          "if (_cargoGroup == grpNull) exitWith {};" \n
                          "" \n
-                         "if (_convoyType isEqualTo ""reinforce"") then {" \n
+                         "if (_convoyType isEqualTo ""reinforce"" && (side _cargoGroup == sidesX getVariable _markers#1)) then {" \n
                          "" \n
                          "	// add units to garrison immediately, otherwise it'll keep sending them" \n
                          "	private _unitTypes = [];" \n

A3-Antistasi/FSMs/DriveAlongPath.fsm

@@ -1,7 +1,7 @@
-/*%FSM<COMPILE "F:\Steam\SteamApps\common\Arma 3 Tools\FSMEditor\scriptedFSM.cfg, DriveAlongPath">*/
+/*%FSM<COMPILE "scriptedFSM.cfg, DriveAlongPath">*/
 /*%FSM<HEAD>*/
 /*
-item0[] = {"Start",0,250,-258.071289,-342.907776,-168.071396,-292.907776,0.000000,"Start"};
+item0[] = {"Start",0,4346,-258.071289,-342.907776,-168.071396,-292.907776,0.000000,"Start"};
 item1[] = {"_",-1,250,-162.790146,-180.814117,-73.255249,-177.907150,0.000000,""};
 item2[] = {"End_and_Rejoin",1,250,121.673431,-203.263062,211.673462,-153.263077,0.000000,"End and Rejoin"};
 item3[] = {"HasArrived",4,218,-87.535736,-114.861282,2.464264,-64.861282,10.000000,"HasArrived"};
@@ -40,8 +40,8 @@ link10[] = {7,5};
 link11[] = {8,5};
 link12[] = {9,2};
 link13[] = {11,10};
-globals[] = {0.000000,0,0,0,0,640,480,1,36,6316128,1,-559.409241,250.910950,151.986633,-492.188782,1112,884,1};
-window[] = {2,-1,-1,-1,-1,785,-1894,-454,26,3,1130};
+globals[] = {0.000000,0,0,0,0,640,480,1,36,6316128,1,-511.636810,203.138428,114.009247,-454.211395,1112,884,1};
+window[] = {2,-1,-1,-32000,-32000,915,156,1596,156,3,1130};
 *//*%FSM</HEAD>*/
 class FSM
 {
@@ -61,7 +61,7 @@ class FSM
                          "if (isNull _vehicle || count _route == 0) exitWith {};" \n
                          "" \n
                          "private _destination = _route select (count _route - 1);" \n
-                         "private _accuracy = 20;" \n
+                         "private _accuracy = 50;" \n
                          "" \n
                          "private _splitCrew = [_vehicle] call A3A_fnc_splitVehicleCrewIntoOwnGroups;" \n
                          "if (_splitCrew select 0 isEqualTo []) exitWith {" \n