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 branch 'master' of https://github.com/acemod/ACE3 into repair

Browse Source
This commit is contained in:
jokoho48
2015-08-09 18:58:02 +02:00
parent e4abf7c8cc 58fc69c2a6
commit fb56517099
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
addons/medical/ACE_Medical_Treatments.hpp
View File

@ -140,6 +140,7 @@ class ACE_Medical_Actions {
class PackingBandage: fieldDressing { class PackingBandage: fieldDressing {
displayName = CSTRING(Actions_PackingBandage); displayName = CSTRING(Actions_PackingBandage);
items[] = {"ACE_packingBandage"}; items[] = {"ACE_packingBandage"};
litter[] = { {"All", "", {"ACE_MedicalLitter_packingBandage"}}};
}; };
class ElasticBandage: fieldDressing { class ElasticBandage: fieldDressing {
displayName = CSTRING(Actions_ElasticBandage); displayName = CSTRING(Actions_ElasticBandage);
@ -148,6 +149,7 @@ class ACE_Medical_Actions {
class QuikClot: fieldDressing { class QuikClot: fieldDressing {
displayName = CSTRING(Actions_QuikClot); displayName = CSTRING(Actions_QuikClot);
items[] = {"ACE_quikclot"}; items[] = {"ACE_quikclot"};
litter[] = { {"All", "", {"ACE_MedicalLitter_QuickClot"}}};
}; };
class Tourniquet: fieldDressing { class Tourniquet: fieldDressing {
displayName = CSTRING(Apply_Tourniquet); displayName = CSTRING(Apply_Tourniquet);
@ -262,7 +264,11 @@ class ACE_Medical_Actions {
animationCallerProne = "AinvPpneMstpSlayW[wpn]Dnon_medicOther"; animationCallerProne = "AinvPpneMstpSlayW[wpn]Dnon_medicOther";
animationCallerSelf = ""; animationCallerSelf = "";
animationCallerSelfProne = ""; animationCallerSelfProne = "";
litter[] = { {"All", "", {"ACE_MedicalLitter_gloves"}}, {"All", "", {{"ACE_MedicalLitterBase", "ACE_MedicalLitter_bandage1", "ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}} }, {"All", "", {{"ACE_MedicalLitterBase", "ACE_MedicalLitter_bandage1", "ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}} }; litter[] = { {"All", "", {"ACE_MedicalLitter_gloves"}},
{"All", "_previousDamage > 0", {{"ACE_MedicalLitterBase", "ACE_MedicalLitter_bandage1", "ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}} },
{"All", "_previousDamage > 0", {{"ACE_MedicalLitterBase", "ACE_MedicalLitter_bandage1", "ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
{"All", "_previousDamage <= 0", {"ACE_MedicalLitter_clean"}}
};
}; };
class CheckPulse: fieldDressing { class CheckPulse: fieldDressing {
displayName = CSTRING(Actions_CheckPulse); displayName = CSTRING(Actions_CheckPulse);
@ -299,6 +305,7 @@ class ACE_Medical_Actions {
callbackSuccess = QUOTE(DFUNC(actionRemoveTourniquet)); callbackSuccess = QUOTE(DFUNC(actionRemoveTourniquet));
condition = QUOTE([ARR_2(_this select 1, _this select 2)] call FUNC(hasTourniquetAppliedTo)); condition = QUOTE([ARR_2(_this select 1, _this select 2)] call FUNC(hasTourniquetAppliedTo));
displayNameProgress = CSTRING(RemovingTourniquet); displayNameProgress = CSTRING(RemovingTourniquet);
litter[] = {};
}; };
class CPR: fieldDressing { class CPR: fieldDressing {
displayName = CSTRING(Actions_CPR); displayName = CSTRING(Actions_CPR);