Skip to content

Commit 1bd77b0

Browse files
mjc4wiltonmjc4wilton
committed
Fix hemtt and release
1 parent d5f47a9 commit 1bd77b0

12 files changed

Lines changed: 79 additions & 92 deletions

‎addons/main/Stringtable.xml‎

Lines changed: 64 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,127 +1,114 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project name="BOCR">
33
<Package name="Main">
4+
<Key ID="STR_BOCR_Main_cutLoweringLine">
5+
<English>Cut Lowering Line</English>
6+
</Key>
47
<Key ID="STR_BOCR_Main_Disable">
5-
<Original>Disable BackpackOnChest</Original>
68
<English>Disable BackpackOnChest</English>
7-
<Chinese>禁用胸前背包</Chinese>
8-
<Chinesesimp>背包前置功能已禁用</Chinesesimp>
99
<French>Interdire le sac en position ventral </French>
10+
<Spanish>Prohibir BackpackOnChest</Spanish>
11+
<Russian>Отключить рюкзак на груди</Russian>
1012
<German>BackpackOnChest verbieten</German>
1113
<Japanese>BackpackOnChest を制限</Japanese>
12-
<Spanish>Prohibir BackpackOnChest</Spanish>
14+
<Chinese>禁用胸前背包</Chinese>
15+
<Chinesesimp>背包前置功能已禁用</Chinesesimp>
1316
<Turkish>BackpackOnChest'i Kapat</Turkish>
14-
<Russian>Отключить рюкзак на груди</Russian>
1517
</Key>
1618
<Key ID="STR_BOCR_Main_Disable_Description">
17-
<Original>Prohibit BackpackOnChest features</Original>
1819
<English>Prohibit BackpackOnChest features</English>
19-
<Turkish>BackpackOnChest özelliklerini yasaklayın</Turkish>
2020
<Russian>Отключение возможности вешать рюкзак на грудь</Russian>
21+
<Turkish>BackpackOnChest özelliklerini yasaklayın</Turkish>
2122
</Key>
22-
<Key ID="STR_BOCR_Main_Walk">
23-
<Original>Force Walking</Original>
24-
<English>Force Walking</English>
25-
<Turkish>Zorla Yürüme</Turkish>
26-
<Russian>Принудительная ходьба</Russian>
23+
<Key ID="STR_BOCR_Main_Lower">
24+
<English>Lower chestpack</English>
2725
</Key>
28-
<Key ID="STR_BOCR_Main_Walk_Description">
29-
<Original>Player is forced to walk when backpack is on chest</Original>
30-
<English>Player is forced to walk when backpack is on chest</English>
31-
<Turkish>Oyuncu sırt çantası gövdesindeyken yürümeye zorlanır</Turkish>
32-
<Russian>Вынуждать игрока ходить когда рюкзак находится на груди</Russian>
26+
<Key ID="STR_BOCR_Main_ModuleAdd_Description">
27+
<English>Adds a chestpack (with invenory) to all syncronized Units.</English>
28+
<French>Ajoute un sac ventral (avec inventaire) à toutes les unités syncronisées.</French>
29+
<Spanish>Agrega una mochila al pecho (con inventario) a todas las unidades sincronizadas</Spanish>
30+
<Russian>Добавить рюкзак на груди (с инвентарем) для всех синхронизированных юнитов</Russian>
31+
<German>Fügt einen Chestpack allen syncronisierten Einheiten hinzu.</German>
32+
<Japanese>同期された全ユニットにチェストパック(インベントリ付)を追加します。</Japanese>
33+
<Chinese>增加胸前背包（包括內容物）給全部同步中的單位。</Chinese>
34+
<Chinesesimp>给所有已同步的单位增加前置背包(包含库存)</Chinesesimp>
35+
<Turkish>Tüm senkronize Birimlere bir Chestpack (envanter ile) ekler.</Turkish>
3336
</Key>
3437
<Key ID="STR_BOCR_Main_ModuleAdd_Displayname">
35-
<Original>Add Chestpack</Original>
3638
<English>Add Chestpack</English>
37-
<Chinese>增加胸前背包</Chinese>
38-
<Chinesesimp>增加背包</Chinesesimp>
3939
<French>Ajouter un sac ventral</French>
40+
<Spanish>Agregar mochila al pecho</Spanish>
41+
<Russian>Добавить рюкзак на груди</Russian>
4042
<German>Chestpack hinzufügen</German>
4143
<Japanese>チェストパック追加</Japanese>
42-
<Spanish>Agregar mochila al pecho</Spanish>
44+
<Chinese>增加胸前背包</Chinese>
45+
<Chinesesimp>增加背包</Chinesesimp>
4346
<Turkish>Chestpack Ekle</Turkish>
44-
<Russian>Добавить рюкзак на груди</Russian>
4547
</Key>
46-
<Key ID="STR_BOCR_Main_ModuleAdd_Description">
47-
<Original>Adds a chestpack (with invenory) to all syncronized Units.</Original>
48-
<English>Adds a chestpack (with invenory) to all syncronized Units.</English>
49-
<Chinese>增加胸前背包（包括內容物）給全部同步中的單位。</Chinese>
50-
<Chinesesimp>给所有已同步的单位增加前置背包(包含库存)</Chinesesimp>
51-
<French>Ajoute un sac ventral (avec inventaire) à toutes les unités syncronisées.</French>
52-
<German>Fügt einen Chestpack allen syncronisierten Einheiten hinzu.</German>
53-
<Japanese>同期された全ユニットにチェストパック(インベントリ付)を追加します。</Japanese>
54-
<Spanish>Agrega una mochila al pecho (con inventario) a todas las unidades sincronizadas</Spanish>
55-
<Turkish>Tüm senkronize Birimlere bir Chestpack (envanter ile) ekler.</Turkish>
56-
<Russian>Добавить рюкзак на груди (с инвентарем) для всех синхронизированных юнитов</Russian>
48+
<Key ID="STR_BOCR_Main_ModuleOnChest_Description">
49+
<English>Puts current backpack on the chest.</English>
50+
<French>Place le sac à dos actuel en position ventral.</French>
51+
<Spanish>Pone la mochila actual en el pecho.</Spanish>
52+
<Russian>Надевает текущий рюкзак на грудь</Russian>
53+
<German>Schnallt den aktuellen Rucksack auf den Bauch.</German>
54+
<Japanese>現在のバックパックを前側に置きます。</Japanese>
55+
<Chinese>把目前背包放置胸前</Chinese>
56+
<Chinesesimp>将当前背包置于胸前</Chinesesimp>
57+
<Turkish>Mevcut sırt çantasını göğsüne koyar.</Turkish>
5758
</Key>
5859
<Key ID="STR_BOCR_Main_ModuleOnChest_Displayname">
59-
<Original>Backpack on Chest</Original>
6060
<English>Backpack on Chest</English>
61-
<Chinese>胸前背包</Chinese>
62-
<Chinesesimp>启用背包前置</Chinesesimp>
6361
<French>Sac à dos en position ventral</French>
62+
<Spanish>Mochila al pecho</Spanish>
63+
<Russian>Рюкзак на груди</Russian>
6464
<German>Rucksack auf den Bauch</German>
6565
<Japanese>前側にバックパック</Japanese>
66-
<Spanish>Mochila al pecho</Spanish>
66+
<Chinese>胸前背包</Chinese>
67+
<Chinesesimp>启用背包前置</Chinesesimp>
6768
<Turkish>Gövede de Sırt Çantası</Turkish>
68-
<Russian>Рюкзак на груди</Russian>
6969
</Key>
70-
<Key ID="STR_BOCR_Main_ModuleOnChest_Description">
71-
<Original>Puts current backpack on the chest.</Original>
72-
<English>Puts current backpack on the chest.</English>
73-
<Chinese>把目前背包放置胸前</Chinese>
74-
<Chinesesimp>将当前背包置于胸前</Chinesesimp>
75-
<French>Place le sac à dos actuel en position ventral.</French>
76-
<German>Schnallt den aktuellen Rucksack auf den Bauch.</German>
77-
<Japanese>現在のバックパックを前側に置きます。</Japanese>
78-
<Spanish>Pone la mochila actual en el pecho.</Spanish>
79-
<Turkish>Mevcut sırt çantasını göğsüne koyar.</Turkish>
80-
<Russian>Надевает текущий рюкзак на грудь</Russian>
70+
<Key ID="STR_BOCR_Main_OnBack">
71+
<English>Put backpack on back</English>
72+
<French>Remettre le sac à dos ventral dans le dos</French>
73+
<Spanish>Poner mochila en la espalda</Spanish>
74+
<Russian>Надеть рюкзак на спину</Russian>
75+
<German>Rucksack auf den Rücken</German>
76+
<Japanese>バックパックを後ろ側にする</Japanese>
77+
<Chinese>把背包背著</Chinese>
78+
<Chinesesimp>将背包置于后背</Chinesesimp>
79+
<Turkish>Sırt çantasını sırtınıza asın</Turkish>
8180
</Key>
8281
<Key ID="STR_BOCR_Main_OnChest">
83-
<Original>Put backpack on chest</Original>
8482
<English>Put backpack on chest</English>
85-
<Chinese>把背包放置胸前</Chinese>
86-
<Chinesesimp>将背包置于胸前</Chinesesimp>
8783
<French>Mettre le sac à dos en position ventral</French>
84+
<Spanish>Poner mochila en el pecho</Spanish>
85+
<Russian>Надеть рюкзак на грудь</Russian>
8886
<German>Rucksack auf den Bauch schnallen</German>
8987
<Japanese>バックパックを前側にする</Japanese>
90-
<Spanish>Poner mochila en el pecho</Spanish>
88+
<Chinese>把背包放置胸前</Chinese>
89+
<Chinesesimp>将背包置于胸前</Chinesesimp>
9190
<Turkish>Sırt çantasını gövdenize asın</Turkish>
92-
<Russian>Надеть рюкзак на грудь</Russian>
93-
</Key>
94-
<Key ID="STR_BOCR_Main_OnBack">
95-
<Original>Put backpack on back</Original>
96-
<English>Put backpack on back</English>
97-
<Chinese>把背包背著</Chinese>
98-
<Chinesesimp>将背包置于后背</Chinesesimp>
99-
<French>Remettre le sac à dos ventral dans le dos</French>
100-
<German>Rucksack auf den Rücken</German>
101-
<Japanese>バックパックを後ろ側にする</Japanese>
102-
<Spanish>Poner mochila en la espalda</Spanish>
103-
<Turkish>Sırt çantasını sırtınıza asın</Turkish>
104-
<Russian>Надеть рюкзак на спину</Russian>
10591
</Key>
10692
<Key ID="STR_BOCR_Main_Swap">
107-
<Original>Swap rucksacks</Original>
10893
<English>Swap rucksacks</English>
109-
<Chinese>前後背包交換</Chinese>
110-
<Chinesesimp>交换背包位置</Chinesesimp>
11194
<French>Intervertir les sacs</French>
95+
<Spanish>Intercambiar mochilas</Spanish>
96+
<Russian>Поменять рюкзаки местами</Russian>
11297
<German>Rucksäcke tauschen</German>
11398
<Japanese>バックパックを入れ替え</Japanese>
114-
<Spanish>Intercambiar mochilas</Spanish>
99+
<Chinese>前後背包交換</Chinese>
100+
<Chinesesimp>交换背包位置</Chinesesimp>
115101
<Turkish>Sırt çantalarını değiştirin (Bölge)</Turkish>
116-
<Russian>Поменять рюкзаки местами</Russian>
117102
</Key>
118-
<Key ID="STR_BOCR_Main_Lower">
119-
<Original>Lower chestpack</Original>
120-
<English>Lower chestpack</English>
103+
<Key ID="STR_BOCR_Main_Walk">
104+
<English>Force Walking</English>
105+
<Russian>Принудительная ходьба</Russian>
106+
<Turkish>Zorla Yürüme</Turkish>
121107
</Key>
122-
<Key ID="STR_BOCR_Main_cutLoweringLine">
123-
<Original>Cut Lowering Line</Original>
124-
<English>Cut Lowering Line</Original>
108+
<Key ID="STR_BOCR_Main_Walk_Description">
109+
<English>Player is forced to walk when backpack is on chest</English>
110+
<Russian>Вынуждать игрока ходить когда рюкзак находится на груди</Russian>
111+
<Turkish>Oyuncu sırt çantası gövdesindeyken yürümeye zorlanır</Turkish>
125112
</Key>
126113
</Package>
127114
</Project>

