diff --git a/addons/accessory/stringtable.xml b/addons/accessory/stringtable.xml index 10a63335a..a8e7c718f 100644 --- a/addons/accessory/stringtable.xml +++ b/addons/accessory/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Accessory Functions + Community Base Addons - Zubehörfunktionen Community Base Addons - アクセサリー機能 社群基礎模組 - 附件功能 社群基础模组 - 附件功能 @@ -12,6 +13,7 @@ Next rail item state + Nächster Zustand des Schienenaufsatzes レイル アイテムを次モード 下個導軌物品狀態 下个导轨物品状态 @@ -21,6 +23,7 @@ Cycles to the next mode available for your rail slot attachment + Wechselt zum nächsten verfügbaren Modus des Schienenaufsatzes. レイルにあるアイテムを次のモードに変更します 循環切換到下個可用的導軌物品模式 循环切换到下个可用的导轨物品模式 @@ -30,6 +33,7 @@ Prev rail item state + Vorheriger Zustand des Schienenaufsatzes レイル アイテムを前モード 上個導軌物品狀態 上个导轨物品状态 @@ -39,6 +43,7 @@ Cycles to the previous mode available for your rail slot attachment + Wechselt zum vorherigen verfügbaren Modus des Schienenaufsatzes. レイルにあるアイテムを前のモードに変更します 循環切換到上個可用的導軌物品模式 循环切换到上个可用的导轨物品模式 @@ -48,6 +53,7 @@ Next optics state + Nächster Zustand der Optik 照準器を次モード 下個瞄鏡模式 下个瞄镜模式 @@ -57,6 +63,7 @@ Cycles to the next mode available for your optics slot attachment + Wechselt zum nächsten verfügbaren Modus des Optikaufsatzes. 照準器アイテムを次のモードに変更します 循環切換到下個可用的瞄鏡模式 循环切换到下个可用的瞄镜模式 @@ -66,6 +73,7 @@ Prev optics state + Vorheriger Zustand der Optik 照準器を前モード 上個瞄鏡模式 上个瞄镜模式 @@ -75,6 +83,7 @@ Cycles to the previous mode available for your optics slot attachment + Wechselt zum vorherigen verfügbaren Modus des Optikaufsatzes. 照準器アイテムを前のモードに変更します 循環切換到上個可用的瞄鏡模式 循环切换到上个可用的瞄镜模式 diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml index 103e782a9..a8554b704 100644 --- a/addons/ai/stringtable.xml +++ b/addons/ai/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Artificial Intelligence + Community Base Addons - Künstliche Intelligenz Community Base Addons - 人工知能 社群基礎模組 - 人工智能 社群基础模组 - 人工智能 diff --git a/addons/arrays/stringtable.xml b/addons/arrays/stringtable.xml index 1afc1cd7a..79487fbe1 100644 --- a/addons/arrays/stringtable.xml +++ b/addons/arrays/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Arrays + Community Base Addons - Arrays Community Base Addons - アレイ 社群基礎模組 - 陣列 社群基础模组 - 阵列 diff --git a/addons/common/CfgFunctions.hpp b/addons/common/CfgFunctions.hpp index 724832a77..b8724d694 100644 --- a/addons/common/CfgFunctions.hpp +++ b/addons/common/CfgFunctions.hpp @@ -27,6 +27,8 @@ class CfgFunctions { PATHTO_FNC(getMagazineIndex); PATHTO_FNC(currentMagazineIndex); PATHTO_FNC(setCallsign); + PATHTO_FNC(getActiveFeatureCamera); + PATHTO_FNC(registerFeatureCamera); }; class Soldiers { diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf index 714379e19..d927fc36a 100644 --- a/addons/common/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -23,6 +23,24 @@ GVAR(delayless_loop) = QUOTE(PATHTOF(delayless_loop.fsm)); // Initialize Components GVAR(groups) = [grpNull, grpNull, grpNull, grpNull, grpNull]; +GVAR(featureCamerasCode) = [ + {!isNull curatorCamera}, // Curator + {!isNull (missionNamespace getVariable ["BIS_EGSpectatorCamera_camera", objNull])}, // BIS Nexus Spectator + {!isNull (uiNamespace getVariable ["BIS_fnc_arsenal_cam", objNull])}, // Arsenal camera + {!isNull (missionNamespace getVariable ["BIS_fnc_establishingShot_fakeUAV", objNull])}, // Establishing shot camera + {!isNull (missionNamespace getVariable ["BIS_fnc_camera_cam", objNull])}, // Splendid camera + {!isNull (uiNamespace getVariable ["BIS_fnc_animViewer_cam", objNull])}, // Animation viewer camera + {!isNull (missionNamespace getVariable ["BIS_DEBUG_CAM", objNull])} // Classic camera +]; +GVAR(featureCamerasNames) = [ + "curator", // Curator + "nexus", // BIS Nexus Spectator + "arsenal", // Arsenal camera + "establishing", // Establishing shot camera + "splendid", // Splendid camera + "animViewer", // Animation viewer camera + "classic" // Classic camera +]; call COMPILE_FILE(init_gauss); call COMPILE_FILE(init_perFrameHandler); diff --git a/addons/common/fnc_getActiveFeatureCamera.sqf b/addons/common/fnc_getActiveFeatureCamera.sqf new file mode 100644 index 000000000..965b22801 --- /dev/null +++ b/addons/common/fnc_getActiveFeatureCamera.sqf @@ -0,0 +1,35 @@ +#include "script_component.hpp" +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_getActiveFeatureCamera + +Description: + Returns active feature camera. + + Checks for the following feature cameras: + - Curator + - Arsenal camera (BIS_fnc_arsenal) + - Nexus Spectator (BIS_fnc_EGSpectator) + - Establishing shot (BIS_fnc_establishingShot) + - Splendid camera (BIS_fnc_camera) + - Animation viewer (BIS_fnc_animViewer) + - Classic camera (BIS_fnc_cameraOld) + + And cameras registered via CBA_fnc_registerFeatureCamera. + +Parameters: + None + +Returns: + Active feature camera ("" if none) + +Examples: + (begin example) + _result = [] call CBA_fnc_getActiveFeatureCamera + (end) + +Author: + Sniperwolf572, Jonpas +---------------------------------------------------------------------------- */ +SCRIPT(getActiveFeatureCamera); + +GVAR(featureCamerasNames) param [GVAR(featureCamerasCode) findIf {call _x}, ""] diff --git a/addons/common/fnc_getVolume.sqf b/addons/common/fnc_getVolume.sqf index 495a4245a..392d28569 100644 --- a/addons/common/fnc_getVolume.sqf +++ b/addons/common/fnc_getVolume.sqf @@ -3,26 +3,27 @@ Function: CBA_fnc_getVolume Description: - Return the volume of an object based on the object's model's bounding box. + Return the volume of the bounding box of an object's model. + The bounding box is retrieved using boundingBoxReal instead of boundingBox for more precise measurements. Parameters: - _object - an object to calculate the volume of + _object - Object to calculate the volume of Returns: - _volume - the volume + _volume - Volume of the bounding box Examples: (begin example) - _volume = _vehicle call CBA_fnc_getVolume + private _volume = _vehicle call CBA_fnc_getVolume (end) Author: - Rommel + Anton ---------------------------------------------------------------------------- */ SCRIPT(getVolume); params [["_object", objNull, [objNull]]]; -private _bounds = (boundingBox _object) select 1; - -(_bounds select 0) * (_bounds select 1) * (_bounds select 2) +(boundingBoxReal _object) params ["_leftBackBottom", "_rightFrontTop"]; +(_rightFrontTop vectorDiff _leftBackBottom) params ["_width", "_length", "_height"]; +_width * _length * _height diff --git a/addons/common/fnc_registerFeatureCamera.sqf b/addons/common/fnc_registerFeatureCamera.sqf new file mode 100644 index 000000000..06746579c --- /dev/null +++ b/addons/common/fnc_registerFeatureCamera.sqf @@ -0,0 +1,43 @@ +#include "script_component.hpp" +/* ---------------------------------------------------------------------------- +Function: CBA_fnc_registerFeatureCamera + +Description: + Registers a feature camera for use with CBA_fnc_getActiveFeatureCamera. + +Parameters: + _name - Name (unique/tagged) + _callback - Activity check (should return true if active, false otherwise) + +Returns: + Successfully registered + +Examples: + (begin example) + _result = [ + "ace_spectator", + {!isNull (missionNamespace getVariable ["ace_spectator_isSet", objNull])} + ] call CBA_fnc_registerFeatureCamera + (end) + +Author: + Sniperwolf572, Jonpas +---------------------------------------------------------------------------- */ +SCRIPT(registerFeatureCamera); + +params [["_name", "", [""]], ["_callback", false, [{}]]]; + +if (_name isEqualTo "") exitWith { + TRACE_1("Name empty",_name); + false +}; + +if (_callback isEqualTo false) exitWith { + TRACE_1("Callback not code",_name); + false +}; + +if ((GVAR(featureCamerasNames) pushBackUnique _name) == -1) exitWith {false}; +GVAR(featureCamerasCode) pushBack _callback; + +true diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index f29034254..b82cb7f17 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Common Component + Community Base Addons - Gemeinsame Komponente Community Base Addons - 全般要素 社群基礎模組 - 通用組件 社群基础模组 - 通用组件 diff --git a/addons/diagnostic/fnc_projectileTracking_trackProjectile.sqf b/addons/diagnostic/fnc_projectileTracking_trackProjectile.sqf index 34665d953..8e0dc6ff8 100644 --- a/addons/diagnostic/fnc_projectileTracking_trackProjectile.sqf +++ b/addons/diagnostic/fnc_projectileTracking_trackProjectile.sqf @@ -28,6 +28,10 @@ params ["_args", "_handle"]; _args params ["_projectile", "_index", "_initialProjectileData"]; if (!isNull _projectile) then { + private _speed = vectorMagnitude velocity _projectile; + if (_speed < 0.1) then { // If projectile is slowed down, stop tracking after this run + [_handle] call CBA_fnc_removePerFrameHandler; + }; private _data = []; private _bulletData = []; @@ -39,13 +43,9 @@ if (!isNull _projectile) then { } else { _bulletData = [_initialProjectileData]; _data = [_handle, _bulletData]; + GVAR(projectileData) set [_index, _data]; }; - - _bulletData pushBack [(getPos _projectile), vectorMagnitude (velocity _projectile)]; - - _data set [1, _bulletData]; - - GVAR(projectileData) set [_index, _data]; + _bulletData pushBack [(getPos _projectile), _speed]; } else { [_handle] call CBA_fnc_removePerFrameHandler; diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index 7e91d86e5..aa5fd196d 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Diagnostics + Community Base Addons - Diagnose Community Base Addons - 診断 社群基礎模組 - 診斷 社群基础模组 - 诊断 @@ -42,6 +43,7 @@ Target Exec + Ziel Ausf. 対象へ実行 在目標執行 在目标执行 @@ -50,7 +52,8 @@ Cible Exec - Enable Target Debuging + Enable Target Debugging + Ziel-Debugging aktivieren 対象デバッキングを有効化 開啟目標除錯模式 开启目标除错模式 @@ -60,6 +63,7 @@ [CBA] Allows remote target debugging. Requires Debug Console. + [CBA] Erlaubt Remote-Ziel-Debugging. Benötigt Debug-Konsole. [CBA] リモート対象デバッキングを許可します。デバッグ コンソールが必要です。 [CBA] 允許遠程為目標進行除錯。需要開啟除錯控制台。 [CBA] 允许远程为目标进行除错。需要开启除错控制台。 diff --git a/addons/events/fnc_addPlayerEventHandler.sqf b/addons/events/fnc_addPlayerEventHandler.sqf index 7543c9fa0..c3e22fbae 100644 --- a/addons/events/fnc_addPlayerEventHandler.sqf +++ b/addons/events/fnc_addPlayerEventHandler.sqf @@ -6,20 +6,21 @@ Description: Adds a player event handler. Possible events: - "unit" - player controlled unit changed - "weapon" - currently selected weapon change - "loadout" - players loadout changed - "vehicle" - players current vehicle changed - "turret" - position in vehicle changed - "visionMode" - player changed to normal/night/thermal view - "cameraView" - camera mode changed ("Internal", "External", "Gunner" etc.) - "visibleMap" - opened or closed map - "group" - player group changes - "leader" - leader of player changes + "unit" - player controlled unit changed + "weapon" - currently selected weapon change + "loadout" - players loadout changed + "vehicle" - players current vehicle changed + "turret" - position in vehicle changed + "visionMode" - player changed to normal/night/thermal view + "cameraView" - camera mode changed ("Internal", "External", "Gunner" etc.) + "featureCamera" - camera changed (Curator, Arsenal, Spectator etc.) + "visibleMap" - opened or closed map + "group" - player group changes + "leader" - leader of player changes Parameters: - _type - Event handler type. - _function - Function to add to event. + _type - Event handler type. + _function - Function to add to event. _applyRetroactively - Call function immediately if player is defined already (optional, default: false) Returns: @@ -84,6 +85,12 @@ private _id = switch (_type) do { }; [QGVAR(cameraViewEvent), _function] call CBA_fnc_addEventHandler // return id }; + case "featurecamera": { + if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then { + [GVAR(oldUnit), call CBA_fnc_getActiveFeatureCamera] call _function; + }; + [QGVAR(featureCameraEvent), _function] call CBA_fnc_addEventHandler // return id + }; case "visiblemap": { if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then { [GVAR(oldUnit), visibleMap] call _function; @@ -120,6 +127,7 @@ if (_id != -1) then { GVAR(oldTurret) = []; GVAR(oldVisionMode) = -1; GVAR(oldCameraView) = ""; + GVAR(oldFeatureCamera) = ""; GVAR(oldVisibleMap) = false; GVAR(playerEHInfo) pushBack addMissionEventHandler ["EachFrame", {call FUNC(playerEH_EachFrame)}]; @@ -214,6 +222,15 @@ if (_id != -1) then { }; } call CBA_fnc_directCall; }; + + GVAR(playerEHInfo) pushBack ([{ + private _data = call CBA_fnc_getActiveFeatureCamera; + if !(_data isEqualTo GVAR(oldFeatureCamera)) then { + GVAR(oldFeatureCamera) = _data; + [QGVAR(featureCameraEvent), [call CBA_fnc_currentUnit, _data]] call CBA_fnc_localEvent; + }; + }, 0.5] call CBA_fnc_addPerFrameHandler); + }; GVAR(playerEHInfo) pushBack [_type, _id]; diff --git a/addons/events/fnc_removePlayerEventHandler.sqf b/addons/events/fnc_removePlayerEventHandler.sqf index 35e98f96a..a24e18502 100644 --- a/addons/events/fnc_removePlayerEventHandler.sqf +++ b/addons/events/fnc_removePlayerEventHandler.sqf @@ -48,6 +48,9 @@ switch (_type) do { case "cameraview": { [QGVAR(cameraViewEvent), _id] call CBA_fnc_removeEventHandler; }; + case "featurecamera": { + [QGVAR(featureCameraEvent), _id] call CBA_fnc_removeEventHandler; + }; case "visiblemap": { [QGVAR(visibleMapEvent), _id] call CBA_fnc_removeEventHandler; }; @@ -63,12 +66,13 @@ switch (_type) do { if (!isNil QGVAR(playerEHInfo)) then { GVAR(playerEHInfo) deleteAt (GVAR(playerEHInfo) find [_type, _id]); - // First two entries are mission eventhandler ids. Rest are framework - // specific ids in array form. If all playerChanged eventhandlers were - // removed, then also clean up the mission eventhandlers. - if (count GVAR(playerEHInfo) == 2) then { + // First two entries are Mission EH IDs, third is PFH ID. Rest are framework + // specific IDs in array form. If all playerChanged eventhandlers were + // removed, then also clean up the Mission EHs and PFHs. + if (count GVAR(playerEHInfo) == 3) then { removeMissionEventHandler ["EachFrame", GVAR(playerEHInfo) select 0]; removeMissionEventHandler ["Map", GVAR(playerEHInfo) select 1]; + [GVAR(playerEHInfo) select 2] call CBA_fnc_removePerFrameHandler; GVAR(playerEHInfo) = nil; }; }; diff --git a/addons/events/stringtable.xml b/addons/events/stringtable.xml index 2310ec06c..9de5ed512 100644 --- a/addons/events/stringtable.xml +++ b/addons/events/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Events + Community Base Addons - Events Community Base Addons - イベント 社群基礎模組 - 事件 社群基础模组 - 事件 diff --git a/addons/hashes/stringtable.xml b/addons/hashes/stringtable.xml index 381d51c63..9fcb9c2e3 100644 --- a/addons/hashes/stringtable.xml +++ b/addons/hashes/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Hashes + Community Base Addons - Hashes Community Base Addons - ハッシュ 社群基礎模組 - 雜湊 社群基础模组 - 杂凑 diff --git a/addons/help/stringtable.xml b/addons/help/stringtable.xml index 49fbcff90..cb230546a 100644 --- a/addons/help/stringtable.xml +++ b/addons/help/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Help + Community Base Addons - Hilfe Community Base Addons - ヘルプ 社群基礎模組 - 幫助 社群基础模组 - 帮助 diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp new file mode 100644 index 000000000..9b23f3243 --- /dev/null +++ b/addons/jam/CfgMagazineWells.hpp @@ -0,0 +1,174 @@ +class CfgMagazineWells { + class CBA_545x39_AK { + BI_mags[] = { + "30Rnd_545x39_Mag_F", + "30Rnd_545x39_Mag_Green_F", + "30Rnd_545x39_Mag_Tracer_F", + "30Rnd_545x39_Mag_Tracer_Green_F" + }; + }; + + class CBA_556x45_MINIMI { + BI_boxes[] = { + "200Rnd_556x45_Box_F", + "200Rnd_556x45_Box_Red_F", + "200Rnd_556x45_Box_Tracer_F", + "200Rnd_556x45_Box_Tracer_Red_F" + }; + }; + class CBA_556x45_STANAG { + BI_mags[] = { + "30Rnd_556x45_Stanag", + "30Rnd_556x45_Stanag_green", + "30Rnd_556x45_Stanag_red", + "30Rnd_556x45_Stanag_Tracer_Red", + "30Rnd_556x45_Stanag_Tracer_Green", + "30Rnd_556x45_Stanag_Tracer_Yellow" + }; + BI_drums[] = { + "150Rnd_556x45_Drum_Mag_F", + "150Rnd_556x45_Drum_Mag_Tracer_F" + }; + }; + + class CBA_556x45_STEYR {}; // AUG + class CBA_556x45_HK33 {}; // H&K 33/53/93 + class CBA_556x45_G36 {}; + class CBA_556x45_SG550 {}; + + class CBA_580x42_TYPE95 { + BI_mags[] = { + "30Rnd_580x42_Mag_F", + "30Rnd_580x42_Mag_Tracer_F" + }; + BI_drums[] = { + "100Rnd_580x42_Mag_F", + "100Rnd_580x42_Mag_Tracer_F" + }; + }; + + class CBA_65x39_MX { + BI_mags[] = { + "30Rnd_65x39_caseless_mag", + "30Rnd_65x39_caseless_green", + "30Rnd_65x39_caseless_mag_Tracer", + "30Rnd_65x39_caseless_green_mag_Tracer", + "100Rnd_65x39_caseless_mag", + "100Rnd_65x39_caseless_mag_Tracer" + }; + }; + + class CBA_68x43_ACR {}; // 6.8mm Remington SPC + class CBA_75x55_STGW57 {}; // SIG SG 510-1, Stgw. 57 + class CBA_762x35_STANAG {}; // .300 Blackout + + class CBA_762x39_AK { + BI_mags[] = { + "30Rnd_762x39_Mag_F", + "30Rnd_762x39_Mag_Green_F", + "30Rnd_762x39_Mag_Tracer_F", + "30Rnd_762x39_Mag_Tracer_Green_F" + }; + }; + + class CBA_762x51_M14 { + BI_mags[] = { + "20Rnd_762x51_Mag" + }; + }; + class CBA_762x51_HK417 { + BI_mags[] = { + "20Rnd_762x51_Mag" + }; + }; + class CBA_762x51_SR25 {}; // M110, SIG716 + class CBA_762x51_SCAR {}; + class CBA_762x51_FAL {}; + class CBA_762x51_G3 {}; + class CBA_762x51_SIGAMT {}; // SIG 510-4, AMT + + class CBA_762x51_LINKS { + BI_belts[] = { + "150Rnd_762x51_Box", + "150Rnd_762x51_Box_Tracer" + }; + }; + + class CBA_762x54R_SVD { + BI_mags[] = { + "10Rnd_762x54_Mag" + }; + }; + class CBA_762x54R_LINKS { + BI_belts[] = { + "150Rnd_762x54_Box", + "150Rnd_762x54_Box_Tracer" + }; + }; + + class CBA_792x57_LINKS {}; // MG42 + class CBA_300WM_AI {}; // AI .300 Winchester Magnum + class CBA_338LM_AI {}; // AI .338 Lapua Magnum + class CBA_50BMG_M107 {}; // M82, M107, G82 + + class CBA_9x19_MP5 {}; // H&K MP5 + class CBA_9x19_STEYR {}; // AUG SMG, MPi, TMP + class CBA_9x19_P226 {}; // SIG P226 + class CBA_9x19_P228 {}; // SIG P228 + class CBA_9x19_P239 {}; // SIG P239 + + class CBA_9x39_VSS {}; // Vintorez, Val + + class CBA_357SIG_P226 {}; // SIG P226 + class CBA_357SIG_P229 {}; // SIG P229 + class CBA_357SIG_P239 {}; // SIG P239 + + class CBA_40SW_P226 {}; // SIG P226 .40 S&W + class CBA_40SW_P229 {}; // SIG P229 .40 S&W + class CBA_40SW_P239 {}; // SIG P239 .40 S&W + + class CBA_10x25_MP5 {}; // H&K MP5/10 10mm Auto + class CBA_12g_SAIGA {}; + + class CBA_40mm_M203 { + BI_grenades[] = { + "1Rnd_HE_Grenade_shell", + "1Rnd_Smoke_Grenade_shell", + "1Rnd_SmokeRed_Grenade_shell", + "1Rnd_SmokeGreen_Grenade_shell", + "1Rnd_SmokeYellow_Grenade_shell", + "1Rnd_SmokePurple_Grenade_shell", + "1Rnd_SmokeBlue_Grenade_shell", + "1Rnd_SmokeOrange_Grenade_shell", + "UGL_FlareWhite_F", + "UGL_FlareGreen_F", + "UGL_FlareRed_F", + "UGL_FlareYellow_F", + "UGL_FlareCIR_F" + }; + }; + class CBA_40mm_3GL { + BI_grenades[] = { + "3Rnd_HE_Grenade_shell", + "3Rnd_Smoke_Grenade_shell", + "3Rnd_SmokeRed_Grenade_shell", + "3Rnd_SmokeGreen_Grenade_shell", + "3Rnd_SmokeYellow_Grenade_shell", + "3Rnd_SmokePurple_Grenade_shell", + "3Rnd_SmokeBlue_Grenade_shell", + "3Rnd_SmokeOrange_Grenade_shell", + "3Rnd_UGL_FlareWhite_F", + "3Rnd_UGL_FlareGreen_F", + "3Rnd_UGL_FlareRed_F", + "3Rnd_UGL_FlareYellow_F", + "3Rnd_UGL_FlareCIR_F" + }; + }; + class CBA_40mm_GP {}; + + class CBA_RPG7 { + BI_rockets[] = { + "RPG7_F" + }; + }; +}; diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp new file mode 100644 index 000000000..7ff7004bf --- /dev/null +++ b/addons/jam/CfgWeapons.hpp @@ -0,0 +1,73 @@ +class CfgWeapons { + class GrenadeLauncher; + class Rifle_Base_F; + class Rifle_Long_Base_F; + class Launcher_Base_F; + + class mk20_base_F: Rifle_Base_F { + magazineWell[] = {"CBA_556x45_STANAG"}; + }; + class SDAR_base_F: Rifle_Base_F { + magazineWell[] = {"CBA_556x45_STANAG"}; + }; + class Tavor_base_F: Rifle_Base_F { + magazineWell[] = {"CBA_556x45_STANAG"}; + }; + class arifle_SPAR_01_base_F : Rifle_Base_F { + magazineWell[] = {"CBA_556x45_STANAG"}; + }; + class arifle_SPAR_02_base_F : Rifle_Base_F { + magazineWell[] = {"CBA_556x45_STANAG"}; + }; + + class UGL_F : GrenadeLauncher { + magazineWell[] = {"CBA_40mm_M203"}; + }; + + class arifle_MX_Base_F : Rifle_Base_F { + magazineWell[] = {"CBA_65x39_MX"}; + class GL_3GL_F : UGL_F { + magazineWell[] = {"CBA_40mm_3GL", "CBA_40mm_M203"}; + }; + }; + + class EBR_base_F: Rifle_Long_Base_F { + magazineWell[] = {"CBA_762x51_M14"}; + }; + class DMR_06_base_F: Rifle_Long_Base_F { + magazineWell[] = {"CBA_762x51_M14"}; + }; + class arifle_SPAR_03_base_F : Rifle_Base_F { + magazineWell[] = {"CBA_762x51_HK417"}; + }; + + class DMR_01_base_F : Rifle_Long_Base_F { + magazineWell[] = {"CBA_762x54R_SVD"}; + }; + + class arifle_CTAR_base_F : Rifle_Base_F { + magazineWell[] = {"CBA_580x42_TYPE95"}; + }; + class arifle_CTARS_base_F : Rifle_Base_F { + magazineWell[] = {"CBA_580x42_TYPE95"}; + }; + + class arifle_AK12_base_F : Rifle_Base_F { + magazineWell[] = {"CBA_762x39_AK"}; + }; + class arifle_AKM_base_F : Rifle_Base_F { + magazineWell[] = {"CBA_762x39_AK"}; + }; + + class arifle_AKS_base_F : Rifle_Base_F { + magazineWell[] = {"CBA_545x39_AK"}; + }; + + class LMG_03_base_F : Rifle_Long_Base_F { + magazineWell[] = {"CBA_556x45_MINIMI"}; + }; + + class launch_RPG7_F : Launcher_Base_F { + magazineWell[] = {"CBA_RPG7"}; + }; +}; diff --git a/addons/jam/config.cpp b/addons/jam/config.cpp new file mode 100644 index 000000000..4ce77bf5c --- /dev/null +++ b/addons/jam/config.cpp @@ -0,0 +1,20 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + author = "$STR_CBA_Author"; + name = CSTRING(component); + url = "$STR_CBA_URL"; + units[] = {}; + weapons[] = {}; + magazines[] = {}; + ammo[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"CBA_main"}; + version = VERSION; + authors[] = {"Robalo"}; + }; +}; + +#include "CfgMagazineWells.hpp" +#include "CfgWeapons.hpp" diff --git a/addons/jam/script_component.hpp b/addons/jam/script_component.hpp new file mode 100644 index 000000000..2b0d120c6 --- /dev/null +++ b/addons/jam/script_component.hpp @@ -0,0 +1,3 @@ +#define COMPONENT jam +#include "\x\cba\addons\main\script_mod.hpp" +#include "\x\cba\addons\main\script_macros.hpp" diff --git a/addons/jam/stringtable.xml b/addons/jam/stringtable.xml new file mode 100644 index 000000000..6e3e54486 --- /dev/null +++ b/addons/jam/stringtable.xml @@ -0,0 +1,9 @@ + + + + + Community Base Addons - Joint Ammo Magazines + Community Base Addons - Gemeinsame Munition und Magazine + + + diff --git a/addons/jr/stringtable.xml b/addons/jr/stringtable.xml index ebca205e6..b073a0fa2 100644 --- a/addons/jr/stringtable.xml +++ b/addons/jr/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Joint Rails + Community Base Addons - Gemeinsame Montageschienen Community Base Addons - ジョイント レール 社群基礎模組 - 共用導軌 社群基础模组 - 共用导轨 @@ -11,7 +12,6 @@ Community Base Addons - Rails d'accessoires - Sound Suppressor MG Sound Suppressor MG Tlumič hluku MG Silencieux pour mitrailleuse diff --git a/addons/keybinding/stringtable.xml b/addons/keybinding/stringtable.xml index 6c73fe240..7bedcdb99 100644 --- a/addons/keybinding/stringtable.xml +++ b/addons/keybinding/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Keybinding + Community Base Addons - Tastenbelegung Community Base Addons - キー割り当て 社群基礎模組 - 按鍵綁定 社群基础模组 - 按键绑定 diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml index d38544414..54c7fb6df 100644 --- a/addons/main/stringtable.xml +++ b/addons/main/stringtable.xml @@ -14,16 +14,23 @@ https://www.github.com/CBATeam/CBA_A3 - https://www.github.com/CBATeam/CBA_A3 - https://www.github.com/CBATeam/CBA_A3 - https://www.github.com/CBATeam/CBA_A3 - https://www.github.com/CBATeam/CBA_A3 - https://www.github.com/CBATeam/CBA_A3 https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 + https://www.github.com/CBATeam/CBA_A3 Community Base Addons - Main Component + Community Base Addons - Hauptkomponente Community Base Addons - メイン要素 社群基礎模組 - 主要組件 社群基础模组 - 主要组件 @@ -34,6 +41,7 @@ Community Base Addons - Optional Component + Community Base Addons - Optionale Komponente Community Base Addons - オプション要素 社群基礎模組 - 可選組件 社群基础模组 - 可选组件 diff --git a/addons/modules/CfgVehicles.hpp b/addons/modules/CfgVehicles.hpp index 088d8d60e..e19c435f8 100644 --- a/addons/modules/CfgVehicles.hpp +++ b/addons/modules/CfgVehicles.hpp @@ -296,124 +296,124 @@ class CfgVehicles { }; class behaviour { - displayName = CSTRING(Behaviour); - description = CSTRING(Behaviour_Desc); + displayName = "$STR_3DEN_GROUP_ATTRIBUTE_BEHAVIOUR_DISPLAYNAME"; + description = "$STR_3DEN_GROUP_ATTRIBUTE_BEHAVIOUR_TOOLTIP"; typeName = "STRING"; class values { class careless { - name = CSTRING(Careless); + name = "$STR_COMBAT_CARELESS"; value = "CARELESS"; default = 1; }; class safe { - name = CSTRING(Safe); + name = "$STR_COMBAT_SAFE"; value = "SAFE"; }; class aware { - name = CSTRING(Aware); + name = "$STR_COMBAT_AWARE"; value = "AWARE"; }; class combat { - name = CSTRING(Combat); + name = "$STR_COMBAT_COMBAT"; value = "COMBAT"; }; class stealth { - name = CSTRING(Stealth); + name = "$STR_COMBAT_STEALTH"; value = "STEALTH"; }; }; }; class combatMode { - displayName = CSTRING(CombatMode); - description = CSTRING(CombatMode_Desc); + displayName = "$STR_3DEN_GROUP_ATTRIBUTE_COMBATMODE_DISPLAYNAME"; + description = "$STR_3DEN_GROUP_ATTRIBUTE_COMBATMODE_TOOLTIP"; typeName = "STRING"; class values { class yellow { - name = CSTRING(CombatYellow); + name = "$STR_3DEN_ATTRIBUTES_COMBATMODE_YELLOW_TEXT"; value = "YELLOW"; default = 1; }; class blue { - name = CSTRING(CombatBlue); + name = "$STR_3DEN_ATTRIBUTES_COMBATMODE_BLUE_TEXT"; value = "BLUE"; }; class green { - name = CSTRING(CombatGreen); + name = "$STR_3DEN_ATTRIBUTES_COMBATMODE_GREEN_TEXT"; value = "GREEN"; }; class white { - name = CSTRING(CombatWhite); + name = "$STR_3DEN_ATTRIBUTES_COMBATMODE_WHITE_TEXT"; value = "WHITE"; }; class red { - name = CSTRING(CombatRed); + name = "$STR_3DEN_ATTRIBUTES_COMBATMODE_RED_TEXT"; value = "RED"; }; }; }; class speedMode { - displayName = CSTRING(SpeedMode); - description = CSTRING(SpeedMode_Desc); + displayName = "$STR_3DEN_GROUP_ATTRIBUTE_SPEEDMODE_DISPLAYNAME"; + description = "$STR_3DEN_GROUP_ATTRIBUTE_SPEEDMODE_TOOLTIP"; typeName = "STRING"; class values { class limited { - name = CSTRING(SpeedLimited); + name = "$STR_SPEED_LIMITED"; value = "LIMITED"; default = 1; }; class normal { - name = CSTRING(SpeedNormal); + name = "$STR_SPEED_NORMAL"; value = "NORMAL"; }; class full { - name = CSTRING(SpeedFull); + name = "$STR_SPEED_FULL"; value = "FULL"; }; }; }; class formation { - displayName = CSTRING(Formation); - description = CSTRING(Formation_Desc); + displayName = "$STR_3DEN_GROUP_ATTRIBUTE_FORMATION_DISPLAYNAME"; + description = "$STR_3DEN_GROUP_ATTRIBUTE_FORMATION_TOOLTIP"; typeName = "STRING"; class values { class column { - name = CSTRING(Column); + name = "$STR_COLUMN"; value = "COLUMN"; default = 1; }; class stagColumn { - name = CSTRING(StagColumn); + name = "$STR_STAGGERED"; value = "STAG COLUMN"; }; class wedge { - name = CSTRING(Wedge); + name = "$STR_WEDGE"; value = "WEDGE"; }; class echLeft { - name = CSTRING(EchLeft); + name = "$STR_ECHL"; value = "ECH LEFT"; }; class echRight { - name = CSTRING(EchRight); + name = "$STR_ECHR"; value = "ECH RIGHT"; }; class vee { - name = CSTRING(Vee); + name = "$STR_VEE"; value = "VEE"; }; class line { - name = CSTRING(Line); + name = "$STR_LINE"; value = "LINE"; }; class file { - name = CSTRING(File); + name = "$STR_FILE"; value = "FILE"; }; class diamond { - name = CSTRING(Diamond); + name = "$STR_DIAMOND"; value = "DIAMOND"; }; }; diff --git a/addons/modules/stringtable.xml b/addons/modules/stringtable.xml index dd2e93766..b205c9edf 100644 --- a/addons/modules/stringtable.xml +++ b/addons/modules/stringtable.xml @@ -2,7 +2,8 @@ - Community Base Addons - Modules Component + Community Base Addons - Modules + Community Base Addons - Module Community Base Addons - モジュール要素 社群基礎模組 - 模塊組件 社群基础模组 - 模块组件 @@ -12,6 +13,7 @@ CBA Modules + CBA Module CBA モジュール CBA模塊 CBA模块 @@ -21,6 +23,7 @@ Attack + Angreifen 攻撃 攻擊 攻击 @@ -30,6 +33,7 @@ Attack Location Type + Typ der Angriffsposition 攻撃場所の種類 攻擊地點類型 攻击地点类型 @@ -39,6 +43,7 @@ Set what kind of object is being passed as the center point + Wähle, welches Objekt als Mittelpunkt verwendet wird. オブジェクトの位置を中央地点として設定します 設定要使用甚麼類型的東西來當作中心點 设定要使用什么类型的东西来当作中心点 @@ -48,6 +53,7 @@ Module Position + Modulposition モジュール位置 模塊的位置 模块的位置 @@ -57,6 +63,7 @@ Object/Location + Objektposition オブジェクト/場所 物件/地點 物件/地点 @@ -66,6 +73,7 @@ Group + Gruppe グループ 群組 群组 @@ -75,6 +83,7 @@ Array + Array アレイ 陣列 阵列 @@ -84,6 +93,7 @@ Marker + Marker マーカー 標誌 标志 @@ -93,6 +103,7 @@ Task + Aufgabe タスク 目標 目标 @@ -102,6 +113,7 @@ Set Position + Position bestimmen 設定位置 設定位置 设定位置 @@ -111,6 +123,7 @@ Attack Position + Angriffsposition 攻撃場所 攻擊位置 攻击位置 @@ -120,6 +133,7 @@ Enter an array with brackets or name without quotes + Array mit eckigen Klammern oder Name ohne Anführungszeichen eingeben. 空白のアレイか、引用符を付けずに名前を入力します 輸入一個使用括號或不帶引號的名稱所組成的陣列 输入一个使用括号或不带引号的名称所组成的阵列 @@ -129,6 +143,7 @@ Search Radius + Suchradius 捜索範囲 搜索半徑 搜索半径 @@ -138,6 +153,7 @@ Enter a number for size of the radius to search + Zahl für die Größe des zu durchsuchenden Umkreises eingeben. 捜索する範囲の大きさを数値で入力します 輸入一個數字來定義搜索區域的半徑大小 输入一个数字来定义搜索区域的半径大小 @@ -147,6 +163,7 @@ Sync to leader of group to attack a parsed location + Mit Gruppenführer synchronisieren, um einen ausgewählten Standort anzugreifen. グループのリーダーに同期し、攻撃地点を捜索させます 同步到群組的隊長身上，使該群組攻擊/搜索指定的地點 同步到群组的队长身上，使该群组攻击/搜索指定的地点 @@ -156,6 +173,7 @@ Allow Override + Überschreiben erlauben 上書きを許可 允許覆寫 允许覆写 @@ -165,6 +183,7 @@ Allow the module to remove old waypoints and assign an attack waypoint + Ermöglicht dem Modul, alte Wegpunkte zu entfernen und einen Angreifen-Wegpunkt zuzuweisen. モジュールにより古いウェイポイントの削除と、新しい攻撃ウェイポイントの指定を許可します 允許模塊移除原有的路徑點並指派新的攻擊路徑點 允许模块移除原有的路径点并指派新的攻击路径点 @@ -174,6 +193,7 @@ Defend + Verteidigen 防衛 防禦 防御 @@ -183,6 +203,7 @@ Defend Position Type + Typ der Verteidigungsposition 防衛場所の種類 防禦地點類型 防御地点类型 @@ -192,6 +213,7 @@ Set what kind of object is being passed as the center point + Wähle, welches Objekt als Mittelpunkt verwendet wird. オブジェクトの位置を中央地点として設定します 設定要使用甚麼類型的東西來當作中心點 设定要使用什么类型的东西来当作中心点 @@ -201,6 +223,7 @@ Defend Position + Verteidigungsposition 防衛場所 防禦位置 防御位置 @@ -210,6 +233,7 @@ Enter an array with brackets or name without quotes + Array mit eckigen Klammern oder Name ohne Anführungszeichen eingeben. 空白のアレイか、引用符を付けずに名前を入力します 輸入一個使用括號或不帶引號的名稱所組成的陣列 输入一个使用括号或不带引号的名称所组成的阵列 @@ -219,6 +243,7 @@ Defend Radius + Verteidigungsradius 防衛範囲 防禦半徑 防御半径 @@ -228,6 +253,7 @@ The max distance to defend from the center point + Die maximale Entfernung zum Verteidigen vom Mittelpunkt. 中央地点からの最大防衛範囲 輸入一個數字來定義防禦區域的半徑大小 输入一个数字来定义防御区域的半径大小 @@ -237,6 +263,7 @@ Building Size Threshold + Größenschwelle der Gebäudes 建物の大きさのしきい値 可使用的建築物大小 可使用的建筑物大小 @@ -246,6 +273,7 @@ Smaller the number the more buildings available + Je kleiner die Zahl, desto mehr Gebäude sind verfügbar. 小さい数字でより多くの建物を利用できます 設定越小的數值，駐軍就能使用越多的房子 设定越小的数值，驻军就能使用越多的房子 @@ -255,6 +283,7 @@ Patrol Chance + Patrouillen-Wahrscheinlichkeit 巡回率 巡邏機率 巡逻机率 @@ -264,6 +293,7 @@ Chance for each unit to patrol instead of garrison + Wahrscheinlichkeit jeder Einheit zu patrouillieren, anstatt ein Gebäude zu besetzen. 各ユニットが歩哨のために巡回する確率を設定 設定駐軍的每個單位有多少機率會做巡邏 设定驻军的每个单位有多少机率会做巡逻 @@ -273,6 +303,7 @@ Hold Chance + Halten-Wahrscheinlichkeit 停止率 停留機率 停留机率 @@ -282,6 +313,7 @@ Chance for each unit to hold their garrison in combat + Wahrscheinlichkeit jeder Einheit den Standort im Kampf zu halten. 各ユニットが戦闘中に歩哨所で留まる確率を設定 設定當駐軍開始交戰時每個單位有多少機率會原地不動 设定当驻军开始交战时每个单位有多少机率会原地不动 @@ -291,6 +323,7 @@ Sync to leader of group to defend a parsed location + Mit Gruppenführer synchronisieren, um einen ausgewählten Standort zu verteidigen. グループのリーダーに同期し、防衛地点を捜索させます 同步到群組的隊長身上，使該群組防禦指定的地點 同步到群组的队长身上，使该群组防御指定的地点 @@ -300,6 +333,7 @@ Patrol + Patrouille 巡回 巡邏 巡逻 @@ -309,6 +343,7 @@ Patrol Center Type + Typ des Patrouillenzentrums 巡回場所の種類 巡邏區類型 巡逻区类型 @@ -318,6 +353,7 @@ Set what kind of object is being passed as the center point + Wähle, welches Objekt als Mittelpunkt verwendet wird. オブジェクトの位置を中央地点として設定します 設定要使用甚麼類型的東西來當作中心點 设定要使用什么类型的东西来当作中心点 @@ -327,6 +363,7 @@ Center Point + Patrouillenzentrum 中央地点 中央地點 中央地点 @@ -336,6 +373,7 @@ Enter an array with brackets or name without quotes + Array mit eckigen Klammern oder Name ohne Anführungszeichen eingeben. 空白のアレイか、引用符を付けずに名前を入力します 輸入一個使用括號或不帶引號的名稱所組成的陣列 输入一个使用括号或不带引号的名称所组成的阵列 @@ -345,6 +383,7 @@ Patrol Radius + Patrouillenradius 巡回範囲 巡邏半徑 巡逻半径 @@ -354,6 +393,7 @@ The distance to patrol from the center point + Die Entfernung zum Patrouillieren vom Mittelpunkt. 中央地点からの哨戒範囲を決定します 輸入一個數字來定義巡邏區域的半徑大小 输入一个数字来定义巡逻区域的半径大小 @@ -363,6 +403,7 @@ Waypoint Count + Wegpunktanzahl ウェイポイント数 路徑點數量 路径点数量 @@ -372,6 +413,7 @@ The amount of waypoints to create + Die Menge der zu erstellenden Wegpunkte. 作成するウェイポイント数 設定會產出多少個路徑點 设定会产出多少个路径点 @@ -381,6 +423,7 @@ Waypoint Type + Wegpunkttyp ウェイポイントの種類 路徑點類型 路径点类型 @@ -390,6 +433,7 @@ The type of waypoint to be used + Die Art des zu verwendenden Wegpunkts. 使用されるウェイポイントの種類 設定會被使用的路徑點類型 设定会被使用的路径点类型 @@ -399,6 +443,7 @@ Move + Bewegen 移動 移動 移动 @@ -408,6 +453,7 @@ Seek and Destroy + Suchen und Zerstören 索敵と破壊 搜索並摧毀 搜索并摧毁 @@ -417,6 +463,7 @@ Loiter + Untätig 周回 盤旋 盘旋 @@ -424,278 +471,9 @@ Krąż Flâner - - Behaviour - 挙動 - 行為 - 行为 - Поведение - Zachowanie - Comportement - - - The behaviour of the group - グループの挙動 - 設定群組的行為 - 设定群组的行为 - Поведение группы - Zachowanie grupy - Le comportement du groupe - - - Careless - 無警戒 - 漫不經心 - 漫不经心 - Беспечно - Beztroski - Imprudence - - - Safe - 安全 - 安全 - 安全 - Безопасно - Bezpieczny - Prudence - - - Aware - 警戒 - 警戒 - 警戒 - Начеку - Uważny - Vigilance - - - Combat - 戦闘 - 交戰 - 交战 - Бой - Walka - Combat - - - Stealth - 隠密 - 隱蔽 - 隐蔽 - Скрытно - Ukryty - Furtivité - - - Combat Mode - 戦闘状態 - 交戰模式 - 交战模式 - Режим Боя - Tryb walki - Mode de combat - - - How fast the group is to engage - グループが交戦時における状態 - 設定群組多快會進入交戰狀態 - 设定群组多快会进入交战状态 - Как быстро группа должна вступать в бой - Jak szybko grupa przejdzie do ataku - Définit quand et comment le groupe choisira d'engager des cibles ennemies - - - Yellow (Fire at will) - イエロー (各個射撃) - 黃色 (主動開火-保持隊形) - 黄色 (主动开火-保持队形) - Жёлтый (Огонь по желанию) - Żółty (Strzelaj bez rozkazu) - Jaune (Feu à volonté) - - - Blue (Never fire) - ブルー (射撃禁止) - 藍色 (永不開火) - 蓝色 (永不开火) - Синий (Запретить огонь) - Niebieski (Nigdy nie strzelaj) - Bleu (Ne pas tirer) - - - Green (Hold Fire-Defend Only) - グリーン (射撃禁止 - 防衛時のみ) - 綠色 (被動開火-保持隊形) - 绿色 (被动开火-保持队形) - Зелёный (Огонь только для защиты) - Zielony (Wstrzmaj ogień-Tylko się broń) - Vert (Ne pas tirer-En défense seulement) - - - White (Hold Fire-Engage at will) - ホワイト (射撃禁止 - 各個射撃) - 白色 (被動開火) - 白色 (被动开火) - Белый (Вступать в бой по желанию) - Biały (Wstrzmaj ogień-Nacieraj bez rozkazu) - Blanc (Ne pas tirer-engagé a volonté) - - - Red (Fire at will-Engage at will) - レッド (射撃許可 - 各個射撃) - 紅色 (主動開火) - 红色 (主动开火) - Красный (Огонь по желанию - вступление в бой по желанию) - Czerwony (Strzelaj bez rozkazu-Nacieraj bez rozkazu) - Rouge (Feu à volonté-engagé a volonté) - - - Speed Mode - 移動速度 - 速度模式 - 速度模式 - Скоростной Режим - Prędkość poruszania - Vitesse - - - Walk, jog, or run to each waypoint - 各ウェイポイントまで歩きや駆け足、疾走を指定できます - 設定單位前往路徑點的移動速度 - 设定单位前往路径点的移动速度 - Ходьба, бег трусцой или бег к каждой путевой точке - Chodzenie, trucht lub bieganie do każdego punktu nawigacyjnego - Marcher, trottiner, ou courir à chaque point de passage - - - Limited(Walking) - 微速 (歩行) - 慢速 (步行) - 慢速 (步行) - Ограниченный (Ходьба) - Ograniczony(Chodzenie) - Limité (Marcher) - - - Normal(Jog-Stays in formation) - 通常 (駆け足 - 隊形維持) - 普通 (慢跑-不破壞隊形) - 普通 (慢跑-不破坏队形) - Нормальный (Бег трусцой, оставаться в строю) - Normalny(Trucht-Utrzymuj formację) - Normal (Trottiner-Rester en formation) - - - Full(Run-No formation) - 全速 (疾走 - 隊形なし) - 全速 (衝刺-破壞隊形) - 全速 (冲刺-破坏队形) - Полная (Бег, вне строя) - Pełna(Bieg-Bez formacji) - Maximale (Courrir-Pas de formation) - - - Formation - 隊形 - 隊形 - 队形 - Строй - Formacja - Formation - - - The formation to be used when moving - 移動時に使う隊形 - 移動時所使用的隊形 - 移动时所使用的队形 - Какой режим строя будет использовать при перемещении - Formacja utrzymywana podczas poruszania - La formation à utiliser lors du déplacement - - - Column - 縦隊 - 單縱隊形 - 单纵队形 - Колонна - Kolumna - Colonne - - - Stag Column - 千鳥縦隊 - 雙縱隊形 - 双纵队形 - Колонна в шахматном порядке - Kolumna Podwójna - Colonne décalée - - - Wedge - 傘型隊形 - 楔形 - 楔形 - Клин - Klin - Coin - - - Ech Left - 左梯形 - 左梯隊形 - 左梯队形 - Левый эшелон - Eszelon Lewy - Echelon gauche - - - Ech Right - 右梯形 - 右梯隊形 - 右梯队形 - Правый эшелон - Eszelon Prawy - Echelon droite - - - Vee - V字隊形 - V字隊形 - V字队形 - V-образный - V-kształtna - V - - - Line - 横隊 - 一字隊形 - 一字队形 - Линия - Linia - Ligne - - - File - 縦列 - 緊湊縱隊 - 紧凑纵队 - Ряд - Szyk - File - - - Diamond - ダイヤモンド - 菱形隊形 - 菱形队形 - Ромб - Diament - Losange - Code to Execute + Auszuführendes Skript コードの実行 會執行的腳本代碼 会执行的脚本代码 @@ -705,6 +483,7 @@ Any code to run at waypoints + Skript, das an den Wegpunkten ausgeführt wird. ウェイポイントで実行されるコード 在路徑點時會執行的腳本代碼 在路径点时会执行的脚本代码 @@ -714,6 +493,7 @@ Timeout + Zeitüberschreitung 時間設定 計時器 计时器 @@ -723,6 +503,7 @@ [Min, Med, Max] Time to wait at waypoints + [Min, Mittel, Max] Am Wegpunkt zu wartende Zeit. [最低,中間,最大] ウェイポイントで待機する時間 [最小值, 中間值, 最大值] 用來設定在路徑點所需等待的時間 [最小值, 中间值, 最大值] 用来设定在路径点所需等待的时间 @@ -732,6 +513,7 @@ Sync to leader of group to patrol a parsed location + Mit Gruppenführer synchronisieren, um einen ausgewählten Standort zu überwachen. グループのリーダーに同期し、地点を捜索させます 同步到群組的隊長身上，使該群組巡邏指定的地點 同步到群组的队长身上，使该群组巡逻指定的地点 diff --git a/addons/music/stringtable.xml b/addons/music/stringtable.xml index 66a004a28..73f487de8 100644 --- a/addons/music/stringtable.xml +++ b/addons/music/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Music + Community Base Addons - Musik Community Base Addons - 音楽 社群基礎模組 - 音樂 社群基础模组 - 音乐 diff --git a/addons/network/stringtable.xml b/addons/network/stringtable.xml index 30d6665dc..311b73bb3 100644 --- a/addons/network/stringtable.xml +++ b/addons/network/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Network + Community Base Addons - Netzwerk Community Base Addons - ネットワーク 社群基礎模組 - 網路 社群基础模组 - 网路 diff --git a/addons/settings/stringtable.xml b/addons/settings/stringtable.xml index baf0e278d..e8b329348 100644 --- a/addons/settings/stringtable.xml +++ b/addons/settings/stringtable.xml @@ -2,7 +2,8 @@ - Community Base Addons - Settings Component + Community Base Addons - Settings + Community Base Addons - Einstellungen Community Base Addons - 設定要素 社群基礎模組 - 設定組件 社群基础模组 - 设定组件 @@ -73,7 +74,7 @@ Serwer - Look at the servers settings. Log in as admin to change. + Look at the server's settings. Log in as admin to change. Server-Einstellungen ansehen. Als Admin einloggen, um zu ändern. サーバー設定を確認します。管理者が変更すると記録します。 查看伺服器的設定。必須登入成管理員才能編輯設定。 @@ -95,7 +96,7 @@ Mission - Look at the missions settings. + Look at the mission's settings. Missionseinstellungen ansehen. ミッションの設定を確認します。 查看任務的設定。 @@ -106,7 +107,7 @@ Zobacz ustawienia misji. - Edit the missions settings. + Edit the mission's settings. Missionseinstellungen bearbeiten. ミッションの設定を編集します。 編輯任務的設定。 diff --git a/addons/statemachine/stringtable.xml b/addons/statemachine/stringtable.xml index 1e70570e0..40c283e29 100644 --- a/addons/statemachine/stringtable.xml +++ b/addons/statemachine/stringtable.xml @@ -2,7 +2,8 @@ - Community Base Addons - State Machine Component + Community Base Addons - State Machine + Community Base Addons - State Machine Community Base Addons - ステート マシーン要素 社群基礎模組 - 狀態機組件 社群基础模组 - 状态机组件 diff --git a/addons/strings/stringtable.xml b/addons/strings/stringtable.xml index 5102e02d8..97e5f6c47 100644 --- a/addons/strings/stringtable.xml +++ b/addons/strings/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Strings + Community Base Addons - Zeichenketten Community Base Addons - ストリングス 社群基礎模組 - 字串 社群基础模组 - 字串 @@ -28,7 +29,7 @@ , - + . diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index 3ee4f699f..5cb1a0624 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - User Interface + Community Base Addons - Benutzeroberfläche Community Base Addons - ユーザー インターフェイス 社群基礎模組 - 使用者介面 社群基础模组 - 使用者介面 diff --git a/addons/vectors/stringtable.xml b/addons/vectors/stringtable.xml index 36ad29a4b..f1737a7a1 100644 --- a/addons/vectors/stringtable.xml +++ b/addons/vectors/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Vectors + Community Base Addons - Vektoren Community Base Addons - ベクター 社群基礎模組 - 向量 社群基础模组 - 向量 diff --git a/addons/versioning/stringtable.xml b/addons/versioning/stringtable.xml index 07d02ba99..bac5bf9cb 100644 --- a/addons/versioning/stringtable.xml +++ b/addons/versioning/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Versioning + Community Base Addons - Versionierung Community Base Addons - バージョニング 社群基礎模組 - 版本 社群基础模组 - 版本 diff --git a/addons/xeh/stringtable.xml b/addons/xeh/stringtable.xml index cc1df91f4..0563601df 100644 --- a/addons/xeh/stringtable.xml +++ b/addons/xeh/stringtable.xml @@ -3,6 +3,7 @@ Community Base Addons - Extended Event Handlers + Community Base Addons - Erweiterte Ereignishandler Community Base Addons - 拡張型イベント ハンドラ 社群基礎模組 - 擴展事件處理器 社群基础模组 - 扩展事件处理器