From e6614394cc88525e24753ca66a81420098ca8bd9 Mon Sep 17 00:00:00 2001
From: nomisum <nomisum@googlemail.com>
Date: Tue, 27 Oct 2015 21:31:11 +0100
Subject: [PATCH] establishing shot, player damage

removed skip test FOR SURE from establishing shot,
shot now from 3000m height
player is not vulnerable before teleport (double safe)
---
 helpers/establishingShot.sqf | 5 +++--
 helpers/teleportPlayer.sqf   | 3 +++
 init.sqf                     | 4 +++-
 mission.sqm                  | 6 ++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/helpers/establishingShot.sqf b/helpers/establishingShot.sqf
index 1b633715..84e881be 100644
--- a/helpers/establishingShot.sqf
+++ b/helpers/establishingShot.sqf
@@ -365,13 +365,14 @@ if (isNil "BIS_fnc_establishingShot_skip") then {
 						];
 
 						private ["_skipText"];
-						_skipText = format [
+						/*_skipText = format [
 							localize "STR_A3_BIS_fnc_titlecard_pressSpace",
 							"<t size = '0.75'>",
 							_keyColor,
 							"</t>",
 							"</t>"
-						];
+						];*/
+						_skipText = "";
 
 						_ctrlText ctrlSetStructuredText parseText _skipText;
 						_ctrlText ctrlSetFade 1;
diff --git a/helpers/teleportPlayer.sqf b/helpers/teleportPlayer.sqf
index 52fa893f..8e6e4298 100644
--- a/helpers/teleportPlayer.sqf
+++ b/helpers/teleportPlayer.sqf
@@ -13,5 +13,8 @@ _nul = player setPos _spawn;
 openMap [false, false];
 hintSilent "";
 cutText ["", "BLACK IN", 1];
+
+// make player vulnerable again
+player allowDamage true;
 [] execVM "helpers\enforceNoSwim.sqf";
 3 call fn_sthud_usermenu_changeMode;
\ No newline at end of file
diff --git a/init.sqf b/init.sqf
index 2f19fe30..97d45681 100644
--- a/init.sqf
+++ b/init.sqf
@@ -147,6 +147,8 @@ diag_log format ["setup: clientandserver done"];
 
 if (hasInterface) then {
 
+	player allowDamage false;
+
 	checkJIP = {
 		if ((OPFOR_TELEPORT_TARGET select 0 != 0) && didJIP && time > jipTime) then {
 			player setDamage 1;
@@ -166,7 +168,7 @@ if (hasInterface) then {
 		[] execVM "helpers\enforceNoSwim.sqf";
 		
 		if (player != opfor_teamlead) then {
-			0 = [[worldSize/2,worldSize/2,0],""] execVM "helpers\establishingShot.sqf";
+			0 = [[worldSize/2,worldSize/2,0],"",3000] execVM "helpers\establishingShot.sqf";
 		} else {
 		disableSerialization;
 		waitUntil {!(isNull ([] call BIS_fnc_displayMission))};
diff --git a/mission.sqm b/mission.sqm
index 06dd39f4..72dc3f87 100644
--- a/mission.sqm
+++ b/mission.sqm
@@ -1131,7 +1131,7 @@ class Mission
 					id=22;
 					side="EAST";
 					vehicle="O_officer_F";
-					player="PLAYER COMMANDER";
+					player="PLAY CDG";
 					leader=1;
 					rank="MAJOR";
 					skill=0.5;
@@ -1147,11 +1147,10 @@ class Mission
 					id=23;
 					side="EAST";
 					vehicle="O_Soldier_SL_F";
-					player="PLAY CDG";
+					player="PLAYER COMMANDER";
 					rank="CAPTAIN";
 					skill=0.5;
 					text="opfor_assistant";
-					init="this setVariable [""canBuy"", true];";
 					description="Assistant Commander";
 				};
 			};
@@ -2152,7 +2151,6 @@ class Mission
 					rank="CAPTAIN";
 					skill=0.5;
 					text="blufor_assistant";
-					init="this setVariable [""canBuy"", true];";
 					description="Assistant Commander";
 				};
 			};