Merge branch 'KAT-Advanced-Medical:dev-Tomcat' into translate

KAT-Advanced-Medical · Feb 19, 2025 · a95c44a · a95c44a
2 parents e17d8d1 + a733b2d
commit a95c44a
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 5 deletions.
diff --git a/.github/workflows/hemtt.yml b/.github/workflows/hemtt.yml
@@ -10,10 +10,6 @@ jobs:
   windows:
     runs-on: windows-latest
     steps:
-    - name: Install Arma 3 Tools
-      uses: arma-actions/arma3-tools@master
-      with:
-        toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
     - name: Checkout the source code
       uses: actions/checkout@v4
     - name: Setup HEMTT

diff --git a/addons/pharma/ACE_Medical_Treatment_Actions.hpp b/addons/pharma/ACE_Medical_Treatment_Actions.hpp
@@ -44,6 +44,8 @@ class ACE_Medical_Treatment_Actions {
         displayName = CSTRING(Give_CWMP);
         displayNameProgress = CSTRING(Using);
         allowedSelections[] = {"Head"};
+        medicRequired = QGVAR(medLvl_CWMP);
+        treatmentTime = QGVAR(treatmentTime_CWMP);
         items[] = {"kat_Painkiller"};
         condition = QUOTE(!(_patient getVariable [ARR_2(QQEGVAR(airway,recovery),false)]));
         callbackSuccess = QFUNC(treatmentAdvanced_CWMP);
@@ -92,7 +94,8 @@ class ACE_Medical_Treatment_Actions {
         displayNameProgress = CSTRING(Using);
         allowedSelections[] = {"Head"};
         allowSelfTreatment = 1;
-        treatmentTime = 5;
+        medicRequired = QGVAR(medLvl_Caffeine);
+        treatmentTime = QGVAR(treatmentTime_Caffeine);
         items[] = {"kat_Caffeine"};
         condition = QUOTE(!(_patient getVariable [ARR_2(QQEGVAR(airway,recovery),false)]));
         callbackSuccess = QFUNC(treatmentAdvanced_Caffeine);

diff --git a/addons/pharma/XEH_preInit.sqf b/addons/pharma/XEH_preInit.sqf
@@ -853,4 +853,40 @@ PREP_RECOMPILE_END;
     true
 ] call CBA_Settings_fnc_init;
 
+[
+    QGVAR(medLvl_Caffeine),
+    "LIST",
+    [LLSTRING(medLvl_Caffeine)],
+    [CBA_SETTINGS_CAT, LSTRING(SubCategory_Caffeine)],
+    [[0, 1, 2], [ACELSTRING(medical_treatment,Anyone), ACELSTRING(medical_treatment,Medics), ACELSTRING(medical_treatment,Doctors)], 0],
+    true
+] call CBA_Settings_fnc_init;
+
+[
+    QGVAR(treatmentTime_Caffeine),
+    "SLIDER",
+    [LLSTRING(treatmentTime_Caffeine)],
+    [CBA_SETTINGS_CAT, LSTRING(SubCategory_Caffeine)],
+    [0.1, 10, 7, 1],
+    true
+] call CBA_Settings_fnc_init;
+
+[
+    QGVAR(medLvl_CWMP),
+    "LIST",
+    [LLSTRING(medLvl_CWMP)],
+    [CBA_SETTINGS_CAT, LSTRING(SubCategory_CWMP)],
+    [[0, 1, 2], [ACELSTRING(medical_treatment,Anyone), ACELSTRING(medical_treatment,Medics), ACELSTRING(medical_treatment,Doctors)], 0],
+    true
+] call CBA_Settings_fnc_init;
+
+[
+    QGVAR(treatmentTime_CWMP),
+    "SLIDER",
+    [LLSTRING(treatmentTime_CWMP)],
+    [CBA_SETTINGS_CAT, LSTRING(SubCategory_CWMP)],
+    [0.1, 10, 7, 1],
+    true
+] call CBA_Settings_fnc_init;
+
 ADDON = true;
diff --git a/addons/pharma/stringtable.xml b/addons/pharma/stringtable.xml
@@ -4152,5 +4152,20 @@
             <German>Verabreiche Epinephrine</German>
             <Chinesesimp>推肾上腺素</Chinesesimp>
         </Key>
+        <Key ID="STR_KAT_Pharma_medLvl_Caffeine">
+            <English>Allow using Caffeine</English>
+        </Key>
+        <Key ID="STR_KAT_Pharma_treatmentTime_Caffeine">
+            <English>Treatment time for Caffeine</English>
+        </Key>
+        <Key ID="STR_KAT_Pharma_medLvl_CWMP">
+            <English>Allow using CWMP</English>
+        </Key>
+        <Key ID="STR_KAT_Pharma_treatmentTime_CWMP">
+            <English>Treatment time for CWMP</English>
+        </Key>
+        <Key ID="STR_KAT_Pharma_SubCategory_CWMP">
+            <English>CWMP Settings</English>
+        </Key>
     </Package>
 </Project>