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

Try base wound class in bandage treatment configs

Browse Source 
Gets the correct wound for the bandage treatment config
Used for selecting most effective bandage and reopening
_className was something like "velocityWoundMedium"
but configs only had base class "velocityWound"
This commit is contained in:
PabstMirror 2015-11-26 23:18:39 -06:00
parent 52a6eddb44
commit e51f658ce0
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,20 +36,40 @@ if (isClass (_config >> _bandage)) then {
_reopeningChance = getNumber (_config >> "reopeningChance");
_reopeningMinDelay = getNumber (_config >> "reopeningMinDelay");
_reopeningMaxDelay = getNumber (_config >> "reopeningMaxDelay") max _reopeningMinDelay;
} else {
ACE_LOGWARNING_2("No config for bandage [%1] config base [%2]", _bandage, _config);
};
if (!isClass (_config >> _className)) then {
TRACE_1("Could Not Find Wound Type, trying base class - not minor/major/large", _className);
switch (true) do {
case ((_className select [((count _className) - (count "Minor")) max 0]) == "Minor"): {
_className = _className select [0, ((count _className) - (count "Minor"))];
};
case ((_className select [((count _className) - (count "Medium")) max 0]) == "Medium"): {
_className = _className select [0, ((count _className) - (count "Medium"))];
};
case ((_className select [((count _className) - (count "Large")) max 0]) == "Large"): {
_className = _className select [0, ((count _className) - (count "Large"))];
};
};
TRACE_1("Changed to",_className);
};
if (isClass (_config >> _className)) then {
_woundTreatmentConfig = (_config >> _className);
if (isNumber (_woundTreatmentConfig >> "reopeningChance")) then {
_reopeningChance = getNumber (_woundTreatmentConfig >> "reopeningChance");
};
};
if (isNumber (_woundTreatmentConfig >> "reopeningMinDelay")) then {
_reopeningMinDelay = getNumber (_woundTreatmentConfig >> "reopeningMinDelay");
};
};
if (isNumber (_woundTreatmentConfig >> "reopeningMaxDelay")) then {
_reopeningMaxDelay = getNumber (_woundTreatmentConfig >> "reopeningMaxDelay") max _reopeningMinDelay;
};
} else {
ACE_LOGWARNING_2("No config for wound type [%1] config base [%2]", _className, _config);
};
TRACE_5("configs",_bandage,_className,_reopeningChance,_reopeningMinDelay,_reopeningMaxDelay);
_bandagedWounds = _target getvariable [QGVAR(bandagedWounds), []];
_injuryType = _injury select 1;
@ -74,9 +94,11 @@ if !(_exist) then {
_target setvariable [QGVAR(bandagedWounds), _bandagedWounds, true];
TRACE_1("",_reopeningChance);
// Check if we are ever going to reopen this
if (random(1) <= _reopeningChance) then {
_delay = _reopeningMinDelay + random(_reopeningMaxDelay - _reopeningMinDelay);
TRACE_1("Will open",_delay);
[{
private ["_bandage", "_openWounds", "_selectedInjury","_bandagedWounds","_exist"];
params ["_target", "_impact", "_part", "_injuryIndex", "_injury"];
@ -102,11 +124,12 @@ if (random(1) <= _reopeningChance) then {
} foreach _bandagedWounds;
if (_exist) then {
TRACE_2("Reopening Wound",_bandagedWounds,_openWounds);
_target setvariable [QGVAR(bandagedWounds), _bandagedWounds, true];
_target setvariable [QGVAR(openWounds), _openWounds, true];
};
};
// Otherwise something went wrong, we we don't reopen them..
//};
}, [_target, _impact, _part, _injuryIndex, +_injury], _delay, 0] call EFUNC(common,waitAndExecute);
}, [_target, _impact, _part, _injuryIndex, +_injury], _delay] call EFUNC(common,waitAndExecute);
};

18
addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
View File

@ -48,13 +48,31 @@ _exit = false;
// Select the classname from the wound classname storage
_className = GVAR(woundClassNames) select _classID;
// Check if this wound type has attributes specified for the used bandage
if (!isClass (_config >> _className)) then {
TRACE_1("Could Not Find Wound Type, trying base class - not minor/major/large", _className);
switch (true) do {
case ((_className select [((count _className) - (count "Minor")) max 0]) == "Minor"): {
_className = _className select [0, ((count _className) - (count "Minor"))];
};
case ((_className select [((count _className) - (count "Medium")) max 0]) == "Medium"): {
_className = _className select [0, ((count _className) - (count "Medium"))];
};
case ((_className select [((count _className) - (count "Large")) max 0]) == "Large"): {
_className = _className select [0, ((count _className) - (count "Large"))];
};
};
TRACE_1("Changed to",_className);
};
if (isClass (_config >> _className)) then {
// Collect the effectiveness from the used bandage for this wound type
_woundTreatmentConfig = (_config >> _className);
if (isNumber (_woundTreatmentConfig >> "effectiveness")) then {
_woundEffectivenss = getNumber (_woundTreatmentConfig >> "effectiveness");
};
} else {
ACE_LOGWARNING_2("No config for wound type [%1] config base [%2]", _className, _config);
};
TRACE_2("Wound classes: ", _specificClass, _classID);