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

basic <-> advanced

Browse Source
This commit is contained in:
commy2 2016-10-13 17:14:43 +02:00
parent 68d75beae6
commit fe2c6e8d85
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/medical/XEH_preInit.sqf
View File

@ -11,20 +11,20 @@ GVAR(STATE_MACHINE) = (configFile >> "ACE_Medical_StateMachine") call FUNC(creat
// @todo, ACE_Settings
[
QGVAR(basicBandages),
QGVAR(advancedBandages),
"CHECKBOX",
["Basic Bandages", "All Bandages share the same effectiveness and reopening chances."], //@todo
["Advanced Bandages", "All bandages have different wound effectivenesses and reopening chances."], //@todo
"ACE Medical", // @todo
true,
false,
true
] call CBA_Settings_fnc_init;
[
QGVAR(basicIVBags),
QGVAR(advancedIVBags),
"CHECKBOX",
["Basic IV Bags", "IV Bags fill up lost blood instantly"], //@todo
["Advanced IV Bags", "IV Bags will slowly fill up lost blood."], //@todo
"ACE Medical", // @todo
true,
false,
true
] call CBA_Settings_fnc_init;

2
addons/medical/script_macros_medical.hpp
View File

@ -28,7 +28,7 @@
// IV Change per second calculation:
// 250ml should take 60 seconds to fill. 250ml/60s = 4.166ml/s.
#define IV_CHANGE_PER_SECOND ([4.166, 1000] select GVAR(basicIVBags)) // in milliliters per second
#define IV_CHANGE_PER_SECOND ([1000, 4.166] select GVAR(advancedIVBags)) // in milliliters per second
// chance per second to get knocked out due to blood loss
#define BLOOD_LOSS_KNOCK_OUT_CHANCE 0.1 // 10%

14
addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp
View File

@ -12,7 +12,7 @@ class GVAR(Actions) {
treatmentTime = 5;
treatmentTimeSelfCoef = 1;
items[] = {{"ACE_fieldDressing", "ACE_packingBandage", "ACE_elasticBandage", "ACE_quikclot"}};
condition = QEGVAR(medical,basicBandages);
condition = QUOTE(!EGVAR(medical,advancedBandages));
patientStateCondition = 0;
itemConsumed = 1;
callbackSuccess = QFUNC(treatmentBandage);
@ -34,7 +34,7 @@ class GVAR(Actions) {
class FieldDressing: BasicBandage {
displayName = ECSTRING(medical,Actions_FieldDressing);
items[] = {"ACE_fieldDressing"};
condition = QUOTE(!EGVAR(medical,basicBandages));
condition = QEGVAR(medical,advancedBandages);
litter[] = {
{"All", "_bloodLossOnBodyPart > 0", {{"ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
{"All", "_bloodLossOnBodyPart <= 0", {"ACE_MedicalLitter_clean"}}
@ -43,7 +43,7 @@ class GVAR(Actions) {
class PackingBandage: BasicBandage {
displayName = ECSTRING(medical,Actions_PackingBandage);
items[] = {"ACE_packingBandage"};
condition = QUOTE(!EGVAR(medical,basicBandages));
condition = QEGVAR(medical,advancedBandages);
litter[] = {
{"All", "", {"ACE_MedicalLitter_packingBandage"}},
{"All", "_bloodLossOnBodyPart > 0", {{"ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
@ -53,7 +53,7 @@ class GVAR(Actions) {
class ElasticBandage: BasicBandage {
displayName = ECSTRING(medical,Actions_ElasticBandage);
items[] = {"ACE_elasticBandage"};
condition = QUOTE(!EGVAR(medical,basicBandages));
condition = QEGVAR(medical,advancedBandages);
litter[] = {
{"All", "_bloodLossOnBodyPart > 0", {{"ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
{"All", "_bloodLossOnBodyPart <= 0", {"ACE_MedicalLitter_clean"}}
@ -62,7 +62,7 @@ class GVAR(Actions) {
class QuikClot: BasicBandage {
displayName = ECSTRING(medical,Actions_QuikClot);
items[] = {"ACE_quikclot"};
condition = QUOTE(!EGVAR(medical,basicBandages));
condition = QEGVAR(medical,advancedBandages);
litter[] = {
{"All", "", {"ACE_MedicalLitter_QuickClot"}},
{"All", "_bloodLossOnBodyPart > 0", {{"ACE_MedicalLitter_bandage2", "ACE_MedicalLitter_bandage3"}}},
@ -78,7 +78,7 @@ class GVAR(Actions) {
items[] = {"ACE_tourniquet"};
treatmentTime = 4;
callbackSuccess = QFUNC(treatmentTourniquet);
condition = QUOTE(!EGVAR(medical,basicBandages) && {!([ARR_2(_target,_bodyPart)] call EFUNC(medical,hasTourniquetAppliedTo))});
condition = QUOTE(EGVAR(medical,advancedBandages) && {!([ARR_2(_target,_bodyPart)] call EFUNC(medical,hasTourniquetAppliedTo))});
litter[] = {};
};
class RemoveTourniquet: Tourniquet {
@ -87,7 +87,7 @@ class GVAR(Actions) {
items[] = {};
treatmentTime = 2.5;
callbackSuccess = QFUNC(treatmentTourniquetRemove);
condition = QUOTE(!EGVAR(medical,basicBandages) && {[ARR_2(_target,_bodyPart)] call EFUNC(medical,hasTourniquetAppliedTo)});
condition = QUOTE(EGVAR(medical,advancedBandages) && {[ARR_2(_target,_bodyPart)] call EFUNC(medical,hasTourniquetAppliedTo)});
};
// --- syringes