From 4a3051df5471d85c2ed7137c9003869b8383a2b7 Mon Sep 17 00:00:00 2001 From: Jo David Date: Sun, 14 Nov 2021 07:45:33 +0100 Subject: [PATCH 01/22] use md extension (#8680) --- docs/{404.html => 404.md} | 0 docs/{news.html => news.md} | 0 docs/{version.html => version.md} | 1 - docs/wiki/development/index.html | 24 ----------- docs/wiki/development/index.md | 24 +++++++++++ docs/wiki/feature/index.html | 62 ---------------------------- docs/wiki/feature/index.md | 62 ++++++++++++++++++++++++++++ docs/wiki/framework/index.html | 30 -------------- docs/wiki/framework/index.md | 30 ++++++++++++++ docs/wiki/{index.html => index.md} | 5 --- docs/wiki/{search.html => search.md} | 0 docs/wiki/user/index.html | 24 ----------- docs/wiki/user/index.md | 24 +++++++++++ 13 files changed, 140 insertions(+), 146 deletions(-) rename docs/{404.html => 404.md} (100%) rename docs/{news.html => news.md} (100%) rename docs/{version.html => version.md} (99%) delete mode 100644 docs/wiki/development/index.html create mode 100644 docs/wiki/development/index.md delete mode 100644 docs/wiki/feature/index.html create mode 100644 docs/wiki/feature/index.md delete mode 100644 docs/wiki/framework/index.html create mode 100644 docs/wiki/framework/index.md rename docs/wiki/{index.html => index.md} (99%) rename docs/wiki/{search.html => search.md} (100%) delete mode 100644 docs/wiki/user/index.html create mode 100644 docs/wiki/user/index.md diff --git a/docs/404.html b/docs/404.md similarity index 100% rename from docs/404.html rename to docs/404.md diff --git a/docs/news.html b/docs/news.md similarity index 100% rename from docs/news.html rename to docs/news.md diff --git a/docs/version.html b/docs/version.md similarity index 99% rename from docs/version.html rename to docs/version.md index 5290db20ae..3e43e033dc 100644 --- a/docs/version.html +++ b/docs/version.md @@ -5,5 +5,4 @@ sitemap: exclude: "yes" --- -

Latest: {{site.ace.version.major}}.{{site.ace.version.minor}}.{{site.ace.version.patch}}

diff --git a/docs/wiki/development/index.html b/docs/wiki/development/index.html deleted file mode 100644 index 8ab81a2bbf..0000000000 --- a/docs/wiki/development/index.html +++ /dev/null @@ -1,24 +0,0 @@ ---- -title: Development Documentation -layout: default -group: subNav -order: 1 -short: wiki -parent: wiki ---- - -
-
-

Development

-

Information about developing ACE3, from setting up the development environment to guidelines and tips.

-
-
- -
-
diff --git a/docs/wiki/development/index.md b/docs/wiki/development/index.md new file mode 100644 index 0000000000..0dbfe501eb --- /dev/null +++ b/docs/wiki/development/index.md @@ -0,0 +1,24 @@ +--- +title: Development Documentation +layout: default +group: subNav +order: 1 +short: wiki +parent: wiki +--- + +
+
+

Development

+

Information about developing ACE3, from setting up the development environment to guidelines and tips.

+
+
+ +
+
diff --git a/docs/wiki/feature/index.html b/docs/wiki/feature/index.html deleted file mode 100644 index 64bbb9ce46..0000000000 --- a/docs/wiki/feature/index.html +++ /dev/null @@ -1,62 +0,0 @@ ---- -title: ACE3 Feature documentation -layout: default -group: subNav -order: 1 -short: wiki -parent: wiki -redirect_from: "/wiki/featurex" ---- - -
-
-

ACE3 Features

-

Overviews and details of ACE3 features, their usage and implementations.

-
-
-
-
-

General

- -
-
-

Interaction

- -
-
-

Realism

- -
-
-

Equipment

- -
-
diff --git a/docs/wiki/feature/index.md b/docs/wiki/feature/index.md new file mode 100644 index 0000000000..483b7677d4 --- /dev/null +++ b/docs/wiki/feature/index.md @@ -0,0 +1,62 @@ +--- +title: ACE3 Feature documentation +layout: default +group: subNav +order: 1 +short: wiki +parent: wiki +redirect_from: "/wiki/featurex" +--- + +
+
+

ACE3 Features

+

Overviews and details of ACE3 features, their usage and implementations.

+
+
+
+
+

General

+ +
+
+

Interaction

+ +
+
+

Realism

+ +
+
+

Equipment

+ +
+
diff --git a/docs/wiki/framework/index.html b/docs/wiki/framework/index.html deleted file mode 100644 index 5851252aa7..0000000000 --- a/docs/wiki/framework/index.html +++ /dev/null @@ -1,30 +0,0 @@ ---- -title: ACE3 Framework documentation -layout: default -group: subNav -order: 1 -short: wiki -parent: wiki -redirect_from: - - "/wiki/missionmaker/mission-tools.html" - - "/wiki/missionmaker/modules.html" - - "/wiki/missionmaker/useful-functions.html" - - "/wiki/frameworkx" ---- - -
-
-

Frameworks

-

Public API implemented by ACE3 which mission makers, modders and scripters can use.

- -
-
- -
-
diff --git a/docs/wiki/framework/index.md b/docs/wiki/framework/index.md new file mode 100644 index 0000000000..6d8a50858c --- /dev/null +++ b/docs/wiki/framework/index.md @@ -0,0 +1,30 @@ +--- +title: ACE3 Framework documentation +layout: default +group: subNav +order: 1 +short: wiki +parent: wiki +redirect_from: + - "/wiki/missionmaker/mission-tools.html" + - "/wiki/missionmaker/modules.html" + - "/wiki/missionmaker/useful-functions.html" + - "/wiki/frameworkx" +--- + +
+
+

Frameworks

+

Public API implemented by ACE3 which mission makers, modders and scripters can use.

+ +
+
+ +
+
diff --git a/docs/wiki/index.html b/docs/wiki/index.md similarity index 99% rename from docs/wiki/index.html rename to docs/wiki/index.md index a854bc954d..6a9f3056ab 100644 --- a/docs/wiki/index.html +++ b/docs/wiki/index.md @@ -34,13 +34,11 @@ parent:

User

-

General information about ACE3, installation guides and troubleshooting.

Learn more

Class Names

-

List of class names present in ACE3 which mission makers, modders and scripters can use.

Learn more
@@ -53,13 +51,11 @@ parent:

Features

-

Overviews and details of ACE3 features, their usage and implementations.

Learn more

Frameworks

-

Public API implemented by ACE3 which mission makers, modders and scripters can use.

Learn more
@@ -72,7 +68,6 @@ parent:

Development

-

Information about developing ACE3, from setting up the development environment to guidelines and tips.

Learn more
diff --git a/docs/wiki/search.html b/docs/wiki/search.md similarity index 100% rename from docs/wiki/search.html rename to docs/wiki/search.md diff --git a/docs/wiki/user/index.html b/docs/wiki/user/index.html deleted file mode 100644 index f49966eb90..0000000000 --- a/docs/wiki/user/index.html +++ /dev/null @@ -1,24 +0,0 @@ ---- -title: User documentation -layout: default -group: subNav -order: 1 -short: wiki -parent: wiki ---- - -
-
-

User

-

General information about ACE3, installation guides and troubleshooting.

-
-
- -
-
diff --git a/docs/wiki/user/index.md b/docs/wiki/user/index.md new file mode 100644 index 0000000000..5d6e93cee1 --- /dev/null +++ b/docs/wiki/user/index.md @@ -0,0 +1,24 @@ +--- +title: User documentation +layout: default +group: subNav +order: 1 +short: wiki +parent: wiki +--- + +
+
+

User

+

General information about ACE3, installation guides and troubleshooting.

+
+
+ +
+
From 4b12047a792dcbe4df02bd5560eb08ba30452c6f Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sun, 14 Nov 2021 12:36:23 -0600 Subject: [PATCH 02/22] Interaction - Fix PlasticCase_01_base_F UBC (#8681) --- addons/interaction/CfgVehicles.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index d20ff1ac6e..c88e93c095 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -644,7 +644,8 @@ class CfgVehicles { class ACE_SelfActions {}; }; - class PlasticCase_01_base_F: ThingX { + class Items_base_F; + class PlasticCase_01_base_F: Items_base_F { class ACE_Actions { class ACE_MainActions { displayName = CSTRING(MainAction); From ec2028cc8af90444e4181774de1883520acf4232 Mon Sep 17 00:00:00 2001 From: shukari Date: Mon, 15 Nov 2021 12:18:54 +0100 Subject: [PATCH 03/22] Documentation - Add Arsenal custom sub-item categories (#8678) * New Info: Adding custom sub item categories * typo fix * Custom sub item categories * Update arsenal.md --- .../functions/fnc_addRightPanelButton.sqf | 4 +- docs/wiki/feature/arsenal.md | 1 + docs/wiki/framework/arsenal-framework.md | 37 +++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/addons/arsenal/functions/fnc_addRightPanelButton.sqf b/addons/arsenal/functions/fnc_addRightPanelButton.sqf index e09aef4c9e..7d4ecd0d98 100644 --- a/addons/arsenal/functions/fnc_addRightPanelButton.sqf +++ b/addons/arsenal/functions/fnc_addRightPanelButton.sqf @@ -9,10 +9,10 @@ * 0: items only misc items * 1: tooltip (Optional) * 2: picture path (Optional) - * 3: override a spezific button (0-9) (Optional) + * 3: override a specific button (0-9) (Optional) * * Return Value: - * successful: number of the slot; error: -1 + * successful: number of the slot (0-9); error: -1 * * Example: * [["ACE_bloodIV_500", "ACE_Banana"], "MedicalStuff", "\z\ace\addons\arsenal\data\iconCustom.paa", 5] call ace_arsenal_fnc_addRightPanelButton diff --git a/docs/wiki/feature/arsenal.md b/docs/wiki/feature/arsenal.md index 91b4341de0..2d0c483b2e 100644 --- a/docs/wiki/feature/arsenal.md +++ b/docs/wiki/feature/arsenal.md @@ -27,6 +27,7 @@ ACE Arsenal has a pretty large number of improvements over BI Virtual Arsenal, h - A setting to disable mod icons to increase performance even further. - An other setting to invert horizontal camera controls. - Settings to disable the "Default loadouts" and "Public loadouts" tabs. +- Custom sub item categories for misc items * Items not currently available in ACE Arsenal but in the unit's inventory, unique items will be omitted when loading loadouts and they can only be removed from containers. diff --git a/docs/wiki/framework/arsenal-framework.md b/docs/wiki/framework/arsenal-framework.md index eb7c2123f6..2e269e3d6d 100644 --- a/docs/wiki/framework/arsenal-framework.md +++ b/docs/wiki/framework/arsenal-framework.md @@ -300,3 +300,40 @@ All are local. | ace_arsenal_loadoutsDisplayClosed | None | 3.12.3 | | ace_arsenal_loadoutsTabChanged | loadouts screen display (DISPLAY), tab control (CONTROL) | 3.12.3 | | ace_arsenal_loadoutsListFilled | loadouts screen display (DISPLAY), tab control (CONTROL) | 3.12.3 | + +## 7. Custom sub item categories + +### 7.1 Adding a sub item category + +`ace_arsenal_fnc_addRightPanelButton` + +| | Argument | Type | Optional (default value) +---| -------- | ---- | ------------------------ +0 | Misc. items | Array of strings | Required +1 | Tooltip | String | Optional (default: `""`) +2 | Picture path | String | Optional (default: `"\z\ace\addons\arsenal\data\iconCustom.paa"`) +3 | Override a specific button | Number | Optional (default: `-1`) + +Return Value: +- successful: number of the slot (0-9) +- error: -1 + +This function creates a sub category under misc items in the ACE Arsenal. +Only items that are listed under 'Misc Items' are available for sub categories. +If the 'Override a specific button' argument is not used, the button will added at the bottom of the rest. + +Examples: +- `[["ACE_bloodIV_500", "ACE_fieldDressing"], "MedicalStuff"] call ace_arsenal_fnc_addRightPanelButton` +- `[["ACE_Banana"], "Fruits", "\path\to\a\picture.paa"] call ace_arsenal_fnc_addRightPanelButton` + +Override Examples: +``` sqf +// a category 'Explosives' is created at the bottom (last possible location) +[["ACE_Clacker", "ACE_M26_Clacker"], "Explosives", nil, 9] call ace_arsenal_fnc_addRightPanelButton; +``` +``` sqf +// a category 'Flashlights' is created and the buttonId is saved +private _buttonId = [["ACE_Flashlight_MX991", "ACE_Flashlight_KSF1"], "Flashlights", "\path\to\a\pictureWithAFlashlight.paa"] call ace_arsenal_fnc_addRightPanelButton; +// now the category 'better flashlight' is replacing the category 'Flashlights' because it is set on the same button index +[["ACE_Flashlight_XL50"], "better flashlight", "\path\to\a\pictureWithAFlashlight.paa", _buttonId] call ace_arsenal_fnc_addRightPanelButton +``` From a9296f66d58dab75717d1e544009867da441e18c Mon Sep 17 00:00:00 2001 From: GhostIsSpooky <69561145+Salluci@users.noreply.github.com> Date: Mon, 15 Nov 2021 12:31:56 -0300 Subject: [PATCH 04/22] Medical - Update `setDead` to use `setHitpointDamage` instigator param (#8397) * Redoing this * Revert "Redoing this" This reverts commit 80ff709676c0e9ddd25992edde1e578523417686. * Do this properly * Update fnc_handleKilled.sqf * use setDead function directly * Handle scripted camera * redo #8387 I'm dumb. * try this * if construct outside of ctrlSetEventHandler Co-authored-by: Filip Maciejewski * tweak disableUserInput / handleKilled Co-authored-by: Filip Maciejewski Co-authored-by: PabstMirror --- .../common/functions/fnc_disableUserInput.sqf | 10 +++++++--- .../functions/fnc_enteredStateDeath.sqf | 3 ++- .../functions/fnc_handleKilled.sqf | 18 ++++++++++-------- .../functions/fnc_handleKilledMission.sqf | 14 +++++++------- .../medical_status/functions/fnc_initUnit.sqf | 3 +++ .../medical_status/functions/fnc_setDead.sqf | 11 ++++++++--- .../functions/fnc_placeInBodyBag.sqf | 2 +- 7 files changed, 38 insertions(+), 23 deletions(-) diff --git a/addons/common/functions/fnc_disableUserInput.sqf b/addons/common/functions/fnc_disableUserInput.sqf index 514fa3601c..006f097266 100644 --- a/addons/common/functions/fnc_disableUserInput.sqf +++ b/addons/common/functions/fnc_disableUserInput.sqf @@ -66,9 +66,13 @@ if (_state) then { _ctrl ctrlSetTooltip "Abort."; _ctrl = _dlg displayctrl ([104, 1010] select isMultiplayer); - _ctrl ctrlSetEventHandler ["buttonClick", QUOTE(closeDialog 0; player setDamage 1; [false] call DFUNC(disableUserInput);)]; - _ctrl ctrlEnable (call {private _config = missionConfigFile >> "respawnButton"; !isNumber _config || {getNumber _config == 1}}); - _ctrl ctrlSetText "RESPAWN"; + if (["ace_medical"] call FUNC(isModLoaded)) then { + _ctrl ctrlSetEventHandler ["buttonClick", 'closeDialog 0; [player, "respawn_button"] call EFUNC(medical_status,setDead); [false] call DFUNC(disableUserInput);']; + } else { + _ctrl ctrlSetEventHandler ["buttonClick", QUOTE(closeDialog 0; player setDamage 1; [false] call DFUNC(disableUserInput);)]; + }; + _ctrl ctrlEnable ((getMissionConfigValue ["respawnButton", -1]) != 0); // handles 3den attribute or description.ext + _ctrl ctrlSetText localize "$str_3den_multiplayer_attributecategory_respawn_displayname"; _ctrl ctrlSetTooltip "Respawn."; }; diff --git a/addons/medical_statemachine/functions/fnc_enteredStateDeath.sqf b/addons/medical_statemachine/functions/fnc_enteredStateDeath.sqf index cb6f63c39a..913ffb075e 100644 --- a/addons/medical_statemachine/functions/fnc_enteredStateDeath.sqf +++ b/addons/medical_statemachine/functions/fnc_enteredStateDeath.sqf @@ -22,6 +22,7 @@ if (isNull _unit) exitWith {}; TRACE_3("enteredStateDeath",_this,_thisOrigin,_thisTransition); private _causeOfDeath = format ["%1:%2", _thisOrigin, _thisTransition]; +private _instigator = _unit getVariable [QEGVAR(medical,lastInstigator), objNull]; // could delay a frame here to fix the double killed EH, but we lose it being a "native" kill (scoreboard / rating) -[_unit, _causeOfDeath] call EFUNC(medical_status,setDead); +[_unit, _causeOfDeath, _instigator] call EFUNC(medical_status,setDead); diff --git a/addons/medical_status/functions/fnc_handleKilled.sqf b/addons/medical_status/functions/fnc_handleKilled.sqf index a78c82bf55..f2b253cf3e 100644 --- a/addons/medical_status/functions/fnc_handleKilled.sqf +++ b/addons/medical_status/functions/fnc_handleKilled.sqf @@ -30,20 +30,22 @@ if (_unit isEqualTo (_unit getVariable [QGVAR(killed), objNull])) exitWith { _unit setVariable [QGVAR(killed), _unit]; private _causeOfDeath = _unit getVariable [QEGVAR(medical,causeOfDeath), "#scripted"]; +private _modifyKilledArray = missionNamespace getVariable [QEGVAR(medical,modifyKilledArray), true]; // getVar so this can be disabled -// if undefined then it's a death not caused by ace's setDead (mission setDamage, disconnect) +// if undefined then it's a death not caused by ace's setDead (mission setDamage, disconnect, forced respawn while conscious) if (_causeOfDeath != "#scripted") then { _killer = _unit getVariable [QEGVAR(medical,lastDamageSource), _killer]; // vehicle _instigator = _unit getVariable [QEGVAR(medical,lastInstigator), _instigator]; // unit in the turret - - // All Killed EHs uses the same array, so we can modify it now to pass the correct killer/instigator - if (missionNamespace getVariable [QEGVAR(medical,modifyKilledArray), true]) then { // getVar so this can be disabled - _this set [1, _killer]; - _this set [2, _instigator]; - }; -} else { // in that case, call setDead manually to prevent any issues +} else { + // call setDead manually to prevent any issues [_unit, "#scripted"] call FUNC(setDead); }; + +// All Killed EHs uses the same array, so we can modify it now to pass the correct killer/instigator +if (_modifyKilledArray) then { + _this set [1, _killer]; + _this set [2, _instigator]; +}; TRACE_3("killer info",_killer,_instigator,_causeOfDeath); if (_unit == player) then { diff --git a/addons/medical_status/functions/fnc_handleKilledMission.sqf b/addons/medical_status/functions/fnc_handleKilledMission.sqf index 67d1f050f4..bf8bd780ba 100644 --- a/addons/medical_status/functions/fnc_handleKilledMission.sqf +++ b/addons/medical_status/functions/fnc_handleKilledMission.sqf @@ -30,16 +30,16 @@ if (_unit isEqualTo (_unit getVariable [QGVAR(killedMission), objNull])) exitWit _unit setVariable [QGVAR(killedMission), _unit]; private _causeOfDeath = _unit getVariable [QEGVAR(medical,causeOfDeath), "#scripted"]; +private _modifyKilledArray = missionNamespace getVariable [QEGVAR(medical,modifyKilledArray), true]; // getVar so this can be disabled -// if undefined then it's a death not caused by ace's setDead (mission setDamage, disconnect) +// if undefined then it's a death not caused by ace's setDead (mission setDamage, disconnect, forced respawn while conscious) if (_causeOfDeath != "#scripted") then { _killer = _unit getVariable [QEGVAR(medical,lastDamageSource), _killer]; // vehicle _instigator = _unit getVariable [QEGVAR(medical,lastInstigator), _instigator]; // unit in the turret - - // All Killed EHs uses the same array, so we can modify it now to pass the correct killer/instigator - if (missionNamespace getVariable [QEGVAR(medical,modifyKilledArray), true]) then { // getVar so this can be disabled - _this set [1, _killer]; - _this set [2, _instigator]; - }; +}; +// All Killed EHs uses the same array, so we can modify it now to pass the correct killer/instigator +if (_modifyKilledArray) then { + _this set [1, _killer]; + _this set [2, _instigator]; }; TRACE_3("killer mission info",_killer,_instigator,_causeOfDeath); diff --git a/addons/medical_status/functions/fnc_initUnit.sqf b/addons/medical_status/functions/fnc_initUnit.sqf index 73ff2ce8b6..1b6c283664 100644 --- a/addons/medical_status/functions/fnc_initUnit.sqf +++ b/addons/medical_status/functions/fnc_initUnit.sqf @@ -75,6 +75,9 @@ if (_isRespawn) then { // Unconscious spontanious wake up chance _unit setVariable [QEGVAR(medical,lastWakeUpCheck), nil]; + + // Cause of death + _unit setVariable [QEGVAR(medical,causeOfDeath), nil]; }; [{ diff --git a/addons/medical_status/functions/fnc_setDead.sqf b/addons/medical_status/functions/fnc_setDead.sqf index 7f41ebf3da..ec85ad8a65 100644 --- a/addons/medical_status/functions/fnc_setDead.sqf +++ b/addons/medical_status/functions/fnc_setDead.sqf @@ -6,6 +6,7 @@ * Arguments: * 0: The unit * 1: Reason for death + * 2: Killer * * Return Value: * None @@ -13,8 +14,8 @@ * Public: No */ -params ["_unit", ["_reason", "#setDead"]]; -TRACE_2("setDead",_unit,_reason); +params ["_unit", ["_reason", "#setDead"], ["_instigator", objNull]]; +TRACE_3("setDead",_unit,_reason,_instigator); // No heart rate or blood pressure to measure when dead _unit setVariable [VAR_HEART_RATE, 0, true]; @@ -26,4 +27,8 @@ _unit setVariable [QEGVAR(medical,causeOfDeath), _reason, true]; [QEGVAR(medical,death), [_unit]] call CBA_fnc_localEvent; // Kill the unit without changing visual apperance -[_unit, 1] call EFUNC(medical_engine,setStructuralDamage); +private _prevDamage = _unit getHitPointDamage "HitHead"; + +_unit setHitPointDamage ["HitHead", 1, true, _instigator]; + +_unit setHitPointDamage ["HitHead", _prevDamage]; diff --git a/addons/medical_treatment/functions/fnc_placeInBodyBag.sqf b/addons/medical_treatment/functions/fnc_placeInBodyBag.sqf index 3154107e01..87de5f3542 100644 --- a/addons/medical_treatment/functions/fnc_placeInBodyBag.sqf +++ b/addons/medical_treatment/functions/fnc_placeInBodyBag.sqf @@ -31,7 +31,7 @@ if (!local _patient) exitWith { if (alive _patient) then { TRACE_1("Manually killing with setDead",_patient); - [_patient, "buried_alive"] call EFUNC(medical_status,setDead); + [_patient, "buried_alive", _medic] call EFUNC(medical_status,setDead); }; private _position = (getPosASL _patient) vectorAdd [0, 0, 0.2]; From 2aacb126dc9cdcdbfe2d129d22a77c0b8a9fe9a7 Mon Sep 17 00:00:00 2001 From: diaverso Date: Mon, 15 Nov 2021 17:02:17 +0100 Subject: [PATCH 05/22] Add Spanish translation (#8682) * Add Spanish translation * Update addons/fire/stringtable.xml * Update addons/fire/stringtable.xml Co-authored-by: PabstMirror --- addons/fire/stringtable.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/fire/stringtable.xml b/addons/fire/stringtable.xml index c969039326..0fbb1d8b68 100644 --- a/addons/fire/stringtable.xml +++ b/addons/fire/stringtable.xml @@ -8,6 +8,7 @@ ACE Возгорание ACE Feuer ACE Ogień + ACE Fuego Pat Down Fire @@ -16,6 +17,7 @@ Потушить Feuer löschen Zgaś ogień + Extingir el fuego Patting Down Fire @@ -24,6 +26,7 @@ Тушение Feuer wird gelöscht... Gaszenie ognia + Extinguiendo el Fuego Allow units to catch fire @@ -32,6 +35,7 @@ Включает возгорание Erlaubt, dass Einheiten Feuer fangen können Zezwól jednostkom na zapalenie się + Permitir que las unidades se incendien Enable fire-flare at night @@ -40,6 +44,7 @@ Включает сверкание пламени Aktiviert Feuerschein bei Nacht. Włącza efekt flary od ognia w nocy + Habilitar bengalas de fuego por la noche Uses a flare effect to increase fire intensity at night @@ -48,19 +53,24 @@ Включает ореол пламени для большей интенсивности ночью Benutzt einen Feuerschein-Effekt um die Intensität des Feuers bei Nacht zu verstärken. Używa efektu flary, aby zwiększyć jasność w nocy + Utiliza un efecto de bengala para aumentar la intensidad del fuego por la noche Enable screams by units on fire + Habilitar los gritos de las unidades en llamas Enables if units on fire will play the screaming sound + Habilita si las unidades en llamas reproducirán el sonido de los gritos Drop Weapons When on Fire + Soltar armas cuando esté en llamas Włącz wyrzucanie broni podczas płonięcia Controls whether units drop their weapons when on fire. + Controla si las unidades dejan caer sus armas cuando están en llamas Powoduje że jednostki wyrzucają swoją broń gdy płoną. From 10cc340fd0d228fb8f1b1e02e82dc703b822d20c Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 15 Nov 2021 16:58:51 -0600 Subject: [PATCH 06/22] Overheating - prep `canCoolWeaponWithItem` (#8684) --- addons/overheating/XEH_PREP.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/overheating/XEH_PREP.hpp b/addons/overheating/XEH_PREP.hpp index 5a1d3c5387..865a049569 100644 --- a/addons/overheating/XEH_PREP.hpp +++ b/addons/overheating/XEH_PREP.hpp @@ -3,6 +3,7 @@ PREP(calculateCooling); PREP(canUnjam); PREP(canSwapBarrel); PREP(canCheckSpareBarrelsTemperatures); +PREP(canCoolWeaponWithItem); PREP(checkSpareBarrelsTemperatures); PREP(checkTemperature); PREP(clearJam); From 83f8539dd48864dc0dca19ccd6f32e7dc3436084 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 17 Nov 2021 16:11:26 -0600 Subject: [PATCH 07/22] Prep 3.14.1 Build 64 --- README.md | 2 +- addons/main/script_version.hpp | 4 ++-- docs/_config.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 48b83610f1..e8599eac73 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- ACE3 Version + ACE3 Version ACE3 Issues diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index c4db7da30e..d9b655c1ab 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 #define MINOR 14 -#define PATCHLVL 0 -#define BUILD 63 +#define PATCHLVL 1 +#define BUILD 64 diff --git a/docs/_config.yml b/docs/_config.yml index c8b22232dc..b00a1a50f7 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -9,8 +9,8 @@ ace: version: major: 3 minor: 14 - patch: 0 - build: 63 + patch: 1 + build: 64 markdown: kramdown From 67cad5120ed5c31258989b74ad4e1fd5d15556cd Mon Sep 17 00:00:00 2001 From: Drofseh Date: Thu, 18 Nov 2021 11:26:31 -0800 Subject: [PATCH 08/22] Documentation - Improve documentation for Rearm & Vehicle Damage (#8588) --- docs/wiki/framework/rearm-framework.md | 47 ++++++++++++------- .../wiki/framework/vehicledamage-framework.md | 8 ++-- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/docs/wiki/framework/rearm-framework.md b/docs/wiki/framework/rearm-framework.md index 1985fdf685..cd31043572 100644 --- a/docs/wiki/framework/rearm-framework.md +++ b/docs/wiki/framework/rearm-framework.md @@ -50,9 +50,24 @@ class MyTruck: Car_F {

Mission makers can also use `this setVariable ["ace_rearm_isSupplyVehicle", true]`

-## 2. Functions +## 2. Variables -### 2.1 Adding specific magazines +### 2.1 Allow Rearming of Scripted Loadouts + +`ace_rearm_scriptedLoadout` + +Normally ACE Rearm evaluates what magazines a vehicle can carry by looking at the turret configs of the vehicle. This means that if a vehicle has a scripted loadout, for example using `addMagazineTurret` to give it different magazines than standard, those scripted magazines cannot be loaded with Rearm and the vehicle may be overloaded by rearming the magazines from the turret configs. + +If a scripted loadout is used, this variable can be set to true to switch the magazines that can be rearmed from the turret configs to any empty magazine in the vehicle. + +```cpp +VEHICLE addMagazineTurret ["SmokeLauncherMag",[0,0]]; +VEHICLE setVariable ["ace_rearm_scriptedLoadout", true, true]; +``` + +## 3. Functions + +### 3.1 Adding specific magazines `ace_rearm_fnc_addMagazineToSupply` @@ -67,7 +82,7 @@ This function is most useful with the module setting `Only specific Magazines`. This function can also be used to increase the supply count on setting `Limited ammo supply based on caliber` by a certain caliber value. -#### 2.1.1 Example +#### 3.1.1 Example `[ammo_truck, "32Rnd_155mm_Mo_shells"] call ace_rearm_fnc_addMagazineToSupply;` @@ -78,7 +93,7 @@ This function can also be used to increase the supply count on setting `Limited The 32 artillery shells are added to the supply count or the magazine storage of the specified ammo truck. -### 2.2 Adding all magazines of a specific vehicle +### 3.2 Adding all magazines of a specific vehicle `ace_rearm_fnc_addVehicleMagazinesToSupply` @@ -90,7 +105,7 @@ The 32 artillery shells are added to the supply count or the magazine storage of This functions wraps `ace_rearm_fnc_addMagazineToSupply` and uses it to add all default magazines of all supported turrets of the vehicle to the ammo truck. -#### 2.2.1 Example 1 +#### 3.2.1 Example 1 `[ammo_truck, tank] call ace_rearm_fnc_addVehicleMagazinesToSupply;` @@ -101,7 +116,7 @@ This functions wraps `ace_rearm_fnc_addMagazineToSupply` and uses it to add all All magazines found in the class config of the object `tank` are made available. -#### 2.2.2 Example 2 +#### 3.2.2 Example 2 `[ammo_truck, "B_MBT_01_arty_F"] call ace_rearm_fnc_addVehicleMagazinesToSupply;` @@ -112,7 +127,7 @@ All magazines found in the class config of the object `tank` are made available. All magazines found in the config of the vehicle class `B_MBT_01_arty_F` are made available. -### 2.3 Enabling / disabling rearming +### 3.3 Enabling / disabling rearming `ace_rearm_fnc_disable` @@ -124,7 +139,7 @@ All magazines found in the config of the vehicle class `B_MBT_01_arty_F` are mad This functions disables rearming for all supported turrets of a certain vehicle. -#### 2.3.1 Example 1 +#### 3.3.1 Example 1 `[tank] call ace_rearm_fnc_disable;` @@ -134,7 +149,7 @@ This functions disables rearming for all supported turrets of a certain vehicle. Disables rearming on the object `tank`. -#### 2.3.2 Example 2 +#### 3.3.2 Example 2 `[tank, false] call ace_rearm_fnc_disable;` @@ -145,7 +160,7 @@ Disables rearming on the object `tank`. Enables rearming on the object `tank`. -### 2.4 Getting the supply count +### 3.4 Getting the supply count `ace_rearm_fnc_getSupplyCount` @@ -156,7 +171,7 @@ Enables rearming on the object `tank`. This functions returns the current supply count of the ammo truck. -#### 2.4.1 Example +#### 3.4.1 Example `[ammo_truck] call ace_rearm_fnc_getSupplyCount;` @@ -166,7 +181,7 @@ This functions returns the current supply count of the ammo truck. The remaining supply count of `ammo_truck` will be returned. -### 2.5 Removing magazines from supply +### 3.5 Removing magazines from supply `ace_rearm_fnc_removeMagazineFromSupply` @@ -177,7 +192,7 @@ The remaining supply count of `ammo_truck` will be returned. 2 | Number of Rounds to withdraw | Number | Optional (default: `-1`) **R** | Magazine could be removed successfully | Boolean | Return value -#### 2.5.1 Example 1 +#### 3.5.1 Example 1 `[ammo_truck, "500Rnd_127x99_mag_Tracer_Red"] call ace_rearm_fnc_removeMagazineFromSupply;` @@ -188,7 +203,7 @@ The remaining supply count of `ammo_truck` will be returned. Removes one ammo box worth of 500Rnd_127x99_mag_Tracer_Red from the supply. Depending on the module setting the ammo box does hold an entire magazine or only the caliber based amount of rounds. -#### 2.5.2 Example 2 +#### 3.5.2 Example 2 `[ammo_truck, "500Rnd_127x99_mag_Tracer_Red", 50] call ace_rearm_fnc_removeMagazineFromSupply;` @@ -200,7 +215,7 @@ Removes one ammo box worth of 500Rnd_127x99_mag_Tracer_Red from the supply. Depe Removes one ammo box with 50 rounds of 500Rnd_127x99_mag_Tracer_Red from the supply. This is 10% of the supply of an entire magazine. -### 2.6 Setting the supply count +### 3.6 Setting the supply count `ace_rearm_fnc_setSupplyCount` @@ -212,7 +227,7 @@ Removes one ammo box with 50 rounds of 500Rnd_127x99_mag_Tracer_Red from the sup This function sets the current supply count of the ammo truck. It can be used to replenish the ammo truck on `Limited ammo supply based on caliber` setting. -#### 2.6.1 Example +#### 3.6.1 Example `[ammo_truck, 1000] call ace_rearm_fnc_setSupplyCount;` diff --git a/docs/wiki/framework/vehicledamage-framework.md b/docs/wiki/framework/vehicledamage-framework.md index c4b86e209f..7e22bccf5d 100644 --- a/docs/wiki/framework/vehicledamage-framework.md +++ b/docs/wiki/framework/vehicledamage-framework.md @@ -101,22 +101,22 @@ Default: "" On vehicle placement the system will iterate through all hitpoints define in `class Turrets` and find the relevant weapons and add their hitpoints. This occurs for ERA and SLAT as well -## CfgAmmo +## 2. CfgAmmo The only configuration needed on ammo is the warhead type (if applicable) and the incendiary value -### 1.1 `ace_vehicle_damage_incendiary` +### 2.1 `ace_vehicle_damage_incendiary` Value in range [0, 1] for how incendiary the ammo is. This is used in calculations to ignite fires. Not based on any real-world value, tweak as feels right. -#### 1.1.1 Default Values +#### 2.1.1 Default Values - Tandem/HEAT: 1 - AP: 0.1 - HE: 0.3 - Incendiary Bullet: 0.7 -### 1.2 `warheadName` +### 2.2 `warheadName` Default ARMA config value. We assume that the warheads are vanilla strings, so options are From 94d0466f17c0fb6150a8c00691148c34810ba0e6 Mon Sep 17 00:00:00 2001 From: Jo David Date: Tue, 23 Nov 2021 16:02:31 +0100 Subject: [PATCH 09/22] GitHub - Improve PR template (#8697) * Update PULL_REQUEST_TEMPLATE.md * Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ea83a609e3..2f72a45b3b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,9 @@ **When merged this pull request will:** -- Describe what this pull request will do -- Each change in a separate line -- Include documentation if applicable -- Respect the [Development Guidelines](https://ace3mod.com/wiki/development/) -- Follow title standard `Component - Add|Fix|Improve|Change|Make|Remove bananas` +- _Describe what this pull request will do_ +- _Each change in a separate line_ + +### IMPORTANT + +- [ ] If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs), please include your changes in this pull request so the documentation will appear on the [website](https://ace3mod.com/). +- [ ] [Development Guidelines](https://ace3mod.com/wiki/development/) are read, understood and applied. +- [ ] Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`. From 24a28da56647dbc581ab77edd4e2ba925851c890 Mon Sep 17 00:00:00 2001 From: diwako Date: Wed, 24 Nov 2021 19:22:17 +0100 Subject: [PATCH 10/22] fix stuck in uncon animation after CfgExtendedAnimation change (#8692) --- addons/medical_engine/XEH_postInit.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical_engine/XEH_postInit.sqf b/addons/medical_engine/XEH_postInit.sqf index fec92ca620..172e5aedfb 100644 --- a/addons/medical_engine/XEH_postInit.sqf +++ b/addons/medical_engine/XEH_postInit.sqf @@ -66,7 +66,7 @@ // Fixes units being stuck in unconscious animation when being knocked over by a PhysX object ["CAManBase", "AnimDone", { params ["_unit", "_anim"]; - if (local _unit && {_anim find QGVAR(face) != -1 && {lifeState _unit != "INCAPACITATED"}}) then { + if (local _unit && {_anim find QUNCON_ANIM(face) != -1 && {lifeState _unit != "INCAPACITATED"}}) then { [_unit, false] call FUNC(setUnconsciousAnim); }; }] call CBA_fnc_addClassEventHandler; From ff9afd689349ae3d20e9f62292dde0319cbad956 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 25 Nov 2021 12:36:05 -0600 Subject: [PATCH 11/22] Prep 3.14.1 Build 65 --- addons/main/script_version.hpp | 2 +- docs/_config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index d9b655c1ab..09c7a01391 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 #define MINOR 14 #define PATCHLVL 1 -#define BUILD 64 +#define BUILD 65 diff --git a/docs/_config.yml b/docs/_config.yml index b00a1a50f7..41888f6afc 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -10,7 +10,7 @@ ace: major: 3 minor: 14 patch: 1 - build: 64 + build: 65 markdown: kramdown From 4cd3f9fe96bc0ab72862e5d4a16cabf843935ce1 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 26 Nov 2021 10:56:41 -0600 Subject: [PATCH 12/22] Misc - Cleanup unused namespace vars (#8704) Co-Authored-By: Serg Vergun <1197314+severgun@users.noreply.github.com> Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com> --- addons/cookoff/XEH_postInit.sqf | 2 -- addons/rearm/XEH_postInit.sqf | 1 - 2 files changed, 3 deletions(-) diff --git a/addons/cookoff/XEH_postInit.sqf b/addons/cookoff/XEH_postInit.sqf index f143273d04..e4a46c10a0 100644 --- a/addons/cookoff/XEH_postInit.sqf +++ b/addons/cookoff/XEH_postInit.sqf @@ -20,8 +20,6 @@ }; }] call CBA_fnc_addEventHandler; -GVAR(cacheTankDuplicates) = call CBA_fnc_createNamespace; - ["ReammoBox_F", "init", { (_this select 0) addEventHandler ["HandleDamage", { if ((_this select 0) getVariable [QGVAR(enableAmmoCookoff), GVAR(enableAmmobox)]) then { diff --git a/addons/rearm/XEH_postInit.sqf b/addons/rearm/XEH_postInit.sqf index d85104e84f..3a6d72fcbe 100644 --- a/addons/rearm/XEH_postInit.sqf +++ b/addons/rearm/XEH_postInit.sqf @@ -1,6 +1,5 @@ #include "script_component.hpp" -GVAR(hardpointGroupsCache) = [] call CBA_fnc_createNamespace; GVAR(configTypesAdded) = []; ["CBA_settingsInitialized", { TRACE_2("settingsInit",GVAR(level),GVAR(supply)); From 53f8577122de4debd1c6cbafcfb34f6e1504be77 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 26 Nov 2021 22:49:37 -0600 Subject: [PATCH 13/22] Tools - Increase timeout on sqfvmChecker.py (#8703) --- tools/sqfvmChecker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sqfvmChecker.py b/tools/sqfvmChecker.py index 98216563f0..ab9c74ceee 100644 --- a/tools/sqfvmChecker.py +++ b/tools/sqfvmChecker.py @@ -42,7 +42,7 @@ def process_file(filePath, skipA3Warnings=True): # cmd.append("-V") proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True) try: - ret = proc.wait(7) # max wait - seconds + ret = proc.wait(12) # max wait - seconds except Exception as _e: print("sqfvm timed out: {}".format(filePath)) return True From 8cea7f40073f7f0853e6c55d3df840ac22961d97 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 27 Nov 2021 19:11:39 -0600 Subject: [PATCH 14/22] RHS Compats - Fix various UBCs (#8688) --- optionals/compat_rhs_afrf3/CfgVehicles.hpp | 2 +- optionals/compat_rhs_afrf3/CfgWeapons.hpp | 3 ++- optionals/compat_rhs_usf3/CfgAmmo.hpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/optionals/compat_rhs_afrf3/CfgVehicles.hpp b/optionals/compat_rhs_afrf3/CfgVehicles.hpp index b6fa189790..e1cfee0138 100644 --- a/optionals/compat_rhs_afrf3/CfgVehicles.hpp +++ b/optionals/compat_rhs_afrf3/CfgVehicles.hpp @@ -187,7 +187,7 @@ class CfgVehicles { ace_rearm_defaultSupply = 1200; }; - class rhs_kamaz5350: rhs_truck {}; + class rhs_kamaz5350; class rhs_kamaz5350_ammo_base: rhs_kamaz5350 { transportAmmo = 0; ace_rearm_defaultSupply = 1200; diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp index 29fa16bc22..1f07f81872 100644 --- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp @@ -126,7 +126,8 @@ class CfgWeapons { HEARING_PROTECTION_VICCREW }; - class rhs_6b48: H_HelmetB { + class rhs_6b47_bare; + class rhs_6b48: rhs_6b47_bare { HEARING_PROTECTION_VICCREW }; diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index d292c9e017..475df36fae 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -240,7 +240,8 @@ class CfgAmmo { EGVAR(vehicle_damage,incendiary) = 0.8; }; - class rhs_ammo_mk19m3_M430I_penetrator: rhsusf_ammo_basic_penetrator { + class rhsusf_ammo_reduced_penetrator; + class rhs_ammo_mk19m3_M430I_penetrator: rhsusf_ammo_reduced_penetrator { EGVAR(vehicle_damage,incendiary) = 0.8; }; From 2f2280494f64b401f597594e7011125e4fb61191 Mon Sep 17 00:00:00 2001 From: TyroneMF Date: Sun, 28 Nov 2021 01:11:46 +0000 Subject: [PATCH 15/22] Slideshow - Add support for texture selections (#8702) Co-authored-by: Filip Maciejewski Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com> --- addons/slideshow/CfgVehicles.hpp | 6 ++++++ addons/slideshow/functions/fnc_addSlideActions.sqf | 9 +++++---- addons/slideshow/functions/fnc_autoTransition.sqf | 9 +++++---- addons/slideshow/functions/fnc_createSlideshow.sqf | 10 ++++++---- addons/slideshow/functions/fnc_moduleInit.sqf | 3 ++- addons/slideshow/stringtable.xml | 6 ++++++ docs/wiki/framework/slideshow-framework.md | 4 +++- 7 files changed, 33 insertions(+), 14 deletions(-) diff --git a/addons/slideshow/CfgVehicles.hpp b/addons/slideshow/CfgVehicles.hpp index 6c11ba866c..c7c0687913 100644 --- a/addons/slideshow/CfgVehicles.hpp +++ b/addons/slideshow/CfgVehicles.hpp @@ -47,6 +47,12 @@ class CfgVehicles { typeName = "NUMBER"; defaultValue = 0; }; + class Selection { + displayName = CSTRING(Selection_DisplayName); + description = CSTRING(Selection_Description); + typeName = "NUMBER"; + defaultValue = 0; + }; }; class ModuleDescription { description = CSTRING(Description); diff --git a/addons/slideshow/functions/fnc_addSlideActions.sqf b/addons/slideshow/functions/fnc_addSlideActions.sqf index 6416c35748..29997861e5 100644 --- a/addons/slideshow/functions/fnc_addSlideActions.sqf +++ b/addons/slideshow/functions/fnc_addSlideActions.sqf @@ -9,6 +9,7 @@ * 2: Names * 3: Controller * 4: Current Slideshow + * 5: Texture Selection (default: 0) * * Return Value: * List of actions @@ -19,7 +20,7 @@ * Public: No */ -params ["_objects", "_images", "_names", "_controller", "_currentSlideshow"]; +params ["_objects", "_images", "_names", "_controller", "_currentSlideshow", ["_selection", 0]]; private _actions = []; { @@ -30,15 +31,15 @@ private _actions = []; _names select _forEachIndex, "", { - (_this select 2) params ["_objects", "_image", "_currentSlideshow"]; + (_this select 2) params ["_objects", "_image", "_currentSlideshow", "_selection"]; { - _x setObjectTextureGlobal [0, _image] + _x setObjectTextureGlobal [_selection, _image] } count _objects; [QGVAR(slideChanged), [_image, _currentSlideshow]] call CBA_fnc_localEvent; }, {true}, {}, - [_objects, _x, _currentSlideshow] + [_objects, _x, _currentSlideshow, _selection] ] call EFUNC(interact_menu,createAction), [], _controller diff --git a/addons/slideshow/functions/fnc_autoTransition.sqf b/addons/slideshow/functions/fnc_autoTransition.sqf index 87fe488754..f57abdd8df 100644 --- a/addons/slideshow/functions/fnc_autoTransition.sqf +++ b/addons/slideshow/functions/fnc_autoTransition.sqf @@ -9,17 +9,18 @@ * 2: State Variable Name * 3: Current Slideshow * 4: Duration (0 disables automatic transitions) + * 5: Texture Selection * * Return Value: * None * * Example: - * [objects, images, "ace_slideshow_slideshow1", duration] call ace_slideshow_fnc_autoTransition + * [objects, images, "ace_slideshow_slideshow1", duration, selection] call ace_slideshow_fnc_autoTransition * * Public: No */ -params ["_objects", "_images", "_varString", "_currentSlideshow", "_duration"]; +params ["_objects", "_images", "_varString", "_currentSlideshow", "_duration", "_selection"]; // Get current slide number of this slideshow private _currentSlide = missionNamespace getVariable [_varString, 0]; @@ -34,11 +35,11 @@ private _image = _images select _currentSlide; // Set slide { - _x setObjectTextureGlobal [0, _image]; + _x setObjectTextureGlobal [_selection, _image]; } count _objects; [QGVAR(slideChanged), [_image, _currentSlideshow]] call CBA_fnc_localEvent; // Log current slide and execute Next slide TRACE_4("Auto-transition",_image,_currentSlide,count _images,_duration); -[FUNC(autoTransition), [_objects, _images, _varString, _currentSlideshow, _duration], _duration] call CBA_fnc_waitAndExecute; +[FUNC(autoTransition), [_objects, _images, _varString, _currentSlideshow, _duration, _selection], _duration] call CBA_fnc_waitAndExecute; diff --git a/addons/slideshow/functions/fnc_createSlideshow.sqf b/addons/slideshow/functions/fnc_createSlideshow.sqf index 0d84fa969b..841365d4c4 100644 --- a/addons/slideshow/functions/fnc_createSlideshow.sqf +++ b/addons/slideshow/functions/fnc_createSlideshow.sqf @@ -10,6 +10,7 @@ * 3: Action Names * 4: Slide Duration (0 disables automatic transitions) * 5: Set Name (default: localized "Slides") + * 6: Texture Selection (default: 0) * * Return Value: * Slideshow ID @@ -26,7 +27,8 @@ params [ ["_images", [], [[]] ], ["_names", [], [[]] ], ["_duration", 0, [0]], - ["_setName", localize LSTRING(Interaction), [""]] + ["_setName", localize LSTRING(Interaction), [""]], + ["_selection", 0, [0]] ]; // Verify data @@ -47,7 +49,7 @@ TRACE_5("Information",_objects,_controllers,_images,_names,_setName); if (isServer) then { // Default images on whiteboards (first image) { - _x setObjectTextureGlobal [0, _images select 0]; + _x setObjectTextureGlobal [_selection, _images select 0]; } count _objects; }; @@ -82,7 +84,7 @@ if (_duration == 0) then { {}, {true}, {(_this select 2) call FUNC(addSlideActions)}, - [_objects, _images, _names, _x, _currentSlideshow], + [_objects, _images, _names, _x, _currentSlideshow, _selection], [0, 0, 0], 2 ] call EFUNC(interact_menu,createAction); @@ -100,7 +102,7 @@ if (_duration == 0) then { missionNamespace setVariable [_varString, 0]; // Automatic transitions handler - [FUNC(autoTransition), [_objects, _images, _varString, _currentSlideshow, _duration], _duration] call CBA_fnc_waitAndExecute; + [FUNC(autoTransition), [_objects, _images, _varString, _currentSlideshow, _duration, _selection], _duration] call CBA_fnc_waitAndExecute; }; _currentSlideshow diff --git a/addons/slideshow/functions/fnc_moduleInit.sqf b/addons/slideshow/functions/fnc_moduleInit.sqf index a8cf27ceec..783f1de720 100644 --- a/addons/slideshow/functions/fnc_moduleInit.sqf +++ b/addons/slideshow/functions/fnc_moduleInit.sqf @@ -32,6 +32,7 @@ private _images = [_logic getVariable ["Images", ""], false, false] call EFUNC(c private _names = [_logic getVariable ["Names", ""], false, false] call EFUNC(common,parseList); private _setName = _logic getVariable ["SetName", ""]; private _duration = _logic getVariable ["Duration", 0]; +private _selection = _logic getVariable ["Selection", 0]; // Objects synced to the module { @@ -40,6 +41,6 @@ private _duration = _logic getVariable ["Duration", 0]; } count (synchronizedObjects _logic); // Prepare with actions -[_objects, _controllers, _images, _names, _duration, _setName] call FUNC(createSlideshow); +[_objects, _controllers, _images, _names, _duration, _setName, _selection] call FUNC(createSlideshow); INFO_1("Slideshow Module Initialized on %1 Objects",(count _objects)); diff --git a/addons/slideshow/stringtable.xml b/addons/slideshow/stringtable.xml index 10adfc6457..937764d231 100644 --- a/addons/slideshow/stringtable.xml +++ b/addons/slideshow/stringtable.xml @@ -227,6 +227,12 @@ 每張幻燈片顯示的時間。 預設:0 (自動換圖已禁用) 每张幻灯片显示的时间。 预设:0 (自动换图已禁用) + + Texture Selection + + + Object texture selection. Default: 0 + Slides Diapositives diff --git a/docs/wiki/framework/slideshow-framework.md b/docs/wiki/framework/slideshow-framework.md index ef1d7062fd..5d27cbc697 100644 --- a/docs/wiki/framework/slideshow-framework.md +++ b/docs/wiki/framework/slideshow-framework.md @@ -40,13 +40,14 @@ Important notes: 3 | Action Names | Array | Required 4 | Slide Duration | Number | Optional (default: `0`, `0` disables automatic transitions) 5 | Set Name | String | Optional (default: localized `"Slides"`) +6 | Texture Selection | Number | Optional (default: `0`) **R** | None | None | Return value _Note: Set Name argument added in 3.9.1._ #### 2.1.1 Example -`[[object1, object2], [controller1], ["images\image1.paa", "images\image2.paa"], ["Action1", "Action2"], 5, "My Slides"] call ace_slideshow_fnc_createSlideshow;` +`[[object1, object2], [controller1], ["images\image1.paa", "images\image2.paa"], ["Action1", "Action2"], 5, "My Slides", 1] call ace_slideshow_fnc_createSlideshow;` | Arguments | Explanation ---| --------- | ----------- @@ -56,3 +57,4 @@ _Note: Set Name argument added in 3.9.1._ 3 | `["Action1", "Action2"]` | Action names for interaction menu if automatic transitions are not enabled 4 | `5` | 5s slide duration before change to next image 5 | `"My Slides"` | Main interaction point name, for easier distinguishing of multiple slideshow sets +6 | `1` | Uses texture selection 1 for objects with multiple options From 59fe345f60035088bac3ee82a3bdea5a56162f6a Mon Sep 17 00:00:00 2001 From: TyroneMF Date: Thu, 2 Dec 2021 14:40:46 +0000 Subject: [PATCH 16/22] Documentation - Add dependencies page (#8706) Co-authored-by: jonpas --- docs/_includes/dependencies_list.md | 368 +++++++++++++--------- docs/_layouts/wiki.html | 7 + docs/sitemap.xml | 3 +- docs/wiki/development/dependencies.md | 36 +++ docs/wiki/feature/advanced-ballistics.md | 6 +- docs/wiki/feature/advanced-fatigue.md | 7 +- docs/wiki/feature/advanced-throwing.md | 6 +- docs/wiki/feature/ai.md | 5 +- docs/wiki/feature/aircraft.md | 5 +- docs/wiki/feature/apl.md | 5 +- docs/wiki/feature/arsenal.md | 4 +- docs/wiki/feature/atragmx.md | 6 +- docs/wiki/feature/attach.md | 5 +- docs/wiki/feature/backpacks.md | 5 +- docs/wiki/feature/ballistics.md | 5 +- docs/wiki/feature/captives.md | 5 +- docs/wiki/feature/chemlights.md | 5 +- docs/wiki/feature/common.md | 8 +- docs/wiki/feature/concertina-wire.md | 5 +- docs/wiki/feature/crew-served-weapons.md | 5 +- docs/wiki/feature/dagr.md | 5 +- docs/wiki/feature/disarming.md | 5 +- docs/wiki/feature/disposable.md | 5 +- docs/wiki/feature/dragging.md | 5 +- docs/wiki/feature/dragon.md | 5 +- docs/wiki/feature/explosives.md | 5 +- docs/wiki/feature/fastroping.md | 5 +- docs/wiki/feature/fcs.md | 5 +- docs/wiki/feature/finger.md | 5 +- docs/wiki/feature/fire.md | 5 +- docs/wiki/feature/flashlights.md | 5 +- docs/wiki/feature/flashsuppressors.md | 5 +- docs/wiki/feature/fonts.md | 6 +- docs/wiki/feature/fortify.md | 5 +- docs/wiki/feature/frag.md | 5 +- docs/wiki/feature/gforces.md | 5 +- docs/wiki/feature/goggles.md | 5 +- docs/wiki/feature/grenades.md | 5 +- docs/wiki/feature/headless.md | 5 +- docs/wiki/feature/hearing.md | 5 +- docs/wiki/feature/hellfire.md | 5 +- docs/wiki/feature/hitreactions.md | 5 +- docs/wiki/feature/hot.md | 5 +- docs/wiki/feature/huntIR.md | 5 +- docs/wiki/feature/interact-menu.md | 8 +- docs/wiki/feature/interaction.md | 8 +- docs/wiki/feature/inventory.md | 5 +- docs/wiki/feature/javelin.md | 5 +- docs/wiki/feature/kestrel4500.md | 6 +- docs/wiki/feature/laser.md | 5 +- docs/wiki/feature/laserpointer.md | 5 +- docs/wiki/feature/logistics-uavbattery.md | 5 +- docs/wiki/feature/logistics-wirecutter.md | 5 +- docs/wiki/feature/magazinerepack.md | 5 +- docs/wiki/feature/main.md | 8 +- docs/wiki/feature/map-gestures.md | 5 +- docs/wiki/feature/map.md | 5 +- docs/wiki/feature/maptools.md | 5 +- docs/wiki/feature/markers.md | 5 +- docs/wiki/feature/medical-ai.md | 6 +- docs/wiki/feature/medical-blood.md | 5 +- docs/wiki/feature/medical-system.md | 5 +- docs/wiki/feature/medical_menu.md | 5 +- docs/wiki/feature/microdagr.md | 6 +- docs/wiki/feature/missileguidance.md | 5 +- docs/wiki/feature/missionmodules.md | 5 +- docs/wiki/feature/mk6mortar.md | 5 +- docs/wiki/feature/modules.md | 9 +- docs/wiki/feature/movement.md | 5 +- docs/wiki/feature/mx2a.md | 5 +- docs/wiki/feature/nametags.md | 5 +- docs/wiki/feature/nightvision.md | 5 +- docs/wiki/feature/nlaw.md | 5 +- docs/wiki/feature/noidle.md | 5 +- docs/wiki/feature/noradio.md | 5 +- docs/wiki/feature/norearm.md | 5 +- docs/wiki/feature/optics.md | 5 +- docs/wiki/feature/optionsmenu.md | 7 +- docs/wiki/feature/overheating.md | 5 +- docs/wiki/feature/overpressure.md | 5 +- docs/wiki/feature/parachute.md | 5 +- docs/wiki/feature/pylons.md | 5 +- docs/wiki/feature/rangecard.md | 6 +- docs/wiki/feature/realisticnames.md | 5 +- docs/wiki/feature/rearm.md | 5 +- docs/wiki/feature/recoil.md | 5 +- docs/wiki/feature/refuel.md | 5 +- docs/wiki/feature/reload.md | 5 +- docs/wiki/feature/reloadlaunchers.md | 5 +- docs/wiki/feature/repair.md | 5 +- docs/wiki/feature/respawn.md | 6 +- docs/wiki/feature/safemode.md | 5 +- docs/wiki/feature/sandbags.md | 5 +- docs/wiki/feature/scopes.md | 6 +- docs/wiki/feature/sitting.md | 5 +- docs/wiki/feature/slideshow.md | 5 +- docs/wiki/feature/smallarms.md | 5 +- docs/wiki/feature/spectator.md | 5 +- docs/wiki/feature/spotting-scope.md | 5 +- docs/wiki/feature/switchunits.md | 7 +- docs/wiki/feature/tacticallader.md | 5 +- docs/wiki/feature/tagging.md | 5 +- docs/wiki/feature/testmissions.md | 5 +- docs/wiki/feature/thermals.md | 5 +- docs/wiki/feature/tripod.md | 5 +- docs/wiki/feature/ui.md | 6 +- docs/wiki/feature/vector.md | 5 +- docs/wiki/feature/vehicledamage.md | 5 +- docs/wiki/feature/vehiclelock.md | 5 +- docs/wiki/feature/vehicles.md | 5 +- docs/wiki/feature/viewdistance.md | 5 +- docs/wiki/feature/volume.md | 5 +- docs/wiki/feature/weaponselect.md | 5 +- docs/wiki/feature/weather.md | 5 +- docs/wiki/feature/winddeflection.md | 6 +- docs/wiki/feature/yardage450.md | 5 +- docs/wiki/feature/zeus.md | 5 +- tools/extract_dependencies.py | 2 +- 118 files changed, 378 insertions(+), 636 deletions(-) create mode 100644 docs/wiki/development/dependencies.md diff --git a/docs/_includes/dependencies_list.md b/docs/_includes/dependencies_list.md index e11d875f0f..5e51cd32db 100644 --- a/docs/_includes/dependencies_list.md +++ b/docs/_includes/dependencies_list.md @@ -1,620 +1,678 @@ {% if include.component == "advanced_ballistics" %} -`ace_ballistics`, `ace_weather` +- `ace_ballistics` +- `ace_weather` {% endif %} {% if include.component == "advanced_fatigue" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "advanced_throwing" %} -`ace_common`, `ace_weaponselect` +- `ace_common` +- `ace_weaponselect` {% endif %} {% if include.component == "ai" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "aircraft" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "apl" %} -`ace_main` +- `ace_main` {% endif %} {% if include.component == "arsenal" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "artillerytables" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "atragmx" %} -`ACE_Advanced_Ballistics`, `ACE_common`, `ACE_weather` +- `ACE_Advanced_Ballistics` +- `ACE_common` +- `ACE_weather` {% endif %} {% if include.component == "attach" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "backpacks" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "ballistics" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "captives" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "cargo" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "chemlights" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "common" %} -`ace_main`, `ace_modules` +- `ace_main` +- `ace_modules` {% endif %} {% if include.component == "concertina_wire" %} -`ace_apl`, `ace_interaction` +- `ace_apl` +- `ace_interaction` {% endif %} {% if include.component == "cookoff" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "csw" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "dagr" %} -`ace_weather` +- `ace_weather` {% endif %} {% if include.component == "disarming" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "disposable" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "dogtags" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "dragging" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "dragon" %} -`ace_hot`, `ace_csw` +- `ace_hot` +- `ace_csw` {% endif %} {% if include.component == "explosives" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "fastroping" %} -`ace_interaction`, `ace_logistics_rope` +- `ace_interaction` +- `ace_logistics_rope` {% endif %} {% if include.component == "fcs" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "field_rations" %} -`ace_interact_menu` +- `ace_interact_menu` {% endif %} {% if include.component == "finger" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "fire" %} -`ace_common`, `ace_medical_engine` +- `ace_common` +- `ace_medical_engine` {% endif %} {% if include.component == "flashlights" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "flashsuppressors" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "fonts" %} -`ace_main` +- `ace_main` {% endif %} {% if include.component == "fortify" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "frag" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "gestures" %} -`ace_interact_menu` +- `ace_interact_menu` {% endif %} {% if include.component == "gforces" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "goggles" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "grenades" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "gunbag" %} -`ace_interaction`, `ace_movement` +- `ace_interaction` +- `ace_movement` {% endif %} {% if include.component == "headless" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "hearing" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "hellfire" %} -`ace_interaction`, `ace_missileguidance` +- `ace_interaction` +- `ace_missileguidance` {% endif %} {% if include.component == "hitreactions" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "hot" %} -`ace_common`, `ace_missileguidance` +- `ace_common` +- `ace_missileguidance` {% endif %} {% if include.component == "huntir" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "intelitems" %} -`ace_interact_menu`, `ace_zeus` +- `ace_interact_menu` +- `ace_zeus` {% endif %} {% if include.component == "interact_menu" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "interaction" %} -`ace_interact_menu` +- `ace_interact_menu` {% endif %} {% if include.component == "inventory" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "javelin" %} -`ace_main`, `ace_common`, `ace_missileguidance` +- `ace_main` +- `ace_common` +- `ace_missileguidance` {% endif %} {% if include.component == "kestrel4500" %} -`ACE_common`, `ACE_weather` +- `ACE_common` +- `ACE_weather` {% endif %} {% if include.component == "killtracker" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "laser" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "laserpointer" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "logistics_rope" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "logistics_uavbattery" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "logistics_wirecutter" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "magazinerepack" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "map" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "map_gestures" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "maptools" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "markers" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "maverick" %} -`ace_missileguidance` +- `ace_missileguidance` {% endif %} {% if include.component == "medical" %} -`ace_medical_engine` +- `ace_medical_engine` {% endif %} {% if include.component == "medical_ai" %} -`ace_medical_treatment` +- `ace_medical_treatment` {% endif %} {% if include.component == "medical_blood" %} -`ace_medical_status` +- `ace_medical_status` {% endif %} {% if include.component == "medical_damage" %} -`ace_medical_engine` +- `ace_medical_engine` {% endif %} {% if include.component == "medical_engine" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "medical_feedback" %} -`ace_medical_status` +- `ace_medical_status` {% endif %} {% if include.component == "medical_gui" %} -`ace_medical_treatment`, `ace_interaction` +- `ace_medical_treatment` +- `ace_interaction` {% endif %} {% if include.component == "medical_statemachine" %} -`ace_medical_vitals` +- `ace_medical_vitals` {% endif %} {% if include.component == "medical_status" %} -`ace_medical_engine` +- `ace_medical_engine` {% endif %} {% if include.component == "medical_treatment" %} -`ace_medical_status`, `ace_medical_damage`, `ace_apl` +- `ace_medical_status` +- `ace_medical_damage` +- `ace_apl` {% endif %} {% if include.component == "medical_vitals" %} -`ace_medical_status` +- `ace_medical_status` {% endif %} {% if include.component == "metis" %} -`ace_missileguidance` +- `ace_missileguidance` {% endif %} {% if include.component == "microdagr" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "minedetector" %} -`ace_explosives` +- `ace_explosives` {% endif %} {% if include.component == "missileguidance" %} -`ace_laser` +- `ace_laser` {% endif %} {% if include.component == "missionmodules" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "mk6mortar" %} -`ace_csw`, `ace_artillerytables` +- `ace_csw` +- `ace_artillerytables` {% endif %} {% if include.component == "modules" %} -`ace_main` +- `ace_main` {% endif %} {% if include.component == "movement" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "mx2a" %} -`ace_apl` +- `ace_apl` {% endif %} {% if include.component == "nametags" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "nightvision" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "nlaw" %} -`ace_missileguidance` +- `ace_missileguidance` {% endif %} {% if include.component == "noidle" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "noradio" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "norearm" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "optics" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "optionsmenu" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "overheating" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "overpressure" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "parachute" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "pylons" %} -`ace_interact_menu` +- `ace_interact_menu` {% endif %} {% if include.component == "quickmount" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "rangecard" %} -`ACE_Advanced_Ballistics`, `ace_scopes` +- `ACE_Advanced_Ballistics` +- `ace_scopes` {% endif %} {% if include.component == "realisticnames" %} -`ace_common`, `ace_optics` +- `ace_common` +- `ace_optics` {% endif %} {% if include.component == "realisticweights" %} -`ace_common`, `ace_disposable` +- `ace_common` +- `ace_disposable` {% endif %} {% if include.component == "rearm" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "recoil" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "refuel" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "reload" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "reloadlaunchers" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "repair" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "respawn" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "safemode" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "sandbag" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "scopes" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "sitting" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "slideshow" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "smallarms" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "spectator" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "spottingscope" %} -`ace_apl`, `ace_interaction` +- `ace_apl` +- `ace_interaction` {% endif %} {% if include.component == "switchunits" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "tacticalladder" %} -`ace_apl`, `ace_interaction` +- `ace_apl` +- `ace_interaction` {% endif %} {% if include.component == "tagging" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "thermals" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "towing" %} -`ace_common`, `ace_logistics_rope` +- `ace_common` +- `ace_logistics_rope` {% endif %} {% if include.component == "trenches" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "tripod" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "ui" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "vector" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "vehicle_damage" %} -`ace_common`, `ace_cookoff` +- `ace_common` +- `ace_cookoff` {% endif %} {% if include.component == "vehiclelock" %} -`ace_interaction` +- `ace_interaction` {% endif %} {% if include.component == "vehicles" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "viewdistance" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "viewrestriction" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "volume" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "weaponselect" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "weather" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "winddeflection" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "yardage450" %} -`ace_apl`, `ace_laser` +- `ace_apl` +- `ace_laser` {% endif %} {% if include.component == "zeus" %} -`ace_common`, `ace_ai` +- `ace_common` +- `ace_ai` {% endif %} {% if include.component == "compat_gm" %} -`ace_csw`, `ace_explosives`, `ace_rearm`, `ace_refuel`, `ace_repair`, `gm_core` +- `ace_csw` +- `ace_explosives` +- `ace_rearm` +- `ace_refuel` +- `ace_repair` +- `gm_core` {% endif %} {% if include.component == "compat_r3f" %} -`r3f_armes_c`, `r3f_acc`, `R3F_G17_addons`, `R3F_G_SCAR`, `R3F_SCAR_H`, `R3F_SCAR_L`, `R3F_FN_MAG` +- `r3f_armes_c` +- `r3f_acc` +- `R3F_G17_addons` +- `R3F_G_SCAR` +- `R3F_SCAR_H` +- `R3F_SCAR_L` +- `R3F_FN_MAG` {% endif %} {% if include.component == "compat_rh_acc" %} -`RH_acc` +- `RH_acc` {% endif %} {% if include.component == "compat_rh_de" %} -`RH_de_cfg` +- `RH_de_cfg` {% endif %} {% if include.component == "compat_rh_m4" %} -`RH_m4_cfg` +- `RH_m4_cfg` {% endif %} {% if include.component == "compat_rh_pdw" %} -`RH_PDW` +- `RH_PDW` {% endif %} {% if include.component == "compat_rhs_afrf3" %} -`ace_explosives`, `ace_csw`, `ace_rearm`, `ace_refuel`, `ace_repair`, `rhs_main_loadorder` +- `ace_explosives` +- `ace_csw` +- `ace_rearm` +- `ace_refuel` +- `ace_repair` +- `rhs_main_loadorder` {% endif %} {% if include.component == "compat_rhs_gref3" %} -`ace_explosives`, `ace_csw`, `rhsgref_main_loadorder` +- `ace_explosives` +- `ace_csw` +- `rhsgref_main_loadorder` {% endif %} {% if include.component == "compat_rhs_saf3" %} -`ace_explosives`, `rhssaf_main_loadorder` +- `ace_explosives` +- `rhssaf_main_loadorder` {% endif %} {% if include.component == "compat_rhs_usf3" %} -`ace_explosives`, `ace_javelin`, `ace_rearm`, `ace_refuel`, `ace_repair`, `ace_csw`, `rhsusf_main_loadorder` +- `ace_explosives` +- `ace_javelin` +- `ace_rearm` +- `ace_refuel` +- `ace_repair` +- `ace_csw` +- `rhsusf_main_loadorder` {% endif %} {% if include.component == "compat_rksl_pm_ii" %} -`RKSL_PMII`, `RKSL_PMII_525` +- `RKSL_PMII` +- `RKSL_PMII_525` {% endif %} {% if include.component == "compat_sma3_iansky" %} -`iansky_opt` +- `iansky_opt` {% endif %} {% if include.component == "compat_sog" %} -`vn_weapons`, `vn_emm_main_menu`, `weapons_f_vietnam_c`, `ace_trenches` +- `vn_weapons` +- `vn_emm_main_menu` +- `weapons_f_vietnam_c` +- `ace_trenches` {% endif %} {% if include.component == "noactionmenu" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "nocrosshair" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "nouniformrestrictions" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "particles" %} -`ace_common` +- `ace_common` {% endif %} {% if include.component == "realisticdispersion" %} -`ace_ballistics` +- `ace_ballistics` {% endif %} {% if include.component == "tracers" %} -`ace_ballistics` +- `ace_ballistics` {% endif %} diff --git a/docs/_layouts/wiki.html b/docs/_layouts/wiki.html index 3bb53c4b6a..091d9c4079 100644 --- a/docs/_layouts/wiki.html +++ b/docs/_layouts/wiki.html @@ -55,6 +55,13 @@ layout: compress
+ {% if page.component %} +
+
+

  See dependencies

+
+
+ {% endif %}

{{page.title}}

diff --git a/docs/sitemap.xml b/docs/sitemap.xml index 45a192100f..0002ad3c3b 100644 --- a/docs/sitemap.xml +++ b/docs/sitemap.xml @@ -12,7 +12,8 @@ sitemap: weekly 0.5 - {% for curPage in site.pages | sort: "group" %} + {% assign pages_by_group = site.pages | sort: "group" %} + {% for curPage in pages_by_group %} {% unless curPage.sitemap.exclude == "yes" %} {{ site.productionUrl}}{{ curPage.url }} diff --git a/docs/wiki/development/dependencies.md b/docs/wiki/development/dependencies.md new file mode 100644 index 0000000000..b43371034c --- /dev/null +++ b/docs/wiki/development/dependencies.md @@ -0,0 +1,36 @@ +--- +layout: wiki +title: Dependencies +description: This page details each component and its dependencies. +group: development +parent: wiki +order: 0 +--- + +This page details each component and the addons it requires. + +## 1. Removing a component + +Any component you wish to remove must also remove any component which depends on it. + +**Example:** + +To remove `ace_ai` you must also remove `ace_zeus`. + +Because `ace_zeus` is being removed you must also remove any components that require `ace_zeus` which in this case would be `ace_intelitems`. + +## 2. Dependencies + +{% assign pages_by_title = site.pages | sort: "title" %} +{% for page in pages_by_title %} + {%- if page.group == 'feature' and page.component -%} + ### {{ page.title }} + + {% capture component %}{{ page.component }}{% endcapture %} + {% include dependencies_list.md component=component %} + + {%- if page.core_component -%} + _Note: This module is required by nearly all other modules. Do NOT remove it!_ + {% endif %} + {% endif %} +{% endfor %} diff --git a/docs/wiki/feature/advanced-ballistics.md b/docs/wiki/feature/advanced-ballistics.md index f6913fde11..4ebb764a13 100644 --- a/docs/wiki/feature/advanced-ballistics.md +++ b/docs/wiki/feature/advanced-ballistics.md @@ -1,6 +1,7 @@ --- layout: wiki title: Advanced Ballistics +component: advanced_ballistics description: The advanced ballistics module improves internal and external ballistics. group: feature category: realism @@ -50,8 +51,3 @@ The Advanced Ballistics module improves internal and external ballistics. - Press Ctrl+⇧ Shift+K. - Red line indicates the current inclination angle in degrees. - Protractor will disappear if you lower or holster your weapon. - - -## 3. Dependencies - -{% include dependencies_list.md component="advanced_ballistics" %} diff --git a/docs/wiki/feature/advanced-fatigue.md b/docs/wiki/feature/advanced-fatigue.md index 77c38d361b..e92bab3882 100644 --- a/docs/wiki/feature/advanced-fatigue.md +++ b/docs/wiki/feature/advanced-fatigue.md @@ -1,6 +1,7 @@ --- layout: wiki title: Advanced Fatigue +component: advanced_fatigue description: Human fatigue simulation based on scientific formulas. group: feature category: realism @@ -91,9 +92,3 @@ At any time the body consumes a certain amount of ATP - even when not moving. Si ### 2.4 ATP Pathway Fatigue Another factor that comes into play here is pathway fatigue - the pathways themselves can fatigue too! That means, the more ATP the pathways have to provide, the slower they will will be able to, limiting how much ATP can overall be provided by each pathway. If we take into account that the aerobic pathways have provide their ATP first for any consumption, that means that the anaerobic pathway will have to provide more ATP if the aerobic ones are fatigued. This is how the long term fatigue effect is created. - - - -## 3. Dependencies - -{% include dependencies_list.md component="advanced_fatigue" %} diff --git a/docs/wiki/feature/advanced-throwing.md b/docs/wiki/feature/advanced-throwing.md index e440ab9641..1d9af7bf39 100644 --- a/docs/wiki/feature/advanced-throwing.md +++ b/docs/wiki/feature/advanced-throwing.md @@ -1,6 +1,7 @@ --- layout: wiki title: Advanced Throwing +component: advanced_throwing description: Precise system for throwing grenades and other throwable items. group: feature category: interaction @@ -72,8 +73,3 @@ Make sure to use different keybinds for Advanced Throwing or unbind vanilla thro - Interact with the item ⊞ Win (ACE3 default). - Select `Pick Up`. - Item will be placed in your hands, but you may not cancel the throw. - - -## 3. Dependencies - -{% include dependencies_list.md component="advanced_throwing" %} diff --git a/docs/wiki/feature/ai.md b/docs/wiki/feature/ai.md index 49727b70f9..5552068501 100644 --- a/docs/wiki/feature/ai.md +++ b/docs/wiki/feature/ai.md @@ -1,6 +1,7 @@ --- layout: wiki title: AI (Artificial Intelligence) +component: ai description: Config based changes to AI to ensure compatibility with advanced AI modifications. group: feature category: realism @@ -29,7 +30,3 @@ Some weapons had minimum engagement ranges. If you were as close as 2 meters to ### 1.4 No scripting All changes of ACE3 AI are config based to ensure full compatibility with advanced AI modifications like e.g. "ASR AI 3". - -## 2. Dependencies - -{% include dependencies_list.md component="ai" %} diff --git a/docs/wiki/feature/aircraft.md b/docs/wiki/feature/aircraft.md index 80d2c658a9..3ddce712d9 100644 --- a/docs/wiki/feature/aircraft.md +++ b/docs/wiki/feature/aircraft.md @@ -1,6 +1,7 @@ --- layout: wiki title: Aircraft +component: aircraft description: Aircraft overhaul. group: feature category: realism @@ -38,7 +39,3 @@ Adds a laser marker to the copilot seat of the Wildcat. ### 2.1 Switching flare modes Press Ctrl+C to switch between flare firing modes (Arma 3 default key bind `countermeasure mode`) - -## 3. Dependencies - -{% include dependencies_list.md component="aircraft" %} diff --git a/docs/wiki/feature/apl.md b/docs/wiki/feature/apl.md index 4a533d4a66..c43b2d68c7 100644 --- a/docs/wiki/feature/apl.md +++ b/docs/wiki/feature/apl.md @@ -1,6 +1,7 @@ --- layout: wiki title: APL +component: apl description: Assets under APL license. group: feature category: equipment @@ -15,7 +16,3 @@ version: ## 1. Overview This folder regroups all assets released under the APL license. - -## 2. Dependencies - -{% include dependencies_list.md component="apl" %} diff --git a/docs/wiki/feature/arsenal.md b/docs/wiki/feature/arsenal.md index 2d0c483b2e..5b1d8ee4d8 100644 --- a/docs/wiki/feature/arsenal.md +++ b/docs/wiki/feature/arsenal.md @@ -1,6 +1,7 @@ --- layout: wiki title: ACE Arsenal +component: arsenal description: Adds an interface that allow player to edit their loadouts. group: feature category: general @@ -94,6 +95,3 @@ You can import loadouts from Virtual Arsenal into ACE Arsenal, face, voice, insi - RMB clears the text field. - Arrow keys can be used to move the caret. - Ctrl + F switches which search bar is selected. - - -{% include dependencies_list.md component="arsenal" %} diff --git a/docs/wiki/feature/atragmx.md b/docs/wiki/feature/atragmx.md index ad368ffbd7..2f778f222a 100644 --- a/docs/wiki/feature/atragmx.md +++ b/docs/wiki/feature/atragmx.md @@ -1,6 +1,7 @@ --- layout: wiki title: ATragMX +component: atragmx description: Handheld ballistics calculator. group: feature category: equipment @@ -134,8 +135,3 @@ Horus ATragMX software considers atmospheric conditions, gun data, ammunition, r ## 4. Official References - [Official Manual]({{ site.ace.githubUrl }}/blob/master/extras/manual_Horus_ATrag-v385.pdf) - - -## 5. Dependencies - -{% include dependencies_list.md component="atragmx" %} diff --git a/docs/wiki/feature/attach.md b/docs/wiki/feature/attach.md index 2fe2236daf..39525ae61e 100644 --- a/docs/wiki/feature/attach.md +++ b/docs/wiki/feature/attach.md @@ -1,6 +1,7 @@ --- layout: wiki title: Attach +component: attach description: Allow players to attach items to vehicles or themselves. group: feature category: interaction @@ -34,7 +35,3 @@ Adds an attachable IR strobe, which is only visible using night vision devices a - Select `Attach item`. - Select your item and follow the instructions on the screen. - Repeat the process to detach. - -## 3. Dependencies - -{% include dependencies_list.md component="attach" %} diff --git a/docs/wiki/feature/backpacks.md b/docs/wiki/feature/backpacks.md index 9e7db5a086..35cbf43810 100644 --- a/docs/wiki/feature/backpacks.md +++ b/docs/wiki/feature/backpacks.md @@ -1,6 +1,7 @@ --- layout: wiki title: Backpacks +component: backpacks description: Notifies a player when his backpack is opened. group: feature category: equipment @@ -16,7 +17,3 @@ version: ### 1.1 Zipping sounds A zipper sound is played when someone opens your backpack. - -## 2. Dependencies - -{% include dependencies_list.md component="backpacks" %} diff --git a/docs/wiki/feature/ballistics.md b/docs/wiki/feature/ballistics.md index 35feda9d34..bf80a52eeb 100644 --- a/docs/wiki/feature/ballistics.md +++ b/docs/wiki/feature/ballistics.md @@ -1,6 +1,7 @@ --- layout: wiki title: Ballistics +component: ballistics description: Realistic ballistic improvements. group: feature category: realism @@ -31,7 +32,3 @@ The M14 EBR now uses ammunition with decreased muzzle velocity and air friction ### 1.6 Fully config-based This module applies configuration changes only and does not decrease game performance. - -## 2. Dependencies - -{% include dependencies_list.md component="ballistics" %} diff --git a/docs/wiki/feature/captives.md b/docs/wiki/feature/captives.md index 6c4780c28f..42be837e40 100644 --- a/docs/wiki/feature/captives.md +++ b/docs/wiki/feature/captives.md @@ -1,6 +1,7 @@ --- layout: wiki title: Captives +component: captives description: System for taking and handling captives. group: feature category: interaction @@ -47,7 +48,3 @@ Allows players to surrender. It renders the unit unable to move and with the han - Select `Passengers`. - Select the captive. - Select `Unload captive`. - -## 3. Dependencies - -{% include dependencies_list.md component="captives" %} diff --git a/docs/wiki/feature/chemlights.md b/docs/wiki/feature/chemlights.md index e384dc9e16..c7116293f0 100644 --- a/docs/wiki/feature/chemlights.md +++ b/docs/wiki/feature/chemlights.md @@ -1,6 +1,7 @@ --- layout: wiki title: Chemlights +component: chemlights description: Adds enhanced types of chemlights. group: feature category: equipment @@ -21,7 +22,3 @@ version: ### 1.1 Chemlights Adds throwable chemlights in the colors white, red, green and yellow. Additionally "Hi" chemlights are added that emit a brighter glow. - -## 2. Dependencies - -{% include dependencies_list.md component="chemlights" %} diff --git a/docs/wiki/feature/common.md b/docs/wiki/feature/common.md index be454568ac..71651cbcd8 100644 --- a/docs/wiki/feature/common.md +++ b/docs/wiki/feature/common.md @@ -1,6 +1,8 @@ --- layout: wiki title: Common +component: common +core_component: true description: Common functions and systems used by most other components. group: feature category: general @@ -15,9 +17,3 @@ version: ## 1. Overview Common functions and systems used by most other components. - -## 2. Dependencies - -{% include dependencies_list.md component="common" %} - -*Note: The Common module is required by nearly all other modules. Do NOT remove it!* diff --git a/docs/wiki/feature/concertina-wire.md b/docs/wiki/feature/concertina-wire.md index 07eb07bf34..4d1557917a 100644 --- a/docs/wiki/feature/concertina-wire.md +++ b/docs/wiki/feature/concertina-wire.md @@ -1,6 +1,7 @@ --- layout: wiki title: Concertina Wire +component: concertina_wire description: Deployable concertina wire. group: feature category: equipment @@ -22,7 +23,3 @@ A concertina wire is a type of barbed wire formed in large coils that can be exp - Approach the concertina coil and select ⊞ Win (ACE3 default) - Select `Deploy concertina wire`. - Follow the instructions on screen. - -## 3. Dependencies - -{% include dependencies_list.md component="concertina_wire" %} diff --git a/docs/wiki/feature/crew-served-weapons.md b/docs/wiki/feature/crew-served-weapons.md index 33a01bb460..b7e9fb4ea0 100644 --- a/docs/wiki/feature/crew-served-weapons.md +++ b/docs/wiki/feature/crew-served-weapons.md @@ -1,6 +1,7 @@ --- layout: wiki title: Crew Served Weapons +component: csw description: Static weapons that require multiple people to crew group: feature category: equipment @@ -72,7 +73,3 @@ Static weapons are assembled when a tripod is placed down, and the weapon mounte - Whether or not you want to handle ammo using the CSW way. Does nothing if using defaultAssemblyMode - Default: On - -## 4. Dependencies - -{% include dependencies_list.md component="csw" %} diff --git a/docs/wiki/feature/dagr.md b/docs/wiki/feature/dagr.md index f69793f1f9..3732f1b604 100644 --- a/docs/wiki/feature/dagr.md +++ b/docs/wiki/feature/dagr.md @@ -1,6 +1,7 @@ --- layout: wiki title: DAGR +component: dagr description: Defense Advanced GPS Receiver. group: feature category: equipment @@ -15,7 +16,3 @@ version: ## 1. Overview Adds the Defense Advanced GPS Receiver. - -## 3. Dependencies - -{% include dependencies_list.md component="dagr" %} diff --git a/docs/wiki/feature/disarming.md b/docs/wiki/feature/disarming.md index 0d45bfee40..7ef31e4820 100644 --- a/docs/wiki/feature/disarming.md +++ b/docs/wiki/feature/disarming.md @@ -1,6 +1,7 @@ --- layout: wiki title: Disarming +component: disarming description: Ability to make units drop items/weapons/magazines. group: feature category: interaction @@ -23,7 +24,3 @@ You can search the inventory and disarm captured or unconscious units. - Interact with the captured or unconscious unit ⊞ Win (ACE3 default key bind `Interaction Key`). - Select `Open inventory`. - Drag & Drop the items you wish to remove from the unit. - -## 3. Dependencies - -{% include dependencies_list.md component="disarming" %} diff --git a/docs/wiki/feature/disposable.md b/docs/wiki/feature/disposable.md index a6da6e3775..e0f60a0ce6 100644 --- a/docs/wiki/feature/disposable.md +++ b/docs/wiki/feature/disposable.md @@ -1,6 +1,7 @@ --- layout: wiki title: Disposable +component: disposable description: Makes NLAW disposable. group: feature category: equipment @@ -15,7 +16,3 @@ version: ## 1. Overview The NLAW is shoulder fired and disposable, firing just once before being needed to be disposed of. This feature makes the NLAW disposable. - -## 2. Dependencies - -{% include dependencies_list.md component="disposable" %} diff --git a/docs/wiki/feature/dragging.md b/docs/wiki/feature/dragging.md index f9ec21ebb2..0d42240a23 100644 --- a/docs/wiki/feature/dragging.md +++ b/docs/wiki/feature/dragging.md @@ -1,6 +1,7 @@ --- layout: wiki title: Dragging +component: dragging description: Adds the option to drag and carry units and objects. group: feature category: interaction @@ -23,7 +24,3 @@ This adds the option to drag or carry units or objects. - Interact with the unit or object ⊞ Win (ACE3 default key bind `Interact Key`). - Select `Drag` or `Carry`. - To release, use the mouse wheel and select `Release` or use Self Interaction Ctrl+⊞ Win and select `Release`. - -## 3. Dependencies - -{% include dependencies_list.md component="dragging" %} diff --git a/docs/wiki/feature/dragon.md b/docs/wiki/feature/dragon.md index 47ceddc66e..8e36d9262f 100644 --- a/docs/wiki/feature/dragon.md +++ b/docs/wiki/feature/dragon.md @@ -1,6 +1,7 @@ --- layout: wiki title: M47 Dragon Missile +component: dragon description: M47 Dragon group: feature category: equipment @@ -75,7 +76,3 @@ Adjust the sight picture by moving the launcher to align the vertical cross hair **Figure 4. Range determination for frontal or rear target.** Frontal, Oblique, and Flank targets - -## 4. Dependencies - -{% include dependencies_list.md component="dragon" %} diff --git a/docs/wiki/feature/explosives.md b/docs/wiki/feature/explosives.md index d44d088251..ec20c0f62f 100644 --- a/docs/wiki/feature/explosives.md +++ b/docs/wiki/feature/explosives.md @@ -1,6 +1,7 @@ --- layout: wiki title: Explosives +component: explosives description: Adds numerous improvements to using and handling explosives. group: feature category: interaction @@ -42,7 +43,3 @@ Enables attaching explosives to vehicles. - You are safe to pick it up after the action has completed. **Tip:** To increase the success rate when defusing, make sure you crawl up to the IED. - -## 3. Dependencies - -{% include dependencies_list.md component="explosives" %} diff --git a/docs/wiki/feature/fastroping.md b/docs/wiki/feature/fastroping.md index 09b599c816..7178bca3fa 100644 --- a/docs/wiki/feature/fastroping.md +++ b/docs/wiki/feature/fastroping.md @@ -1,6 +1,7 @@ --- layout: wiki title: Fast-Roping +component: fastroping description: System for adding fast roping capabilities to helicopters. group: feature category: realism @@ -24,7 +25,3 @@ If you are sitting in the back of a helicopter that has fast roping capabilities You can safely prepare the FRIES in base or during flight to speed up the insertion. Not all helicopters are equipped with a FRIES by default and need to be synchronized with the "Equip FRIES" module in the editor. If the helicopter cannot carry a FRIES, an error message will appear. - -## 4. Dependencies - -{% include dependencies_list.md component="fastroping" %} diff --git a/docs/wiki/feature/fcs.md b/docs/wiki/feature/fcs.md index 937daf44d4..a5fb157a95 100644 --- a/docs/wiki/feature/fcs.md +++ b/docs/wiki/feature/fcs.md @@ -1,6 +1,7 @@ --- layout: wiki title: FCS (Fire Control System) +component: fcs description: Fire control system for armoured vehicles and helicopters. category: equipment group: feature @@ -36,7 +37,3 @@ Anti air cannons can now use airburst ammunition. It will explode on the FCS' ze - Place the crosshair on the object to range. - Tap Tab ↹ - The optic is now adjusted. - -## 3. Dependencies - -{% include dependencies_list.md component="fcs" %} diff --git a/docs/wiki/feature/finger.md b/docs/wiki/feature/finger.md index 0957c6e435..a31e2cf210 100644 --- a/docs/wiki/feature/finger.md +++ b/docs/wiki/feature/finger.md @@ -1,6 +1,7 @@ --- layout: wiki title: Finger +component: finger description: Finger pointing. group: feature category: realism @@ -20,7 +21,3 @@ Allows players to point in a direction with their fingers, when they do so peopl ### 2.1 How to point things - Press ⇧ Shift+` (QWERTY and AZERTY layouts) - -## 3. Dependencies - -{% include dependencies_list.md component="finger" %} diff --git a/docs/wiki/feature/fire.md b/docs/wiki/feature/fire.md index 567a32b357..1589a945fa 100644 --- a/docs/wiki/feature/fire.md +++ b/docs/wiki/feature/fire.md @@ -1,6 +1,7 @@ --- layout: wiki title: Fire +component: fire description: Ignite things and people. group: feature category: realism @@ -29,7 +30,3 @@ Fire will burn you and cause intense pain. If on fire, you can stop, drop, and r - Enables/Disables whether or not to spawn a flare-light on the person on fire. Can be a bit gaudy at night - Default: Off - -## 4. Dependencies - -{% include dependencies_list.md component="vehicle_damage" %} diff --git a/docs/wiki/feature/flashlights.md b/docs/wiki/feature/flashlights.md index 3fb6b16695..082d20b7fb 100644 --- a/docs/wiki/feature/flashlights.md +++ b/docs/wiki/feature/flashlights.md @@ -1,6 +1,7 @@ --- layout: wiki title: Flashlights +component: flashlights description: Adds handheld flashlights. group: feature category: equipment @@ -32,7 +33,3 @@ When using those flashlights you will have a slight glow around you making this
Note:

The flashlights states are persistent you don't need to turn the flashlight On everytime you open the map, it will stay turned on / off.

- -## 3. Dependencies - -{% include dependencies_list.md component="flashlights" %} diff --git a/docs/wiki/feature/flashsuppressors.md b/docs/wiki/feature/flashsuppressors.md index b8c498982a..4b7f455428 100644 --- a/docs/wiki/feature/flashsuppressors.md +++ b/docs/wiki/feature/flashsuppressors.md @@ -1,6 +1,7 @@ --- layout: wiki title: Flash Suppressors +component: flashsuppressors description: Makes flash suppressors from game files able to be used. group: feature category: equipment @@ -17,7 +18,3 @@ version: This adds the ability to use the flash suppressors that are already in game but not accessible. Flash suppressors are devices that reduce the muzzle flash while firing by cooling or dispersing the burning gases that exit the muzzle. Its intent is to reduce the chances that the shooter will be blinded in low-light shooting conditions as well as reducing the intensity of the flash visible to the enemy. - -## 2. Dependencies - -{% include dependencies_list.md component="flashsuppressors" %} diff --git a/docs/wiki/feature/fonts.md b/docs/wiki/feature/fonts.md index 629c6a6c6e..13afed1f09 100644 --- a/docs/wiki/feature/fonts.md +++ b/docs/wiki/feature/fonts.md @@ -1,6 +1,7 @@ --- layout: wiki title: Fonts +component: fonts description: Custom fonts including fixed-width font. group: feature category: general @@ -15,8 +16,3 @@ version: ## 1. Overview This module adds a font that will be used in the future, characters with equal widths to make it easy to structure correctly. This is **NOT** present in 3.1.1 because of a bug even if it's present in the sources. - - -## 3. Dependencies - -{% include dependencies_list.md component="fonts" %} diff --git a/docs/wiki/feature/fortify.md b/docs/wiki/feature/fortify.md index b145e483e0..c9ab46b7ea 100644 --- a/docs/wiki/feature/fortify.md +++ b/docs/wiki/feature/fortify.md @@ -1,6 +1,7 @@ --- layout: wiki title: Fortify +component: fortify description: Enables player to build fortifications. group: feature category: interaction @@ -36,7 +37,3 @@ Please note that to use this function the Fortify module needs to be placed down - Using Alt / Ctrl / Shift + Scroll Wheel you can rotate object on different axis. - You can use planks to get up on rooftops. - Holding Ctrl while placing allows for placing multiple objects of the same type. - -## 4. Dependencies - -{% include dependencies_list.md component="fortify" %} diff --git a/docs/wiki/feature/frag.md b/docs/wiki/feature/frag.md index f079caa4a5..4511057bd9 100644 --- a/docs/wiki/feature/frag.md +++ b/docs/wiki/feature/frag.md @@ -1,6 +1,7 @@ --- layout: wiki title: Frag +component: frag description: Shapnel system for explosives. group: feature category: realism @@ -15,7 +16,3 @@ version: ## 1. Overview Adds a shrapnel system for explosives. - -## 2. Dependencies - -{% include dependencies_list.md component="frag" %} diff --git a/docs/wiki/feature/gforces.md b/docs/wiki/feature/gforces.md index 6679b275a3..2cbfd15f59 100644 --- a/docs/wiki/feature/gforces.md +++ b/docs/wiki/feature/gforces.md @@ -1,6 +1,7 @@ --- layout: wiki title: G-Forces +component: gforces description: G-force induced tunnel vision and unconsciousness. group: feature category: realism @@ -15,7 +16,3 @@ version: ## 1. Overview Adds G-force induced tunnel vision and unconsciousness. - -## 2. Dependencies - -{% include dependencies_list.md component="gforces" %} diff --git a/docs/wiki/feature/goggles.md b/docs/wiki/feature/goggles.md index 3fc5393dd2..f8dcfc7e29 100644 --- a/docs/wiki/feature/goggles.md +++ b/docs/wiki/feature/goggles.md @@ -1,6 +1,7 @@ --- layout: wiki title: Goggles +component: goggles description: Various effects for different goggles and ambient effects like dirt thrown up by explosions. group: feature category: equipment @@ -22,7 +23,3 @@ Adds color tint to sunglasses and other eyewear. Causes raindrops to appear on t ### 2.1 Cleaning your goggles - To clean your goggles press Ctrl+⇧ Shift+T (ACE3 deault key bind `Wipe goggles`) - -## 3. Dependencies - -{% include dependencies_list.md component="goggles" %} diff --git a/docs/wiki/feature/grenades.md b/docs/wiki/feature/grenades.md index 508ff9d246..679b309b1e 100644 --- a/docs/wiki/feature/grenades.md +++ b/docs/wiki/feature/grenades.md @@ -1,6 +1,7 @@ --- layout: wiki title: Grenades +component: grenades description: Different throwing modes for grenades, a flashbang, incendiary grenade and hand flares. group: feature category: equipment @@ -39,7 +40,3 @@ Adds the AN-M14 incendiary grenade. This grenade has a thermate filler and is pr ### 2.2 Switching between grenades - Press 6 (ACE3 default key bind `Select frag`) to switch between `LETHAL` grenades - Press 7 (ACE3 default key bind `Select non-frag`) to switch between `NON LETHAL` grenades - -## 3. Dependencies - -{% include dependencies_list.md component="grenades" %} diff --git a/docs/wiki/feature/headless.md b/docs/wiki/feature/headless.md index 068f773f6b..1b66336c95 100644 --- a/docs/wiki/feature/headless.md +++ b/docs/wiki/feature/headless.md @@ -1,6 +1,7 @@ --- layout: wiki title: Headless +component: headless description: Automatic passing of AI groups to Headless Clients. group: feature category: general @@ -16,7 +17,3 @@ redirect_from: "/wiki/featurex/headless.html" ## 1. Overview Enables automatic passing of AI groups to (up to 3) Headless Clients using round-robin system, with automatic Headless Client recognition. Due to the fully event-based transferring (on unit spawn and on Headless Client connect and disconnect) the performance impact is minimal. It also transfers *groups* of units instead of each unit separately. - -## 2. Dependencies - -{% include dependencies_list.md component="headless" %} diff --git a/docs/wiki/feature/hearing.md b/docs/wiki/feature/hearing.md index e939e5dc2a..56861bb98a 100644 --- a/docs/wiki/feature/hearing.md +++ b/docs/wiki/feature/hearing.md @@ -1,6 +1,7 @@ --- layout: wiki title: Hearing +component: hearing description: Combat deafness and ringing. group: feature category: realism @@ -33,7 +34,3 @@ Some types of helmets can mitigate hearing damage also (ie. crewman helmet, pilo - Select `Earplugs in`. - Same method to remove them but the option is `Earplugs out`. - Note: you're able to re-use earplugs. - -## 3. Dependencies - -{% include dependencies_list.md component="hearing" %} diff --git a/docs/wiki/feature/hellfire.md b/docs/wiki/feature/hellfire.md index 7db6a6c47e..02f6395fd7 100644 --- a/docs/wiki/feature/hellfire.md +++ b/docs/wiki/feature/hellfire.md @@ -1,6 +1,7 @@ --- layout: wiki title: Hellfire +component: hellfire description: AGM-114K Hellfire Missiles group: feature category: equipment @@ -70,7 +71,3 @@ class myChopper: HeliBase { ace_hellfire_addLaserDesignator = 1; }; ``` - -## 5. Dependencies - -{% include dependencies_list.md component="hellfire" %} diff --git a/docs/wiki/feature/hitreactions.md b/docs/wiki/feature/hitreactions.md index 01f81bd495..7d12c1cb12 100644 --- a/docs/wiki/feature/hitreactions.md +++ b/docs/wiki/feature/hitreactions.md @@ -1,6 +1,7 @@ --- layout: wiki title: Hit Reactions +component: hitreactions description: Reactions when getting shot. group: feature category: realism @@ -17,7 +18,3 @@ version: ### 1.1 Falling under fire If a unit is shot while running it falls to the ground in a prone position, the area where the shot lands does not matters. Note that the shot needs to inflict a certain amount of damage to make the unit fall, a small cut won't make the unit stumble. - -## 2. Dependencies - -{% include dependencies_list.md component="hitreactions" %} diff --git a/docs/wiki/feature/hot.md b/docs/wiki/feature/hot.md index 19ff6f978d..787f94aa43 100644 --- a/docs/wiki/feature/hot.md +++ b/docs/wiki/feature/hot.md @@ -1,6 +1,7 @@ --- layout: wiki title: HOT +component: hot description: HOT 1/2/3 Missiles group: feature category: equipment @@ -60,7 +61,3 @@ if (local this) then { this addMagazineTurret ["ace_hot_3_6Rnd", [-1]]; }; ``` - -## 4. Dependencies - -{% include dependencies_list.md component="hot" %} diff --git a/docs/wiki/feature/huntIR.md b/docs/wiki/feature/huntIR.md index 01df138809..6f882191fa 100644 --- a/docs/wiki/feature/huntIR.md +++ b/docs/wiki/feature/huntIR.md @@ -1,6 +1,7 @@ --- layout: wiki title: HuntIR +component: huntir description: High-altitude Unit Navigated Tactical Imaging Round group: feature category: equipment @@ -43,7 +44,3 @@ Shortcut | Action ↑ | Raise camera ↓ | Lower camera R | Reset camera - -## 3. Dependencies - -{% include dependencies_list.md component="huntir" %} diff --git a/docs/wiki/feature/interact-menu.md b/docs/wiki/feature/interact-menu.md index 01a732cf7a..ed6cbe4434 100644 --- a/docs/wiki/feature/interact-menu.md +++ b/docs/wiki/feature/interact-menu.md @@ -1,6 +1,8 @@ --- layout: wiki title: Interaction Menu +component: interact_menu +core_component: true description: Base framework for interaction menu. group: feature category: interaction @@ -15,9 +17,3 @@ version: ## 1. Overview This handles the interaction layer of ACE3. - -## 2. Dependencies - -{% include dependencies_list.md component="interact_menu" %} - -*Note: The Interact Menu module is required by most of the other modules. Do NOT remove it!* diff --git a/docs/wiki/feature/interaction.md b/docs/wiki/feature/interaction.md index 8747b4f1a7..7e34645687 100644 --- a/docs/wiki/feature/interaction.md +++ b/docs/wiki/feature/interaction.md @@ -1,6 +1,8 @@ --- layout: wiki title: Interaction +component: interaction +core_component: true description: Provides basic interaction options. group: feature category: interaction @@ -43,9 +45,3 @@ Some of the zeus actions are also available (while in zeus) in the interaction m - Open the interaction menu. - Select `Waypoints`. - From here you can modify the speed / formation / behavior of the units / groups that are moving to that waypoint. - -## 3. Dependencies - -{% include dependencies_list.md component="interaction" %} - -*Note: The Interaction module is required by most of the other modules. Do NOT remove it!* diff --git a/docs/wiki/feature/inventory.md b/docs/wiki/feature/inventory.md index 0e25c713b8..3e91d4b217 100644 --- a/docs/wiki/feature/inventory.md +++ b/docs/wiki/feature/inventory.md @@ -1,6 +1,7 @@ --- layout: wiki title: Inventory +component: inventory description: Options to increase size of the inventory dialog. group: feature category: interaction @@ -25,7 +26,3 @@ Makes the inventory dialog bigger and increases the number of items that can be - Click on `Make Inventory Display Bigger`. - Choose the size desired on the right drop down menu. - Press the `Close` button, your changes are automatically saved. - -## 3. Dependencies - -{% include dependencies_list.md component="inventory" %} diff --git a/docs/wiki/feature/javelin.md b/docs/wiki/feature/javelin.md index 82f5981433..cda8293727 100644 --- a/docs/wiki/feature/javelin.md +++ b/docs/wiki/feature/javelin.md @@ -1,6 +1,7 @@ --- layout: wiki title: Javelin +component: javelin description: Javelin AT launcher and locking. group: feature category: equipment @@ -33,7 +34,3 @@ The Titan / Javelin now posses the ability to be used in top down attack or dire - For this feature you need to have a compatible launcher. - When aiming with your launcher press Ctrl + Tab ↹. - On the right side of the screen (for most launchers) you should see that `TOP`is now illumiated in green which means that your missile will be fired in top down mode. - -## 3. Dependencies - -{% include dependencies_list.md component="javelin" %} diff --git a/docs/wiki/feature/kestrel4500.md b/docs/wiki/feature/kestrel4500.md index cf5a3f4ddd..c7ae1e94a0 100644 --- a/docs/wiki/feature/kestrel4500.md +++ b/docs/wiki/feature/kestrel4500.md @@ -1,6 +1,7 @@ --- layout: wiki title: Kestrel 4500 +component: kestrel4500 description: Kestrel 4500 Pocket Weather Tracker. group: feature category: equipment @@ -55,8 +56,3 @@ The Kestrel 4500 Pocket Weather Tracker is Kestrel's environmental meter. This i ## 3. Official Manual - [Official Manual]({{ site.ace.githubUrl }}/blob/master/extras/K4500_Instruction_Manual_English.pdf) - - -## 4. Dependencies - -{% include dependencies_list.md component="kestrel4500" %} diff --git a/docs/wiki/feature/laser.md b/docs/wiki/feature/laser.md index e82a98fe67..d63eeb4999 100644 --- a/docs/wiki/feature/laser.md +++ b/docs/wiki/feature/laser.md @@ -1,6 +1,7 @@ --- layout: wiki title: Laser +component: laser description: Various functions necessary for realistic portrayal of laser mechanics in other components. group: feature category: realism @@ -15,7 +16,3 @@ version: ## 1. Overview Contains various functions necessary for the realistic portrayal of laser mechanics in other components. - -## 2. Dependencies - -{% include dependencies_list.md component="laser" %} diff --git a/docs/wiki/feature/laserpointer.md b/docs/wiki/feature/laserpointer.md index 76404805b7..e6a79e6d13 100644 --- a/docs/wiki/feature/laserpointer.md +++ b/docs/wiki/feature/laserpointer.md @@ -1,6 +1,7 @@ --- layout: wiki title: Laser Pointer +component: laserpointer description: Switching laser modes, daylight lasers. group: feature category: equipment @@ -23,7 +24,3 @@ ACE3 adds a visible laser attachment for weapons. This feature is compatible wit - For this feature you need to have a compatible side attachment. - Press Ctrl + L (ACE3 default key bind `Switch Laser / IR Laser`). - A hint indicating the mode switch will appear in the top right corner. - -## 3. Dependencies - -{% include dependencies_list.md component="laserpointer" %} diff --git a/docs/wiki/feature/logistics-uavbattery.md b/docs/wiki/feature/logistics-uavbattery.md index b1a7cd40b3..1a69bb135b 100644 --- a/docs/wiki/feature/logistics-uavbattery.md +++ b/docs/wiki/feature/logistics-uavbattery.md @@ -1,6 +1,7 @@ --- layout: wiki title: Logistics - UAV Battery +component: logistics_uavbattery description: UAV recharging. group: feature category: equipment @@ -23,7 +24,3 @@ Adds an item `ACE_UAVBattery` that allows refuelling / recharging of the "Darter - For this you need a `UAV battery` and the UAV needs to be a quad-copter. - Interact with the UAV ⊞ Win (ACE3 default key bind `Interact Key`) - Select `Recharge` - -## 3. Dependencies - -{% include dependencies_list.md component="logistics_uavbattery" %} diff --git a/docs/wiki/feature/logistics-wirecutter.md b/docs/wiki/feature/logistics-wirecutter.md index 0a74c8094c..c277d2dedc 100644 --- a/docs/wiki/feature/logistics-wirecutter.md +++ b/docs/wiki/feature/logistics-wirecutter.md @@ -1,6 +1,7 @@ --- layout: wiki title: Logistics - Wirecutter +component: logistics_wirecutter description: Cutting fences, wirecutter. group: feature category: equipment @@ -24,7 +25,3 @@ Adds an item `ACE_wirecutter` that allows cutting of fences in Arma 3 and AllInA - Approach the fence you want to cut. - Press the interaction key ⊞ Win (ACE3 default key bind `Interaction Key`). - Find the interaction point and select `Cut Fence` (the only option). - -## 3. Dependencies - -{% include dependencies_list.md component="logistics_wirecutter" %} diff --git a/docs/wiki/feature/magazinerepack.md b/docs/wiki/feature/magazinerepack.md index 2503dc4323..c9b1b8cf3d 100644 --- a/docs/wiki/feature/magazinerepack.md +++ b/docs/wiki/feature/magazinerepack.md @@ -1,6 +1,7 @@ --- layout: wiki title: Magazine Repack +component: magazinerepack description: Repacking magazines, and maybe your bananas. group: feature category: realism @@ -24,7 +25,3 @@ Adds the ability to repack magazines of the same type. - Press the self interaction button Ctrl + ⊞ Win (ACE3 default key bind `Self Interaction Key`). - Select `Repack magazines`. - Select the type of magazines you want to repack. - -## 3. Dependencies - -{% include dependencies_list.md component="magazinerepack" %} diff --git a/docs/wiki/feature/main.md b/docs/wiki/feature/main.md index 1c3792ccb6..3300a9c5a1 100644 --- a/docs/wiki/feature/main.md +++ b/docs/wiki/feature/main.md @@ -1,6 +1,8 @@ --- layout: wiki title: Main +component: main +core_component: true description: Main module. group: feature category: general @@ -15,9 +17,3 @@ version: ## 1. Overview Main module which acts as the ACE3 core module. - -## 2. Dependencies - -`Arma 3` and `CBA_A3` - -*Note: The Main module is required by all other modules. Do not remove it!* diff --git a/docs/wiki/feature/map-gestures.md b/docs/wiki/feature/map-gestures.md index 8defad4e79..f48c737394 100644 --- a/docs/wiki/feature/map-gestures.md +++ b/docs/wiki/feature/map-gestures.md @@ -1,6 +1,7 @@ --- layout: wiki title: Map Gestures +component: map_gestures description: Allow players to gesture on map. group: feature category: interaction @@ -23,7 +24,3 @@ Allow players to gesture/point on their map. ### 2.1 Gesturing on map - To gesture on map hold Left Mouse Btn. - -## 2. Dependencies - -{% include dependencies_list.md component="map_gestures" %} diff --git a/docs/wiki/feature/map.md b/docs/wiki/feature/map.md index 619b6849b6..3c8c868b30 100644 --- a/docs/wiki/feature/map.md +++ b/docs/wiki/feature/map.md @@ -1,6 +1,7 @@ --- layout: wiki title: Map +component: map description: Map improvements. group: feature category: realism @@ -33,7 +34,3 @@ The Blufor tracker marks the position of your faction's group leaders on the map ## 2. Usage - IMPORTANT NOTICE: The (optional) features above CAN be restricted by the mission maker / server owner. User experience may vary. - -## 3. Dependencies - -{% include dependencies_list.md component="map" %} diff --git a/docs/wiki/feature/maptools.md b/docs/wiki/feature/maptools.md index 29138f4e5a..c6f4903780 100644 --- a/docs/wiki/feature/maptools.md +++ b/docs/wiki/feature/maptools.md @@ -1,6 +1,7 @@ --- layout: wiki title: Map Tools +component: maptools description: Map tools, a roamer and pens. group: feature category: equipment @@ -38,7 +39,3 @@ If you are equipped with a vanilla GPS it will be shown on the map. (You don't n - Press ALT + LMB to start the line, left click again to end it. - To delete a line press Del around the center of the line. - Note that you can change the color of the lines by clicking on one of the coloured column on top of the screen (While the map is opened). - -## 3. Dependencies - -{% include dependencies_list.md component="maptools" %} diff --git a/docs/wiki/feature/markers.md b/docs/wiki/feature/markers.md index 3336a074bb..0a8764a2a1 100644 --- a/docs/wiki/feature/markers.md +++ b/docs/wiki/feature/markers.md @@ -1,6 +1,7 @@ --- layout: wiki title: Markers +component: markers description: Improved markers. group: feature category: interaction @@ -33,7 +34,3 @@ Adds the ability to move map markers after they are placed. (Note: Must be enabl
Note:

Does not work in Editor Preview! Conflicts with vanilla teleport keybind.

- -## 2. Dependencies - -{% include dependencies_list.md component="markers" %} diff --git a/docs/wiki/feature/medical-ai.md b/docs/wiki/feature/medical-ai.md index cecf8d53b1..9f553596de 100644 --- a/docs/wiki/feature/medical-ai.md +++ b/docs/wiki/feature/medical-ai.md @@ -1,6 +1,7 @@ --- layout: wiki title: Medical AI +component: medical_ai description: Makes AI heal themselves and each other with the ACE Medical system. group: feature category: realism @@ -31,8 +32,3 @@ The Medical AI will only become active if the AI units use the basic medical sys ### 2.2 Singleplayer AI units will also heal themselves in singleplayer. If the player is in control of an AI group and uses basic medical, Medical AI is also enabled and will run for the players group as well. The AI subordinates will automatically start healing themselves and do not need to be told to do so manually through the command menu, additionally the groups medic will also start healing other units (including the player). - - -## 3. Dependencies - -{% include dependencies_list.md component="medical_ai" %} diff --git a/docs/wiki/feature/medical-blood.md b/docs/wiki/feature/medical-blood.md index ba2cef29b0..2a044328a3 100644 --- a/docs/wiki/feature/medical-blood.md +++ b/docs/wiki/feature/medical-blood.md @@ -1,6 +1,7 @@ --- layout: wiki title: Medical Blood +component: medical_blood description: Spawn blood drops for bleeding units. group: feature category: realism @@ -24,7 +25,3 @@ When any unit is bleeding, this component will spawn blood drops on the ground. ## 2. In game ACE Blood in game - -## 3. Dependencies - -{% include dependencies_list.md component="medical_blood" %} diff --git a/docs/wiki/feature/medical-system.md b/docs/wiki/feature/medical-system.md index 7846413b08..cbe5ddd695 100644 --- a/docs/wiki/feature/medical-system.md +++ b/docs/wiki/feature/medical-system.md @@ -1,6 +1,7 @@ --- layout: wiki title: Medical System +component: medical description: ACE3 provides users with a more realistic medical system. group: feature order: 4 @@ -255,7 +256,3 @@ force ace_medical_treatment_clearTraumaAfterBandage = true; // to increase the f ``` _more tbd_ - -## 3. Dependencies - -{% include dependencies_list.md component="medical" %} diff --git a/docs/wiki/feature/medical_menu.md b/docs/wiki/feature/medical_menu.md index 186b39a144..14f3391aac 100644 --- a/docs/wiki/feature/medical_menu.md +++ b/docs/wiki/feature/medical_menu.md @@ -1,6 +1,7 @@ --- layout: wiki title: Medical Menu +component: medical_menu description: Adds the medical menu. group: feature category: realism @@ -14,7 +15,3 @@ version: ## 1. Overview Adds the medical menu, this is entirely optional and can be limited to vehicles / disabled by the mission maker. - -## 3. Dependencies - -{% include dependencies_list.md component="medical_menu" %} diff --git a/docs/wiki/feature/microdagr.md b/docs/wiki/feature/microdagr.md index f3c8d7a68c..779e19618a 100644 --- a/docs/wiki/feature/microdagr.md +++ b/docs/wiki/feature/microdagr.md @@ -1,6 +1,7 @@ --- layout: wiki title: MicroDAGR +component: microdagr description: A GPS device and much more. group: feature category: equipment @@ -182,8 +183,3 @@ There are three ways of adding a waypoint. 1. Note that the compass menu also changed and now features the azimuth, compass bearing, distance and grid position of the point you sighted. Note that the results of the measure you took won't change until you do an other measure. - - -## 3. Dependencies - -{% include dependencies_list.md component="microdagr" %} diff --git a/docs/wiki/feature/missileguidance.md b/docs/wiki/feature/missileguidance.md index 8928cd2ab2..0c96184300 100644 --- a/docs/wiki/feature/missileguidance.md +++ b/docs/wiki/feature/missileguidance.md @@ -1,6 +1,7 @@ --- layout: wiki title: Missile Guidance +component: missileguidance description: Various modes for different missiles. group: feature category: realism @@ -28,7 +29,3 @@ Adds the AMG framework, for more information about it refer to the [AMG framewor - Switch to thermals by pressing N the `FLTR` LED should light up. - Aim at the target and hold Tab ↹ a crosshair will appear and the `SEEK` LED will light up. - Fire! - -## 3. Dependencies - -{% include dependencies_list.md component="missileguidance" %} diff --git a/docs/wiki/feature/missionmodules.md b/docs/wiki/feature/missionmodules.md index 1f3fdb7418..c4a1f9e5e9 100644 --- a/docs/wiki/feature/missionmodules.md +++ b/docs/wiki/feature/missionmodules.md @@ -1,6 +1,7 @@ --- layout: wiki title: Mission Modules +component: missionmodules description: Modules that can be used by mission makers. group: feature category: general @@ -15,7 +16,3 @@ version: ## 1. Overview Add modules that can be used by mission makers, such as ambient sounds. - -## 2. Dependencies - -{% include dependencies_list.md component="missionmodules" %} diff --git a/docs/wiki/feature/mk6mortar.md b/docs/wiki/feature/mk6mortar.md index de08727a41..33b5f68c7b 100644 --- a/docs/wiki/feature/mk6mortar.md +++ b/docs/wiki/feature/mk6mortar.md @@ -1,6 +1,7 @@ --- layout: wiki title: Mk6 Mortar +component: mk6mortar description: Improve the existing Mk6 Mortar. group: feature category: equipment @@ -54,7 +55,3 @@ You need the proper mortar magazines in your inventory. - Interact with the mortar by pressing the interaction key ⊞ Win and looking near the muzzle. - Select the `Load Mortar` action and then select the round type you want to load. - If you want to unload the mortar without firing, interact near the muzzle again and select `Remove Round`. If there isn't space in your inventory for the round, it will be placed on the ground. - -## 3. Dependencies - -{% include dependencies_list.md component="mk6mortar" %} diff --git a/docs/wiki/feature/modules.md b/docs/wiki/feature/modules.md index f74777e3c1..1ac6953188 100644 --- a/docs/wiki/feature/modules.md +++ b/docs/wiki/feature/modules.md @@ -1,6 +1,7 @@ --- layout: wiki title: Modules +component: modules description: Framework for module handling. group: feature category: general @@ -16,12 +17,6 @@ version: This is taking care of module initialization. It lets us ensure that modules placed in the editor run when they are supposed to. -## 2. Dependencies - -{% include dependencies_list.md component="modules" %} - -> Note: The Modules module is required by nearly all other modules. Do NOT remove it! - -## 3. Usage +## 2. Usage For technical usage and instructions, please refer to our framework documentation about the module component. diff --git a/docs/wiki/feature/movement.md b/docs/wiki/feature/movement.md index ee4c295959..bd13c5ccc4 100644 --- a/docs/wiki/feature/movement.md +++ b/docs/wiki/feature/movement.md @@ -1,6 +1,7 @@ --- layout: wiki title: Movement +component: movement description: Movement improvements. group: feature category: realism @@ -40,7 +41,3 @@ The player can now use the sights of rifles and pistols in all prone stances. - Approach what you want to climb. - Press ctrl + V (ACE3 default key bind `Climb`). - Note that when climbing your character will put his weapon on his back. - -## Dependencies - -{% include dependencies_list.md component="movement" %} diff --git a/docs/wiki/feature/mx2a.md b/docs/wiki/feature/mx2a.md index 068260c3be..0c4258767f 100644 --- a/docs/wiki/feature/mx2a.md +++ b/docs/wiki/feature/mx2a.md @@ -1,6 +1,7 @@ --- layout: wiki title: MX-2A +component: mx2a description: MX-2A thermal imaging device. group: feature category: equipment @@ -15,7 +16,3 @@ version: ## 1. Overview Adds the MX-2A thermal imaging device. - -## 3. Dependencies - -{% include dependencies_list.md component="mx2a" %} diff --git a/docs/wiki/feature/nametags.md b/docs/wiki/feature/nametags.md index e0b57faca9..d8ef04364d 100644 --- a/docs/wiki/feature/nametags.md +++ b/docs/wiki/feature/nametags.md @@ -1,6 +1,7 @@ --- layout: wiki title: Nametags +component: nametags description: Name tags above other players. group: feature category: interaction @@ -19,7 +20,3 @@ Adds nametags and soldier ranks to friendly players in multiplayer. This can be ### 1.2 Arma 3 VON, ACRE and TFAR soundwaves A soundwave effect is shown when someone is speaking using either the vanilla VON, ACRE 1 or 2 and TFAR. - -## 2. Dependencies - -{% include dependencies_list.md component="nametags" %} diff --git a/docs/wiki/feature/nightvision.md b/docs/wiki/feature/nightvision.md index 679bd1b846..20459bf022 100644 --- a/docs/wiki/feature/nightvision.md +++ b/docs/wiki/feature/nightvision.md @@ -1,6 +1,7 @@ --- layout: wiki title: Nightvision +component: nightvision description: Adds realistic effects to NVGs. group: feature category: equipment @@ -36,7 +37,3 @@ Enables the user to manually adjust NVG brightness. ### 2.1 Adjusting brightness - Use ALT + PageUP and ALT + PageDOWN to adjust NVG brightness (ACE3 default key bind `Increase/Decrease NVG Brightness`). - -## 3. Dependencies - -{% include dependencies_list.md component="nightvision" %} diff --git a/docs/wiki/feature/nlaw.md b/docs/wiki/feature/nlaw.md index 471a6bdc38..a0cf040788 100644 --- a/docs/wiki/feature/nlaw.md +++ b/docs/wiki/feature/nlaw.md @@ -1,6 +1,7 @@ --- layout: wiki title: NLAW +component: nlaw description: NLAW group: feature category: equipment @@ -29,7 +30,3 @@ It will also correct for gravity drop. - Start tracking by pressing and holding the "NLAW Track Target" keybind (default: Tab) - While holding the key down track the target for 2-3 seconds and fire. - Can also be fired against static targets without tracking. - -## 3. Dependencies - -{% include dependencies_list.md component="nlaw" %} diff --git a/docs/wiki/feature/noidle.md b/docs/wiki/feature/noidle.md index c6df8e37e7..f1213cff55 100644 --- a/docs/wiki/feature/noidle.md +++ b/docs/wiki/feature/noidle.md @@ -1,6 +1,7 @@ --- layout: wiki title: No Idle +component: noidle description: Disable idle animations. group: feature category: interaction @@ -17,7 +18,3 @@ version: ### 1.1 Idle animations removed This removes idle animations. - -## 2. Dependencies - -{% include dependencies_list.md component="noidle" %} diff --git a/docs/wiki/feature/noradio.md b/docs/wiki/feature/noradio.md index f27fd717d3..c2d1ccc722 100644 --- a/docs/wiki/feature/noradio.md +++ b/docs/wiki/feature/noradio.md @@ -1,6 +1,7 @@ --- layout: wiki title: No Radio +component: noradio description: Disable callouts. group: feature category: interaction @@ -17,7 +18,3 @@ version: ### 1.1 Silent avatar Mutes the player's automatic callouts ("Enemy man, 100 meters, front!"). Does not mute AI callouts. - -## 2. Dependencies - -{% include dependencies_list.md component="noradio" %} diff --git a/docs/wiki/feature/norearm.md b/docs/wiki/feature/norearm.md index a4027a9bb3..c924416e9c 100644 --- a/docs/wiki/feature/norearm.md +++ b/docs/wiki/feature/norearm.md @@ -1,6 +1,7 @@ --- layout: wiki title: No Rearm +component: norearm description: Remove rearm action. group: feature category: interaction @@ -15,7 +16,3 @@ version: ## 1. Overview Hides the rearm action for players (on cars / boxes / corpses / ground) - -## 2. Dependencies - -{% include dependencies_list.md component="norearm" %} diff --git a/docs/wiki/feature/optics.md b/docs/wiki/feature/optics.md index 0de83f673d..93c2cf4ad0 100644 --- a/docs/wiki/feature/optics.md +++ b/docs/wiki/feature/optics.md @@ -1,6 +1,7 @@ --- layout: wiki title: Optics +component: optics description: Animated 2D and PiP optics. group: feature category: equipment @@ -15,7 +16,3 @@ version: ## 1. Overview Adds animated 2D and PIP variants of some optics (RCO / MRCO / ARCO / LRPS / MOS) - -## 2. Dependencies - -{% include dependencies_list.md component="optics" %} diff --git a/docs/wiki/feature/optionsmenu.md b/docs/wiki/feature/optionsmenu.md index 68aa84ab71..d1e9623c95 100644 --- a/docs/wiki/feature/optionsmenu.md +++ b/docs/wiki/feature/optionsmenu.md @@ -1,6 +1,7 @@ --- layout: wiki title: Options Menu +component: optionsmenu description: ACE3 options menu. group: feature category: interaction @@ -30,9 +31,3 @@ Adds the options menu used by other components. ### 2.2 Options menu informations - You don't have to press a save button. When a setting is changed it's saved automatically. - -## 3. Dependencies - -{% include dependencies_list.md component="optionsmenu" %} - -*Note: The Options Menu module is utilized by many other modules. Disabling it is not recommended.* diff --git a/docs/wiki/feature/overheating.md b/docs/wiki/feature/overheating.md index eaad8357a5..be397344e7 100644 --- a/docs/wiki/feature/overheating.md +++ b/docs/wiki/feature/overheating.md @@ -1,6 +1,7 @@ --- layout: wiki title: Overheating +component: overheating description: Weapon temperature and jamming, barrel swapping. group: feature category: realism @@ -66,7 +67,3 @@ Jams can be cleared in the following ways: - After a firefight unload closed bolt firearms (most rifles) until the barrel temperature has gone down to less than 180°C (two sections or less on the bar). - Clear failure to fire jams quickly - -## 3. Dependencies - -{% include dependencies_list.md component="overheating" %} diff --git a/docs/wiki/feature/overpressure.md b/docs/wiki/feature/overpressure.md index e27fcce297..e9c8ab15c6 100644 --- a/docs/wiki/feature/overpressure.md +++ b/docs/wiki/feature/overpressure.md @@ -1,6 +1,7 @@ --- layout: wiki title: Overpressure +component: overpressure description: Backblast and overpressure. group: feature category: realism @@ -16,7 +17,3 @@ version: ### 1.1 Overpressure Adds backblast to AT launchers and overpressure zones to tank cannons, don't stay behind a firing RPG or it'll hurt. - -## 2. Dependencies - -{% include dependencies_list.md component="overpressure" %} diff --git a/docs/wiki/feature/parachute.md b/docs/wiki/feature/parachute.md index 6404c21af2..143ac910ed 100644 --- a/docs/wiki/feature/parachute.md +++ b/docs/wiki/feature/parachute.md @@ -1,6 +1,7 @@ --- layout: wiki title: Parachute +component: parachute description: Add an altimeter and a non-steerable parachute. group: feature category: equipment @@ -35,7 +36,3 @@ Smoothens the parachute landing animation. ### 2.2 Cutting a parachute - While falling with a parachute deployed open the self interaction menu Ctrl+⊞ Win (ACE3 default). - Select `Cut Parachute` - -## 3. Dependencies - -{% include dependencies_list.md component="parachute" %} diff --git a/docs/wiki/feature/pylons.md b/docs/wiki/feature/pylons.md index c490b33fb2..382c2af7f9 100644 --- a/docs/wiki/feature/pylons.md +++ b/docs/wiki/feature/pylons.md @@ -1,6 +1,7 @@ --- layout: wiki title: Pylons +component: pylons description: Adds an interface that allow players to configure aircraft pylons in-game. group: feature category: interaction @@ -35,7 +36,3 @@ To save a custom loadout you first configure it. In the text box above `SAVE`, ` To load a custom loadout you select it in the preset pane and press `LOAD` followed by `APPLY`. To delete a custom loadout you select it in the preset pane and press `DELETE`. - -## 3. Dependencies - -{% include dependencies_list.md component="pylons" %} diff --git a/docs/wiki/feature/rangecard.md b/docs/wiki/feature/rangecard.md index f2e9039d5b..4a7dee56d3 100644 --- a/docs/wiki/feature/rangecard.md +++ b/docs/wiki/feature/rangecard.md @@ -1,6 +1,7 @@ --- layout: wiki title: Rangecard +component: rangecard description: Adds a range card for your weapons. group: feature category: equipment @@ -36,8 +37,3 @@ Add a range card that updates itself for your weapon and the type of ammo you're - Move to the `Bullet Drop` column, the drop is in MRADs, you need to compensate for it by adjusting your sight. Example, you want to adjust for a bullet drop of -7.9 MRADs simply adjust your scope 7.9 MRADs vertically. (check [feature scopes]({{ site.baseurl }}/wiki/feature/scopes.html) ) for this. - Possibility to copy and share the range card. Range card self interaction menu - - -## 3. Dependencies - -{% include dependencies_list.md component="rangecard" %} diff --git a/docs/wiki/feature/realisticnames.md b/docs/wiki/feature/realisticnames.md index f6aa9ba262..5767560f47 100644 --- a/docs/wiki/feature/realisticnames.md +++ b/docs/wiki/feature/realisticnames.md @@ -1,6 +1,7 @@ --- layout: wiki title: Realistic Names +component: realisticnames description: More realistic weapon names. group: feature category: realism @@ -16,7 +17,3 @@ version: ### 1.1 Real names Changes the names of vehicles, magazines, weapons, grenades, explosive charges and mines to their respective real-world counterparts whenever possible. - -## 2. Dependencies - -{% include dependencies_list.md component="realisticnames" %} diff --git a/docs/wiki/feature/rearm.md b/docs/wiki/feature/rearm.md index ae7fcb1612..9d0033e498 100644 --- a/docs/wiki/feature/rearm.md +++ b/docs/wiki/feature/rearm.md @@ -1,6 +1,7 @@ --- layout: wiki title: Rearm +component: rearm description: Adds custom rearm system. group: feature category: interaction @@ -87,7 +88,3 @@ Please check the framework description. - -## 5. Dependencies - -{% include dependencies_list.md component="rearm" %} diff --git a/docs/wiki/feature/recoil.md b/docs/wiki/feature/recoil.md index 49a8a8c421..8c26b3b69a 100644 --- a/docs/wiki/feature/recoil.md +++ b/docs/wiki/feature/recoil.md @@ -1,6 +1,7 @@ --- layout: wiki title: Recoil +component: recoil description: Recoil overhaul. group: feature category: realism @@ -22,7 +23,3 @@ Introducing camshake when firing on foot or as vehicle gunner depending on stanc ### 1.3 Burst dispersion Firing in longer burst (> 3 rounds per burst) slightly reduces the accuracy. Firing machine guns in bursts is now useful. - -## 2. Dependencies - -{% include dependencies_list.md component="recoil" %} diff --git a/docs/wiki/feature/refuel.md b/docs/wiki/feature/refuel.md index 73f8b63249..d7f3f88e6d 100644 --- a/docs/wiki/feature/refuel.md +++ b/docs/wiki/feature/refuel.md @@ -1,6 +1,7 @@ --- layout: wiki title: Refuel +component: refuel description: Adds the option to refuel vehicles. group: feature category: interaction @@ -64,7 +65,3 @@ There is a global setting that will effect all vehicles and static pumps. To onl ```sqf this setVariable ["ace_refuel_hoseLength", 30]; ``` - -## 4. Dependencies - -{% include dependencies_list.md component="refuel" %} diff --git a/docs/wiki/feature/reload.md b/docs/wiki/feature/reload.md index 97be510e9a..497dfcefa2 100644 --- a/docs/wiki/feature/reload.md +++ b/docs/wiki/feature/reload.md @@ -1,6 +1,7 @@ --- layout: wiki title: Reload +component: reload description: Hides default reload indicator, making it necessary to manually check the magazine. group: feature category: interaction @@ -21,7 +22,3 @@ Hides the actual round count of magazines and removes the icon when the current ### 2.1 Checking your ammo - Press Ctrl + R (ACE3 default key bind `Check Ammo`). - -## 3. Dependencies - -{% include dependencies_list.md component="reload" %} diff --git a/docs/wiki/feature/reloadlaunchers.md b/docs/wiki/feature/reloadlaunchers.md index 11f1163751..c35727e19f 100644 --- a/docs/wiki/feature/reloadlaunchers.md +++ b/docs/wiki/feature/reloadlaunchers.md @@ -1,6 +1,7 @@ --- layout: wiki title: Reload Launchers +component: reloadlaunchers description: Ability to reload someone else's launcher. group: feature category: interaction @@ -22,7 +23,3 @@ Add the ability to reload someone else's launcher. - Press the interaction key ⊞ Win and aim at your buddy's launcher. - Select `reload launcher`. - Select the type of ammo. - -## 3. Dependencies - -{% include dependencies_list.md component="reloadlaunchers" %} diff --git a/docs/wiki/feature/repair.md b/docs/wiki/feature/repair.md index f27639b5e9..2130f2484f 100644 --- a/docs/wiki/feature/repair.md +++ b/docs/wiki/feature/repair.md @@ -1,6 +1,7 @@ --- layout: wiki title: Repair +component: repair description: Adds custom repair system. group: feature category: interaction @@ -41,7 +42,3 @@ Adds a more realistic repair system. - Amount repaired is based on settings and training level - Using the interaction system select the hitpoint to repair -## 3. Dependencies - -{% include dependencies_list.md component="repair" %} - diff --git a/docs/wiki/feature/respawn.md b/docs/wiki/feature/respawn.md index 639b87ed9a..cc915d9734 100644 --- a/docs/wiki/feature/respawn.md +++ b/docs/wiki/feature/respawn.md @@ -1,6 +1,7 @@ --- layout: wiki title: Respawn +component: respawn description: Same gear on respawn, friendly fire message, rally points. group: feature category: interaction @@ -31,8 +32,3 @@ Adds rallypoints to all 3 sides to enable teleportation from base spawn to FOB's - Approach the rallypoint flagpole - Use the interaction key ⊞ Win (ACE3 default key bind `Interaction key`). - Select teleport to (base / rallypoint). - - -## 3. Dependencies - -{% include dependencies_list.md component="respawn" %} diff --git a/docs/wiki/feature/safemode.md b/docs/wiki/feature/safemode.md index 95b3fd1e3c..81307f89a1 100644 --- a/docs/wiki/feature/safemode.md +++ b/docs/wiki/feature/safemode.md @@ -1,6 +1,7 @@ --- layout: wiki title: Safe Mode +component: safemode description: Ability to use safe mode on small arms. group: feature category: equipment @@ -22,7 +23,3 @@ You can now use the safety mode of any weapon. Switching weapon modes takes the ### 2.1 Switching safety on / off - To turn it on press Ctrl + ` (QWERTY layout) (ACE3 default key bind `Safe Mode`). - To turn it off press Ctrl + ` (QWERTY layout) again or switch firing mode. - -## 3. Dependencies - -{% include dependencies_list.md component="safemode" %} diff --git a/docs/wiki/feature/sandbags.md b/docs/wiki/feature/sandbags.md index 61d7b9d143..8d82a32f6b 100644 --- a/docs/wiki/feature/sandbags.md +++ b/docs/wiki/feature/sandbags.md @@ -1,6 +1,7 @@ --- layout: wiki title: Sandbags +component: sandbag description: Adds stackable sandbags. group: feature category: equipment @@ -25,7 +26,3 @@ Note that those sandbags are affected by physics, a rocket will send them flying - Self interact Ctrl+⊞ Win (ACE3 default). - Select `Deploy sandbag`. - Follow the instruction on screen. - -## 3. Dependencies - -{% include dependencies_list.md component="sandbag" %} diff --git a/docs/wiki/feature/scopes.md b/docs/wiki/feature/scopes.md index ce5d3f4de4..9b8dd69f14 100644 --- a/docs/wiki/feature/scopes.md +++ b/docs/wiki/feature/scopes.md @@ -1,6 +1,7 @@ --- layout: wiki title: Scopes +component: scopes description: Scope adjustment. group: feature category: equipment @@ -40,8 +41,3 @@ Please not that the following key combinations are ACE3 default key binds. ### 2.4 Simplified Zeroing Simplified zeroing - - -## 3. Dependencies - -{% include dependencies_list.md component="scopes" %} diff --git a/docs/wiki/feature/sitting.md b/docs/wiki/feature/sitting.md index 708174bfc8..bc186f3594 100644 --- a/docs/wiki/feature/sitting.md +++ b/docs/wiki/feature/sitting.md @@ -1,6 +1,7 @@ --- layout: wiki title: Sitting +component: sitting description: Ability to sit on chairs. group: feature category: interaction @@ -23,7 +24,3 @@ Please note that to be able to use this function the sitting module need to be p - Look at the chair and press the interaction key Ctrl+⊞ Win (ACE3 default). - Select `Sit Down`. - To stand up press the self interaction key ⊞ Win (ACE3 default) and select `Stand Up`. - -## 3. Dependencies - -{% include dependencies_list.md component="sitting" %} diff --git a/docs/wiki/feature/slideshow.md b/docs/wiki/feature/slideshow.md index d99a8f2940..43bb89c2fb 100644 --- a/docs/wiki/feature/slideshow.md +++ b/docs/wiki/feature/slideshow.md @@ -1,6 +1,7 @@ --- layout: wiki title: Slideshow +component: slideshow description: Ability to have automatic or controllable slide-shows. group: feature category: interaction @@ -26,7 +27,3 @@ Also if no remotes are defined the "screen" object itself becomes the remote. - Look at the object used as a remote and use the interaction menu ⊞ Win (ACE3 default). - Select the action that correspond to the image you want (the name of the action depends on the mission maker). - -## 3. Dependencies - -{% include dependencies_list.md component="slideshow" %} diff --git a/docs/wiki/feature/smallarms.md b/docs/wiki/feature/smallarms.md index c792a6e4f6..ecdcf03500 100644 --- a/docs/wiki/feature/smallarms.md +++ b/docs/wiki/feature/smallarms.md @@ -1,6 +1,7 @@ --- layout: wiki title: Small Arms +component: smallarms description: Various improvements to small arms. group: feature category: realism @@ -22,7 +23,3 @@ Assault rifles no longer have tracer rounds in their non-tracer magazines. This ### 1.3 Real magazine round counts All pistol and sub machine gun magazines now have adjusted capacities to match their real life counterparts. - -## 2. Dependencies - -{% include dependencies_list.md component="smallarms" %} diff --git a/docs/wiki/feature/spectator.md b/docs/wiki/feature/spectator.md index cfc3cce0fa..6df29687f9 100644 --- a/docs/wiki/feature/spectator.md +++ b/docs/wiki/feature/spectator.md @@ -1,6 +1,7 @@ --- layout: wiki title: Spectator +component: spectator description: A flexible spectator system. group: feature category: interaction @@ -73,7 +74,3 @@ The O hotkey can be used to toggle unit and group drawing on and off. ### 1.10 Projectile drawing The P hotkey can be used to toggle projectile drawing on and off. Projectiles originating from units listed in the unit list will be drawn in real time and allow fire fights to be observed more clearly. Note that this feature may have a significant performance impact in scenarios with lots of projectiles on screen at once. - -## 2. Dependencies - -{% include dependencies_list.md component="spectator" %} diff --git a/docs/wiki/feature/spotting-scope.md b/docs/wiki/feature/spotting-scope.md index d982eaa92c..e2d97a2e73 100644 --- a/docs/wiki/feature/spotting-scope.md +++ b/docs/wiki/feature/spotting-scope.md @@ -1,6 +1,7 @@ --- layout: wiki title: Spotting Scope +component: spottingscope description: Adds a deployable spotting scope. group: feature category: equipment @@ -22,7 +23,3 @@ Adds a deployable spotting scope. - Self interact Ctrl+⊞ Win (ACE3 default). - Select `Equipment`. - Select `Place spotting scope` (note that the scope will be at your feet). - -## 3. Dependencies - -{% include dependencies_list.md component="spottingscope" %} diff --git a/docs/wiki/feature/switchunits.md b/docs/wiki/feature/switchunits.md index 69aa140cf9..9421728379 100644 --- a/docs/wiki/feature/switchunits.md +++ b/docs/wiki/feature/switchunits.md @@ -1,6 +1,7 @@ --- layout: wiki title: Switch Units +component: switchunits description: Insurgency-style unit switching. group: feature category: interaction @@ -28,8 +29,4 @@ In its current form you're able to switch to infantry (vehicles, etc. are planne - Open your map - Find a unit you can access (they are showed with special icons and names on the map). - Press LMB on the desired unit. -- You'll control that unit until it dies or until you switch to an other one. If the unit dies you'll be brought back to your original unit.. - -## 3. Dependencies - -{% include dependencies_list.md component="switchunits" %} +- You'll control that unit until it dies or until you switch to an other one. If the unit dies you'll be brought back to your original unit. diff --git a/docs/wiki/feature/tacticallader.md b/docs/wiki/feature/tacticallader.md index 135b56e5fc..49094403b5 100644 --- a/docs/wiki/feature/tacticallader.md +++ b/docs/wiki/feature/tacticallader.md @@ -1,6 +1,7 @@ --- layout: wiki title: Tactical Ladder +component: tacticalladder description: Adds a deployable ladder with adjustable height that you can transport on your back. group: feature category: equipment @@ -22,7 +23,3 @@ Adds a deployable ladder with adjustable height that you can transport on your b - Self interact Ctrl+⊞ Win (ACE3 default). - Select `Deploy ladder`. - You can adjust it's position and height by interacting with it ⊞ Win (ACE3 default) and following the instructions on screen. - -## 3. Dependencies - -{% include dependencies_list.md component="tacticalladder" %} diff --git a/docs/wiki/feature/tagging.md b/docs/wiki/feature/tagging.md index ee937d4734..9478c88b64 100644 --- a/docs/wiki/feature/tagging.md +++ b/docs/wiki/feature/tagging.md @@ -1,6 +1,7 @@ --- layout: wiki title: Tagging +component: tagging description: Adds a can of spray paint which allows you to tag buildings, walls and other static objects. group: feature category: equipment @@ -21,7 +22,3 @@ Adds a can of spray paint which allows you to tag buildings, walls and other sta ### 2.1 Using the Spray - Self interact Ctrl+⊞ Win (ACE3 default). - Select `Tag` and select the wanted type. - -## 3. Dependencies - -{% include dependencies_list.md component="tagging" %} diff --git a/docs/wiki/feature/testmissions.md b/docs/wiki/feature/testmissions.md index 372d11d25c..30202f0352 100644 --- a/docs/wiki/feature/testmissions.md +++ b/docs/wiki/feature/testmissions.md @@ -1,6 +1,7 @@ --- layout: wiki title: Test Missions +component: testmissions description: Adds ACE3 Test Missions. group: feature category: general @@ -16,7 +17,3 @@ version: ## 1. Overview Adds an ACE3 Test Missions - -## 2. Dependencies - -{% include dependencies_list.md component="testmissions" %} diff --git a/docs/wiki/feature/thermals.md b/docs/wiki/feature/thermals.md index e46a57f377..93eedaf27e 100644 --- a/docs/wiki/feature/thermals.md +++ b/docs/wiki/feature/thermals.md @@ -1,6 +1,7 @@ --- layout: wiki title: Thermals +component: thermals description: Improves thermal properties. group: feature category: equipment @@ -16,7 +17,3 @@ version: ### 1.1 Body Warmth Adjusts the thermal properties of humans making them less like torches. - -## 2. Dependencies - -{% include dependencies_list.md component="thermals" %} diff --git a/docs/wiki/feature/tripod.md b/docs/wiki/feature/tripod.md index 6147c14b9e..9fb22ab2a4 100644 --- a/docs/wiki/feature/tripod.md +++ b/docs/wiki/feature/tripod.md @@ -1,6 +1,7 @@ --- layout: wiki title: Tripod +component: tripod description: Adds a packable tripod deployable on the field. group: feature category: equipment @@ -25,7 +26,3 @@ Adds a packable tripod deployable on the field. It features a flat part to deplo - Select `Place SSWT kit`. To adjust or pick up the tripod just interact with it ⊞ Win and select the desired action. - -## 3. Dependencies - -{% include dependencies_list.md component="tripod" %} diff --git a/docs/wiki/feature/ui.md b/docs/wiki/feature/ui.md index c43769e0e9..120d1704bd 100644 --- a/docs/wiki/feature/ui.md +++ b/docs/wiki/feature/ui.md @@ -1,6 +1,7 @@ --- layout: wiki title: User Interface +component: ui description: Selective User Interface framework and other tweaks. group: feature category: general @@ -15,8 +16,3 @@ version: ## 1. Overview User Interface component adds the ability for almost every element in vanilla Arma to be hidden and shown on the fly, as well as frameworks for modders and mission makers to add their own elements and toggle them as necessary. In addition it removes vignette (black borders around the edges) and changes the chat contrast on the map to allow easier reading. - - -## 2. Dependencies - -{% include dependencies_list.md component="ui" %} diff --git a/docs/wiki/feature/vector.md b/docs/wiki/feature/vector.md index d4092e0b62..72c620999a 100644 --- a/docs/wiki/feature/vector.md +++ b/docs/wiki/feature/vector.md @@ -1,6 +1,7 @@ --- layout: wiki title: Vector +component: vector description: Adds a realistic depiction of the Vector 21 rangefinder. group: feature category: equipment @@ -97,7 +98,3 @@ Polish version of this manual with some comments and small additional section /polska wersja tego dokumentu opatrzona komentarzami oraz niewielkim dodatkiem: http://pgm.armaonline.pl/forum/viewtopic.php?f=15&t=548 - -## 4. Dependencies - -{% include dependencies_list.md component="vector" %} diff --git a/docs/wiki/feature/vehicledamage.md b/docs/wiki/feature/vehicledamage.md index 6ec910e14b..12dd1d4a19 100644 --- a/docs/wiki/feature/vehicledamage.md +++ b/docs/wiki/feature/vehicledamage.md @@ -1,6 +1,7 @@ --- layout: wiki title: Vehicle Damage +component: vehicle_damage description: Enhances vanilla armoured vehicle damage simulation. group: feature category: realism @@ -132,7 +133,3 @@ When hit, HEAT warheads will be defeated and no damage will be applied. If hit w - Enable experimental car damage. System will apply vehicle damage simulation to "car" types (trucks, SUVs, Humvees, etc.). Not fully tested and could be immbalanced causing weird behaviours. - Default: Off - -## 4. Dependencies - -{% include dependencies_list.md component="vehicle_damage" %} diff --git a/docs/wiki/feature/vehiclelock.md b/docs/wiki/feature/vehiclelock.md index ccd594ec16..a210a5c4cd 100644 --- a/docs/wiki/feature/vehiclelock.md +++ b/docs/wiki/feature/vehiclelock.md @@ -1,6 +1,7 @@ --- layout: wiki title: Vehicle Lock +component: vehiclelock description: The vehicle lock module enables locking vehicles and their inventory. group: feature category: interaction @@ -22,7 +23,3 @@ Locking, unlocking and picking vehicle locks is possible via the ACE Interact me
Note:

Different locking modes can be set, consult with your mission maker for more information.

- -## 3. Dependencies - -{% include dependencies_list.md component="vehiclelock" %} diff --git a/docs/wiki/feature/vehicles.md b/docs/wiki/feature/vehicles.md index 480130cfba..d9bff3c0f4 100644 --- a/docs/wiki/feature/vehicles.md +++ b/docs/wiki/feature/vehicles.md @@ -1,6 +1,7 @@ --- layout: wiki title: Vehicles +component: vehicles description: Various tweaks to vehicles and vehicle weapons. group: feature category: realism @@ -55,7 +56,3 @@ Adds the ability to prevent the automatic shut-off of the engine when exiting ve ### 2.2 Turning the speed limiter on / off - To turn the speed limiter on press Del. - To turn it off press Del again. - -## 3. Dependencies - -{% include dependencies_list.md component="vehicles" %} diff --git a/docs/wiki/feature/viewdistance.md b/docs/wiki/feature/viewdistance.md index 0f0b4c602b..ff4099c28d 100644 --- a/docs/wiki/feature/viewdistance.md +++ b/docs/wiki/feature/viewdistance.md @@ -1,6 +1,7 @@ --- layout: wiki title: View Distance +component: viewdistance description: The view distance module adds extra view distance settings group: feature category: interaction @@ -19,7 +20,3 @@ ACE3 View Distance adds the ability to have different view distance settings whe - When in-game, press ESC. - Click `ACE Options` in the top-left corner. - Scroll down to the `Client View Distance` settings. - -## 3. Dependencies - -{% include dependencies_list.md component="viewdistance" %} diff --git a/docs/wiki/feature/volume.md b/docs/wiki/feature/volume.md index fb34c7bdf2..ec913c7715 100644 --- a/docs/wiki/feature/volume.md +++ b/docs/wiki/feature/volume.md @@ -1,6 +1,7 @@ --- layout: wiki title: Volume Toggle +component: volume description: Ability to toggle volume of game and music. group: feature category: general @@ -29,7 +30,3 @@ Adds the possibility of setting a keybind to toggle volume of game and music. It 1. Set the keybind in ACE controls 2. Enable the feature in ACE options 3. Change the options to your liking - -## 4. Dependencies - -{% include dependencies_list.md component="volume" %} diff --git a/docs/wiki/feature/weaponselect.md b/docs/wiki/feature/weaponselect.md index d175695949..e148b89355 100644 --- a/docs/wiki/feature/weaponselect.md +++ b/docs/wiki/feature/weaponselect.md @@ -1,6 +1,7 @@ --- layout: wiki title: Weapon Select +component: weaponselect description: Ability to quickly select weapons using the number keys. group: feature category: interaction @@ -36,7 +37,3 @@ Changes the grenade selection key bindings to help prevent accidents. Quick weapon selection is not bound by default, but can be bound in the controls menu under `ACE3 Weapons`. Quick vehicle weapon selection is not bound by default, but can be bound in the controls menu under `ACE3 Vehicles`. - -## 3. Dependencies - -{% include dependencies_list.md component="weaponselect" %} diff --git a/docs/wiki/feature/weather.md b/docs/wiki/feature/weather.md index c2c86a9462..c7a0b0f15e 100644 --- a/docs/wiki/feature/weather.md +++ b/docs/wiki/feature/weather.md @@ -1,6 +1,7 @@ --- layout: wiki title: Weather +component: weather description: The Weather module overrides the mission/editor weather setting with a synchronized realistic weather simulation. group: feature category: realism @@ -21,7 +22,3 @@ ACE3 Weather extends the existing weather by temperature, humidity and air press ### 2.1 Wind info - Wind info is toggled on/off using SHIFT + K. - The arrow representing wind info is based on [Beaufort scale](http://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale) - -## 3. Dependencies - -{% include dependencies_list.md component="weather" %} diff --git a/docs/wiki/feature/winddeflection.md b/docs/wiki/feature/winddeflection.md index 459172d90d..ad36c73c69 100644 --- a/docs/wiki/feature/winddeflection.md +++ b/docs/wiki/feature/winddeflection.md @@ -1,6 +1,7 @@ --- layout: wiki title: Wind Deflection +component: winddeflection description: The wind deflection module simulates wind deflection of projectiles. group: feature category: realism @@ -21,8 +22,3 @@ Wind Deflection simulates the wind deflection of projectiles fired by players an
Note:

The only affected projectiles are bullets and grenades. Mortar shells, tank shells, missiles and rockets are not affected.

- - -## 2. Dependencies - -{% include dependencies_list.md component="winddeflection" %} diff --git a/docs/wiki/feature/yardage450.md b/docs/wiki/feature/yardage450.md index 9a2466e149..c089a5775d 100644 --- a/docs/wiki/feature/yardage450.md +++ b/docs/wiki/feature/yardage450.md @@ -1,6 +1,7 @@ --- layout: wiki title: Yardage 450 +component: yardage450 description: Adds the Bushnell Yardage Pro Sport 450 Laser Rangefinder. group: feature category: equipment @@ -23,7 +24,3 @@ Adds the Bushnell Yardage Pro Sport 450 Laser Rangefinder. - Tap R once to activate the device. - Sight the target and Hold R until `TARGET AQCUIRED` appears on top of the screen. - The range in meters should now appear at the bottom of the screen. - -## 3. Dependencies - -{% include dependencies_list.md component="yardage450" %} diff --git a/docs/wiki/feature/zeus.md b/docs/wiki/feature/zeus.md index d3c3638f1d..dfb072e9af 100644 --- a/docs/wiki/feature/zeus.md +++ b/docs/wiki/feature/zeus.md @@ -1,6 +1,7 @@ --- layout: wiki title: Zeus +component: zeus description: The Zeus module improves the Vanilla functionality. group: feature category: interaction @@ -17,7 +18,3 @@ ACE3 Zeus is enabled by default. This feature provides control over vanilla aspe ## 2. Usage ACE3 Zeus can be disabled or modified via a module in the 2D editor. - -## 3. Dependencies - -{% include dependencies_list.md component="zeus" %} diff --git a/tools/extract_dependencies.py b/tools/extract_dependencies.py index 1d017d61fa..e28eb6cd9c 100644 --- a/tools/extract_dependencies.py +++ b/tools/extract_dependencies.py @@ -94,7 +94,7 @@ def main(): jekyll_statement = "".join([ "{% if include.component == \"" + folder + "\" %}\n", - "{}\n".format(data), + "- {}\n".format(data.replace(", ", "\n- ")), "{% endif %}\n" ]) From e0df864a5d0778174491bd135947f474c93e9330 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Tue, 7 Dec 2021 22:06:15 +0100 Subject: [PATCH 17/22] Map Tools - Improve modded maps support (#8729) --- addons/maptools/functions/fnc_canUseMapTools.sqf | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/addons/maptools/functions/fnc_canUseMapTools.sqf b/addons/maptools/functions/fnc_canUseMapTools.sqf index e09a450031..3196507388 100644 --- a/addons/maptools/functions/fnc_canUseMapTools.sqf +++ b/addons/maptools/functions/fnc_canUseMapTools.sqf @@ -17,13 +17,7 @@ visibleMap && {alive ACE_player} && -{ - scopeName "hasMap"; - { - if (_x isKindOf ["ItemMap", configFile >> "CfgWeapons"]) exitWith {true breakOut "hasMap"}; - } forEach (assignedItems ACE_player); - false -} && +{getText (configFile >> "CfgWeapons" >> (assignedItems ACE_player param [0, ""]) >> "simulation") == "ItemMap"} && {"ACE_MapTools" in (ACE_player call EFUNC(common,uniqueItems))} && {!GVAR(mapTool_isDragging)} && {!GVAR(mapTool_isRotating)} From efa1980990c47eb82ed6a5df743904c4aaa4571c Mon Sep 17 00:00:00 2001 From: Whigital Date: Fri, 17 Dec 2021 17:48:22 +0100 Subject: [PATCH 18/22] Compats - Add SOG helmet hearing and dust protection (#8718) --- optionals/compat_sog/CfgWeapons/helmets.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/optionals/compat_sog/CfgWeapons/helmets.hpp b/optionals/compat_sog/CfgWeapons/helmets.hpp index 69bc30adcc..8edc6e2ac7 100644 --- a/optionals/compat_sog/CfgWeapons/helmets.hpp +++ b/optionals/compat_sog/CfgWeapons/helmets.hpp @@ -21,6 +21,13 @@ class vn_b_helmet_sph4_02_01: vn_b_headgear_base { class vn_b_helmet_t56_01_01: vn_b_headgear_base { HEARING_PROTECTION_VICCREW; }; +class vn_b_helmet_svh4_01_01: vn_b_headgear_base { + HEARING_PROTECTION_VICCREW; +}; +class vn_b_helmet_svh4_02_01: vn_b_headgear_base { + HEARING_PROTECTION_VICCREW; + ACE_Protection = 1; +}; class vn_o_headgear_base; class vn_o_helmet_tsh3_01: vn_o_headgear_base { From c6ed114758af1551e64aa3712f6224c2f4bba62d Mon Sep 17 00:00:00 2001 From: Whigital Date: Fri, 17 Dec 2021 18:35:41 +0100 Subject: [PATCH 19/22] Compats - Fix RHSUSF water Jerry Can having refuel actions (#8717) --- optionals/compat_rhs_usf3/CfgEventHandlers.hpp | 2 +- optionals/compat_rhs_usf3/CfgVehicles.hpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/optionals/compat_rhs_usf3/CfgEventHandlers.hpp b/optionals/compat_rhs_usf3/CfgEventHandlers.hpp index 95ab21f864..e9aed5c5ea 100644 --- a/optionals/compat_rhs_usf3/CfgEventHandlers.hpp +++ b/optionals/compat_rhs_usf3/CfgEventHandlers.hpp @@ -11,7 +11,7 @@ class Extended_PreInit_EventHandlers { }; class Extended_InitPost_EventHandlers { - class rhsusf_props_JerryCan_Base { + class rhsusf_props_ScepterMFC_Base { class ADDON { init = QUOTE(call EFUNC(refuel,makeJerryCan)); }; diff --git a/optionals/compat_rhs_usf3/CfgVehicles.hpp b/optionals/compat_rhs_usf3/CfgVehicles.hpp index 80c275f029..c5dcc81567 100644 --- a/optionals/compat_rhs_usf3/CfgVehicles.hpp +++ b/optionals/compat_rhs_usf3/CfgVehicles.hpp @@ -577,5 +577,11 @@ class CfgVehicles { class rhsusf_props_JerryCan_Base: Items_base_F { EGVAR(cargo,canLoad) = 1; EGVAR(cargo,size) = 1; + EGVAR(dragging,canCarry) = 1; + }; + + class rhsusf_props_ScepterMWC_Base: rhsusf_props_JerryCan_Base { + EXGVAR(field_rations,waterSupply) = 20; + EXGVAR(field_rations,offset)[] = {-0.13, 0, 0.2}; }; }; From ce6e0d48a16d9321ec6f01b65126508f19e8612e Mon Sep 17 00:00:00 2001 From: mihuan-0 <61108288+mihuan-0@users.noreply.github.com> Date: Sun, 19 Dec 2021 07:13:43 +0800 Subject: [PATCH 20/22] Translations - Add missing Simplified Chinese translation and change a few existing ones (#8731) * Add files via upload * Delete stringtable.xml * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Apply suggestions from code review Co-authored-by: PabstMirror --- addons/advanced_fatigue/stringtable.xml | 2 + addons/aircraft/stringtable.xml | 8 ++ addons/arsenal/stringtable.xml | 15 ++- addons/artillerytables/stringtable.xml | 4 + addons/ballistics/stringtable.xml | 57 +++++++++-- addons/cargo/stringtable.xml | 11 +++ addons/chemlights/stringtable.xml | 9 ++ addons/common/stringtable.xml | 23 ++++- addons/cookoff/stringtable.xml | 4 + addons/csw/stringtable.xml | 68 +++++++++++++ addons/dogtags/stringtable.xml | 1 + addons/dragging/stringtable.xml | 5 + addons/dragon/stringtable.xml | 7 ++ addons/explosives/stringtable.xml | 11 ++- addons/fastroping/stringtable.xml | 12 +++ addons/field_rations/stringtable.xml | 102 ++++++++++++++------ addons/fire/stringtable.xml | 10 ++ addons/flashlights/stringtable.xml | 2 + addons/flashsuppressors/stringtable.xml | 14 +-- addons/fortify/stringtable.xml | 15 +++ addons/gforces/stringtable.xml | 3 + addons/goggles/stringtable.xml | 1 + addons/grenades/stringtable.xml | 16 +++ addons/gunbag/stringtable.xml | 3 + addons/headless/stringtable.xml | 4 + addons/hellfire/stringtable.xml | 3 + addons/hot/stringtable.xml | 21 ++++ addons/intelitems/stringtable.xml | 11 +++ addons/interact_menu/stringtable.xml | 2 + addons/interaction/stringtable.xml | 11 +++ addons/killtracker/stringtable.xml | 7 +- addons/laser/stringtable.xml | 8 +- addons/laserpointer/stringtable.xml | 16 +-- addons/logistics_rope/stringtable.xml | 8 ++ addons/magazinerepack/stringtable.xml | 2 + addons/map_gestures/stringtable.xml | 37 ++++--- addons/markers/stringtable.xml | 23 ++++- addons/medical_ai/stringtable.xml | 2 + addons/medical_blood/stringtable.xml | 8 +- addons/medical_damage/stringtable.xml | 27 +++++- addons/medical_engine/stringtable.xml | 2 + addons/medical_feedback/stringtable.xml | 17 +++- addons/medical_gui/stringtable.xml | 19 ++++ addons/medical_statemachine/stringtable.xml | 11 +++ addons/medical_status/stringtable.xml | 3 + addons/medical_treatment/stringtable.xml | 87 +++++++++++++++++ addons/microdagr/stringtable.xml | 7 ++ addons/nametags/stringtable.xml | 2 + addons/nightvision/stringtable.xml | 46 +++++---- addons/overheating/stringtable.xml | 27 ++++++ addons/parachute/stringtable.xml | 1 + addons/quickmount/stringtable.xml | 2 + addons/realisticnames/stringtable.xml | 18 +++- addons/rearm/stringtable.xml | 4 + addons/reload/stringtable.xml | 2 + addons/repair/stringtable.xml | 5 + addons/scopes/stringtable.xml | 2 + addons/slideshow/stringtable.xml | 2 + addons/smallarms/stringtable.xml | 8 +- addons/spectator/stringtable.xml | 2 + addons/switchunits/stringtable.xml | 1 + addons/towing/stringtable.xml | 11 +++ addons/trenches/stringtable.xml | 9 ++ addons/ui/stringtable.xml | 3 + addons/vehicle_damage/stringtable.xml | 6 ++ addons/vehiclelock/stringtable.xml | 1 + addons/vehicles/stringtable.xml | 8 ++ addons/viewdistance/stringtable.xml | 1 + addons/weather/stringtable.xml | 2 + addons/zeus/stringtable.xml | 25 ++++- 70 files changed, 815 insertions(+), 112 deletions(-) diff --git a/addons/advanced_fatigue/stringtable.xml b/addons/advanced_fatigue/stringtable.xml index d93490ae85..5d761c0423 100644 --- a/addons/advanced_fatigue/stringtable.xml +++ b/addons/advanced_fatigue/stringtable.xml @@ -248,6 +248,7 @@ Скрыть шкалу усталости автоматически Blende Ausdauerleiste automatisch aus 體力條自動淡去 + 自动淡化体力条 Dissolvenza automatica della barra della stamina Automaticky schovat lištu výdrže Fondu automatique de la barre d'endurance @@ -262,6 +263,7 @@ Регулирует прозрачность шкалы в зависимости от статуса выносливости. Passt die Transparenz der Ausdauerleiste abhängig vom Ausdauerstatus an. 依照目前的體力程度調整體力條之透明度 + 根据体力状况调整体力条的透明度 Regola la trasparenza della barra in base allo stato di affaticamento. Upravuje průhlednost lišty v závislosti na současném stavu výdrže Règle la transparence de la barre en fonction de l'état d'endurance. diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml index 668d71963f..7ee41c4d58 100644 --- a/addons/aircraft/stringtable.xml +++ b/addons/aircraft/stringtable.xml @@ -56,6 +56,7 @@ 30mm High-Explosive Incendiary 30mm Alto Explosivo Incendiaria 30毫米高爆燃燒彈 + 30毫米高爆燃烧弹 30 mm High-Explosive Incendiary 30mm Odłamkowo-Burzące - Zapalające 30mm Yüksek Patlayıcı @@ -68,6 +69,7 @@ 30mm HEI 30mm AEI 30毫米高爆燃燒 + 30毫米高爆燃烧弹 30 mm HEI 30mm OB-Z 30mm HEI @@ -80,6 +82,7 @@ 30mm DU Armor Piercing 30mm UE Perforante de Blindaje 30毫米貧化鈾穿甲彈 + 30毫米贫铀穿甲弹 30 mm UA Armor Piercing 30mm Zubożony Uran - Przebijające 30mm DU Zırh Delici @@ -92,6 +95,7 @@ 30mm DU AP 30mm UE AP 30毫米貧鈾穿甲 + 30毫米贫铀穿甲弹 30 mm UA AP 30mm ZU-P 30mm DU AP @@ -104,6 +108,7 @@ 30mm Combat Mix 4:1 DU:HEI 30mm Mezcla de Combate 4:1 UE:AEI 30毫米戰鬥混合彈4:1 穿甲:高爆 + 30毫米战斗穿甲/高爆4:1混合弹 30 mm Mix de Combat 4:1 UA:HEI 30mm Mieszanka bojowa 4:1 ZU:OB-Z 30mm Combat Mix 4:1 DU:HEI @@ -116,6 +121,7 @@ 30mm CM 4:1 30mm MC 4:1 30毫米 穿高混合 4:1 + 30毫米穿甲/高爆4:1混合弹 30 mm MdC 4:1 30mm MB 4:1 30mm CM 4:1 @@ -128,6 +134,7 @@ 30mm Combat Mix 5:1 DU:HEI 30mm Mezcla de Combate 5:1 UE:AEI 30毫米戰鬥混合彈5:1 穿甲:高爆 + 30毫米战斗穿甲/高爆5:1混合弹 30 mm Mix de Combat 5:1 UA:HEI 30mm Mieszanka bojowa 5:1 ZU:OB-Z 30mm Combat Mix 5:1 DU:HEI @@ -140,6 +147,7 @@ 30mm CM 5:1 30mm MC 5:1 30毫米 穿高混合 5:1 + 30毫米 穿高混合 5:1 30 mm MdC 5:1 30mm MB 5:1 30mm CM 5:1 diff --git a/addons/arsenal/stringtable.xml b/addons/arsenal/stringtable.xml index edcf637ce2..67c38d6724 100644 --- a/addons/arsenal/stringtable.xml +++ b/addons/arsenal/stringtable.xml @@ -1138,6 +1138,7 @@ Suporte de Visão Noturna Support JVN 夜視鏡支援 + 夜视仪支援 Podpora nočního vidění Gece Görüş Desteği @@ -1152,6 +1153,7 @@ Primária suportada Primaire supportée 主武器支援 + 主武器支援 Hlavní část hledí podporuje @@ -1165,6 +1167,7 @@ Secundária suportada Secondaire supportée 次要武器支援 + 副武器支援 Vedlejší část hledí podporuje @@ -1178,6 +1181,7 @@ Primária integrada Primaire intégrée 整合主武器 + 整合主武器 Integrováno do hlavní části hledí @@ -1191,6 +1195,7 @@ Não suportado Non supporté 不支援 + 无支援 Není podporováno Desteklenmiyor @@ -1215,7 +1220,7 @@ Aktiviere die Gesichter-, Stimmen- und Abzeichenübersicht Activer les onglets visages/voix/insignes 顔 / 声 / 記章タブを有効化 - 启用脸谱/声音/徽章/选项 + 启用脸谱/声音/徽章选项 啟用臉譜/聲音/徽章選項 Abilita volti, voci e insegne Aktywuj zakładki twarz / głos / insygnia @@ -1296,6 +1301,7 @@ Lista Negra Liste noire 黑名單 + 黑名单 Seznam zakázaných Kara Liste @@ -1326,6 +1332,7 @@ Экспорт текущего списка предметов в виде массива для использования в скриптах Exporte l'équipement actuel dans le presse-papier, sous la forme d'un tableau à utiliser dans les scripts. 匯出目前的物品列表為陣列用於腳本編寫 + 导出目前的物品列表为排列以用于脚本编写 Exportovat současný seznam předmětů jako pole pro použití ve skriptech @@ -1338,6 +1345,7 @@ Importar lista de itens da área de transferência (deve estar no mesmo formato que uma lista exportada) Importe un tableau d'équipements depuis le presse-papier (le format doit être identique à celui de l'exportation). 從剪貼簿匯入物品列表之陣列（應該與匯出的格式一樣） + 从剪贴板导入物品列表排列（应该与汇出的格式一样） Importa elenco appunti (deve essere nello stesso formato di un elenco esportato) Importovat pole se seznamem předmětů ze schránky (měl by být ve stejném formátu jako export) @@ -1351,6 +1359,7 @@ Adicionar itens compatíveis Ajouter des objets compatibles 增加相容的物品 + 添加兼容物品 Aggiungi Oggetti Compatibili Přidat kompatibilní předměty @@ -1364,6 +1373,7 @@ Irá automaticamente adicionar acessórios ou carregadores (baseado na categoria selecionada) para todas as armas na lista de itens atual Ajoute automatiquement des accessoires ou des chargeurs compatibles (en fonction de la catégorie sélectionnée), pour toutes les armes de la liste actuelle. 將會自動增加相容的配件以及彈匣（基於選擇的類型）至妳目前物品列表中的全部武器 + 将自动为当前物品列表中的所有武器添加兼容的配件或弹夹（基于选定的类别） Aggiungerà automaticamente accessori o caricatori (in base alla categoria selezionata) per tutte le armi nell'elenco degli oggetti correnti Automaticky přídá kompatibilní zásobníky (na základě vybrané kategorie) ro všechny zbraně v současném seznamu předmětů @@ -1378,6 +1388,7 @@ Время действия Time to live 有效時間 + 有效时间 Time to live Bitme Süresi @@ -1389,6 +1400,7 @@ 信管設定時間 Tiempo de espoleta Detonationsverzögerung + 引信设定时间 Detonates on impact @@ -1398,6 +1410,7 @@ Detonuj przy uderzeniu 着発信管 Detona mediante impacto + 击发引信 diff --git a/addons/artillerytables/stringtable.xml b/addons/artillerytables/stringtable.xml index d1d4ab23ef..df2f64ed57 100644 --- a/addons/artillerytables/stringtable.xml +++ b/addons/artillerytables/stringtable.xml @@ -5,6 +5,7 @@ Artillery Rangetable Artillerieschusstafel 火炮射程表 + 火炮射程表 Tavola balistica per artigliria Dělostřelecké tabulky střelby 火砲射表 @@ -19,6 +20,7 @@ Universal Artillery Rangetable Universale Artillerieschusstafel 通用的火炮射程表 + 通用火炮射程表 Tavola balistica universale per artiglieria Univerzální dělostřelecká tabulka střelby 汎用の火砲用射程表 @@ -67,6 +69,7 @@ Artillery Computer Disabled Artilleriecomputer ausgeschaltet 停用火炮電腦 + 停用火炮电脑 Computer artiglieria disattivato Zakázat používání dělostřeleckého počítače 砲撃コンピュータ無効化 @@ -81,6 +84,7 @@ Disable the vanilla artillery computers Deaktiviert die Vanilla-Artilleriecomputer 停用原本的火炮控制電腦 + 禁用原版炮兵计算机 Disattiva il computer artiglieria vanilla Zakázat používání dělostřeleckého počítače základní hry ゲームの砲撃コンピュータを無効化します。 diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index 9a5c92f582..06d87f1dba 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -7,6 +7,7 @@ Postas #00 #00 Schrotmunition #00 鹿彈 + #00 鹿弹 #00 Buckshot #00 バックショット Chevrotine #00 @@ -20,7 +21,8 @@ #00 Buckshot Postas #00 #00 Schrotmunition - #00 鹿彈 + #00 鹿彈(8.38 毫米) + #00 鹿弹 #00 Buckshot #00 バックショット Chevrotine #00 @@ -35,6 +37,7 @@ Postas #0 #0 Schrotmunition #0 鹿彈 + #0 鹿弹 #0 Buckshot #0 バックショット Chevrotine #0 @@ -49,6 +52,7 @@ Postas #0 #0 Schrotmunition #0 鹿彈 + #0 鹿弹(8.1 毫米) #0 Buckshot #0 バックショット Chevrotine #0 @@ -63,6 +67,7 @@ Postas #1 #1 Schrotmunition #1 鹿彈 + #1 鹿弹 #1 Buckshot #1 バックショット Chevrotine #1 @@ -77,6 +82,7 @@ Postas #1 #1 Schrotmunition #1 鹿彈 + #1 鹿弹(7.6 毫米) #1 Buckshot #1 バックショット Chevrotine #1 @@ -91,6 +97,7 @@ Postas #2 #2 Schrotmunition #2 鹿彈 + #2 鹿弹 #2 Buckshot #2 バックショット Chevrotine #2 @@ -105,6 +112,7 @@ Postas #2 #2 Schrotmunition #2 鹿彈 + #2 鹿弹(6.9 毫米) #2 Buckshot #2 バックショット Chevrotine #2 @@ -119,6 +127,7 @@ Postas #3 #3 Schrotmunition #3 鹿彈 + #3 鹿弹 #3 Buckshot #3 バックショット Chevrotine #3 @@ -133,6 +142,7 @@ Postas #3 #3 Schrotmunition #3 鹿彈 + #3 鹿弹(6.4 毫米) #3 Buckshot #3 バックショット Chevrotine #3 @@ -147,6 +157,7 @@ Postas #4 #4 Schrotmunition #4 鹿彈 + #4 鹿弹 #4 Buckshot #4 バックショット Chevrotine #4 @@ -161,6 +172,7 @@ Postas #4 #4 Schrotmunition #4 鹿彈 + #4 鹿弹(6.10 毫米) #4 Buckshot #4 バックショット Chevrotine #4 @@ -174,7 +186,8 @@ #4 Birdshot Perdigones #4 #4 Vogelschrot - #4 鹿彈 + #4 鳥彈 + #4 鸟弹 #4 Birdshot #4 バックショット Grenaille No.4 @@ -187,7 +200,8 @@ #4 Birdshot Perdigones #4 #4 Vogelschrot - #4 鹿彈 + #4 鳥彈 + #4 鸟弹(3.30 毫米) #4 Birdshot #4 バックショット Grenaille No.4 @@ -201,6 +215,7 @@ 2 Cartuchos de Postas Calibre 12 #00 12 Gauge 2Schuss #00 Schrotmunition 12鉛徑 2發 #00 鹿彈 + 12铅径 2发 #00 鹿弹 12 Gauge 2Rnd #00 Buckshot 12 ゲージ 2 発入り #00 バックショット 2 balles cal. 12 Chevrotine #00 @@ -215,6 +230,7 @@ 2 Cartuchos de Postas Calibre 12 #0 12 Gauge 2Schuss #0 Schrotmunition 12鉛徑 2發 #0 鹿彈 + 12铅径 2发 #0 鹿弹 12 Gauge 2Rnd #0 Buckshot 12 ゲージ 2 発入り #0 バックショット 2 balles cal. 12 Chevrotine #0 @@ -229,6 +245,7 @@ 2 Cartuchos de Postas Calibre 12 #1 12 Gauge 2Schuss #1 Schrotmunition 12鉛徑 2發 #1 鹿彈 + 12铅径 2发 #1 鹿弹 12 Gauge 2Rnd #1 Buckshot 12 ゲージ 2 発入り #1 バックショット 2 balles cal. 12 Chevrotine #1 @@ -243,6 +260,7 @@ 2 Cartuchos de Postas Calibre 12 #2 12 Gauge 2Schuss #2 Schrotmunition 12鉛徑 2發 #2 鹿彈 + 12铅径 2发 #2 鹿弹 12 Gauge 2Rnd #2 Buckshot 12 ゲージ 2 発入り #2 バックショット 2 balles cal. 12 Chevrotine #2 @@ -257,6 +275,7 @@ 2 Cartuchos de Postas Calibre 12 #3 12 Gauge 2Schuss #3 Schrotmunition 12鉛徑 2發 #3 鹿彈 + 12铅径 2发 #3 鹿弹 12 Gauge 2Rnd #3 Buckshot 12 ゲージ 2 発入り #3 バックショット 2 balles cal. 12 Chevrotine #3 @@ -271,6 +290,7 @@ 2 Cartuchos de Postas Calibre 12 #4 12 Gauge 2Schuss #4 Schrotmunition 12鉛徑 2發 #4 鹿彈 + 12铅径 2发 #4 鹿弹 12 Gauge 2Rnd #4 Buckshot 12 ゲージ 2 発入り #4 バックショット 2 balles cal. 12 Chevrotine #4 @@ -284,7 +304,8 @@ 12 Gauge 2Rnd #4 Birdshot 2 Cartuchos de Perdigones Calibre 12 #4 12 Gauge 2Schuss #4 Schrotmunition - 12鉛徑 2發 #4 鹿彈 + 12鉛徑 2發 #4 鳥彈 + 12铅径 2发 #4 鸟弹 12 Gauge 2Rnd #4 Birdshot 12 ゲージ 2 発入り #4 バックショット 2 balles cal. 12 Grenaille No.4 @@ -299,6 +320,7 @@ 6 Cartuchos de Postas Calibre 12 #00 12 Gauge 6Schuss #00 Schrotmunition 12鉛徑 6發 #00 鹿彈 + 12铅径 6发 #00 鹿弹 12 Gauge 6Rnd #00 Buckshot 12 ゲージ 6 発入り #00 バックショット 6 balles cal. 12 Chevrotine #00 @@ -313,6 +335,7 @@ 6 Cartuchos de Postas Calibre 12 #0 12 Gauge 6Schuss #0 Schrotmunition 12鉛徑 6發 #0 鹿彈 + 12铅径 6发 #0 鹿弹 12 Gauge 6Rnd #0 Buckshot 12 ゲージ 6 発入り #0 バックショット 6 balles cal. 12 Chevrotine #0 @@ -327,6 +350,7 @@ 6 Cartuchos de Postas Calibre 12 #1 12 Gauge 6Schuss #1 Schrotmunition 12鉛徑 6發 #1 鹿彈 + 12铅径 6发 #1 鹿弹 12 Gauge 6Rnd #1 Buckshot 12 ゲージ 6 発入り #1 バックショット 6 balles cal. 12 Chevrotine #1 @@ -341,6 +365,7 @@ 6 Cartuchos de Postas Calibre 12 #2 12 Gauge 6Schuss #2 Schrotmunition 12鉛徑 6發 #2 鹿彈 + 12铅径 6发 #2 鹿弹 12 Gauge 6Rnd #2 Buckshot 12 ゲージ 6 発入り #2 バックショット 6 balles cal. 12 Chevrotine #2 @@ -355,6 +380,7 @@ 6 Cartuchos de Postas Calibre 12 #3 12 Gauge 6Schuss #3 Schrotmunition 12鉛徑 6發 #3 鹿彈 + 12铅径 6发 #3 鹿弹 12 Gauge 6Rnd #3 Buckshot 12 ゲージ 6 発入り #3 バックショット 6 balles cal. 12 Chevrotine #3 @@ -369,6 +395,7 @@ 6 Cartuchos de Postas Calibre 12 #4 12 Gauge 6Schuss #4 Schrotmunition 12鉛徑 6發 #4 鹿彈 + 12铅径 6发 #4 鹿弹 12 Gauge 6Rnd #4 Buckshot 12 ゲージ 6 発入り #4 バックショット 6 balles cal. 12 Chevrotine #4 @@ -382,7 +409,8 @@ 12 Gauge 6Rnd #4 Birdshot 6 Cartuchos de Perdigones Calibre 12 #4 12 Gauge 6Schuss #4 Schrotmunition - 12鉛徑 6發 #4 鹿彈 + 12鉛徑 6發 #4 鳥彈 + 12铅径 6发 #4 鸟弹 12 Gauge 6Rnd #4 Birdshot 12 ゲージ 6 発入り #4 バックショット 6 balles cal. 12 Grenaille No.4 @@ -396,6 +424,7 @@ 15 Cartuchos de Postas Calibre 12 #00 12 Gauge 15Schuss #00 Schrotmunition 12鉛徑 15發 #00 鹿彈 + 12铅径 15发 #00 鹿弹 12 Gauge 15Rnd #00 Buckshot 12 ゲージ 15 発入り #00 バックショット 15 balles cal. 12 Chevrotine #00 @@ -2765,6 +2794,7 @@ Ch. 6,5x47 mm 30Cps Sable (HPBT Scenar) 6.5x47 mm 30-Patronen-Magazin Sandfarben (HPBT Scenar) Magazynek 6.5x47 mm 30rd Piaskowy (HPBT Scenar) + 6.5x47毫米 30发 沙色弹夹(Lapua 空尖艇尾狙击专用弹) 6.5x47 mm 30Rnd Promet Mag (HPBT Scenar) @@ -2772,6 +2802,7 @@ Ch. 6,5x47 mm 30Cps Promet (HPBT Scenar) 6.5x47 mm 30-Patronen-Magazin für Promet (HPBT Scenar) Magazynek 6.5x47 mm 30rd Promet (HPBT Scenar) + 6.5x47毫米 30发 Promet弹夹(Lapua 空尖艇尾狙击专用弹) 6.5x47 mm 30Rnd Black Mag (HPBT Scenar) @@ -2779,6 +2810,7 @@ Ch. 6,5x47 mm 30Cps Noir (HPBT Scenar) 6.5x47 mm 30-Patronen-Magazin Schwarz (HPBT Scenar) Magazynek 6.5x47 mm 30rd Czarny (HPBT Scenar) + 6.5x47毫米 30发 黑色弹夹(Lapua 空尖艇尾狙击专用弹) 6.5x47 mm 30Rnd Khaki Mag (HPBT Scenar) @@ -2786,6 +2818,7 @@ Ch. 6,5x47 mm 30Cps Kaki (HPBT Scenar) 6.5x47 mm 30-Patronen-Magazin Khaki (HPBT Scenar) Magazynek 6.5x47 mm 30rd Khaki (HPBT Scenar) + 6.5x47毫米 30发 卡其色弹夹(Lapua 空尖艇尾狙击专用弹) 6.5 mm Lapua @@ -2844,6 +2877,7 @@ Ch. 6,5 mm Creedmor 30Cps Sable 6.5 mm Creedmor 30-Patronen-Magazin Sandfarben Magazynek 6.5 mm Creedmor 30Rnd Piaskowy + 6.5毫米 Creedmor狙击专用弹 30发 沙色弹夹 6.5 mm Creedmor 30Rnd Promet Mag @@ -2851,6 +2885,7 @@ Ch. 6,5 mm Creedmor 30Cps Promet 6.5 mm Creedmor 30-Patronen-Magazin für Promet Magazynek 6.5 mm Creedmor 30Rnd Promet + 6.5毫米 Creedmor狙击专用弹 30发 Promet弹夹 6.5 mm Creedmor 30Rnd Black Mag @@ -2858,6 +2893,7 @@ Ch. 6,5 mm Creedmor 30Cps Noir 6.5 mm Creedmor 30-Patronen-Magazin Schwarz Magazynek 6.5 mm Creedmor 30Rnd Czarny + 6.5毫米 Creedmor狙击专用弹 30发 黑色弹夹 6.5 mm Creedmor 30Rnd Khaki Mag @@ -2865,6 +2901,7 @@ Ch. 6,5 mm Creedmor 30Cps Kaki 6.5 mm Creedmor 30-Patronen-Magazin Khaki Magazynek 6.5 mm Creedmor 30Rnd Khaki + 6.5毫米 Creedmor狙击专用弹 30发 卡其色弹夹 6.5 mm CM @@ -3084,7 +3121,7 @@ 12.7x99 mm 5発入り 弾倉 5발들이 12.7x99 mm 탄창 12.7x99毫米 5發 彈匣 - 12.7x99 mm 5发 弹匣 + 12.7x99毫米 5发 弹匣 12.7x99 mm 5Rnd Mag @@ -3101,7 +3138,7 @@ 口径: 12.7x99 mm<br />装填数: 5 구경: 12.7x99 mm<br />장탄수: 5 口徑: 12.7x99毫米<br />發數: 5 - 口径: 12.7x99 mm<br />发数: 5 + 口径: 12.7x99毫米<br />发数: 5 Kalibre: 12.7x99 mm<br />Mermi: 5 @@ -3118,7 +3155,7 @@ 12.7x99 mm 10発入り 弾倉 10발들이 12.7x99 mm 탄창 12.7x99毫米 10發 彈匣 - 12.7x99 mm 10发 弹匣 + 12.7x99毫米 10发 弹匣 12.7x99 mm 10Rnd Mag @@ -3135,7 +3172,7 @@ 口径: 12.7x99 mm<br />装填数: 10 구경: 12.7x99 mm<br />장탄수: 10 口徑: 12.7x99毫米<br />發數: 10 - 口径: 12.7x99 mm<br />发数: 10 + 口径: 12.7x99毫米<br />发数: 10 Kalibre: 12.7x99 mm<br />Mermi: 10 @@ -3152,7 +3189,7 @@ 12.7 mm 12.7 mm 12.7毫米 - 12.7 mm + 12.7毫米 12.7 mm diff --git a/addons/cargo/stringtable.xml b/addons/cargo/stringtable.xml index 917b507748..405c58946b 100644 --- a/addons/cargo/stringtable.xml +++ b/addons/cargo/stringtable.xml @@ -40,6 +40,7 @@ Переименовано в: Neu Bewaffnet: <br/>%1 Nazwa zmieniona na:<br/>%1 + 重命名为: Custom name has been cleared. @@ -48,6 +49,7 @@ Пользовательское название удалено. Eigener Name wurde gelöscht. Własna nazwa została usunięta + 自定义名称已被清除。 Set New Name: @@ -56,6 +58,7 @@ Задать новое название: Neuen Namen setzen: Ustaw nową nazwę: + 设定新名称: Enable Rename Action @@ -64,6 +67,7 @@ Включить возможность переименования Aktiviere Umbenennungs-Aktion Włącz możliwość zmiany nazwy + 启用重命名动作 Enables the rename action for renamable objects. @@ -72,6 +76,7 @@ Включает переименование для объектов, допускающих переименование. Aktiviert die Umbenennungs-Aktion für neu benennbare Objekte. Włącza akcję zmiany nazwy dla obiektów z możliwością zmiany nazwy. + 启用可重命名对象的重命名动作。 Cargo @@ -285,6 +290,7 @@ Nom personnalisé Eigener Name Własna nazwa + 自定义名称 Set a custom cargo name used in the cargo interface. @@ -293,6 +299,7 @@ Установить пользовательское имя груза, используемое в интерфейсе погрузки. Definiere eigenen Frachtnamen, welcher im Frachtraum genutzt wird. Ustaw własną nazwę ładunku, używaną w menu ładunku. + 设置货物界面中使用的一个自定义货物名称。 Cargo Space @@ -428,6 +435,7 @@ 裝載時間係數 Koeficient času nákládání Coeficiente de tiempo para cargar + 装载时间系数 Modifies how long it takes to load/unload items.\nTime, in seconds, is the size of the item multiplied by this value. @@ -441,6 +449,7 @@ 修改要花多長時間來裝載/卸載物品。\n時間，以秒為單位，而物品的大小數值與這個係數成比。 Upravuje jak dlouho nakládají/vykládání trvá.\nVýsledkem je čas v sekundách - velikost objektu vynásobená touto hodnotou. Modifica el tiempo de carga/descarga de objetos.\n El Tiempo en segundos, es el tamño del objeto multiplicado por este valor. + 修改装载/卸载物体所需的时间。\n时间，单位：秒，物体的大小乘以该系数值。 Reopen Cargo Menu @@ -450,6 +459,7 @@ Переоткрыть меню погрузки Frachtmenü erneut öffnen Ponownie otwórz menu załadunku + 重新打开货物菜单 Reopen the Cargo Menu after successful unload. @@ -459,6 +469,7 @@ Переоткрыть меню погрузки после успешной выгрузки. Frachtmenü erneut öffnen, nach erfolgreichen Entladen. Ponownie otwórz menu załadunku po udanym wyładowaniu. + 成功卸货后，重新打开货物菜单。 diff --git a/addons/chemlights/stringtable.xml b/addons/chemlights/stringtable.xml index c1c6c930d8..400b21d339 100644 --- a/addons/chemlights/stringtable.xml +++ b/addons/chemlights/stringtable.xml @@ -315,6 +315,7 @@ Химсвет (Ярко-Синий) Bastão de Luz (Azul Forte) 螢光棒（超亮藍色） + 萤光棒（超亮蓝色） Chemické světlo (Modré jasné) Luz química (Azul Hi) Işık Çubuğu (Mavi) @@ -329,6 +330,7 @@ Яркий Синий свет Luz forte azul 超亮藍色光 + 超亮蓝色光 Modré jasné světlo Luz azul Hi Mavi Yüksek Işık @@ -343,6 +345,7 @@ Тип: Свет - Ярко-Синий (30 минут)<br />1 штука<br />В руках Tipo: Luz - Azul Forte (30 minutos)<br/>Usos: 1<br/>Usado em: Mão 類型: 光 - 超亮藍色 (30分鐘)<br />發數: 1<br />使用於: 手 + 类型: 光 - 超亮蓝色 (30分钟)<br />发数: 1<br />使用于: 手 Typ: Světlo - Modré jasné<br/>Počet použití: 1<br/>Použít v ruce Tipo: Luz - Azul Hi (30 minutos)<br />Cantidad: 1<br />Usado en: Mano Type: Light - Blue Hi (30 minute)<br />Rounds: 1<br />Used in: Hand @@ -357,6 +360,7 @@ Химсвет (Ярко-Зеленый) Bastão de Luz (Verde Forte) 螢光棒（超亮綠色） + 萤光棒（超亮绿色） Chemické světlo (Zelené jasné) Luz química (Verde Hi) Işık Çubuğu (Yeşil) @@ -371,6 +375,7 @@ Яркий Зеленый свет Luz forte verde 超亮綠色光 + 超亮绿色光 Zelené jasné světlo Luz verde Hi Yeşil Yüksek Işık @@ -385,6 +390,7 @@ Тип: Свет - Ярко-Зеленый (30 минут)<br />1 штука<br />В руках Tipo: Luz - Verde Forte (30 minutos)<br/>Usos: 1<br/>Usado em: Mão 類型: 光 - 超亮綠色 (30分鐘)<br />發數: 1<br />使用於: 手 + 类型: 光 - 超亮绿色 (30分钟)<br />发数: 1<br />使用于: 手 Typ: Světlo - Zelené jasné<br/>Počet použití: 1<br/>Použít v ruce Tipo: Luz - Verde Hi (30 minutos)<br />Cantidad: 1<br />Usado en: Mano Type: Light - Green Hi (30 minute)<br />Rounds: 1<br />Used in: Hand @@ -399,6 +405,7 @@ Химсвет (Ультраяркий Оранжевый) Bastão de Luz (Laranja Ultra Forte) 螢光棒（極亮橘色） + 萤光棒（极亮橘色） Chemické světlo (Oranžové velmi jasné) Luz química (Naranja Ultra-Hi) Işık Çubuğu (Turuncu) @@ -413,6 +420,7 @@ Ультраяркий Оранжевый свет Luz ultra forte laranja 極亮橘色光 + 极亮橘色光 Oranžové velmi jasné světlo Luz naranja Ultra-Hi Turuncu Yüksek Işık @@ -427,6 +435,7 @@ Тип: Свет - Ультраяркий Оранжевый (5 минут)<br />1 штука<br />В руках Tipo: Luz - Laranja Ultra Forte (5 minutos)<br/>Usos: 1<br/>Usado em: Mão 類型: 光 - 極亮橘色 (5分鐘)<br />發數: 1<br />使用於: 手 + 类型: 光 - 极亮橘色 (5分钟)<br />发数: 1<br />使用于: 手 Typ: Světlo - Oranžové velmi jasné<br/>Počet použití: 1<br/>Použít v ruce Tipo: Luz - Naranja Ultra-Hi (5 minutos)<br />Cantidad: 1<br />Usado en: Mano Type: Light - Orange Ultra-Hi (5 minute)<br />Rounds: 1<br />Used in: Hand diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index 5f36164548..655b2de7a3 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -47,6 +47,7 @@ アドバンスド 고급 進階 + 进阶 Gelişmiş @@ -455,6 +456,7 @@ 通常 보통 普通 + 正常 Normal @@ -519,6 +521,7 @@ Check all addons, not only those of ACE. Vérifie tous les addons, même ceux qui ne sont pas liés à ACE. 檢查全部的插件而非只有ACE。 + 检查全部插件而非只有ACE。 Zkontrolovat všechny addony a ne jenom ACE. Sprawdź wszystkie dodatki, nie tylko ACE. ACE のみならず、全てのアドオンを検査します。 @@ -545,6 +548,7 @@ Define a list of regardless allowed addons. Permet de définir une liste d'addons autorisés systématiquement. 定義哪些插件是允許使用的。 + 定义哪些插件是允许使用的。 Nastavte seznam addonů, které jsou povolené. Zdefiniuj listę niezależnie od dozwolonych dodatków. 許可するアドオンを定義します。 @@ -691,6 +695,7 @@ Цвета Colores 色 + 颜色 Persistent weapon laserpointer/flashlight @@ -768,7 +773,7 @@ PBO を検査 PBO 검사 檢查PBO檔 - 检查PBO档 + 检查PBO Check addon integrity with server and do selected action if an addon is missing. @@ -1058,6 +1063,7 @@ Vždy Zawsze Her Zaman + 总是 Anywhere @@ -1073,6 +1079,7 @@ どこでも 어디서나 任何地方 + 任何地方 Herhangi bir yer @@ -1089,6 +1096,7 @@ ベーシック 기본 基礎 + 基础 Basit @@ -1105,6 +1113,7 @@ 医療車両のみ 의료차량 醫療載具 + 医疗载具 Medikal Araçlar @@ -1150,6 +1159,7 @@ Confirmar Confirmer 確認 + 确认 Conferma Potvrdit Potwierdź @@ -1164,6 +1174,7 @@ Nunca Jamais 從不 + 从不 Mai Nikdy Nigdy @@ -1298,6 +1309,7 @@ ACE Uncategorized + 未分类的ACE No Room to unload @@ -1403,6 +1415,7 @@ けいれん回避モード Tryb dla epileptyków Mode adapté à l'épilepsie + 癫痫病友好模式 Disables some flashing light effects to reduce seizure risk. @@ -1410,6 +1423,7 @@ 点滅する光エフェクトを無効化し、けいれんする恐れを低下させます。 Wyłącz część migających efektów w celu zredukowania ryzyka napadu epilepsji Désactive certains effets de lumière clignotante afin de réduire les risques de crise d'épilepsie. + 禁用一些闪烁的灯光效果，以降低癫痫发作的风险。 Flag (ACE - Black) @@ -1483,6 +1497,7 @@ Show the action in the self-interaction menu Affiche l'action dans le menu d'interaction personnel. 在自我互動選單內顯示動作 + 在自我互动选单内显示动作 Pokaż akcje w menu interakcji własnej Mostra a ação no menu de auto-interação セルフ インタラクションに動作を表示 @@ -1501,6 +1516,7 @@ Оба Beide Oba + 两方 Additional progress bar information @@ -1509,6 +1525,7 @@ Дополнительная информация прогресс-бара Zusätzliche Informationen beim Fortschrittsbalken Dodatkowe informacje na pasku postępu + 额外的进度条信息 Controls extra information shown in progress bar. @@ -1517,6 +1534,7 @@ Устанавливает дополнительную информацию в прогресс-баре. Kontrolliert zusätzliche Informationen beim Fortschrittsbalkens Kontroluje dodatkowe informacje na pasku postępu. + 控制进度条中显示的额外信息。 Percentage @@ -1525,6 +1543,7 @@ Процент выполнения Prozent Procent + 百分比 Time remaining @@ -1533,6 +1552,7 @@ Времени осталось Zeit verbleibend Pozostały czas + 剩余时间 None @@ -1573,6 +1593,7 @@ Оставшееся время: %1s Zeit übrig %1s Pozostały czas: %1s + 剩余时间: %1秒 Locations Boost Training diff --git a/addons/cookoff/stringtable.xml b/addons/cookoff/stringtable.xml index d237193c77..3ca75a8480 100644 --- a/addons/cookoff/stringtable.xml +++ b/addons/cookoff/stringtable.xml @@ -25,6 +25,7 @@ Manipulação de dano e efeitos de torre Dégâts et effets de tourelle 傷害控制及炮塔效果 + 损坏处理和炮塔效果 Manovrabilità danneggiata ed effetti torretta Poškodit ovládání a efekty věže Obsługa obrażeń i efekty wieży @@ -38,6 +39,7 @@ Modifica a manipulação de dano para o cozinhamento de munição e efeitos de explosão da torre Modifie la gestion des dégâts pour l'auto-inflammation et les effets d'explosion de tourelle. 更改殉爆以及炮塔爆炸之傷害控制 + 改变殉爆和炮塔爆炸的损坏处理效果 Modifica la gestione dei danni per gli effetti di esplosione della torretta e danneggiamenti Změní poškození ovládání a efekty výbuchu veže Zmienia obsługę obrażeń podczas samozapłonu i eksplozji wieży @@ -167,6 +169,7 @@ Включить возгорание поеприпасов Aktiviert das in Brand setzen des Fahrzeugs während des Durchzündens der Munition Włącz pożar pojazdu podczas samozapłonu + 启用殉爆载具火灾 Whether or not vehicles will catch on fire during cook-off @@ -175,6 +178,7 @@ Будет ли техника возгораться при подрыве боеприпасов Ob Fahrzeuge in Brand gesetzt werden, während deren Munition durchzündet. Określa, czy pojazdy zapalą się podczas samozapłonu ich amunicji. + 车辆在殉爆过程中是否会起火 diff --git a/addons/csw/stringtable.xml b/addons/csw/stringtable.xml index d3593a29f4..54fc41db7b 100644 --- a/addons/csw/stringtable.xml +++ b/addons/csw/stringtable.xml @@ -8,6 +8,7 @@ Armes statiques 共用火器 (CSW) 班組支援武器 + 班组支援武器（CSW） Armi servite dall'equipaggio Posádkou obsluhované zbraně (CSW) Broń ciężka (CSW) @@ -21,6 +22,7 @@ Placer le trépied 三脚を設置 設置三腳架 + 安放三脚架 Piazza treppiede Položit trojnožku Rozłóż Trójnóg @@ -40,6 +42,7 @@ Desmonta 解体 拆解 + 拆解 Sök @@ -54,6 +57,7 @@ Entrar 乗る 進入 + 进入 Bin @@ -69,6 +73,7 @@ Carregar %1 %1 を装填 裝填 %1 + 装填 %1 Yükle %1 @@ -84,6 +89,7 @@ Descarregar %1 %1 を除去 卸載 %1 + 卸载 %1 Boşalt %1 @@ -93,6 +99,7 @@ Connecter %1 %1 を接続 聯結至 %1 + 连接 %1 Collega %1 Spojit %1 Połącz %1 @@ -106,6 +113,7 @@ Assemblage avancé アドバンスド設置 進階組裝 + 高级组装 Montaggio avanzato Pokročilé skládání Zaawansowane składanie @@ -119,6 +127,7 @@ Utilise ACE pour l'assemblage/le désassemblage des armes statiques supportées.\nLes munitions chargées sont réduites à un seul chargeur. 対応している設置型火器に ACE3 の設置と解体を使用します。装填済みの弾倉は 1 つの弾倉に減少します。 使用ACE來組裝/拆解固定型武器。上膛的限制為單個彈匣。 + 使用ACE来组装/拆解固定式武器。限制弹药为一个弹匣。 Utilizzare ace per l'Assemblaggio/smontaggio di armi statiche supportate. Le munizioni cariche sono ridotte ad un solo caricatore. Použít ACE pro složení/rozložení podporovaných statických zbraní. Nabitá munice je snížená na jeden zásobník. Użyj ACE do składania/rozkładania broni statycznych. Załadowana amunicja zostaje zredukowana do jednego magazynku. @@ -132,6 +141,7 @@ Conserver le surplus de munitions 過剰弾薬を保持 保存額外彈藥 + 保存额外弹药 Risparmiare munizioni extra Uložit munici navíc. Zapisz dodatkową amunicje @@ -145,6 +155,7 @@ Range les chargeurs en surplus auprès de l'arme statique. 次の設置型火器用に過剰弾薬を保持します。 在固定型武器旁存放額外彈匣 + 在固定式武器旁边存放额外的弹匣 Conservare i caricatori extra accanto all'arma statica Ukládat munici navíc vedle statické zbraně. Dodatkowe magazynki przechowuj obok broni statycznej @@ -158,6 +169,7 @@ Manipulation des munitions 弾薬の処理 彈藥處理 + 弹药处置 Gestione delle munizioni Manipulace s municí Obsługa amunicji @@ -171,6 +183,7 @@ Définit qui peut charger et décharger les chargeurs. 弾薬の装填と除去を許可します。 允許裝填或卸載彈匣 + 允许装卸弹匣 Permettere il carico e lo scarico dei caricatori Povolit nabíjení a vybíjení zásobníků. Zezwalaj na ładowanie i rozładowywanie magazynków @@ -184,6 +197,7 @@ Coefficient du temps d'interaction インタラクション時間係数 互動時間係數 + 交互时间系数 Coefficente per il tempo di interazione Koeficient času interakce Współczynnik czasu interakcji @@ -197,6 +211,7 @@ Définit l'échelle de temps nécessaire à l'assemblage et au rechargement des armes statiques. 設置型火器の設置と再装填時間を管理できます。 設置組裝及裝填組裝固定型武器 + 衡量组装和重新装填固定式武器所需的时间 Tempo necessario per assemblare e ricaricare le armi statiche Škáluje čas potřebný ke skládání a přebíjení statických zbraní. Definiuje czas potrzebny do złożenia i przeładowania broni statycznej @@ -210,6 +225,7 @@ Glisser le trépied après déploiement 設置後に三脚を引きずる 在佈置三腳架後拖拉 + 部署后拖动三脚架 Trascinare i treppiedi dopo lo schieramento Tahat trojnožku po položení Przeciągnij statyw po rozmieszczeniu @@ -223,6 +239,7 @@ Aussitôt après avoir déployé un trépied, le joueur commence automatiquement à le glisser pour le positionner plus précisément. 三脚を設置後、動かせるよう三脚を引きずるようにします。 在部署三腳架後，開始拖動它使其在你所要的精準位置 + 部署好三脚架后，开始拖动它到一个精确的位置 Dopo aver posizionato un treppiede, iniziate a trascinarlo in una posizione precisa Po položení trojnožky začít automaticky tahání pro lepší polohu. Po rozłożeniu trójnogu zacznij od przeciągania go w określone miejsce @@ -236,6 +253,7 @@ Récupérer le trépied 三脚を拾う 撿起三腳架 + 捡起三脚架 Recupero treppiede Složit trojnožku Podnieś Trójnóg @@ -249,6 +267,7 @@ Monter l'arme 火器を乗せる 裝載武器 + 装载武器 Montare l'arma Připevnit zbraň Zamontuj Broń @@ -262,6 +281,7 @@ Désassemblage de l'arme... 火器を解体中です・・・ 拆裝武器中... + 正在拆卸武器... Smontaggio arma... Rozkládám zbraň... Rozkładanie Broni... @@ -275,6 +295,7 @@ Assemblage de l'arme... 火器を設置中です・・・ 組裝武器中... + 正在组装武器... Montaggio arma... Skládám zbraň... Składanie Broni... @@ -288,6 +309,7 @@ Récupération du trépied... 三脚を取得中です・・・ 撿起三腳架... + 捡起三脚架... Recupero treppiede... Zvedám trojnožku... Podnoszenie Trójnogu... @@ -301,6 +323,7 @@ Installation du trépied... 三脚を設置中です・・・ 部署三腳架... + 部署三脚架... Piazzare treppiede... Pokládám trojnožku... Rozmieszczanie Trójnogu... @@ -314,6 +337,7 @@ Activer CSW CSW 有効化 啟用CSW(班用支援武器) + 启用班组支援武器（CSW） Attiva CSW Povolit posádkou obsluhované zbraně (CSW) Włącz CSW @@ -327,6 +351,7 @@ Active les fonctions CSW sur cette arme. この火器で共用火器を有効化します。 對此武器啟用班組支援能力 + 在该武器上启用班组支援能力 Abilita l'abilità dell'equipaggio su quest'arma Zapne CSW funkce na této zbrani Włącza opcje systemu CSW na tej broni @@ -340,6 +365,7 @@ Activer et laisser l'arme vide 火器有効化し空を維持 啟用並不裝填武器 + 启用并不装填武器 Abilitato e lascia l'arma vuota Povolit a nechat zbraň prázdnou Włącz i pozostaw broń pustą @@ -357,6 +383,7 @@ Tripé 三脚 三腳架 + 三脚架 Trojnožka Тренога @@ -368,6 +395,7 @@ [CSW] Lanceur statique Mini-Spike (AT) [CSW] 設置型ミニ スパイク ランチャー (AT) [CSW] 固定型 "迷你長釘"導彈發射器（對地） + [CSW] 固定式"迷你长钉"导弹发射器（AT） [CSW] Static Mini-Spike Launcher (AT) [CSW] Statický raketomet Mini-Spike (protitankový) [CSW] Static Mini-Spike Launcher (AT) @@ -382,6 +410,7 @@ [CSW] Lanceur statique Mini-Spike (AA) [CSW] 設置型ミニ スパイク ランチャー (AA) [CSW] 固定型 "迷你長釘"導彈發射器（對空） + [CSW] 固定式"迷你长钉"导弹发射器（AA） [CSW] Static Mini-Spike Launcher (AA) [CSW] Statický raketomet Mini-Spike (protiletadlový) [CSW] Static Mini-Spike Launcher (AA) @@ -396,6 +425,7 @@ [CSW] Mitrailleuse statique XM312 [CSW] 設置型 XM312 [CSW] 固定型 XM312重機槍 + [CSW] 固定式XM312重机枪 [CSW] Static XM312 Gun [CSW] Statická zbraň XM312 [CSW] Static XM312 Gun @@ -411,6 +441,7 @@ [CSW] Станковый M2 со щитом [CSW] 設置型 防盾付き M2 [CSW] Statisches M2 mit Schild + [CSW] 固定式防盾型M2重机枪 [CSW] Static XM312 Gun (Autonomous) @@ -420,6 +451,7 @@ [CSW] Mitrailleuse statique XM312 (Autonome) [CSW] 設置型 XM312 (自律型) [CSW] 固定型 XM312重機槍（自主型） + [CSW] 固定式XM312重机枪（自主） [CSW] Static XM312 Gun (Autonomo) [CSW] Statická zbraň XM312 (autonomická) [CSW] Static XM312 Gun (Autonomous) @@ -434,6 +466,7 @@ [CSW] Lance-grenades statique XM307 [CSW] 設置型 XM307 [CSW] 固定型XM307榴彈機槍 + [CSW] 固定式XM307榴弹机枪 [CSW] Static XM307 Gun [CSW] Statická zbraň XM307 [CSW] Static XM307 Gun @@ -448,6 +481,7 @@ [CSW] Lance-grenades statique XM307 (Autonome) [CSW] 設置型 XM307 (自律型) [CSW] 固定型 XM307榴彈機槍（自主型） + [CSW] 固定式XM307榴弹机枪（自主） [CSW] Static XM307 Gun (Autonomo) [CSW] Statická zbraň XM307 (autonomická) [CSW] Static XM307 Gun (Autonomous) @@ -462,6 +496,7 @@ [CSW] Bande 12,7x108 mm HMG [CSW] 12.7x108 mm HMG ベルト [CSW]12.7x108毫米 重機槍彈鏈 + [CSW]12.7x108毫米 重机枪弹链 [CSW] 12.7x108mm HMG Belt [CSW] Pás 12.7×108mm pro těžký kulomet [CSW] 12.7x108mm HMG Belt @@ -476,6 +511,7 @@ [CSW] Bande 12,7x99 mm HMG [CSW] 12.7x99 mm HMG ベルト [CSW]12.7x99毫米 重機槍彈鏈 + [CSW]12.7x99毫米 重机枪弹链 [CSW] 12.7x99mm HMG Belt [CSW] Pás 12.7×99mm pro těžký kulomet [CSW] 12.7x99mm HMG Belt @@ -490,6 +526,7 @@ [CSW] Bande 12,7x99 mm HMG traçantes (Rouges) [CSW] 12.7x99 mm HMG 曳光弾ベルト (赤) [CSW] 12.7x99毫米 重機槍曳光彈鏈（紅色） + [CSW] 12.7x99毫米 重机枪曳光弹链（红） [CSW] 12.7x99mm Tracer HMG Belt (Red) [CSW] Pás 12.7×99mm pro těžký kulomet (červená stopovka) [CSW] 12.7x99mm Tracer HMG Belt (Red) @@ -504,6 +541,7 @@ [CSW] Bande 12,7x99 mm HMG traçantes (Vertes) [CSW] 12.7x99 mm HMG 曳光弾ベルト (緑) [CSW] 12.7x99毫米 重機槍曳光彈鏈（綠色） + [CSW] 12.7x99毫米 重机枪曳光弹链（绿） [CSW] 12.7x99mm Tracer HMG Belt (Green) [CSW] Pás 12.7×99mm pro těžký kulomet (zelená stopovka) [CSW] 12.7x99mm Tracer HMG Belt (Green) @@ -518,6 +556,7 @@ [CSW] Bande 12,7x99 mm HMG traçantes (Jaunes) [CSW] 12.7x99 mm HMG 曳光弾ベルト (黄) [CSW] 12.7x99毫米 重機槍曳光彈鏈（黃色） + [CSW] 12.7x99毫米 重机枪曳光弹链（黄） [CSW] 12.7x99mm Tracer HMG Belt (Yellow) [CSW] Pás 12.7×99mm pro těžký kulomet (žlutá stopovka) [CSW] 12.7x99mm Tracer HMG Belt (Yellow) @@ -532,6 +571,7 @@ [CSW] Bande grenades 20 mm GMG [CSW] 20 mm てき弾 GMG ベルト [CSW]20毫米 榴彈 榴彈機槍彈鏈 + [CSW] 20毫米 榴弹机枪弹链 [CSW] 20mm Grenade GMG Belt [CSW] Pás 20mm granátů pro granátomet [CSW] 20mm Grenade GMG Belt @@ -546,6 +586,7 @@ Trépied M3 M3 三脚 M3 三腳架 + M3 三脚架 M3 Tripod M3 trojnožka M3 Tripod @@ -560,6 +601,7 @@ [CSW] 6P57 Trépied déployable [CSW] 6P57 設置型三脚 [CSW] 6P57 部署型三腳架 + [CSW] 6P57 部署型三脚架 [CSW] 6P57 Deployable Tripod [CSW] 6P57 trojnožka [CSW] 6P57 Deployable Tripod @@ -574,6 +616,7 @@ [CSW] 6P57 Trépied déployable (Bas) [CSW] 6P57 設置型三脚 (低座) [CSW] 6P57 部署型（低位） + [CSW] 6P57 部署型（低） [CSW] 6P57 Deployable Tripod (Low) [CSW] 6P57 trojnožka (nízká) [CSW] 6P57 Deployable Tripod (Low) @@ -588,6 +631,7 @@ [CSW] M220 Trépied déployable [CSW] M220 設置型三脚 [CSW] M220 部署型三腳架 + [CSW] M220 部署型三脚架 [CSW] M220 Deployable Tripod [CSW] M220 trojnožka [CSW] M220 Deployable Tripod @@ -602,6 +646,7 @@ [CSW] SAG-30 Trépied déployable [CSW] SAG-30 設置型三脚 [CSW] SAG-30 部署型三腳架 + [CSW] SAG-30 部署型三脚架 [CSW] SAG-30 Deployable Tripod [CSW] SAG-30 trojnožka [CSW] SAG-30 Deployable Tripod @@ -616,6 +661,7 @@ Trépied 6P57 6P57 三脚 6P57 三腳架 + 6P57 三脚架 6P57 Tripod 6P57 trojnožka 6P57 Tripod @@ -630,6 +676,7 @@ Trépied SAG-30 SAG-30 三脚 SAG-30 三腳架 + SAG-30 三脚架 SAG-30 Tripod SAG-30 trojnožka SAG-30 Tripod @@ -644,6 +691,7 @@ Trépied M220 M220 三脚 M220 三腳架 + M220 三脚架 M220 Tripod M220 trojnožka M220 Tripod @@ -658,6 +706,7 @@ [CSW] M3 Trépied déployable [CSW] M3 設置型三脚 [CSW] M3 部屬型三腳架 + [CSW] M3 部属型三脚架 [CSW] M3 Deployable Tripod [CSW] M3 trojnožka [CSW] M3 Deployable Tripod @@ -672,6 +721,7 @@ [CSW] M3 Trépied déployable (Bas) [CSW] M3 設置型三脚 (低座) [CSW] M3 部署型三腳架（低位） + [CSW] M3 部署型三脚架（低） [CSW] M3 Deployable Tripod (Low) [CSW] M3 trojnožka (nízká) [CSW] M3 Deployable Tripod (Low) @@ -686,6 +736,7 @@ [CSW] Plaque de base pour mortier [CSW] 迫撃砲基盤 [CSW] 迫擊炮基座 + [CSW] 迫击炮底座 [CSW] Mortar Baseplate [CSW] Podstavec pro minomet [CSW] Mortar Baseplate @@ -700,6 +751,7 @@ Plaque de base pour mortier 迫撃砲基盤 迫擊炮基座 + 迫击炮底座 Mortar Baseplate Podstavec pro minomet Mortar Baseplate @@ -714,6 +766,7 @@ [CSW] Tube mortier Mk6 [CSW] Mk6 迫撃砲発射筒 [CSW] Mk6 迫擊炮炮管 + [CSW] Mk6 迫击炮管 [CSW] Mk6 Mortar Tube [CSW] Minomet Mk6 hlaveň [CSW] Mk6 Mortar Tube @@ -728,6 +781,7 @@ [CSW] Sac tube M252 [CSW] M252 発射筒バッグ [CSW] M252 炮管袋 + [CSW] M252 炮管包 [CSW] M252 Tube Bag [CSW] M252 minometná hlaveň v pouzdře [CSW] M252 Tube Bag @@ -742,6 +796,7 @@ [CSW] Sac M2 [CSW] M2 ガン バッグ [CSW] M2槍械袋 + [CSW] M2枪械包 [CSW] M2 Gun Bag [CSW] M2 zbraň v pouzdře [CSW] M2 Gun Bag @@ -756,6 +811,7 @@ [CSW] Sac MK19 [CSW] Mk19 ガン バッグ [CSW] Mk19槍械袋 + [CSW] Mk19枪械包 [CSW] MK19 Gun Bag [CSW] MK19 zbraň v pouzdře [CSW] MK19 Gun Bag @@ -770,6 +826,7 @@ [CSW] Sac lanceur BGM-71 TOW [CSW] BGM-71 TOW ランチャー バッグ [CSW] BGM-71 拖式飛彈發射器袋 + [CSW] BGM-71 陶式导弹发射器包 [CSW] BGM-71 TOW Launcher Bag [CSW] BGM-71 TOW raketomet v pouzdře [CSW] BGM-71 TOW Launcher Bag @@ -784,6 +841,7 @@ [CSW] Sac DSHK [CSW] DShK ガン バッグ [CSW]DShK 槍械袋 + [CSW]DShK 枪械包 [CSW] DSHK Gun Bag [CSW] DSHK zbraň v pouzdře [CSW] DSHK Gun Bag @@ -798,6 +856,7 @@ [CSW] Sac tube 2B14 [CSW] 2B14 発射筒バッグ [CSW] 2B14 炮管袋 + [CSW] 2B14 炮管包 [CSW] 2B14 Tube Bag [CSW] 2B14 minometná hlaveň v pouzdře [CSW] 2B14 Tube Bag @@ -812,6 +871,7 @@ [CSW] Sac NSV [CSW] NSV ガン バッグ [CSW] NSV 槍械袋 + [CSW] NSV 枪械包 [CSW] NSV Gun Bag [CSW] NSV zbraň v pouzdře [CSW] NSV Gun Bag @@ -826,6 +886,7 @@ [CSW] Sac KORD [CSW] KORD ガン バッグ [CSW] KORD 槍械袋 + [CSW] KORD 枪械包 [CSW] KORD Gun Bag [CSW] KORD zbraň v pouzdře [CSW] KORD Gun Bag @@ -840,6 +901,7 @@ [CSW] Sac AGS-30 [CSW] AGS-30 バッグ [CSW] AGS-30 槍械袋 + [CSW] AGS-30 枪械包 [CSW] AGS-30 Gun Bag [CSW] ASG-30 zbraň v pouzdře [CSW] AGS-30 Gun Bag @@ -854,6 +916,7 @@ [CSW] Sac lanceur 9K115 Metis [CSW] 9K115 メティス ランチャー バッグ [CSW] 9K115 麥士蒂索人發射器袋 + [CSW] 9K115 麦士蒂索人反坦克发射器包 [CSW] 9K115 Metis Launcher Bag [CSW] 9K115 Metis raketomet v pouzdře [CSW] Torba na 9K115 Metis @@ -868,6 +931,7 @@ [CSW] Sac lanceur 9M113 Kornet [CSW] 9M113 コルネット ランチャー バッグ [CSW] 9M113 短號發射器 + [CSW] 9M113 短号发射器 [CSW] 9M113 Kornet Launcher [CSW] 9M113 Kornet raketomet [CSW] Wyrzutnia 9M113 Kornet @@ -882,6 +946,7 @@ Trépied SPG-9 SPG-9 三脚 SPG-9 三腳架 + SPG-9 三脚架 SPG-9 Tripod SPG-9 trojnožka SPG-9 Tripod @@ -896,6 +961,7 @@ [CSW] SPG-9 Trépied déployable [CSW] SPG-9 設置型三脚 [CSW] SPG-9 部署型三腳架 + [CSW] SPG-9 部署型三脚架 [CSW] SPG-9 Deployable Tripod [CSW] SPG-9 trojnožka [CSW] SPG-9 Deployable Tripod @@ -910,6 +976,7 @@ [CSW] Sac lanceur SPG-9 [CSW] SPG-9 ランチャー バッグ [CSW] SPG-9 發射器袋 + [CSW] SPG-9 发射器包 [CSW] SPG-9 Launcher Bag [CSW] SPG-9 raketomet v pouzdře [CSW] SPG-9 Launcher Bag @@ -924,6 +991,7 @@ [CSW] Sac lanceur SPG-9M [CSW] SPG-9M ランチャー バッグ [CSW] SPG-9M 發射器袋 + [CSW] SPG-9M 发射器包 [CSW] SPG-9M Launcher Bag [CSW] SPG-9M raketomet v pouzdře [CSW] SPG-9M Launcher Bag diff --git a/addons/dogtags/stringtable.xml b/addons/dogtags/stringtable.xml index c2fc066b3d..88f6bcbf80 100644 --- a/addons/dogtags/stringtable.xml +++ b/addons/dogtags/stringtable.xml @@ -101,6 +101,7 @@ Onscreen display for checking dogtags Anzeige um Erkennungsmarke zu überprüfen 在畫面中顯示檢查兵籍牌 + 在画面中显示检查兵籍牌 確認中のドッグタグを画面上で表示します Display su schermo per il controllo delle piastrine Wyświetlacz ekranowy dla sprawdzania nieśmiertelników diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml index b166d3dfaa..9233f9698e 100644 --- a/addons/dragging/stringtable.xml +++ b/addons/dragging/stringtable.xml @@ -61,6 +61,7 @@ Objeyi Taşı/Bırak Arrastrar/Soltar Objeto Objekt tragen/loslassen + 背负/释放物体 Item too heavy @@ -106,6 +107,7 @@ Wyżej/niżej | (Ctrl + Kółko myszy) obracanie Yükselt/Alçalt | (Ctrl + Tekerlek) Döndür Subir/Bajar | (Ctrl + Scroll) Rotar + 抬起/放低 | (Ctrl + 鼠标滚轮) 旋转 ACE Dragging @@ -116,6 +118,7 @@ ACE Arrastrar ACE Przeciąganie ACE ドラッグ + ACE拖曳系统 Allow firing while dragging @@ -126,6 +129,7 @@ Permitir disparar mientras se arrastra Pozwól na strzelanie podczas przeciągania 搬送中に射撃許可 + 允许在拖动时开火 Allow the player to fire their gun while dragging. @@ -136,6 +140,7 @@ Permite al jugador disparar mientras está arrastrando. Pozwala graczom strzelać z broni podczas przeciągania obiektów. プレイヤーが引きずっている最中でも射撃できるようにします。 + 允许玩家在拖动时开火。 diff --git a/addons/dragon/stringtable.xml b/addons/dragon/stringtable.xml index a99e3fb49c..0852c8a2f8 100644 --- a/addons/dragon/stringtable.xml +++ b/addons/dragon/stringtable.xml @@ -8,6 +8,7 @@ [CSW] M47 Super-Dragon [CSW] M47 スーパー ドラゴン [CSW] M47龍式 + [CSW] M47龙式反坦克导弹 [CSW] M47 Super-Dragon [CSW] M47 Super-Dragon [CSW] M47 Super-Dragon @@ -22,6 +23,7 @@ M47 Super-Dragon M47 スーパー ドラゴン M47 龍式 + M47龙式反坦克导弹 M47 Super-Dragon M47 Super-Dragon M47 Super-Dragon @@ -36,6 +38,7 @@ Monter le viseur 照準器を取り付ける 裝上瞄具 + 装上瞄具 Monta mirino Připojit puškohled Dołącz Optykę @@ -49,6 +52,7 @@ Démonter le viseur 照準器を外す 拆下瞄具 + 卸下瞄具 Smonta mirino Odpojit puškohled Odczep Optykę @@ -62,6 +66,7 @@ SU-36/P Daysight SU-36/P デイサイト SU-36/P 日間瞄具 + SU-36/P 常规瞄具 SU-36/P Daysight SU-36/P denní puškohled SU-36/P Celownik dzienny @@ -76,6 +81,7 @@ Un viseur léger et bon marché utilisé pour les opérations de jour.\nContient l'ordinateur de guidage pour tout le système. 昼間時に使用される軽量で、低価格の照準器です。システム全体の誘導コンピュータを備えています。 一個輕量，便宜適合日間行動使用的廉價瞄具。內含全套制導電腦系統 + 一种用于日间作战的轻型廉价瞄准具。包含整个系统的制导计算机 Una luce,un mirino usato per le operazioni diurne.Contiene il computer di guida per l'intero sistema Lehký a levný puškohled pro použití za denního světla. Obsahuje navigační počítač pro celý systém. Lekki, tani celownik używany do działania w trakcie dnia. Zawiera komputer naprowadząjący dla całego systemu @@ -89,6 +95,7 @@ Un missile filoguidé SACLOS, présentant une caractéristique de vol exceptionnelle. 特徴的な飛行特性を持つ、ワイヤ誘導の SACLOS ミサイルです。 一個有線制導半自動指令型飛彈並有著獨特的飛航動作 + 具有独特飞行特性的线导半自动指令型导弹 Un missile SACLOS filo-guidato con uniche caratterische di volo Drátem naváděná SACLOS raketa s unikátními letovými vlastnostmi Naprowadzany przewodowo rakietowy pocisk SACLOS o unikalnej charakterystyce lotu diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml index 4143426314..5ce9e62dc7 100644 --- a/addons/explosives/stringtable.xml +++ b/addons/explosives/stringtable.xml @@ -825,7 +825,7 @@ Punisci non-specialisti? 非特技兵へ足かせ 비-전문가에 불이익을 줍니까? - 折磨非专业人员? + 惩罚非专业人士？ 折磨非專業人員? @@ -1054,6 +1054,7 @@ Timer de explosão Minuteur pour explosifs 引爆倒數 + 定时爆炸 Časovač exploze Patlayıcı Zamanlayıcı Temporizador de explosivo @@ -1064,6 +1065,7 @@ EOD に Spécialiste en explosifs 是EOD + 爆破专家 è EOD Je specilista na výbušniny (EOD) Jest EOD @@ -1076,6 +1078,7 @@ ユニットが何であれ爆発物専門家にします。 Définit si l'unité est un spécialiste en explosifs. 控制該單位是否是爆裂物處置專家 + 控制该单位是否是爆破专家 Controlla se l'unità è uno specialista di esplosivi. Určuje jestli je jednotka specialista na výbušniny. Kontroluje, czy jednostka jest specjalistą od materiałów wybuchowych. @@ -1090,6 +1093,7 @@ Tiempo mínimo Minimalny czas Minimale Zeit + 最短时间 Maximum Time @@ -1099,6 +1103,7 @@ Tiempo máximo Maksymalny czas Maximale Zeit + 最长时间 Default Time @@ -1108,6 +1113,7 @@ Tiempo por defecto Domyślny czas Standardmäßige Zeit + 默认时间 Minimum time value (in seconds) for the explosive timer. @@ -1117,6 +1123,7 @@ Tiempo mínimo (en segundos) para el temporizador del explosivo. Minimalna wartość czasomierza dla ładunku (w sekundach). Minimale Zeit (in Sekunden) für den Zeitzünder. + 定时爆炸的最短时间（单位：秒） Maximum time value (in seconds) for the explosive timer. @@ -1126,6 +1133,7 @@ Tiempo máximo (en segundos) para el temporizador del explosivo. Maksymalna wartość czasomierza dla ładunku (w sekundach). Maximale Zeit (in Sekunden) für den Zeitzünder. + 定时爆炸的最长时间（单位：秒） Default time value (in seconds) for the explosive timer. @@ -1135,6 +1143,7 @@ Tiempo por defecto (en segundos) para el temporizador del explosivo. Domyślna wartość czasomierza dla ładunku (w sekundach). Standardmäßige Zeit (in Sekunden) für den Zeitzünder. + 定时爆炸的默认时间（单位：秒） diff --git a/addons/fastroping/stringtable.xml b/addons/fastroping/stringtable.xml index 839bbc5e2a..7ca41f451e 100644 --- a/addons/fastroping/stringtable.xml +++ b/addons/fastroping/stringtable.xml @@ -168,6 +168,8 @@ 3m halat sal Desplegar cuerdas de 3m 3m ロープを展開 + 部屬3公尺長之繩索 + 部署3米长的绳索 Deploy 6m ropes @@ -181,6 +183,8 @@ 6m halat sal Desplegar cuerdas de 6m 6m ロープを展開 + 部屬6公尺長之繩索 + 部署6米长的绳索 Deploy 12m ropes @@ -191,6 +195,7 @@ Выпустить 12 м канат Jogar cordar (12m) 部屬12公尺長之繩索 + 部署12米长的绳索 Dispiegamento corde 12m Připravit 12m lana 12m halat sal @@ -205,6 +210,7 @@ Выпустить 15 м канат Jogar cordar (15m) 部屬15公尺長之繩索 + 部署15米长的绳索 Dispiegamento corde 15m Připravit 15m lana 15m halat sal @@ -219,6 +225,7 @@ Выпустить 18 м канат Jogar cordar (18m) 部屬18公尺長之繩索 + 部署18米长的绳索 Dispiegamento corde 18m Připravit 18m lana 18m halat sal @@ -233,6 +240,7 @@ Выпустить 27 м канат Jogar cordar (27m) 部屬27公尺長之繩索 + 部署27米长的绳索 Dispiegamento corde 27m Připravit 27m lana 27m halat sal @@ -247,6 +255,7 @@ Выпустить 36 м канат Jogar cordar (36m) 部屬36公尺長之繩索 + 部署36米长的绳索 Dispiegamento corde 36m Připravit 36m lana 36m halat sal @@ -261,6 +270,7 @@ [ACE] Ящик с канатами [ACE] Suprimento de cordas [ACE] 繩索補充箱 + [ACE] 绳索补给箱 [ACE] Cassa Corde [ACE] Bedna s lany [ACE] Halat Sandığı @@ -270,6 +280,7 @@ Fast-roping Hélicordage 快速繩降 + 快速索降 ファスト ロープ Cuerdas rápidas Zjazd na linach @@ -287,6 +298,7 @@ Требуется канат Requer uma corda para jogar 需要繩索來部屬 + 需要绳索来部署 Richiede una corda per il dispigamento Požadovat předmět lana pro slaňování Requiere una cuerda para desplegar diff --git a/addons/field_rations/stringtable.xml b/addons/field_rations/stringtable.xml index 373a16444c..c2594dc797 100644 --- a/addons/field_rations/stringtable.xml +++ b/addons/field_rations/stringtable.xml @@ -4,7 +4,7 @@ ACE Field Rations ACE 戰地口糧 - ACE 干粮 + ACE 野战军粮 ACE Poměrové pole ACE Rations sur le terrain ACE Feld Rationen @@ -22,6 +22,7 @@ ACE Field Rations HUD ACE Feldrationen HUD ACE 戰地口糧界面 + ACE 野战军粮界面 ACE フィールド レーション HUD ACE HUD Racji Polowych Индикаторы жажды и голода @@ -30,7 +31,7 @@ Indicates current hunger and thirst status. 顯示目前的飲食需求程度。 - 指示当前的饥饿和渴望状态。 + 显示当前的饥饿和渴望状态。 Označuje aktuální stav hladovění a žízní. Indique l'état actuel de la faim et de la soif. Zeigt den aktuellen Hunger- und Durststatus an. @@ -68,11 +69,12 @@ Есть/Пить Yeme / Içme 食べる/飲む + 吃/喝 Enable/Disable Field Rations 啟用/禁用戰地口糧。 - 启用/禁用字段口粮 + 启用/禁用野战军粮 Povolit / zakázat příděly v polích Activer / désactiver les rations de champ Feldrationen aktivieren / deaktivieren @@ -89,7 +91,7 @@ Time Without Water 水份需時 - 没有水的时候 + 脱水时间 Czas bez wody Temps sans eau Zeit ohne Wasser @@ -106,7 +108,7 @@ How long should a person be able to go without water (hours). 一個單位脫水之前能支撐多久（單位為小時）。 - 一个单位能够没有水的时间多少（小时） + 一个单位在脱水的情况下能够支撑多久（小时） Jak dlouho by měla jednotka jít bez vody (hodiny) Combien de temps une unité devrait-elle pouvoir se passer d'eau (heures)? Wie lange sollte eine Einheit ohne Wasser auskommen (Stunden)? @@ -123,7 +125,7 @@ Time Without Food 飢餓需時 - 没有食物的时间 + 饥饿时间 Čas bez jídla Temps sans nourriture Zeit ohne Essen @@ -140,7 +142,7 @@ How long should a person be able to go without food (hours). 一個單位挨餓之前能支撐多久（單位為小時）。 - 一个单位能够没有食物的时间多少（小时） + 一个单位挨饿的情况下能够支撑多久（小时） Jak dlouho by měla jednotka jít bez jídla (hodiny) Combien de temps une unité doit-elle pouvoir se passer de nourriture (heures)? Wie lange sollte eine Einheit ohne Essen gehen können (Stunden)? @@ -158,6 +160,7 @@ Thirst Quenched Durst gestillt 止渴程度 + 解渴程度 乾きの満たし Утоление жажды Pragnienie zaspokojone @@ -167,6 +170,7 @@ Coefficient for the amount of thirst quenched from drinking. Koeffizient für die Menge des Dursts, der durch Trinken gestillt wird. 從飲用中能夠攝取多少水份。 + 通过喝水能够补充多少水份。 飲むことによって得られる乾きの満たし量の係数を設定します Коэффициент утоления жажды от питья Współczynnik ilości zaspokojnego pragnienia od picia @@ -176,6 +180,7 @@ Hunger Satiated Hunger gesättigt 飽足感 + 饱腹感 満腹感 Утоление голода Głód Zaspokojony @@ -185,6 +190,7 @@ Coefficient for the amount of hunger satiated from eating. Koeffizient für die Menge des Hungers, der durch essen gesättigt wird. 從飲食中獲取多少飽食感。 + 通过饮食能够补充多少能量。 食べることによって得られる満腹感の量の係数を設定します Коэффициент утоления голода от принятия пищи Współczynnik ilosci zaspokojnego głodu od jedzenia @@ -197,6 +203,7 @@ Su Içme Animasyonu 水源動作 Wasserquellen-Aktionen + 水源动作 Controls what actions are available on water sources. @@ -205,6 +212,7 @@ Su içerken hangi animasyonu yapacağını belirler 水源で可能な動作を設定します。 Bestimmt, welche Aktionen an Wasserquellen verfügbar sind. + 控制对水源可用的动作。 Refill Only @@ -213,6 +221,7 @@ Sadece içeceği iç 汲むだけ Nur Befüllen + 仅限取水 Terrain Object Actions @@ -221,6 +230,7 @@ Varsayılan Nesne Animasyonu マップ オブジェクト動作 Geländeobjekt-Aktionen + 地形对象动作 Enables water source actions for terrain objects. @@ -229,11 +239,13 @@ Varsayılan nesneler için animasyonu etkinleştir マップに存在するオブジェクトを水源として動作するよう設定できます。 Aktiviert Wasserquellen-Aktionen für Geländeobjekte. + 为地形对象启用水源动作。 Affect Advanced Fatigue Beeinflusst die erweiterte Ausdauer 與進階疲勞聯動 + 与进阶疲劳联动 アドバンスド ファティーグへの影響 Влияние на продвинутую усталость Wpływ na zaawansowane zmęczenie @@ -243,6 +255,7 @@ Controls if thirst and hunger should affect ACE Advanced Fatigue. Bestimmt, ob Durst und Hunger ACE Erweiterte Ausdauer beeinflussen sollen. 是否讓飲食影響到ACE的進階疲勞。 + 是否让饮食影响到ACE的进阶疲劳。 喉の渇きと空腹感が ACE アドバンスド ファティーグへ与える影響を決定します Определяет, будет ли жажда и голод влиять на продвинутую усталость ACE. Kontroluje czy pragnienie i głód mają wpływ na zaawansowane zmęczenie ACE. @@ -252,6 +265,7 @@ HUD Type HUD Typ 界面類型 + 界面类型 HUD タイプ Typ HUD Тип индикаторов @@ -261,6 +275,7 @@ Selects which HUD style will be used. Wählt, welcher HUD Stil benutzt wird. 選擇妳想使用的界面類型。 + 选择你想使用的界面类型。 使用する HUD のタイプを選択できます Wybierz który styl HUD będzie używany Выберите какой стиль индикаторов будет использован. @@ -270,6 +285,7 @@ Colored Icons Farbige Icons 顏色化圖示 + 彩色图标 色付きアイコン Kolorowe ikony Цветные иконки @@ -279,6 +295,7 @@ Draining Icons Farblose Icons 增減化圖示 + 渐化图标 ドレイン アイコン Ubywające ikony Исчезающие иконки @@ -288,6 +305,7 @@ HUD Show Level HUD zeigen Level 界面顯示程度 + 界面显示程度 HUD 表示レベル Widok HUD Уровень для отображения иконок @@ -297,6 +315,7 @@ Automatically show the HUD when either thirst or hunger are above this level. Zeigt automatisch das HUD an, sobald Durst oder Hunger über diesem Level sind. 在飲食低於多少程度時顯示界面。 + 在饮食能量低于多少程度时显示界面。 この値以上に空腹感か乾きを感じると自動的に HUD を表示します Automatycznie pokaż HUD kiedy pragnienie albo głód przekroczy ten poziom Автоматически отображает иконки при достижении определенных уровней голода и жажды. @@ -323,6 +342,7 @@ Colored Icons - Transparency Farbige Icons - Transparenz 顏色化圖示 - 透明度 + 彩色图标 - 透明度 色付きアイコン - 透明度 Kolorowe ikony - transparentność Прозрачность цветных иконок @@ -332,6 +352,7 @@ Controls the transparency of the Colored Icons HUD. Dynamic setting makes the HUD less transparent as thirst or hunger increase. Bestimmt die Tranzparenz der farbigen HUD Icons. Die Dynamische Einstellung macht das HUD weniger transparent, wenn Hunger oder Durst steigen. 控制顏色化圖示的透明度。設定為動態使其界面透明度與飲食需求一樣，越透明越需要。 + 控制彩色图标HUD的透明度。动态设置使HUD的透明度随着口渴或饥饿的增加而减弱。 Kontroluje transparentność kolorowych ikon HUD. Dynamiczne ustawienie zmniejsza przejrzystość wraz z zwiększeniem głodu czy pragnienia. 色付きアイコンの透明度を決定できます。動的に設定されると、喉の渇きや空腹感が増すにつれて、アイコンの透明度を下げます。 Настраивает прозрачность цветных иконок. «Динамическая» делает иконки менее прозрачными при увеличении жажды и голода. @@ -358,6 +379,7 @@ Water Supply Wasservorrat 飲用水補給 + 饮用水补给 水資源 Водные ресурсы Źródło wody @@ -366,6 +388,7 @@ The amount of water available for ACE Field Rations water source actions (-1 disabled, -10 infinite) Die Menge des für ACE Feldrationen Wasserquellenaktionen verfügbaren Wassers (-1 ausgeschaltet, -10 unendlich) 水源可供補充飲用水的次數（-1為關閉，-10為無限次）。 + 水源可供取水的次数（-1为关闭，-10为无限次）。 ACE フィールド レーションで利用できる水源の量を設定できます。(-1で無効化、-10で無限) Количество воды, доступной для использования в ACE Полевые рационы. (-1 - отключено, -10 - бесконечно) Ilość wody dostępnej dla Akcji ACE Źródła wody (-1 wyłączone, -10 nieskończone) @@ -374,6 +397,7 @@ Water Source Wasserquelle 水源 + 水源 水源 Źródło wody Источник воды @@ -383,6 +407,7 @@ Check Remaining Water Überprüfe verbleibendes Wasser 檢查剩餘飲用水 + 检查剩余饮用水 残っている水を確認 Sprawdź ilość wody Проверить остаток воды @@ -392,6 +417,7 @@ Checking remaining water... Überprüfe verbleibendes Wasser... 檢查剩下的飲用水... + 检查剩余饮用水中... 残っている水量を確認中です・・・ Sprawdzanie ilości wody Проверяется остаток воды... @@ -401,6 +427,7 @@ There are %1 litres left. Es sind %1 Liter übrig. 那還有 %1 公升 + 还剩下 %1 升 残り %1 リットル残っています。 Pozostało %1 litrów. Осталось %1 л воды @@ -410,6 +437,7 @@ There is no water left. Es ist kein Wasser mehr übrig. 水已經用完了 + 水已经喝完了。 水はもうありません。 Nie ma wody Воды больше не осталось @@ -422,11 +450,12 @@ Pij z źródła wody Mataradan Iç 水源から飲む + 从水源处喝水 Refill 重新補充 - 笔芯 + 重新取水 Doplňte Recharge Nachfüllung @@ -443,7 +472,7 @@ Refilling... 補充中... - 加... + 取水中... Doplňování... Remplissage ... Nachfüllen... @@ -460,7 +489,7 @@ Item Refilled 物品重新補充 - 项目重新填充 + 物品已重新补充 Položka je vyplněna Article rechargé Artikel nachgefüllt @@ -478,6 +507,7 @@ Eating %1... Esse %1... 食用 %1... + 食用 %1... %1を食べています・・・ Jedzenie %1... Поедание %1... @@ -487,6 +517,7 @@ Drinking %1... Trinke %1... 飲用自 %1... + 饮用 %1... %1を飲んでいます・・・ Picie %1... Выпивание %1... @@ -496,6 +527,7 @@ Drinking from %1... Trinke von %1... 飲用%1的水中... + 从%1饮用中... %1から飲んでいます・・・ Picie z %1... Выпивание из %1... @@ -508,11 +540,12 @@ Mataradan Içiliyor... 水源から飲んでいます・・・ Trinke von Quelle... + 从水源处喝水中... Water Bottle 飲用水 - 水瓶 + 矿泉水 Láhev na vodu Bouteille d'eau Wasserflasche @@ -529,7 +562,7 @@ A water bottle 一罐裝滿水的寶特瓶 - 一个水瓶 + 一罐装满水的矿泉水瓶 Láhev s vodou Une bouteille d'eau Eine Wasserflasche @@ -546,7 +579,7 @@ Water Bottle (Half) 飲用水（半罐） - 水瓶（一半） + 矿泉水（半瓶） Vodní láhev (poloviční) Bouteille d'eau (la moitié) Wasserflasche (Hälfte) @@ -563,7 +596,7 @@ A half full water bottle 一罐裝滿半罐水的寶特瓶 - 半满水瓶 + 半瓶矿泉水 Polní plná láhev s vodou Une bouteille d'eau à moitié pleine Eine halbvolle Wasserflasche @@ -580,7 +613,7 @@ Water Bottle (Empty) 空寶特瓶 - 水瓶（空） + 矿泉水（空） Láhev s vodou (prázdné) Bouteille d'eau (vide) Wasserflasche (leer) @@ -597,7 +630,7 @@ An empty water bottle 一個空寶特瓶 - 一个空的水瓶 + 一个空的矿泉水瓶 Prázdná láhev s vodou Une bouteille d'eau vide Eine leere Wasserflasche @@ -614,7 +647,7 @@ Canteen 水壺 - 食堂 + 水壶 Jídelna Cantine Feldflasche @@ -631,7 +664,7 @@ A canteen filled with water 一個裝滿水的水壺 - 一个装满水的食堂 + 一个装满水的水壶 Jídelna naplněná vodou Une cantine remplie d'eau Eine Feldflasche mit Wasser gefüllt @@ -648,7 +681,7 @@ Canteen (Half) 水壺（半罐） - 食堂（一半） + 水壶（半壶） Jídelna (poloviční) Cantine (Demi) Feldflasche (halb) @@ -665,7 +698,7 @@ A canteen half filled with water 剩下一半水的水壺 - 食堂一半装满了水 + 剩一半水的水壶 Jídelna naplněná vodou Une cantine à moitié remplie d'eau Eine Feldflasche zur Hälfte mit Wasser gefüllt @@ -682,7 +715,7 @@ Canteen (Empty) 水壺（空） - 食堂（空） + 水壶（空） Jídelna (prázdné) Cantine (Vide) Feldflasche (leer) @@ -699,7 +732,7 @@ An empty canteen 一個空的水壺 - 一个空的食堂 + 一个空的水壶 Prázdná jídelna Une cantine vide Eine leere Feldflasche @@ -717,6 +750,7 @@ Refreshing lemon and lime flavored soft drink Ein erfrischender Softdrink mit Zitronen- und Limettengeschmack. 清新檸檬以及有著酸橙味的汽水 + 清爽的柠檬和青柠味汽水 新鮮なレモンとライムの風味を味わえるソフト ドリンク Odświeżający napój cytronowo-limonkowy Освежающий напиток со вкусом лимона и лайма @@ -726,6 +760,7 @@ Orange flavored soft drink with a tingly, fruity taste Ein nach Orange schmeckender Softdrink mit einem prickelndem und fruchtigem Geschmack 有著微微的橘子水果味的汽水 + 橙子味汽水，有刺鼻的水果味 口いっぱいに果物を感じるオレンジ風味のソフト ドリンク Napój pomarańczowy Напиток с апельсиновым вкусом @@ -735,6 +770,7 @@ Red Gull gives you wings Red Gull verleiht Flügel 紅鷹讓你猛虎添翼 + 红鹰让你猛虎添翼 レッドガルは翼をさずける Red Gull doda ci skrzydeł Рэд Гулл окрыляет! @@ -743,7 +779,7 @@ MRE Lamb Curry 軍糧 羊肉咖哩 - MRE羊肉咖喱 + MRE羊肉咖喱饭 MRE jehněčí kari MRE Curry d'agneau EPA Lamm Curry @@ -760,7 +796,7 @@ An MRE containing Lamb Curry. Heat for best effect 含有羊肉咖哩的軍用口糧。加熱以達到最佳效果 - 含有羊肉咖喱的MRE。加热以达到最佳效果 + 含有羊肉咖喱饭的MRE。加热以达到最佳效果 MRE obsahující Lamb Curry. Teplo pro nejlepší efekt Un MRE contenant du Curry d'agneau. Chaleur pour le meilleur effet Eine EPA mit Lamm Curry. Für den besten Geschmack erhitzen. @@ -778,6 +814,7 @@ MRE Beef Stew EPA Rindereintopf 軍糧 牛肉燉湯 + MRE炖牛肉汤 MRE ビーフ シチュー MRE Gulasz wołowy ИРП Тушеная говядина @@ -787,6 +824,7 @@ An MRE containing Beef Stew. Heat for best effect Eine EPA, welche Rindereintopf beeinhaltet. Für den besten Geschmack erhitzen. 含有牛肉燉湯的軍用口糧。加熱以達到最佳效果 + 含有牛肉炖汤的MRE。加热以达到最佳效果 ビーフ シチューの MRE。温めるとなお美味しい MRE zawierające gulasz wołowy. Podgrzej dla najlepszego efektu Сухой паёк, содержащий тушеную говядину. Перед употреблением рекомендуется разогреть @@ -812,7 +850,7 @@ An MRE containing Cream Tomato Soup. Mix with water and heat for best effect 含有奶油番茄湯的軍用口糧。 用水和熱混合以獲得最佳效果 - 含有奶油番茄汤的MRE。 用水和热混合以获得最佳效果 + 含有奶油番茄汤的MRE。添水加热以获得最佳效果 MRE obsahující krémovou rajčatovou polévku. Směs s vodou a teplem pro nejlepší efekt Un MRE contenant de la soupe à la tomate et à la crème. Mélanger avec de l'eau et chauffer pour obtenir le meilleur effet Eine EPA mit Creme Tomatensuppe. Für beste Wirkung mit Wasser und Hitze mischen. @@ -846,7 +884,7 @@ An MRE containing Chicken Soup. Mix with water and heat for best effect 含有雞湯的軍用口糧。 用水和熱混合以獲得最佳效果 - 含有鸡汤的MRE。 用水和热混合以获得最佳效果 + 含有鸡汤的MRE。添水加热以获得最佳效果 MRE obsahující kuřecí polévku. Směs s vodou a teplem pro nejlepší efekt Un MRE contenant une soupe au poulet. Mélanger avec de l'eau et chauffer pour obtenir le meilleur effet Eine EPA mit Hühnersuppe. Für beste Wirkung mit Wasser und Hitze mischen. @@ -880,7 +918,7 @@ An MRE with Chicken Tikka Masala. Heat for best effect 含有瑪撒拉雞的軍用口糧。 用水和熱混合以獲得最佳效果 - 与鸡Tikka马萨拉MRE。 加热以达到最佳效果 + 与鸡Tikka马萨拉MRE。加热以达到最佳效果 MRE s kuřecím masem Tikka Masala. Teplo pro nejlepší efekt Un MRE avec du poulet Tikka Masala. Chaleur pour le meilleur effet Eine EPA mit Hühnchen Tikka Masala. Für den besten Geschmack erhitzen. @@ -914,7 +952,7 @@ An MRE containing Steak and Vegetables. Heat for best effect 包含牛排和蔬菜的軍用口糧。 加熱以達到最佳效果 - 包含牛排和蔬菜的MRE。 加热以达到最佳效果 + 包含牛排和蔬菜的MRE。加热以达到最佳效果 MRE obsahující steak a zeleninu. Teplo pro nejlepší efekt Un MRE contenant du bifteck et des légumes. Chaleur pour le meilleur effet Eine EPA mit Steak und Gemüse. Für den besten Geschmack erhitzen. @@ -948,7 +986,7 @@ An MRE containing Meatballs and Pasta. Heat for best effect 含有肉丸和意大利麵的軍用口糧。 加熱以達到最佳效果 - 含有肉丸和意大利面的MRE。 加热以达到最佳效果 + 含有肉丸和意大利面的MRE。加热以达到最佳效果 MRE obsahující maso a těstoviny. Teplo pro nejlepší efekt Un MRE contenant des boulettes de viande et des pâtes. Chaleur pour le meilleur effet Eine EPA mit Fleischbällchen und Pasta. Für den besten Geschmack erhitzen. @@ -982,7 +1020,7 @@ An MRE containing Chicken with Herb Dumplings. Heat for best effect 含有雞肉和香草餃子的軍用口糧。 加熱以達到最佳效果 - 含有鸡肉和香草饺子的MRE。 加热以达到最佳效果 + 含有鸡肉和香草饺子的MRE。加热以达到最佳效果 MRE obsahující kuře s bylinkovými knedlíky. Teplo pro nejlepší efekt Un MRE contenant du poulet et des dumplings aux fines herbes. Chaleur pour le meilleur effet Eine EPA mit Hühnchen mit Kräuterknödeln. Für den besten Geschmack erhitzen. @@ -999,7 +1037,7 @@ Humanitarian Ration 人道主義口糧 - 人道主义配给 + 人道主义口粮 Humanitární poměr Ration humanitaire Humanitäre Ration @@ -1015,7 +1053,7 @@ A Humanitarian Ration intended to serve as a person's food supply during crises 人道主義口糧意圖在危機期間充當人的食物供應 - 人道主义配额意图在危机期间充当人的食物供应 + 用于危机期间个人食物供应的人道主义口粮。 Humanitární rada, která má sloužit jako zásobování potravinami během krizí Une ration humanitaire destinée à servir d'approvisionnement alimentaire en cas de crise Eine humanitäre Ration, die dazu bestimmt ist, in Krisenzeiten als Nahrung für eine Person zu dienen diff --git a/addons/fire/stringtable.xml b/addons/fire/stringtable.xml index 0fbb1d8b68..239894b570 100644 --- a/addons/fire/stringtable.xml +++ b/addons/fire/stringtable.xml @@ -9,6 +9,7 @@ ACE Feuer ACE Ogień ACE Fuego + ACE 火灾 Pat Down Fire @@ -18,6 +19,7 @@ Feuer löschen Zgaś ogień Extingir el fuego + 灭火 Patting Down Fire @@ -27,6 +29,7 @@ Feuer wird gelöscht... Gaszenie ognia Extinguiendo el Fuego + 正在灭火 Allow units to catch fire @@ -36,6 +39,7 @@ Erlaubt, dass Einheiten Feuer fangen können Zezwól jednostkom na zapalenie się Permitir que las unidades se incendien + 允许单位着火 Enable fire-flare at night @@ -45,6 +49,7 @@ Aktiviert Feuerschein bei Nacht. Włącza efekt flary od ognia w nocy Habilitar bengalas de fuego por la noche + 在夜间启用耀斑效果 Uses a flare effect to increase fire intensity at night @@ -54,24 +59,29 @@ Benutzt einen Feuerschein-Effekt um die Intensität des Feuers bei Nacht zu verstärken. Używa efektu flary, aby zwiększyć jasność w nocy Utiliza un efecto de bengala para aumentar la intensidad del fuego por la noche + 启用耀斑效果，增加夜间火焰的强度。 Enable screams by units on fire Habilitar los gritos de las unidades en llamas + 启用着火单位发出惨叫声 Enables if units on fire will play the screaming sound Habilita si las unidades en llamas reproducirán el sonido de los gritos + 启用着火的单位是否会发出惨叫声。 Drop Weapons When on Fire Soltar armas cuando esté en llamas Włącz wyrzucanie broni podczas płonięcia + 着火时扔掉武器 Controls whether units drop their weapons when on fire. Controla si las unidades dejan caer sus armas cuando están en llamas Powoduje że jednostki wyrzucają swoją broń gdy płoną. + 控制单位在着火时是否丢掉武器。 diff --git a/addons/flashlights/stringtable.xml b/addons/flashlights/stringtable.xml index 16aaea33e4..94bda7a770 100644 --- a/addons/flashlights/stringtable.xml +++ b/addons/flashlights/stringtable.xml @@ -117,6 +117,7 @@ Maglite ML300L Maglite ML300L Maglite ML300L + Maglite ML300L强光手电筒 Maglite ML300L Maglite ML300L Maglite ML300L @@ -130,6 +131,7 @@ Leistungsstarke LED-Taschenlampe. Mocna latarka LED. 強大的LED手電筒 + 强光LED手电筒。 Torcia a LED ad alta potenza Silná LED svítilna. Puissante lampe torche à LED. diff --git a/addons/flashsuppressors/stringtable.xml b/addons/flashsuppressors/stringtable.xml index 03b30aeeba..3f990e6135 100644 --- a/addons/flashsuppressors/stringtable.xml +++ b/addons/flashsuppressors/stringtable.xml @@ -14,7 +14,7 @@ Bocacha (6,5 mm) 消炎器 (6.5 mm) 소염기 (6.5 mm) - 消光器 (6.5 mm) + 消焰器 (6.5 mm) 消光器 (6.5 毫米) Flash Suppressor (6.5 mm) @@ -31,7 +31,7 @@ Bocacha (7,62 mm) 消炎器 (7.62 mm) 소염기 (7.62 mm) - 消光器 (7.62 mm) + 消焰器 (7.62 mm) 消光器 (7.62 毫米) Flash Suppressor (7.62 mm) @@ -48,7 +48,7 @@ Bocacha (5,56 mm) 消炎器 (5.56 mm) 소염기 (5.56 mm) - 消光器 (5.56 mm) + 消焰器 (5.56 mm) 消光器 (5.56 毫米) Flash Suppressor (5.56 mm) @@ -65,7 +65,7 @@ Bocacha (.45 ACP) 消炎器 (.45 ACP) 소염기 (.45 ACP) - 消光器 (.45 ACP) + 消焰器 (.45 ACP) 消光器 (.45 ACP) Flash Suppressor (.45 ACP) @@ -82,7 +82,7 @@ Bocacha (9 mm) 消炎器 (9 mm) 소염기 (9 mm) - 消光器 (9 mm) + 消焰器 (9 mm) 消光器 (9 毫米) Flash Suppressor (9 mm) @@ -99,7 +99,7 @@ Bocacha (.338) 消炎器 (.338) 소염기 (.338) - 消光器 (.338) + 消焰器 (.338) 消光器 (.338) Flash Suppressor (.338) @@ -116,7 +116,7 @@ Bocacha (9,3 mm) 消炎器 (9.3 mm) 소염기 (9.3 mm) - 消光器 (9.3 mm) + 消焰器 (9.3 mm) 消光器 (9.3 毫米) Flash Suppressor (9.3 mm) diff --git a/addons/fortify/stringtable.xml b/addons/fortify/stringtable.xml index 48e69198c3..dd7ebe1882 100644 --- a/addons/fortify/stringtable.xml +++ b/addons/fortify/stringtable.xml @@ -52,6 +52,7 @@ Inşa etme sistemini bazı temel parametrelerle başlatır. <br/> Ön ayarlar configFile ve missionConfigFile'dan alınır, format için wiki'ye bakın. 要塞システムを初期設定に戻します。<br/>プリセットは configfile と missionConfigFile から参照されます。詳細は wiki を参照してください。 Initialisiert das Verstärken-System, mit grundlegenden Einstellungen <br/>Vorseinstellungen werden aus der configFile und der missionConfigFile gezogen, für mehr Informationen: siehe das ACE Wiki. + 使用一些基本参数初始化要塞系统。<br/>预设从configFile和missionConfigFile中提取，参见wiki的格式。 Rotate @@ -159,24 +160,31 @@ Time-Cost Coefficient + 时间-成本系数 Coefficient used to determine time to build structure.<br/>A in Ax + b where x is cost of object + 用于确定建造建筑所需时间的系数。<br/>A是Ax+b中的一个参数，其中x是物体的成本 Minimum Build Time + 最短建造时间 Minimum time to build any structure.<br/>b in Ax + b where x is cost of object + 建造任何建筑的最短时间。<br/>b是Ax+b中的一个参数，其中x是物体的成本 Building + 建造 Create map markers + 创建地图标记 Create map markers that look like terrain buildings when static fortifications are placed + 在放置静态防御工事时，创建看起来像地形建筑的地图标记 Never @@ -196,6 +204,7 @@ For units friendly to the placer + 对放置者友军单位 For everyone @@ -220,6 +229,7 @@ Küçük 小型 Klein + 小型 Small (Green) @@ -228,6 +238,7 @@ Küçük (Yeşil) 小型 (グリーン) Klein (Grün) + 小型(绿色) Medium @@ -236,6 +247,7 @@ Orta 中型 Mittel + 中型 Medium (Green) @@ -244,6 +256,7 @@ Orta (Yeşil) 中型 (グリーン) Mittel (Grün) + 中型(绿色) Big @@ -252,6 +265,7 @@ Büyük 大型 Groß + 大型 Big (Green) @@ -260,6 +274,7 @@ Büyük (Yeşil) 大型 (グリーン) Groß (Grün) + 大型(绿色) diff --git a/addons/gforces/stringtable.xml b/addons/gforces/stringtable.xml index 3831ec8739..621d87fed5 100644 --- a/addons/gforces/stringtable.xml +++ b/addons/gforces/stringtable.xml @@ -10,6 +10,7 @@ ACE G-Kuvveti ACE Fuerza G ACE G-Kräfte + ACE G力 Gforces Effects @@ -67,6 +68,7 @@ G-Kuvvet Katsayısı Coeficiente de Fuerza G G-Kräfte-Koeffizient + G力系数 Controls strength of G-Force affecting players. @@ -77,6 +79,7 @@ Oyuncuları etkileyen G-Force'un gücünü kontrol eder. Controla la intensidad de fuerza G que afecta a los jugadores. Bestimmt, wie stark G-Kräfte Spieler beeinflussen. + 控制影响玩家的G力的强度。 diff --git a/addons/goggles/stringtable.xml b/addons/goggles/stringtable.xml index 8d5005660e..99f97702b5 100644 --- a/addons/goggles/stringtable.xml +++ b/addons/goggles/stringtable.xml @@ -139,6 +139,7 @@ Ukaž Vyčistit brýle v menu Interakce (vlastní) ゴーグル拭き取りをｾﾙﾌ ｲﾝﾀﾗｸｼｮﾝに表示 在自我互動中顯示擦拭護目鏡的動作 + 在自我互动中显示擦拭护目镜的动作 Afficher l'interaction "Essuyer les lunettes" Mostra a auto-interação de limpar os óculos Mostrar limpiar gafas en menú de auto-interacción diff --git a/addons/grenades/stringtable.xml b/addons/grenades/stringtable.xml index 0cd8a020bc..ad40c77548 100644 --- a/addons/grenades/stringtable.xml +++ b/addons/grenades/stringtable.xml @@ -158,6 +158,7 @@ CTS 7290 9-bang Flash Grenade CTS 7290 9-fach Blendgranate CTS 7290-9 9閃 閃光彈 + CTS 7290 9闪 闪光弹 CTS 7290 9- Flash bang Grenade CTS 7290 9 ranný oslepující granát CTS 7290 9-bang 閃光手榴弾 @@ -446,6 +447,7 @@ Тип: Осветительная ракета - звезда на парашюте Tipo: Sinalizador de pára-quedas estrela 類型：星式帶傘照明彈 + 类型：星式带伞照明弹 Type : Fusée éclairante à parachute Typ: Světlice s padákem Tür: Yıldız Paraşüt Fişeği @@ -460,6 +462,7 @@ M583 Осветит. ракета (Белая) M583 Sinalizador de Iluminação (Branco) M583 照明彈（白色） + M583 照明弹（白色） M583 Fusée éclairante (Blanche) M583 Světlice (Bílá) M583 Aydınlatma Fişeği (Beyaz) @@ -474,6 +477,7 @@ M662 Осветит. ракета (Красная) M662 Sinalizador de Iluminação (Vermelho) M662 照明彈（紅色） + M662 照明弹（红色） M662 Fusée éclairante (Rouge) M662 Světlice (Červená) M662 Aydınlatma Fişeği (Kırmızı) @@ -488,6 +492,7 @@ M661 Осветит. ракета (Зеленая) M661 Sinalizador de Iluminação (Verde) M661 照明彈（綠色） + M661 照明弹（绿色） M661 Fusée éclairante (Verte) M661 Světlice (Zelená) M661 Aydınlatma Fişeği (Yeşil) @@ -502,6 +507,7 @@ Тип: ИК-осветительная ракета на парашюте Tipo: Sinalizador Infravermelho de Pára-quedas 類型：帶傘型紅外線照明彈 + 类型：带伞型红外照明弹 Type : Fusée IR à parachute Typ: Infračervená světlice s padákem Tip : Paraşüt IR Flare @@ -516,6 +522,7 @@ M992 ИК-осветительная ракета M992 Sinalizador de Iluminação Infravermelho M992 紅外線照明彈 + M992 红外照明弹 M992 Fusée IR M992 Infračervená světlice M992 Illumination IR Flare @@ -529,6 +536,7 @@ Carga de mochila explosiva (Lanzable) Pakiet ładunków wybuchowych (Rzucany) Rucksackladung (Werfbar) + 炸药包（可投掷） Type: Charge<br />Rounds: 1<br />Used on: Things that need to die @@ -538,6 +546,7 @@ Tipo: Carga<br />Unidades: 1<br />Usada: Cosas que necesitan morir Typ: Ładunek<br/>Naboje: 1<br/>Użycie: Na rzeczach które mają zginąć Typ: Ladung <br/>Patronen:1<br/>Benutzt für: Dinge die Sterben müssen + 类型：炸药<br />数量：1<br />用于：需要死亡的事物 An explosive satchel that is throwable. 7 second fixed fuse @@ -547,6 +556,7 @@ Carga de mochila explosiva que se puede lanzar. Espoleta fija de 7 segundos Rzucany pakiet ładunków wybuchowych. 7 sekundowy zapalnik Werfbare Rucksackladung. 7 Sekunden Zeitzünder + 一个可投掷的炸药包。7秒定时引信 Explosive Charge (Throwable) @@ -556,6 +566,7 @@ Carga explosiva (Lanzable) Ładunek wybuchowy (Rzucany) Sprengladung (Werfbar) + 炸药块（可投掷） An explosive charge that is throwable. 7 second fixed fuse @@ -565,6 +576,7 @@ Carga explosiva que se puede lanzar. Espoleta fija de 7 segundos Rzucany ładunkek wybuchowy. 7 sekundowy zapalnik Werfbare Sprengladung. 7 Sekunden Zeitzünder + 一个可投掷的炸药块。7秒定时引信 Convert to short fuse @@ -574,6 +586,7 @@ Convertir a espoleta corta Konwertuj na krótki zapalnik Zündschnur verkürzen + 切换为短引信 Remove short fuse @@ -583,6 +596,7 @@ Quitar espoleta corta Usuń krótki zapalnik Kurze Zündschnur entfernen + 去除短引信 ACE Grenades @@ -608,6 +622,7 @@ Permitir conversión de explosivos Pozwól na konwersję ładunków wybuchowych Erlaube die Umwandlung von Sprengstoffen + 允许爆炸性切换 Allow converting explosives to throwables @@ -617,6 +632,7 @@ Permitir convertir explosivos a lanzables Zezwala na konwersje ładunków wybuchowych na rzucane wersje Erlaube die Umwandlung von Sprengstoffen in werfbare Ladungen + 允许将炸药转换为可投掷物 diff --git a/addons/gunbag/stringtable.xml b/addons/gunbag/stringtable.xml index fbcc3d1fb8..b79718b68d 100644 --- a/addons/gunbag/stringtable.xml +++ b/addons/gunbag/stringtable.xml @@ -74,6 +74,7 @@ Silah çantasında silah değişimi Intercambiar arma en funda de arma Waffe in Waffentasche tauschen + 交换枪袋中的武器 Enable Weapon Swap @@ -84,6 +85,7 @@ Silah Değiştirmeyi Etkinleştir Habilitar cambio de arma Aktiviere Tauschen von Waffen + 启用武器互换 Allows interaction to directly swap the primary weapon and stored weapon. @@ -94,6 +96,7 @@ Etkileşimin doğrudan birincil silahı ve depolanan silahı değiştirmesine izin verir. Permitir interacción para intercambiar el arma principal y el arma guardada. Erlaube den direkten Wechsel von Primärer und verstauter Waffe über das Interaktionsmenü. + 允许互动直接切换主武器和存储武器。 Get weapon out of gunbag diff --git a/addons/headless/stringtable.xml b/addons/headless/stringtable.xml index 660067a293..bdfba3d880 100644 --- a/addons/headless/stringtable.xml +++ b/addons/headless/stringtable.xml @@ -138,6 +138,7 @@ Transferiere Ausrüstung 装備の移送 裝備傳輸 + 装备转移 Передавать снаряжение Transfer Wyposażenia @@ -147,6 +148,7 @@ 装備の移送はヘッドレス クライアントへの移行後にユニットが裸で出現する問題の回避を試みます。 Передача снаряжения юнитов позволяет обходить проблему, при которой юниты оказываются без снаряжения после передачи управления Headless клиенту. 裝備傳輸用於試著暫時應付單位透過無頭客戶端傳輸時所導致裸裝之問題。 + 装备转移用于试着暂时应付单位透过无头客户端传输时所导致裸装之问题。 Transfer Wyposażenia jednostek usiłuje uniknąć problemu z nagimi jednostkami po transferze do Headless Clienta @@ -154,6 +156,7 @@ Derzeitige Ausrüstung 現在の装備 目前裝備 + 当前装备 Текущее снаряжение Obecne wyposażenie @@ -162,6 +165,7 @@ Konfiguriere Ausrüstung コンフィグの装備 設置裝備 + 设置装备 Снаряжение из настроек Konfiguracja Wyposażenia diff --git a/addons/hellfire/stringtable.xml b/addons/hellfire/stringtable.xml index be74f29c08..875d384892 100644 --- a/addons/hellfire/stringtable.xml +++ b/addons/hellfire/stringtable.xml @@ -25,6 +25,7 @@ セミ アクティブ レーダー誘導の対戦車弾頭 Rakieta naprowadzana laserowo z głowicą przeciwpancerną Halbaktive Laser-Zielsuchrakete mit HEAT-Gefechtskopf + 高爆反坦克弹头半主动激光制导导弹 Millimeter-wave radar guided missile with high explosive anti-tank warhead @@ -34,6 +35,7 @@ ミリ波レーダー誘導の対戦車弾頭 Rakieta namierzana radarowo z głowicą przeciwpancerną Millimeterwellenradar-Lenkflugkörper mit HEAT-Gefechtskopf + 毫米波雷达制导高爆反坦克弹头导弹 Semi-active laser homing missile with metal augmented charge anti-personnel warhead @@ -43,6 +45,7 @@ セミ アクティブ レーダー誘導の対人弾 Rakieta naprowadzana laserowo z głowicą odłamkową Halbaktive Laser-Zielsuchrakete mit metallverstärktem Antipersonen-Gefechtskopf + 带金属增强装药人员杀伤弹头的半主动激光制导导弹 diff --git a/addons/hot/stringtable.xml b/addons/hot/stringtable.xml index 816c2e9b01..247c79425d 100644 --- a/addons/hot/stringtable.xml +++ b/addons/hot/stringtable.xml @@ -10,6 +10,7 @@ Проводное управление Guiado por Fio 有線制導 + 有线制导 Filoguidé Drátem naváděné Tel-Güdümlü @@ -24,6 +25,7 @@ Полуавтоматическое командное наведение по линии визирования (SACLOS) Comando semi-automático para a linha de visão (SACLOS) 視線內半自動指令 + 视线内半自动指令 Contrôle semi-automatique par contact visuel (SACLOS) Poloautomatický povelový systém dalkového navedení pro záměrné cíle (SACLOS) Control semi-automático por línea de visión @@ -38,6 +40,7 @@ Ракета с проводным управлением Míssil Guiado por Fio 有線制導飛彈 + 线导导弹 Missile filoguidé Drátem naváděná střela Tel Güdümlü Füze @@ -52,6 +55,7 @@ Ракета HOT Míssil HOT 高次音速(HOT)飛彈 + 高次音速(HOT)导弹 Missile HOT HOT Střela HOT Missile @@ -67,6 +71,7 @@ HOT 1 HOT 1 HOT 1 + HOT 1 HOT 1 HOT 1 HOT 1 @@ -81,6 +86,7 @@ HOT 2 HOT 2 HOT 2 + HOT 2 HOT 2 HOT 2 HOT 2 @@ -95,6 +101,7 @@ HOT 2MP HOT 2MP HOT 2MP + HOT 2MP HOT 2MP HOT 2MP HOT 2MP @@ -109,6 +116,7 @@ HOT 3 HOT 3 HOT 3 + HOT 3 HOT 3 HOT 3 HOT 3 @@ -122,6 +130,7 @@ Ракета с проводным управлением (Противопехотная) Míssil Guiado por Fio (Anti-Pessoal) 有線制導飛彈（反步兵） + 线导导弹（反人员） Missile filoguidé (antipersonnel) Drátem naváděná střela (protipěchotní) Tel Güdümlü Füze (Anti-Personelı) @@ -137,6 +146,7 @@ 1x HOT 1 [ACE] 1x HOT 1 [ACE] 1x HOT 1 [ACE] + 1x HOT 1 [ACE] 1x HOT 1 [ACE] 1x HOT 1 [ACE] 1x HOT 1 [ACE] @@ -151,6 +161,7 @@ 3x HOT 1 [ACE] 3x HOT 1 [ACE] 3x HOT 1 [ACE] + 3x HOT 1 [ACE] 3x HOT 1 [ACE] 3x HOT 1 [ACE] 3x HOT 1 [ACE] @@ -165,6 +176,7 @@ 4x HOT 1 [ACE] 4x HOT 1 [ACE] 4x HOT 1 [ACE] + 4x HOT 1 [ACE] 4x HOT 1 [ACE] 4x HOT 1 [ACE] 4x HOT 1 [ACE] @@ -179,6 +191,7 @@ 1x HOT 2 [ACE] 1x HOT 2 [ACE] 1x HOT 2 [ACE] + 1x HOT 2 [ACE] 1x HOT 2 [ACE] 1x HOT 2 [ACE] 1x HOT 2 [ACE] @@ -193,6 +206,7 @@ 3x HOT 2 [ACE] 3x HOT 2 [ACE] 3x HOT 2 [ACE] + 3x HOT 2 [ACE] 3x HOT 2 [ACE] 3x HOT 2 [ACE] 3x HOT 2 [ACE] @@ -207,6 +221,7 @@ 4x HOT 2 [ACE] 4x HOT 2 [ACE] 4x HOT 2 [ACE] + 4x HOT 2 [ACE] 4x HOT 2 [ACE] 4x HOT 2 [ACE] 4x HOT 2 [ACE] @@ -221,6 +236,7 @@ 1x HOT 2MP [ACE] 1x HOT 2MP [ACE] 1x HOT 2MP [ACE] + 1x HOT 2MP [ACE] 1x HOT 2MP [ACE] 1x HOT 2MP [ACE] 1x HOT 2MP [ACE] @@ -235,6 +251,7 @@ 3x HOT 2MP [ACE] 3x HOT 2MP [ACE] 3x HOT 2MP [ACE] + 3x HOT 2MP [ACE] 3x HOT 2MP [ACE] 3x HOT 2MP [ACE] 3x HOT 2MP [ACE] @@ -249,6 +266,7 @@ 4x HOT 2MP [ACE] 4x HOT 2MP [ACE] 4x HOT 2MP [ACE] + 4x HOT 2MP [ACE] 4x HOT 2MP [ACE] 4x HOT 2MP [ACE] 4x HOT 2MP [ACE] @@ -263,6 +281,7 @@ 1x HOT 3 [ACE] 1x HOT 3 [ACE] 1x HOT 3 [ACE] + 1x HOT 3 [ACE] 1x HOT 3 [ACE] 1x HOT 3 [ACE] 1x HOT 3 [ACE] @@ -277,6 +296,7 @@ 4x HOT 3 [ACE] 4x HOT 3 [ACE] 4x HOT 3 [ACE] + 4x HOT 3 [ACE] 4x HOT 3 [ACE] 4x HOT 3 [ACE] 4x HOT 3 [ACE] @@ -291,6 +311,7 @@ 3x HOT 3 [ACE] 3x HOT 3 [ACE] 3x HOT 3 [ACE] + 3x HOT 3 [ACE] 3x HOT 3 [ACE] 3x HOT 3 [ACE] 3x HOT 3 [ACE] diff --git a/addons/intelitems/stringtable.xml b/addons/intelitems/stringtable.xml index 17b705bf79..7660730fe2 100644 --- a/addons/intelitems/stringtable.xml +++ b/addons/intelitems/stringtable.xml @@ -5,6 +5,7 @@ ACE Intel Items ACE Aufklärungsgegenstände ACE 情報物品 + ACE 情报物品 ACE 機密アイテム ACE Предметы с данными ACE Przedmioty Wywiadu @@ -14,6 +15,7 @@ Intel Items Aufklärungsgegenstände 情報物品 + 情报物品 機密アイテム Предметы с данными Przedmioty Wywiadu @@ -23,6 +25,7 @@ Notepad Notizblock 筆記本 + 笔记本 メモ Блокнот Notes @@ -32,6 +35,7 @@ Notepad - Can access from the map screen Notizblock - Über die Karte abrufbar 筆記本 - 可以透過地圖界面來存取 + 笔记本 - 可以透过地图界面访问 メモ - マップ画面から確認可能 Блокнот - Можно получить доступ с экрана карты Notes - Dostępne z mapy @@ -41,6 +45,7 @@ Document Dokument 文件 + 文件 資料 Документ Dokument @@ -50,6 +55,7 @@ Printed Document - Can access from the map screen Bedrucktes Dokument - Über die Karte abrufbar 影印文件 - 可以透過地圖界面來存取 + 影印文件 - 可以透过地图界面访问 メモ - マップ画面から確認可能 Распечатанный документ - Можно получить доступ с экрана карты Wydrukowane Dokumenty - Dostępne z mapy @@ -59,6 +65,7 @@ Photo Foto 相片 + 照片 写真 Фотография Zdjęcie @@ -68,6 +75,7 @@ Photo - Can access from the map screen Foto - Über die Karte abrufbar 相片 - 可以透過地圖界面來存取 + 照片 - 可以透过地图界面访问 写真 - マップ画面から確認可能 Фотография - Можно получить доступ с экрана карты Zdjęcie - Dostępne z mapy @@ -84,6 +92,7 @@ Текст Texto 文字 + 文字 テキスト Yazı @@ -91,6 +100,7 @@ Photo Filename Foto-Dateiname 相片名稱 + 照片文件名 写真名 Имя файла фотографии Zdjęcie Nazwa Pliku @@ -107,6 +117,7 @@ Подобрать Recoger 撿起 + 捡起 拾う Al diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index e2291e2953..37fb14bf45 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -497,6 +497,7 @@ Combiner les sous-actions uniques Untergeordnete Aktionen zusammenfassen Połącz akcje podrzędne + 整合子操作 Combines parent action with only one child action together. @@ -506,6 +507,7 @@ Lorsqu'un menu ne contient qu'une seule sous-action, elle est combinée avec son menu parent. Übergeordnete Aktionen mit nur einer Unteraktion zusammenfassen. Gdy menu zawiera tylko jedną akcję podrzędną, łączy ją z akcją nadrzędną. + 主操作与子操作集成显示。 diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml index 4bda1e8c12..062c0aa40e 100644 --- a/addons/interaction/stringtable.xml +++ b/addons/interaction/stringtable.xml @@ -330,6 +330,7 @@ Переименовать группу Gruppe umbenennen Zmień nazwę grupy + 小队重命名 This group name is already in use. @@ -338,6 +339,7 @@ Данное имя группы уже используется. Dieser Gruppenname ist bereits in Verwendung. Ta nazwa grupy jest już w użyciu. + 该小队名称已被使用 NEW GROUP NAME: @@ -346,6 +348,7 @@ НОВОЕ ИМЯ ГРУППЫ NEUER GRUPPENNAME: NOWA NAZWA GRUPY: + 新的小队名： DANCE! @@ -930,6 +933,7 @@ Перевернуть ひっくり返す 拋 + 翻动 Gira Przewróć Virar @@ -1226,6 +1230,7 @@ 踹開擋風玻璃 Romper parabrisas Ön camı parçala + 砸碎挡风玻璃 Attach %1 @@ -1235,6 +1240,7 @@ Fixer %1 Przyczep %1 Befestige %1 + 附加 %1 Detach %1 @@ -1244,6 +1250,7 @@ Retirer %1 Odczep %1 Löse %1 + 拆卸 %1 Enables attach/detach weapon attachment actions for current weapon. @@ -1253,6 +1260,7 @@ Cette option permet de fixer/retirer des accessoires d'arme à partir du menu d'interaction personnel. Włącza akcje przyczepienia/odczepienia dodatków dla obecnej broni Aktiviert das Befestigen/Lösen von Waffenausätzen an der aktuellen Waffe. + 启用当前武器的附加/拆卸武器配件的动作。 Allow group rename @@ -1261,6 +1269,7 @@ Разрешить переименование группы Erlaube das Umbenennen der Gruppe Zezwól na zmianę nazwy grupy + 允许小队重命名 Allows a group leader to rename their group if the name is not already taken. @@ -1269,6 +1278,7 @@ Разрешить лидеру группы её переименование, если имя не занято. Erlaube Gruppenführer das Umbenennen Ihrer Gruppe, wenn der Name nicht bereits vergeben ist. Pozwala liderowi grupy na zmianę jej nazwy, jeżeli ta nazwa nie jest już w użyciu. + 允许队长在队名未被占用的情况下重命名。 Warning: can cause some objects to collide with others. @@ -1277,6 +1287,7 @@ 警告: 一部のオブジェクトが干渉する可能性があります。 Achtung: einige Objekte könnten mit anderen Kollidieren. Uwaga: niektóre obiekty mogą kolidować z innymi. + 警告：会导致一些物体与其他物体发生碰撞。 diff --git a/addons/killtracker/stringtable.xml b/addons/killtracker/stringtable.xml index 0cd0af2d42..c59dd280df 100644 --- a/addons/killtracker/stringtable.xml +++ b/addons/killtracker/stringtable.xml @@ -6,6 +6,7 @@ ACE キルトラッカー ACE Abgeschossene Ereignisse ACE Licznik Zabójstw + ACE击杀事件 Total Kills: @@ -14,6 +15,7 @@ Toplam Öldürme: 総キル: Gesammte Abschüsse: + 总击杀数： Kill: %1 %2 @@ -22,6 +24,7 @@ Öldürülen: %1 %2 キル: %1 %2 Abschuss: %1 %2 + 击杀：%1 %2 Killer: %1 %2 @@ -30,6 +33,7 @@ Öldüren: %1 %2 キラー: %1 %2 Täter: %1 %2 + 击杀者：%1 %2 Vehicle: %1 @@ -38,6 +42,7 @@ Araç :%1 車両: %1 Fahrzeuge %! + 载具：%1 Friendly Fire @@ -51,7 +56,7 @@ Střelba do vlastních! Fogo amigo 아군 오인사격 - 友军误射 + 友军误击 同士討ち Dost Atışı diff --git a/addons/laser/stringtable.xml b/addons/laser/stringtable.xml index 4663712840..6e9a5cccf1 100644 --- a/addons/laser/stringtable.xml +++ b/addons/laser/stringtable.xml @@ -9,7 +9,7 @@ Wskaźnik poziomu rozproszenia wiązki lasera Nombre de simulations pour la dispersion du laser Contatore di Simulazione della Dispersione del Laser - 雷射散射模拟计算 + 激光色散模拟计数 雷射散射模擬計算 Число симуляций рассеивания лазерного луча Contador da Simulação de Dispersão de Laser @@ -30,7 +30,7 @@ Codice laser レーザ コード 레이저 코드 - 雷射码 + 激光码 雷射碼 Lazer Kod @@ -47,7 +47,7 @@ Laser - Cambia codice + レーザ - コードの数値を増やす 레이저 - 코드 순환 위 - 雷射 - 循环切换雷射码 上 + 激光 - 循环切换激光码 上 雷射 - 循環切換雷射碼 上 Lazer - Çevrim Kodu Yukarı @@ -64,7 +64,7 @@ Laser - Cambia codice - レーザ - コードの数値を減らす 레이저 - 코드 순환 아래 - 雷射 - 循环切换雷射码 下 + 激光 - 循环切换激光码 下 雷射 - 循環切換雷射碼 下 Lazer - Çevrim Kodu aşağı diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml index 9418705ceb..26278d8dc2 100644 --- a/addons/laserpointer/stringtable.xml +++ b/addons/laserpointer/stringtable.xml @@ -14,7 +14,7 @@ Laser レーザ ポインタ 레이저 지시기 - 雷射指示器 + 激光指示器 雷射指示器 Lazer Işaretleyici @@ -31,7 +31,7 @@ Laser (vermelho) レーザ ポインタ (赤) 레이저 지시기 (빨강) - 雷射指示器 (红色) + 激光指示器 (红色) 雷射指示器 (紅色) Lazer Işaretleyici (Kırmızı) @@ -48,7 +48,7 @@ Laser (verde) レーザ ポインタ (緑) 레이저 지시기 (초록) - 雷射指示器 (绿色) + 激光指示器 (绿色) 雷射指示器 (綠色) Lazer Işaretleyici (Yeşil) @@ -65,7 +65,7 @@ Emite luz visível. 可視光をだします。 밝은 곳에서도 보임 - 发射出可见光 + 发出可见激光 發射出可見光 Görünür ışık yayar. @@ -82,7 +82,7 @@ <t color='#9cf953'>Használat: </t>Lézer BE/KI kapcsolása <t color='#9cf953'>つかう: </t>レーザの起動/停止 <t color='#9cf953'>사용키: </t>레이저 켜기/끄기 - <t color='#9cf953'>使用: </t>雷射开启/关闭 + <t color='#9cf953'>使用: </t>激光开启/关闭 <t color='#9cf953'>使用: </t>雷射開啟/關閉 <t color='#9cf953'>Use: </t>Turn Laser ON/OFF @@ -99,7 +99,7 @@ Laser レーザ 레이저 - 雷射 + 激光 雷射 Lazer @@ -116,7 +116,7 @@ Laser IV 赤外線レーザ 적외선 레이저 - 红外线雷射 + 红外线激光 紅外線雷射 IR Lazer @@ -133,7 +133,7 @@ Alternar entre Laser / Laser IV レーザ/赤外線レーザを切り替える 레이저 / 적외선 레이저 전환 - 切换雷射/红外线雷射 + 切换激光/红外线激光 切換雷射/紅外線雷射 Değiştir Lazer/IR Lazer diff --git a/addons/logistics_rope/stringtable.xml b/addons/logistics_rope/stringtable.xml index b91b7ec1c3..629a271a3c 100644 --- a/addons/logistics_rope/stringtable.xml +++ b/addons/logistics_rope/stringtable.xml @@ -8,6 +8,7 @@ Витой канат. ООбычно используется для спуска или буксирования. Ein verdrehtes Geflecht aus Fasern. Wird normalerweise zum Abseilen oder Abschleppen verwendet. Lina skręcona z włókien. Zwykle używana do zjazdów lub holowania. + 编织绳。通常用于索降和牵引拖曳。 Rope 3.2 meters @@ -21,6 +22,7 @@ 3.2 metre halat Cuerda de 3.2 metros ロープ (3.2 メートル) + 绳索（3.2米） Rope 6.2 meters @@ -34,6 +36,7 @@ 6.2 metre halat Cuerda de 6.2 metros ロープ (6.2 メートル) + 绳索（6.2米） Rope 12.2 meters @@ -44,6 +47,7 @@ Канат 12.2 метров Corda (12.2m) 繩索（12.2公尺長） + 绳索（12.2米） Corda da 12.2 metri Lano 12.2 metrů 12.2 metre halat @@ -58,6 +62,7 @@ Канат 15.2 метров Corda (15.2m) 繩索（15.2公尺長） + 绳索（15.2米） Corda da 15.2 metri Lano 15.2 metrů 15.2 metre halat @@ -72,6 +77,7 @@ Канат 18.3 метров Corda (18.3m) 繩索（18.3公尺長） + 绳索（18.3米） Corda da 18.3 metri Lano 18.3 metrů 18.3 metre halat @@ -86,6 +92,7 @@ Канат 27.4 метров Corda (27.4m) 繩索（27.4公尺長） + 绳索（27.4米） Corda da 27.4 metri Lano 27.4 metrů 27.4 metre halat @@ -100,6 +107,7 @@ Канат 36.6 метров Corda (36.6m) 繩索（36.6公尺長） + 绳索（36.6米） Corda da 36.6 metri Lano 36.6 metrů 36.6 metre halat diff --git a/addons/magazinerepack/stringtable.xml b/addons/magazinerepack/stringtable.xml index b63fd2cde2..5d29e1430c 100644 --- a/addons/magazinerepack/stringtable.xml +++ b/addons/magazinerepack/stringtable.xml @@ -173,6 +173,7 @@ Перепаковать загруженные магазины Geladene Magazine umpacken Przepakuj załadowane magazynki + 重新整理已上膛的弹夹 Repacking magazines, weapon unloaded @@ -181,6 +182,7 @@ Перепаковка магазинов, оружие разряжено Magazin umgepackt, Waffe entladen Przepakowywanie magazynków, broń rozładowana + 重新整理弹匣，武器未上膛 diff --git a/addons/map_gestures/stringtable.xml b/addons/map_gestures/stringtable.xml index 2a73b8be87..06ec2390e7 100644 --- a/addons/map_gestures/stringtable.xml +++ b/addons/map_gestures/stringtable.xml @@ -13,7 +13,7 @@ Pointage sur carte マップ ジェスチャー 지도 신호 - 地图标识器 + 地图指示 地圖指示器 Harita Hareketleri @@ -45,7 +45,7 @@ Active le pointage sur carte. マップ ジェスチャーを有効化 지도 신호 활성화 - 启用地图标识器 + 启用地图指示 啟用地圖指示器 Harita hareketlerini etkinleştir. @@ -61,7 +61,7 @@ Portée du pointage sur carte マップ ジェスチャーの最大範囲 지도 신호 최대 거리 - 地图标识器最大范围 + 地图指示最大范围 地圖指示器最大範圍 Harita Hareketi Max Uzaklık @@ -77,7 +77,7 @@ Définit le rayon au-delà duquel un joueur ne verra plus l'indicateur de pointage des autres joueurs. プレイヤーによるマップ ジェスチャーの表示範囲を設定します 플레이어간에 지도 신호 표시거리를 설정합니다. - 设定地图标识器显示的最大范围距离 + 设定地图指示显示的最大范围距离 設定地圖指示器顯示的最大範圍距離 @@ -139,7 +139,7 @@ Définit la couleur du texte pour le nom à côté du marqueur de pointage sur carte. マップ ジェスチャーに表示される、名前の色を決定します。 지도 색상에 표시되는 이름의 색상을 결정합니다. - 定义名称文字颜色。使其与地图标识器颜色有所区别。 + 定义名称文字颜色。使其与地图指示颜色有所区别。 定義名稱文字顏色。使其與地圖指示器顏色有所區別 Barva jména zobrazeného vedle značky ukazovátka na mapě. @@ -169,7 +169,7 @@ Définit la couleur par défaut pour les chefs de groupe quand il n'y a pas de réglage de groupe. [Module : laisser vide pour ne pas forcer chez les clients.] グループ設定が存在しない場合に、グループ リーダーへ設定される色の値を設定します。[モジュール：空の場合はクライアントへ強制しません] 그룹 설정이 없는 경우 리더의 예비 색상 값입니다. [모듈: 클라이언트에서 강체치 않기 위해 공백으로 비워둘것] - 当没有设定小队颜色时，此功能会定义队长的标识器颜色。[模块: 此栏留空来保持预设颜色] + 当没有设定小队颜色时，此功能会定义队长的指示颜色。[模块: 此栏留空来保持预设颜色] 當沒有設定小隊顏色時，此功能會定義隊長的指示器顏色。[模塊: 此欄留空來保持預設顏色] Záložní barva pro velitele skupin pokud není žádné skupinové nastavení [Modul: ponechat prázdné abyste nepřepsali nastavení klientů] @@ -200,7 +200,7 @@ Définit la couleur par défaut quand il n'y a pas de réglage pour le groupe. [Module : laisser vide pour ne pas forcer chez les clients.] グループ設定が存在しない場合に、グループ リーダーへ設定される色の値を設定します。[モジュール：空の場合はクライアントへ強制しません] 그룹 설정이 없을 경우의 예비 색상입니다. [모듈: 클라이언트에서 강체치 않기 위해 공백으로 비워둘것] - 当没有设定小队颜色时，此功能会定义玩家的标识器颜色。[模块: 此栏留空来保持预设颜色] + 当没有设定小队颜色时，此功能会定义玩家的指示颜色。[模块: 此栏留空来保持预设颜色] 當沒有設定小隊顏色時，此功能會定義玩家的指示器顏色。[模塊: 此欄留空來保持預設顏色] Záložní barva pokud není žádné skupinové nastavení [Modul: ponechat prázdné abyste nepřepsali nastavení klientů] @@ -230,7 +230,7 @@ Couleur pour les chefs des groupes synchronisés avec ce module. モジュールで同期されたグループのリーダー用に色の値を決定します。 그룹이 이 모듈에 동기화 됐을때의 리더 색상입니다. - 改变与此同步小队队长的标识器颜色。 + 改变与此同步小队队长的指示颜色。 改變與此同步小隊隊長的指示器顏色 Barva pro velitele skupin které jsou synchronizované s tímto modulem. @@ -261,7 +261,7 @@ Couleur pour les membres des groupes synchronisés avec ce module. モジュールで同期されたグループのメンバ用に色の値を決定します。 그룹이 이 모듈에 동기화 됐을때의 멤버 색상입니다. - 改变与此同步小队队员的标识器颜色 + 改变与此同步小队队员的指示颜色 改變與此同步小隊隊員的指示器顏色 Barva pro členy skupin které jsou synchronizované s tímto modulem. @@ -273,6 +273,7 @@ 友軍ジェスチャーのみ表示 Mostrar sólo gestos de aliados Nur Gesten befreundeter Einheiten zeigen + 仅显示友军指示 Shows only Gestures from Units that are from the same side or a Friendly side. @@ -282,6 +283,7 @@ Muestra únicamente gestos de las unidades que son del mismo bando o de un bando aliado Pokazuj tylko Gesty od jednostek z tej samej lub sojuszniczej strony Nur Gesten von Einheiten der selben oder einer verbündeten Seite zeigen. + 仅显示来自同一阵营或友军的单位的指示。 Max range Camera @@ -291,6 +293,7 @@ Máximo alcance de cámara Maksymalny zasięg kamery Maximale Kamerareichweite + 摄像机最大范围 Max range between a Camera and players to show the map gesture indicator @@ -300,6 +303,7 @@ Máxima distancia entre una cámara y los jugadores para mostrar el indicador de gestos en mapa Maksymalny zasięg pomiędzy kamerą a graczami do pokazania gestów na mapie Maximale Reichweite, in der eine Kamera das Kartenzeichen der Spieler zeigt + 摄像机和玩家之间的最大范围显示地图指示 Allow Spectator @@ -309,6 +313,7 @@ Permitir espectador Zezwól na Obserwatora Erlaube Zuschauer + 允许旁观者 Allows Spectator to See Map Gestures @@ -318,6 +323,7 @@ Permitir al espectador ver los gestos de mapa Zezwól Obserwatorowi widzieć Gesty na mapie Erlaube, dass Zuschauer das Kartenzeichen sehen können + 允许旁观者查看地图指示 Allow Curator @@ -327,6 +333,7 @@ Permitir Curador Zezwól na Zeusa Erlaube Zeus + 允许宙斯 Allows Curator to See Map Gestures @@ -336,6 +343,7 @@ Permitir al Curador ver los gestos de mapa Zezwól Zeusowi widzieć gesty na mapie Erlaube, dass Zeus das Kartenzeichen sehen kann + 允许宙斯查看地图指示 Briefing Mode @@ -345,6 +353,7 @@ Modo de briefing Tryb Odprawy Briefing-Modus + 简报模式 What player can see what @@ -354,6 +363,7 @@ Qué puede ver cada jugador Co mogą widzieć gracze Welcher Spieler kann was sehen + 什么玩家能看到什么 Disabled @@ -363,6 +373,7 @@ Deshabilitado Zablokowany Deaktiviert + 禁用 Group @@ -375,6 +386,7 @@ Группа Grupo グループ + 小队 Side @@ -387,6 +399,7 @@ Сторона Bando 陣営 + 阵营 Proximity @@ -396,6 +409,7 @@ Proximidad Umgebung Tylko w pobliżu + 附近 All @@ -408,6 +422,7 @@ Все Todas 全て + 全部 Map Gestures - Group Settings @@ -421,7 +436,7 @@ Pointage sur carte - réglages de groupe マップ ジェスチャー - グループ設定 지도 신호 - 그룹 설정 - 地图标识器 - 队伍设定 + 地图指示 - 队伍设定 地圖指示器 - 隊伍設定 @@ -436,7 +451,7 @@ ACE Pointage sur carte ACE マップ ジェスチャー ACE 지도 신호 - ACE 地图标识器 + ACE 地图指示 ACE 地圖指示器 ACE Harita Hareketleri diff --git a/addons/markers/stringtable.xml b/addons/markers/stringtable.xml index f39f8c3f76..6b9f97b973 100644 --- a/addons/markers/stringtable.xml +++ b/addons/markers/stringtable.xml @@ -9,6 +9,7 @@ スケール: %1 Skala: %1 Skalierung: %1 + 规模: %1° Direction: %1° @@ -34,6 +35,7 @@ 右クリックでリセット Naciśnij PPM żeby zresetować Rechte Maustaste zum Zurücksetzen + 点击鼠标右键重置 Markers @@ -41,7 +43,7 @@ マーカー Marcatori 標誌 - 标志 + 标识 맵마커 Znaczniki Маркеры @@ -57,7 +59,7 @@ 次ユーザーにマーカー移動を許可 마커 이동 허가 誰可以移動標誌 - 谁可以移动标志 + 谁可以移动标识 Permetti di spostare i marcatori a: Zezwól na poruszanie znaczników dla Разрешить перемещение маркеров для @@ -72,7 +74,7 @@ どのプレイヤーが Alt キーを押しながらマーカー移動をできるか制限できます。 Alt 키를 누른 상태에서 마커를 움직일 수있는 플레이어를 제한합니다. 設定誰可以透過按住Alt鍵來移動標誌 - 设定谁可以透过按住Alt键来移动标志。 + 设定谁可以透过按住Alt键来移动标识。 Limita quali giocatori possono spostare i marcatori mentre premono il tasto Alt. Ogranicz którzy gracze mogą poruszać znacznikami podczas trzymania przycisku Alt. Устанавливает ограничение на перемещения маркеров игроками при помощи клавиши Alt @@ -170,6 +172,7 @@ Создателя Criador 放置者 + 放置者 Créateur Creatore Tvůrce @@ -184,6 +187,7 @@ Permitir marcas de tiempo Zezwól na znaczniki czasu Erlaube Zeitstempel + 允许时间戳 Whether to allow timestamps to be automatically applied to markers @@ -193,6 +197,7 @@ Permitir que las marcas de tiempo sean automáticamente aplicadas a los marcadores Zezwól na automatyczne stosowanie znaczników czasu do markerów Ob Zeitstempel automatisch auf Maker angewendet werden sollen. + 是否允许时间戳自动应用于标记 Timestamp @@ -202,6 +207,7 @@ Marca de tiempo Znacznik czasu Zeitstempel + 时间戳 Watch Required @@ -211,6 +217,7 @@ Reloj requerido Wymagany zegarek Uhr benötigt + 需要手表 Timestamp Format @@ -220,6 +227,7 @@ Formato de marca de tiempo Format znacznika czasu Format des Zeitstempels + 时间戳格式 Changes the timestamp format @@ -229,6 +237,7 @@ Cambia el formato de marca de tiempo Zmienia format znacznika czasu Zeitstempel-Format anpassen + 更改时间戳格式 "HH" - Hour @@ -238,6 +247,7 @@ "HH" - Hora "HH" - Godziny "HH" - Stunden + "HH" - 时 "MM" - Minute @@ -247,6 +257,7 @@ "MM" - Minuto "MM" - Minuty "MM" - Minuten + "MM" - 分 "SS" - Seconds @@ -256,6 +267,7 @@ "SS" - Segundos "SS" - Sekundy "SS" - Sekunden + "SS" - 秒 "MM" - Milliseconds @@ -265,6 +277,7 @@ "MM" - Milisegundos "MM" - Milisekundy "MS" - Milisekunden + "MS" - 毫秒 Timestamp Hour Format @@ -274,6 +287,7 @@ Formato de hora de marca de tiempo Format Godzinnych znaczników czasu Zeitstempel-Stundenformat + 时间戳小时格式 24-Hour Clock @@ -283,6 +297,7 @@ Reloj 24-Horas Zegar 24-godzinny 24-Stunden + 24小时制 12-Hour Clock @@ -292,6 +307,7 @@ Reloj 12-Horas Zegar 12-godzinny 12-Stunden + 12小时制 Changes timestamp to use either 24-hour or 12-hour clock format @@ -301,6 +317,7 @@ Cambia que la marca de tiempo sea en formato de reloj 24-horas o 12-horas Zmienia znacznik czasu tak, aby używał formatu 24-godzinnego lub 12-godzinnego Ändert den Zeitstempel, um entweder das 24-Stunden- oder das 12-Stunden-Format zu verwenden + 改变时间戳以使用24小时或12小时的时钟格式 diff --git a/addons/medical_ai/stringtable.xml b/addons/medical_ai/stringtable.xml index e8b73e56b3..9eb65de005 100644 --- a/addons/medical_ai/stringtable.xml +++ b/addons/medical_ai/stringtable.xml @@ -8,6 +8,7 @@ ИИ Медик Médecine IA IA Médico + AI医疗兵 AI醫療兵 Medico AI Zdravotnická AI @@ -22,6 +23,7 @@ ИИ будет реагировать на травмы и потерю сознания Les unités IA seront sensibles aux blessures, ainsi qu'à la perte de connaissance. A IA irá responder a ferimentos e perdas de consciência + AI对于受伤及无意识单位会有所反应 AI對於受傷及無意識單位會有所反應 L'intelligenza artificiale risponderà a lesioni e perdita di coscienza UI reaguje na zranění a bezvědomí diff --git a/addons/medical_blood/stringtable.xml b/addons/medical_blood/stringtable.xml index 79f8f7ba75..692bbe9bec 100644 --- a/addons/medical_blood/stringtable.xml +++ b/addons/medical_blood/stringtable.xml @@ -13,6 +13,7 @@ Sangue 혈흔 血痕 + 血迹 血跡 Kan @@ -38,6 +39,7 @@ Si une unité saigne, elle laissera des traces de sang derrière elle. Разрешает создание капель крови при кровотечении или получении урона Permitir a criação de gotas de sangue quando as unidades recebem ferimentos ou estão sangrando. + 当单位失血或受伤的时,启用出血效果。 啟用出血效果當單位失血或受傷的時候。 Povoluje vytváření kapek krve na zemi když jednotka krvácí nebo utrpí zranění. Umożliwia tworzenie śladów krwi, gdy jednostki krwawią lub otrzymują obrażenia. @@ -52,6 +54,7 @@ Quantité de sang à afficher Макс. кол-во капель крови Limite de objetos de sangue + 最大血迹数 最大血跡數 Massimo numero di chiazze di sangue Maximum objektů krve @@ -66,6 +69,7 @@ Définit le nombre maximal de traces de sangs pouvant être affichées.\nUne quantité excessive peut engendrer une baisse de FPS. Задает макс. количество создаваемых объектов капель крови. Чрезмерное количество может вызвать задержку FPS Define o limite máximo de objetos de gota de sangue que podem ser criados, quantidades excessivas podem causar lag de FPS. + 设置最大可存在的血迹数量。过量会导致帧数低下或卡顿 設定最大可存在的血跡數量。太極端的數量會導致幀數低落或卡頓 Imposta il numero massimo di chiazze di sangue che possono essere depositate, quantità eccessive possono causare del lag di FPS. Nastavuje maximum objektů krve na zemi, příliš mnoho může způsobit pokles FPS @@ -80,6 +84,7 @@ Durée d'affichage du sang Время жизни капель крови Duração do Sangue + 血迹时长 血跡時長 Durata del sangue Životnost krve @@ -94,6 +99,7 @@ Définit la durée d'affichage des traces de sang. Управляет временем жизни объектов капель крови. Controla o tempo de vida que um objeto de gota de sangue tem. + 控制血迹在地上的时长 控制血跡在地上的時長 Controlla la durata delle chiazze di sangue. Nastavuje jak dlouho objekty krve na zemi vydrží. @@ -110,7 +116,7 @@ Tylko gracze Joueurs seulement Solo Giocatori - 只有玩家 + 仅玩家 只有玩家 Только игроки Apenas Jogadores diff --git a/addons/medical_damage/stringtable.xml b/addons/medical_damage/stringtable.xml index 5b7eb96f67..000e24fcbe 100644 --- a/addons/medical_damage/stringtable.xml +++ b/addons/medical_damage/stringtable.xml @@ -8,6 +8,7 @@ Порог критического урона игрока Limite de Dano Crítico do Jogador 玩家重擊承受量 + 玩家临界伤害阈值 Soglia danni critici del giocatore Kritická míra poškození pro hráče Próg Obrażeń Krytycznych Gracza @@ -21,6 +22,7 @@ Устанавливает количество урона, которое может получить игрок, прежде чем потеряет сознание. Define a quantidade de dano que um jogador pode receber antes de ficar inconsciente. 設定玩家在無意識前能承受多少傷害。 + 设置玩家在昏迷前可以承受的伤害量（如果启用了“创伤总和”，则会死亡）。 Imposta la quantità di danno che un giocatore può ricevere prima di perdere conoscenza. Nastavuje kolik poškození hráč může obdržet než upadne do bezvědomí. Definiuje ilość obrażeń jaką może przyjąć gracz przed straceniem przytomności (oraz śmierci gdy "Suma urazów" jest włączona). @@ -35,6 +37,7 @@ Порог критического урона AI Limite de Dano Crítico da IA AI重擊承受量 + AI临界伤害阈值 Soglia dei danni critici dell AI Kritická míra poškození pro AI Próg Obrażeń Krytycznych AI @@ -48,6 +51,7 @@ Устанавливает количество урона, которое может получить ИИ, прежде чем потеряет сознание. Define a quantidade de dano que uma IA pode receber antes de ficar inconsciente. 設定AI在無意識之前能承受多少傷害 + 设置AI在昏迷前可以承受的伤害量（如果启用了“创伤总和”，则会死亡）。 Imposta la quantità di danno che un'unità AI può ricevere prima di perdere conoscenza. Nastavuje kolik poškození AI může obdržet než upadne do bezvědomí. Definiuje ilość obrażeń jaką może przyjąć AI przed straceniem przytomności (oraz śmierci gdy "Suma urazów" jest włączona). @@ -409,7 +413,7 @@ 찢어짐 撕裂傷 Yırtık - 裂伤 + 撕裂伤 Small Tear @@ -426,7 +430,7 @@ 조금 찢어짐 小撕裂傷 Küçük Yırtık - 轻度裂伤 + 轻度撕裂伤 Medium Tear @@ -443,7 +447,7 @@ 꽤 찢어짐 中度撕裂傷 Orta Yırtık - 中度裂伤 + 中度撕裂伤 Large Tear @@ -459,7 +463,7 @@ 大きな裂傷 심하게 찢어짐 嚴重撕裂傷 - 重度裂伤 + 重度撕裂伤 Büyük Yırtık @@ -603,6 +607,7 @@ Причина смертельного урона 致命傷の原因 致命傷來源 + 致命伤来源 Cause de blessure mortelle Fonte del danno fatale Zdroj smrtelné škody @@ -617,6 +622,7 @@ Определяет какой урон будет смертельным 致命傷となるダメージの種類を決定します。 決定何種傷害為致命 + 确定哪些伤害可能是致命的 Determina quali danni possono essere fatali Détermine le type de blessures pouvant être fatales. Nastavuje jaké poškození může být smrtelné @@ -631,6 +637,7 @@ Только серьезные попадания в жизненно важные органы 重要器官に大きなダメージを受けた時のみ 只有重要器官之重傷 + 只有重要器官受到重创 Grosses blessures sur organes vitaux Solo grandi colpi agli organi vitali Pouze zásahy do životně důležitých orgánů @@ -645,6 +652,7 @@ Совокупность травмы 外傷の数 外部創傷累計 + 创伤总和 Somme des traumatismes Somma dei traumi Celkové množství úrazů @@ -658,6 +666,7 @@ Оба 両方 兩者都是 + 二者之一 Les deux o Kterýkoliv ze dvou @@ -674,6 +683,7 @@ Термический ожог Thermische Verbrennung Oparzenie + 热灼伤 Minor Thermal Burn @@ -682,6 +692,7 @@ Незначительный термический ожог Leichte thermische Verbrennung Pomniejsze oparzenie + 轻微热灼伤 Medium Thermal Burn @@ -690,6 +701,7 @@ Средний термический ожог Mittlere thermische Verbrennung Średnie oparzenie + 中度热灼伤 Major Thermal Burn @@ -698,6 +710,7 @@ Сильный термический ожог Schwere thermische Verbrennung Duże oparzenie + 重度热灼伤 Unit Damage Threshold @@ -709,6 +722,7 @@ Próg obrażeń jednostki Birim Hasar Katsayısı Umbral de daño de unidad + 单位伤害阈值 Sets the amount of damage a unit can receive before going unconscious. (0 for mission default) @@ -720,6 +734,7 @@ Ustawia próg obrażeń jakie może otrzymać jednostka przed utratą przytomności. (0 jako ustawienie domyślne misji) Bilinçsiz duruma geçmeden önce bir birimin alabileceği hasar miktarını ayarlar. (Görev varsayılanı için 0) Determina la cantidad de daño que puede recibir una unidad antes de quedar inconsciente (0 para predeterminado de misión) + 设定一个单位在昏迷前所能承受的伤害量。(任务默认为0) Pain Unconscious Chance @@ -729,6 +744,7 @@ Probabilidad de inconsciencia por dolor Douleur - Chance d'évanouissement Chance für Bewusslosigkeit durch Schmerz + 疼痛昏厥概率 The probability of a person falling unconscious when their pain is above the tolerance threshold upon receiving damage. @@ -738,6 +754,7 @@ La probabilidad de que una persona caiga inconsciente cuando su dolor está por encima del umbral al haber recibido daño. La probabilité pour qu'une personne perde connaissance lorsque la douleur ressentie est supérieure à son seuil de tolérance. Die Wahrscheinlichkeit, dass eine Person bewusstlos wird, wenn ihre Schmerzen bei einer Verwundung über der Toleranzschwelle liegen. + 当一个人的疼痛超过承受能力的极限时，他陷入昏迷的概率。 Fatal Injury Death Chance @@ -747,6 +764,7 @@ Szana na śmierć przy śmiertelej ranie 致命傷による死亡確率 Tödliche Verletzung - Wahrscheinlichkeit des Todes + 致命伤死亡概率 The chance of dying to a fatal injury. @@ -756,6 +774,7 @@ Szansa na śmierć po otrzymaniu śmiertelnej rany. 致命傷による死亡確率を設定します。 Die Wahrscheinlichkeit, an einer eigentlich tödlichen Verletzung zu sterben. + 死于致命伤的概率。 diff --git a/addons/medical_engine/stringtable.xml b/addons/medical_engine/stringtable.xml index 7c008b0e6c..feec6a6ca9 100644 --- a/addons/medical_engine/stringtable.xml +++ b/addons/medical_engine/stringtable.xml @@ -9,6 +9,7 @@ Włącz obrażenia od kolizji pojazdu 車両衝突ダメージを有効化 Aktiviere Verletzungen durch Fahrzeugunfälle + 启用车辆碰撞损坏 Controls whether crew receives damage from vehicle collisions. @@ -18,6 +19,7 @@ Kontroluje czy załoga pojazdu otrzyma obrażenia podczas kolizji pojazdu. 車両が衝突をすると乗員がダメージを受けるかどうかを決定します。 Kontrolliert, ob Besatzung eines Fahrzeugs Schaden durch Unfälle erleiden soll + 控制乘员是否受到车辆碰撞的伤害。 diff --git a/addons/medical_feedback/stringtable.xml b/addons/medical_feedback/stringtable.xml index 2db6b75c8c..9e481e0cba 100644 --- a/addons/medical_feedback/stringtable.xml +++ b/addons/medical_feedback/stringtable.xml @@ -9,6 +9,7 @@ Réaction aux blessures Reação a Lesões 視覺回饋 + 受伤反应 Commenti Zpětná vazba Informacje Zwrotne @@ -29,6 +30,7 @@ 痛み効果種類 고통 효과 종류 疼痛效果類型 + 疼痛效果类型 Ağrı Etkisi Türü @@ -38,6 +40,7 @@ Выбирает тип визуализации болевого эффекта. Selecione o tipo de efeito de dor. 選擇哪一個視覺效果用於回饋疼痛 + 选择反馈的疼痛效果类型。 Seleziona il tipo di effetto del dolore usato. Nastavuje který efekt bolesti bude používán. Wybiera rodzaj efektu bólu. @@ -53,6 +56,7 @@ Flash blancs Flashes Brancos 白光閃爍 + 白光闪烁 Bianco lampeggiante Blikání bílé barvy Miganie na biało @@ -67,6 +71,7 @@ Pulsations floues Borrão Pulsante 脈動模糊 + 脉冲式模糊 Sfocatura pulsante Pulzující rozmazání Pulsujące rozmycie @@ -94,6 +99,7 @@ Only high pain effect 強い痛みの時のみ 只有在強烈疼痛時使用 + 仅在剧烈疼痛下启用 Juste un fort effet douloureux Solo elevato effetto di dolore Pouze efekt vysoké bolesti @@ -114,6 +120,7 @@ Düşük Kan Efekt Türü Tipo de efecto por volumen bajo de sangre Effektart für "Niedriges Blutvolumen" + 低血容量影响类型 Selects the used low blood volume effect type. @@ -125,6 +132,7 @@ Kullanılan düşük kan hacmi efekt türünü seçer. Selecciona el tipo de efecto a causa de un volumen bajo de sangre. Wählt die verwendete Effektart für niedriges Blutvolumen. + 选择低血容量下的效果类型。 Color Fading @@ -136,6 +144,7 @@ Renk Soldurma Atenuación del color Farbverblassen + 褪色 Icon @@ -147,6 +156,7 @@ Simge Icono Symbol + 图标 Icon + Color Fading @@ -158,6 +168,7 @@ Simge + Renk Soldurma Icono + Atenuación del color Symbol + Farbverblassen + 图标+褪色 @@ -173,7 +184,7 @@ Abilita Grida 叫びを有効化 비명 활성화 - 启用尖叫 + 启用惨叫 啟用尖叫 Çığlıkları Etkinleştir @@ -190,7 +201,7 @@ Abilita Grida da parte delle unità ferite 負傷したユニットを叫ぶようにします。 부상당한 인원이 소리지르는것을 활성화합니다 - 启用伤者的尖叫声 + 启用伤者的惨叫声 啟用傷者的尖叫聲 Yaralı birimler tarafından çığlık atmayı etkinleştir @@ -201,6 +212,7 @@ Indicateurs de fractures/garrots/attelles Fraktur-/Tourniquet-/Schienen-Indikatoren aktivieren Włącz wskaźniki złamań/stazy/szyny + 启用骨折/止血带/夹板指示器 Enables indicators for fractures and applied tourniquets and splints over the Stance Indicator. @@ -209,6 +221,7 @@ Affiche des icônes au niveau de l'indicateur de posture, indiquant si le personnage souffre de fractures ou si des garrots ou des attelles sont appliqués. Aktiviert Indikatoren für Frakturen mit angelegte Tourniquets und Schienen über dem Haltungsindikator. Włącza wskaźniki złamań oraz założonej staz/szyn przy ikonie stanu postawy + 在姿态指示器上启用骨折、应用止血带和夹板指示器。 diff --git a/addons/medical_gui/stringtable.xml b/addons/medical_gui/stringtable.xml index 84df4102d8..8b4e62f19e 100644 --- a/addons/medical_gui/stringtable.xml +++ b/addons/medical_gui/stringtable.xml @@ -8,6 +8,7 @@ Медицинский интерфейс GUI 界面 + 界面 GUI GUI Graficzny Interfejs Użytkownika @@ -23,6 +24,7 @@ Activer les actions médicales Ativar Ações Médicas 啟用醫療行為 + 启用医疗措施 Attivare azioni mediche Povolit zdravotnické akce Włącza opcje medyczne @@ -37,6 +39,7 @@ Permet d'afficher les actions médicales dans le menu d'interaction, et de définir leur style visuel. Ativa as ações médicas para o menu de interação e seleciona seus estilos. 為互動選單啟用醫療行為以及選擇其風格。 + 为交互式菜单启用医疗操作，并选择其样式。 Abilita le azioni mediche per il Menu Interazione e seleziona il loro stile. Povolit zdravotnické akce pro menu interakcí a vybrat jejich styl. Umożliwia akcje medyczne w menu interakcji i wybiera ich styl. @@ -85,6 +88,7 @@ Activer les actions médicales sur soi-même Ativar ações médicas em si mesmo 啟用自我醫療行為 + 启用医疗自我措施 Abilitare le azioni di automedicazione Povolit zdravotnické vlastní akce Włącza akcje medyczne na sobie @@ -99,6 +103,7 @@ Active les actions médicales du menu d'interaction personnel. Ativa as ações médicas do menu de interação pessoal. 為自我互動選單啟用醫療行為。 + 为自我交互菜单启用医疗操作。 Abilita il menu per le interazioni mediche personali Povoluje zdravotnické akce v menu vlastních interakcí. Umożliwia działania medyczne w menu własnej interakcji. @@ -113,6 +118,7 @@ Activer le menu médical Ativar Menu Médico 啟用醫療選單 + 启用医疗菜单 Abilita il menu medico Povolit Zdravotnické menu Włącz Menu Medyczne @@ -127,6 +133,7 @@ Permet l'utilisation du menu médical via le menu d'interaction ou l'appui d'une touche. Ativa o uso do Menu Médico atráves da Tecla ou Menu de Interação. 啟用以互動選單或者按鍵綁定所呼出的高效醫療選單 + 通过按键绑定或交互菜单启用医疗菜单。 Abilita l'uso del Menu Medico attraverso il menu tastiera o il menu di interazione. Povoluje používání Zdravotnického menu klávesovou zkratku nebo skrze menu interakcí. Umożliwia korzystanie z menu medycznego poprzez skrót lub menu interakcji. @@ -141,6 +148,7 @@ Rouvrir le menu médical Reabrir Menu Médico 醫療選單二度開啟 + 重新打开医疗菜单 Riaprire il menù medico Znovu otevřít Zdravotnické menu Otwiera ponownie menu medyczne @@ -155,6 +163,7 @@ Réouvre le menu médical suite à l'application d'un soin. Reabrir Menu Médico após um tratamento com sucesso 當治療完成後二度打開醫療選單 + 治疗成功后，重新打开医疗菜单。 Riaprire il menu medico dopo il trattamento con successo. Otevře Zdravotnické menu po úspěšném dokončení zdravotnické akce. Otwiera ponownie menu medyczne po udanym leczeniu. @@ -169,6 +178,7 @@ Distance maximale Distância Máxima 最大醫療距離 + 最大医疗距离 Massima distanza Maximální vzdálenost Maksymalny dystans @@ -183,6 +193,7 @@ Définit la distance (en mètres) à partir de laquelle il n'est plus possible d'activer le menu médical pour traiter un patient. A Distância máxima do paciente para que o Menu Médico possa ser aberto. 設定距離多遠以內可以對目標使用醫療選單 + 设定距离多远以内可以对目标使用医疗菜单 Distanza massima da cui si può aprire il Menu Medico. Maximální vzdálenost ze které je možné otevřít Zdravotnické menu. Maksymalny dystans w którym menu medyczne może zostać otwarte. @@ -197,6 +208,7 @@ Показывать группу триажа в меню взаимодействий Pokaż poziom Triażu w menu interakcji Zeige Triage-Einstufung im Interaktionsmenü + 在交互式菜单中显示分诊级别 Shows the patient's triage level by changing the color of the main and medical menu actions. @@ -206,6 +218,7 @@ Отображает установленную группу карты медицинской сортировки (триажа), изменяя цвет действий основного и медицинского меню. Pokazuje poziom Triażu pacjenta poprzez zmianę koloru ikony w menu interakcji. Zeigt die Triage-Einstufung des Patienten durch Ändern der Farbe der Aktionen des Hauptmenüs und des medizinischen Menüs an. + 通过改变主菜单和医疗菜单动作的颜色来显示伤员的分诊级别。 Medical @@ -1138,6 +1151,7 @@ Couleurs des hémorragies Farben für Blutverlust Kolory utraty krwi + 失血颜色 Blood Loss Colors, That Used in Medical GUI. 10 Color Gradient. @@ -1146,6 +1160,7 @@ Couleurs utilisées pour afficher les hémorragies dans l'interface médicale. Dégradé de 10 couleurs. Farben für Blutverlust, die in dem Medizinischen Menü verwendet werden. 10-Farben Farbverlauf. Kolory używane do wyświetlania krwawienia w interfejsie medycznym. Gradient 10 kolorów. + 失血颜色，用于医学图形用户界面。10种渐变颜色。 Blood Loss Color %1 @@ -1154,6 +1169,7 @@ Hémorragies - couleur %1 Blutverlustfarbe %1 Krwawienie - kolor %1 + 失血颜色 %1 Damage Colors @@ -1162,6 +1178,7 @@ Couleur des dégâts Farben für Schaden Kolory obrażeń + 负伤颜色 Damage Colors, That Used in Medical GUI. 10 Color Gradient. @@ -1170,6 +1187,7 @@ Couleurs utilisées pour afficher les dégâts dans l'interface médicale. Dégradé de 10 couleurs. Farben für Schaden, die in dem medizinischen Menü verwendet werden. 10-Farben Farbverlauf. Kolory używane do wyświetlania obrażeń w interfejsie medycznym. Gradient 10 kolorów. + 负伤颜色，用于医学图形用户界面。10种渐变颜色。 Damage Color %1 @@ -1178,6 +1196,7 @@ Dégâts - couleur %1 Schadensfarbe %1 Obrażenia - kolor %1 + 负伤颜色 %1 diff --git a/addons/medical_statemachine/stringtable.xml b/addons/medical_statemachine/stringtable.xml index 724ecd3f4f..2e8eb804c3 100644 --- a/addons/medical_statemachine/stringtable.xml +++ b/addons/medical_statemachine/stringtable.xml @@ -9,6 +9,7 @@ États Estados 狀態 + 状态 Stato Stavy Stany @@ -20,6 +21,7 @@ Lesões Fatais do Jogador プレイヤーの致命傷 玩家致命傷 + 玩家致命伤 Décès si blessure mortelle (joueurs) Smrtelná zranění hráčů Śmiertelne Obrażenia Gracza @@ -34,6 +36,7 @@ Controla quando os jogadores podem receber lesões fatais. Uma lesão fatal é causada por um dano significante na cabeça ou tronco. プレイヤーが致命傷を受けた時の挙動を管理できます。頭部や胸部に受ける大きなダメージは致命傷になります。 控制當玩家受致命傷時是否能救起。致命傷是指對頭部或身體造成可觀傷害所造成的。 + 控制当玩家受致命伤时是否能救起。致命伤是指对头部或躯干遭受重大伤害。 Détermine si les joueurs décèdent en cas de blessure mortelle. Une blessure mortelle est définie par des dommages importants à la tête ou au cœur. Oyuncuların ölümcül yaralanmaları ne zaman alabileceğini kontrol eder. Ölümcül bir yaralanma, kafaya veya vücuda önemli hasar verir. Nastavuje zda hráči mohou utrpět smrtelné zranění. Smrtelné zranění je utrpěto významným poškozením hlavy nebo trupu. @@ -48,6 +51,7 @@ Lesões Fatais da IA AI の致命傷 AI致命傷 + AI致命伤 Décès si blessure mortelle (IA) Smrtelná zranění AI Śmiertelne obrażenia AI. @@ -62,6 +66,7 @@ Controla quando a IA pode receber lesões fatais. Uma lesão fatal é causada por um dano significante na cabeça ou tronco.\nQuando definido para "Sempre", isso efetivamente causa a "Morte Instantânea da IA", pois a IA irá imediatamente morrer para qualquer lesão fatal.\nNOTA: Qualquer opção além de "Sempre" requer que Inconsciência de IA esteja ativada. AI が致命傷を受けた時の挙動を管理できます。頭部や胸部に受ける大きなダメージは致命傷になります。\n"常に"に設定されていると、いかなる致命傷でも "AI の即死" 効果が生まれます。\n注: "常に"以外のモードでは AI の無意識化を有効化させる必要があります。 控制當AI受致命傷時是否能救起。致命傷是指對頭部或身體造成可觀傷害所造成的。\n當設置為"總是"時，這會使其與"AI 瞬間死亡"同一個效果，在AI受到致命傷時瞬間死亡。\n備註：選了"總是"以外的選項的話必須開啟「AI無意識」的選項。 + 控制当AI受致命伤时是否能救起。致命伤是指对头部或躯干遭受重大伤害。\n当设置为"总是"时，这将有效地产生"AI即时死亡"行为，因为AI将立即死于任何致命伤。\n注意："总是"以外的任何模式都需要启用AI无意识。 Détermine si les unités IA décèdent en cas de blessure mortelle. Une blessure mortelle est définie par des dommages importants à la tête ou au cœur.\nSi réglé sur "Toujours", cela produit effectivement un comportement de "Mort instantanée" car les unités IA mourront immédiatement de toute blessure mortelle.\nNOTE : Tout mode autre que "Toujours" nécessite l'activation de l'option "Inconscience IA". AI'nın ölümcül yaralanmaları ne zaman alabileceğini kontrol eder. Ölümcül bir yaralanma, kafa veya vücudun önemli hasar görmesinden kaynaklanır. \"Her zaman" olarak ayarlandığında, AI herhangi bir ölümcül yaralanmadan hemen öleceği için bu etkili bir şekilde "AI Anında Ölüm" davranışı üretir.\ NOT: "Her zaman" "Yapay Zeka Bilinci'nin etkinleştirilmesini gerektirir. Nastavuje zda AI může utrpět smrtelné zranění. Smrtelné zranění je utrpěto významným poškozením hlavy nebo trupu.\nPokud je tato možnost nastavena na "Vždy", efektivně nastává stav "Povolit okamžitou smrt AI", protože AI okamžitě zemře při jakémkoliv smrtelném zranění.\nPOZNÁMKA: Jakýkoliv jiný stav než "Vždy" potřebuje zapnutou možnost "Bezvědomí AI". @@ -93,6 +98,7 @@ Controla se a IA pode ficar inconsciente ao invés de morrer imediatamente.\nEssa configuração funciona com "Lesões Fatais de IA", pois para uma unidade ter uma parada cardíaca é necessário que a IA possa fica inconsciente.\nContudo, essas configurações são separadas pois unidades podem ficar inconscientes por vitais críticos causados por ferimentos não-fatais.\nEssencialmente, isso significa que para ativar uma parada cardíaca em IA, essa configuração precisa estar ativa. AI が即死する代わりに気絶するかどうかを決定できます。\nこれは "AI の致命傷" 設定と連動します。これは AI の進呈しを起こすにはユニットが気絶する必要がある為です。\nしかしながら、これらの設定はユニットが非致死性の負傷により重体となって気絶できるよう分離されています。\n本質的にはこの設定は AI ユニットの心停止を可能にするものであり、有効化されておくべきです。 控制AI是否能進入無意識狀態而非立刻原地死亡。\n這個選項會與「AI致命傷」的選項聯動，使單位心搏停止的話必須先讓其無意識。\n然而，兩個設定分開之原因是使單位能因從非致命傷的攻擊情況下進入生命危險的狀態。\n簡單來說，你想要讓AI單位有心搏停止可能的話，該選項必須啟用。 + 控制AI是否可以进入昏迷状态而不是立即死亡。\n这个设置与"AI致命伤"设置一起工作，因为进入心脏骤停需要单位能够昏迷。\n然而，这些设置是分开的，因为单位可能会因非致命伤害导致的关键生命体征而昏迷过去。\n从本质上讲，这意味着为了使AI单位的心脏骤停，必须启用此设置。 Définit si les unités IA peuvent perdre connaissance au lieu de mourir immédiatement.\nCe paramètre fonctionne conjointement avec l'option "Décès si blessure mortelle (IA)" car, pour qu'une unité IA subisse un arrêt cardiaque, elle doit également pouvoir perdre connaissance.\nCependant, ces paramètres sont séparés car les unités peuvent s'évanouir suite à des signes vitaux critiques résultant de blessures non mortelles.\nEn résumé, cela signifie que ce paramètre doit absolument être activé pour qu'une unité IA puisse entrer en état d'arrêt cardiaque. Nastavuje zda AI může upadnout do bezvědomí namísto okamžité smrti.\nToto nastavení funguje společně s "Smrtelná zranění AI" protože srdeční zástava potřebuje možnost upadnout do bezvědomí.\nTyto možnosti jsou separované, protože jednotky mohou upadnout do bezvědomí kvůli kritickému stavu způsobenému ne smrtelnými zraněními.\nV podstatě to znamená, že pokud chcete zapnout srdeční zástavu pro AI, tato možnost musí být zapnutá. Definiuje, czy AI może stracić przytomność zamiast natychmiast zginąć.\n Ta opcja działa razem z ustawieniem "Śmiertelne urazy AI", ponieważ przejście do zatrzymania akcji serca wymaga, aby jednostka mogła stracić przytomność.\n Jednak te ustawienia są rozdzielone, ponieważ jednostki mogą stracić przytomność z powodu krytycznych czynności życiowych powstałych w wyniku urazów innych niż śmiertelne.\n W istocie oznacza to, że aby umożliwić zatrzymanie akcji serca dla jednostek AI, to ustawienie musi być włączone. @@ -110,6 +116,7 @@ Durée de l'arrêt cardiaque Tempo de Parada Cardíaca 心搏停止時間 + 心脏骤停时间 Tempo d'arresto cardiaco Délka srdeční zástavy Czas Zatrzymania Akcji Serca @@ -123,6 +130,7 @@ Контролирует, сколько времени требуется, чтобы умереть от остановки сердца. Controla o tempo necessário para morrer para uma parada cardíaca. 控制心搏停止後多久死亡 + 控制心脏骤停后多久单位死亡 Controlla quanto tempo ci vuole per morire di arresto cardiaco. Nastavuje po jak dlouhé době pacient zemře kvůli srdeční zástavě. Definiuje czas potrzebny na śmierć z powodu zatrzymania akcji serca. @@ -138,6 +146,7 @@ Provoquer un arrêt cardiaque Em Parada Cardíaca 心搏停止中 + 心脏骤停中 In arresto cardiaco V srdeční zástavě Zatrzymanie Akcji Serca @@ -152,6 +161,7 @@ 心停止中の失血 Desangrado durante parada cardíaca Wykrwawienie podczas zatrzymanej akcji serca + 心脏骤停期间失血情况 Controls whether a person can die in cardiac arrest by blood loss before the cardiac arrest time runs out. @@ -161,6 +171,7 @@ 心停止時間を超え死亡する前に、失血による心停止で死亡するかどうかを決定します。 COntrola si una persona puede morir en parada cardíaca por causa de pérdida de sangre antes de que se termine el contador de parada cardíaca Kontroluje czy śmierć osoby może nastąpić poprzez wykrwawienie zanim wyczerpię się Czas Zatrzymania Akcji Serca. + 控制单位是否会在心脏骤停时间耗完之前因失血过多而死亡。 diff --git a/addons/medical_status/stringtable.xml b/addons/medical_status/stringtable.xml index 8f46954596..4eafef0762 100644 --- a/addons/medical_status/stringtable.xml +++ b/addons/medical_status/stringtable.xml @@ -9,6 +9,7 @@ Statut Status 狀態 + 状态 Stato Stav Status @@ -91,6 +92,7 @@ Débit de transfusion IV Velocidade de Transferência de Sangue 點滴輸血流量 + 点滴输血流量 IV Portata della trasfusione Rychlost IV transfuze Natężenie Przepływu Transfuzji IV @@ -105,6 +107,7 @@ Définit la vitesse à laquelle le liquide s'écoule des poches de perfusion.\nLa variation du volume de poche IV est calculée selon la formule suivante :\n intervalle de temps (s) * variation IV par seconde (4,1667 ml/s) * débit (ce coefficient). Controla o quão rápido flúidos são extraídos de bolsas de IV. A mudança no volume da bolsa d IV é calculado assim:\nIntervalo de tempo (s) * mudança de iv por segundo (4.1667 mL/s) * Velocidade de transferência (esse valor) 控制從點滴輸入人體的液體流量多快。點滴的體積更改是以\n時間間隔（單位秒）乘上點滴每秒速度（4.1667毫升/秒）乘上流量（該係數）。 + 控制从点滴输入人体的液体流量多快。静脉输液袋容积变化的计算方法是：\n时间间隔（秒）x点滴每秒速度（4.1667毫升/秒）x流量（该系数）。 Controlla la velocità con cui il fluido esce dalle sacche per flebo. La variazione di volume delle sacche IV è calcolata come:\intervallo di tempo (s) * variazione iv al secondo (4,1667 mL/s) * portata (questo coefficiente). Nastavuje jak rychle tekutiny vytékají z IV sáčku. Zbývající objem IV sáčku je vypočítáván následovně:\nčasový interval (s) * změna iv za sekundu (4,1667 mL/s) * rychlost toku (tento koeficient). Kontroluje, jak szybko płyn wypływa z worków IV. Zmiana objętości worka IV jest obliczana jako:\n przedział czasowy * zmiana iv na sekundę (4,1667 mL/s) * natężenie przepływu (ten współczynnik). diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml index befe21cfeb..5e166f0cc9 100644 --- a/addons/medical_treatment/stringtable.xml +++ b/addons/medical_treatment/stringtable.xml @@ -9,6 +9,7 @@ Traitement Tratamento 治療 + 治疗 Trattamento Léčba Leczenie @@ -22,6 +23,7 @@ Медицинский мусор Lixo 醫療用廢棄物 + 医疗废弃物 Rifiuti Odpadky Śmieci @@ -37,6 +39,7 @@ Diagnostic avancé Diagnóstico Avançado 進階診斷 + 进阶诊断 Diagnosi avanzata Pokročilá diagnóza Zaawansowana Diagnoza @@ -50,6 +53,7 @@ Включает действия «Проверить пульс», «Проверить давление» и «Проверить реакцию» вместо общего действия «Диагностика». Ativa as opções de Verificar Pulso, Verificar Pressão Sanguínea e Verificar Resposta, ao invés do diagnóstico geral. 啟用檢查脈搏、血壓以及病患反應的動作而非一般的診斷動作。\n當停用時，CPR只會在需要時出現。\n當這個選項啟用時必須診斷病患是否無意識或者心搏停止。 + 启用后，可以检查脉搏、血压和反应治疗，而不是通用诊断。\n禁用时，心肺复苏操作将仅在适当时显示。\n此设置操作启用后必须需要先确定一个人是失去知觉还是心脏骤停。 Abilita le azioni di controllo del polso, controllo della pressione sanguigna e controllo della risposta al trattamento invece dell'azione generica Diagnose.\ Se disabilitata, l'azione di RCP sarà mostrata solo quando l'esecuzione della RCP è appropriata.\Le azioni abilitate da questa impostazione sono necessarie per determinare se una persona è in stato di incoscienza o in arresto cardiaco. Povoluje kontrolu srdečního tepu, krevního tlaku a reakce pacienta namísto univerzální diagnózy.\nKdyž je tato možnost vypnuta, CPR akce bude dostupná pouze pokud je vhodné ji provést.\nAkce které tato možnost zapíná jsou nutné k určení zda je pacient v bezvědomí nebo má srdeční zástavu. Włącza opcje sprawdzania Pulsu, Ciśnienia Tętniczego Krwi i Reakcje Na Ból, zamiast bardziej ogólnej akcji Diagnozuj.\n Po wyłączeniu tej opcji akcja RKO będzie wyświetlana tylko wtedy, gdy jej wykonanie będzie odpowiednie.\n Opcja, która włącza to ustawienie jest potrzebna do ustalenia, czy osoba jest nieprzytomna lub ma zatrzymanie krążenia. @@ -64,6 +68,7 @@ 死亡/心停止状態でも診断許可 Включено & Может диагностировать смерть/остановку сердца Aktiviert & kann Tod/Herzstillstand diagnostizieren + 已启用 & 可以诊断死亡/心搏骤停 Advanced Medication @@ -73,6 +78,7 @@ Médication avancée Medicação Avançada 進階醫療用品 + 进阶医疗用品 Pokročilé léky Medicazione avanzata Zaawansowane leki @@ -86,6 +92,7 @@ Permet une manipulation étendue et plus approfondie des médicaments.\nEn outre, permet l'utilisation d'adénosine. Ativa a manipulação avançada de medicações. Também permite o uso de Adenosina e Atropina. 是否擴展藥物管控使其更深度化。並且，啟用腺苷以及阿托品的使用次數 + 可以扩展、更深入地使用药物。同时，能够使用腺苷以及阿托品。 Povoluje hlubší a rozšířené zacházení s léčivy. Také aktivuje Adenosin a Atropin. Abilita una gestione della medicazione più estesa e approfondita. Permette inoltre l'utilizzo dell'Adenosina. Ermöglicht erweiterte, mehr tiefgründigere Anwendung von Medikationen. Ebenso ermöglicht es die Benutzung von Adenosin. @@ -100,6 +107,7 @@ Pansements avancés Ataduras Avançadas 進階包紮 + 进阶包扎 Bendaggi avanzati Pokročilé obvazy Zaawansowane Bandaże @@ -114,6 +122,7 @@ Включает действия для разных типов повязок, вместо общего действия «Перевязка». Ativa o uso de tipos diferentes de ataduras ao invés de apenas a atadura básica. 啟用不同繃帶的可用行為而非一般包紮動作。 + 启用不同绷带类型的治疗操作，而不是通用的绷带操作。\n此外，也可以启用包扎伤口开裂。 Permette azioni di trattamento per diversi tipi di bendaggio al posto del bendaggio generico. Povoluje specifické obvazy s různými vlastnostmi namísto jednoho univerzálního obvazu. Umożliwia wybranie konkretnego rodzaju bandaża zamiast ogólnej akcji bandażowania. @@ -130,6 +139,7 @@ Etkinleştirildi ve Yeniden Açılabilir Habilitada y pueden reabrirse Aktiviert und können sich wieder öffnen + 已启用 & 可以伤口开裂 Wound Reopening Coefficient @@ -141,6 +151,7 @@ 再開放係数 Yara Yeniden Açılma Katsayısı Coeficiente de reapertura de heridas + 伤口开裂系数 Coefficient for controlling the wound reopening chance. The final reopening chance is determined by multiplying this value with the specific reopening chance for the wound type and bandage used. @@ -152,6 +163,7 @@ 傷が再開放する確率の係数を設定できます。再開放は、この数値と傷の種類、そして使用した包帯に応じて左右されます。 Yaranın yeniden açılma şansını kontrol etme katsayısı. Son yeniden açılma şansı, bu değerin kullanılan yara tipi ve bandaj için spesifik yeniden açılma şansı ile çarpılmasıyla belirlenir. Coeficiente que controla la probabilidad de reapertura de heridas. La probabilidad final de reapertura de heridas queda determinada multiplicando este valor por la probabilidad específica del tipo de herida y venda usada. + 用于控制伤口开裂概率的系数。最终的重开放概率=该值x伤口类型x所使用的绷带的具体开裂概率。 Clear Trauma @@ -160,6 +172,7 @@ Очистить рану Traumata entfernen Leczenie ran + 清理创伤 Controls when hitpoint damage from wounds is healed. @@ -168,6 +181,7 @@ Определяет, когда исцеляется урон от ран. Steuert, wann Trefferpunktschaden von Wunden geheilt wird. Kontroluje kiedy punkty obrażeń od odniesionych ran są w pełni wyleczone. + 控制伤口治疗后确定受伤部位的受伤情况。 After Bandage @@ -176,6 +190,7 @@ После перевязки Nach dem Bandagieren Po zabandażowaniu + 包扎后 After Stitch @@ -184,6 +199,7 @@ После наложения швов Nach dem Nähen Po zszyciu + 缝合后 Boost medical training when in medical vehicles or facilities. Untrained becomes medic, medic becomes doctor. @@ -192,6 +208,7 @@ Увеличивает уровень медподготовки при нахождении в медицинской технике или госпитале. Неподготовленный становится Медиком, Медик становится Доктором. Aumenta a qualidade do tratamento quando dentro de veículos ou instalações médicas. Destreinados se tornam médicos, médicos se tornam doutores. 在醫療設施或者載具旁時增加醫療能力。未受訓練的將會成為醫療兵，醫療兵將會成為軍醫。 + 在医疗设施或载具旁时提升医疗训练。未受训练者将会成为医疗兵，医疗兵将会晋升为军医。 Aumentare la formazione medica quando si è in veicoli o strutture mediche. Se non addestrato diventa medico, il medico diventa dottore. Zvyšuje zdravotnickou úroveň v zdravotnických objektech a vozidlech. Nevycvičení se stávají mediky a medici se stávají doktory. Zwiększ wyszkolenie medyczne w pojazdach lub obiektach medycznych. Niewytrenowana jednostka zostaje medykiem, medyk zostaje lekarzem. @@ -206,6 +223,7 @@ Разрешить общие медикаменты Permitir Compartilhar Itens Médicos 允許共享設備 + 允许共享装备 Consentire la condivisione di attrezzature Povolit sdílení vybavení Zezwalaj na współdzielenie sprzętu @@ -220,6 +238,7 @@ Контролирует, можно ли разделить медикаменты между пациентом и врачом. Controla se um item médico pode ser compartilhado entre médico e paciente. 控制是否病患與醫療兵之間能否共享醫療物資 + 控制伤员和医疗兵之间是否可以共享医疗装备。 Controlla se le attrezzature mediche possono essere condivise tra il paziente e il medico. Nastavuje zda jak je zdravotnické vybavení sdíleno mezi medikem a pacientem. Kontroluje, czy sprzęt medyczny ma być dzielony między pacjentem a medykiem. @@ -234,6 +253,7 @@ Сначала медикаменты пациента Usar do Paciente Primeiro 優先使用患者的醫療物資 + 优先消耗伤员装备 L'attrezzatura del paziente prima di tutto Prvně pacientovo vybavení Najpierw sprzęt pacjenta @@ -248,6 +268,7 @@ Сначала медикаменты врача Usar do Médico Primeiro 優先使用醫療兵的醫療物資 + 优先消耗医疗兵装备 Prima le attrezzature mediche Prvně medikovo vybavení Najpierw sprzęt medyka @@ -263,6 +284,7 @@ Время ввода автоинъектора Czas aplikacji autostrzykawki Behandlungszeit des Autoinjektors + 自动注射器治疗时间 Time, in seconds, required to administer medication using an autoinjector. @@ -272,6 +294,7 @@ Время, необходимое для введения медикаментов автоинъектором (в секундах). Czas w sekundach potrzebny do aplikacji medykamentów za pomocą autostrzykawki. Zeit in Sekunden, die benötigt wird, um Medikamente mittels Autoinjektor zu verabreichen. + 使用自动注射器给药所需的时间(秒) Tourniquet Treatment Time @@ -281,6 +304,7 @@ Tiempo de tratamiento de torniquete Время наложения/снятия жгута Czas aplikacji stazy + 止血带治疗时间 Time, in seconds, required to apply/remove a tourniquet. @@ -290,6 +314,7 @@ Tiempo, en segundos, requerido para aplicar/quitar un torniquete. Время, необходимое для наложения/снятия жгута (в секундах). Czas w sekundach potrzebny do założenia/zdjęcia stazy. + 使用/移除止血带所需的时间(秒) IV Bag Treatment Time @@ -299,6 +324,7 @@ Tiempo de tratamiento de bolsa de IV Время применения пакета внутривенного переливания Czas aplikacji IV + 静脉输液袋治疗时间 Time, in seconds, required to administer an IV bag. @@ -308,6 +334,7 @@ Tiempo, en segundos, requerido para administrar una bolsa de IV. Время, необходимое для применения пакета внутривенного переливания (в секундах). Czas w sekundach potrzebny na aplikację transfuzji IV. + 使用静脉输液所需的时间(秒) Splint Treatment Time @@ -317,6 +344,7 @@ TIempo de tratamiento de férula Время наложения шины Czas aplikacji szyny + 夹板治疗时间 Time, in seconds, required to apply a splint. @@ -326,6 +354,7 @@ TIempo, en segundos, requerido para aplicar una férula. Время, необходимое для наложения шины (в секундах). Czas w sekundach potrzebny na aplikację szyny. + 使用夹板所需的时间(秒) Body Bag Use Time @@ -335,6 +364,7 @@ TIempo de uso de bolsa para cuerpos Время использования мешка для трупов Czas użycia worka na ciało + 尸袋使用时间 Time, in seconds, required to put a patient in a body bag. @@ -344,6 +374,7 @@ Tiempo, en segundos, requerido para poner a un paciente en una bolsa para cuerpos. Время, необходимое для того чтобы упаковать труп в мешок (в секундах). Czas w sekundach potrzebny na spakowanie ciała do worka na ciało. + 装入裹尸袋时间 Allow Epinephrine @@ -368,6 +399,7 @@ Уровень подготовки, необходимый для использования Адреналина. É necessária uma qualificação médica para usar epinefrina. 要受過何種程度的醫療訓練才可以使用腎上腺素 + 使用肾上腺素所需的医疗水平。 Livello di addestramento richiesto per usare l'Epinefrina. Úroveň výcviku pro použití epinefrinu Poziom wyszkolenia wymagany do korzystania z epinefryny. @@ -398,6 +430,7 @@ Контролирует, где можно использовать Адреналин. Controla onde Epinefrina pode ser utilizada. 控制何處能使用腎上腺素 + 控制何地能使用肾上腺素。 Controlli dove si può usare l'Epinefrina. Nastavuje kde může být epinefrin použit Kontroluje, gdzie można stosować epinefrynę. @@ -429,6 +462,7 @@ Уровень подготовки, необходимый для использования Аптечки. É necessária uma qualificação médica para usar KPS 要受過何種程度的醫療訓練才可以使用個人急救包 + 使用个人急救包所需的医疗水平。 Livello di formazione richiesto per l'utilizzo di un PAK. Úroveň výcviku pro použití osobní lékárničky (PAK). Poziom wyszkolenia wymagany do korzystania z apteczek osobistych. @@ -460,6 +494,7 @@ Контролирует, где можно использовать Аптечку. Controla onde o KPS pode ser utilizado. 控制何處能使用個人急救包 + 控制何地能使用个人急救包。 Controlla dove può essere usato un PAK. Nastavuje kde může být osobní lékárnička (PAK) použita. Kontroluje, gdzie można korzystać z apteczek osobistych. @@ -474,6 +509,7 @@ Израсходовать Аптечку KPS Descartável 個人急救包為消耗品 + 个人急救包会被消耗 Consumare PAK Spotřebuj osobní lékárničku (PAK) Zużycie apteczek osobistych @@ -488,6 +524,7 @@ Контролирует, следует ли израсходовать Аптечку после использования. Controla se o KPS deve ser descartado/consumido após o uso. 設定個人急救包是否為消耗品 + 设置个人急救包是否会被消耗 Controlla se un PAK deve essere consumato dopo l'uso. Nastavuje zda má být osobní lékárnička (PAK) spotřebována po použití. Kontroluje, czy apteczka osobista powinna być zużyta po użyciu. @@ -500,6 +537,7 @@ Utilizzo del kit di pronto soccorso su se stessi Erste-Hilfe-Set Selbstanwendung 自我使用急救包 + 自我使用急救包 Utilisation de la trousse sanitaire sur soi-même Używanie apteczki osobistej na sobie 応急処置キットの自己使用 @@ -513,6 +551,7 @@ Abilita l'utilizzo del kit di pronto soccorso su se stessi. Erlaubt die Benutzung des Erste-Hilfe-Sets, um sich selbst zu heilen. 啟用個人急救包能對自己使用。 + 启用自身能使用个人急救包。 Définit si le joueur peut utiliser la trousse sanitaire pour se soigner lui-même. Pozwala na użycie apteczki osobistej na sobie 応急処置キットを使って、自分を治療できるようにします。 @@ -528,6 +567,7 @@ Контролирует, следует ли израсходовать Аптечку после использования. Coeficiente de Tempo do KPS 個人急救包的時間係數 + 个人急救包时间系数 Coefficiente temporale PAK Časový koeficient pro osobní lékárničku (PAK) Współczynnik czasu apteczek osobistych @@ -542,6 +582,7 @@ Изменяет быстроту применения Аптечки.\nВремя лечения зависит от общего повреждения частей тела, умноженного на данный коэффициент (минимум 10 сек.). Modifica quanto tempo o KPS leva para ser aplicado.\nO tempo de tratamento é baseado no total de dano do corpo, multiplicado por esse coeficiente, com um mínimo de 10 segundos. 修改個人急救包要使用多久才能完成。\n醫療時間是依照全身的肢體狀況並乘上該係數而決定的，至少十秒。 + 修改个人急救包应用时间。 \n治疗时间=全身的总伤害x该系数，至少十秒。 Il tempo di trattamento si basa sul danno totale della parte del corpo moltiplicato per questo coefficiente, con un minimo di 10 secondi. Upravuje jak dlouho trvá léčba pomocí osobní lékárničky (PAK).\nDoba léčby závisí na celkovém poškození částí těla vynásobeném tímto koeficientem, přičemž minimum je 10 vteřin. Zmienia czas potrzebny na zastosowanie apteczki osobistej.\n Czas leczenia jest oparty na całkowitym uszkodzeniu części ciała pomnożonym przez ten współczynnik, wynosi minimum 10 sekund. @@ -556,6 +597,7 @@ Разрешить Хирургический набор Permitir Kit Cirúrgico 允許使用手術包 + 允许使用手术包 Permettere il kit chirurgico Povolit sešívací sadu Ograniczenia Użycia Zestawu Chirurgicznego @@ -570,6 +612,7 @@ Уровень медицинской подготовки, необходимый для использования Хирургического набора. É necessária uma qualificação médica para usar Kit Cirúrgico 要受過多少程度的醫療訓練才能使用手術包。 + 使用手术包所需的医疗水平。 Livello di formazione richiesto per l'utilizzo di un kit chirurgico. Úroveň výcviku pro použití sešívací sady. Poziom wyszkolenia wymagany do korzystania z Zestawu Chirurgicznego. @@ -584,6 +627,7 @@ Места использования Хирургического набора Locais para Kit Cirúrgico 手術包使用地點 + 手术包使用地点 Luoghi Kit chirurgico Nastavuje kde může být sešívací sada použita Miejsca użycia Zestawu Chirurgicznego @@ -598,6 +642,7 @@ Контролирует, где можно использовать Хирургический набор Controle onde o Kit Cirúrgico pode ser utilizado. 控制何處能使用手術包 + 控制何地能使用手术包 Controlla dove può essere usato un kit chirurgico. Nastavuje zda má být sešívací sada spotřebována po použití. Kontroluje, gdzie można użyć Zestawu Chirurgicznego. @@ -612,6 +657,7 @@ Израсходовать Хирургический набор Kit Cirúrgico Consumível 手術包為消耗品 + 手术包是否被消耗 Consumare Kit Chirurgico Spotřebuj sešívací sadu Zużycie Zestawów Chirurgicznych @@ -625,6 +671,7 @@ Контролирует, следует ли израсходовать Хирургический набор после использования. Controla se o Kit Cirúrgico deve ser descartado/consumido após o uso. 設定手術包是否為消耗品 + 设置手术包是否使用后会被消耗 Controlla se un kit chirurgico deve essere consumato dopo l'uso. Nastavuje Kontroluje, czy Zestaw Chirurgiczny powinien być zużyty po użyciu. @@ -637,6 +684,7 @@ Auto-Cirurgia 自己縫合 自我縫合 + 自我缝合 Auto cucitura Samo-zašívání Zszywanie własnych ran @@ -650,6 +698,7 @@ Permite o uso de Kit Cirúrgico em si mesmo. 縫合キットを使い自らを縫合できるようにします。 啟用是否能自己使用手術包來縫合自己的傷口。 + 启用是否能够使用手术包进行自我缝合。 Umožňuje použití sešívací sady na sebe sama. Umożliwia użycie Zestawu Chirurgicznego na sobie. Permette l'uso di kit chirurgici per ricucirsi. @@ -665,6 +714,7 @@ Время зашивания ран Czas szycia rany Benötigte Zeit, um Wunden zu nähen + 伤口缝合时间 Time, in seconds, required to stitch a single wound. @@ -674,6 +724,7 @@ Время, необходимое для зашивания одной раны (в секундах). Czas w sekundach potrzebny na zaszycie pojedyńczej rany. Zeit in Sekunden, um eine einzelne Wunde zu nähen. + 缝合一个伤口所需的时间（秒） Self IV Transfusion @@ -683,6 +734,7 @@ Pose d'IV sur soi-même Autotransfusão de IV 自我注射點滴 + 自我静脉输液 Samoaplikace IV transfuze Samotransfuzja IV Trasfusione endovena su se stessi @@ -696,6 +748,7 @@ Active la possibilité de s'auto-poser des IVs. Permite utilizar bolsas de IV para transfusão em si mesmo 啟用是否能對自己注射點滴 + 启用是否能够自我静脉输液 Umožňuje aplikovat IV transfuze na sama sebe. Pozwala przetoczyć płyny IV samemu sobie Abilita la trasfusione in endovena su se stessi. @@ -709,6 +762,7 @@ Разрешить упаковывать пациентов без сознания в мешки для трупов Nieprzytomni w worku na ciało Erlaube Benutzung des Leichensackes mit bewusstlosen Personen + 允许昏迷者装入尸袋 Enables placing an unconscious patient in a body bag. @@ -718,6 +772,7 @@ Разрешает упаковывать пациентов без сознания в мешки для трупов. Zezwalaj na pakowanie nieprzytomnych osób do worka na ciało. Aktiviert, Bewusstlose in Leichensack zu legen. + 能够将昏迷的伤员装入尸袋中。 Allow IV Transfusion @@ -725,6 +780,7 @@ Zezwalaj na przetaczanie płynów IV Pose de perfusions autorisée pour 允許操作點滴 + 允许静脉输液 IV 輸血の制限 Povolit IV transfuzi Разрешить внутривенное переливание @@ -736,6 +792,7 @@ Poziom wyszkolenia potrzebny aby móc przetaczać płyny IV. Définit la qualification médicale requise pour poser des perfusions intraveineuses. 要有何種醫療水準才可注射點滴。 + 静脉输液所需的医疗水平。 IV 輸血を行うのに訓練済レベルを要求とします。 Úroveň výcviku nutná pro IV transfuzi. Уровень навыка, требуемый для осуществления внутривенного переливания. @@ -749,6 +806,7 @@ Места введения пакетов внутривенного переливания Miejsca do transfuzji IV Orte an denen IV-Transfusionen angelegt werden können + 静脉输液地点 Controls where IV transfusions can be performed. @@ -758,6 +816,7 @@ Определяет к каким частям тела разрешено применять пакеты внутренного переливания. Kontroluje w jakich miejscach można robić transfuzje IV. Kontrolliert, wo IV-Transfusionen durchgeführt werden können. + 控制何地可以静脉输液 Convert Vanilla Items @@ -767,6 +826,7 @@ Convertir les objets vanilla Converter itens vanilla 轉換原版物品 + 转换原版物品 Converti oggetti vanilla Přeměnit zdravotnické předměty ze základní hry Konwertuj przedmioty z vanili @@ -780,6 +840,7 @@ Определяет, что делать с ванильными медикаментами: преобразовать в медикаменты ACE, удалить или проигнорировать. Controla se itens médicos vanilla serão convertidos para itens do ACE, removidos ou ignorados. 控制是否轉換原版的醫療物資成ACE的醫療物資，或者單純移除或無視。 + 控制是否转换原版的医疗物品成ACE的医疗物品，或者单纯移除/无视。 Controlla se gli articoli medicali vanilla vengono convertiti in articoli medicali ACE, rimossi o ignorati. Nastavuje zda zdravotnické předměty ze základní hry budou přeměněny na ACE předměty, odstraněny nebo ignorovány. Kontroluje, czy podstawowe przedmioty medyczne z Arma są konwertowane na przedmioty medyczne ACE, tylko usuwane lub ignorowane. @@ -792,6 +853,7 @@ Удалять Apenas Remover 單純移除 + 仅移除 Rimuovere solo Pouze odstranit Tylko Usuwaj @@ -811,6 +873,7 @@ Abilita rifiuti 廃棄物の有効化 啟用醫療用廢棄物 + 启用医疗废弃物 Çöpleri Etkinleştir @@ -820,6 +883,7 @@ Разрешает создание медицинского мусора при лечении. Permite a criação de lixo médico durante o tratamento. 啟用醫療後剩下的醫療用廢棄物。 + 启用在治疗后能够产生医疗垃圾。 Permette la creazione di rifiuti al momento del trattamento. Umožňuje vytvořit odpadky při léčbě. Umożliwia tworzenie śmieci po przeprowadzaniu zabiegu. @@ -833,6 +897,7 @@ Макс. кол-во мусора Máximo de Objetos de Lixo 最大醫療用廢棄物數量 + 最大医疗垃圾数量 Numero massimo di rifiuti Maximum odpadků Maksymalna Ilość Śmieci @@ -847,6 +912,7 @@ Устанавливает максимальное количество создаваемых объектов мусора. Чрезмерное значение может вызвать задержку FPS. Define o limite máximo de objetos de lixo que podem ser criados, quantidade excessivas podem causar lag de FPS. 設定最大可以產生的醫療用廢棄物數量，極端的數量的話可能導致幀數下降。 + 设置可以生成的最大垃圾数量，数量过多会导致FPS延迟。 Imposta il numero massimo di rifiuti che possono essere generati, quantità eccessive possono diminuire gli FPS. Nastavuje maximum odpadků, které se mohou objevit. Vysoká hodnota m§že negativně ovlivnit FPS. Definiuje maksymalną liczbę śmieci, które mogą zostać stworzone, nadmierne ilości mogą powodować spadki FPS. @@ -860,6 +926,7 @@ Время жизни мусора Duração de Lixo 醫療用廢棄物時長 + 医疗垃圾寿命 Tempo rifiuti Životnost odpadků Czas trwania Śmieci @@ -874,6 +941,7 @@ Управляет временем жизни объектов мусора в секундах. -1 означает Навсегда. Controla o tempo de vida de objetos de lixo criados em segundos. -1 é para sempre. 控制醫療用廢棄物的時長，以秒為單位。設定為-1則是永不刪除。 + 控制医疗垃圾物体的生命周期，以秒为单位。-1则是永不删除。 Controlla la durata di vita dei rifiuti in secondi. -1 è per sempre. Nastavuje za jak dlouho zdravotnické odpadky zmizí. -1 je navždy. Kontroluje czas trwania śmieci w sekundach. -1 pozostawia je na zawsze. @@ -904,6 +972,7 @@ Медики Médicos 醫療兵 + 医疗兵 Medici Medikové Medycy @@ -918,6 +987,7 @@ Доктора Doutores 軍醫 + 军医 Dottori Doktoři Doktorzy @@ -932,6 +1002,7 @@ Госпитали Instalações Médicas 醫療設施 + 医疗设施 Strutture mediche Zdravotnické zařízení Obiekty Medyczne @@ -946,6 +1017,7 @@ Техника и госпитали Veículos e Instalações Médicas 車輛與設施 + 载具&设施 Zdravotnická zařízení a vozidla Veicoli e strutture Pojazdy i Obiekty @@ -960,6 +1032,7 @@ Szansa na powodzenie CPR - Minimum 心肺蘇生の最低成功確率 HLW Minimale Erfolgschance + 心肺复苏的最低成功率 CPR Success Chance Maximum @@ -968,6 +1041,7 @@ Szansa na powodzenie CPR - Maksimum 心肺蘇生の最高成功確率 HLW Maximale Erfolgschance + 心肺复苏的最高成功率 Minimum probability that performing CPR will restore heart rhythm.\nThis minimum value is used when the patient has at least "Lost a fatal amount of blood".\nAn interpolated probability is used when the patient's blood volume is between the minimum and maximum thresholds. @@ -976,6 +1050,7 @@ Minimalna wartość szansy na to że CPR przywróci bicie serca.\nTa minimalna wartość jest używana gdy pacjent ma status "Stracił krytyczną ilość krwi".\nInterpolowana wartość szansy jest używana gdy pacjent ma poziom krwi będący pomiędzy minimum a maksimum. 心肺蘇生を行うことで心拍が回復する最低成功確率を設定します。\nこの値は患者が"致命的な程失血している"時に使用されます。\n患者の血液量が最低値と最大値の間だった場合は、補完確率が適用されます。 Minimale Wahrscheinlichkeit, dass die Durchführung einer HLW den Herzrhythmus wiederherstellt.\nDieser Mindestwert wird verwendet, wenn der Patient mindestens "eine tödliche Menge Blut verloren" hat.\nEine interpolierte Wahrscheinlichkeit wird verwendet, wenn das Blutvolumen des Patienten zwischen dem minimalen und dem maximalen Schwellenwert liegt. + 实施心肺复苏恢复心律的最小可能性。\n当伤员至少有"致命失血量"时，就取该最小值。\n当伤员的血量介于最小和最大阈值之间时，将使用插值概率。 Maximum probability that performing CPR will restore heart rhythm.\nThis maximum value is used when the patient has at most "Lost some blood".\nAn interpolated probability is used when the patient's blood volume is between the minimum and maximum thresholds. @@ -984,6 +1059,7 @@ Maksymalna wartość szansy na to że CPR przywróci bicie serca.\nTa maksymalna wartość jest używana gdy pacjent ma status "Stracił trochę krwi".\nInterpolowana wartość szansy jest używana gdy pacjent ma poziom krwi będący pomiędzy minimum a maksimum. 心肺蘇生を行うことで心拍が回復する最高成功確率を設定します。\nこの値は患者が"いくらか失血している"時以上の場合に使用されます。\n患者の血液量が最低値と最大値の間だった場合は、補完確率が適用されます。 Maximale Wahrscheinlichkeit, dass die Durchführung einer HLW den Herzrhythmus wiederherstellt.\nDieser Maximalwert wird verwendet, wenn der Patient höchstens "Blut verloren" hat.\nEine interpolierte Wahrscheinlichkeit wird verwendet, wenn das Blutvolumen des Patienten zwischen dem minimalen und dem maximalen Schwellenwert liegt. + 实施心肺复苏恢复心律的最大可能性。\n当伤员最多“失血一些”时，就取该最大值。\n当伤员的血量介于最小和最大阈值之间时，将使用插值概率。 CPR Treatment Time @@ -993,6 +1069,7 @@ Время проведения СЛР Czas potrzebny na wykonanie CPR HLW Behandlungsdauer + 心肺复苏时间 Time, in seconds, required to perform CPR on a patient. @@ -1002,11 +1079,13 @@ Время, необходимое для проведения сердечно-лёгочной реанимации (СЛР) (в секундах). Czas w sekundach jaki jest potrzebny do wykonania CPR na pacjencie. Zeit in Sekunden, die benötigt wird, um eine HLW durzuführen. + 对伤员实施心肺复苏所需的时间（秒） Holster Required 武器の扱い 需要收起武器 + 需要收起武器 Rengainer obligatoirement Fondina richiesta Vyžadováno schování zbraně @@ -1019,6 +1098,7 @@ Controls whether weapons must be holstered / lowered in order to perform medical actions.\nExcept Exam options allow examination actions (checking pulse, blood pressure, response) at all times regardless of this setting. 何らかの治療をするには武器を下げるか収めるかどうかを決定します。\nなお次の診断行動は設定で例外できます: 心拍確認、血圧測定、反応確認 控制是否要先放下或把武器放入武器套才能做出醫療行為。\n除了診斷 - 允許未放下或未放入的情況下進行一連串的診斷（檢查脈搏，血壓，反應）。 + 控制是否要先放下或把武器放起才能做出医疗行为。\n除了诊断 - 允许未放下或未收起的情况下进行一连串的诊断（检查脉搏，血压，反应）。 Définit si les armes doivent être rengainées ou abaissées avant de pouvoir effectuer des actes médicaux.\nLes options "sauf examens" autorisent les examens (vérification du pouls, de la tension artérielle, de l'état de conscience) en toutes circonstances. Nastavuje zda musí být zbraň schovaná/snížená pro provádění zdravotnických úkonů.\nKromě Diagnózy - Umožňuje diagnostické akce (kontrola srdečního tepu, tlaku krve a reakci pacienta) vždy bez ohledu na nastavení schování zbraně. Kontroluje, czy broń musi być schowana/opuszczona w celu wykonania leczenia pacjenta.\n Za wyjątkiem diagnozowania - umożliwia wykonywanie czynności kontrolnych (sprawdzanie tętna, ciśnienia krwi, reakcji) przez cały czas, niezależnie od ustawienia Wymagana broń w kaburze. @@ -1031,6 +1111,7 @@ Lowered or Holstered 下げるか収める 放低或者收起 + 放低或者收起 Abaisser ou rengainer Abbassato o con fondina Snížena nebo Schována @@ -1043,6 +1124,7 @@ Lowered or Holstered (Except Exam) 下げるか収める (診断行動は除外) 放低或者收起（除了診斷） + 放低或者收起（除了诊断） Abaisser ou rengainer (sauf examens) Abbassato o con la fondina (eccetto l'esame) Snížena nebo Schována (kromě Diagnózy) @@ -1055,6 +1137,7 @@ Holstered Only 収めた時のみ 只能收起 + 只能收起 Rengainer seulement Solo con la fondina Pouze Schována @@ -1067,6 +1150,7 @@ Holstered Only (Except Exam) 収めた時のみ (診断行動は除外) 只能收起（除了診斷） + 只能收起（除了诊断） Rengainer seulement (sauf examens) Solo fondina (eccetto esame) Pouze Schována (kromě Diagnózy) @@ -3783,6 +3867,7 @@ %1 jest nieresponsywny, ma płytki oddech oraz jest w konwulsjach %1 は反応せず、浅い呼吸とけいれんをしている %1 reagiert nicht, schnappt nach Luft und verkrampft + %1没有反应，微软的喘着气和抽搐 %1 is not responsive, motionless and cold @@ -3790,6 +3875,7 @@ %1 jest nieresponsywny, nieruchomy oraz zimny %1 は反応せず、動かず冷たくなっている %1 reagiert nicht, ist regungslos und kalt + %1没有反应，一动不动，身体冰凉 You checked %1 @@ -4481,6 +4567,7 @@ ¡El cuerpo se retorció y puede que no esté muerto! Ciało drgnęło i może nie być martwe! Der Körper zuckte und kann nicht tot sein! + 身体抽搐了一下，可能还没死! diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml index 74200ac4e6..2f5384e04b 100644 --- a/addons/microdagr/stringtable.xml +++ b/addons/microdagr/stringtable.xml @@ -510,6 +510,7 @@ MicroDAGR - Precisão de Waypoint Précision des points de passage 微型軍用GPS接收器 - 導航精確度 + 微型军用GPS接收器 - 航点精度 MicroDAGR - přesnost Waypointů Micro DAGR - precisión del waypoint @@ -523,6 +524,7 @@ Controla o quão preciso pode exibir o waypoint de distância Définit la précision d'affichage des points de passage. 控制顯示的導航點精確度為多少 + 控制显示航点距离的精确程度。 Nastavuje jak přesně je vzdálenost waypointů zobrazena. Controla cómo de precisa se mostrará la distancia al waypoint @@ -536,6 +538,7 @@ 100m 100 m 一百公尺 + 100米 100 m 100m 100m @@ -550,6 +553,7 @@ 10m 10 m 十公尺 + 10米 10 m 10m 10m @@ -564,6 +568,7 @@ 1m 1 m 一公尺 + 1米 1 m 1m 1m @@ -592,6 +597,7 @@ MicroDAGR - 前のモードに MicroDAGR - vorheriger Modus MicroDAGR - Poprzedni Tryb + 微型GPS接收器 - 上一个模式 MicroDAGR - Next Mode @@ -601,6 +607,7 @@ MicroDAGR - 次のモードに MicroDAGR - nächster Modus MicroDAGR - Kolejny Tryb + 微型GPS接收器 - 下一个模式 diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index f75530cc56..92c472e4dc 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -531,6 +531,7 @@ Coefficient de luminosité ambiante Spielernamen Umgebungshelligkeitskoeffizient Współczynnik jasności otoczenia + 铭牌的环境亮度系数 Adjusts how strongly ambient brightness affects nametag view distance. @@ -539,6 +540,7 @@ Définit à quel point le manque de lumière ambiante abaisse la distance de visibilité du nom des joueurs. Stellt ein, wie stark sich die Umgebungshelligkeit auf die Sichtweite der Spielernamen auswirkt. Definiuje jak bardzo jasność otoczenia wpływa na zasięg wyświetlania imion postaci. + 调整环境亮度对铭牌查看距离的影响程度。 diff --git a/addons/nightvision/stringtable.xml b/addons/nightvision/stringtable.xml index 63752fb20c..492069b0ce 100644 --- a/addons/nightvision/stringtable.xml +++ b/addons/nightvision/stringtable.xml @@ -7,7 +7,7 @@ ACE Visione notturna ACE-Nachtsicht ACE夜視鏡 - ACE夜视镜 + ACE夜视仪 ACE Vision Nocturne ACE Noktowizja ACE ПНВ @@ -23,6 +23,7 @@ 暗視装置 (第1世代、ブラウン) Gogle noktowizyjne (Gen 1, Brązowe) NS-Brille (1. Gen., braun) + 夜视仪（一代，棕色） NV Goggles (Gen1, Black) @@ -31,6 +32,7 @@ 暗視装置 (第1世代、ブラック) Gogle noktowizyjne (Gen 1, Czarne) NS-Brille (1. Gen., schwarz) + 夜视仪（一代，黑色） NV Goggles (Gen1, Green) @@ -39,6 +41,7 @@ 暗視装置 (第1世代、グリーン) Gogle noktowizyjne (Gen 1, Zielone) NS-Brille (1. Gen., grün) + 夜视仪（一代，绿色） NV Goggles (Gen2, Brown) @@ -47,6 +50,7 @@ 暗視装置 (第2世代、ブラウン) Gogle noktowizyjne (Gen 2, Brązowe) NS-Brille (2. Gen., braun) + 夜视仪（二代，棕色） NV Goggles (Gen2, Black) @@ -55,6 +59,7 @@ 暗視装置 (第2世代、ブラック) Gogle noktowizyjne (Gen 2, Czarne) NS-Brille (2. Gen., schwarz) + 夜视仪（二代，黑色） NV Goggles (Gen2, Green) @@ -63,6 +68,7 @@ 暗視装置 (第2世代、グリーン) Gogle noktowizyjne (Gen 2, Zielone) NS-Brille (2. Gen., grün) + 夜视仪（二代，绿色） NV Goggles (Gen3) @@ -77,7 +83,7 @@ Éjjellátó szemüveg (3. Gen.) 暗視装置 (第3世代) 야투경 (3세대) - 夜视镜 (三代) + 夜视仪 (三代) 夜視鏡 (三代) GG Gözlüğü (3. Jen) @@ -94,7 +100,7 @@ Éjjellátó szemüveg (3. Gen., barna) 暗視装置 (第3世代、ブラウン) 야투경 (3세대, 갈색) - 夜视镜 (三代, 棕色) + 夜视仪 (三代, 棕色) 夜視鏡 (三代, 棕色) GG Gözlüğü (3. Jen Kahverengi) @@ -111,7 +117,7 @@ Éjjellátó szemüveg (3. Gen., zöld) 暗視装置 (第3世代、グリーン) 야투경 (3세대, 녹색) - 夜视镜 (三代, 绿色) + 夜视仪 (三代, 绿色) 夜視鏡 (三代, 綠色) GG Gözlüğü (3. Jen Yeşil) @@ -128,7 +134,7 @@ Éjjellátó szemüveg (3. Gen., fekete) 暗視装置 (第3世代、ブラック) 야투경 (3세대, 검정색) - 夜视镜 (三代, 黑色) + 夜视仪 (三代, 黑色) 夜視鏡 (三代, 黑色) GG Gözlüğü (3. Jen Siyah) @@ -139,6 +145,7 @@ 暗視装置 (第4世代、ブラウン) Gogle noktowizyjne (Gen 4, Brązowe) NS-Brille (4. Gen., braun) + 夜视仪 (四代, 棕色) NV Goggles (Gen4, Black) @@ -147,6 +154,7 @@ 暗視装置 (第3世代、ブラック) Gogle noktowizyjne (Gen 4, Czarne) NS-Brille (4. Gen., schwarz) + 夜视仪 (四代, 黑色) NV Goggles (Gen4, Green) @@ -155,6 +163,7 @@ 暗視装置 (第3世代、グリーン) Gogle noktowizyjne (Gen 4, Zielone) NS-Brille (4. Gen., grün) + 夜视仪 (四代, 绿色) NV Goggles (Wide, Brown) @@ -163,6 +172,7 @@ 暗視装置 (ワイド、ブラウン) Gogle noktowizyjne (Szerokie, Brązowe) NS-Brille (Weit, braun) + 夜视仪 (宽, 棕色) NV Goggles (Wide, Black) @@ -171,6 +181,7 @@ 暗視装置 (ワイド、ブラック) Gogle noktowizyjne (Szerokie, Czarne) NS-Brille (Weit, schwarz) + 夜视仪 (宽, 黑色) NV Goggles (Wide, Green) @@ -179,6 +190,7 @@ 暗視装置 (ワイド、グリーン) Gogle noktowizyjne (Szerokie, Zielone) NS-Brille (Weit, grün) + 夜视仪 (宽, 绿色) Brightness: %1 @@ -210,7 +222,7 @@ Aumenta la luminosità dell'NVG 暗視装置の明度を上げる 야투경 밝기 높이기 - 增加夜视镜亮度 + 增加夜视仪亮度 增加夜視鏡亮度 Gece Görüşü Parlaklığını Arttır @@ -227,7 +239,7 @@ Riduci la luminosità dell'NVG 暗視装置の明度を下げる 야투경 밝기 줄이기 - 减少夜视镜亮度 + 减少夜视仪亮度 減少夜視鏡亮度 Gece Görüşü Parlaklığını Düşür @@ -243,7 +255,7 @@ Vision nocturne 暗視装置 야간투시경 - 夜视 + 夜视仪 夜視 Gece Görüşü @@ -259,7 +271,7 @@ Réglages pour la vision nocturne. 暗視装置の設定をします。 야간투시경 설정 - 设定夜视选项. + 设置夜视仪选项. 設定夜視選項 Gece görüşü ayarı. @@ -275,7 +287,7 @@ Désactiver les JVN dans les viseurs スコープでは暗視装置を無効化 조준경 사용시 야투경 비활성화 - 使用瞄准镜时关闭夜视镜 + 使用瞄准镜时关闭夜视仪 使用瞄準鏡時關閉夜視鏡 Gece görüşünü dürbünde kapat. @@ -291,7 +303,7 @@ Bloque l'usage des JVN pendant la visée. スコープで狙いを付けると、暗視装置を無効化します。 조준시 야투경의 사용을 제한합니다. - 此功能开启后，当要使用瞄准镜时，为避免夜视镜镜头碰撞到瞄准镜，会先拿开夜视镜后再进行瞄准镜瞄准。 + 此功能开启后，当要使用瞄准镜时，为避免夜视仪镜头碰撞到瞄准镜，会先拿开夜视仪后再进行瞄准镜瞄准。 此功能開啟後，當要使用瞄準鏡時，為避免夜視鏡鏡頭碰撞到瞄準鏡，會先拿開夜視鏡後再進行瞄準鏡瞄準 @@ -300,7 +312,7 @@ Livello Nebbia NVG Nebel in Nachtsicht 夜視鏡霧氣程度 - 夜视镜雾气程度 + 夜视仪雾气程度 Épaisseur du brouillard (JVN) Skala Mgły NVG Степень размытия ПНВ @@ -314,7 +326,7 @@ La nebbia viene utilizzata per limitare la visibilità. Nebel wird genutzt, um die Sichtbarkeit einzuschränken. 透過霧氣來縮減夜視鏡的可視距離 - 透过雾气来缩减夜视镜的可视距离。 + 透过雾气来缩减夜视仪的可视距离。 Le brouillard est utilisé pour limiter la visibilité. Mgła jest wykorzystywana do ograniczenia widoczności. Туман используется для ограничения видимости @@ -328,7 +340,7 @@ Effetto livello NVG Nachtsichteffekte 夜視鏡效果程度 - 夜视镜效果程度 + 夜视仪效果程度 Intensité des effets Skala Efektów NVG Степень эффектов ПНВ @@ -342,7 +354,7 @@ Effetti di sfocatura e luminosità [Importare a 0 disabiliterà TUTTI gli effetti della visione notturna] Unschärfe und Helligkeitseffekte [Dies auf 0 zu setzen deaktiviert SÄMTLICHE Nachtsichteffekte] 調整模糊與亮度的效果。[設值為0會關閉所有夜視鏡的特殊效果] - 调整模糊与亮度的效果。[设值为0会关闭所有夜视镜的特殊效果] + 调整模糊与亮度的效果。[设值为0会关闭所有夜视仪的特殊效果] Effets de flou et de luminosité. [Régler cette option sur 0 désactivera TOUS les effets de vision nocturne.] Efekty rozmazania i jasności [Ustawienie na 0 wyłączy WSZYSTKIE efekty noktowizji] Эффекты размытия и яркости [Установка на 0 отключит ВСЕ эффекты ПНВ] @@ -368,7 +380,7 @@ NVG Noise Scale Intensität des Bildrauschens 夜視鏡雜訊程度 - 夜视镜杂讯程度 + 夜视仪杂讯程度 暗視装置のノイズ度 Intensité du bruit (JVN) Fattore di Disturbo del NVG @@ -382,7 +394,7 @@ Image noise intensity when wearing NVGs Intensität des Bildrauschens im Nachtsichtgerät 調整配戴夜視鏡時畫面雜訊的多寡。 - 调整配戴夜视镜时画面杂讯的多寡。 + 调整配戴夜视仪时画面杂讯的多寡。 暗視装置を使用時に起きる画像ノイズの強度です Intensité du bruit de l'image lorsque vous portez des JVN. Intensità del disturbo dell'immagine quando i NVG sono equipaggiati diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml index 63b53d3d39..d6f7544d11 100644 --- a/addons/overheating/stringtable.xml +++ b/addons/overheating/stringtable.xml @@ -53,6 +53,7 @@ Коэффициент нагрева Erhitzungs-Koeffizient Współczynnik nagrzewania + 过热系数 Coefficient for the amount of heat a weapon generates per shot.\nHigher value increases heat. @@ -61,18 +62,23 @@ Коэффициент количества тепла, выделяемого оружием за выстрел. \nБольшие значения увеличивают нагрев. Koeffizient für die Menge an Hitze, die eine Waffe pro Schuss erzeugt.\nHöhere Werte beschleunigen die Erhitzung. Współczynnik wpływający na ilość ciepła generowanego przez broń przy każdym strzale. + 武器每次射击产生的热量系数。\n数值越高，热量越高。 Cooling Coefficient + 冷却系数 Coefficient for how quickly a weapon cools down.\nHigher value increases cooling speed. + 武器冷却速度系数。\n数值越高，冷却速度越快。 Suppressor Coefficient + 消音器系数 Coefficient for how much additional heat is added from having a suppressor attached.\nHigher value increases heat, 0 means no additional heat from the suppressor. + 附加了消音器后，产生的额外热量系数。\n数值越高，热量越高，0意味着消音器不产生额外热量。 Display Text on Jam @@ -209,6 +215,7 @@ Дистанция для Еффектов и Разброса Abstand für Effekte und Dispersion Odległość efektów i rozproszenia + 效果和扩散距离 The distance, in meters, from the player within which overheating particle effects and dispersion are visible. @@ -217,6 +224,7 @@ Дистанция в метрах, с которой видны эффекты частиц и разброса при перегреве. Der Abstand in Metern vom Spieler, in dem Überhitzungspartikeleffekte und Dispersion sichtbar sind. Określa odległość w metrach, do której widoczne są efekty cząsteczkowe i rozproszenie. + 距离玩家的距离(米)，在这个距离内可以看到过热的粒子效应和扩散。 Heat Increases Fire Rate @@ -225,6 +233,7 @@ Нагрев увеличивает темп стрельбы Hitze erhöht die Feuerrate Ciepło zwiększa szybkostrzelność + 过热增加射速 As weapons heat up, their rate of fire increases by up to 10%. @@ -233,6 +242,7 @@ При нареве орудия, его темп стрельбы увеличивается до 10%. Wenn sich Waffen erhitzen, erhöht sich ihre Feuerrate um bis zu 10%. Gdy broń się nagrzewa, jej szybkostrzelność może wzrosnąć nawet o 10%. + 随着武器的过热，其射速最多增加10%。 Jam Chance Coefficient @@ -241,6 +251,7 @@ Шанс заклинивания оружия Koeffizient für Ladehemmung Szansa na zacięcie + 卡弹概率系数 Coefficient for the chance that a weapon will jam from overheating.\nHigher value make jams more likely.\nSet to 0 to disable jamming. @@ -249,6 +260,7 @@ Шанс заклинивания оружия от перегрева.\nБольшие значения повышают шанс заклинивания.\nУстановите 0 для отключения заклинивания. Koeffizient für die Wahrscheinlichkeit, dass eine Waffe eine Ladehemmung hat.\Höhere Werte erhöhen die Wahrscheinlichkeit.\Auf 0 setzen, um Ladehemmungen zu deaktivieren. Współczynnik zmieniający szansę na zacięcie się broni z powodu przegrzania.\nIm wyższa wartość, tym większe ryzyko zacięcia się broni.\nUstaw na 0, aby wyłączyć zacinanie się broni. + 武器因过热而卡弹的概率系数。\n数值越高，卡住的可能性越大。\n设置为0以禁用卡弹。 Unjam Weapon on Reload @@ -288,6 +300,7 @@ Désenrayer l'arme au changement de canon Замена ствола устраняет заклинивание оружия. Usuń zacięcie przy wymianie lufy + 更换枪管清除卡弹 Controls whether swapping barrels clears a weapon jam. @@ -296,6 +309,7 @@ Определяет, устраняет ли замена ствола заклинивание оружия. Bestimmt, ob das Wechseln des Laufes eine Ladehemmung behebt. Określa, czy wymiana lufy usuwa zacięcie się broni. + 通过更换枪管，以便清除卡弹。 Chance of Unjam Failing @@ -336,6 +350,7 @@ Коеффициент возгорания при перегреве Selbstzündungskoeffizient bei Überhitzung Współczynnik samozapłonu + 过热炸膛系数 Coefficient for the heat required for cookoffs to occur.\nHigher values require more heat to cookoff.\nSet to 0 to disable cookoff. @@ -344,6 +359,7 @@ Коеффициент нагрева, при котором возникает возгорание. Koeffizient für die zum Selbstzünden erforderliche Hitze.\nHöhere Werte erfordern mehr Hitze zum Selbstzünden.\nAuf 0 setzen, um das Selbstzünden zu deaktivieren. Współczynnik modyfikujący ilość ciepła wymaganego do samozapłonu amunicji w komorze broni.\nIm wyższa wartość, tym gorętsza musi być broń, aby amunicja uległa samozapłonowi\nUstaw 0, aby wyłączyć samozapłon. + 发生炸膛的过热系数。\n数值越高，炸膛所需要的过热值越高。\n设置为0禁用炸膛。 Spare barrel @@ -400,6 +416,7 @@ Оружие сдетонировало! Munition durchgezündet! Samozapłon amunicji! + 武器炸膛！ Failure to eject. @@ -408,6 +425,7 @@ Не удалось достать. Hülse wurde nicht ausgeworfen. Nie udało się wyrzucić łuski. + 弹出失败。 Failure to extract. @@ -416,6 +434,7 @@ Не удалось извлечь. Hülse wurde nicht ausgezogen. Nie udało się wyjąć łuski. + 未能抽出。 Failure to feed. @@ -424,6 +443,7 @@ Не удалось подать. Patrone wurde nicht zugeführt. Nie udało się załadować naboju. + 未能进食。 Failure to fire. @@ -432,6 +452,7 @@ Не удалось выстрелить. Patrone wurde nicht gezündet! Nie udało się strzelić. + 未能开火。 Clear jam @@ -613,6 +634,7 @@ Охладить оружие с... Waffe mit... kühlen Schłódź broń za pomocą... + 冷却武器... Cooling %1 with %2. @@ -621,6 +643,7 @@ Охлаждение %1 с %2. Kühle %1 mit %2. Chłodzenie %1 za pomocą %2. + 冷却 %1 至 %2。 Cool weapon in water source. @@ -629,6 +652,7 @@ Охладить оружие в воде. Kühle Waffe aus Wasserquelle. Schłódź broń wodą. + 用水源冷却武器。 Cooling weapon in water source. @@ -637,6 +661,7 @@ Охлаждение оружия в воде. Waffe wird aus Wasserquelle gekühlt. Chłodzenie broni wodą. + 在水源中冷却武器。 Container doesn't have enough water. @@ -645,6 +670,7 @@ Воды недостаточно для охлаждения. Behälter beinhaltet nicht genug Wasser. Zbiornik nie ma wystarczającej ilości wody + 容器里的水不够。 Weapon is cool enough the water has stopped boiling. @@ -653,6 +679,7 @@ Оружие достаточно холодное для прекращения кипения воды. Waffe ist kalt genug, dass Wasser hat aufgehört zu kochen. Broń jest wystarczająco schłodzona. Woda przestała się gotować. + 武器已经冷却，水已经停止沸腾了。 Temperature diff --git a/addons/parachute/stringtable.xml b/addons/parachute/stringtable.xml index 38108c2c5c..17fe910041 100644 --- a/addons/parachute/stringtable.xml +++ b/addons/parachute/stringtable.xml @@ -140,6 +140,7 @@ 開傘失敗率 Szansa na nieotwarcie się spadochronu Wahrscheinlichkeit, dass ein Fallschirm sich nicht öffnet + 开伞失败率 diff --git a/addons/quickmount/stringtable.xml b/addons/quickmount/stringtable.xml index 19669fa088..9a189c516c 100644 --- a/addons/quickmount/stringtable.xml +++ b/addons/quickmount/stringtable.xml @@ -67,6 +67,7 @@ This option allows quick entry into the vehicle you are directly looking at. Cette option permet d'entrer rapidement dans les véhicules que vous regardez. 這個選項允許你能快速進入你直視的載具 + 这个选项允许你能快速进入你直视的载具 Ta opcja umożliwia szybkie wsiadanie do pojazdu na który patrzysz. Esta opção permite entrada rápida para o veículo que você está olhando この機能により直接見ている車両へすぐさま搭乗できます。 @@ -198,6 +199,7 @@ Cambia posto Mudar de Assento 換座位 + 换座位 Changer de place Změnit sedadlo Koltuk Değiştir diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml index 235d29b979..536d55f5fe 100644 --- a/addons/realisticnames/stringtable.xml +++ b/addons/realisticnames/stringtable.xml @@ -1332,6 +1332,7 @@ M183 Комплектный подрывной заряд (Бросаемый) Ładunek burzący M183 (Rzucany) M183 Geballte Sprengladung (Werfbar) + M183炸药包（可投掷） M112 Demolition Block @@ -1359,6 +1360,7 @@ M112 подрывной заряд (Бросаемый) Ładunek burzący M112 (Rzucany) M112 Sprengladung (Werfbar) + M112塑性炸药（可投掷） M67 Fragmentation Grenade @@ -1390,6 +1392,7 @@ V40 Mini-Granát Mini Granada V40 V40 Mini-El Bombası + V40迷你手榴弹 M83 Smoke Grenade (White) @@ -3952,6 +3955,7 @@ ELCAN SpecterOS (Forêt) ELCAN SpecterOS (緑地) ELCAN SpecterOS (Grün) + ELCAN SpecterOS (繁茂) ELCAN SpecterOS (Arid) @@ -3959,6 +3963,7 @@ ELCAN SpecterOS (Désert) ELCAN SpecterOS (乾燥地帯) ELCAN SpecterOS (Trocken) + ELCAN SpecterOS (干旱) ELCAN SpecterOS 7.62 (Black) @@ -3966,6 +3971,7 @@ ELCAN SpecterOS 7.62 (Noire) ELCAN SpecterOS 7.62 (ブラック) ELCAN SpecterOS 7.62 (Schwarz) + ELCAN SpecterOS 7.62 (黑色) ELCAN SpecterOS 7.62 (Lush) @@ -3973,6 +3979,7 @@ ELCAN SpecterOS 7.62 (Forêt) ELCAN SpecterOS 7.62 (緑地) ELCAN SpecterOS 7.62 (Grün) + ELCAN SpecterOS 7.62 (繁茂) ELCAN SpecterOS 7.62 (Arid) @@ -3980,6 +3987,7 @@ ELCAN SpecterOS 7.62 (Désert) ELCAN SpecterOS 7.62 (乾燥地帯) ELCAN SpecterOS 7.62 (Trocken) + ELCAN SpecterOS 7.62 (干旱) SIG BRAVO4 / ROMEO3 (Black) @@ -4242,6 +4250,7 @@ Burris XTR II (Usée) Burris XTR II (使い古し) Burris XTR II (Alt) + Burris XTR II (陈旧) Burris XTR II (ASP-1 Kir) @@ -4249,6 +4258,7 @@ Burris XTR II (ASP-1 Kir) Burris XTR II (ASP-1 Kir) Burris XTR II (ASP-1 Kir) + Burris XTR II (ASP-1 Kir) EOTech XPS3 (Tan) @@ -4301,6 +4311,7 @@ EOTech XPS3 (Forêt) EOTech XPS3 (緑地) EOTech XPS3 (Grün) + EOTech XPS3 (繁茂) EOTech XPS3 (Arid) @@ -4308,6 +4319,7 @@ EOTech XPS3 (Désert) EOTech XPS3 (乾燥地帯) EOTech XPS3 (Trocken) + EOTech XPS3 (干旱) EOTech XPS3 SMG (Tan) @@ -4487,7 +4499,7 @@ P90 TR (Preto) P90 TR (ブラック) P90 TR (黑色) - P90 TR (黑色) + P90 TR (黑色) P90 TR (Black) P90 TR (Siyah) @@ -4759,7 +4771,7 @@ Магазин из 50-ти 5,7 мм 5.7mm 50 発入り弾倉 5.7mm 50發 彈匣 - 5.7mm 50发 弹匣 + 5.7mm 50发 弹匣 5.7mm 50Rnd Mag 5.7mm 50Rnd Şarjör @@ -5030,7 +5042,7 @@ M14 (klasický) M14 (clássico) M14 (표준) - M14 (經典) + M14 (经典) M14 (クラシック) M14 (klasik) M14 (klasszikus) diff --git a/addons/rearm/stringtable.xml b/addons/rearm/stringtable.xml index 4aae2a1aeb..af1bdfcbce 100644 --- a/addons/rearm/stringtable.xml +++ b/addons/rearm/stringtable.xml @@ -656,6 +656,7 @@ Боеприпасы для перевооружения Carga de Rearme 整裝用貨物 + 重整军备货物 Stock de munitions Sklad munice Cargar munición @@ -669,6 +670,7 @@ Объем боеприпасов для перевооружения (-1 для отмены) A Carga para Rearmamento (-1 para desativar) 貨物可以提高多少次整裝（-1為停用） + 重新武装的货物(-1禁用) Le quantité de munitions (en points), qui est disponible pour du réarmement (-1 pour désactiver). Objekt pro přezbrojování (-1 pro vypnutí) Cantidad de munición restante para rearmado (-1 para deshabilitar) @@ -680,6 +682,7 @@ Distância para Rearmar 再武装距離 整裝距離 + 整装距离 Distanza di riarmo Přezbrojovací vzdálenost Odległość przezbrojenia @@ -693,6 +696,7 @@ A distância máxima que um veículo pode ser rearmado/municiado. 車両から再武装できる範囲を決定します。 與載具之最大可整裝距離 + 车辆可重新整装的最大距离 La distanza massima a cui un veicolo può essere riarmato Maximální vzdálenost na jakou může být vozidlo přezbrojeno Maksymalna odległość na jakiej pojazd może zostać przezbrojony diff --git a/addons/reload/stringtable.xml b/addons/reload/stringtable.xml index 478c512200..367c8e9f1b 100644 --- a/addons/reload/stringtable.xml +++ b/addons/reload/stringtable.xml @@ -40,6 +40,7 @@ Vždy zobrazit kontrolu munice v menu vlastní interakce セルフ インタラクションへ弾薬確認を常に表示 總是在自我互動中顯示檢查彈藥動作 + 总是在自我互动中显示检查弹药动作 Toujours afficher l'action de vérification des munitions Sempre mostrar a opção de checar a própria munição Всегда показывать проверку боеприпасов в меню взаимодействия с собой @@ -53,6 +54,7 @@ Zobrazuje kontrolu munice v menu vlastní interakce i pokud hráč nepoužívá statickou zbraň. 設置型火器を使っていなくても、セルフ インタラクションへ弾薬確認を常に表示します。 即使不是固定式支援武器也依然在自我互動中顯示檢查彈藥動作 + 即使不是固定式支援武器也依然在自我互动中显示检查弹药动作 Permet d'afficher l'action de vérification des munitions du menu d'interaction personnel, même si le joueur n'utilise pas d'arme statique. Mostra a opção de ver sua própria munição mesmo quando não em armas estáticas. Показывать проверку боеприпасов даже вне стационарного орудия diff --git a/addons/repair/stringtable.xml b/addons/repair/stringtable.xml index 9009b15537..c3d53736fb 100644 --- a/addons/repair/stringtable.xml +++ b/addons/repair/stringtable.xml @@ -268,6 +268,7 @@ Повысьте подготовку инженеров при ремонте транспортных средств или объектов. Нетренированный становится инженером, инженер становится продвинутым инженером. Steigert die Ausbildung von Pionieren, wenn Sie sich in Reparaturfahrzeugen oder -einrichtungen befinden. Aus Ungelerntem wird Pionier, aus Pionier wird ein fortgeschrittener Pionier. Zwiększ wyszkolenie inżynierów w pojazdach i budynkach naprawczych. Niewyszkoleni zostają inżynierami, inżynierowie zostają zaawansowanymi inżynierami. + 在修理车辆或设施时，提升工程师训练。未受过训练的变成工程师，工程师晋升为高级工程师。 Full Repair Locations @@ -1887,6 +1888,7 @@ Sonstige Reparaturbedingungen 部分修理条件 額外修理條件 + 部分全面维修条件 Exigences pour réparations diverses Requisiti di riparazione vari Požadavky pro částečnou opravu @@ -1900,6 +1902,7 @@ Gegenstände die benötigt werden, um eine spezifische Fahrzeugkomponente oder eine Kette zu entfernen/auszutauschen. 車両の特定コンポーネントか履帯の除去/交換にアイテムを必要とします。 是否需要物品來修復一些特別載具部位或者移除/替換履帶 + 维修特定车辆部件或拆除/更换轨道所需的物品。 Outils nécessaires pour la réparation d'un équipement spécifique du véhicule, et pour le démontage ou le remplacement des chenilles. Předměty potřebné k provedení opravy konkrétní části vozidla nebo sundání/výměny pásů. Przedmioty wymagane do naprawy określonego elementu pojazdu lub usunięcia/wymiany gąsienicy. @@ -1913,6 +1916,7 @@ Bedingungen für vollständige Reparatur 完全修理条件 完整修復條件 + 全面维修条件 Exigences pour réparations complètes Requisiti per la riparazione completa Požadavky pro plnou opravu @@ -1926,6 +1930,7 @@ Gegenstände die benötigt werden um ein Fahrzeug vollständig zu reparieren. 車両の完全修理にアイテムを必要とします。 是否需要物品來完整修復載具 + 进行全面车辆维修所需的物品。 Outils nécessaires pour effectuer une réparation complète des véhicules. Předměty potřebné k provedení plné opravy vozidla. Przedmioty wymagane do przeprowadzenia pełnej naprawy pojazdu. diff --git a/addons/scopes/stringtable.xml b/addons/scopes/stringtable.xml index eae39deffd..e2df8ae6f7 100644 --- a/addons/scopes/stringtable.xml +++ b/addons/scopes/stringtable.xml @@ -573,6 +573,7 @@ Horizontal limits Horizontale Grenzen 水平限制 + 水平限制 水平制限 Limite orrizontale Limit poziomy @@ -586,6 +587,7 @@ Vertical limits Vertikale Grenzen 垂直限制 + 垂直限制 垂直制限 Limite verticale Limit pionowy diff --git a/addons/slideshow/stringtable.xml b/addons/slideshow/stringtable.xml index 937764d231..91e2cbf55b 100644 --- a/addons/slideshow/stringtable.xml +++ b/addons/slideshow/stringtable.xml @@ -229,9 +229,11 @@ Texture Selection + 纹理选择 Object texture selection. Default: 0 + 物体纹理选择（默认：0） Slides diff --git a/addons/smallarms/stringtable.xml b/addons/smallarms/stringtable.xml index 2277426d78..53d43b3a93 100644 --- a/addons/smallarms/stringtable.xml +++ b/addons/smallarms/stringtable.xml @@ -13,7 +13,7 @@ 9 mm, 17ks zásobník Carregador 17Mun. 9 mm 9mm 17발 탄창 - 9 毫米 17 发弹匣 + 9 毫米 17发弹匣 9mm 17Rnd マガジン 9 mm 17 Merm. Şarjör @@ -27,6 +27,7 @@ .45 ACP, 25ks zásobník .45 ACP 25 Merm. Şarjör .45 ACP 25Rnd マガジン + .45 ACP 25发弹匣 .45 ACP 25Rnd Tracers (Green) Mag @@ -38,6 +39,7 @@ .45 ACP, 25ks zásobník stopovky (zelené) .45 ACP 25 Merm. İzli (Yeşil) Şarjör .45 ACP 25Rnd 曳光弾 (緑) マガジン + .45 ACP 25发曳光弹（绿）弹匣 .45 ACP 25Rnd Tracers (Red) Mag @@ -49,6 +51,7 @@ .45 ACP, 25ks zásobník stopovky (červené) .45 ACP 25 Merm. İzli (Kırmızı) Şarjör .45 ACP 25Rnd 曳光弾 (赤) マガジン + .45 ACP 25发曳光弹（红）弹匣 .45 ACP 25Rnd Tracers (Yellow) Mag @@ -60,6 +63,7 @@ .45 ACP, 25ks zásobník stopovky (žluté) .45 ACP 25 Merm. İzli (Sarı) Şarjör .45 ACP 25Rnd 曳光弾 (黄) マガジン + .45 ACP 25发曳光弹（黄）弹匣 .45 ACP 8Rnd Mag @@ -71,6 +75,7 @@ .45 ACP, 8ks zásobník .45 ACP 8 Merm. Şarjör .45 ACP 8Rnd マガジン + .45 ACP 8发弹匣 .45 ACP 15Rnd Mag @@ -82,6 +87,7 @@ .45 ACP, 15ks zásobník .45 ACP 15 Merm. Şarjör .45 ACP 15Rnd マガジン + .45 ACP 15发弹匣 diff --git a/addons/spectator/stringtable.xml b/addons/spectator/stringtable.xml index 5467eb6cc3..69a8c06baf 100644 --- a/addons/spectator/stringtable.xml +++ b/addons/spectator/stringtable.xml @@ -212,6 +212,7 @@ 最大追随距離 Distância Máxima de Acompanhamento 最大跟隨距離 + 最大跟随距离 Distance maximale de suivi Distanza massima per seguire Maximální vzdálenost sledování objektu @@ -225,6 +226,7 @@ カメラが目標へ追随できる最大距離を決定できます。 A distância máxima que a câmera de acompanhamento pode estar do alvo. 攝影機能追隨目標的最大距離 + 摄影机能追随目标的最大距离 Distanza massima che la telecamera seguente può percorrere dall'obiettivo Distance maximale à laquelle la caméra de suivi peut se trouver par rapport à la cible. Maximální vzdálenost při které může kamera sledovat cíl diff --git a/addons/switchunits/stringtable.xml b/addons/switchunits/stringtable.xml index c343718f13..191d884912 100644 --- a/addons/switchunits/stringtable.xml +++ b/addons/switchunits/stringtable.xml @@ -71,6 +71,7 @@ Ermögliche Seitenwechsel Permettre le changement de camp 啟用陣營切換 + 启用阵营切换 Povolit změnu strany Włącz zmiane strony Habilita troca de time diff --git a/addons/towing/stringtable.xml b/addons/towing/stringtable.xml index 4efe789ff6..8a965a26a4 100644 --- a/addons/towing/stringtable.xml +++ b/addons/towing/stringtable.xml @@ -8,6 +8,7 @@ Буксирование Abschleppen Holowanie + 牵引 Attach Tow Rope @@ -16,6 +17,7 @@ Прикрепить буксировочный канат Abschleppseil befestigen Przypnij linkę holowniczą + 系上牵引绳 Attaching Cancelled @@ -24,6 +26,7 @@ Прикрепление отменено Befestigen Abgebrochen Przyczepianie anulowane + 取消系上绳索 Attach Tow Rope (3.2m) @@ -32,6 +35,7 @@ Прикрепить буксировочный канат (3.2м) Befestige Seil (3.2m) Przypnij linkę holowniczą (3,2m) + 系上牵引绳（3.2米） Attach Tow Rope (6.2m) @@ -40,6 +44,7 @@ Прикрепить буксировочный канат (6.2м) Befestige Seil (6.2m) Przypnij linkę holowniczą (6,2m) + 系上牵引绳（6.2米） Attach Tow Rope (12.2m) @@ -48,6 +53,7 @@ Прикрепить буксировочный канат (12.2м) Befestige Seil (12.2m) Przypnij linkę holowniczą (12,2m) + 系上牵引绳（12.2米） Attach Tow Rope (15.2m) @@ -56,6 +62,7 @@ Прикрепить буксировочный канат (15.2м) Befestige Seil (15.2m) Przypnij linkę holowniczą (15,2m) + 系上牵引绳（15.2米） Attach Tow Rope (18.3m) @@ -64,6 +71,7 @@ Прикрепить буксировочный канат (18.3м) Befestige Seil (18.3m) Przypnij linkę holowniczą (18,3m) + 系上牵引绳（18.3米） Attach Tow Rope (27.4m) @@ -72,6 +80,7 @@ Прикрепить буксировочный канат (27.4м) Befestige Seil (27.4m) Przypnij linkę holowniczą (27,4m) + 系上牵引绳（27.4米） Attach Tow Rope (36.6m) @@ -80,6 +89,7 @@ Прикрепить буксировочный канат (36.6м) Befestige Seil (36.6m) Przypnij linkę holowniczą (36,6m) + 系上牵引绳（36.6米） Detach Tow Rope @@ -88,6 +98,7 @@ Отцепить буксировочный канат Entferne Abschleppseil Odepnij linkę holowniczą + 解开牵引绳 diff --git a/addons/trenches/stringtable.xml b/addons/trenches/stringtable.xml index 682c2a7e82..6e8f7fd19a 100644 --- a/addons/trenches/stringtable.xml +++ b/addons/trenches/stringtable.xml @@ -250,6 +250,7 @@ ACETrincheras ACE Okopy ACE Gräben + ACE战壕 Small Trench Dig Duration @@ -259,6 +260,7 @@ Tiempo de cavar trinchera pequeña Czas kopania małego okopu Kleiner Graben - Aushebungsdauer + 小型战壕挖掘时间 Time, in seconds, required to dig a small trench. @@ -268,6 +270,7 @@ Tiempo, en segundos, requerido para cavar una trinchera pequeña. Czas, w sekundach wymagany do wykopania małego okopu Zeit in Sekunden, um einen kleinen Graben auszuheben. + 挖一条小型战壕所需的时间(秒)。 Small Trench Remove Duration @@ -277,6 +280,7 @@ Tiempo de eliminar trinchera pequeña Czas usuwania małego okopu Kleiner Graben - Aufschüttdauer + 小型战壕回填时间 Time, in seconds, required to remove a small trench. @@ -286,6 +290,7 @@ Tiempo, en segundos, requerido para eliminar una trinchera pequeña. Czas, w sekundach wymagany do usunięcia małego okopu Zeit in Sekunden, um einen kleinen Graben aufzuschütten. + 回填一条小型战壕所需的时间(秒)。 Big Trench Dig Duration @@ -295,6 +300,7 @@ Tiempo de cavar trinchera grande Czas kopania dużego okopu Große Graben - Aushebungsdauer + 大型战壕挖掘时间 Time, in seconds, required to dig a big trench. @@ -304,6 +310,7 @@ Tiempo, en segundos, requerido para cavar una trinchera grande Czas, w sekundach wymagany do wykopania dużego okopu Zeit in Sekunden, um einen großen Graben auszuheben. + 挖一条大型战壕所需的时间(秒)。 Big Trench Remove Duration @@ -313,6 +320,7 @@ Tiempo de eliminar trinchera grande Czas usuwania dużego okopu Kleiner Graben - Aufschüttdauer + 大型战壕回填时间 Time, in seconds, required to remove a big trench. @@ -322,6 +330,7 @@ Tiempo, en segundos, requerido para eliminar una trinchera grande Czas, w sekundach wymagany do usunięcia dużego okopu Zeit in Sekunden, um einen großen Graben aufzuschütten. + 回填一条大型战壕所需的时间(秒)。 diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index ba961711f0..c229970c2b 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -165,6 +165,7 @@ Znak wodny wersji deweloperskiej 開発版ウォーターマーク Wasserzeichen für Entwicklungsversion + 开发建设水印 Weapon Name @@ -673,6 +674,7 @@ Indicateur de vitesse de déplacement Включить индикатор скорости передвижения Aktiviere Bewegungsgeschwindigkeits-Indikator + 启用移动速度指示器 Enables movement speed indicator for player character. @@ -681,6 +683,7 @@ Affiche un indicateur permettant de visualiser la vitesse de déplacement du personnage. Включает индикатор скорости передвижения персонажа игрока. Aktiviere den Bewegungsgeschwindigkeits-Indikator des Spielers. + 为玩家角色启用移动速度指示器。 diff --git a/addons/vehicle_damage/stringtable.xml b/addons/vehicle_damage/stringtable.xml index b9def24abe..b84b8b319a 100644 --- a/addons/vehicle_damage/stringtable.xml +++ b/addons/vehicle_damage/stringtable.xml @@ -7,6 +7,7 @@ ACE Dégâts de véhicule avancés ACE Erweiterter Fahrzeugsschaden ACE Zaawansowany system uszkodzeń pojazdów + ACE高级载具损坏 Enable/Disable advanced vehicle damage @@ -14,6 +15,7 @@ Active les dégâts de véhicule avancés. Aktiviert/Deaktiviert den Erweiterten Fahrzeugsschaden Włącz/Wyłącz zaawansowane uszkodzenia pojazdów + 启用/禁用高级载具损坏 Enable/Disable advanced car damage (Experimental) @@ -21,6 +23,7 @@ Active les dégâts avancés sur les voitures (expérimental). Aktiviert/Deaktiviert den Erweiterten Fahrzeugsschaden (Experimentell) Włącz/Wyłącz zaawansowane uszkodzenia w samochodach (eksperymentalne) + 启用/禁用高级车辆损坏（实验性） Enable/Disable advanced Car Damage @@ -28,6 +31,7 @@ Dégâts de voiture avancés Aktiviert/Deaktiviert erweiterten Autoschaden Włącz/Wyłącz zaawansowane uszkodzenia w samochodach + 启用/禁用高级车辆损坏 Removes all vehicle ammo after cook-off @@ -35,6 +39,7 @@ Retire toutes les munitions des véhicules après une auto-inflammation. Entfernt die gesamte Munition nach dem Durchzünden der Munition eines Fahrzeuges. Usuwa całą amunicję z pojazdu po samozapłonie + 殉爆后移除所有车辆弹药 Enable/Disable Ammo Removal During Cook-Off @@ -42,6 +47,7 @@ Retirer les munitions durant l'auto-inflammation Aktiviert/Deaktiviert Entfernung der Munition beim Durchzünden Włącz/Wyłącz usuwanie amunicji podczas samozapłonu + 启用/禁用殉爆过程中的弹药移除功能 Wreck (Turret) diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml index 0c3bcc4585..670e7b7ad1 100644 --- a/addons/vehiclelock/stringtable.xml +++ b/addons/vehiclelock/stringtable.xml @@ -285,6 +285,7 @@ Usuń niejednoznaczny stan blokady あいまいな鍵の状態を削除 Unklaren Sperrzustand entfernen + 移除不明确的上锁状态 As Is diff --git a/addons/vehicles/stringtable.xml b/addons/vehicles/stringtable.xml index bb6ca8d48a..daae288f98 100644 --- a/addons/vehicles/stringtable.xml +++ b/addons/vehicles/stringtable.xml @@ -46,6 +46,7 @@ Límite de velocidad Rychlostní omezení 速限 + 限速 Vitesse limite Hız Limiti @@ -77,6 +78,7 @@ Aumentar límite de velocidad Zvyš rychlostní limit 增加速限 + 提高限速 Augmenter la vitesse limite Hız Limitini Arttır @@ -91,6 +93,7 @@ Disminuir límite de velocidad Sniž rychlostní limit 降低速限 + 降低限速 Diminuer la vitesse limite Hız Limitini Azalt @@ -103,6 +106,7 @@ Desactivar apagado automático del motor Vypni automatické vypnutí motoru 關閉引擎自動熄火 + 关闭引擎自动熄火 Désactiver l'arrêt automatique du moteur Wyłącz automatyczne wyłączanie silnika Disattivare lo spegnimento automatico del motore @@ -117,6 +121,7 @@ Desactivar el apagado automático del motor al salir de los vehículos. Zabraň automatickému vypnutí motoru při opuštění vozidla. 避免離開載具時自動熄火。 + 避免离开载具时自动熄火。 Impedire lo spegnimento automatico del motore quando si esce dai veicoli. Empêche l'arrêt automatique du moteur à la sortie des véhicules. Araçtan inerken motorun otomatik kapatılmasını engelleyin. @@ -131,6 +136,7 @@ Ocultar opção de Ejetar Ocultar acción de expulsión 隱藏逃脫動作 + 隐藏下车选项 Masquer l'action d'éjection Nascondi azione di espulsione Schovat vyskočení z vozidla @@ -144,6 +150,7 @@ Oculta a opção de interação para ejetar. Requer que o jogo seja reiniciado. Oculta la entrada Expulsar del menú de acciones. Requiere un reinicio del juego. 隱藏在動作選單中逃脫動作的選項。要求遊戲重新啟動。 + 隐藏鼠标滚轮菜单中的下车选项。需要重新启动游戏。 Masque l'entrée "Éjection" du menu Action. Nécessite un redémarrage du jeu. Nasconde la voce Espelli dal menu azione. Richiede il riavvio del gioco. Schová akci vyskošení z vozidla z akčního menu. Vyžaduje restart hry. @@ -157,6 +164,7 @@ Krokování omezovače rychlosti Шаг ограничителя скорости Salto de limitador de vehículo + 限速器步长 diff --git a/addons/viewdistance/stringtable.xml b/addons/viewdistance/stringtable.xml index 55a55fc4c4..17c1818614 100644 --- a/addons/viewdistance/stringtable.xml +++ b/addons/viewdistance/stringtable.xml @@ -120,6 +120,7 @@ Setting to 0 will use default video settings + 设置为0将使用默认的视频设置 Client View Distance (On Foot) diff --git a/addons/weather/stringtable.xml b/addons/weather/stringtable.xml index 82e0006843..3a8375e73d 100644 --- a/addons/weather/stringtable.xml +++ b/addons/weather/stringtable.xml @@ -172,6 +172,7 @@ Check Air Temperature Überprüfe Lufttemperatur 檢查氣溫 + 检查气温 Controllare la temperatura dell'aria Zkontrolovat teplotu vzduchu 気温を確認 @@ -186,6 +187,7 @@ Show Check Air Temperature Action Zeige "Überprüfe Lufttemperatur" im Selbstinteraktionsmenü 顯示檢查氣溫動作 + 显示检查气温选项 Mostra Controlla l'azione della temperatura dell'aria Ukázat akci kontroly teploty vzduchu 気温の確認動作を表示 diff --git a/addons/zeus/stringtable.xml b/addons/zeus/stringtable.xml index 41959254b0..5bf1bfdfbf 100644 --- a/addons/zeus/stringtable.xml +++ b/addons/zeus/stringtable.xml @@ -79,7 +79,7 @@ Mostra messaggi popup globali quando un giocatore viene assegnato come Zeus. プレイヤーが Zeus になる際、全体へポップアップ表示を行います。 플레이어가 Zeus 될 시 서버에 이를 알리는 팝업이 등장합니다. - 当一位玩家被指定为宙斯时显示全域讯息 + 当一位玩家被指定为宙斯时显示全局讯息 當一位玩家被指定為宙斯時顯示全域訊息 @@ -295,6 +295,7 @@ Editing Mode 編輯模式 + 编辑模式 Modalità per editare Bearbeitungsmodus 編集モード @@ -308,6 +309,7 @@ Add or remove editable objects from Zeus 新增或移除可編輯物件給宙斯 + 添加或删除宙斯的可编辑对象 Aktiviere oder deaktiviere zu bearbeitende Objekte von Zeus Agguingi o rimuovi oggetti che Zeus può modificare Zeus から編集可能オブジェクトの追加と削除をする @@ -322,6 +324,7 @@ Add Objects Füge Objekte hinzu 新增物件 + 新增物体 Aggiungi Oggetti オブジェクト追加 Dodaj obiekty @@ -356,7 +359,7 @@ Wszyscy kuratorzy Tous les curateurs Tutti i Moderatori - 所有编辑者 + 所有宙斯 所有編輯者 Все кураторы Todos os Curadores @@ -371,7 +374,7 @@ Zatwierdź zmiany dla wszystkich kuratorów Applique les changements à tous les curateurs. Applica i cambiamenti a tutti i moderatori - 确认变更给所有编辑者 + 确认变更给所有宙斯 確認變更給所有編輯者 Применить изменения ко всем кураторам Aplicar mudanças à todos os Curadores @@ -388,6 +391,7 @@ Objetos adicionais Další objekty 額外物件 + 额外物体 Objets supplémentaires Objetos adicionales @@ -401,6 +405,7 @@ Objetos adicionais para incluir na ação, ignorando a distância da tarefa Další objekty, které mají být zahrnuty do akce, bez ohledu na poloměr úlohy 無論任務範圍何處，都在行動中包含著額外的物件 + 确认变更给所有宙斯 Objets supplémentaires à intégrer dans l'action, quel que soit le rayon de la tâche. Objetos adicionales para incluir en la acción al margen del Radio de Tarea @@ -1097,6 +1102,7 @@ Nenhum Ninguno 無 + 无 Nikdo Aucun Hiçbiri @@ -1111,6 +1117,7 @@ Jogadores Jugadores 玩家 + 玩家 Hráči Joueurs Oyuncular @@ -1125,6 +1132,7 @@ Jogadores e IA Jugadores e IA 玩家與AI + 玩家与AI Hráči a AI Joueurs et IA Oyuncular ve AI @@ -1141,7 +1149,7 @@ Fügt Objekte zum Kurator hinzu キュレーターにオブジェクトを追加 큐레이터에 물체 추가 - 增加物件给任务策划人 + 增加物件给任务宙斯 增加物件給任務策劃人 @@ -1156,7 +1164,7 @@ Fügt jedes gespawnte Objekt allen Kuratoren der Mission hinzu ミッション内で作成されたオブジェクトに全キュレーターを追加 미션 내 큐레이터에 모든 생성 물체 추가 - 在任务中生成物件给所有的任务策划人 + 在任务中生成物件给所有的任务宙斯 在任務中生成物件給所有的任務策劃人 @@ -1179,6 +1187,7 @@ Select cargo to unload Ladung zum ausladen auswählen 選擇要卸載的貨物 + 选择要卸载的货物 Scegli il carico da scaricare 選択したカーゴを降ろす Wybierz ładunek do wyładowania @@ -1831,6 +1840,7 @@ Criar Zeus Crear Zeus 新增宙斯 + 新增宙斯 Vytvořit Zeuse Créer Zeus Zeus oluştur @@ -1845,6 +1855,7 @@ Apagar Zeus Eliminar Zeus 刪除宙斯 + 删除宙斯 Smazat Zeuse Supprimer Zeus Zeus sil @@ -1858,6 +1869,7 @@ menu "%1" Menu "%1" 選單 %1 + 菜单"%1" "%1" menu Menu "%1" "%1" menü @@ -1871,6 +1883,7 @@ Десантировать груз Soltar carga de paraquedas 空投貨物 + 空投货物 Paradrop Cargo Výsadek nákladu Paralargage de cargaison @@ -1886,6 +1899,7 @@ Nenhuma carga carregada No hay carga cargada 沒有貨物裝載 + 没有装载货物 Nessun carico caricato Žádný náklad není naložen Aucune cargaison chargée @@ -1894,6 +1908,7 @@ Burn Unit Einheit anzünden + 焚烧单位 From 5332059738554713908f89ada1f0bfa9f7130bf2 Mon Sep 17 00:00:00 2001 From: Ellis Nielsen Date: Sat, 18 Dec 2021 17:14:15 -0600 Subject: [PATCH 21/22] SOG Compat - Remove Vanilla systems left in CfgVehicles (#8708) * init commit * review changes * removed Land_vn_building_base import * case sensitive includes * changed to use script_component.hpp * config style * config style * config style * config style * revert to define * defines.hpp * defines.hpp Co-authored-by: commy2 --- addons/refuel/defines.hpp | 5 ++++ addons/refuel/script_component.hpp | 6 +---- optionals/compat_sog/CfgVehicles.hpp | 2 ++ optionals/compat_sog/CfgVehicles/land.hpp | 26 +++++++++++++++++++ optionals/compat_sog/CfgVehicles/vn_boxes.hpp | 15 +++++++++++ optionals/compat_sog/CfgVehicles/wheeled.hpp | 21 +++++++++++++++ optionals/compat_sog/script_component.hpp | 2 ++ 7 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 addons/refuel/defines.hpp create mode 100644 optionals/compat_sog/CfgVehicles/land.hpp create mode 100644 optionals/compat_sog/CfgVehicles/vn_boxes.hpp diff --git a/addons/refuel/defines.hpp b/addons/refuel/defines.hpp new file mode 100644 index 0000000000..dc9055da9a --- /dev/null +++ b/addons/refuel/defines.hpp @@ -0,0 +1,5 @@ +#define REFUEL_INFINITE_FUEL -10 +#define REFUEL_DISABLED_FUEL -1 +#define REFUEL_ACTION_DISTANCE 7 +#define REFUEL_NOZZLE_ACTION_DISTANCE 2 +#define REFUEL_PROGRESS_DURATION 2 diff --git a/addons/refuel/script_component.hpp b/addons/refuel/script_component.hpp index be346e0cca..09d0afc599 100644 --- a/addons/refuel/script_component.hpp +++ b/addons/refuel/script_component.hpp @@ -18,11 +18,7 @@ #include "\z\ace\addons\main\script_macros.hpp" -#define REFUEL_INFINITE_FUEL -10 -#define REFUEL_DISABLED_FUEL -1 -#define REFUEL_ACTION_DISTANCE 7 -#define REFUEL_NOZZLE_ACTION_DISTANCE 2 -#define REFUEL_PROGRESS_DURATION 2 +#include "\z\ace\addons\refuel\defines.hpp" #ifdef FAST_PROGRESSBARS #define TIME_PROGRESSBAR(X) ((X) * 0.075) diff --git a/optionals/compat_sog/CfgVehicles.hpp b/optionals/compat_sog/CfgVehicles.hpp index 7d398612f0..3192739489 100644 --- a/optionals/compat_sog/CfgVehicles.hpp +++ b/optionals/compat_sog/CfgVehicles.hpp @@ -20,4 +20,6 @@ class CfgVehicles { #include "CfgVehicles\turrets.hpp" #include "CfgVehicles\units.hpp" #include "CfgVehicles\wheeled.hpp" + #include "CfgVehicles\land.hpp" + #include "CfgVehicles\vn_boxes.hpp" }; diff --git a/optionals/compat_sog/CfgVehicles/land.hpp b/optionals/compat_sog/CfgVehicles/land.hpp new file mode 100644 index 0000000000..9f66b2d087 --- /dev/null +++ b/optionals/compat_sog/CfgVehicles/land.hpp @@ -0,0 +1,26 @@ + +// fuel pumps +class Land_vn_commercial_base; +class Land_vn_fuelstation_01_pump_f: Land_vn_commercial_base { + transportFuel = 0; + EGVAR(refuel,hooks)[] = {{0, 0.4, -0.5}, {0, -0.4, -0.5}}; + EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL; +}; +class Land_vn_fuelstation_02_pump_f: Land_vn_commercial_base { + transportFuel = 0; + EGVAR(refuel,hooks)[] = {{0, 0.4, -0.5}, {0, -0.4, -0.5}}; + EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL; +}; +class Land_vn_fuelstation_feed_f: Land_vn_commercial_base { + transportFuel = 0; + EGVAR(refuel,hooks)[] = {{0, 0.4, -0.5}, {0, -0.4, -0.5}}; + EGVAR(refuel,fuelCargo) = REFUEL_INFINITE_FUEL; +}; + +// fuel objects +class Land_vn_building_b_base; +class Land_vn_usaf_fueltank_75_01: Land_vn_building_b_base { + transportFuel = 0; + EGVAR(refuel,hooks)[] = {{0, -0.4, -0.5}}; + EGVAR(refuel,fuelCargo) = 2840; // 750 * 3.785 +}; diff --git a/optionals/compat_sog/CfgVehicles/vn_boxes.hpp b/optionals/compat_sog/CfgVehicles/vn_boxes.hpp new file mode 100644 index 0000000000..085f7cc324 --- /dev/null +++ b/optionals/compat_sog/CfgVehicles/vn_boxes.hpp @@ -0,0 +1,15 @@ + +// dragging carrying items +class ReammoBox_F; +class vn_ammobox_base: ReammoBox_F { + EGVAR(cargo,size) = 1; + EGVAR(cargo,canLoad) = 1; + + EGVAR(dragging,canCarry) = 1; + EGVAR(dragging,carryPosition)[] = {0,1,1}; + EGVAR(dragging,carryDirection) = 0; + + EGVAR(dragging,canDrag) = 1; + EGVAR(dragging,dragPosition)[] = {0,1.2,0}; + EGVAR(dragging,dragDirection) = 0; +}; diff --git a/optionals/compat_sog/CfgVehicles/wheeled.hpp b/optionals/compat_sog/CfgVehicles/wheeled.hpp index dcd8c31ff2..c0561375bd 100644 --- a/optionals/compat_sog/CfgVehicles/wheeled.hpp +++ b/optionals/compat_sog/CfgVehicles/wheeled.hpp @@ -5,9 +5,20 @@ class vn_wheeled_m54_base: vn_wheeled_truck_base { }; class vn_wheeled_m54_cab_base; class vn_wheeled_m54_fuel_base: vn_wheeled_m54_cab_base { + transportFuel = 0; EGVAR(refuel,hooks)[] = {{-1.15, -2.3, 0.28}}; EGVAR(refuel,fuelCargo) = 4542; }; +class vn_wheeled_m54_03_base; +class vn_wheeled_m54_repair_base: vn_wheeled_m54_03_base { + transportRepair = 0; + EGVAR(repair,canRepair) = 1; +}; +class vn_wheeled_m54_01_base; +class vn_wheeled_m54_ammo_base: vn_wheeled_m54_01_base { + transportAmmo = 0; + EGVAR(rearm,defaultSupply) = 1200; +}; // M151 class vn_wheeled_car_base; @@ -20,9 +31,19 @@ class vn_wheeled_z157_base: vn_wheeled_truck_base { EGVAR(refuel,fuelCapacity) = 150; }; class vn_wheeled_z157_fuel_base: vn_wheeled_z157_base { + transportFuel = 0; EGVAR(refuel,hooks)[] = {{-1.36, -3.575, -0.4}}; EGVAR(refuel,fuelCargo) = 4000; }; +class vn_wheeled_z157_repair_base: vn_wheeled_z157_base { + transportRepair = 0; + EGVAR(repair,canRepair) = 1; +}; +class vn_wheeled_z157_01_base; +class vn_wheeled_z157_ammo_base: vn_wheeled_z157_01_base { + transportAmmo = 0; + EGVAR(rearm,defaultSupply) = 1200; +}; // BTR-40 class vn_wheeled_btr40_base: vn_wheeled_car_base { diff --git a/optionals/compat_sog/script_component.hpp b/optionals/compat_sog/script_component.hpp index d1d3e65186..2b5d04fff9 100644 --- a/optionals/compat_sog/script_component.hpp +++ b/optionals/compat_sog/script_component.hpp @@ -5,5 +5,7 @@ #include "\z\ace\addons\main\script_macros.hpp" +#include "\z\ace\addons\refuel\defines.hpp" + #define EXPLOSIVES_PLACE(CLASS) EGVAR(explosives,DOUBLES(Place,CLASS)) #define QEXPLOSIVES_PLACE(CLASS) QUOTE(EXPLOSIVES_PLACE(CLASS)) From af86109c2b3c9ec05d134561cf99691b84c832ff Mon Sep 17 00:00:00 2001 From: Serg Vergun <1197314+severgun@users.noreply.github.com> Date: Sun, 19 Dec 2021 02:15:32 +0300 Subject: [PATCH 22/22] General - Utilize `isNotEqualTo` command (#8732) * Utilize isNotEqualTo command * fix pr validation --- addons/common/functions/fnc_assignedItemFix.sqf | 10 +++++----- addons/cookoff/XEH_postInit.sqf | 2 +- addons/cookoff/functions/fnc_cookOff.sqf | 2 +- addons/cookoff/functions/fnc_smoke.sqf | 2 +- addons/fire/functions/fnc_burn.sqf | 6 +++--- addons/fire/functions/fnc_burnReaction.sqf | 2 +- addons/fire/functions/fnc_fireManagerPFH.sqf | 2 +- addons/headless/functions/fnc_transferGroups.sqf | 6 +++--- addons/intelitems/functions/fnc_deleteControl.sqf | 2 +- addons/interaction/functions/fnc_renameGroupUI.sqf | 2 +- addons/markers/functions/fnc_initInsertMarker.sqf | 2 +- addons/markers/functions/fnc_placeMarker.sqf | 2 +- addons/pylons/functions/fnc_onButtonApply.sqf | 2 +- addons/tagging/functions/fnc_applyCustomTag.sqf | 2 +- addons/vehicle_damage/functions/fnc_processHit.sqf | 2 +- .../viewrestriction/functions/fnc_canChangeCamera.sqf | 2 +- .../functions/fnc_switchPreserveView.sqf | 4 ++-- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/addons/common/functions/fnc_assignedItemFix.sqf b/addons/common/functions/fnc_assignedItemFix.sqf index 3f523f4a59..444286eee3 100644 --- a/addons/common/functions/fnc_assignedItemFix.sqf +++ b/addons/common/functions/fnc_assignedItemFix.sqf @@ -37,11 +37,11 @@ GVAR(AssignedItemsShownItems) = [ private _assignedItems = getUnitLoadout _unit param [9, ["","","","","",""]]; // ["ItemMap","ItemGPS","ItemRadio","ItemCompass","ItemWatch","NVGoggles"] GVAR(AssignedItemsShownItems) = [ - !((_assignedItems select 0) isEqualTo "") && {getText (configFile >> "CfgWeapons" >> _assignedItems select 0 >> "ACE_hideItemType") != "map"}, - !((_assignedItems select 3) isEqualTo "") && {getText (configFile >> "CfgWeapons" >> _assignedItems select 3 >> "ACE_hideItemType") != "compass"}, - !((_assignedItems select 4) isEqualTo "") && {getText (configFile >> "CfgWeapons" >> _assignedItems select 4 >> "ACE_hideItemType") != "watch"}, - !((_assignedItems select 2) isEqualTo "") && {getText (configFile >> "CfgWeapons" >> _assignedItems select 2 >> "ACE_hideItemType") != "radio"}, - !((_assignedItems select 1) isEqualTo "") && {getText (configFile >> "CfgWeapons" >> _assignedItems select 1 >> "ACE_hideItemType") != "gps"} + ((_assignedItems select 0) isNotEqualTo "") && {getText (configFile >> "CfgWeapons" >> _assignedItems select 0 >> "ACE_hideItemType") != "map"}, + ((_assignedItems select 3) isNotEqualTo "") && {getText (configFile >> "CfgWeapons" >> _assignedItems select 3 >> "ACE_hideItemType") != "compass"}, + ((_assignedItems select 4) isNotEqualTo "") && {getText (configFile >> "CfgWeapons" >> _assignedItems select 4 >> "ACE_hideItemType") != "watch"}, + ((_assignedItems select 2) isNotEqualTo "") && {getText (configFile >> "CfgWeapons" >> _assignedItems select 2 >> "ACE_hideItemType") != "radio"}, + ((_assignedItems select 1) isNotEqualTo "") && {getText (configFile >> "CfgWeapons" >> _assignedItems select 1 >> "ACE_hideItemType") != "gps"} ]; GVAR(AssignedItemsShownItems) params ["_showMap", "_showCompass", "_showWatch", "_showRadio", "_showGPS"]; diff --git a/addons/cookoff/XEH_postInit.sqf b/addons/cookoff/XEH_postInit.sqf index e4a46c10a0..52073d39b1 100644 --- a/addons/cookoff/XEH_postInit.sqf +++ b/addons/cookoff/XEH_postInit.sqf @@ -15,7 +15,7 @@ params ["_vehicle", ["_effects", []]]; _effects = _effects + (_vehicle getVariable [QGVAR(effects), []]); - if !(_effects isEqualTo []) then { + if (_effects isNotEqualTo []) then { { deleteVehicle _x } count _effects; }; }] call CBA_fnc_addEventHandler; diff --git a/addons/cookoff/functions/fnc_cookOff.sqf b/addons/cookoff/functions/fnc_cookOff.sqf index 4fb1d751ff..8f1ee56bae 100644 --- a/addons/cookoff/functions/fnc_cookOff.sqf +++ b/addons/cookoff/functions/fnc_cookOff.sqf @@ -34,7 +34,7 @@ _vehicle setVariable [QGVAR(isCookingOff), true, true]; _intensity = _intensity min _maxIntensity; private _config = _vehicle call CBA_fnc_getObjectConfig; -private _positions = getArray (_config >> QGVAR(cookoffSelections)) select {!((_vehicle selectionPosition _x) isEqualTo [0,0,0])}; +private _positions = getArray (_config >> QGVAR(cookoffSelections)) select {(_vehicle selectionPosition _x) isNotEqualTo [0,0,0]}; if (_positions isEqualTo []) then { WARNING_1("no valid selection for cookoff found. %1",typeOf _vehicle); diff --git a/addons/cookoff/functions/fnc_smoke.sqf b/addons/cookoff/functions/fnc_smoke.sqf index de9e4c5d37..50ff7fe8aa 100644 --- a/addons/cookoff/functions/fnc_smoke.sqf +++ b/addons/cookoff/functions/fnc_smoke.sqf @@ -31,7 +31,7 @@ private _effects = [_smokeBarrel]; { private _position = [0, -2, 0]; - if !(_x isEqualTo "#noselection") then { + if (_x isNotEqualTo "#noselection") then { _position = _vehicle selectionPosition _x; }; diff --git a/addons/fire/functions/fnc_burn.sqf b/addons/fire/functions/fnc_burn.sqf index bf4709fd0d..78bc40007a 100644 --- a/addons/fire/functions/fnc_burn.sqf +++ b/addons/fire/functions/fnc_burn.sqf @@ -137,7 +137,7 @@ if (_isBurning) exitWith {}; }; // always keep flare visible to perceiving unit as long as it isnt the player - if !(_unit isEqualTo ace_player) then { + if (_unit isNotEqualTo ace_player) then { private _relativeAttachPoint = [0, 0, 0.3]; if (_distanceToUnit > 1.5) then { _relativeAttachPoint = (vectorNormalized (_unit worldToModelVisual (getPos ace_player))) vectorMultiply linearConversion [5, 30, _distanceToUnit, 0.5, 1.5]; @@ -162,7 +162,7 @@ if (_isBurning) exitWith {}; [QGVAR(burn), [ace_player, _intensity * (7 / 8), _instigator]] call CBA_fnc_globalEvent; }; } else { - if ((ace_player isKindOf "Man") && { !(_unit isEqualTo ace_player) }) then { + if ((ace_player isKindOf "Man") && {_unit isNotEqualTo ace_player}) then { private _burnCounter = ace_player getVariable [QGVAR(burnCounter), 0]; if (_distanceToUnit < BURN_PROPOGATE_DISTANCE) then { if (_burnCounter < BURN_PROPOGATE_COUNTER_MAX) then { @@ -279,7 +279,7 @@ if (_isBurning) exitWith {}; _lightFlare setLightFlareMaxDistance 100; _lightFlare setLightFlareSize 0; - if !(_unit isEqualTo ace_player) then { + if (_unit isNotEqualTo ace_player) then { private _relativeAttachPoint = (vectorNormalized (_unit worldToModelVisual (getPos ace_player))) vectorMultiply 1; _relativeAttachPoint set [2, 0.5]; _lightFlare attachTo [_unit, _relativeAttachPoint]; diff --git a/addons/fire/functions/fnc_burnReaction.sqf b/addons/fire/functions/fnc_burnReaction.sqf index a79875a24b..e7bef91dbc 100644 --- a/addons/fire/functions/fnc_burnReaction.sqf +++ b/addons/fire/functions/fnc_burnReaction.sqf @@ -18,7 +18,7 @@ params ["_unit", ["_throwWeapon", true]]; if ( _throwWeapon && {GVAR(dropWeapon) > 0} - && {_unit in _unit && { !(currentWeapon _unit isEqualTo "") }} + && {_unit in _unit && {(currentWeapon _unit) isNotEqualTo ""}} && {!isPlayer _unit || GVAR(dropWeapon >= 2)} ) then { [_unit] call EFUNC(hitreactions,throwWeapon); diff --git a/addons/fire/functions/fnc_fireManagerPFH.sqf b/addons/fire/functions/fnc_fireManagerPFH.sqf index f52d5f31d5..fa2c0ea8f3 100644 --- a/addons/fire/functions/fnc_fireManagerPFH.sqf +++ b/addons/fire/functions/fnc_fireManagerPFH.sqf @@ -28,7 +28,7 @@ params ["_args", "_handle"]; _value params ["_source", "_radius", "_intensity"]; private _attachedObject = attachedTo _source; private _sourcePos = getPosATL _source; - if !(_attachedObject isEqualTo objNull) then { + if (_attachedObject isNotEqualTo objNull) then { _sourcePos = getPosATL _attachedObject; }; diff --git a/addons/headless/functions/fnc_transferGroups.sqf b/addons/headless/functions/fnc_transferGroups.sqf index 94cd2627d4..6918c8e23d 100644 --- a/addons/headless/functions/fnc_transferGroups.sqf +++ b/addons/headless/functions/fnc_transferGroups.sqf @@ -65,11 +65,11 @@ private _numTransferredHC3 = 0; // Transfer AI groups { // No transfer if empty group - private _transfer = !(units _x isEqualTo []) && {!(_x getVariable [QXGVAR(blacklist), false])}; + private _transfer = ((units _x) isNotEqualTo []) && {!(_x getVariable [QXGVAR(blacklist), false])}; if (_transfer) then { // No transfer if waypoints with synchronized triggers exist for the group - private _allWaypointsWithTriggers = (waypoints _x) select {!((synchronizedTriggers _x) isEqualTo [])}; - if !(_allWaypointsWithTriggers isEqualTo []) exitWith { + private _allWaypointsWithTriggers = (waypoints _x) select {(synchronizedTriggers _x) isNotEqualTo []}; + if (_allWaypointsWithTriggers isNotEqualTo []) exitWith { _transfer = false; }; diff --git a/addons/intelitems/functions/fnc_deleteControl.sqf b/addons/intelitems/functions/fnc_deleteControl.sqf index 8c93f85fa6..858044715f 100644 --- a/addons/intelitems/functions/fnc_deleteControl.sqf +++ b/addons/intelitems/functions/fnc_deleteControl.sqf @@ -27,7 +27,7 @@ ctrlPosition _controlsGroup params ["_posX", "_posY"]; private _ctrlContent = _controlsGroup controlsGroupCtrl IDC_CONTENT; private _data = ctrlText _ctrlContent; -if !(_data isEqualTo GET_DATA(_index)) then { +if (_data isNotEqualTo GET_DATA(_index)) then { SET_DATA(_index,_data); }; diff --git a/addons/interaction/functions/fnc_renameGroupUI.sqf b/addons/interaction/functions/fnc_renameGroupUI.sqf index e9b46d0f83..2fdac954e1 100644 --- a/addons/interaction/functions/fnc_renameGroupUI.sqf +++ b/addons/interaction/functions/fnc_renameGroupUI.sqf @@ -26,7 +26,7 @@ _display displayAddEventHandler ["Unload", { params ["_display", "_exitCode"]; - if !(_exitCode isEqualTo 1) exitWith {}; + if (_exitCode isNotEqualTo 1) exitWith {}; private _group = _display getVariable QGVAR(renamedGroup); private _textCtrl = _display displayCtrl 451; diff --git a/addons/markers/functions/fnc_initInsertMarker.sqf b/addons/markers/functions/fnc_initInsertMarker.sqf index 2aa7a0155e..2a900f2241 100644 --- a/addons/markers/functions/fnc_initInsertMarker.sqf +++ b/addons/markers/functions/fnc_initInsertMarker.sqf @@ -343,7 +343,7 @@ // init marker scale slider _aceScaleSlider sliderSetRange [0.5, 2.0]; - if !(GVAR(editingMarker) isEqualTo "") then { + if (GVAR(editingMarker) isNotEqualTo "") then { //get the original scale GVAR(currentMarkerScale) = (markerSize GVAR(editingMarker)) param [0, 1]; }; diff --git a/addons/markers/functions/fnc_placeMarker.sqf b/addons/markers/functions/fnc_placeMarker.sqf index 77942343ad..8db947d0b8 100644 --- a/addons/markers/functions/fnc_placeMarker.sqf +++ b/addons/markers/functions/fnc_placeMarker.sqf @@ -51,7 +51,7 @@ if (_closeNum isEqualTo 1) then { // Add to list of user placed markers, and then filter for deleted GVAR(userPlacedMarkers) pushBack _newestMarker; - GVAR(userPlacedMarkers) = GVAR(userPlacedMarkers) select {!((getMarkerPos _x) isEqualTo [0,0,0])}; + GVAR(userPlacedMarkers) = GVAR(userPlacedMarkers) select {(getMarkerPos _x) isNotEqualTo [0,0,0]}; [QGVAR(setMarkerNetwork), [ _newestMarker, [ diff --git a/addons/pylons/functions/fnc_onButtonApply.sqf b/addons/pylons/functions/fnc_onButtonApply.sqf index 5603ed8d94..3fb802d90b 100644 --- a/addons/pylons/functions/fnc_onButtonApply.sqf +++ b/addons/pylons/functions/fnc_onButtonApply.sqf @@ -17,7 +17,7 @@ // Check for FRIES change private _checkbox = CONTROL(ID_DIALOG) ID_CHECKBOX_FRIES; -if (ctrlShown _checkbox && {!((cbChecked _checkbox) isEqualTo (_checkbox getVariable QGVAR(originalState)))}) then { +if (ctrlShown _checkbox && {(cbChecked _checkbox) isNotEqualTo (_checkbox getVariable QGVAR(originalState))}) then { if (cbChecked _checkbox) then { [GVAR(currentAircraft)] call EFUNC(fastroping,equipFRIES); } else { diff --git a/addons/tagging/functions/fnc_applyCustomTag.sqf b/addons/tagging/functions/fnc_applyCustomTag.sqf index 63ae9836ac..140747d067 100644 --- a/addons/tagging/functions/fnc_applyCustomTag.sqf +++ b/addons/tagging/functions/fnc_applyCustomTag.sqf @@ -24,7 +24,7 @@ params ["_identifier", "_displayName", "_requiredItem"]; // Add only if tag not already added (compare identifiers) -if !(GVAR(cachedTags) select {_x select 0 == _identifier} isEqualTo []) exitWith { +if ((GVAR(cachedTags) select {_x select 0 == _identifier}) isNotEqualTo []) exitWith { INFO_2("Tag with selected identifier already exists: %1 (%2)",_identifier,_displayName) }; diff --git a/addons/vehicle_damage/functions/fnc_processHit.sqf b/addons/vehicle_damage/functions/fnc_processHit.sqf index d548eed5a3..fd58fda181 100644 --- a/addons/vehicle_damage/functions/fnc_processHit.sqf +++ b/addons/vehicle_damage/functions/fnc_processHit.sqf @@ -146,7 +146,7 @@ private _chanceOfDetonation = 0; private _explosiveAmmoCount = 0; private _nonExplosiveAmmoCount = 0; -if !(count (_currentVehicleAmmo select 0) isEqualTo 0) then { +if (count (_currentVehicleAmmo select 0) isNotEqualTo 0) then { private _magConfig = configFile >> "CfgMagazines"; private _ammoConfig = configFile >> "CfgAmmo"; private _countOfExplodableAmmo = 0; diff --git a/addons/viewrestriction/functions/fnc_canChangeCamera.sqf b/addons/viewrestriction/functions/fnc_canChangeCamera.sqf index 9114a23303..d037d2f095 100644 --- a/addons/viewrestriction/functions/fnc_canChangeCamera.sqf +++ b/addons/viewrestriction/functions/fnc_canChangeCamera.sqf @@ -22,7 +22,7 @@ params ["_newCameraView", "_cameraOn", ["_checkGunnerView", true]]; // Remote control hates switchCamera (control returns to player, camera is left on remotely controlled object/unit), make sure remote controlled units are not impacted !(_newCameraView isEqualTo "GUNNER" && {_checkGunnerView}) && -{!(_newCameraView isEqualTo "GROUP")} && +{_newCameraView isNotEqualTo "GROUP"} && {!isNull ACE_player} && {player == ACE_player} && {alive ACE_player} && diff --git a/addons/viewrestriction/functions/fnc_switchPreserveView.sqf b/addons/viewrestriction/functions/fnc_switchPreserveView.sqf index 6de1b5b135..722de4ea37 100644 --- a/addons/viewrestriction/functions/fnc_switchPreserveView.sqf +++ b/addons/viewrestriction/functions/fnc_switchPreserveView.sqf @@ -32,7 +32,7 @@ GVAR(preserveViewCameraViewEH) = ["cameraView", { private _vehicle = vehicle _player; private _vehicleClass = {if (_vehicle isKindOf _x) exitWith {_x}} forEach ["CAManBase", "LandVehicle", "Air", "Ship", "All"]; private _varName = QXGVAR(preserveView) + _vehicleClass; - if !(_cameraView isEqualTo (profileNamespace getVariable [_varName, ""])) then { + if (_cameraView isNotEqualTo (profileNamespace getVariable [_varName, ""])) then { profileNamespace setVariable [_varName, _cameraView]; }; }] call CBA_fnc_addPlayerEventHandler; @@ -44,7 +44,7 @@ GVAR(preserveViewVehicleEH) = ["vehicle", { private _vehicleClass = {if (_vehicle isKindOf _x) exitWith {_x}} forEach ["CAManBase", "LandVehicle", "Air", "Ship", "All"]; private _savedView = profileNamespace getVariable (QXGVAR(preserveView) + _vehicleClass); - if (!isNil "_savedView" && {!(_cameraView isEqualTo _savedView)}) then { + if (!isNil "_savedView" && {_cameraView isNotEqualTo _savedView}) then { _vehicle switchCamera _savedView; }; }, true] call CBA_fnc_addPlayerEventHandler;