Merge branch 'master' into pr/9273

2024-08-30 18:23:18 +00:00 · 2024-02-02 18:19:24 +01:00 · 2024-02-02 18:19:24 +01:00 · 85f138fbc1
commit 85f138fbc1
parent c4b29e6ae7 c150d923f7
10 changed files with 31 additions and 51 deletions
--- a/addons/ai/functions/fnc_garrison.sqf
+++ b/addons/ai/functions/fnc_garrison.sqf
@ -7,8 +7,8 @@
 * 0: The building(s) nearest this position are used <POSITION>
 * 1: Limit the building search to those type of building <ARRAY>
 * 2: Units that will be garrisoned <ARRAY>
- * 3: Radius to fill building(s) <SCALAR> (default: 50)
- * 4: 0: even filling, 1: building by building, 2: random filling <SCALAR> (default: 0)
+ * 3: Radius to fill building(s) <NUMBER> (default: 50)
+ * 4: 0: even filling, 1: building by building, 2: random filling <NUMBER> (default: 0)
 * 5: True to fill building(s) from top to bottom <BOOL> (default: false) (note: only works with filling mode 0 and 1)
 * 6: Teleport units <BOOL> (default: false)

--- a/addons/arsenal/functions/fnc_handleActions.sqf
+++ b/addons/arsenal/functions/fnc_handleActions.sqf
@ -7,7 +7,7 @@
 * Arguments:
 * 0: Arsenal display <DISPLAY>
 * 1: Current panel control <CONTROL>
- * 2: Current panel selection <SCALAR>
+ * 2: Current panel selection <NUMBER>
 * 3: Item config entry <CONFIG>
 *
 * Return Value:
--- a/addons/cargo/functions/fnc_startLoadIn.sqf
+++ b/addons/cargo/functions/fnc_startLoadIn.sqf
@ -76,7 +76,7 @@ if ([_item, _vehicle] call FUNC(canLoadItemIn)) then {
                [QEGVAR(common,fixFloating), _item, _item] call CBA_fnc_targetEvent;
            };
        },
-        LLSTRING(loadingItem),
+        format [LLSTRING(loadingItem), [_item, true] call FUNC(getNameItem), getText (configOf _vehicle >> "displayName")],
        {
            (_this select 0) call FUNC(canLoadItemIn)
        },
--- a/addons/cargo/functions/fnc_startUnload.sqf
+++ b/addons/cargo/functions/fnc_startUnload.sqf
@ -58,7 +58,7 @@ if (GVAR(interactionParadrop)) exitWith {
                [LSTRING(unlevelFlightWarning)] call EFUNC(common,displayTextStructured);
            };
        },
