Skip to content

Commit fdf0cd8

Browse files
PabstMirrorPabstMirror
committed
Merge branch 'master' into release-3.18.4
2 parents 62829f3 + b58b0d2 commit fdf0cd8

24 files changed

+221
-45
lines changed

‎addons/accessory/stringtable.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Spanish>Community Base Addons - Funciones accesorias</Spanish>
99
<Italian>Community Base Addons - Funzioni per Accessori</Italian>
1010
<Polish>Community Base Addons - Funkcje Akcesoriów</Polish>
11-
<Russian>Community Base Addons - Функционал Аксессуаров</Russian>
11+
<Russian>Community Base Addons - Функционал аксессуаров</Russian>
1212
<German>Community Base Addons - Zubehörfunktionen</German>
1313
<Korean>커뮤니티 베이스 애드온 - 부착물 기능</Korean>
1414
<Japanese>Community Base Addons - アクセサリー機能</Japanese>

‎addons/ai/stringtable.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Spanish>Posición del edificio de IA</Spanish>
99
<Italian>Posizione edificio AI</Italian>
1010
<Polish>Pozycja AI w budynku</Polish>
11-
<Russian>ИИ Позиция в здании</Russian>
11+
<Russian>Позиция ИИ в здании</Russian>
1212
<German>KI Gebäudeposition</German>
1313
<Korean>인공지능 건물 위치</Korean>
1414
<Japanese>AI の建物内での位置</Japanese>
@@ -23,7 +23,7 @@
2323
<Spanish>Community Base Addons - Inteligencia artificial</Spanish>
2424
<Italian>Community Base Addons - Intelligenza Artificiale</Italian>
2525
<Polish>Community Base Addons - Sztuczna Inteligencja</Polish>
26-
<Russian>Community Base Addons - Искуственный Интеллект</Russian>
26+
<Russian>Community Base Addons - Искуственный интеллект</Russian>
2727
<German>Community Base Addons - Künstliche Intelligenz</German>
2828
<Korean>커뮤니티 베이스 애드온- 인공지능</Korean>
2929
<Japanese>Community Base Addons - 人工知能</Japanese>
@@ -43,6 +43,7 @@
4343
<Japanese>不可視の標的飛行機</Japanese>
4444
<Chinese>隱形目標（飛機）</Chinese>
4545
<Chinesesimp>隐形目标（飞机）</Chinesesimp>
46+
<Russian>Невидимая цель - самолет</Russian>
4647
</Key>
4748
<Key ID="STR_CBA_AI_InvisibleTargetSoldier">
4849
<English>Invisible Target Soldier</English>
@@ -72,6 +73,7 @@
7273
<Japanese>不可視の標的車両</Japanese>
7374
<Chinese>隱形目標（車輛）</Chinese>
7475
<Chinesesimp>隐形目标（车辆）</Chinesesimp>
76+
<Russian>Невидимая цель - транспорт</Russian>
7577
</Key>
7678
</Package>
7779
</Project>

‎addons/bitwise/stringtable.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<German>Community Base Addons - Bitweise</German>
88
<Korean>커뮤니티 베이스 애드온 - 비트 연산</Korean>
99
<Japanese>Community Base Addons - ビット演算</Japanese>
10+
<Russian>Community Base Addons - Битовые операции</Russian>
1011
</Key>
1112
</Package>
1213
</Project>

‎addons/characters/stringtable.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<Japanese>Community Base Addons - キャラクター</Japanese>
1313
<Chinese>社區基礎插件 - 角色</Chinese>
1414
<Chinesesimp>社区基础插件-角色</Chinesesimp>
15+
<Russian>Community Base Addons - Персонажи</Russian>
1516
</Key>
1617
<Key ID="STR_CBA_Characters_MenMalariaInfected">
1718
<English>Men (Malaria-Infected)</English>
@@ -24,6 +25,7 @@
2425
<Japanese>人間 (マラリア罹患)</Japanese>
2526
<Chinese>男子(瘧疾感染者)</Chinese>
2627
<Chinesesimp>男子(疟疾感染者)</Chinesesimp>
28+
<Russian>Люди (зараженные малярией)</Russian>
2729
</Key>
2830
</Package>
2931
</Project>

