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

magazinerepack stringtable fix #5390 (#5392)

Browse Source 
* fix #5390

stringtable optimization

* Dont use the same wort twice - magazinerepack stringtable

* [magazinerepack] get bulletsLeft in last partial mag as optional param

* [magrepack] remove unused entries

* [magrepack] entry is needed for interrupt event

* [magrepack] finish msg

successful -> full mags + left rounds
Interrupted -> full mags + partial mags

* [magrepack] final translation change

* space fix
This commit is contained in:
shukari 2017-09-21 20:42:01 +02:00 committed by jonpas
parent 942ab122d3
commit a783e6319f
2 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf
View File

@ -30,6 +30,7 @@ if (!([ACE_player, objNull, ["isNotInside", "isNotSitting", "isNowSwimming"]] ca
// Count mags
private _fullMags = 0;
private _partialMags = 0;
private _bulletsLeft = 0;
{
_x params ["_classname", "_count"];
@ -38,15 +39,16 @@ private _partialMags = 0;
_fullMags = _fullMags + 1;
} else {
_partialMags = _partialMags + 1;
_bulletsLeft = _count;
};
};
} forEach (magazinesAmmoFull ACE_player);
private _repackedMagsText = format [localize LSTRING(RepackedMagazinesCount), _fullMags, _partialMags];
private _structuredOutputText = if (_errorCode == 0) then {
private _repackedMagsText = format [localize LSTRING(RepackedMagazinesDetail), _fullMags, _bulletsLeft];
format ["<t align='center'>%1</t><br/>%2", localize LSTRING(RepackComplete), _repackedMagsText];
} else {
private _repackedMagsText = format [localize LSTRING(RepackedMagazinesCount), _fullMags, _partialMags];
format ["<t align='center'>%1</t><br/>%2", localize LSTRING(RepackInterrupted), _repackedMagsText];
};

50
addons/magazinerepack/stringtable.xml
View File

@ -17,38 +17,6 @@
<Chinesesimp>重新整理弹匣</Chinesesimp>
<Chinese>重新整理彈匣</Chinese>
</Key>
<Key ID="STR_ACE_MagazineRepack_SelectMagazineMenu">
<English>Select Magazine Menu</English>
<German>Magazinauswahlmenü</German>
<Spanish>Menú de selección de cargador</Spanish>
<French>Sélectionner le menu des chargeurs</French>
<Polish>Menu wyboru magazynków</Polish>
<Czech>Zvolit menu zásobníků</Czech>
<Italian>Seleziona menù di ricarica</Italian>
<Portuguese>Menu de Seleção de Carregador</Portuguese>
<Hungarian>Fegyvertár menü kiválasztás</Hungarian>
<Russian>Меню выбора магазинов</Russian>
<Japanese>弾倉メニューから選ぶ</Japanese>
<Korean>탄창 메뉴 고르기</Korean>
<Chinesesimp>选择弹匣清单</Chinesesimp>
<Chinese>選擇彈匣清單</Chinese>
</Key>
<Key ID="STR_ACE_MagazineRepack_SelectMagazine">
<English>Select Mag</English>
<German>Magazin auswählen</German>
<Spanish>Seleccionar cargador</Spanish>
<French>Sélectionner le chargeur</French>
<Polish>Wybierz magazynek</Polish>
<Czech>Vyber zásobník</Czech>
<Italian>Seleziona caricatore</Italian>
<Portuguese>Selecionar Carregador</Portuguese>
<Hungarian>Tár kiválasztása</Hungarian>
<Russian>Выбрать магазин</Russian>
<Japanese>弾倉を選択</Japanese>
<Korean>탄창 고르기</Korean>
<Chinesesimp>选择弹匣</Chinesesimp>
<Chinese>選擇彈匣</Chinese>
</Key>
<Key ID="STR_ACE_MagazineRepack_RepackingMagazine">
<English>Repacking Magazines...</English>
<German>Magazine umpacken...</German>
@ -65,22 +33,6 @@
<Chinesesimp>重新整理弹匣中 ...</Chinesesimp>
<Chinese>重新整理彈匣中 ...</Chinese>
</Key>
<Key ID="STR_ACE_MagazineRepack_RepackedMagazines">
<English>Repacked Magazines</English>
<German>Magazine umgepackt</German>
<Spanish>Cargadores reorganizados</Spanish>
<French>Chargeurs réorganisés</French>
<Polish>Magazynki przepakowane</Polish>
<Czech>Přepáskované zásobníky</Czech>
<Italian>Caricatore riempito</Italian>
<Portuguese>Carregadores Reorganizados</Portuguese>
<Hungarian>Újratárazott tárak</Hungarian>
<Russian>Магазины перепакованы</Russian>
<Japanese>弾倉の詰め替えが終わった</Japanese>
<Korean>탄창 채워짐</Korean>
<Chinesesimp>弹匣已重新整理</Chinesesimp>
<Chinese>彈匣已重新整理</Chinese>
</Key>
<Key ID="STR_ACE_MagazineRepack_RepackedMagazinesDetail">
<English>%1 full mag(s) and %2 extra round(s)</English>
<German>%1 volle(s) Magazin(e) und %2 übrig gebliebene Patrone(n)</German>
@ -132,7 +84,7 @@
<Key ID="STR_ACE_MagazineRepack_RepackedMagazinesCount">
<English>%1 Full and %2 Partial</English>
<French>%1 plein(s) et %2 partiel(s)</French>
<German>%1 volle Magazine und 1 Magazin mit %2 Partronen</German>
<German>%1 volle(s) Magazin(e) und %2 angefangene(s) Magazin(e)</German>
<Spanish>%1 Llenos y %2 Incompletos</Spanish>
<Russian>%1 полных и %2 неполных</Russian>
<Czech>%1 plný a %2 částečně</Czech>