acemod · PabstMirror · Jun 3, 2019 · Apr 11, 2019 · Apr 11, 2019 · Apr 11, 2019
diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml
@@ -1030,7 +1030,7 @@
             <Korean>기본</Korean>
         </Key>
         <Key ID="STR_ACE_Common_Vehicle">
-            <English>Medical vehicles</English>
+            <English>Medical Vehicles</English>
             <Russian>В медицинском транспорте</Russian>
             <Polish>Pojazdy medyczne</Polish>
             <Spanish>Vehiculos médicos</Spanish>

diff --git a/addons/medical/XEH_preInit.sqf b/addons/medical/XEH_preInit.sqf
@@ -11,7 +11,6 @@ PREP_RECOMPILE_END;
 // Add warning for old functions that were technically public, Remove at 3.14.0
 {
     missionNamespace setVariable [_x, compileFinal format ['diag_log text "ACE Medical WARNING: Formerly public function [%1] has no effect in medical rewrite."; nil', _x]];
-} forEach ["ace_medical_fnc_actionPlaceInBodyBag","ace_medical_fnc_actionRemoveTourniquet","ace_medical_fnc_addHeartRateAdjustment","ace_medical_fnc_addToLog","ace_medical_fnc_addToTriageCard
-","ace_medical_fnc_addUnconsciousCondition","ace_medical_fnc_addVitalLoop","ace_medical_fnc_canAccessMedicalEquipment","ace_medical_fnc_canTreat","ace_medical_fnc_displayTriageCard","ace_medical_fnc_dropDownTriageCard","ace_medical_fnc_getTriageStatus","ace_medical_fnc_getUnconsciousCondition","ace_medical_fnc_hasItem","ace_medical_fnc_hasItems","ace_medical_fnc_hasTourniquetAppliedTo","ace_medical_fnc_isInMedicalFacility","ace_medical_fnc_isInMedicalVehicle","ace_medical_fnc_isMedic","ace_medical_fnc_isMedicalVehicle","ace_medical_fnc_itemCheck","ace_medical_fnc_selectionNameToNumber","ace_medical_fnc_setCardiacArrest","ace_medical_fnc_setDead","ace_medical_fnc_setHitPointDamage","ace_medical_fnc_showBloodEffect","ace_medical_fnc_treatment","ace_medical_fnc_treatmentAdvanced_bandage","ace_medical_fnc_treatmentAdvanced_CPR","ace_medical_fnc_treatmentAdvanced_CPRLocal","ace_medical_fnc_treatmentAdvanced_medication","ace_medical_fnc_treatmentAdvanced_medicationLocal","ace_medical_fnc_treatmentIV","ace_medical_fnc_treatmentIVLocal","ace_medical_fnc_unconsciousPFH","ace_medical_fnc_useItem","ace_medical_fnc_useItems"];
+} forEach ["ace_medical_fnc_actionPlaceInBodyBag","ace_medical_fnc_actionRemoveTourniquet","ace_medical_fnc_addHeartRateAdjustment","ace_medical_fnc_addToLog","ace_medical_fnc_addToTriageCard","ace_medical_fnc_addUnconsciousCondition","ace_medical_fnc_addVitalLoop","ace_medical_fnc_canAccessMedicalEquipment","ace_medical_fnc_canTreat","ace_medical_fnc_displayTriageCard","ace_medical_fnc_dropDownTriageCard","ace_medical_fnc_getTriageStatus","ace_medical_fnc_getUnconsciousCondition","ace_medical_fnc_hasItem","ace_medical_fnc_hasItems","ace_medical_fnc_hasTourniquetAppliedTo","ace_medical_fnc_isInMedicalFacility","ace_medical_fnc_isInMedicalVehicle","ace_medical_fnc_isMedic","ace_medical_fnc_isMedicalVehicle","ace_medical_fnc_itemCheck","ace_medical_fnc_selectionNameToNumber","ace_medical_fnc_setCardiacArrest","ace_medical_fnc_setDead","ace_medical_fnc_setHitPointDamage","ace_medical_fnc_showBloodEffect","ace_medical_fnc_treatment","ace_medical_fnc_treatmentAdvanced_bandage","ace_medical_fnc_treatmentAdvanced_CPR","ace_medical_fnc_treatmentAdvanced_CPRLocal","ace_medical_fnc_treatmentAdvanced_medication","ace_medical_fnc_treatmentAdvanced_medicationLocal","ace_medical_fnc_treatmentIV","ace_medical_fnc_treatmentIVLocal","ace_medical_fnc_unconsciousPFH","ace_medical_fnc_useItem","ace_medical_fnc_useItems"];
 
 ADDON = true;