‎addons/common/CfgFunctions.hpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ class CfgFunctions {
44
class Config {
55
PATHTO_FNC(getConfigEntry);
66
PATHTO_FNC(getCfgDataRandom);
7+
PATHTO_FNC(getCfgDataHashmap);
78
PATHTO_FNC(getObjectConfig);
89
PATHTO_FNC(getItemConfig);
910
PATHTO_FNC(getMuzzles);
@@ -120,6 +121,7 @@ class CfgFunctions {
120121
};
121122

122123
class Misc {
124+
PATHTO_FNC(convertStringCode);
123125
PATHTO_FNC(addPerFrameHandler);
124126
PATHTO_FNC(removePerFrameHandler);
125127
PATHTO_FNC(setPerFrameHandlerDelay);

‎addons/common/fnc_convertStringCode.sqf‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#include "script_component.hpp"
2+
/* ----------------------------------------------------------------------------
3+
Function: CBA_fnc_convertStringCode
4+
5+
Description:
6+
Converts a String into Code - Also checks for existing Functions with that name.
7+
8+
Parameters:
9+
_str - Code as String <STRING>
10+
11+
Returns:
12+
Code as Code <CODE>
13+
14+
Examples:
15+
(begin example)
16+
getText (_cfg >> "statement") call CBA_fnc_convertStringCode
17+
(end)
18+
19+
Author:
20+
OverlordZorn
21+
---------------------------------------------------------------------------- */
22+
params [["_stringCode", "", [""]]];
23+
24+
switch (true) do {
25+
case (_stringCode isEqualTo ""): {{}};
26+
case (!(missionNamespace isNil _stringCode)): {missionNamespace getVariable _stringCode};
27+
default {compile _stringCode};
28+
}

‎addons/common/fnc_createUUID.sqf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ for "_i" from 0 to 29 do {
3535

3636
_uuid insert [8, ["-"]];
3737
_uuid insert [13, ["-", _versionByte]];
38-
_uuid insert [17, ["-", _variantByte]];
39-
_uuid insert [22, ["-"]];
38+
_uuid insert [18, ["-", _variantByte]];
39+
_uuid insert [23, ["-"]];
4040
_uuid joinString ""

‎addons/common/fnc_getCfgDataHashmap.sqf‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
#include "script_component.hpp"
2+
/* ----------------------------------------------------------------------------
3+
Function: CBA_fnc_getCfgDataHashmap
4+
5+
Description:
6+
This function extracts all config properties of a class and returns them as a Hashmap with the properties as keys (string).
7+
8+
The following Values will be converted:
9+
Boolean as String ("true", "false") will be converted to boolean data-type.
10+
11+
Will check if _cfg exists, if not, returns nil.
12+
13+
Parameters:
14+
_cfg - Entry to get value of <CONFIG>
15+
_condition - Condition for configProperties (optional, default: "true") <STRING>
16+
_inherit - include inherited properties (optional, default: true) <BOOL>
17+
_convert - convert certain values - see above (optional, default: true) <BOOL>
18+
19+
Returns:
20+
properties <HASHMAP>
21+
22+
Examples:
23+
(begin example)
24+
private _hashMap = [configFile >> "CfgJellies" >> "Blue_Jelly"] call CBA_fnc_getCfgDataHashmap;
25+
(end)
26+
27+
Author:
28+
OverlordZorn
29+
---------------------------------------------------------------------------- */
30+
31+
32+
params [
33+
["_cfg", configNull, [configNull]],
34+
["_condition", "true", [""]],
35+
["_inherit", true, [true]],
36+
["_convert", true, [true]]
37+
];
38+
39+
if !(isClass _cfg || { isNull _cfg } ) exitWith { nil };
40+
41+
private _properties = configProperties [_cfg, _condition, _inherit];
42+
43+
private _returnHashMap = createHashMap;
44+
45+
private _convertApply = [
46+
nil,
47+
{
48+
switch (true) do {
49+
case (_x isEqualType [] ): { _x apply _convertApply };
50+
case (_x isEqualTo "true");
51+
case (_x isEqualTo "(true)"): { true };
52+
case (_x isEqualTo "false");
53+
case (_x isEqualTo "(false)"): { false };
54+
default { _x };
55+
}
56+
}
57+
] select _convert;
58+
59+
60+
private _convertCall = [
61+
{
62+
_this
63+
},
64+
{
65+
switch (true) do {
66+
case (_this isEqualType [] ): { _this apply _convertApply };
67+
case (_this isEqualTo "true");
68+
case (_this isEqualTo "(true)"): { true };
69+
case (_this isEqualTo "false");
70+
case (_this isEqualTo "(false)"): { false };
71+
default { _this };
72+
};
73+
}
74+
] select _convert;
75+
76+
77+
{
78+
private _config = _x;
79+
80+
private _value = _x call BIS_fnc_getCfgData call _convertCall;
81+
82+
_returnHashMap set [
83+
configName _x,
84+
_value
85+
];
86+
87+
} forEach _properties;
88+
89+
_returnHashMap // return

‎addons/common/stringtable.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<French>Community Base Addons - Composants communs</French>
88
<Italian>Community Base Addons - Componenti Comuni</Italian>
99
<Polish>Community Base Addons - Ogólne Komponenty</Polish>
10-
<Russian>Community Base Addons - Общие Компоненты</Russian>
10+
<Russian>Community Base Addons - Общие компоненты</Russian>
1111
<German>Community Base Addons - Gemeinsame Komponente</German>
1212
<Korean>커뮤니티 베이스 애드온 - 일반 구성 요소</Korean>
1313
<Japanese>Community Base Addons - 全般要素</Japanese>

‎addons/diagnostic/stringtable.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<Japanese>スペース4個</Japanese>
2929
<Chinese>4 個空格</Chinese>
3030
<Chinesesimp>4 个空格</Chinesesimp>
31+
<Russian>4 пробела</Russian>
3132
</Key>
3233
<Key ID="STR_CBA_Diagnostic_ConsoleIndentType">
3334
<English>Debug Console Indentation</English>
@@ -41,6 +42,7 @@
4142
<Japanese>デバッグコンソールのインデント</Japanese>
4243
<Chinese>調試控制台縮進</Chinese>
4344
<Chinesesimp>调试控制台缩进</Chinesesimp>
45+
<Russian>Отступ консоли отладки</Russian>
4446
</Key>
4547
<Key ID="STR_CBA_Diagnostic_ConsoleIndentTypeTooltip">
4648
<English>Type of indentation that can be added to expression in the debug console by pressing Tab key or removed by pressing Shift + Tab.</English>
@@ -54,6 +56,7 @@
5456
<Japanese>デバッグコンソールでのインデントのタイプ。 インデントはTabキーを押して追加、Shift + Tabキーを押して削除できる。</Japanese>
5557
<Chinese>可以通過按 Tab 鍵為添加到調試控制台中的表達式縮進或通過按 Shift + Tab 鍵為其刪除縮進。</Chinese>
5658
<Chinesesimp>可以通过按 Tab 键为添加到调试控制台中的表达式缩进或通过按 Shift + Tab 键为其删除缩进。</Chinesesimp>
59+
<Russian>Тип отступа, который может быть добавлен к коду в консоли отладки нажатием клавиши Tab или убран нажатием клавиш Shift + Tab.</Russian>
5760
</Key>
5861
<Key ID="STR_CBA_Diagnostic_EnableTargetDebug">
5962
<English>Enable Target Debugging</English>
@@ -62,7 +65,7 @@
6265
<Spanish>Activar Depuración de Objetivo</Spanish>
6366
<Italian>Attiva il debug remoto</Italian>
6467
<Polish>Włącz debugowanie na celu</Polish>
65-
<Russian>Включить Отладку Цели</Russian>
68+
<Russian>Включить отладку цели</Russian>
6669
<German>Ziel-Debugging aktivieren</German>
6770
<Korean>대상 디버깅 활성화</Korean>
6871
<Japanese>対象デバッキングを有効化</Japanese>
@@ -77,7 +80,7 @@
7780
<Spanish>[CBA] Permite la depuración de objetivos remotos. Requiere consola de depuración.</Spanish>
7881
<Italian>[CBA] Abilita il debug remoto. Richiede la console di debug.</Italian>
7982
<Polish>[CBA] Włącza debugowanie zdalnego celu. Konsola Debugowania musi być dostęna.</Polish>
80-
<Russian>[CBA] Разрешает отладку дистанционной цели. Требуется Консоль Отладки.</Russian>
83+
<Russian>[CBA] Разрешает отладку удаленной цели. Требуется консоль отладки.</Russian>
8184
<German>[CBA] Erlaubt Remote-Ziel-Debugging. Benötigt Debug-Konsole.</German>
8285
<Korean>[CBA] 원격 대상 디버깅을 허용합니다. 디버그 콘솔 필요</Korean>
8386
<Japanese>[CBA] リモート対象デバッキングを許可します。デバッグ コンソールが必要です。</Japanese>
@@ -92,7 +95,7 @@
9295
<Spanish>Consola Extendida de Depuración</Spanish>
9396
<Italian>Console debug estesa</Italian>
9497
<Polish>Rozszerzona Konsola Debugowania</Polish>
95-
<Russian>Расширенная Консоль Отладки</Russian>
98+
<Russian>Расширенная консоль отладки</Russian>
9699
<German>Erweiterte Debug-Konsole</German>
97100
<Korean>확장 디버그 콘솔</Korean>
98101
<Japanese>拡張デバッグコンソール</Japanese>
@@ -154,6 +157,7 @@
154157
<Japanese>目標監視フィールドのリフレッシュレート</Japanese>
155158
<Chinese>刷新率</Chinese>
156159
<Chinesesimp>刷新率</Chinesesimp>
160+
<Russian>Частота обновления поля отслеживания цели</Russian>
157161
</Key>
158162
<Key ID="STR_CBA_Diagnostic_WatchInfoRefreshRateTooltip">
159163
<English>Refresh rate (in seconds) for the CBA target watcher fields to the right of the debug console.</English>
@@ -164,6 +168,7 @@
164168
<Japanese>デバッグコンソールの右側にあるCBA目標監視フィールドのリフレッシュレート(秒単位)。</Japanese>
165169
<Chinese>調試控制台右側的 CBA 目標監視器字段的刷新率（以秒為單位）。</Chinese>
166170
<Chinesesimp>调试控制台右侧的 CBA 目标监视器字段的刷新率（以秒为单位）。</Chinesesimp>
171+
<Russian>Частота обновления в секундах для CBA полей отслеживания справа от консоли отладки.</Russian>
167172
</Key>
168173
</Package>
169174
</Project>

0 commit comments

Comments
 (0)