General code audit.

This commit is contained in:
worldwidesorrow
2019-12-11 20:02:18 -06:00
committed by GitHub
parent aaab8292e2
commit 6e6919220d

View File

@@ -1,6 +1,4 @@
#include "\z\addons\dayz_code\util\array.hpp";
private ["_msg","_antibiotics","_hasAntibiotics","_id","_hasMeds","_unit","_medsUsed"];
private ["_msg","_unit","_medsUsed"];
if (count _this > 2) then {
_unit = (_this select 3) select 0;
@@ -10,31 +8,21 @@ if (count _this > 2) then {
_medsUsed = _this select 1;
};
_antibiotics =["ItemAntibiotic","ItemAntibiotic1","ItemAntibiotic2","ItemAntibiotic3","ItemAntibiotic4","ItemAntibiotic5","ItemAntibiotic6"];
_hasAntibiotics = false;
{
if (_x in magazines player) exitWith {
// Set antibiotics if not defined (used when giving to somebody)
if(isNil "_medsUsed") then {
if (isNil "_medsUsed") then {
{
if (_x in magazines player) exitWith {
// Set antibiotics if not defined (used when giving to somebody)
_medsUsed = _x;
};
_hasAntibiotics = true;
};
} count _antibiotics;
} count ["ItemAntibiotic","ItemAntibiotic1","ItemAntibiotic2","ItemAntibiotic3","ItemAntibiotic4","ItemAntibiotic5","ItemAntibiotic6"];
};
_msg = "str_actions_medical_misplaced_antibiotics";
_msg = localize "str_actions_medical_misplaced_antibiotics";
if (_hasAntibiotics) then {
if !(isNil "_medsUsed") then {
//Remove one table from the box.
[_medsUsed,"medical"] call dayz_reduceItems;
//remove infection
//Called in medAntis
//r_player_infected = false;
//_unit setVariable["USEC_infected",false,true];
//remove option
call fnc_usec_medic_removeActions;
r_action = false;
@@ -42,22 +30,23 @@ if (_hasAntibiotics) then {
//player removeAction s_player_antiobiotic;
//s_player_antiobiotic = -1;
if ((_unit == player) or (vehicle player != player)) then {
if (_unit == player) then {
//Self Healing
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medAntibiotics.sqf";
r_player_infected = false;
_unit setVariable["USEC_infected",false,true];
_msg = "str_actions_medical_taken_antibiotics";
_msg = localize "str_actions_medical_taken_antibiotics";
} else {
//Send request to other player
// Heal another player
PVDZ_send = [_unit,"Antibiotics",[_unit,player]];
publicVariableServer "PVDZ_send";
//Give humnaity for good deeds
[20,0] call player_humanityChange;
_msg = "str_actions_medical_gave_antibiotics";
_msg = format[localize "str_actions_medical_gave_antibiotics", (name _unit)];
};
};
localize _msg call dayz_rollingMessages;
_msg call dayz_rollingMessages;