Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cargo - Show item and vehicle in progress bar text (#9747)

Browse Source 
* improve cargo progress bar text

* spanish

---------

Co-authored-by: BrettMayson <brett@mayson.io>
This commit is contained in:
Grim 2024-01-22 19:41:46 -03:00 committed by GitHub
parent 7e255bf05b
commit 4470b1f341
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/cargo/functions/fnc_startLoadIn.sqf
View File

@ -76,7 +76,7 @@ if ([_item, _vehicle] call FUNC(canLoadItemIn)) then {
[QEGVAR(common,fixFloating), _item, _item] call CBA_fnc_targetEvent; [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) (_this select 0) call FUNC(canLoadItemIn)
}, },

4
addons/cargo/functions/fnc_startUnload.sqf
View File

@ -58,7 +58,7 @@ if (GVAR(interactionParadrop)) exitWith {
[LSTRING(unlevelFlightWarning)] call EFUNC(common,displayTextStructured); [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"]; (_this select 0) params ["", "_target"];
@ -109,7 +109,7 @@ if ([_item, GVAR(interactionVehicle), _unit] call FUNC(canUnloadItem)) then {
{ {
TRACE_1("unload fail",_this); 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"]; (_this select 0) params ["_item", "_vehicle", "_unit"];

32
addons/cargo/stringtable.xml
View File

@ -241,36 +241,12 @@
<Chinesesimp>从&lt;br/&gt;%2卸载&lt;br/&gt;%1</Chinesesimp> <Chinesesimp>从&lt;br/&gt;%2卸载&lt;br/&gt;%1</Chinesesimp>
</Key> </Key>
<Key ID="STR_ACE_Cargo_LoadingItem"> <Key ID="STR_ACE_Cargo_LoadingItem">
<English>Loading Cargo</English> <English>Loading %1 into %2...</English>
<German>Belade</German> <Spanish>Cargando %1 en %2...</Spanish>
<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>
</Key> </Key>
<Key ID="STR_ACE_Cargo_UnloadingItem"> <Key ID="STR_ACE_Cargo_UnloadingItem">
<English>Unloading Cargo</English> <English>Unloading %1 from %2...</English>
<German>Entlade</German> <Spanish>Descargando %1 de %2...</Spanish>
<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>
</Key> </Key>
<Key ID="STR_ACE_Cargo_LoadingFailed"> <Key ID="STR_ACE_Cargo_LoadingFailed">
<English>%1&lt;br/&gt;could not be loaded</English> <English>%1&lt;br/&gt;could not be loaded</English>