-        LLSTRING(unloadingItem),
+        format [LLSTRING(unloadingItem), [_item, true] call FUNC(getNameItem), getText (configOf GVAR(interactionVehicle) >> "displayName")],
        {
            (_this select 0) params ["", "_target"];

@ -109,7 +109,7 @@ if ([_item, GVAR(interactionVehicle), _unit] call FUNC(canUnloadItem)) then {
        {
            TRACE_1("unload fail",_this);
        },
-        LLSTRING(unloadingItem),
+        format [LLSTRING(unloadingItem), [_item, true] call FUNC(getNameItem), getText (configOf GVAR(interactionVehicle) >> "displayName")],
        {
            (_this select 0) params ["_item", "_vehicle", "_unit"];

--- a/addons/cargo/stringtable.xml
+++ b/addons/cargo/stringtable.xml
@ -241,36 +241,12 @@
            <Chinesesimp>从&lt;br/&gt;%2卸载&lt;br/&gt;%1</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Cargo_LoadingItem">
-            <English>Loading Cargo</English>
-            <German>Belade</German>
-            <Portuguese>Carregando carga</Portuguese>
-            <Polish>Ładowanie cargo</Polish>
-            <Czech>Nakládám</Czech>
-            <Russian>Погрузка</Russian>
-            <Italian>Caricando</Italian>
-            <Spanish>Cargando</Spanish>
-            <French>Chargement de la cargaison</French>
-            <Japanese>カーゴへ積み込んでいます</Japanese>
-            <Korean>화물 싣기</Korean>
-            <Chinese>裝載貨物中</Chinese>
-            <Chinesesimp>正在装载货物</Chinesesimp>
-            <Turkish>Kargo Yükleniyor</Turkish>
+            <English>Loading %1 into %2...</English>
+            <Spanish>Cargando %1 en %2...</Spanish>
        </Key>
        <Key ID="STR_ACE_Cargo_UnloadingItem">
-            <English>Unloading Cargo</English>
-            <German>Entlade</German>
-            <Portuguese>Descarregando carga</Portuguese>
-            <Polish>Rozładowywanie cargo</Polish>
-            <Czech>Vykládám</Czech>
-            <Russian>Выгрузка</Russian>
-            <Italian>Scaricando</Italian>
-            <Spanish>Descargando</Spanish>
-            <French>Déchargement de la cargaison</French>
-            <Japanese>カーゴから降ろしています</Japanese>
-            <Korean>화물 내리기</Korean>
-            <Chinese>卸載貨物中</Chinese>
-            <Chinesesimp>正在卸载货物</Chinesesimp>
-            <Turkish>Kargo Boşaltılıyor</Turkish>
+            <English>Unloading %1 from %2...</English>
+            <Spanish>Descargando %1 de %2...</Spanish>
        </Key>
        <Key ID="STR_ACE_Cargo_LoadingFailed">
            <English>%1&lt;br/&gt;could not be loaded</English>
--- a/addons/common/functions/fnc_getWeight.sqf
+++ b/addons/common/functions/fnc_getWeight.sqf
@ -5,7 +5,7 @@
 *
 * Arguments:
 * 0: The Unit (usually the player) <OBJECT>
- * 1: Force a return type <SCALAR, BOOLEAN>
+ * 1: Force a return type <NUMBER, BOOLEAN>
 *
 * Return Value:
 * The return value <NUMBER>
--- a/addons/maptools/functions/fnc_updateMapToolMarkers.sqf
+++ b/addons/maptools/functions/fnc_updateMapToolMarkers.sqf
@ -25,15 +25,8 @@ if (GVAR(plottingBoard_Shown) == 0) then {
            _y set [4, 0];
        };
    } forEach GVAR(plottingBoard_markers);
-};
-
-if (((GVAR(mapTool_Shown) == 0) && {GVAR(plottingBoard_Shown) == 0}) || {
-    private _uniqueItems = ACE_player call EFUNC(common,uniqueItems);
-
-    !(("ACE_MapTools" in _uniqueItems) || {"ACE_PlottingBoard" in _uniqueItems})
-}) exitWith {};
-
-if (GVAR(plottingBoard_Shown) > 0) then {
+} else {
+    if !([ACE_player, "ACE_PlottingBoard"] call EFUNC(common,hasItem)) exitWith {};
    if (GVAR(plottingBoard_moveToMouse)) then {
        GVAR(plottingBoard_pos) = _mapCtrl ctrlMapScreenToWorld getMousePosition;
        GVAR(plottingBoard_moveToMouse) = false;  // we only need to do this once after opening the map tool
@ -97,7 +90,7 @@ if (GVAR(plottingBoard_Shown) > 0) then {
    } forEach GVAR(plottingBoard_markers);
 };

-if (GVAR(mapTool_Shown) > 0) then {
+if ((GVAR(mapTool_Shown) > 0) && {[ACE_player, "ACE_MapTools"] call EFUNC(common,hasItem)}) then {
    // Open map tools in center of screen when toggled to be shown
    if (GVAR(mapTool_moveToMouse)) then {
        GVAR(mapTool_pos) = _mapCtrl ctrlMapScreenToWorld getMousePosition;
--- a/addons/medical_status/functions/fnc_addMedicationAdjustment.sqf
+++ b/addons/medical_status/functions/fnc_addMedicationAdjustment.sqf
@ -7,10 +7,10 @@
 * 0: The Unit <OBJECT>
 * 1: Medication <STRING>
 * 2: Time in system for the adjustment to reach its peak <NUMBER>
- * 3: Duration the adjustment will have an effect <NUMVER>
- * 4: Heart Rate Adjust <NUMVER>
- * 5: Pain Suppress Adjust <NUMVER>
- * 6: Flow Adjust <NUMVER>
+ * 3: Duration the adjustment will have an effect <NUMBER>
+ * 4: Heart Rate Adjust <NUMBER>
+ * 5: Pain Suppress Adjust <NUMBER>
+ * 6: Flow Adjust <NUMBER>
 *
 * Return Value:
 * None
--- a/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf
+++ b/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf
@ -21,8 +21,16 @@ params ["_medic", "_patient", "_bodyPart"];

 private _heartRate = 0;

-if (alive _patient && {!([_patient, _bodyPart] call FUNC(hasTourniquetAppliedTo))}) then {
-    _heartRate = GET_HEART_RATE(_patient);
+if (!([_patient, _bodyPart] call FUNC(hasTourniquetAppliedTo))) then {
+    _heartRate = switch (true) do {
+        case (alive _patient): {
+            GET_HEART_RATE(_patient)
+        };
+        case (alive (_patient getVariable [QEGVAR(medical,CPR_provider), objNull])): {
+            random [25, 30, 35] // fake heart rate because patient is dead and off state machine
+        };
+        default { 0 };
+    };
 };

 private _heartRateOutput = LSTRING(Check_Pulse_Output_5);
--- a/docs/tools/document_functions.py
+++ b/docs/tools/document_functions.py
@ -192,6 +192,9 @@ class FunctionFile:
                if arg_default is None:
                    arg_default = ""

+                if ("SCALAR" in arg_types or "NUMVER" in arg_types):
+                    self.feedback("Bad Arg Type \"{}\"".format(arg_types), 1)
+
                arguments.append([arg_index, arg_name, arg_types, arg_default, arg_notes])
            else:
                # Notes about the above argument won't start with an index