rc9 fixes

EVO/fn_deployEplayer.sqf

@@ -1,6 +1,3 @@
-private ["_checkBoundingSize","_type","_bbdummy","_boundingBox","_boundingSize","_msg","_truck","_composition","_sortedByDist","_frstNum","_secNum","_biggestOffset","_biggestOffsetAbs","_radius","_sortedBySize","_flatPos","_veh","_h","_pos","_nearVehicles","_mark","_mssg","_medmark"];
-
-
 _checkBoundingSize = {
 	_type = _this select 0;
 	_bbdummy = _type createVehicleLocal [0,0,0];
@@ -78,16 +75,24 @@ if (!isNil "playerStructures") then {
 	{
 		deleteVehicle _x;
 	} forEach playerStructures;
-	sleep 3.0;
+	_msg = format ["Your previous FARP has been removed."];
+	["deployed",["FARP REMOVED", _msg]] call BIS_fnc_showNotification;
+};
+
+
+if (!isNil "playerRespawnPoint") then {
+	//playerRespawnPoint call BIS_fnc_removeRespawnPosition;
 };
 
+
 WaitUntil {animationState player != "Acts_carFixingWheel"};
 
 
 if (!alive player || player distance _pos > 1) exitWith {};
 _mark = format["%1FARP",(name player)];
 deleteMarker _mark;
 playerStructures = [(getPos player), (getDir player), "Comps\farp.sqf", false] call (compile (preprocessFileLineNumbers "scripts\otl7_Mapper.sqf"));
+//playerRespawnPoint = [(group player), (getPos player)] spawn BIS_fnc_addRespawnPosition;
 _mssg = format["%1's FARP",(name player)];
 _medmark = createMarker [_mark, getPos player];
 _medmark setMarkerShape "ICON";

EVO/fn_deployMplayer.sqf

@@ -1,5 +1,3 @@
-private ["_msg","_truck","_pos","_composition","_sortedByDist","_frstNum","_secNum","_biggestOffset","_biggestOffsetAbs","_boundingSize","_checkBoundingSize","_radius","_sortedBySize","_flatPos","_nearMen","_mash","_damage","_obj","_mark","_mssg","_medmark"];
-
 /*
 if (player distance spawnBuilding < 1000) exitWith {
 	_msg = format ["You can't deploy a MASH in the base."];
@@ -61,9 +59,16 @@ if (!isNil "playerStructures") then {
 	{
 		deleteVehicle _x;
 	} forEach playerStructures;
-	sleep 3.0;
+	_msg = format ["Your previous MASH has been removed."];
+	["deployed",["MASH REMOVED", _msg]] call BIS_fnc_showNotification;
+};
+
+if (!isNil "playerRespawnPoint") then {
+	//playerRespawnPoint call BIS_fnc_removeRespawnPosition;
 };
 
+
+
 WaitUntil {animationState player != "Acts_carFixingWheel"};
 if (!alive player || player distance _pos > 1) exitWith {};
 
@@ -99,6 +104,7 @@ if (!alive player || player distance _pos > 1) exitWith {};
 _mark = format["%1mash",(name player)];
 deleteMarker _mark;
 playerStructures = [(getPos player), (getDir player), "Comps\mash.sqf", false] call (compile (preprocessFileLineNumbers "scripts\otl7_Mapper.sqf"));
+//playerRespawnPoint = [(group player), (getPos player)] spawn BIS_fnc_addRespawnPosition;
 _mssg = format["%1's MASH",(name player)];
 _medmark = createMarker [_mark, getPos player];
 _medmark setMarkerShape "ICON";

EVO/fn_initEVO.sqf

@@ -74,16 +74,11 @@ handle = [] spawn EVO_fnc_buildSideMissionArray;
 
 handle = [] spawn {
 	while {true} do {
-		_ret = [(getPos server), (floor (random 360)), "O_Plane_CAS_02_F", EAST] call EVO_fnc_spawnvehicle;
+		_ret = [(getPos server), (floor (random 360)), (["O_Heli_Attack_02_F","O_Heli_Attack_02_black_F","O_Plane_CAS_02_F","O_UAV_02_CAS_F","O_Plane_CAS_02_F"] call bis_fnc_selectRandom), EAST] call EVO_fnc_spawnvehicle;
 		_plane = _ret select 0;
 		_grp = _ret select 2;
-		_plane flyInHeight 350;
-		_wp =_grp addWaypoint [getMarkerPos "opforair", 0];
-		[_grp, 0] setWaypointBehaviour "COMBAT";
-		[_grp, 0] setWaypointCombatMode "RED";
-		[_grp, 0] setWaypointSpeed "FULL";
-		[_grp, 0] setWaypointType "HOLD";
-		[_grp, 0] setWPPos getMarkerPos "opforair";
+		//_plane flyInHeight 400;
+		_null = [(leader _grp), currentTargetMarkerName, "NOSMOKE", "DELETE:", 80, "SHOWMARKER"] execVM "scripts\UPSMON.sqf";
 		waitUntil {!canMove _plane || !alive _plane};
 		sleep 400;
 	};

EVO/fn_initTarget.sqf

@@ -248,7 +248,7 @@ while {_loop} do {
 	_count = 0;
 	sleep 10;
 	{
-		if (alive _x && ([_x, getMarkerPos currentTargetMarkerName] call BIS_fnc_distance2D < 1000))) then {
+		if (alive _x && ([_x, getMarkerPos currentTargetMarkerName] call BIS_fnc_distance2D < 1000)) then {
 			_count = _count + 1;
 		};
 	} forEach currentAOunits;
@@ -298,18 +298,11 @@ if (alive currentTargetOF) then {
 		playsound "goodjob";
 	};
 }], "BIS_fnc_spawn", true] call BIS_fnc_MP;
-_finishedMarkerName = format ["%1_ao_done", currentTargetName];
-_finishedMarker = createMarker [_finishedMarkerName, position _currentTarget];
-_finishedMarkerName setMarkerShape "ELLIPSE";
-_finishedMarkerName setMarkerBrush "SOLID";
-_finishedMarkerName setMarkerDir direction currentTarget;
-_aoSize = [(((size currentTarget) select 0) + 200), (((size currentTarget) select 1) + 200)];
-_finishedMarkerName setMarkerSize _aoSize;
-_finishedMarkerName setMarkerColor "ColorWEST";
-_finishedMarkerName setMarkerPos (position currentTarget);
 
+currentTargetMarkerName setMarkerBrush "SOLID";
+currentTargetMarkerName setMarkerColor "ColorWEST";
 //deleteMarker currentTargetMarkerName;
-currentTargetMarkerName setMarkerAlpha 0;
+//currentTargetMarkerName setMarkerAlpha 0;
 sleep random 30;
 deleteVehicle currentTargetOF;
 targetCounter = targetCounter + 1;

EVO/fn_onUnitKilled.sqf

@@ -5,6 +5,7 @@ _scoreToAdd = 0;
 _score = 0;
 _notify = true;
 _vis = lineIntersects [eyePos _killer, eyePos _killed, _killer, _killed];
+_string = "";
 if (("killNotificationParam " call BIS_fnc_getParamValue) == 0) then {
 	_notify = false;
 } else {

EVO/fn_pinit.sqf

@@ -37,18 +37,18 @@ if (("pfatigue" call BIS_fnc_getParamValue) == 0) then {
 };
 
 if (("pRespawnPoints" call BIS_fnc_getParamValue) == 1) then {
-	_respawnPos = [(side player), player] spawn BIS_fnc_addRespawnPosition;
+	_respawnPos = [(group player), player] spawn BIS_fnc_addRespawnPosition;
 };
 
 if (typeOf player == "B_medic_F") then {
 	//player addAction ["<t color='#CCCC00'>Build MASH</t>", "[] call EVO_fnc_deployMplayer;"];
-	player addaction ["<t color='#CCCC00'>Build MASH</t>","[] call EVO_fnc_deployMplayer",nil,1,false,true,"","player distance spawnBuilding > 800 && isTouchingGround player"];
+	player addaction ["<t color='#CCCC00'>Build MASH</t>","[] call EVO_fnc_deployMplayer",nil,1,false,true,"","player distance spawnBuilding > 800 && isTouchingGround player && speed player < 1 && vehicle player == player && animationState player != 'Acts_carFixingWheel'"];
 	[["Gamemode","MASH"], 15, "", 35, "", true, true, true, true] call BIS_fnc_advHint;
 };
 
 if (typeOf player == "B_soldier_repair_F") then {
 	//player addAction ["<t color='#CCCC00'>Build FARP</t>", "[] call EVO_fnc_deployEplayer;"];
-	player addaction ["<t color='#CCCC00'>Build FARP</t>","[] call EVO_fnc_deployEplayer",nil,1,false,true,"","player distance spawnBuilding > 800 && isTouchingGround player"];
+	player addaction ["<t color='#CCCC00'>Build FARP</t>","[] call EVO_fnc_deployEplayer",nil,1,false,true,"","player distance spawnBuilding > 800 && isTouchingGround player && speed player < 1 && vehicle player == player && animationState player != 'Acts_carFixingWheel'"];
 	[["Gamemode","FARP"], 15, "", 35, "", true, true, true, true] call BIS_fnc_advHint;
 };
 

EVO/fn_wrapUp.sqf

@@ -7,7 +7,7 @@ while {_loop} do {
     };
 };
 
-_veh = obj
+_veh = vehicle _obj;
 if (vehicle _obj != _obj) then {_veh = vehicle _obj};
 sleep 30;
 deleteVehicle _obj;

briefing.sqf

@@ -1,8 +1,8 @@
-player createDiaryRecord ["Briefing", ["Situation", "CSAT forces have established a foothold in Altis alongside the AAF. Fighting has erupted all over the island. NATO expeditionary forces have established a staging area on the southeast corner of the island."]];
-player createDiaryRecord ["Briefing", ["Enemy Forces", "OPFOR infantry companies have secured the villages and cities of Altis, and are dug in expecting assault. Additional OPFOR support assets have been spotted throughout the island. Expect OPFOR CAS and indirect fire support. Forward recon elements also discovered a significant AAA network covering the island, and have marked the known air coverage locations."]];
-player createDiaryRecord ["Briefing", ["Friendly Forces", "NATO has deployed an expeditionary platoon and established a staging base on the southeast corner of the island. While primarily an infantry fighting unit, the force will have auxiliary support assets available. Prioritization will be to the highest ranking requestors."]];
-player createDiaryRecord ["Briefing", ["Mission", "Eradicated CSAT prescence on the island of Altis and systematically secure each village and city throughout the island."]];
-player createDiaryRecord ["Briefing", ["Execution", "NATO high command has issued orders to retake the island via a systematic approach. We will be receiving intel from our forward recon teams and leaders will be receiving new orders as we receive them. Infantry movement will be supported by light armor and air cover as we move towards the island."]];
+player createDiaryRecord ["briefing", ["Situation", "CSAT forces have established a foothold in Altis alongside the AAF. Fighting has erupted all over the island. NATO expeditionary forces have established a staging area on the southeast corner of the island."]];
+player createDiaryRecord ["briefing", ["Enemy Forces", "OPFOR infantry companies have secured the villages and cities of Altis, and are dug in expecting assault. Additional OPFOR support assets have been spotted throughout the island. Expect OPFOR CAS and indirect fire support. Forward recon elements also discovered a significant AAA network covering the island, and have marked the known air coverage locations."]];
+player createDiaryRecord ["briefing", ["Friendly Forces", "NATO has deployed an expeditionary platoon and established a staging base on the southeast corner of the island. While primarily an infantry fighting unit, the force will have auxiliary support assets available. Prioritization will be to the highest ranking requestors."]];
+player createDiaryRecord ["briefing", ["Mission", "Eradicated CSAT prescence on the island of Altis and systematically secure each village and city throughout the island."]];
+player createDiaryRecord ["briefing", ["Execution", "NATO high command has issued orders to retake the island via a systematic approach. We will be receiving intel from our forward recon teams and leaders will be receiving new orders as we receive them. Infantry movement will be supported by light armor and air cover as we move towards the island."]];
 _index = player createDiarySubject ["Gamemode","Gamemode"];
 _rankString = "You are awarded field promotions based on your score:";
 _rankString = _rankString + format ["<br/><img image='img\pvt.paa' width='32' height='32'> %1 points   = PRIVATE<br/>