Merge previous changes

Fix some conflicts, optimize previous code

@ExileServer/addons/a3_dms/map_configs/chernarus_isles_config.sqf

@@ -0,0 +1,11 @@
+/*
+	Custom configs for Chernarus Isles.
+	Created by [FPS]kuplion.
+*/
+
+// Making these configs below as strict as possible will help in reducing the number of attempts taken to find a valid position, and as a result, improve performance.
+
+DMS_MinDistFromWestBorder			= 750;
+DMS_MinDistFromEastBorder			= 2500;
+DMS_MinDistFromSouthBorder			= 2500;
+DMS_MinDistFromNorthBorder			= 1000;

@ExileServer/addons/a3_dms/map_configs/chernarus_summer_config.sqf

@@ -0,0 +1,11 @@
+/*
+	Custom configs for Chernarus Summer.
+	Created by [FPS]kuplion.
+*/
+
+// Making these configs below as strict as possible will help in reducing the number of attempts taken to find a valid position, and as a result, improve performance.
+
+DMS_MinDistFromWestBorder			= 750;
+DMS_MinDistFromEastBorder			= 2500;
+DMS_MinDistFromSouthBorder			= 3500;
+DMS_MinDistFromNorthBorder			= 1000;

@ExileServer/addons/a3_dms/map_configs/chernarus_winter_config.sqf

@@ -0,0 +1,11 @@
+/*
+	Custom configs for Chernarus Winter.
+	Created by [FPS]kuplion.
+*/
+
+// Making these configs below as strict as possible will help in reducing the number of attempts taken to find a valid position, and as a result, improve performance.
+
+DMS_MinDistFromWestBorder			= 750;
+DMS_MinDistFromEastBorder			= 2500;
+DMS_MinDistFromSouthBorder			= 3500;
+DMS_MinDistFromNorthBorder			= 1000;

@ExileServer/addons/a3_dms/map_configs/malden_config.sqf

@@ -0,0 +1,10 @@
+DMS_MinDistFromWestBorder			= 500;
+DMS_MinDistFromEastBorder			= 500;
+DMS_MinDistFromSouthBorder			= 500;
+DMS_MinDistFromNorthBorder			= 500;
+DMS_MinSurfaceNormal				= 0.8;
+DMS_PlayerNearBlacklist				= 500;
+DMS_SpawnZoneNearBlacklist			= 1500;
+DMS_TraderZoneNearBlacklist			= 1500;
+DMS_MissionNearBlacklist			= 2500;
+DMS_WaterNearBlacklist				= 100;

@ExileServer/addons/a3_dms/missions/bandit/nedural_mission.sqf

@@ -195,7 +195,7 @@ _missionObjs =
 // Define Mission Win message in persistent vehicle choice
 
 // Define Mission Lose message
-_msgLOSE = ['#FF0000',"The attackers finsihed eating and drove off."];
+_msgLOSE = ['#FF0000',"The attackers finished eating and drove off."];
 
 // Define mission name (for map marker and logging)
 _missionName = "Ural Picnic";

@ExileServer/addons/a3_dms/scripts/fn_FillCrate.sqf

@@ -104,8 +104,14 @@ if !(_crate getVariable ["DMS_CrateGodMode",DMS_GodmodeCrates]) then
 {
 	_crate allowDamage true;
 };
