W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch

Browse Source
This commit is contained in:
oiad
2016-11-11 13:15:50 +13:00
parent dd0363b4e8 dba59af7c1
commit 979323932c
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SQF/dayz_code/compile/fn_damageActions.sqf
View File

@@ -8,7 +8,7 @@ if (dayz_actionInProgress) exitWith {};
- [] call fnc_usec_damageActions;
************************************************************/
private ["_menClose","_hasPatient","_vehicle","_inVehicle","_isClose","_assignedRole","_driver","_action","_turret","_weapons","_weaponName","_crew","_unconscious_crew","_patients","_vehType","_unit","_antibiotics","_bloodBags","_unconscious","_lowBlood","_injured","_hasSepsis","_inPain","_legsBroke","_armsBroke","_infected","_hasBandage","_hasSepsisBandage","_hasEpi","_hasMorphine","_hasSplint","_hasPainkillers","_hasEmptyBag","_hasTester","_hasAntibiotics","_hasBloodBag","_vehClose","_hasVehicle","_action1","_action2","_action3","_y","_playerMagazines","_isFriendly"];
private ["_menClose","_hasPatient","_vehicle","_inVehicle","_isClose","_assignedRole","_driver","_action","_turret","_weapons","_weaponName","_crew","_unconscious_crew","_patients","_vehType","_unit","_antibiotics","_bloodBags","_unconscious","_lowBlood","_injured","_hasSepsis","_inPain","_legsBroke","_armsBroke","_infected","_hasBandage","_hasSepsisBandage","_hasEpi","_hasMorphine","_hasSplint","_hasPainkillers","_hasEmptyBag","_hasTester","_hasAntibiotics","_hasBloodBag","_vehClose","_action1","_action2","_action3","_playerMagazines","_isFriendly"];
_menClose = cursorTarget;
_hasPatient = alive _menClose;
@@ -135,7 +135,6 @@ if (isPlayer cursorTarget) then {
_hasBloodBag = Array_Any(_playerMagazines, {_this in _bloodBags});
_vehClose = (getPosATL player) nearEntities [["Car","Tank","Helicopter","Plane","StaticWeapon","Ship"],5];
_hasVehicle = ({alive _x} count _vehClose > 0);
if (_hasPatient) then {
//Allow player to drag
@@ -150,18 +149,11 @@ if (isPlayer cursorTarget) then {
r_player_actions set [count r_player_actions, _action3];
};
//Load Vehicle
if (_hasVehicle && _unconscious) then {
_y = 0;
if (count _vehClose > 0 && _unconscious) then {
r_action = true;
_unit = _unit;
_vehicle = _vehClose select _y;
while{((!alive _vehicle) && (_y < (count _vehClose)))} do {
_y = _y + 1;
_vehicle = (_vehClose select _y);
_vehType = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
uiSleep 0.001;
};
_action = _unit addAction [format[localize "str_actions_medical_03",_vehType], "\z\addons\dayz_code\medical\load\load_act.sqf",[player,_vehicle,_unit], 0, true, true];
_vehicle = _vehClose select 0;
_vehType = getText (configFile >> "CfgVehicles" >> typeOf _vehicle >> "displayName");
NORRN_loadWoundedAction = _unit addAction [format[localize "str_actions_medical_03",_vehType], "\z\addons\dayz_code\medical\load\load_act.sqf",[player,_vehicle,_unit], 0, true, true];
r_player_actions set [count r_player_actions,_action];
};
//Allow player to bandage

2
SQF/dayz_code/medical/antibiotics.sqf
View File

@@ -1,6 +1,6 @@
#include "\z\addons\dayz_code\util\array.hpp";
private ["_msg","_antibiotics","_hasAntibiotics","_id","_hasMeds","_unit"];
private ["_msg","_antibiotics","_hasAntibiotics","_id","_hasMeds","_unit","_medsUsed"];
if (count _this > 2) then {
_unit = (_this select 3) select 0;

2
SQF/dayz_code/medical/load/load_act.sqf
View File

@@ -12,7 +12,7 @@ r_action = false;
r_action_load = false;
call fnc_usec_medic_removeActions;
_dragger removeAction NORRN_loadWoundedAction;
_wounded removeAction NORRN_loadWoundedAction;
if ((_vcl emptyPositions "cargo") > 0) then
{

4
SQF/dayz_code/medical/load/unLoad_act.sqf
View File

@@ -7,6 +7,8 @@ _args = _this select 3;
_name = _args select 0;
_vcl = _args select 1;
_crewVcl = crew _vcl;
LHA_Deck = [];
LHA_height = 0;
//_name removeAction NORRN_pullOutAction; // NORRN_pullOutAction is defined anywhere
@@ -34,4 +36,4 @@ for [{ _loop = 0 },{ _loop < count _crewVcl },{ _loop = _loop + 1}] do
uiSleep 0.1;
};
if (true) exitWith {};
if (true) exitWith {};

7
SQF/dayz_code/medical/publicEH/medTransfuse.sqf
View File

@@ -78,4 +78,9 @@ while {r_doLoop} do {
//Rerun the loop
sleep 1;
};
};
if (((r_player_blood / r_player_bloodTotal) >= 0.35) and (player getVariable["USEC_lowBlood",false])) then {
r_player_lowblood = false;
player setVariable["USEC_lowBlood",false,true];
};