Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix more setVariable and getVariable capitalization

Browse Source
This commit is contained in:
commy2 2015-11-30 17:53:57 +01:00
parent 5a1aae6028
commit 411a8d58f3
16 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/common/XEH_preInit.sqf
View File

@ -51,7 +51,7 @@ PREP(fixCollision);
PREP(fixFloating); PREP(fixFloating);
PREP(fixLoweredRifleAnimation); PREP(fixLoweredRifleAnimation);
PREP(fixPosition); PREP(fixPosition);
PREP(getAllDefinedSetVariables); PREP(getAllDefinedsetVariables);
PREP(getAllGear); PREP(getAllGear);
PREP(getCaptivityStatus); PREP(getCaptivityStatus);
PREP(getDeathAnim); PREP(getDeathAnim);

8
addons/common/functions/fnc_displayTextStructured.sqf
View File

@ -48,10 +48,10 @@ _ctrlHint ctrlSetBackgroundColor GVAR(displayTextColor);
_ctrlHint ctrlSetTextColor GVAR(displayTextFontColor); _ctrlHint ctrlSetTextColor GVAR(displayTextFontColor);
/* /*
// This does not function at the moment. Has been disabled until it fixed. // This does not function at the moment. Has been disabled until it fixed.
_xPos = profilenamespace getvariable ["IGUI_GRID_ACE_displayText_X", ((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40))]; _xPos = profilenamespace getVariable ["IGUI_GRID_ACE_displayText_X", ((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40))];
_yPos = profilenamespace getvariable ["IGUI_GRID_ACE_displayText_Y", safeZoneY + 0.175 * safezoneH]; _yPos = profilenamespace getVariable ["IGUI_GRID_ACE_displayText_Y", safeZoneY + 0.175 * safezoneH];
_wPos = profilenamespace getvariable ["IGUI_GRID_ACE_displayText_W", (10 *(((safezoneW / safezoneH) min 1.2) / 40))]; _wPos = profilenamespace getVariable ["IGUI_GRID_ACE_displayText_W", (10 *(((safezoneW / safezoneH) min 1.2) / 40))];
_hPos = profilenamespace getvariable ["IGUI_GRID_ACE_displayText_H", (2 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))]; _hPos = profilenamespace getVariable ["IGUI_GRID_ACE_displayText_H", (2 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))];
*/ */
_xPos = ((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40)); _xPos = ((safezoneX + safezoneW) - (10 *(((safezoneW / safezoneH) min 1.2) / 40)) - 2.9 *(((safezoneW / safezoneH) min 1.2) / 40));

2
addons/common/functions/fnc_resetAllDefaults.sqf
View File

@ -39,6 +39,6 @@ if (isPlayer _unit) then {
_unit setVariable [_x select 0, nil, _x select 3]; _unit setVariable [_x select 0, nil, _x select 3];
}; };
false false
} count ([_unit] call FUNC(getAllDefinedSetVariables)); } count ([_unit] call FUNC(getAllDefinedsetVariables));
_unit setVariable ["ACE_forceWalkStatusNumber", 0, true]; _unit setVariable ["ACE_forceWalkStatusNumber", 0, true];

2
addons/common/functions/fnc_setDefinedVariable.sqf
View File