diff --git a/addons/medical/initSettings.sqf b/addons/medical/initSettings.sqf
@@ -1,6 +1,6 @@
 // CBA Settings [ADDON: ace_medical]:
 
-private _categoryArray = [LELSTRING(medical,Category_DisplayName), "?"];
+private _categoryArray = [LELSTRING(medical,Category), "?"];
 
 // todo: Check the description is still accurate
 [

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/stringtable.xml b/addons/medical/stringtable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Medical">
-        <Key ID="STR_ACE_Medical_Category_DisplayName">
+        <Key ID="STR_ACE_Medical_Category">
             <English>ACE Medical</English>
             <Russian>ACE: медицина</Russian>
             <Polish>ACE Opcje medyczne</Polish>

diff --git a/addons/medical_ai/functions/fnc_playTreatmentAnim.sqf b/addons/medical_ai/functions/fnc_playTreatmentAnim.sqf
@@ -26,7 +26,7 @@ private _animConfig = if (_isBandage) then {
     configFile >> "ACE_Medical_Actions" >> "Basic" >> "Morphine";
 };
 
-private _configProperty = "animationCaller";
+private _configProperty = "animationMedic";
 if (_isSelfTreatment) then {
     _configProperty = _configProperty + "Self";
 };

diff --git a/addons/medical_blood/initSettings.sqf b/addons/medical_blood/initSettings.sqf
@@ -1,6 +1,6 @@
 // CBA Settings [ADDON: ace_medical_blood]:
 
-private _categoryArray = [LELSTRING(medical,Category_DisplayName), LLSTRING(subCategory)];
+private _categoryArray = [LELSTRING(medical,Category), LLSTRING(subCategory)];
 
 [
     QGVAR(enabledFor), "LIST",

diff --git a/addons/medical_damage/initSettings.sqf b/addons/medical_damage/initSettings.sqf
@@ -1,6 +1,6 @@
 // CBA Settings [ADDON: ace_medical_damage]:
 
-private _categoryArray = [LELSTRING(medical,Category_DisplayName), LLSTRING(subCategory)];
+private _categoryArray = [LELSTRING(medical,Category), LLSTRING(subCategory)];
 
 [
     QEGVAR(medical,playerDamageThreshold), "SLIDER",

diff --git a/addons/medical_feedback/initSettings.sqf b/addons/medical_feedback/initSettings.sqf
@@ -1,6 +1,6 @@
 // CBA Settings [ADDON: ace_medical_feedback]:
 
-private _categoryArray = [LELSTRING(medical,Category_DisplayName), LLSTRING(subCategory)];
+private _categoryArray = [LELSTRING(medical,Category), LLSTRING(subCategory)];
 
 [
     QGVAR(painEffectType),

diff --git a/addons/medical_gui/CfgVehicles.hpp b/addons/medical_gui/CfgVehicles.hpp
@@ -44,7 +44,7 @@ class CfgVehicles {
                     #include "InteractionBodyParts.hpp"
                     #undef ACTION_CONDITION
                 };
-                class  ACE_LoadPatient {
+                class ACE_LoadPatient {
                     displayName = CSTRING(LoadPatient);
                     condition = QUOTE(_target getVariable [ARR_2('ACE_isUnconscious',false)] && {alive _target} && {vehicle _target == _target});
                     exceptions[] = {"isNotDragging", "isNotCarrying"};

diff --git a/addons/medical_gui/initSettings.sqf b/addons/medical_gui/initSettings.sqf
@@ -2,7 +2,7 @@
     QGVAR(enableActions),
     "LIST",
     [LSTRING(EnableActions_DisplayName), LSTRING(EnableActions_Description)],
-    LSTRING(Category),
+    [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [[0, 1, 2], [LSTRING(Selections3D), LSTRING(Radial), ELSTRING(common,Disabled)], 0],
     false
 ] call CBA_settings_fnc_init;
@@ -11,7 +11,7 @@
     QGVAR(enableSelfActions),
     "CHECKBOX",
     [LSTRING(EnableSelfActions_DisplayName), LSTRING(EnableSelfActions_Description)],
-    LSTRING(Category),
+    [ELSTRING(medical,Category), LSTRING(SubCategory)],
     true,
     false
 ] call CBA_settings_fnc_init;
@@ -20,7 +20,7 @@
     QGVAR(enableMedicalMenu),
     "LIST",
     [LSTRING(EnableMedicalMenu_DisplayName), LSTRING(EnableMedicalMenu_Description)],
-    LSTRING(Category),
+    [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [[0, 1, 2], [ELSTRING(common,Disabled), ELSTRING(common,Enabled), ELSTRING(common,VehiclesOnly)], 1],
     false
 ] call CBA_settings_fnc_init;
@@ -29,7 +29,7 @@
     QGVAR(openAfterTreatment),
     "CHECKBOX",
     [LSTRING(OpenAfterTreatment_DisplayName), LSTRING(OpenAfterTreatment_Description)],
-    LSTRING(Category),
+    [ELSTRING(medical,Category), LSTRING(SubCategory)],
     true,
     false
 ] call CBA_settings_fnc_init;
@@ -38,7 +38,7 @@
     QGVAR(maxDistance),
     "SLIDER",
     [LSTRING(MaxDistance_DisplayName), LSTRING(MaxDistance_Description)],
-    LSTRING(Category),
+    [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [0, 10, 3, 1],
     false
 ] call CBA_settings_fnc_init;
diff --git a/addons/medical_gui/stringtable.xml b/addons/medical_gui/stringtable.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Medical GUI">
-        <Key ID="STR_ACE_Medical_GUI_Category">
-            <English>ACE Medical GUI</English>
+        <Key ID="STR_ACE_Medical_GUI_SubCategory">
+            <English>GUI</English>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_EnableActions_DisplayName">
             <English>Enable Medical Actions</English>

diff --git a/addons/medical_statemachine/initSettings.sqf b/addons/medical_statemachine/initSettings.sqf
@@ -1,6 +1,6 @@
 // CBA Settings [ADDON: ace_medical_statemachine]:
 
-private _categoryArray = [LELSTRING(medical,Category_DisplayName), LLSTRING(subCategory)];
+private _categoryArray = [LELSTRING(medical,Category), LLSTRING(subCategory)];
 
 [
     QGVAR(fatalInjuryCondition), "LIST",

diff --git a/addons/medical_status/initSettings.sqf b/addons/medical_status/initSettings.sqf
@@ -1,6 +1,6 @@
 // CBA Settings [ADDON: ace_medical_status]:
 
-private _categoryArray = [LELSTRING(medical,Category_DisplayName), LLSTRING(subCategory)];
+private _categoryArray = [LELSTRING(medical,Category), LLSTRING(subCategory)];
 
 [
     QEGVAR(medical,bleedingCoefficient), "SLIDER",

diff --git a/addons/medical_treatment/ACE_Medical_Treatment.hpp b/addons/medical_treatment/ACE_Medical_Treatment.hpp
@@ -582,7 +582,7 @@ class ADDON {
             timeInSystem = 1800;
             timeTillMaxEffect = 30;
             maxDose = 4;
-            inCompatableMedication[] = {};
+            incompatableMedication[] = {};
             viscosityChange = -10;
         };
         class Epinephrine {
@@ -593,7 +593,7 @@ class ADDON {
             timeInSystem = 120;
             timeTillMaxEffect = 10;
             maxDose = 10;
-            inCompatableMedication[] = {};
+            incompatableMedication[] = {};
         };
         class Adenosine {
             painReduce = 0;
@@ -603,7 +603,7 @@ class ADDON {
             timeInSystem = 120;
             timeTillMaxEffect = 15;
             maxDose = 6;
-            inCompatableMedication[] = {};
+            incompatableMedication[] = {};
         };
         class Atropine {
             painReduce = 0;
@@ -613,14 +613,14 @@ class ADDON {
             timeInSystem = 120;
             timeTillMaxEffect = 15;
             maxDose = 6;
-            inCompatableMedication[] = {};
+            incompatableMedication[] = {};
         };
         class PainKillers {
             painReduce = 0.1;
             timeInSystem = 600;
             timeTillMaxEffect = 60;
             maxDose = 10;
-            inCompatableMedication[] = {};
+            incompatableMedication[] = {};
             viscosityChange = 5;
         };
     };