Skip to content

Commit

Permalink
establishing shot, player damage
Browse files Browse the repository at this point in the history
removed skip test FOR SURE from establishing shot,
shot now from 3000m height
player is not vulnerable before teleport (double safe)
  • Loading branch information
nomisum committed Oct 27, 2015
1 parent 68a155a commit e661439
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
5 changes: 3 additions & 2 deletions helpers/establishingShot.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions helpers/teleportPlayer.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
4 changes: 3 additions & 1 deletion init.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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))};
Expand Down
6 changes: 2 additions & 4 deletions mission.sqm
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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";
};
};
Expand Down Expand Up @@ -2152,7 +2151,6 @@ class Mission
rank="CAPTAIN";
skill=0.5;
text="blufor_assistant";
init="this setVariable [""canBuy"", true];";
description="Assistant Commander";
};
};
Expand Down

0 comments on commit e661439

Please sign in to comment.