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

merge basic and adv. bandage actions

Browse Source
This commit is contained in:
commy2 2016-10-13 01:55:10 +02:00
parent fd6e46b622
commit 4a06d19ce4
4 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/medical_ai/functions/fnc_healSelf.sqf
View File

@ -33,7 +33,7 @@ switch (true) do {
};
} forEach _openWounds;
private _selection = ALL_BODY_PARTS select _partIndex;
[_this, "Bandage", _selection] call EFUNC(medical_treatment,treatmentBandageLocal);
[_this, "BasicBandage", _selection] call EFUNC(medical_treatment,treatmentBandageLocal);
#ifdef DEBUG_MODE_FULL
systemChat format ["%1 is bandaging selection %2", _this, _selection];

2
addons/medical_ai/functions/fnc_healUnit.sqf
View File

@ -62,7 +62,7 @@ switch (true) do {
};
} forEach _openWounds;
private _selection = ALL_BODY_PARTS select _partIndex;
[_target, "Bandage", _selection] call EFUNC(medical_treatment,treatmentBandageLocal);
[_target, "BasicBandage", _selection] call EFUNC(medical_treatment,treatmentBandageLocal);
#ifdef DEBUG_MODE_FULL
systemChat format ["%1 is bandaging selection %2 on %3", _this, _selection, _target];

2
addons/medical_ai/functions/fnc_playTreatmentAnim.sqf
View File

@ -18,7 +18,7 @@ params ["_unit", "_isBandage", "_isSelfTreatment"];
if (vehicle _unit != _unit) exitWith {};
private _animConfig = if (_isBandage) then {
configFile >> "ACE_Medical_Actions" >> "Basic" >> "Bandage";
configFile >> "ACE_Medical_Actions" >> "Basic" >> "BasicBandage";
} else {
configFile >> "ACE_Medical_Actions" >> "Basic" >> "Morphine";
};

43
addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
View File

@ -1,7 +1,7 @@
class GVAR(Actions) {
class Basic {
class Bandage {
class BasicBandage {
displayName = ECSTRING(medical,Bandage);
displayNameProgress = ECSTRING(medical,Bandaging);
category = "bandage";
@ -31,7 +31,38 @@ class GVAR(Actions) {
{"All", "_bloodLossOnSelection <= 0", {"ACE_MedicalLitter_clean"}}
};
};
class Morphine: Bandage {
class FieldDressing: BasicBandage {
displayName = ECSTRING(medical,Actions_FieldDressing);
items[] = {"ACE_fieldDressing"};
litter[] = {
{"All", "_bloodLossOnSelection > 0", {{"ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
{"All", "_bloodLossOnSelection <= 0", {"ACE_MedicalLitter_clean"}}
};
};
class PackingBandage: BasicBandage {
displayName = ECSTRING(medical,Actions_PackingBandage);
items[] = {"ACE_packingBandage"};
litter[] = {
{"All", "", {"ACE_MedicalLitter_packingBandage"}},
{"All", "_bloodLossOnSelection > 0", {{"ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
{"All", "_bloodLossOnSelection <= 0", {"ACE_MedicalLitter_clean"}}
};
};
class ElasticBandage: BasicBandage {
displayName = ECSTRING(medical,Actions_ElasticBandage);
items[] = {"ACE_elasticBandage"};
};
class QuikClot: BasicBandage {
displayName = ECSTRING(medical,Actions_QuikClot);
items[] = {"ACE_quikclot"};
litter[] = {
{"All", "", {"ACE_MedicalLitter_QuickClot"}},
{"All", "_bloodLossOnSelection > 0", {{"ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
{"All", "_bloodLossOnSelection <= 0", {"ACE_MedicalLitter_clean"}}
};
};
class Morphine: BasicBandage {
displayName = ECSTRING(medical,Inject_Morphine);
displayNameProgress = ECSTRING(medical,Injecting_Morphine);
allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"};
@ -53,7 +84,7 @@ class GVAR(Actions) {
litter[] = { {"All", "", {"ACE_MedicalLitter_epinephrine"}} };
treatmentLocations[] = {QGVAR(useLocation_basicEpi)};
};
class BloodIV: Bandage {
class BloodIV: BasicBandage {
displayName = ECSTRING(medical,Actions_Blood4_1000);
displayNameProgress = ECSTRING(medical,Transfusing_Blood);
allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"};
@ -74,7 +105,7 @@ class GVAR(Actions) {
displayName = ECSTRING(medical,Actions_Blood4_250);
items[] = {"ACE_bloodIV_250"};
};
class BodyBag: Bandage {
class BodyBag: BasicBandage {
displayName = ECSTRING(medical,PlaceInBodyBag);
displayNameProgress = ECSTRING(medical,PlacingInBodyBag);
category = "advanced";
@ -91,7 +122,7 @@ class GVAR(Actions) {
itemConsumed = 1;
litter[] = {};
};
class Diagnose: Bandage {
class Diagnose: BasicBandage {
displayName = ECSTRING(medical,Actions_Diagnose);
displayNameProgress = ECSTRING(medical,Actions_Diagnosing);
category = "examine";
@ -108,7 +139,7 @@ class GVAR(Actions) {
itemConsumed = 0;
litter[] = {};
};
class CPR: Bandage {
class CPR: BasicBandage {
displayName = ECSTRING(medical,Actions_CPR);
displayNameProgress = ECSTRING(medical,Actions_PerformingCPR);
category = "advanced";