‎addons/main/functions/fnc_EHAnimDone.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ _chestpackClass = [_unit] call FUNC(chestpack);
2626
if ((animationState _unit) find "halofreefall_" isEqualTo 0) then {
2727
if !(_chestpackClass in GVAR(exceptions)) then {
2828
_chestpack attachTo [_unit,[0,-0.4,0.05],"pelvis"];
29-
_chestpack setVectorDirandUp [[0,0,1],[0,1,0]];
29+
_chestpack setVectorDirAndUp [[0,0,1],[0,1,0]];
3030
};
3131
};

‎addons/main/functions/fnc_EHHandleDisconnect.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
params ["_unit", "_id", "_uid", "_name"];
1919

20-
if !([_unit] call FUNC(chestpack) isEqualTo "") then {
20+
if (([_unit] call FUNC(chestpack)) isNotEqualTo "") then {
2121
[[_unit] call FUNC(chestpackContainer), _unit] spawn {
2222
params ["_container","_unit"];
2323
sleep 1.5;

‎addons/main/functions/fnc_actionOnBack.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ private _chestpackVariables = [_unit] call FUNC(chestpackVariables);
2323
private _shouldSwitchNVGs = currentVisionMode _unit != 0;
2424

2525
//make sure the player has a chestpack and no backpack
26-
if ((_chestpack isEqualTo "") or !(backpack _unit isEqualTo "")) exitWith {};
26+
if ((_chestpack isEqualTo "") or (backpack _unit isNotEqualTo "")) exitWith {};
2727

2828
//add items
2929
private _loadout = [_unit] call CBA_fnc_getLoadout;

‎addons/main/functions/fnc_actionSwap.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if ((_backpack isEqualTo "") or ([_unit] call FUNC(chestpack)) isEqualTo "") exi
3333
//Backpack Variable Handling
3434
{
3535
private _val = (backpackContainer _unit) getVariable _x;
36-
_backpackVariables pushback [_x, _val];
36+
_backpackVariables pushBack [_x, _val];
3737
} forEach ((allVariables (backpackContainer _unit) - GVAR(VarBlacklist)));
3838

3939
//remove packs

‎addons/main/functions/fnc_addChestpack.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if (GVAR(walk)) then {
5252
_unit setVariable [QGVAR(chestpack), [[_chestpackClass, _chestpack], [_getInID, _getOutID, _animID, _killedID], _backpackLoadout, _backpackVariables, _backpackLoad], true];
5353

5454
//handle vehicles
55-
if !(vehicle _unit isEqualTo _unit) then {
55+
if ((vehicle _unit) isNotEqualTo _unit) then {
5656
[_unit, "", vehicle _unit] call FUNC(EHGetIn);
5757
} else {
5858
[_unit, "", objNull] call FUNC(EHGetOut);

‎addons/main/functions/fnc_arsenal_onButtonClick.sqf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
*
1515
* Public: No
1616
*/
17-
private _center = missionnamespace getvariable ["BIS_fnc_arsenal_center", player];
17+
private _center = missionNamespace getVariable ["BIS_fnc_arsenal_center", player];
1818

1919
private _chestpack = [_center] call FUNC(chestpack);
2020
private _backpack = backpack _center;
2121

2222
private _action = ["onback", "onchest"] select (_chestpack isEqualTo "");
23-
if (!(_backpack isEqualTo "") and !(_chestpack isEqualTo "")) then {_action = "swap";};
23+
if ((_backpack isNotEqualTo "") and (_chestpack isNotEqualTo "")) then {_action = "swap";};
2424

2525
//execute action
2626
switch (_action) do {

‎addons/main/functions/fnc_arsenal_updateUI.sqf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ if (_display isEqualType controlNull) exitWith { // the onSelChanged EH calls b
2222
};
2323

2424
// the arsenal unit
25-
private _center = missionnamespace getvariable ["BIS_fnc_arsenal_center",player];
25+
private _center = missionNamespace getVariable ["BIS_fnc_arsenal_center",player];
2626

2727
private _chestpack = [_center] call FUNC(chestpack);
2828
private _backpack = backpack _center;
2929

3030
private _action = ["onBack", "onChest"] select (_chestpack isEqualTo "");
31-
if (!(_backpack isEqualTo "") and !(_chestpack isEqualTo "")) then {_action = "swap";};
31+
if ((_backpack isNotEqualTo "") and (_chestpack isNotEqualTo "")) then {_action = "swap";};
3232

3333
switch (_action) do {
3434
case ("onBack"): {

‎addons/main/functions/fnc_moduleOnChest.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ _null = [_units,_backpackClass,_delay] spawn {
3030
params ["_units","_backpackClass","_delay"];
3131
sleep _delay;
3232
{
33-
if !((backpack _x) isEqualTo "") then {
33+
if ((backpack _x) isNotEqualTo "") then {
3434
[_x] call FUNC(actionOnChest);
3535
};
3636
if (_backpackClass != "") then {

‎addons/main/functions/fnc_removeItemFromChestpack.sqf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ params ["_unit","_item", ["_quantity", 1]];
2020

2121
private _loadout = _unit call FUNC(chestpackLoadout);
2222
private _itemFound = {
23-
if !(_x find _item isEqualTo -1) exitWith { [_x, _forEachIndex, true] };
23+
if (_x find _item isNotEqualTo -1) exitWith { [_x, _forEachIndex, true] };
2424
} forEach _loadout;
2525

2626
//exit if no item found
27-
if !(_itemFound select 2 isEqualTo true) exitWith {};
27+
if ((_itemFound select 2) isNotEqualTo true) exitWith {};
2828

2929
private _var = _unit getVariable [QGVAR(chestpack), nil];
3030
private _currentItem = (_var select 2) select (_itemFound select 1);

0 commit comments

Comments
 (0)