From 669bbbf6bf52ddcfdb0b2042601d08219dde70f6 Mon Sep 17 00:00:00 2001 From: mrschick <58027418+mrschick@users.noreply.github.com> Date: Wed, 9 Aug 2023 15:20:15 +0200 Subject: [PATCH 01/11] Fix unusable VRC-103 on Tank_F/Wheeled_APC_F Inheritors --- addons/sys_rack/CfgVehicles.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/sys_rack/CfgVehicles.hpp b/addons/sys_rack/CfgVehicles.hpp index 8ea5c2004..a305b34e0 100644 --- a/addons/sys_rack/CfgVehicles.hpp +++ b/addons/sys_rack/CfgVehicles.hpp @@ -188,7 +188,6 @@ class CfgVehicles { componentName = "ACRE_VRC103"; allowedPositions[] = {"driver", "commander", "gunner"}; // Who has access "inside" - anyone inside, "external" - provides access upto 10m away, "driver", "gunner", "copilot", "commander" mountedRadio = "ACRE_PRC117F"; - intercom[] = {"intercom_1"}; }; }; }; @@ -202,7 +201,6 @@ class CfgVehicles { componentName = "ACRE_VRC103"; allowedPositions[] = {"driver", "commander", "gunner"}; // Who has access "inside" - anyone inside, "external" - provides access upto 10m away, "driver", "gunner", "copilot", "commander" mountedRadio = "ACRE_PRC117F"; - intercom[] = {"intercom_1"}; }; }; }; From 69b947c699172355c07cda40bb2de491dcfd45dc Mon Sep 17 00:00:00 2001 From: mrschick <58027418+mrschick@users.noreply.github.com> Date: Wed, 9 Aug 2023 15:35:54 +0200 Subject: [PATCH 02/11] Add Rack access to AAF MRAP Commanders --- addons/sys_rack/CfgVehicles.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sys_rack/CfgVehicles.hpp b/addons/sys_rack/CfgVehicles.hpp index a305b34e0..ab6260102 100644 --- a/addons/sys_rack/CfgVehicles.hpp +++ b/addons/sys_rack/CfgVehicles.hpp @@ -94,7 +94,7 @@ class CfgVehicles { displayName = CSTRING(dashUpper); // Name is displayed in the interaction menu. shortName = CSTRING(dashUpperShort); componentName = "ACRE_VRC110"; - allowedPositions[] = {"driver", {"cargo", 0}}; // Who has access "inside" - anyone inside, "external" - provides access upto 10m away, "driver", "gunner", "copilot", "commander" + allowedPositions[] = {"driver", {"cargo", 0}, "commander"}; // Who has access "inside" - anyone inside, "external" - provides access upto 10m away, "driver", "gunner", "copilot", "commander" isRadioRemovable = 1; intercom[] = {"intercom_1"}; }; @@ -102,7 +102,7 @@ class CfgVehicles { displayName = CSTRING(dashLower); // If you have multiple racks a text label helps identify the particular rack. shortName = CSTRING(dashLowerShort); componentName = "ACRE_VRC103"; - allowedPositions[] = {"driver", {"cargo", 0}}; + allowedPositions[] = {"driver", {"cargo", 0}, "commander"}; mountedRadio = "ACRE_PRC117F"; intercom[] = {"intercom_1"}; }; From c8604d89fd9accf3a95b607c94f4da76b587c975 Mon Sep 17 00:00:00 2001 From: mrschick <58027418+mrschick@users.noreply.github.com> Date: Sun, 13 Aug 2023 13:25:08 +0200 Subject: [PATCH 03/11] Revert "Fix unusable VRC-103 on Tank_F/Wheeled_APC_F Inheritors" This reverts commit 669bbbf6bf52ddcfdb0b2042601d08219dde70f6. --- addons/sys_rack/CfgVehicles.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/sys_rack/CfgVehicles.hpp b/addons/sys_rack/CfgVehicles.hpp index ab6260102..dd83ed1c1 100644 --- a/addons/sys_rack/CfgVehicles.hpp +++ b/addons/sys_rack/CfgVehicles.hpp @@ -188,6 +188,7 @@ class CfgVehicles { componentName = "ACRE_VRC103"; allowedPositions[] = {"driver", "commander", "gunner"}; // Who has access "inside" - anyone inside, "external" - provides access upto 10m away, "driver", "gunner", "copilot", "commander" mountedRadio = "ACRE_PRC117F"; + intercom[] = {"intercom_1"}; }; }; }; @@ -201,6 +202,7 @@ class CfgVehicles { componentName = "ACRE_VRC103"; allowedPositions[] = {"driver", "commander", "gunner"}; // Who has access "inside" - anyone inside, "external" - provides access upto 10m away, "driver", "gunner", "copilot", "commander" mountedRadio = "ACRE_PRC117F"; + intercom[] = {"intercom_1"}; }; }; }; From d68d8b854a265da7d12bd5c05f402a5541a46e7a Mon Sep 17 00:00:00 2001 From: mrschick <58027418+mrschick@users.noreply.github.com> Date: Sun, 13 Aug 2023 13:27:09 +0200 Subject: [PATCH 04/11] Wired Intercom "use" Action that turns the Work Knob --- addons/sys_rack/fnc_rackChildrenActions.sqf | 44 +++++++++++++++++++++ addons/sys_rack/script_component.hpp | 2 + 2 files changed, 46 insertions(+) diff --git a/addons/sys_rack/fnc_rackChildrenActions.sqf b/addons/sys_rack/fnc_rackChildrenActions.sqf index c475e3cd3..4e6c72dbc 100644 --- a/addons/sys_rack/fnc_rackChildrenActions.sqf +++ b/addons/sys_rack/fnc_rackChildrenActions.sqf @@ -121,6 +121,50 @@ if (_mountedRadio == "") then { // Empty ] call ace_interact_menu_fnc_createAction; _actions pushBack [_action, [], _target]; }; + + // Start using (only if not accessible but wired to intercom) + if (!(_mountedRadio in ACRE_ACCESSIBLE_RACK_RADIOS) && {([_mountedRadio, acre_player] call FUNC(isRadioHearable))}) then { + private _action = [ + QGVAR(useMountedRadio), + localize LSTRING(useRadio), + "", + { + [_this] spawn { + params ["_this"]; + private _mountedRadio = _this select 2; + private _newWorkPos = 0; + private _wiredRacks = [vehicle acre_player, acre_player, EGVAR(sys_intercom,activeIntercom), "wiredRacks"] call EFUNC(sys_intercom,getStationConfiguration); + { + private _rack = _x select 0; + private _radio = [_rack] call FUNC(getMountedRadio); + if (_radio isEqualTo _mountedRadio) exitWith { + _newWorkPos = _forEachIndex + 1; + }; + } forEach _wiredRacks; + + [] call EFUNC(sys_intercom,openGui); + sleep 0.5; + + private _curWorkPos = [vehicle acre_player, acre_player, EGVAR(sys_intercom,activeIntercom), "workKnob"] call EFUNC(sys_intercom,getStationConfiguration); + private _direction = 0; + if (_newWorkPos < _curWorkPos) then { + _direction = 1; + }; + + private _i = 0; + while {_i < abs (_curWorkPos - _newWorkPos)} do { + [0, _direction] call EFUNC(sys_intercom,vic3ffcsOnWorkKnobPress); + _i = _i + 1; + sleep 0.2; + }; + }; + }, + {true}, + {}, + _mountedRadio + ] call ace_interact_menu_fnc_createAction; + _actions pushBack [_action, [], _target]; + }; }; /* Connectors */ diff --git a/addons/sys_rack/script_component.hpp b/addons/sys_rack/script_component.hpp index 3cbdc18f4..dc0c274e9 100644 --- a/addons/sys_rack/script_component.hpp +++ b/addons/sys_rack/script_component.hpp @@ -25,3 +25,5 @@ #include "\idi\acre\addons\sys_components\script_acre_component_defines.hpp" #include "\idi\acre\addons\sys_intercom\script_acre_rackIntercom_defines.hpp" +/*#include "\idi\acre\addons\sys_intercom\script_component.hpp" +#include "\idi\acre\addons\sys_intercom\vic3\script_component.hpp"*/ From c4a8e4c699b71a2e9e8dedadd15962fe8a57e279 Mon Sep 17 00:00:00 2001 From: mrschick <58027418+mrschick@users.noreply.github.com> Date: Sun, 13 Aug 2023 17:09:16 +0200 Subject: [PATCH 05/11] Added some code comments --- addons/sys_rack/fnc_rackChildrenActions.sqf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/sys_rack/fnc_rackChildrenActions.sqf b/addons/sys_rack/fnc_rackChildrenActions.sqf index 4e6c72dbc..0ca3e9c4d 100644 --- a/addons/sys_rack/fnc_rackChildrenActions.sqf +++ b/addons/sys_rack/fnc_rackChildrenActions.sqf @@ -131,6 +131,8 @@ if (_mountedRadio == "") then { // Empty { [_this] spawn { params ["_this"]; + + // Find the work knob position that corresponds to the mounted radio private _mountedRadio = _this select 2; private _newWorkPos = 0; private _wiredRacks = [vehicle acre_player, acre_player, EGVAR(sys_intercom,activeIntercom), "wiredRacks"] call EFUNC(sys_intercom,getStationConfiguration); @@ -142,15 +144,18 @@ if (_mountedRadio == "") then { // Empty }; } forEach _wiredRacks; + // Open FFCS GUI [] call EFUNC(sys_intercom,openGui); sleep 0.5; + // Find current knob position and the direction to move it to the desired position private _curWorkPos = [vehicle acre_player, acre_player, EGVAR(sys_intercom,activeIntercom), "workKnob"] call EFUNC(sys_intercom,getStationConfiguration); private _direction = 0; if (_newWorkPos < _curWorkPos) then { _direction = 1; }; + // Turn the work knob N times towards the desired position private _i = 0; while {_i < abs (_curWorkPos - _newWorkPos)} do { [0, _direction] call EFUNC(sys_intercom,vic3ffcsOnWorkKnobPress); From 9cd507b708465a6f4e333f194b299d4951bd5137 Mon Sep 17 00:00:00 2001 From: mrschick <58027418+mrschick@users.noreply.github.com> Date: Sat, 9 Sep 2023 15:29:18 +0200 Subject: [PATCH 06/11] Use CBA_fnc_waitAndExecute instead of scheduled sleep --- addons/sys_rack/fnc_rackChildrenActions.sqf | 49 ++++++++++----------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/addons/sys_rack/fnc_rackChildrenActions.sqf b/addons/sys_rack/fnc_rackChildrenActions.sqf index 0ca3e9c4d..f17240622 100644 --- a/addons/sys_rack/fnc_rackChildrenActions.sqf +++ b/addons/sys_rack/fnc_rackChildrenActions.sqf @@ -129,40 +129,37 @@ if (_mountedRadio == "") then { // Empty localize LSTRING(useRadio), "", { - [_this] spawn { - params ["_this"]; - - // Find the work knob position that corresponds to the mounted radio - private _mountedRadio = _this select 2; - private _newWorkPos = 0; - private _wiredRacks = [vehicle acre_player, acre_player, EGVAR(sys_intercom,activeIntercom), "wiredRacks"] call EFUNC(sys_intercom,getStationConfiguration); - { - private _rack = _x select 0; - private _radio = [_rack] call FUNC(getMountedRadio); - if (_radio isEqualTo _mountedRadio) exitWith { - _newWorkPos = _forEachIndex + 1; - }; - } forEach _wiredRacks; + // Find the work knob position that corresponds to the mounted radio + private _mountedRadio = _this select 2; + private _newWorkPos = 0; + private _wiredRacks = [vehicle acre_player, acre_player, EGVAR(sys_intercom,activeIntercom), "wiredRacks"] call EFUNC(sys_intercom,getStationConfiguration); + { + private _rack = _x select 0; + private _radio = [_rack] call FUNC(getMountedRadio); + if (_radio isEqualTo _mountedRadio) exitWith { + _newWorkPos = _forEachIndex + 1; + }; + } forEach _wiredRacks; - // Open FFCS GUI - [] call EFUNC(sys_intercom,openGui); - sleep 0.5; + // Open FFCS GUI + [] call EFUNC(sys_intercom,openGui); - // Find current knob position and the direction to move it to the desired position - private _curWorkPos = [vehicle acre_player, acre_player, EGVAR(sys_intercom,activeIntercom), "workKnob"] call EFUNC(sys_intercom,getStationConfiguration); - private _direction = 0; - if (_newWorkPos < _curWorkPos) then { - _direction = 1; - }; + // Find current knob position and the direction to move it to the desired position + private _curWorkPos = [vehicle acre_player, acre_player, EGVAR(sys_intercom,activeIntercom), "workKnob"] call EFUNC(sys_intercom,getStationConfiguration); + private _direction = 0; + if (_newWorkPos < _curWorkPos) then { + _direction = 1; + }; - // Turn the work knob N times towards the desired position + // After a delay, turn the work knob N times towards the desired position + [{ + params ["_direction", "_curWorkPos", "_newWorkPos"]; private _i = 0; while {_i < abs (_curWorkPos - _newWorkPos)} do { [0, _direction] call EFUNC(sys_intercom,vic3ffcsOnWorkKnobPress); _i = _i + 1; - sleep 0.2; }; - }; + }, [_direction, _curWorkPos, _newWorkPos], 0.5] call CBA_fnc_waitAndExecute; }, {true}, {}, From 7ac665018e97a3188ad913e1d41dcc8681a5e04e Mon Sep 17 00:00:00 2001 From: mrschick <58027418+mrschick@users.noreply.github.com> Date: Sun, 10 Sep 2023 16:47:35 +0200 Subject: [PATCH 07/11] Re-implement turning work-knob in steps --- addons/sys_rack/fnc_rackChildrenActions.sqf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/sys_rack/fnc_rackChildrenActions.sqf b/addons/sys_rack/fnc_rackChildrenActions.sqf index f17240622..5b0d694a8 100644 --- a/addons/sys_rack/fnc_rackChildrenActions.sqf +++ b/addons/sys_rack/fnc_rackChildrenActions.sqf @@ -151,13 +151,18 @@ if (_mountedRadio == "") then { // Empty _direction = 1; }; - // After a delay, turn the work knob N times towards the desired position + // After a delay, turn the work knob N times towards the desired position in 0.2s intervals [{ params ["_direction", "_curWorkPos", "_newWorkPos"]; private _i = 0; + private _delay = 0; while {_i < abs (_curWorkPos - _newWorkPos)} do { - [0, _direction] call EFUNC(sys_intercom,vic3ffcsOnWorkKnobPress); + [{ + params ["_direction"]; + [0, _direction] call EFUNC(sys_intercom,vic3ffcsOnWorkKnobPress); + }, [_direction], _delay] call CBA_fnc_waitAndExecute; _i = _i + 1; + _delay = _delay + 0.2; }; }, [_direction, _curWorkPos, _newWorkPos], 0.5] call CBA_fnc_waitAndExecute; }, From b2d135f601b0b0719217e09148829634d49b8253 Mon Sep 17 00:00:00 2001 From: mrschick <58027418+mrschick@users.noreply.github.com> Date: Wed, 20 Sep 2023 14:56:13 +0200 Subject: [PATCH 08/11] Implemented a descriptive vehicle rack interaction --- addons/sys_rack/XEH_PREP.hpp | 1 + .../sys_rack/fnc_getRackLetterFromRadio.sqf | 30 +++++++ addons/sys_rack/fnc_rackChildrenActions.sqf | 90 ++++++------------- addons/sys_rack/script_component.hpp | 4 +- addons/sys_rack/stringtable.xml | 5 ++ 5 files changed, 63 insertions(+), 67 deletions(-) create mode 100644 addons/sys_rack/fnc_getRackLetterFromRadio.sqf diff --git a/addons/sys_rack/XEH_PREP.hpp b/addons/sys_rack/XEH_PREP.hpp index a173436bd..1c770e402 100644 --- a/addons/sys_rack/XEH_PREP.hpp +++ b/addons/sys_rack/XEH_PREP.hpp @@ -29,6 +29,7 @@ PREP(configureRackIntercom); PREP(initializeRack); PREP(getRackBaseClassname); PREP(getRackFromRadio); +PREP(getRackLetterFromRadio); PREP(getMountableRadios); PREP(getMountedRadio); PREP(getWiredIntercoms); diff --git a/addons/sys_rack/fnc_getRackLetterFromRadio.sqf b/addons/sys_rack/fnc_getRackLetterFromRadio.sqf new file mode 100644 index 000000000..54e151a0c --- /dev/null +++ b/addons/sys_rack/fnc_getRackLetterFromRadio.sqf @@ -0,0 +1,30 @@ +#include "script_component.hpp" +/* + * Author: ACRE2Team, mrschick + * Returns the rack letter if a radio is currently mounted. + * + * Arguments: + * 0: Radio ID + * + * Return Value: + * letter on work knob corresponding to the rack, or "" if radio is not a rack + * + * Example: + * ["ACRE_PRC152_ID_1"] call acre_sys_rack_fnc_getRackLetterFromRadio + * + * Public: No + */ + +params ["_radioId"]; + +private _return = ""; + +private _wiredRacks = [vehicle acre_player, acre_player, EGVAR(sys_intercom,activeIntercom), "wiredRacks"] call EFUNC(sys_intercom,getStationConfiguration); +{ + private _rackId = _x select 0; + if (([_rackId] call FUNC(getMountedRadio)) == _radioId) exitWith { + _return = [RACK_LETTERS] select _forEachIndex; + }; +} forEach _wiredRacks; + +_return diff --git a/addons/sys_rack/fnc_rackChildrenActions.sqf b/addons/sys_rack/fnc_rackChildrenActions.sqf index 5b0d694a8..8454a7777 100644 --- a/addons/sys_rack/fnc_rackChildrenActions.sqf +++ b/addons/sys_rack/fnc_rackChildrenActions.sqf @@ -106,71 +106,31 @@ if (_mountedRadio == "") then { // Empty ] call ace_interact_menu_fnc_createAction; _actions pushBack [_action, [], _target]; }; - }; - - // Start using (only if not yet accessible and not connected to intercom) - if (!(_mountedRadio in ACRE_ACCESSIBLE_RACK_RADIOS) && {!([_mountedRadio, acre_player] call FUNC(isRadioHearable))}) then { - private _action = [ - QGVAR(useMountedRadio), - localize LSTRING(useRadio), - "", - {_this call FUNC(startUsingMountedRadio)}, - {true}, - {}, - _mountedRadio - ] call ace_interact_menu_fnc_createAction; - _actions pushBack [_action, [], _target]; - }; - - // Start using (only if not accessible but wired to intercom) - if (!(_mountedRadio in ACRE_ACCESSIBLE_RACK_RADIOS) && {([_mountedRadio, acre_player] call FUNC(isRadioHearable))}) then { - private _action = [ - QGVAR(useMountedRadio), - localize LSTRING(useRadio), - "", - { - // Find the work knob position that corresponds to the mounted radio - private _mountedRadio = _this select 2; - private _newWorkPos = 0; - private _wiredRacks = [vehicle acre_player, acre_player, EGVAR(sys_intercom,activeIntercom), "wiredRacks"] call EFUNC(sys_intercom,getStationConfiguration); - { - private _rack = _x select 0; - private _radio = [_rack] call FUNC(getMountedRadio); - if (_radio isEqualTo _mountedRadio) exitWith { - _newWorkPos = _forEachIndex + 1; - }; - } forEach _wiredRacks; - - // Open FFCS GUI - [] call EFUNC(sys_intercom,openGui); - - // Find current knob position and the direction to move it to the desired position - private _curWorkPos = [vehicle acre_player, acre_player, EGVAR(sys_intercom,activeIntercom), "workKnob"] call EFUNC(sys_intercom,getStationConfiguration); - private _direction = 0; - if (_newWorkPos < _curWorkPos) then { - _direction = 1; - }; - - // After a delay, turn the work knob N times towards the desired position in 0.2s intervals - [{ - params ["_direction", "_curWorkPos", "_newWorkPos"]; - private _i = 0; - private _delay = 0; - while {_i < abs (_curWorkPos - _newWorkPos)} do { - [{ - params ["_direction"]; - [0, _direction] call EFUNC(sys_intercom,vic3ffcsOnWorkKnobPress); - }, [_direction], _delay] call CBA_fnc_waitAndExecute; - _i = _i + 1; - _delay = _delay + 0.2; - }; - }, [_direction, _curWorkPos, _newWorkPos], 0.5] call CBA_fnc_waitAndExecute; - }, - {true}, - {}, - _mountedRadio - ] call ace_interact_menu_fnc_createAction; - _actions pushBack [_action, [], _target]; + } else { + // Start using (only if not yet accessible and not connected to intercom) + if (!([_mountedRadio, acre_player] call FUNC(isRadioHearable))) then { + private _action = [ + QGVAR(useMountedRadio), + localize LSTRING(useRadio), + "", + {_this call FUNC(startUsingMountedRadio)}, + {true}, + {}, + _mountedRadio + ] call ace_interact_menu_fnc_createAction; + _actions pushBack [_action, [], _target]; + } else { + // Open FFCS (only if not accessible but wired to intercom) + // mimics standalone radio interaction to radios wired to intercom for easier UX + private _action = [ + QGVAR(useMountedRadio), + format [localize LSTRING(useIntercomRadio), ([_mountedRadio] call FUNC(getRackLetterFromRadio))], + "", + {[] call EFUNC(sys_intercom,openGui)}, + {true} + ] call ace_interact_menu_fnc_createAction; + _actions pushBack [_action, [], _target]; + }; }; }; diff --git a/addons/sys_rack/script_component.hpp b/addons/sys_rack/script_component.hpp index dc0c274e9..b5cde696d 100644 --- a/addons/sys_rack/script_component.hpp +++ b/addons/sys_rack/script_component.hpp @@ -21,9 +21,9 @@ #define MAX_EXTERNAL_RACK_DISTANCE 10 +#define RACK_LETTERS "A", "B", "C", "D", "E", "F" + #include "script_acre_rack_defines.hpp" #include "\idi\acre\addons\sys_components\script_acre_component_defines.hpp" #include "\idi\acre\addons\sys_intercom\script_acre_rackIntercom_defines.hpp" -/*#include "\idi\acre\addons\sys_intercom\script_component.hpp" -#include "\idi\acre\addons\sys_intercom\vic3\script_component.hpp"*/ diff --git a/addons/sys_rack/stringtable.xml b/addons/sys_rack/stringtable.xml index 5b66699b7..582ce6981 100644 --- a/addons/sys_rack/stringtable.xml +++ b/addons/sys_rack/stringtable.xml @@ -89,6 +89,11 @@ Использовать Kullan + + Use by turning Work-Knob to %1 + Durch drehen des Work-Knobs auf %1 verwenden + Usa girando la manopola Work su %1 + Unable to unmount radio as you have no inventory space. Funkgerät kann nicht deinstalliert werden. Nicht genug Platz im Inventar. From 43973521198302a9fe508f0d72eb19f38e203e3c Mon Sep 17 00:00:00 2001 From: mrschick <58027418+mrschick@users.noreply.github.com> Date: Thu, 21 Sep 2023 00:50:21 +0200 Subject: [PATCH 09/11] Made interaction names more descriptive --- addons/sys_rack/stringtable.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/sys_rack/stringtable.xml b/addons/sys_rack/stringtable.xml index 582ce6981..1dcb9e3a7 100644 --- a/addons/sys_rack/stringtable.xml +++ b/addons/sys_rack/stringtable.xml @@ -90,9 +90,9 @@ Kullan - Use by turning Work-Knob to %1 - Durch drehen des Work-Knobs auf %1 verwenden - Usa girando la manopola Work su %1 + Use via Intercom (Work-Knob to %1) + Durch Intercom verwenden (Work-Knob auf %1 stellen) + Usa tramite l'intercom (manopola Work su %1) Unable to unmount radio as you have no inventory space. From 6bf5cc9d68b43015b7c72e69a2104bf52cc48c15 Mon Sep 17 00:00:00 2001 From: Fabio Schick <58027418+mrschick@users.noreply.github.com> Date: Mon, 25 Sep 2023 19:21:04 +0200 Subject: [PATCH 10/11] Apply 2 suggestions from code review Co-authored-by: jonpas --- addons/sys_rack/fnc_getRackLetterFromRadio.sqf | 2 +- addons/sys_rack/stringtable.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sys_rack/fnc_getRackLetterFromRadio.sqf b/addons/sys_rack/fnc_getRackLetterFromRadio.sqf index 54e151a0c..c78f6bc1a 100644 --- a/addons/sys_rack/fnc_getRackLetterFromRadio.sqf +++ b/addons/sys_rack/fnc_getRackLetterFromRadio.sqf @@ -7,7 +7,7 @@ * 0: Radio ID * * Return Value: - * letter on work knob corresponding to the rack, or "" if radio is not a rack + * Letter on Work knob corresponding to the rack, or "" if radio is not in a rack * * Example: * ["ACRE_PRC152_ID_1"] call acre_sys_rack_fnc_getRackLetterFromRadio diff --git a/addons/sys_rack/stringtable.xml b/addons/sys_rack/stringtable.xml index 1dcb9e3a7..89446207e 100644 --- a/addons/sys_rack/stringtable.xml +++ b/addons/sys_rack/stringtable.xml @@ -90,7 +90,7 @@ Kullan - Use via Intercom (Work-Knob to %1) + Use via Intercom (WK: %1) Durch Intercom verwenden (Work-Knob auf %1 stellen) Usa tramite l'intercom (manopola Work su %1) From ec367e38204aef4ab16731b5a4a0d04177208365 Mon Sep 17 00:00:00 2001 From: mrschick <58027418+mrschick@users.noreply.github.com> Date: Mon, 25 Sep 2023 22:59:09 +0200 Subject: [PATCH 11/11] Final translations --- addons/sys_rack/stringtable.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/sys_rack/stringtable.xml b/addons/sys_rack/stringtable.xml index 89446207e..5fae69ee5 100644 --- a/addons/sys_rack/stringtable.xml +++ b/addons/sys_rack/stringtable.xml @@ -90,9 +90,9 @@ Kullan - Use via Intercom (WK: %1) - Durch Intercom verwenden (Work-Knob auf %1 stellen) - Usa tramite l'intercom (manopola Work su %1) + Use via Intercom (Work: %1) + Durch Intercom verwenden (Work: %1) + Usa tramite l'intercom (Work: %1) Unable to unmount radio as you have no inventory space.