-
-_crate enableSimulationGlobal true;
+if(dynamicSimulationSystemEnabled)then
+{
+	_crate enableDynamicSimulation true;
+}
+else
+{
+	_crate enableSimulationGlobal true;
+};
 if (_crate getVariable ["DMS_CrateEnableRope",DMS_EnableBoxMoving]) then
 {
 	_crate enableRopeAttach true;

@ExileServer/addons/a3_dms/scripts/fn_FreezeManager.sqf

@@ -20,7 +20,10 @@
         {
             {
                 _x enableSimulationGlobal true;
-                (vehicle _x) enableSimulationGlobal true;
+				if!(dynamicSimulationEnabled (vehicle _x))then
+				{
+					(vehicle _x) enableSimulationGlobal true;
+				};
             } forEach _units;
 
             _x setVariable ["DMS_isGroupFrozen",false];
@@ -81,7 +84,10 @@
                 {
                     {
                         _x enableSimulationGlobal false;
-                        (vehicle _x) enableSimulationGlobal false;
+						if!(dynamicSimulationEnabled (vehicle _x))then
+						{
+							(vehicle _x) enableSimulationGlobal false;
+						};
                     } forEach _units;
 
                     _x setVariable ["DMS_isGroupFrozen",true];

@ExileServer/addons/a3_dms/scripts/fn_FreezeToggle.sqf

@@ -24,7 +24,10 @@ if (_freeze) then
 {
     {
         _x enableSimulationGlobal false;
-        (vehicle _x) enableSimulationGlobal false;
+		if!(dynamicSimulationEnabled (vehicle _x))then
+		{
+			(vehicle _x) enableSimulationGlobal false;
+		};
     } forEach (units _group);
 
     _group setVariable ["DMS_isGroupFrozen",true];
@@ -33,7 +36,10 @@ else
 {
     {
         _x enableSimulationGlobal true;
-        (vehicle _x) enableSimulationGlobal true;
+		if!(dynamicSimulationEnabled (vehicle _x))then
+		{
+			(vehicle _x) enableSimulationGlobal true;
+		};
     } forEach (units _group);
     
     _group setVariable ["DMS_isGroupFrozen",false];

@ExileServer/addons/a3_dms/scripts/fn_ImportFromM3E.sqf

@@ -51,7 +51,11 @@ private _objs = _export apply
 {
 	// Create the object
 	private _obj = createVehicle [_x select 0, [0,0,0], [], 0, "CAN_COLLIDE"];
-	_obj enableSimulationGlobal true;
+
+	if (dynamicSimulationSystemEnabled) then
+	{
+		_obj enableDynamicSimulation true;
+	};
 
 	// Calculate the object's position using provided relative position
 	private _objPos = [_pos,_x select 1] call DMS_fnc_CalcPos;

@ExileServer/addons/a3_dms/scripts/fn_ImportFromM3E_3DEN.sqf

@@ -52,7 +52,14 @@ private _objs = _export apply
 	private _object = (_x select 0) createVehicle [0,0,0];
 	_object setDir (_x select 2);
 	_object setPosATL (_center vectorAdd (_x select 1));
-	_object enableSimulationGlobal ((_x select 3) select 0);
+	if(dynamicSimulationSystemEnabled)then
+	{
+		_object enableDynamicSimulation true;
+	}
+	else
+	{
+		_object enableSimulationGlobal ((_x select 3) select 0);
+	};
 	_object allowDamage ((_x select 3) select 1);
 	_object;
 };

@ExileServer/addons/a3_dms/scripts/fn_ImportFromM3E_3DEN_Convert.sqf

@@ -55,7 +55,14 @@ private _objs = _export apply
 	_object setPosASL ((_x select 1) vectorAdd [0,0,5000]);
 	_object setVectorDirAndUp (_x select 2);
 
-	_object enableSimulationGlobal ((_x select 3) select 0);
+	if(dynamicSimulationSystemEnabled)then
+	{
+		_object enableDynamicSimulation true;
+	}
+	else
+	{
+		_object enableSimulationGlobal ((_x select 3) select 0);
+	};
 	_object allowDamage ((_x select 3) select 1);
 
 	_object;

@ExileServer/addons/a3_dms/scripts/fn_ImportFromM3E_3DEN_Static.sqf

@@ -49,7 +49,14 @@ private _objs = _export apply
 	_object setPosASL (_x select 1);
 	_object setVectorDirAndUp (_x select 2);
 
-	_object enableSimulationGlobal ((_x select 3) select 0);
+	if(dynamicSimulationSystemEnabled)then
+	{
+		_object enableDynamicSimulation true;
+	}
+	else
+	{
+		_object enableSimulationGlobal ((_x select 3) select 0);
+	};
 	_object allowDamage ((_x select 3) select 1);
 
 	_object;

@ExileServer/addons/a3_dms/scripts/fn_ImportFromM3E_Convert.sqf

@@ -58,6 +58,11 @@ private _objs = _export apply
 	{
 		_obj setDir (_x select 2);
 		_obj setPosATL _pos;
+		
+		if (dynamicSimulationSystemEnabled) then
+		{
+			_object enableDynamicSimulation true;
+		};
 	}
 	else
 	{

@ExileServer/addons/a3_dms/scripts/fn_ImportFromM3E_Static.sqf

@@ -52,6 +52,11 @@ private _objs = _export apply
 	{
 		_obj setDir (_x select 2);
 		_obj setPosATL _pos;
+
+		if(dynamicSimulationSystemEnabled)then
+		{
+			_obj enableDynamicSimulation true;
+		};
 	}
 	else
 	{

README.md

@@ -2,23 +2,23 @@
 
 
 # To the User:
-####Read the instructions carefully. Before leaving any questions regarding DMS, please read through the [DMS "config.sqf"](https://github.com/Defent/DMS_Exile/blob/master/%40ExileServer/addons/a3_dms/config.sqf?ts=4); the majority of the questions we receive are answered (directly or indirectly) by the config.
+#### Read the instructions carefully. Before leaving any questions regarding DMS, please read through the [DMS "config.sqf"](https://github.com/Defent/DMS_Exile/blob/master/%40ExileServer/addons/a3_dms/config.sqf?ts=4); the majority of the questions we receive are answered (directly or indirectly) by the config.
 
-####Disclaimer:
+#### Disclaimer:
 Defent's Mission System (DMS) is written from the ground up to be an efficient, easy to install, and vastly customizable mission system for the ArmA 3 [Exile Mod](http://www.exilemod.com/).
 
 However, creating such a mission system takes a lot of time and testing. We (the authors of DMS) are not perfect, and as a result, there may be bugs, glitches, and/or errors within DMS. We appreciate your co-operation in identifying and resolving such issues to improve DMS; however we are not liable for any issues resulting from the usage of DMS on/by your server. We are also not liable to help you in resolving any issues that may arise.
 
 You are welcome to port DMS or any of its functions for any other mod or (legal) purposes. For more information read the License Overview below:
 
-###License Overview:
+### License Overview:
 This work is protected by [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0)](http://creativecommons.org/licenses/by-nc-sa/4.0/). By using, downloading, or copying any of the work contained, you agree to the license included.
 
 <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">DMS</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="https://github.com/Defent/DMS_Exile" property="cc:attributionName" rel="cc:attributionURL">Defent and eraser1</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://github.com/Defent/DMS_Exile" rel="dct:source">https://github.com/Defent/DMS_Exile</a>.
 
 The following overview is a human-readable summary of (and not a substitute for) [the full license](http://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).
 
-####You are free to:
+#### You are free to:
 
 **Share** — copy and redistribute the material in any medium or format.
 
@@ -26,7 +26,7 @@ The following overview is a human-readable summary of (and not a substitute for)
 
 
 
-####Under the following terms:
+#### Under the following terms:
 
 **Attribution** — You must give **appropriate credit**, provide a link to the license, and **indicate if changes were made**. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
 
@@ -38,7 +38,7 @@ The following overview is a human-readable summary of (and not a substitute for)
 
 
 
-####Notices:
+#### Notices:
 
 You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable **exception or limitation**.
 No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as **publicity, privacy, or moral rights** may limit how you use the material.