W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-04 15:22:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Players are able to use flares inside a vehicle now

Browse Source 
Also remove FNC_GetSetPos. It is no longer needed or used.

Made by @Victor-the-Cleaner
This commit is contained in:
A Man
2022-04-19 14:53:12 +02:00
parent 8090e52beb
commit bde803b6d3
4 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
SQF/dayz_code/actions/flare_pickup.sqf
View File

@@ -1,21 +1,37 @@
private["_flare","_text"]; local _flare = _this select 3;
_flare = _this select 3;
player playActionNow "PutDown"; player playActionNow "PutDown";
uiSleep 2; uiSleep 2;
_flare attachTo [player, [0,0,0], "granat2"]; _flare attachTo [player, [0,0,0], "granat2"];
[_flare, -90, -10] call object_setpitchbank; [_flare, -90, -10] call object_setpitchbank;
[_flare] call FNC_GetSetPos; //[_flare] call FNC_GetSetPos;
_flare setVariable ["owner", player, true]; _flare setVariable ["owner", player, true];
player removeAction s_player_grabflare; player removeAction s_player_grabflare;
player removeAction s_player_removeflare; player removeAction s_player_removeflare;
dayz_hasLight = true; dayz_hasLight = true;
//Add Drop Action //Add Drop Action
_text = getText (configFile >> "CfgAmmo" >> (typeOf _flare) >> "displayName"); local _text = getText (configFile >> "CfgAmmo" >> (typeOf _flare) >> "displayName");
s_player_dropflare = player addAction [format [localize "str_actions_medical_16", _text], "\z\addons\dayz_code\actions\flare_drop.sqf", _flare, 1, false, true, "", ""]; s_player_dropflare = player addAction [format [localize "str_actions_medical_16", _text], "\z\addons\dayz_code\actions\flare_drop.sqf", _flare, 1, false, true, "", ""];
local _vehicle = false;
while {(alive _flare) and dayz_hasLight} do { while {(alive _flare) and dayz_hasLight} do {
local _player = true;
if (player != vehicle player) then {
_player = false;
};
if (!_player && !_vehicle) then { // player got into a vehicle
detach _flare;
_flare attachTo [vehicle player, [0,0,0]];
_vehicle = true;
};
if (_player && _vehicle) then { // player exited a vehicle
detach _flare;
_flare attachTo [player, [0,0,0], "granat2"];
[_flare, -90, -10] call object_setpitchbank;
_vehicle = false;
};
uiSleep 0.1; uiSleep 0.1;
}; };
if (dayz_hasLight) then { if (dayz_hasLight) then {

10
SQF/dayz_code/compile/fn_getPos.sqf
View File

@@ -1,9 +1,3 @@
private "_pos"; local _pos = getPosATL (_this select 0);
if (surfaceIsWater _pos) then {_pos = ATLToASL _pos;};
_pos = getPosASL (_this select 0);
if !(surfaceIsWater _pos) then {
_pos = ASLToATL _pos;
};
_pos _pos

1
SQF/dayz_code/init/compiles.sqf
View File

@@ -840,7 +840,6 @@ if (dayz_townGenerator) then {
BIS_fnc_numberDigits = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_numberDigits.sqf"; BIS_fnc_numberDigits = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_numberDigits.sqf";
BIS_fnc_numberText = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_numberText.sqf"; BIS_fnc_numberText = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_numberText.sqf";
local_lockUnlock = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_lockUnlock.sqf"; //When vehicle is local to unit perform locking vehicle local_lockUnlock = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_lockUnlock.sqf"; //When vehicle is local to unit perform locking vehicle
FNC_GetSetPos = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fnc_getSetPos.sqf";
dayz_groupInvite = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\handleInvite.sqf"; dayz_groupInvite = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\handleInvite.sqf";
player_sumMedical = { player_sumMedical = {

0
SQF/dayz_code/compile/fnc_getSetPos.sqf → SQF/dayz_code/old/fnc_getSetPos.sqf
View File