Small med stuff (#7084)

* Small med stuff * update adv fatigue comment * disable medical debug by default * Fix tourniquet call to addToTriageCard
acemod · Jul 3, 2019 · fa910a7 · fa910a7
1 parent 05e4f74
commit fa910a7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/addons/advanced_fatigue/XEH_postInit.sqf b/addons/advanced_fatigue/XEH_postInit.sqf
@@ -47,8 +47,8 @@ if (!hasInterface) exitWith {};
         [QEGVAR(medical,pain), { // 0->1.0, 0.5->1.05, 1->1.1
             linearConversion [0, 1, (_this getVariable [QEGVAR(medical,pain), 0]), 1, 1.1, true];
         }] call FUNC(addDutyFactor);
-        [QEGVAR(medical,bloodVolume), { // 100->1.0, 90->1.1, 80->1.2
-            linearConversion [6, 0, (_this getVariable [QEGVAR(medical,bloodVolume), 100]), 1, 2, true];
+        [QEGVAR(medical,bloodVolume), { // 6->1.0, 5->1.167, 4->1.33
+            linearConversion [6, 0, (_this getVariable [QEGVAR(medical,bloodVolume), 6]), 1, 2, true];
         }] call FUNC(addDutyFactor);
     };
     if (["ACE_Dragging"] call EFUNC(common,isModLoaded)) then {

diff --git a/addons/medical/script_component.hpp b/addons/medical/script_component.hpp
@@ -2,7 +2,7 @@
 #define COMPONENT_BEAUTIFIED Medical Core
 #include "\z\ace\addons\main\script_mod.hpp"
 
-#define DEBUG_MODE_FULL
+// #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 // #define ENABLE_PERFORMANCE_COUNTERS
 

diff --git a/addons/medical_gui/functions/fnc_menuPFH.sqf b/addons/medical_gui/functions/fnc_menuPFH.sqf
@@ -19,7 +19,7 @@
 if !([ACE_player, GVAR(target), ["isNotInside", "isNotSwimming"]] call EFUNC(common,canInteractWith) && {[ACE_player, GVAR(target)] call FUNC(canOpenMenu)}) then {
     closeDialog 0;
     // Show hint if distance condition failed
-    if (ACE_player distance GVAR(target) > GVAR(maxDistance)) then {
+    if ((ACE_player distance GVAR(target) > GVAR(maxDistance)) && {vehicle ACE_player != vehicle GVAR(target)}) then {
         [[ELSTRING(medical,DistanceToFar), GVAR(target) call EFUNC(common,getName)], 2] call EFUNC(common,displayTextStructured);
     };
 };

diff --git a/addons/medical_gui/initSettings.sqf b/addons/medical_gui/initSettings.sqf
@@ -40,5 +40,5 @@
     [LSTRING(MaxDistance_DisplayName), LSTRING(MaxDistance_Description)],
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [0, 10, 3, 1],
-    false
+    true
 ] call CBA_settings_fnc_init;
diff --git a/addons/medical_treatment/functions/fnc_tourniquet.sqf b/addons/medical_treatment/functions/fnc_tourniquet.sqf
@@ -27,7 +27,7 @@ if ([_patient, _bodyPart] call FUNC(hasTourniquetAppliedTo)) exitWith {
     ["There is already a tourniquet on this body part!", 1.5] call EFUNC(common,displayTextStructured); // todo: localize
 };
 
-[_patient, _usedItem] call FUNC(addToTraigeCard);
+[_patient, _usedItem] call FUNC(addToTriageCard);
 [_patient, "activity", LSTRING(Activity_appliedTourniquet), [[_medic, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);
 
 [QGVAR(tourniquetLocal), [_patient, _bodyPart], _patient] call CBA_fnc_targetEvent;