@ -1,6 +1,6 @@
/* /*
* Author: Glowbal * Author: Glowbal
* Setvariable value * setVariable value
* *
* Arguments: * Arguments:
* 0: Unit <OBJECT> * 0: Unit <OBJECT>

4
addons/explosives/functions/fnc_getPlacedExplosives.sqf
View File

@ -44,9 +44,9 @@ _list = [];
if (_adjustedList) then { if (_adjustedList) then {
_clackerList = _clackerList - ["X"]; _clackerList = _clackerList - ["X"];
if (count _clackerList == 0) then { if (count _clackerList == 0) then {
_unit SetVariable [QGVAR(Clackers), nil, true]; _unit setVariable [QGVAR(Clackers), nil, true];
} else { } else {
_unit SetVariable [QGVAR(Clackers), _clackerList, true]; _unit setVariable [QGVAR(Clackers), _clackerList, true];
}; };
}; };

2
addons/explosives/functions/fnc_onInventoryChanged.sqf
View File

@ -29,7 +29,7 @@ _config = ConfigFile >> "CfgWeapons" >> _item;
if (isClass _config && {getNumber(_config >> "ACE_Detonator") == 1}) then { if (isClass _config && {getNumber(_config >> "ACE_Detonator") == 1}) then {
private ["_clackerItems"]; private ["_clackerItems"];
_clackerItems = _giver getVariable [QGVAR(Clackers), []]; _clackerItems = _giver getVariable [QGVAR(Clackers), []];
_receiver SetVariable [QGVAR(Clackers), (_receiver getVariable [QGVAR(Clackers), []]) + _clackerItems, true]; _receiver setVariable [QGVAR(Clackers), (_receiver getVariable [QGVAR(Clackers), []]) + _clackerItems, true];
_detonators = [_giver] call FUNC(getDetonators); _detonators = [_giver] call FUNC(getDetonators);
if (count _detonators == 0) then { if (count _detonators == 0) then {

8
addons/medical/functions/fnc_canTreat.sqf
View File

@ -37,7 +37,7 @@ _medicRequired = if (isNumber (_config >> "requiredMedic")) then {
} else { } else {
// Check for required class // Check for required class
if (isText (_config >> "requiredMedic")) exitwith { if (isText (_config >> "requiredMedic")) exitwith {
missionNamespace getvariable [(getText (_config >> "requiredMedic")), 0] missionNamespace getVariable [(getText (_config >> "requiredMedic")), 0]
}; };
0; 0;
}; };
@ -55,7 +55,7 @@ if (getText (_config >> "condition") != "") then {
if (isnil _condition) then { if (isnil _condition) then {
_condition = compile _condition; _condition = compile _condition;
} else { } else {
_condition = missionNamespace getvariable _condition; _condition = missionNamespace getVariable _condition;
}; };
if (_condition isEqualType false) then { if (_condition isEqualType false) then {
_return = _condition; _return = _condition;
@ -66,7 +66,7 @@ if (getText (_config >> "condition") != "") then {
if (!_return) exitwith { false }; if (!_return) exitwith { false };
_patientStateCondition = if (isText(_config >> "patientStateCondition")) then { _patientStateCondition = if (isText(_config >> "patientStateCondition")) then {
missionNamespace getvariable [getText(_config >> "patientStateCondition"), 0] missionNamespace getVariable [getText(_config >> "patientStateCondition"), 0]
} else { } else {
getNumber(_config >> "patientStateCondition") getNumber(_config >> "patientStateCondition")
}; };
@ -85,7 +85,7 @@ _medVeh = {([_caller] call FUNC(isInMedicalVehicle)) || ([_target] call FUNC(isI
if (_x == "MedicalVehicle" && _medVeh) exitwith {_return = true;}; if (_x == "MedicalVehicle" && _medVeh) exitwith {_return = true;};
if !(isnil _x) exitwith { if !(isnil _x) exitwith {
private "_val"; private "_val";
_val = missionNamespace getvariable _x; _val = missionNamespace getVariable _x;
if (_val isEqualType 0) then { if (_val isEqualType 0) then {
_return = switch (_val) do { _return = switch (_val) do {
case 0: {true}; //AdvancedMedicalSettings_anywhere case 0: {true}; //AdvancedMedicalSettings_anywhere

2
addons/medical/functions/fnc_createLitter.sqf
View File

@ -69,7 +69,7 @@ _createdLitter = [];
if (isnil _litterCondition) then { if (isnil _litterCondition) then {
_litterCondition = if (_litterCondition != "") then {compile _litterCondition} else {{true}}; _litterCondition = if (_litterCondition != "") then {compile _litterCondition} else {{true}};
} else { } else {
_litterCondition = missionNamespace getvariable _litterCondition; _litterCondition = missionNamespace getVariable _litterCondition;
if (!(_litterCondition isEqualType {})) then {_litterCondition = {false}}; if (!(_litterCondition isEqualType {})) then {_litterCondition = {false}};
}; };
if !([_caller, _target, _selectionName, _className, _usersOfItems, _previousDamage] call _litterCondition) exitwith {}; if !([_caller, _target, _selectionName, _className, _usersOfItems, _previousDamage] call _litterCondition) exitwith {};

20
addons/medical/functions/fnc_displayPatientInformation.sqf
View File

@ -46,7 +46,7 @@ if (_show) then {
}; };
disableSerialization; disableSerialization;
_display = uiNamespace getvariable QGVAR(DisplayInformation); _display = uiNamespace getVariable QGVAR(DisplayInformation);
if (isnil "_display") exitwith { if (isnil "_display") exitwith {
[_idPFH] call CBA_fnc_removePerFrameHandler; [_idPFH] call CBA_fnc_removePerFrameHandler;
}; };
@ -59,26 +59,26 @@ if (_show) then {
_genericMessages pushback [localize _partText, [1, 1, 1, 1]]; _genericMessages pushback [localize _partText, [1, 1, 1, 1]];
}; };
if (_target getvariable[QGVAR(isBleeding), false]) then { if (_target getVariable[QGVAR(isBleeding), false]) then {
_genericMessages pushback [localize LSTRING(Status_Bleeding), [1, 0.1, 0.1, 1]]; _genericMessages pushback [localize LSTRING(Status_Bleeding), [1, 0.1, 0.1, 1]];
}; };
if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then { if (_target getVariable[QGVAR(hasLostBlood), 0] > 1) then {
_genericMessages pushback [localize LSTRING(Status_Lost_Blood), [1, 0.1, 0.1, 1]]; _genericMessages pushback [localize LSTRING(Status_Lost_Blood), [1, 0.1, 0.1, 1]];
}; };
if (((_target getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]]) select _selectionN) > 0) then { if (((_target getVariable [QGVAR(tourniquets), [0,0,0,0,0,0]]) select _selectionN) > 0) then {
_genericMessages pushback [localize LSTRING(Status_Tourniquet_Applied), [0.77, 0.51, 0.08, 1]]; _genericMessages pushback [localize LSTRING(Status_Tourniquet_Applied), [0.77, 0.51, 0.08, 1]];
}; };
if (_target getvariable[QGVAR(hasPain), false]) then { if (_target getVariable[QGVAR(hasPain), false]) then {
_genericMessages pushback [localize LSTRING(Status_Pain), [1, 1, 1, 1]]; _genericMessages pushback [localize LSTRING(Status_Pain), [1, 1, 1, 1]];
}; };
_totalIvVolume = 0; _totalIvVolume = 0;
{ {
private "_value"; private "_value";
_value = _target getvariable _x; _value = _target getVariable _x;
if !(isnil "_value") then { if !(isnil "_value") then {
_totalIvVolume = _totalIvVolume + (_target getvariable [_x, 0]); _totalIvVolume = _totalIvVolume + (_target getVariable [_x, 0]);
}; };
} foreach GVAR(IVBags); } foreach GVAR(IVBags);
if (_totalIvVolume >= 1) then { if (_totalIvVolume >= 1) then {
@ -88,7 +88,7 @@ if (_show) then {
_damaged = [false, false, false, false, false, false]; _damaged = [false, false, false, false, false, false];
_selectionBloodLoss = [0,0,0,0,0,0]; _selectionBloodLoss = [0,0,0,0,0,0];
if (GVAR(level) >= 2 && {([_target] call FUNC(hasMedicalEnabled))}) then { if (GVAR(level) >= 2 && {([_target] call FUNC(hasMedicalEnabled))}) then {
_openWounds = _target getvariable [QGVAR(openWounds), []]; _openWounds = _target getVariable [QGVAR(openWounds), []];
private "_amountOf"; private "_amountOf";
{ {
_x params ["", "_x1", "_selectionX", "_amountOf", "_x4"]; _x params ["", "_x1", "_selectionX", "_amountOf", "_x4"];
@ -110,7 +110,7 @@ if (_show) then {
}; };
} foreach _openWounds; } foreach _openWounds;
_bandagedwounds = _target getvariable [QGVAR(bandagedWounds), []]; _bandagedwounds = _target getVariable [QGVAR(bandagedWounds), []];
{ {
_x params ["", "", "_selectionX", "_amountOf", "_x4"]; _x params ["", "", "_selectionX", "_amountOf", "_x4"];
// Find how much this bodypart is bleeding // Find how much this bodypart is bleeding
@ -200,7 +200,7 @@ if (_show) then {
lbClear _logCtrl; lbClear _logCtrl;
private ["_logs", "_message", "_moment", "_arguments", "_lbCtrl"]; private ["_logs", "_message", "_moment", "_arguments", "_lbCtrl"];
_logs = _target getvariable [QGVAR(logFile_Activity), []]; _logs = _target getVariable [QGVAR(logFile_Activity), []];
{ {
// [_message,_moment,_type, _arguments] // [_message,_moment,_type, _arguments]
_x params ["_message", "_moment", "_type", "_arguments"]; _x params ["_message", "_moment", "_type", "_arguments"];

12
addons/medical/functions/fnc_handleBandageOpening.sqf
View File

@ -56,7 +56,7 @@ if (isClass (_config >> _className)) then {
}; };
TRACE_5("configs",_bandage,_className,_reopeningChance,_reopeningMinDelay,_reopeningMaxDelay); TRACE_5("configs",_bandage,_className,_reopeningChance,_reopeningMinDelay,_reopeningMaxDelay);
_bandagedWounds = _target getvariable [QGVAR(bandagedWounds), []]; _bandagedWounds = _target getVariable [QGVAR(bandagedWounds), []];
_injuryType = _injury select 1; _injuryType = _injury select 1;
_exist = false; _exist = false;
_bandagedInjury = []; _bandagedInjury = [];
@ -77,7 +77,7 @@ if !(_exist) then {
_bandagedWounds pushback _bandagedInjury; _bandagedWounds pushback _bandagedInjury;
}; };
_target setvariable [QGVAR(bandagedWounds), _bandagedWounds, true]; _target setVariable [QGVAR(bandagedWounds), _bandagedWounds, true];
TRACE_1("",_reopeningChance); TRACE_1("",_reopeningChance);
// Check if we are ever going to reopen this // Check if we are ever going to reopen this
@ -89,14 +89,14 @@ if (random(1) <= _reopeningChance) then {
params ["_target", "_impact", "_part", "_injuryIndex", "_injury"]; params ["_target", "_impact", "_part", "_injuryIndex", "_injury"];
//if (alive _target) then { //if (alive _target) then {
_openWounds = _target getvariable [QGVAR(openWounds), []]; _openWounds = _target getVariable [QGVAR(openWounds), []];
if ((count _openWounds)-1 < _injuryIndex) exitwith {}; if ((count _openWounds)-1 < _injuryIndex) exitwith {};
_selectedInjury = _openWounds select _injuryIndex; _selectedInjury = _openWounds select _injuryIndex;
if (_selectedInjury select 1 == _injury select 1 && (_selectedInjury select 2) == (_injury select 2)) then { // matching the IDs if (_selectedInjury select 1 == _injury select 1 && (_selectedInjury select 2) == (_injury select 2)) then { // matching the IDs
_selectedInjury set [3, (_selectedInjury select 3) + _impact]; _selectedInjury set [3, (_selectedInjury select 3) + _impact];
_openWounds set [_injuryIndex, _selectedInjury]; _openWounds set [_injuryIndex, _selectedInjury];
_bandagedWounds = _target getvariable [QGVAR(bandagedWounds), []]; _bandagedWounds = _target getVariable [QGVAR(bandagedWounds), []];
_exist = false; _exist = false;
_injuryId = _injury select 1; _injuryId = _injury select 1;
{ {
@ -110,8 +110,8 @@ if (random(1) <= _reopeningChance) then {
if (_exist) then { if (_exist) then {
TRACE_2("Reopening Wound",_bandagedWounds,_openWounds); TRACE_2("Reopening Wound",_bandagedWounds,_openWounds);
_target setvariable [QGVAR(bandagedWounds), _bandagedWounds, true]; _target setVariable [QGVAR(bandagedWounds), _bandagedWounds, true];
_target setvariable [QGVAR(openWounds), _openWounds, true]; _target setVariable [QGVAR(openWounds), _openWounds, true];
}; };
}; };
// Otherwise something went wrong, we we don't reopen them.. // Otherwise something went wrong, we we don't reopen them..

2
addons/medical/functions/fnc_handleDamage.sqf
View File

@ -111,7 +111,7 @@ if (_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) exitW
}; };
if (_damageReturn >= 0.9 && {_selection in ["", "head", "body"]}) exitWith { if (_damageReturn >= 0.9 && {_selection in ["", "head", "body"]}) exitWith {
if (_unit getvariable ["ACE_isUnconscious", false]) exitwith { if (_unit getVariable ["ACE_isUnconscious", false]) exitwith {
[_unit, false, true] call FUNC(setDead); [_unit, false, true] call FUNC(setDead);
0.89; 0.89;
}; };

10
addons/medical/functions/fnc_handleDamage_basic.sqf
View File

@ -16,7 +16,7 @@ private ["_damageBodyParts", "_cache_params", "_cache_damages"];
params ["_target"]; params ["_target"];
TRACE_1("ACE_DEBUG: HandleDamage_BASIC Called",_target); TRACE_1("ACE_DEBUG: HandleDamage_BASIC Called",_target);
_damageBodyParts = _target getvariable [QGVAR(bodyPartStatus), [0,0,0,0,0,0]]; _damageBodyParts = _target getVariable [QGVAR(bodyPartStatus), [0,0,0,0,0,0]];
_cache_params = _target getVariable [QGVAR(cachedHandleDamageParams), []]; _cache_params = _target getVariable [QGVAR(cachedHandleDamageParams), []];
_cache_damages = _target getVariable QGVAR(cachedDamages); _cache_damages = _target getVariable QGVAR(cachedDamages);
@ -32,9 +32,9 @@ TRACE_4("ACE_DEBUG: HandleDamage BASIC",_unit, _damageBodyParts,_cache_params,_c
private ["_newDamage", "_pain"]; private ["_newDamage", "_pain"];
_newDamage = (_cache_damages select _foreachIndex); _newDamage = (_cache_damages select _foreachIndex);
_damageBodyParts set [_part, (_damageBodyParts select _part) + _newDamage]; _damageBodyParts set [_part, (_damageBodyParts select _part) + _newDamage];
_unit setvariable [QGVAR(bodyPartStatus), _damageBodyParts]; _unit setVariable [QGVAR(bodyPartStatus), _damageBodyParts];
if (alive _unit && {!(_unit getvariable ["ACE_isUnconscious", false])}) then { if (alive _unit && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
// If it reaches this, we can assume that the hit did not kill this unit, as this function is called 3 frames after the damage has been passed. // If it reaches this, we can assume that the hit did not kill this unit, as this function is called 3 frames after the damage has been passed.
if ([_unit, _part, if (_part > 1) then {_newDamage * 1.3} else {_newDamage * 2}] call FUNC(determineIfFatal)) then { if ([_unit, _part, if (_part > 1) then {_newDamage * 1.3} else {_newDamage * 2}] call FUNC(determineIfFatal)) then {
[_unit, true, 0.5+random(10)] call FUNC(setUnconscious); [_unit, true, 0.5+random(10)] call FUNC(setUnconscious);
@ -47,8 +47,8 @@ TRACE_4("ACE_DEBUG: HandleDamage BASIC",_unit, _damageBodyParts,_cache_params,_c
}foreach _cache_params; }foreach _cache_params;
// We broadcast the value across the net here, in order to avoid broadcasting it multiple times earlier in the above code block // We broadcast the value across the net here, in order to avoid broadcasting it multiple times earlier in the above code block
_target setvariable [QGVAR(bodyPartStatus), _damageBodyParts, true]; _target setVariable [QGVAR(bodyPartStatus), _damageBodyParts, true];
TRACE_2("ACE_DEBUG: HandleDamage BASIC Broadcast value here",_unit, _target getvariable QGVAR(bodyPartStatus)); TRACE_2("ACE_DEBUG: HandleDamage BASIC Broadcast value here",_unit, _target getVariable QGVAR(bodyPartStatus));
EXPLODE_6_PVT(_damageBodyParts,_headDamage,_torsoDamage,_handsDamageR,_handsDamageL,_legsDamageR,_legsDamageL); EXPLODE_6_PVT(_damageBodyParts,_headDamage,_torsoDamage,_handsDamageR,_handsDamageL,_legsDamageR,_legsDamageL);
_target setHitPointDamage ["hitHead", _headDamage min 0.95]; _target setHitPointDamage ["hitHead", _headDamage min 0.95];

30
addons/medical/functions/fnc_setDead.sqf
View File

@ -26,9 +26,9 @@ if (!local _unit) exitwith {
_reviveVal = _unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]; _reviveVal = _unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)];
if (((_reviveVal == 1 && {[_unit] call EFUNC(common,isPlayer)} || _reviveVal == 2)) && !_force) exitwith { if (((_reviveVal == 1 && {[_unit] call EFUNC(common,isPlayer)} || _reviveVal == 2)) && !_force) exitwith {
if (_unit getvariable [QGVAR(inReviveState), false]) exitwith { if (_unit getVariable [QGVAR(inReviveState), false]) exitwith {
if (GVAR(amountOfReviveLives) > 0) then { if (GVAR(amountOfReviveLives) > 0) then {
_lifesLeft = _unit getvariable[QGVAR(amountOfReviveLives), GVAR(amountOfReviveLives)]; _lifesLeft = _unit getVariable[QGVAR(amountOfReviveLives), GVAR(amountOfReviveLives)];
if (_lifesLeft == 0) then { if (_lifesLeft == 0) then {
[_unit, true] call FUNC(setDead); [_unit, true] call FUNC(setDead);
}; };
@ -37,45 +37,45 @@ if (((_reviveVal == 1 && {[_unit] call EFUNC(common,isPlayer)} || _reviveVal ==
false; false;
}; };
_unit setvariable [QGVAR(inReviveState), true, true]; _unit setVariable [QGVAR(inReviveState), true, true];
_unit setvariable [QGVAR(reviveStartTime), ACE_time]; _unit setVariable [QGVAR(reviveStartTime), ACE_time];
[_unit, true] call FUNC(setUnconscious); [_unit, true] call FUNC(setUnconscious);
[{ [{
private "_startTime"; private "_startTime";
params ["_args", "_idPFH"]; params ["_args", "_idPFH"];
_args params ["_unit"]; _args params ["_unit"];
_startTime = _unit getvariable [QGVAR(reviveStartTime), 0]; _startTime = _unit getVariable [QGVAR(reviveStartTime), 0];
if (GVAR(maxReviveTime) > 0 && {ACE_time - _startTime > GVAR(maxReviveTime)}) exitwith { if (GVAR(maxReviveTime) > 0 && {ACE_time - _startTime > GVAR(maxReviveTime)}) exitwith {
[_idPFH] call CBA_fnc_removePerFrameHandler; [_idPFH] call CBA_fnc_removePerFrameHandler;
_unit setvariable [QGVAR(inReviveState), nil, true]; _unit setVariable [QGVAR(inReviveState), nil, true];
_unit setvariable [QGVAR(reviveStartTime), nil]; _unit setVariable [QGVAR(reviveStartTime), nil];
[_unit, true] call FUNC(setDead); [_unit, true] call FUNC(setDead);
}; };
if !(_unit getvariable [QGVAR(inReviveState), false]) exitwith { if !(_unit getVariable [QGVAR(inReviveState), false]) exitwith {
// revived without dieing, so in case we have lifes, remove one. // revived without dieing, so in case we have lifes, remove one.
if (GVAR(amountOfReviveLives) > 0) then { if (GVAR(amountOfReviveLives) > 0) then {
_lifesLeft = _unit getvariable[QGVAR(amountOfReviveLives), GVAR(amountOfReviveLives)]; _lifesLeft = _unit getVariable[QGVAR(amountOfReviveLives), GVAR(amountOfReviveLives)];
_unit setvariable [QGVAR(amountOfReviveLives), _lifesLeft - 1, true]; _unit setVariable [QGVAR(amountOfReviveLives), _lifesLeft - 1, true];
}; };
_unit setvariable [QGVAR(reviveStartTime), nil]; _unit setVariable [QGVAR(reviveStartTime), nil];
[_idPFH] call CBA_fnc_removePerFrameHandler; [_idPFH] call CBA_fnc_removePerFrameHandler;
}; };
if (GVAR(level) >= 2) then { if (GVAR(level) >= 2) then {
if (_unit getvariable [QGVAR(heartRate), 60] > 0) then { if (_unit getVariable [QGVAR(heartRate), 60] > 0) then {
_unit setvariable [QGVAR(heartRate), 0]; _unit setVariable [QGVAR(heartRate), 0];
}; };
}; };
}, 1, [_unit] ] call CBA_fnc_addPerFrameHandler; }, 1, [_unit] ] call CBA_fnc_addPerFrameHandler;
false; false;
}; };
_unit setvariable ["ACE_isDead", true, true]; _unit setVariable ["ACE_isDead", true, true];
if (isPLayer _unit) then { if (isPLayer _unit) then {
_unit setvariable ["isDeadPlayer", true, true]; _unit setVariable ["isDeadPlayer", true, true];
}; };
["medical_onSetDead", [_unit]] call EFUNC(common,localEvent); ["medical_onSetDead", [_unit]] call EFUNC(common,localEvent);

28
addons/medical/functions/fnc_treatment.sqf
View File

@ -42,7 +42,7 @@ _medicRequired = if (isNumber (_config >> "requiredMedic")) then {
} else { } else {
// Check for required class // Check for required class
if (isText (_config >> "requiredMedic")) exitwith { if (isText (_config >> "requiredMedic")) exitwith {
missionNamespace getvariable [(getText (_config >> "requiredMedic")), 0]; missionNamespace getVariable [(getText (_config >> "requiredMedic")), 0];
}; };
0; 0;
}; };
@ -63,7 +63,7 @@ if (isText (_config >> "Condition")) then {
if (isnil _condition) then { if (isnil _condition) then {
_condition = compile _condition; _condition = compile _condition;
} else { } else {
_condition = missionNamespace getvariable _condition; _condition = missionNamespace getVariable _condition;
}; };
if (_condition isEqualType false) then { if (_condition isEqualType false) then {
_return = _condition; _return = _condition;
@ -75,7 +75,7 @@ if (isText (_config >> "Condition")) then {
if (!_return) exitwith {false}; if (!_return) exitwith {false};
_patientStateCondition = if (isText(_config >> "patientStateCondition")) then { _patientStateCondition = if (isText(_config >> "patientStateCondition")) then {
missionNamespace getvariable [getText(_config >> "patientStateCondition"), 0] missionNamespace getVariable [getText(_config >> "patientStateCondition"), 0]
} else { } else {
getNumber(_config >> "patientStateCondition") getNumber(_config >> "patientStateCondition")
}; };
@ -97,7 +97,7 @@ if ("All" in _locations) then {
if (_x == "MedicalVehicle" && _medVeh) exitwith {_return = true;}; if (_x == "MedicalVehicle" && _medVeh) exitwith {_return = true;};
if !(isnil _x) exitwith { if !(isnil _x) exitwith {
private "_val"; private "_val";
_val = missionNamespace getvariable _x; _val = missionNamespace getVariable _x;
if (_val isEqualType 0) then { if (_val isEqualType 0) then {
_return = switch (_val) do { _return = switch (_val) do {
case 0: {true}; //AdvancedMedicalSettings_anywhere case 0: {true}; //AdvancedMedicalSettings_anywhere
@ -119,7 +119,7 @@ _consumeItems = if (isNumber (_config >> "itemConsumed")) then {
} else { } else {
// Check for required class // Check for required class
if (isText (_config >> "itemConsumed")) exitwith { if (isText (_config >> "itemConsumed")) exitwith {
missionNamespace getvariable [(getText (_config >> "itemConsumed")), 0]; missionNamespace getVariable [(getText (_config >> "itemConsumed")), 0];
}; };
0; 0;
}; };
@ -135,19 +135,19 @@ if (_callbackProgress == "") then {
if (isNil _callbackProgress) then { if (isNil _callbackProgress) then {
_callbackProgress = compile _callbackProgress; _callbackProgress = compile _callbackProgress;
} else { } else {
_callbackProgress = missionNamespace getvariable _callbackProgress; _callbackProgress = missionNamespace getVariable _callbackProgress;
}; };
// Patient Animation // Patient Animation
_patientAnim = getText (_config >> "animationPatient"); _patientAnim = getText (_config >> "animationPatient");
if (_target getvariable ["ACE_isUnconscious", false] && GVAR(allowUnconsciousAnimationOnTreatment)) then { if (_target getVariable ["ACE_isUnconscious", false] && GVAR(allowUnconsciousAnimationOnTreatment)) then {
if !(animationState _target in (getArray (_config >> "animationPatientUnconsciousExcludeOn"))) then { if !(animationState _target in (getArray (_config >> "animationPatientUnconsciousExcludeOn"))) then {
_patientAnim = getText (_config >> "animationPatientUnconscious"); _patientAnim = getText (_config >> "animationPatientUnconscious");
}; };
}; };
if (_caller != _target && {vehicle _target == _target} && {_patientAnim != ""}) then { if (_caller != _target && {vehicle _target == _target} && {_patientAnim != ""}) then {
if (_target getvariable ["ACE_isUnconscious", false]) then { if (_target getVariable ["ACE_isUnconscious", false]) then {
[_target, _patientAnim, 2, true] call EFUNC(common,doAnimation); [_target, _patientAnim, 2, true] call EFUNC(common,doAnimation);
} else { } else {
[_target, _patientAnim, 1, true] call EFUNC(common,doAnimation); [_target, _patientAnim, 1, true] call EFUNC(common,doAnimation);
@ -160,7 +160,7 @@ if (_caller == _target) then {
_callerAnim = [getText (_config >> "animationCallerSelf"), getText (_config >> "animationCallerSelfProne")] select (stance _caller == "PRONE"); _callerAnim = [getText (_config >> "animationCallerSelf"), getText (_config >> "animationCallerSelfProne")] select (stance _caller == "PRONE");
}; };
_caller setvariable [QGVAR(selectedWeaponOnTreatment), (weaponState _caller)]; _caller setVariable [QGVAR(selectedWeaponOnTreatment), (weaponState _caller)];
// Cannot use secondairy weapon for animation // Cannot use secondairy weapon for animation
if (currentWeapon _caller == secondaryWeapon _caller) then { if (currentWeapon _caller == secondaryWeapon _caller) then {
@ -184,12 +184,12 @@ if (vehicle _caller == _caller && {_callerAnim != ""}) then {
if ((stance _caller) == "STAND") then { if ((stance _caller) == "STAND") then {
switch (_wpn) do {//If standing, end in a crouched animation based on their current weapon switch (_wpn) do {//If standing, end in a crouched animation based on their current weapon
case ("rfl"): {_caller setvariable [QGVAR(treatmentPrevAnimCaller), "AmovPknlMstpSrasWrflDnon"];}; case ("rfl"): {_caller setVariable [QGVAR(treatmentPrevAnimCaller), "AmovPknlMstpSrasWrflDnon"];};
case ("pst"): {_caller setvariable [QGVAR(treatmentPrevAnimCaller), "AmovPknlMstpSrasWpstDnon"];}; case ("pst"): {_caller setVariable [QGVAR(treatmentPrevAnimCaller), "AmovPknlMstpSrasWpstDnon"];};
case ("non"): {_caller setvariable [QGVAR(treatmentPrevAnimCaller), "AmovPknlMstpSnonWnonDnon"];}; case ("non"): {_caller setVariable [QGVAR(treatmentPrevAnimCaller), "AmovPknlMstpSnonWnonDnon"];};
}; };
} else { } else {
_caller setvariable [QGVAR(treatmentPrevAnimCaller), animationState _caller]; _caller setVariable [QGVAR(treatmentPrevAnimCaller), animationState _caller];
}; };
[_caller, _callerAnim] call EFUNC(common,doAnimation); [_caller, _callerAnim] call EFUNC(common,doAnimation);
}; };
@ -203,7 +203,7 @@ _treatmentTime = if (isNumber (_config >> "treatmentTime")) then {
if (isnil _treatmentTimeConfig) then { if (isnil _treatmentTimeConfig) then {
_treatmentTimeConfig = compile _treatmentTimeConfig; _treatmentTimeConfig = compile _treatmentTimeConfig;
} else { } else {
_treatmentTimeConfig = missionNamespace getvariable _treatmentTimeConfig; _treatmentTimeConfig = missionNamespace getVariable _treatmentTimeConfig;
}; };
if (_treatmentTimeConfig isEqualType 0) exitwith { if (_treatmentTimeConfig isEqualType 0) exitwith {
_treatmentTimeConfig; _treatmentTimeConfig;

6
addons/medical/functions/fnc_treatmentBasic_bandageLocal.sqf
View File

@ -18,7 +18,7 @@
params ["_target", "_selectionName"]; params ["_target", "_selectionName"];
_damageBodyParts = _target getvariable [QGVAR(bodyPartStatus), [0,0,0,0,0,0]]; _damageBodyParts = _target getVariable [QGVAR(bodyPartStatus), [0,0,0,0,0,0]];
// Ensure it is a valid bodypart // Ensure it is a valid bodypart
_part = [_selectionName] call FUNC(selectionNameToNumber); _part = [_selectionName] call FUNC(selectionNameToNumber);
@ -33,8 +33,8 @@ if ((_damageBodyParts select _part) > 0) then {
_damageOnPart = _damageOnPart - BANDAGEHEAL; _damageOnPart = _damageOnPart - BANDAGEHEAL;
}; };
_damageBodyParts set [_part, _damageOnPart max 0]; _damageBodyParts set [_part, _damageOnPart max 0];
_target setvariable [QGVAR(bodyPartStatus), _damageBodyParts, true]; _target setVariable [QGVAR(bodyPartStatus), _damageBodyParts, true];
TRACE_2("ACE_DEBUG: Treatment BASIC Bandage Broadcast value here",_unit, _target getvariable QGVAR(bodyPartStatus)); TRACE_2("ACE_DEBUG: Treatment BASIC Bandage Broadcast value here",_unit, _target getVariable QGVAR(bodyPartStatus));
}; };
EXPLODE_6_PVT(_damageBodyParts,_headDamage,_torsoDamage,_handsDamageR,_handsDamageL,_legsDamageR,_legsDamageL); EXPLODE_6_PVT(_damageBodyParts,_headDamage,_torsoDamage,_handsDamageR,_handsDamageL,_legsDamageR,_legsDamageL);

6
addons/repair/functions/fnc_repair.sqf
View File

@ -145,7 +145,7 @@ if (isNil _callbackProgress) then {
// Player Animation // Player Animation
_callerAnim = [getText (_config >> "animationCaller"), getText (_config >> "animationCallerProne")] select (stance _caller == "PRONE"); _callerAnim = [getText (_config >> "animationCaller"), getText (_config >> "animationCallerProne")] select (stance _caller == "PRONE");
_caller setvariable [QGVAR(selectedWeaponOnrepair), currentWeapon _caller]; _caller setVariable [QGVAR(selectedWeaponOnrepair), currentWeapon _caller];
// Cannot use secondairy weapon for animation // Cannot use secondairy weapon for animation
if (currentWeapon _caller == secondaryWeapon _caller) then { if (currentWeapon _caller == secondaryWeapon _caller) then {
@ -163,9 +163,9 @@ if (vehicle _caller == _caller && {_callerAnim != ""}) then {
}; };
if (stance _caller == "STAND") then { if (stance _caller == "STAND") then {
_caller setvariable [QGVAR(repairPrevAnimCaller), "amovpknlmstpsraswrfldnon"]; _caller setVariable [QGVAR(repairPrevAnimCaller), "amovpknlmstpsraswrfldnon"];
} else { } else {
_caller setvariable [QGVAR(repairPrevAnimCaller), animationState _caller]; _caller setVariable [QGVAR(repairPrevAnimCaller), animationState _caller];
}; };
[_caller, _callerAnim] call EFUNC(common,doAnimation); [_caller, _callerAnim] call EFUNC(common,doAnimation);
}; };