From ce70c72cd6878e49f86d1b41081a6b048d892f61 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 7 Apr 2015 22:44:41 -0500 Subject: [PATCH 001/171] wip1 --- addons/interact_menu/config.cpp | 6 ++++++ addons/interact_menu/functions/fnc_keyDown.sqf | 9 ++++++++- addons/interact_menu/functions/fnc_renderIcon.sqf | 9 ++++++++- addons/interact_menu/functions/fnc_renderSelector.sqf | 9 ++++++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp index 17900c2f6b2..998098470e1 100644 --- a/addons/interact_menu/config.cpp +++ b/addons/interact_menu/config.cpp @@ -22,5 +22,11 @@ class ACE_Settings { typeName = "BOOL"; isClientSetable = 1; displayName = "$STR_ACE_Interact_Menu_AlwaysUseCursorSelfInteraction"; + }; + class GVAR(cursorKeepCentered) { + value = 0; + typeName = "BOOL"; + isClientSetable = 1; + displayName = "Keep cursor centered"; }; }; diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf index faa5b0f4536..291c6752606 100644 --- a/addons/interact_menu/functions/fnc_keyDown.sqf +++ b/addons/interact_menu/functions/fnc_keyDown.sqf @@ -39,8 +39,15 @@ if (GVAR(useCursorMenu)) then { // uiNamespace getVariable QGVAR(dlgCursorMenu); // uiNamespace getVariable QGVAR(cursorMenuOpened); ctrlEnable [91921, true]; + GVAR(cursorPos) = [0.5,0.5,0]; ((finddisplay 91919) displayctrl 91921) ctrlAddEventHandler ["MouseMoving", { - GVAR(cursorPos) = [_this select 1, _this select 2, 0]; + + if (GVAR(cursorKeepCentered)) then { + GVAR(cursorPos) = GVAR(cursorPos) vectorAdd [_this select 1, _this select 2, 0] vectorDiff [0.5, 0.5, 0]; + setMousePosition [0.5, 0.5]; + } else { + GVAR(cursorPos) = [_this select 1, _this select 2, 0]; + }; }]; setMousePosition [0.5, 0.5]; }; diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf index 1cfc13923e9..e48847cbb94 100644 --- a/addons/interact_menu/functions/fnc_renderIcon.sqf +++ b/addons/interact_menu/functions/fnc_renderIcon.sqf @@ -37,6 +37,13 @@ if(_icon == "") then { }; _text = format ["
%4", _icon, _color, _color, _text]; _ctrl ctrlSetStructuredText (parseText _text); -_ctrl ctrlSetPosition [(_sPos select 0)-(0.125*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.25*SafeZoneW, 0.1*SafeZoneW]; +_pos = [(_sPos select 0)-(0.125*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.25*SafeZoneW, 0.1*SafeZoneW]; + +if (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then { + _pos set [0, ((_pos select 0) - (GVAR(cursorPos) select 0) + 0.5)]; + _pos set [1, ((_pos select 1) - (GVAR(cursorPos) select 1) + 0.5)]; +}; +_ctrl ctrlSetPosition _pos; + //_ctrl ctrlSetBackgroundColor [1, 0, 0, 0.1]; _ctrl ctrlCommit 0; diff --git a/addons/interact_menu/functions/fnc_renderSelector.sqf b/addons/interact_menu/functions/fnc_renderSelector.sqf index 44ed15e9c42..e397b40994f 100644 --- a/addons/interact_menu/functions/fnc_renderSelector.sqf +++ b/addons/interact_menu/functions/fnc_renderSelector.sqf @@ -25,6 +25,13 @@ _ctrl = GVAR(iconCtrls) select GVAR(iconCount); GVAR(iconCount) = GVAR(iconCount) + 1; _ctrl ctrlSetStructuredText (parseText format ["", _icon]); -_ctrl ctrlSetPosition [(_sPos select 0)-(0.05*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.1*SafeZoneW, 0.035*SafeZoneW]; +_pos = [(_sPos select 0)-(0.05*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.1*SafeZoneW, 0.035*SafeZoneW]; + +if (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then { + _pos set [0, ((_pos select 0) - (GVAR(cursorPos) select 0) + 0.5)]; + _pos set [1, ((_pos select 1) - (GVAR(cursorPos) select 1) + 0.5)]; +}; +_ctrl ctrlSetPosition _pos; + //_ctrl ctrlSetBackgroundColor [1, 0, 0, 0.1]; _ctrl ctrlCommit 0; From 03dbe8e6c5c8630e5cb6f64a5736c1cf596795e0 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 7 Apr 2015 22:57:58 -0500 Subject: [PATCH 002/171] Make it optional --- addons/interact_menu/functions/fnc_keyDown.sqf | 1 - addons/interact_menu/functions/fnc_renderIcon.sqf | 4 ++-- addons/interact_menu/functions/fnc_renderSelector.sqf | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf index 291c6752606..c488724a217 100644 --- a/addons/interact_menu/functions/fnc_keyDown.sqf +++ b/addons/interact_menu/functions/fnc_keyDown.sqf @@ -41,7 +41,6 @@ if (GVAR(useCursorMenu)) then { ctrlEnable [91921, true]; GVAR(cursorPos) = [0.5,0.5,0]; ((finddisplay 91919) displayctrl 91921) ctrlAddEventHandler ["MouseMoving", { - if (GVAR(cursorKeepCentered)) then { GVAR(cursorPos) = GVAR(cursorPos) vectorAdd [_this select 1, _this select 2, 0] vectorDiff [0.5, 0.5, 0]; setMousePosition [0.5, 0.5]; diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf index e48847cbb94..6ed2a74a0a1 100644 --- a/addons/interact_menu/functions/fnc_renderIcon.sqf +++ b/addons/interact_menu/functions/fnc_renderIcon.sqf @@ -18,7 +18,7 @@ */ #include "script_component.hpp" #define DEFAULT_ICON QUOTE(\z\ace\addons\interaction\ui\dot_ca.paa) -private ["_color", "_sPos", "_ctrl", "_icon"]; +private ["_color", "_sPos", "_ctrl", "_icon", "_pos"]; _text = _this select 0; _color = _this select 1; _sPos = _this select 2; @@ -39,7 +39,7 @@ _text = format ["
(count GVAR(iconCtrls))-1) then { GVAR(iconCtrls) pushBack ((findDisplay _displayNum) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]); }; -private "_ctrl"; +private ["_ctrl", "_pos"]; _ctrl = GVAR(iconCtrls) select GVAR(iconCount); GVAR(iconCount) = GVAR(iconCount) + 1; _ctrl ctrlSetStructuredText (parseText format ["", _icon]); _pos = [(_sPos select 0)-(0.05*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.1*SafeZoneW, 0.035*SafeZoneW]; -if (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then { +if (GVAR(cursorKeepCentered) && {uiNamespace getVariable [QGVAR(cursorMenuOpened),false]}) then { _pos set [0, ((_pos select 0) - (GVAR(cursorPos) select 0) + 0.5)]; _pos set [1, ((_pos select 1) - (GVAR(cursorPos) select 1) + 0.5)]; }; From f0a97bd8553bcdfa56d45cd8e0a1cbbdae1550c0 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 20:20:08 -0300 Subject: [PATCH 003/171] Added - Portuguese translation to Attach Failed --- addons/attach/stringtable.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml index 34e8883537f..4241ddd6442 100644 --- a/addons/attach/stringtable.xml +++ b/addons/attach/stringtable.xml @@ -174,6 +174,7 @@ Befestigen Fehlgeschlagen Присоединить Ошибка Error al acoplar + Erro ao anexar From ac5589c1c17ad708afb1de7ddcd090973e6d3c34 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 20:30:09 -0300 Subject: [PATCH 004/171] Added - Portuguese translation to Captive surendering Need more context to translate STR_ACE_Captives_Zeus_OnlyAlive and STR_ACE_Captives_Zeus_OnlyInfentry. --- addons/captives/stringtable.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml index 32334811f33..ff8ff84a47e 100644 --- a/addons/captives/stringtable.xml +++ b/addons/captives/stringtable.xml @@ -133,10 +133,12 @@ Surrender Kapitulieren + Render-se Stop Surrendering Den Kampf erneut aufnehmen + Parar de se render Only use on alive units @@ -149,6 +151,7 @@ Nothing under mouse Es wurde nichts ausgewählt + Nada debaixo do mouse From ae7af34a111ebf00f596c403c97a09e176d7013f Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 20:53:44 -0300 Subject: [PATCH 005/171] Added - Portuguese translation to common/Stringtable Everything translated. Even the banana. --- addons/common/stringtable.xml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index bcd2b149aaf..e1ee265312f 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -276,6 +276,7 @@ Désactiver Menu Commande Выключить командное меню Parancsnoki menü kikapcsolása + Desabilitar menu de comando Unknown @@ -285,6 +286,7 @@ Neznámý Неизвестно Ismeretlen + Desconhecido No Voice @@ -294,56 +296,71 @@ Žádný hlas Без голоса Nincs hang + Sem voz Akceptuj prośby Aceptar Peticiones Accept Requests + Aceitar Pedido Ignoruj prośby Rechazar Peticiones Decline Requests + Rejeitar pedido Akceptuj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności. Acepta Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones. Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions. + Aceitar pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações. Ignoruj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności. Rechazar Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones. Decline Requests send by other players. These can be requests to use / share equipment, perform certain actions. + Rejeita pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações. Feedback icons + Ícones de Feedback Select the position of or disable the feedback icons on your screen. These icons will show to provide extra feedback on your character status and actions performed. + Selecione a posição ou disabilite a posição dos ícones de feedback na sua tela. Esses ícones irão aparecer para mostrar feedback extra do status do seu personagem e ações realizadas. Progress bar location + Local da barra de progresso Set the desired location of the progress bar on your screen. + Define o local desejado da barra de progresso na sua tela. Hint Background color + Cor do fundo da hint The color of the background from the ACE hints. + A cor de fundo das hints do ACE. Hint text font color + Cor do do texto da hint The color of the text font from the ACE hints. This color is the default color for all text displayed through the ACE Hint system, if the hint text has no other color specified. + A cor do texto das hints do ACE. Essa cor é a cor default para todos os texos exibidos pelo sistema de hints do ACE , caso o texto da hint não tem outra cor especificada. Banana + Banana A banana is an edible fruit, botanically a berry, produced by several kinds of large herbaceous flowering plants in the genus Musa. + A banana é uma fruta comestível, botanicamente uma baga, produzida por vários tipos de plantas herbáceas grandes do genero Musa. - \ No newline at end of file + From c1941f271938c9e89d5e1413b2f9c0df6bc03e89 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 22:12:54 -0300 Subject: [PATCH 006/171] Added - Portuguese translation to common/Stringtable I see that the english description for the banana is from the Wikipedia. If wanted I can use the portuguese version from Wikipedia. --- addons/common/stringtable.xml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index bcd2b149aaf..f8a25c62693 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -276,6 +276,7 @@ Désactiver Menu Commande Выключить командное меню Parancsnoki menü kikapcsolása + Desabilitar menu de comando Unknown @@ -285,6 +286,7 @@ Neznámý Неизвестно Ismeretlen + Desconhecido No Voice @@ -294,56 +296,71 @@ Žádný hlas Без голоса Nincs hang + Sem voz Akceptuj prośby Aceptar Peticiones Accept Requests + Aceitar Pedido Ignoruj prośby Rechazar Peticiones Decline Requests + Rejeitar pedido Akceptuj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności. Acepta Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones. Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions. + Aceitar pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações. Ignoruj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności. Rechazar Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones. Decline Requests send by other players. These can be requests to use / share equipment, perform certain actions. + Rejeita pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações. Feedback icons + Ícones de Feedback Select the position of or disable the feedback icons on your screen. These icons will show to provide extra feedback on your character status and actions performed. + Selecione a posição ou disabilite a posição dos ícones de feedback na sua tela. Esses ícones irão aparecer para mostrar feedback extra do status do seu personagem e ações realizadas. Progress bar location + Local da barra de progresso Set the desired location of the progress bar on your screen. + Define o local desejado da barra de progresso na sua tela. Hint Background color + Cor do fundo da hint The color of the background from the ACE hints. + A cor de fundo das hints do ACE. Hint text font color + Cor do do texto da hint The color of the text font from the ACE hints. This color is the default color for all text displayed through the ACE Hint system, if the hint text has no other color specified. + A cor do texto das hints do ACE. Essa cor é a cor default para todos os texos exibidos pelo sistema de hints do ACE , caso o texto da hint não tem outra cor especificada. Banana + Banana A banana is an edible fruit, botanically a berry, produced by several kinds of large herbaceous flowering plants in the genus Musa. + A banana é uma fruta comestível, botanicamente uma baga, produzida por vários tipos de plantas herbáceas grandes do genero Musa. - \ No newline at end of file + From f98b9c27c6a5ae4bf4821d9a46ec9a5e0ef122fc Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 22:16:14 -0300 Subject: [PATCH 007/171] Added - Portuguese translation to Captive surrendering I need more context on "STR_ACE_Captives_Zeus_OnlyInfentry" and "STR_ACE_Captives_Zeus_OnlyAlive" to translate. Are those texts talking to the player or is just a description for an action? --- addons/captives/stringtable.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml index 32334811f33..32e22a199d0 100644 --- a/addons/captives/stringtable.xml +++ b/addons/captives/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -133,10 +133,12 @@ Surrender Kapitulieren + Render-se Stop Surrendering Den Kampf erneut aufnehmen + Parar de se render Only use on alive units @@ -149,6 +151,7 @@ Nothing under mouse Es wurde nichts ausgewählt + Nada debaixo do mouse From b8f2bd963627b715f4c62ebaff0efedc5d31202e Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 22:18:46 -0300 Subject: [PATCH 008/171] Added - Portuguese translation to cargo door Confused if it is a ramp or a door. Translated to as if it is a door. Should work. --- addons/aircraft/stringtable.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml index 4d1c49fff64..e89be5db84c 100644 --- a/addons/aircraft/stringtable.xml +++ b/addons/aircraft/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -35,6 +35,7 @@ Otevřít nákladní prostor Rámpát kinyitni Открыть грузовой отсек + Abrir porta de carga Close Cargo Door @@ -45,6 +46,7 @@ Zavřít nákladní prostor Rámpát zárni Закрыть грузовой отсек + Fechar porta de carga From 0dbb4579c4857be862f48a8d070fe739bf289473 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 22:25:37 -0300 Subject: [PATCH 009/171] Added - Portuguese translation Disposable --- addons/disposable/stringtable.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index 8b6c032961c..6a3f561b228 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -11,6 +11,7 @@ Lanzador utilizado Használt cső Отстрелянная труба + Tubo utilizado Used disposable rocket launcher @@ -21,6 +22,7 @@ Lanzador desechable utilizado Használt rakétavető Отстрелянная одноразовая пусковая установка + Lança foguetes descartável utilizado Preloaded Missile Dummy @@ -31,6 +33,7 @@ Preloaded Missile Dummy Preloaded Missile Dummy Заряженная ракетная пустышка + Preloaded Missile Dummy - \ No newline at end of file + From c8c183863c741a11c508134be201ee52471c87a4 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 22:28:45 -0300 Subject: [PATCH 010/171] Changed - Dragging drop Portuguese Translation Changed from "Largar" to "Soltar". "Largar" seems a little to harsh when dealing with humans. "STR_ACE_Dragging_UnableToDrag" Commented code unchanged --- addons/dragging/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml index 1fca04fee19..eafa5e597f6 100644 --- a/addons/dragging/stringtable.xml +++ b/addons/dragging/stringtable.xml @@ -22,7 +22,7 @@ Položit Lâcher Loslassen - Largar + Soltar Lascia Elengedés From 4198a942b3673f60cd03015155bddd395e80d2f1 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 22:42:21 -0300 Subject: [PATCH 011/171] Added/Changed - explosives Portuguese Translation Added "Dead Man's Switch" and "Explosives_Pickup" PT translation and corrected some stuff. --- addons/explosives/stringtable.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml index 57ef1904609..d5020532031 100644 --- a/addons/explosives/stringtable.xml +++ b/addons/explosives/stringtable.xml @@ -143,7 +143,7 @@ M57 Odpalovací Zařízení Detonatore M57 M57 Detonátor - M57 Dispositivo de Detonação + Dispositivo de Detonação M57 Взрыватель M57 @@ -251,7 +251,7 @@ Nahoru Sopra Fel - Cima + Para cima Поднять @@ -263,7 +263,7 @@ Dolu Sotto Le - Baixo + Para Baixo Опустить @@ -407,7 +407,7 @@ Nástražný drát Filo a Inciampo Botlódrót - Linha de tração + Fio de ativação Натяжной @@ -478,6 +478,7 @@ Czuwak Detonador de hombre muerto Dead Man's Switch + Detonador do homem morto Кнопка мертвеца @@ -488,10 +489,12 @@ Używany w celu zdalnej detonacji ładunków kiedy jego operator zostanie zabity. Utilizado para detonar explosivos remotamente al soltarlo. Robbanóanyagok távoli robbantásához + Usado para detonar remotamente o explosivo quando solto. Используется для дистанционного подрыва, после смерти оператора. Pick up + Pegar From be7a579f7d975888a762c509bcdd06c19f236c7d Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 22:50:35 -0300 Subject: [PATCH 012/171] Added - Portuguese translation to LaseTarget There is no way to translate Lase Target in a faithful way to portuguese. If "Marcar com laser" is too big, "Marcar Alvo" is a solid alternative for all intents and purposes... --- addons/fcs/stringtable.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/fcs/stringtable.xml b/addons/fcs/stringtable.xml index 154d874f730..b816dc21add 100644 --- a/addons/fcs/stringtable.xml +++ b/addons/fcs/stringtable.xml @@ -15,6 +15,7 @@ Marcar Alvo Designatore Laser --> + Marcar com laser / Medir Distância Подсветить цель / Измерить расстояние From c260ff89baccb33b5236330563d71f954f5d3044 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 23:00:13 -0300 Subject: [PATCH 013/171] Added - Portuguese Translation to Interact_menu --- addons/interact_menu/stringtable.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 6e5ce8fdb27..1027daa3581 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -4,18 +4,23 @@ Always display cursor for self interaction + Sempre mostrar cursor para interação pessoal Interact Key + Tecla de Interação Self Interaction Key + Tecla de Interação Pessoal Self Actions + Ações Pessoais Vehicle Actions + Ações de Veículos - \ No newline at end of file + From ec8e2707f81097f7fb8ef107dad00306d412d8a4 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Thu, 9 Apr 2015 23:05:47 -0300 Subject: [PATCH 014/171] Added - Portuguese translation to inventory --- addons/inventory/stringtable.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/inventory/stringtable.xml b/addons/inventory/stringtable.xml index 9ca01373d14..e716041c15e 100644 --- a/addons/inventory/stringtable.xml +++ b/addons/inventory/stringtable.xml @@ -4,9 +4,12 @@ Make Inventory Display Bigger + Aumentar o Tamanho da Tela do Inventário Normally inventory display is scaled by UI size. This allows scaling the Inventory UI size up, but doesn't increase font size allowing more rows displayed. + Normalmente o tamanho da tela do inventário é ditada pelo tamanho da UI. Isso permite aumentar o tamanho da tela de inventário, mas não aumenta o tamanho da fonte, permitindo que mais linhas sejam visualizadas. + - \ No newline at end of file + From f7166047dc3b12f6e3e621de3d709c095c2cc9c7 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Fri, 10 Apr 2015 05:01:11 -0300 Subject: [PATCH 015/171] Added - Portuguese translation to Kestrel ApproximateTemp --- addons/kestrel/stringtable.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/kestrel/stringtable.xml b/addons/kestrel/stringtable.xml index 5f54fd64894..5478ccd69de 100644 --- a/addons/kestrel/stringtable.xml +++ b/addons/kestrel/stringtable.xml @@ -11,6 +11,7 @@ Odhadovaná teplota Hőmérséklet nagyábol Примерная температура + Temperatura Aproximada Kestrel 4500NV @@ -61,4 +62,4 @@ Закрыть Kestrel - \ No newline at end of file + From 37858ec430e769fb7384714fc3ac64f5ff74b588 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Fri, 10 Apr 2015 05:04:15 -0300 Subject: [PATCH 016/171] Added - Portuguese translation to laser_selfdesignate --- addons/laser_selfdesignate/stringtable.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/laser_selfdesignate/stringtable.xml b/addons/laser_selfdesignate/stringtable.xml index 70f8912cfeb..6af47505b3b 100644 --- a/addons/laser_selfdesignate/stringtable.xml +++ b/addons/laser_selfdesignate/stringtable.xml @@ -4,9 +4,11 @@ Laser<br/>Designator On + Desiginador<br/>Laser Ligado Laser<br/>Designator Off + Desiginador<br/>Laser Desligado - \ No newline at end of file + From a0a0cfbfbd3b6facb8533530b71070a488321074 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Fri, 10 Apr 2015 05:07:44 -0300 Subject: [PATCH 017/171] Added - Portuguese translation to laserpointer --- addons/laserpointer/stringtable.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml index 87b36618a6a..d34c9caa384 100644 --- a/addons/laserpointer/stringtable.xml +++ b/addons/laserpointer/stringtable.xml @@ -5,15 +5,18 @@ Laser Pointer (red) Laserpointer (rot) + Laser (vermelho) Laser Pointer (green) Laserpointer (grün) + Laser (verde) Emits visible light. Strahlt sichtbares Licht aus. + Emite luz visível From 599ae092da8c78f484f45fa57d3b763d8d682ee2 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Fri, 10 Apr 2015 05:09:43 -0300 Subject: [PATCH 018/171] Changed - added dot on description --- addons/laserpointer/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml index d34c9caa384..bd4a0cbba86 100644 --- a/addons/laserpointer/stringtable.xml +++ b/addons/laserpointer/stringtable.xml @@ -16,7 +16,7 @@ Emits visible light. Strahlt sichtbares Licht aus. - Emite luz visível + Emite luz visível. From baf015ff5ab72d7a6305df86650238b8bbb66280 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Fri, 10 Apr 2015 05:22:46 -0300 Subject: [PATCH 019/171] Added - Portuguese Translation to logistics_uavbattery The correct translation of "UAV" to Portuguese is indeed "VANT", but this term is not used as "UAV" is. In reality, most Portuguese speaking people knows what an "UAV" is but if you use the Portuguese translation they have no idea of what you are talking about. Another alternative is to use the word "Drone". Everyone knows what a drone its, however, I find that the "UAV" is more in terms with the authenticity aspect of ACE3, since it the military uses the word "UAV" instead of "Drone" Also, it seems that somebody wrote "UAV's" instead of "UAVs". If you intentd to use the plural, you should not use the Apostrophe. I am not correcting this since I am not sure if indeed this was intended for plural or not. --- addons/logistics_uavbattery/stringtable.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/logistics_uavbattery/stringtable.xml b/addons/logistics_uavbattery/stringtable.xml index fbd90042909..6acb2b571dc 100644 --- a/addons/logistics_uavbattery/stringtable.xml +++ b/addons/logistics_uavbattery/stringtable.xml @@ -10,7 +10,7 @@ Dron jest naładowany A drón fel van töltve Dron je nabitý - O VANT está cheio + O UAV está cheio Il drone è pieno БПЛА заполнен @@ -22,7 +22,7 @@ Potrzebujesz baterii UAV Szükséged van egy UAV akkumulátorra Potřebuješ UAV-Baterii - Você precisa de uma Bateria para VANT + Você precisa de uma Bateria para UAVs Hai bisogno di una Batteria UAV Требуется аккумулятор БПЛА @@ -46,8 +46,8 @@ Bateria UAV UAV akkumulátor UAV-Baterie - Bateria para VANT - Batteria UAV + Bateria para UAV + Batteria para UAVs Аккумулятор БПЛА @@ -58,7 +58,7 @@ Używana do naładowania UAV Hordozható UAV-ok működéséhez való akkumulátor Používané k dobíjení UAV - Usada para reabastecer VANT + Usada para reabastecer o UAV Usata per ricaricare la Batteria dell'UAV Используется для подзарядки БПЛА @@ -75,4 +75,4 @@ Подзаряжаем ... - \ No newline at end of file + From b5e5359795f7ba5648ff7a335b907993e9bd80e1 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 11 Apr 2015 00:35:18 -0500 Subject: [PATCH 020/171] CursorCentered - Localizations --- addons/interact_menu/config.cpp | 3 ++- addons/interact_menu/stringtable.xml | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp index 998098470e1..9f1036dab96 100644 --- a/addons/interact_menu/config.cpp +++ b/addons/interact_menu/config.cpp @@ -27,6 +27,7 @@ class ACE_Settings { value = 0; typeName = "BOOL"; isClientSetable = 1; - displayName = "Keep cursor centered"; + displayName = "$STR_ACE_Interact_cursorKeepCentered"; + description = "$STR_ACE_Interact_cursorKeepCenteredDescription"; }; }; diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 6e5ce8fdb27..fa37437b427 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -1,5 +1,5 @@  - + @@ -17,5 +17,11 @@ Vehicle Actions + + Keep cursor centered + + + Keeps cursor centered and pans the option menu around. Useful if screen size is limited. + \ No newline at end of file From 31a989795296d2012329487a275b42b7ecb75e8b Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Sat, 11 Apr 2015 03:07:15 -0300 Subject: [PATCH 021/171] Added - Portuguese translation to wirecutter --- addons/logistics_wirecutter/stringtable.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/logistics_wirecutter/stringtable.xml b/addons/logistics_wirecutter/stringtable.xml index cf6e96c1aa3..376476ef846 100644 --- a/addons/logistics_wirecutter/stringtable.xml +++ b/addons/logistics_wirecutter/stringtable.xml @@ -6,9 +6,11 @@ Wirecutter Drahtschneider Wirecutter + Cortador de Arame Wirecutter + Cortador de Arame Cut Fence @@ -47,4 +49,4 @@ Забор вырезан - \ No newline at end of file + From 9d326ce9a5f002bcbc9162c556595221ead9506b Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Sat, 11 Apr 2015 03:10:39 -0300 Subject: [PATCH 022/171] Added - Portuguese translation to magazineRepack --- addons/magazinerepack/stringtable.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/magazinerepack/stringtable.xml b/addons/magazinerepack/stringtable.xml index d8fd5ca1773..b857e5e6f5c 100644 --- a/addons/magazinerepack/stringtable.xml +++ b/addons/magazinerepack/stringtable.xml @@ -78,16 +78,19 @@ Repacking Finished Wiederverpacken Fertig Reembalaje Finalizado + Reorganização Terminada Repacking Interrupted Umpacken Unterbrochen Reempaque Interrupted + Reorganização Interrompida %1 Full and %2 Partial %1 Vollständigen und %2 Teilweisen %1 Total y %2 Parcial + %1 Total e %2 Parcial - \ No newline at end of file + From f6eeb5e3ba29821b099bf5c53739ee8f9f2b0256 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Wed, 22 Apr 2015 22:29:31 +0200 Subject: [PATCH 023/171] Add pain coefficient --- addons/medical/ACE_Settings.hpp | 4 ++++ addons/medical/CfgVehicles.hpp | 6 ++++++ addons/medical/XEH_postInit.sqf | 2 +- addons/medical/functions/fnc_moduleMedicalSettings.sqf | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index e7f60a14e86..0b600996d01 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -22,6 +22,10 @@ class ACE_Settings { typeName = "SCALAR"; value = 1; }; + class GVAR(painCoefficient) { + typeName = "SCALAR"; + value = 1; + }; class GVAR(enableAirway) { typeName = "BOOL"; value = false; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 2b1f7c94685..9f355cbc551 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -128,6 +128,12 @@ class CfgVehicles { typeName = "NUMBER"; defaultValue = 1; }; + class painCoefficient { + displayName = "Pain coefficient"; + description = "Coefficient to modify the pain intensity"; + typeName = "NUMBER"; + defaultValue = 1; + }; class keepLocalSettingsSynced { displayName = "Sync status"; description = "Keep unit status synced. Recommended on."; diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index 526990709b9..b8152f08b89 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -166,7 +166,7 @@ GVAR(lastHeartBeatSound) = time; // Pain effect _strength = ACE_player getVariable [QGVAR(pain), 0]; - // _strength = _strength * (ACE_player getVariable [QGVAR(coefPain), GVAR(coefPain)]); @todo + _strength = _strength * (ACE_player getVariable [QGVAR(painCoefficient), GVAR(painCoefficient)]); if (GVAR(painEffectType) == 1) then { GVAR(effectPainCC) ppEffectEnable false; if ((ACE_player getVariable [QGVAR(pain), 0]) > 0 && {alive ACE_player}) then { diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf index 34dd063a4d0..9771a07db6a 100644 --- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf +++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf @@ -34,4 +34,5 @@ if !(_activated) exitWith {}; [_logic, QGVAR(enableUnsconsiousnessAI), "enableUnsconsiousnessAI"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(preventInstaDeath), "preventInstaDeath"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(keepLocalSettingsSynced), "keepLocalSettingsSynced"] call EFUNC(common,readSettingFromModule); From 74ca85cbd99d1c1eb525762d5430db5f201a0bfb Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Wed, 22 Apr 2015 22:36:41 +0200 Subject: [PATCH 024/171] Change getBloodLoss to expect an array --- addons/medical/XEH_postInit.sqf | 4 ++-- addons/medical/functions/fnc_getBloodLoss.sqf | 16 +++++++++------- .../functions/fnc_getBloodVolumeChange.sqf | 2 +- .../medical/functions/fnc_getHeartRateChange.sqf | 4 ++-- .../medical/functions/fnc_handleUnitVitals.sqf | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index b8152f08b89..15aa3624098 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -131,7 +131,7 @@ GVAR(effectTimeBlood) = time; }; }; - _bleeding = ACE_player call FUNC(getBloodLoss); + _bleeding = [ACE_player] call FUNC(getBloodLoss); // Bleeding Indicator if (_bleeding > 0 and GVAR(effectTimeBlood) + 3.5 < time) then { GVAR(effectTimeBlood) = time; @@ -250,7 +250,7 @@ if (USE_WOUND_EVENT_SYNC) then { [ {(((_this select 0) getvariable [QGVAR(bloodVolume), 100]) < 65)}, {(((_this select 0) getvariable [QGVAR(pain), 0]) > 0.9)}, - {(((_this select 0) call FUNC(getBloodLoss)) > 0.25)}, + {(([_this select 0] call FUNC(getBloodLoss)) > 0.25)}, {((_this select 0) getvariable [QGVAR(inReviveState), false])}, {((_this select 0) getvariable [QGVAR(inCardiacArrest), false])}, {((_this select 0) getvariable ["ACE_isDead", false])}, diff --git a/addons/medical/functions/fnc_getBloodLoss.sqf b/addons/medical/functions/fnc_getBloodLoss.sqf index f6b26f76867..aa94d7dc33e 100644 --- a/addons/medical/functions/fnc_getBloodLoss.sqf +++ b/addons/medical/functions/fnc_getBloodLoss.sqf @@ -15,15 +15,17 @@ #define BLOODLOSSRATE_BASIC 0.2 -private ["_totalBloodLoss","_tourniquets","_openWounds", "_value", "_cardiacOutput", "_internalWounds"]; -// TODO Only use this calculation if medium or higher, otherwise use vanilla calculations (for basic medical). +private ["_unit", "_totalBloodLoss","_tourniquets","_openWounds", "_value", "_cardiacOutput", "_internalWounds"]; + +_unit = _this select 0; + _totalBloodLoss = 0; // Advanced medical bloodloss handling if (GVAR(level) >= 2) then { - _tourniquets = _this getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]]; - _openWounds = _this getvariable [QGVAR(openWounds), []]; - //_cardiacOutput = [_this] call FUNC(getCardiacOutput); + _tourniquets = _unit getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]]; + _openWounds = _unit getvariable [QGVAR(openWounds), []]; + //_cardiacOutput = [_unit] call FUNC(getCardiacOutput); { if ((_tourniquets select (_x select 2)) == 0) then { @@ -34,7 +36,7 @@ if (GVAR(level) >= 2) then { }; }foreach _openWounds; - _internalWounds = _this getvariable [QGVAR(internalWounds), []]; + _internalWounds = _unit getvariable [QGVAR(internalWounds), []]; { _totalBloodLoss = _totalBloodLoss + ((_x select 4) * (_x select 3)); }foreach _internalWounds; @@ -42,6 +44,6 @@ if (GVAR(level) >= 2) then { // cap the blood loss to be no greater as the current cardiac output //(_totalBloodLoss min _cardiacOutput); } else { - _totalBloodLoss = BLOODLOSSRATE_BASIC * (damage _this); + _totalBloodLoss = BLOODLOSSRATE_BASIC * (damage _unit); }; _totalBloodLoss * (GVAR(bleedingCoefficient) max 0); diff --git a/addons/medical/functions/fnc_getBloodVolumeChange.sqf b/addons/medical/functions/fnc_getBloodVolumeChange.sqf index f94c5d5b7b6..23eba4a0c7f 100644 --- a/addons/medical/functions/fnc_getBloodVolumeChange.sqf +++ b/addons/medical/functions/fnc_getBloodVolumeChange.sqf @@ -34,7 +34,7 @@ private ["_unit","_bloodVolume","_bloodVolumeChange", "_ivVolume"]; _unit = _this select 0; _bloodVolume = _unit getvariable [QGVAR(bloodVolume), 100]; -_bloodVolumeChange = -(_unit call FUNC(getBloodLoss)); +_bloodVolumeChange = -([_unit] call FUNC(getBloodLoss)); if (_bloodVolume < 100.0) then { { diff --git a/addons/medical/functions/fnc_getHeartRateChange.sqf b/addons/medical/functions/fnc_getHeartRateChange.sqf index e7bc9407d2f..f3fec640531 100644 --- a/addons/medical/functions/fnc_getHeartRateChange.sqf +++ b/addons/medical/functions/fnc_getHeartRateChange.sqf @@ -20,7 +20,7 @@ _unit = _this select 0; _hrIncrease = 0; if (!(_unit getvariable [QGVAR(inCardiacArrest),false])) then { _heartRate = _unit getvariable [QGVAR(heartRate), 80]; - _bloodLoss = _unit call FUNC(getBloodLoss); + _bloodLoss = [_unit] call FUNC(getBloodLoss); _adjustment = _unit getvariable [QGVAR(heartRateAdjustments), []]; { @@ -83,4 +83,4 @@ if (!(_unit getvariable [QGVAR(inCardiacArrest),false])) then { _hrIncrease = _hrIncrease - HEART_RATE_MODIFIER; }; }; -_hrIncrease \ No newline at end of file +_hrIncrease diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf index 411f64b49eb..f986a095dec 100644 --- a/addons/medical/functions/fnc_handleUnitVitals.sqf +++ b/addons/medical/functions/fnc_handleUnitVitals.sqf @@ -43,7 +43,7 @@ if (_bloodVolume < 90) then { }; }; -if ((_unit call FUNC(getBloodLoss)) > 0) then { +if (([_unit] call FUNC(getBloodLoss)) > 0) then { if !(_unit getvariable [QGVAR(isBleeding), false]) then { _unit setvariable [QGVAR(isBleeding), true, true]; }; From d10f4d543d3a2c4cbaff379447a4002f3e20ea77 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Wed, 22 Apr 2015 22:38:48 +0200 Subject: [PATCH 025/171] Enable unit specific bleeding coefficient --- addons/medical/functions/fnc_getBloodLoss.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_getBloodLoss.sqf b/addons/medical/functions/fnc_getBloodLoss.sqf index aa94d7dc33e..7fe108670f7 100644 --- a/addons/medical/functions/fnc_getBloodLoss.sqf +++ b/addons/medical/functions/fnc_getBloodLoss.sqf @@ -46,4 +46,4 @@ if (GVAR(level) >= 2) then { } else { _totalBloodLoss = BLOODLOSSRATE_BASIC * (damage _unit); }; -_totalBloodLoss * (GVAR(bleedingCoefficient) max 0); +_totalBloodLoss * ((_unit getVariable [QGVAR(bleedingCoefficient), GVAR(bleedingCoefficient)]) max 0); From 84e19375152b963bfcad3c5dc19e48cf714a9c36 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Wed, 22 Apr 2015 23:50:37 +0200 Subject: [PATCH 026/171] Add damage threshold to basic --- .../functions/fnc_handleDamage_basic.sqf | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf index aa9c2f61df2..3c94aba248c 100644 --- a/addons/medical/functions/fnc_handleDamage_basic.sqf +++ b/addons/medical/functions/fnc_handleDamage_basic.sqf @@ -24,13 +24,20 @@ #define ARMDAMAGETRESHOLD2 1.7 #define UNCONSCIOUSNESSTRESHOLD 0.7 -private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_damage"]; - -_unit = _this select 0; -_selectionName = _this select 1; -_damage = _this select 2; -_shooter = _this select 3; -_projectile = _this select 4; +private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_threshold"]; + +_unit = _this select 0; +_selectionName = _this select 1; +_damage = _this select 2; +_shooter = _this select 3; +_projectile = _this select 4; + +// Apply damage treshold / coefficient +_threshold = [ + _unit getVariable [QGVAR(damageThreshold), GVAR(AIDamageThreshold)], + _unit getVariable [QGVAR(damageThreshold), GVAR(playerDamageThreshold)] +] select ([_unit] call EFUNC(common,isPlayer)); +_damage = _damage * (1 / _threshold); // This is a new hit, reset variables. // Note: sometimes handleDamage spans over 2 or even 3 frames. From d1c95ba8a19fbe6d3cae1a3c7d68c76dd97b6ed5 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 23 Apr 2015 11:31:27 +0200 Subject: [PATCH 027/171] Add maximum unconsciousness time option --- addons/medical/ACE_Settings.hpp | 4 ++++ addons/medical/CfgVehicles.hpp | 6 ++++++ addons/medical/XEH_respawn.sqf | 8 +++++++- .../functions/fnc_moduleMedicalSettings.sqf | 1 + .../medical/functions/fnc_setUnconscious.sqf | 19 +++++++++++++++++++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 0b600996d01..40a28fb4d96 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -63,6 +63,10 @@ class ACE_Settings { typeName = "BOOL"; value = 0; }; + class GVAR(maxUnconsciousTime) { + typeName = "SCALAR"; + value = -1; + }; class GVAR(maxReviveTime) { typeName = "SCALAR"; value = 120; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 9f355cbc551..6aa3f82d608 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -122,6 +122,12 @@ class CfgVehicles { typeName = "BOOL"; defaultValue = 0; }; + class maxUnconsciousTime { + displayName = "Max. Uncon. Time"; + description = "Maximum time a unit can be unconscious before dying. Negative Values disable this."; + typeName = "NUMBER"; + defaultValue = -1; + }; class bleedingCoefficient { displayName = "Bleeding coefficient"; description = "Coefficient to modify the bleeding speed"; diff --git a/addons/medical/XEH_respawn.sqf b/addons/medical/XEH_respawn.sqf index ac6cc2d6ef1..0a95e064fdb 100644 --- a/addons/medical/XEH_respawn.sqf +++ b/addons/medical/XEH_respawn.sqf @@ -8,7 +8,13 @@ if !(local _unit) exitWith {}; [_unit] call FUNC(init); -//Reset captive status for respawning unit +// Reset captive status for respawning unit if (!(_unit getVariable ["ACE_isUnconscious", false])) then { [_unit, QGVAR(unconscious), false] call EFUNC(common,setCaptivityStatus); }; + +// Remove maximum unconsciousness time handler +_maxUnconHandle = _unit getVariable [QGVAR(maxUnconTimeHandle), -1]; +if (_maxUnconHandle > 0) then { + [_maxUnconHandle] call CBA_fnc_removePerFrameHandler; +}; diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf index 9771a07db6a..dd7422c40ee 100644 --- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf +++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf @@ -33,6 +33,7 @@ if !(_activated) exitWith {}; [_logic, QGVAR(AIDamageThreshold), "AIDamageThreshold"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(enableUnsconsiousnessAI), "enableUnsconsiousnessAI"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(preventInstaDeath), "preventInstaDeath"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(maxUnconsciousTime), "maxUnconsciousTime"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(keepLocalSettingsSynced), "keepLocalSettingsSynced"] call EFUNC(common,readSettingFromModule); diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index c5809f8c8e5..84c56181682 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -22,6 +22,15 @@ _unit = _this select 0; _set = if (count _this > 1) then {_this select 1} else {true}; _minWaitingTime = if (count _this > 2) then {_this select 2} else {DEFAULT_DELAY}; +// No change, fuck off. (why is there no xor?) +if (_set isEqualTo (_unit getVariable ["ACE_isUnconscious", false])) exitWith {}; + +// Remove maximum unconsciousness time handler +_maxUnconHandle = _unit getVariable [QGVAR(maxUnconTimeHandle), -1]; +if (_maxUnconHandle > 0) then { + [_maxUnconHandle] call CBA_fnc_removePerFrameHandler; +}; + if !(_set) exitwith { _unit setvariable ["ACE_isUnconscious", false, true]; }; @@ -86,4 +95,14 @@ _startingTime = time; [DFUNC(unconsciousPFH), 0.1, [_unit,_animState, _originalPos, _startingTime, _minWaitingTime, false, vehicle _unit isKindOf "ParachuteBase"] ] call CBA_fnc_addPerFrameHandler; +// Maximum unconsciousness time +_maxUnconTime = _unit getVariable [QGVAR(maxUnconsciousTime), GVAR(maxUnconsciousTime)]; +if (_maxUnconTime >= 0) then { + _handle = [{ + _unit = _this select 0; + [_unit] call FUNC(setDead); + }, [_unit], _maxUnconTime, 0.5] call EFUNC(common,waitAndExecute); + _unit setVariable [QGVAR(maxUnconTimeHandle), _handle]; +}; + ["medical_onUnconscious", [_unit, true]] call EFUNC(common,globalEvent); From d7b961043b9580724daaedcedc049d8daf3b6945 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 24 Apr 2015 22:20:16 +0200 Subject: [PATCH 028/171] Remove animation reset before falling unconscious This caused the unit to briefly move to the default animation, which looked shite. --- addons/medical/functions/fnc_setUnconscious.sqf | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 84c56181682..633718f1631 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -71,8 +71,6 @@ if (vehicle _unit == _unit) then { _unit addWeapon "ACE_FakePrimaryWeapon"; }; _unit selectWeapon (primaryWeapon _unit); - _unit switchMove ""; - _unit playmoveNow ""; }; // We are storing the current animation, so we can use it later on when waking the unit up inside a vehicle @@ -89,7 +87,15 @@ if (GVAR(moveUnitsFromGroupOnUnconscious)) then { }; [_unit, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus); -[_unit, [_unit] call EFUNC(common,getDeathAnim), 1, true] call EFUNC(common,doAnimation); +_anim = [_unit] call EFUNC(common,getDeathAnim) +[_unit, _anim, 1, true] call EFUNC(common,doAnimation); +[{ + _unit = _this select 0; + _anim = _this select 1; + if (_unit getVariable "ACE_isUnconscious") then { + [_unit, _anim, 2, true] call EFUNC(common,doAnimation); + }; +}, [_unit, _anim], 2, 1] call EFUNC(common,waitAndExecute); _startingTime = time; From 664d08d4aa729767d366c855c38af199d3139f76 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 25 Apr 2015 08:23:54 +0200 Subject: [PATCH 029/171] add option to only use action when clicking --- addons/interact_menu/XEH_clientInit.sqf | 6 ++---- addons/interact_menu/config.cpp | 12 +++++++++--- .../functions/fnc_handlePlayerChanged.sqf | 6 +++++- addons/interact_menu/functions/fnc_keyUp.sqf | 6 ++++++ addons/interact_menu/stringtable.xml | 6 +++++- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf index b8a8fc899bb..1a7dba30658 100644 --- a/addons/interact_menu/XEH_clientInit.sqf +++ b/addons/interact_menu/XEH_clientInit.sqf @@ -32,8 +32,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)]; if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false}; // Statement [0] call FUNC(keyDown) -}, -{[0] call FUNC(keyUp)}, +},{[0,false] call FUNC(keyUp)}, [219, [false, false, false]], false] call cba_fnc_addKeybind; //Left Windows Key ["ACE3", QGVAR(SelfInteractKey), (localize "STR_ACE_Interact_Menu_SelfInteractKey"), @@ -42,8 +41,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)]; if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false}; // Statement [1] call FUNC(keyDown) -}, -{[1] call FUNC(keyUp)}, +},{[1,false] call FUNC(keyUp)}, [219, [false, true, false]], false] call cba_fnc_addKeybind; //Left Windows Key + Ctrl/Strg diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp index c79c9cd6d1a..5ca0ebdc5f8 100644 --- a/addons/interact_menu/config.cpp +++ b/addons/interact_menu/config.cpp @@ -42,25 +42,31 @@ class ACE_Settings { typeName = "COLOR"; isClientSettable = 1; displayName = "$STR_ACE_Interact_Menu_ColorTextMax"; - }; + }; class GVAR(colorTextMin) { value[] = {1, 1, 1, 0.25}; typeName = "COLOR"; isClientSettable = 1; displayName = "$STR_ACE_Interact_Menu_ColorTextMin"; - }; + }; class GVAR(colorShadowMax) { value[] = {0, 0, 0, 1}; typeName = "COLOR"; isClientSettable = 1; displayName = "$STR_ACE_Interact_Menu_ColorShadowMax"; - }; + }; class GVAR(colorShadowMin) { value[] = {0, 0, 0, 0.25}; typeName = "COLOR"; isClientSettable = 1; displayName = "$STR_ACE_Interact_Menu_ColorShadowMin"; }; + class GVAR(actionOnKeyRelease) { + value = 1; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_Interact_Menu_ActionOnKeyRelease"; + }; }; class ACE_Extensions { diff --git a/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf b/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf index fe25853733c..f1f6e78f6db 100644 --- a/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf +++ b/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf @@ -15,7 +15,11 @@ EXPLODE_2_PVT(_this,_newUnit,_oldUnit); // add to new unit private "_ehid"; -_ehid = [_newUnit, "DefaultAction", {EGVAR(interact_menu,openedMenuType) >= 0}, {}] call EFUNC(common,addActionEventHandler); +_ehid = [_newUnit, "DefaultAction", {GVAR(openedMenuType) >= 0}, { + if !(GVAR(actionOnKeyRelease)) then { + [GVAR(openedMenuType),true] call FUNC(keyUp); + }; +}] call EFUNC(common,addActionEventHandler); _newUnit setVariable [QGVAR(AAEHID), _ehid]; diff --git a/addons/interact_menu/functions/fnc_keyUp.sqf b/addons/interact_menu/functions/fnc_keyUp.sqf index 735130e69ab..7b244978024 100644 --- a/addons/interact_menu/functions/fnc_keyUp.sqf +++ b/addons/interact_menu/functions/fnc_keyUp.sqf @@ -12,6 +12,9 @@ */ #include "script_component.hpp" +private "_calledByClicking"; +_calledByClicking = _this select 1; + // Exit if there's no menu opened if (GVAR(openedMenuType) < 0) exitWith {true}; @@ -29,6 +32,9 @@ if(GVAR(actionSelected)) then { // Clear the conditions caches ["clearConditionCaches", []] call EFUNC(common,localEvent); + // exit scope if selecting an action on key release is disabled + if (!(GVAR(actionOnKeyRelease)) && !_calledByClicking) exitWith {}; + // Check the action conditions _actionData = GVAR(selectedAction) select 0; if ([_target, _player, _actionData select 6] call (_actionData select 4)) then { diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 55d67788f43..d9e2e1366b7 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -83,5 +83,9 @@ Interaction - Shadow Min + + Do action when releasing menu key + Aktion nach Loslassen der Taste ausführen + - \ No newline at end of file + From 55529d03963416ba0051268ea2914202bf95eab6 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Sat, 25 Apr 2015 09:41:55 +0200 Subject: [PATCH 030/171] Added support for switching from 3d selections to radial menu --- addons/medical/ACE_Medical_Actions.hpp | 12 ++++++------ addons/medical/ACE_Settings.hpp | 9 +++++++++ addons/medical/CfgVehicles.hpp | 5 ++++- addons/medical/stringtable.xml | 13 +++++++++++++ 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/addons/medical/ACE_Medical_Actions.hpp b/addons/medical/ACE_Medical_Actions.hpp index ed5670f8148..e3292105b03 100644 --- a/addons/medical/ACE_Medical_Actions.hpp +++ b/addons/medical/ACE_Medical_Actions.hpp @@ -3,7 +3,7 @@ class ACE_Head { displayName = "$STR_ACE_Interaction_Head"; runOnHover = 1; statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation)); - condition = "true"; + ACTION_CONDITION EXCEPTIONS icon = PATHTOF(UI\icons\medical_cross.paa); distance = MEDICAL_ACTION_DISTANCE; @@ -75,7 +75,7 @@ class ACE_Torso { displayName = "$STR_ACE_Interaction_Torso"; runOnHover = 1; statement = QUOTE([ARR_3(_target, true, 1)] call DFUNC(displayPatientInformation)); - condition = "true"; + ACTION_CONDITION EXCEPTIONS icon = PATHTOF(UI\icons\medical_cross.paa); distance = MEDICAL_ACTION_DISTANCE; @@ -175,7 +175,7 @@ class ACE_ArmLeft { displayName = "$STR_ACE_Interaction_ArmLeft"; runOnHover = 1; statement = QUOTE([ARR_3(_target, true, 2)] call DFUNC(displayPatientInformation)); - condition = "true"; + ACTION_CONDITION EXCEPTIONS icon = PATHTOF(UI\icons\medical_cross.paa); distance = MEDICAL_ACTION_DISTANCE; @@ -332,7 +332,7 @@ class ACE_ArmRight { displayName = "$STR_ACE_Interaction_ArmRight"; runOnHover = 1; statement = QUOTE([ARR_3(_target, true, 3)] call DFUNC(displayPatientInformation)); - condition = "true"; + ACTION_CONDITION EXCEPTIONS icon = PATHTOF(UI\icons\medical_cross.paa); distance = MEDICAL_ACTION_DISTANCE; @@ -486,7 +486,7 @@ class ACE_LegLeft { displayName = "$STR_ACE_Interaction_LegLeft"; runOnHover = 1; statement = QUOTE([ARR_3(_target, true, 4)] call DFUNC(displayPatientInformation)); - condition = "true"; + ACTION_CONDITION EXCEPTIONS icon = PATHTOF(UI\icons\medical_cross.paa); distance = MEDICAL_ACTION_DISTANCE; @@ -628,7 +628,7 @@ class ACE_LegRight { displayName = "$STR_ACE_Interaction_LegRight"; runOnHover = 1; statement = QUOTE([ARR_3(_target, true, 5)] call DFUNC(displayPatientInformation)); - condition = "true"; + ACTION_CONDITION EXCEPTIONS icon = PATHTOF(UI\icons\medical_cross.paa); distance = MEDICAL_ACTION_DISTANCE; diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index e7f60a14e86..c3531915db8 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -143,4 +143,13 @@ class ACE_Settings { typeName = "BOOL"; value = 0; }; + + class GVAR(menuTypeStyle) { + displayName = "$STR_ACE_Medical_menuTypeDisplay"; + description = "$STR_ACE_Medical_menuTypeDescription"; + typeName = "SCALAR"; + value = 0; + values[] = {"$STR_ACE_Medical_useSelection", "$STR_ACE_Medical_useRadial"}; + isClientSettable = 1; + }; }; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 2b1f7c94685..648aa8e4203 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -428,6 +428,7 @@ class CfgVehicles { class ACE_Actions { // Include actions in body parts for treatment while in the open #define EXCEPTIONS exceptions[] = {}; + #define ACTION_CONDITION condition = QUOTE(GVAR(menuTypeStyle) == 0); #include "ACE_Medical_Actions.hpp" // Create a consolidates medical menu for treatment while boarded @@ -436,12 +437,14 @@ class CfgVehicles { displayName = "$STR_ACE_MEDICAL_ACTIONS_Medical"; runOnHover = 1; exceptions[] = {"isNotInside"}; - condition = QUOTE(vehicle _target != _target); + condition = QUOTE(vehicle _target != _target || GVAR(menuTypeStyle) == 1); statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation)); icon = PATHTOF(UI\icons\medical_cross.paa); #undef EXCEPTIONS + #undef ACTION_CONDITION #define EXCEPTIONS exceptions[] = {"isNotInside"}; + #define ACTION_CONDITION condition = "true"; #include "ACE_Medical_Actions.hpp" }; class GVAR(loadPatient) { diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 53c587bec06..316425d6b46 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1635,5 +1635,18 @@ Aberración cromática Aberration chromatique + + Style of menu (Medical) + + + Select the type of menu you prefer; default 3d selections or radial. + + + Selections (3d) + + + Radial + + \ No newline at end of file From 73f387d3e3778d8ac3b92d532602204918c58377 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 25 Apr 2015 11:55:39 +0200 Subject: [PATCH 031/171] outline interaction menu text --- addons/interact_menu/functions/fnc_renderIcon.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf index 9107b6d998c..91a200ee896 100644 --- a/addons/interact_menu/functions/fnc_renderIcon.sqf +++ b/addons/interact_menu/functions/fnc_renderIcon.sqf @@ -33,9 +33,9 @@ if(_icon == "") then { }; _text = if (GVAR(UseListMenu)) then { - format ["%5", _icon, _iconColor, _textColor, _shadowColor, _text] + format ["%5", _icon, _iconColor, _textColor, _shadowColor, _text] } else { - format ["
%5", _icon, _iconColor, _textColor, _shadowColor, "ace_breakLine" callExtension _text]; + format ["
%5", _icon, _iconColor, _textColor, _shadowColor, "ace_breakLine" callExtension _text]; }; _ctrl ctrlSetStructuredText (parseText _text); From 11d86248a760f938d56b8d164c3d2f128a7ae106 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Sat, 25 Apr 2015 22:20:28 +0200 Subject: [PATCH 032/171] Reorganised module and settings #809 --- addons/medical/ACE_Settings.hpp | 4 + addons/medical/CfgVehicles.hpp | 153 +++++++++--------- addons/medical/XEH_preInit.sqf | 3 +- addons/medical/functions/fnc_handleDamage.sqf | 2 +- ... => fnc_moduleAdvancedMedicalSettings.sqf} | 11 +- .../functions/fnc_moduleMedicalSettings.sqf | 8 +- .../functions/fnc_moduleReviveSettings.sqf | 27 ++++ addons/medical/functions/fnc_setDead.sqf | 2 +- 8 files changed, 122 insertions(+), 88 deletions(-) rename addons/medical/functions/{fnc_moduleTreatmentConfiguration.sqf => fnc_moduleAdvancedMedicalSettings.sqf} (64%) create mode 100644 addons/medical/functions/fnc_moduleReviveSettings.sqf diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index e7f60a14e86..26fa87e7068 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -59,6 +59,10 @@ class ACE_Settings { typeName = "BOOL"; value = 0; }; + class GVAR(enableRevive) { + typeName = "BOOL"; + value = 0; + }; class GVAR(maxReviveTime) { typeName = "SCALAR"; value = 120; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 2b1f7c94685..2de90e77d05 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -37,47 +37,38 @@ class CfgVehicles { }; }; }; - class enableFor { - displayName = "Enabled for"; - description = "Select what units the medical system will be enabled for (Adv only)"; + class medicSetting { + displayName = "Medics setting"; + description = "What is the level of detail prefered for medics?"; typeName = "NUMBER"; class values { - class playableUnits { - name = "Players only."; + class disable { + name = "Disable medics"; value = 0; - default = 1; }; - class playableUnitsAndAI { - name = "Players and AI"; + class normal { + name = "Normal"; value = 1; + default = 1; + }; + class full { + name = "Advanced"; + value = 2; }; }; }; - // TODO Disabled until the features are implemented - /*class enableAirway { - displayName = "Enable Airway"; - description = "Enable Advanced medical Airway (Adv only)"; - typeName = "BOOL"; - defaultValue = 0; - }; - class enableFractures { - displayName = "Enable Fractures"; - description = "Enable Advanced medical Fractures (Adv only)"; - typeName = "BOOL"; - defaultValue = 0; - };*/ - class enableAdvancedWounds { - displayName = "Enable Advanced wounds"; - description = "Allow reopening of bandaged wounds? (Adv only)"; - typeName = "BOOL"; - defaultValue = 0; - }; - class enableVehicleCrashes { - displayName = "Vehicle Crashes"; - description = "Do units take damage from a vehicle crash?"; + class allowLitterCreation { + displayName = "Enable Litter"; + description = "Enable litter being created upon treatment"; typeName = "BOOL"; defaultValue = 1; }; + class litterCleanUpDelay { + displayName = "Life time of litter objects"; + description = "How long should litter objects stay? In seconds. -1 is forever."; + typeName = "NUMBER"; + defaultValue = 1800; + }; class enableScreams { displayName = "Enable Screams"; description = "Enable screaming by injuried units"; @@ -141,80 +132,58 @@ class CfgVehicles { }; }; - class ACE_moduleTreatmentSettings: ACE_Module { + class ACE_moduleAdvancedMedicalSettings: ACE_Module { scope = 2; - displayName = "Treatment Settings [ACE]"; + displayName = "Advanced Medical Settings [ACE]"; icon = QUOTE(PATHTOF(UI\Icon_Module_Medical_ca.paa)); category = "ACE_medical"; - function = QUOTE(FUNC(moduleTreatmentConfiguration)); + function = QUOTE(FUNC(moduleAdvancedMedicalSettings)); functionPriority = 10; isGlobal = 2; isTriggerActivated = 0; isDisposable = 0; author = "$STR_ACE_Common_ACETeam"; class Arguments { - class medicSetting { - displayName = "Medics setting"; - description = "What is the level of detail prefered for medics?"; + class enableFor { + displayName = "Enabled for"; + description = "Select what units the advanced medical system will be enabled for"; typeName = "NUMBER"; class values { - class disable { - name = "Disable medics"; + class playableUnits { + name = "Players only."; value = 0; - }; - class normal { - name = "Normal"; - value = 1; default = 1; }; - class full { - name = "Advanced"; - value = 2; + class playableUnitsAndAI { + name = "Players and AI"; + value = 1; }; }; }; - class maxReviveTime { - displayName = "Max Revive time"; - description = "Max amount of seconds a unit can spend in revive state"; - typeName = "NUMBER"; - defaultValue = 120; - }; - class amountOfReviveLives { - displayName = "Max Revive lives"; - description = "Max amount of lives a unit. 0 or -1 is disabled."; - typeName = "NUMBER"; - defaultValue = -1; - }; - class enableOverdosing { - displayName = "Enable Overdosing"; - description = "Enable overdosing of medications"; + class enableAdvancedWounds { + displayName = "Enable Advanced wounds"; + description = "Allow reopening of bandaged wounds?"; typeName = "BOOL"; - defaultValue = 1; + defaultValue = 0; }; - class allowLitterCreation { - displayName = "Enable Litter"; - description = "Enable litter being created upon treatment"; + class enableVehicleCrashes { + displayName = "Vehicle Crashes"; + description = "Do units take damage from a vehicle crash?"; typeName = "BOOL"; defaultValue = 1; }; - class litterCleanUpDelay { - displayName = "Life time of litter objects"; - description = "How long should litter objects stay? In seconds. -1 is forever."; - typeName = "NUMBER"; - defaultValue = 1800; - }; class medicSetting_PAK { - displayName = "Allow PAK (Adv)"; + displayName = "Allow PAK"; description = "Who can use the PAK for full heal?"; typeName = "NUMBER"; class values { class anyone { name = "Anyone"; value = 0; }; class Medic { name = "Medics only"; value = 1; default = 1; }; - class Special { name = "Doctors only (Adv)"; value = 2; }; + class Special { name = "Doctors only"; value = 2; }; }; }; class consumeItem_PAK { - displayName = "Remove PAK on use (Adv)"; + displayName = "Remove PAK on use"; description = "Should PAK be removed on usage?"; typeName = "NUMBER"; class values { @@ -223,7 +192,7 @@ class CfgVehicles { }; }; class useLocation_PAK { - displayName = "Locations PAK (Adv)"; + displayName = "Locations PAK"; description = "Where can the personal aid kit be used?"; typeName = "NUMBER"; class values { @@ -254,6 +223,42 @@ class CfgVehicles { }; }; + + class ACE_moduleReviveSettings: ACE_Module { + scope = 2; + displayName = "Revive Settings [ACE]"; + icon = QUOTE(PATHTOF(UI\Icon_Module_Medical_ca.paa)); + category = "ACE_medical"; + function = QUOTE(DFUNC(moduleReviveSettings)); + functionPriority = 1; + isGlobal = 1; + isTriggerActivated = 0; + author = "$STR_ACE_Common_ACETeam"; + class Arguments { + class enableRevive { + displayName = "Enable Revive"; + description = "Enable a basic revive system"; + typeName = "BOOL"; + defaultValue = 0; + }; + class maxReviveTime { + displayName = "Max Revive time"; + description = "Max amount of seconds a unit can spend in revive state"; + typeName = "NUMBER"; + defaultValue = 120; + }; + class amountOfReviveLives { + displayName = "Max Revive lives"; + description = "Max amount of lives a unit. 0 or -1 is disabled."; + typeName = "NUMBER"; + defaultValue = -1; + }; + }; + class ModuleDescription { + description = "Provides a medical system for both players and AI."; + sync[] = {}; + }; + }; class ACE_moduleAssignMedicRoles: Module_F { scope = 2; displayName = "Set Medic Class [ACE]"; diff --git a/addons/medical/XEH_preInit.sqf b/addons/medical/XEH_preInit.sqf index b6deca40333..051f7da2660 100644 --- a/addons/medical/XEH_preInit.sqf +++ b/addons/medical/XEH_preInit.sqf @@ -92,10 +92,11 @@ PREP(displayPatientInformation); PREP(displayTriageCard); PREP(dropDownTriageCard); PREP(moduleMedicalSettings); +PREP(moduleAdvancedMedicalSettings); +PREP(moduleReviveSettings); PREP(moduleAssignMedicRoles); PREP(moduleAssignMedicalVehicle); PREP(moduleAssignMedicalFacility); -PREP(moduleTreatmentConfiguration); PREP(copyDeadBody); PREP(requestWoundSync); PREP(unconsciousPFH); diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index c13818bbcdc..956b4f95aa7 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -76,7 +76,7 @@ if (GVAR(level) >= 2) then { }; [_unit] call FUNC(addToInjuredCollection); -if ((_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) && {_damageReturn >= 0.9} && {_selection in ["", "head", "body"]}) exitWith { +if (((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)])) && {_damageReturn >= 0.9} && {_selection in ["", "head", "body"]}) exitWith { if (vehicle _unit != _unit and {damage _vehicle >= 1}) then { // @todo // [_unit] call FUNC(unload); diff --git a/addons/medical/functions/fnc_moduleTreatmentConfiguration.sqf b/addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf similarity index 64% rename from addons/medical/functions/fnc_moduleTreatmentConfiguration.sqf rename to addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf index 5d88fa0f0a2..cf884e0ab0c 100644 --- a/addons/medical/functions/fnc_moduleTreatmentConfiguration.sqf +++ b/addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf @@ -22,12 +22,11 @@ _activated = _this select 2; if !(_activated) exitWith {}; -[_logic, QGVAR(medicSetting), "medicSetting"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(maxReviveTime), "maxReviveTime"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(amountOfReviveLives), "amountOfReviveLives"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(enableOverdosing), "enableOverdosing"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(allowLitterCreation), "allowLitterCreation"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(litterCleanUpDelay), "litterCleanUpDelay"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(enableFor), "enableFor"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(enableAdvancedWounds), "enableAdvancedWounds"] call EFUNC(common,readSettingFromModule); +// TODO disabled until implemented +// [_logic, QGVAR(enableAirway), "enableAirway"] call EFUNC(common,readSettingFromModule); +// [_logic, QGVAR(enableFractures), "enableFractures"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(medicSetting_PAK), "medicSetting_PAK"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(medicSetting_SurgicalKit), "medicSetting_SurgicalKit"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(consumeItem_PAK), "consumeItem_PAK"] call EFUNC(common,readSettingFromModule); diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf index 34dd063a4d0..0d514aee278 100644 --- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf +++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf @@ -23,11 +23,9 @@ _activated = _this select 2; if !(_activated) exitWith {}; [_logic, QGVAR(level), "level"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(enableFor), "enableFor"] call EFUNC(common,readSettingFromModule); -// TODO disabled until implemented -// [_logic, QGVAR(enableAirway), "enableAirway"] call EFUNC(common,readSettingFromModule); -// [_logic, QGVAR(enableFractures), "enableFractures"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(enableAdvancedWounds), "enableAdvancedWounds"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(medicSetting), "medicSetting"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(allowLitterCreation), "allowLitterCreation"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(litterCleanUpDelay), "litterCleanUpDelay"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(enableScreams), "enableScreams"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(playerDamageThreshold), "playerDamageThreshold"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(AIDamageThreshold), "AIDamageThreshold"] call EFUNC(common,readSettingFromModule); diff --git a/addons/medical/functions/fnc_moduleReviveSettings.sqf b/addons/medical/functions/fnc_moduleReviveSettings.sqf new file mode 100644 index 00000000000..c96b1eb67c8 --- /dev/null +++ b/addons/medical/functions/fnc_moduleReviveSettings.sqf @@ -0,0 +1,27 @@ +/* + * Author: Glowbal + * Module for adjusting the medical revive settings + * + * Arguments: + * 0: The module logic + * 1: units + * 2: activated + * + * Return Value: + * None + * + * Public: No + */ + +#include "script_component.hpp" + +private ["_logic", "_units", "_activated"]; +_logic = _this select 0; +_units = _this select 1; +_activated = _this select 2; + +if !(_activated) exitWith {}; + +[_logic, QGVAR(maxReviveTime), "maxReviveTime"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(amountOfReviveLives), "amountOfReviveLives"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(enableRevive), "enableRevive"] call EFUNC(common,readSettingFromModule); diff --git a/addons/medical/functions/fnc_setDead.sqf b/addons/medical/functions/fnc_setDead.sqf index 334a2d8b97c..428d6674abf 100644 --- a/addons/medical/functions/fnc_setDead.sqf +++ b/addons/medical/functions/fnc_setDead.sqf @@ -26,7 +26,7 @@ if (!local _unit) exitwith { false; }; -if ((_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) && !_force) exitwith { +if ((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]) && !_force) exitwith { if (_unit getvariable [QGVAR(inReviveState), false]) exitwith { if (GVAR(amountOfReviveLives) > 0) then { _lifesLeft = _unit getvariable[QGVAR(amountOfReviveLives), GVAR(amountOfReviveLives)]; From 523cb49ff158aa912296e8cc8f7a4a553e0ecfa6 Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Sun, 26 Apr 2015 03:09:16 -0300 Subject: [PATCH 033/171] Added - Portuguese translation to lots of things. Also fixed a typo the english key for STR_ACE_microdagr_configure. --- addons/disposable/stringtable.xml | 72 +- addons/dragging/stringtable.xml | 91 +- addons/explosives/stringtable.xml | 10 +- addons/frag/stringtable.xml | 35 +- addons/grenades/stringtable.xml | 488 ++--- addons/interaction/stringtable.xml | 1326 ++++++------- addons/logistics_uavbattery/stringtable.xml | 150 +- addons/maptools/stringtable.xml | 289 +-- addons/markers/stringtable.xml | 23 +- addons/medical/stringtable.xml | 1925 ++++++++++--------- addons/microdagr/stringtable.xml | 232 ++- addons/movement/stringtable.xml | 86 +- addons/nametags/stringtable.xml | 160 +- addons/nightvision/stringtable.xml | 249 +-- addons/optionsmenu/stringtable.xml | 221 ++- addons/overheating/stringtable.xml | 306 +-- addons/parachute/stringtable.xml | 88 +- addons/realisticnames/stringtable.xml | 83 +- addons/reload/stringtable.xml | 84 +- addons/reloadlaunchers/stringtable.xml | 8 +- addons/respawn/stringtable.xml | 42 +- addons/safemode/stringtable.xml | 80 +- addons/switchunits/stringtable.xml | 40 +- addons/vehiclelock/stringtable.xml | 235 +-- addons/weaponselect/stringtable.xml | 502 ++--- addons/wep_javelin/stringtable.xml | 8 +- addons/winddeflection/stringtable.xml | 69 +- 27 files changed, 3584 insertions(+), 3318 deletions(-) diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index 6a3f561b228..1213a561c79 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -1,39 +1,39 @@  - - - Used Tube - Benutze Einwegwaffe - Tube utilisé - Použitý odpalovač - Zużyta tuba - Lanzador utilizado - Használt cső - Отстрелянная труба - Tubo utilizado - - - Used disposable rocket launcher - Benutzter Einweg-Raketenwerfer - Lance-roquette à usage unique utilisé - Použitý raketomet - Zużyta tuba granatnika jednorazowego użytku - Lanzador desechable utilizado - Használt rakétavető - Отстрелянная одноразовая пусковая установка - Lança foguetes descartável utilizado - - - Preloaded Missile Dummy - Preloaded Missile Dummy - Preloaded Missile Dummy - Preloaded Missile Dummy - Preloaded Missile Dummy - Preloaded Missile Dummy - Preloaded Missile Dummy - Заряженная ракетная пустышка - Preloaded Missile Dummy - - - + + + Used Tube + Benutze Einwegwaffe + Tube utilisé + Použitý odpalovač + Zużyta tuba + Lanzador utilizado + Használt cső + Отстрелянная труба + Tubo utilizado + + + Used disposable rocket launcher + Benutzter Einweg-Raketenwerfer + Lance-roquette à usage unique utilisé + Použitý raketomet + Zużyta tuba granatnika jednorazowego użytku + Lanzador desechable utilizado + Használt rakétavető + Отстрелянная одноразовая пусковая установка + Lança foguetes descartável utilizado + + + Preloaded Missile Dummy + Preloaded Missile Dummy + Preloaded Missile Dummy + Preloaded Missile Dummy + Preloaded Missile Dummy + Preloaded Missile Dummy + Preloaded Missile Dummy + Заряженная ракетная пустышка + Míssel dummy pré-carregado + + + \ No newline at end of file diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml index eafa5e597f6..e3449f5fcaa 100644 --- a/addons/dragging/stringtable.xml +++ b/addons/dragging/stringtable.xml @@ -1,35 +1,35 @@ - + - - - Drag - Тащить - Arrastrar - Ciągnij - Táhnout - Tracter - Ziehen - Arrastar - Trascina - Húzás - - - Release - Отпустить - Soltar - Puść - Položit - Lâcher - Loslassen - Soltar - Lascia - Elengedés - - - Item to heavy - Gegenstand zu schwer - - - - Carry - Tragen - Portar - Nieś - Porter - Nést - Carregar - Trascina - Felvesz - Нести - - - + O item é muito pesado + + + Carry + Tragen + Portar + Nieś + Porter + Nést + Carregar + Trascina + Felvesz + Нести + + + \ No newline at end of file diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml index d5020532031..c4b84dd5383 100644 --- a/addons/explosives/stringtable.xml +++ b/addons/explosives/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -251,7 +251,7 @@ Nahoru Sopra Fel - Para cima + Para Cima Поднять @@ -280,7 +280,7 @@ Detonate Menu - "Zünden"-Menü + "Zünden"-Menü Menú de detonación Menu detonowania Menu de mise à feu @@ -292,7 +292,7 @@ Place Menu - "Platzieren"-Menü + "Platzieren"-Menü Menú de colocación Menu umieszczania Menu Placement @@ -497,4 +497,4 @@ Pegar - + \ No newline at end of file diff --git a/addons/frag/stringtable.xml b/addons/frag/stringtable.xml index f3562ee5b13..ddfe28f85e7 100644 --- a/addons/frag/stringtable.xml +++ b/addons/frag/stringtable.xml @@ -1,18 +1,19 @@ - + - - - -(Æ) Disable Fragmentation -(Æ) Zakázat fragmentaci granátů -(Æ) Weapons: Keine Schrapnelle -(Æ) Wyłącz głowice fragmentacyjne -(Æ) Выключить разлёт осколков -(Æ) Disable Fragmentation -(Æ) Disable Fragmentation -(Æ) Disable Fragmentation -(Æ) Disable Fragmentation - - - - + + + + (Æ) Disable Fragmentation + (Æ) Zakázat fragmentaci granátů + (Æ) Weapons: Keine Schrapnelle + (Æ) Wyłącz głowice fragmentacyjne + (Æ) Выключить разлёт осколков + (Æ) Disable Fragmentation + (Æ) Disable Fragmentation + (Æ) Disable Fragmentation + (Æ) Disable Fragmentation + (Æ) Disabilitar Fragmentação + + + + \ No newline at end of file diff --git a/addons/grenades/stringtable.xml b/addons/grenades/stringtable.xml index 1129d442711..25cd9972948 100644 --- a/addons/grenades/stringtable.xml +++ b/addons/grenades/stringtable.xml @@ -1,246 +1,246 @@ - + - - - Switch Grenade Mode - Granaten-Modus wechseln - Cambiar modo de granada - Tryb rzutu granatem - Změnit styl hodu granátu - Changer type de lancer de grenade - Сменить режим броска гранаты - Gránátdobás mód váltás - Cambia tipo di granata - Alternar Modo de Granada - - - Normal Throw - Normaler Wurf - Lanzamiento normal - Normalny rzut - Normální - Lancer Normal - Нормальный бросок - Normál dobás - Lancio normale - Arremesso Normal - - - High Throw - Hoher Wurf - Lanzamiento alto - Rzut lobem - Vysoko - Lancer Haut - Высокий бросок - Magas dobás - Lancio verso l'alto - Arremesso Alto - - - Precise Throw - Präziser Wurf - Lanzamiento preciso - Precyzyjny rzut - Přesně - Lancer Précis - Точный бросок - Pontos dobás - Lancio preciso - Arremesso Preciso - - - Roll Grenade - Granate rollen - Rodar granada - Po ziemi - Po zemi - Lancer Roulé - Катить гранату - Gurítás - Fai rotolare la granata - Rolar Granada - - - Drop Grenade - Granate fallenlassen - Soltar granada - Upuść granat - Upustit granát - Lâcher la grenade - Бросить себе под ноги - Ejtés - Lascia la granata - Largar Granada - - - M84 Stun Grenade - M84 Blendgranate - Granada aturdidora M84 - M84 Grenade Incapacitante - Granat hukowy M84 - M84 Omračující granát - M84 светозвуковая граната - M84 Villanógránát - Granata Stordente M84 - M84 granada de atordoamento - - - Also known as flashbang. Causes immediate flash blindness, deafness, tinnitus, and inner ear disturbance. - Verursacht temporäre Blind- und Taubheit. - Produce de manera inmediata ceguera, sordera, tinitus y afecta el oído interior. - Les grenades incapacitantes servent à désorienter ou distraire une menace pendant quelques secondes. - Granat ogłusza, nie zabijając przeciwnika. Detonacja daje efekt oślepiającego błysku i głośnego huku. - Omračující granát je taktická nesmrtící zbraň používaná při záchraně rukojmí a zvládání davu. - Граната XM84 (M84) - не летального действия, и предназначена для отвлечения и временного вывода из строя, либо дезориентации противника. Основное использование нашла при освобождении заложников, захвате преступников и террористов, а также проведении диверсионных миссий. - Eldobás után felrobban és éles hang, valamint fényhatással zavarja össze a környezetében tartózkodókat. - Anche conosciuta come flashbang. Causa accecamento immediato, sensazioni di sposatezza, mancanza d'equilibrio e disturbi al timpano. - Um tipo de granada não-letal destinado a confundir, desorientar e distrair uma potencial ameaça. - - - M127A1 Hand Held Signal (White) - M127A1 Leuchtmittel (Weiß) - M127A1 Světlice (Bílá) - M127A1 Jelzőrakéta (Fehér) - M127A1 Bengala (Bianco) - Flara ręczna sygnałowa M127A1 (biała) - M127A1 Sinalizador (Branco) - M127A1 Фальшфейер (Белый) - Bengala M127A1 (Blanca) - M127A1 Feux à main (Blanc) - - - M127A1 Hand Held Signal (Red) - M127A1 Leuchtmittel (Rot) - M127A1 Světlice (Červená) - M127A1 Jelzőrakéta (Piros) - M127A1 Bengala (Rosso) - Flara ręczna sygnałowa M127A1 (czerwona) - M127A1 Sinalizador (Vermelho) - M127A1 Фальшфейер (Красный) - Bengala M127A1 (Roja) - M127A1 Feux à main (Rouge) - - - M127A1 Hand Held Signal (Green) - M127A1 Leuchtmittel (Grün) - M127A1 Světlice (Zelená) - M127A1 Jelzőrakéta (Zöld) - M127A1 Bengala (Verde) - Flara ręczna sygnałowa M127A1 (zielona) - M127A1 Sinalizador (Verde) - M127A1 Фальшфейер (Зелёный) - Bengala M127A1 (Verde) - M127A1 Feux à main (Vert) - - - M127A1 Hand Held Signal (Yellow) - M127A1 Leuchtmittel (Gelb) - M127A1 Světlice (Žlutá) - M127A1 Jelzőrakéta (Sárga) - M127A1 Bengala (Giallo) - Flara ręczna sygnałowa M127A1 (żółta) - M127A1 Sinalizador (Amarelo) - M127A1 Фальшфейер (Жёлтые) - Bengala M127A1 (Amarilla) - M127A1 Feux à main (Jaune) - - - White Hand Flare - Weiße Leuchtkugel, wird wie eine Granate geworfen. - Světlice (Bílá) - Jelzőrakéta (Fehér) - Bengala (Bianco) - Flara ręczna (biała) - Sinalizador (Branco) - Фальшфейер (Белый) - Bengala (Blanca) - Feux à main (Blanc) - - - Red Hand Flare - Rote Leuchtkugel, wird wie eine Granate geworfen. - Světlice (Červená) - Jelzőrakéta (Piros) - Bengala (Rosso) - Flara ręczna (czerwona) - Sinalizador (Vermelho) - Фальшфейер (Красный) - Bengala (Roja) - Feux à main (Rouge) - - - Green Hand Flare - Grüne Leuchtkugel, wird wie eine Granate geworfen. - Světlice (Zelená) - Jelzőrakéta (Zöld) - Bengala (Verde) - Flara ręczna (zielona) - Sinalizador (Verde) - Фальшфейер (Зелёный) - Bengala (Verde) - Feux à main (Vert) - - - Yellow Hand Flare - Gelbe Leuchtkugel, wird wie eine Granate geworfen. - Světlice Žlutá - Jelzőrakéta (Sárga) - Bengala (Giallo) - Flara ręczna (żółta) - Sinalizador (Amarelo) - Фальшфейер (Жёлтые) - Bengala (Amarilla) - Feux à main (Jaune) - - - M127A1 (White) - M127A1 (Weiß) - M127A1 (Bílá) - M127A1 (Blanc) - M127A1 (Fehér) - M127A1 (Bianco) - M127A1 (biała) - M127A1 (Branco) - M127A1 (Белый) - M127A1 (Blanca) - - - M127A1 (Red) - M127A1 (Rot) - M127A1 (Červená) - M127A1 (Rouge) - M127A1 (Piros) - M127A1 (Rosso) - M127A1 (czerwona) - M127A1 (Vermelho) - M127A1 (Красный) - M127A1 (Roja) - - - M127A1 (Green) - M127A1 (Grün) - M127A1 (Zelená) - M127A1 (Vert) - M127A1 (Zöld) - M127A1 (Verde) - M127A1 (zielona) - M127A1 (Verde) - M127A1 (Зелёный) - M127A1 (Verde) - - - M127A1 (Yellow) - M127A1 (Gelb) - M127A1 (Žlutá) - M127A1 (Jaune) - M127A1 (Sárga) - M127A1 (Giallo) - M127A1 (żółta) - M127A1 (Amarelo) - M127A1 (Жёлтые) - M127A1 (Amarilla) - - - + + + Switch Grenade Mode + Granaten-Modus wechseln + Cambiar modo de granada + Tryb rzutu granatem + Změnit styl hodu granátu + Changer type de lancer de grenade + Сменить режим броска гранаты + Gránátdobás mód váltás + Cambia tipo di granata + Alternar Modo de Granada + + + Normal Throw + Normaler Wurf + Lanzamiento normal + Normalny rzut + Normální + Lancer Normal + Нормальный бросок + Normál dobás + Lancio normale + Arremesso Normal + + + High Throw + Hoher Wurf + Lanzamiento alto + Rzut lobem + Vysoko + Lancer Haut + Высокий бросок + Magas dobás + Lancio verso l'alto + Arremesso Alto + + + Precise Throw + Präziser Wurf + Lanzamiento preciso + Precyzyjny rzut + Přesně + Lancer Précis + Точный бросок + Pontos dobás + Lancio preciso + Arremesso Preciso + + + Roll Grenade + Granate rollen + Rodar granada + Po ziemi + Po zemi + Lancer Roulé + Катить гранату + Gurítás + Fai rotolare la granata + Rolar Granada + + + Drop Grenade + Granate fallenlassen + Soltar granada + Upuść granat + Upustit granát + Lâcher la grenade + Бросить себе под ноги + Ejtés + Lascia la granata + Largar Granada + + + M84 Stun Grenade + M84 Blendgranate + Granada aturdidora M84 + M84 Grenade Incapacitante + Granat hukowy M84 + M84 Omračující granát + M84 светозвуковая граната + M84 Villanógránát + Granata Stordente M84 + M84 granada de atordoamento + + + Also known as flashbang. Causes immediate flash blindness, deafness, tinnitus, and inner ear disturbance. + Verursacht temporäre Blind- und Taubheit. + Produce de manera inmediata ceguera, sordera, tinitus y afecta el oído interior. + Les grenades incapacitantes servent à désorienter ou distraire une menace pendant quelques secondes. + Granat ogłusza, nie zabijając przeciwnika. Detonacja daje efekt oślepiającego błysku i głośnego huku. + Omračující granát je taktická nesmrtící zbraň používaná při záchraně rukojmí a zvládání davu. + Граната XM84 (M84) - не летального действия, и предназначена для отвлечения и временного вывода из строя, либо дезориентации противника. Основное использование нашла при освобождении заложников, захвате преступников и террористов, а также проведении диверсионных миссий. + Eldobás után felrobban és éles hang, valamint fényhatással zavarja össze a környezetében tartózkodókat. + Anche conosciuta come flashbang. Causa accecamento immediato, sensazioni di sposatezza, mancanza d'equilibrio e disturbi al timpano. + Também conhecida como flashbang. Causa uma clarão imediato, cegueira, surdez, zumbido e distúrbio no tímpano. + + + M127A1 Hand Held Signal (White) + M127A1 Leuchtmittel (Weiß) + M127A1 Světlice (Bílá) + M127A1 Jelzőrakéta (Fehér) + M127A1 Bengala (Bianco) + Flara ręczna sygnałowa M127A1 (biała) + Sinalizador de Mão M127A1 (Branco) + M127A1 Фальшфейер (Белый) + Bengala M127A1 (Blanca) + M127A1 Feux à main (Blanc) + + + M127A1 Hand Held Signal (Red) + M127A1 Leuchtmittel (Rot) + M127A1 Světlice (Červená) + M127A1 Jelzőrakéta (Piros) + M127A1 Bengala (Rosso) + Flara ręczna sygnałowa M127A1 (czerwona) + Sinalizador de Mão M127A1 (Vermelho) + M127A1 Фальшфейер (Красный) + Bengala M127A1 (Roja) + M127A1 Feux à main (Rouge) + + + M127A1 Hand Held Signal (Green) + M127A1 Leuchtmittel (Grün) + M127A1 Světlice (Zelená) + M127A1 Jelzőrakéta (Zöld) + M127A1 Bengala (Verde) + Flara ręczna sygnałowa M127A1 (zielona) + Sinalizador de Mão M127A1 (Verde) + M127A1 Фальшфейер (Зелёный) + Bengala M127A1 (Verde) + M127A1 Feux à main (Vert) + + + M127A1 Hand Held Signal (Yellow) + M127A1 Leuchtmittel (Gelb) + M127A1 Světlice (Žlutá) + M127A1 Jelzőrakéta (Sárga) + M127A1 Bengala (Giallo) + Flara ręczna sygnałowa M127A1 (żółta) + Sinalizador de Mão M127A1 (Amarelo) + M127A1 Фальшфейер (Жёлтые) + Bengala M127A1 (Amarilla) + M127A1 Feux à main (Jaune) + + + White Hand Flare + Weiße Leuchtkugel, wird wie eine Granate geworfen. + Světlice (Bílá) + Jelzőrakéta (Fehér) + Bengala (Bianco) + Flara ręczna (biała) + Sinalizador de Mão (Branco) + Фальшфейер (Белый) + Bengala (Blanca) + Feux à main (Blanc) + + + Red Hand Flare + Rote Leuchtkugel, wird wie eine Granate geworfen. + Světlice (Červená) + Jelzőrakéta (Piros) + Bengala (Rosso) + Flara ręczna (czerwona) + Sinalizador de Mão (Vermelho) + Фальшфейер (Красный) + Bengala (Roja) + Feux à main (Rouge) + + + Green Hand Flare + Grüne Leuchtkugel, wird wie eine Granate geworfen. + Světlice (Zelená) + Jelzőrakéta (Zöld) + Bengala (Verde) + Flara ręczna (zielona) + Sinalizador de Mão (Verde) + Фальшфейер (Зелёный) + Bengala (Verde) + Feux à main (Vert) + + + Yellow Hand Flare + Gelbe Leuchtkugel, wird wie eine Granate geworfen. + Světlice Žlutá + Jelzőrakéta (Sárga) + Bengala (Giallo) + Flara ręczna (żółta) + Sinalizador de Mão (Amarelo) + Фальшфейер (Жёлтые) + Bengala (Amarilla) + Feux à main (Jaune) + + + M127A1 (White) + M127A1 (Weiß) + M127A1 (Bílá) + M127A1 (Blanc) + M127A1 (Fehér) + M127A1 (Bianco) + M127A1 (biała) + M127A1 (Branco) + M127A1 (Белый) + M127A1 (Blanca) + + + M127A1 (Red) + M127A1 (Rot) + M127A1 (Červená) + M127A1 (Rouge) + M127A1 (Piros) + M127A1 (Rosso) + M127A1 (czerwona) + M127A1 (Vermelho) + M127A1 (Красный) + M127A1 (Roja) + + + M127A1 (Green) + M127A1 (Grün) + M127A1 (Zelená) + M127A1 (Vert) + M127A1 (Zöld) + M127A1 (Verde) + M127A1 (zielona) + M127A1 (Verde) + M127A1 (Зелёный) + M127A1 (Verde) + + + M127A1 (Yellow) + M127A1 (Gelb) + M127A1 (Žlutá) + M127A1 (Jaune) + M127A1 (Sárga) + M127A1 (Giallo) + M127A1 (żółta) + M127A1 (Amarelo) + M127A1 (Жёлтые) + M127A1 (Amarilla) + + + \ No newline at end of file diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml index dcd87056e23..93d3b2bd095 100644 --- a/addons/interaction/stringtable.xml +++ b/addons/interaction/stringtable.xml @@ -1,660 +1,672 @@  - - - Interactions - - - Torso - - - Head - - - Left Arm - - - Right Arm - - - Left Leg - - - Right Leg - - - Weapon - - - Interaction Menu - Interaktionsmenü - Menú de interacción - Menu interakcji - Menu interakce - Menu d'interaction - Меню взаимодействия - Interakció - Menu de Interação - Menù Interattivo - - - Interaction Menu (Self) - Interaktionsmenü (Selbst) - Menú de interacción (Propia) - Menu interakcji (na siebie) - Menu interakce (vlastní) - Menu d'interaction (Perso) - Меню взаимодействия (с собой) - Interakció (saját) - Menu de Interação (Individual) - Menù Interattivo (Individuale) - - - Open / Close Door - Tür öffnen / schließen - Abrir / Cerrar puerta - Otwórz / Zamknij drzwi - Otevřít / Zavřít dveře - Ouvrir / Fermer Portes - Открыть / Закрыть двери - Ajtó nyitás / zárás - Abrir / Fechar Porta - Apri / Chiudi la porta - - - Lock Door - Tür sperren - Bloquear puerta - Verrouiller Porte - Blocca la porta - Заблокировать дверь - Trancar Porta - Ajtó bezárása - Zablokuj drzwi - Zamknout dveře - - - Unlock Door - Tür entsperren - Desbloquear puerta - Déverrouiller Porte - Sblocca la porta - Разблокировать дверь - Destrancar Porta - Zár kinyitása - Odblokuj drzwi - Odemknout dveře - - - Locked Door - Tür gesperrt - Puerta bloqueada - Porte Verrouillée - Porta bloccata - Дверь заблокирована - Porta Trancada - Zárt ajtó - Zablokowano drzwi - Zamčené dveře - - - Unlocked Door - Tür entsperrt - Puerta desbloqueada - Porte Déverrouillée - Porta sbloccata - Дверь разблокирована - Porta Destrancada - Nyitott ajtó - Odblokowano drzwi - Odemčené dveře - - - Join group - Gruppe beitreten - Unirse al grupo - Dołącz do grupy - Přidat se do skupiny - Rejoindre Groupe - Вступить в группу - Csatlakozás - Unir-se ao grupo - Unisciti alla squadra - - - Leave Group - Gruppe verlassen - Dejar grupo - Opuść grupę - Odejít ze skupiny - Quitter Groupe - Выйти из группы - Csoport elhagyása - Deixar grupo - Lascia la squadra - - - Become Leader - Grp.-führung übern. - Asumir el liderazgo - Przejmij dowodzenie - Stát se velitelem - Devenir Leader - Стать лидером - Vezetés átvétele - Tornar-se Líder - Prendi il comando - - - DANCE! - TANZEN! - BAILAR! - TAŃCZ! - TANČIT! - Danse! - ТАНЦЕВАТЬ! - TÁNC! - DANCE! - Balla! - - - Stop Dancing - Tanzen abbrechen - Dejar de bailar - Przestań tańczyć - Přestat tancovat - Arrêter de danser - Прекратить танцевать - Tánc abbahagyása - Parar de dançar - Smetti di ballare - - - << Back - << Zurück - << Atrás - << Wstecz - << Zpět - << Retour - << Назад - << Vissza - << Voltar - << Indietro - - - Gestures - Gesten - Gestos - Gesty - Gesta - Signaux - Жесты - Kézjelek - Gestos - Segnali gestuali - - - Attack - Angreifen - Atacar - Do ataku - Zaútočit - Attaquer - Атаковать - Támadás - Atacar - Attaccare - - - Advance - Vordringen - Avanzar - Naprzód - Postoupit - Avancer - Продвигаться - Előre - Avançar - Avanzare - - - Go - Los - Adelante - Szybko - Jít - Aller - Идти - Mozgás - Mover-se - Muoversi - - - Follow - Folgen - Seguirme - Za mną - Následovat - Suivre - Следовать - Utánam - Seguir - Seguire - - - Point - Zeigen - Señalar - Wskazać - Ukázat - Pointer - Точка - Mutat - Apontar - Puntare a - - - Up - Aufstehen - Arriba - Do góry - Vztyk - Debout - Вверх - Fel - Acima - Alzarsi - - - Cover - Deckung - Cubrirse - Do osłony - Krýt se - A couvert - Укрыться - Fedezékbe - Proteger-se - Copertura - - - Cease Fire - Feuer einstellen - Alto el fuego - Wstrzymać ogień - Zastavit palbu - Halte au feu - Прекратить огонь - Tüzet szüntess - Cessar Fogo - Cessare il Fuoco - - - Freeze - Keine Bewegung - Alto - Stać - Stát - Halte - Замереть - Állj - Alto - Fermi - - - Hi - Hallo - Hola - Witaj - Ahoj - Salut - Привет - Szeva - Olá - Ciao - - - Yes - Ja - Si - Tak - Ano - Oui - Да - Igen - Sim - Si - - - No - Nein - No - Nie - Ne - Non - Нет - Nem - Não - No - - - Put weapon on back - Waffe wegstecken - Arma a la espalda - Umieść broń na plecach - Dát zbraň na záda - Arme à la bretelle - Повесить оружие на спину - Fegyvert hátra - Colocar arma nas costas - Metti l'arma in spalla - - - Tap Shoulder - Auf Schulter klopfen - Tocar el hombro - Klepnij w ramię - Poklepat na rameno - Taper sur l'épaule - Похлопать по плечу - Vállveregetés - Tocar ombro - Dai un colpetto - - - You were tapped on the RIGHT shoulder - Te tocaron el hombro DERECHO - Dir wurde auf die Schulter geklopft - On te tape sur l'épaule - Zostałeś klepnięty po ramieniu - Vállonveregettek - Někdo tě poklepal na rameno - Вас похлопали по плечу - Você foi tocado no ombro - Ti è stato dato un colpetto sulla spalla - - - You were tapped on the LEFT shoulder. - Te tocaron el hombro IZQUIERDO. - Dir wurde auf die Schulter geklopft - On te tape sur l'épaule. - Zostałeś klepnięty po ramieniu - Vállonveregettek - Někdo tě poklepal na rameno. - Вас похлопали по плечу - Você foi tocado no ombro. - Ti è stato dato un colpetto sulla spalla - - - Cancel - Abbrechen - Cancelar - Anuluj - Annuler - Zrušit - Annulla - Отменить - Cancelar - Mégse - - - Select - Wählen - Seleccionar - Wybierz - Sélectionner - Zvolit - Seleziona - Выбрать - Selecionar - Kiválaszt - - - Go Away! - Geh Weg! - Aléjate! - Odejdź! - Jděte pryč! - Allez-vous-en! - Уходите отсюда! - Tűnés! - Vá Embora! - Via di qui! - - - Get Down! - Auf Den Boden! - Al suelo! - Padnij! - K zemi! - A terre! - A földre! - Ложись! - Abaixe-se! - A Terra! - - - Team<br/>Management - Team<br/>Management - Gestión<br/>de equipo - Gestion<br/>d'équipe - Zarządzanie<br/>oddziałem - Správa<br/>týmu - Управление<br/>группой - Gerenciamento<br/>de Equipe - Organizzazione<br/>Squadra - Csapat<br/>kezelés - - - Red - Rot - Rojo - Rouge - Czerwony - Červený - Красный - Vermelha - Rosso - Piros - - - Green - Grün - Verde - Vert - Zielony - Zelený - Зеленый - Verde - Verde - Zöld - - - Blue - Blau - Azul - Bleu - Niebieski - Modrý - Синий - Azul - Blu - Kék - - - Yellow - Gelb - Amarillo - Jaune - Żółty - Žlutý - Желтый - Amarela - Giallo - Sárga - - - Join Team<br/>Red - Team Rot<br/>beitreten - Unirse al<br/>equipo rojo - Rejoindre<br/>Rouge - Dołącz do drużyny<br/>czerwonej - Připojit do<br/>Červeného Týmu - Присоединиться<br/>к красной группе - Unir-se à<br/>Equipe Vermelha - Entra nella<br/>Squadra Rossa - Csatlakozás a<br/>piros csapathoz - - - Join Team<br/>Green - Team Grün<br/>beitreten - Unirse al<br/>equipo verde - Rejoindre<br/>Verte - Dołącz do<br/>drużyny zielonej - Připojit do<br/>Zeleného Týmu - Присоединиться<br/>к зеленой группе - Unir-se à<br/>Equipe Verde - Entra nella<br/>Squadra Verde - Csatlakozás a<br/>zöld csapathoz - - - Join Team<br/>Blue - Team Blau<br/>beitreten - Unirse al<br/>equipo azul - Rejoindre<br/>Bleue - Dołącz do<br/>drużyny niebieskiej - Připojit do<br/>Modrého Týmu - Присоединиться<br/>к синей группе - Unir-se à<br/>Equipe Azul - Entra nella<br/>Squadra Blu - Csatlakozás a<br/>kék csapathoz - - - Join Team<br/>Yellow - Team Gelb<br/>beitreten - Unirse al<br/>equipo amarillo - Rejoindre<br/>Jaune - Dołącz do<br/>drużyny żółtej - Připojit do<br/>Žlutého Týmu - Присоединиться<br/>к желтой группе - Unir-se à<br/>Equipe Amarela - Entra nella<br/>Squadra Gialla - Csatlakozás a<br/>sárga csapathoz - - - You joined Team %1 - Du bist Team %1 beigetreten - Te has unido al equipo %1 - Tu as rejoint l'équipe %1 - Dołączyłeś do drużyny %1 - Připojil ses do Týmu %1 - Вы присоединились к группе %1 - Você uniu-se à Equipe %1 - Sei entrato nella Squadra %1 - Csatlakoztál a %1 csapathoz - - - Leave Team - Team verlassen - Dejar equipo - Quitter l'équipe - Opuść drużynę - Opustit tým - Покинуть группу - Deixar Equipe - Lascia la Squadra - Csapat elhagyása - - - You left the Team - Du hast das Team verlassen - Has dejado el equipo - Tu as quitté l'équipe - Opuściłeś drużynę - Opustil si tým - Вы покинули группу - Você deixou a Equipe - Hai lasciato la squadra - Elhagytad a csapatot - - - Pardon - Begnadigen - Perdonar - Przebacz - Pardon - Pardon - Извините - Perdão - Perdona - Megbocsátás - - - Scroll - Scrollen - Przewiń - Défilement - Desplazar - Пролистать - Rolar - Scorri - Görgetés - Otáčení - - - Modifier Key - Modifikator - Modyfikator - Modifier la touche - Tecla modificadora - клавиша-модификатор - Tecla Modificadora - Modifica Tasto - Módosító billentyű - Modifikátor - - - Not in Range - Außer Reichweite - Hors de portée. - Fuera de rango - Слишком далеко - Fora do Alcançe - Hatótávolságon kívül - Poza zasięgiem - Mimo dosah - - - Equipment - Ausrüstung - Equipamiento - Équipment - Ekwipunek - Vybavení - Felszerelés - Снаряжение - - - Push - Schieben - Empujar - Pousser - Pchnij - Odstrčit - Tolás - Толкать - - - Interact - Interagiere - Interakce - Взаимодействовать - Interakcja - Interactuar - - - Passengers - - - + + + Interactions + Interaçãoes + + + Torso + Torso + + + Head + Cabeça + + + Left Arm + Braço Esquerdo + + + Right Arm + Braço Direito + + + Left Leg + Perna Esquerda + + + Right Leg + Perna Direita + + + Weapon + Arma + + + Interaction Menu + Interaktionsmenü + Menú de interacción + Menu interakcji + Menu interakce + Menu d'interaction + Меню взаимодействия + Interakció + Menu de Interação + Menù Interattivo + + + Interaction Menu (Self) + Interaktionsmenü (Selbst) + Menú de interacción (Propia) + Menu interakcji (na siebie) + Menu interakce (vlastní) + Menu d'interaction (Perso) + Меню взаимодействия (с собой) + Interakció (saját) + Menu de Interação (Individual) + Menù Interattivo (Individuale) + + + Open / Close Door + Tür öffnen / schließen + Abrir / Cerrar puerta + Otwórz / Zamknij drzwi + Otevřít / Zavřít dveře + Ouvrir / Fermer Portes + Открыть / Закрыть двери + Ajtó nyitás / zárás + Abrir / Fechar Porta + Apri / Chiudi la porta + + + Lock Door + Tür sperren + Bloquear puerta + Verrouiller Porte + Blocca la porta + Заблокировать дверь + Trancar Porta + Ajtó bezárása + Zablokuj drzwi + Zamknout dveře + + + Unlock Door + Tür entsperren + Desbloquear puerta + Déverrouiller Porte + Sblocca la porta + Разблокировать дверь + Destrancar Porta + Zár kinyitása + Odblokuj drzwi + Odemknout dveře + + + Locked Door + Tür gesperrt + Puerta bloqueada + Porte Verrouillée + Porta bloccata + Дверь заблокирована + Porta Trancada + Zárt ajtó + Zablokowano drzwi + Zamčené dveře + + + Unlocked Door + Tür entsperrt + Puerta desbloqueada + Porte Déverrouillée + Porta sbloccata + Дверь разблокирована + Porta Destrancada + Nyitott ajtó + Odblokowano drzwi + Odemčené dveře + + + Join group + Gruppe beitreten + Unirse al grupo + Dołącz do grupy + Přidat se do skupiny + Rejoindre Groupe + Вступить в группу + Csatlakozás + Unir-se ao grupo + Unisciti alla squadra + + + Leave Group + Gruppe verlassen + Dejar grupo + Opuść grupę + Odejít ze skupiny + Quitter Groupe + Выйти из группы + Csoport elhagyása + Deixar grupo + Lascia la squadra + + + Become Leader + Grp.-führung übern. + Asumir el liderazgo + Przejmij dowodzenie + Stát se velitelem + Devenir Leader + Стать лидером + Vezetés átvétele + Tornar-se Líder + Prendi il comando + + + DANCE! + TANZEN! + BAILAR! + TAŃCZ! + TANČIT! + Danse! + ТАНЦЕВАТЬ! + TÁNC! + DANCE! + Balla! + + + Stop Dancing + Tanzen abbrechen + Dejar de bailar + Przestań tańczyć + Přestat tancovat + Arrêter de danser + Прекратить танцевать + Tánc abbahagyása + Parar de dançar + Smetti di ballare + + + << Back + << Zurück + << Atrás + << Wstecz + << Zpět + << Retour + << Назад + << Vissza + << Voltar + << Indietro + + + Gestures + Gesten + Gestos + Gesty + Gesta + Signaux + Жесты + Kézjelek + Gestos + Segnali gestuali + + + Attack + Angreifen + Atacar + Do ataku + Zaútočit + Attaquer + Атаковать + Támadás + Atacar + Attaccare + + + Advance + Vordringen + Avanzar + Naprzód + Postoupit + Avancer + Продвигаться + Előre + Avançar + Avanzare + + + Go + Los + Adelante + Szybko + Jít + Aller + Идти + Mozgás + Mover-se + Muoversi + + + Follow + Folgen + Seguirme + Za mną + Následovat + Suivre + Следовать + Utánam + Seguir + Seguire + + + Point + Zeigen + Señalar + Wskazać + Ukázat + Pointer + Точка + Mutat + Apontar + Puntare a + + + Up + Aufstehen + Arriba + Do góry + Vztyk + Debout + Вверх + Fel + Acima + Alzarsi + + + Cover + Deckung + Cubrirse + Do osłony + Krýt se + A couvert + Укрыться + Fedezékbe + Proteger-se + Copertura + + + Cease Fire + Feuer einstellen + Alto el fuego + Wstrzymać ogień + Zastavit palbu + Halte au feu + Прекратить огонь + Tüzet szüntess + Cessar Fogo + Cessare il Fuoco + + + Freeze + Keine Bewegung + Alto + Stać + Stát + Halte + Замереть + Állj + Alto + Fermi + + + Hi + Hallo + Hola + Witaj + Ahoj + Salut + Привет + Szeva + Olá + Ciao + + + Yes + Ja + Si + Tak + Ano + Oui + Да + Igen + Sim + Si + + + No + Nein + No + Nie + Ne + Non + Нет + Nem + Não + No + + + Put weapon on back + Waffe wegstecken + Arma a la espalda + Umieść broń na plecach + Dát zbraň na záda + Arme à la bretelle + Повесить оружие на спину + Fegyvert hátra + Colocar arma nas costas + Metti l'arma in spalla + + + Tap Shoulder + Auf Schulter klopfen + Tocar el hombro + Klepnij w ramię + Poklepat na rameno + Taper sur l'épaule + Похлопать по плечу + Vállveregetés + Tocar ombro + Dai un colpetto + + + You were tapped on the RIGHT shoulder + Te tocaron el hombro DERECHO + Dir wurde auf die Schulter geklopft + On te tape sur l'épaule + Zostałeś klepnięty po ramieniu + Vállonveregettek + Někdo tě poklepal na rameno + Вас похлопали по плечу + Você foi tocado no ombro + Ti è stato dato un colpetto sulla spalla + + + You were tapped on the LEFT shoulder. + Te tocaron el hombro IZQUIERDO. + Dir wurde auf die Schulter geklopft + On te tape sur l'épaule. + Zostałeś klepnięty po ramieniu + Vállonveregettek + Někdo tě poklepal na rameno. + Вас похлопали по плечу + Você foi tocado no ombro. + Ti è stato dato un colpetto sulla spalla + + + Cancel + Abbrechen + Cancelar + Anuluj + Annuler + Zrušit + Annulla + Отменить + Cancelar + Mégse + + + Select + Wählen + Seleccionar + Wybierz + Sélectionner + Zvolit + Seleziona + Выбрать + Selecionar + Kiválaszt + + + Go Away! + Geh Weg! + Aléjate! + Odejdź! + Jděte pryč! + Allez-vous-en! + Уходите отсюда! + Tűnés! + Vá Embora! + Via di qui! + + + Get Down! + Auf Den Boden! + Al suelo! + Padnij! + K zemi! + A terre! + A földre! + Ложись! + Abaixe-se! + A Terra! + + + Team<br/>Management + Team<br/>Management + Gestión<br/>de equipo + Gestion<br/>d'équipe + Zarządzanie<br/>oddziałem + Správa<br/>týmu + Управление<br/>группой + Gerenciamento<br/>de Equipe + Organizzazione<br/>Squadra + Csapat<br/>kezelés + + + Red + Rot + Rojo + Rouge + Czerwony + Červený + Красный + Vermelha + Rosso + Piros + + + Green + Grün + Verde + Vert + Zielony + Zelený + Зеленый + Verde + Verde + Zöld + + + Blue + Blau + Azul + Bleu + Niebieski + Modrý + Синий + Azul + Blu + Kék + + + Yellow + Gelb + Amarillo + Jaune + Żółty + Žlutý + Желтый + Amarela + Giallo + Sárga + + + Join Team<br/>Red + Team Rot<br/>beitreten + Unirse al<br/>equipo rojo + Rejoindre<br/>Rouge + Dołącz do drużyny<br/>czerwonej + Připojit do<br/>Červeného Týmu + Присоединиться<br/>к красной группе + Unir-se à<br/>Equipe Vermelha + Entra nella<br/>Squadra Rossa + Csatlakozás a<br/>piros csapathoz + + + Join Team<br/>Green + Team Grün<br/>beitreten + Unirse al<br/>equipo verde + Rejoindre<br/>Verte + Dołącz do<br/>drużyny zielonej + Připojit do<br/>Zeleného Týmu + Присоединиться<br/>к зеленой группе + Unir-se à<br/>Equipe Verde + Entra nella<br/>Squadra Verde + Csatlakozás a<br/>zöld csapathoz + + + Join Team<br/>Blue + Team Blau<br/>beitreten + Unirse al<br/>equipo azul + Rejoindre<br/>Bleue + Dołącz do<br/>drużyny niebieskiej + Připojit do<br/>Modrého Týmu + Присоединиться<br/>к синей группе + Unir-se à<br/>Equipe Azul + Entra nella<br/>Squadra Blu + Csatlakozás a<br/>kék csapathoz + + + Join Team<br/>Yellow + Team Gelb<br/>beitreten + Unirse al<br/>equipo amarillo + Rejoindre<br/>Jaune + Dołącz do<br/>drużyny żółtej + Připojit do<br/>Žlutého Týmu + Присоединиться<br/>к желтой группе + Unir-se à<br/>Equipe Amarela + Entra nella<br/>Squadra Gialla + Csatlakozás a<br/>sárga csapathoz + + + You joined Team %1 + Du bist Team %1 beigetreten + Te has unido al equipo %1 + Tu as rejoint l'équipe %1 + Dołączyłeś do drużyny %1 + Připojil ses do Týmu %1 + Вы присоединились к группе %1 + Você uniu-se à Equipe %1 + Sei entrato nella Squadra %1 + Csatlakoztál a %1 csapathoz + + + Leave Team + Team verlassen + Dejar equipo + Quitter l'équipe + Opuść drużynę + Opustit tým + Покинуть группу + Deixar Equipe + Lascia la Squadra + Csapat elhagyása + + + You left the Team + Du hast das Team verlassen + Has dejado el equipo + Tu as quitté l'équipe + Opuściłeś drużynę + Opustil si tým + Вы покинули группу + Você deixou a Equipe + Hai lasciato la squadra + Elhagytad a csapatot + + + Pardon + Begnadigen + Perdonar + Przebacz + Pardon + Pardon + Извините + Perdão + Perdona + Megbocsátás + + + Scroll + Scrollen + Przewiń + Défilement + Desplazar + Пролистать + Rolar + Scorri + Görgetés + Otáčení + + + Modifier Key + Modifikator + Modyfikator + Modifier la touche + Tecla modificadora + клавиша-модификатор + Tecla Modificadora + Modifica Tasto + Módosító billentyű + Modifikátor + + + Not in Range + Außer Reichweite + Hors de portée. + Fuera de rango + Слишком далеко + Fora do Alcançe + Hatótávolságon kívül + Poza zasięgiem + Mimo dosah + + + Equipment + Ausrüstung + Equipamiento + Équipment + Ekwipunek + Vybavení + Felszerelés + Снаряжение + Equipamento + + + Push + Schieben + Empujar + Pousser + Pchnij + Odstrčit + Tolás + Толкать + Empurrar + + + Interact + Interagiere + Interakce + Взаимодействовать + Interakcja + Interactuar + Interagir + + + Passengers + Passageiros + + + \ No newline at end of file diff --git a/addons/logistics_uavbattery/stringtable.xml b/addons/logistics_uavbattery/stringtable.xml index 6acb2b571dc..ca7ef558402 100644 --- a/addons/logistics_uavbattery/stringtable.xml +++ b/addons/logistics_uavbattery/stringtable.xml @@ -1,78 +1,78 @@  - - - Drone is full - Drohne ist voll - El VANT está lleno - L'UAV est chargé - Dron jest naładowany - A drón fel van töltve - Dron je nabitý - O UAV está cheio - Il drone è pieno - БПЛА заполнен - - - You need a UAV Battery - Du brauchst eine UAV-Batterie - Necesitas una batería para VANT - Pas de batterie UAV - Potrzebujesz baterii UAV - Szükséged van egy UAV akkumulátorra - Potřebuješ UAV-Baterii - Você precisa de uma Bateria para UAVs - Hai bisogno di una Batteria UAV - Требуется аккумулятор БПЛА - - - Recharge - Aufladen - Recargar - Recharger - Naładuj - Feltöltés - Dobít - Recarregar - Ricarica - Подзарядить - - - UAV Battery - UAV-Batterie - Batería para VANT - Batterie UAV - Bateria UAV - UAV akkumulátor - UAV-Baterie - Bateria para UAV - Batteria para UAVs - Аккумулятор БПЛА - - - Used to refuel Carried UAV's - Verwendet zum Aufladen von tragbaren UAV's - Usada para reabastecer el VANT - Utilisée pour recharger l'UAV - Używana do naładowania UAV - Hordozható UAV-ok működéséhez való akkumulátor - Používané k dobíjení UAV - Usada para reabastecer o UAV - Usata per ricaricare la Batteria dell'UAV - Используется для подзарядки БПЛА - - - Recharging ... - Aufladen ... - Recargando ... - Rechargement ... - Ładowanie ... - Akku feltöltése ... - Dobíjení ... - Recarregando ... - In ricarica ... - Подзаряжаем ... - - - + + + Drone is full + Drohne ist voll + El VANT está lleno + L'UAV est chargé + Dron jest naładowany + A drón fel van töltve + Dron je nabitý + O UAV está cheio + Il drone è pieno + БПЛА заполнен + + + You need a UAV Battery + Du brauchst eine UAV-Batterie + Necesitas una batería para VANT + Pas de batterie UAV + Potrzebujesz baterii UAV + Szükséged van egy UAV akkumulátorra + Potřebuješ UAV-Baterii + Você precisa de uma bateria para UAVs + Hai bisogno di una Batteria UAV + Требуется аккумулятор БПЛА + + + Recharge + Aufladen + Recargar + Recharger + Naładuj + Feltöltés + Dobít + Recarregar + Ricarica + Подзарядить + + + UAV Battery + UAV-Batterie + Batería para VANT + Batterie UAV + Bateria UAV + UAV akkumulátor + UAV-Baterie + Bateria para UAV + Batteria para UAVs + Аккумулятор БПЛА + + + Used to refuel Carried UAV's + Verwendet zum Aufladen von tragbaren UAV's + Usada para reabastecer el VANT + Utilisée pour recharger l'UAV + Używana do naładowania UAV + Hordozható UAV-ok működéséhez való akkumulátor + Používané k dobíjení UAV + Usada para reabastecer o UAV + Usata per ricaricare la Batteria dell'UAV + Используется для подзарядки БПЛА + + + Recharging ... + Aufladen ... + Recargando ... + Rechargement ... + Ładowanie ... + Akku feltöltése ... + Dobíjení ... + Recarregando ... + In ricarica ... + Подзаряжаем ... + + + \ No newline at end of file diff --git a/addons/maptools/stringtable.xml b/addons/maptools/stringtable.xml index 5dd45789767..c5b7bba44c9 100644 --- a/addons/maptools/stringtable.xml +++ b/addons/maptools/stringtable.xml @@ -1,148 +1,149 @@  - - - Map Tools - Herramientas de mapa - Outils de navigation - Narzędzia nawigacyjne - Kartenwerkzeug - Pomůcky k Mapě - Strumenti Cartografici - Ferramentas de Mapa - Térképészeti eszközök - Инструменты карты - - - The Map Tools allow you to measure distances and angles on the map. - Las herramientas de mapa permiten medir distancias y ángulos en el mapa. - Les outils de navigation permettent de mesurer des distances et des angles sur la carte. - Narzędzia nawigacyjne pozwalają na mierzenie odległości i kątów na mapie. - Das Kartenwerkzeug erlaubt es dir, Distanzen und Winkel zu messen. - Pomůcky k mapě slouží k měření vzdáleností a úhlů na mapě. - Gli Strumenti Cartografici ti consentono di misurare distanze ed angoli sulla mappa. - As Ferramentas de Mapa permitem que você meça distâncias e ângulos no mapa. - A térképészeti eszközökkel távolságokat és szögeket tud mérni a térképen. - Картографические инструменты позволяют измерять расстояния и углы на карте. - - - Map Tools - Herramientas de mapa - Outils de navigation - Narzędzia nawigacyjne - Kartenwerkzeug - Pomůcky k Mapě - Strumenti Cartografici - Ferramentas de Mapa - Térképészeti eszközök - Инструменты карты - - - Hide Map Tool - Verstecke Kartenwerkzeug - Ocultar herr. de mapa - Ranger les outils - Nascondi Strumenti Cartografici - Ocultar Ferramenta de Mapa - Térképészeti eszközök elrejtése - Ukryj narzędzia nawigacyjne - Schovat pomůcku k mapě - Скрыть инструменты - - - Show Normal Map Tool - Zeige Kartenwerkzeug (normal) - Mostrar herr. de mapa normal - Montrer outils normaux - Visualizza Strumenti Cartografici standard - Mostrar Ferramenta de Mapa Padrão - Térképészeti eszköz megjelenítése (normál méret) - Pokaż normalne narzędzia nawigacyjne - Zobrazit normální pomůcku k mapě - Показать инструменты (средн. размер) - - - Show Small Map Tool - Zeige Kartenwerkzeug (klein) - Mostrar herr. de mapa pequeñas - Montrer petits outils - Visualizza Strumenti Cartografici piccoli - Mostrar Ferramenta de Mapa Pequena - Térképészeti eszköz megjelenítése (kicsinyített) - Pokaż pomniejszone narzędzia nawigacyjne - Zobrazit malou pomůcku k mapě - Показать инструменты (малый размер) - - - Align Map Tool to North - Kartenwerkzeug nach Norden ausrichten - Alinear herr. de mapa al norte - Aligner au nord - Allinea gli Strumenti Cartografici con il Nord - Alinhar Ferramenta de Mapa com o Norte - Térképészeti eszköz Északhoz állítása - Wyrównaj linijkę do północy - Srovnat pomůcku k mapě na sever - Выровнять инструменты на север - - - Align Map Tool to Compass - Kartenwerkzeug am Kompass ausrichten - Alinear herr. de mapa a la brújula - Aligner sur la boussole - Allinea gli Strumenti Cartografici con la bussola - Alinhar Ferramenta de Mapa com a Bússola - Térképészeti eszköz iránytűhöz állítása - Wyrównaj linijkę do kompasu - Srovnat pomůcku k mapě ke kompasu - Выровнять инструменты по компасу - - - Show GPS on Map - Zeige GPS auf der Karte - Mostrar el GPS sobre el mapa - Ranger le GPS - Visualizza il GPS sulla mappa - Mostrar GPS no Mapa - GPS megjelnítése a térképen - Pokaż GPS na mapie - Zobrazit GPS na mapě - Показать GPS на карте - - - Hide GPS on Map - Verstecke GPS auf der Karte - Ocultar el GPS del mapa - Montrer le GPS - Nascondi il GPS sulla mappa - Ocultar GPS no Mapa - GPS elrejtése térképről - Ukryj GPS na mapie - Schovat GPS na mapě - Скрыть GPS на карте - - - Copy Map - Karte kopieren - Copiar mapa - Скопировать карту - Kopiuj oznaczenia mapy - Copier la carte - Zkopírovat mapu - Copiare Carta - Térkép másolása - Copiar Mapa - - - Direction: %1° - Drehung: %1° - Direction: %1° - Směr: %1° - Kierunek: %1° - Dirección: %1° - Irány: %1 - Направление:%1 - - + + + Map Tools + Herramientas de mapa + Outils de navigation + Narzędzia nawigacyjne + Kartenwerkzeug + Pomůcky k Mapě + Strumenti Cartografici + Ferramentas de Mapa + Térképészeti eszközök + Инструменты карты + + + The Map Tools allow you to measure distances and angles on the map. + Las herramientas de mapa permiten medir distancias y ángulos en el mapa. + Les outils de navigation permettent de mesurer des distances et des angles sur la carte. + Narzędzia nawigacyjne pozwalają na mierzenie odległości i kątów na mapie. + Das Kartenwerkzeug erlaubt es dir, Distanzen und Winkel zu messen. + Pomůcky k mapě slouží k měření vzdáleností a úhlů na mapě. + Gli Strumenti Cartografici ti consentono di misurare distanze ed angoli sulla mappa. + As Ferramentas de Mapa permitem que você meça distâncias e ângulos no mapa. + A térképészeti eszközökkel távolságokat és szögeket tud mérni a térképen. + Картографические инструменты позволяют измерять расстояния и углы на карте. + + + Map Tools + Herramientas de mapa + Outils de navigation + Narzędzia nawigacyjne + Kartenwerkzeug + Pomůcky k Mapě + Strumenti Cartografici + Ferramentas de Mapa + Térképészeti eszközök + Инструменты карты + + + Hide Map Tool + Verstecke Kartenwerkzeug + Ocultar herr. de mapa + Ranger les outils + Nascondi Strumenti Cartografici + Ocultar Ferramenta de Mapa + Térképészeti eszközök elrejtése + Ukryj narzędzia nawigacyjne + Schovat pomůcku k mapě + Скрыть инструменты + + + Show Normal Map Tool + Zeige Kartenwerkzeug (normal) + Mostrar herr. de mapa normal + Montrer outils normaux + Visualizza Strumenti Cartografici standard + Mostrar Ferramenta de Mapa Padrão + Térképészeti eszköz megjelenítése (normál méret) + Pokaż normalne narzędzia nawigacyjne + Zobrazit normální pomůcku k mapě + Показать инструменты (средн. размер) + + + Show Small Map Tool + Zeige Kartenwerkzeug (klein) + Mostrar herr. de mapa pequeñas + Montrer petits outils + Visualizza Strumenti Cartografici piccoli + Mostrar Ferramenta de Mapa Pequena + Térképészeti eszköz megjelenítése (kicsinyített) + Pokaż pomniejszone narzędzia nawigacyjne + Zobrazit malou pomůcku k mapě + Показать инструменты (малый размер) + + + Align Map Tool to North + Kartenwerkzeug nach Norden ausrichten + Alinear herr. de mapa al norte + Aligner au nord + Allinea gli Strumenti Cartografici con il Nord + Alinhar Ferramenta de Mapa com o Norte + Térképészeti eszköz Északhoz állítása + Wyrównaj linijkę do północy + Srovnat pomůcku k mapě na sever + Выровнять инструменты на север + + + Align Map Tool to Compass + Kartenwerkzeug am Kompass ausrichten + Alinear herr. de mapa a la brújula + Aligner sur la boussole + Allinea gli Strumenti Cartografici con la bussola + Alinhar Ferramenta de Mapa com a Bússola + Térképészeti eszköz iránytűhöz állítása + Wyrównaj linijkę do kompasu + Srovnat pomůcku k mapě ke kompasu + Выровнять инструменты по компасу + + + Show GPS on Map + Zeige GPS auf der Karte + Mostrar el GPS sobre el mapa + Ranger le GPS + Visualizza il GPS sulla mappa + Mostrar GPS no Mapa + GPS megjelnítése a térképen + Pokaż GPS na mapie + Zobrazit GPS na mapě + Показать GPS на карте + + + Hide GPS on Map + Verstecke GPS auf der Karte + Ocultar el GPS del mapa + Montrer le GPS + Nascondi il GPS sulla mappa + Ocultar GPS no Mapa + GPS elrejtése térképről + Ukryj GPS na mapie + Schovat GPS na mapě + Скрыть GPS на карте + + + Copy Map + Karte kopieren + Copiar mapa + Скопировать карту + Kopiuj oznaczenia mapy + Copier la carte + Zkopírovat mapu + Copiare Carta + Térkép másolása + Copiar Mapa + + + Direction: %1° + Drehung: %1° + Direction: %1° + Směr: %1° + Kierunek: %1° + Dirección: %1° + Irány: %1 + Направление:%1 + Direção: %1 + + \ No newline at end of file diff --git a/addons/markers/stringtable.xml b/addons/markers/stringtable.xml index ea6d72990ad..6ef49b923a4 100644 --- a/addons/markers/stringtable.xml +++ b/addons/markers/stringtable.xml @@ -1,15 +1,16 @@  - - - Direction: %1° - Drehung: %1° - Direction: %1° - Směr: %1° - Kierunek: %1° - Dirección: %1° - Направление: %1 - - + + + Direction: %1° + Drehung: %1° + Direction: %1° + Směr: %1° + Kierunek: %1° + Dirección: %1° + Направление: %1 + Direção %1 + + \ No newline at end of file diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index ec01d3b626f..49d06048d9d 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1,904 +1,1029 @@  - - - - Inject Atropine - - - Inject Epinephrine - Epinephrine injizieren - Inyectar Epinefrina - Wtrzyknij adrenalinę - Aplikovat Adrenalin - Ввести андреналил - Adrénaline - Adrenalin - Injetar Epinefrina - Inietta Epinefrina - - - Inject Morphine - Morphin injizieren - Inyectar Morfina - Wstrzyknij morfinę - Aplikovat Morfin - Ввести морфин - Morphine - Morfium - Injetar Morfina - Inietta Morfina - - - Transfuse Blood - Bluttransfusion - Transfundir sangre - Przetocz krew - Transfúze krve - Перелить кровь - Transfusion - Infúzió - Transfundir Sangue - Effettua Trasfusione - - - Transfuse Plasma - - - Transfuse Saline - - - Apply Tourniquet - - - Bandage - Verbinden - Venda - Bandaż - Obvázat - Pansement - Benda - Kötözés - Atadura - Перевязать - - - Bandage Head - Kopf verbinden - Vendar la cabeza - Bandażuj głowę - Obvázat hlavu - Перевязать голову - Pansement Tête - Fej kötözése - Atar Cabeça - Benda la testa - - - Bandage Torso - Torso verbinden - Vendar el torso - Bandażuj tors - Obvázat hruď - Перевязать торс - Pansement Torse - Felsőtest kötözése - Atar Tronco - Benda il torso - - - Bandage Left Arm - Arm links verbinden - Vendar el brazo izquierdo - Bandażuj lewe ramię - Obvázat levou ruku - Перевязать левую руку - Pansement Bras Gauche - Bal kar kötözése - Atar Braço Esquerdo - Benda il braccio sinistro - - - Bandage Right Arm - Arm rechts verbinden - Vendar el brazo derecho - Bandażuj prawe ramię - Obvázat pravou ruku - Перевязать правую руку - Pansement Bras Droit - Jobb kar kötözése - Atar Braço Direito - Benda il braccio destro - - - Bandage Left Leg - Bein links verbinden - Vendar la pierna izquierda - Bandażuj lewą nogę - Obvázat levou nohu - Перевязать левую ногу - Pansement Jambe Gauche - Bal láb kötözése - Atar Perna Esquerda - Benda la gamba sinistra - - - Bandage Right Leg - Bein rechts verbinden - Vendar la pierna derecha - Bandażuj prawą nogę - Obvázat pravou nohu - Перевязать правую ногу - Pansement Jambe Droite - Jobb láb kötözése - Atar Perna Direita - Benda la gamba destra - - - Injecting Morphine ... - Morphin injizieren ... - Inyectando Morfina ... - Wstrzykiwanie morfiny ... - Aplikuju Morfin ... - Введение морфина... - Injection de Morphine... - Morfium beadása... - Injetando Morfina ... - Inietto la morfina ... - - - Injecting Epinephrine ... - Epinephrine injizieren ... - Inyectando Epinefrina ... - Wstrzykiwanie adrenaliny ... - Aplikuju Adrenalin ... - Введение андреналина - Injection d'Adrénaline ... - Adrenalin beadása... - Injetando Epinefrina ... - Inietto l'epinefrina ... - - - Injecting Atropine ... - - - Transfusing Blood ... - Bluttransfusion ... - Realizando transfusión ... - Przetaczanie krwi ... - Probíhá transfúze krve ... - Переливание крови... - Transfusion Sanguine ... - Infúzió... - Transfundindo Sangue ... - Effettuo la trasfusione ... - - - Transfusing Saline ... - - - Transfusing Plasma ... - - - Bandaging ... - Verbinden ... - Vendando ... - Bandażowanie ... - Obvazuji ... - Pansement ... - Sto applicando la benda ... - Bekötözés... - Atando ... - Перевязывание.... - - - Applying Tourniquet ... - - - Medical - Zdravotní - Médical - Sanitäter - Medico - Medyczne - Médico - Медик - Médico - - - Field Dressing - - - Packing Bandage - - - Elastic Bandage - - - QuikClot - - - Check Pulse - - - Check Blood Pressure - - - Triage Card - - - Tourniquet - - - Remove Tourniquet - - - Give Blood IV (1000ml) - - - Give Blood IV (500ml) - - - Give Blood IV (250ml) - - - Give Plasma IV (1000ml) - - - Give Plasma IV (500ml) - - - Give Plasma IV (250ml) - - - Give Saline IV (1000ml) - - - Give Saline IV (500ml) - - - Give Saline IV (250ml) - - - - - Minor - - - Delayed - - - Immediate - - - Deceased - - - None - - - Normal breathing - Дыхание в норме - Respiración normal - Respiration Normale - Normalny oddech - - - No breathing - Дыхания нет - No respira - Apnée - Brak oddechu - - - Difficult breathing - Дыхание затруднено - Dificultad para respirar - Difficultée Respiratoire - Trudności z oddychaniem - - - Almost no breathing - Дыхания почти нет - Casi sin respirar - Respiration Faible - Prawie brak oddechu - - - Bleeding - Кровотечение - Sangrando - Seignement - Krwawienie zewnętrzne - - - In Pain - Испытывает боль - Con Dolor - A De La Douleur - W bólu - - - Lost a lot of Blood - Большая кровопотеря - Mucha Sangre perdida - A Perdu Bcp de Sang - Stracił dużo krwi - - - Tourniquet [CAT] - Жгут - Torniquete [CAT] - Garot [CAT] - Opaska uciskowa [CAT] - - - Receiving IV [%1ml] - - - - - Bandage (Basic) - Повязка (обычная) - Vendaje (Básico) - Bandage (Standard) - Bandaż (jałowy) - - - Used to cover a wound - Для перевязки ран - Utilizado para cubrir una herida - Utilisé Pour Couvrir Une Blessure - Używany w celu przykrycia i ochrony miejsca zranienia - - - A dressing, that is a particular material used to cover a wound, which is applied over the wound once bleeding has been stemmed. - Повязка, накладываемая поверх раны после остановки кровотечения. - Un apósito, material específico utilizado para cubrir una herida, se aplica sobre la herida una vez ha dejado de sangrar. - C'est un bandage, qui est fait d'un matériel spécial utiliser pour couvrir une blessure, qui peut etre appliquer des que le seignement as ete stopper. - Opatrunek materiałowy, używany do przykrywania ran, zakładany na ranę po zatamowaniu krwawienia. - - - Packing Bandage - Тампонирующая повязка - Vendaje Compresivo - Bandage Mèche - Bandaż (uciskowy) - - - Used to pack medium to large wounds and stem the bleeding - Для тампонирования ран среднего и большого размера и остановки кровотечения. - Se utiliza para vendar heridas medianas y grandes y detener el sangrado - Utiliser pour remplire la cavité créé dans une blessure moyenne et grande. - Używany w celu opatrywania średnich i dużych ran oraz tamowania krwawienia. - - - A bandage used to pack the wound to stem bleeding and facilitate wound healing. Packing a wound is an option in large polytrauma injuries. - Повязка для тампонирования раны, остановки кровотечения и лучшего заживления. При тяжелых сочетанных ранениях возможно тампонирование раны. - Se utiliza para detener la hemorragia de una herida y favorecer su cicatrización. Se usa en grandes lesiones o politraumatismos. - Un bandage servent a etre inseré dans les blessure pour éponger le seignement et faciliter la guerrison. Ce bandage est une option pour soigner les lession de politrauma. - Opatrunek stosowany w celu zatrzymania krwawienia i osłony większych ran. - - - Bandage (Elastic) - Повязка (давящая) - Vendaje (Elástico) - Bandage (Élastique) - Bandaż (elastyczny) - - - Bandage kit, Elastic - Давящая повязка - Vendaje (Elástico) - Bandage Compressif Élastique - Zestaw bandaży elastycznych. - - - - - Ce bandage peut etre utiliser pour compresser la plaie afin de ralentire le seignement et assurer la tenue du bandage lors de mouvment. - Elastyczna opaska podtrzymująca opatrunek oraz usztywniająca okolice stawów. - Brinda una compresión uniforme y ofrece soporte extra a una zona lesionada - - - Tourniquet (CAT) - Жгут - Torniquete (CAT) - Garot (CAT) - Staza (typ. CAT) - - - Slows down blood loss when bleeding - Уменьшает кровопотерю при кровотечении. - Reduce la velocidad de pérdida de sangre - Ralentit le seignement - Zmniejsza ubytek krwi z kończyn w przypadku krwawienia. - - - A constricting device used to compress venous and arterial circulation in effect inhibiting or slowing blood flow and therefore decreasing loss of blood. - Жгут используется для прижатия сосудов, приводящего к остановке или значительному уменьшению кровотечения и сокращению кровопотери. - Dispositivo utilizado para eliminar el pulso distal y de ese modo controlar la pérdida de sangre - Un appareil servent a compresser les artères et veines afin de reduire la perte de sang. - Opaska zaciskowa CAT służy do tamowanie krwotoków w sytuacji zranienia kończyn z masywnym krwawieniem tętniczym lub żylnym. - - - Morphine autoinjector - Морфин в автоматическом шприце - Morfina auto-inyectable - Auto-injecteur de Morphine - Autostrzykawka z morfiną - - - Used to combat moderate to severe pain experiences - Для снятия средних и сильных болевых ощущений. - Usado para combatir los estados dolorosos moderados a severos - Utiliser pour contrer les douleurs modéré à severes. - Morfina. Ma silne działanie przeciwbólowe. - - - An analgesic used to combat moderate to severe pain experiences. - Анальгетик для снятия средних и сильных болевых ощущений. - Analgésico usado para combatir los estados dolorosos de moderado a severo. - Un Analgésique puissant servant a contrer les douleur modéré a severe. - Organiczny związek chemiczny z grupy alkaloidów. Ma silne działanie przeciwbólowe. - - - Atropin autoinjector - Атропин в автоматическом шприце - Atropina auto-inyectable - Auto-injecteur d'Atropine - Autostrzykawka AtroPen - - - Used in NBC scenarios - Применяется для защиты от ОМП - Usado en escenarios NBQ - Utiliser en cas d'attaque CBRN - Atropina. Stosowana jako lek rozkurczowy i środek rozszerzający źrenice. - - - A drug used by the Military in NBC scenarios. - Препарат, используемый в войсках для защиты от оружия массового поражения. - Medicamento usado por Militares en escenarios NBQ - Médicament utilisé par l'armée en cas d'attaque CBRN - Atropina. Stosowana jako lek rozkurczowy i środek rozszerzający źrenice. Środek stosowany w przypadku zagrożeń NBC. - - - Epinephrine autoinjector - Адреналин в автоматическом шприце - Epinefrina auto-inyectable - Auto-injecteur d'épinéphrine - Autostrzykawka EpiPen - - - Increase heart rate and counter effects given by allergic reactions - Стимулирует работу сердца и купирует аллергические реакции. - Aumenta la frecuencia cardiaca y contraresta los efectos de las reacciones alérgicas - Augmente la Fréquance cadiaque et contré les effet d'une reaction Anaphylactique - Adrenalina. Zwiększa puls i przeciwdziała efektom wywołanym przez reakcje alergiczne - - - A drug that works on a sympathetic response to dilate the bronchi, increase heart rate and counter such effects given by allergic reactions (anaphylaxis). Used in sudden cardiac arrest scenarios with decreasing positive outcomes. - Препарат, вызывающий симпатическую реакцию, приводящую к расширению бронхов, увеличению частоты сердечных сокращений и купированию аллергических реакций (анафилактического шока). Применяется при остановке сердца с уменьшением вероятности благоприятного исхода. - Medicamento que dilata los bronquios, aumenta la frecuencia cardiaca y contrarresta los efectos de las reacciones alérgicas (anafilaxis). Se utiliza en caso de paros cardiacos repentinos. - Un medicament qui fonctione sur le systeme sympatique créan une dilatation des bronches, augmente la fréquance cardiaque et contre les effet d'une reaction alergique (anaphylaxie). Utiliser lors d'arret cardio-respiratoire pour augmenté les chances retrouver un ryhtme. - EpiPen z adrenaliną ma działanie sympatykomimetyczne, tj. pobudza receptory alfa- i beta-adrenergiczne. Pobudzenie układu współczulnego prowadzi do zwiększenia częstotliwości pracy serca, zwiększenia pojemności wyrzutowej serca i przyśpieszenia krążenia wieńcowego. Pobudzenie oskrzelowych receptorów beta-adrenergicznych wywołuje rozkurcz mięśni gładkich oskrzeli, co w efekcie zmniejsza towarzyszące oddychaniu świsty i duszności. - - - Plasma IV (1000ml) - Плазма для в/в вливания (1000 мл) - Plasma Intravenoso (1000ml) - Plasma Sanguin IV (1000ml) - Osocze IV (1000ml) - - - A volume-expanding blood supplement. - Дополнительный препарат, применяемый при возмещении объема крови. - Suplemento para expandir el volumen sanguíneo. - Supplement visant a remplacer les volume sanguin - Składnik krwi, używany do zwiększenia jej objętości. - - - A volume-expanding blood supplement. - Дополнительный препарат, применяемый при возмещении объема крови. - Suplemento para expandir el volumen sanguíneo. - Supplement visant a remplacer le volume sanguin et remplace les plaquettes. - Składnik krwi, używany do zwiększenia jej objętości. - - - Plasma IV (500ml) - Плазма для в/в вливания (500 мл) - Plasma Intravenoso (500ml) - Plasma Sanguin IV (500ml) - Osocze IV (500ml) - - - Plasma IV (250ml) - Плазма для в/в вливания (250 мл) - Plasma Intravenoso (250ml) - Plasma Sanguin (250ml) - Osocze IV (250ml) - - - Blood IV (1000ml) - Кровь для переливания (1000 мл) - Sangre Intravenosa (1000ml) - Cullot Sanguin IV (1000ml) - Krew IV (1000ml) - - - Blood IV, for restoring a patients blood (keep cold) - Пакет крови для возмещения объема потерянной крови (хранить в холодильнике) - Sangre Intravenosa, para restarurar el volumen sanguíneo (mantener frío) - Cullot Sanguin IV, pour remplacer le volume sanguin (garder Réfrigeré) - Krew IV, używana do uzupełnienia krwi u pacjenta, trzymać w warunkach chłodniczych - - - O Negative infusion blood used in strict and rare events to replenish blood supply usually conducted in the transport phase of medical care. - Кровь I группы, резус-отрицательная, применяется по жизненным показаниям для возмещения объема потерянной крови на догоспитальном этапе оказания медицинской помощи. - Cullot Sanguin O- ,utiliser seulement lors de perte sanguine majeur afin de remplacer le volume sanguin perdu. Habituelment utiliser lors du transport ou dans un etablisement de soin. - Krew 0 Rh-, używana w rzadkich i szczególnych przypadkach do uzupełnienia krwi u pacjenta, zazwyczaj w trakcie fazie transportu rannej osoby do szpitala. - Utilice sólo durante gran pérdida de sangre para reemplazar el volumen de sangre perdido. Uso habitual durante el transporte de heridos. - - - Blood IV (500ml) - Кровь для переливания (500 мл) - Sangre Intravenosa (500ml) - Cullot Sanguin IV (500ml) - Krew IV (500ml) - - - Blood IV (250ml) - Кровь для переливания (250 мл) - Sangre Intravenosa (250ml) - Cullot Sanguin IV (250ml) - Krew IV (250ml) - - - Saline IV (1000ml) - Физраствор для в/в вливания (1000 мл) - Solución Salina Intravenosa (1000ml) - solution Saline 0.9% IV (1000ml) - Solanka 0,9% IV (1000ml) - - - Saline IV, for restoring a patients blood - Пакет физраствора для возмещения объема потерянной крови - Solución Salina Intravenosa, para restaurar el volumen sanguíneo - Solution Saline 0.9% IV, pour retablir temporairement la tention arteriel - Solanka 0,9%, podawana dożylnie (IV), używana w celu uzupełnienia krwi u pacjenta - - - A medical volume-replenishing agent introduced into the blood system through an IV infusion. - Пакет физиологического раствора для возмещения объема потерянной крови путем внутривенного вливания. - Suero fisiológico inoculado al torrente sanguíneo de forma intravenosa. - Un remplacment temporaire pour rétablir la tention artériel lors de perte sanguine, étant ajouter par intraveineuse - Używany w medycynie w formie płynu infuzyjnego jako środek nawadniający i uzupełniający niedobór elektrolitów, podawany dożylnie (IV). - - - Saline IV (500ml) - Физраствор для в/в вливания (500 мл) - Solución Salina Intravenosa (500ml) - Solution Saline 0.9% IV (500ml) - Solanka 0,9% IV (500ml) - - - Saline IV (250ml) - Физраствор для в/в вливания (250 мл) - Solución Salina Intravenosa (250ml) - Solution Saline 0.9% IV (250ml) - Solanka 0,9% IV (250ml) - - - Basic Field Dressing (QuikClot) - Первичный перевязочный пакет (QuikClot) - Vendaje Básico (Coagulante) - Bandage Regulier (Coagulant) - Opatrunek QuikClot - - - QuikClot bandage - Гемостатический пакет QuikClot - Venda Coagulante - Bandage coagulant - Podstawowy opatrunek stosowany na rany - - - - - Un bandage servant a coaguler les seignements mineur à moyen. - Proszkowy opatrunek adsorbcyjny przeznaczony do tamowania zagrażających życiu krwawień średniej i dużej intensywności. - Vendaje Hemostático con coagulante que detiene el sangrado. - - - Personal Aid Kit - Аптечка - Kit de Soporte Vital Avanzado - Équipement de support Vitale - Apteczka osobista - - - Includes various treatment kit needed for stitching or advanced treatment - Содержит различные материалы и инструменты для зашивания ран и оказания специальной медпомощи. - Incluye material médico para tratamientos avanzados - Inclue du matériel medical pour les traitement avancé, tel les point de suture. - Zestaw środków medycznych do opatrywania ran i dodatkowego leczenia po-urazowego - - - - - - - - - Surgical Kit - Хирургический набор - Kit Quirúrgico - - - Surgical Kit for in field advanced medical treatment - Набор для хирургической помощи в полевых условиях - Kit Quirúrgico para el tratamiento avanzado en el campo de batalla - - - Surgical Kit for in field advanced medical treatment - Набор для хирургической помощи в полевых условиях - Kit Quirúrgico para el tratamiento avanzado en el campo de batalla - - - Bodybag - Мешок для трупов - Bolsa para cadáveres - - - A bodybag for dead bodies - Мешок для упаковки трупов - Bolsa para cadáveres - - - A bodybag for dead bodies - Мешок для упаковки трупов - Bolsa para cadáveres - - - - - Blood Pressure - Артериальное давление - Presión Arterial - - - Checking Blood Pressure.. - Проверка артериального давления... - Comprobando Presión Arterial... - - - You checked %1 - Вы осмотрели раненого %1 - Examinando a %1 - - - You find a blood pressure of %2/%3 - Артериальное давление %2/%3 - La Presión Arterial es %2/%3 - - - You find a low blood pressure - Давление низкое - La Presión Arterial es baja - - - You find a normal blood pressure - Давление нормальное - La Presión Arterial es normal - - - You find a high blood pressure - Давление высокое - La Presión Arterial es alta - - - You find no blood pressure - Давления нет - No hay Presión Arterial - - - You fail to find a blood pressure - Артериальное давление не определяется - No puedes encontrar Presión Arterial - - - Pulse - Пульс - Pulso - - - Checking Heart Rate.. - Проверка пульса... - Comprobando Pulso... - - - You checked %1 - Вы осмотрели раненого %1 - Examinando a %1 - - - You find a Heart Rate of %2 - Пульс %2 уд./мин. - El Pulso es %2 - - - You find a weak Heart Rate - Пульс слабый - El Pulso es débil - - - You find a strong Heart Rate - Пульс учащенный - El Pulso está acelerado - - - You find a normal Heart Rate - Пульс в норме - El Pulso es bueno - - - You find no Heart Rate - Пульс не прощупывается - No tiene Pulso - - - Response - Реакция - Reacciona - - - You check response of patient - Вы проверяете реакцию раненого - Compruebas si el paciente reacciona - - - %1 is responsive - %1 реагирует на раздражители - %1 ha reaccionado - - - %1 is not responsive - %1 не реагирует - %1 no reacciona - - - You checked %1 - Вы осмотрели раненого %1 - Examinas a %1 - - - Bandaged - Повязка наложена - Vendado - - - You bandage %1 (%2) - Вы перевязали раненого %1 (%2) - Aplicas vendaje a %1 en %2 - - - %1 is bandaging you - %1 перевязывает вас - %1 te está vendando - - - You start stitching injures from %1 (%2) - Вы зашиваете ранения от %1 (%2) - Estás suturando heridas de %1 en %2 - - - Stitching - Наложение швов - Suturando - - - You treat the airway of %1 - Вы интубируете раненого %1 - Estás intubando a %1 - - - Airway - Дыхательные пути - Vías Aéreas - - - %1 is treating your airway - %1 проводит вам интубацию - %1 te está intubando - - - Drag - Ziehen - Arrastrar - Ciągnij - Táhnout - Тащить - Tracter - Húzás - Arrastar - Trascina - - - Carry - Tragen - Cargar - Nieś - Nést - Нести - Porter - Cipelés - Carregar - Trasporta - - - Release - Loslassen - Soltar - Połóż - Položit - Отпустить - Déposer - Elenged - Largar - Lascia - - - Load Patient Into - Patient Einladen - Cargar el paciente en - Załaduj pacjenta - Naložit pacianta do - Погрузить пациента в - Embarquer le Patient - Sebesült berakása - Carregar Paciente Em - Carica paziente nel - - - Unload Patient - Patient Ausladen - Descargar el paciente - Wyładuj pacjenta - Vyložit pacienta - Выгрузить пациента - Débarquer le Patient - Sebesült kihúzása - Descarregar Paciente - Scarica il paziente - - - Unload patient - - - Load patient - - - Place body in bodybag - - - Placing body in bodybag - - - - - %1 has bandaged patient - - - %1 used %2 - - - %1 has given an IV - - - %1 applied a tourniquet - - - + + + + Inject Atropine + Injetar Atropina + + + Inject Epinephrine + Epinephrine injizieren + Inyectar Epinefrina + Wtrzyknij adrenalinę + Aplikovat Adrenalin + Ввести андреналил + Adrénaline + Adrenalin + Injetar Epinefrina + Inietta Epinefrina + + + Inject Morphine + Morphin injizieren + Inyectar Morfina + Wstrzyknij morfinę + Aplikovat Morfin + Ввести морфин + Morphine + Morfium + Injetar Morfina + Inietta Morfina + + + Transfuse Blood + Bluttransfusion + Transfundir sangre + Przetocz krew + Transfúze krve + Перелить кровь + Transfusion + Infúzió + Transfundir Sangue + Effettua Trasfusione + + + Transfuse Plasma + Transfundir Plasma + + + Transfuse Saline + Transfundir Soro + + + Apply Tourniquet + Aplicar Torniquete + + + Bandage + Verbinden + Venda + Bandaż + Obvázat + Pansement + Benda + Kötözés + Atadura + Перевязать + + + Bandage Head + Kopf verbinden + Vendar la cabeza + Bandażuj głowę + Obvázat hlavu + Перевязать голову + Pansement Tête + Fej kötözése + Atar Cabeça + Benda la testa + + + Bandage Torso + Torso verbinden + Vendar el torso + Bandażuj tors + Obvázat hruď + Перевязать торс + Pansement Torse + Felsőtest kötözése + Atar Tronco + Benda il torso + + + Bandage Left Arm + Arm links verbinden + Vendar el brazo izquierdo + Bandażuj lewe ramię + Obvázat levou ruku + Перевязать левую руку + Pansement Bras Gauche + Bal kar kötözése + Atar Braço Esquerdo + Benda il braccio sinistro + + + Bandage Right Arm + Arm rechts verbinden + Vendar el brazo derecho + Bandażuj prawe ramię + Obvázat pravou ruku + Перевязать правую руку + Pansement Bras Droit + Jobb kar kötözése + Atar Braço Direito + Benda il braccio destro + + + Bandage Left Leg + Bein links verbinden + Vendar la pierna izquierda + Bandażuj lewą nogę + Obvázat levou nohu + Перевязать левую ногу + Pansement Jambe Gauche + Bal láb kötözése + Atar Perna Esquerda + Benda la gamba sinistra + + + Bandage Right Leg + Bein rechts verbinden + Vendar la pierna derecha + Bandażuj prawą nogę + Obvázat pravou nohu + Перевязать правую ногу + Pansement Jambe Droite + Jobb láb kötözése + Atar Perna Direita + Benda la gamba destra + + + Injecting Morphine ... + Morphin injizieren ... + Inyectando Morfina ... + Wstrzykiwanie morfiny ... + Aplikuju Morfin ... + Введение морфина... + Injection de Morphine... + Morfium beadása... + Injetando Morfina ... + Inietto la morfina ... + + + Injecting Epinephrine ... + Epinephrine injizieren ... + Inyectando Epinefrina ... + Wstrzykiwanie adrenaliny ... + Aplikuju Adrenalin ... + Введение андреналина + Injection d'Adrénaline ... + Adrenalin beadása... + Injetando Epinefrina ... + Inietto l'epinefrina ... + + + Injecting Atropine ... + Injetando Atropina + + + Transfusing Blood ... + Bluttransfusion ... + Realizando transfusión ... + Przetaczanie krwi ... + Probíhá transfúze krve ... + Переливание крови... + Transfusion Sanguine ... + Infúzió... + Transfundindo Sangue ... + Effettuo la trasfusione ... + + + Transfusing Saline ... + Transfundindo Soro... + + + Transfusing Plasma ... + Transfundindo Plasma... + + + Bandaging ... + Verbinden ... + Vendando ... + Bandażowanie ... + Obvazuji ... + Pansement ... + Sto applicando la benda ... + Bekötözés... + Atando ... + Перевязывание.... + + + Applying Tourniquet ... + Applicando Torniquete + + + Medical + Zdravotní + Médical + Sanitäter + Medico + Medyczne + Médico + Медик + Médico + + + Field Dressing + Curativo de Campo + + + Packing Bandage + Bandagem de Compressão + + + Elastic Bandage + Bandagem Elástica + + + QuikClot + QuikClot + + + Check Pulse + Checar Pulso + + + Check Blood Pressure + Chegar Pressão Sanguínea + + + Triage Card + Cartão de Triagem + + + Tourniquet + Torniquete + + + Remove Tourniquet + Remover Torniquete + + + Give Blood IV (1000ml) + Administrar Sangue IV (1000ml) + + + Give Blood IV (500ml) + Administrar Sangue IV (500ml) + + + Give Blood IV (250ml) + Administrar Sangue IV (250ml) + + + Give Plasma IV (1000ml) + Administrar Plasma IV (1000ml) + + + Give Plasma IV (500ml) + Administrar Plasma IV (500ml) + + + Give Plasma IV (250ml) + Administrar Plasma IV (250ml) + + + Give Saline IV (1000ml) + Administrar Soro IV (1000ml) + + + Give Saline IV (500ml) + Administrar Soro IV (500ml) + + + Give Saline IV (250ml) + Administrar Soro IV (250ml) + + + + + Minor + Leve + + + Delayed + Atrasado + + + Immediate + Imediato + + + Deceased + Falecido + + + None + Nenhum + + + Normal breathing + Дыхание в норме + Respiración normal + Respiration Normale + Normalny oddech + Respiração normal + + + No breathing + Дыхания нет + No respira + Apnée + Brak oddechu + Não respira + + + Difficult breathing + Дыхание затруднено + Dificultad para respirar + Difficultée Respiratoire + Trudności z oddychaniem + Dificuldade para respirar + + + Almost no breathing + Дыхания почти нет + Casi sin respirar + Respiration Faible + Prawie brak oddechu + Quase não respira + + + Bleeding + Кровотечение + Sangrando + Seignement + Krwawienie zewnętrzne + Sangrando + + + In Pain + Испытывает боль + Con Dolor + A De La Douleur + W bólu + Com dor + + + Lost a lot of Blood + Большая кровопотеря + Mucha Sangre perdida + A Perdu Bcp de Sang + Stracił dużo krwi + Perdeu muito sangue + + + Tourniquet [CAT] + Жгут + Torniquete [CAT] + Garot [CAT] + Opaska uciskowa [CAT] + Torniquete [CAT] + + + Receiving IV [%1ml] + Recebendo IV [%1ml] + + + + + Bandage (Basic) + Повязка (обычная) + Vendaje (Básico) + Bandage (Standard) + Bandaż (jałowy) + Bandagem(Básico) + + + Used to cover a wound + Для перевязки ран + Utilizado para cubrir una herida + Utilisé Pour Couvrir Une Blessure + Używany w celu przykrycia i ochrony miejsca zranienia + Usado para cobrir um ferimento + + + A dressing, that is a particular material used to cover a wound, which is applied over the wound once bleeding has been stemmed. + Повязка, накладываемая поверх раны после остановки кровотечения. + Un apósito, material específico utilizado para cubrir una herida, se aplica sobre la herida una vez ha dejado de sangrar. + C'est un bandage, qui est fait d'un matériel spécial utiliser pour couvrir une blessure, qui peut etre appliquer des que le seignement as ete stopper. + Opatrunek materiałowy, używany do przykrywania ran, zakładany na ranę po zatamowaniu krwawienia. + Uma curativo, material específico para cobrir um ferimento que é aplicado assim que o sangramento é estancando. + + + Packing Bandage + Тампонирующая повязка + Vendaje Compresivo + Bandage Mèche + Bandaż (uciskowy) + Bandagem de Compressão + + + Used to pack medium to large wounds and stem the bleeding + Для тампонирования ран среднего и большого размера и остановки кровотечения. + Se utiliza para vendar heridas medianas y grandes y detener el sangrado + Utiliser pour remplire la cavité créé dans une blessure moyenne et grande. + Używany w celu opatrywania średnich i dużych ran oraz tamowania krwawienia. + Usado para o preenchimento de cavidades geradas por ferimentos médios e grandes e estancar o sangramento. + + + A bandage used to pack the wound to stem bleeding and facilitate wound healing. Packing a wound is an option in large polytrauma injuries. + Повязка для тампонирования раны, остановки кровотечения и лучшего заживления. При тяжелых сочетанных ранениях возможно тампонирование раны. + Se utiliza para detener la hemorragia de una herida y favorecer su cicatrización. Se usa en grandes lesiones o politraumatismos. + Un bandage servent a etre inseré dans les blessure pour éponger le seignement et faciliter la guerrison. Ce bandage est une option pour soigner les lession de politrauma. + Opatrunek stosowany w celu zatrzymania krwawienia i osłony większych ran. + Uma bandagem usada para preencher o ferimento para estancar o sangramento e facilitar a cicatrização. Preenchimento de feridas é uma opção em ferimentos de politrauma grandes. + + + Bandage (Elastic) + Повязка (давящая) + Vendaje (Elástico) + Bandage (Élastique) + Bandaż (elastyczny) + Bandagem (Elástica) + + + Bandage kit, Elastic + Давящая повязка + Vendaje (Elástico) + Bandage Compressif Élastique + Zestaw bandaży elastycznych. + Kit de Bandagem, Elástica + + + + + Ce bandage peut etre utiliser pour compresser la plaie afin de ralentire le seignement et assurer la tenue du bandage lors de mouvment. + Elastyczna opaska podtrzymująca opatrunek oraz usztywniająca okolice stawów. + Brinda una compresión uniforme y ofrece soporte extra a una zona lesionada + Esta bandagem pode ser utilizada para comprimir o ferimento e diminuir o sangramento e garantir que o ferimento não abra em movimento. + + + Tourniquet (CAT) + Жгут + Torniquete (CAT) + Garot (CAT) + Staza (typ. CAT) + Torniquete (CAT) + + + Slows down blood loss when bleeding + Уменьшает кровопотерю при кровотечении. + Reduce la velocidad de pérdida de sangre + Ralentit le seignement + Zmniejsza ubytek krwi z kończyn w przypadku krwawienia. + Reduz a velocidade da perda de sangue + + + A constricting device used to compress venous and arterial circulation in effect inhibiting or slowing blood flow and therefore decreasing loss of blood. + Жгут используется для прижатия сосудов, приводящего к остановке или значительному уменьшению кровотечения и сокращению кровопотери. + Dispositivo utilizado para eliminar el pulso distal y de ese modo controlar la pérdida de sangre + Un appareil servent a compresser les artères et veines afin de reduire la perte de sang. + Opaska zaciskowa CAT służy do tamowanie krwotoków w sytuacji zranienia kończyn z masywnym krwawieniem tętniczym lub żylnym. + A aparelho que comprime as artérias e veias para diminuir a perda de sangue. + + + Morphine autoinjector + Морфин в автоматическом шприце + Morfina auto-inyectable + Auto-injecteur de Morphine + Autostrzykawka z morfiną + Auto-injetor de morfina + + + Used to combat moderate to severe pain experiences + Для снятия средних и сильных болевых ощущений. + Usado para combatir los estados dolorosos moderados a severos + Utiliser pour contrer les douleurs modéré à severes. + Morfina. Ma silne działanie przeciwbólowe. + Usado para combater dores moderadas e severas + + + An analgesic used to combat moderate to severe pain experiences. + Анальгетик для снятия средних и сильных болевых ощущений. + Analgésico usado para combatir los estados dolorosos de moderado a severo. + Un Analgésique puissant servant a contrer les douleur modéré a severe. + Organiczny związek chemiczny z grupy alkaloidów. Ma silne działanie przeciwbólowe. + Um analgésico usado para combater dores moderadas e fortes. + + + Atropin autoinjector + Атропин в автоматическом шприце + Atropina auto-inyectable + Auto-injecteur d'Atropine + Autostrzykawka AtroPen + Auto-injetor de Atropina + + + Used in NBC scenarios + Применяется для защиты от ОМП + Usado en escenarios NBQ + Utiliser en cas d'attaque CBRN + Atropina. Stosowana jako lek rozkurczowy i środek rozszerzający źrenice. + Usado em casos de ataque QBRN + + + A drug used by the Military in NBC scenarios. + Препарат, используемый в войсках для защиты от оружия массового поражения. + Medicamento usado por Militares en escenarios NBQ + Médicament utilisé par l'armée en cas d'attaque CBRN + Atropina. Stosowana jako lek rozkurczowy i środek rozszerzający źrenice. Środek stosowany w przypadku zagrożeń NBC. + Uma droga usada por militares em casos de ataque QBRN. + + + Epinephrine autoinjector + Адреналин в автоматическом шприце + Epinefrina auto-inyectable + Auto-injecteur d'épinéphrine + Autostrzykawka EpiPen + Auto-injetor de epinefrina + + + Increase heart rate and counter effects given by allergic reactions + Стимулирует работу сердца и купирует аллергические реакции. + Aumenta la frecuencia cardiaca y contraresta los efectos de las reacciones alérgicas + Augmente la Fréquance cadiaque et contré les effet d'une reaction Anaphylactique + Adrenalina. Zwiększa puls i przeciwdziała efektom wywołanym przez reakcje alergiczne + Aumenta a frequência cardíaca e combate efeitos causados por reações alérgicas + + + A drug that works on a sympathetic response to dilate the bronchi, increase heart rate and counter such effects given by allergic reactions (anaphylaxis). Used in sudden cardiac arrest scenarios with decreasing positive outcomes. + Препарат, вызывающий симпатическую реакцию, приводящую к расширению бронхов, увеличению частоты сердечных сокращений и купированию аллергических реакций (анафилактического шока). Применяется при остановке сердца с уменьшением вероятности благоприятного исхода. + Medicamento que dilata los bronquios, aumenta la frecuencia cardiaca y contrarresta los efectos de las reacciones alérgicas (anafilaxis). Se utiliza en caso de paros cardiacos repentinos. + Un medicament qui fonctione sur le systeme sympatique créan une dilatation des bronches, augmente la fréquance cardiaque et contre les effet d'une reaction alergique (anaphylaxie). Utiliser lors d'arret cardio-respiratoire pour augmenté les chances retrouver un ryhtme. + EpiPen z adrenaliną ma działanie sympatykomimetyczne, tj. pobudza receptory alfa- i beta-adrenergiczne. Pobudzenie układu współczulnego prowadzi do zwiększenia częstotliwości pracy serca, zwiększenia pojemności wyrzutowej serca i przyśpieszenia krążenia wieńcowego. Pobudzenie oskrzelowych receptorów beta-adrenergicznych wywołuje rozkurcz mięśni gładkich oskrzeli, co w efekcie zmniejsza towarzyszące oddychaniu świsty i duszności. + Uma droga trabalha dilatando os bronquios, aumentando a frequência cardíaca e combate efeitos de reações alérgicas(anáfilaticas). Usado em casos de parada cardiaca com poucas changes de recuperação. + + + Plasma IV (1000ml) + Плазма для в/в вливания (1000 мл) + Plasma Intravenoso (1000ml) + Plasma Sanguin IV (1000ml) + Osocze IV (1000ml) + Plasma IV (1000ml) + + + A volume-expanding blood supplement. + Дополнительный препарат, применяемый при возмещении объема крови. + Suplemento para expandir el volumen sanguíneo. + Supplement visant a remplacer les volume sanguin + Składnik krwi, używany do zwiększenia jej objętości. + Suplemento para expandir o volume sanguíneo. + + + A volume-expanding blood supplement. + Дополнительный препарат, применяемый при возмещении объема крови. + Suplemento para expandir el volumen sanguíneo. + Supplement visant a remplacer le volume sanguin et remplace les plaquettes. + Składnik krwi, używany do zwiększenia jej objętości. + Suplemento para expandir o volume sanguíneo. + + + Plasma IV (500ml) + Плазма для в/в вливания (500 мл) + Plasma Intravenoso (500ml) + Plasma Sanguin IV (500ml) + Osocze IV (500ml) + Plasma IV (500ml) + + + Plasma IV (250ml) + Плазма для в/в вливания (250 мл) + Plasma Intravenoso (250ml) + Plasma Sanguin (250ml) + Osocze IV (250ml) + Plasma IV (250ml) + + + Blood IV (1000ml) + Кровь для переливания (1000 мл) + Sangre Intravenosa (1000ml) + Cullot Sanguin IV (1000ml) + Krew IV (1000ml) + Sangue IV (1000ml) + + + Blood IV, for restoring a patients blood (keep cold) + Пакет крови для возмещения объема потерянной крови (хранить в холодильнике) + Sangre Intravenosa, para restarurar el volumen sanguíneo (mantener frío) + Cullot Sanguin IV, pour remplacer le volume sanguin (garder Réfrigeré) + Krew IV, używana do uzupełnienia krwi u pacjenta, trzymać w warunkach chłodniczych + Sangue intravenoso, para restaurar o volume sanguinio do paciente.(Manter frio) + + + O Negative infusion blood used in strict and rare events to replenish blood supply usually conducted in the transport phase of medical care. + Кровь I группы, резус-отрицательная, применяется по жизненным показаниям для возмещения объема потерянной крови на догоспитальном этапе оказания медицинской помощи. + Cullot Sanguin O- ,utiliser seulement lors de perte sanguine majeur afin de remplacer le volume sanguin perdu. Habituelment utiliser lors du transport ou dans un etablisement de soin. + Krew 0 Rh-, używana w rzadkich i szczególnych przypadkach do uzupełnienia krwi u pacjenta, zazwyczaj w trakcie fazie transportu rannej osoby do szpitala. + Utilice sólo durante gran pérdida de sangre para reemplazar el volumen de sangre perdido. Uso habitual durante el transporte de heridos. + Sangue O- , utilizado em casos raros para rapidamente repor o sangue. Uso habitual ocorre durante o transporte ou em estações de tratamento. + + + Blood IV (500ml) + Кровь для переливания (500 мл) + Sangre Intravenosa (500ml) + Cullot Sanguin IV (500ml) + Krew IV (500ml) + Sangue IV (500ml) + + + Blood IV (250ml) + Кровь для переливания (250 мл) + Sangre Intravenosa (250ml) + Cullot Sanguin IV (250ml) + Krew IV (250ml) + Sangue IV (250ml) + + + Saline IV (1000ml) + Физраствор для в/в вливания (1000 мл) + Solución Salina Intravenosa (1000ml) + solution Saline 0.9% IV (1000ml) + Solanka 0,9% IV (1000ml) + Soro IV (1000ml) + + + Saline IV, for restoring a patients blood + Пакет физраствора для возмещения объема потерянной крови + Solución Salina Intravenosa, para restaurar el volumen sanguíneo + Solution Saline 0.9% IV, pour retablir temporairement la tention arteriel + Solanka 0,9%, podawana dożylnie (IV), używana w celu uzupełnienia krwi u pacjenta + Solução Salina Intravenosa 0.9%, para restaurar o volume de sangue temporariamente. + + + A medical volume-replenishing agent introduced into the blood system through an IV infusion. + Пакет физиологического раствора для возмещения объема потерянной крови путем внутривенного вливания. + Suero fisiológico inoculado al torrente sanguíneo de forma intravenosa. + Un remplacment temporaire pour rétablir la tention artériel lors de perte sanguine, étant ajouter par intraveineuse + Używany w medycynie w formie płynu infuzyjnego jako środek nawadniający i uzupełniający niedobór elektrolitów, podawany dożylnie (IV). + Uma reposição temporaria para restaurar a pressão arterial perdida por perda de sangue. + + + Saline IV (500ml) + Физраствор для в/в вливания (500 мл) + Solución Salina Intravenosa (500ml) + Solution Saline 0.9% IV (500ml) + Solanka 0,9% IV (500ml) + Soro IV (1000ml) + + + Saline IV (250ml) + Физраствор для в/в вливания (250 мл) + Solución Salina Intravenosa (250ml) + Solution Saline 0.9% IV (250ml) + Solanka 0,9% IV (250ml) + Soro IV (1000ml) + + + Basic Field Dressing (QuikClot) + Первичный перевязочный пакет (QuikClot) + Vendaje Básico (Coagulante) + Bandage Regulier (Coagulant) + Opatrunek QuikClot + Bandagem básica (Coagulante) + + + QuikClot bandage + Гемостатический пакет QuikClot + Venda Coagulante + Bandage coagulant + Podstawowy opatrunek stosowany na rany + Bandagem com agente coagulante + + + + + Un bandage servant a coaguler les seignements mineur à moyen. + Proszkowy opatrunek adsorbcyjny przeznaczony do tamowania zagrażających życiu krwawień średniej i dużej intensywności. + Vendaje Hemostático con coagulante que detiene el sangrado. + Bandagem Hemostática com coagulante que controla hemorragia médias e grandes com risco de vida. + + + Personal Aid Kit + Аптечка + Kit de Soporte Vital Avanzado + Équipement de support Vitale + Apteczka osobista + Kit De Primeiros Socorros Pessoal + + + Includes various treatment kit needed for stitching or advanced treatment + Содержит различные материалы и инструменты для зашивания ран и оказания специальной медпомощи. + Incluye material médico para tratamientos avanzados + Inclue du matériel medical pour les traitement avancé, tel les point de suture. + Zestaw środków medycznych do opatrywania ran i dodatkowego leczenia po-urazowego + Inclui vários tratamentos materiais para custura e tratamento avançado + + + + + + + + + Surgical Kit + Хирургический набор + Kit Quirúrgico + Kit Cirurgico + + + Surgical Kit for in field advanced medical treatment + Набор для хирургической помощи в полевых условиях + Kit Quirúrgico para el tratamiento avanzado en el campo de batalla + Kit Cirurgico para uso de tratamento médico avançado em campo + + + Surgical Kit for in field advanced medical treatment + Набор для хирургической помощи в полевых условиях + Kit Quirúrgico para el tratamiento avanzado en el campo de batalla + Kit Cirurgico para uso de tratamento médico avançado em campo. + + + Bodybag + Мешок для трупов + Bolsa para cadáveres + Saco para cadáver + + + A bodybag for dead bodies + Мешок для упаковки трупов + Bolsa para cadáveres + Um saco para corpos mortos + + + A bodybag for dead bodies + Мешок для упаковки трупов + Bolsa para cadáveres + Um saco para corpos mortos. + + + + + Blood Pressure + Артериальное давление + Presión Arterial + Pressão Arterial + + + Checking Blood Pressure.. + Проверка артериального давления... + Comprobando Presión Arterial... + Aferindo Pressão Arterial... + + + You checked %1 + Вы осмотрели раненого %1 + Examinando a %1 + Você aferiu o paciente %1 + + + You find a blood pressure of %2/%3 + Артериальное давление %2/%3 + La Presión Arterial es %2/%3 + A Pressão Arterial é de %2/%3 + + + You find a low blood pressure + Давление низкое + La Presión Arterial es baja + Pressão Arterial baixa + + + You find a normal blood pressure + Давление нормальное + La Presión Arterial es normal + Pressão Arterial normal + + + You find a high blood pressure + Давление высокое + La Presión Arterial es alta + Pressão Arterial Alta + + + You find no blood pressure + Давления нет + No hay Presión Arterial + Sem Pressão Arterial + + + You fail to find a blood pressure + Артериальное давление не определяется + No puedes encontrar Presión Arterial + Você falhou em aferir a Pressão Arterial + + + Pulse + Пульс + Pulso + Pulso + + + Checking Heart Rate.. + Проверка пульса... + Comprobando Pulso... + Aferindo Pulso... + + + You checked %1 + Вы осмотрели раненого %1 + Examinando a %1 + Você aferiu o paciente %1 + + + You find a Heart Rate of %2 + Пульс %2 уд./мин. + El Pulso es %2 + A Freqüência Cardíaca é de %2 + + + You find a weak Heart Rate + Пульс слабый + El Pulso es débil + Freqüência Cardíaca baixa + + + You find a strong Heart Rate + Пульс учащенный + El Pulso está acelerado + Freqüência Cardíaca normal + + + You find a normal Heart Rate + Пульс в норме + El Pulso es bueno + Freqüência Cardíaca alta + + + You find no Heart Rate + Пульс не прощупывается + No tiene Pulso + Sem Freqüência Cardíaca + + + Response + Реакция + Reacciona + Reação + + + You check response of patient + Вы проверяете реакцию раненого + Compruebas si el paciente reacciona + Aferindo se o paciente tem reação... + + + %1 is responsive + %1 реагирует на раздражители + %1 ha reaccionado + %1 está respondendo + + + %1 is not responsive + %1 не реагирует + %1 no reacciona + %1 não está respondendo + + + You checked %1 + Вы осмотрели раненого %1 + Examinas a %1 + Você aferiu o paciente %1 + + + Bandaged + Повязка наложена + Vendado + Enfaixado + + + You bandage %1 (%2) + Вы перевязали раненого %1 (%2) + Aplicas vendaje a %1 en %2 + Você aplica bandagem no paciente %1 (%2) + + + %1 is bandaging you + %1 перевязывает вас + %1 te está vendando + %1 está aplicando uma bandagem em você + + + You start stitching injures from %1 (%2) + Вы зашиваете ранения от %1 (%2) + Estás suturando heridas de %1 en %2 + Você começa a suturar os ferimentos do %1 (%2) + + + Stitching + Наложение швов + Suturando + Suturando... + + + You treat the airway of %1 + Вы интубируете раненого %1 + Estás intubando a %1 + Você entuba o %1 + + + Airway + Дыхательные пути + Vías Aéreas + Vias Aéreas + + + %1 is treating your airway + %1 проводит вам интубацию + %1 te está intubando + %1 está te entubando + + + Drag + Ziehen + Arrastrar + Ciągnij + Táhnout + Тащить + Tracter + Húzás + Arrastar + Trascina + + + Carry + Tragen + Cargar + Nieś + Nést + Нести + Porter + Cipelés + Carregar + Trasporta + + + Release + Loslassen + Soltar + Połóż + Položit + Отпустить + Déposer + Elenged + Soltar + Lascia + + + Load Patient Into + Patient Einladen + Cargar el paciente en + Załaduj pacjenta + Naložit pacianta do + Погрузить пациента в + Embarquer le Patient + Sebesült berakása + Carregar Paciente Em + Carica paziente nel + + + Unload Patient + Patient Ausladen + Descargar el paciente + Wyładuj pacjenta + Vyložit pacienta + Выгрузить пациента + Débarquer le Patient + Sebesült kihúzása + Descarregar Paciente + Scarica il paziente + + + Unload patient + Descarregar Paciente + + + Load patient + Carregar Paciente Em + + + Place body in bodybag + Colocar corpo dentro do saco para cadáver + + + Placing body in bodybag + Colocando corpo dentro do saco para cadáver... + + + + + %1 has bandaged patient + %1 aplicou bandagem no paciente + + + %1 used %2 + %1 usou %2 + + + %1 has given an IV + %1 aplicou um intravenoso + + + %1 applied a tourniquet + %1 aplicou um torniquete + + + \ No newline at end of file diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml index 772a7a172f7..8fadcc32f68 100644 --- a/addons/microdagr/stringtable.xml +++ b/addons/microdagr/stringtable.xml @@ -1,109 +1,131 @@  - - - MicroDAGR GPS - - - MicroDAGR advanced GPS receiver - - - Angular Unit: - - - Mils - - - Show Waypoints On Map: - - - Degrees - - - On - Zapnuto - Oui - Ein - Sì - Wł. - Ativar - Вкл. - Sí - - - Off - Vypnuto - Non - Aus - No - Wył. - Desativar - Выкл. - No - - - Enter Grid Cords: - - - Name of [%1] - - - MGRS-New - - - WGD - - - Range: - Reichweite: - - - Compass Direction - - - Mark - - - Waypoints - Wegpunkte - - - Connect To - - - Settings - Einstellungen - Configuración - - - SetWP - - - Add - - - Delete - Smazat - Supprimer - Löschen - Elimina - Usuń - Excluir - Удалить - Suprimir - - - Toggle MicroDAGR Display Mode - - - Show MicoDAGR - - - Configure MicroDAGR - - - Close MicroDAGR - - + + + MicroDAGR GPS + GPS MicroDAGR + + + MicroDAGR advanced GPS receiver + Recepitor GPS avançado MicroDAGR + + + Angular Unit: + Unidade Angular: + + + Mils + Mils: + + + Show Waypoints On Map: + Mostrar Waypoints no mapa: + + + Degrees + Graus + + + On + Zapnuto + Oui + Ein + Sì + Wł. + Ativar + Вкл. + Sí + + + Off + Vypnuto + Non + Aus + No + Wył. + Desativar + Выкл. + No + + + Enter Grid Cords: + Digite as Ccords. do Grid + + + Name of [%1] + Nome do [%1] + + + MGRS-New + MGRS-Novo + + + WGD + WGD + + + Range: + Reichweite: + Distância: + + + Compass Direction + Direção na bússula + + + Mark + Marca + + + Waypoints + Wegpunkte + Waypoints + + + Connect To + Conectar à + + + Settings + Einstellungen + Configuración + Opções + + + SetWP + Definir WP + + + Add + Adicionar + + + Delete + Smazat + Supprimer + Löschen + Elimina + Usuń + Excluir + Удалить + Suprimir + + + Toggle MicroDAGR Display Mode + Alternar Modo de Display do MicroDAGR + + + Show MicroDAGR + Mostrar MicroDAGR + + + Configure MicroDAGR + Configurar MicroDAGR + + + Close MicroDAGR + Fechar MicroDAGR + + \ No newline at end of file diff --git a/addons/movement/stringtable.xml b/addons/movement/stringtable.xml index d31896acaa8..5206139e7f7 100644 --- a/addons/movement/stringtable.xml +++ b/addons/movement/stringtable.xml @@ -1,46 +1,48 @@  - - - Show weight in lb - Zeige Gewicht in Pfund - Mostrar peso en libras - Afficher le poids en lb - Pokaż ciężar w funtach - Zobrazit váhu v lb - Mostra peso in libbre - Mostrar peso em libras - Súly megjelenítése fontban. - Показать вес в фунтах - - - Weight: - Gewicht: - Peso: - Poids: - Waga: - Váha: - Peso: - Peso: - Súly: - Вес: - - - Climb - Klettern - Wspinaczka - Trepar - Vylézt - Подняться - - - Can't climb here - Kann hier nicht klettern - Nie możesz wspiąć się tutaj - No se puede trepar aquí - Zde není možné vylézt - Не можете подняться здесь - - + + + Show weight in lb + Zeige Gewicht in Pfund + Mostrar peso en libras + Afficher le poids en lb + Pokaż ciężar w funtach + Zobrazit váhu v lb + Mostra peso in libbre + Mostrar peso em libras + Súly megjelenítése fontban. + Показать вес в фунтах + + + Weight: + Gewicht: + Peso: + Poids: + Waga: + Váha: + Peso: + Peso: + Súly: + Вес: + + + Climb + Klettern + Wspinaczka + Trepar + Vylézt + Подняться + Subir + + + Can't climb here + Kann hier nicht klettern + Nie możesz wspiąć się tutaj + No se puede trepar aquí + Zde není možné vylézt + Не можете подняться здесь + Não se pode subir aqui + + \ No newline at end of file diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml index 622df44aca5..12c07fd8009 100644 --- a/addons/nametags/stringtable.xml +++ b/addons/nametags/stringtable.xml @@ -1,81 +1,87 @@  - - - Show Names - Namen anzeigen - Mostrar nombres - Afficher noms - Zobrazit jména - Pokaż nazwy - Nevek mutatása - Показать имена - - - Show player names - Spielernamen anzeigen - Mostrar nombres de jugadores - Pokaż nazwy graczy - Afficher nom des joueurs - Játékosnevek mutatása - Zobrazit jména hráčů - Mostrar nomes de jogadores - Mostra i nomi dei giocatori - Показать имена игроков - - - Show player name only on cursor (requires player names) - Pokaż nazwę gracza tylko pod kursorem - Mostrar nombres solo en el cursor (requiere Mostrar nombres de jugadores) - Zeige Spielernamen nur an, wenn die Maus auf sie gerrichtet ist (benötigt Spielernamen) - Noms uniquement sous le curseur (si noms affichés) - Zobrazit jméno hráče jenom na kurzor (vyžaduje jména hráčů) - Mostra i nomi solo se puntati (richiede i nomi dei giocatori abilitati) - Mostrar nome de jogador somente no cursor (requer nome de jogadores) - Játékosok nevének mutatása (névcímke szükséges) - Показать имена игроков только под курсором (требует имен игроков) - - - Show player name only on keypress (requires player names) - Spielernamen nur auf Tastendruck anzeigen (benötigt Spielernamen) - Mostrar nombres solo al pulsar (requiere Mostrar nombres de jugadores) - Noms uniquement sur pression de la touche (si noms affichés) - Zobrazit jména hráčů jen na klávesu (vyžaduje jména hráčů) - Pokaż nazwę gracza tylko po przytrzymaniu klawisza - Játékosnevek mutatása gombnyomásra(névcíme szükséges) - Показать имена игроков только по нажатию клавиши (требует имен игроков) - - - Show player ranks (requires player names) - Spielerränge anzeigen (benötig Spielernamen) - Pokaż rangi graczy (wymaga nazw graczy) - Mostrar rango de los jugadores (requiere Mostrar nombres de jugadores) - Grade des joueurs (si noms affichés) - Zobrazit hodnosti hráčů (vyžaduje jména hráčů) - Mostra i gradi (richiede i nomi dei giocatori abilitati) - Mostrar patente de jogadores (requer nome de jogadores) - Játékosok rendfokozatának mutatása (névcímke szükséges) - Показать звания игроков (требует имен игроков) - - - Show vehicle crew info - Zeige Fahrzeugbesatzung - Mostrar tripulantes - Pokaż informacje o załodze pojazdu - Zobrazit info o posádce vozidla - Показать экипаж - - - Show name tags for AI units - - - Show SoundWaves (requires player names) - Zeigen Schallwelle (benötigt spielernamen) - Mostrar onda sonora (requiere Mostrar nombres de jugadores) - - - Default Nametag Color (Non Group Members) - - + + + Show Names + Namen anzeigen + Mostrar nombres + Afficher noms + Zobrazit jména + Pokaż nazwy + Nevek mutatása + Показать имена + Mostrar nomes + + + Show player names + Spielernamen anzeigen + Mostrar nombres de jugadores + Pokaż nazwy graczy + Afficher nom des joueurs + Játékosnevek mutatása + Zobrazit jména hráčů + Mostrar nomes de jogadores + Mostra i nomi dei giocatori + Показать имена игроков + + + Show player name only on cursor (requires player names) + Pokaż nazwę gracza tylko pod kursorem + Mostrar nombres solo en el cursor (requiere Mostrar nombres de jugadores) + Zeige Spielernamen nur an, wenn die Maus auf sie gerrichtet ist (benötigt Spielernamen) + Noms uniquement sous le curseur (si noms affichés) + Zobrazit jméno hráče jenom na kurzor (vyžaduje jména hráčů) + Mostra i nomi solo se puntati (richiede i nomi dei giocatori abilitati) + Mostrar nome de jogador somente no cursor (requer nome de jogadores) + Játékosok nevének mutatása (névcímke szükséges) + Показать имена игроков только под курсором (требует имен игроков) + + + Show player name only on keypress (requires player names) + Spielernamen nur auf Tastendruck anzeigen (benötigt Spielernamen) + Mostrar nombres solo al pulsar (requiere Mostrar nombres de jugadores) + Noms uniquement sur pression de la touche (si noms affichés) + Zobrazit jména hráčů jen na klávesu (vyžaduje jména hráčů) + Pokaż nazwę gracza tylko po przytrzymaniu klawisza + Játékosnevek mutatása gombnyomásra(névcíme szükséges) + Показать имена игроков только по нажатию клавиши (требует имен игроков) + Mostrar nomes somente ao pressionar teclar (requer nome de jogadores) + + + Show player ranks (requires player names) + Spielerränge anzeigen (benötig Spielernamen) + Pokaż rangi graczy (wymaga nazw graczy) + Mostrar rango de los jugadores (requiere Mostrar nombres de jugadores) + Grade des joueurs (si noms affichés) + Zobrazit hodnosti hráčů (vyžaduje jména hráčů) + Mostra i gradi (richiede i nomi dei giocatori abilitati) + Mostrar patente de jogadores (requer nome de jogadores) + Játékosok rendfokozatának mutatása (névcímke szükséges) + Показать звания игроков (требует имен игроков) + + + Show vehicle crew info + Zeige Fahrzeugbesatzung + Mostrar tripulantes + Pokaż informacje o załodze pojazdu + Zobrazit info o posádce vozidla + Показать экипаж + Mostrar tripulantes + + + Show name tags for AI units + Mostrar nomes para unidades de IA + + + Show SoundWaves (requires player names) + Zeigen Schallwelle (benötigt spielernamen) + Mostrar onda sonora (requiere Mostrar nombres de jugadores) + Mostrar onda sonora (requer nome de jogadores) + + + Default Nametag Color (Non Group Members) + Cor padrão do nome (unidades fora do grupo) + + \ No newline at end of file diff --git a/addons/nightvision/stringtable.xml b/addons/nightvision/stringtable.xml index 16ead016da6..9aeb75583e4 100644 --- a/addons/nightvision/stringtable.xml +++ b/addons/nightvision/stringtable.xml @@ -1,127 +1,128 @@  - - - NV Goggles (Gen1) - Noktovizor (Gen1) - JVN (Gen1) - NS-Brille (Gen1) - Occhiali notturni (Gen1) - Gogle noktowizyjne (Gen1) - Óculos de visão noturna (Gen1) - ПНВ (Gen1) - Sistema de visión nocturna (Gen1) - - - NV Goggles (Gen2) - Noktovizor (Gen2) - JVN (Gen2) - NS-Brille (Gen2) - Occhiali notturni (Gen2) - Gogle noktowizyjne (Gen2) - Óculos de visão noturna (Gen2) - ПНВ (Gen2) - Sistema de visión nocturna (Gen2) - - - NV Goggles (Gen3) - Noktovizor (Gen3) - JVN (Gen3) - NS-Brille (Gen3) - Occhiali notturni (Gen3) - Gogle noktowizyjne (Gen3) - Óculos de visão noturna (Gen3) - ПНВ (Gen3) - Sistema de visión nocturna (Gen3) - - - NV Goggles (Gen3, Brown) - Noktovizor (Gen3, hnědý) - JVN (Gen3, marron) - NS-Brille (Gen3, Braun) - Occhiali notturni (Gen3, marroni) - Gogle noktowizyjne (Gen3, brązowe) - Óculos de visão noturna (Gen3, marrons) - ПНВ (Gen3, коричневый) - Sistema de visión nocturna (Gen3, marrón) - - - NV Goggles (Gen3, Green) - Noktovizor (Gen3, zelený) - JVN (Gen3, vertes) - NS-Brille (Gen3, Grün) - Occhiali notturni (Gen3, verdi) - Gogle noktowizyjne (Gen3, zielone) - Óculos de visão noturna (Gen3, verdes) - ПНВ (Gen3, зеленый) - Sistema de visión nocturna (Gen3, verde) - - - NV Goggles (Gen3, Black) - Noktovizor (Gen3, černý) - JVN (Gen3, noires) - NS-Brille (Gen3, Schwarz) - Occhiali notturni (Gen3, neri) - Gogle noktowizyjne (Gen3, czarne) - Óculos de visão noturna (Gen3, pretos) - ПНВ (Gen3, черный) - Sistema de visión nocturna (Gen3, negro) - - - NV Goggles (Gen4) - Noktovizor (Gen4) - JVN (Gen4) - NS-Brille (Gen4) - Occhiali notturni (Gen4) - Gogle noktowizyjne (Gen4) - Óculos de visão noturna (Gen4) - ПНВ (Gen4) - Sistema de visión nocturna (Gen4) - - - NV Goggles (Wide) - NS-Brille (Weitwinkel) - Sistema de visión nocturna (Panorámicas) - Gogle noktowizyjne (panoramiczne) - Noktovizor (Široký) - ПНВ (Широкий) - - - Brightness: %1 - Helligkeit: %1 - Brillo: %1 - Czułość: %1 - Zvýšení: %1 - Luminosité : %1 - Контраст: - Fényerő: %1 - Luminosidade: %1 - Luminosità: %1 - - - Increase NVG Brightness - Nachtsichtgerätshelligkeit erhöhen - Aumentar el brillo de las NVG - Zwiększ czułość noktowizji - Zvýšení jasu noktovizoru - Augmenter la luminosité des JVN - Увеличить яркость ПНВ - Fényerő növelése - Aumentar Luminosidade do EVN - Aumenta la luminosità dell'NVG - - - Decrease NVG Brightness - Nachtsichtgerätshelligkeit verringern - Disminuir el brillo de las NVG - Zmniejsz czułość noktowizji - Snížení jasu noktovizoru - Baisser la luminosité des JVN - Уменьшить яркость ПНВ - Fényerő csökkentése - Diminuir Luminosidade do EVN - Riduci la luminosità dell'NVG - - - + + + NV Goggles (Gen1) + Noktovizor (Gen1) + JVN (Gen1) + NS-Brille (Gen1) + Occhiali notturni (Gen1) + Gogle noktowizyjne (Gen1) + Óculos de visão noturna (Gen1) + ПНВ (Gen1) + Sistema de visión nocturna (Gen1) + + + NV Goggles (Gen2) + Noktovizor (Gen2) + JVN (Gen2) + NS-Brille (Gen2) + Occhiali notturni (Gen2) + Gogle noktowizyjne (Gen2) + Óculos de visão noturna (Gen2) + ПНВ (Gen2) + Sistema de visión nocturna (Gen2) + + + NV Goggles (Gen3) + Noktovizor (Gen3) + JVN (Gen3) + NS-Brille (Gen3) + Occhiali notturni (Gen3) + Gogle noktowizyjne (Gen3) + Óculos de visão noturna (Gen3) + ПНВ (Gen3) + Sistema de visión nocturna (Gen3) + + + NV Goggles (Gen3, Brown) + Noktovizor (Gen3, hnědý) + JVN (Gen3, marron) + NS-Brille (Gen3, Braun) + Occhiali notturni (Gen3, marroni) + Gogle noktowizyjne (Gen3, brązowe) + Óculos de visão noturna (Gen3, marrons) + ПНВ (Gen3, коричневый) + Sistema de visión nocturna (Gen3, marrón) + + + NV Goggles (Gen3, Green) + Noktovizor (Gen3, zelený) + JVN (Gen3, vertes) + NS-Brille (Gen3, Grün) + Occhiali notturni (Gen3, verdi) + Gogle noktowizyjne (Gen3, zielone) + Óculos de visão noturna (Gen3, verdes) + ПНВ (Gen3, зеленый) + Sistema de visión nocturna (Gen3, verde) + + + NV Goggles (Gen3, Black) + Noktovizor (Gen3, černý) + JVN (Gen3, noires) + NS-Brille (Gen3, Schwarz) + Occhiali notturni (Gen3, neri) + Gogle noktowizyjne (Gen3, czarne) + Óculos de visão noturna (Gen3, pretos) + ПНВ (Gen3, черный) + Sistema de visión nocturna (Gen3, negro) + + + NV Goggles (Gen4) + Noktovizor (Gen4) + JVN (Gen4) + NS-Brille (Gen4) + Occhiali notturni (Gen4) + Gogle noktowizyjne (Gen4) + Óculos de visão noturna (Gen4) + ПНВ (Gen4) + Sistema de visión nocturna (Gen4) + + + NV Goggles (Wide) + NS-Brille (Weitwinkel) + Sistema de visión nocturna (Panorámicas) + Gogle noktowizyjne (panoramiczne) + Noktovizor (Široký) + ПНВ (Широкий) + Óculos de visão noturna (Panorâmico) + + + Brightness: %1 + Helligkeit: %1 + Brillo: %1 + Czułość: %1 + Zvýšení: %1 + Luminosité : %1 + Контраст: + Fényerő: %1 + Luminosidade: %1 + Luminosità: %1 + + + Increase NVG Brightness + Nachtsichtgerätshelligkeit erhöhen + Aumentar el brillo de las NVG + Zwiększ czułość noktowizji + Zvýšení jasu noktovizoru + Augmenter la luminosité des JVN + Увеличить яркость ПНВ + Fényerő növelése + Aumentar Luminosidade do EVN + Aumenta la luminosità dell'NVG + + + Decrease NVG Brightness + Nachtsichtgerätshelligkeit verringern + Disminuir el brillo de las NVG + Zmniejsz czułość noktowizji + Snížení jasu noktovizoru + Baisser la luminosité des JVN + Уменьшить яркость ПНВ + Fényerő csökkentése + Diminuir Luminosidade do EVN + Riduci la luminosità dell'NVG + + + \ No newline at end of file diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index 76407da4353..facc3e82480 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -1,107 +1,122 @@  - - - ACE Options - ACE Optionen - Opciones ACE - Opcje ACE - ACE Nastavení - ACE Options - ACE Настройки - Opções do ACE - ACE Opciók - Opzioni ACE - - - Fix Animation - - - Reset All - Rücksetzen - - - Colors - Farben - цвета - Colors - - - Options - Optionen - Opciones - Opcje - Nastavení - Options - Настройки - Opções - Opciók - Opzioni - - - Values - - - Yes - Ja - Si - Tak - Ano - Oui - Да - Igen - Sim - Si - - - No - Nein - No - Nie - Ne - Non - Нет - Nem - Não - No - - - Setting: - Nastavení: - Einstellung: - Yстановки: - Ajuste: - - - Export - - - Open Export Menu - - - String input. - - - Array. Seperate elements by using ,. - - - Number - - - Uknown input type - - - Save input - - - Include Client Settings - - - Exclude Client Settings - - - Settings exported to clipboard - - + + + ACE Options + ACE Optionen + Opciones ACE + Opcje ACE + ACE Nastavení + ACE Options + ACE Настройки + Opções do ACE + ACE Opciók + Opzioni ACE + + + Fix Animation + Arrumar Animação + + + Reset All + Rücksetzen + Resetar Tudo + + + Colors + Farben + цвета + Colors + Cores + + + Options + Optionen + Opciones + Opcje + Nastavení + Options + Настройки + Opções + Opciók + Opzioni + + + Values + Valores + + + Yes + Ja + Si + Tak + Ano + Oui + Да + Igen + Sim + Si + + + No + Nein + No + Nie + Ne + Non + Нет + Nem + Não + No + + + Setting: + Nastavení: + Einstellung: + Yстановки: + Ajuste: + Opção: + + + Export + Exportar + + + Open Export Menu + Abrir menu de exportação + + + String input. + Input de String + + + Array. Seperate elements by using ,. + Vetor. Separe elementos usando *,*. + + + Number + Número + + + Uknown input type + Tipo desonhecido de input + + + Save input + Salvar input + + + Include Client Settings + Incluir opções do cliente + + + Exclude Client Settings + Excluir opções do cliente + + + Settings exported to clipboard + Opções exportadas para o clipboard. + + \ No newline at end of file diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml index 5d2c9595dfa..dea35406bd2 100644 --- a/addons/overheating/stringtable.xml +++ b/addons/overheating/stringtable.xml @@ -1,156 +1,158 @@  - - - Display text on jam - - - Display a notification whenever your weapon gets jammed - - - Spare barrel - Ersatzlauf - Cañón de repuesto - Zapasowa lufa - Náhradní hlaveň - Deuxième canon - Запасной ствол - Tartalék cső - Cano Reserva - Canna di ricambio - - - Use to swap barrel. - Benutzen, um Lauf zu wechseln. - Permite intercambiar el cañón - Umożliwia wymianę lufy - Používané k výměně hlavně - Utilisé pour changer de canon. - Используется для смены ствола. - Cső kicseréléséhez. - Use para trocar o cano/estriamento. - Usata per cambiare la canna. - - - Weapon jammed! - Ladehemmung! - Arma encasquillada! - Broń się zacięła! - Zbraň se zasekla! - Arme enrayée - Оружие заклинило! - Elakadt a fegyver! - Arma travada! - Arma inceppata! - - - Clear jam - Ladehemmung beheben - Desencasquillar el arma - Usuń zacięcie - Uvolnit zbraň - Désenrayer l'arme - Исправить клин оружия. - Hárítsd el az akadályt! - Destravar arma - Ripulisci l'arma - - - Jam cleared - Ladehemmung behoben - Arma desencasquillada - Zacięcie usunięte - Zbraň uvolněna - Arme désenrayée - Оружие исправлено - Akadály elhárítva! - Arma destravada - Arma pronta al fuoco - - - Swap barrel - Lauf wechseln - Cambiar el cañón - Wymień lufę - Vyměnit hlaveň - Changer de canon - Сменить ствол - Cserélj csövet! - Substituir cano - Sostiuisci la canna - - - Swapping barrel... - Lauf wird gewechselt... - Cambiando el cañón... - Wymienianie lufy... - Vyměňuji hlaveň ... - Changement du canon... - Смена ствола... - Cső cserélése... - Substituindo cano... - Sto sostituendo la canna ... - - - Swapped barrel - Lauf gewechselt - Cañón cambiado - Lufa wymieniona - Hlaveň vyměněna - Canon changé - Ствол сменен - Cső kicserélve! - Cano substituído - Canna sostituita - - - Check weapons temperature - Temperatur der Waffe prüfen - Verificar temperatura del arma - Sprawdź temperaturę broni - Vérifier la température de l'arme - Hőmérséklet ellenőrzése - Zjistit teplotu zbraně - Conferir temperatura da arma - Controlla la temperatura della canna - Проверить температуру оружия - - - Check<br/>temperature - Temperatur<br/>prüfen - Verificar<br/>temperatura - Sprawdź<br/>temperaturę - Vérifier la<br/>température - Hőmérséklet<br/>ellenőrzése - Zjistit<br/>teplotu - Conferir<br/>temperatura - Controlla la<br/>temperatura - Проверить<br/>температуру - - - Checking temperature ... - Prüfe Temperatur ... - Verificando temperatura ... - Sprawdzanie temperatury ... - Vérification de la température ... - Hőmérséklet ellenőrzése... - Zjišťuju teplotu ... - Conferindo temperatura ... - Sto controllando la temperatura ... - Проверка температуры ... - - - Temperature - Temperatur - Temperatura - Temperatura - Température - Hőmérséklet - Teplota - Temperatura - Temperatura - Температура - - + + + Display text on jam + Mostrar texto quando trava acontecer + + + Display a notification whenever your weapon gets jammed + Mostra uma notificação quando sua arma sofre um travamento. + + + Spare barrel + Ersatzlauf + Cañón de repuesto + Zapasowa lufa + Náhradní hlaveň + Deuxième canon + Запасной ствол + Tartalék cső + Cano Reserva + Canna di ricambio + + + Use to swap barrel. + Benutzen, um Lauf zu wechseln. + Permite intercambiar el cañón + Umożliwia wymianę lufy + Používané k výměně hlavně + Utilisé pour changer de canon. + Используется для смены ствола. + Cső kicseréléséhez. + Use para trocar o cano/estriamento. + Usata per cambiare la canna. + + + Weapon jammed! + Ladehemmung! + Arma encasquillada! + Broń się zacięła! + Zbraň se zasekla! + Arme enrayée + Оружие заклинило! + Elakadt a fegyver! + Arma travada! + Arma inceppata! + + + Clear jam + Ladehemmung beheben + Desencasquillar el arma + Usuń zacięcie + Uvolnit zbraň + Désenrayer l'arme + Исправить клин оружия. + Hárítsd el az akadályt! + Destravar arma + Ripulisci l'arma + + + Jam cleared + Ladehemmung behoben + Arma desencasquillada + Zacięcie usunięte + Zbraň uvolněna + Arme désenrayée + Оружие исправлено + Akadály elhárítva! + Arma destravada + Arma pronta al fuoco + + + Swap barrel + Lauf wechseln + Cambiar el cañón + Wymień lufę + Vyměnit hlaveň + Changer de canon + Сменить ствол + Cserélj csövet! + Substituir cano + Sostiuisci la canna + + + Swapping barrel... + Lauf wird gewechselt... + Cambiando el cañón... + Wymienianie lufy... + Vyměňuji hlaveň ... + Changement du canon... + Смена ствола... + Cső cserélése... + Substituindo cano... + Sto sostituendo la canna ... + + + Swapped barrel + Lauf gewechselt + Cañón cambiado + Lufa wymieniona + Hlaveň vyměněna + Canon changé + Ствол сменен + Cső kicserélve! + Cano substituído + Canna sostituita + + + Check weapons temperature + Temperatur der Waffe prüfen + Verificar temperatura del arma + Sprawdź temperaturę broni + Vérifier la température de l'arme + Hőmérséklet ellenőrzése + Zjistit teplotu zbraně + Conferir temperatura da arma + Controlla la temperatura della canna + Проверить температуру оружия + + + Check<br/>temperature + Temperatur<br/>prüfen + Verificar<br/>temperatura + Sprawdź<br/>temperaturę + Vérifier la<br/>température + Hőmérséklet<br/>ellenőrzése + Zjistit<br/>teplotu + Conferir<br/>temperatura + Controlla la<br/>temperatura + Проверить<br/>температуру + + + Checking temperature ... + Prüfe Temperatur ... + Verificando temperatura ... + Sprawdzanie temperatury ... + Vérification de la température ... + Hőmérséklet ellenőrzése... + Zjišťuju teplotu ... + Conferindo temperatura ... + Sto controllando la temperatura ... + Проверка температуры ... + + + Temperature + Temperatur + Temperatura + Temperatura + Température + Hőmérséklet + Teplota + Temperatura + Temperatura + Температура + + \ No newline at end of file diff --git a/addons/parachute/stringtable.xml b/addons/parachute/stringtable.xml index f97b389eebd..7d3c278fd8a 100644 --- a/addons/parachute/stringtable.xml +++ b/addons/parachute/stringtable.xml @@ -1,46 +1,50 @@  - - - Altimeter - Altimètre - Höhenmesser - Výškoměr - Wysokościomierz - Altímetro - Magasságmérő - Высотомер - - - Altimeter Watch - Montre altimètre - Höhenmesser - Hodinky s výškoměrem - Zegarek z wysokościomierzem - Reloj altímetro - Magasságmérő - Часы с высотомером - - - Used to show height, descent rate and the time. - Affiche la hauteur, le taux de descente et l'heure. - Zeigt Höhe, Fallgeschwindigkeit und Uhrzeit. - Používané k zjištění výšky, rychlosti sestupu a času. - Używany przez spadochroniarzy, pokazuje wysokość, prędkość opadania oraz czas. - Utilizado para mostrar altura, tasa de descenso y hora. - Mutatja a magasságot, zuhanás sebességét és az időt. - Используется для определения высоты, скорости снижения и времени. - - - Non-Steerable Parachute - Ungelenkter Fallschirm - Paracaídas no dirigible - Parachute non manœuvrable - Niesterowalny spadochron - Neříditelný padák - Irányithatatlan ejtőernyő - Неуправляемый парашют - - + + + Altimeter + Altimètre + Höhenmesser + Výškoměr + Wysokościomierz + Altímetro + Magasságmérő + Высотомер + Altímetro + + + Altimeter Watch + Montre altimètre + Höhenmesser + Hodinky s výškoměrem + Zegarek z wysokościomierzem + Reloj altímetro + Magasságmérő + Часы с высотомером + Relógio Altímetro + + + Used to show height, descent rate and the time. + Affiche la hauteur, le taux de descente et l'heure. + Zeigt Höhe, Fallgeschwindigkeit und Uhrzeit. + Používané k zjištění výšky, rychlosti sestupu a času. + Używany przez spadochroniarzy, pokazuje wysokość, prędkość opadania oraz czas. + Utilizado para mostrar altura, tasa de descenso y hora. + Mutatja a magasságot, zuhanás sebességét és az időt. + Используется для определения высоты, скорости снижения и времени. + Usado para mostrar altura, taxa de descida e o tempo. + + + Non-Steerable Parachute + Ungelenkter Fallschirm + Paracaídas no dirigible + Parachute non manœuvrable + Niesterowalny spadochron + Neříditelný padák + Irányithatatlan ejtőernyő + Неуправляемый парашют + Para-querdas não controlável + + \ No newline at end of file diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml index 9ccd7752d2d..93c20506617 100644 --- a/addons/realisticnames/stringtable.xml +++ b/addons/realisticnames/stringtable.xml @@ -725,6 +725,7 @@ CH-47I Chinook (nieuzbrojony) CH-47I Chinook (невооруженный) CH-47I Chinook (Neozbrojený) + CH-47I Chinook (Desarmado) A-10D Thunderbolt II @@ -878,7 +879,7 @@ M183 Demoliční nálož M183 Charge de Démolition M183 Комплектный подрывной заряд - M183 Sacola de Demolição + Sacola de Demolição M183 M183 romboló töltet M183 Demolition Charge Assembly @@ -890,7 +891,7 @@ M112 Výbušná nálož Pétard M112 M112 подрывной заряд - M112 Carga de Demolição + Carga de Demolição M112 M112 romboló töltet M112 Demolition Block @@ -902,7 +903,7 @@ M67 Granát M67 Grenade à fragmentation M67 ручная осколочная граната - M67 Granada de fragmentação + Granada de fragmentação M67 M67 repeszgránát M67 Granata a frammentazione @@ -914,7 +915,7 @@ M83 Kouřový Granát (Bílý) M83 Grenade fumigène (Blanche) M83 дымовой гранаты (Белый) - M83 Granada de fumaça (Branca) + Granada de fumaça (Branca) M83 M83 füstgránát (Fehér) M83 Granata fumogena (Bianco) @@ -926,7 +927,7 @@ M18 Kouřový Granát (Modrý) M18 Grenade fumigène (Bleue) M18 дымовой гранаты (Синий) - M18 Granada de fumaça (Azul) + Granada de fumaça (Azul) M18 M18 füstgránát (Kék) M18 Granata fumogena (Blu) @@ -938,7 +939,7 @@ M18 Kouřový Granát (Zelený) M18 Grenade fumigène (Verte) M18 дымовой гранаты (Зелёный) - M18 Granada de fumaça (Verde) + Granada de fumaça (Verde) M18 M18 füstgránát (Zöld) M18 Granata fumogena (Verde) @@ -950,7 +951,7 @@ M18 Kouřový Granát (Oranžový) M18 Grenade fumigène (Orange) M18 дымовой гранаты (Оранжевый) - M18 Granada de fumaça (Laranja) + Granada de fumaça (Laranja) M18 M18 füstgránát (Narancssárga) M18 Granata fumogena (Arancione) @@ -962,7 +963,7 @@ M18 Kouřový Granát (Fialový) M18 Grenade fumigène (Pourpre) M18 дымовой гранаты (Пурпурный) - M18 Granada de fumaça (Roxa) + Granada de fumaça (Roxa) M18 M18 füstgránát (Lila) M18 Granata fumogena (Viola) @@ -974,7 +975,7 @@ M18 Kouřový Granát (Červený) M18 Grenade fumigène (Rouge) M18 дымовой гранаты (Красный) - M18 Granada de fumaça (Vermelha) + Granada de fumaça (Vermelha) M18 M18 füstgránát (Piros) M18 Granata fumogena (Rosso) @@ -986,7 +987,7 @@ M18 Kouřový Granát (Žlutý) M18 Grenade fumigène (Jaune) M183 дымовой гранаты (Жёлтые) - M18 Granada de fumaça (Amarela) + Granada de fumaça (Amarela) M18 M18 füstgránát (Sárga) M18 Granata fumogena (Giallo) @@ -998,7 +999,7 @@ M15 Protitanková Mina M15 Mine antichar M15 противотанковая мина - M15 Mina anticarro + Mina anti-tanqueM15 M15 harckocsiakna M15 Mine anticarro @@ -1010,7 +1011,7 @@ VS-50 Protipěchotní Mina VS-50 Mine antipersonnel à pression VS-50 Противопехотная мина - VS-50 Mina antipessoal + Mina antipessoal VS-50 VS-50 gyalogsági taposóakna VS-50 Mine antiuomo @@ -1022,7 +1023,7 @@ M26 Šrapnelová Mina M26 Mine antipersonnel bondissante M26 Противопехотная мина - M26 Mina saltadora antipessoal + Mina saltadora antipessoal M26 M26 gyalogsági ugróakna M26 Mine saltanti antiuomo @@ -1034,187 +1035,230 @@ PMR-3 Nástražná Mina PMR-3 Mine antipersonnel à traction PMR-3 Противопехотная мина - PMR-3 Mina antipessoal (armadilha) + Mina antipessoal (armadilha) PMR-3 PMR-3 botlódrótos gyalogsági akna PMR-3 Mine antiuomo P99 P99 + P99 MP-443 Grach MP-443 Grach + MP-443 Grach ACP-C2 ACP-C2 + ACP-C2 FNX-45 Tactical FNX-45 Tactical + FNX-45 Tactical Chiappa Rhino 60DS Chiappa Rhino 60DS + Chiappa Rhino 60DS Taurus Judge Taurus Judge + Taurus Judge NLAW NLAW + NLAW RPG-32 RPG-32 + RPG-32 Mini-Spike (AA) Mini-Spike (AA) + Mini-Spike (AA) Mini-Spike (AT) Mini-Spike (AT) + Mini-Spike (AT) MX MX + MX MX (Black) MX (Black) + MX (Preto) MXC MXC + MXC MXC (Black) MXC (Black) + MXC (Preto) MX 3GL MX 3GL + MX 3GL MX 3GL (Black) MX 3GL (Black) + MX 3GL (Preto) MX LSW MX LSW + MX LSW MX LSW (Black) MX LSW (Black) + MX LSW (Preto) MXM MXM + MXM MXM (Black) MXM (Black) + MXM (Preto) KT2002 Katiba KT2002 Katiba + KT2002 Katiba KT2002C Katiba KT2002C Katiba + KT2002C Katiba KT2002 Katiba KGL KT2002 Katiba KGL + KT2002 Katiba KGL F2000 (Camo) F2000 (Camo) + F2000 (Camo) F2000 F2000 + F2000 F2000 Tactical (Camo) F2000 Tactical (Camo) + F2000 Tactical (Camo) F2000 Tactical F2000 Tactical + F2000 Tactical F2000 EGLM (Camo) F2000 EGLM (Camo) + F2000 EGLM (Camo) F2000 EGLM F2000 EGLM + F2000 EGLM TAR-21 TAR-21 + TAR-21 CTAR-21 CTAR-21 + CTAR-21 TAR-21 EGLM TAR-21 EGLM + TAR-21 EGLM Vector SMG Vector SMG + Vector SMG Scorpion Evo 3 A1 Scorpion Evo 3 A1 + Scorpion Evo 3 A1 CPW CPW + CPW RFB SDAR RFB SDAR + RFB SDAR Stoner 99 LMG Stoner 99 LMG + Stoner 99 LMG Negev NG7 Negev NG7 + Negev NG7 Mk14 Mod 1 EBR Mk14 Mod 1 EBR + Mk14 Mod 1 EBR GM6 Lynx GM6 Lynx + GM6 Lynx GM6 Lynx (Camo) GM6 Lynx (Camo) + GM6 Lynx (Camo) M200 Intervention M200 Intervention + M200 Intervention M200 Intervention (Camo) M200 Intervention (Camo) + M200 Intervention (Camo) VS-121 VS-121 + VS-121 - TODO: MAR-10 .338 @@ -1227,7 +1271,6 @@ TODO: MAR-10 .338 (Sand) - TODO: Mk-I EMR 7.62 mm @@ -1249,7 +1292,6 @@ TODO: NATO DMR (provisional) spotter - TODO: ASP-1 Kir 12.7 mm @@ -1259,7 +1301,6 @@ TODO: ASP-1 Kir 12.7 mm (Tan) - TODO: Cyrus 9.3 mm @@ -1272,7 +1313,6 @@ TODO: Cyrus 9.3 mm (Tan) - TODO: Mk14 7.62 mm @@ -1282,7 +1322,6 @@ TODO: Mk14 7.62 mm (Olive) - TODO: Navid 9.3 mm @@ -1292,7 +1331,6 @@ TODO: Navid 9.3 mm (Tan) - TODO: SPMG .338 @@ -1305,6 +1343,5 @@ TODO: SPMG .338 (Sand) - - + \ No newline at end of file diff --git a/addons/reload/stringtable.xml b/addons/reload/stringtable.xml index 40f36c65494..a1deb3d5d3c 100644 --- a/addons/reload/stringtable.xml +++ b/addons/reload/stringtable.xml @@ -1,42 +1,46 @@ - + - - - Check ammo on weapon reload - - - Check the ammo in your new magazine on magazine reload. - - - Check Ammo - Munition prüfen - Verificar munición - Sprawdź amunicję - Vérifier Munitions - Lőszerellenőrzés - Zkontrolovat Munici - Controlla le munizioni - Conferir munições - Kонтроль Боеприпасы - - - Ammo - Munition - Munición - Amunicja - Munitions - Lőszer - Munice - Munizioni - Munições - Боеприпасы - - - Link belt - - - Linking belt... - - - + + + Check ammo on weapon reload + Conferir munição ao recarregar a arma + + + Check the ammo in your new magazine on magazine reload. + Confere a munição no seu novo carregador ao recarregar a arma + + + Check Ammo + Munition prüfen + Verificar munición + Sprawdź amunicję + Vérifier Munitions + Lőszerellenőrzés + Zkontrolovat Munici + Controlla le munizioni + Conferir munições + Kонтроль Боеприпасы + + + Ammo + Munition + Munición + Amunicja + Munitions + Lőszer + Munice + Munizioni + Munições + Боеприпасы + + + Link belt + Ligar cintos de munição + + + Linking belt... + Ligando cintos... + + + \ No newline at end of file diff --git a/addons/reloadlaunchers/stringtable.xml b/addons/reloadlaunchers/stringtable.xml index 6677153419f..ba241c0a638 100644 --- a/addons/reloadlaunchers/stringtable.xml +++ b/addons/reloadlaunchers/stringtable.xml @@ -5,20 +5,22 @@ Load launcher Panzerabwehr laden + Recarregar lançador Loading launcher ... Panzerabwehr wird geladen ... + Recarregando lançador... Launcher loaded Panzerabwehr geladen + Lançador Carregado - Load %1 Lade %1 + Recarregar %1 - - + \ No newline at end of file diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml index 59a9b2b31ce..aa823960f0d 100644 --- a/addons/respawn/stringtable.xml +++ b/addons/respawn/stringtable.xml @@ -1,21 +1,25 @@  - - - Deploy in 5 seconds ... - Wird in 5 Sekunden errichtet ... - - - Rallypoint deployed - Rallypoint errichtet - - - Teleported to Base - Zur Basis teleportiert - - - Teleported to Rallypoint - Zum Rallypoint teleportiert - - - + + + Deploy in 5 seconds ... + Wird in 5 Sekunden errichtet ... + Será posicionado em 5 segundos ... + + + Rallypoint deployed + Rallypoint errichtet + Rallypoints posicionado + + + Teleported to Base + Zur Basis teleportiert + Teletransportado para a Base + + + Teleported to Rallypoint + Zum Rallypoint teleportiert + Teletransportado para o Rallypoints + + + \ No newline at end of file diff --git a/addons/safemode/stringtable.xml b/addons/safemode/stringtable.xml index 9684babfdfd..1697a7a5bca 100644 --- a/addons/safemode/stringtable.xml +++ b/addons/safemode/stringtable.xml @@ -1,42 +1,46 @@  - - - Safe Mode - Waffe sichern - Seguro puesto - Bezpiecznik - Pojistka - Veszélytelenités - Предохранитель - - - Take off Safety - Waffe entsichern - Quitar seguro - Zwolnij bezpiecznik - Uvolnit pojistku - Veszélyesités - Снять с предохранителя - - - Put on Safety - Waffe gesichert - Poner seguro - Zabezpiecz broń - Přepnout pojistku - Veszélytelenitve - Поставить на предохранитель - - - Took off Safety - Waffe entsichert - Seguro quitado - Odbezpieczono broń - Odstranit pojistku - veszélyes - Снят с предохранителя - - + + + Safe Mode + Waffe sichern + Seguro puesto + Bezpiecznik + Pojistka + Veszélytelenités + Предохранитель + Modo de segurança + + + Take off Safety + Waffe entsichern + Quitar seguro + Zwolnij bezpiecznik + Uvolnit pojistku + Veszélyesités + Снять с предохранителя + Tirar segurança + + + Put on Safety + Waffe gesichert + Poner seguro + Zabezpiecz broń + Přepnout pojistku + Veszélytelenitve + Поставить на предохранитель + Colocar Segurança + + + Took off Safety + Waffe entsichert + Seguro quitado + Odbezpieczono broń + Odstranit pojistku + veszélyes + Снят с предохранителя + Tirou Segurança + + \ No newline at end of file diff --git a/addons/switchunits/stringtable.xml b/addons/switchunits/stringtable.xml index 842bf891272..c4a12ac744b 100644 --- a/addons/switchunits/stringtable.xml +++ b/addons/switchunits/stringtable.xml @@ -1,21 +1,23 @@  - - - Switched unit - Einheit gewechselt - Юнит переключен - Prohozená jednotka - Przełącz jednostkę - Cambiado de unidad - - - This unit is too close to the enemy. - Diese Einheit ist zu nah am Feind. - Юнит слишком близок к противнику - Tato jednotka je moc blízko k nepříteli. - Ta jednostka jest zbyt blisko przeciwnika. - Esta unidad está demasiado cerca del enemigo. - - - + + + Switched unit + Einheit gewechselt + Юнит переключен + Prohozená jednotka + Przełącz jednostkę + Cambiado de unidad + Trocado de unidade + + + This unit is too close to the enemy. + Diese Einheit ist zu nah am Feind. + Юнит слишком близок к противнику + Tato jednotka je moc blízko k nepříteli. + Ta jednostka jest zbyt blisko przeciwnika. + Esta unidad está demasiado cerca del enemigo. + Essa unidade está muito perta do inimigo. + + + \ No newline at end of file diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml index 580283dcab8..20d17bd79b5 100644 --- a/addons/vehiclelock/stringtable.xml +++ b/addons/vehiclelock/stringtable.xml @@ -1,116 +1,127 @@  - - - Unlock Vehicle - Fahrzeug aufschließen - Vehículo abierto - Déverrouiller le véhicule - Odblokuj pojazd - Odemknout vozidlo - Jármű nyitása - Открыть машину - - - Lock Vehicle - Fahrzeug abschließen - Vehículo cerrado - Verrouiller le véhicule - Zablokuj pojazd - Zamknout vozidlo - Jármű zárása - Закрыть машину - - - Lockpick Vehicle - Fahrzeug knacken - Forzar vehículo - Crocheter le véhicule - Otwórz zamek - Vypáčit vozidlo - Jármű feltörése - Взломать замок - - - Picking Lock.... - Schloss knacken... - Forzando cierre... - Crochetage... - Otwieranie zamka... - Páčim vozidlo... - Feltörés... - Взламываем замок... - - - A custom key that will open a specific vehicle. - Ein Schlüssel der ein bestimmtes Fahrzeug aufschließt. - Una llave concreta abrirá un vehículo concreto. - Une clé propre à un seul véhicule. - Unikatowy klucz który otworzy konkretny pojazd. - Vlastní klíč, který otevře konkrétní vozidlo. - Kulcs egy járműhez - Ключ от конкретной машины. - - - A Master Key will open any lock, no matter what! - Ein Generalschlüssel der jedes Schloss öffnet... - Una llave maestra abrirá cualquier cierre, no importa cual! - Un passe-partout qui ouvrira n'importe quelle serrure. - Uniwersalny klucz który otworzy każdy zamek. - Hlavní klíč otevře libovolný zámek, bez vyjímek! - Általános kulcs minden járműhez - Универсальный ключ, открывающий любой замок. - - - A lockpick set that can pick the locks of most vehicles. - Ein Dietrich der die meisten Fahrzeugschlösser knacken kann... - Un set de ganzúas puede abrir la mayoría de cerraduras de vehículos. - Un crochet qui ouvrira la plupart des véhicules. - Zestaw wytrychów dzięki któremu można otworzyć zamki w większości pojazdów. - Sada paklíčů, která dokáže odemknout zámky u většiny vozidel. - Álkulcs melyik minden járműt nyitni tud - Набор отмычек, которым можно взломать почти любую машину. - - - A key that should open most WEST vehicles. - Ein Schlüssel der die meisten westlichen Fahrzeuge öffnen sollte... - Una llave que puede abrir la mayoría de vehículos occidentales. - Une clé qui ouvrira la plupart des véhicules WEST. - Klucz który powinien otworzyć większość pojazdów ZACHODU. - Klíč který by měl otevřít většinou Západních vozidel. - Általános kulcs WEST járművekhez - Ключ для открытия большинства машин Запада. - - - A key that should open most EAST vehicle. - Ein Schlüssel der die meisten östlichen Fahrzeuge öffnen sollte... - Una llave que puede abrir la mayoría de vehículos orientales. - Une clé qui ouvrira la plupart des véhicules EAST. - Klucz który powinien otworzyć większość pojazdów WSCHODU. - Általános kulcs EAST járművekhez - Klíč který by měl otevřít vetšinu Východních vozidel. - Ключ для открытия большинства машин Востока. - - - A key that should open most INDEP vehicle. - Ein Schlüssel der die meisten Fahrzeuge der Aufständischen öffnen sollte... - Una llave que puede abrir la mayoría de vehículos independientes. - Une clé qui ouvrira la plupart des véhicules INDEP. - Klucz który powinien otworzyć większość pojazdów INDFOR. - Általános kulcs INDEPENDENT járművekhez - Klíč který by měl otevřít většinu Nezávislých vozidel. - Ключ для открытия большинства машин Независимых. - - - A key that should open most CIV vehicle. - Ein Schlüssel der die meisten zivilen Fahrzeuge öffnen sollte... - Una llave que puede abrir la mayoría de vehículos civiles. - Une clé qui ouvrira la plupart des véhicules CIV. - Klucz który powinien otworzyć większość pojazdów CYWILNYCH. - Klíč který by měl otevřít většinu Civilních vozidel. - Általános kulcs CIVILIAN járművekhez - Ключ для открытия большинства машин Гражданских. - - + + + Unlock Vehicle + Fahrzeug aufschließen + Vehículo abierto + Déverrouiller le véhicule + Odblokuj pojazd + Odemknout vozidlo + Jármű nyitása + Открыть машину + Destravar veículo + + + Lock Vehicle + Fahrzeug abschließen + Vehículo cerrado + Verrouiller le véhicule + Zablokuj pojazd + Zamknout vozidlo + Jármű zárása + Закрыть машину + Travar Veículo + + + Lockpick Vehicle + Fahrzeug knacken + Forzar vehículo + Crocheter le véhicule + Otwórz zamek + Vypáčit vozidlo + Jármű feltörése + Взломать замок + Usar mixa no Veículo + + + Picking Lock.... + Schloss knacken... + Forzando cierre... + Crochetage... + Otwieranie zamka... + Páčim vozidlo... + Feltörés... + Взламываем замок... + Usando Mixa... + + + A custom key that will open a specific vehicle. + Ein Schlüssel der ein bestimmtes Fahrzeug aufschließt. + Una llave concreta abrirá un vehículo concreto. + Une clé propre à un seul véhicule. + Unikatowy klucz który otworzy konkretny pojazd. + Vlastní klíč, který otevře konkrétní vozidlo. + Kulcs egy járműhez + Ключ от конкретной машины. + Uma chave específica que abre um veículo específico. + + + A Master Key will open any lock, no matter what! + Ein Generalschlüssel der jedes Schloss öffnet... + Una llave maestra abrirá cualquier cierre, no importa cual! + Un passe-partout qui ouvrira n'importe quelle serrure. + Uniwersalny klucz który otworzy każdy zamek. + Hlavní klíč otevře libovolný zámek, bez vyjímek! + Általános kulcs minden járműhez + Универсальный ключ, открывающий любой замок. + Uma chave mestre irá abrir qualquer fechadura, não importa qual! + + + A lockpick set that can pick the locks of most vehicles. + Ein Dietrich der die meisten Fahrzeugschlösser knacken kann... + Un set de ganzúas puede abrir la mayoría de cerraduras de vehículos. + Un crochet qui ouvrira la plupart des véhicules. + Zestaw wytrychów dzięki któremu można otworzyć zamki w większości pojazdów. + Sada paklíčů, která dokáže odemknout zámky u většiny vozidel. + Álkulcs melyik minden járműt nyitni tud + Набор отмычек, которым можно взломать почти любую машину. + Um set de chave mixas que pode abrir a maioria dos veículos. + + + A key that should open most WEST vehicles. + Ein Schlüssel der die meisten westlichen Fahrzeuge öffnen sollte... + Una llave que puede abrir la mayoría de vehículos occidentales. + Une clé qui ouvrira la plupart des véhicules WEST. + Klucz który powinien otworzyć większość pojazdów ZACHODU. + Klíč který by měl otevřít většinou Západních vozidel. + Általános kulcs WEST járművekhez + Ключ для открытия большинства машин Запада. + Uma chave que abre a maioria dos veículos ocidentais + + + A key that should open most EAST vehicle. + Ein Schlüssel der die meisten östlichen Fahrzeuge öffnen sollte... + Una llave que puede abrir la mayoría de vehículos orientales. + Une clé qui ouvrira la plupart des véhicules EAST. + Klucz który powinien otworzyć większość pojazdów WSCHODU. + Általános kulcs EAST járművekhez + Klíč který by měl otevřít vetšinu Východních vozidel. + Ключ для открытия большинства машин Востока. + Uma chave que abre a maioria dos veículos orientais + + + A key that should open most INDEP vehicle. + Ein Schlüssel der die meisten Fahrzeuge der Aufständischen öffnen sollte... + Una llave que puede abrir la mayoría de vehículos independientes. + Une clé qui ouvrira la plupart des véhicules INDEP. + Klucz który powinien otworzyć większość pojazdów INDFOR. + Általános kulcs INDEPENDENT járművekhez + Klíč který by měl otevřít většinu Nezávislých vozidel. + Ключ для открытия большинства машин Независимых. + Uma chave que abre a maioria dos veículos independentes + + + A key that should open most CIV vehicle. + Ein Schlüssel der die meisten zivilen Fahrzeuge öffnen sollte... + Una llave que puede abrir la mayoría de vehículos civiles. + Une clé qui ouvrira la plupart des véhicules CIV. + Klucz który powinien otworzyć większość pojazdów CYWILNYCH. + Klíč který by měl otevřít většinu Civilních vozidel. + Általános kulcs CIVILIAN járművekhez + Ключ для открытия большинства машин Гражданских. + Uma chave que abre a maioria dos veículos civis. + + \ No newline at end of file diff --git a/addons/weaponselect/stringtable.xml b/addons/weaponselect/stringtable.xml index 3a39d593963..684168f2f2e 100644 --- a/addons/weaponselect/stringtable.xml +++ b/addons/weaponselect/stringtable.xml @@ -1,254 +1,256 @@  - - - Display text on grenade throw - - - Display a hint or text on grenade throw. - - - Select Pistol - Pistole auswählen - Seleccionar pistola - Wybierz pistolet - Zvolit příruční zbraň - Выбрать пистолет - Sélectionner Pistolet - Pisztoly Kiválasztása - Selecionar Pistola - Seleziona la Pistola - - - Select Rifle - Gewehr auswählen - Seleccionar fusil - Wybierz karabin - Zvolit hlavní zbraň - Выбрать автомат - Sélectionner Fusil - Puska Kiválasztása - Selecionar Rifle - Seleziona il Fucile - - - Select Launcher - Raketenwerfer auswählen - Seleccionar lanzador - Wybierz wyrzutnię - Zvolit Raketomet - Выбрать гранатомет - Sélectionner Lanceur - Rakétavető Kiválasztása - Selecionar Lançador - Seleziona il Lanciatore - - - Select Grenade Launcher - Granatwerfer auswählen - Seleccionar lanzador de granadas - Wybierz granatnik - Zvolit Granátomet - Выбрать подствольный гранатомет - Sélectionner Lance-grenades - Gránátvető Kiválasztása - Selecionar Lança-Granadas - Seleziona il Lanciagranate - - - Select Binoculars - Fernglas auswählen - Seleccionar prismáticos - Wybierz lornetkę - Zvolit Dalekohled - Выбрать бинокль - Sélectionner Jumelles - Távcső Kiválasztása - Selecionar Binóculos - Seleziona il Binocolo - - - Holster Weapon - Waffe holstern - Enfundar el arma - Schowaj broń - Schovat zbraň - Убрать оружие - Arme à la bretelle - Fegyvert tokba - Guardar Arma - Nascondi l'arma - - - Engine on - Motor an - Encender motor - Włącz silnik - Moteur allumé - Motor indítása - Zapnout motor - Ligar Motor - Motore acceso - Включить двигатель - - - Engine off - Motor aus - Apagar motor - Wyłącz silnik - Moteur éteint - Motor leállítása - Vypnout motor - Desligar Motor - Motore spento - Выключить двигатель - - - Select Main Gun - Hauptgeschütz auswählen - Seleccionar arma principal - Wybierz główną broń - Sélectionner l'Arme Principale - Elsődleges Fegyver Kiválasztása - Zvolit Hlavní Zbraň - Selecionar Arma Principal - Seleziona Arma Primaria - Выбрать основное оружие - - - Select Machine Gun - Maschinengewehr auswählen - Seleccionar ametralladora - Wybierz karabin maszynowy - Sélectionner Mitrailleuse - Géppuska Kiválasztása - Zvolit Kulomet - Selecionar Metralhadora - Seleziona Mitragliatrice - Выбрать пулемёт - - - Select Missiles - Raketen auswählen - Seleccionar misiles - Wybierz rakiety - Sélectionner Missiles - Rakéták Kiválasztása - Zvolit Rakety - Selecionar Mísseis - Seleziona Missili - Выбрать ракеты - - - Grenade %1 - Granate %1 - Granada %1 - Granat %1 - Granát %1 - Gránát Kiválasztása - Граната %1 - - - Ready Grenade - Granate nehmen - Granada lista - Przygotuj granat - Odjistit granát - Kész Gránát - Подготовить гранату - - - Select Frag Grenade - Explosive Granate auswählen - Seleccionar granada de fragmenación - Wybierz granat odłamkowy - Sélectionner grenade à fragmentation - Repeszgránát Kiválasztása - Zvolit Výbušný Granát - Selecionar Granada de Fragmentação - Seleziona Granata a Frammentazione - Выбрать осколочную гранату - - - Select Non-Frag Grenade - Nichtexplosive Granate auswählen - Seleccionar granada de no fragmentación - Wybierz granat nieodłamkowy - Sélectionner grenade non-léthale - Nem Robbanó Gránát Kiválasztása - Zvolit Ne-Výbušný Granát - Selecionar Granada - Seleziona Altre Granate - Выбрать гранату - - - Throw Selected Grenade - Gewählte Granate werfen - Arrojar granada seleccionada - Rzuć wybrany granat - Lancer la grenade sélectionnée - Kiválasztott Gránát Eldobása - Hodit Zvolený Granát - Lançar Granada Selecionada - Lancia la Granata Selezionata - Бросить выбранную гранату - - - No grenades left - Keine Granaten übrig - No quedan granadas - Plus de grenades - Brak granatów - Žádné granáty - Nincs több gránát - Гранат не осталось - - - No frags left - Keine explosiven Granaten übrig - Sin granadas de fragmentación - Brak granatów odłamkowych - Plus de grenades à fragmentation - Nincs több repeszgránát - Už nejsou granáty - Não há granadas de fragmentação restantes - Nessuna granata a frammentazione rimanente - Осколочныких гранат нет - - - No misc. grenades left - Keine nichtexplosiven Granaten übrig - Sin granadas de varias - Brak granatów nieodłamkowych - Plus de grenades non-léthales - Nincs több egyéb gránát - Už nejsou žádné ostatní granáty - Não há outras granadas restantes - Nessun'altra granata rimanente. - Невзрывоопасные гранаты закончились - - - No grenade selected - Keine Granate ausgewählt - Granada no seleccionada - Nie wybrano żadnego granatu - Aucune grenade sélectionnée - Nincs kiválasztva gránát - Není zvolen žádný granát - Nenhuma granada selecionada - Nessuna granata selezionata - Нет выбранной гранаты - - - Fire Smoke Launcher - Rauchwand abfeuern - Disparar lanzador de humo - Kouřový odpalovač - Tirer le lance-pots fumigènes - Wystrzel granat dymny - Füst kilövése - Запустить дымовую завесу - - + + + Display text on grenade throw + Mostrat texto ao lançar granada + + + Display a hint or text on grenade throw. + Mostra um hint ou texto ao lançar uma granada + + + Select Pistol + Pistole auswählen + Seleccionar pistola + Wybierz pistolet + Zvolit příruční zbraň + Выбрать пистолет + Sélectionner Pistolet + Pisztoly Kiválasztása + Selecionar Pistola + Seleziona la Pistola + + + Select Rifle + Gewehr auswählen + Seleccionar fusil + Wybierz karabin + Zvolit hlavní zbraň + Выбрать автомат + Sélectionner Fusil + Puska Kiválasztása + Selecionar Rifle + Seleziona il Fucile + + + Select Launcher + Raketenwerfer auswählen + Seleccionar lanzador + Wybierz wyrzutnię + Zvolit Raketomet + Выбрать гранатомет + Sélectionner Lanceur + Rakétavető Kiválasztása + Selecionar Lançador + Seleziona il Lanciatore + + + Select Grenade Launcher + Granatwerfer auswählen + Seleccionar lanzador de granadas + Wybierz granatnik + Zvolit Granátomet + Выбрать подствольный гранатомет + Sélectionner Lance-grenades + Gránátvető Kiválasztása + Selecionar Lança-Granadas + Seleziona il Lanciagranate + + + Select Binoculars + Fernglas auswählen + Seleccionar prismáticos + Wybierz lornetkę + Zvolit Dalekohled + Выбрать бинокль + Sélectionner Jumelles + Távcső Kiválasztása + Selecionar Binóculos + Seleziona il Binocolo + + + Holster Weapon + Waffe holstern + Enfundar el arma + Schowaj broń + Schovat zbraň + Убрать оружие + Arme à la bretelle + Fegyvert tokba + Guardar Arma + Nascondi l'arma + + + Engine on + Motor an + Encender motor + Włącz silnik + Moteur allumé + Motor indítása + Zapnout motor + Ligar Motor + Motore acceso + Включить двигатель + + + Engine off + Motor aus + Apagar motor + Wyłącz silnik + Moteur éteint + Motor leállítása + Vypnout motor + Desligar Motor + Motore spento + Выключить двигатель + + + Select Main Gun + Hauptgeschütz auswählen + Seleccionar arma principal + Wybierz główną broń + Sélectionner l'Arme Principale + Elsődleges Fegyver Kiválasztása + Zvolit Hlavní Zbraň + Selecionar Arma Principal + Seleziona Arma Primaria + Выбрать основное оружие + + + Select Machine Gun + Maschinengewehr auswählen + Seleccionar ametralladora + Wybierz karabin maszynowy + Sélectionner Mitrailleuse + Géppuska Kiválasztása + Zvolit Kulomet + Selecionar Metralhadora + Seleziona Mitragliatrice + Выбрать пулемёт + + + Select Missiles + Raketen auswählen + Seleccionar misiles + Wybierz rakiety + Sélectionner Missiles + Rakéták Kiválasztása + Zvolit Rakety + Selecionar Mísseis + Seleziona Missili + Выбрать ракеты + + + Grenade %1 + Granate %1 + Granada %1 + Granat %1 + Granát %1 + Gránát Kiválasztása + Граната %1 + + + Ready Grenade + Granate nehmen + Granada lista + Przygotuj granat + Odjistit granát + Kész Gránát + Подготовить гранату + + + Select Frag Grenade + Explosive Granate auswählen + Seleccionar granada de fragmenación + Wybierz granat odłamkowy + Sélectionner grenade à fragmentation + Repeszgránát Kiválasztása + Zvolit Výbušný Granát + Selecionar Granada de Fragmentação + Seleziona Granata a Frammentazione + Выбрать осколочную гранату + + + Select Non-Frag Grenade + Nichtexplosive Granate auswählen + Seleccionar granada de no fragmentación + Wybierz granat nieodłamkowy + Sélectionner grenade non-léthale + Nem Robbanó Gránát Kiválasztása + Zvolit Ne-Výbušný Granát + Selecionar Granada + Seleziona Altre Granate + Выбрать гранату + + + Throw Selected Grenade + Gewählte Granate werfen + Arrojar granada seleccionada + Rzuć wybrany granat + Lancer la grenade sélectionnée + Kiválasztott Gránát Eldobása + Hodit Zvolený Granát + Lançar Granada Selecionada + Lancia la Granata Selezionata + Бросить выбранную гранату + + + No grenades left + Keine Granaten übrig + No quedan granadas + Plus de grenades + Brak granatów + Žádné granáty + Nincs több gránát + Гранат не осталось + + + No frags left + Keine explosiven Granaten übrig + Sin granadas de fragmentación + Brak granatów odłamkowych + Plus de grenades à fragmentation + Nincs több repeszgránát + Už nejsou granáty + Não há granadas de fragmentação restantes + Nessuna granata a frammentazione rimanente + Осколочныких гранат нет + + + No misc. grenades left + Keine nichtexplosiven Granaten übrig + Sin granadas de varias + Brak granatów nieodłamkowych + Plus de grenades non-léthales + Nincs több egyéb gránát + Už nejsou žádné ostatní granáty + Não há outras granadas restantes + Nessun'altra granata rimanente. + Невзрывоопасные гранаты закончились + + + No grenade selected + Keine Granate ausgewählt + Granada no seleccionada + Nie wybrano żadnego granatu + Aucune grenade sélectionnée + Nincs kiválasztva gránát + Není zvolen žádný granát + Nenhuma granada selecionada + Nessuna granata selezionata + Нет выбранной гранаты + + + Fire Smoke Launcher + Rauchwand abfeuern + Disparar lanzador de humo + Kouřový odpalovač + Tirer le lance-pots fumigènes + Wystrzel granat dymny + Füst kilövése + Запустить дымовую завесу + + \ No newline at end of file diff --git a/addons/wep_javelin/stringtable.xml b/addons/wep_javelin/stringtable.xml index 4068d6f0a64..9e35165cb26 100644 --- a/addons/wep_javelin/stringtable.xml +++ b/addons/wep_javelin/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -10,8 +10,9 @@ Lock Target (Hold) Lock Target (Hold) Lock Target (Hold) + Travar Alvo(Segurar) - + Cycle Fire Mode Cycle Fire Mode Cycle Fire Mode @@ -19,6 +20,7 @@ Cycle Fire Mode Cycle Fire Mode Cycle Fire Mode + Alterar Modo de Disparo - + \ No newline at end of file diff --git a/addons/winddeflection/stringtable.xml b/addons/winddeflection/stringtable.xml index b52100046f3..85470214c52 100644 --- a/addons/winddeflection/stringtable.xml +++ b/addons/winddeflection/stringtable.xml @@ -1,32 +1,37 @@ - - - - - - Wind Information - Informacje o wietrze - Información del viento - - - Direction: %1 - Kierunek: %1 - Dirección: %1 - - - Speed: %1 m/s - Prędkość: %1 - Velocidad: %1 m/s - - - Weather Information - Informacje o pogodzie - Información Meteorológica - - - Humidity: %1% - Wilgotność: %1 - Humedad: %1% - - - - + + + + + + Wind Information + Informacje o wietrze + Información del viento + Informação do vento + + + Direction: %1 + Kierunek: %1 + Dirección: %1 + Direção: %1 + + + Speed: %1 m/s + Prędkość: %1 + Velocidad: %1 m/s + Velocidade: %1 m/s + + + Weather Information + Informacje o pogodzie + Información Meteorológica + Informação Meteorológica + + + Humidity: %1% + Wilgotność: %1 + Humedad: %1% + Humidade: %1% + + + + \ No newline at end of file From ba89bc8faa2ef596cc881aeba3350ec7a19acd3c Mon Sep 17 00:00:00 2001 From: VyMajoris Date: Sun, 26 Apr 2015 03:15:25 -0300 Subject: [PATCH 034/171] Added - Myself to AUTHORS.txt --- AUTHORS.txt | 1 + addons/common/stringtable.xml | 728 +++++++++++++++++----------------- 2 files changed, 365 insertions(+), 364 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index b931d774acf..1241015ae9e 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -65,3 +65,4 @@ simon84 Tonic Tourorist Valentin Torikian +VyMajoris(W-Cephei) diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index f8a25c62693..28de0b430e8 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -1,366 +1,366 @@ - + - - - ACE-Team - ACE-Team - ACE-Team - ACE-Team - ACE-Team - ACE-Team - Команда ACE - ACE-Team - ACE-Team - ACE-Team - - - Save - Speichern - Guardar - Zapisz - Uložit - Sauvegarder - Сохранить - Salvar - Mentés - Salva - - - Cancel - Abbrechen - Cancelar - Anuluj - Zrušit - Annuler - Отмена - Cancelar - Mégse - Annulla - - - ACE Options - ACE Optionen - Opciones ACE - Opcje ACE - ACE Nastavení - ACE Options - ACE Настройки - Opções do ACE - ACE Opciók - Opzioni ACE - - - - N - N - N - N - S - N - С - N - É - N - - - NNE - NNO - NNE - NNE - SSV - NNE - ССВ - NNE - ÉÉK - NNE - - - NE - NO - NE - NE - SV - NE - СВ - NE - ÉK - NE - - - ENE - ONO - ENE - ENE - VSV - ENE - ВСВ - LNE - KÉK - ENE - - - E - O - E - E - V - E - В - L - K - E - - - ESE - OSO - ESE - ESE - VJV - ESE - ВЮВ - LSE - KDK - ESE - - - SE - SO - SE - SE - JV - SE - ЮВ - SE - DK - SE - - - SSE - SSO - SSE - SSE - JJV - SSE - ЮЮВ - SSE - DDK - SSE - - - S - S - S - S - J - S - Ю - S - D - S - - - SSW - SSW - SSO - SSW - JJZ - SSO - ЮЮЗ - SSO - DDNy - SSO - - - SW - SW - SO - SW - JZ - SO - ЮЗ - SO - DNy - SO - - - WSW - WSW - OSO - WSW - ZJZ - OSO - ЗЮЗ - OSO - NyDNy - OSO - - - W - W - O - W - Z - O - З - O - Ny - O - - - WNW - WNW - ONO - WNW - ZSZ - ONO - ЗСЗ - ONO - NyÉNy - ONO - - - NW - NW - NO - NW - SZ - NO - СЗ - NO - ÉNy - NO - - - NNW - NNW - NNO - NNW - SSZ - NNO - ССЗ - NNO - ÉÉNy - NNO - - - Action cancelled. - Aktion abgebrochen. - Acción cancelada. - Przerwano czynność - Akce přerušena - Action annulée. - Действие отменено. - Ação cancelada. - Művelet megszakítva. - Azione cancellata. - - - [ACE] Miscellaneous Items - [ACE] Verschiedenes - [ACE] Objetos varios - [ACE] Różne przedmioty - [ACE] Ostatní předměty - [ACE] Objets divers - [ACE] Различные предметы - [ACE] Itens diversos - [ACE] Egyéb tárgyak - [ACE] Oggetti vari - - - Disable Command Menu - Befehlsmenü ausschalten - Desactivar menú de mando - Wyłącz menu dowodzenia - Vypnout velící menu - Désactiver Menu Commande - Выключить командное меню - Parancsnoki menü kikapcsolása - Desabilitar menu de comando - - - Unknown - Unbekannt - Desconocido - Nieznany - Neznámý - Неизвестно - Ismeretlen - Desconhecido - - - No Voice - Keine Stimme - Sin voz - Brak głosu - Žádný hlas - Без голоса - Nincs hang - Sem voz - - - Akceptuj prośby - Aceptar Peticiones - Accept Requests - Aceitar Pedido - - - Ignoruj prośby - Rechazar Peticiones - Decline Requests - Rejeitar pedido - - - Akceptuj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności. - Acepta Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones. - Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions. - Aceitar pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações. - - - Ignoruj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności. - Rechazar Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones. - Decline Requests send by other players. These can be requests to use / share equipment, perform certain actions. - Rejeita pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações. - - - Feedback icons - Ícones de Feedback - - - Select the position of or disable the feedback icons on your screen. These icons will show to provide extra feedback on your character status and actions performed. - Selecione a posição ou disabilite a posição dos ícones de feedback na sua tela. Esses ícones irão aparecer para mostrar feedback extra do status do seu personagem e ações realizadas. - - - Progress bar location - Local da barra de progresso - - - Set the desired location of the progress bar on your screen. - Define o local desejado da barra de progresso na sua tela. - - - Hint Background color - Cor do fundo da hint - - - The color of the background from the ACE hints. - A cor de fundo das hints do ACE. - - - Hint text font color - Cor do do texto da hint - - - The color of the text font from the ACE hints. This color is the default color for all text displayed through the ACE Hint system, if the hint text has no other color specified. - A cor do texto das hints do ACE. Essa cor é a cor default para todos os texos exibidos pelo sistema de hints do ACE , caso o texto da hint não tem outra cor especificada. - - - Banana - Banana - - - A banana is an edible fruit, botanically a berry, produced by several kinds of large herbaceous flowering plants in the genus Musa. - A banana é uma fruta comestível, botanicamente uma baga, produzida por vários tipos de plantas herbáceas grandes do genero Musa. - - - + + + ACE-Team + ACE-Team + ACE-Team + ACE-Team + ACE-Team + ACE-Team + Команда ACE + ACE-Team + ACE-Team + ACE-Team + + + Save + Speichern + Guardar + Zapisz + Uložit + Sauvegarder + Сохранить + Salvar + Mentés + Salva + + + Cancel + Abbrechen + Cancelar + Anuluj + Zrušit + Annuler + Отмена + Cancelar + Mégse + Annulla + + + ACE Options + ACE Optionen + Opciones ACE + Opcje ACE + ACE Nastavení + ACE Options + ACE Настройки + Opções do ACE + ACE Opciók + Opzioni ACE + + + + N + N + N + N + S + N + С + N + É + N + + + NNE + NNO + NNE + NNE + SSV + NNE + ССВ + NNE + ÉÉK + NNE + + + NE + NO + NE + NE + SV + NE + СВ + NE + ÉK + NE + + + ENE + ONO + ENE + ENE + VSV + ENE + ВСВ + LNE + KÉK + ENE + + + E + O + E + E + V + E + В + L + K + E + + + ESE + OSO + ESE + ESE + VJV + ESE + ВЮВ + LSE + KDK + ESE + + + SE + SO + SE + SE + JV + SE + ЮВ + SE + DK + SE + + + SSE + SSO + SSE + SSE + JJV + SSE + ЮЮВ + SSE + DDK + SSE + + + S + S + S + S + J + S + Ю + S + D + S + + + SSW + SSW + SSO + SSW + JJZ + SSO + ЮЮЗ + SSO + DDNy + SSO + + + SW + SW + SO + SW + JZ + SO + ЮЗ + SO + DNy + SO + + + WSW + WSW + OSO + WSW + ZJZ + OSO + ЗЮЗ + OSO + NyDNy + OSO + + + W + W + O + W + Z + O + З + O + Ny + O + + + WNW + WNW + ONO + WNW + ZSZ + ONO + ЗСЗ + ONO + NyÉNy + ONO + + + NW + NW + NO + NW + SZ + NO + СЗ + NO + ÉNy + NO + + + NNW + NNW + NNO + NNW + SSZ + NNO + ССЗ + NNO + ÉÉNy + NNO + + + Action cancelled. + Aktion abgebrochen. + Acción cancelada. + Przerwano czynność + Akce přerušena + Action annulée. + Действие отменено. + Ação cancelada. + Művelet megszakítva. + Azione cancellata. + + + [ACE] Miscellaneous Items + [ACE] Verschiedenes + [ACE] Objetos varios + [ACE] Różne przedmioty + [ACE] Ostatní předměty + [ACE] Objets divers + [ACE] Различные предметы + [ACE] Itens diversos + [ACE] Egyéb tárgyak + [ACE] Oggetti vari + + + Disable Command Menu + Befehlsmenü ausschalten + Desactivar menú de mando + Wyłącz menu dowodzenia + Vypnout velící menu + Désactiver Menu Commande + Выключить командное меню + Parancsnoki menü kikapcsolása + Desabilitar menu de comando + + + Unknown + Unbekannt + Desconocido + Nieznany + Neznámý + Неизвестно + Ismeretlen + Desconhecido + + + No Voice + Keine Stimme + Sin voz + Brak głosu + Žádný hlas + Без голоса + Nincs hang + Sem voz + + + Akceptuj prośby + Aceptar Peticiones + Accept Requests + Aceitar Pedido + + + Ignoruj prośby + Rechazar Peticiones + Decline Requests + Rejeitar pedido + + + Akceptuj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności. + Acepta Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones. + Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions. + Aceitar pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações. + + + Ignoruj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności. + Rechazar Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones. + Decline Requests send by other players. These can be requests to use / share equipment, perform certain actions. + Rejeita pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações. + + + Feedback icons + Ícones de Feedback + + + Select the position of or disable the feedback icons on your screen. These icons will show to provide extra feedback on your character status and actions performed. + Selecione a posição ou disabilite a posição dos ícones de feedback na sua tela. Esses ícones irão aparecer para mostrar feedback extra do status do seu personagem e ações realizadas. + + + Progress bar location + Local da barra de progresso + + + Set the desired location of the progress bar on your screen. + Define o local desejado da barra de progresso na sua tela. + + + Hint Background color + Cor do fundo da hint + + + The color of the background from the ACE hints. + A cor de fundo das hints do ACE. + + + Hint text font color + Cor do do texto da hint + + + The color of the text font from the ACE hints. This color is the default color for all text displayed through the ACE Hint system, if the hint text has no other color specified. + A cor do texto das hints do ACE. Essa cor é a cor default para todos os texos exibidos pelo sistema de hints do ACE, caso o texto da hint não tem outra cor especificada. + + + Banana + Banana + + + A banana is an edible fruit, botanically a berry, produced by several kinds of large herbaceous flowering plants in the genus Musa. + A banana é uma fruta comestível, botanicamente uma baga, produzida por vários tipos de plantas herbáceas grandes do genero Musa. + + + \ No newline at end of file From fc08ebb0a5ac482fe684b8e634d8e1d5015d6bf3 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Sun, 26 Apr 2015 11:19:25 +0200 Subject: [PATCH 035/171] added "isNotInside" exception to unload --- addons/medical/CfgVehicles.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 2de90e77d05..339abe5a424 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -467,7 +467,7 @@ class CfgVehicles { showDisabled = 0; priority = 2; icon = PATHTOF(UI\icons\medical_cross.paa); - exceptions[] = {"isNotDragging", "isNotCarrying"}; + exceptions[] = {"isNotDragging", "isNotCarrying", "isNotInside"}; }; }; }; From 6170ef0d5033fb24b81225b5622e78dd56b41a11 Mon Sep 17 00:00:00 2001 From: ulteq Date: Sun, 26 Apr 2015 23:05:58 +0200 Subject: [PATCH 036/171] Code cleanup --- addons/frag/CfgVehicles.hpp | 0 addons/frag/XEH_post_init.sqf | 17 ++--------- addons/frag/XEH_pre_Init.sqf | 29 ++++++------------- addons/frag/config.cpp | 4 +-- .../frag/functions/fnc_BIS_ARTY_WRAPPER.sqf | 13 --------- addons/frag/functions/fnc_addBlackList.sqf | 4 --- addons/frag/functions/fnc_addManualTrack.sqf | 7 ----- addons/frag/functions/fnc_clearTraces.sqf | 2 -- addons/frag/functions/fnc_denyFrag.sqf | 7 ----- addons/frag/functions/fnc_frag_trace.sqf | 10 ------- addons/frag/functions/fnc_vectorDiffFast.sqf | 15 ---------- 11 files changed, 12 insertions(+), 96 deletions(-) delete mode 100644 addons/frag/CfgVehicles.hpp delete mode 100644 addons/frag/functions/fnc_BIS_ARTY_WRAPPER.sqf delete mode 100644 addons/frag/functions/fnc_addBlackList.sqf delete mode 100644 addons/frag/functions/fnc_addManualTrack.sqf delete mode 100644 addons/frag/functions/fnc_clearTraces.sqf delete mode 100644 addons/frag/functions/fnc_denyFrag.sqf delete mode 100644 addons/frag/functions/fnc_frag_trace.sqf delete mode 100644 addons/frag/functions/fnc_vectorDiffFast.sqf diff --git a/addons/frag/CfgVehicles.hpp b/addons/frag/CfgVehicles.hpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/addons/frag/XEH_post_init.sqf b/addons/frag/XEH_post_init.sqf index 9769148871f..6c8d64d1fbf 100644 --- a/addons/frag/XEH_post_init.sqf +++ b/addons/frag/XEH_post_init.sqf @@ -1,18 +1,5 @@ #include "script_component.hpp" + if(isServer) then { [QGVAR(frag_eh), { _this call FUNC(frago); }] call ace_common_fnc_addEventHandler; -}; -/* -GVAR(replacedBisArtyWrapper) = false; -[] spawn { - waitUntil { - if(!(isNil "BIS_ARTY_F_ShellFlight")) then { - ACE_WRAPPER_BIS_ARTY_F_ShellFlight = BIS_ARTY_F_ShellFlight; - BIS_ARTY_F_ShellFlight = FUNC(BIS_ARTY_WRAPPER); - GVAR(replacedBisArtyWrapper) = true; - }; - sleep 4; - GVAR(replacedBisArtyWrapper) - }; -}; -*/ \ No newline at end of file +}; \ No newline at end of file diff --git a/addons/frag/XEH_pre_Init.sqf b/addons/frag/XEH_pre_Init.sqf index 5fb261cc053..cefd77d9219 100644 --- a/addons/frag/XEH_pre_Init.sqf +++ b/addons/frag/XEH_pre_Init.sqf @@ -1,48 +1,37 @@ #include "script_component.hpp" - ADDON = false; +PREP(doSpall); PREP(fired); PREP(frago); -PREP(trackFragRound); PREP(spallTrack); -PREP(doSpall); -PREP(vectorDiffFast); +PREP(trackFragRound); -GVAR(trackedObjects) = []; GVAR(blackList) = []; GVAR(traceFrags) = false; - -GVAR(replacedBisArtyWrapper) = true; +GVAR(trackedObjects) = []; GVAR(TOTALFRAGS) = 0; -GVAR(spallIsTrackingCount) = 0; GVAR(spallHPData) = []; +GVAR(spallIsTrackingCount) = 0; +GVAR(autoTrace) = true; +GVAR(traceID) = -1; GVAR(traces) = []; GVAR(tracesStarted) = false; -GVAR(traceID) = -1; -GVAR(autoTrace) = true; // TODO setting GVAR(enabled) = true; - // * Other Shit */ -PREP(frag_trace); -PREP(denyFrag); -PREP(BIS_ARTY_WRAPPER); -PREP(startTracing); -PREP(stopTracing); -PREP(clearTraces); -PREP(trackTrace); PREP(addTrack); PREP(drawTraces); PREP(removeTrack); PREP(spallHP); -PREP(addBlackList); -PREP(addManualTrack); +PREP(startTracing); +PREP(stopTracing); +PREP(trackTrace); ADDON = true; diff --git a/addons/frag/config.cpp b/addons/frag/config.cpp index 4c1fb71e151..c9dff6bac6d 100644 --- a/addons/frag/config.cpp +++ b/addons/frag/config.cpp @@ -10,7 +10,5 @@ class CfgPatches { }; }; -//PRELOAD_ADDONS; - #include "CfgEventhandlers.hpp" -#include "CfgAmmo.hpp" +#include "CfgAmmo.hpp" \ No newline at end of file diff --git a/addons/frag/functions/fnc_BIS_ARTY_WRAPPER.sqf b/addons/frag/functions/fnc_BIS_ARTY_WRAPPER.sqf deleted file mode 100644 index 0d71cf58ac8..00000000000 --- a/addons/frag/functions/fnc_BIS_ARTY_WRAPPER.sqf +++ /dev/null @@ -1,13 +0,0 @@ -#include "script_component.hpp" -_ret = [(_this select 6)] call FUNC(removeTrack); -if(!_ret) then { - [(_this select 6)] call FUNC(addBlackList); -}; -_this call ACE_WRAPPER_BIS_ARTY_F_ShellFlight; -_catEntry = BIS_ARTY_SHELLCAT select ((count BIS_ARTY_SHELLCAT) - 1); -_shell = _catEntry select 0; -_ARTY_DeployOnImpact = getText (configFile >> "CfgAmmo" >> "ARTY_DeployOnImpact"); -if(_ARTY_DeployOnImpact == "") then { - _this set[6, _shell]; - _this call FUNC(fired); -}; \ No newline at end of file diff --git a/addons/frag/functions/fnc_addBlackList.sqf b/addons/frag/functions/fnc_addBlackList.sqf deleted file mode 100644 index f7b3faf9026..00000000000 --- a/addons/frag/functions/fnc_addBlackList.sqf +++ /dev/null @@ -1,4 +0,0 @@ -#include "script_component.hpp" -private ["_round"]; -_round = _this select 0; -GVAR(blackList) set[(count GVAR(blackList)), _round]; \ No newline at end of file diff --git a/addons/frag/functions/fnc_addManualTrack.sqf b/addons/frag/functions/fnc_addManualTrack.sqf deleted file mode 100644 index 3dc14cc7484..00000000000 --- a/addons/frag/functions/fnc_addManualTrack.sqf +++ /dev/null @@ -1,7 +0,0 @@ -#include "script_component.hpp" -private ["_round"]; -_round = _this select 0; -if(alive _round) then { - GVAR(trackedObjects) set[(count GVAR(trackedObjects)), _round]; - [DFUNC(trackFragRound), 0, [_round, (getPosASL _round), (velocity _round), (typeOf _round), time, objNull, false, 0, 0]] call cba_fnc_addPerFrameHandler; -}; \ No newline at end of file diff --git a/addons/frag/functions/fnc_clearTraces.sqf b/addons/frag/functions/fnc_clearTraces.sqf deleted file mode 100644 index b301094044c..00000000000 --- a/addons/frag/functions/fnc_clearTraces.sqf +++ /dev/null @@ -1,2 +0,0 @@ -#include "script_component.hpp" -GVAR(traces) = []; \ No newline at end of file diff --git a/addons/frag/functions/fnc_denyFrag.sqf b/addons/frag/functions/fnc_denyFrag.sqf deleted file mode 100644 index 6c4aa9bf8d0..00000000000 --- a/addons/frag/functions/fnc_denyFrag.sqf +++ /dev/null @@ -1,7 +0,0 @@ -#include "script_component.hpp" - -private ["_ret"]; -_ret = [(_this select 0)] call FUNC(removeTrack); -if(!_ret) then { - [(_this select 0)] call FUNC(addBlackList); -}; \ No newline at end of file diff --git a/addons/frag/functions/fnc_frag_trace.sqf b/addons/frag/functions/fnc_frag_trace.sqf deleted file mode 100644 index 664e117793a..00000000000 --- a/addons/frag/functions/fnc_frag_trace.sqf +++ /dev/null @@ -1,10 +0,0 @@ -#include "script_component.hpp" - -private ["_params", "_shell"]; -_params = _this select 0; -_shell = _params select 0; -if(alive _shell) then { - drop ["\Ca\Data\Cl_basic","","Billboard",1,30,(getPos _shell),[0,0,0],1,1.275,1.0,0.0,[0.5],[[0,1,0,1]],[0],0.0,2.0,"","",""]; -} else { - [_this select 1] call cba_fnc_removePerFrameHandler; -}; \ No newline at end of file diff --git a/addons/frag/functions/fnc_vectorDiffFast.sqf b/addons/frag/functions/fnc_vectorDiffFast.sqf deleted file mode 100644 index 0a41860727c..00000000000 --- a/addons/frag/functions/fnc_vectorDiffFast.sqf +++ /dev/null @@ -1,15 +0,0 @@ -#include "script_component.hpp" -private["_p1","_p2","_return"]; - -_p1 = _this select 0; -_p2 = _this select 1; - -if ((count _p1) != (count _p2)) then {textLogFormat ["BIS_FNC Error: vectors not of same size"]}; - -_return = []; - -{ - _return set[_forEachIndex, (_p2 select _forEachIndex) - _x]; -} forEach _p1; - -_return From 1fc044dfa9e9954574942fd172462fe5f3dc136a Mon Sep 17 00:00:00 2001 From: ulteq Date: Sun, 26 Apr 2015 23:14:54 +0200 Subject: [PATCH 037/171] Cleanup++: *Moved GVAR(enabled) into ACE_Settings.hpp *Replaced BIS_fnc_magnitude with vectorMagnitude *Renamed Nou_GBU12 *Added G_40mm_HE config data --- addons/frag/ACE_Settings.hpp | 8 ++++++++ addons/frag/CfgAmmo.hpp | 9 ++++++--- addons/frag/XEH_pre_Init.sqf | 3 --- addons/frag/config.cpp | 3 ++- addons/frag/functions/fnc_doSpall.sqf | 4 ++-- addons/frag/functions/fnc_fired.sqf | 4 +++- 6 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 addons/frag/ACE_Settings.hpp diff --git a/addons/frag/ACE_Settings.hpp b/addons/frag/ACE_Settings.hpp new file mode 100644 index 00000000000..b160a127f3c --- /dev/null +++ b/addons/frag/ACE_Settings.hpp @@ -0,0 +1,8 @@ +class ACE_Settings { + class GVAR(enabled) { + displayName = "Frag System"; + description = "Enables the shrapnel system for explosives"; + typeName = "BOOL"; + value = 1; + }; +}; diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp index 3cfb27dfafe..6490c94f227 100644 --- a/addons/frag/CfgAmmo.hpp +++ b/addons/frag/CfgAmmo.hpp @@ -9,7 +9,7 @@ class CfgAmmo { // GVAR(skip) = 1; //}; class Bo_GBU12_LGB; - class Nou_GBU12 : Bo_GBU12_LGB { + class ACE_GBU12 : Bo_GBU12_LGB { GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(metal) = 140000; GVAR(charge) = 87000; @@ -71,8 +71,11 @@ class CfgAmmo { class G_40mm_HE: GrenadeBase { - GVAR(skip) = 0; - GVAR(force) = 1; + GVAR(classes)[] = {"ACE_frag_tiny_HD"}; + GVAR(metal) = 200; + GVAR(charge) = 45; + GVAR(gurney_c) = 2830; + GVAR(gurney_k) = 3/5; }; class ACE_G_40mm_HEDP: G_40mm_HE { diff --git a/addons/frag/XEH_pre_Init.sqf b/addons/frag/XEH_pre_Init.sqf index cefd77d9219..beede543dd5 100644 --- a/addons/frag/XEH_pre_Init.sqf +++ b/addons/frag/XEH_pre_Init.sqf @@ -22,9 +22,6 @@ GVAR(traceID) = -1; GVAR(traces) = []; GVAR(tracesStarted) = false; -// TODO setting -GVAR(enabled) = true; - // * Other Shit */ PREP(addTrack); PREP(drawTraces); diff --git a/addons/frag/config.cpp b/addons/frag/config.cpp index c9dff6bac6d..16af88bfc4c 100644 --- a/addons/frag/config.cpp +++ b/addons/frag/config.cpp @@ -11,4 +11,5 @@ class CfgPatches { }; #include "CfgEventhandlers.hpp" -#include "CfgAmmo.hpp" \ No newline at end of file +#include "CfgAmmo.hpp" +#include "ACE_Settings.hpp" \ No newline at end of file diff --git a/addons/frag/functions/fnc_doSpall.sqf b/addons/frag/functions/fnc_doSpall.sqf index cb54cb776b1..c033210325d 100644 --- a/addons/frag/functions/fnc_doSpall.sqf +++ b/addons/frag/functions/fnc_doSpall.sqf @@ -45,8 +45,8 @@ if(_alive || {_caliber >= 2.5} || {(_explosive > 0 && {_idh >= 1})}) then { _vm = 1; _velocity = _initialData select 5; - _oldVelocity = _velocity call BIS_fnc_magnitude; - _curVelocity = (velocity _round) call BIS_fnc_magnitude; + _oldVelocity = vectorMagnitude _velocity; + _curVelocity = vectorMagnitude (velocity _round); if(alive _round) then { _diff = _velocity vectorDiff (velocity _round); diff --git a/addons/frag/functions/fnc_fired.sqf b/addons/frag/functions/fnc_fired.sqf index 85f5f45c0ab..0ead1a17f85 100644 --- a/addons/frag/functions/fnc_fired.sqf +++ b/addons/frag/functions/fnc_fired.sqf @@ -1,6 +1,8 @@ #include "script_component.hpp" + private ["_gun", "_type", "_round", "_doFragTrack", "_doSpall"]; -if !(!isNil QGVAR(enabled) && {GVAR(enabled)}) exitWith {}; + +if (!GVAR(enabled)) exitWith {}; _gun = _this select 0; _type = _this select 4; From f54f0cd1faa7b5b7c929ba5ce364f92a72d82afd Mon Sep 17 00:00:00 2001 From: ulteq Date: Mon, 27 Apr 2015 13:58:18 +0200 Subject: [PATCH 038/171] Renamed init functions --- addons/frag/CfgEventhandlers.hpp | 6 +++--- addons/frag/{XEH_post_init.sqf => XEH_postInit.sqf} | 0 addons/frag/{XEH_pre_Init.sqf => XEH_preInit.sqf} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename addons/frag/{XEH_post_init.sqf => XEH_postInit.sqf} (100%) rename addons/frag/{XEH_pre_Init.sqf => XEH_preInit.sqf} (100%) diff --git a/addons/frag/CfgEventhandlers.hpp b/addons/frag/CfgEventhandlers.hpp index 1e631e07eb7..df7eaeacd12 100644 --- a/addons/frag/CfgEventhandlers.hpp +++ b/addons/frag/CfgEventhandlers.hpp @@ -1,12 +1,12 @@ class Extended_PreInit_EventHandlers { class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_pre_init)); + init = QUOTE(call COMPILE_FILE(XEH_preInit)); }; }; class Extended_PostInit_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_post_init)); + class ADDON { + init = QUOTE(call COMPILE_FILE(XEH_postInit)); }; }; diff --git a/addons/frag/XEH_post_init.sqf b/addons/frag/XEH_postInit.sqf similarity index 100% rename from addons/frag/XEH_post_init.sqf rename to addons/frag/XEH_postInit.sqf diff --git a/addons/frag/XEH_pre_Init.sqf b/addons/frag/XEH_preInit.sqf similarity index 100% rename from addons/frag/XEH_pre_Init.sqf rename to addons/frag/XEH_preInit.sqf From 3c92cab7aff9b17cd1105b843d5941e9bdd74f4f Mon Sep 17 00:00:00 2001 From: ulteq Date: Mon, 27 Apr 2015 14:02:59 +0200 Subject: [PATCH 039/171] Reverted the addBlackList function --- addons/frag/XEH_preInit.sqf | 1 + addons/frag/functions/fnc_addBlackList.sqf | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 addons/frag/functions/fnc_addBlackList.sqf diff --git a/addons/frag/XEH_preInit.sqf b/addons/frag/XEH_preInit.sqf index beede543dd5..906a696ebf4 100644 --- a/addons/frag/XEH_preInit.sqf +++ b/addons/frag/XEH_preInit.sqf @@ -23,6 +23,7 @@ GVAR(traces) = []; GVAR(tracesStarted) = false; // * Other Shit */ +PREP(addBlackList); PREP(addTrack); PREP(drawTraces); PREP(removeTrack); diff --git a/addons/frag/functions/fnc_addBlackList.sqf b/addons/frag/functions/fnc_addBlackList.sqf new file mode 100644 index 00000000000..95edcd15904 --- /dev/null +++ b/addons/frag/functions/fnc_addBlackList.sqf @@ -0,0 +1,4 @@ +#include "script_component.hpp" +private ["_round"]; +_round = _this select 0; +GVAR(blackList) set[(count GVAR(blackList)), _round]; \ No newline at end of file From e4db44d73c46a15cfb8e882d593035c0094349d8 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Mon, 27 Apr 2015 16:36:00 +0200 Subject: [PATCH 040/171] adjusted damage parsing --- addons/medical/functions/fnc_handleDamage.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index 956b4f95aa7..70b219a8a42 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -63,14 +63,14 @@ if (GVAR(level) >= 2) then { }; }; - if ((_minLethalDamage <= _newDamage) && {[_unit, [_selection] call FUNC(selectionNameToNumber), _newDamage] call FUNC(determineIfFatal)} && {_selection in ["", "head", "body"]}) then { + if ([_unit, [_selection] call FUNC(selectionNameToNumber), _newDamage] call FUNC(determineIfFatal)) then { if ([_unit] call FUNC(setDead)) then { _damageReturn = 1; } else { - _damageReturn = 0.89; + _damageReturn = _damageReturn min 0.89; }; } else { - _damageReturn = 0.89; + _damageReturn = _damageReturn min 0.89; }; }; }; From 450e324f7b27adbe8475fc882dd6c5b32f93c164 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Mon, 27 Apr 2015 16:42:12 +0200 Subject: [PATCH 041/171] adjusted damage handling (adv medical) --- addons/medical/functions/fnc_handleDamage.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index 70b219a8a42..a8dddcadc81 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -47,7 +47,7 @@ if (GVAR(level) >= 2) then { }; _newDamage = _this call FUNC(handleDamage_caching); - if (_damageReturn > 0.9) then { + //if (_damageReturn > 0.9) then { _typeOfDamage = [_projectile] call FUNC(getTypeOfDamage); @@ -63,7 +63,7 @@ if (GVAR(level) >= 2) then { }; }; - if ([_unit, [_selection] call FUNC(selectionNameToNumber), _newDamage] call FUNC(determineIfFatal)) then { + if ((_minLethalDamage <= _newDamage) && {[_unit, [_selection] call FUNC(selectionNameToNumber), _newDamage] call FUNC(determineIfFatal)}) then { if ([_unit] call FUNC(setDead)) then { _damageReturn = 1; } else { @@ -72,7 +72,7 @@ if (GVAR(level) >= 2) then { } else { _damageReturn = _damageReturn min 0.89; }; - }; + //}; }; [_unit] call FUNC(addToInjuredCollection); From 0d6d96e76c6ee3c51552be1b239c4a75f6776676 Mon Sep 17 00:00:00 2001 From: ulteq Date: Mon, 27 Apr 2015 22:04:35 +0200 Subject: [PATCH 042/171] Cleanup++: * Added missing privates * Removed unused privates * Replaced some old vector calculations with new vector commands --- addons/frag/functions/fnc_addTrack.sqf | 8 +++++-- addons/frag/functions/fnc_doSpall.sqf | 5 ++-- addons/frag/functions/fnc_drawTraces.sqf | 5 +++- addons/frag/functions/fnc_fired.sqf | 2 +- addons/frag/functions/fnc_frago.sqf | 2 +- addons/frag/functions/fnc_spallHP.sqf | 12 +++++----- addons/frag/functions/fnc_spallTrack.sqf | 24 +++++++------------- addons/frag/functions/fnc_trackFragRound.sqf | 2 +- addons/frag/functions/fnc_trackTrace.sqf | 10 ++++---- 9 files changed, 34 insertions(+), 36 deletions(-) diff --git a/addons/frag/functions/fnc_addTrack.sqf b/addons/frag/functions/fnc_addTrack.sqf index 2beea1dd567..1ce25b6bf91 100644 --- a/addons/frag/functions/fnc_addTrack.sqf +++ b/addons/frag/functions/fnc_addTrack.sqf @@ -1,5 +1,8 @@ #include "script_component.hpp" -if(GVAR(autoTrace)) then { + +private ["_color", "_data", "_index", "_obj", "_objTVel", "_objVel", "_origin", "_positions"]; + +if (GVAR(autoTrace)) then { [] call FUNC(startTracing); }; @@ -16,5 +19,6 @@ _objVel = velocity _obj; _objTVel = sqrt((_objVel select 0)^2 + (_objVel select 1)^2 + (_objVel select 2)^2); _positions set[(count _positions), [(getPos _obj), _objTVel]]; _data = [_origin, typeOf _origin, typeOf _obj, _objTVel, _positions, _color]; + GVAR(traces) set[_index, _data]; -[DFUNC(trackTrace), 0, [_obj, _index, time]] call cba_fnc_addPerFrameHandler; \ No newline at end of file +[DFUNC(trackTrace), 0, [_obj, _index, time]] call cba_fnc_addPerFrameHandler; diff --git a/addons/frag/functions/fnc_doSpall.sqf b/addons/frag/functions/fnc_doSpall.sqf index c033210325d..808b0276901 100644 --- a/addons/frag/functions/fnc_doSpall.sqf +++ b/addons/frag/functions/fnc_doSpall.sqf @@ -3,13 +3,12 @@ #ifdef DEBUG_MODE_FULL GVAR(traceFrags) = true; #endif -// ACE_player sideChat "WAAAAAAAAAAAAAAAAAAAAA"; +// ACE_player sideChat "WAAAAAAAAAAAAAAAAAAAAA"; private ["_params", "_initialData", "_hpData", "_roundType", "_round", "_object", "_caliber", "_explosive", "_idh", "_alive", "_exit", "_vm", "_velocity", "_unitDir", "_oldVelocity", "_curVelocity", "_diff", "_polar", "_pos", "_spallPos", "_i", "_pos1", "_pos2", "_blah", "_data", "_spallPolar", "_c", "_warn", "_m", "_k", "_gC", "_shellType", "_fragPower", "_spread", "_spallCount", "_elev", "_dir", "_vel", "_spallFragVect", - "_fragment"]; - + "_fragment", "_index", "_hitData", "_fragTypes", "_fragType", "_foundObjects"]; _params = _this select 0; [(_this select 1)] call cba_fnc_removePerFrameHandler; diff --git a/addons/frag/functions/fnc_drawTraces.sqf b/addons/frag/functions/fnc_drawTraces.sqf index b9645bab972..9dfaa3e46db 100644 --- a/addons/frag/functions/fnc_drawTraces.sqf +++ b/addons/frag/functions/fnc_drawTraces.sqf @@ -1,4 +1,7 @@ #include "script_component.hpp" + +private ["_color", "_index", "_lastPos", "_lastSpd", "_max", "_positions", "_startSpeed"]; + { _positions = _x select 4; _color = _x select 5; @@ -29,4 +32,4 @@ _lastSpd = _data1 select 1; }; // drawIcon3D ["", [1,0,0,1], _lastPos, 0, 0, 0, format["%1m/s", _lastSpd], 1, 0.05, "PuristaMedium"]; -} forEach GVAR(traces); \ No newline at end of file +} forEach GVAR(traces); diff --git a/addons/frag/functions/fnc_fired.sqf b/addons/frag/functions/fnc_fired.sqf index 0ead1a17f85..7ed717c2b87 100644 --- a/addons/frag/functions/fnc_fired.sqf +++ b/addons/frag/functions/fnc_fired.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -private ["_gun", "_type", "_round", "_doFragTrack", "_doSpall"]; +private ["_gun", "_type", "_round", "_doFragTrack", "_doSpall", "_spallTrack", "_spallTrackID"]; if (!GVAR(enabled)) exitWith {}; diff --git a/addons/frag/functions/fnc_frago.sqf b/addons/frag/functions/fnc_frago.sqf index a396de04e89..4c3408db6de 100644 --- a/addons/frag/functions/fnc_frago.sqf +++ b/addons/frag/functions/fnc_frago.sqf @@ -14,7 +14,7 @@ private ["_round", "_lastPos", "_lastVel", "_shellType", "_gun", "_fragTypes", " "_manObjects", "_objects", "_crew", "_fragCount", "_fragArcs", "_doRandom", "_target", "_boundingBox", "_targetPos", "_distance", "_add", "_bbX", "_bbY", "_bbZ", "_cubic", "_targetVel", "_baseVec", "_dir", "_currentCount", "_count", "_vecVar", "_i", "_vec", "_fp", "_vel", "_fragType", "_fragObj", "_randomCount", - "_sectorSize", "_sectorOffset", "_randomDir"]; + "_sectorSize", "_sectorOffset", "_randomDir", "_endTime"]; _round = _this select 0; diff --git a/addons/frag/functions/fnc_spallHP.sqf b/addons/frag/functions/fnc_spallHP.sqf index fb894be4996..5e3719cb47f 100644 --- a/addons/frag/functions/fnc_spallHP.sqf +++ b/addons/frag/functions/fnc_spallHP.sqf @@ -1,15 +1,15 @@ #include "script_component.hpp" -private ["_initialData", "_currentCount", "_hpData", "_round", "_hpRound"]; +private ["_initialData", "_hpData", "_round", "_hpRound", "_hpDirect"]; //player sideChat format["f: %1 c: %2", (_this select 0), (count GVAR(spallHPData))]; -if((_this select 0) <= (count GVAR(spallHPData))) then { + +if ((_this select 0) <= (count GVAR(spallHPData))) then { _initialData = GVAR(spallHPData) select (_this select 0); - if(!isNil "_initialData") then { + if (!isNil "_initialData") then { _hpRound = ((_this select 1) select 0) select 2; _round = _initialData select 3; _hpDirect = ((_this select 1) select 0) select 10; - if(_hpDirect && {_round == _hpRound}) then { - + if (_hpDirect && {_round == _hpRound}) then { { _hpData = _x; _round = _initialData select 3; @@ -26,4 +26,4 @@ if((_this select 0) <= (count GVAR(spallHPData))) then { } forEach (_this select 1); }; }; -}; \ No newline at end of file +}; diff --git a/addons/frag/functions/fnc_spallTrack.sqf b/addons/frag/functions/fnc_spallTrack.sqf index a264e1ded90..4b7a06bc653 100644 --- a/addons/frag/functions/fnc_spallTrack.sqf +++ b/addons/frag/functions/fnc_spallTrack.sqf @@ -1,30 +1,22 @@ //fnc_spallTrack.sqf #include "script_component.hpp" -private ["_params", "_round", "_multiplier", "_delta", "_curPos", "_velocity", "_velocityStep", "_forwardPos", "_intersectsWith", "_index", "_i", "_test", "_hpId", "_data"]; -// setAccTime 0; + +private ["_round", "_multiplier", "_foundObjects", "_foundObjectHPIds", "_delta", "_curPos", "_velocity", "_velocityStep", "_forwardPos", "_intersectsWith", "_index", "_hpId", "_data"]; _round = _this select 0; _multiplier = _this select 1; _foundObjects = _this select 2; _foundObjectHPIds = _this select 3; -_delta = (1/diag_fps)*_multiplier; +_delta = (1/diag_fps) * _multiplier; _curPos = getPosASL _round; _velocity = velocity _round; -_velocityStep = [ - (_velocity select 0)*_delta, - (_velocity select 1)*_delta, - (_velocity select 2)*_delta - ]; -_forwardPos = [ - (_curPos select 0) + (_velocityStep select 0), - (_curPos select 1) + (_velocityStep select 1), - (_curPos select 2) + (_velocityStep select 2) - ]; - +_velocityStep = _velocity vectorMultiply _delta; +_forwardPos = _curPos vectorAdd _velocityStep; + _intersectsWith = lineIntersectsWith [_curPos, _forwardPos]; -if(count _intersectsWith > 0) then { +if (count _intersectsWith > 0) then { // player sideChat format["inter: %1", _intersectsWith]; { if(!(_x in _foundObjects)) then { @@ -37,4 +29,4 @@ if(count _intersectsWith > 0) then { GVAR(spallHPData) set[_index, _data]; }; } forEach _intersectsWith; -}; \ No newline at end of file +}; diff --git a/addons/frag/functions/fnc_trackFragRound.sqf b/addons/frag/functions/fnc_trackFragRound.sqf index 43584481882..8db68c99e82 100644 --- a/addons/frag/functions/fnc_trackFragRound.sqf +++ b/addons/frag/functions/fnc_trackFragRound.sqf @@ -1,6 +1,6 @@ //fnc_trackFragRound.sqf #include "script_component.hpp" -private ["_params", "_round", "_lastPos", "_lastVel", "_type", "_time", "_doSpall", "_skip", "_explosive", "_indirectRange", "_force", "_fragPower"]; +private ["_params", "_round", "_lastPos", "_lastVel", "_type", "_time", "_doSpall", "_spallTrack", "_foundObjectHPIds", "_skip", "_explosive", "_indirectRange", "_force", "_fragPower"]; _params = _this select 0; _round = _params select 0; _lastPos = _params select 1; diff --git a/addons/frag/functions/fnc_trackTrace.sqf b/addons/frag/functions/fnc_trackTrace.sqf index b0f3f06633a..205292a8201 100644 --- a/addons/frag/functions/fnc_trackTrace.sqf +++ b/addons/frag/functions/fnc_trackTrace.sqf @@ -1,14 +1,14 @@ #include "script_component.hpp" + +private ["_params", "_tracerObj", "_index", "_positions"]; _params = _this select 0; _tracerObj = _params select 0; _index = _params select 1; -if(alive _tracerObj && (count GVAR(traces)) > 0) then { +if (alive _tracerObj && (count GVAR(traces)) > 0) then { _data = GVAR(traces) select _index; _positions = _data select 4; - _objVel = velocity _tracerObj; - _objTVel = sqrt((_objVel select 0)^2 + (_objVel select 1)^2 + (_objVel select 2)^2); - _positions set[(count _positions), [(getPos _tracerObj), _objTVel]]; + _positions set[(count _positions), [(getPos _tracerObj), vectorMagnitude (velocity _tracerObj)]]; } else { [(_this select 1)] call cba_fnc_removePerFrameHandler; -}; \ No newline at end of file +}; From 416a914253326c3ed5dc5dd3555f819f3a8e500c Mon Sep 17 00:00:00 2001 From: ulteq Date: Mon, 27 Apr 2015 22:14:08 +0200 Subject: [PATCH 043/171] More vector math replacements --- addons/frag/functions/fnc_addTrack.sqf | 9 ++++----- addons/frag/functions/fnc_doSpall.sqf | 12 ++---------- addons/frag/functions/fnc_drawTraces.sqf | 5 +---- addons/frag/functions/fnc_frago.sqf | 16 ++++------------ 4 files changed, 11 insertions(+), 31 deletions(-) diff --git a/addons/frag/functions/fnc_addTrack.sqf b/addons/frag/functions/fnc_addTrack.sqf index 1ce25b6bf91..d4a4272a9cf 100644 --- a/addons/frag/functions/fnc_addTrack.sqf +++ b/addons/frag/functions/fnc_addTrack.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -private ["_color", "_data", "_index", "_obj", "_objTVel", "_objVel", "_origin", "_positions"]; +private ["_color", "_data", "_index", "_obj", "_objSpd", "_origin", "_positions"]; if (GVAR(autoTrace)) then { [] call FUNC(startTracing); @@ -15,10 +15,9 @@ if((count _this) > 2) then { _color = _this select 2; }; _positions = []; -_objVel = velocity _obj; -_objTVel = sqrt((_objVel select 0)^2 + (_objVel select 1)^2 + (_objVel select 2)^2); -_positions set[(count _positions), [(getPos _obj), _objTVel]]; -_data = [_origin, typeOf _origin, typeOf _obj, _objTVel, _positions, _color]; +_objSpd = vectorMagnitude (velocity _obj); +_positions set[(count _positions), [(getPos _obj), _objSpd]]; +_data = [_origin, typeOf _origin, typeOf _obj, _objSpd, _positions, _color]; GVAR(traces) set[_index, _data]; [DFUNC(trackTrace), 0, [_obj, _index, time]] call cba_fnc_addPerFrameHandler; diff --git a/addons/frag/functions/fnc_doSpall.sqf b/addons/frag/functions/fnc_doSpall.sqf index 808b0276901..990fb80f8d9 100644 --- a/addons/frag/functions/fnc_doSpall.sqf +++ b/addons/frag/functions/fnc_doSpall.sqf @@ -65,16 +65,8 @@ if(_alive || {_caliber >= 2.5} || {(_explosive > 0 && {_idh >= 1})}) then { _pos = _hpData select 3; _spallPos = nil; for "_i" from 0 to 100 do { - _pos1 = [ - (_pos select 0) + (((_unitDir select 0)*0.01)*_i), - (_pos select 1) + (((_unitDir select 1)*0.01)*_i), - (_pos select 2) + (((_unitDir select 2)*0.01)*_i) - ]; - _pos2 = [ - (_pos select 0) + (((_unitDir select 0)*0.01)*(_i+1)), - (_pos select 1) + (((_unitDir select 1)*0.01)*(_i+1)), - (_pos select 2) + (((_unitDir select 2)*0.01)*(_i+1)) - ]; + _pos1 = _pos vectorAdd (_unitDir vectorMultiply (0.01 * _i)); + _pos2 = _pos vectorAdd (_unitDir vectorMultiply (0.01 * (_i + 1))); // _blah = [_object, "FIRE"] intersect [_object worldToModel (ASLtoATL _pos1), _object worldToModel (ASLtoATL _pos2)]; // diag_log text format["b: %1", _blah]; diff --git a/addons/frag/functions/fnc_drawTraces.sqf b/addons/frag/functions/fnc_drawTraces.sqf index 9dfaa3e46db..e61fc9b5bac 100644 --- a/addons/frag/functions/fnc_drawTraces.sqf +++ b/addons/frag/functions/fnc_drawTraces.sqf @@ -7,10 +7,7 @@ private ["_color", "_index", "_lastPos", "_lastSpd", "_max", "_positions", "_sta _color = _x select 5; _index = 0; _max = count _positions; - _startSpeed = (_positions select 0) select 1; - if(_startSpeed <= 0) then { - _startSpeed = 0.01; - }; + _startSpeed = 0.01 max ((_positions select 0) select 1); _lastSpd = []; _lastPos = []; while {_index < _max} do { diff --git a/addons/frag/functions/fnc_frago.sqf b/addons/frag/functions/fnc_frago.sqf index 4c3408db6de..de7c6986d9b 100644 --- a/addons/frag/functions/fnc_frago.sqf +++ b/addons/frag/functions/fnc_frago.sqf @@ -159,11 +159,7 @@ if(_isArmed && (count _objects) > 0) then { _vec set[2, (_vec select 2)-(_vecVar/2)+(random _vecVar)]; _fp = (_fragPower-(random (_fragPowerRandom))); - _vel = [ - (_vec select 0)*_fp, - (_vec select 1)*_fp, - (_vec select 2)*_fp - ]; + _vel = _vec vectorMultiply _fp; _fragType = round (random ((count _fragTypes)-1)); _fragObj = (_fragTypes select _fragType) createVehicleLocal [0,0,10000]; @@ -198,14 +194,10 @@ if(_isArmed && (count _objects) > 0) then { _sectorOffset = 360 * (_i - 1) / (_randomCount max 1); _randomDir = random(_sectorSize); _vec = [cos(_sectorOffset + _randomDir), sin(_sectorOffset + _randomDir), sin(30 - (random 45))]; - + _fp = (_fragPower-(random (_fragPowerRandom))); - - _vel = [ - (_vec select 0)*_fp, - (_vec select 1)*_fp, - (_vec select 2)*_fp - ]; + + _vel = _vec vectorMultiply _fp; _fragType = round (random ((count _fragTypes)-1)); _fragObj = (_fragTypes select _fragType) createVehicleLocal [0,0,10000]; From f8b8d7dd165eae627550c949e4b78def6af1bf99 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 28 Apr 2015 00:08:28 -0500 Subject: [PATCH 044/171] Set Lock on postInit so spawned vehicles are set --- addons/vehiclelock/CfgEventHandlers.hpp | 23 ++++++++ addons/vehiclelock/CfgVehicles.hpp | 57 ++++++++++++------- addons/vehiclelock/XEH_preInit.sqf | 1 + addons/vehiclelock/config.cpp | 4 ++ .../functions/fnc_handleVehicleInitPost.sqf | 39 +++++++++++++ .../vehiclelock/functions/fnc_moduleInit.sqf | 23 +------- .../functions/fnc_onOpenInventory.sqf | 2 +- 7 files changed, 105 insertions(+), 44 deletions(-) create mode 100644 addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf diff --git a/addons/vehiclelock/CfgEventHandlers.hpp b/addons/vehiclelock/CfgEventHandlers.hpp index cf704d000ce..85db25d4a0c 100644 --- a/addons/vehiclelock/CfgEventHandlers.hpp +++ b/addons/vehiclelock/CfgEventHandlers.hpp @@ -15,3 +15,26 @@ class Extended_InventoryOpened_EventHandlers { }; }; }; +class Extended_InitPost_EventHandlers { + class CAManBase { + class ADDON { + serverInit = QUOTE(_this call FUNC(handleUnitInitPost)); + }; + }; + class Car { + class ADDON { + serverInit = QUOTE(_this call FUNC(handleVehicleInitPost)); + }; + }; + class Tank { + class ADDON { + serverInit = QUOTE(_this call FUNC(handleVehicleInitPost)); + }; + }; + class Helicopter { + class ADDON { + serverInit = QUOTE(_this call FUNC(handleVehicleInitPost)); + }; + }; +}; + diff --git a/addons/vehiclelock/CfgVehicles.hpp b/addons/vehiclelock/CfgVehicles.hpp index 65ad0568d6b..94bcf343171 100644 --- a/addons/vehiclelock/CfgVehicles.hpp +++ b/addons/vehiclelock/CfgVehicles.hpp @@ -1,50 +1,65 @@ #define MACRO_LOCK_ACTIONS \ - class ACE_MainActions { \ + class ACE_SelfActions { \ class ACE_unlockVehicle { \ displayName = "$STR_ACE_Vehicle_Action_UnLock"; \ - distance = 4; \ condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(2,3)]}); \ statement = QUOTE([ARR_3('VehicleLock_SetVehicleLock', [_target], [ARR_2(_target,false)])] call EFUNC(common,targetEvent)); \ - showDisabled = 0; \ priority = 0.3; \ icon = QUOTE(PATHTOF(UI\key_menuIcon_ca.paa)); \ }; \ class ACE_lockVehicle { \ displayName = "$STR_ACE_Vehicle_Action_Lock"; \ - distance = 4; \ condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(0,1)]}); \ statement = QUOTE([ARR_3('VehicleLock_SetVehicleLock', [_target], [ARR_2(_target,true)])] call EFUNC(common,targetEvent)); \ - showDisabled = 0; \ priority = 0.2; \ icon = QUOTE(PATHTOF(UI\key_menuIcon_ca.paa)); \ }; \ class ACE_lockpickVehicle { \ displayName = "$STR_ACE_Vehicle_Action_Lockpick"; \ - distance = 4; \ condition = QUOTE([ARR_3(_player, _target, 'canLockpick')] call FUNC(lockpick)); \ statement = QUOTE([ARR_3(_player, _target, 'startLockpick')] call FUNC(lockpick)); \ - showDisabled = 0; \ priority = 0.1; \ }; \ + }; \ + class ACE_Actions { \ + class ACE_MainActions { \ + class ACE_unlockVehicle { \ + displayName = "$STR_ACE_Vehicle_Action_UnLock"; \ + distance = 4; \ + condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(2,3)]}); \ + statement = QUOTE([ARR_3('VehicleLock_SetVehicleLock', [_target], [ARR_2(_target,false)])] call EFUNC(common,targetEvent)); \ + priority = 0.3; \ + icon = QUOTE(PATHTOF(UI\key_menuIcon_ca.paa)); \ + }; \ + class ACE_lockVehicle { \ + displayName = "$STR_ACE_Vehicle_Action_Lock"; \ + distance = 4; \ + condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(0,1)]}); \ + statement = QUOTE([ARR_3('VehicleLock_SetVehicleLock', [_target], [ARR_2(_target,true)])] call EFUNC(common,targetEvent)); \ + priority = 0.2; \ + icon = QUOTE(PATHTOF(UI\key_menuIcon_ca.paa)); \ + }; \ + class ACE_lockpickVehicle { \ + displayName = "$STR_ACE_Vehicle_Action_Lockpick"; \ + distance = 4; \ + condition = QUOTE([ARR_3(_player, _target, 'canLockpick')] call FUNC(lockpick)); \ + statement = QUOTE([ARR_3(_player, _target, 'startLockpick')] call FUNC(lockpick)); \ + priority = 0.1; \ + }; \ + }; \ }; class CfgVehicles { class LandVehicle; class Car: LandVehicle { - class ACE_Actions { - MACRO_LOCK_ACTIONS - }; + MACRO_LOCK_ACTIONS }; class Tank: LandVehicle { - class ACE_Actions { - MACRO_LOCK_ACTIONS - }; + MACRO_LOCK_ACTIONS }; class Air; class Helicopter: Air { - class ACE_Actions { - MACRO_LOCK_ACTIONS - }; + MACRO_LOCK_ACTIONS }; class Logic; @@ -55,7 +70,7 @@ class CfgVehicles { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "Vehicle Lock Setup"; - function = QUOTE(DFUNC(moduleInit)); + function = QFUNC(moduleInit); scope = 2; isGlobal = 0; icon = QUOTE(PATHTOF(UI\Icon_Module_VehicleLock_ca.paa)); @@ -67,9 +82,9 @@ class CfgVehicles { typeName = "BOOL"; defaultValue = 0; }; - class SetLockState { - displayName = "Set Lock State"; // Argument label - description = "Set lock state for all vehicles on map at start"; // Tooltip description + class VehicleStartingLockState { + displayName = "Vehicle Starting Lock State"; // Argument label + description = "Set lock state for all vehicles (removes ambiguous lock states)"; // Tooltip description typeName = "NUMBER"; // Value type, can be "NUMBER", "STRING" or "BOOL" class values { class None {name = "As Is"; value = 0; default = 1;}; @@ -93,7 +108,7 @@ class CfgVehicles { author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "Vehicle Key Assign"; - function = QUOTE(DFUNC(moduleSync)); + function = QFUNC(moduleSync); scope = 2; isGlobal = 0; icon = QUOTE(PATHTOF(UI\Icon_Module_VehicleKey_ca.paa)); diff --git a/addons/vehiclelock/XEH_preInit.sqf b/addons/vehiclelock/XEH_preInit.sqf index bdab28fc756..18a7062c244 100644 --- a/addons/vehiclelock/XEH_preInit.sqf +++ b/addons/vehiclelock/XEH_preInit.sqf @@ -4,6 +4,7 @@ ADDON = false; PREP(addKeyForVehicle); PREP(getVehicleSideKey); +PREP(handleVehicleInitPost); PREP(hasKeyForVehicle); PREP(lockpick); PREP(moduleInit); diff --git a/addons/vehiclelock/config.cpp b/addons/vehiclelock/config.cpp index 248a1e7ca09..608a892b454 100644 --- a/addons/vehiclelock/config.cpp +++ b/addons/vehiclelock/config.cpp @@ -20,6 +20,10 @@ class ACE_Settings { class GVAR(LockVehicleInventory) { value = 0; typeName = "BOOL"; + }; + class GVAR(VehicleStartingLockState) { + value = -1; + typeName = "SCALAR"; }; }; diff --git a/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf b/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf new file mode 100644 index 00000000000..df875b1859b --- /dev/null +++ b/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf @@ -0,0 +1,39 @@ +/* + * Author: PabstMirror + * Function for sync module. Assigns keys for all synced vehicles to any players that are synced. + * + * Arguments: + * 0: Vehicle + * + * Return Value: + * None + * + * Example: + * [car] call ACE_VehicleLock_fnc_handleVehicleInitPost + * + * Public: No + */ +#include "script_component.hpp" + +PARAMS_1(_vehicle); + +if (!isServer) exitWith {}; +if (GVAR(VehicleStartingLockState) == -1) exitWith {}; + +[{ + private ["_lock"]; + PARAMS_1(_vehicle); + if ((_vehicle isKindOf "Car") || {_vehicle isKindOf "Tank"} || {_vehicle isKindOf "Helicopter"}) then { + //set lock state (eliminates the ambigious 1-"Default" and 3-"Locked for Player" states) + _lock = switch (GVAR(VehicleStartingLockState)) do { + case (0): {(locked _vehicle) in [2, 3]}; + case (1):{true}; + case (2):{false}; + }; + if (((_lock) && {(locked _vehicle) != 2}) || {(!_lock) && {(locked _vehicle) != 0}}) then { + TRACE_3("Setting Lock State",_lock,(typeOf _vehicle),_vehicle); + ["VehicleLock_SetVehicleLock", [_vehicle], [_vehicle, _lock]] call EFUNC(common,targetEvent); + }; + }; + //Delay call until mission start (so everyone has the eventHandler's installed) +}, [_vehicle], 0.25, 0.25] call EFUNC(common,waitAndExecute); \ No newline at end of file diff --git a/addons/vehiclelock/functions/fnc_moduleInit.sqf b/addons/vehiclelock/functions/fnc_moduleInit.sqf index c26e8aacbd6..510b8ec7bed 100644 --- a/addons/vehiclelock/functions/fnc_moduleInit.sqf +++ b/addons/vehiclelock/functions/fnc_moduleInit.sqf @@ -17,8 +17,6 @@ */ #include "script_component.hpp" -private ["_sideKeysAssignment", "_setLockState", "_lock"]; - PARAMS_3(_logic,_syncedUnits,_activated); if (!_activated) exitWith {WARNING("Vehicle Lock Init Module - placed but not active");}; @@ -27,23 +25,4 @@ if (!isServer) exitWith {}; //Set the GVAR for default lockpick strength [_logic, QGVAR(DefaultLockpickStrength), "DefaultLockpickStrength"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(LockVehicleInventory), "LockVehicleInventory"] call EFUNC(common,readSettingFromModule); - -_setLockState = _logic getVariable["SetLockState", 0]; -[{ - PARAMS_1(_setLockState); - { - if ((_x isKindOf "Car") || {_x isKindOf "Tank"} || {_x isKindOf "Helicopter"}) then { - //set lock state (eliminates the ambigious 1-"Default" and 3-"Locked for Player" states) - _lock = switch (_setLockState) do { - case (0): {(locked _x) in [2, 3]}; - case (1):{true}; - case (2):{false}; - }; - if (((_lock) && {(locked _x) != 2}) || {(!_lock) && {(locked _x) != 0}}) then { - TRACE_3("Setting Lock State", _lock, (typeOf _x), _x); - ["VehicleLock_SetVehicleLock", [_x], [_x, _lock]] call EFUNC(common,targetEvent); - }; - }; - } forEach vehicles; - //Delay call until mission start (so everyone has the eventHandler's installed) -}, [_setLockState], 0.25, 0.25] call EFUNC(common,waitAndExecute); +[_logic, QGVAR(VehicleStartingLockState), "VehicleStartingLockState"] call EFUNC(common,readSettingFromModule); diff --git a/addons/vehiclelock/functions/fnc_onOpenInventory.sqf b/addons/vehiclelock/functions/fnc_onOpenInventory.sqf index 65c3068dce9..8199f4b8507 100644 --- a/addons/vehiclelock/functions/fnc_onOpenInventory.sqf +++ b/addons/vehiclelock/functions/fnc_onOpenInventory.sqf @@ -34,7 +34,7 @@ if (GVAR(LockVehicleInventory) && //if setting not enabled playSound "ACE_Sound_Click"; //don't open the vehicles inventory _handeled = true; - //Just opens a dummy groundContainer + //Just opens a dummy groundContainer (so the player can still see their own inventory) ACE_player action ["Gear", objNull]; }; From 8a55c69cd7ceb877e1908909483aee8db6f93f1c Mon Sep 17 00:00:00 2001 From: Ivan Navarro Cabello Date: Tue, 28 Apr 2015 17:03:49 +0200 Subject: [PATCH 045/171] added spanish translation added spanish translation --- addons/ballistics/stringtable.xml | 6 ++- addons/interact_menu/stringtable.xml | 4 ++ addons/medical/stringtable.xml | 65 ++++++++++++++++++++++++++-- addons/mk6mortar/stringtable.xml | 32 ++++++++------ 4 files changed, 88 insertions(+), 19 deletions(-) diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index 4dc27fd2fcc..b91b4629851 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -903,7 +903,7 @@ Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 20 Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 20 Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 20 - + 7.62mm 20Rnd Mag (Mk248 Mod 0) Magazynek 7,62mm 20rd (Mk248 Mod 0) @@ -991,6 +991,7 @@ 6.5mm Creedmor 30Rnd Mag Magazynek 6,5mm Creedmor 30rd + Cargador de 30 balas Creedmor de 6.5mm 6.5mm CM @@ -1002,6 +1003,7 @@ Caliber: 6.5mm Creedmor<br />Rounds: 30<br />Used in: MXM Kaliber: 6,5mm Creedmor<br />Pociski: 30<br />Używany w: MXM + Calibre: 6.5mm Creedmor<br />Balas: 30<br />Se usa en: MXM .338 10Rnd Mag (300gr Sierra MatchKing HPBT) @@ -1106,4 +1108,4 @@ Калибр: 12,7x99 мм (A-MAX)<br />Патронов: 5 - + \ No newline at end of file diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 48ee00f4751..2de20752212 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -76,21 +76,25 @@ Interaction - Text Max Interakcja - Tekst max Interaction -Texte Max + Interacción - Texto al max. Interaction - Text Min Interakcja - Tekst min Interaction - Texte Min + Interacción - Texto al min. Interaction - Shadow Max Interakcja - Cień max Interaction - Ombre Max + Interacción - Sombras al max. Interaction - Shadow Min Interakcja - Cień min Interaction - Ombre Min + Interacción - Sombras al min. \ No newline at end of file diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index ec6b3aa3747..312effe8b09 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -5,11 +5,13 @@ INJURIES VERLETZUNGEN ТРАВМЫ + HERIDAS No injuries on this bodypart ... Körperteil nicht verletzt ... Данная часть тела не повреждена ... + Sin heridas en esta parte del cuerpo ... Litter Simulation Detail @@ -358,7 +360,7 @@ Triage Card Triagekarte - Tarjeta de triaje + Tarjeta de clasificación Медкарта Karta segregacyjna Karta Triage @@ -370,6 +372,7 @@ No entries on this triage card. Keine Einträge auf der Triagekarte Нет записей. + Sin entradas en esta tarjeta de clasificación. Tourniquet @@ -397,21 +400,25 @@ Diagnose Diagnose Диагностика + Diagnosticar Diagnosing ... Diagnostizieren ... Диагностика ... + Diagnosticando ... CPR HLW Сердечно-легочная реанимация + RCP Performing CPR ... HLW durchführen ... Сердечно-легочная реанимация ... + Realizando RCP ... Give Blood IV (1000ml) @@ -1063,7 +1070,7 @@ Personal Aid Kit Аптечка - Botiquín de primeros auxilios + Equipo de primeros auxilios Équipement de support vital Apteczka osobista Persönliches Verbandpäckchen @@ -1084,11 +1091,13 @@ Personal Aid Kit for in field stitching or advanced treatment W znacznym stopniu poprawia stan pacjenta Полевая аптчека для продвинутого лечения и зашивания ран + Equipo de primeros auxilios para costura de campaña o tratamiento avanzados Use Personal Aid Kit Verbandpäckchen benutzen Использовать аптечку + Usar equipo de primeros auxilios Surgical Kit @@ -1124,6 +1133,7 @@ Use Surgical Kit Operationsset benutzen Использовать хирургический набор + Usar equipo quirúrgico Bodybag @@ -1179,6 +1189,7 @@ %1 checked Blood Pressure: %2 %1 kontrollierte Blutdruck: %2 %1 проверил артериальное давление: %2 + %1 verificada la presión arterial: %2 You checked %1 @@ -1254,21 +1265,25 @@ Low Niedrig Низкое + Baja Normal Normal Нормальное + Normal High Hoch Высокое + Alta No Blood Pressure Kein Blutdruck Артериальное давление отсутствует + Sin presión arterial Pulse @@ -1304,21 +1319,25 @@ %1 checked Heart Rate: %2 %1 kontrollierte Herzfrequenz: %2 %1 проверил пульс: %2 + %1 verificado el ritmo cardíaco: %2 Weak Schwach Слабый + Débil Normal Normal Нормальный + Normal Strong Stark Сильный + Fuerte You find a Heart Rate of %2 @@ -1423,30 +1442,37 @@ Patient %1<br/>is %2.<br/>%3.<br/>%4 Пациент %1<br/>%2.<br/>%3.<br/>%4 + Paciente %1<br/>is %2.<br/>%3.<br/>%4 alive жив + Vivo dead мертв + Muerto He's lost some blood Есть кровопотеря + Ha perdido un poco de sangre He hasn't lost blood Нет кровопотери + No ha perdido la sangre He is in pain Испытывает боль + Siente dolor He is not in pain Не испытывает боли + No siente dolor Bandaged @@ -1780,166 +1806,199 @@ Scrape Kratzer Ссадина + Arañazo Minor Scrape Kleiner Kratzer Малая ссадина + Arañazo menor Medium Scrape Mittlerer Kratzer Средняя ссадина + Arañazo medio Large Scrape Großer Kratzer Большая ссадина + Arañazo severo Avulsion Avulsion Рваная рана + Avulsión Minor Avulsion Kleine Avulsion Малая рваная рана + Avulsión menor Medium Avulsion Mittlere Avulsion Средняя рваная рана + Avulsión media Large Avulsion Große Avulsion Большая рваная рана + Avulsión severa Bruise Prellung Ушиб + Contusión Minor Bruise Kleine Prellung Малый ушиб + Contusión menor Medium Bruise Mittlere Prellung Средний ушиб + Contusión media Large Bruise Große Prellung Большой ушиб + Contusión severa Crushed tissue Quetschverletzung Компресионная травма + Tejido triturado Minor crushed tissue Kleine Quetschverletzung Малая компрессионная травма + Tejido triturado menor Medium crushed tissue Mittlere Quetschverletzung Средняя компрессионная травма + Tejido triturado medio Large crushed tissue Große Quetschverletzung Большая компрессионная травма + Tejido triturado severo Cut Schnittwunde Резаная рана + Corte Small Cut Kleine Schnittwunde Малая резаная рана + Corte menor Medium Cut Mittlere Schnittwunde Средняя резаная рана + Corte mediano Large Cut Große Schnittwunde Большая резаная рана + Corte severo Tear Riss Рваная рана + Desgarro Small Tear Kleiner Riss Малая рваная рана + Desgarro menor Medium Tear Mittlerer Riss Средняя рваная рана + Desgarro medio Large Tear Großer Riss Большая рваная рана + Desgarro severo Velocity Wound Ballistisches Trauma Огнестрельная рана + Herida de bala Smal Velocity Wound Kleines Ballistisches Trauma Малая огнестрельная рана + Herida de bala menor Medium Velocity Wound Mittleres Ballistisches Trauma Средняя огнестрельная рана + Herida de bala media Large Velocity Wound Großes Ballistisches Trauma Большая огнестрельная рана + Herida de bala severa Puncture Wound Stichwunde Колотая рана + Herida punzante Minor Puncture Wound Kleine Stichwunde Малая колотая рана + Herida punzante menor Medium Puncture Wound Mittlere Stichwunde Средняя колотая рана + Herida punzante media Large Puncture Wound Große Stichwunde Большая колотая рана + Herida punzante severa Broken Femur Gebrochener Oberschenkelknochen Перелом + Femur roto - + \ No newline at end of file diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml index 19d68d8eb11..e0ed44578d7 100644 --- a/addons/mk6mortar/stringtable.xml +++ b/addons/mk6mortar/stringtable.xml @@ -1,17 +1,21 @@  - - - 82mm Rangetable - - - Range Table for the MK6 82mm Mortar - - - Open 82mm Rangetable - - - Charge - - + + + 82mm Rangetable + Tabla de distancias de 82mm + + + Range Table for the MK6 82mm Mortar + Tabla de distancias para el mortero MK6 de 82mm + + + Open 82mm Rangetable + Abrir tabla de distancias de 82mm + + + Charge + Carga + + \ No newline at end of file From c38fe384e3c53094b98bdf53a51655279a203b9c Mon Sep 17 00:00:00 2001 From: Glowbal Date: Tue, 28 Apr 2015 19:30:35 +0200 Subject: [PATCH 046/171] added default values for getvar's --- addons/medical/functions/fnc_handleUnitVitals.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf index 411f64b49eb..b806d1358f4 100644 --- a/addons/medical/functions/fnc_handleUnitVitals.sqf +++ b/addons/medical/functions/fnc_handleUnitVitals.sqf @@ -66,13 +66,13 @@ if (_painStatus > 0) then { if (GVAR(level) == 1) then { // reduce pain - if (_unit getVariable [QGVAR(pain), 0] > 0) then { - _unit setVariable [QGVAR(pain), ((_unit getVariable QGVAR(pain)) - 0.001 * _interval) max 0, _syncValues]; + if (_painStatus > 0) then { + _unit setVariable [QGVAR(pain), (_painStatus - 0.001 * _interval) max 0, _syncValues]; }; // reduce painkillers if (_unit getVariable [QGVAR(morphine), 0] > 0) then { - _unit setVariable [QGVAR(morphine), ((_unit getVariable QGVAR(morphine)) - 0.0015 * _interval) max 0, _syncValues]; + _unit setVariable [QGVAR(morphine), ((_unit getVariable [QGVAR(morphine), 0]) - 0.0015 * _interval) max 0, _syncValues]; }; // bleeding From 0b4bb6e4c9fe9841cca973b46a11aaff8e8201cf Mon Sep 17 00:00:00 2001 From: NukeDev Date: Tue, 28 Apr 2015 19:40:36 +0200 Subject: [PATCH 047/171] Italian's Translation fixes atragmx, attach, ballistics, captives languages fixes --- addons/atragmx/stringtable.xml | 5 +- addons/attach/stringtable.xml | 3 +- addons/ballistics/stringtable.xml | 106 +++++++++++++++++++++++++++++- addons/captives/stringtable.xml | 3 +- 4 files changed, 112 insertions(+), 5 deletions(-) diff --git a/addons/atragmx/stringtable.xml b/addons/atragmx/stringtable.xml index f3825c405a8..70b7acf1dfb 100644 --- a/addons/atragmx/stringtable.xml +++ b/addons/atragmx/stringtable.xml @@ -20,6 +20,7 @@ Abrir ATragMX Ouvrir ATragMX ATragMX öffnen + Apri ATragMX Rugged PDA with ATragMX @@ -27,6 +28,7 @@ Защищенный КПК с ATragMX PDA rugerizada con ATragMX Robuster PDA mit ATragMX + PDA Robusto con ATragMX Open ATragMX @@ -35,6 +37,7 @@ Abrir ATragMX Ouvrir ATragMX ATragMX öffnen + Apri ATragMX - + \ No newline at end of file diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml index 70ed9666b4f..c2ec045aa2a 100644 --- a/addons/attach/stringtable.xml +++ b/addons/attach/stringtable.xml @@ -178,6 +178,7 @@ Připnutí selhalo Przyczepianie nie powiodło się Hozzácsatolás sikertelen + Impossibile Attaccare %1<br/>Attached @@ -204,4 +205,4 @@ %1<br/>отсоединен(-а) - + \ No newline at end of file diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index 4dc27fd2fcc..8c063ab568a 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -373,6 +373,7 @@ Bande .338 NM 130Cps Traçante Cinta de 130 balas trazadoras de .338 NM Лента из 130-ти .338 NM трассирующих + .338 NM 130Rnd Tracciante Belt .338 NM Tracer @@ -382,6 +383,7 @@ .338 NM Traçante .338 NM trazadora .338 NM трассирующие + .338 NM 130Rnd Tracciante Caliber: .338 Norma Magnum Tracer<br />Rounds: 130<br />Used in: SPMG @@ -390,6 +392,7 @@ Calibre: .338 Norma Magnum Traçante<br />Cartouches: 130<br />Utilisé dans: SPMG Calibre: .338 Norma Magnum trazadora<br />Balas: 130<br />Se usa en: SPMG Калибр: .338 Norma Magnum трассирующие<br />Патронов: 130<br />Используются в: SPMG + Calibro: .338 Norma Magnum Tracciante<br />Munizioni: 130<br />In uso su: SPMG .338 NM 130Rnd IR-DIM Belt @@ -398,6 +401,7 @@ Bande .338 NM 130Cps IR-DIM Cinta de 130 balas IR-DIM de .338 NM Лента из 130-ти .338 NM ИК-трассирующих + .338 NM 130Rnd IR-DIM Belt .338 NM IR-DIM @@ -407,6 +411,7 @@ .338 NM IR-DIM .338 NM IR-DIM .338 NM ИК-трассирующие + .338 NM IR-DIM Caliber: .338 Norma Magnum Tracer IR-DIM<br />Rounds: 130<br />Used in: SPMG @@ -415,6 +420,7 @@ Calibre: .338 Norma Magnum Traçante IR-DIM<br />Cartouches: 130<br />Utilisé dans: SPMG Calibre: .338 Norma Magnum trazadora IR-DIM<br />Balas: 130<br />Se usa en: SPMG Калибр: .338 Norma Magnum ИК-трассирующие<br />Патронов: 130<br />Используются с: SPMG + Calibro: .338 Norma Magnum Tracciante IR-DIM<br />Munizioni: 130<br />In uso su: SPMG .338 NM 130Rnd AP Belt @@ -423,6 +429,7 @@ Bande .338 NM 130Cps AP Cinta de 130 balas AP de .338 NM Лента из 130-ти .338 NM бронебойных + .338 NM 130Rnd AP Belt .338 NM AP @@ -432,6 +439,7 @@ .338 NM AP .338 NM AP .338 NM бронебойные + .338 NM AP Caliber: .338 Norma Magnum AP<br />Rounds: 130<br />Used in: SPMG @@ -440,6 +448,7 @@ Calibre: .338 Norma Magnum AP<br />Cartouches: 130<br />Utilisé dans: SPMG Calibre: .338 Norma Magnum AP<br />Balas: 130<br />Se usa en: SPMG Калибр: .338 Norma Magnum бронебойные<br />Патронов: 130<br />Используются с: SPMG + Calibro: .338 Norma Magnum AP<br />Munizioni: 130<br />In uso su: SPMG @@ -449,6 +458,7 @@ Chargeur 9.3mm 10Cps Traçante Cargador de 10 balas trazadoras de 9.3mm Магазин из 10-ти 9,3 мм трассирующих + 9.3mm 10Rnd Tracer Mag 9.3mm Tracer @@ -458,6 +468,7 @@ 9.3mm Traçante 9.3mm trazadora 9,3 мм трассирующие + 9.3mm Tracer Caliber: 9.3x64mm Tracer<br />Rounds: 10<br />Used in: Cyrus @@ -466,6 +477,7 @@ Calibre: 9.3x64mm Traçante<br />Cartouches: 10<br />Utilisé dans: Cyrus Calibre: 9.3x64mm trazadora<br />Balas: 10<br />Se usa en: Cyrus Калибр: 9,3x64 мм трассирующие<br />Патронов: 10<br />Используются с: Cyrus + Calibro: 9.3x64mm Tracer<br />Munizioni: 10<br />In uso su: Cyrus 9.3mm 10Rnd Tracer IR-DIM Mag @@ -474,6 +486,7 @@ Chargeur 9.3mm 10Cps Traçante IR-DIM Cargador de 10 balas trazadoras IR-DIM de 9.3mm Магазин из 10-ти 9,3 мм ИК-трассирующих + 9.3mm 10Rnd Tracciante IR-DIM Mag 9.3mm IR-DIM @@ -483,6 +496,7 @@ 9.3mm IR-DIM 9.3mm IR-DIM 9,3 мм ИК-трассирующие + 9.3mm IR-DIM Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 10<br />Used in: Cyrus @@ -491,6 +505,7 @@ Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 10<br />Utilisé dans: Cyrus Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 10<br />Se usa en: Cyrus Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 10<br />Используются с: Cyrus + Calibro: 9.3x64mm Tracciante IR-DIM<br />Munizioni: 10<br />In uso su: Cyrus @@ -500,6 +515,7 @@ Bande 9.3mm 150Cps Traçante Cinta de 150 balas trazadoras de 9.3mm Лента из 150-ти 9,3 мм трассирующих + 9.3mm 150Rnd Tracer Belt 9.3mm Tracer @@ -509,6 +525,7 @@ 9.3mm Traçante 9.3mm trazadora 9,3 мм трассирующие + 9.3mm Tracciante Caliber: 9.3x64mm Tracer<br />Rounds: 150<br />Used in: Navid @@ -517,6 +534,7 @@ Calibre: 9.3x64mm Traçante<br />Cartouches: 150<br />Utilisé dans: Navid Calibre: 9.3x64mm trazadora<br />Balas: 150<br />Se usa en: Navid Калибр: 9,3x64 мм трассирующие<br />Патронов: 150<br />Используются с: Навид + Calibro: 9.3x64mm Tracciante<br />Munizioni: 150<br />In uso su: Navid 9.3mm 150Rnd Tracer IR-DIM Belt @@ -525,6 +543,7 @@ Bande 9.3mm 150Cps Traçante IR-DIM Cinta de 150 balas trazadoras IR-DIM de 9.3mm Лента из 150-ти 9,3 мм ИК-трассирующих + 9.3mm 150Rnd Tracciante IR-DIM Belt 9.3mm IR-DIM @@ -534,6 +553,7 @@ 9.3mm IR-DIM 9.3mm IR-DIM 9,3 мм ИК-трассирующие + 9.3mm IR-DIM Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 150<br />Used in: Navid @@ -542,6 +562,7 @@ Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 150<br />Utilisé dans: Navid Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 150<br />Se usa en: Navid Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 150<br />Используются с: Навид + Calibro: 9.3x64mm Tracciante IR-DIM<br />Munizioni: 150<br />In uso su: Navid 9.3mm 150Rnd AP Belt @@ -550,6 +571,7 @@ Bande 9.3mm 150Cps AP Cinta de 150 balas AP de 9.3mm Лента из 150-ти 9,3 мм бронебойных + 9.3mm 150Rnd AP Belt 9.3mm AP @@ -559,6 +581,7 @@ 9.3mm AP 9.3mm AP 9,3 мм бронебойные + 9.3mm AP Caliber: 9.3x64mm AP<br />Rounds: 150<br />Used in: Navid @@ -567,6 +590,7 @@ Calibre: 9.3x64mm AP<br />Cartouches: 150<br />Utilisé dans: Navid Calibre: 9.3x64mm AP<br />Balas: 150<br />Se usa en: Navid Калибр: 9,3x64 мм бронебойные<br />Патронов: 150<br />Используются с: Навид + Calibro: 9.3x64mm AP<br />Munizioni: 150<br />In uso su: Navid 9x19mm 16Rnd Mag @@ -574,6 +598,7 @@ Chargeur 9x19mm 16Cps Cargador de 16 balas de 9x19mm Магазин из 16-ти 9х19 мм + 9x19mm 16Rnd Mag 9x19mm @@ -581,6 +606,7 @@ 9x19mm 9x19mm 9х19 мм + 9x19mm 9x19mm 30Rnd Mag @@ -588,6 +614,7 @@ 9x19mm 30Cps Cargador de 16 balas de 9x19mm Магазин из 16-ти 9х19 мм + 9x19mm 30Rnd Mag 9x19mm 30Rnd Mag @@ -595,6 +622,7 @@ 9x19mm 30Cps Cargador de 30 balas de 9x19mm Магазин из 30-ти 9х19 мм + 9x19mm 30Rnd Mag 9x19mm @@ -602,6 +630,7 @@ 9x19mm 9x19mm 9х19 мм + 9x19mm 9x19mm 30Rnd Mag @@ -609,6 +638,7 @@ 9x19mm 30Cps Cargador de 30 balas de 9x19mm Магазин из 30-ти 9х19 мм + 9x19mm 30Rnd Mag 7.62x54mm 10Rnd Tracer IR-DIM Mag @@ -616,6 +646,7 @@ Chargeur 7.62x54mm 10Rnd Traçante IR-DIM Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm Магазин из 10-ти 7,62 мм ИК-трассирующих + 7.62x54mm 10Munizioni Traccianti IR-DIM Mag 7.62mm IR-DIM @@ -623,6 +654,7 @@ 7.62mm IR-DIM 7.62mm IR-DIM 7,62 мм ИК-трассирующие + 7.62mm IR-DIM 7.62x54mm 10Rnd Tracer IR-DIM Mag @@ -630,6 +662,7 @@ Chargeur 7.62x54mm 10Cps Traçante IR-DIM Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm Магазин из 10-ти 7,62 мм ИК-трассирующих + 7.62x54mm 10Munizioni Traccianti IR-DIM Mag 6.5mm 100Rnd Tracer IR-DIM Mag @@ -637,6 +670,7 @@ Chargeur 6.5mm 100Rnd Traçante IR-DIM Cargador de 100 balas trazadoras IR-DIM de 6.5mm Магазин из 100 6,5 мм ИК-трассирующих + 6.5mm 100Munizioni Traccianti IR-DIM Mag 6.5mm IR-DIM @@ -644,6 +678,7 @@ 6.5mm IR-DIM 6.5mm IR-DIM 6,5 мм ИК-трассирующие + 6.5mm IR-DIM 6.5mm 100Rnd Tracer IR-DIM Mag<br />Rounds: 100<br />Used in: MX LSW @@ -651,6 +686,7 @@ Chargeur 6.5mm 100Rnd Traçante IR-DIM Cargador de 100 balas trazadoras IR-DIM de 6.5mm Магазин из 100 6,5 мм ИК-трассирующих + 6.5mm 100Rnd Tracer IR-DIM Mag<br />Munizioni: 100<br />In uso su: MX LSW 6.5mm 200Rnd Tracer IR-DIM Belt @@ -658,6 +694,7 @@ Bande 6.5mm 200Rnd Traçante IR-DIM Cinta de 200 balas trazadoras IR-DIM de 6.5mm Магазин из 200-т 6,5 мм ИК-трассирующих + 6.5mm 200Rnd Tracer IR-DIM Belt 6.5mm IR-DIM @@ -665,6 +702,7 @@ 6.5mm IR-DIM 6.5mm IR-DIM 6,5 мм ИК-трассирующие + 6.5mm IR-DIM 6.5mm 200Rnd Tracer IR-DIM Belt<br />Rounds: 200<br />Used in: Stoner 99 LMG @@ -672,6 +710,7 @@ Bande 6.5mm 200Cps Traçante IR-DIM Cinta de 200 balas trazadoras IR-DIM de 6.5mm Магазин из 200-т 6,5 мм ИК-трассирующих + 6.5mm 200Rnd Tracer IR-DIM Belt<br />Munizioni: 200<br />In uso su: Stoner 99 LMG 5.56mm 30Rnd Mag (Mk262) @@ -679,6 +718,7 @@ 5.56mm 30Cps (Mk262) Cargador de 30 balas de 5.56mm (Mk262) Магазин из 30-ти 5.56 мм Mk262 + 5.56mm 30Rnd Mag (Mk262) 5.56mm Mk262 @@ -686,6 +726,7 @@ 5.56mm Mk262 5.56mm Mk262 5,56 мм Mk262 + 5.56mm Mk262 Caliber: 5.56x45 mm NATO (Mk262)<br />Rounds: 30 @@ -693,6 +734,7 @@ Calibre: 5.56x45 mm NATO (Mk262)<br />Cartouches: 30 Calibre: 5.56x45 mm NATO (Mk262)<br />Balas: 30 Калибр: 5,56x45 мм NATO (Mk262)<br />Патронов: 30 + Calibro: 5.56x45 mm NATO (Mk262)<br />Munizioni: 30 5.56mm 30Rnd Mag (Mk318) @@ -700,6 +742,7 @@ 5.56mm 30Cps (Mk318) Cargador de 30 balas de 5.56mm (Mk318) Магазин из 30-ти 5.56 мм (Mk318) + 5.56mm 30Rnd Mag (Mk318) 5.56mm Mk318 @@ -707,6 +750,7 @@ 5.56mm Mk318 5.56mm Mk318 5.56 мм Mk318 + 5.56mm Mk318 Caliber: 5.56x45 mm NATO (Mk318)<br />Rounds: 30 @@ -714,6 +758,7 @@ Calibre: 5.56x45 mm NATO (Mk318)<br />Cartouches: 30 Calibre: 5.56x45 mm NATO (Mk318)<br />Balas: 30 Калибр: 5,56x45 мм NATO (Mk318)<br />Патронов: 30 + Calibro: 5.56x45 mm NATO (Mk318)<br />Munizioni: 30 5.56mm 30Rnd Mag (M995 AP) @@ -721,6 +766,7 @@ 5.56mm 30Cps (M995 AP) Cargador de 30 balas de 5.56mm (M995 AP) Магазин из 30-ти 5.56 мм (M995 AP) + 5.56mm 30Rnd Mag (M995 AP) 5.56mm AP @@ -728,6 +774,7 @@ 5.56mm AP 5.56mm AP 5.56 мм AP + 5.56mm AP Caliber: 5.56x45 mm NATO (M995 AP)<br />Rounds: 30 @@ -735,6 +782,7 @@ Calibre: 5.56x45 mm NATO (M995 AP)<br />Cartouches: 30 Calibre: 5.56x45 mm NATO (M995 AP)<br />Balas: 30 Калибр: 5,56x45 мм NATO (M995 AP)<br />Патронов: 30 + Calibro: 5.56x45 mm NATO (M995 AP)<br />Munizioni: 30 7.62mm 10Rnd Mag (M118LR) @@ -742,6 +790,7 @@ 7.62mm 10Cps (M118LR) Cargador de 10 balas de 7.62mm (M118LR) Магазин из 10-ти 7,62 мм (M118LR) + 7.62mm 10Rnd Mag (M118LR) 7.62mm M118LR @@ -749,6 +798,7 @@ 7.62mm M118LR 7.62mm (M118LR) 7,62 мм M118LR + 7.62mm M118LR Caliber: 7.62x51 mm NATO (M118LR)<br />Rounds: 10 @@ -756,6 +806,7 @@ Calibre: 7.62x51 mm NATO (M118LR)<br />Cartouches: 10 Calibre: 7.62x51 mm NATO (M118LR)<br />Balas: 10 Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 10 + Calibro: 7.62x51 mm NATO (M118LR)<br />Munizioni: 10 7.62mm 20Rnd Mag (M118LR) @@ -763,6 +814,7 @@ 7.62mm 20Cps (M118LR) Cargador de 20 balas de 7.62mm (M118LR) Магазин из 20-ти 7,62 мм (M118LR) + 7.62mm 20Rnd Mag (M118LR) 7.62mm M118LR @@ -770,6 +822,7 @@ 7.62mm M118LR 7.62mm (M118LR) 7,62 мм M118LR + 7.62mm M118LR Caliber: 7.62x51 mm NATO (M118LR)<br />Rounds: 20 @@ -777,6 +830,7 @@ Calibre: 7.62x51 mm NATO (M118LR)<br />Cartouches: 20 Calibre: 7.62x51 mm NATO (M118LR)<br />Balas: 20 Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 20 + Calibro: 7.62x51 mm NATO (M118LR)<br />Munizioni: 20 7.62mm 10Rnd Mag (Mk316 Mod 0) @@ -784,6 +838,7 @@ 7.62mm 10Cps (Mk316 Mod 0) Cargador de 10 balas de 7.62mm (Mk316 Mod 0) Магазин из 10-ти 7,62 мм (Mk316 Mod 0) + 7.62mm 10Rnd Mag (Mk316 Mod 0) 7.62mm Mk316 @@ -791,6 +846,7 @@ 7.62mm Mk316 7.62mm Mk316 7,62 мм Mk316 + 7.62mm Mk316 Caliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Rounds: 10 @@ -798,6 +854,7 @@ Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 10 Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 10 Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 10 + Calibro: 7.62x51 mm NATO (Mk316 Mod 0)<br />Munizioni: 10 7.62mm 20Rnd Mag (Mk316 Mod 0) @@ -805,6 +862,7 @@ 7.62mm 20Cps (Mk316 Mod 0) Cargador de 20 balas de 7.62mm (Mk316 Mod 0) Магазин из 20-ти 7,62 мм (Mk316 Mod 0) + 7.62mm 20Rnd Mag (Mk316 Mod 0) 7.62mm Mk316 @@ -812,6 +870,7 @@ 7.62mm Mk316 7.62mm Mk316 7,62 мм Mk316 + 7.62mm Mk316 Caliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Rounds: 20 @@ -819,6 +878,7 @@ Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 20 Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 20 Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 20 + Calibro: 7.62x51 mm NATO (Mk316 Mod 0)<br />Munizioni: 20 7.62mm 10Rnd Mag (Mk319 Mod 0) @@ -826,6 +886,7 @@ 7.62mm 10Cps (Mk319 Mod 0) Cargador de 10 balas de 7.62mm (Mk319 Mod 0) Магазин из 10-ти 7,62 мм (Mk319 Mod 0) + 7.62mm 10Rnd Mag (Mk319 Mod 0) 7.62mm Mk319 @@ -833,6 +894,7 @@ 7.62mm Mk319 7.62mm Mk319 7,62mm Mk319 + 7.62mm Mk319 Caliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Rounds: 10 @@ -840,6 +902,7 @@ Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Cartouches: 10 Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Balas: 10 Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 10 + Calibro: 7.62x51 mm NATO (Mk319 Mod 0)<br />Munizioni: 10 7.62mm 20Rnd Mag (Mk319 Mod 0) @@ -847,6 +910,7 @@ 7.62mm 20Cps (Mk319 Mod 0) Cargador de 20 balas de 7.62mm (Mk319 Mod 0) Магазин из 20-ти 7,62 мм (Mk319 Mod 0) + 7.62mm 20Rnd Mag (Mk319 Mod 0) 7.62mm Mk319 @@ -854,6 +918,7 @@ 7.62mm Mk319 7.62mm Mk319 7,62 мм Mk319 + 7.62mm Mk319 Caliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Rounds: 20 @@ -861,6 +926,7 @@ Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Cartouches: 20 Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Balas: 20 Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 20 + Calibro: 7.62x51 mm NATO (Mk319 Mod 0)<br />Munizioni: 20 7.62mm 10Rnd Mag (M993 AP) @@ -868,6 +934,7 @@ 7.62mm 10Cps (M993 AP) Cargador de 10 balas de 7.62mm (M993 AP) Магазин из 10-ти 7,62 мм (M993 AP) + 7.62mm 10Rnd Mag (M993 AP) 7.62mm AP @@ -875,6 +942,7 @@ 7.62mm AP 7.62mm AP 7,62mm AP + 7.62mm AP Caliber: 7.62x51 mm NATO (M993 AP)<br />Rounds: 10 @@ -882,6 +950,7 @@ Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 10 Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 10 Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 10 + Calibro: 7.62x51 mm NATO (M993 AP)<br />Munizioni: 10 7.62mm 20Rnd Mag (M993 AP) @@ -889,6 +958,7 @@ 7.62mm 20Cps (M993 AP) Cargador de 20 balas de 7.62mm (M993 AP) Магазин из 20-ти 7,62 мм (M993 AP) + 7.62mm 20Rnd Mag (M993 AP) 7.62mm AP @@ -896,6 +966,7 @@ 7.62mm AP 7.62mm AP 7,62 мм AP + 7.62mm AP Caliber: 7.62x51 mm NATO (M993 AP)<br />Rounds: 20 @@ -903,13 +974,15 @@ Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 20 Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 20 Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 20 - + Calibro: 7.62x51 mm NATO (M993 AP)<br />Munizioni: 20 + 7.62mm 20Rnd Mag (Mk248 Mod 0) Magazynek 7,62mm 20rd (Mk248 Mod 0) 7.62mm 20Cps (Mk248 Mod 0) Cargador de 20 balas de 7.62mm (Mk248 Mod 0) Магазин из 20-ти 7,62 мм (Mk248 Mod 0) + 7.62mm 20Rnd Mag (Mk248 Mod 0) 7.62mm (Mk248 Mod 0) @@ -917,6 +990,7 @@ 7.62mm (Mk248 Mod 0) 7.62mm (Mk248 Mod 0) 7,62 мм (Mk248 Mod 0) + 7.62mm (Mk248 Mod 0) Caliber: 7.62x67 mm NATO (Mk248 Mod 0)<br />Rounds: 20 @@ -924,6 +998,7 @@ Calibre: 7.62x67mm NATO (Mk248 Mod 0)<br />Cartouches: 20 Calibre: 7.62x67 mm NATO (Mk248 Mod 0)<br />Balas: 20 Калибр: 7,62x67 мм NATO (Mk248 Mod 0)<br />Патронов: 20 + Calibro: 7.62x67 mm NATO (Mk248 Mod 0)<br />Munizioni: 20 7.62mm 20Rnd Mag (Mk248 Mod 1) @@ -931,6 +1006,7 @@ 7.62mm 20Cps (Mk248 Mod 1) Cargador de 20 balas de 7.62mm (Mk248 Mod 1) Магазин из 20-ти 7,62 мм (Mk248 Mod 1) + 7.62mm 20Rnd Mag (Mk248 Mod 1) 7.62mm (Mk248 Mod 1) @@ -938,6 +1014,7 @@ 7.62mm (Mk248 Mod 1) 7.62mm (Mk248 Mod 1) 7,62 мм (Mk248 Mod 1) + 7.62mm (Mk248 Mod 1) Caliber: 7.62x67 mm NATO (Mk248 Mod 1)<br />Rounds: 20 @@ -945,6 +1022,7 @@ Calibre: 7.62x67mm NATO (Mk248 Mod 1)<br />Cartouches: 20 Calibre: 7.62x67 mm NATO (Mk248 Mod 1)<br />Balas: 20 Калибр: 7,62x67 мм NATO (Mk248 Mod 1)<br />Патронов: 20 + Calibro: 7.62x67 mm NATO (Mk248 Mod 1)<br />Munizioni: 20 7.62mm 20Rnd Mag (Berger Hybrid OTM) @@ -952,6 +1030,7 @@ 7.62 20Cps (Berger Hybrid OTM) Cargador de 20 balas de 7.62mm (Berger Hybrid OTM) Магазин из 20-ти 7,62 мм (Berger Hybrid OTM) + 7.62mm 20Rnd Mag (Berger Hybrid OTM) 7.62mm (OTM) @@ -959,6 +1038,7 @@ 7.62mm (OTM) 7.62mm (OTM) 7,62 мм (OTM) + 7.62mm (OTM) Caliber: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Rounds: 20 @@ -966,6 +1046,7 @@ Calibre: 7.62x67mm NATO (Berger Hybrid OTM)<br />Cartouches: 20 Calibre: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Balas: 20 Калибр: 7,62x67 мм NATO (Berger Hybrid OTM)<br />Патронов: 20 + Calibro: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Munizioni: 20 6.5x47mm 30Rnd Mag (HPBT Scenar) @@ -973,6 +1054,7 @@ Cargador de 30 balas de 6.5x47mm (HPBT Scenar) Magazynek 6,5x47 mm 30rd (HPBT Scenar) Магазин из 30-ти 6,5x47 мм (HPBT Scenar) + 6.5x47mm 30Rnd Mag (HPBT Scenar) 6.5mm Lapua @@ -980,6 +1062,7 @@ 6.5mm Lapua 6,5mm Lapua 6,5 мм Lapua + 6.5mm Lapua Caliber: 6.5x47mm (HPBT Scenar)<br />Rounds: 30<br />Used in: MXM @@ -987,10 +1070,12 @@ Calibre: 6.5x47mm (HPBT Scenar)<br />Balas: 30 Kaliber: 6,5x47 mm (HPBT Scenar)<br />Pociski: 30 Калибр: 6,5x47 мм (HPBT Scenar)<br />Патронов: 30 + Calibro: 6.5x47mm (HPBT Scenar)<br />Munizioni: 30<br />In uso su: MXM 6.5mm Creedmor 30Rnd Mag Magazynek 6,5mm Creedmor 30rd + 6.5mm Creedmor 30Rnd Mag 6.5mm CM @@ -998,10 +1083,12 @@ 6.5mm CM 6,5mm CM 6,5 мм CM + 6.5mm CM Caliber: 6.5mm Creedmor<br />Rounds: 30<br />Used in: MXM Kaliber: 6,5mm Creedmor<br />Pociski: 30<br />Używany w: MXM + Calibro: 6.5mm Creedmor<br />Munizioni: 30<br />In uso su: MXM .338 10Rnd Mag (300gr Sierra MatchKing HPBT) @@ -1009,6 +1096,7 @@ Cargador de 10 balas de 8.6x70mm (300gr Sierra MatchKing HPBT) Magazynek .338 10rd (300gr Sierra MatchKing HPBT) Магазин из 10-ти .338 (300 гран Sierra MatchKing HPBT) + .338 10Munizioni Mag (300gr Sierra MatchKing HPBT) .338 (HPBT) @@ -1016,6 +1104,7 @@ .338 (HPBT) .338 (HPBT) .338 (HPBT) + .338 (HPBT) Caliber: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Rounds: 10 @@ -1023,6 +1112,7 @@ Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Balas: 10 Kaliber: 8,6x70 mm (300gr Sierra MatchKing HPBT)<br />Pociski: 10 Калибр: .338 (300 гран Sierra MatchKing HPBT)<br />Патронов: 10 + Calibro: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Munizioni: 10 .338 10Rnd Mag (API526) @@ -1030,6 +1120,7 @@ Cargador de 10 balas de .338 (API526) Magazynek .338 10rd (API526) Магазин из 10-ти .338 (API526) + .338 10Rnd Mag (API526) .338 AP @@ -1037,6 +1128,7 @@ .338 AP .338 AP .338 бронебойные + .338 AP Caliber: 8.6x70mm (API526)<br />Rounds: 10 @@ -1044,6 +1136,7 @@ Calibre: 8.6x70mm (API526)<br />Balas: 10 Kaliber: 8,6x70 mm (API526)<br />Pociski: 10 Калибр: .338 (API526)<br />Патронов: 10 + Calibro: 8.6x70mm (API526)<br />Munizioni: 10 12.7x99mm 5Rnd Mag @@ -1051,6 +1144,7 @@ Cargador de 5 balas de 12.7x99mm Magazynek 12,7x99 mm 5rd Магазин из 5-ти 12,7x99 мм + 12.7x99mm 5Rnd Mag 12.7mm @@ -1058,6 +1152,7 @@ 12.7mm 12,7mm 12,7 мм + 12.7mm Caliber: 12.7x99mm<br />Rounds: 5 @@ -1065,24 +1160,28 @@ Calibre: 12.7x99mm<br />Balas: 5 Kaliber: 12,7x99 mm<br />Pociski: 5 Калибр: 12,7x99 мм<br />Патронов: 5 + Calibro: 12.7x99mm<br />Munizioni: 5 12.7x99mm API 5Rnd Mag 12.7x99mm API 5Cps Cargador de 5 balas de 12.7x99mm API Magazynek 12,7x99mm API 5rd + 12.7x99mm API 5Rnd Mag 12.7mm API 12.7mm API 12.7mm API 12,7mm API + 12.7mm API Caliber: 12.7x99mm API<br />Rounds: 5 Calibre: 12.7x99mm API<br />Cartouches: 5 Calibre: 12.7x99mm API<br />Balas: 5 Kaliber: 12,7x99 mm API<br />Pociski: 5 + Calibro: 12.7x99mm API<br />Munizioni: 5 12.7x99mm 5Rnd Mag (AMAX) @@ -1090,6 +1189,7 @@ Cargador de 5 balas de 12.7x99mm (AMAX) Magazynek 12,7x99 mm 5rd (AMAX) Магазин из 5-ти 12,7x99 мм (A-MAX) + 12.7x99mm 5Rnd Mag (AMAX) 12.7mm @@ -1097,6 +1197,7 @@ 12.7mm 12,7mm 12,7 мм + 12.7mm Caliber: 12.7x99mm (AMAX)<br />Rounds: 5 @@ -1104,6 +1205,7 @@ Calibre: 12.7x99mm (AMAX)<br />Balas: 5 Kaliber: 12,7x99 mm (AMAX)<br />Pociski: 5 Калибр: 12,7x99 мм (A-MAX)<br />Патронов: 5 + Calibro: 12.7x99mm (AMAX)<br />Munizioni: 5 - + \ No newline at end of file diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml index 55a9f6211a9..1f6bcaa3ca3 100644 --- a/addons/captives/stringtable.xml +++ b/addons/captives/stringtable.xml @@ -119,6 +119,7 @@ Ekwipunek rewidowanej osoby Инвентарь обысканного человека Inventário da pessoa revistada + Inventario delle persone perquisite Frisk person @@ -188,4 +189,4 @@ Niente selezionato - + \ No newline at end of file From 270f9f3662478ce55ab33b03fabae57a3a18a905 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 28 Apr 2015 13:26:52 -0500 Subject: [PATCH 048/171] Fix init order problem --- addons/vehiclelock/config.cpp | 2 +- .../vehiclelock/functions/fnc_handleVehicleInitPost.sqf | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/vehiclelock/config.cpp b/addons/vehiclelock/config.cpp index 608a892b454..76d5817d8db 100644 --- a/addons/vehiclelock/config.cpp +++ b/addons/vehiclelock/config.cpp @@ -7,7 +7,7 @@ class CfgPatches { requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_interaction"}; author[] = {"PabstMirror"}; - authorUrl = "https://github.com/PabstMirror/"; + authorUrl = "https://github.com/acemod/ACE3"; VERSION_CONFIG; }; }; diff --git a/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf b/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf index df875b1859b..5a2bc3f7bde 100644 --- a/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf +++ b/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf @@ -1,6 +1,7 @@ /* * Author: PabstMirror - * Function for sync module. Assigns keys for all synced vehicles to any players that are synced. + * For every lockable vehicle, sets the starting lock state to a sane value. + * Only run if the InitModule is placed. * * Arguments: * 0: Vehicle @@ -18,9 +19,10 @@ PARAMS_1(_vehicle); if (!isServer) exitWith {}; -if (GVAR(VehicleStartingLockState) == -1) exitWith {}; [{ + //If the module wasn't placed, just exit (needs to be in wait because objectInitEH is before moduleInit) + if (GVAR(VehicleStartingLockState) == -1) exitWith {}; private ["_lock"]; PARAMS_1(_vehicle); if ((_vehicle isKindOf "Car") || {_vehicle isKindOf "Tank"} || {_vehicle isKindOf "Helicopter"}) then { @@ -36,4 +38,4 @@ if (GVAR(VehicleStartingLockState) == -1) exitWith {}; }; }; //Delay call until mission start (so everyone has the eventHandler's installed) -}, [_vehicle], 0.25, 0.25] call EFUNC(common,waitAndExecute); \ No newline at end of file +}, [_vehicle], 0.25, 0.25] call EFUNC(common,waitAndExecute); From 9e0932eb5692a1a68f635dcf078cb6f12c985011 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 28 Apr 2015 13:31:47 -0500 Subject: [PATCH 049/171] Opps --- addons/vehiclelock/CfgEventHandlers.hpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/vehiclelock/CfgEventHandlers.hpp b/addons/vehiclelock/CfgEventHandlers.hpp index 85db25d4a0c..6fbbd5c243f 100644 --- a/addons/vehiclelock/CfgEventHandlers.hpp +++ b/addons/vehiclelock/CfgEventHandlers.hpp @@ -16,11 +16,6 @@ class Extended_InventoryOpened_EventHandlers { }; }; class Extended_InitPost_EventHandlers { - class CAManBase { - class ADDON { - serverInit = QUOTE(_this call FUNC(handleUnitInitPost)); - }; - }; class Car { class ADDON { serverInit = QUOTE(_this call FUNC(handleVehicleInitPost)); @@ -37,4 +32,3 @@ class Extended_InitPost_EventHandlers { }; }; }; - From 95d83554da56d1018ad080ff33f3c71fd2a276c7 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Tue, 28 Apr 2015 20:32:02 +0200 Subject: [PATCH 050/171] Added local treatment through remoteExec for basic --- addons/medical/XEH_preInit.sqf | 2 ++ .../functions/fnc_treatmentBasic_bloodbag.sqf | 7 ++--- .../fnc_treatmentBasic_bloodbagLocal.sqf | 21 +++++++++++++++ .../functions/fnc_treatmentBasic_morphine.sqf | 11 ++------ .../fnc_treatmentBasic_morphineLocal.sqf | 27 +++++++++++++++++++ 5 files changed, 54 insertions(+), 14 deletions(-) create mode 100644 addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf create mode 100644 addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf diff --git a/addons/medical/XEH_preInit.sqf b/addons/medical/XEH_preInit.sqf index 051f7da2660..4f4ff5bc302 100644 --- a/addons/medical/XEH_preInit.sqf +++ b/addons/medical/XEH_preInit.sqf @@ -80,8 +80,10 @@ PREP(treatmentAdvanced_medication); PREP(treatmentAdvanced_medicationLocal); PREP(treatmentBasic_bandage); PREP(treatmentBasic_bloodbag); +PREP(treatmentBasic_bloodbagLocal); PREP(treatmentBasic_epipen); PREP(treatmentBasic_morphine); +PREP(treatmentBasic_morphineLocal); PREP(treatmentIV); PREP(treatmentIVLocal); PREP(treatmentTourniquet); diff --git a/addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf b/addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf index 57563ad8fc8..9d2c12280dc 100644 --- a/addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf +++ b/addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf @@ -15,12 +15,9 @@ */ #include "script_component.hpp" -#define BLOODBAGHEAL 70 -private ["_caller", "_target","_className","_blood"]; +private ["_caller", "_target"]; _caller = _this select 0; _target = _this select 1; -_className = _this select 3; -_blood = ((_target getVariable [QGVAR(bloodVolume), 100]) + BLOODBAGHEAL) min 100; -_target setVariable [QGVAR(bloodVolume), _blood, true]; +[[_target], QUOTE(DFUNC(treatmentBasic_bloodbagLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ diff --git a/addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf b/addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf new file mode 100644 index 00000000000..9bbe04b35f7 --- /dev/null +++ b/addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf @@ -0,0 +1,21 @@ +/* + * Author: KoffeinFlummi + * Local callback when the bloodbag treatment is complete + * + * Arguments: + * 0: The patient + * + * Return Value: + * nil + * + * Public: No + */ + +#include "script_component.hpp" +#define BLOODBAGHEAL 70 + +private ["_target","_blood"]; +_target = _this select 0; + +_blood = ((_target getVariable [QGVAR(bloodVolume), 100]) + BLOODBAGHEAL) min 100; +_target setVariable [QGVAR(bloodVolume), _blood, true]; diff --git a/addons/medical/functions/fnc_treatmentBasic_morphine.sqf b/addons/medical/functions/fnc_treatmentBasic_morphine.sqf index d8d793d0bc0..048b3147814 100644 --- a/addons/medical/functions/fnc_treatmentBasic_morphine.sqf +++ b/addons/medical/functions/fnc_treatmentBasic_morphine.sqf @@ -17,15 +17,8 @@ #include "script_component.hpp" #define MORPHINEHEAL 0.4 -private ["_caller", "_target","_className","_blood","_morphine","_pain"]; +private ["_caller", "_target"]; _caller = _this select 0; _target = _this select 1; -_className = _this select 3; -// reduce pain, pain sensitivity -_morphine = ((_target getVariable [QGVAR(morphine), 0]) + MORPHINEHEAL) min 1; -_target setVariable [QGVAR(morphine), _morphine, true]; -_pain = ((_target getVariable [QGVAR(pain), 0]) - MORPHINEHEAL) max 0; -_target setVariable [QGVAR(pain), _pain, true]; - -// @todo overdose +[[_target], QUOTE(DFUNC(treatmentBasic_morphineLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ diff --git a/addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf b/addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf new file mode 100644 index 00000000000..9dddf743e26 --- /dev/null +++ b/addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf @@ -0,0 +1,27 @@ +/* + * Author: KoffeinFlummi + * Local callback when the morphine treatment is complete + * + * Arguments: + * 0: The medic + * 1: The patient + * + * Return Value: + * nil + * + * Public: No + */ + +#include "script_component.hpp" +#define MORPHINEHEAL 0.4 + +private ["_target", "_morphine", "_pain"]; +_target = _this select 0; + +// reduce pain, pain sensitivity +_morphine = ((_target getVariable [QGVAR(morphine), 0]) + MORPHINEHEAL) min 1; +_target setVariable [QGVAR(morphine), _morphine, true]; +_pain = ((_target getVariable [QGVAR(pain), 0]) - MORPHINEHEAL) max 0; +_target setVariable [QGVAR(pain), _pain, true]; + +// @todo overdose From ebbb88deffa078b057a1e62413f4a1c7c8053e81 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Tue, 28 Apr 2015 20:32:29 +0200 Subject: [PATCH 051/171] Join in progress players will now be initialized --- addons/medical/XEH_postInit.sqf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index 526990709b9..18191784329 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -266,6 +266,10 @@ if (USE_WOUND_EVENT_SYNC) then { [ACE_player] call FUNC(itemCheck); }] call EFUNC(common,addEventHandler); - // Networked litter [QGVAR(createLitter), FUNC(handleCreateLitter), GVAR(litterCleanUpDelay)] call EFUNC(common,addSyncedEventHandler); + +["PlayerJip", { + diag_log format["[ACE] JIP Medical init for player"]; + [player] call FUNC(init); +}] call FUNC(addEventHandler); From c06caa72092b41185646e83964e3523536b03d54 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Tue, 28 Apr 2015 20:33:01 +0200 Subject: [PATCH 052/171] Only add JIP event for player clients --- addons/medical/XEH_postInit.sqf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index 18191784329..a3eb4684427 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -269,7 +269,9 @@ if (USE_WOUND_EVENT_SYNC) then { // Networked litter [QGVAR(createLitter), FUNC(handleCreateLitter), GVAR(litterCleanUpDelay)] call EFUNC(common,addSyncedEventHandler); -["PlayerJip", { - diag_log format["[ACE] JIP Medical init for player"]; - [player] call FUNC(init); -}] call FUNC(addEventHandler); +if (hasInterface) then { + ["PlayerJip", { + diag_log format["[ACE] JIP Medical init for player"]; + [player] call FUNC(init); + }] call FUNC(addEventHandler); +}; From f606c248540bc03f12d28bb6306ef440fc13e625 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Tue, 28 Apr 2015 20:47:11 +0200 Subject: [PATCH 053/171] fixes #901 --- .../medical/functions/fnc_actionDiagnose.sqf | 8 ++++++-- .../fnc_displayPatientInformation.sqf | 2 +- .../medical/functions/fnc_handleUnitVitals.sqf | 18 ++++++++++++------ addons/medical/functions/fnc_init.sqf | 2 +- .../fnc_treatmentAdvanced_fullHealLocal.sqf | 2 +- addons/medical/stringtable.xml | 3 +++ 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/addons/medical/functions/fnc_actionDiagnose.sqf b/addons/medical/functions/fnc_actionDiagnose.sqf index 234cc6d303f..886fa4752bc 100644 --- a/addons/medical/functions/fnc_actionDiagnose.sqf +++ b/addons/medical/functions/fnc_actionDiagnose.sqf @@ -26,8 +26,12 @@ if (alive _target) then { } else { _genericMessages pushback "STR_ACE_MEDICAL_diagnoseDead"; }; -if (_target getvariable[QGVAR(hasLostBlood), false]) then { - _genericMessages pushback "STR_ACE_MEDICAL_lostBlood"; +if (_target getvariable[QGVAR(hasLostBlood), 0] > 0) then { + if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then { + _genericMessages pushback "STR_ACE_MEDICAL_lostBloodALot"; + } else { + _genericMessages pushback "STR_ACE_MEDICAL_lostBlood"; + }; } else { _genericMessages pushback "STR_ACE_MEDICAL_noBloodloss"; }; diff --git a/addons/medical/functions/fnc_displayPatientInformation.sqf b/addons/medical/functions/fnc_displayPatientInformation.sqf index 1fc1051efa1..a62bfcacbc5 100644 --- a/addons/medical/functions/fnc_displayPatientInformation.sqf +++ b/addons/medical/functions/fnc_displayPatientInformation.sqf @@ -57,7 +57,7 @@ if (_show) then { if (_target getvariable[QGVAR(isBleeding), false]) then { _genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_BLEEDING", [1, 0.1, 0.1, 1]]; }; - if (_target getvariable[QGVAR(hasLostBlood), false]) then { + if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then { _genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_LOST_BLOOD", [1, 0.1, 0.1, 1]]; }; diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf index b806d1358f4..e04b35955eb 100644 --- a/addons/medical/functions/fnc_handleUnitVitals.sqf +++ b/addons/medical/functions/fnc_handleUnitVitals.sqf @@ -33,13 +33,19 @@ _bloodVolume = _bloodVolume max 0; _unit setvariable [QGVAR(bloodVolume), _bloodVolume, _syncValues]; // Set variables for synchronizing information across the net -if (_bloodVolume < 90) then { - if !(_unit getvariable [QGVAR(hasLostBlood), false]) then { - _unit setvariable [QGVAR(hasLostBlood), true, true]; - }; +if (_bloodVolume < 100) then { + if ((_bloodVolume < 90 && (GVAR(level) == 2)) || _bloodVolume <= 30) then { + if (_unit getvariable [QGVAR(hasLostBlood), 0] != 2) then { + _unit setvariable [QGVAR(hasLostBlood), 2, true]; + }; + } else { + if (_unit getvariable [QGVAR(hasLostBlood), 0] != 1) then { + _unit setvariable [QGVAR(hasLostBlood), 1, true]; + }; + } } else { - if (_unit getvariable [QGVAR(hasLostBlood),false]) then { - _unit setvariable [QGVAR(hasLostBlood), false, true]; + if (_unit getvariable [QGVAR(hasLostBlood), 0] != 0) then { + _unit setvariable [QGVAR(hasLostBlood), 0, true]; }; }; diff --git a/addons/medical/functions/fnc_init.sqf b/addons/medical/functions/fnc_init.sqf index d01a63b3a57..80e8d9ba19e 100644 --- a/addons/medical/functions/fnc_init.sqf +++ b/addons/medical/functions/fnc_init.sqf @@ -60,7 +60,7 @@ _unit setvariable [QGVAR(airwayCollapsed), false]; _unit setvariable [QGVAR(addedToUnitLoop), false, true]; _unit setvariable [QGVAR(inCardiacArrest), false, true]; _unit setVariable ["ACE_isUnconscious", false, true]; -_unit setvariable [QGVAR(hasLostBlood), false, true]; +_unit setvariable [QGVAR(hasLostBlood), 0, true]; _unit setvariable [QGVAR(isBleeding), false, true]; _unit setvariable [QGVAR(hasPain), false, true]; _unit setvariable [QGVAR(amountOfReviveLives), GVAR(amountOfReviveLives), true]; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf b/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf index 77f6d7f44c8..e385c5f7c06 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf @@ -55,7 +55,7 @@ if (alive _target) exitwith { _target setvariable [QGVAR(inCardiacArrest), false, true]; _target setvariable [QGVAR(inReviveState), false, true]; _target setVariable ["ACE_isUnconscious", false, true]; - _target setvariable [QGVAR(hasLostBlood), false, true]; + _target setvariable [QGVAR(hasLostBlood), 0, true]; _target setvariable [QGVAR(isBleeding), false, true]; _target setvariable [QGVAR(hasPain), false, true]; diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 52baf9bbe3c..7d3c2a6db4c 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1497,6 +1497,9 @@ Il à perdu du sang Stracił trochę krwi + + He's lost a lot of blood + He hasn't lost blood Нет кровопотери From 1512e4c367ceb1f214d8d7473fd0d291522b81ef Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 28 Apr 2015 14:09:26 -0500 Subject: [PATCH 054/171] isClientSettable spelling --- addons/interact_menu/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp index ad58d8433e7..36172d734fb 100644 --- a/addons/interact_menu/config.cpp +++ b/addons/interact_menu/config.cpp @@ -28,7 +28,7 @@ class ACE_Settings { class GVAR(cursorKeepCentered) { value = 0; typeName = "BOOL"; - isClientSetable = 1; + isClientSettable = 1; displayName = "$STR_ACE_Interact_cursorKeepCentered"; description = "$STR_ACE_Interact_cursorKeepCenteredDescription"; }; From a854b90b00b5854e0604d7cb639cb572acb76bea Mon Sep 17 00:00:00 2001 From: Glowbal Date: Tue, 28 Apr 2015 22:19:30 +0200 Subject: [PATCH 055/171] Increased level at which a lot of blood message gets shown in basic medical --- addons/medical/functions/fnc_handleUnitVitals.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf index e04b35955eb..0e01ef654c9 100644 --- a/addons/medical/functions/fnc_handleUnitVitals.sqf +++ b/addons/medical/functions/fnc_handleUnitVitals.sqf @@ -34,7 +34,7 @@ _unit setvariable [QGVAR(bloodVolume), _bloodVolume, _syncValues]; // Set variables for synchronizing information across the net if (_bloodVolume < 100) then { - if ((_bloodVolume < 90 && (GVAR(level) == 2)) || _bloodVolume <= 30) then { + if ((_bloodVolume < 90 && (GVAR(level) == 2)) || _bloodVolume <= 45) then { if (_unit getvariable [QGVAR(hasLostBlood), 0] != 2) then { _unit setvariable [QGVAR(hasLostBlood), 2, true]; }; From 414a50fb9b9376dc671706dbfe58190c62bf4ca4 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 28 Apr 2015 15:40:36 -0500 Subject: [PATCH 056/171] Fix Dragging StanceChange Anim --- addons/dragging/CfgMovesBasic.hpp | 8 ++++++++ addons/dragging/config.cpp | 1 + 2 files changed, 9 insertions(+) create mode 100644 addons/dragging/CfgMovesBasic.hpp diff --git a/addons/dragging/CfgMovesBasic.hpp b/addons/dragging/CfgMovesBasic.hpp new file mode 100644 index 00000000000..de15271416a --- /dev/null +++ b/addons/dragging/CfgMovesBasic.hpp @@ -0,0 +1,8 @@ +class CfgMovesBasic { + class Actions { + class MoveWithInjuredManDragger; + class MoveWithInjuredManDraggerRfl: MoveWithInjuredManDragger { + Up = "amovpercmstpsraswrfldnon"; + }; + }; +}; diff --git a/addons/dragging/config.cpp b/addons/dragging/config.cpp index c58aab607ec..cc843d4a686 100644 --- a/addons/dragging/config.cpp +++ b/addons/dragging/config.cpp @@ -14,3 +14,4 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgVehicles.hpp" +#include "CfgMovesBasic.hpp" From a80e11d025913233efc852399b9e7d953a873510 Mon Sep 17 00:00:00 2001 From: ulteq Date: Wed, 29 Apr 2015 01:33:26 +0200 Subject: [PATCH 057/171] Fixed some 7.62 tracer magazines: *Made use of the ACE_20Rnd_762x51_Mag_Tracer magazine *Fixed ACE_10Rnd_762x54_Tracer_mag (inheritance, stringtable, tracersEvery) --- addons/ballistics/CfgMagazines.hpp | 3 ++- addons/ballistics/CfgVehicles.hpp | 4 ++++ addons/ballistics/CfgWeapons.hpp | 3 +++ addons/ballistics/stringtable.xml | 32 +++++++++++++++--------------- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/addons/ballistics/CfgMagazines.hpp b/addons/ballistics/CfgMagazines.hpp index 9ead13c9626..32121e4e879 100644 --- a/addons/ballistics/CfgMagazines.hpp +++ b/addons/ballistics/CfgMagazines.hpp @@ -322,13 +322,14 @@ class CfgMagazines { class 10Rnd_762x54_Mag: 10Rnd_762x51_Mag { initSpeed = 800; }; - class ACE_10Rnd_762x54_Tracer_mag: 16Rnd_9x21_Mag { + class ACE_10Rnd_762x54_Tracer_mag: 10Rnd_762x54_Mag { author = "$STR_ACE_Common_ACETeam"; ammo = "ACE_762x54_Ball_7T2"; displayName = "$STR_ACE_10Rnd_762x54_Tracer_mag_Name"; displayNameShort = "$STR_ACE_10Rnd_762x54_Tracer_mag_NameShort"; descriptionShort = "$STR_ACE_10Rnd_762x54_Tracer_mag_Description"; initSpeed = 800; + tracersEvery = 1; }; class 150Rnd_762x54_Box: 150Rnd_762x51_Box { diff --git a/addons/ballistics/CfgVehicles.hpp b/addons/ballistics/CfgVehicles.hpp index c43782d024d..82e7fef5e3e 100644 --- a/addons/ballistics/CfgVehicles.hpp +++ b/addons/ballistics/CfgVehicles.hpp @@ -42,6 +42,7 @@ class CfgVehicles { MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4); MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4); MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4); + MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4); MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4); MACRO_ADDMAGAZINE(ACE_10Rnd_338_300gr_HPBT_Mag,4); MACRO_ADDMAGAZINE(ACE_10Rnd_338_API526_Mag,4); @@ -59,6 +60,7 @@ class CfgVehicles { MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4); MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4); MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4); + MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4); MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4); MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_SD,3); MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_M993_AP_Mag,4); @@ -82,6 +84,7 @@ class CfgVehicles { MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4); MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4); MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4); + MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4); MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4); }; }; @@ -200,6 +203,7 @@ class CfgVehicles { MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4); MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4); MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4); + MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4); MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4); MACRO_ADDMAGAZINE(ACE_20Rnd_762x67_Mk248_Mod_0_Mag,4); MACRO_ADDMAGAZINE(ACE_20Rnd_762x67_Mk248_Mod_1_Mag,4); diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp index 7e647d2605f..0f9dbcfbe42 100644 --- a/addons/ballistics/CfgWeapons.hpp +++ b/addons/ballistics/CfgWeapons.hpp @@ -509,6 +509,7 @@ class CfgWeapons { class srifle_EBR_F: EBR_base_F { magazines[] = { "20Rnd_762x51_Mag", + "ACE_20Rnd_762x51_Mag_Tracer", "ACE_20Rnd_762x51_Mag_Tracer_Dim", "ACE_20Rnd_762x51_Mk316_Mod_0_Mag", "ACE_20Rnd_762x51_M118LR_Mag", @@ -560,6 +561,7 @@ class CfgWeapons { class srifle_DMR_03_F: DMR_03_base_F { magazines[] = { "20Rnd_762x51_Mag", + "ACE_20Rnd_762x51_Mag_Tracer", "ACE_20Rnd_762x51_Mag_Tracer_Dim", "ACE_20Rnd_762x51_Mk316_Mod_0_Mag", "ACE_20Rnd_762x51_M118LR_Mag", @@ -584,6 +586,7 @@ class CfgWeapons { class srifle_DMR_06_camo_F: DMR_06_base_F { magazines[] = { "20Rnd_762x51_Mag", + "ACE_20Rnd_762x51_Mag_Tracer", "ACE_20Rnd_762x51_Mag_Tracer_Dim", "ACE_20Rnd_762x51_Mk316_Mod_0_Mag", "ACE_20Rnd_762x51_M118LR_Mag", diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index f885a79691e..dc9df9db34b 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -617,28 +617,28 @@ 9x19mm 30-Patronen-Magazin - 7.62x54mm 10Rnd Tracer IR-DIM Mag - Magazynek 7,62x54mm 10rd Smugacz IR-DIM - Chargeur 7.62x54mm 10Rnd Traçante IR-DIM - Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm + 7.62x54mm 10Rnd Tracer Mag + Magazynek 7,62x54mm 10rd Smugacz + Chargeur 7.62x54mm 10Rnd Traçante + Cargador de 10 balas trazadoras de 7.62x54mm Магазин из 10-ти 7,62 мм ИК-трассирующих - 7,62x54mm 10-Patronen-Magazin IR-DIM Leuchtspur + 7,62x54mm 10-Patronen-Magazin Leuchtspur - 7.62mm IR-DIM - 7,62mm IR-DIM - 7.62mm IR-DIM - 7.62mm IR-DIM - 7,62 мм ИК-трассирующие - 7,62x54mm IR-DIM + 7.62mm + 7,62mm + 7.62mm + 7.62mm + 7,62 мм + 7,62x54mm - 7.62x54mm 10Rnd Tracer IR-DIM Mag - Magazynek 7,62x54mm 10rd Smugacz IR-DIM - Chargeur 7.62x54mm 10Cps Traçante IR-DIM - Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm + 7.62x54mm 10Rnd Tracer Mag + Magazynek 7,62x54mm 10rd Smugacz + Chargeur 7.62x54mm 10Cps Traçante + Cargador de 10 balas trazadoras de 7.62x54mm Магазин из 10-ти 7,62 мм ИК-трассирующих - 7,62x54mm 10-Patronen-Magazin IR-DIM Leuchtspur + 7,62x54mm 10-Patronen-Magazin Leuchtspur 6.5mm 100Rnd Tracer IR-DIM Mag From 3eb2bdfc8467aa7432312466a1bfb4bac9a52924 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 28 Apr 2015 21:17:29 -0500 Subject: [PATCH 058/171] Display Name Progress Text --- addons/medical/ACE_Medical_Treatments.hpp | 8 +++++--- addons/medical/stringtable.xml | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/addons/medical/ACE_Medical_Treatments.hpp b/addons/medical/ACE_Medical_Treatments.hpp index 85bcab96164..fced8c93bf3 100644 --- a/addons/medical/ACE_Medical_Treatments.hpp +++ b/addons/medical/ACE_Medical_Treatments.hpp @@ -196,7 +196,7 @@ class ACE_Medical_Actions { }; class SurgicalKit: fieldDressing { displayName = ""; - displayNameProgress = ""; + displayNameProgress = "$STR_ACE_Medical_TreatmentAction"; items[] = {"ACE_surgicalKit"}; treatmentLocations[] = {QGVAR(useLocation_SurgicalKit)}; requiredMedic = QGVAR(medicSetting_SurgicalKit); @@ -208,7 +208,7 @@ class ACE_Medical_Actions { }; class PersonalAidKit: fieldDressing { displayName = ""; - displayNameProgress = ""; + displayNameProgress = "$STR_ACE_Medical_TreatmentAction"; items[] = {"ACE_personalAidKit"}; treatmentLocations[] = {QGVAR(useLocation_PAK)}; requiredMedic = QGVAR(medicSetting_PAK); @@ -225,7 +225,7 @@ class ACE_Medical_Actions { }; class CheckPulse: fieldDressing { displayName = ""; - displayNameProgress = ""; + displayNameProgress = "$STR_ACE_MEDICAL_CHECK_PULSE_CONTENT"; treatmentLocations[] = {"All"}; requiredMedic = 0; treatmentTime = 2; @@ -240,9 +240,11 @@ class ACE_Medical_Actions { }; class CheckBloodPressure: CheckPulse { callbackSuccess = QUOTE(DFUNC(actionCheckBloodPressure)); + displayNameProgress = "$STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_CONTENT"; }; class CheckResponse: CheckPulse { callbackSuccess = QUOTE(DFUNC(actionCheckResponse)); + displayNameProgress = "$STR_ACE_MEDICAL_CHECK_RESPONSE_CONTENT"; }; class RemoveTourniquet: CheckPulse { treatmentTime = 2.5; diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 7d3c2a6db4c..dda25fd5ad7 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -2080,5 +2080,8 @@ Zkłamana kość udowa Femur Cassé + + Treating... + \ No newline at end of file From 409851dd8ce9faeb352d7f88f6fdc2762e90ea3a Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 28 Apr 2015 23:57:11 -0500 Subject: [PATCH 059/171] Attach the real explosive --- addons/explosives/functions/fnc_onLanded.sqf | 9 ++++++++- .../explosives/functions/fnc_placeExplosive.sqf | 15 ++++++++++++--- addons/explosives/functions/fnc_startTimer.sqf | 1 + addons/explosives/functions/fnc_triggerType.sqf | 5 ++++- addons/explosives/script_component.hpp | 2 ++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/addons/explosives/functions/fnc_onLanded.sqf b/addons/explosives/functions/fnc_onLanded.sqf index 59487e651ca..f2ed729b1a3 100644 --- a/addons/explosives/functions/fnc_onLanded.sqf +++ b/addons/explosives/functions/fnc_onLanded.sqf @@ -1,7 +1,10 @@ /* * Author: Garth 'L-H' de Wet + * Handles the "EpeContactStart" event when placing the explosive. * * Arguments: + * 0: Explosive Placing Object + * 1: Colliding Object * * Return Value: * None @@ -14,19 +17,23 @@ #include "script_component.hpp" EXPLODE_2_PVT(_this,_explosive,_hitTarget); +TRACE_2("Explosive EpeContactStart",_explosive,_hitTarget); + if ((_explosive getVariable [QGVAR(Handled), false])) exitWith {}; _explosive setVariable [QGVAR(Handled), true]; if (!isNull _hitTarget && {_hitTarget isKindOf "AllVehicles"}) then { + TRACE_1("Attaching to",_hitTarget); _explosive attachTo [_hitTarget]; private "_dir"; - _dir = _setup getVariable [QGVAR(Direction), 0]; + _dir = _explosive getVariable [QGVAR(Direction), 0]; _dir = _dir - (getDir _hitTarget); [[_explosive, _dir, 0], QFUNC(setPosition)] call EFUNC(common,execRemoteFnc); } else { [{ EXPLODE_2_PVT(_this,_player,_explosive); private "_pos"; + _pos = getPosASL _explosive; if (surfaceIsWater _pos) then { _pos = getPosASL _explosive; _explosive setPosASL _pos; diff --git a/addons/explosives/functions/fnc_placeExplosive.sqf b/addons/explosives/functions/fnc_placeExplosive.sqf index 228e8eef23a..4bed019d471 100644 --- a/addons/explosives/functions/fnc_placeExplosive.sqf +++ b/addons/explosives/functions/fnc_placeExplosive.sqf @@ -21,10 +21,14 @@ * Public: Yes */ #include "script_component.hpp" -private ["_ammo", "_explosive"]; +private ["_ammo", "_explosive", "_attachedTo", "_expPos", "_magazineTrigger"]; EXPLODE_6_PVT(_this,_unit,_pos,_dir,_magazineClass,_triggerConfig,_triggerSpecificVars); -if (count _this > 6) then { - deleteVehicle (_this select 6); +DEFAULT_PARAM(6,_setupPlaceholderObject,objNull); + +_attachedTo = objNull; +if (!isNull _setupPlaceholderObject) then { + _attachedTo = attachedTo _setupPlaceholderObject; + deleteVehicle _setupPlaceholderObject; }; if (isNil "_triggerConfig") exitWith { @@ -57,6 +61,11 @@ _expPos = getPosATL _explosive; _defuseHelper setPosATL (((getPosATL _defuseHelper) vectorAdd (_pos vectorDiff _expPos))); _explosive setPosATL _pos; +if (!isNull _attachedTo) then { + TRACE_1("Attaching Live Explosive",_attachedTo); + _explosive attachTo [_attachedTo]; +}; + if (isText(_triggerConfig >> "onPlace") && {[_unit,_explosive,_magazineClass,_triggerSpecificVars] call compile (getText (_triggerConfig >> "onPlace"))}) exitWith {_explosive}; [[_explosive, _dir, getNumber (_magazineTrigger >> "pitch")], QFUNC(setPosition)] call EFUNC(common,execRemoteFnc); diff --git a/addons/explosives/functions/fnc_startTimer.sqf b/addons/explosives/functions/fnc_startTimer.sqf index 13da62ec296..9d2ca0aee4b 100644 --- a/addons/explosives/functions/fnc_startTimer.sqf +++ b/addons/explosives/functions/fnc_startTimer.sqf @@ -19,6 +19,7 @@ EXPLODE_2_PVT(_this,_explosive,_delay); [{ + private ["_explosive"]; _explosive = _this; if (!isNull _explosive) then { [_explosive, -1, [_explosive, 0]] call FUNC(detonateExplosive); diff --git a/addons/explosives/functions/fnc_triggerType.sqf b/addons/explosives/functions/fnc_triggerType.sqf index fc6a0b90c1a..f9d8790a562 100644 --- a/addons/explosives/functions/fnc_triggerType.sqf +++ b/addons/explosives/functions/fnc_triggerType.sqf @@ -14,7 +14,10 @@ * Public: Yes */ #include "script_component.hpp" -private "_result"; + +private["_result", "_config", "_count", "_index", "_supports"]; +// IGNORE_PRIVATE_WARNING(_supports); + _result = []; _config = getArray (ConfigFile >> "CfgMagazines" >> (_this select 0) >> "ACE_Triggers" >> "SupportedTriggers"); _count = count _config; diff --git a/addons/explosives/script_component.hpp b/addons/explosives/script_component.hpp index 60c7e88d066..5ff12b8ba35 100644 --- a/addons/explosives/script_component.hpp +++ b/addons/explosives/script_component.hpp @@ -1,6 +1,8 @@ #define COMPONENT explosives #include "\z\ace\addons\main\script_mod.hpp" +// #define DEBUG_MODE_FULL + #ifdef DEBUG_ENABLED_EXPLOSIVES #define DEBUG_MODE_FULL #endif From e56838be36be55723dae18375b6e0abc79d031c4 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 29 Apr 2015 00:05:02 -0500 Subject: [PATCH 060/171] Private Variables --- addons/explosives/XEH_postInit.sqf | 2 +- addons/explosives/functions/fnc_addCellphoneIED.sqf | 6 +++++- addons/explosives/functions/fnc_addClacker.sqf | 2 +- .../explosives/functions/fnc_addDetonateActions.sqf | 2 +- .../explosives/functions/fnc_addExplosiveActions.sqf | 2 +- .../functions/fnc_addTransmitterActions.sqf | 2 +- addons/explosives/functions/fnc_addTriggerActions.sqf | 3 +-- addons/explosives/functions/fnc_canDefuse.sqf | 2 +- addons/explosives/functions/fnc_detonateExplosive.sqf | 11 ++++++----- addons/explosives/functions/fnc_dialPhone.sqf | 2 +- addons/explosives/functions/fnc_getDetonators.sqf | 2 ++ .../explosives/functions/fnc_getPlacedExplosives.sqf | 2 ++ addons/explosives/functions/fnc_hasExplosives.sqf | 2 ++ .../explosives/functions/fnc_hasPlacedExplosives.sqf | 2 ++ addons/explosives/functions/fnc_module.sqf | 3 +++ addons/explosives/functions/fnc_place_Approve.sqf | 2 +- addons/explosives/functions/fnc_setupExplosive.sqf | 2 +- addons/explosives/functions/fnc_startDefuse.sqf | 5 ++++- 18 files changed, 36 insertions(+), 18 deletions(-) diff --git a/addons/explosives/XEH_postInit.sqf b/addons/explosives/XEH_postInit.sqf index a4a55f8609f..998f73ccaf0 100644 --- a/addons/explosives/XEH_postInit.sqf +++ b/addons/explosives/XEH_postInit.sqf @@ -37,7 +37,7 @@ player addEventHandler ["Killed", { } count _deadman; }]; player addEventHandler ["Take", { - private ["_item", "_getter", "_giver", "_config"]; + private ["_item", "_getter", "_giver", "_config", "_detonators"]; _item = _this select 2; _getter = _this select 0; _giver = _this select 1; diff --git a/addons/explosives/functions/fnc_addCellphoneIED.sqf b/addons/explosives/functions/fnc_addCellphoneIED.sqf index 3be21df5599..953476861b8 100644 --- a/addons/explosives/functions/fnc_addCellphoneIED.sqf +++ b/addons/explosives/functions/fnc_addCellphoneIED.sqf @@ -17,7 +17,11 @@ * Public: No */ #include "script_component.hpp" + EXPLODE_4_PVT(_this,_unit,_explosive,_magazineClass,_extra); + +private["_config", "_detonators", "_hasRequired", "_requiredItems", "_code", "_count", "_codeSet"]; + // Config is the last item in the list of passed in items. _config = (_this select 3) select (count (_this select 3) - 1); @@ -29,7 +33,7 @@ _detonators = [_unit] call FUNC(getDetonators); _hasRequired = false; }; } count _requiredItems; -private ["_code", "_count", "_codeSet"]; + _codeSet = false; while {!_codeSet} do { _code = str(round (random 9999)); diff --git a/addons/explosives/functions/fnc_addClacker.sqf b/addons/explosives/functions/fnc_addClacker.sqf index 7e3529f931c..b25c1e1bcdd 100644 --- a/addons/explosives/functions/fnc_addClacker.sqf +++ b/addons/explosives/functions/fnc_addClacker.sqf @@ -17,7 +17,7 @@ * Public: Yes */ #include "script_component.hpp" -private ["_clacker", "_config", "_requiredItems", "_hasRequired"]; +private ["_clacker", "_config", "_requiredItems", "_hasRequired", "_detonators"]; EXPLODE_3_PVT(_this,_unit,_explosive,_magazineClass); // Config is the last item in the list of passed in items. _config = (_this select 3) select (count (_this select 3) - 1); diff --git a/addons/explosives/functions/fnc_addDetonateActions.sqf b/addons/explosives/functions/fnc_addDetonateActions.sqf index 5081040233d..5c94649608f 100644 --- a/addons/explosives/functions/fnc_addDetonateActions.sqf +++ b/addons/explosives/functions/fnc_addDetonateActions.sqf @@ -15,7 +15,7 @@ * Public: No */ #include "script_component.hpp" -private ["_result", "_item", "_children"]; +private ["_result", "_item", "_children", "_range", "_required"]; EXPLODE_2_PVT(_this,_unit,_detonator); _range = GetNumber (ConfigFile >> "CfgWeapons" >> _detonator >> "ACE_Range"); diff --git a/addons/explosives/functions/fnc_addExplosiveActions.sqf b/addons/explosives/functions/fnc_addExplosiveActions.sqf index 29a2eed6082..214b41602cb 100644 --- a/addons/explosives/functions/fnc_addExplosiveActions.sqf +++ b/addons/explosives/functions/fnc_addExplosiveActions.sqf @@ -11,7 +11,7 @@ * Public: No */ #include "script_component.hpp" -private ["_mags", "_item", "_index", "_children"]; +private ["_mags", "_item", "_index", "_children", "_itemCount", "_list"]; EXPLODE_1_PVT(_this,_unit); diff --git a/addons/explosives/functions/fnc_addTransmitterActions.sqf b/addons/explosives/functions/fnc_addTransmitterActions.sqf index 6408eb2ec76..abaa57decc7 100644 --- a/addons/explosives/functions/fnc_addTransmitterActions.sqf +++ b/addons/explosives/functions/fnc_addTransmitterActions.sqf @@ -14,7 +14,7 @@ * Public: No */ #include "script_component.hpp" -private ["_items", "_unit", "_children", "_config"]; +private ["_unit", "_children", "_config", "_detonators"]; _unit = _this select 0; _detonators = [_unit] call FUNC(getDetonators); _children = []; diff --git a/addons/explosives/functions/fnc_addTriggerActions.sqf b/addons/explosives/functions/fnc_addTriggerActions.sqf index e9c2dca0e65..6f4ece163ca 100644 --- a/addons/explosives/functions/fnc_addTriggerActions.sqf +++ b/addons/explosives/functions/fnc_addTriggerActions.sqf @@ -15,8 +15,7 @@ * Public: No */ #include "script_component.hpp" -private ["_hasRequiredItems","_triggerTypes", "_children", - "_detonators", "_required", "_magTriggers"]; +private ["_hasRequiredItems","_triggerTypes", "_children", "_detonators", "_required", "_magTriggers"]; EXPLODE_2_PVT(_this,_magazine,_explosive); _detonators = [ACE_player] call FUNC(getDetonators); diff --git a/addons/explosives/functions/fnc_canDefuse.sqf b/addons/explosives/functions/fnc_canDefuse.sqf index cd04564a9f4..ef4bd10a837 100644 --- a/addons/explosives/functions/fnc_canDefuse.sqf +++ b/addons/explosives/functions/fnc_canDefuse.sqf @@ -14,7 +14,7 @@ * Public: Yes */ #include "script_component.hpp" -private ["_specialist"]; +private ["_isSpecialist"]; EXPLODE_2_PVT(_this,_unit,_target); if (isNull(_target getVariable [QGVAR(Explosive),objNull])) exitWith { deleteVehicle _target; diff --git a/addons/explosives/functions/fnc_detonateExplosive.sqf b/addons/explosives/functions/fnc_detonateExplosive.sqf index f05a265c3a8..e4dfc2f7fc7 100644 --- a/addons/explosives/functions/fnc_detonateExplosive.sqf +++ b/addons/explosives/functions/fnc_detonateExplosive.sqf @@ -19,7 +19,7 @@ * Public: Yes */ #include "script_component.hpp" -private ["_result", "_ignoreRange", "_helper"]; +private ["_result", "_ignoreRange", "_helper", "_pos"]; EXPLODE_3_PVT(_this,_unit,_range,_item); _ignoreRange = (_range == -1); _result = true; @@ -46,10 +46,11 @@ if (getNumber (ConfigFile >> "CfgAmmo" >> typeof (_item select 0) >> "TriggerWhe }; }; [{ - _explosive = _this; - if (!isNull _explosive) then { - _explosive setDamage 1; - }; + private ["_explosive"]; + _explosive = _this; + if (!isNull _explosive) then { + _explosive setDamage 1; + }; }, _item select 0, _item select 1, 0] call EFUNC(common,waitAndExecute); _result diff --git a/addons/explosives/functions/fnc_dialPhone.sqf b/addons/explosives/functions/fnc_dialPhone.sqf index f00fa8a970b..aa163b027fe 100644 --- a/addons/explosives/functions/fnc_dialPhone.sqf +++ b/addons/explosives/functions/fnc_dialPhone.sqf @@ -15,7 +15,7 @@ * Public: Yes */ #include "script_component.hpp" -private ["_arr", "_ran", "_i","_speedDial"]; +private ["_arr", "_ran", "_i"]; EXPLODE_2_PVT(_this,_unit,_code); if (_unit getVariable [QGVAR(Dialing),false]) exitWith {}; if !(alive _unit) exitWith {}; diff --git a/addons/explosives/functions/fnc_getDetonators.sqf b/addons/explosives/functions/fnc_getDetonators.sqf index 26bde9b1903..9df13c266a3 100644 --- a/addons/explosives/functions/fnc_getDetonators.sqf +++ b/addons/explosives/functions/fnc_getDetonators.sqf @@ -14,6 +14,8 @@ * Public: Yes */ #include "script_component.hpp" +// IGNORE_PRIVATE_WARNING(_detonators); + private ["_unit", "_items", "_result", "_config"]; _unit = _this select 0; _items = (items _unit); diff --git a/addons/explosives/functions/fnc_getPlacedExplosives.sqf b/addons/explosives/functions/fnc_getPlacedExplosives.sqf index 11649720474..0c2080923a6 100644 --- a/addons/explosives/functions/fnc_getPlacedExplosives.sqf +++ b/addons/explosives/functions/fnc_getPlacedExplosives.sqf @@ -16,6 +16,8 @@ * Public: Yes */ #include "script_component.hpp" +// IGNORE_PRIVATE_WARNING(_allExplosives,_deadmanExplosives); + private ["_unit", "_clackerList", "_adjustedList", "_list", "_filter"]; _unit = _this select 0; _filter = nil; diff --git a/addons/explosives/functions/fnc_hasExplosives.sqf b/addons/explosives/functions/fnc_hasExplosives.sqf index 794cebc57d3..bd790bd12fe 100644 --- a/addons/explosives/functions/fnc_hasExplosives.sqf +++ b/addons/explosives/functions/fnc_hasExplosives.sqf @@ -14,6 +14,8 @@ * Public: Yes */ #include "script_component.hpp" +// IGNORE_PRIVATE_WARNING(_hasExplosives); + private ["_unit", "_result", "_magazines"]; _result = false; _unit = _this select 0; diff --git a/addons/explosives/functions/fnc_hasPlacedExplosives.sqf b/addons/explosives/functions/fnc_hasPlacedExplosives.sqf index 4a6ccc9de82..174bc07fbc1 100644 --- a/addons/explosives/functions/fnc_hasPlacedExplosives.sqf +++ b/addons/explosives/functions/fnc_hasPlacedExplosives.sqf @@ -14,4 +14,6 @@ * Public: Yes */ #include "script_component.hpp" +// IGNORE_PRIVATE_WARNING(_hasPlacedExplosives); + (count (_this call FUNC(getPlacedExplosives)) > 0) diff --git a/addons/explosives/functions/fnc_module.sqf b/addons/explosives/functions/fnc_module.sqf index 3e522e9a709..4080b41bdec 100644 --- a/addons/explosives/functions/fnc_module.sqf +++ b/addons/explosives/functions/fnc_module.sqf @@ -15,6 +15,9 @@ */ #include "script_component.hpp" if !(isServer) exitWith {}; + +private["_activated", "_logic"]; + _logic = _this select 0; _activated = _this select 2; diff --git a/addons/explosives/functions/fnc_place_Approve.sqf b/addons/explosives/functions/fnc_place_Approve.sqf index 0082a9bd6a7..f133dbb080a 100644 --- a/addons/explosives/functions/fnc_place_Approve.sqf +++ b/addons/explosives/functions/fnc_place_Approve.sqf @@ -19,7 +19,7 @@ if (GVAR(pfeh_running)) then { [QGVAR(Placement),"OnEachFrame"] call CALLSTACK(BIS_fnc_removeStackedEventHandler); GVAR(pfeh_running) = false; }; -private ["_mag", "_setup", "_player"]; +private ["_setup", "_player", "_dir"]; _setup = GVAR(Setup); GVAR(Setup) = objNull; [GVAR(placer), "ACE_Explosives", false] call EFUNC(Common,setForceWalkStatus); diff --git a/addons/explosives/functions/fnc_setupExplosive.sqf b/addons/explosives/functions/fnc_setupExplosive.sqf index ea3a0862748..a0aad3d1abc 100644 --- a/addons/explosives/functions/fnc_setupExplosive.sqf +++ b/addons/explosives/functions/fnc_setupExplosive.sqf @@ -28,7 +28,7 @@ GVAR(Setup) setVariable [QGVAR(class), _class, true]; GVAR(TweakedAngle) = 180; [QGVAR(Placement),"OnEachFrame", { - private "_player"; + private ["_player", "_pos"]; _player = ACE_player; if (GVAR(placer) != _player) exitWith { call FUNC(place_Cancel); diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf index 7eacdd33e14..d3631fdb5fb 100644 --- a/addons/explosives/functions/fnc_startDefuse.sqf +++ b/addons/explosives/functions/fnc_startDefuse.sqf @@ -16,11 +16,14 @@ */ #include "script_component.hpp" EXPLODE_2_PVT(_this,_unit,_target); + +private["_actionToPlay"]; + _target = attachedTo (_target); _fnc_DefuseTime = { EXPLODE_2_PVT(_this,_specialist,_target); - + private ["_defuseTime"]; _defuseTime = 5; if (isNumber(ConfigFile >> "CfgAmmo" >> typeOf (_target) >> "ACE_DefuseTime")) then { _defuseTime = getNumber(ConfigFile >> "CfgAmmo" >> typeOf (_target) >> "ACE_DefuseTime"); From d7d43ce3b1c922b647f9eaa4cd0fe53f8b2911bb Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 29 Apr 2015 01:26:13 -0500 Subject: [PATCH 061/171] #828 - Private Variables for Interact Menu --- addons/interact_menu/XEH_clientInit.sqf | 2 +- addons/interact_menu/functions/fnc_compileMenu.sqf | 3 +-- addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf | 4 ++-- addons/interact_menu/functions/fnc_createAction.sqf | 1 + addons/interact_menu/functions/fnc_findActionNode.sqf | 2 +- addons/interact_menu/functions/fnc_removeActionFromClass.sqf | 2 +- addons/interact_menu/functions/fnc_render.sqf | 2 +- addons/interact_menu/functions/fnc_renderActionPoints.sqf | 2 +- addons/interact_menu/functions/fnc_renderBaseMenu.sqf | 2 +- addons/interact_menu/functions/fnc_renderIcon.sqf | 2 +- addons/interact_menu/functions/fnc_renderMenu.sqf | 2 +- addons/interact_menu/functions/fnc_renderSelector.sqf | 3 ++- addons/interact_menu/functions/fnc_setupTextColors.sqf | 2 +- addons/interact_menu/functions/fnc_splitPath.sqf | 2 +- addons/interact_menu/script_component.hpp | 2 ++ 15 files changed, 18 insertions(+), 15 deletions(-) diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf index faabf773f4a..5714b77e167 100644 --- a/addons/interact_menu/XEH_clientInit.sqf +++ b/addons/interact_menu/XEH_clientInit.sqf @@ -8,7 +8,7 @@ GVAR(ParsedTextCached) = []; //Setup text/shadow color matrix [] call FUNC(setupTextColors); ["SettingChanged", { - PARAMS_2(_name,_value); + PARAMS_1(_name); if ((_name == QGVAR(colorTextMax)) || {_name == QGVAR(colorTextMin)} || {_name == QGVAR(colorShadowMax)} || {_name == QGVAR(colorShadowMin)}) then { [] call FUNC(setupTextColors); }; diff --git a/addons/interact_menu/functions/fnc_compileMenu.sqf b/addons/interact_menu/functions/fnc_compileMenu.sqf index bd2023a90d8..f5296ec9cf7 100644 --- a/addons/interact_menu/functions/fnc_compileMenu.sqf +++ b/addons/interact_menu/functions/fnc_compileMenu.sqf @@ -26,8 +26,7 @@ if !(isNil {missionNamespace getVariable [_actionsVarName, nil]}) exitWith {}; private "_recurseFnc"; _recurseFnc = { - private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_selection", "_condition", "_showDisabled", - "_enableInside", "_canCollapse", "_runOnHover", "_children", "_entry", "_entryCfg", "_insertChildren", "_modifierFunction"]; + private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_selection", "_condition", "_showDisabled", "_enableInside", "_canCollapse", "_runOnHover", "_children", "_entry", "_entryCfg", "_insertChildren", "_modifierFunction", "_i"]; EXPLODE_1_PVT(_this,_actionsCfg); _actions = []; diff --git a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf index 0258b3dc8ab..e4c449ce800 100644 --- a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf +++ b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf @@ -14,7 +14,7 @@ EXPLODE_1_PVT(_this,_target); -private ["_objectType","_actionsVarName"]; +private ["_objectType","_actionsVarName", "_canCollapse", "_children", "_enableInside", "_entry", "_entryCfg", "_i", "_insertChildren", "_modifierFunction", "_runOnHover"]; _objectType = _target; if (typeName _target == "OBJECT") then { _objectType = typeOf _target; @@ -26,7 +26,7 @@ if !(isNil {missionNamespace getVariable [_actionsVarName, nil]}) exitWith {}; private "_recurseFnc"; _recurseFnc = { - private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_selection", "_condition", "_showDisabled", + private ["_actions", "_displayName", "_icon", "_statement", "_condition", "_showDisabled", "_enableInside", "_canCollapse", "_runOnHover", "_children", "_entry", "_entryCfg", "_insertChildren", "_modifierFunction"]; EXPLODE_1_PVT(_this,_actionsCfg); _actions = []; diff --git a/addons/interact_menu/functions/fnc_createAction.sqf b/addons/interact_menu/functions/fnc_createAction.sqf index fb3f05b7b52..a7d939722e8 100644 --- a/addons/interact_menu/functions/fnc_createAction.sqf +++ b/addons/interact_menu/functions/fnc_createAction.sqf @@ -28,6 +28,7 @@ EXPLODE_5_PVT(_this,_actionName,_displayName,_icon,_statement,_condition); +// IGNORE_PRIVATE_WARNING(_target); private ["_insertChildren","_customParams","_position","_distance","_params", "_modifierFunction"]; _insertChildren = if (count _this > 5) then { diff --git a/addons/interact_menu/functions/fnc_findActionNode.sqf b/addons/interact_menu/functions/fnc_findActionNode.sqf index 4027b7a8522..b8639754d23 100644 --- a/addons/interact_menu/functions/fnc_findActionNode.sqf +++ b/addons/interact_menu/functions/fnc_findActionNode.sqf @@ -19,7 +19,7 @@ EXPLODE_2_PVT(_this,_actionTreeList,_parentPath); -private ["_parentNode", "_foundParentNode", "_fnc_findFolder"]; +private ["_parentNode", "_foundParentNode", "_fnc_findFolder", "_actionTree"]; // Hack to make this work on the root node too if (count _parentPath == 0) exitWith { diff --git a/addons/interact_menu/functions/fnc_removeActionFromClass.sqf b/addons/interact_menu/functions/fnc_removeActionFromClass.sqf index 898228d6d85..c407273258f 100644 --- a/addons/interact_menu/functions/fnc_removeActionFromClass.sqf +++ b/addons/interact_menu/functions/fnc_removeActionFromClass.sqf @@ -19,7 +19,7 @@ EXPLODE_3_PVT(_this,_objectType,_typeNum,_fullPath); -private ["_res","_varName","_actionTrees"]; +private ["_res","_varName","_actionTrees", "_actionIndex", "_parentLevel", "_parentNode"]; _res = _fullPath call FUNC(splitPath); EXPLODE_2_PVT(_res,_parentPath,_actionName); diff --git a/addons/interact_menu/functions/fnc_render.sqf b/addons/interact_menu/functions/fnc_render.sqf index 01a550eb911..06c155ac547 100644 --- a/addons/interact_menu/functions/fnc_render.sqf +++ b/addons/interact_menu/functions/fnc_render.sqf @@ -14,7 +14,7 @@ BEGIN_COUNTER(fnc_render); -private ["_cursorPos1", "_cursorPos2", "_cursorVec", "_p1", "_p2", "_p", "_v", "_cp", "_forEachIndex", "_renderTargets", "_x", "_cursorScreenPos", "_closestDistance", "_closestSelection", "_pos", "_sPos", "_disSq", "_closest", "_cTime", "_delta", "_foundTarget", "_misMatch", "_hoverPath", "_i"]; +private ["_cursorPos1", "_cursorPos2", "_p1", "_p2", "_forEachIndex", "_x", "_cursorScreenPos", "_closestDistance", "_closestSelection", "_sPos", "_disSq", "_closest", "_cTime", "_delta", "_foundTarget", "_misMatch", "_hoverPath", "_i", "_actionData", "_player", "_target"]; _foundTarget = false; _cursorPos1 = positionCameraToWorld [0, 0, 0]; _cursorPos2 = positionCameraToWorld [0, 0, 2]; diff --git a/addons/interact_menu/functions/fnc_renderActionPoints.sqf b/addons/interact_menu/functions/fnc_renderActionPoints.sqf index 78d5418e5a8..8e6cb7d3907 100644 --- a/addons/interact_menu/functions/fnc_renderActionPoints.sqf +++ b/addons/interact_menu/functions/fnc_renderActionPoints.sqf @@ -14,7 +14,7 @@ GVAR(currentOptions) = []; -private ["_player","_numInteractObjects","_numInteractions","_actionsVarName","_classActions","_objectActions","_target","_player","_action","_actionData","_active","_cameraPos","_cameraDir"]; +private ["_player","_numInteractObjects","_numInteractions","_actionsVarName","_classActions","_target","_player","_action","_cameraPos","_cameraDir", "_lambda", "_nearestObjects", "_pos"]; _player = ACE_player; _fnc_renderNearbyActions = { diff --git a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf index a5214ddcbeb..8df24f9e55d 100644 --- a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf +++ b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf @@ -16,7 +16,7 @@ BEGIN_COUNTER(fnc_renderBaseMenu) -private ["_distance","_pos","_weaponDir","_ref","_cameraPos","_sPos","_activeActionTree"]; +private ["_distance","_pos","_weaponDir","_ref","_sPos","_activeActionTree", "_line"]; EXPLODE_2_PVT(_this,_object,_baseActionNode); EXPLODE_1_PVT(_baseActionNode,_actionData); diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf index ec56c5a6531..642464028da 100644 --- a/addons/interact_menu/functions/fnc_renderIcon.sqf +++ b/addons/interact_menu/functions/fnc_renderIcon.sqf @@ -17,7 +17,7 @@ */ #include "script_component.hpp" #define DEFAULT_ICON QUOTE(\z\ace\addons\interaction\ui\dot_ca.paa) -private ["_ctrl", "_pos"]; +private ["_ctrl", "_pos", "_displayNum"]; PARAMS_6(_text,_icon,_sPos,_textColor,_shadowColor,_iconColor); //systemChat format ["Icon %1 - %2,%3", _text, _sPos select 0, _sPos select 1]; diff --git a/addons/interact_menu/functions/fnc_renderMenu.sqf b/addons/interact_menu/functions/fnc_renderMenu.sqf index e80e9d41abb..a0503747861 100644 --- a/addons/interact_menu/functions/fnc_renderMenu.sqf +++ b/addons/interact_menu/functions/fnc_renderMenu.sqf @@ -15,7 +15,7 @@ */ #include "script_component.hpp" -private ["_menuInSelectedPath", "_path", "_menuDepth", "_currentRenderDepth", "_x", "_offset", "_newPos", "_forEachIndex"]; +private ["_menuInSelectedPath", "_path", "_menuDepth", "_x", "_offset", "_newPos", "_forEachIndex", "_player", "_pos", "_shadowColor", "_target", "_textColor"]; EXPLODE_4_PVT(_this,_parentPath,_action,_sPos,_angles); EXPLODE_3_PVT(_action,_actionData,_activeChildren,_actionObject); diff --git a/addons/interact_menu/functions/fnc_renderSelector.sqf b/addons/interact_menu/functions/fnc_renderSelector.sqf index ca2f06d63f7..569fa791983 100644 --- a/addons/interact_menu/functions/fnc_renderSelector.sqf +++ b/addons/interact_menu/functions/fnc_renderSelector.sqf @@ -15,12 +15,13 @@ EXPLODE_2_PVT(_this,_sPos,_icon); +private ["_displayNum", "_ctrl", "_pos"]; + if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then { _displayNum = [[46, 12] select visibleMap,91919] select (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]); GVAR(iconCtrls) pushBack ((findDisplay _displayNum) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]); }; -private ["_ctrl", "_pos"]; _ctrl = GVAR(iconCtrls) select GVAR(iconCount); GVAR(iconCount) = GVAR(iconCount) + 1; diff --git a/addons/interact_menu/functions/fnc_setupTextColors.sqf b/addons/interact_menu/functions/fnc_setupTextColors.sqf index 5df9c589da9..58f99959852 100644 --- a/addons/interact_menu/functions/fnc_setupTextColors.sqf +++ b/addons/interact_menu/functions/fnc_setupTextColors.sqf @@ -12,7 +12,7 @@ */ #include "script_component.hpp" -private ["_mixColor", "_rowT", "_rowS", "_menuDepth", "_pathCount", "_menuInSelectedPath", "_color", "_path"]; +private ["_mixColor", "_rowT", "_rowS", "_menuDepth", "_pathCount"]; //Mixes 2 colors (number arrays) and makes a color string "#AARRGGBB" for structured text _mixColor = { diff --git a/addons/interact_menu/functions/fnc_splitPath.sqf b/addons/interact_menu/functions/fnc_splitPath.sqf index 935e947b304..790ae834660 100644 --- a/addons/interact_menu/functions/fnc_splitPath.sqf +++ b/addons/interact_menu/functions/fnc_splitPath.sqf @@ -13,7 +13,7 @@ */ #include "script_component.hpp" -private ["_parentPath","_actionName"]; +private ["_parentPath","_actionName", "_i"]; _parentPath = []; for [{_i = 0},{_i < (count _this) - 1},{_i = _i + 1}] do { _parentPath pushBack (_this select _i); diff --git a/addons/interact_menu/script_component.hpp b/addons/interact_menu/script_component.hpp index a086b02613c..3117065ca25 100644 --- a/addons/interact_menu/script_component.hpp +++ b/addons/interact_menu/script_component.hpp @@ -1,6 +1,8 @@ #define COMPONENT interact_menu #include "\z\ace\addons\main\script_mod.hpp" +// #define DEBUG_MODE_FULL + #ifdef DEBUG_ENABLED_INTERACT_MENU #define DEBUG_MODE_FULL #endif From f83f8dad0ee2b200ccfa372b8523a1b80901b3a3 Mon Sep 17 00:00:00 2001 From: ulteq Date: Wed, 29 Apr 2015 09:27:49 +0200 Subject: [PATCH 062/171] Fixes: https://github.com/acemod/ACE3/issues/904 --- addons/scopes/functions/fnc_adjustScope.sqf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/scopes/functions/fnc_adjustScope.sqf b/addons/scopes/functions/fnc_adjustScope.sqf index d13ff57ffcf..31b85f309ed 100644 --- a/addons/scopes/functions/fnc_adjustScope.sqf +++ b/addons/scopes/functions/fnc_adjustScope.sqf @@ -17,6 +17,7 @@ PARAMS_3(_unit,_turretAndDirection,_majorStep); if (!(_unit isKindOf "Man")) exitWith {false}; +if (currentMuzzle _unit != currentWeapon _unit) exitWith {false}; private ["_weaponIndex", "_zeroing", "_optic", "_increment", "_maxVertical", "_maxHorizontal", "_elevation", "_windage", "_zero", "_adjustment"]; @@ -37,7 +38,7 @@ _increment = getNumber (configFile >> "CfgWeapons" >> _optic >> "ACE_ScopeAdjust _maxVertical = getArray (configFile >> "CfgWeapons" >> _optic >> "ACE_ScopeAdjust_Vertical"); _maxHorizontal = getArray (configFile >> "CfgWeapons" >> _optic >> "ACE_ScopeAdjust_Horizontal"); -if ((count _maxHorizontal < 2) or (count _maxVertical < 2)) exitWith {false}; +if ((_increment == 0) or (count _maxHorizontal < 2) or (count _maxVertical < 2)) exitWith {false}; _zeroing = _adjustment select _weaponIndex; _elevation = _zeroing select 0; From 47d4446520a7c5f635fef4715ddd38514a42b3d0 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 29 Apr 2015 02:34:47 -0500 Subject: [PATCH 063/171] Don't check intersection if distance < 1m Related to #869 --- addons/interact_menu/functions/fnc_renderBaseMenu.sqf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf index 8df24f9e55d..841303bcdf3 100644 --- a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf +++ b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf @@ -50,11 +50,12 @@ if (GVAR(openedMenuType) == 0 && vehicle ACE_player == ACE_player && if (_actualDistance > _distance) exitWith {true}; - if (_distance > 1.0) exitWith { + if (_actualDistance > 1.0) exitWith { // If distance to action is greater than 1.0 m, check LOS _line = [_headPos call EFUNC(common,positionToASL), _pos call EFUNC(common,positionToASL), _object, ACE_player]; lineIntersects _line }; + false }) exitWith {false}; // Exit if the action is behind you From 95536f0a94c36c7cb43e0e1ec9d263cfb995981e Mon Sep 17 00:00:00 2001 From: bux578 Date: Wed, 29 Apr 2015 10:10:30 +0200 Subject: [PATCH 064/171] update authors.txt --- AUTHORS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index d0f248e72fa..7bae4a67d58 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -43,7 +43,7 @@ evromalarkey Falke75 Ferenczi Ferenzi -Filip Basara (Logo) +Filip Basara FreeZbe geraldbolso1899 Ghost From cfbf3bd0535526df08579ce2e90803a286aa3b07 Mon Sep 17 00:00:00 2001 From: Bla1337 Date: Wed, 29 Apr 2015 11:20:21 +0300 Subject: [PATCH 065/171] Localization update --- addons/ballistics/stringtable.xml | 38 +++++++------- addons/interact_menu/stringtable.xml | 1 + addons/interaction/stringtable.xml | 10 ++-- addons/medical/stringtable.xml | 4 +- addons/missileguidance/stringtable.xml | 1 + addons/mk6mortar/stringtable.xml | 4 ++ addons/optics/stringtable.xml | 4 +- addons/optionsmenu/stringtable.xml | 1 + addons/overheating/stringtable.xml | 2 +- addons/realisticnames/stringtable.xml | 68 +++++++++++++------------- addons/reloadlaunchers/stringtable.xml | 2 +- addons/weaponselect/stringtable.xml | 4 +- 12 files changed, 75 insertions(+), 64 deletions(-) diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index dc9df9db34b..bbc0f8e30fb 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -741,7 +741,7 @@ Magazynek 5,56mm 30rd (M995 AP) 5.56mm 30Cps (M995 AP) Cargador de 30 balas de 5.56mm (M995 AP) - Магазин из 30-ти 5.56 мм (M995 AP) + Магазин из 30-ти 5.56 мм (M995 бронебойные) 5,56mm 30-Patronen-Magazin (M995AP) @@ -749,7 +749,7 @@ 5,56mm AP 5.56mm AP 5.56mm AP - 5.56 мм AP + 5.56 мм бронебойные 5,56mm AP @@ -757,7 +757,7 @@ Kaliber: 5,56x45mm NATO (M995 AP)<br />Pociski: 30 Calibre: 5.56x45mm NATO (M995 AP)<br />Cartouches: 30 Calibre: 5.56x45mm NATO (M995 AP)<br />Balas: 30 - Калибр: 5,56x45 мм NATO (M995 AP)<br />Патронов: 30 + Калибр: 5,56x45 мм NATO (M995 бронебойные)<br />Патронов: 30 Kaliber: 5,56x45mm NATO (M995 AP)<br />Patronen: 30 @@ -869,7 +869,7 @@ 7,62mm Mk319 7.62mm Mk319 7.62mm Mk319 - 7,62mm Mk319 + 7,62 мм Mk319 7,62mm Mk319 @@ -909,7 +909,7 @@ Magazynek 7,62mm 10rd (M993 AP) 7.62mm 10Cps (M993 AP) Cargador de 10 balas de 7.62mm (M993 AP) - Магазин из 10-ти 7,62 мм (M993 AP) + Магазин из 10-ти 7,62 мм (M993 бронебойные) 7,62mm 10-Patronen-Magazin (M993 AP) @@ -917,7 +917,7 @@ 7,62mm AP 7.62mm AP 7.62mm AP - 7,62mm AP + 7,62mm бронебойные 7,62mm AP @@ -925,7 +925,7 @@ Kaliber: 7,62x51mm NATO (M993 AP)<br />Pociski: 10 Calibre: 7.62x51mm NATO (M993 AP)<br />Cartouches: 10 Calibre: 7.62x51mm NATO (M993 AP)<br />Balas: 10 - Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 10 + Калибр: 7,62x51 мм NATO (M993 бронебойные)<br />Патронов: 10 Kaliber: 7,62x51mm NATO (M993 AP)<br />Patronen: 10 @@ -933,7 +933,7 @@ Magazynek 7,62mm 20rd (M993 AP) 7.62mm 20Cps (M993 AP) Cargador de 20 balas de 7.62mm (M993 AP) - Магазин из 20-ти 7,62 мм (M993 AP) + Магазин из 20-ти 7,62 мм (M993 бронебойные) 7,62mm 20-Patronen-Magazin (M993 AP) @@ -941,7 +941,7 @@ 7,62mm AP 7.62mm AP 7.62mm AP - 7,62 мм AP + 7,62 мм бронебойные 7,62mm AP @@ -949,7 +949,7 @@ Kaliber: 7,62x51mm NATO (M993 AP)<br />Pociski: 20 Calibre: 7.62x51mm NATO (M993 AP)<br />Cartouches: 20 Calibre: 7.62x51mm NATO (M993 AP)<br />Balas: 20 - Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 20 + Калибр: 7,62x51 мм NATO (M993 бронебойные)<br />Патронов: 20 Kaliber: 7,62x51mm NATO (M993 AP)<br />Patronen: 20 @@ -1029,7 +1029,7 @@ 6.5x47mm 30Cps (HPBT Scenar) Cargador de 30 balas de 6.5x47mm (HPBT Scenar) Magazynek 6,5x47mm 30rd (HPBT Scenar) - Магазин из 30-ти 6,5x47 мм (HPBT Scenar) + Магазин из 30-ти 6,5x47 мм (экспансивные Scenar) 6,5x47mm 30-Patronen-Magazin (HPBT Scenar) @@ -1045,12 +1045,13 @@ Calibre: 6.5x47mm (HPBT Scenar)<br />Cartouches: 30 Calibre: 6.5x47mm (HPBT Scenar)<br />Balas: 30 Kaliber: 6,5x47mm (HPBT Scenar)<br />Pociski: 30 - Калибр: 6,5x47 мм (HPBT Scenar)<br />Патронов: 30 + Калибр: 6,5x47 мм (экспансивные Scenar)<br />Патронов: 30 Kaliber: 6,5x47mm (HPBT Scenar)<br />Patronen: 30<br />Eingesetzt von: MXM 6.5mm Creedmor 30Rnd Mag Magazynek 6,5mm Creedmor 30rd + Магазин из 30-ти 6,5 мм Creedmor 6,5mm Creedmor 30-Patronen-Magazin @@ -1071,7 +1072,7 @@ .338 10 Cps (300gr Sierra MatchKing HPBT) Cargador de 10 balas de 8.6x70mm (300gr Sierra MatchKing HPBT) Magazynek .338 10rd (300gr Sierra MatchKing HPBT) - Магазин из 10-ти .338 (300 гран Sierra MatchKing HPBT) + Магазин из 10-ти .338 (300 гран Sierra MatchKing экспансивные) .338 10-Patronen-Magazin (300gr Sierra MatchKing HPBT) @@ -1079,7 +1080,7 @@ .338 HPBT .338 HPBT .338 HPBT - .338 HPBT + .338 экспансивные .338 HPBT @@ -1087,7 +1088,7 @@ Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Cartouches: 10 Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Balas: 10 Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)<br />Pociski: 10 - Калибр: 8,6x70mm (300 гран Sierra MatchKing HPBT)<br />Патронов: 10 + Калибр: 8,6x70mm (300 гран Sierra MatchKing экспансивные)<br />Патронов: 10 Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)<br />Patronen: 10 @@ -1103,7 +1104,7 @@ .338 AP .338 AP .338 AP - .338 бронебойные + .338 AP .338 AP @@ -1111,7 +1112,7 @@ Calibre: 8.6x70mm (API526)<br />Cartouches: 10 Calibre: 8.6x70mm (API526)<br />Balas: 10 Kaliber: 8,6x70mm (API526)<br />Pociski: 10 - Калибр: 8,6x70mm (API526)<br />Патронов: 10 + Калибр: 8,6x70 мм (API526)<br />Патронов: 10 Kaliber: 8,6x70mm (API526)<br />Patronen: 10 @@ -1143,6 +1144,7 @@ 12.7x99mm API 5Cps Cargador de 5 balas de 12.7x99mm API Magazynek 12,7x99mm API 5rd + Магазин из 5-ти 12,7x99 мм (бронебойно-зажигательные) 12,7x99mm 5-Patronen-Magazin (API) @@ -1150,6 +1152,7 @@ 12.7mm API 12.7mm API 12,7mm API + 12.7 мм бронебойно-зажигательные 12,7mm API @@ -1157,6 +1160,7 @@ Calibre: 12.7x99mm API<br />Cartouches: 5 Calibre: 12.7x99mm API<br />Balas: 5 Kaliber: 12,7x99mm API<br />Pociski: 5 + Калибр: 12,7x99 мм бронебойно-зажигательные<br />Патронов: 5 Kaliber:12,7x99mm API<br />Patronen: 5 diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index a5df7723b42..e31534427b5 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -18,6 +18,7 @@ Toujours afficher le curseur pour les interactions Mostra sempre il cursore per le interazioni Zawsze wyświetlaj kursor dla interakcji + Показывать курсор (взаимодействие) Immer den Cursor für Fremd-Interaktionen anzeigen diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml index 38902f80cf4..2be029aec0f 100644 --- a/addons/interaction/stringtable.xml +++ b/addons/interaction/stringtable.xml @@ -552,7 +552,7 @@ Jaune Żółty Žlutý - Желтый + Жёлтый Amarela Giallo Sárga @@ -564,7 +564,7 @@ Rejoindre<br/>Rouge Dołącz do drużyny<br/>czerwonej Připojit do<br/>Červeného týmu - Присоединиться<br/>к красной группе + Присоединиться<br/>к Красной группе Unir-se à<br/>Equipe Vermelha Entra nella<br/>Squadra Rossa Csatlakozás a<br/>piros csapathoz @@ -576,7 +576,7 @@ Rejoindre<br/>Vert Dołącz do<br/>drużyny zielonej Připojit do<br/>Zeleného týmu - Присоединиться<br/>к зеленой группе + Присоединиться<br/>к Зеленой группе Unir-se à<br/>Equipe Verde Entra nella<br/>Squadra Verde Csatlakozás a<br/>zöld csapathoz @@ -588,7 +588,7 @@ Rejoindre<br/>Bleu Dołącz do<br/>drużyny niebieskiej Připojit do<br/>Modrého týmu - Присоединиться<br/>к синей группе + Присоединиться<br/>к Синей группе Unir-se à<br/>Equipe Azul Entra nella<br/>Squadra Blu Csatlakozás a<br/>kék csapathoz @@ -600,7 +600,7 @@ Rejoindre<br/>Jaune Dołącz do<br/>drużyny żółtej Připojit do<br/>Žlutého týmu - Присоединиться<br/>к желтой группе + Присоединиться<br/>к Жёлтой группе Unir-se à<br/>Equipe Amarela Entra nella<br/>Squadra Gialla Csatlakozás a<br/>sárga csapathoz diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 52baf9bbe3c..85c56227a77 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1485,7 +1485,7 @@ dead - мертв + мёртв tot mort martwy @@ -1721,7 +1721,7 @@ %1 has given an IV %1 has puesto una IV - %1 провел переливание + %1 провёл переливание %1 hat eine Infusion verabreicht %1 podał IV %1 a administré une IV diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml index 6840f11e427..15a87c31baf 100644 --- a/addons/missileguidance/stringtable.xml +++ b/addons/missileguidance/stringtable.xml @@ -17,6 +17,7 @@ Advanced missile guidance, or AMG, provides multiple enhancements to missile locking and firing. It is also a framework required for missile weapon types. Zaawansowane namierzanie rakiet, lub ZNR, dostarcza wiele poprawek do systemu namierzania rakiet oraz dodaje nowe tryby strzału. Jest to wymagana opcja dla broni rakietowych. Guía de misiles avanzada, o AMG en sus siglas en inglés, ofrece múltiples mejoras en el fijado y disparo de misiles. Es también un framework requerido para armas de tipo misil. + Продвинутое наведение ракет, или ПНР, обеспечивает множество усовершествований для наведения и стрельбы ракет. Также, это система, необходимая для всех ракетных типов оружия. Das Erweiterte Raketenlenksystem, auch AMG genannt, bietet viele Verbesserungen zum Aufschalten und Feuern mittels gelenkten Raketen. Le guidage avancé de missile, ou AMG en anglais, apporte de multiple améliorations au verouillage et au tir de missiles. C'est aussi un framework requis pour tout arme de type missile. diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml index 1dfdd1b470e..fe08d320e58 100644 --- a/addons/mk6mortar/stringtable.xml +++ b/addons/mk6mortar/stringtable.xml @@ -6,24 +6,28 @@ 82mm Distanztabelle Tabela strzelnicza 82mm table de tir 82mm + 82 мм Таблица дальностей и прицелов Range Table for the MK6 82mm Mortar Distanztabelle für den Mk6 82mm Mortar Tabela strzelnicza dla moździerza 82mm MK6 Table de tir pour le mortier MK6 82mm + Таблица дальностей и прицелов для MK6 82 мм мортиры Open 82mm Rangetable Öffne 82mm Distanztabelle Otwórz tabelę strzelniczą 82mm ouvrir la table de tir 82mm + Открыть 82 мм Таблицу дальностей и прицелов Charge Ladung Charge Ładunek + Зарядить diff --git a/addons/optics/stringtable.xml b/addons/optics/stringtable.xml index 56216f2cb13..f9964c43105 100644 --- a/addons/optics/stringtable.xml +++ b/addons/optics/stringtable.xml @@ -57,7 +57,7 @@ MRCO (2D) MRCO (2D) MRCO (2D) - Прицел MRCO (2D) + MRCO (2D) MRCO (2D) MRCO (2D) @@ -69,7 +69,7 @@ MRCO (PIP) MRCO (PIP) MRCO (PIP) - Прицел MRCO (PIP) + MRCO (PIP) MRCO (PIP) MRCO (PIP) diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index 8a86563690a..1beec5d7df5 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -218,6 +218,7 @@ Menu option: taille de l'UI Skalowanie UI menu ustawień Opción de escalado del menú UI + Размер интерфейса меню настройки UI Skalierung diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml index 9699c67edea..d21d2ad8843 100644 --- a/addons/overheating/stringtable.xml +++ b/addons/overheating/stringtable.xml @@ -112,7 +112,7 @@ Lufa wymieniona Hlaveň vyměněna Canon changé - Ствол сменен + Ствол сменён Cső kicserélve Cano substituído Canna sostituita diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml index 37e7b287004..cc99277d488 100644 --- a/addons/realisticnames/stringtable.xml +++ b/addons/realisticnames/stringtable.xml @@ -138,7 +138,7 @@ M-ATV (CKM) M-ATV (TK) M-ATV (HMG) - M-ATV (Пулемет) + M-ATV (Пулемёт) M-ATV (HMG) M-ATV (nehézgéppuska) M-ATV (HMG) @@ -150,7 +150,7 @@ M-ATV (GMG) M-ATV (Granátomet) M-ATV (GMG) - M-ATV (Гранатомет) + M-ATV (Гранатомёт) M-ATV (GMG) M-ATV (gránátgéppuska) M-ATV (GMG) @@ -366,7 +366,7 @@ Fennek (CKM) Fennek (TK) Fennek (HMG) - Феннек (Пулемет) + Феннек (Пулемёт) Fennek (HMG) Fennek (nehézgéppuska) Fennek (HMG) @@ -378,7 +378,7 @@ Fennek (GMG) Fennek (granátomet) Fennek (GMG) - Феннек (Гранатомет) + Феннек (Гранатомёт) Fennek (GMG) Fennek (gránátgéppuska) Fennek (GMG) @@ -438,7 +438,7 @@ KamAZ Transportowy (zakryty) KAMAZ Valník (krytý) KamAZ Transport (bâché) - КамАЗ Траспортный (Крытый) + КамАЗ Траспортный (крытый) KamAZ Transporte (coberto) KamAZ szállítójármű (ponyvás) KamAZ da trasporto (coperto) @@ -510,7 +510,7 @@ Punisher (CKM) Punisher (TK) Punisher (HMG) - Kаратель (Пулемет) + Kаратель (Пулемёт) Punisher (HMG) Punisher (nehézgéppuska) Punisher (HMG) @@ -522,7 +522,7 @@ Punisher (GMG) Punisher (granátomet) Punisher (GMG) - Kаратель (Гранатомет) + Kаратель (Гранатомёт) Punisher (GMG) Punisher (gránátgéppuska) Punisher (GMG) @@ -534,7 +534,7 @@ T100 Black Eagle T100 Black Eagle T100 Black Eagle - T100 Черный Орел + T100 Чёрный Орел T100 Black Eagle T100 Fekete Sas T100 Black Eagle @@ -606,7 +606,7 @@ Typhoon Transportowy (przykryty) Typhoon valník (krytý) Typhoon Transport (bâché) - Тайфун Транспортный (kрытый) + Тайфун Транспортный (крытый) Typhoon Transporte (coberto) Typhoon szállítójármű (ponyvás) Typhoon da trasporto (coperto) @@ -988,7 +988,7 @@ Granat dymny M18 (Żółty) M18 Kouřový Granát (žlutý) M18 Grenade fumigène (Jaune) - M183 дымовая граната (Жёлтые) + M183 дымовая граната (Жёлтый) M18 Granada de fumaça (Amarela) M18 füstgránát (Sárga) M18 Granata fumogena (Giallo) @@ -1159,7 +1159,7 @@ MX (Noir) MX (Fekete) MX (Negro) - MX (черный) + MX (Чёрный) MXC @@ -1179,7 +1179,7 @@ MXC (Noir) MXC (Fekete) MXC (Negro) - MXC (черный) + MXC (Чёрный) MX 3GL @@ -1199,7 +1199,7 @@ MX 3GL (Noir) MX 3GL (Fekete) MX 3GL (Negro) - MX 3GL (черный) + MX 3GL (Чёрный) MX LSW @@ -1219,7 +1219,7 @@ MX LSW (Noir) MX LSW (Fekete) MX LSW (Negro) - MX LSW (черный) + MX LSW (Чёрный) MXM @@ -1239,7 +1239,7 @@ MXM (Noir) MXM (Fekete) MXM (Negro) - MXM (черный) + MXM (Чёрный) KH2002 Sama @@ -1279,7 +1279,7 @@ F2000 (Camo) F2000 (Terepmintás) F2000 (Camuflaje) - F2000 (камо) + F2000 (Камо) F2000 @@ -1299,7 +1299,7 @@ F2000 Tactical (Camo) F2000 Tactical (Terepmintás) F2000 Tactical (Camuflaje) - F2000 Tactical (камо) + F2000 Tactical (Камо) F2000 Tactical @@ -1319,7 +1319,7 @@ F2000 EGLM (Camo) F2000 EGLM (Terepmintás) F2000 EGLM (Camuflaje) - F2000 EGLM (камо) + F2000 EGLM (Камо) F2000 EGLM @@ -1495,7 +1495,7 @@ Noreen "Bad News" ULR (Black) Noreen "Bad News" ULR (Noir) Noreen "Bad News" ULR (Negro) - Noreen "Bad News" ULR (черный) + Noreen "Bad News" ULR (Чёрный) Noreen "Bad News" ULR (Schwarz) Noreen "Bad News" ULR (czarny) @@ -1504,7 +1504,7 @@ Noreen "Bad News" ULR (Camo) Noreen "Bad News" ULR (Camo) Noreen "Bad News" ULR (Camuflaje) - Noreen "Bad News" ULR (камо) + Noreen "Bad News" ULR (Камо) Noreen "Bad News" ULR (Camo) Noreen "Bad News" ULR (kamuflaż) @@ -1513,7 +1513,7 @@ Noreen "Bad News" ULR (Sand) Noreen "Bad News" ULR (Beige) Noreen "Bad News" ULR (Arena) - Noreen "Bad News" ULR (песочный) + Noreen "Bad News" ULR (Песочный) Noreen "Bad News" ULR (Sand) Noreen "Bad News" ULR (piaskowy) @@ -1531,7 +1531,7 @@ SIG 556 (Black) SIG 556 (Noir) SIG 556 (Negro) - SIG 556 (черный) + SIG 556 (Чёрный) SIG 556 (czarny) SIG 556 (Schwarz) @@ -1540,7 +1540,7 @@ SIG 556 (Khaki) SIG 556 (Kaki) SIG 556 (Caqui) - SIG 556 (хаки) + SIG 556 (Хаки) SIG 556 (khaki) SIG 556 (Khaki) @@ -1549,7 +1549,7 @@ SIG 556 (Sand) SIG 556 (Beige) SIG 556 (Arena) - SIG 556 (песочный) + SIG 556 (Песочный) SIG 556 (piaskowy) SIG 556 (Sand) @@ -1558,7 +1558,7 @@ SIG 556 (Camo) SIG 556 (Camo) SIG 556 (Camuflaje) - SIG 556 (камо) + SIG 556 (Камо) SIG 556 (kamuflaż) SIG 556 (Camo) @@ -1567,7 +1567,7 @@ SIG 556 (Woodland) SIG 556 (Woodland) SIG 556 (Bosque) - SIG 556 (лесной) + SIG 556 (Лесной) SIG 556 (leśny) SIG 556 (Woodland) @@ -1594,7 +1594,7 @@ ASP-1 Kir (Black) ASP-1 Kir (Noir) ASP-1 Kir (Negro) - ASP-1 Kir (черный) + ASP-1 Kir (Чёрный) ASP-1 Kir (Schwarz) ASP-1 Kir (czarny) @@ -1603,7 +1603,7 @@ ASP-1 Kir (Tan) ASP-1 Kir (Tan) ASP-1 Kir (Tan) - ASP-1 Kir (бронзовый) + ASP-1 Kir (Бронзовый) ASP-1 Kir (Hellbraun) ASP-1 Kir (Tan) @@ -1621,7 +1621,7 @@ Cyrus (Black) Cyrus (Noir) Cyrus (Negro) - Cyrus (черный) + Cyrus (Чёрный) Cyrus (Schwarz) Cyrus (czarny) @@ -1630,7 +1630,7 @@ Cyrus (Hex) Cyrus (Hex) Cyrus (Hex) - Cyrus (гекс) + Cyrus (Гекс) Cyrus (Hex) Cyrus (hex) @@ -1639,7 +1639,7 @@ Cyrus (Tan) Cyrus (Tan) Cyrus (Tan) - Cyrus (бронза) + Cyrus (Бронза) Cyrus (Hellbraun) Cyrus (podpalany) @@ -1684,7 +1684,7 @@ HK121 (Hex) HK121 (Hex) HK121 (Hex) - HK121 (гекс) + HK121 (Гекс) HK121 (Hex) HK121 (hex) @@ -1693,7 +1693,7 @@ HK121 (Tan) HK121 (Tan) HK121 (Tan) - HK121 (бронза) + HK121 (Бронза) HK121 (Hellbraun) HK121 (podpalany) @@ -1720,7 +1720,7 @@ LWMMG (Black) LWMMG (Noir) LWMMG (Negro) - LWMMG (Черный) + LWMMG (Чёрный) LWMMG (czarny) LWMMG (Schwarz) diff --git a/addons/reloadlaunchers/stringtable.xml b/addons/reloadlaunchers/stringtable.xml index bb949040d0a..3a73918745c 100644 --- a/addons/reloadlaunchers/stringtable.xml +++ b/addons/reloadlaunchers/stringtable.xml @@ -28,7 +28,7 @@ Lanceur chargé Panzerabwehr geladen Lanzador cargado - ПУ заряжено + ПУ заряжена Odpalovač nabit Wyrzutnia załadowana Kilövő betöltve diff --git a/addons/weaponselect/stringtable.xml b/addons/weaponselect/stringtable.xml index 6e06025620c..a30b18f5dda 100644 --- a/addons/weaponselect/stringtable.xml +++ b/addons/weaponselect/stringtable.xml @@ -53,7 +53,7 @@ Seleccionar lanzador Wybierz wyrzutnię Zvolit Raketomet - Выбрать гранатомет + Выбрать гранатомёт Sélectionner Lanceur Rakétavető Kiválasztása Selecionar Lançador @@ -65,7 +65,7 @@ Seleccionar lanzador de granadas Wybierz granatnik Zvolit Granátomet - Выбрать подствольный гранатомет + Выбрать подствольный гранатомёт Sélectionner Lance-grenades Gránátvető Kiválasztása Selecionar Lança-Granadas From 7ca35bf823094c3d35c6820709958c7b9e263269 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Wed, 29 Apr 2015 10:44:10 +0200 Subject: [PATCH 066/171] prevent multiple detonators of same type to be displayed #835 As per @CorruptedHeart suggestion. > Just needs a > if (getNumber (_config >> "ACE_Detonator") == 1 && {!(_x in _result)}) then { --- addons/explosives/functions/fnc_getDetonators.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/explosives/functions/fnc_getDetonators.sqf b/addons/explosives/functions/fnc_getDetonators.sqf index 26bde9b1903..01a4d0129ee 100644 --- a/addons/explosives/functions/fnc_getDetonators.sqf +++ b/addons/explosives/functions/fnc_getDetonators.sqf @@ -21,7 +21,7 @@ _result = []; { _config = ConfigFile >> "CfgWeapons" >> _x; - if (getNumber (_config >> "ACE_Detonator") == 1) then { + if (getNumber (_config >> "ACE_Detonator") == 1 && {!(_x in _result)}) then { _result pushBack _x; }; } forEach _items; From 87d1f7c2819a01c595290e4345fe94904d08093b Mon Sep 17 00:00:00 2001 From: ulteq Date: Wed, 29 Apr 2015 12:24:56 +0200 Subject: [PATCH 067/171] Fixes: https://github.com/acemod/ACE3/pull/909#issuecomment-97377112 --- addons/explosives/functions/fnc_detonateExplosive.sqf | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/addons/explosives/functions/fnc_detonateExplosive.sqf b/addons/explosives/functions/fnc_detonateExplosive.sqf index e4dfc2f7fc7..f79f38ae1e4 100644 --- a/addons/explosives/functions/fnc_detonateExplosive.sqf +++ b/addons/explosives/functions/fnc_detonateExplosive.sqf @@ -19,19 +19,13 @@ * Public: Yes */ #include "script_component.hpp" -private ["_result", "_ignoreRange", "_helper", "_pos"]; +private ["_result", "_ignoreRange", "_pos"]; EXPLODE_3_PVT(_this,_unit,_range,_item); _ignoreRange = (_range == -1); _result = true; if (!_ignoreRange && {(_unit distance (_item select 0)) > _range}) exitWith {false}; -_helper = (attachedTo (_item select 0)); -if (!isNull(_helper)) then { - detach (_item select 0); - deleteVehicle _helper; -}; - if (getNumber (ConfigFile >> "CfgAmmo" >> typeof (_item select 0) >> "TriggerWhenDestroyed") == 0) then { private ["_exp", "_previousExp"]; _previousExp = _item select 0; From 1c8137a7e5b874963c06f644cf73fc9153f57e0c Mon Sep 17 00:00:00 2001 From: Legolasindar Date: Wed, 29 Apr 2015 12:46:32 +0200 Subject: [PATCH 068/171] fixed spanish translate for opened pull #893 fixed spanish translate for opened pull #893 --- addons/medical/stringtable.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 312effe8b09..99adc0cb3ab 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1091,7 +1091,7 @@ Personal Aid Kit for in field stitching or advanced treatment W znacznym stopniu poprawia stan pacjenta Полевая аптчека для продвинутого лечения и зашивания ран - Equipo de primeros auxilios para costura de campaña o tratamiento avanzados + Equipo de primeros auxilios para sutura de campaña o tratamientos avanzados Use Personal Aid Kit @@ -1447,12 +1447,12 @@ alive жив - Vivo + vivo dead мертв - Muerto + muerto He's lost some blood @@ -1462,7 +1462,7 @@ He hasn't lost blood Нет кровопотери - No ha perdido la sangre + No ha perdido sangre He is in pain @@ -2001,4 +2001,4 @@ Femur roto - \ No newline at end of file + From cec16d6a44f1c8b74e54732286711fe437c66f1b Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Wed, 29 Apr 2015 12:58:02 +0200 Subject: [PATCH 069/171] 3 > 2 --- tools/stringtableduplicates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/stringtableduplicates.py b/tools/stringtableduplicates.py index b9b49200591..49f5bcb7435 100755 --- a/tools/stringtableduplicates.py +++ b/tools/stringtableduplicates.py @@ -34,7 +34,7 @@ def check_module(projectpath, module): diff = len(entries) - len(list(set(entries))) duplicates += diff if diff > 0: - print key.getAttribute("ID") + print(key.getAttribute("ID")) return duplicates From d149db61e8ca98384a19e7b1381c9bc2f68452a5 Mon Sep 17 00:00:00 2001 From: commy2 Date: Wed, 29 Apr 2015 13:01:08 +0200 Subject: [PATCH 070/171] ace insignia, #906 --- addons/common/CfgUnitInsignia.hpp | 9 +++++++++ addons/common/config.cpp | 1 + addons/common/data/ace3logo_ca.paa | Bin 0 -> 22016 bytes 3 files changed, 10 insertions(+) create mode 100644 addons/common/CfgUnitInsignia.hpp create mode 100644 addons/common/data/ace3logo_ca.paa diff --git a/addons/common/CfgUnitInsignia.hpp b/addons/common/CfgUnitInsignia.hpp new file mode 100644 index 00000000000..c12c17c0c09 --- /dev/null +++ b/addons/common/CfgUnitInsignia.hpp @@ -0,0 +1,9 @@ + +class CfgUnitInsignia { + class ACE_insignia { + displayName = "ACE 3"; + author = "kripto202"; + texture = PATHTOF(data\ace3logo_ca.paa); + textureVehicle = ""; + }; +}; diff --git a/addons/common/config.cpp b/addons/common/config.cpp index 16bd13fc0c5..27647f8d000 100644 --- a/addons/common/config.cpp +++ b/addons/common/config.cpp @@ -22,6 +22,7 @@ class CfgPatches { #include "CfgActions.hpp" #include "CfgMoves.hpp" #include "CfgVoice.hpp" +#include "CfgUnitInsignia.hpp" class ACE_Rsc_Display_Base { idd = -1; diff --git a/addons/common/data/ace3logo_ca.paa b/addons/common/data/ace3logo_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..d3e6e20c7b3d08d692565170b06d6824e09d82c3 GIT binary patch literal 22016 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 B%1ZzM literal 0 HcmV?d00001 From 2068eaea7518d89acef37d245c313ea6933ae799 Mon Sep 17 00:00:00 2001 From: ulteq Date: Wed, 29 Apr 2015 13:53:38 +0200 Subject: [PATCH 071/171] Added G_40mm_HE config, changed 40mm gurney_k values --- addons/frag/CfgAmmo.hpp | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp index 6490c94f227..aa98be80f75 100644 --- a/addons/frag/CfgAmmo.hpp +++ b/addons/frag/CfgAmmo.hpp @@ -68,29 +68,27 @@ class CfgAmmo { GVAR(gurney_c) = 2320; GVAR(gurney_k) = 1/2; }; - - - class G_40mm_HE: GrenadeBase { - GVAR(classes)[] = {"ACE_frag_tiny_HD"}; - GVAR(metal) = 200; - GVAR(charge) = 45; - GVAR(gurney_c) = 2830; - GVAR(gurney_k) = 3/5; - }; - - class ACE_G_40mm_HEDP: G_40mm_HE { + + class G_40mm_HEDP: GrenadeBase { + // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M433 GVAR(classes)[] = {"ACE_frag_tiny_HD"}; GVAR(metal) = 200; GVAR(charge) = 45; GVAR(gurney_c) = 2830; - GVAR(gurney_k) = 3/5; + GVAR(gurney_k) = 1/2; }; - class ACE_G_40mm_HE: ACE_G_40mm_HEDP { + class G_40mm_HE: GrenadeBase { + // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M441 GVAR(classes)[] = {"ACE_frag_tiny_HD"}; GVAR(metal) = 200; GVAR(charge) = 32; GVAR(gurney_c) = 2700; - GVAR(gurney_k) = 3/5; + GVAR(gurney_k) = 1/2; + }; + + class ACE_G_40mm_HEDP: G_40mm_HEDP { + }; + class ACE_G_40mm_HE: G_40mm_HE { }; class ACE_G_40mm_Practice: ACE_G_40mm_HE { GVAR(skip) = 1; From dfbc9b74fd692a7c149b70896d9e8f15388581ae Mon Sep 17 00:00:00 2001 From: Glowbal Date: Wed, 29 Apr 2015 15:14:37 +0200 Subject: [PATCH 072/171] Added arsenalScope #913 --- addons/common/CfgWeapons.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/common/CfgWeapons.hpp b/addons/common/CfgWeapons.hpp index cf8c06798e5..59bb8f6b9ad 100644 --- a/addons/common/CfgWeapons.hpp +++ b/addons/common/CfgWeapons.hpp @@ -15,7 +15,7 @@ class CfgWeapons { class ACE_FakePrimaryWeapon: Rifle_Base_F { scope = 2; scopeCurator = 1; - + scopeArsenal = 1; displayName = ""; model = "\A3\Weapons_f\empty"; picture = ""; From 283e34779feb9544753ee5dc345f7fd249c69df9 Mon Sep 17 00:00:00 2001 From: jaynus Date: Wed, 29 Apr 2015 07:05:48 -0700 Subject: [PATCH 073/171] Don't inherit --- addons/missileguidance/functions/fnc_onFired.sqf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/missileguidance/functions/fnc_onFired.sqf b/addons/missileguidance/functions/fnc_onFired.sqf index 7ada1d44420..6c6c2717bff 100644 --- a/addons/missileguidance/functions/fnc_onFired.sqf +++ b/addons/missileguidance/functions/fnc_onFired.sqf @@ -7,7 +7,7 @@ if(GVAR(enabled) < 1 || {!local _projectile} ) exitWith { false }; if( !isPlayer _shooter && { GVAR(enabled) < 2 } ) exitWith { false }; -private["_config", "_enabled", "_target", "_seekerType", "_attackProfile"]; +private["_config", "_configs", "_enabled", "_target", "_seekerType", "_attackProfile"]; private["_args", "_canUseLock", "_guidingUnit", "_launchPos", "_lockMode", "_targetPos", "_vanillaTarget"]; PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile); @@ -15,7 +15,9 @@ PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile); // Bail on not missile if(! (_ammo isKindOf "MissileBase") ) exitWith { false }; -_config = configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON); +_configs = configProperties [configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON), "true", false]; +if( (count _configs) < 1) exitWith {}; +_config = _configs select 1; _enabled = getNumber ( _config >> "enabled"); // Bail if guidance is not enabled From 5ec6bea71d8acc13834ae9c30c40be19c3221594 Mon Sep 17 00:00:00 2001 From: FreeZbe Date: Wed, 29 Apr 2015 16:19:23 +0200 Subject: [PATCH 074/171] French: update stringtable --- addons/interact_menu/stringtable.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index a5df7723b42..cc447c082e1 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -76,7 +76,7 @@ Interaction - Text Max Interakcja - Tekst max - Interaction -Texte Max + Interaction - Texte Max Interaktionstextfarbe Max Interazioni - Testo Massimo @@ -103,9 +103,11 @@ Keep cursor centered + Garder le curseur au centre Keeps cursor centered and pans the option menu around. Useful if screen size is limited. + Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée. - \ No newline at end of file + From ca7aeece904ad04cf1d5aaaa39506d950e213402 Mon Sep 17 00:00:00 2001 From: FreeZbe Date: Wed, 29 Apr 2015 16:28:59 +0200 Subject: [PATCH 075/171] French: update stringtable --- addons/ballistics/stringtable.xml | 88 ++++++++++++++++--------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index dc9df9db34b..83ddf4bec1d 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -31,7 +31,7 @@ Kaliber: 6,5x39mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL Kaliber: 6,5x39mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL Calibre: 6,5x39mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL - Calibre: 6,5x39mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL + Calibre: 6,5x39mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé avec: MX/C/M/SW/3GL Kaliber: 6,5x39mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL Ráže: 6.5x39mm Svítící IR-DIM<br />Munice: 30<br />Použití: MX/C/M/SW/3GL Calibre: 6,5x39mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL @@ -67,7 +67,7 @@ Kaliber: 6,5x39mm Halk<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL Kaliber: 6,5x39mm SD<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL Calibre: 6,5x39mm SD<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL - Calibre: 6,5x39mm SD<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL + Calibre: 6,5x39mm SD<br />Cartouches: 30<br />Utilisé avec: MX/C/M/SW/3GL Kaliber: 6,5x39mm SD<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL Ráže: 6.5x39mm SD<br />Munice: 30<br />Použití: MX/C/M/SW/3GL Calibre: 6,5x39mm SD<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL @@ -103,7 +103,7 @@ Kaliber: 6,5x39mm Páncéltörő<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL Kaliber: 6,5x39mm AP<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL Calibre: 6,5x39mm AP<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL - Calibre: 6,5x39mm AP<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL + Calibre: 6,5x39mm AP<br />Cartouches: 30<br />Utilisé avec: MX/C/M/SW/3GL Kaliber: 6,5x39mm AP<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL Ráže: 6.5x39mm AP<br />Munice: 30<br />Použití: MX/C/M/SW/3GL Calibre: 6,5x39mm AP<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL @@ -140,7 +140,7 @@ Kaliber: 6,5x39mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: Katiba Kaliber: 6,5x39mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: Katiba Calibre: 6,5x39mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: Katiba - Calibre: 6,5x39mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: Katiba + Calibre: 6,5x39mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé avec: Katiba Kaliber: 6,5x39mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: Katiba Ráže: 6.5x39mm Svítící IR-DIM<br />Munice: 30<br />Použití: Katiba Calibre: 6,5x39mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: Katiba @@ -176,7 +176,7 @@ Kaliber: 6,5x39mm Halk<br />Lövedékek: 30<br />Használható: Katiba Kaliber: 6,5x39mm SD<br />Patronen: 30<br />Eingesetzt von: Katiba Calibre: 6,5x39mm SD<br />Balas: 30<br />Se usa en: Katiba - Calibre: 6,5x39mm SD<br />Cartouches: 30<br />Utilisé dans: Katiba + Calibre: 6,5x39mm SD<br />Cartouches: 30<br />Utilisé avec: Katiba Kaliber: 6,5x39mm SD<br />Naboje: 30<br />Używane w: Katiba Ráže: 6.5x39mm SD<br />Munice: 30<br />Použití: Katiba Calibre: 6,5x39mm SD<br />Projéteis: 30<br />Usado em: Katiba @@ -212,7 +212,7 @@ Kaliber: 6,5x39mm Páncéltörő<br />Lövedékek: 30<br />Használható: Katiba Kaliber: 6,5x39mm AP<br />Patronen: 30<br />Eingesetzt von: Katiba Calibre: 6,5x39mm AP<br />Balas: 30<br />Se usa en: Katiba - Calibre: 6,5x39mm AP<br />Cartouches: 30<br />Utilisé dans: Katiba + Calibre: 6,5x39mm AP<br />Cartouches: 30<br />Utilisé avec: Katiba Kaliber: 6,5x39mm AP<br />Pociski: 30<br />Używane w: Katiba Ráže: 6.5x39mm AP<br />Munice: 30<br />Použití: Katiba Calibre: 6,5x39mm AP<br />Projéteis: 30<br />Usado em: Katiba @@ -249,7 +249,7 @@ Kaliber: 5,56x45mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR Kaliber: 5,56x45mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR Calibre: 5,56x45mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR - Calibre: 5,56x45mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR + Calibre: 5,56x45mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé avec: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR Kaliber: 5,56x45mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR Ráže: 5.56x45mm Svítící IR-DIM<br />Munice: 30<br />Použití: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR Calibre: 5,56x45mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR @@ -286,7 +286,7 @@ Kaliber: 7,62x51mm Nyomjelző<br />Lövedékek: 20<br />Használható: Mk18 ABR Kaliber: 7,62x51mm Leuchtspur<br />Patronen: 20<br />Eingesetzt von: EBR Calibre: 7,62x51mm Trazadora<br />Balas: 20<br />Se usa en: Mk18 ABR - Calibre: 7,62x51mm Traçantes<br />Cartouches: 20<br />Utilisé dans: EBR + Calibre: 7,62x51mm Traçantes<br />Cartouches: 20<br />Utilisé avec: EBR Kaliber: 7,62x51mm Smugacz<br />Pociski: 20<br />Używane w: Mk18 ABR Ráže: 7.62x51mm Svítící<br />Munice: 20<br />Použití: Mk18 ABR Calibre: 7,62x51mm Traçante<br />Projéteis: 20<br />Usado em: Mk18 ABR @@ -322,7 +322,7 @@ Kaliber: 7,62x51mm Nyomjelző IR-DIM<br />Lövedékek: 20<br />Használható: Mk18 ABR Kaliber: 7,62x51mm Leuchtspur IR-DIM<br />Patronen: 20<br />Eingesetzt von: EBR Calibre: 7,62x51mm Trazadoras IR-DIM<br />Balas: 20<br />Se usa en: Mk18 ABR - Calibre: 7,62x51mm Traçantes IR-DIM<br />Cartouches: 20<br />Utilisé dans: EBR + Calibre: 7,62x51mm Traçantes IR-DIM<br />Cartouches: 20<br />Utilisé avec: EBR Kaliber: 7,62x51mm Smugacz IR-DIM<br />Pociski: 20<br />Używane w: Mk18 ABR Ráže: 7.62x51mm Svítící IR-DIM<br />Munice: 20<br />Použití: Mk18 ABR Calibre: 7,62x51mm Traçante IR-DIM<br />Projéteis: 20<br />Usado em: Mk18 ABR @@ -358,7 +358,7 @@ Kaliber: 7,62x51mm Halk<br />Lövedékek: 20<br />Használható: Mk18 ABR Kaliber: 7,62x51mm SD<br />Patronen: 20<br />Eingesetzt von: EBR Calibre: 7,62x51mm SD<br />Balas: 20<br />Se usa en: Mk18 ABR - Calibre: 7,62x51mm SD<br />Cartouches: 20<br />Utilisé dans: EBR + Calibre: 7,62x51mm SD<br />Cartouches: 20<br />Utilisé avec: EBR Kaliber: 7,62x51mm SD<br />Pociski: 20<br />Używane w: Mk18 ABR Ráže: 7.62x51mm SD<br />Munice: 20<br />Použití: Mk18 ABR Calibre: 7,62x51mm SD<br />Projéteis: 20<br />Usado em: Mk18 ABR @@ -387,7 +387,7 @@ Caliber: .338 Norma Magnum Tracer<br />Rounds: 130<br />Used in: SPMG Kaliber: .338 Norma Magnum Leuchtspur<br />Patronen: 130<br />Eingesetzt von: SPMG Kaliber: .338 Norma Magnum Smugacz<br />Pociski: 130<br />Używany w: SPMG - Calibre: .338 Norma Magnum Traçante<br />Cartouches: 130<br />Utilisé dans: SPMG + Calibre: .338 Norma Magnum Traçante<br />Cartouches: 130<br />Utilisé avec: SPMG Calibre: .338 Norma Magnum trazadora<br />Balas: 130<br />Se usa en: SPMG Калибр: .338 Norma Magnum трассирующие<br />Патронов: 130<br />Используются в: SPMG @@ -412,7 +412,7 @@ Caliber: .338 Norma Magnum Tracer IR-DIM<br />Rounds: 130<br />Used in: SPMG Kaliber: .338 Norma Magnum Leuchtspur IR-DIM<br />Patronen: 130<br />Eingesetzt von: SPMG Kaliber: .338 Norma Magnum Smugacz IR-DIM<br />Pociski: 130<br />Używany w: SPMG - Calibre: .338 Norma Magnum Traçante IR-DIM<br />Cartouches: 130<br />Utilisé dans: SPMG + Calibre: .338 Norma Magnum Traçante IR-DIM<br />Cartouches: 130<br />Utilisé avec: SPMG Calibre: .338 Norma Magnum trazadora IR-DIM<br />Balas: 130<br />Se usa en: SPMG Калибр: .338 Norma Magnum ИК-трассирующие<br />Патронов: 130<br />Используются с: SPMG @@ -437,7 +437,7 @@ Caliber: .338 Norma Magnum AP<br />Rounds: 130<br />Used in: SPMG Kaliber: .338 Norma Magnum Hartkern<br />Patronen: 130<br />Eingesetzt von: SPMG Kaliber: .338 Norma Magnum AP<br />Pociski: 130<br />Używane w: SPMG - Calibre: .338 Norma Magnum AP<br />Cartouches: 130<br />Utilisé dans: SPMG + Calibre: .338 Norma Magnum AP<br />Cartouches: 130<br />Utilisé avec: SPMG Calibre: .338 Norma Magnum AP<br />Balas: 130<br />Se usa en: SPMG Калибр: .338 Norma Magnum бронебойные<br />Патронов: 130<br />Используются с: SPMG @@ -463,7 +463,7 @@ Caliber: 9.3x64mm Tracer<br />Rounds: 10<br />Used in: Cyrus Kaliber: 9,3x64mm Leuchtspur<br />Patronen: 10<br />Eingesetzt von: Cyrus Kaliber: 9,3x64mm Smugacz<br />Pociski: 10<br />Używany w: Cyrus - Calibre: 9.3x64mm Traçante<br />Cartouches: 10<br />Utilisé dans: Cyrus + Calibre: 9.3x64mm Traçante<br />Cartouches: 10<br />Utilisé avec: Cyrus Calibre: 9.3x64mm trazadora<br />Balas: 10<br />Se usa en: Cyrus Калибр: 9,3x64 мм трассирующие<br />Патронов: 10<br />Используются с: Cyrus @@ -488,7 +488,7 @@ Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 10<br />Used in: Cyrus Kaliber: 9,3x64mm Leuchtspur IR-DIM<br />Patronen: 10<br />Eingesetzt von: Cyrus Kaliber: 9,3x64mm Smugacz IR-DIM<br />Pociski: 10<br />Używany w: Cyrus - Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 10<br />Utilisé dans: Cyrus + Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 10<br />Utilisé avec: Cyrus Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 10<br />Se usa en: Cyrus Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 10<br />Используются с: Cyrus @@ -514,7 +514,7 @@ Caliber: 9.3x64mm Tracer<br />Rounds: 150<br />Used in: Navid Kaliber: 9,3x64mm Leuchtspur<br />Patronen: 150<br />Eingesetzt von: Navid Kaliber: 9,3x64mm Smugacz<br />Pociski: 150<br />Używane w: Navid - Calibre: 9.3x64mm Traçante<br />Cartouches: 150<br />Utilisé dans: Navid + Calibre: 9.3x64mm Traçante<br />Cartouches: 150<br />Utilisé avec: Navid Calibre: 9.3x64mm trazadora<br />Balas: 150<br />Se usa en: Navid Калибр: 9,3x64 мм трассирующие<br />Патронов: 150<br />Используются с: Навид @@ -539,7 +539,7 @@ Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 150<br />Used in: Navid Kaliber: 9,3x64mm Leuchtspur IR-DIM<br />Patronen: 150<br />Eingesetzt von: Navid Kaliber: 9,3x64mm Smugacz IR-DIM<br />Pociski: 150<br />Używane w: Navid - Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 150<br />Utilisé dans: Navid + Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 150<br />Utilisé avec: Navid Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 150<br />Se usa en: Navid Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 150<br />Используются с: Навид @@ -564,7 +564,7 @@ Caliber: 9.3x64mm AP<br />Rounds: 150<br />Used in: Navid Kaliber: 9,3x64mm Hartkern<br />Patronen: 150<br />Eingesetzt von: Navid Kaliber: 9,3x64mm AP<br />Pociski: 150<br />Używane w: Navid - Calibre: 9.3x64mm AP<br />Cartouches: 150<br />Utilisé dans: Navid + Calibre: 9.3x64mm AP<br />Cartouches: 150<br />Utilisé avec: Navid Calibre: 9.3x64mm AP<br />Balas: 150<br />Se usa en: Navid Калибр: 9,3x64 мм бронебойные<br />Патронов: 150<br />Используются с: Навид @@ -587,7 +587,7 @@ 9x19mm 30Rnd Mag Magazynek 9x19mm 16rd - 9x19mm 30Cps + Chargeur 9x19mm 30Cps Cargador de 16 balas de 9x19mm Магазин из 16-ти 9х19 мм 9x19mm 30-Patronen-Magazin @@ -595,7 +595,7 @@ 9x19mm 30Rnd Mag Magazynek 9x19mm 30rd - 9x19mm 30Cps + Chargeur 9x19mm 30Cps Cargador de 30 balas de 9x19mm Магазин из 30-ти 9х19 мм 9x19mm 30-Patronen-Magazin @@ -611,7 +611,7 @@ 9x19mm 30Rnd Mag Magazynek 9x19mm 30rd - 9x19mm 30Cps + Chargeur 9x19mm 30Cps Cargador de 30 balas de 9x19mm Магазин из 30-ти 9х19 мм 9x19mm 30-Patronen-Magazin @@ -659,7 +659,7 @@ 6.5mm 100Rnd Tracer IR-DIM Mag<br />Rounds: 100<br />Used in: MX LSW Magazynek 6,5mm 100rd Smugacz IR-DIM - Chargeur 6.5mm 100Rnd Traçante IR-DIM + Chargeur 6.5mm 100Rnd Traçante IR-DIM<br />Cartouches: 100<br />Utilisé avec: MX LSW Cargador de 100 balas trazadoras IR-DIM de 6.5mm Магазин из 100 6,5 мм ИК-трассирующих 6,5mm 100-Patronen-Magazin IR-DIM Leuchtspur<br />Patronen: 100<br />Eingesetzt von: MXLSW @@ -683,7 +683,7 @@ 6.5mm 200Rnd Tracer IR-DIM Belt<br />Rounds: 200<br />Used in: Stoner 99 LMG Magazynek 6,5mm 200rd Smugacz IR-DIM - Bande 6.5mm 200Cps Traçante IR-DIM + Bande 6.5mm 200Cps Traçante IR-DIM<br />Cartouches: 200<br />Utilisé avec: Stoner 99 LMG Cinta de 200 balas trazadoras IR-DIM de 6.5mm Магазин из 200-т 6,5 мм ИК-трассирующих 6,5mm 200-Patronen-Gurt IR-DIM Leuchtspur<br />Patronen: 200<br />Eingesetzt von: Stoner 99 LMG @@ -715,7 +715,7 @@ 5.56mm 30Rnd Mag (Mk318) Magazynek 5,56mm 30rd (Mk318) - 5.56mm 30Cps (Mk318) + Chargeur 5.56mm 30Cps (Mk318) Cargador de 30 balas de 5.56mm (Mk318) Магазин из 30-ти 5.56 мм (Mk318) 5,56mm 30-Patronen-Magazin (Mk318) @@ -739,7 +739,7 @@ 5.56mm 30Rnd Mag (M995 AP) Magazynek 5,56mm 30rd (M995 AP) - 5.56mm 30Cps (M995 AP) + Chargeur 5.56mm 30Cps (M995 AP) Cargador de 30 balas de 5.56mm (M995 AP) Магазин из 30-ти 5.56 мм (M995 AP) 5,56mm 30-Patronen-Magazin (M995AP) @@ -763,7 +763,7 @@ 7.62mm 10Rnd Mag (M118LR) Magazynek 7,62mm 10rd (M118LR) - 7.62mm 10Cps (M118LR) + Chargeur 7.62mm 10Cps (M118LR) Cargador de 10 balas de 7.62mm (M118LR) Магазин из 10-ти 7,62 мм (M118LR) 7,62mm 10-Patronen-Magazin (M118LR) @@ -787,7 +787,7 @@ 7.62mm 20Rnd Mag (M118LR) Magazynek 7,62mm 20rd (M118LR) - 7.62mm 20Cps (M118LR) + Chargeur 7.62mm 20Cps (M118LR) Cargador de 20 balas de 7.62mm (M118LR) Магазин из 20-ти 7,62 мм (M118LR) 7,62mm 20-Patronen-Magazin (M118LR) @@ -811,7 +811,7 @@ 7.62mm 10Rnd Mag (Mk316 Mod 0) Magazynek 7,62mm 10rd (Mk316 Mod 0) - 7.62mm 10Cps (Mk316 Mod 0) + Chargeur 7.62mm 10Cps (Mk316 Mod 0) Cargador de 10 balas de 7.62mm (Mk316 Mod 0) Магазин из 10-ти 7,62 мм (Mk316 Mod 0) 7,62mm 10-Patronen-Magazin (Mk316 Mod 0) @@ -835,7 +835,7 @@ 7.62mm 20Rnd Mag (Mk316 Mod 0) Magazynek 7,62mm 20rd (Mk316 Mod 0) - 7.62mm 20Cps (Mk316 Mod 0) + Chargeur 7.62mm 20Cps (Mk316 Mod 0) Cargador de 20 balas de 7.62mm (Mk316 Mod 0) Магазин из 20-ти 7,62 мм (Mk316 Mod 0) 7,62mm 20-Patronen-Magazin (Mk316 Mod 0) @@ -859,7 +859,7 @@ 7.62mm 10Rnd Mag (Mk319 Mod 0) Magazynek 7,62mm 10rd (Mk319 Mod 0) - 7.62mm 10Cps (Mk319 Mod 0) + Chargeur 7.62mm 10Cps (Mk319 Mod 0) Cargador de 10 balas de 7.62mm (Mk319 Mod 0) Магазин из 10-ти 7,62 мм (Mk319 Mod 0) 7,62mm 10-Patronen-Magazin (Mk319 Mod 0) @@ -883,7 +883,7 @@ 7.62mm 20Rnd Mag (Mk319 Mod 0) Magazynek 7,62mm 20rd (Mk319 Mod 0) - 7.62mm 20Cps (Mk319 Mod 0) + Chargeur 7.62mm 20Cps (Mk319 Mod 0) Cargador de 20 balas de 7.62mm (Mk319 Mod 0) Магазин из 20-ти 7,62 мм (Mk319 Mod 0) 7,62mm 20-Patronen-Magazin (Mk319 Mod 0) @@ -907,7 +907,7 @@ 7.62mm 10Rnd Mag (M993 AP) Magazynek 7,62mm 10rd (M993 AP) - 7.62mm 10Cps (M993 AP) + Chargeur 7.62mm 10Cps (M993 AP) Cargador de 10 balas de 7.62mm (M993 AP) Магазин из 10-ти 7,62 мм (M993 AP) 7,62mm 10-Patronen-Magazin (M993 AP) @@ -931,7 +931,7 @@ 7.62mm 20Rnd Mag (M993 AP) Magazynek 7,62mm 20rd (M993 AP) - 7.62mm 20Cps (M993 AP) + Chargeur 7.62mm 20Cps (M993 AP) Cargador de 20 balas de 7.62mm (M993 AP) Магазин из 20-ти 7,62 мм (M993 AP) 7,62mm 20-Patronen-Magazin (M993 AP) @@ -955,7 +955,7 @@ 7.62mm 20Rnd Mag (Mk248 Mod 0) Magazynek 7,62mm 20rd (Mk248 Mod 0) - 7.62mm 20Cps (Mk248 Mod 0) + Chargeur 7.62mm 20Cps (Mk248 Mod 0) Cargador de 20 balas de 7.62mm (Mk248 Mod 0) Магазин из 20-ти 7,62 мм (Mk248 Mod 0) 7,62mm 20-Patronen-Magazin (Mk248 Mod 0) @@ -979,7 +979,7 @@ 7.62mm 20Rnd Mag (Mk248 Mod 1) Magazynek 7,62mm 20rd (Mk248 Mod 1) - 7.62mm 20Cps (Mk248 Mod 1) + Chargeur 7.62mm 20Cps (Mk248 Mod 1) Cargador de 20 balas de 7.62mm (Mk248 Mod 1) Магазин из 20-ти 7,62 мм (Mk248 Mod 1) 7,62mm 20-Patronen-Magazin (Mk248 Mod 1) @@ -1003,7 +1003,7 @@ 7.62mm 20Rnd Mag (Berger Hybrid OTM) Magazynek 7,62mm 20rd (Berger Hybrid OTM) - 7.62 20Cps (Berger Hybrid OTM) + Chargeur 7.62 20Cps (Berger Hybrid OTM) Cargador de 20 balas de 7.62mm (Berger Hybrid OTM) Магазин из 20-ти 7,62 мм (Berger Hybrid OTM) 7,62mm 20-Patronen-Magazin (Berger Hybrid OTM) @@ -1026,7 +1026,7 @@ 6.5x47mm 30Rnd Mag (HPBT Scenar) - 6.5x47mm 30Cps (HPBT Scenar) + Chargeur 6.5x47mm 30Cps (HPBT Scenar) Cargador de 30 balas de 6.5x47mm (HPBT Scenar) Magazynek 6,5x47mm 30rd (HPBT Scenar) Магазин из 30-ти 6,5x47 мм (HPBT Scenar) @@ -1052,6 +1052,7 @@ 6.5mm Creedmor 30Rnd Mag Magazynek 6,5mm Creedmor 30rd 6,5mm Creedmor 30-Patronen-Magazin + Chargeur 6.5mm Creedmor 30Cps 6.5mm CM @@ -1065,10 +1066,11 @@ Caliber: 6.5x47mm Creedmor<br />Rounds: 30<br />Used in: MXM Kaliber: 6,5x47mm Creedmor<br />Pociski: 30<br />Używany w: MXM Kaliber: 6,5x47mm Creedmor<br />Patronen: 30<br />Eingesetzt von: MXM + Calibre: 6.5x47mm Creedmor <br />Cartouches: 30<br />Utilisé avec: MXM .338 10Rnd Mag (300gr Sierra MatchKing HPBT) - .338 10 Cps (300gr Sierra MatchKing HPBT) + Chargeur .338 10 Cps (300gr Sierra MatchKing HPBT) Cargador de 10 balas de 8.6x70mm (300gr Sierra MatchKing HPBT) Magazynek .338 10rd (300gr Sierra MatchKing HPBT) Магазин из 10-ти .338 (300 гран Sierra MatchKing HPBT) @@ -1092,7 +1094,7 @@ .338 10Rnd Mag (API526) - .338 10Cps (API526) + Chargeur .338 10Cps (API526) Cargador de 10 balas de .338 (API526) Magazynek .338 10rd (API526) Магазин из 10-ти .338 (API526) @@ -1116,7 +1118,7 @@ 12.7x99mm 5Rnd Mag - 12.7x99mm 5Cps + Chargeur 12.7x99mm 5Cps Cargador de 5 balas de 12.7x99mm Magazynek 12,7x99mm 5rd Магазин из 5-ти 12,7x99 мм @@ -1140,7 +1142,7 @@ 12.7x99mm API 5Rnd Mag - 12.7x99mm API 5Cps + Chargeur 12.7x99mm API 5Cps Cargador de 5 balas de 12.7x99mm API Magazynek 12,7x99mm API 5rd 12,7x99mm 5-Patronen-Magazin (API) @@ -1161,7 +1163,7 @@ 12.7x99mm 5Rnd Mag (AMAX) - 12.7x99mm 5Rnd Mag (AMAX) + Chargeur 12.7x99mm 5Rnd Mag (AMAX) Cargador de 5 balas de 12.7x99mm (AMAX) Magazynek 12,7x99mm 5rd (AMAX) Магазин из 5-ти 12,7x99 мм (A-MAX) @@ -1184,4 +1186,4 @@ Kaliber:12,7x99mm (AMAX)<br />Patronen: 5 - \ No newline at end of file + From 73772d9de19a55ea3f3065ae01dba2b17755e597 Mon Sep 17 00:00:00 2001 From: NukeDev Date: Wed, 29 Apr 2015 16:44:42 +0200 Subject: [PATCH 076/171] Other Fixes --- addons/medical/stringtable.xml | 50 ++++++++++++++++++++++++++ addons/missileguidance/stringtable.xml | 1 + 2 files changed, 51 insertions(+) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 8bcd17cef77..1a1968ba1fd 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1123,6 +1123,7 @@ Use Surgical Kit Operationsset benutzen + Usa kit chirurgico Bodybag @@ -1177,6 +1178,7 @@ %1 checked Blood Pressure: %2 %1 kontrollierte Blutdruck: %2 + %1 controllata pressione sanguigna: %2 You checked %1 @@ -1251,18 +1253,22 @@ Low Niedrig + Basso Normal Normal + Normale High Hoch + Alto No Blood Pressure Kein Blutdruck + Nessuna Pressione Sanguigna Pulse @@ -1297,18 +1303,22 @@ %1 checked Heart Rate: %2 %1 kontrollierte Herzfrequenz: %2 + %1 Controllata Frequenza Cardiaca: %2 Weak Schwach + Lento Normal Normal + Normale Strong Stark + Veloce You find a Heart Rate of %2 @@ -1412,24 +1422,31 @@ Patient %1<br/>is %2.<br/>%3.<br/>%4 + Paziente %1<br/>è %2.<br/>%3.<br/>%4 alive + Vivo dead + Morto He's lost some blood + Ha perso molto sangue He hasn't lost blood + Non ha perso sangue He is in pain + è affetto da dolore He is not in pain + Non è affetto da dolore Bandaged @@ -1762,134 +1779,167 @@ Scrape Kratzer + Scorticatura Minor Scrape Kleiner Kratzer + Minima Scorticatura Medium Scrape Mittlerer Kratzer + Media Scorticatura Large Scrape Großer Kratzer + Alta Scorticatura Avulsion Avulsion + Avulsione Minor Avulsion Kleine Avulsion + Minima Avulsione Medium Avulsion Mittlere Avulsion + Media Avulsione Large Avulsion Große Avulsion + Alta Avulsione Bruise Prellung + Contusione Minor Bruise Kleine Prellung + Minima Contusione Medium Bruise Mittlere Prellung + Media Contusione Large Bruise Große Prellung + Alta Contusione Crushed tissue Quetschverletzung + Tessuto Schiacciato Minor crushed tissue Kleine Quetschverletzung + Minimo Tessuto Schiacciato Medium crushed tissue Mittlere Quetschverletzung + Medio Tessuto Schiacciato Large crushed tissue Große Quetschverletzung + Alto Tessuto Schiacciato Cut Schnittwunde + Taglio Small Cut Kleine Schnittwunde + Piccolo Taglio Medium Cut Mittlere Schnittwunde + Medio Taglio Large Cut Große Schnittwunde + Grande Taglio Tear Riss + Strappo Small Tear Kleiner Riss + Piccolo Strappo Medium Tear Mittlerer Riss + Medio Strappo Large Tear Großer Riss + Grande Strappo Velocity Wound Ballistisches Trauma + Velocità Ferita Smal Velocity Wound Kleines Ballistisches Trauma + Lenta Velocità Ferita Medium Velocity Wound Mittleres Ballistisches Trauma + Media Velocità Ferita Large Velocity Wound Großes Ballistisches Trauma + Alta Velocità Ferita Puncture Wound Stichwunde + Puntura Ferita Minor Puncture Wound Kleine Stichwunde + Piccola Puntura Ferita Medium Puncture Wound Mittlere Stichwunde + Media Puntura Ferita Large Puncture Wound Große Stichwunde + Grande Puntura Ferita Broken Femur Gebrochener Oberschenkelknochen + Femore Rotto \ No newline at end of file diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml index e0923981f3b..68da1c0cd88 100644 --- a/addons/missileguidance/stringtable.xml +++ b/addons/missileguidance/stringtable.xml @@ -17,6 +17,7 @@ Advanced missile guidance, or AMG, provides multiple enhancements to missile locking and firing. It is also a framework required for missile weapon types. Zaawansowane namierzanie rakiet, lub ZNR, dostarcza wiele poprawek do systemu namierzania rakiet oraz dodaje nowe tryby strzału. Jest to wymagana opcja dla broni rakietowych. Guía de misiles avanzada, o AMG en sus siglas en inglés, ofrece múltiples mejoras en el fijado y disparo de misiles. Es también un framework requerido para armas de tipo misil. + Guida dei missili avanzata, o AMG, offre diversi miglioramenti alla teleguida di missili. E' anche un sistema necessario per i tipi di armi missile. Hydra-70 DAGR Missile From d4dc5e6d858c2b64d17a288a604bf138d6c09a3b Mon Sep 17 00:00:00 2001 From: NukeDev Date: Wed, 29 Apr 2015 17:22:20 +0200 Subject: [PATCH 077/171] Other Fixes 2 --- addons/overheating/stringtable.xml | 5 +- addons/realisticnames/stringtable.xml | 76 ++++++++++++++++++++++++++- addons/respawn/stringtable.xml | 8 ++- addons/vehiclelock/stringtable.xml | 4 +- 4 files changed, 88 insertions(+), 5 deletions(-) diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml index 557bd6c9156..32e45bdddf4 100644 --- a/addons/overheating/stringtable.xml +++ b/addons/overheating/stringtable.xml @@ -10,6 +10,7 @@ Wyświetl tekst przy zacięciu broni Affiche texte si enrayé Szöveges értesítés kijelzése a fegyver elakadásakor + Visualizza testo in caso di inceppamento Display a notification whenever your weapon gets jammed @@ -20,6 +21,7 @@ Wyświetl powiadomienie za każdym razem, kiedy Twoja broń ulegnie zacięciu Affiche une notification lors d'un enrayement Egy szöveges értesítés jelenik meg, amikor a fegyver megakad + Visualizza una notifica in caso la tua arma si inceppasse Spare barrel @@ -138,6 +140,7 @@ Vérifier la température Fegyverhő ellenőrzése Проверить температуру оружия + Controlla la temperatura della canna Checking temperature ... @@ -164,4 +167,4 @@ Температура - + \ No newline at end of file diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml index 5e9aaa701d1..d4dbf701f5a 100644 --- a/addons/realisticnames/stringtable.xml +++ b/addons/realisticnames/stringtable.xml @@ -118,6 +118,7 @@ YABHON-R3 (штурмовик) YABHON-R3 (CAS) YABHON-R3 (Légitámogató) + YABHON-R3 (CAS) M-ATV @@ -728,6 +729,7 @@ CH-47I Chinook (neozbrojený) CH-47I Chinook (Neozbrojený) CH-47I Chinook (fegyvertelen) + CH-47I Chinook (disarmato) A-10D Thunderbolt II @@ -1050,6 +1052,7 @@ P99 P99 P99 + P99 MP-443 Grach @@ -1060,6 +1063,7 @@ MP-443 Grach MP-443 Grach МР-443 "Грач" + MP-443 Grach ACP-C2 @@ -1070,6 +1074,7 @@ ACP-C2 ACP-C2 ACP-C2 + ACP-C2 FNX-45 Tactical @@ -1080,6 +1085,7 @@ FNX-45 Tactical FNX-45 Tactical FNX-45 Tactical + FNX-45 Tactical Chiappa Rhino 60DS @@ -1090,6 +1096,7 @@ Chiappa Rhino 6DS Chiappa Rhino 60DS Chiappa Rhino 60DS + Chiappa Rhino 6DS Taurus Judge @@ -1100,6 +1107,7 @@ Taurus Judge Taurus Judge Taurus Judge + Taurus Judge NLAW @@ -1110,6 +1118,7 @@ NLAW NLAW NLAW + NLAW RPG-32 @@ -1120,6 +1129,7 @@ RPG-32 RPG-32 РПГ-32 + RPG-32 Mini-Spike (AA) @@ -1130,6 +1140,7 @@ Mini-Spike (Repülő-elhárító) Mini-Spike (AA) Mini-Spike (AA) + Mini-Spike (AA) Mini-Spike (AT) @@ -1140,6 +1151,7 @@ Mini-Spike (Tankelhárító) Mini-Spike (AT) Mini-Spike (AT) + Mini-Spike (AT) MX @@ -1150,6 +1162,7 @@ MX MX MX + MX MX (Black) @@ -1160,6 +1173,7 @@ MX (Fekete) MX (Negro) MX (черный) + MX (Nero) MXC @@ -1170,6 +1184,7 @@ MXC MXC MXC + MXC MXC (Black) @@ -1180,6 +1195,7 @@ MXC (Fekete) MXC (Negro) MXC (черный) + MXC (Nero) MX 3GL @@ -1190,6 +1206,7 @@ MX 3GL MX 3GL MX 3GL + MX 3GL MX 3GL (Black) @@ -1200,6 +1217,7 @@ MX 3GL (Fekete) MX 3GL (Negro) MX 3GL (черный) + MX 3GL (Nero) MX LSW @@ -1210,6 +1228,7 @@ MX LSW MX LSW MX LSW + MX LSW MX LSW (Black) @@ -1220,6 +1239,7 @@ MX LSW (Fekete) MX LSW (Negro) MX LSW (черный) + MX LSW (Nero) MXM @@ -1230,6 +1250,7 @@ MXM MXM MXM + MXM MXM (Black) @@ -1240,6 +1261,7 @@ MXM (Fekete) MXM (Negro) MXM (черный) + MXM (Nero) KT2002 Katiba @@ -1250,6 +1272,7 @@ KT2002 Katiba KT2002 Katiba KT2002 Катиба + KT2002 Katiba KT2002C Katiba @@ -1260,6 +1283,7 @@ KT2002C Katiba KT2002C Katiba KT2002C Катиба + KT2002C Katiba KT2002 Katiba KGL @@ -1270,6 +1294,7 @@ KT2002 Katiba KGL KT2002 Katiba KGL KT2002 Катиба KGL + KT2002 Katiba KGL F2000 (Camo) @@ -1280,6 +1305,7 @@ F2000 (Terepmintás) F2000 (Camuflaje) F2000 (камо) + F2000 (Camo) F2000 @@ -1290,6 +1316,7 @@ F2000 F2000 F2000 + F2000 F2000 Tactical (Camo) @@ -1300,6 +1327,7 @@ F2000 Tactical (Terepmintás) F2000 Tactical (Camuflaje) F2000 Tactical (камо) + F2000 Tactical (Camo) F2000 Tactical @@ -1310,6 +1338,7 @@ F2000 Tactical F2000 Tactical F2000 Tactical + F2000 Tactical F2000 EGLM (Camo) @@ -1320,6 +1349,7 @@ F2000 EGLM (Terepmintás) F2000 EGLM (Camuflaje) F2000 EGLM (камо) + F2000 EGLM (Camo) F2000 EGLM @@ -1330,6 +1360,7 @@ F2000 EGLM F2000 EGLM F2000 EGLM + F2000 EGLM TAR-21 @@ -1340,6 +1371,7 @@ TAR-21 TAR-21 TAR-21 + TAR-21 CTAR-21 @@ -1350,6 +1382,7 @@ CTAR-21 CTAR-21 CTAR-21 + CTAR-21 TAR-21 EGLM @@ -1360,6 +1393,7 @@ TAR-21 EGLM TAR-21 EGLM TAR-21 EGLM + TAR-21 EGLM Vector SMG @@ -1370,6 +1404,7 @@ Vector SMG Vector SMG Vector SMG + Vector SMG Scorpion Evo 3 A1 @@ -1380,6 +1415,7 @@ Scorpion Evo 3 A1 Scorpion Evo 3 A1 Scorpion Evo 3 A1 + Scorpion Evo 3 A1 CPW @@ -1390,6 +1426,7 @@ CPW CPW CPW + CPW RFB SDAR @@ -1400,6 +1437,7 @@ RFB SDAR RFB SDAR RFB SDAR + RFB SDAR Stoner 99 LMG @@ -1410,6 +1448,7 @@ Stoner 99 Könnyűgéppuska Stoner 99 LMG Stoner 99 LMG + Stoner 99 LMG Negev NG7 @@ -1420,6 +1459,7 @@ Negev NG7 Negev NG7 Negev NG7 + Negev NG7 Mk14 Mod 1 EBR @@ -1430,6 +1470,7 @@ Mk14 Mod 1 EBR Mk14 Mod 1 EBR Mk14 Mod 1 EBR + Mk14 Mod 1 EBR GM6 Lynx @@ -1440,6 +1481,7 @@ GM6 Gepárd GM6 Lynx GM6 Lynx + GM6 Lynx GM6 Lynx (Camo) @@ -1450,6 +1492,7 @@ GM6 Gepárd (Terepmintás) GM6 Lynx (Camuflaje) GM6 Lynx (камо) + GM6 Lynx (Camo) M200 Intervention @@ -1460,6 +1503,7 @@ M200 Intervention M200 Intervention M200 Intervention + M200 Intervention M200 Intervention (Camo) @@ -1470,6 +1514,7 @@ M200 Intervention (Terepmintás) M200 Intervention (Camuflaje) M200 Intervention (камо) + M200 Intervention (Camo) VS-121 @@ -1480,6 +1525,7 @@ VS-121 VS-121 VS-121 + VS-121 Noreen "Bad News" ULR @@ -1487,6 +1533,7 @@ Noreen "Bad News" ULR Noreen "Bad News" ULR Noreen "Bad News" ULR + Noreen "Bad News" ULR Noreen "Bad News" ULR (Black) @@ -1494,6 +1541,7 @@ Noreen "Bad News" ULR (Noir) Noreen "Bad News" ULR (Negro) Noreen "Bad News" ULR (черный) + Noreen "Bad News" ULR (Nero) Noreen "Bad News" ULR (Camo) @@ -1501,6 +1549,7 @@ Noreen "Bad News" ULR (Camo) Noreen "Bad News" ULR (Camuflaje) Noreen "Bad News" ULR (камо) + Noreen "Bad News" ULR (Camo) Noreen "Bad News" ULR (Sand) @@ -1508,6 +1557,7 @@ Noreen "Bad News" ULR (Beige) Noreen "Bad News" ULR (Arena) Noreen "Bad News" ULR (песочный) + Noreen "Bad News" ULR (Sabbia) SIG 556 @@ -1516,6 +1566,7 @@ SIG 556 SIG 556 SIG 556 + SIG 556 SIG 556 (Black) @@ -1524,6 +1575,7 @@ SIG 556 (Negro) SIG 556 (черный) SIG 556 (czarny) + SIG 556 (Nero) SIG 556 (Khaki) @@ -1532,6 +1584,7 @@ SIG 556 (Caqui) SIG 556 (хаки) SIG 556 (khaki) + SIG 556 (Khaki) SIG 556 (Sand) @@ -1540,6 +1593,7 @@ SIG 556 (Arena) SIG 556 (песочный) SIG 556 (piaskowy) + SIG 556 (Sabbia) SIG 556 (Camo) @@ -1548,6 +1602,7 @@ SIG 556 (Camuflaje) SIG 556 (камо) SIG 556 (kamuflaż) + SIG 556 (Camo) SIG 556 (Woodland) @@ -1556,6 +1611,7 @@ SIG 556 (Bosque) SIG 556 (лесной) SIG 556 (leśny) + SIG 556 (Woodland) SIG 556 (provisional) spotter @@ -1564,6 +1620,7 @@ SIG 556 (provisional) observador SIG 556 (provisional) корректировщик SIG 556 (prowizoryczny) obserwator + SIG 556 (provisional) spotter ASP-1 Kir @@ -1571,6 +1628,7 @@ ASP-1 Kir ASP-1 Kir ASP-1 Kir + ASP-1 Kir ASP-1 Kir (Black) @@ -1578,6 +1636,7 @@ ASP-1 Kir (Noir) ASP-1 Kir (Negro) ASP-1 Kir (черный) + ASP-1 Kir (Nero) ASP-1 Kir (Tan) @@ -1585,6 +1644,7 @@ ASP-1 Kir (Tan) ASP-1 Kir (Tan) ASP-1 Kir (бронзовый) + ASP-1 Kir (Tan) Cyrus @@ -1592,6 +1652,7 @@ Cyrus Cyrus Cyrus + Cyrus Cyrus (Black) @@ -1599,6 +1660,7 @@ Cyrus (Noir) Cyrus (Negro) Cyrus (черный) + Cyrus (Nero) Cyrus (Hex) @@ -1606,6 +1668,7 @@ Cyrus (Hex) Cyrus (Hex) Cyrus (гекс) + Cyrus (Hex) Cyrus (Tan) @@ -1613,6 +1676,7 @@ Cyrus (Tan) Cyrus (Tan) Cyrus (бронза) + Cyrus (Tan) M14 @@ -1621,6 +1685,7 @@ M14 M14 M14 + M14 M14 (Camo) @@ -1629,6 +1694,7 @@ M14 (Camuflaje) M14 (Камо) M14 (kamuflaż) + M14 (Camo) M14 (Olive) @@ -1637,6 +1703,7 @@ M14 (Oliva) M14 (Олива) M14 (oliwkowy) + M14 (Olive) HK121 @@ -1644,6 +1711,7 @@ HK121 HK121 HK121 + HK121 HK121 (Hex) @@ -1651,6 +1719,7 @@ HK121 (Hex) HK121 (Hex) HK121 (гекс) + HK121 (Hex) HK121 (Tan) @@ -1658,6 +1727,7 @@ HK121 (Tan) HK121 (Tan) HK121 (бронза) + HK121 (Tan) LWMMG @@ -1666,6 +1736,7 @@ LWMMG LWMMG LWMMG + LWMMG LWMMG (MTP) @@ -1674,6 +1745,7 @@ LWMMG (MTP) LWMMG (MTP) LWMMG (MTP) + LWMMG (MTP) LWMMG (Black) @@ -1682,6 +1754,7 @@ LWMMG (Negro) LWMMG (Черный) LWMMG (czarny) + LWMMG (Nero) LWMMG (Sand) @@ -1690,6 +1763,7 @@ LWMMG (Arena) LWMMG (Песочный) LWMMG (piaskowy) + LWMMG (Sabbia) - + \ No newline at end of file diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml index 75f711e20e4..95cc7123edc 100644 --- a/addons/respawn/stringtable.xml +++ b/addons/respawn/stringtable.xml @@ -52,6 +52,7 @@ Точка сбора Синих (База) Punkt zbiórki Zachodu (Baza) Point de ralliement OUEST (Base) + Rallypoint West (Base) Rallypoint East (Base) @@ -60,6 +61,7 @@ Точка сбора Красных (База) Punkt zbiórki Wschodu (Baza) Point de ralliement EST (Base) + Rallypoint East (Base) Rallypoint Independent (Base) @@ -68,6 +70,7 @@ Точка сбора Независимых (База) Punkt zbiórki Ruchu oporu (Baza) Point de ralliement Indépendant (Base) + Rallypoint Independent (Base) Rallypoint West @@ -76,6 +79,7 @@ Точка сбора Синих Punkt zbiórki Zachodu Point de ralliement OUEST + Rallypoint West Rallypoint East @@ -84,6 +88,7 @@ Точка сбора Красных Punkt zbiórki Wschodu Point de ralliement EST + Rallypoint East Rallypoint Independent @@ -92,6 +97,7 @@ Точка сбора Независимых Punkt zbiórki Ruchu oporu Point de ralliement Indépendant + Rallypoint Independent - + \ No newline at end of file diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml index e62f9fdc5f8..5dcab5fe2f5 100644 --- a/addons/vehiclelock/stringtable.xml +++ b/addons/vehiclelock/stringtable.xml @@ -98,7 +98,7 @@ Egy kulcs, ami a KELET egységeinek legtöbb járművét ki tudja nyitni. Klíč který by měl otevřít vetšinu Východních vozidel. Ключ для открытия большинства машин Синих. - Una chaive che apr ela maggior parte dei veicoli EAST + Una chaive che apre la maggior parte dei veicoli EAST A key that should open most INDEP vehicle. @@ -123,4 +123,4 @@ Una chaive che apr ela maggior parte dei veicoli CIV - + \ No newline at end of file From 989332831f582e8dc351960730a6bfdc909e59b0 Mon Sep 17 00:00:00 2001 From: ulteq Date: Wed, 29 Apr 2015 17:42:37 +0200 Subject: [PATCH 078/171] Added frag configs for 82mm and 155mm shells --- addons/frag/CfgAmmo.hpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp index 3cfb27dfafe..3db80f03957 100644 --- a/addons/frag/CfgAmmo.hpp +++ b/addons/frag/CfgAmmo.hpp @@ -98,7 +98,14 @@ class CfgAmmo { }; // curator ammo entries - class Sh_82mm_AMOS; + class ShellBase; + class Sh_82mm_AMOS : ShellBase { + // Source: http://www.arsenal-bg.com/defense_police/mortar_bombs_82mm.htm + GVAR(metal) = 3200; + GVAR(charge) = 420; + GVAR(gurney_c) = 1906; + GVAR(gurney_k) = 1/2; + }; class ModuleOrdnanceMortar_F_Ammo: Sh_82mm_AMOS { GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 800; @@ -107,7 +114,14 @@ class CfgAmmo { GVAR(gurney_k) = 1/2; }; - class Sh_155mm_AMOS; + class Sh_155mm_AMOS: ShellBase { + // Source: http://www.globalsecurity.org/military/systems/munitions/m795.htm + GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; + GVAR(metal) = 36000; + GVAR(charge) = 9979; + GVAR(gurney_c) = 1906; + GVAR(gurney_k) = 1/2; + }; class ModuleOrdnanceHowitzer_F_ammo: Sh_155mm_AMOS { GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(metal) = 1950; From 00dc0ef01eedc4e6abc0f87e2f3667cade66cb35 Mon Sep 17 00:00:00 2001 From: ulteq Date: Wed, 29 Apr 2015 17:48:19 +0200 Subject: [PATCH 079/171] Added frag classes array for 82mm shell --- addons/frag/CfgAmmo.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp index 3db80f03957..726c7e5b578 100644 --- a/addons/frag/CfgAmmo.hpp +++ b/addons/frag/CfgAmmo.hpp @@ -101,6 +101,7 @@ class CfgAmmo { class ShellBase; class Sh_82mm_AMOS : ShellBase { // Source: http://www.arsenal-bg.com/defense_police/mortar_bombs_82mm.htm + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 3200; GVAR(charge) = 420; GVAR(gurney_c) = 1906; From 5a3b672f10e3e05f6342e4f46c4fa61301efe085 Mon Sep 17 00:00:00 2001 From: Lex Rivera Date: Wed, 29 Apr 2015 21:15:32 +0300 Subject: [PATCH 080/171] [compat_asdg] fix MRCO PiP compatibility --- optionals/compat_asdg/config.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/optionals/compat_asdg/config.cpp b/optionals/compat_asdg/config.cpp index b485685c554..c7e7903ce2b 100644 --- a/optionals/compat_asdg/config.cpp +++ b/optionals/compat_asdg/config.cpp @@ -28,6 +28,7 @@ class asdg_OpticRail1913: asdg_OpticRail { ACE_optic_Arco_2D = 1; ACE_optic_Arco_PIP = 1; ACE_optic_MRCO_2D = 1; + ACE_optic_MRCO_PIP = 1; ACE_optic_SOS_2D = 1; ACE_optic_SOS_PIP = 1; ACE_optic_LRPS_2D = 1; From 608af39a675b7ef68e859da743954aee3eb12ab2 Mon Sep 17 00:00:00 2001 From: ulteq Date: Wed, 29 Apr 2015 21:22:07 +0200 Subject: [PATCH 081/171] Added proper dummy object cleanup code --- addons/explosives/functions/fnc_detonateExplosive.sqf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/explosives/functions/fnc_detonateExplosive.sqf b/addons/explosives/functions/fnc_detonateExplosive.sqf index f79f38ae1e4..917c874af69 100644 --- a/addons/explosives/functions/fnc_detonateExplosive.sqf +++ b/addons/explosives/functions/fnc_detonateExplosive.sqf @@ -19,13 +19,19 @@ * Public: Yes */ #include "script_component.hpp" -private ["_result", "_ignoreRange", "_pos"]; +private ["_result", "_ignoreRange", "_helpers", "_pos"]; EXPLODE_3_PVT(_this,_unit,_range,_item); _ignoreRange = (_range == -1); _result = true; if (!_ignoreRange && {(_unit distance (_item select 0)) > _range}) exitWith {false}; +_helpers = attachedObjects (_item select 0); +{ + detach _x; + deleteVehicle _x; +} forEach _helpers; + if (getNumber (ConfigFile >> "CfgAmmo" >> typeof (_item select 0) >> "TriggerWhenDestroyed") == 0) then { private ["_exp", "_previousExp"]; _previousExp = _item select 0; From 87465b8b102d374f4465cd79520d4e4ad6fae487 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Wed, 29 Apr 2015 21:49:24 +0200 Subject: [PATCH 082/171] fixes #829 --- addons/medical/functions/fnc_handleDamage.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index a8dddcadc81..a9895135802 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -63,7 +63,7 @@ if (GVAR(level) >= 2) then { }; }; - if ((_minLethalDamage <= _newDamage) && {[_unit, [_selection] call FUNC(selectionNameToNumber), _newDamage] call FUNC(determineIfFatal)}) then { + if ((_minLethalDamage <= _newDamage) && {[_unit, [_selection] call FUNC(selectionNameToNumber), _newDamage] call FUNC(determineIfFatal)} || !alive vehicle _unit) then { if ([_unit] call FUNC(setDead)) then { _damageReturn = 1; } else { From fce91279b575c09251e739a133feae95bb175ea1 Mon Sep 17 00:00:00 2001 From: bux578 Date: Wed, 29 Apr 2015 22:04:17 +0200 Subject: [PATCH 083/171] add ace3 and banana insignia `[this,"ACE_insignia_logo"] call BIS_fnc_setUnitInsignia;` and `[this,"ACE_insignia_banana"] call BIS_fnc_setUnitInsignia;` --- addons/common/CfgUnitInsignia.hpp | 14 ++++++++++---- addons/common/data/ace3logo_ca.paa | Bin 22016 -> 0 bytes addons/common/data/insignia_ace3logo_ca.paa | Bin 0 -> 33382 bytes addons/common/data/insignia_banana_ca.paa | Bin 0 -> 36279 bytes 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 addons/common/data/ace3logo_ca.paa create mode 100644 addons/common/data/insignia_ace3logo_ca.paa create mode 100644 addons/common/data/insignia_banana_ca.paa diff --git a/addons/common/CfgUnitInsignia.hpp b/addons/common/CfgUnitInsignia.hpp index c12c17c0c09..aba82823c90 100644 --- a/addons/common/CfgUnitInsignia.hpp +++ b/addons/common/CfgUnitInsignia.hpp @@ -1,9 +1,15 @@ class CfgUnitInsignia { - class ACE_insignia { - displayName = "ACE 3"; - author = "kripto202"; - texture = PATHTOF(data\ace3logo_ca.paa); + class ACE_insignia_logo { + displayName = "ACE3"; + author = "$STR_ACE_Common_ACETeam"; + texture = PATHTOF(data\Insignia_ace3logo_ca.paa); + textureVehicle = ""; + }; + class ACE_insignia_banana { + displayName = "ABE3"; + author = "$STR_ACE_Common_ACETeam"; + texture = PATHTOF(data\insignia_banana_ca.paa); textureVehicle = ""; }; }; diff --git a/addons/common/data/ace3logo_ca.paa b/addons/common/data/ace3logo_ca.paa deleted file mode 100644 index d3e6e20c7b3d08d692565170b06d6824e09d82c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22016 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 B%1ZzM diff --git a/addons/common/data/insignia_ace3logo_ca.paa b/addons/common/data/insignia_ace3logo_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..04640aa187fdd60644c9daebc8e9547f13ada719 GIT binary patch literal 33382 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 YK%SXr3*fJL@+Gc0)8PZ6pELJA0B578h5!Hn literal 0 HcmV?d00001 diff --git a/addons/common/data/insignia_banana_ca.paa b/addons/common/data/insignia_banana_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..5302ac07adaa39707d5841de87990bac5d244160 GIT binary patch literal 36279 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 Qj6 Date: Wed, 29 Apr 2015 22:04:46 +0200 Subject: [PATCH 084/171] fixes #838 --- addons/medical/ACE_Settings.hpp | 3 ++- addons/medical/CfgVehicles.hpp | 7 ++++++- addons/medical/functions/fnc_handleDamage.sqf | 2 +- addons/medical/functions/fnc_setDead.sqf | 5 +++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 26fa87e7068..1d87803f43e 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -60,8 +60,9 @@ class ACE_Settings { value = 0; }; class GVAR(enableRevive) { - typeName = "BOOL"; + typeName = "SCALAR"; value = 0; + values[] = {"Disabled", "Players only", "Players and AI"}; }; class GVAR(maxReviveTime) { typeName = "SCALAR"; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 339abe5a424..f28322baf7c 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -238,8 +238,13 @@ class CfgVehicles { class enableRevive { displayName = "Enable Revive"; description = "Enable a basic revive system"; - typeName = "BOOL"; + typeName = "NUMBER"; defaultValue = 0; + class values { + class disable { name = "Disabled"; value = 0; default = 1;}; + class playerOnly { name = "Player only"; value = 1; }; + class playerAndAI { name = "Player & AI"; value = 2; }; + }; }; class maxReviveTime { displayName = "Max Revive time"; diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index a9895135802..db799b45ab5 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -76,7 +76,7 @@ if (GVAR(level) >= 2) then { }; [_unit] call FUNC(addToInjuredCollection); -if (((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)])) && {_damageReturn >= 0.9} && {_selection in ["", "head", "body"]}) exitWith { +if (((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]) > 0) && {_damageReturn >= 0.9} && {_selection in ["", "head", "body"]}) exitWith { if (vehicle _unit != _unit and {damage _vehicle >= 1}) then { // @todo // [_unit] call FUNC(unload); diff --git a/addons/medical/functions/fnc_setDead.sqf b/addons/medical/functions/fnc_setDead.sqf index 428d6674abf..9d8498cd04f 100644 --- a/addons/medical/functions/fnc_setDead.sqf +++ b/addons/medical/functions/fnc_setDead.sqf @@ -13,7 +13,7 @@ #include "script_component.hpp" -private ["_unit", "_force"]; +private ["_unit", "_force", "_reviveVal"]; _unit = _this select 0; _force = false; if (count _this >= 2) then { @@ -26,7 +26,8 @@ if (!local _unit) exitwith { false; }; -if ((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]) && !_force) exitwith { +_reviveVal = _unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]; +if (((_reviveVal == 1 && {[_unit] call EFUNC(common,isPlayer)} || _reviveVal == 2)) && !_force) exitwith { if (_unit getvariable [QGVAR(inReviveState), false]) exitwith { if (GVAR(amountOfReviveLives) > 0) then { _lifesLeft = _unit getvariable[QGVAR(amountOfReviveLives), GVAR(amountOfReviveLives)]; From aaa8171457ff1300f5a22d8bd6feab017541ad7c Mon Sep 17 00:00:00 2001 From: Glowbal Date: Wed, 29 Apr 2015 22:54:58 +0200 Subject: [PATCH 085/171] Implemented prevent instant death #839 --- addons/medical/functions/fnc_handleDamage.sqf | 53 +++++++++++-------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index db799b45ab5..546a6c44b04 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -37,45 +37,54 @@ if !(_selection in (GVAR(SELECTIONS) + [""])) exitWith {0}; _damageReturn = _damage; if (GVAR(level) < 2) then { _damageReturn = _this call FUNC(handleDamage_basic); -}; - -if (GVAR(level) >= 2) then { +} else { if !([_unit] call FUNC(hasMedicalEnabled)) exitwith { // Because of the config changes, we cannot properly disable the medical system for a unit. // lets use basic for the time being.. _damageReturn = _this call FUNC(handleDamage_basic); }; _newDamage = _this call FUNC(handleDamage_caching); + _typeOfDamage = [_projectile] call FUNC(getTypeOfDamage); - //if (_damageReturn > 0.9) then { - - _typeOfDamage = [_projectile] call FUNC(getTypeOfDamage); + _typeIndex = (GVAR(allAvailableDamageTypes) find _typeOfDamage); + _minLethalDamage = 0.01; + if (_typeIndex >= 0) then { + _minLethalDamage = GVAR(minLethalDamages) select _typeIndex; + }; - _typeIndex = (GVAR(allAvailableDamageTypes) find _typeOfDamage); - _minLethalDamage = 0.01; - if (_typeIndex >= 0) then { - _minLethalDamage = GVAR(minLethalDamages) select _typeIndex; + if (vehicle _unit != _unit && {!(vehicle _unit isKindOf "StaticWeapon")} && {isNull _source} && {_projectile == ""} && {_selection == ""}) then { + if (GVAR(enableVehicleCrashes)) then { + _selection = GVAR(SELECTIONS) select (floor(random(count GVAR(SELECTIONS)))); }; + }; - if (vehicle _unit != _unit && {!(vehicle _unit isKindOf "StaticWeapon")} && {isNull _source} && {_projectile == ""} && {_selection == ""}) then { - if (GVAR(enableVehicleCrashes)) then { - _selection = GVAR(SELECTIONS) select (floor(random(count GVAR(SELECTIONS)))); - }; + if ((_minLethalDamage <= _newDamage) && {[_unit, [_selection] call FUNC(selectionNameToNumber), _newDamage] call FUNC(determineIfFatal)} || !alive vehicle _unit) then { + if ((_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)])) exitwith { + _damageReturn = 0.9; }; - - if ((_minLethalDamage <= _newDamage) && {[_unit, [_selection] call FUNC(selectionNameToNumber), _newDamage] call FUNC(determineIfFatal)} || !alive vehicle _unit) then { - if ([_unit] call FUNC(setDead)) then { - _damageReturn = 1; - } else { - _damageReturn = _damageReturn min 0.89; - }; + if ({[_unit] call FUNC(setDead)}) then { + _damageReturn = 1; } else { _damageReturn = _damageReturn min 0.89; }; - //}; + } else { + _damageReturn = _damageReturn min 0.89; + }; }; [_unit] call FUNC(addToInjuredCollection); +if (_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) exitWith { + if (_damageReturn >= 0.9 && {_selection in ["", "head", "body"]}) exitWith { + if (_unit getvariable ["ACE_isUnconscious", false]) exitwith { + [_unit] call FUNC(setDead); + 0.89 + }; + [{ [_this select 0, true] call FUNC(setUnconscious); }, [_unit]] call EFUNC(common,execNextFrame); + 0.89 + }; + _damageReturn min 0.89; +}; + if (((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]) > 0) && {_damageReturn >= 0.9} && {_selection in ["", "head", "body"]}) exitWith { if (vehicle _unit != _unit and {damage _vehicle >= 1}) then { // @todo From 581c64f66faa324cb1ec0382aae51401f65438ab Mon Sep 17 00:00:00 2001 From: Glowbal Date: Wed, 29 Apr 2015 23:12:47 +0200 Subject: [PATCH 086/171] Implemented unloading from vehicles #740 --- addons/interaction/CfgVehicles.hpp | 36 ++++++++++++++++++++++++++++++ addons/medical/CfgVehicles.hpp | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index f6f39808b9d..96165d63e3b 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -398,6 +398,12 @@ class CfgVehicles { selection = ""; distance = 10; condition = "true"; + class ACE_Passengers { + displayName = "$STR_ACE_Interaction_Passengers"; + condition = "true"; + statement = ""; + insertChildren = QUOTE(_this call DFUNC(addPassengersActions)); + }; }; }; class ACE_SelfActions { @@ -416,6 +422,12 @@ class CfgVehicles { selection = ""; distance = 10; condition = "true"; + class ACE_Passengers { + displayName = "$STR_ACE_Interaction_Passengers"; + condition = "true"; + statement = ""; + insertChildren = QUOTE(_this call DFUNC(addPassengersActions)); + }; }; }; class ACE_SelfActions { @@ -436,6 +448,12 @@ class CfgVehicles { selection = ""; distance = 10; condition = "true"; + class ACE_Passengers { + displayName = "$STR_ACE_Interaction_Passengers"; + condition = "true"; + statement = ""; + insertChildren = QUOTE(_this call DFUNC(addPassengersActions)); + }; }; }; class ACE_SelfActions { @@ -454,6 +472,12 @@ class CfgVehicles { selection = ""; distance = 10; condition = "true"; + class ACE_Passengers { + displayName = "$STR_ACE_Interaction_Passengers"; + condition = "true"; + statement = ""; + insertChildren = QUOTE(_this call DFUNC(addPassengersActions)); + }; }; }; class ACE_SelfActions { @@ -483,6 +507,12 @@ class CfgVehicles { showDisabled = 0; priority = -1; }; + class ACE_Passengers { + displayName = "$STR_ACE_Interaction_Passengers"; + condition = "true"; + statement = ""; + insertChildren = QUOTE(_this call DFUNC(addPassengersActions)); + }; }; }; class ACE_SelfActions { @@ -502,6 +532,12 @@ class CfgVehicles { selection = "gunnerview"; distance = 2; condition = "true"; + class ACE_Passengers { + displayName = "$STR_ACE_Interaction_Passengers"; + condition = "true"; + statement = ""; + insertChildren = QUOTE(_this call DFUNC(addPassengersActions)); + }; }; }; class ACE_SelfActions { diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index f28322baf7c..179daae742a 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -446,7 +446,7 @@ class CfgVehicles { displayName = "$STR_ACE_MEDICAL_ACTIONS_Medical"; runOnHover = 1; exceptions[] = {"isNotInside"}; - condition = QUOTE(vehicle _target != _target); + condition = QUOTE(vehicle _target != _target && vehicle _target == vehicle _player); statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation)); icon = PATHTOF(UI\icons\medical_cross.paa); From a39e869728e1c0cff4a94e3f87882d292a869b28 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 29 Apr 2015 16:44:47 -0500 Subject: [PATCH 087/171] Fix extra {} wraped Error position: Error if: Type code, expected Bool File z\ace\addons\medical\functions\fnc_handleDamage.sqf, line 50 --- addons/medical/functions/fnc_handleDamage.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index 546a6c44b04..0a39bea0555 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -62,7 +62,7 @@ if (GVAR(level) < 2) then { if ((_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)])) exitwith { _damageReturn = 0.9; }; - if ({[_unit] call FUNC(setDead)}) then { + if ([_unit] call FUNC(setDead)) then { _damageReturn = 1; } else { _damageReturn = _damageReturn min 0.89; From 5fef446c0031fb6609462f19cbf9c419a9915f9d Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 29 Apr 2015 16:53:09 -0500 Subject: [PATCH 088/171] EFUNC for dragging calls --- addons/medical/functions/fnc_actionLoadUnit.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/medical/functions/fnc_actionLoadUnit.sqf b/addons/medical/functions/fnc_actionLoadUnit.sqf index 990467521a6..34df6aa085b 100644 --- a/addons/medical/functions/fnc_actionLoadUnit.sqf +++ b/addons/medical/functions/fnc_actionLoadUnit.sqf @@ -23,10 +23,10 @@ if ([_target] call EFUNC(common,isAwake)) exitwith { ["displayTextStructured", [_caller], [["This person (%1) is awake and cannot be loaded", [_target] call EFUNC(common,getName)], 1.5, _caller]] call EFUNC(common,targetEvent); }; if ([_target] call FUNC(isBeingCarried)) then { - [_caller, _target] call FUNC(dropObject_carry); + [_caller, _target] call EFUNC(dragging,dropObject_carry); }; if ([_target] call FUNC(isBeingDragged)) then { - [_caller, _target] call FUNC(dropObject); + [_caller, _target] call EFUNC(dragging,dropObject); }; _vehicle = [_caller, _target] call EFUNC(common,loadPerson); From f90834eeaba6e5b2df2b3aeb3d9b79f0212cd893 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 29 Apr 2015 16:57:24 -0500 Subject: [PATCH 089/171] Unused --- addons/medical/functions/fnc_actionLoadUnit.sqf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/medical/functions/fnc_actionLoadUnit.sqf b/addons/medical/functions/fnc_actionLoadUnit.sqf index 34df6aa085b..34f93fb11d5 100644 --- a/addons/medical/functions/fnc_actionLoadUnit.sqf +++ b/addons/medical/functions/fnc_actionLoadUnit.sqf @@ -30,9 +30,3 @@ if ([_target] call FUNC(isBeingDragged)) then { }; _vehicle = [_caller, _target] call EFUNC(common,loadPerson); -if (!isNull _vehicle) then { - if (!isnil QGVAR(DROP_ADDACTION)) then { - _caller removeAction GVAR(DROP_ADDACTION); - GVAR(DROP_ADDACTION) = nil; - }; -}; From 8e54e6ec13ff59e7014f954b51db43e5652b9232 Mon Sep 17 00:00:00 2001 From: commy2 Date: Thu, 30 Apr 2015 00:53:49 +0200 Subject: [PATCH 090/171] fix setFWS locality issues, fix #892 --- addons/common/CfgEventHandlers.hpp | 2 +- addons/common/functions/fnc_resetAllDefaults.sqf | 1 + addons/common/functions/fnc_setForceWalkStatus.sqf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/common/CfgEventHandlers.hpp b/addons/common/CfgEventHandlers.hpp index ce0938f0632..bea7b6e7bc6 100644 --- a/addons/common/CfgEventHandlers.hpp +++ b/addons/common/CfgEventHandlers.hpp @@ -24,7 +24,7 @@ class Extended_InitPost_EventHandlers { init = QUOTE(if (local (_this select 0)) then {_this call FUNC(setName)};); }; class GVAR(forceWalk) { - init = QUOTE(if (local (_this select 0)) then {_this call FUNC(applyForceWalkStatus);};); + init = QUOTE(_this call FUNC(applyForceWalkStatus)); }; class GVAR(muteUnit) { init = QUOTE(_this call FUNC(muteUnitHandleInitPost)); diff --git a/addons/common/functions/fnc_resetAllDefaults.sqf b/addons/common/functions/fnc_resetAllDefaults.sqf index 63e6764d01a..64a8e39fa68 100644 --- a/addons/common/functions/fnc_resetAllDefaults.sqf +++ b/addons/common/functions/fnc_resetAllDefaults.sqf @@ -37,3 +37,4 @@ if (isPlayer _unit) then { }; }foreach ([_unit] call FUNC(getAllDefinedSetVariables)); +_unit setVariable ["ACE_forceWalkStatusNumber", 0, true]; diff --git a/addons/common/functions/fnc_setForceWalkStatus.sqf b/addons/common/functions/fnc_setForceWalkStatus.sqf index 52b674015f2..477f76297d5 100644 --- a/addons/common/functions/fnc_setForceWalkStatus.sqf +++ b/addons/common/functions/fnc_setForceWalkStatus.sqf @@ -50,4 +50,4 @@ _bitmaskNumber = _forceWalkReasonsBooleans call FUNC(toBitmask); _unit setVariable ["ACE_forceWalkStatusNumber", _bitmaskNumber, true]; // actually apply the forceWalk command globaly -[[_unit], QUOTE(FUNC(applyForceWalkStatus)), _unit] call FUNC(execRemoteFnc); +[[_unit], QUOTE(FUNC(applyForceWalkStatus)), 2] call FUNC(execRemoteFnc); From 9aa2e3130acd654f49d477bde9ec8923a9da8f80 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 29 Apr 2015 23:37:52 -0500 Subject: [PATCH 091/171] Options for Shadow/Outline and Text Size --- addons/interact_menu/config.cpp | 16 ++++++++++ .../functions/fnc_renderIcon.sqf | 10 +++--- .../functions/fnc_renderMenu.sqf | 11 +++---- .../functions/fnc_setupTextColors.sqf | 32 +++++++++++-------- 4 files changed, 43 insertions(+), 26 deletions(-) diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp index 36172d734fb..04a7db97913 100644 --- a/addons/interact_menu/config.cpp +++ b/addons/interact_menu/config.cpp @@ -68,6 +68,22 @@ class ACE_Settings { isClientSettable = 1; displayName = "$STR_ACE_Interact_Menu_ColorShadowMin"; }; + class GVAR(textSize) { + value = 2; + typeName = "SCALAR"; + isClientSettable = 1; + displayName = "Interaction Text Size"; + description = "Interaction Text Size 2"; + values[] = {"$str_very_small", "$str_small", "$str_medium", "$str_large", "$str_very_large"}; + }; + class GVAR(shadowSetting) { + value = 1; + typeName = "SCALAR"; + isClientSettable = 1; + displayName = "Text Shadow"; + description = "Interaction Text Size 2"; + values[] = {"Disabled", "Enabled", "Outline"}; + }; }; class ACE_Extensions { diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf index f98e41f18ae..f001917b27b 100644 --- a/addons/interact_menu/functions/fnc_renderIcon.sqf +++ b/addons/interact_menu/functions/fnc_renderIcon.sqf @@ -6,9 +6,7 @@ * 0: Text * 1: Icon * 2: 2d position - * 3: Color - * 4: Shadow Color - * 5: Icon Color + * 3: Text Settings * * Return value: * None @@ -18,7 +16,7 @@ #include "script_component.hpp" #define DEFAULT_ICON QUOTE(\z\ace\addons\interaction\ui\dot_ca.paa) private ["_ctrl", "_pos", "_displayNum"]; -PARAMS_6(_text,_icon,_sPos,_textColor,_shadowColor,_iconColor); +PARAMS_4(_text,_icon,_sPos,_textSettings); //systemChat format ["Icon %1 - %2,%3", _text, _sPos select 0, _sPos select 1]; @@ -33,9 +31,9 @@ if(_icon == "") then { }; _text = if (GVAR(UseListMenu)) then { - format ["%5", _icon, _iconColor, _textColor, _shadowColor, _text] + format ["%3", _icon, _textSettings, _text] } else { - format ["
%5", _icon, _iconColor, _textColor, _shadowColor, "ace_breakLine" callExtension _text]; + format ["
%3", _icon, _textSettings, "ace_breakLine" callExtension _text]; }; //_ctrl ctrlSetStructuredText parseText _text; diff --git a/addons/interact_menu/functions/fnc_renderMenu.sqf b/addons/interact_menu/functions/fnc_renderMenu.sqf index a0503747861..29759557c5e 100644 --- a/addons/interact_menu/functions/fnc_renderMenu.sqf +++ b/addons/interact_menu/functions/fnc_renderMenu.sqf @@ -43,19 +43,16 @@ _menuInSelectedPath = true; //END_COUNTER(constructing_paths); //BEGIN_COUNTER(constructing_colors); -// Render icon -// ARGB Color (First Hex Pair is transparancy) -_textColor = GVAR(colorSelected); -_shadowColor = GVAR(colorSelectedShadow); +//Get text color settings string +_textSettings = GVAR(colorSelectedSettings); if(!_menuInSelectedPath) then { - _textColor = (GVAR(colorNotSelectedMatrix) select (count _path)) select _menuDepth; - _shadowColor = (GVAR(colorShadowNotSelectedMatrix) select (count _path)) select _menuDepth; + _textSettings = (GVAR(textSettingsMatrix) select (count _path)) select _menuDepth; }; //END_COUNTER(constructing_colors); //BEGIN_COUNTER(fnc_renderIcons); -[_actionData select 1, _actionData select 2, _sPos, _textColor, _shadowColor, "#FFFFFFFF"] call FUNC(renderIcon); +[_actionData select 1, _actionData select 2, _sPos, _textSettings] call FUNC(renderIcon); //END_COUNTER(fnc_renderIcons); diff --git a/addons/interact_menu/functions/fnc_setupTextColors.sqf b/addons/interact_menu/functions/fnc_setupTextColors.sqf index 58f99959852..ed45f4799f1 100644 --- a/addons/interact_menu/functions/fnc_setupTextColors.sqf +++ b/addons/interact_menu/functions/fnc_setupTextColors.sqf @@ -12,7 +12,6 @@ */ #include "script_component.hpp" -private ["_mixColor", "_rowT", "_rowS", "_menuDepth", "_pathCount"]; //Mixes 2 colors (number arrays) and makes a color string "#AARRGGBB" for structured text _mixColor = { @@ -30,23 +29,30 @@ _mixColor = { _return }; -GVAR(colorSelected) = [GVAR(colorTextMin), GVAR(colorTextMax), 1] call _mixColor; -GVAR(colorSelectedShadow) = [GVAR(colorShadowMin), GVAR(colorShadowMax), 1] call _mixColor; -GVAR(colorNotSelectedMatrix) = []; -GVAR(colorShadowNotSelectedMatrix) = []; +_textColor = [GVAR(colorTextMin), GVAR(colorTextMax), 1] call _mixColor; +_shadowColor = [GVAR(colorShadowMin), GVAR(colorShadowMax), 1] call _mixColor; +_textSize = switch (GVAR(textSize)) do { + case (0): {0.6}; + case (1): {0.7}; + case (2): {0.8}; + case (3): {0.9}; + case (4): {1}; +}; + +GVAR(colorSelectedSettings) = format ["color='%1' size='%2' shadow='%3' shadowColor='%4' shadowOffset='0.06'", _textColor, _textSize, GVAR(shadowSetting), _shadowColor]; +GVAR(textSettingsMatrix) = []; for "_pathCount" from 0 to 15 do { - _rowT = []; - _rowS = []; + _row = []; for "_menuDepth" from 0 to 15 do { if (_menuDepth > 0) then { - _rowT pushBack ([GVAR(colorTextMin), GVAR(colorTextMax), (((_pathCount - 1) / _menuDepth) max 0.25)] call _mixColor); - _rowS pushBack ([GVAR(colorShadowMin), GVAR(colorShadowMax), (((_pathCount - 1) / _menuDepth) max 0.25)] call _mixColor); + _textColor = [GVAR(colorTextMin), GVAR(colorTextMax), (((_pathCount - 1) / _menuDepth) max 0.25)] call _mixColor; + _shadowColor = [GVAR(colorShadowMin), GVAR(colorShadowMax), (((_pathCount - 1) / _menuDepth) max 0.25)] call _mixColor; } else { - _rowT pushBack ([GVAR(colorTextMin), GVAR(colorTextMax), 0] call _mixColor); - _rowS pushBack ([GVAR(colorShadowMin), GVAR(colorShadowMax), 0] call _mixColor); + _textColor = [GVAR(colorTextMin), GVAR(colorTextMax), 0] call _mixColor; + _shadowColor = [GVAR(colorShadowMin), GVAR(colorShadowMax), 0] call _mixColor; }; + _row pushBack format ["color='%1' size='%2' shadow='%3' shadowColor='%4' shadowOffset='0.06'", _textColor, _textSize, GVAR(shadowSetting), _shadowColor]; }; - GVAR(colorNotSelectedMatrix) pushBack _rowT; - GVAR(colorShadowNotSelectedMatrix) pushBack _rowS; + GVAR(textSettingsMatrix) pushBack _row; }; From 11aafe013be5e756abc9e96c9bb716d9a333398a Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 29 Apr 2015 23:53:00 -0500 Subject: [PATCH 092/171] Localization --- addons/interact_menu/XEH_clientInit.sqf | 4 ++-- addons/interact_menu/config.cpp | 11 +++++------ addons/interact_menu/functions/fnc_renderMenu.sqf | 2 +- .../functions/fnc_setupTextColors.sqf | 1 + addons/interact_menu/stringtable.xml | 14 +++++++++++++- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf index 5714b77e167..039bccfe253 100644 --- a/addons/interact_menu/XEH_clientInit.sqf +++ b/addons/interact_menu/XEH_clientInit.sqf @@ -5,11 +5,11 @@ if (!hasInterface) exitWith {}; GVAR(ParsedTextCached) = []; -//Setup text/shadow color matrix +//Setup text/shadow/size/color settings matrix [] call FUNC(setupTextColors); ["SettingChanged", { PARAMS_1(_name); - if ((_name == QGVAR(colorTextMax)) || {_name == QGVAR(colorTextMin)} || {_name == QGVAR(colorShadowMax)} || {_name == QGVAR(colorShadowMin)}) then { + if (_name in [QGVAR(colorTextMax), QGVAR(colorTextMin), QGVAR(colorShadowMax), QGVAR(colorShadowMin), QGVAR(textSize), QGVAR(shadowSetting)]) then { [] call FUNC(setupTextColors); }; }] call EFUNC(common,addEventhandler); diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp index 04a7db97913..1b654531e95 100644 --- a/addons/interact_menu/config.cpp +++ b/addons/interact_menu/config.cpp @@ -72,17 +72,16 @@ class ACE_Settings { value = 2; typeName = "SCALAR"; isClientSettable = 1; - displayName = "Interaction Text Size"; - description = "Interaction Text Size 2"; + displayName = "$STR_ACE_Interact_textSize"; values[] = {"$str_very_small", "$str_small", "$str_medium", "$str_large", "$str_very_large"}; }; class GVAR(shadowSetting) { - value = 1; + value = 2; typeName = "SCALAR"; isClientSettable = 1; - displayName = "Text Shadow"; - description = "Interaction Text Size 2"; - values[] = {"Disabled", "Enabled", "Outline"}; + displayName = "$STR_ACE_Interact_shadowSetting"; + description = "$STR_ACE_Interact_shadowSettingDescription"; + values[] = {"$STR_A3_OPTIONS_DISABLED", "$STR_A3_OPTIONS_ENABLED", "$STR_ACE_Interact_shadowOutline"}; }; }; diff --git a/addons/interact_menu/functions/fnc_renderMenu.sqf b/addons/interact_menu/functions/fnc_renderMenu.sqf index 29759557c5e..c4615d83374 100644 --- a/addons/interact_menu/functions/fnc_renderMenu.sqf +++ b/addons/interact_menu/functions/fnc_renderMenu.sqf @@ -15,7 +15,7 @@ */ #include "script_component.hpp" -private ["_menuInSelectedPath", "_path", "_menuDepth", "_x", "_offset", "_newPos", "_forEachIndex", "_player", "_pos", "_shadowColor", "_target", "_textColor"]; +private ["_menuInSelectedPath", "_path", "_menuDepth", "_x", "_offset", "_newPos", "_forEachIndex", "_player", "_pos", "_target", "_textSettings"]; EXPLODE_4_PVT(_this,_parentPath,_action,_sPos,_angles); EXPLODE_3_PVT(_action,_actionData,_activeChildren,_actionObject); diff --git a/addons/interact_menu/functions/fnc_setupTextColors.sqf b/addons/interact_menu/functions/fnc_setupTextColors.sqf index ed45f4799f1..0183e9e50b1 100644 --- a/addons/interact_menu/functions/fnc_setupTextColors.sqf +++ b/addons/interact_menu/functions/fnc_setupTextColors.sqf @@ -12,6 +12,7 @@ */ #include "script_component.hpp" +private ["_menuDepth", "_mixColor", "_pathCount", "_row", "_shadowColor", "_textColor", "_textSize"]; //Mixes 2 colors (number arrays) and makes a color string "#AARRGGBB" for structured text _mixColor = { diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index b8913ce1c95..5f3f26f1f1d 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -115,5 +115,17 @@ Keeps cursor centered and pans the option menu around. Useful if screen size is limited. Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée. + + Interaction Text Size + + + Interaction Text Shadow + + + Allows controlling the text's shadow. Outline ignores custom shadow colors. + + + Outline + - + \ No newline at end of file From eb5af0cd89288a96ff55c26424008b58018ef0b3 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 30 Apr 2015 01:17:26 -0500 Subject: [PATCH 093/171] Medical Private Variables --- addons/medical/XEH_postInit.sqf | 5 ++++- .../fnc_actionCheckBloodPressureLocal.sqf | 2 +- .../functions/fnc_actionCheckPulse.sqf | 2 +- .../functions/fnc_actionCheckPulseLocal.sqf | 2 +- .../functions/fnc_actionCheckResponse.sqf | 2 +- .../medical/functions/fnc_actionDiagnose.sqf | 2 +- .../medical/functions/fnc_actionLoadUnit.sqf | 2 +- .../functions/fnc_actionRemoveTourniquet.sqf | 2 +- .../functions/fnc_actionUnloadUnit.sqf | 2 +- .../functions/fnc_addToInjuredCollection.sqf | 2 +- addons/medical/functions/fnc_addToLog.sqf | 2 +- .../medical/functions/fnc_addToTriageCard.sqf | 2 +- .../functions/fnc_addUnloadPatientActions.sqf | 2 +- addons/medical/functions/fnc_canTreat.sqf | 2 +- addons/medical/functions/fnc_copyDeadBody.sqf | 2 +- addons/medical/functions/fnc_createLitter.sqf | 2 +- .../functions/fnc_determineIfFatal.sqf | 2 +- .../fnc_displayPatientInformation.sqf | 4 ++-- .../functions/fnc_displayTriageCard.sqf | 4 ++-- .../functions/fnc_dropDownTriageCard.sqf | 2 +- addons/medical/functions/fnc_getBloodLoss.sqf | 2 +- .../functions/fnc_getHeartRateChange.sqf | 2 +- .../functions/fnc_handleBandageOpening.sqf | 2 +- .../functions/fnc_handleCreateLitter.sqf | 1 + addons/medical/functions/fnc_handleDamage.sqf | 6 +++--- .../functions/fnc_handleDamage_basic.sqf | 2 +- .../functions/fnc_handleDamage_wounds.sqf | 2 +- addons/medical/functions/fnc_handleKilled.sqf | 2 +- .../functions/fnc_handleUnitVitals.sqf | 2 +- addons/medical/functions/fnc_hasItem.sqf | 2 +- addons/medical/functions/fnc_init.sqf | 2 +- addons/medical/functions/fnc_isMedic.sqf | 2 +- .../functions/fnc_modifyMedicalAction.sqf | 20 +++++++++---------- .../functions/fnc_onWoundUpdateRequest.sqf | 2 +- .../functions/fnc_parseConfigForInjuries.sqf | 2 +- .../functions/fnc_playInjuredSound.sqf | 2 +- .../functions/fnc_requestWoundSync.sqf | 2 +- addons/medical/functions/fnc_setDead.sqf | 2 +- .../functions/fnc_setHitPointDamage.sqf | 2 +- .../medical/functions/fnc_setUnconscious.sqf | 2 +- addons/medical/functions/fnc_treatment.sqf | 2 +- .../functions/fnc_treatmentAdvanced_CPR.sqf | 2 +- .../fnc_treatmentAdvanced_bandage.sqf | 2 +- .../fnc_treatmentAdvanced_bandageLocal.sqf | 2 +- .../fnc_treatmentAdvanced_fullHeal.sqf | 2 +- .../fnc_treatmentAdvanced_medication.sqf | 2 +- .../fnc_treatmentAdvanced_medicationLocal.sqf | 6 +++--- .../functions/fnc_treatmentBasic_bandage.sqf | 2 +- addons/medical/functions/fnc_treatmentIV.sqf | 2 +- .../functions/fnc_treatmentIVLocal.sqf | 6 +++--- .../functions/fnc_treatmentTourniquet.sqf | 2 +- .../fnc_treatmentTourniquetLocal.sqf | 2 +- .../functions/fnc_treatment_failure.sqf | 2 +- .../functions/fnc_treatment_success.sqf | 2 +- .../medical/functions/fnc_unconsciousPFH.sqf | 2 +- 55 files changed, 75 insertions(+), 71 deletions(-) diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index a3eb4684427..386eb4de93a 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -14,6 +14,7 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"]; ["medical_onUnconscious", { if (local (_this select 0)) then { + private ["_unit"]; _unit = _this select 0; if (_this select 1) then { _unit setVariable ["tf_globalVolume", 0.4]; @@ -36,7 +37,7 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"]; // Initialize all effects _fnc_createEffect = { - private ["_type", "_layer", "_default"]; + private ["_type", "_layer", "_default", "_effect"]; _type = _this select 0; _layer = _this select 1; _default = _this select 2; @@ -91,6 +92,7 @@ GVAR(effectTimeBlood) = time; // MAIN EFFECTS LOOP [{ + private["_bleeding", "_blood"]; // Zeus interface is open or player is dead; disable everything if (!(isNull (findDisplay 312)) or !(alive ACE_player)) exitWith { GVAR(effectUnconsciousCC) ppEffectEnable false; @@ -155,6 +157,7 @@ GVAR(lastHeartBeatSound) = time; // HEARTRATE BASED EFFECTS [{ + private["_heartRate", "_interval", "_minTime", "_sound", "_strength"]; _heartRate = ACE_player getVariable [QGVAR(heartRate), 70]; if (GVAR(level) == 1) then { _heartRate = 60 + 40 * (ACE_player getVariable [QGVAR(pain), 0]); diff --git a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf index a9228d1760e..d686515308a 100644 --- a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf +++ b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" -private ["_caller","_target","_bloodPressure","_bloodPressureHigh","_bloodPressureLow","_title","_content"]; +private ["_caller","_target","_bloodPressure","_bloodPressureHigh","_bloodPressureLow", "_logOutPut", "_output"]; _caller = _this select 0; _target = _this select 1; diff --git a/addons/medical/functions/fnc_actionCheckPulse.sqf b/addons/medical/functions/fnc_actionCheckPulse.sqf index f545c11144b..fd96321e8ff 100644 --- a/addons/medical/functions/fnc_actionCheckPulse.sqf +++ b/addons/medical/functions/fnc_actionCheckPulse.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" -private ["_caller","_target","_title","_content"]; +private ["_caller","_target"]; _caller = _this select 0; _target = _this select 1; [[_caller, _target], QUOTE(DFUNC(actionCheckPulseLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ diff --git a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf index dcb098c925a..f035ae18adb 100644 --- a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf +++ b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" -private ["_caller","_unit", "_heartRateOutput", "_heartRate","_logOutPut","_content"]; +private ["_caller", "_unit", "_heartRateOutput", "_heartRate", "_logOutPut"]; _caller = _this select 0; _unit = _this select 1; diff --git a/addons/medical/functions/fnc_actionCheckResponse.sqf b/addons/medical/functions/fnc_actionCheckResponse.sqf index c4837062746..babd93bf924 100644 --- a/addons/medical/functions/fnc_actionCheckResponse.sqf +++ b/addons/medical/functions/fnc_actionCheckResponse.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" -private ["_caller","_target"]; +private ["_caller","_target", "_output"]; _caller = _this select 0; _target = _this select 1; diff --git a/addons/medical/functions/fnc_actionDiagnose.sqf b/addons/medical/functions/fnc_actionDiagnose.sqf index 886fa4752bc..692414027a8 100644 --- a/addons/medical/functions/fnc_actionDiagnose.sqf +++ b/addons/medical/functions/fnc_actionDiagnose.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" -private ["_caller","_target","_title","_content"]; +private ["_caller", "_target", "_genericMessages"]; _caller = _this select 0; _target = _this select 1; diff --git a/addons/medical/functions/fnc_actionLoadUnit.sqf b/addons/medical/functions/fnc_actionLoadUnit.sqf index 34f93fb11d5..03d9a3ef543 100644 --- a/addons/medical/functions/fnc_actionLoadUnit.sqf +++ b/addons/medical/functions/fnc_actionLoadUnit.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" -private ["_caller", "_target","_vehicle", "_loaded"]; +private ["_caller", "_target","_vehicle"]; _caller = _this select 0; _target = _this select 1; diff --git a/addons/medical/functions/fnc_actionRemoveTourniquet.sqf b/addons/medical/functions/fnc_actionRemoveTourniquet.sqf index 2eafe367326..a14dbc3bcd2 100644 --- a/addons/medical/functions/fnc_actionRemoveTourniquet.sqf +++ b/addons/medical/functions/fnc_actionRemoveTourniquet.sqf @@ -15,7 +15,7 @@ #include "script_component.hpp" -private ["_caller","_target","_part","_selectionName","_removeItem","_tourniquets", "_output"]; +private ["_caller", "_target", "_part", "_selectionName", "_tourniquets", "_output"]; _caller = _this select 0; _target = _this select 1; _selectionName = _this select 2; diff --git a/addons/medical/functions/fnc_actionUnloadUnit.sqf b/addons/medical/functions/fnc_actionUnloadUnit.sqf index 8c05a43fc9d..fd56e6d6bd9 100644 --- a/addons/medical/functions/fnc_actionUnloadUnit.sqf +++ b/addons/medical/functions/fnc_actionUnloadUnit.sqf @@ -15,7 +15,7 @@ #include "script_component.hpp" -private ["_caller", "_target","_vehicle", "_drag", "_handle"]; +private ["_caller", "_target", "_drag"]; _caller = _this select 0; _target = _this select 1; _drag = if (count _this > 2) then {_this select 2} else {false}; diff --git a/addons/medical/functions/fnc_addToInjuredCollection.sqf b/addons/medical/functions/fnc_addToInjuredCollection.sqf index cbe146d701c..c95db059df7 100644 --- a/addons/medical/functions/fnc_addToInjuredCollection.sqf +++ b/addons/medical/functions/fnc_addToInjuredCollection.sqf @@ -13,7 +13,7 @@ #include "script_component.hpp" -private "_unit"; +private ["_unit", "_force"]; _unit = _this select 0; _force = if (count _this > 1) then {_this select 1} else {false}; diff --git a/addons/medical/functions/fnc_addToLog.sqf b/addons/medical/functions/fnc_addToLog.sqf index c36d57b4822..46bacf23490 100644 --- a/addons/medical/functions/fnc_addToLog.sqf +++ b/addons/medical/functions/fnc_addToLog.sqf @@ -16,7 +16,7 @@ #include "script_component.hpp" -private ["_unit", "_type", "_message", "_arguments", "_lastNumber", "_moment", "_logVarName", "_log","_newLog"]; +private ["_unit", "_type", "_message", "_arguments", "_lastNumber", "_moment", "_logVarName", "_log","_newLog", "_logs"]; _unit = _this select 0; _type = _this select 1; _message = _this select 2; diff --git a/addons/medical/functions/fnc_addToTriageCard.sqf b/addons/medical/functions/fnc_addToTriageCard.sqf index 49e642cfc4a..61add24cfce 100644 --- a/addons/medical/functions/fnc_addToTriageCard.sqf +++ b/addons/medical/functions/fnc_addToTriageCard.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" -private ["_unit","_caller","_newItem","_log", "_inList","_amount"]; +private ["_unit", "_newItem", "_log", "_inList", "_amount"]; _unit = _this select 0; _newItem = _this select 1; diff --git a/addons/medical/functions/fnc_addUnloadPatientActions.sqf b/addons/medical/functions/fnc_addUnloadPatientActions.sqf index c792746d470..13a4177859f 100644 --- a/addons/medical/functions/fnc_addUnloadPatientActions.sqf +++ b/addons/medical/functions/fnc_addUnloadPatientActions.sqf @@ -16,7 +16,7 @@ EXPLODE_3_PVT(_this,_vehicle,_player,_parameters); -private ["_actions"]; +private ["_actions", "_unit"]; _actions = []; { diff --git a/addons/medical/functions/fnc_canTreat.sqf b/addons/medical/functions/fnc_canTreat.sqf index 5f52759f54a..062a696fcd2 100644 --- a/addons/medical/functions/fnc_canTreat.sqf +++ b/addons/medical/functions/fnc_canTreat.sqf @@ -16,7 +16,7 @@ #include "script_component.hpp" -private ["_caller", "_target", "_selectionName", "_className", "_config", "_availableLevels", "_medicRequired", "_items", "_locations", "_return", "_condition"]; +private ["_caller", "_target", "_selectionName", "_className", "_config", "_medicRequired", "_items", "_locations", "_return", "_condition"]; _caller = _this select 0; _target = _this select 1; _selectionName = _this select 2; diff --git a/addons/medical/functions/fnc_copyDeadBody.sqf b/addons/medical/functions/fnc_copyDeadBody.sqf index 8e476b86629..36bcd914874 100644 --- a/addons/medical/functions/fnc_copyDeadBody.sqf +++ b/addons/medical/functions/fnc_copyDeadBody.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" -private ["_oldBody","_newUnit","_class","_group","_position","_side","_allVariables"]; +private ["_oldBody","_newUnit","_class","_group","_position","_side", "_caller", "_name"]; _oldBody = _this select 0; _caller = _this select 1; diff --git a/addons/medical/functions/fnc_createLitter.sqf b/addons/medical/functions/fnc_createLitter.sqf index 5299fbb2440..253a3ed3154 100644 --- a/addons/medical/functions/fnc_createLitter.sqf +++ b/addons/medical/functions/fnc_createLitter.sqf @@ -16,7 +16,7 @@ #define MIN_ENTRIES_LITTER_CONFIG 3 -private ["_target", "_className", "_config", "_litter", "_createLitter", "_litterObject", "_position", "_createdLitter"]; +private ["_target", "_className", "_config", "_litter", "_createLitter", "_position", "_createdLitter", "_caller", "_selectionName", "_usersOfItems"]; _caller = _this select 0; _target = _this select 1; _selectionName = _this select 2; diff --git a/addons/medical/functions/fnc_determineIfFatal.sqf b/addons/medical/functions/fnc_determineIfFatal.sqf index aedcf161eec..bad15dbcadb 100644 --- a/addons/medical/functions/fnc_determineIfFatal.sqf +++ b/addons/medical/functions/fnc_determineIfFatal.sqf @@ -10,7 +10,7 @@ #include "script_component.hpp" -private ["_unit","_part","_damageThreshold", "_withDamage"]; +private ["_unit","_part","_damageThreshold", "_withDamage", "_damageBodyPart"]; _unit = _this select 0; _part = _this select 1; _withDamage = if (count _this > 2) then { _this select 2} else {0}; diff --git a/addons/medical/functions/fnc_displayPatientInformation.sqf b/addons/medical/functions/fnc_displayPatientInformation.sqf index a62bfcacbc5..f3385c7d51e 100644 --- a/addons/medical/functions/fnc_displayPatientInformation.sqf +++ b/addons/medical/functions/fnc_displayPatientInformation.sqf @@ -16,7 +16,7 @@ // Exit for basic medical if (GVAR(level) < 2) exitWith {}; -private ["_target", "_show", "_selectionN"]; +private ["_target", "_show", "_selectionN", "_amountOfGeneric", "_bandagedwounds", "_logCtrl", "_part", "_partText", "_pointDamage", "_severity", "_total", "_totalIvVolume", "_triageStatus", "_type"]; _target = _this select 0; _show = if (count _this > 1) then {_this select 1} else {true}; _selectionN = if (count _this > 2) then {_this select 2} else {0}; @@ -192,7 +192,7 @@ if (_show) then { _logCtrl = (_display displayCtrl 302); lbClear _logCtrl; - private ["_logs", "_log", "_message", "_moment", "_arguments", "_lbCtrl"]; + private ["_logs", "_message", "_moment", "_arguments", "_lbCtrl"]; _logs = _target getvariable [QGVAR(logFile_Activity), []]; { // [_message,_moment,_type, _arguments] diff --git a/addons/medical/functions/fnc_displayTriageCard.sqf b/addons/medical/functions/fnc_displayTriageCard.sqf index 8e9660a3d51..dd3b44a9466 100644 --- a/addons/medical/functions/fnc_displayTriageCard.sqf +++ b/addons/medical/functions/fnc_displayTriageCard.sqf @@ -13,7 +13,7 @@ #include "script_component.hpp" -private ["_target", "_show"]; +private ["_target", "_show", "_amount", "_item", "_log", "_message", "_triageCardTexts", "_triageStatus"]; _target = _this select 0; _show = if (count _this > 1) then {_this select 1} else {true}; @@ -24,7 +24,7 @@ if (_show) then { createDialog QGVAR(triageCard); [{ - private ["_target", "_display", "_alphaLevel", "_damaged", "_availableSelections", "_openWounds", "_selectionBloodLoss", "_red", "_green", "_blue", "_alphaLevel", "_allInjuryTexts", "_lbCtrl", "_genericMessages"]; + private ["_target", "_display", "_alphaLevel", "_alphaLevel", "_lbCtrl"]; _target = (_this select 0) select 0; if (GVAR(TriageCardTarget) != _target) exitwith { [_this select 1] call CBA_fnc_removePerFrameHandler; diff --git a/addons/medical/functions/fnc_dropDownTriageCard.sqf b/addons/medical/functions/fnc_dropDownTriageCard.sqf index 6ea910b7af4..6f30152c5f1 100644 --- a/addons/medical/functions/fnc_dropDownTriageCard.sqf +++ b/addons/medical/functions/fnc_dropDownTriageCard.sqf @@ -13,7 +13,7 @@ #include "script_component.hpp" -private ["_show"]; +private ["_show", "_ctrl", "_display", "_idc", "_pos"]; _show = _this select 0; disableSerialization; diff --git a/addons/medical/functions/fnc_getBloodLoss.sqf b/addons/medical/functions/fnc_getBloodLoss.sqf index f6b26f76867..414b3a47c7f 100644 --- a/addons/medical/functions/fnc_getBloodLoss.sqf +++ b/addons/medical/functions/fnc_getBloodLoss.sqf @@ -15,7 +15,7 @@ #define BLOODLOSSRATE_BASIC 0.2 -private ["_totalBloodLoss","_tourniquets","_openWounds", "_value", "_cardiacOutput", "_internalWounds"]; +private ["_totalBloodLoss","_tourniquets","_openWounds", "_cardiacOutput", "_internalWounds"]; // TODO Only use this calculation if medium or higher, otherwise use vanilla calculations (for basic medical). _totalBloodLoss = 0; diff --git a/addons/medical/functions/fnc_getHeartRateChange.sqf b/addons/medical/functions/fnc_getHeartRateChange.sqf index e7bc9407d2f..7429d6dd439 100644 --- a/addons/medical/functions/fnc_getHeartRateChange.sqf +++ b/addons/medical/functions/fnc_getHeartRateChange.sqf @@ -15,7 +15,7 @@ #define HEART_RATE_MODIFIER 0.02 -private ["_unit", "_heartRate", "_hrIncrease", "_bloodLoss", "_time", "_values", "_adjustment", "_adjustments", "_additionalIncrease", "_change", "_callBack", "_bloodVolume"]; +private ["_unit", "_heartRate", "_hrIncrease", "_bloodLoss", "_time", "_values", "_adjustment", "_change", "_callBack", "_bloodVolume"]; _unit = _this select 0; _hrIncrease = 0; if (!(_unit getvariable [QGVAR(inCardiacArrest),false])) then { diff --git a/addons/medical/functions/fnc_handleBandageOpening.sqf b/addons/medical/functions/fnc_handleBandageOpening.sqf index 21211c9c1b6..a92bf9029c9 100644 --- a/addons/medical/functions/fnc_handleBandageOpening.sqf +++ b/addons/medical/functions/fnc_handleBandageOpening.sqf @@ -18,7 +18,7 @@ #include "script_component.hpp" -private ["_target", "_impact", "_part", "_injuryIndex", "_injury", "_bandage", "_classID", "_className", "_reopeningChance", "_reopeningMinDelay", "_reopeningMaxDelay", "_config", "_woundTreatmentConfig", "_bandagedWounds", "_exist", "_injuryId", "_existingInjury", "_delay", "_openWounds", "_selectedInjury"]; +private ["_target", "_impact", "_part", "_injuryIndex", "_injury", "_bandage", "_classID", "_className", "_reopeningChance", "_reopeningMinDelay", "_reopeningMaxDelay", "_config", "_woundTreatmentConfig", "_bandagedWounds", "_exist", "_injuryId", "_existingInjury", "_delay", "_openWounds", "_selectedInjury", "_bandagedInjury"]; _target = _this select 0; _impact = _this select 1; _part = _this select 2; diff --git a/addons/medical/functions/fnc_handleCreateLitter.sqf b/addons/medical/functions/fnc_handleCreateLitter.sqf index ee7e591cd12..617d05e519b 100644 --- a/addons/medical/functions/fnc_handleCreateLitter.sqf +++ b/addons/medical/functions/fnc_handleCreateLitter.sqf @@ -5,6 +5,7 @@ if(!hasInterface) exitWith { false }; PARAMS_3(_litterClass,_position,_direction); private["_litterObject", "_maxLitterCount"]; +//IGNORE_PRIVATE_WARNING(_values); if (isNil QGVAR(allCreatedLitter)) then { GVAR(allCreatedLitter) = []; diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index 0a39bea0555..d4577623212 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" -private ["_unit", "_selection", "_damage", "_shooter", "_projectile", "_damageReturn", "_typeOfDamage"]; +private ["_unit", "_selection", "_damage", "_shooter", "_projectile", "_damageReturn", "_typeOfDamage", "_minLethalDamage", "_newDamage", "_typeIndex"]; _unit = _this select 0; _selection = _this select 1; _damage = _this select 2; @@ -52,7 +52,7 @@ if (GVAR(level) < 2) then { _minLethalDamage = GVAR(minLethalDamages) select _typeIndex; }; - if (vehicle _unit != _unit && {!(vehicle _unit isKindOf "StaticWeapon")} && {isNull _source} && {_projectile == ""} && {_selection == ""}) then { + if (vehicle _unit != _unit && {!(vehicle _unit isKindOf "StaticWeapon")} && {isNull _shooter} && {_projectile == ""} && {_selection == ""}) then { if (GVAR(enableVehicleCrashes)) then { _selection = GVAR(SELECTIONS) select (floor(random(count GVAR(SELECTIONS)))); }; @@ -86,7 +86,7 @@ if (_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) exitW }; if (((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]) > 0) && {_damageReturn >= 0.9} && {_selection in ["", "head", "body"]}) exitWith { - if (vehicle _unit != _unit and {damage _vehicle >= 1}) then { + if (vehicle _unit != _unit and {damage (vehicle _unit) >= 1}) then { // @todo // [_unit] call FUNC(unload); }; diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf index aa9c2f61df2..1647cc84429 100644 --- a/addons/medical/functions/fnc_handleDamage_basic.sqf +++ b/addons/medical/functions/fnc_handleDamage_basic.sqf @@ -24,7 +24,7 @@ #define ARMDAMAGETRESHOLD2 1.7 #define UNCONSCIOUSNESSTRESHOLD 0.7 -private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_damage"]; +private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_damage", "_armdamage", "_hitPoint", "_index", "_legdamage", "_newDamage", "_otherDamage", "_pain", "_restore"]; _unit = _this select 0; _selectionName = _this select 1; diff --git a/addons/medical/functions/fnc_handleDamage_wounds.sqf b/addons/medical/functions/fnc_handleDamage_wounds.sqf index b45a974166f..9172304dd2b 100644 --- a/addons/medical/functions/fnc_handleDamage_wounds.sqf +++ b/addons/medical/functions/fnc_handleDamage_wounds.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" -private ["_unit", "_selectionName", "_damage", "_typeOfProjectile", "_typeOfDamage", "_bodyPartn", "_woundType", "_injuryTypeInfo", "_allInjuriesForDamageType", "_allPossibleInjuries", "_highestPossibleDamage", "_highestPossibleSpot", "_minDamage", "_openWounds", "_woundID", "_toAddInjury", "_painToAdd"]; +private ["_unit", "_selectionName", "_damage", "_typeOfProjectile", "_typeOfDamage", "_bodyPartn", "_injuryTypeInfo", "_allInjuriesForDamageType", "_allPossibleInjuries", "_highestPossibleDamage", "_highestPossibleSpot", "_minDamage", "_openWounds", "_woundID", "_toAddInjury", "_painToAdd", "_bloodLoss", "_bodyPartNToAdd", "_classType", "_damageLevels", "_foundIndex", "_i", "_injury", "_maxDamage", "_pain", "_painLevel", "_selections", "_toAddClassID", "_woundsCreated"]; _unit = _this select 0; _selectionName = _this select 1; _damage = _this select 2; diff --git a/addons/medical/functions/fnc_handleKilled.sqf b/addons/medical/functions/fnc_handleKilled.sqf index ce0f087836a..5003ec189c3 100644 --- a/addons/medical/functions/fnc_handleKilled.sqf +++ b/addons/medical/functions/fnc_handleKilled.sqf @@ -13,7 +13,7 @@ #include "script_component.hpp" -private["_unit"]; +private["_unit", "_openWounds"]; _unit = _this select 0; if (!local _unit) exitwith {}; diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf index 0e01ef654c9..aff3b48945a 100644 --- a/addons/medical/functions/fnc_handleUnitVitals.sqf +++ b/addons/medical/functions/fnc_handleUnitVitals.sqf @@ -13,7 +13,7 @@ #include "script_component.hpp" -private ["_unit", "_heartRate","_bloodPressure","_bloodVolume","_painStatus", "_lastTimeValuesSynced", "_syncValues"]; +private ["_unit", "_heartRate","_bloodPressure","_bloodVolume","_painStatus", "_lastTimeValuesSynced", "_syncValues", "_airwayStatus", "_blood", "_bloodPressureH", "_bloodPressureL", "_interval"]; _unit = _this select 0; _interval = time - (_unit getVariable [QGVAR(lastMomentVitalsHandled), 0]); diff --git a/addons/medical/functions/fnc_hasItem.sqf b/addons/medical/functions/fnc_hasItem.sqf index 551d532ae44..cfec633b550 100644 --- a/addons/medical/functions/fnc_hasItem.sqf +++ b/addons/medical/functions/fnc_hasItem.sqf @@ -15,7 +15,7 @@ #include "script_component.hpp" -private ["_medic", "_patient", "_item", "_return"]; +private ["_medic", "_patient", "_item", "_return", "_crew"]; _medic = _this select 0; _patient = _this select 1; _item = _this select 2; diff --git a/addons/medical/functions/fnc_init.sqf b/addons/medical/functions/fnc_init.sqf index 80e8d9ba19e..0ec6ce3ce24 100644 --- a/addons/medical/functions/fnc_init.sqf +++ b/addons/medical/functions/fnc_init.sqf @@ -13,7 +13,7 @@ #include "script_component.hpp" -private ["_unit", "_allUsedMedication", "_logs", "_forceNew"]; +private ["_unit", "_allUsedMedication", "_logs"]; _unit = _this select 0; diff --git a/addons/medical/functions/fnc_isMedic.sqf b/addons/medical/functions/fnc_isMedic.sqf index cc07948f4b0..df5765f16b8 100644 --- a/addons/medical/functions/fnc_isMedic.sqf +++ b/addons/medical/functions/fnc_isMedic.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" -private ["_unit","_class","_return"]; +private ["_unit", "_class", "_medicN"] _unit = _this select 0; _medicN = if (count _this > 1) then {_this select 1} else {1}; diff --git a/addons/medical/functions/fnc_modifyMedicalAction.sqf b/addons/medical/functions/fnc_modifyMedicalAction.sqf index 66398a25905..179ae9eb833 100644 --- a/addons/medical/functions/fnc_modifyMedicalAction.sqf +++ b/addons/medical/functions/fnc_modifyMedicalAction.sqf @@ -19,15 +19,15 @@ EXPLODE_4_PVT(_this,_target,_player,_selectionN,_actionData); if (GVAR(level) < 2) exitwith { - private ["_pointDamage"]; - _pointDamage = _target getHitPointDamage (["HitHead", "HitBody", "HitLeftArm", "HitRightArm", "HitLeftLeg", "HitRightLeg"] select _selectionN); + private ["_pointDamage"]; + _pointDamage = _target getHitPointDamage (["HitHead", "HitBody", "HitLeftArm", "HitRightArm", "HitLeftLeg", "HitRightLeg"] select _selectionN); - if (_pointDamage >= 0.8) exitWith { - _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossRed.paa))]; - }; - if (_pointDamage > 0) exitWith { - _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossYellow.paa))]; - }; + if (_pointDamage >= 0.8) exitWith { + _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossRed.paa))]; + }; + if (_pointDamage > 0) exitWith { + _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossYellow.paa))]; + }; }; private ["_openWounds", "_amountOf"]; @@ -35,6 +35,6 @@ _openWounds = _target getvariable [QGVAR(openWounds), []]; { _amountOf = _x select 3; if (_amountOf > 0 && {(_selectionN == (_x select 2))}) exitwith { - _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossRed.paa))]; + _actionData set [2, QUOTE(PATHTOF(UI\icons\medical_crossRed.paa))]; }; -}foreach _openWounds; +} foreach _openWounds; diff --git a/addons/medical/functions/fnc_onWoundUpdateRequest.sqf b/addons/medical/functions/fnc_onWoundUpdateRequest.sqf index ccbb373648b..3c99496d7b5 100644 --- a/addons/medical/functions/fnc_onWoundUpdateRequest.sqf +++ b/addons/medical/functions/fnc_onWoundUpdateRequest.sqf @@ -13,7 +13,7 @@ */ #include "script_component.hpp" -private ["_unit", "_openWounds"]; +private ["_unit", "_openWounds", "_originOfrequest"]; _unit = _this select 0; _originOfrequest = _this select 1; diff --git a/addons/medical/functions/fnc_parseConfigForInjuries.sqf b/addons/medical/functions/fnc_parseConfigForInjuries.sqf index c624b1af1b4..503ff9833e4 100644 --- a/addons/medical/functions/fnc_parseConfigForInjuries.sqf +++ b/addons/medical/functions/fnc_parseConfigForInjuries.sqf @@ -12,7 +12,7 @@ #include "script_component.hpp" -private ["_injuriesRootConfig", "_woundsConfig", "_allWoundClasses", "_amountOf", "_entry","_classType", "_selections", "_bloodLoss", "_pain","_minDamage","_causes", "_damageTypesConfig", "_thresholds", "_typeThresholds", "_selectionSpecific", "_selectionSpecificType", "_classDisplayName", "_subClassDisplayName", "_maxDamage", "_subClassmaxDamage", "_defaultMinLethalDamage", "_minLethalDamage"]; +private ["_injuriesRootConfig", "_woundsConfig", "_allWoundClasses", "_amountOf", "_entry","_classType", "_selections", "_bloodLoss", "_pain","_minDamage","_causes", "_damageTypesConfig", "_thresholds", "_typeThresholds", "_selectionSpecific", "_selectionSpecificType", "_classDisplayName", "_subClassDisplayName", "_maxDamage", "_subClassmaxDamage", "_defaultMinLethalDamage", "_minLethalDamage", "_allFoundDamageTypes", "_classID", "_configDamageTypes", "_i", "_parseForSubClassWounds", "_subClass", "_subClassConfig", "_subClassbloodLoss", "_subClasscauses", "_subClassminDamage", "_subClasspain", "_subClassselections", "_subClasstype", "_type", "_varName", "_woundTypes"]; _injuriesRootConfig = (configFile >> "ACE_Medical_Advanced" >> "Injuries"); _allFoundDamageTypes = []; diff --git a/addons/medical/functions/fnc_playInjuredSound.sqf b/addons/medical/functions/fnc_playInjuredSound.sqf index 16a7d691168..c48e3d0a4c5 100644 --- a/addons/medical/functions/fnc_playInjuredSound.sqf +++ b/addons/medical/functions/fnc_playInjuredSound.sqf @@ -15,7 +15,7 @@ #include "script_component.hpp" -private ["_unit","_amountOfDamage","_bodyPartStatus","_availableSounds_A","_availableSounds_B","_availableSounds_C","_sound"]; +private ["_unit","_availableSounds_A","_availableSounds_B","_availableSounds_C","_sound", "_pain"]; _unit = _this select 0; _pain = _this select 1; if (!local _unit || !GVAR(enableScreams)) exitwith{}; diff --git a/addons/medical/functions/fnc_requestWoundSync.sqf b/addons/medical/functions/fnc_requestWoundSync.sqf index 7144c49684f..74fd3e230da 100644 --- a/addons/medical/functions/fnc_requestWoundSync.sqf +++ b/addons/medical/functions/fnc_requestWoundSync.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" -private [ "_target", "_caller", "_openWounds"]; +private [ "_target", "_caller"]; _target = _this select 0; _caller = _this select 1; diff --git a/addons/medical/functions/fnc_setDead.sqf b/addons/medical/functions/fnc_setDead.sqf index 9d8498cd04f..411fd6dc06e 100644 --- a/addons/medical/functions/fnc_setDead.sqf +++ b/addons/medical/functions/fnc_setDead.sqf @@ -13,7 +13,7 @@ #include "script_component.hpp" -private ["_unit", "_force", "_reviveVal"]; +private ["_unit", "_force", "_reviveVal", "_lifesLeft"]; _unit = _this select 0; _force = false; if (count _this >= 2) then { diff --git a/addons/medical/functions/fnc_setHitPointDamage.sqf b/addons/medical/functions/fnc_setHitPointDamage.sqf index d71edc94df9..18d4fc616e1 100644 --- a/addons/medical/functions/fnc_setHitPointDamage.sqf +++ b/addons/medical/functions/fnc_setHitPointDamage.sqf @@ -21,7 +21,7 @@ #define ARMDAMAGETRESHOLD1 1 #define ARMDAMAGETRESHOLD2 1.7 -private ["_unit", "_selection", "_damage", "_selections", "_damages", "_damageOld", "_damageSumOld", "_damageNew", "_damageSumNew", "_damageFinal"]; +private ["_unit", "_selection", "_damage", "_selections", "_damages", "_damageOld", "_damageSumOld", "_damageNew", "_damageSumNew", "_damageFinal", "_armdamage", "_legdamage"]; _unit = _this select 0; _selection = _this select 1; diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 86f9425d230..82e93eb1fb7 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -17,7 +17,7 @@ #define DEFAULT_DELAY (round(random(10)+5)) -private ["_unit", "_set", "_animState", "_originalPos", "_captiveSwitch", "_startingTime","_minWaitingTime"]; +private ["_unit", "_set", "_animState", "_originalPos", "_startingTime","_minWaitingTime"]; _unit = _this select 0; _set = if (count _this > 1) then {_this select 1} else {true}; _minWaitingTime = if (count _this > 2) then {_this select 2} else {DEFAULT_DELAY}; diff --git a/addons/medical/functions/fnc_treatment.sqf b/addons/medical/functions/fnc_treatment.sqf index df6cc173d0e..f50ff505e09 100644 --- a/addons/medical/functions/fnc_treatment.sqf +++ b/addons/medical/functions/fnc_treatment.sqf @@ -16,7 +16,7 @@ #include "script_component.hpp" -private ["_caller", "_target", "_selectionName", "_className", "_config", "_availableLevels", "_medicRequired", "_items", "_locations", "_return", "_callbackSuccess", "_callbackFailure", "_callbackProgress", "_treatmentTime", "_callerAnim", "_patientAnim", "_iconDisplayed", "_return", "_usersOfItems", "_consumeItems"]; +private ["_caller", "_target", "_selectionName", "_className", "_config", "_medicRequired", "_items", "_locations", "_return", "_callbackProgress", "_treatmentTime", "_callerAnim", "_patientAnim", "_iconDisplayed", "_return", "_usersOfItems", "_consumeItems", "_condition", "_displayText", "_wpn"]; _caller = _this select 0; _target = _this select 1; _selectionName = _this select 2; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf b/addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf index ee3f51f5495..0a49420783f 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf @@ -16,7 +16,7 @@ #include "script_component.hpp" -private ["_caller", "_target", "_selectionName", "_className", "_items", "_removeItem"]; +private ["_caller", "_target", "_selectionName", "_className", "_items"]; _caller = _this select 0; _target = _this select 1; _selectionName = _this select 2; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf b/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf index 146e996d258..42ca38cd0ab 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" -private ["_caller", "_target", "_selectionName", "_className", "_items", "_removeItem"]; +private ["_caller", "_target", "_selectionName", "_className", "_items", "_specificSpot"]; _caller = _this select 0; _target = _this select 1; _selectionName = _this select 2; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf b/addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf index 2884503599b..d6c490d3c62 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf @@ -15,7 +15,7 @@ #include "script_component.hpp" -private ["_target", "_bandage", "_part", "_selectionName", "_openWounds", "_config", "_effectiveness","_mostEffectiveInjury", "_mostEffectiveSpot", "_woundEffectivenss", "_mostEffectiveInjury", "_impact", "_exit", "_specificClass", "_classID", "_effectivenessFound"]; +private ["_target", "_bandage", "_part", "_selectionName", "_openWounds", "_config", "_effectiveness","_mostEffectiveInjury", "_mostEffectiveSpot", "_woundEffectivenss", "_mostEffectiveInjury", "_impact", "_exit", "_specificClass", "_classID", "_effectivenessFound", "_className", "_hitPoints", "_hitSelections", "_point", "_woundTreatmentConfig"]; _target = _this select 0; _bandage = _this select 1; _selectionName = _this select 2; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf b/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf index 807be828e89..63a559a40b6 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf @@ -10,7 +10,7 @@ #include "script_component.hpp" -private ["_unit", "_caller", "_selectionName", "_className", "_items"]; +private ["_target"], "_caller", "_selectionName", "_className", "_items"]; _caller = _this select 0; _target = _this select 1; _selectionName = _this select 2; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf b/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf index 508040b8afd..55057f17588 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" -private ["_caller", "_target", "_selectionName", "_className", "_items", "_removeItem"]; +private ["_caller", "_target", "_selectionName", "_className", "_items"]; _caller = _this select 0; _target = _this select 1; _selectionName = _this select 2; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf b/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf index bbf5aea6c06..58f1f8c52be 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf @@ -15,7 +15,7 @@ #include "script_component.hpp" -private ["_target", "_className", "_currentInSystem", "_medicationConfig", "_painReduce", "_hrIncreaseLow", "_hrIncreaseNorm", "_hrIncreaseHigh", "_maxDose", "_inCompatableMedication", "_timeInSystem", "_heartRate", "_pain", "_resistance", "_hrCallback"]; +private ["_target", "_className", "_currentInSystem", "_medicationConfig", "_painReduce", "_hrIncreaseLow", "_hrIncreaseNorm", "_hrIncreaseHigh", "_maxDose", "_inCompatableMedication", "_timeInSystem", "_heartRate", "_pain", "_resistance", "_hrCallback", "_varName", "_viscosityChange"]]; _target = _this select 0; _className = _this select 1; @@ -77,9 +77,9 @@ if (_painReduce > 0) then { _target setvariable [QGVAR(pain), (_pain - (_pain * _painReduce)) max 0]; }; -_resistance = _unit getvariable [QGVAR(peripheralResistance), 100]; +_resistance = _target getvariable [QGVAR(peripheralResistance), 100]; _resistance = _resistance + _viscosityChange; -_unit setvariable [QGVAR(peripheralResistance), _resistance max 0]; +_target setvariable [QGVAR(peripheralResistance), _resistance max 0]; // Call back to ensure that the medication is decreased over time [_target, _classname, _varName, _maxDose, _timeInSystem, _inCompatableMedication, _viscosityChange] call FUNC(onMedicationUsage); diff --git a/addons/medical/functions/fnc_treatmentBasic_bandage.sqf b/addons/medical/functions/fnc_treatmentBasic_bandage.sqf index 4b07e989aa6..75b0b6bfdde 100644 --- a/addons/medical/functions/fnc_treatmentBasic_bandage.sqf +++ b/addons/medical/functions/fnc_treatmentBasic_bandage.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" #define BANDAGEHEAL 0.8 -private ["_caller", "_target","_selection","_className","_target","_hitSelections","_hitPoints","_point"]; +private ["_caller", "_target","_selection","_className","_target","_hitSelections","_hitPoints","_point", "_damage"]; _caller = _this select 0; _target = _this select 1; _selection = _this select 2; diff --git a/addons/medical/functions/fnc_treatmentIV.sqf b/addons/medical/functions/fnc_treatmentIV.sqf index c171d7364fb..3a62b9e6573 100644 --- a/addons/medical/functions/fnc_treatmentIV.sqf +++ b/addons/medical/functions/fnc_treatmentIV.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" -private ["_caller", "_target", "_selectionName", "_className", "_items", "_removeItem", "_attributes"]; +private ["_caller", "_target", "_selectionName", "_className", "_items", "_removeItem"]; _caller = _this select 0; _target = _this select 1; _selectionName = _this select 2; diff --git a/addons/medical/functions/fnc_treatmentIVLocal.sqf b/addons/medical/functions/fnc_treatmentIVLocal.sqf index 66ecdf9d906..04708b965f2 100644 --- a/addons/medical/functions/fnc_treatmentIVLocal.sqf +++ b/addons/medical/functions/fnc_treatmentIVLocal.sqf @@ -15,7 +15,7 @@ #include "script_component.hpp" -private ["_target", "_ivItem", "_config", "_volumeAdded", "_typeOf", "_varName"]; +private ["_target", "_ivItem", "_config", "_volumeAdded", "_typeOf", "_varName", "_bloodVolume"]; _target = _this select 0; _ivItem = _this select 1; @@ -27,8 +27,8 @@ _config = (configFile >> "ACE_Medical_Advanced" >> "Treatment" >> "IV"); _volumeAdded = getNumber (_config >> "volume"); _typeOf = getText (_config >> "type"); -if (isClass (_config >> _className)) then { - _config = (_config >> _className); +if (isClass (_config >> _ivItem)) then { + _config = (_config >> _ivItem); if (isNumber (_config >> "volume")) then { _volumeAdded = getNumber (_config >> "volume");}; if (isText (_config >> "type")) then { _typeOf = getText (_config >> "type"); }; }; diff --git a/addons/medical/functions/fnc_treatmentTourniquet.sqf b/addons/medical/functions/fnc_treatmentTourniquet.sqf index da50c5c1bfb..731797f1f98 100644 --- a/addons/medical/functions/fnc_treatmentTourniquet.sqf +++ b/addons/medical/functions/fnc_treatmentTourniquet.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" -private ["_caller","_target","_part","_selectionName","_removeItem", "_tourniquets", "_items", "_output"]; +private ["_caller","_target","_part","_selectionName","_removeItem", "_tourniquets", "_items", "_output", "_className"]; _caller = _this select 0; _target = _this select 1; _selectionName = _this select 2; diff --git a/addons/medical/functions/fnc_treatmentTourniquetLocal.sqf b/addons/medical/functions/fnc_treatmentTourniquetLocal.sqf index 289f852a063..02484bbca68 100644 --- a/addons/medical/functions/fnc_treatmentTourniquetLocal.sqf +++ b/addons/medical/functions/fnc_treatmentTourniquetLocal.sqf @@ -29,7 +29,7 @@ _tourniquets set[_part, _applyingTo]; _target setvariable [QGVAR(tourniquets), _tourniquets, true]; [{ - private ["_args","_target","_applyingTo","_part", "_tourniquets"]; + private ["_args","_target","_applyingTo","_part", "_tourniquets", "_time"]; _args = _this select 0; _target = _args select 0; _applyingTo = _args select 1; diff --git a/addons/medical/functions/fnc_treatment_failure.sqf b/addons/medical/functions/fnc_treatment_failure.sqf index 33712956a00..c329bf724ca 100644 --- a/addons/medical/functions/fnc_treatment_failure.sqf +++ b/addons/medical/functions/fnc_treatment_failure.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" -private ["_caller", "_target","_selectionName","_className","_config","_callback", "_usersOfItems", "_weaponSelect"]; +private ["_args", "_caller", "_target","_selectionName","_className","_config","_callback", "_usersOfItems", "_weaponSelect"]; _args = _this select 0; _caller = _args select 0; diff --git a/addons/medical/functions/fnc_treatment_success.sqf b/addons/medical/functions/fnc_treatment_success.sqf index 66406a180a1..0178ea78fdf 100644 --- a/addons/medical/functions/fnc_treatment_success.sqf +++ b/addons/medical/functions/fnc_treatment_success.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" -private ["_caller", "_target","_selectionName","_className","_config","_callback", "_weaponSelect"]; +private ["_args", "_caller", "_target","_selectionName","_className","_config","_callback", "_weaponSelect"]; _args = _this select 0; _caller = _args select 0; _target = _args select 1; diff --git a/addons/medical/functions/fnc_unconsciousPFH.sqf b/addons/medical/functions/fnc_unconsciousPFH.sqf index fc60c2bb025..bf328648d5f 100644 --- a/addons/medical/functions/fnc_unconsciousPFH.sqf +++ b/addons/medical/functions/fnc_unconsciousPFH.sqf @@ -13,7 +13,7 @@ #include "script_component.hpp" -private ["_unit", "_vehicleOfUnit","_minWaitingTime", "_oldAnimation", "_captiveSwitch", "_hasMovedOut", "_parachuteCheck"]; +private ["_unit", "_minWaitingTime", "_oldAnimation", "_hasMovedOut", "_parachuteCheck", "_args", "_originalPos", "_startingTime"]; _args = _this select 0; _unit = _args select 0; _oldAnimation = _args select 1; From d71bba0359265f5e3bb86d3d0e0584831e65c287 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 30 Apr 2015 01:21:41 -0500 Subject: [PATCH 094/171] opps --- .../medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf b/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf index 58f1f8c52be..934bc9239a6 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf @@ -15,7 +15,7 @@ #include "script_component.hpp" -private ["_target", "_className", "_currentInSystem", "_medicationConfig", "_painReduce", "_hrIncreaseLow", "_hrIncreaseNorm", "_hrIncreaseHigh", "_maxDose", "_inCompatableMedication", "_timeInSystem", "_heartRate", "_pain", "_resistance", "_hrCallback", "_varName", "_viscosityChange"]]; +private ["_target", "_className", "_currentInSystem", "_medicationConfig", "_painReduce", "_hrIncreaseLow", "_hrIncreaseNorm", "_hrIncreaseHigh", "_maxDose", "_inCompatableMedication", "_timeInSystem", "_heartRate", "_pain", "_resistance", "_hrCallback", "_varName", "_viscosityChange"]; _target = _this select 0; _className = _this select 1; From 48f7455ef10d9ddfa6f961818833bafe53225d4c Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 30 Apr 2015 01:23:23 -0500 Subject: [PATCH 095/171] Opps2 --- addons/medical/functions/fnc_isMedic.sqf | 2 +- addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/medical/functions/fnc_isMedic.sqf b/addons/medical/functions/fnc_isMedic.sqf index df5765f16b8..122d2612385 100644 --- a/addons/medical/functions/fnc_isMedic.sqf +++ b/addons/medical/functions/fnc_isMedic.sqf @@ -14,7 +14,7 @@ #include "script_component.hpp" -private ["_unit", "_class", "_medicN"] +private ["_unit", "_class", "_medicN"]; _unit = _this select 0; _medicN = if (count _this > 1) then {_this select 1} else {1}; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf b/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf index 63a559a40b6..37627a8c5d7 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf @@ -10,7 +10,7 @@ #include "script_component.hpp" -private ["_target"], "_caller", "_selectionName", "_className", "_items"]; +private ["_target", "_caller", "_selectionName", "_className", "_items"]; _caller = _this select 0; _target = _this select 1; _selectionName = _this select 2; From 8f3d8707cc9f1bb17b916acb5c4021e41e521665 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Thu, 30 Apr 2015 08:53:43 +0200 Subject: [PATCH 096/171] Should be select Should fix the new script error after last fix. --- addons/javelin/functions/fnc_onOpticDraw.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/javelin/functions/fnc_onOpticDraw.sqf b/addons/javelin/functions/fnc_onOpticDraw.sqf index 8fa96c036a1..505953d8775 100644 --- a/addons/javelin/functions/fnc_onOpticDraw.sqf +++ b/addons/javelin/functions/fnc_onOpticDraw.sqf @@ -130,7 +130,7 @@ FUNC(disableFire) = { if(_firedEH < 0 && difficulty > 0) then { _firedEH = [ACE_player, "DefaultAction", {true}, { - _canFire = _this getVariable["ace_missileguidance_target", nil]; + _canFire = (_this select 0) getVariable["ace_missileguidance_target", nil]; if(!isNil "_canFire") exitWith { false }; true }] call EFUNC(common,addActionEventHandler); From 59017ed79d3ef2de2af15fa6686d9ee8466a24f9 Mon Sep 17 00:00:00 2001 From: ulteq Date: Thu, 30 Apr 2015 10:26:00 +0200 Subject: [PATCH 097/171] Added more frag configs: * R_Hydra_HE * Sh_120mm_HE * Sh_125mm_HE * Missile_AGM_02_F * M_Hellfire_AT --- addons/frag/CfgAmmo.hpp | 53 +++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp index 726c7e5b578..4a01b7fe69e 100644 --- a/addons/frag/CfgAmmo.hpp +++ b/addons/frag/CfgAmmo.hpp @@ -44,10 +44,14 @@ class CfgAmmo { }; class RocketBase; - //class R_Hydra_HE: RocketBase { - // GVAR(skip) = 1; - //}; - + class R_Hydra_HE: RocketBase { + // Source: http://fas.org/man/dod-101/sys/missile/hydra-70.htm + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; + GVAR(metal) = 3850; + GVAR(charge) = 1040; + GVAR(gurney_c) = 2700; + GVAR(gurney_k) = 1/2; + }; //class R_57mm_HE: RocketBase { // GVAR(skip) = 1; //}; @@ -104,7 +108,7 @@ class CfgAmmo { GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 3200; GVAR(charge) = 420; - GVAR(gurney_c) = 1906; + GVAR(gurney_c) = 2440; GVAR(gurney_k) = 1/2; }; class ModuleOrdnanceMortar_F_Ammo: Sh_82mm_AMOS { @@ -114,13 +118,26 @@ class CfgAmmo { GVAR(gurney_c) = 2320; GVAR(gurney_k) = 1/2; }; - + class Sh_120mm_HE : ShellBase { + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; + GVAR(metal) = 23000; + GVAR(charge) = 3148; + GVAR(gurney_c) = 2830; + GVAR(gurney_k) = 1/2; + }; + class Sh_125mm_HE: Sh_120mm_HE { + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; + GVAR(metal) = 16000; + GVAR(charge) = 3200; + GVAR(gurney_c) = 2440; + GVAR(gurney_k) = 1/2; + }; class Sh_155mm_AMOS: ShellBase { // Source: http://www.globalsecurity.org/military/systems/munitions/m795.htm GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(metal) = 36000; GVAR(charge) = 9979; - GVAR(gurney_c) = 1906; + GVAR(gurney_c) = 2440; GVAR(gurney_k) = 1/2; }; class ModuleOrdnanceHowitzer_F_ammo: Sh_155mm_AMOS { @@ -146,11 +163,23 @@ class CfgAmmo { // GVAR(multiplier) = 1.2; //}; - //class MissileBase; - //class M_Hellfire_AT: MissileBase { - // GVAR(force) = 1; - // GVAR(multiplier) = 1.75; - //}; + class MissileBase; + class Missile_AGM_02_F : MissileBase { + // Source: http://fas.org/man/dod-101/sys/smart/agm-65.htm + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; + GVAR(metal) = 56250; + GVAR(charge) = 39000; + GVAR(gurney_c) = 2700; + GVAR(gurney_k) = 1/2; + }; + class M_Hellfire_AT: MissileBase { + // Source: http://www.designation-systems.net/dusrm/m-114.html + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; + GVAR(metal) = 8000; + GVAR(charge) = 2400; + GVAR(gurney_c) = 2700; + GVAR(gurney_k) = 1/2; + }; /* class B_762x51_Ball; From e77ddcf837553a6d251fc18ad5f782cdd7bf4d69 Mon Sep 17 00:00:00 2001 From: ulteq Date: Thu, 30 Apr 2015 10:35:06 +0200 Subject: [PATCH 098/171] Added Sh_105mm_HEAT_MP frag config --- addons/frag/CfgAmmo.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp index 4a01b7fe69e..142414ab401 100644 --- a/addons/frag/CfgAmmo.hpp +++ b/addons/frag/CfgAmmo.hpp @@ -103,6 +103,7 @@ class CfgAmmo { // curator ammo entries class ShellBase; + class Sh_125mm_HEAT; class Sh_82mm_AMOS : ShellBase { // Source: http://www.arsenal-bg.com/defense_police/mortar_bombs_82mm.htm GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; @@ -118,6 +119,13 @@ class CfgAmmo { GVAR(gurney_c) = 2320; GVAR(gurney_k) = 1/2; }; + class Sh_105mm_HEAT_MP : Sh_125mm_HEAT { + GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; + GVAR(metal) = 11400; + GVAR(charge) = 7100; + GVAR(gurney_c) = 2800; + GVAR(gurney_k) = 1/2; + }; class Sh_120mm_HE : ShellBase { GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 23000; From 50a8a89b2805d7755854b31d80fdc86918a4521a Mon Sep 17 00:00:00 2001 From: ulteq Date: Thu, 30 Apr 2015 10:50:49 +0200 Subject: [PATCH 099/171] Added missing privates --- addons/ballistics/scripts/initTargetWall.sqf | 2 ++ addons/disarming/functions/fnc_openDisarmDialog.sqf | 2 +- addons/frag/functions/fnc_trackTrace.sqf | 2 +- addons/hearing/functions/fnc_firedNear.sqf | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/ballistics/scripts/initTargetWall.sqf b/addons/ballistics/scripts/initTargetWall.sqf index b09d5897bcd..391faaa82e9 100644 --- a/addons/ballistics/scripts/initTargetWall.sqf +++ b/addons/ballistics/scripts/initTargetWall.sqf @@ -1,6 +1,8 @@ // by commy2 #include "script_component.hpp" +private ["_wall", "_paper"]; + _wall = _this select 0; if (local _wall) then { diff --git a/addons/disarming/functions/fnc_openDisarmDialog.sqf b/addons/disarming/functions/fnc_openDisarmDialog.sqf index 832f32ced51..88e0e81be88 100644 --- a/addons/disarming/functions/fnc_openDisarmDialog.sqf +++ b/addons/disarming/functions/fnc_openDisarmDialog.sqf @@ -60,7 +60,7 @@ GVAR(disarmTarget) = _target; //Setup PFEH [{ - private ["_groundContainer", "_targetContainer", "_playerName", "_rankPicture", "_rankIndex", "_targetUniqueItems", "_holderUniqueItems"]; + private ["_groundContainer", "_targetContainer", "_playerName", "_rankPicture", "_rankIndex", "_targetUniqueItems", "_holderUniqueItems", "_holder"]; disableSerialization; EXPLODE_2_PVT(_this,_args,_pfID); EXPLODE_3_PVT(_args,_player,_target,_display); diff --git a/addons/frag/functions/fnc_trackTrace.sqf b/addons/frag/functions/fnc_trackTrace.sqf index 205292a8201..371d58b3b1a 100644 --- a/addons/frag/functions/fnc_trackTrace.sqf +++ b/addons/frag/functions/fnc_trackTrace.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -private ["_params", "_tracerObj", "_index", "_positions"]; +private ["_params", "_tracerObj", "_index", "_positions", "_data"]; _params = _this select 0; _tracerObj = _params select 0; _index = _params select 1; diff --git a/addons/hearing/functions/fnc_firedNear.sqf b/addons/hearing/functions/fnc_firedNear.sqf index 6a603c3c3ad..b456b3b8721 100644 --- a/addons/hearing/functions/fnc_firedNear.sqf +++ b/addons/hearing/functions/fnc_firedNear.sqf @@ -21,7 +21,7 @@ */ #include "script_component.hpp" -private ["_silencer", "_audibleFireCoef", "_loudness", "_strength", "_vehAttenuation"]; +private ["_silencer", "_audibleFireCoef", "_audibleFire", "_loudness", "_strength", "_vehAttenuation"]; PARAMS_7(_object,_firer,_distance,_weapon,_muzzle,_mode,_ammo); From 5d1478b733363e12954195ac7255974e8421efd9 Mon Sep 17 00:00:00 2001 From: Bla1337 Date: Thu, 30 Apr 2015 14:01:22 +0300 Subject: [PATCH 100/171] interact and medical system localization upd --- addons/interact_menu/stringtable.xml | 6 ++++++ addons/medical/stringtable.xml | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index b8913ce1c95..de1d972fafa 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -85,6 +85,7 @@ Interaction - Texte Max Interaktionstextfarbe Max Interazioni - Testo Massimo + Взаимодействие - Текст Макс. Interaction - Text Min @@ -92,6 +93,7 @@ Interaction - Texte Min Interaktionstextfarbe Min Interazioni - Testo Minimo + Взаимодействие - Текст Мин. Interaction - Shadow Max @@ -99,6 +101,7 @@ Interaction - Ombre Max Interaktionstextschatten Max Interazioni - Ombra Massima + Взаимодействие - Тень Макс. Interaction - Shadow Min @@ -106,14 +109,17 @@ Interaction - Ombre Min Interaktionstextschatten Min Interazioni - Ombra Minima + Взаимодействие - Тень Мин. Keep cursor centered Garder le curseur au centre + Центрировать курсор Keeps cursor centered and pans the option menu around. Useful if screen size is limited. Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée. + Центрирует курсор и двигает само меню опций. Полезно при ограниченном размере экрана. diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 2cb2d5715d7..53fb7d16f6f 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -347,7 +347,7 @@ QuikClot QuikClot QuikClot - QuickClot + QuikClot Opatrunek QuikClot QuikClot Hémostatique @@ -443,7 +443,7 @@ CPR HLW RCP - Сердечно-легочная реанимация + Сердечно-лёгочная реанимация RPC RKO @@ -451,7 +451,7 @@ Performing CPR ... HLW durchführen ... Eseguendo RCP... - Сердечно-легочная реанимация ... + Сердечно-лёгочная реанимация ... RPC en cours Przeprowadzanie RKO ... @@ -789,7 +789,7 @@ A bandage used to pack the wound to stem bleeding and facilitate wound healing. Packing a wound is an option in large polytrauma injuries. - Повязка для тампонирования раны, остановки кровотечения и лучшего заживления. При тяжелых сочетанных ранениях возможно тампонирование раны. + Повязка для тампонирования раны, остановки кровотечения и лучшего заживления. При тяжёлых сочетанных ранениях возможно тампонирование раны. Se utiliza para detener la hemorragia de una herida y favorecer su cicatrización. Se usa en grandes lesiones o politraumatismos. Bandage servant à recouvrir les blessures pour arrêter les hémmoragies et faciliter la guérisson. Recouvrir une blessure est optionnel dans le cas de blessures polytraumatiques Opatrunek stosowany w celu zatrzymania krwawienia i osłony większych ran. @@ -824,7 +824,7 @@ Allows an even compression and extra support to the injured area. Ermöglicht eine gleichmäßige Kompression und zusätzliche Unterstützung für den verletzten Bereich. - Давящая повязка обеспечивает равномерное сжатие и дополнительную поддержку поврежденной области + Давящая повязка обеспечивает равномерное сжатие и дополнительную поддержку повреждённой области Ce bandage peut être utilisé pour compresser la plaie afin de ralentir le saignement et assurer la tenue du bandage lors de mouvement. Elastyczna opaska podtrzymująca opatrunek oraz usztywniająca okolice stawów. Brinda una compresión uniforme y ofrece soporte extra a una zona lesionada @@ -1035,7 +1035,7 @@ Blood IV, for restoring a patients blood (keep cold) - Пакет крови для возмещения объема потерянной крови (хранить в холодильнике) + Пакет крови для возмещения объёма потерянной крови (хранить в холодильнике) Sangre intravenosa, para restarurar el volumen sanguíneo (mantener frío) Cullot sanguin O- ,utiliser seulement lors de perte sanguine majeur afin de remplacer le volume sanguin perdu. Habituelment utiliser lors du transport ou dans un etablisement de soin. Krew IV, używana do uzupełnienia krwi u pacjenta, trzymać w warunkach chłodniczych @@ -1089,7 +1089,7 @@ Saline IV, for restoring a patients blood - Пакет физраствора для возмещения объема потерянной крови + Пакет физраствора для возмещения объёма потерянной крови Solución salina intravenosa, para restaurar el volumen sanguíneo Solution saline 0.9% IV, pour rétablir temporairement la tension artérielle Sól fizjologiczna, podawana dożylnie (IV), używana w celu uzupełnienia krwi u pacjenta @@ -1100,7 +1100,7 @@ A medical volume-replenishing agent introduced into the blood system through an IV infusion. - Пакет физиологического раствора для возмещения объема потерянной крови путем внутривенного вливания + Пакет физиологического раствора для возмещения объёма потерянной крови путем внутривенного вливания Suero fisiológico inoculado al torrente sanguíneo de forma intravenosa. Un remplacant temporaire pour rétablir la tension artérielle lors de perte sanguine, administré par intra-veineuse Używany w medycynie w formie płynu infuzyjnego jako środek nawadniający i uzupełniający niedobór elektrolitów, podawany dożylnie (IV). From 4e165e25724b03425a91ecf50cc23f0d754c9a8b Mon Sep 17 00:00:00 2001 From: Harakhti Date: Thu, 30 Apr 2015 13:25:25 +0200 Subject: [PATCH 101/171] Update Hungarian translations Let us match the current revision. At the time of making, the Ballistics XML was broken. --- addons/advanced_ballistics/stringtable.xml | 2 + addons/atragmx/stringtable.xml | 3 + addons/disarming/stringtable.xml | 1 + addons/interact_menu/stringtable.xml | 10 ++- addons/kestrel4500/stringtable.xml | 7 +- addons/laserpointer/stringtable.xml | 5 +- addons/medical/stringtable.xml | 80 +++++++++++++++++++++- addons/microdagr/stringtable.xml | 3 +- addons/missileguidance/stringtable.xml | 7 +- addons/mk6mortar/stringtable.xml | 6 +- addons/optionsmenu/stringtable.xml | 3 +- addons/realisticnames/stringtable.xml | 30 +++++++- addons/respawn/stringtable.xml | 8 ++- addons/scopes/stringtable.xml | 11 ++- addons/weather/stringtable.xml | 3 +- 15 files changed, 165 insertions(+), 14 deletions(-) diff --git a/addons/advanced_ballistics/stringtable.xml b/addons/advanced_ballistics/stringtable.xml index dbf2784f21c..b88e569fdfc 100644 --- a/addons/advanced_ballistics/stringtable.xml +++ b/addons/advanced_ballistics/stringtable.xml @@ -9,6 +9,7 @@ Afficher les info sur le vent Mostrar información del viento Windinformationen anzeigen + Széladatok mutatása Show Protractor @@ -18,6 +19,7 @@ Afficher le rapporteur Mostrar transportador Winkelmesser anzeigen + Szögmérő mutatása \ No newline at end of file diff --git a/addons/atragmx/stringtable.xml b/addons/atragmx/stringtable.xml index f6bafa7762e..e2fc54f9ab2 100644 --- a/addons/atragmx/stringtable.xml +++ b/addons/atragmx/stringtable.xml @@ -20,6 +20,7 @@ Abrir ATragMX Ouvrir ATragMX ATragMX öffnen + ATragMX elővétele Rugged PDA with ATragMX @@ -28,6 +29,7 @@ PDA rugerizada con ATragMX Robuster PDA mit ATragMX PDA robuste avec ATragMX + Megerősített PDA, ATragMX-el Open ATragMX @@ -36,6 +38,7 @@ Abrir ATragMX Ouvrir ATragMX ATragMX öffnen + ATragMX elővétele \ No newline at end of file diff --git a/addons/disarming/stringtable.xml b/addons/disarming/stringtable.xml index 583080ff080..8f02cb7769c 100644 --- a/addons/disarming/stringtable.xml +++ b/addons/disarming/stringtable.xml @@ -10,6 +10,7 @@ Открыть инвентарь Apri l'inventario Ouvrir l'inventaire + Felszerelés megtekintése \ No newline at end of file diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index b8913ce1c95..6fe1208e35d 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -21,6 +21,7 @@ Zawsze wyświetlaj kursor dla interakcji Показывать курсор (взаимодействие) Immer den Cursor für Fremd-Interaktionen anzeigen + Mindig legyen a cselekvés kurzorja látható Display interaction menus as lists @@ -30,6 +31,7 @@ Mostra il menù di interazione come lista Wyświetlaj menu interakcji jako listę Interaktionsmenü in Listen anzeigen + Cselekvő menük listaként való megjelenítése Interact Key @@ -85,6 +87,7 @@ Interaction - Texte Max Interaktionstextfarbe Max Interazioni - Testo Massimo + Cselekvés - Szöveg max. Interaction - Text Min @@ -92,6 +95,7 @@ Interaction - Texte Min Interaktionstextfarbe Min Interazioni - Testo Minimo + Cselekvés - Szöveg min. Interaction - Shadow Max @@ -99,6 +103,7 @@ Interaction - Ombre Max Interaktionstextschatten Max Interazioni - Ombra Massima + Cselekvés - Árnyék max. Interaction - Shadow Min @@ -106,14 +111,17 @@ Interaction - Ombre Min Interaktionstextschatten Min Interazioni - Ombra Minima + Cselekvés - Árnyék min. Keep cursor centered Garder le curseur au centre + Kurzor középen tartása Keeps cursor centered and pans the option menu around. Useful if screen size is limited. Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée. + Középen tartja a kurzort, és a menüelemeket mozgatja. Hasznos lehetőség korlátozott képméretnél. - + \ No newline at end of file diff --git a/addons/kestrel4500/stringtable.xml b/addons/kestrel4500/stringtable.xml index 15808311d96..9d069acf6a9 100644 --- a/addons/kestrel4500/stringtable.xml +++ b/addons/kestrel4500/stringtable.xml @@ -22,6 +22,7 @@ Kestrel 4500 Taschenwettermessgerät Kestrel 4500 Indicatore Meteorologico Tascabile Kestrel 4500 Medidor Balístico Ativo + Kestrel 4500 kézi szél-és időjárásmérő Open Kestrel 4500 @@ -42,6 +43,7 @@ Mostra Kestrel 4500 Mostrar Kestrel 4500 Kestrel 4500 anzeigen + Kestrel 4500 mutatása Hide Kestrel 4500 @@ -51,6 +53,7 @@ Nascondi Kestrel 4500 Esconder Kestrel 4500 Kestrel 4500 wegstecken + Kestrel 4500 elrejtése Open Kestrel 4500 @@ -60,6 +63,7 @@ Accendi Kestrel 4500 Abrir Kestrel 4500 Kestrel 4500 öffnen + Kestrel 4500 elővétele Show Kestrel 4500 @@ -69,6 +73,7 @@ Mostra Kestrel 4500 Mostrar Kestrel 4500 Kestrel 4500 anzeigen + Kestrel 4500 mutatása - + \ No newline at end of file diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml index c3c227d8e30..e7a80dc1bd3 100644 --- a/addons/laserpointer/stringtable.xml +++ b/addons/laserpointer/stringtable.xml @@ -57,6 +57,7 @@ Laser Laser Laser + Lézer IR Laser @@ -66,6 +67,7 @@ Laser IR Laser IR Laser IR + Infravörös Lézer Switch Laser / IR Laser @@ -75,6 +77,7 @@ Changer Laser / Laser IR Alterna Laser / IR Laser Cambiar Laser / Laser IR + Lézer / Infravörös Lézer váltása - + \ No newline at end of file diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 2cb2d5715d7..0655f2e0c47 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -8,6 +8,7 @@ ТРАВМЫ BLESSURES OBRAŻENIA + SÉRÜLÉSEK No injuries on this bodypart ... @@ -16,6 +17,7 @@ Данная часть тела не повреждена ... Aucune blessures sur cette partie du corps Brak obrażeń na tej części ciała ... + Ezen a testrészen nincs sérülés ... Litter Simulation Detail @@ -24,6 +26,7 @@ Количество мусора от медицины Dettagli Simulazione Rifiuti Niveau de simulation des détritus + Hulladékszimuláció részletessége Litter simulation detail level sets the number of litter items which will be locally spawned in the client. Excessive amounts in local areas could cause FPS lag, so this is a client only setting. @@ -32,6 +35,7 @@ Устанавливает количество мусора, который появляется после использования мед. препаратов. Большое количество мусора может уменьшить производительность, поэтому данная настройка локальна для клиента. Il livello di dettagli della simulazione dei rifiuti indica il numero di rifiuti che verranno creati localmente nel client. La creazione di troppi rifiuti in aree locali potrebbe causare lag e calo di FPS. Questo è un settaggio client. Le nieau de simulation des détritus règle la quantité de déchets qui vont être créer localement dans le client. Des quantitées excessive dans certaines zones locales aurait pu causer des chutes D'IPS, donc c'est une option client uniquement. + A hulladékszimuláció részletessége megszabja a kliens által megjelenített hulladékobjektumok mennyiségét. Súlyos mennyiségek izolált területeken alacsony FPS-t okozhatnak, így ez egy kliensoldali beállítás. Inject Atropine @@ -115,6 +119,7 @@ Наложить жгут Applica laccio emostatico Aplicar Torniquete + Érszorító alkalmazása Bandage @@ -398,6 +403,7 @@ Нет записей. Aucune entrée sur cette carte de triage Brak wpisów w tej karcie segregacyjnej. + Ez az orvosi lap nem tartalmaz bejegyzést. Tourniquet @@ -430,6 +436,7 @@ Диагностика Diagnostiquer Diagnoza + Diagnosztizálás Diagnosing ... @@ -438,6 +445,7 @@ Диагностика ... Diagnostic en cours Diagnozowanie ... + Diagnózis folyamatban... CPR @@ -446,6 +454,7 @@ Сердечно-легочная реанимация RPC RKO + Újraélesztés Performing CPR ... @@ -454,6 +463,7 @@ Сердечно-легочная реанимация ... RPC en cours Przeprowadzanie RKO ... + Újraélesztés folyamatban... Give Blood IV (1000ml) @@ -966,6 +976,7 @@ Una sostanza che permette di dilatare i bronchi, aumentare il battito cardiaco e combattere effetti di reazioni allergiche. Usato anche in casi di arresto cardiaco. Ein Medikament, dass die Bronchien erweitert, die Herzfrequenz erhöht und Symptome von allergischen Reaktionen(Anaphylaxie) bekämpft. Wird bei plötzlichem Herzstillstand verabreicht. Uma droga trabalha dilatando os bronquios, aumentando a frequência cardíaca e combate efeitos de reações alérgicas(anáfilaticas). Usado em casos de parada cardiaca com poucas changes de recuperação. + Egy hormon, mely a szimpatikus idegrendszer által kitágítja a hörgőket, valamint megnöveli a szívverést, ezzel ellensúlyozva ilyen jellegű allergiás reakciókat (anafilaxiás sokk). Hirtelen szívmegállás esetén is használt, idő alatt csökkenő hatásfokkal. Plasma IV (1000ml) @@ -1053,6 +1064,7 @@ Cullot sanguin O- utilisé dans de rares et stricts cas pour compléter une perte de sang importante. Administré normalement lors d'un MEDEVAC O Negative Blutinfusion wird nur in seltenen Fällen verwendet, um den Bluthaushalt des Patienten zu ergänzen. Wird in der Regel wärend der Transportphase durchgeführt. Sangue O- , utilizado em casos raros para rapidamente repor o sangue. Uso habitual ocorre durante o transporte ou em estações de tratamento. + Nullás vércsoportú, Rh-negatív vér-infúzió, melyet kritikus és ritka helyzetekben vérutánpótlásra használnak, jellemzően az orvosi ellátás szállítási fázisa közben. Blood IV (500ml) @@ -1192,6 +1204,7 @@ Полевая аптчека для продвинутого лечения и зашивания ран Persönliches Verbandspäckchen zum ambulanten Nähen und fortgeschrittener Behandlung. Trousse de premiers soins pour coudre sur le terrain et traitements avancés. + Elsősegélycsomag, terepen való sebvarráshoz és haladó ellátáshoz Use Personal Aid Kit @@ -1199,6 +1212,7 @@ Использовать аптечку Utiliser la Trousse de premier soins Użyj apteczki osobistej + Elsősegélycsomag használata Surgical Kit @@ -1239,6 +1253,7 @@ Использовать хирургический набор Utiliser la trousse chirugicale Zszyj rany + Sebészeti készlet használata Bodybag @@ -1301,6 +1316,7 @@ %1 проверил артериальное давление: %2 %1 à vérifié la tension: %2 %1 sprawdził ciśnienie krwi: %2 + %1 ellenőrizte a vérnyomást: %2 You checked %1 @@ -1385,6 +1401,7 @@ Низкое Faible Niskie + Alacsony Normal @@ -1392,6 +1409,7 @@ Нормальное Normale Normalne + Normális High @@ -1399,6 +1417,7 @@ Высокое Haute Wysokie + Magas No Blood Pressure @@ -1406,6 +1425,7 @@ Артериальное давление отсутствует Aucune tension Brak ciśnienia krwi + Nincs vérnyomás Pulse @@ -1446,6 +1466,7 @@ %1 проверил пульс: %2 %1 à vérifié le rythme cardiaque: %2 %1 sprawdził tętno: %2 + %1 ellenőrizte a szívverés-számot: %2 Weak @@ -1453,6 +1474,7 @@ Слабый Faible Słabe + Gyenge Normal @@ -1460,6 +1482,7 @@ Нормальный Normal Normalne + Normális Strong @@ -1467,6 +1490,7 @@ Сильный Fort Silne + Erős You find a Heart Rate of %2 @@ -1584,6 +1608,7 @@ Patient %1<br/>ist %2.<br/>%3.<br/>%4 Patient %1<br/>est %2.<br/>%3.<br/> Pacjent %1<br/>jest %2.<br/>%3.<br/>%4 + A páciens, %1,<br/>%2.<br/>%3.<br/>%4 alive @@ -1591,6 +1616,7 @@ lebendig vivant żywy + élő dead @@ -1598,6 +1624,7 @@ tot mort martwy + halott He's lost some blood @@ -1605,9 +1632,11 @@ Er hat etwas Blut verloren Il à perdu du sang Stracił trochę krwi + Valamennyi vért vesztett He's lost a lot of blood + Sok vért vesztett He hasn't lost blood @@ -1615,6 +1644,7 @@ Er hat kein Blut verloren il n'a pas perdu de sang Nie stracił krwi + Nem vesztett vért He is in pain @@ -1622,6 +1652,7 @@ Er hat Schmerzen il souffre Odczuwa ból + Fájdalmai vannak He is not in pain @@ -1629,6 +1660,7 @@ Er hat keine Schmerzen Il ne souffre pas Nie odczuwa bólu + Nincsenek fájdalmai Bandaged @@ -1874,6 +1906,7 @@ Gravemente ferito Gravemente herido Lourdement blessé + Erősen sérült Lightly wounded @@ -1883,6 +1916,7 @@ Leggermente ferito Levemente herido Légèrement blessé + Enyhén sérült Very lightly wounded @@ -1892,6 +1926,7 @@ Ferito lievemente Muy levemente herido Très légèrement blessé + Nagyon enyhén sérült Head @@ -1901,6 +1936,7 @@ Testa Cabeza Tête + Fej Torso @@ -1910,6 +1946,7 @@ Torso Torso Torse + Testtörzs Left Arm @@ -1919,6 +1956,7 @@ Braccio sinistro Brazo izquierdo Bras gouche + Bal kar Right Arm @@ -1928,6 +1966,7 @@ Braccio destro Brazo derecho Bras droit + Jobb kar Left Leg @@ -1937,6 +1976,7 @@ Gamba sinistra Pierna izquierda Jambe gauche + Bal láb Right Leg @@ -1946,6 +1986,7 @@ Gamba destra Pierna derecha Jambe droite + Jobb láb Pain Effect Type @@ -1955,6 +1996,7 @@ Pain Effect Type Tipo de efecto de dolor Type d'effet de douleur + Fájdalom-effekt típusa Colour Flashing @@ -1964,6 +2006,7 @@ Colore lampeggiante Parpadeo de color Flash de couleur + Színvillódzás Chromatic Aberration @@ -1973,6 +2016,7 @@ Aberrazione cromatica Aberración cromática Aberration chromatique + Kromatikus aberráció Scrape @@ -1980,6 +2024,7 @@ Ссадина Eraflure Draśnięcie + Horzsolás Minor Scrape @@ -1987,6 +2032,7 @@ Малая ссадина Eraflure Mineure Pomniejsze draśnięcie + Kis horzsolás Medium Scrape @@ -1994,6 +2040,7 @@ Средняя ссадина Moyenne Eraflure Średnie draśnięcie + Közepes horzsolás Large Scrape @@ -2001,6 +2048,7 @@ Большая ссадина Large Eraflure Duże draśnięcie + Nagy horzsolás Avulsion @@ -2008,6 +2056,7 @@ Рваная рана Avulsion Rana płatowa + Leszakadás Minor Avulsion @@ -2015,6 +2064,7 @@ Малая рваная рана Avulsion Mineure Pomniejsza rana płatowa + Kis leszakadás Medium Avulsion @@ -2022,6 +2072,7 @@ Средняя рваная рана Avulsion Moyenne Średnia rana płatowa + Közepes leszakadás Large Avulsion @@ -2029,6 +2080,7 @@ Большая рваная рана Large Avulsion Duża rana płatowa + Nagy leszakadás Bruise @@ -2036,6 +2088,7 @@ Ушиб Hématome Stłuczenie + Zúzódás Minor Bruise @@ -2043,6 +2096,7 @@ Малый ушиб Hématome Mineur Pomniejsze stłuczenie + Kis zúzódás Medium Bruise @@ -2050,6 +2104,7 @@ Средний ушиб Hématome Moyen Średnie stłuczenie + Közepes zúzódás Large Bruise @@ -2057,6 +2112,7 @@ Большой ушиб Large Hématome Duże stłuczenie + Nagy zúzódás Crushed tissue @@ -2064,6 +2120,7 @@ Компресионная травма Tissu écrasé Zgniecienie tkanek miękkich + Zúzott szövet Minor crushed tissue @@ -2071,6 +2128,7 @@ Малая компрессионная травма Tissu écrasé Mineur Pomniejsze zgniecienie tkanek miękkich + Kis zúzott szövet Medium crushed tissue @@ -2078,6 +2136,7 @@ Средняя компрессионная травма Tissu écrasé Moyen Średnie zgniecienie tkanek miękkich + Közepes zúzott szövet Large crushed tissue @@ -2085,6 +2144,7 @@ Большая компрессионная травма Tissu écrasé Large Duże zgniecienie tkanek miękkich + Nagy zúzött szövet Cut @@ -2092,6 +2152,7 @@ Резаная рана Coupure Rana cięta + Vágás Small Cut @@ -2099,6 +2160,7 @@ Малая резаная рана Pomniejsza rana cięta Petite Coupure + Kis vágás Medium Cut @@ -2106,6 +2168,7 @@ Средняя резаная рана Średnia rana cięta Moyenne Coupure + Közepes vágás Large Cut @@ -2113,6 +2176,7 @@ Большая резаная рана Duża rana cięta Large Coupure + Nagy vágás Tear @@ -2120,6 +2184,7 @@ Рваная рана Rozerwanie skóry Déchirure + Szakadás Small Tear @@ -2127,6 +2192,7 @@ Малая рваная рана Pomniejsze rozerwanie skóry Petite Déchirure + Kis szakadás Medium Tear @@ -2134,6 +2200,7 @@ Средняя рваная рана Średnie rozerwanie skóry Moyenne Déchirure + Közepes szakadás Large Tear @@ -2141,6 +2208,7 @@ Большая рваная рана Duże rozerwanie skóry Large Déchirure + Nagy szakadás Velocity Wound @@ -2148,6 +2216,7 @@ Огнестрельная рана Rana postrzałowa Blessure de vélocité + Lőtt seb Smal Velocity Wound @@ -2155,6 +2224,7 @@ Малая огнестрельная рана Pomniejsza rana postrzałowa Petite Bessure de vélocité + Kis lőtt seb Medium Velocity Wound @@ -2162,6 +2232,7 @@ Средняя огнестрельная рана Średnia rana postrzałowa Moyenne Blessure de vélocité + Közepes lőtt seb Large Velocity Wound @@ -2169,6 +2240,7 @@ Большая огнестрельная рана Duża rana postrzałowa Large Blessure de vélocité + Nagy lőtt seb Puncture Wound @@ -2176,6 +2248,7 @@ Колотая рана Rana kłuta Blessure de perforation + Szúrt seb Minor Puncture Wound @@ -2183,6 +2256,7 @@ Малая колотая рана Pomniejsza rana kłuta Blessure de perforation Mineure + Kis szúrt seb Medium Puncture Wound @@ -2190,6 +2264,7 @@ Средняя колотая рана Średnia rana kłuta Blessure de perforation Moyenne + Közepes szúrt seb Large Puncture Wound @@ -2197,6 +2272,7 @@ Большая колотая рана Duża rana kłuta Large Blessure de perforation + Nagy szúrt seb Broken Femur @@ -2204,9 +2280,11 @@ Перелом Zkłamana kość udowa Femur Cassé + Törött combcsont Treating... + Ellátás... - + \ No newline at end of file diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml index f9ca634fd24..32fad199de9 100644 --- a/addons/microdagr/stringtable.xml +++ b/addons/microdagr/stringtable.xml @@ -251,6 +251,7 @@ Excluir Удалить Borrar + Törlés Toggle MicroDAGR Display Mode @@ -301,4 +302,4 @@ Fechar MicroDAGR - + \ No newline at end of file diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml index 15a87c31baf..cacec33b33c 100644 --- a/addons/missileguidance/stringtable.xml +++ b/addons/missileguidance/stringtable.xml @@ -20,6 +20,7 @@ Продвинутое наведение ракет, или ПНР, обеспечивает множество усовершествований для наведения и стрельбы ракет. Также, это система, необходимая для всех ракетных типов оружия. Das Erweiterte Raketenlenksystem, auch AMG genannt, bietet viele Verbesserungen zum Aufschalten und Feuern mittels gelenkten Raketen. Le guidage avancé de missile, ou AMG en anglais, apporte de multiple améliorations au verouillage et au tir de missiles. C'est aussi un framework requis pour tout arme de type missile. + A fejlett rakétairányító (vagy AMG) többféle módosítást tartalmaz a rakéták célkövetéséhez és tüzeléséhez. Ez egy szükséges keresztrendszer a rakéta-alapú fegyverekhez. Hydra-70 DAGR Missile @@ -54,7 +55,7 @@ Hydra-70 DAGR laserem naváděná střela Hydra-70 DAGR missile guida laser - Hydra-70 DAGR lézer-irányított rakéta + Hydra-70 DAGR lézer-irányított rakéta Управляемая ракета лазерного наведения Hydra-70 DAGR @@ -66,7 +67,7 @@ Hellfire II AGM-114K Missile Hellfire II AGM-114K - Hellfire II AGM-114K rakéta + Hellfire II AGM-114K rakéta Hellfire II AGM-114K @@ -90,7 +91,7 @@ Hellfire II AGM-114K laserem naváděná střela Missile guida laser Hellfire II AGM-114K - Hellfire II AGM-114K lézer-irányított rakéta + Hellfire II AGM-114K lézer-irányított rakéta Управляемая ракета лазерного наведения Hellfire II AGM-114K diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml index fe08d320e58..da01ebc1499 100644 --- a/addons/mk6mortar/stringtable.xml +++ b/addons/mk6mortar/stringtable.xml @@ -7,6 +7,7 @@ Tabela strzelnicza 82mm table de tir 82mm 82 мм Таблица дальностей и прицелов + 82mm hatótáv-tábla Range Table for the MK6 82mm Mortar @@ -14,6 +15,7 @@ Tabela strzelnicza dla moździerza 82mm MK6 Table de tir pour le mortier MK6 82mm Таблица дальностей и прицелов для MK6 82 мм мортиры + Hatótáv-tábla a MK6 82mm-es mozsárhoz Open 82mm Rangetable @@ -21,6 +23,7 @@ Otwórz tabelę strzelniczą 82mm ouvrir la table de tir 82mm Открыть 82 мм Таблицу дальностей и прицелов + 82mm hatótáv-tábla megnyitása Charge @@ -28,6 +31,7 @@ Charge Ładunek Зарядить + Töltés - + \ No newline at end of file diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml index ccb39c93c8b..38235629054 100644 --- a/addons/optionsmenu/stringtable.xml +++ b/addons/optionsmenu/stringtable.xml @@ -235,6 +235,7 @@ Opción de escalado del menú UI Размер интерфейса меню настройки UI Skalierung + Beállításmenü kezelőfelületének skálázása - + \ No newline at end of file diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml index 49ffbf17736..fcd54a56107 100644 --- a/addons/realisticnames/stringtable.xml +++ b/addons/realisticnames/stringtable.xml @@ -1533,6 +1533,7 @@ Noreen "Bad News" ULR Noreen "Bad News" ULR Noreen "Bad News" ULR + Noreen "Bad News"ULR Noreen "Bad News" ULR (Black) @@ -1542,6 +1543,7 @@ Noreen "Bad News" ULR (Чёрный) Noreen "Bad News" ULR (Schwarz) Noreen "Bad News" ULR (czarny) + Noreen "Bad News"ULR (Fekete) Noreen "Bad News" ULR (Camo) @@ -1551,6 +1553,7 @@ Noreen "Bad News" ULR (Камо) Noreen "Bad News" ULR (Camo) Noreen "Bad News" ULR (kamuflaż) + Noreen "Bad News"ULR (Terepmintás) Noreen "Bad News" ULR (Sand) @@ -1560,6 +1563,7 @@ Noreen "Bad News" ULR (Песочный) Noreen "Bad News" ULR (Sand) Noreen "Bad News" ULR (piaskowy) + Noreen "Bad News"ULR (Homok) SIG 556 @@ -1569,6 +1573,7 @@ SIG 556 SIG 556 SIG 556 + SIG 556 SIG 556 (Black) @@ -1578,6 +1583,7 @@ SIG 556 (Чёрный) SIG 556 (czarny) SIG 556 (Schwarz) + SIG 556 (Fekete) SIG 556 (Khaki) @@ -1587,6 +1593,7 @@ SIG 556 (Хаки) SIG 556 (khaki) SIG 556 (Khaki) + SIG 556 (Khaki) SIG 556 (Sand) @@ -1596,6 +1603,7 @@ SIG 556 (Песочный) SIG 556 (piaskowy) SIG 556 (Sand) + SIG 556 (Homok) SIG 556 (Camo) @@ -1605,6 +1613,7 @@ SIG 556 (Камо) SIG 556 (kamuflaż) SIG 556 (Camo) + SIG 556 (Terepmintás) SIG 556 (Woodland) @@ -1614,6 +1623,7 @@ SIG 556 (Лесной) SIG 556 (leśny) SIG 556 (Woodland) + SIG 556 (Erdőmintás) SIG 556 (provisional) spotter @@ -1623,6 +1633,7 @@ SIG 556 (provisional) корректировщик SIG 556 (prowizoryczny) obserwator SIG 556 (provisorisch) Beobachter + SIG 556 (Ellátmányi) Megfigyelő ASP-1 Kir @@ -1632,6 +1643,7 @@ ASP-1 Kir ASP-1 Kir ASP-1 Kir + ASP-1 Kir ASP-1 Kir (Black) @@ -1641,6 +1653,7 @@ ASP-1 Kir (Чёрный) ASP-1 Kir (Schwarz) ASP-1 Kir (czarny) + ASP-1 Kir (Fekete) ASP-1 Kir (Tan) @@ -1650,6 +1663,7 @@ ASP-1 Kir (Бронзовый) ASP-1 Kir (Hellbraun) ASP-1 Kir (Tan) + ASP-1 Kir (Cserszín) Cyrus @@ -1659,6 +1673,7 @@ Cyrus Cyrus Cyrus + Cyrus Cyrus (Black) @@ -1668,6 +1683,7 @@ Cyrus (Чёрный) Cyrus (Schwarz) Cyrus (czarny) + Cyrus (Fekete) Cyrus (Hex) @@ -1677,6 +1693,7 @@ Cyrus (Гекс) Cyrus (Hex) Cyrus (hex) + Cyrus (Hex) Cyrus (Tan) @@ -1686,6 +1703,7 @@ Cyrus (Бронза) Cyrus (Hellbraun) Cyrus (podpalany) + Cyrus (Cserszín) M14 @@ -1695,6 +1713,7 @@ M14 M14 M14 + M14 M14 (Camo) @@ -1704,6 +1723,7 @@ M14 (Камо) M14 (kamuflaż) M14 (Camo) + M14 (Terepmintás) M14 (Olive) @@ -1713,6 +1733,7 @@ M14 (Олива) M14 (oliwkowy) M14 (Olive) + M14 (Olíva) HK121 @@ -1722,6 +1743,7 @@ HK121 HK121 HK121 + HK121 HK121 (Hex) @@ -1731,6 +1753,7 @@ HK121 (Гекс) HK121 (Hex) HK121 (hex) + HK121 (Hex) HK121 (Tan) @@ -1740,6 +1763,7 @@ HK121 (Бронза) HK121 (Hellbraun) HK121 (podpalany) + HK121 (Cserszín) LWMMG @@ -1749,6 +1773,7 @@ LWMMG LWMMG LWMMG + LWMMG LWMMG (MTP) @@ -1758,6 +1783,7 @@ LWMMG (MTP) LWMMG (MTP) LWMMG (MTP) + LWMMG (MTP) LWMMG (Black) @@ -1767,6 +1793,7 @@ LWMMG (Чёрный) LWMMG (czarny) LWMMG (Schwarz) + LWMMG (Fekete) LWMMG (Sand) @@ -1776,6 +1803,7 @@ LWMMG (Песочный) LWMMG (piaskowy) LWMMG (Sand) + LWMMG (Homok) - + \ No newline at end of file diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml index 8d0305c3ed7..1e95313e0ef 100644 --- a/addons/respawn/stringtable.xml +++ b/addons/respawn/stringtable.xml @@ -56,6 +56,7 @@ Точка сбора Синих (База) Punkt zbiórki Zachodu (Baza) Point de ralliement OUEST (Base) + Gyülekezőpont, Nyugat (Bázis) Rallypoint East (Base) @@ -64,6 +65,7 @@ Точка сбора Красных (База) Punkt zbiórki Wschodu (Baza) Point de ralliement EST (Base) + Gyülekezőpont, Kelet (Bázis) Rallypoint Independent (Base) @@ -72,6 +74,7 @@ Точка сбора Независимых (База) Punkt zbiórki Ruchu oporu (Baza) Point de ralliement Indépendant (Base) + Gyülekezőpont, Független (Bázis) Rallypoint West @@ -80,6 +83,7 @@ Точка сбора Синих Punkt zbiórki Zachodu Point de ralliement OUEST + Gyülekezőpont, Nyugat Rallypoint East @@ -88,6 +92,7 @@ Точка сбора Красных Punkt zbiórki Wschodu Point de ralliement EST + Gyülekezőpont, Kelet Rallypoint Independent @@ -96,6 +101,7 @@ Точка сбора Независимых Punkt zbiórki Ruchu oporu Point de ralliement Indépendant + Gyülekezőpont, Független - + \ No newline at end of file diff --git a/addons/scopes/stringtable.xml b/addons/scopes/stringtable.xml index d84f0932af8..257b78892b0 100644 --- a/addons/scopes/stringtable.xml +++ b/addons/scopes/stringtable.xml @@ -9,6 +9,7 @@ Regola leggermente alzata in alto Hausse + Kleine Korrektur nach oben + Enyhe állítás fel Minor adjustment down @@ -18,6 +19,7 @@ Regola leggermente alzata in basso Hausse - Kleine Korrektur nach unten + Enyhe állítás le Minor adjustment right @@ -27,6 +29,7 @@ Regola leggermente il tiro a destra Dérive + Kleine Korrektur nach rechts + Enyhe állítás jobbra Minor adjustment left @@ -36,6 +39,7 @@ Regola leggermete il tiro a sinistra Dérive - Kleine Korrektur nach links + Enyhe állítás balra Major adjustment up @@ -45,6 +49,7 @@ Regola l'alzata in alto Hausse +++ Große Korrektur nach oben + Nagy állítás fel Major adjustment down @@ -54,6 +59,7 @@ Regola l'alzata in basso Hausse --- Große Korrektur nach unten + Nagy állítás le Major adjustment right @@ -63,6 +69,7 @@ Regola il tiro a destra Dérive +++ Große Korrektur nach rechts + Nagy állítás jobbra Major adjustment left @@ -72,6 +79,7 @@ Regola il tiro a sinistra Dérive --- Große Korrektur nach links + Nagy állítás balra Set zero adjustment @@ -81,6 +89,7 @@ Resetta i valori del tiro RAZ corrections Auf 0 justieren + Állítások nullázása - + \ No newline at end of file diff --git a/addons/weather/stringtable.xml b/addons/weather/stringtable.xml index 4e0723bb7ab..0b891b3a785 100644 --- a/addons/weather/stringtable.xml +++ b/addons/weather/stringtable.xml @@ -9,6 +9,7 @@ Mostrar información del viento Mostra informazioni sul vento Zeige Windinformationen + Széladatok mutatása - + \ No newline at end of file From 0f135c5dab1b84f59635970932c0429e4022a2de Mon Sep 17 00:00:00 2001 From: bux578 Date: Thu, 30 Apr 2015 15:23:52 +0200 Subject: [PATCH 102/171] fix ballistics stringtable --- addons/ballistics/stringtable.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index 5826461a39f..eea2f0cb9e9 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -788,7 +788,7 @@ Cargador de 30 balas de 5.56mm (M995 AP) Магазин из 30-ти 5.56 мм (M995 бронебойные) 5,56mm 30-Patronen-Magazin (M995AP) - 5.56mm 30Rnd Mag (M995 AP) + 5.56mm 30Rnd Mag (M995 AP) 5.56mm AP @@ -1022,7 +1022,6 @@ Calibre: 7.62x51mm NATO (M993 AP)<br />Balas: 20 Калибр: 7,62x51 мм NATO (M993 бронебойные)<br />Патронов: 20 Kaliber: 7,62x51mm NATO (M993 AP)<br />Patronen: 20 - Calibro: 7.62x51 mm NATO (M993 AP)<br />Munizioni: 20 @@ -1137,9 +1136,9 @@ 6.5mm Creedmor 30Rnd Mag Magazynek 6,5mm Creedmor 30rd 6.5mm Creedmor 30Rnd Mag - Магазин из 30-ти 6,5 мм Creedmor + Магазин из 30-ти 6,5 мм Creedmor 6,5mm Creedmor 30-Patronen-Magazin - Chargeur 6.5mm Creedmor 30Cps + Chargeur 6.5mm Creedmor 30Cps 6.5mm CM From 7568773ecee066cf566a8c3454c203060e4f8c7f Mon Sep 17 00:00:00 2001 From: jaynus Date: Thu, 30 Apr 2015 09:00:09 -0700 Subject: [PATCH 103/171] class localize and disable all guidance/locking. --- addons/javelin/CfgVehicles.hpp | 42 ++++++++++++++++++-- addons/javelin/CfgWeapons.hpp | 40 +++++++++++++++++-- addons/javelin/functions/fnc_onFired.sqf | 5 +++ addons/javelin/functions/fnc_onOpticDraw.sqf | 6 ++- 4 files changed, 86 insertions(+), 7 deletions(-) diff --git a/addons/javelin/CfgVehicles.hpp b/addons/javelin/CfgVehicles.hpp index 5ea7e3327cb..48781036ade 100644 --- a/addons/javelin/CfgVehicles.hpp +++ b/addons/javelin/CfgVehicles.hpp @@ -9,12 +9,48 @@ class CfgVehicles { class MainTurret; }; }; + class AT_01_base_F: StaticMGWeapon {}; - - class AT_01_base_F: StaticMGWeapon { + class B_static_AT_F: AT_01_base_F { class Turrets : Turrets { class MainTurret : MainTurret { - weapons[] = { "missiles_titan_static_at" }; + weapons[] = { QGVAR(Titan_Static) }; + magazines[] = {"1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles"}; + + turretInfoType = "ACE_RscOptics_javelin"; + gunnerOpticsModel = PATHTOF(data\reticle_titan.p3d); + opticsZoomMin = 0.08333; + opticsZoomMax = 0.04167; + opticsZoomInit = 0.08333; + opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1"}; + opticsFlare = 0; + discretefov[] = {0.08333,0.04167}; + discreteInitIndex = 0; + }; + }; + }; + class O_static_AT_F: AT_01_base_F { + class Turrets : Turrets { + class MainTurret : MainTurret { + weapons[] = { QGVAR(Titan_Static) }; + magazines[] = {"1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles"}; + + turretInfoType = "ACE_RscOptics_javelin"; + gunnerOpticsModel = PATHTOF(data\reticle_titan.p3d); + opticsZoomMin = 0.08333; + opticsZoomMax = 0.04167; + opticsZoomInit = 0.08333; + opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1"}; + opticsFlare = 0; + discretefov[] = {0.08333,0.04167}; + discreteInitIndex = 0; + }; + }; + }; + class I_static_AT_F: AT_01_base_F { + class Turrets : Turrets { + class MainTurret : MainTurret { + weapons[] = { QGVAR(Titan_Static) }; magazines[] = {"1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles","1Rnd_GAT_missiles"}; turretInfoType = "ACE_RscOptics_javelin"; diff --git a/addons/javelin/CfgWeapons.hpp b/addons/javelin/CfgWeapons.hpp index 1392cd1a562..1bbf713b3b5 100644 --- a/addons/javelin/CfgWeapons.hpp +++ b/addons/javelin/CfgWeapons.hpp @@ -11,7 +11,9 @@ class CfgWeapons { }; - class missiles_titan_at : missiles_titan { + class missiles_titan_at : missiles_titan { }; + class GVAR(Titan_Static) : missiles_titan_at { + GVAR(enabled) = 1; weaponInfoType = "ACE_RscOptics_javelin"; modelOptics = PATHTOF(data\reticle_titan.p3d); @@ -20,18 +22,50 @@ class CfgWeapons { lockingTargetSound[] = {"",0,1}; lockedTargetSound[] = {"",0,1}; }; - class missiles_titan_static_at : missiles_titan_at { }; // @TODO: AA by default, motherfuckers class launch_Titan_base : Launcher_Base_F {}; - class launch_Titan_short_base : launch_Titan_base { + class launch_Titan_short_base : launch_Titan_base { }; + + class launch_B_Titan_short_F: launch_Titan_short_base { + GVAR(enabled) = 1; + weaponInfoType = "ACE_RscOptics_javelin"; + modelOptics = PATHTOF(data\reticle_titan.p3d); + + canLock = 0; + + lockingTargetSound[] = {"",0,1}; + lockedTargetSound[] = {"",0,1}; + }; + class launch_I_Titan_short_F: launch_Titan_short_base { + GVAR(enabled) = 1; + weaponInfoType = "ACE_RscOptics_javelin"; + modelOptics = PATHTOF(data\reticle_titan.p3d); + + canLock = 0; + + lockingTargetSound[] = {"",0,1}; + lockedTargetSound[] = {"",0,1}; + }; + class launch_O_Titan_short_F: launch_Titan_short_base { + GVAR(enabled) = 1; weaponInfoType = "ACE_RscOptics_javelin"; modelOptics = PATHTOF(data\reticle_titan.p3d); canLock = 0; + lockingTargetSound[] = {"",0,1}; + lockedTargetSound[] = {"",0,1}; + }; + class launch_Titan_short_F: launch_Titan_short_base { + GVAR(enabled) = 1; + weaponInfoType = "ACE_RscOptics_javelin"; + modelOptics = PATHTOF(data\reticle_titan.p3d); + + canLock = 0; + lockingTargetSound[] = {"",0,1}; lockedTargetSound[] = {"",0,1}; }; diff --git a/addons/javelin/functions/fnc_onFired.sqf b/addons/javelin/functions/fnc_onFired.sqf index 8c6590f5df0..4c0f798167d 100644 --- a/addons/javelin/functions/fnc_onFired.sqf +++ b/addons/javelin/functions/fnc_onFired.sqf @@ -6,10 +6,15 @@ PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile); // Bail on not missile if( _shooter != ACE_player) exitWith { false }; +/* if( ! ([ (configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) ), "launch_Titan_short_base"] call EFUNC(common,inheritsFrom)) && { ! ([ (configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) ), "missiles_titan_at"] call EFUNC(common,inheritsFrom)) } ) exitWith { }; +*/ +_configs = configProperties [configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) >> QGVAR(enabled), "true", false]; +if( (count _configs) < 1) exitWith {}; +_config = _configs select 1; _pfh_handle = uiNamespace getVariable ["ACE_RscOptics_javelin_PFH", nil]; if(!isNil "_pfh_handle") then { diff --git a/addons/javelin/functions/fnc_onOpticDraw.sqf b/addons/javelin/functions/fnc_onOpticDraw.sqf index 8fa96c036a1..134260c064b 100644 --- a/addons/javelin/functions/fnc_onOpticDraw.sqf +++ b/addons/javelin/functions/fnc_onOpticDraw.sqf @@ -35,10 +35,14 @@ _soundTime = _args select 4; _randomLockInterval = _args select 5; _fireDisabledEH = _args select 6; +_configs = configProperties [configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) >> QGVAR(enabled), "true", false]; + +/* if( ! ([ (configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) ), "launch_Titan_short_base"] call EFUNC(common,inheritsFrom)) && { ! ([ (configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) ), "missiles_titan_at"] call EFUNC(common,inheritsFrom)) } - ) exitWith { +*/ +if((count _config) < 1) exitWith { __JavelinIGUITargeting ctrlShow false; __JavelinIGUITargetingGate ctrlShow false; __JavelinIGUITargetingLines ctrlShow false; From 21cc0db28f03a9d7fe74dae54b1021a5592b4b14 Mon Sep 17 00:00:00 2001 From: jaynus Date: Thu, 30 Apr 2015 09:04:29 -0700 Subject: [PATCH 104/171] Correctly look up configs. --- addons/missileguidance/functions/fnc_onFired.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/missileguidance/functions/fnc_onFired.sqf b/addons/missileguidance/functions/fnc_onFired.sqf index 6c6c2717bff..5145258cd35 100644 --- a/addons/missileguidance/functions/fnc_onFired.sqf +++ b/addons/missileguidance/functions/fnc_onFired.sqf @@ -17,7 +17,7 @@ if(! (_ammo isKindOf "MissileBase") ) exitWith { false }; _configs = configProperties [configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON), "true", false]; if( (count _configs) < 1) exitWith {}; -_config = _configs select 1; +_config = (configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON)); _enabled = getNumber ( _config >> "enabled"); // Bail if guidance is not enabled From b9c1936efc93c599125f204f2bdb8f7e3ba86474 Mon Sep 17 00:00:00 2001 From: Kavinsky Date: Thu, 30 Apr 2015 18:51:30 +0200 Subject: [PATCH 105/171] changed laserpointer to allow 3rd party laser pointers. now there is a new config option for CfgWeapons called ace_laserpointer, number with value 0 no laser, 1 red laser, 2 green laser --- addons/laserpointer/CfgWeapons.hpp | 4 ++++ addons/laserpointer/functions/fnc_onDraw.sqf | 13 ++++++++++--- documentation/development/ace3-config-entries.md | 3 +++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/addons/laserpointer/CfgWeapons.hpp b/addons/laserpointer/CfgWeapons.hpp index 4f6a61c83a0..6223c3a9880 100644 --- a/addons/laserpointer/CfgWeapons.hpp +++ b/addons/laserpointer/CfgWeapons.hpp @@ -20,6 +20,8 @@ class CfgWeapons { ACE_nextModeClass = "acc_pointer_IR"; ACE_modeDescription = "$STR_ACE_Laserpointer_Laser"; + ACE_laserpointer = 1; + author = "$STR_ACE_Common_ACETeam"; _generalMacro = "ACE_acc_pointer_red"; scope = 1; @@ -79,6 +81,8 @@ class CfgWeapons { ACE_nextModeClass = "ACE_acc_pointer_green_IR"; ACE_modeDescription = "$STR_ACE_Laserpointer_Laser"; + ACE_laserpointer = 2; + author = "$STR_ACE_Common_ACETeam"; _generalMacro = "ACE_acc_pointer_green"; scope = 2; diff --git a/addons/laserpointer/functions/fnc_onDraw.sqf b/addons/laserpointer/functions/fnc_onDraw.sqf index 0e4ddf981a1..e3236f7cb55 100644 --- a/addons/laserpointer/functions/fnc_onDraw.sqf +++ b/addons/laserpointer/functions/fnc_onDraw.sqf @@ -25,10 +25,17 @@ _isIR = _isIR == 1; default {""}; }; - _laserID = ["ACE_acc_pointer_red", "ACE_acc_pointer_green"] find _laser; + if (_laser != "") then { + _cacheName = format ["ACE_laserpointer_%1", _laser]; + _laserID = missionNamespace getVariable [_cacheName, -1]; + if (missionNamespace getVariable [_cacheName, -1] == -1) then { + _laserID = getNumber (configFile >> "CfgWeapons" >> _laser >> "ACE_laserpointer"); + missionNamespace setVariable [_cacheName, _laserID]; + }; - if (_laserID > -1 && {_x isFlashlightOn _weapon}) then { - [_x, 50, _laserID == 1 || _isIR] call FUNC(drawLaserpoint); + if (_laserID > 0 && {_x isFlashlightOn _weapon}) then { + [_x, 50, _laserID == 2 || _isIR] call FUNC(drawLaserpoint); + }; }; } forEach GVAR(nearUnits); diff --git a/documentation/development/ace3-config-entries.md b/documentation/development/ace3-config-entries.md index 78f80228569..10331724699 100644 --- a/documentation/development/ace3-config-entries.md +++ b/documentation/development/ace3-config-entries.md @@ -54,6 +54,9 @@ ace_detonator ace_barrelTwist ace_twistDirection ace_barrelLength +ace_laserpointer +ace_nextmodeclass +ace_modedescription ``` From 367da1f4bfaae7e0e0ee36d44a9058b01debd799 Mon Sep 17 00:00:00 2001 From: bux578 Date: Thu, 30 Apr 2015 19:36:35 +0200 Subject: [PATCH 106/171] cleaned up insignias --- addons/common/data/insignia_ace3logo_ca.paa | Bin 33382 -> 33082 bytes addons/common/data/insignia_banana_ca.paa | Bin 36279 -> 36749 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/addons/common/data/insignia_ace3logo_ca.paa b/addons/common/data/insignia_ace3logo_ca.paa index 04640aa187fdd60644c9daebc8e9547f13ada719..5a8ca321d7a59e68d8878fedc7877666eb7427c6 100644 GIT binary patch delta 5266 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�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 MBtgjWGB2zA3ueQP-T(jq literal 36279 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 Qj6 Date: Thu, 30 Apr 2015 20:44:43 +0200 Subject: [PATCH 107/171] Improved unloadPerson function Removed caller parameter. --- addons/common/functions/fnc_unloadPerson.sqf | 53 +++++++------------ .../functions/fnc_actionUnloadUnit.sqf | 2 +- 2 files changed, 20 insertions(+), 35 deletions(-) diff --git a/addons/common/functions/fnc_unloadPerson.sqf b/addons/common/functions/fnc_unloadPerson.sqf index 33c0e9c0c25..60e4f56d7da 100644 --- a/addons/common/functions/fnc_unloadPerson.sqf +++ b/addons/common/functions/fnc_unloadPerson.sqf @@ -1,59 +1,44 @@ -/** - * fn_unloadPerson_f.sqf - * @Descr: Unload a person from a vehicle - * @Author: Glowbal +/* + * Author: Glowbal + * Unload a person from a vehicle * - * @Arguments: [caller OBJECT, unit OBJECT] - * @Return: BOOL Returns true if succesfully unloaded person - * @PublicAPI: true + * Arguments: + * 0: unit + * + * Return Value: + * Returns true if succesfully unloaded person + * + * Public: No */ #include "script_component.hpp" #define GROUP_SWITCH_ID QUOTE(FUNC(loadPerson)) -private ["_caller", "_unit","_vehicle", "_loaded"]; -_caller = [_this, 0, ObjNull,[ObjNull]] call BIS_fnc_Param; -_unit = [_this, 1, ObjNull,[ObjNull]] call BIS_fnc_Param; +private ["_unit","_vehicle", "_loaded", "_emptyPos"]; +_unit = _this select 0; _vehicle = vehicle _unit; if (_vehicle == _unit) exitwith {false;}; if !(speed _vehicle <1 && (((getpos _vehicle) select 2) < 2)) exitwith {false;}; -if (!([_caller] call FUNC(isAwake))) exitwith{false;}; -moveOut _unit; +_emptyPos = ((getPos _vehicle) findEmptyPosition [0, 10, typeof _unit]); +if (count _emptyPos == 0) exitwith {false}; + +_unit setPos _emptyPos; unassignVehicle _unit; if (!alive _unit) then { _unit action ["Eject", vehicle _unit]; }; -[_unit, false, GROUP_SWITCH_ID, side group _caller] call FUNC(switchToGroupSide); +[_unit, false, GROUP_SWITCH_ID, side group _unit] call FUNC(switchToGroupSide); _loaded = _vehicle getvariable [QGVAR(loaded_persons),[]]; _loaded = _loaded - [_unit]; _vehicle setvariable [QGVAR(loaded_persons),_loaded,true]; if (!([_unit] call FUNC(isAwake))) then { - _handle = [_unit,_vehicle] spawn { - private ["_unit","_vehicle"]; - _unit = _this select 0; - _vehicle = _this select 1; - waituntil {vehicle _unit != _vehicle}; - [_unit,([_unit] call FUNC(getDeathAnim)), 1, true] call FUNC(doAnimation); - [format["Unit should move into death anim: %1", _unit]] call FUNC(debug); - }; -} else { - if ([_unit] call FUNC(isArrested)) then { - _handle = [_unit,_vehicle] spawn { - _unit = _this select 0; - _vehicle = _this select 1; - waituntil {vehicle _unit != _vehicle}; - [_unit,"UnaErcPoslechVelitele2", 1] call FUNC(doAnimation); - [format["Unit should move into arrested anim: %1", _unit]] call FUNC(debug); - }; - } else { - [format["Unit should move into normal anim: %1", _unit]] call FUNC(debug); - }; + [_unit,([_unit] call FUNC(getDeathAnim)), 1, true] call FUNC(doAnimation); }; -true; \ No newline at end of file +true; diff --git a/addons/medical/functions/fnc_actionUnloadUnit.sqf b/addons/medical/functions/fnc_actionUnloadUnit.sqf index fd56e6d6bd9..bb66147f2a7 100644 --- a/addons/medical/functions/fnc_actionUnloadUnit.sqf +++ b/addons/medical/functions/fnc_actionUnloadUnit.sqf @@ -24,7 +24,7 @@ _drag = if (count _this > 2) then {_this select 2} else {false}; if (vehicle _target == _target) exitwith {}; if (([_target] call cse_fnc_isAwake)) exitwith {}; -if ([_caller, _target] call EFUNC(common,unloadPerson)) then { +if ([_target] call EFUNC(common,unloadPerson)) then { if (_drag) then { if ((vehicle _caller) == _caller) then { [[_caller, _target, true], QUOTE(DFUNC(actionDragUnit)), _caller, false] call EFUNC(common,execRemoteFnc); // TODO replace by event From 8d358f3ab577b5dabb9f99bb7f6d60d641eca003 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Thu, 30 Apr 2015 20:44:59 +0200 Subject: [PATCH 108/171] can only carry/drag units that are not in a vehicle --- addons/dragging/functions/fnc_canCarry.sqf | 2 +- addons/dragging/functions/fnc_canDrag.sqf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/dragging/functions/fnc_canCarry.sqf b/addons/dragging/functions/fnc_canCarry.sqf index 0fc5c074d6f..6472124aef8 100644 --- a/addons/dragging/functions/fnc_canCarry.sqf +++ b/addons/dragging/functions/fnc_canCarry.sqf @@ -22,4 +22,4 @@ if !([_unit, _target, []] call EFUNC(common,canInteractWith)) exitWith {false}; // a static weapon has to be empty for dragging if ((typeOf _target) isKindOf "StaticWeapon" && {count crew _target > 0}) exitWith {false}; -alive _target && {_target getVariable [QGVAR(canCarry), false]} && {animationState _target in ["", "unconscious"] || (_target getvariable ["ACE_isUnconscious", false]) || (_target isKindOf "CAManBase" && {(_target getHitPointDamage "HitLegs") > 0.4})} +alive _target && {vehicle _target == _target} && {_target getVariable [QGVAR(canCarry), false]} && {animationState _target in ["", "unconscious"] || (_target getvariable ["ACE_isUnconscious", false]) || (_target isKindOf "CAManBase" && {(_target getHitPointDamage "HitLegs") > 0.4})} diff --git a/addons/dragging/functions/fnc_canDrag.sqf b/addons/dragging/functions/fnc_canDrag.sqf index 92744553fdc..7eedfce179a 100644 --- a/addons/dragging/functions/fnc_canDrag.sqf +++ b/addons/dragging/functions/fnc_canDrag.sqf @@ -22,4 +22,4 @@ if !([_unit, _target, []] call EFUNC(common,canInteractWith)) exitWith {false}; // a static weapon has to be empty for dragging if ((typeOf _target) isKindOf "StaticWeapon" && {count crew _target > 0}) exitWith {false}; -alive _target && {_target getVariable [QGVAR(canDrag), false]} && {animationState _target in ["", "unconscious"] || (_target getvariable ["ACE_isUnconscious", false]) || (_target isKindOf "CAManBase" && {(_target getHitPointDamage "HitLegs") > 0.4})}; \ No newline at end of file +alive _target && {vehicle _target == _target} && {_target getVariable [QGVAR(canDrag), false]} && {animationState _target in ["", "unconscious"] || (_target getvariable ["ACE_isUnconscious", false]) || (_target isKindOf "CAManBase" && {(_target getHitPointDamage "HitLegs") > 0.4})}; \ No newline at end of file From 67370f334028fdabb381515fe137907fbb46bc85 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Thu, 30 Apr 2015 20:49:38 +0200 Subject: [PATCH 109/171] Handles waking up --- addons/common/XEH_postInit.sqf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf index 7dc07743ed9..53de6b5d694 100644 --- a/addons/common/XEH_postInit.sqf +++ b/addons/common/XEH_postInit.sqf @@ -73,7 +73,7 @@ if (_currentVersion != _previousVersion) then { // Synced ACE events // Handle JIP scenario if(!isServer) then { - ["PlayerJip", { + ["PlayerJip", { diag_log text format["[ACE] * JIP event synchronization initialized"]; ["SEH_all", [player]] call FUNC(serverEvent); }] call FUNC(addEventHandler); @@ -112,7 +112,7 @@ enableCamShake true; // Set the name for the current player ["playerChanged", { EXPLODE_2_PVT(_this,_newPlayer,_oldPlayer); - + if (alive _newPlayer) then { [_newPlayer] call FUNC(setName) }; @@ -227,6 +227,7 @@ GVAR(OldIsCamera) = false; ["displayTextStructured", FUNC(displayTextStructured)] call FUNC(addEventhandler); ["displayTextPicture", FUNC(displayTextPicture)] call FUNC(addEventhandler); +["medical_onUnconscious", {if (local (_this select 0) && {!(_this select 1)}) then {[ _this select 0, false, QUOTE(FUNC(loadPerson)), west /* dummy side */] call FUNC(switchToGroupSide);};}] call FUNC(addEventhandler); ["notOnMap", {!visibleMap}] call FUNC(addCanInteractWithCondition); ["isNotInside", { @@ -243,10 +244,10 @@ GVAR(OldIsCamera) = false; if(isMultiplayer && { time > 0 || isNull player } ) then { // We are jipping! Get ready and wait, and throw the event [{ - if(!(isNull player)) then { + if(!(isNull player)) then { ["PlayerJip", [player] ] call FUNC(localEvent); [(_this select 1)] call cba_fnc_removePerFrameHandler; - }; + }; }, 0, []] call cba_fnc_addPerFrameHandler; }; From 8c8e310d663ad46816d84d4c6f85a6bceb0f1dad Mon Sep 17 00:00:00 2001 From: commy2 Date: Thu, 30 Apr 2015 21:00:30 +0200 Subject: [PATCH 110/171] handle cursor mode --- addons/interact_menu/functions/fnc_handlePlayerChanged.sqf | 6 +++--- addons/interact_menu/functions/fnc_keyDown.sqf | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf b/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf index f1f6e78f6db..cff8bb10481 100644 --- a/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf +++ b/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf @@ -16,9 +16,9 @@ EXPLODE_2_PVT(_this,_newUnit,_oldUnit); // add to new unit private "_ehid"; _ehid = [_newUnit, "DefaultAction", {GVAR(openedMenuType) >= 0}, { - if !(GVAR(actionOnKeyRelease)) then { - [GVAR(openedMenuType),true] call FUNC(keyUp); - }; + if !(GVAR(actionOnKeyRelease)) then { + [GVAR(openedMenuType),true] call FUNC(keyUp); + }; }] call EFUNC(common,addActionEventHandler); _newUnit setVariable [QGVAR(AAEHID), _ehid]; diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf index 9f1d0b9bcb2..d4e460c10f0 100644 --- a/addons/interact_menu/functions/fnc_keyDown.sqf +++ b/addons/interact_menu/functions/fnc_keyDown.sqf @@ -52,6 +52,12 @@ if (GVAR(useCursorMenu)) then { GVAR(cursorPos) = [_this select 1, _this select 2, 0]; }; }]; + // handles LMB in cursor mode when action on keyrelease is disabled + ((finddisplay 91919) displayctrl 91921) ctrlAddEventHandler ["MouseButtonDown", { + if !(GVAR(actionOnKeyRelease)) then { + [GVAR(openedMenuType),true] call FUNC(keyUp); + }; + }]; setMousePosition [0.5, 0.5]; }; From ba18f8b43002748576e9c044d57c293a46355ab1 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 30 Apr 2015 14:07:19 -0500 Subject: [PATCH 111/171] Handle Scaling --- .../functions/fnc_renderMenu.sqf | 37 +++++++++++++------ .../functions/fnc_setupTextColors.sqf | 8 ++-- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/addons/interact_menu/functions/fnc_renderMenu.sqf b/addons/interact_menu/functions/fnc_renderMenu.sqf index c4615d83374..c88b6cb862f 100644 --- a/addons/interact_menu/functions/fnc_renderMenu.sqf +++ b/addons/interact_menu/functions/fnc_renderMenu.sqf @@ -68,7 +68,7 @@ if !(_menuInSelectedPath) exitWith {true}; //BEGIN_COUNTER(children); -private ["_numChildren","_angleSpan","_angle","_angleInterval","_scale","_offset"]; +private ["_numChildren","_angleSpan","_angle","_angleInterval","_scaleX", "_scaleY", "_offset", "_textSize"]; _numChildren = count _activeChildren; _angleSpan = _maxAngleSpan min (55 * ((_numChildren) - 1)); if (_angleSpan >= 305) then { @@ -87,15 +87,30 @@ if (_numChildren == 1) then { }; // Scale menu based on the amount of children -_scale = if (GVAR(UseListMenu)) then { - 0.17 +_scaleX = if (GVAR(UseListMenu)) then { + _textSize = switch (GVAR(textSize)) do { + case (0): {0.75}; + case (1): {0.875}; + case (2): {1}; + case (3): {1.2}; + case (4): {1.4}; + }; + 0.17 * _textSize * 1.1 +} else { + _textSize = if (GVAR(textSize) > 2) then {1.3} else {1}; + _textSize * 0.17 * (((0.8 * (0.46 / sin (0.5 * _angleInterval))) min 1.1) max 0.5) +}; +_scaleY = if (GVAR(UseListMenu)) then { + 0.17 * 0.30 * 4/3 } else { - 0.17 * (((0.8 * (0.46 / sin (0.5 * _angleInterval))) min 1.1) max 0.5) + _textSize = if (GVAR(textSize) > 2) then {1.3} else {1}; + _textSize * 0.17 * 4/3 * (((0.8 * (0.46 / sin (0.5 * _angleInterval))) min 1.1) max 0.5) }; // Animate menu scale if (_menuInSelectedPath && (_menuDepth == count _path)) then { - _scale = _scale * (0.3 + 0.7 * (((diag_tickTime - GVAR(expandedTime)) * 8) min 1)); + _scaleX = _scaleX * (0.3 + 0.7 * (((diag_tickTime - GVAR(expandedTime)) * 8) min 1)); + _scaleY = _scaleY * (0.3 + 0.7 * (((diag_tickTime - GVAR(expandedTime)) * 8) min 1)); }; _target = _actionObject; @@ -107,12 +122,12 @@ _angle = _centerAngle - _angleSpan / 2; //BEGIN_COUNTER(children); private ["_offset","_newPos"]; _newPos = if (GVAR(UseListMenu)) then { - [(_sPos select 0) + _scale * 1.10, - (_sPos select 1) + _scale * 0.30 * 4/3 * (_foreachindex - _numChildren/2 + 0.5)]; - } else { - [(_sPos select 0) -_scale * cos _angle, - (_sPos select 1) +_scale * (sin _angle) * 4/3]; - }; + [(_sPos select 0) + _scaleX, + (_sPos select 1) + _scaleY * (_foreachindex - _numChildren/2 + 0.5)]; + } else { + [(_sPos select 0) - _scaleX * (cos _angle), + (_sPos select 1) + _scaleY * (sin _angle)]; + }; //drawLine3D [_pos, _newPos, [1,0,0,0.8]]; //END_COUNTER(children); diff --git a/addons/interact_menu/functions/fnc_setupTextColors.sqf b/addons/interact_menu/functions/fnc_setupTextColors.sqf index 0183e9e50b1..e26ef9dad8e 100644 --- a/addons/interact_menu/functions/fnc_setupTextColors.sqf +++ b/addons/interact_menu/functions/fnc_setupTextColors.sqf @@ -33,11 +33,11 @@ _mixColor = { _textColor = [GVAR(colorTextMin), GVAR(colorTextMax), 1] call _mixColor; _shadowColor = [GVAR(colorShadowMin), GVAR(colorShadowMax), 1] call _mixColor; _textSize = switch (GVAR(textSize)) do { - case (0): {0.6}; - case (1): {0.7}; + case (0): {0.4}; + case (1): {0.6}; case (2): {0.8}; - case (3): {0.9}; - case (4): {1}; + case (3): {1}; + case (4): {1.2}; }; GVAR(colorSelectedSettings) = format ["color='%1' size='%2' shadow='%3' shadowColor='%4' shadowOffset='0.06'", _textColor, _textSize, GVAR(shadowSetting), _shadowColor]; From 2f763a23101872f310f25f54a3ec5ef54bbdd125 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Thu, 30 Apr 2015 21:17:33 +0200 Subject: [PATCH 112/171] Disabled client setting for menu style --- addons/medical/ACE_Settings.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 36d882c9d8b..453c6962d21 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -155,6 +155,6 @@ class ACE_Settings { typeName = "SCALAR"; value = 0; values[] = {"$STR_ACE_Medical_useSelection", "$STR_ACE_Medical_useRadial"}; - isClientSettable = 1; + // isClientSettable = 1; }; }; From e7290feaa20c90afd5dbd6074a87722fd4e21584 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Thu, 30 Apr 2015 21:20:04 +0200 Subject: [PATCH 113/171] disabled radial option, so it isn't server selectable either --- addons/medical/ACE_Settings.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 453c6962d21..ef4a4f01625 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -154,7 +154,7 @@ class ACE_Settings { description = "$STR_ACE_Medical_menuTypeDescription"; typeName = "SCALAR"; value = 0; - values[] = {"$STR_ACE_Medical_useSelection", "$STR_ACE_Medical_useRadial"}; + values[] = {"$STR_ACE_Medical_useSelection"/*, "$STR_ACE_Medical_useRadial"*/}; // isClientSettable = 1; }; }; From b52906800fbd8c9cde993828010610fee695efdc Mon Sep 17 00:00:00 2001 From: bux578 Date: Thu, 30 Apr 2015 21:20:41 +0200 Subject: [PATCH 114/171] add translation guide --- documentation/development/how-to-translate-ace3.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/documentation/development/how-to-translate-ace3.md b/documentation/development/how-to-translate-ace3.md index b7e23fa5758..576cd3a98ba 100644 --- a/documentation/development/how-to-translate-ace3.md +++ b/documentation/development/how-to-translate-ace3.md @@ -24,3 +24,7 @@ This page describes in short how you can help translating ACE3 into your languag (The last three steps require some git knowledge, but there are a lot of tutorials out there) [GitHub for Windows help](https://windows.github.com/help.html) + + +#### Community Translation Guides +**Spanish:** [https://gist.github.com/Legolasindar/bf8a3b09cb835f72501f](https://gist.github.com/Legolasindar/bf8a3b09cb835f72501f) From 85669a9e92c28093114abf753a1ecf13f0deef4d Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 30 Apr 2015 22:01:09 +0200 Subject: [PATCH 115/171] Convert Medical stringtable key names to lowercase --- addons/medical/ACE_Medical_Actions.hpp | 162 +++++----- addons/medical/ACE_Medical_SelfActions.hpp | 80 ++--- addons/medical/ACE_Medical_Treatments.hpp | 22 +- addons/medical/CfgVehicles.hpp | 32 +- addons/medical/CfgWeapons.hpp | 96 +++--- .../fnc_actionCheckBloodPressureLocal.sqf | 22 +- .../functions/fnc_actionCheckPulseLocal.sqf | 18 +- .../functions/fnc_actionCheckResponse.sqf | 4 +- .../medical/functions/fnc_actionDiagnose.sqf | 16 +- .../fnc_displayPatientInformation.sqf | 10 +- .../functions/fnc_displayTriageCard.sqf | 2 +- .../medical/functions/fnc_getTriageStatus.sqf | 10 +- .../fnc_treatmentAdvanced_bandage.sqf | 2 +- .../fnc_treatmentAdvanced_medication.sqf | 2 +- addons/medical/functions/fnc_treatmentIV.sqf | 2 +- .../functions/fnc_treatmentTourniquet.sqf | 2 +- addons/medical/stringtable.xml | 292 +++++++++--------- addons/medical/ui/triagecard.hpp | 12 +- 18 files changed, 393 insertions(+), 393 deletions(-) diff --git a/addons/medical/ACE_Medical_Actions.hpp b/addons/medical/ACE_Medical_Actions.hpp index 98c61a330c4..9052df81da7 100644 --- a/addons/medical/ACE_Medical_Actions.hpp +++ b/addons/medical/ACE_Medical_Actions.hpp @@ -21,7 +21,7 @@ class ACE_Head { }; // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(treatment)); @@ -32,47 +32,47 @@ class ACE_Head { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\bandage.paa); }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\bandage.paa); }; class CheckPulse: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse"; + displayName = "$STR_ACE_Medical_Actions_CheckPulse"; condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(treatment)); EXCEPTIONS icon = ""; }; class CheckBloodPressure: CheckPulse { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure"; + displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure"; condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(treatment)); EXCEPTIONS }; class CheckResponse: CheckPulse { - displayName = "$STR_ACE_MEDICAL_CHECK_RESPONSE"; + displayName = "$STR_ACE_Medical_Check_Response"; condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckResponse')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckResponse')] call DFUNC(treatment)); EXCEPTIONS }; class Diagnose: CheckPulse { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Diagnose"; + displayName = "$STR_ACE_Medical_Actions_Diagnose"; condition = QUOTE([ARR_4(_player, _target, 'head', 'Diagnose')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'head', 'Diagnose')] call DFUNC(treatment)); EXCEPTIONS @@ -100,7 +100,7 @@ class ACE_Torso { icon = PATHTOF(UI\icons\bandage.paa); }; class PlaceInBodyBag { - displayName = "$STR_ACE_MEDICAL_PlaceInBodyBag"; + displayName = "$STR_ACE_Medical_PlaceInBodyBag"; distance = 2.0; condition = QUOTE([ARR_4(_player, _target, 'body', 'BodyBag')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'body', 'BodyBag')] call DFUNC(treatment)); @@ -111,7 +111,7 @@ class ACE_Torso { enableInside = 1; }; class TriageCard { - displayName = "$STR_ACE_MEDICAL_ACTIONS_TriageCard"; + displayName = "$STR_ACE_Medical_Actions_TriageCard"; distance = 2.0; condition = "true"; statement = QUOTE([ARR_2(_target, true)] call DFUNC(displayTriageCard)); @@ -125,7 +125,7 @@ class ACE_Torso { // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(treatment)); @@ -137,42 +137,42 @@ class ACE_Torso { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\bandage.paa); }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\bandage.paa); }; class SurgicalKit: fieldDressing { - displayName = "$STR_ACE_MEDICAL_USE_SURGICALKIT"; + displayName = "$STR_ACE_Medical_Use_SurgicalKit"; condition = QUOTE([ARR_4(_player, _target, 'body', 'SurgicalKit')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'body', 'SurgicalKit')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\surgicalKit.paa); }; class PersonalAidKit: fieldDressing { - displayName = "$STR_ACE_MEDICAL_USE_AID_KIT"; + displayName = "$STR_ACE_Medical_Use_Aid_Kit"; condition = QUOTE([ARR_4(_player, _target, 'body', 'PersonalAidKit')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'body', 'PersonalAidKit')] call DFUNC(treatment)); EXCEPTIONS icon = ""; }; class CPR: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CPR"; + displayName = "$STR_ACE_Medical_Actions_CPR"; condition = QUOTE([ARR_4(_player, _target, 'body', 'CPR')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'body', 'CPR')] call DFUNC(treatment)); EXCEPTIONS @@ -203,7 +203,7 @@ class ACE_ArmLeft { // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(treatment)); @@ -214,28 +214,28 @@ class ACE_ArmLeft { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\bandage.paa); }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\bandage.paa); }; class Tourniquet: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; + displayName = "$STR_ACE_Medical_Actions_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(treatment)); EXCEPTIONS @@ -263,75 +263,75 @@ class ACE_ArmLeft { icon = PATHTOF(UI\icons\autoInjector.paa); }; class BloodIV: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_1000"; + displayName = "$STR_ACE_Medical_Actions_Blood4_1000"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\iv.paa); }; class BloodIV_500: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_500"; + displayName = "$STR_ACE_Medical_Actions_Blood4_500"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class BloodIV_250: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_250"; + displayName = "$STR_ACE_Medical_Actions_Blood4_250"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'BloodIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_1000"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_1000"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV_500: PlasmaIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_500"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_500"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV_250: PlasmaIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_250"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_250"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PlasmaIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_1000"; + displayName = "$STR_ACE_Medical_Actions_Saline4_1000"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV_500: SalineIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_500"; + displayName = "$STR_ACE_Medical_Actions_Saline4_500"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV_250: SalineIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_250"; + displayName = "$STR_ACE_Medical_Actions_Saline4_250"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'SalineIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class CheckPulse: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse"; + displayName = "$STR_ACE_Medical_Actions_CheckPulse"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(treatment)); EXCEPTIONS icon = ""; }; class CheckBloodPressure: CheckPulse { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure"; + displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(treatment)); EXCEPTIONS }; class RemoveTourniquet: Tourniquet { - displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; + displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(treatment)); EXCEPTIONS @@ -361,7 +361,7 @@ class ACE_ArmRight { // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(treatment)); @@ -372,26 +372,26 @@ class ACE_ArmRight { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(treatment)); EXCEPTIONS }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(treatment)); EXCEPTIONS }; class Tourniquet: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; + displayName = "$STR_ACE_Medical_Actions_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(treatment)); EXCEPTIONS @@ -417,75 +417,75 @@ class ACE_ArmRight { EXCEPTIONS }; class BloodIV: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_1000"; + displayName = "$STR_ACE_Medical_Actions_Blood4_1000"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\iv.paa); }; class BloodIV_500: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_500"; + displayName = "$STR_ACE_Medical_Actions_Blood4_500"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class BloodIV_250: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_250"; + displayName = "$STR_ACE_Medical_Actions_Blood4_250"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'BloodIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_1000"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_1000"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV_500: PlasmaIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_500"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_500"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV_250: PlasmaIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_250"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_250"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PlasmaIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_1000"; + displayName = "$STR_ACE_Medical_Actions_Saline4_1000"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV_500: SalineIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_500"; + displayName = "$STR_ACE_Medical_Actions_Saline4_500"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV_250: SalineIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_250"; + displayName = "$STR_ACE_Medical_Actions_Saline4_250"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'SalineIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class CheckPulse: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse"; + displayName = "$STR_ACE_Medical_Actions_CheckPulse"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(treatment)); EXCEPTIONS icon = ""; }; class CheckBloodPressure: CheckPulse { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure"; + displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(treatment)); EXCEPTIONS }; class RemoveTourniquet: Tourniquet { - displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; + displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(treatment)); EXCEPTIONS @@ -517,7 +517,7 @@ class ACE_LegLeft { // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(treatment)); @@ -528,26 +528,26 @@ class ACE_LegLeft { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(treatment)); EXCEPTIONS }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(treatment)); EXCEPTIONS }; class Tourniquet: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; + displayName = "$STR_ACE_Medical_Actions_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(treatment)); EXCEPTIONS @@ -574,62 +574,62 @@ class ACE_LegLeft { EXCEPTIONS }; class BloodIV: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_1000"; + displayName = "$STR_ACE_Medical_Actions_Blood4_1000"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\iv.paa); }; class BloodIV_500: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_500"; + displayName = "$STR_ACE_Medical_Actions_Blood4_500"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class BloodIV_250: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_250"; + displayName = "$STR_ACE_Medical_Actions_Blood4_250"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'BloodIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_1000"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_1000"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV_500: PlasmaIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_500"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_500"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV_250: PlasmaIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_250"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_250"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PlasmaIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_1000"; + displayName = "$STR_ACE_Medical_Actions_Saline4_1000"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV_500: SalineIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_500"; + displayName = "$STR_ACE_Medical_Actions_Saline4_500"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV_250: SalineIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_250"; + displayName = "$STR_ACE_Medical_Actions_Saline4_250"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'SalineIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class RemoveTourniquet: Tourniquet { - displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; + displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(treatment)); EXCEPTIONS @@ -660,7 +660,7 @@ class ACE_LegRight { // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(treatment)); @@ -671,26 +671,26 @@ class ACE_LegRight { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(treatment)); EXCEPTIONS }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(treatment)); EXCEPTIONS }; class Tourniquet: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; + displayName = "$STR_ACE_Medical_Actions_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(treatment)); EXCEPTIONS @@ -716,62 +716,62 @@ class ACE_LegRight { EXCEPTIONS }; class BloodIV: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_1000"; + displayName = "$STR_ACE_Medical_Actions_Blood4_1000"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV')] call DFUNC(treatment)); EXCEPTIONS icon = PATHTOF(UI\icons\iv.paa); }; class BloodIV_500: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_500"; + displayName = "$STR_ACE_Medical_Actions_Blood4_500"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class BloodIV_250: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Blood4_250"; + displayName = "$STR_ACE_Medical_Actions_Blood4_250"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'BloodIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_1000"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_1000"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV_500: PlasmaIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_500"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_500"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class PlasmaIV_250: PlasmaIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Plasma4_250"; + displayName = "$STR_ACE_Medical_Actions_Plasma4_250"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PlasmaIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV: BloodIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_1000"; + displayName = "$STR_ACE_Medical_Actions_Saline4_1000"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV_500: SalineIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_500"; + displayName = "$STR_ACE_Medical_Actions_Saline4_500"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV_500')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV_500')] call DFUNC(treatment)); EXCEPTIONS }; class SalineIV_250: SalineIV { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Saline4_250"; + displayName = "$STR_ACE_Medical_Actions_Saline4_250"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV_250')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'SalineIV_250')] call DFUNC(treatment)); EXCEPTIONS }; class RemoveTourniquet: Tourniquet { - displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; + displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(canTreatCached)); statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(treatment)); EXCEPTIONS diff --git a/addons/medical/ACE_Medical_SelfActions.hpp b/addons/medical/ACE_Medical_SelfActions.hpp index add07c82625..5b98448664c 100644 --- a/addons/medical/ACE_Medical_SelfActions.hpp +++ b/addons/medical/ACE_Medical_SelfActions.hpp @@ -1,5 +1,5 @@ class Medical { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Medical"; + displayName = "$STR_ACE_Medical_Actions_Medical"; runOnHover = 1; hotkey = "M"; exceptions[] = {"isNotInside"}; @@ -29,7 +29,7 @@ class Medical { }; // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; @@ -40,35 +40,35 @@ class Medical { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\bandage.paa); }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\bandage.paa); }; class CheckPulse: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse"; + displayName = "$STR_ACE_Medical_Actions_CheckPulse"; condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(treatment)); icon = ""; }; class CheckBloodPressure: CheckPulse { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure"; + displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure"; condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(treatment)); @@ -100,7 +100,7 @@ class Medical { }; class TriageCard { - displayName = "$STR_ACE_MEDICAL_ACTIONS_TriageCard"; + displayName = "$STR_ACE_Medical_Actions_TriageCard"; distance = 2.0; condition = "true"; exceptions[] = {"isNotInside"}; @@ -113,7 +113,7 @@ class Medical { // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; @@ -124,21 +124,21 @@ class Medical { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\bandage.paa); }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(treatment)); @@ -168,7 +168,7 @@ class Medical { // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; @@ -179,28 +179,28 @@ class Medical { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\bandage.paa); }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\bandage.paa); }; class Tourniquet: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; + displayName = "$STR_ACE_Medical_Actions_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(treatment)); @@ -228,20 +228,20 @@ class Medical { icon = PATHTOF(UI\icons\autoInjector.paa); }; class CheckPulse: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse"; + displayName = "$STR_ACE_Medical_Actions_CheckPulse"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(treatment)); icon = ""; }; class CheckBloodPressure: CheckPulse { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure"; + displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(treatment)); }; class RemoveTourniquet: Tourniquet { - displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; + displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(treatment)); @@ -270,7 +270,7 @@ class Medical { // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; @@ -281,26 +281,26 @@ class Medical { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(treatment)); }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(treatment)); }; class Tourniquet: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; + displayName = "$STR_ACE_Medical_Actions_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(treatment)); @@ -326,20 +326,20 @@ class Medical { statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Epinephrine')] call DFUNC(treatment)); }; class CheckPulse: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse"; + displayName = "$STR_ACE_Medical_Actions_CheckPulse"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(treatment)); icon = ""; }; class CheckBloodPressure: CheckPulse { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure"; + displayName = "$STR_ACE_Medical_Actions_CheckBloodPressure"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(treatment)); }; class RemoveTourniquet: Tourniquet { - displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; + displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(treatment)); @@ -369,7 +369,7 @@ class Medical { // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; @@ -380,26 +380,26 @@ class Medical { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(treatment)); }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(treatment)); }; class Tourniquet: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; + displayName = "$STR_ACE_Medical_Actions_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(treatment)); @@ -426,7 +426,7 @@ class Medical { statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Epinephrine')] call DFUNC(treatment)); }; class RemoveTourniquet: Tourniquet { - displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; + displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(treatment)); @@ -456,7 +456,7 @@ class Medical { // Advanced medical class FieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; + displayName = "$STR_ACE_Medical_Actions_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; @@ -467,26 +467,26 @@ class Medical { icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; + displayName = "$STR_ACE_Medical_Actions_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; + displayName = "$STR_ACE_Medical_Actions_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(treatment)); }; class QuikClot: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; + displayName = "$STR_ACE_Medical_Actions_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(treatment)); }; class Tourniquet: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; + displayName = "$STR_ACE_Medical_Actions_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(treatment)); @@ -512,7 +512,7 @@ class Medical { statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Epinephrine')] call DFUNC(treatment)); }; class RemoveTourniquet: Tourniquet { - displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; + displayName = "$STR_ACE_Medical_Actions_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(canTreatCached)); exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(treatment)); diff --git a/addons/medical/ACE_Medical_Treatments.hpp b/addons/medical/ACE_Medical_Treatments.hpp index fced8c93bf3..4f47e68a0bc 100644 --- a/addons/medical/ACE_Medical_Treatments.hpp +++ b/addons/medical/ACE_Medical_Treatments.hpp @@ -56,8 +56,8 @@ class ACE_Medical_Actions { litter[] = {}; }; class BodyBag: Bandage { - displayName = "$STR_ACE_MEDICAL_PlaceInBodyBag"; - displayNameProgress = "$STR_ACE_MEDICAL_PlacingInBodyBag"; + displayName = "$STR_ACE_Medical_PlaceInBodyBag"; + displayNameProgress = "$STR_ACE_Medical_PlacingInBodyBag"; treatmentLocations[] = {"All"}; requiredMedic = 0; treatmentTime = 2; @@ -72,8 +72,8 @@ class ACE_Medical_Actions { litter[] = {}; }; class Diagnose: Bandage { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Diagnose"; - displayNameProgress = "$STR_ACE_MEDICAL_ACTIONS_Diagnosing"; + displayName = "$STR_ACE_Medical_Actions_Diagnose"; + displayNameProgress = "$STR_ACE_Medical_Actions_Diagnosing"; treatmentLocations[] = {"All"}; requiredMedic = 0; treatmentTime = 1; @@ -225,7 +225,7 @@ class ACE_Medical_Actions { }; class CheckPulse: fieldDressing { displayName = ""; - displayNameProgress = "$STR_ACE_MEDICAL_CHECK_PULSE_CONTENT"; + displayNameProgress = "$STR_ACE_Medical_Check_Pulse_CONTENT"; treatmentLocations[] = {"All"}; requiredMedic = 0; treatmentTime = 2; @@ -240,11 +240,11 @@ class ACE_Medical_Actions { }; class CheckBloodPressure: CheckPulse { callbackSuccess = QUOTE(DFUNC(actionCheckBloodPressure)); - displayNameProgress = "$STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_CONTENT"; + displayNameProgress = "$STR_ACE_Medical_Check_Bloodpressure_CONTENT"; }; class CheckResponse: CheckPulse { callbackSuccess = QUOTE(DFUNC(actionCheckResponse)); - displayNameProgress = "$STR_ACE_MEDICAL_CHECK_RESPONSE_CONTENT"; + displayNameProgress = "$STR_ACE_Medical_Check_Response_CONTENT"; }; class RemoveTourniquet: CheckPulse { treatmentTime = 2.5; @@ -252,8 +252,8 @@ class ACE_Medical_Actions { condition = QUOTE([ARR_2(_this select 1, _this select 2)] call FUNC(hasTourniquetAppliedTo)); }; class CPR: fieldDressing { - displayName = "$STR_ACE_MEDICAL_ACTIONS_CPR"; - displayNameProgress = "$STR_ACE_MEDICAL_ACTIONS_PerformingCPR"; + displayName = "$STR_ACE_Medical_Actions_CPR"; + displayNameProgress = "$STR_ACE_Medical_Actions_PerformingCPR"; treatmentLocations[] = {"All"}; requiredMedic = 0; treatmentTime = 15; @@ -272,8 +272,8 @@ class ACE_Medical_Actions { litter[] = {}; }; class BodyBag: fieldDressing { - displayName = "$STR_ACE_MEDICAL_PlaceInBodyBag"; - displayNameProgress = "$STR_ACE_MEDICAL_PlacingInBodyBag"; + displayName = "$STR_ACE_Medical_PlaceInBodyBag"; + displayNameProgress = "$STR_ACE_Medical_PlacingInBodyBag"; treatmentLocations[] = {"All"}; requiredMedic = 0; treatmentTime = 2; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 3d77a24172c..6149c57afd4 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -444,7 +444,7 @@ class CfgVehicles { // Create a consolidates medical menu for treatment while boarded class ACE_MainActions { class Medical { - displayName = "$STR_ACE_MEDICAL_ACTIONS_Medical"; + displayName = "$STR_ACE_Medical_Actions_Medical"; runOnHover = 1; exceptions[] = {"isNotInside"}; condition = QUOTE((vehicle _target != _target && vehicle _target == vehicle _player) || GVAR(menuTypeStyle) == 1); @@ -653,7 +653,7 @@ class CfgVehicles { side = -1; model = QUOTE(PATHTOF(data\bodybag.p3d)); icon = ""; - displayName = $STR_ACE_MEDICAL_BODYBAG_DISPLAY; + displayName = $STR_ACE_Medical_Bodybag_Display; EGVAR(dragging,canDrag) = 1; EGVAR(dragging,dragPosition[]) = {0,1.2,0}; EGVAR(dragging,dragDirection) = 0; @@ -706,7 +706,7 @@ class CfgVehicles { class ACE_fieldDressingItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_BANDAGE_BASIC_DISPLAY; + displayName = $STR_ACE_Medical_Bandage_Basic_Display; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -719,7 +719,7 @@ class CfgVehicles { class ACE_packingBandageItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_PACKING_BANDAGE_DISPLAY; + displayName = $STR_ACE_Medical_Packing_Bandage_Display; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -732,7 +732,7 @@ class CfgVehicles { class ACE_elasticBandageItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_BANDAGE_ELASTIC_DISPLAY; + displayName = $STR_ACE_Medical_Bandage_Elastic_Display; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -745,7 +745,7 @@ class CfgVehicles { class ACE_tourniquetItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_TOURNIQUET_DISPLAY; + displayName = $STR_ACE_Medical_Tourniquet_Display; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -758,7 +758,7 @@ class CfgVehicles { class ACE_morphineItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_MORPHINE_DISPLAY; + displayName = $STR_ACE_Medical_Morphine_Display; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -771,7 +771,7 @@ class CfgVehicles { class ACE_atropineItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_ATROPINE_DISPLAY; + displayName = $STR_ACE_Medical_Atropine_Display; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -784,7 +784,7 @@ class CfgVehicles { class ACE_epinephrineItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_EPINEPHRINE_DISPLAY; + displayName = $STR_ACE_Medical_Epinephrine_Display; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -797,7 +797,7 @@ class CfgVehicles { class ACE_plasmaIVItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_PLASMA_IV; + displayName = $STR_ACE_Medical_Plasma_IV; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -811,7 +811,7 @@ class CfgVehicles { class ACE_bloodIVItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_BLOOD_IV; + displayName = $STR_ACE_Medical_Blood_IV; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -824,7 +824,7 @@ class CfgVehicles { class ACE_salineIVItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_SALINE_IV; + displayName = $STR_ACE_Medical_Saline_IV; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -837,7 +837,7 @@ class CfgVehicles { class ACE_quikClotItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_QUIKCLOT_DISPLAY; + displayName = $STR_ACE_Medical_QuikClot_Display; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -850,7 +850,7 @@ class CfgVehicles { class ACE_personalAidKitItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_AID_KIT_DISPLAY; + displayName = $STR_ACE_Medical_Aid_Kit_Display; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -863,7 +863,7 @@ class CfgVehicles { class ACE_surgicalKitItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_SURGICALKIT_DISPLAY; + displayName = $STR_ACE_Medical_SurgicalKit_Display; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { @@ -876,7 +876,7 @@ class CfgVehicles { class ACE_bodyBagItem: Item_Base_F { scope = 2; scopeCurator = 2; - displayName = $STR_ACE_MEDICAL_BODYBAG_DISPLAY; + displayName = $STR_ACE_Medical_Bodybag_Display; author = "$STR_ACE_Common_ACETeam"; vehicleClass = "Items"; class TransportItems { diff --git a/addons/medical/CfgWeapons.hpp b/addons/medical/CfgWeapons.hpp index 8c45b6906cc..5fc5a4c9a83 100644 --- a/addons/medical/CfgWeapons.hpp +++ b/addons/medical/CfgWeapons.hpp @@ -24,64 +24,64 @@ class CfgWeapons { scope = 2; model = QUOTE(PATHTOF(data\bandage.p3d)); picture = QUOTE(PATHTOF(ui\items\fieldDressing_x_ca.paa)); - displayName = $STR_ACE_MEDICAL_BANDAGE_BASIC_DISPLAY; - descriptionShort = $STR_ACE_MEDICAL_BANDAGE_BASIC_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_BANDAGE_BASIC_DESC_USE; + displayName = $STR_ACE_Medical_Bandage_Basic_Display; + descriptionShort = $STR_ACE_Medical_Bandage_Basic_Desc_Short; + descriptionUse = $STR_ACE_Medical_Bandage_Basic_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 1; }; }; class ACE_packingBandage: ACE_ItemCore { scope = 2; - displayName = $STR_ACE_MEDICAL_PACKING_BANDAGE_DISPLAY; + displayName = $STR_ACE_Medical_Packing_Bandage_Display; picture = QUOTE(PATHTOF(ui\items\packingBandage_x_ca.paa)); model = QUOTE(PATHTOF(data\packingbandage.p3d)); - descriptionShort = $STR_ACE_MEDICAL_PACKING_BANDAGE_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_PACKING_BANDAGE_DESC_USE; + descriptionShort = $STR_ACE_Medical_Packing_Bandage_Desc_Short; + descriptionUse = $STR_ACE_Medical_Packing_Bandage_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 1; }; }; class ACE_elasticBandage: ACE_ItemCore { scope = 2; - displayName = $STR_ACE_MEDICAL_BANDAGE_ELASTIC_DISPLAY; + displayName = $STR_ACE_Medical_Bandage_Elastic_Display; picture = QUOTE(PATHTOF(ui\items\elasticBandage_x_ca.paa)); model = "\A3\Structures_F_EPA\Items\Medical\Bandage_F.p3d"; - descriptionShort = $STR_ACE_MEDICAL_BANDAGE_ELASTIC_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_BANDAGE_ELASTIC_DESC_USE; + descriptionShort = $STR_ACE_Medical_Bandage_Elastic_Desc_Short; + descriptionUse = $STR_ACE_Medical_Bandage_Elastic_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 1; }; }; class ACE_tourniquet: ACE_ItemCore { scope = 2; - displayName = $STR_ACE_MEDICAL_TOURNIQUET_DISPLAY; + displayName = $STR_ACE_Medical_Tourniquet_Display; picture = QUOTE(PATHTOF(ui\items\tourniquet_x_ca.paa)); model = QUOTE(PATHTOF(data\tourniquet.p3d)); - descriptionShort = $STR_ACE_MEDICAL_TOURNIQUET_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_TOURNIQUET_DESC_USE; + descriptionShort = $STR_ACE_Medical_Tourniquet_Desc_Short; + descriptionUse = $STR_ACE_Medical_Tourniquet_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 1; }; }; class ACE_morphine: ACE_ItemCore { scope = 2; - displayName = $STR_ACE_MEDICAL_MORPHINE_DISPLAY; + displayName = $STR_ACE_Medical_Morphine_Display; picture = QUOTE(PATHTOF(ui\items\morphine_x_ca.paa)); model = QUOTE(PATHTOF(data\morphine.p3d)); - descriptionShort = $STR_ACE_MEDICAL_MORPHINE_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_MORPHINE_DESC_USE; + descriptionShort = $STR_ACE_Medical_Morphine_Desc_Short; + descriptionUse = $STR_ACE_Medical_Morphine_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 1; }; }; class ACE_atropine: ACE_ItemCore { scope = 2; - displayName = $STR_ACE_MEDICAL_ATROPINE_DISPLAY; + displayName = $STR_ACE_Medical_Atropine_Display; picture = QUOTE(PATHTOF(ui\items\atropine_x_ca.paa)); model = QUOTE(PATHTOF(data\atropine.p3d)); - descriptionShort = $STR_ACE_MEDICAL_ATROPINE_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_ATROPINE_DESC_USE; + descriptionShort = $STR_ACE_Medical_Atropine_Desc_Short; + descriptionUse = $STR_ACE_Medical_Atropine_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 1; @@ -89,33 +89,33 @@ class CfgWeapons { }; class ACE_epinephrine: ACE_ItemCore { scope = 2; - displayName = $STR_ACE_MEDICAL_EPINEPHRINE_DISPLAY; + displayName = $STR_ACE_Medical_Epinephrine_Display; picture = QUOTE(PATHTOF(ui\items\epinephrine_x_ca.paa)); model = QUOTE(PATHTOF(data\epinephrine.p3d)); - descriptionShort = $STR_ACE_MEDICAL_EPINEPHRINE_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_EPINEPHRINE_DESC_USE; + descriptionShort = $STR_ACE_Medical_Epinephrine_Desc_Short; + descriptionUse = $STR_ACE_Medical_Epinephrine_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 1; }; }; class ACE_plasmaIV: ACE_ItemCore { scope = 2; - displayName = $STR_ACE_MEDICAL_PLASMA_IV; + displayName = $STR_ACE_Medical_Plasma_IV; picture = QUOTE(PATHTOF(ui\items\plasmaIV_x_ca.paa)); - descriptionShort = $STR_ACE_MEDICAL_PLASMA_IV_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_PLASMA_IV_DESC_USE; + descriptionShort = $STR_ACE_Medical_Plasma_IV_DESC_SHORT; + descriptionUse = $STR_ACE_Medical_Plasma_IV_DESC_USE; class ItemInfo: InventoryItem_Base_F { mass = 10; }; }; class ACE_plasmaIV_500: ACE_plasmaIV { - displayName = $STR_ACE_MEDICAL_PLASMA_IV_500; + displayName = $STR_ACE_Medical_Plasma_IV_500; class ItemInfo: InventoryItem_Base_F { mass = 5; }; }; class ACE_plasmaIV_250: ACE_plasmaIV { - displayName = $STR_ACE_MEDICAL_PLASMA_IV_250; + displayName = $STR_ACE_Medical_Plasma_IV_250; class ItemInfo: InventoryItem_Base_F { mass = 2.5; }; @@ -123,86 +123,86 @@ class CfgWeapons { class ACE_bloodIV: ACE_ItemCore { scope = 2; model = "\A3\Structures_F_EPA\Items\Medical\BloodBag_F.p3d"; - displayName = $STR_ACE_MEDICAL_BLOOD_IV; + displayName = $STR_ACE_Medical_Blood_IV; picture = QUOTE(PATHTOF(ui\items\bloodIV_x_ca.paa)); - descriptionShort = $STR_ACE_MEDICAL_BLOOD_IV_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_BLOOD_IV_DESC_USE; + descriptionShort = $STR_ACE_Medical_Blood_IV_DESC_SHORT; + descriptionUse = $STR_ACE_Medical_Blood_IV_DESC_USE; class ItemInfo: InventoryItem_Base_F { mass = 10; }; }; class ACE_bloodIV_500: ACE_bloodIV { - displayName = $STR_ACE_MEDICAL_BLOOD_IV_500; + displayName = $STR_ACE_Medical_Blood_IV_500; class ItemInfo: InventoryItem_Base_F { mass = 5; }; }; class ACE_bloodIV_250: ACE_bloodIV { - displayName = $STR_ACE_MEDICAL_BLOOD_IV_250; + displayName = $STR_ACE_Medical_Blood_IV_250; class ItemInfo: InventoryItem_Base_F { mass = 2.5; }; }; class ACE_salineIV: ACE_ItemCore { scope = 2; - displayName = $STR_ACE_MEDICAL_SALINE_IV; + displayName = $STR_ACE_Medical_Saline_IV; picture = QUOTE(PATHTOF(ui\items\salineIV_x_ca.paa)); - descriptionShort = $STR_ACE_MEDICAL_SALINE_IV_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_SALINE_IV_DESC_USE; + descriptionShort = $STR_ACE_Medical_Saline_IV_DESC_SHORT; + descriptionUse = $STR_ACE_Medical_Saline_IV_DESC_USE; class ItemInfo: InventoryItem_Base_F { mass = 10; }; }; class ACE_salineIV_500: ACE_salineIV { - displayName = $STR_ACE_MEDICAL_SALINE_IV_500; + displayName = $STR_ACE_Medical_Saline_IV_500; class ItemInfo: InventoryItem_Base_F { mass = 2.5; }; }; class ACE_salineIV_250: ACE_salineIV { - displayName = $STR_ACE_MEDICAL_SALINE_IV_250; + displayName = $STR_ACE_Medical_Saline_IV_250; class ItemInfo: InventoryItem_Base_F { mass = 2.5; }; }; class ACE_quikclot: ACE_ItemCore { scope = 2; - displayName = $STR_ACE_MEDICAL_QUIKCLOT_DISPLAY; + displayName = $STR_ACE_Medical_QuikClot_Display; picture = QUOTE(PATHTOF(ui\items\quickclot_x_ca.paa)); - descriptionShort = $STR_ACE_MEDICAL_QUIKCLOT_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_QUIKCLOT_DESC_USE; + descriptionShort = $STR_ACE_Medical_QuikClot_Desc_Short; + descriptionUse = $STR_ACE_Medical_QuikClot_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 1; }; }; class ACE_personalAidKit: ACE_ItemCore { scope = 2; - displayName = $STR_ACE_MEDICAL_AID_KIT_DISPLAY; + displayName = $STR_ACE_Medical_Aid_Kit_Display; picture = QUOTE(PATHTOF(ui\items\personal_aid_kit_x_ca.paa)); - descriptionShort = $STR_ACE_MEDICAL_AID_KIT_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_AID_KIT_DESC_USE; + descriptionShort = $STR_ACE_Medical_Aid_Kit_Desc_Short; + descriptionUse = $STR_ACE_Medical_Aid_Kit_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 2; }; }; class ACE_surgicalKit: ACE_ItemCore { scope=2; - displayName= $STR_ACE_MEDICAL_SURGICALKIT_DISPLAY; + displayName= $STR_ACE_Medical_SurgicalKit_Display; model = QUOTE(PATHTOF(data\surgical_kit.p3d)); picture = QUOTE(PATHTOF(ui\items\surgicalKit_x_ca.paa)); - descriptionShort = $STR_ACE_MEDICAL_SURGICALKIT_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_SURGICALKIT_DESC_USE; + descriptionShort = $STR_ACE_Medical_SurgicalKit_Desc_Short; + descriptionUse = $STR_ACE_Medical_SurgicalKit_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 5; }; }; class ACE_bodyBag: ACE_ItemCore { scope=2; - displayName= $STR_ACE_MEDICAL_BODYBAG_DISPLAY; + displayName= $STR_ACE_Medical_Bodybag_Display; model = QUOTE(PATHTOF(data\bodybagItem.p3d)); picture = QUOTE(PATHTOF(ui\items\bodybag_x_ca.paa)); - descriptionShort = $STR_ACE_MEDICAL_BODYBAG_DESC_SHORT; - descriptionUse = $STR_ACE_MEDICAL_BODYBAG_DESC_USE; + descriptionShort = $STR_ACE_Medical_Bodybag_Desc_Short; + descriptionUse = $STR_ACE_Medical_Bodybag_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 15; }; diff --git a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf index d686515308a..7a0b332400f 100644 --- a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf +++ b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf @@ -28,27 +28,27 @@ _bloodPressureLow = _bloodPressure select 0; _output = ""; _logOutPut = ""; if ([_caller] call FUNC(isMedic)) then { - _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_1"; + _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_1"; _logOutPut = format["%1/%2",round(_bloodPressureHigh),round(_bloodPressureLow)]; } else { if (_bloodPressureHigh > 20) then { - _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_2"; - _logOutPut = localize "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_LOW"; + _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_2"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_LOW"; if (_bloodPressureHigh > 100) then { - _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_3"; - _logOutPut = localize "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_NORMAL"; + _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_3"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_NORMAL"; if (_bloodPressureHigh > 160) then { - _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_4"; - _logOutPut = localize "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_HIGH"; + _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_4"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_HIGH"; }; }; } else { if (random(10) > 3) then { - _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_5"; - _logOutPut = localize "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_NOBLOODPRESSURE"; + _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_5"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_NOBLOODPRESSURE"; } else { - _output = "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_OUTPUT_6"; + _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_6"; }; }; }; @@ -56,5 +56,5 @@ if ([_caller] call FUNC(isMedic)) then { ["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller]] call EFUNC(common,targetEvent); if (_logOutPut != "") then { - [_target,"activity", localize "STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_LOG", [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog); + [_target,"activity", localize "STR_ACE_Medical_Check_Bloodpressure_LOG", [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog); }; diff --git a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf index f035ae18adb..3f49cba6e60 100644 --- a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf +++ b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf @@ -23,24 +23,24 @@ _heartRate = _unit getvariable [QGVAR(heartRate), 80]; if (!alive _unit) then { _heartRate = 0; }; -_heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_5"; +_heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_5"; _logOutPut = "No heart rate"; if (_heartRate > 1.0) then { if ([_caller] call FUNC(isMedic)) then { - _heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_1"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_1"; _logOutPut = format["%1",round(_heartRate)]; } else { // non medical personel will only find a pulse/HR - _heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_2"; - _logOutPut = localize "STR_ACE_MEDICAL_CHECK_PULSE_WEAK"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_2"; + _logOutPut = localize "STR_ACE_Medical_Check_Pulse_WEAK"; if (_heartRate > 60) then { if (_heartRate > 100) then { - _heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_3"; - _logOutPut = localize "STR_ACE_MEDICAL_CHECK_PULSE_STRONG"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_3"; + _logOutPut = localize "STR_ACE_Medical_Check_Pulse_STRONG"; } else { - _heartRateOutput = "STR_ACE_MEDICAL_CHECK_PULSE_OUTPUT_4"; - _logOutPut = localize "STR_ACE_MEDICAL_CHECK_PULSE_NORMAL"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_4"; + _logOutPut = localize "STR_ACE_Medical_Check_Pulse_NORMAL"; }; }; }; @@ -49,5 +49,5 @@ if (_heartRate > 1.0) then { ["displayTextStructured", [_caller], [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent); if (_logOutPut != "") then { - [_unit,"activity", localize "STR_ACE_MEDICAL_CHECK_PULSE_LOG",[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog); + [_unit,"activity", localize "STR_ACE_Medical_Check_Pulse_LOG",[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog); }; diff --git a/addons/medical/functions/fnc_actionCheckResponse.sqf b/addons/medical/functions/fnc_actionCheckResponse.sqf index babd93bf924..92e724a3e04 100644 --- a/addons/medical/functions/fnc_actionCheckResponse.sqf +++ b/addons/medical/functions/fnc_actionCheckResponse.sqf @@ -20,9 +20,9 @@ _target = _this select 1; _output = ""; if ([_target] call EFUNC(common,isAwake)) then { - _output = "STR_ACE_MEDICAL_CHECK_REPONSE_RESPONSIVE"; + _output = "STR_ACE_Medical_Check_Response_Responsive"; } else { - _output = "STR_ACE_MEDICAL_CHECK_REPONSE_UNRESPONSIVE"; + _output = "STR_ACE_Medical_Check_Response_Unresponsive"; }; ["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName)], 2, _caller]] call EFUNC(common,targetEvent); diff --git a/addons/medical/functions/fnc_actionDiagnose.sqf b/addons/medical/functions/fnc_actionDiagnose.sqf index 692414027a8..d0a5aebc9fc 100644 --- a/addons/medical/functions/fnc_actionDiagnose.sqf +++ b/addons/medical/functions/fnc_actionDiagnose.sqf @@ -18,28 +18,28 @@ private ["_caller", "_target", "_genericMessages"]; _caller = _this select 0; _target = _this select 1; -_genericMessages = ["STR_ACE_MEDICAL_diagnoseMessage"]; +_genericMessages = ["STR_ACE_Medical_diagnoseMessage"]; _genericMessages pushBack ([_target] call EFUNC(common,getName)); if (alive _target) then { - _genericMessages pushback "STR_ACE_MEDICAL_diagnoseAlive"; + _genericMessages pushback "STR_ACE_Medical_diagnoseAlive"; } else { - _genericMessages pushback "STR_ACE_MEDICAL_diagnoseDead"; + _genericMessages pushback "STR_ACE_Medical_diagnoseDead"; }; if (_target getvariable[QGVAR(hasLostBlood), 0] > 0) then { if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then { - _genericMessages pushback "STR_ACE_MEDICAL_lostBloodALot"; + _genericMessages pushback "STR_ACE_Medical_lostBloodALot"; } else { - _genericMessages pushback "STR_ACE_MEDICAL_lostBlood"; + _genericMessages pushback "STR_ACE_Medical_lostBlood"; }; } else { - _genericMessages pushback "STR_ACE_MEDICAL_noBloodloss"; + _genericMessages pushback "STR_ACE_Medical_noBloodloss"; }; if (_target getvariable[QGVAR(hasPain), false]) then { - _genericMessages pushback "STR_ACE_MEDICAL_inPain"; + _genericMessages pushback "STR_ACE_Medical_inPain"; } else { - _genericMessages pushback "STR_ACE_MEDICAL_noPain"; + _genericMessages pushback "STR_ACE_Medical_noPain"; }; ["displayTextStructured", [_caller], [_genericMessages, 3.0, _caller]] call EFUNC(common,targetEvent); diff --git a/addons/medical/functions/fnc_displayPatientInformation.sqf b/addons/medical/functions/fnc_displayPatientInformation.sqf index f3385c7d51e..c5c5d23a010 100644 --- a/addons/medical/functions/fnc_displayPatientInformation.sqf +++ b/addons/medical/functions/fnc_displayPatientInformation.sqf @@ -55,17 +55,17 @@ if (_show) then { }; if (_target getvariable[QGVAR(isBleeding), false]) then { - _genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_BLEEDING", [1, 0.1, 0.1, 1]]; + _genericMessages pushback [localize "STR_ACE_Medical_Status_Bleeding", [1, 0.1, 0.1, 1]]; }; if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then { - _genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_LOST_BLOOD", [1, 0.1, 0.1, 1]]; + _genericMessages pushback [localize "STR_ACE_Medical_Status_Lost_Blood", [1, 0.1, 0.1, 1]]; }; if (((_target getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]]) select _selectionN) > 0) then { - _genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_TOURNIQUET_APPLIED", [0.77, 0.51, 0.08, 1]]; + _genericMessages pushback [localize "STR_ACE_Medical_Status_Tourniquet_Applied", [0.77, 0.51, 0.08, 1]]; }; if (_target getvariable[QGVAR(hasPain), false]) then { - _genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_PAIN", [1, 1, 1, 1]]; + _genericMessages pushback [localize "STR_ACE_Medical_Status_Pain", [1, 1, 1, 1]]; }; _totalIvVolume = 0; @@ -77,7 +77,7 @@ if (_show) then { }; }foreach GVAR(IVBags); if (_totalIvVolume >= 1) then { - _genericMessages pushback [format[localize "STR_ACE_MEDICAL_receivingIvVolume", floor _totalIvVolume], [1, 1, 1, 1]]; + _genericMessages pushback [format[localize "STR_ACE_Medical_receivingIvVolume", floor _totalIvVolume], [1, 1, 1, 1]]; }; _damaged = [false, false, false, false, false, false]; diff --git a/addons/medical/functions/fnc_displayTriageCard.sqf b/addons/medical/functions/fnc_displayTriageCard.sqf index dd3b44a9466..a9054dac464 100644 --- a/addons/medical/functions/fnc_displayTriageCard.sqf +++ b/addons/medical/functions/fnc_displayTriageCard.sqf @@ -58,7 +58,7 @@ if (_show) then { }foreach _log; if (count _triageCardTexts == 0) then { - _lbCtrl lbAdd (localize "STR_ACE_MEDICAL_TriageCard_NoEntry"); + _lbCtrl lbAdd (localize "STR_ACE_Medical_TriageCard_NoEntry"); }; { _lbCtrl lbAdd _x; diff --git a/addons/medical/functions/fnc_getTriageStatus.sqf b/addons/medical/functions/fnc_getTriageStatus.sqf index d80cbe5d64c..aaeec2d5161 100644 --- a/addons/medical/functions/fnc_getTriageStatus.sqf +++ b/addons/medical/functions/fnc_getTriageStatus.sqf @@ -17,10 +17,10 @@ private ["_unit","_return","_status"]; _unit = _this select 0; _status = _unit getvariable [QGVAR(triageLevel), -1]; _return = switch (_status) do { - case 1: {[localize "STR_ACE_MEDICAL_TRIAGE_STATUS_MINOR", 1, [0, 0.5, 0, 0.9]]}; - case 2: {[localize "STR_ACE_MEDICAL_TRIAGE_STATUS_DELAYED", 2, [0.7, 0.5, 0, 0.9]]}; - case 3: {[localize "STR_ACE_MEDICAL_TRIAGE_STATUS_IMMEDIATE", 3, [0.4, 0.07, 0.07, 0.9]]}; - case 4: {[localize "STR_ACE_MEDICAL_TRIAGE_STATUS_DECEASED", 4, [0, 0, 0, 0.9]]}; - default {[localize "STR_ACE_MEDICAL_TRIAGE_STATUS_NONE", 0, [0, 0, 0, 0.9]]}; + case 1: {[localize "STR_ACE_Medical_Triage_Status_Minor", 1, [0, 0.5, 0, 0.9]]}; + case 2: {[localize "STR_ACE_Medical_Triage_Status_Delayed", 2, [0.7, 0.5, 0, 0.9]]}; + case 3: {[localize "STR_ACE_Medical_Triage_Status_Immediate", 3, [0.4, 0.07, 0.07, 0.9]]}; + case 4: {[localize "STR_ACE_Medical_Triage_Status_Deceased", 4, [0, 0, 0, 0.9]]}; + default {[localize "STR_ACE_Medical_Triage_Status_None", 0, [0, 0, 0, 0.9]]}; }; _return; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf b/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf index 42ca38cd0ab..394595ade3b 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf @@ -37,6 +37,6 @@ if !([_target] call FUNC(hasMedicalEnabled)) exitwith { }; }foreach _items;*/ -[_target, "activity", "STR_ACE_MEDICAL_ACTIVITY_bandagedPatient", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); +[_target, "activity", "STR_ACE_Medical_Activity_bandagedPatient", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); true; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf b/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf index 55057f17588..c6ac2dc8e55 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf @@ -32,6 +32,6 @@ _items = _this select 4; }; }foreach _items; -[_target, "activity", "STR_ACE_MEDICAL_ACTIVITY_usedItem", [[_caller] call EFUNC(common,getName), _className]] call FUNC(addToLog); +[_target, "activity", "STR_ACE_Medical_Activity_usedItem", [[_caller] call EFUNC(common,getName), _className]] call FUNC(addToLog); true; diff --git a/addons/medical/functions/fnc_treatmentIV.sqf b/addons/medical/functions/fnc_treatmentIV.sqf index 3a62b9e6573..c0f4e4681f6 100644 --- a/addons/medical/functions/fnc_treatmentIV.sqf +++ b/addons/medical/functions/fnc_treatmentIV.sqf @@ -29,4 +29,4 @@ if (count _items == 0) exitwith {}; _removeItem = _items select 0; [[_target, _removeItem], QUOTE(DFUNC(treatmentIVLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ [_target, _removeItem] call FUNC(addToTriageCard); -[_target, "activity", "STR_ACE_MEDICAL_ACTIVITY_gaveIV", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); +[_target, "activity", "STR_ACE_Medical_Activity_gaveIV", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); diff --git a/addons/medical/functions/fnc_treatmentTourniquet.sqf b/addons/medical/functions/fnc_treatmentTourniquet.sqf index 731797f1f98..c4ee10011e3 100644 --- a/addons/medical/functions/fnc_treatmentTourniquet.sqf +++ b/addons/medical/functions/fnc_treatmentTourniquet.sqf @@ -43,7 +43,7 @@ _removeItem = _items select 0; [[_target, _removeItem, _selectionName], QUOTE(DFUNC(treatmentTourniquetLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ [_target, _removeItem] call FUNC(addToTriageCard); -[_target, "activity", "STR_ACE_MEDICAL_ACTIVITY_appliedTourniquet", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); +[_target, "activity", "STR_ACE_Medical_Activity_appliedTourniquet", [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); true; diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 1029bda77a0..122244f9905 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -296,7 +296,7 @@ Sto applicando il laccio emostatico ... Applicando Torniquete - + Medical Zdravotní Médical @@ -308,7 +308,7 @@ Médico Orvosi - + Field Dressing Verbandpäckchen Compresa de campaña @@ -320,7 +320,7 @@ Bendaggio rapido Curativo de Campo - + Packing Bandage Mullbinde Vendaje compresivo @@ -331,7 +331,7 @@ Bandage gauze Bandagem de Compressão - + Elastic Bandage Elastischer Verband Vendaje elástico @@ -343,7 +343,7 @@ Bendaggio elastico Bandagem Elástica - + QuikClot QuikClot QuikClot @@ -355,7 +355,7 @@ QuikClot(polvere emostatica) QuikClot - + Check Pulse Puls überprüfen Comprobar pulso @@ -367,7 +367,7 @@ Controlla il polso Checar Pulso - + Check Blood Pressure Blutdruck überprüfen Comprobar presión arterial @@ -379,7 +379,7 @@ Controlla pressionsa sanguigna Chegar Pressão Sanguínea - + Triage Card Triagekarte Tarjeta de triaje @@ -391,7 +391,7 @@ Triage Card Cartão de Triagem - + No entries on this triage card. Keine Einträge auf der Triagekarte Nessuna voce sulla Triage Card @@ -399,7 +399,7 @@ Aucune entrée sur cette carte de triage Brak wpisów w tej karcie segregacyjnej. - + Tourniquet Tourniquet Torniquete @@ -411,7 +411,7 @@ Laccio emostatico Torniquete - + Remove Tourniquet Tourniquet entfernen Quitar torniquete @@ -423,7 +423,7 @@ Rimuovi laccio emostatico Remover Torniquete - + Diagnose Diagnose Diagnosi @@ -431,7 +431,7 @@ Diagnostiquer Diagnoza - + Diagnosing ... Diagnostizieren ... Diagnosi in corso... @@ -439,7 +439,7 @@ Diagnostic en cours Diagnozowanie ... - + CPR HLW RCP @@ -447,7 +447,7 @@ RPC RKO - + Performing CPR ... HLW durchführen ... Eseguendo RCP... @@ -455,7 +455,7 @@ RPC en cours Przeprowadzanie RKO ... - + Give Blood IV (1000ml) Bluttransfusion IV (1000ml) Dar Sangre IV (1000ml) @@ -467,7 +467,7 @@ Effettua trasfusione sangue IV (1000ml) Administrar Sangue IV (1000ml) - + Give Blood IV (500ml) Bluttransfusion IV (500ml) Dar Sangre IV (500ml) @@ -479,7 +479,7 @@ Effettua trasfusione sangue IV (500ml) Administrar Sangue IV (500ml) - + Give Blood IV (250ml) Bluttransfusion IV (250ml) Dar Sangre IV (250ml) @@ -491,7 +491,7 @@ Effettua trasfusione sangue IV (250ml) Administrar Sangue IV (250ml) - + Give Plasma IV (1000ml) Plasmatransfusion IV (1000ml) Dar Plasma IV (1000ml) @@ -503,7 +503,7 @@ Effettua trasfusione plasma IV (1000ml) Administrar Plasma IV (1000ml) - + Give Plasma IV (500ml) Plasmatransfusion IV (500ml) Dar Plasma IV (500ml) @@ -515,7 +515,7 @@ Effettua trasfusione plasma IV (500ml) Administrar Plasma IV (500ml) - + Give Plasma IV (250ml) Plasmatransfusion IV (250ml) Dar Plasma IV (250ml) @@ -527,7 +527,7 @@ Effettua trasfusione plasma IV (250ml) Administrar Plasma IV (250ml) - + Give Saline IV (1000ml) Kochsalzlösung IV (1000ml) Dar Salino IV (1000ml) @@ -539,7 +539,7 @@ Effettua trasfusione salina IV (1000ml) Administrar Soro IV (1000ml) - + Give Saline IV (500ml) Kochsalzlösung IV (500ml) Dar Salino IV (500ml) @@ -551,7 +551,7 @@ Effettua trasfusione salina IV (500ml) Administrar Soro IV (500ml) - + Give Saline IV (250ml) Kochsalzlösung IV (250ml) Dar Salino IV (250ml) @@ -563,7 +563,7 @@ Effettua trasfusione salina IV (250ml) Administrar Soro IV (250ml) - + Minor Gering Menor @@ -575,7 +575,7 @@ Minore Leve - + Delayed Retrasado Срочная помощь @@ -587,7 +587,7 @@ Differito Atrasado - + Immediate Inmediato Неотложная помощь @@ -599,7 +599,7 @@ Immediata Imediato - + Deceased Fallecido Труп @@ -611,7 +611,7 @@ Deceduto Falecido - + None Ninguno Отсутствует @@ -623,7 +623,7 @@ Nessuna Nenhum - + Normal breathing Дыхание в норме Respiración normal @@ -635,7 +635,7 @@ Respiro normale Respiração normal - + No breathing Keine Atmung Дыхание отсутствует @@ -647,7 +647,7 @@ Mancanza di respiro Não respira - + Difficult breathing Дыхание затруднено Dificultad para respirar @@ -659,7 +659,7 @@ Difficoltà a respirare Dificuldade para respirar - + Almost no breathing Fast keine Atmung Дыхание очень слабое @@ -671,7 +671,7 @@ Respira a fatica Quase não respira - + Bleeding Blutet Кровотечение @@ -683,7 +683,7 @@ Sanguinando Sangrando - + In Pain Hat Schmerzen Испытывает боль @@ -695,7 +695,7 @@ Con dolore Com dor - + Lost a lot of Blood Hat eine große Menge Blut verloren Большая кровопотеря @@ -707,7 +707,7 @@ Ha perso parecchio sangue Perdeu muito sangue - + Tourniquet [CAT] Tourniquet [CAT] Жгут @@ -719,7 +719,7 @@ Laccio emostatico [CAT] Torniquete [CAT] - + Receiving IV [%1ml] Erhalte IV [%1ml] Reciviendo IV [%1ml] @@ -731,7 +731,7 @@ Ricevendo IV [%1ml] Recebendo IV [%1ml] - + Bandage (Basic) Bandage (Standard) Повязка (обычная) @@ -743,7 +743,7 @@ Bendaggio (base) Bandagem(Básico) - + Used to cover a wound Для перевязки ран Utilizado para cubrir una herida @@ -754,7 +754,7 @@ Usato per coprire una ferita Usado para cobrir um ferimento - + A dressing, that is a particular material used to cover a wound, which is applied over the wound once bleeding has been stemmed. Ein Verband, der aus einem besonderen Material besteht um die Wunde zu schützen, nachdem die Blutung gestoppt wurde. Повязка, накладываемая поверх раны после остановки кровотечения. @@ -765,7 +765,7 @@ Una benda apposita, utilizzata per coprire una ferita, la quale è applicata sopra di essa una volta fermata l'emorragia. Uma curativo, material específico para cobrir um ferimento que é aplicado assim que o sangramento é estancando. - + Packing Bandage Mullbinde Тампонирующая повязка @@ -776,7 +776,7 @@ Bendaggio compressivo Bandagem de Compressão - + Used to pack medium to large wounds and stem the bleeding Wird verwendet, um mittlere bis große Wunden abzudecken und Blutungen zu stoppen Для тампонирования ран среднего и большого размера и остановки кровотечения. @@ -787,7 +787,7 @@ Usato su medie o larghe ferite per fermare emorragie. Usado para o preenchimento de cavidades geradas por ferimentos médios e grandes e estancar o sangramento. - + A bandage used to pack the wound to stem bleeding and facilitate wound healing. Packing a wound is an option in large polytrauma injuries. Повязка для тампонирования раны, остановки кровотечения и лучшего заживления. При тяжёлых сочетанных ранениях возможно тампонирование раны. Se utiliza para detener la hemorragia de una herida y favorecer su cicatrización. Se usa en grandes lesiones o politraumatismos. @@ -798,7 +798,7 @@ Ein Verband, um die Wunde abzudecken und die Wundheilung zu fördern. Wunden abdecken ist eine Option bei größeren Polytraumen Uma bandagem usada para preencher o ferimento para estancar o sangramento e facilitar a cicatrização. Preenchimento de feridas é uma opção em ferimentos de politrauma grandes. - + Bandage (Elastic) Bandage (Elastisch) Повязка (давящая) @@ -810,7 +810,7 @@ Benda (Elastica) Bandagem (Elástica) - + Bandage kit, Elastic Elastische Binde (Kompressionsbinde) Давящая повязка @@ -821,7 +821,7 @@ Kit bendaggio, elastico Kit de Bandagem, Elástica - + Allows an even compression and extra support to the injured area. Ermöglicht eine gleichmäßige Kompression und zusätzliche Unterstützung für den verletzten Bereich. Давящая повязка обеспечивает равномерное сжатие и дополнительную поддержку повреждённой области @@ -832,7 +832,7 @@ Permette di comprimevere e aiutare la zone ferita. Esta bandagem pode ser utilizada para comprimir o ferimento e diminuir o sangramento e garantir que o ferimento não abra em movimento. - + Tourniquet (CAT) Tourniquet [CAT] Жгут @@ -844,7 +844,7 @@ Laccio emostatico (CAT) Torniquete (CAT) - + Slows down blood loss when bleeding Замедляет кровопотерю при кровотечении Reduce la velocidad de pérdida de sangre @@ -855,7 +855,7 @@ Rallenta la perdita di sangue in caso di sanguinamento Reduz a velocidade da perda de sangue - + A constricting device used to compress venous and arterial circulation in effect inhibiting or slowing blood flow and therefore decreasing loss of blood. Жгут используется для прижатия сосудов к костным выступам, которое приводит к остановке или значительному уменьшению кровотечения Dispositivo utilizado para eliminar el pulso distal y de ese modo controlar la pérdida de sangre @@ -866,7 +866,7 @@ Un laccio emostatico usato per comprimere le vene e arterie per bloccare o rallentare la circolazione del sangue e quindi rallentare dissanguamenti. A aparelho que comprime as artérias e veias para diminuir a perda de sangue. - + Morphine autoinjector Morphium Autoinjektor Морфин в пневмошприце @@ -878,7 +878,7 @@ Autoiniettore di morfina Auto-injetor de morfina - + Used to combat moderate to severe pain experiences Wird verwendet um moderate bis starke Schmärzen zu lindern. Для снятия средних и сильных болевых ощущений @@ -889,7 +889,7 @@ Usato per combattere il dolore. Usado para combater dores moderadas e severas - + An analgesic used to combat moderate to severe pain experiences. Обезболивающее для снятия средних и сильных болевых ощущений. Analgésico usado para combatir los estados dolorosos de moderados a severos. @@ -900,7 +900,7 @@ Un analgesico usato per combattere il dolore. Um analgésico usado para combater dores moderadas e fortes. - + Atropin autoinjector Атропин в пневмошприце Atropina auto-inyectable @@ -912,7 +912,7 @@ Autoiniettore di Atropina Auto-injetor de Atropina - + Used in NBC scenarios Применяется для защиты от ОМП Usado en escenarios NBQ @@ -923,7 +923,7 @@ Usato in situazioni con gas nervino. Usado em casos de ataque QBRN - + A drug used by the Military in NBC scenarios. Препарат, используемый в войсках для защиты от оружия массового поражения. Medicamento usado por militares en escenarios NBQ @@ -934,7 +934,7 @@ E' un farmaco usato in ambito militare in scenari con presenza di gas nervino. Uma droga usada por militares em casos de ataque QBRN. - + Epinephrine autoinjector Адреналин в пневмошприце Epinefrina auto-inyectable @@ -946,7 +946,7 @@ Autoiniettore di Epinefrina Auto-injetor de epinefrina - + Increase heart rate and counter effects given by allergic reactions Стимулирует работу сердца и купирует аллергические реакции Aumenta la frecuencia cardiaca y contraresta los efectos de las reacciones alérgicas @@ -957,7 +957,7 @@ Aumenta il battito cardiaco e combatte gli effetti di reazioni allergiche. Aumenta a frequência cardíaca e combate efeitos causados por reações alérgicas - + A drug that works on a sympathetic response to dilate the bronchi, increase heart rate and counter such effects given by allergic reactions (anaphylaxis). Used in sudden cardiac arrest scenarios with decreasing positive outcomes. Препарат, вызывающий симпатическую реакцию, приводящую к расширению бронхов, увеличению частоты сердечных сокращений и купированию аллергических реакций (анафилактического шока). Применяется при остановке сердца с уменьшенной вероятностью благоприятного исхода. Medicamento que dilata los bronquios, aumenta la frecuencia cardiaca y contrarresta los efectos de las reacciones alérgicas (anafilaxis). Se utiliza en caso de paros cardiacos repentinos. @@ -967,7 +967,7 @@ Ein Medikament, dass die Bronchien erweitert, die Herzfrequenz erhöht und Symptome von allergischen Reaktionen(Anaphylaxie) bekämpft. Wird bei plötzlichem Herzstillstand verabreicht. Uma droga trabalha dilatando os bronquios, aumentando a frequência cardíaca e combate efeitos de reações alérgicas(anáfilaticas). Usado em casos de parada cardiaca com poucas changes de recuperação. - + Plasma IV (1000ml) Плазма для в/в вливания (1000 мл) Plasma IV (1000ml) @@ -978,7 +978,7 @@ Plasma IV (1000ml) Plasma IV (1000ml) - + A volume-expanding blood supplement. Дополнительный препарат, применяемый при возмещении объема крови. Suplemento para expandir el volumen sanguíneo. @@ -989,7 +989,7 @@ Volumenerweiterungsmittel (künstliches Blutvolumen) Suplemento para expandir o volume sanguíneo. - + A volume-expanding blood supplement. Дополнительный препарат, применяемый при возмещении объема крови. Suplemento para expandir el volumen sanguíneo. @@ -1000,7 +1000,7 @@ Volumenerweiterungsmittel (künstliches Blutvolumen) Suplemento para expandir o volume sanguíneo. - + Plasma IV (500ml) Плазма для в/в вливания (500 мл) Plasma IV (500ml) @@ -1011,7 +1011,7 @@ Plasma IV (500ml) Plasma IV (500ml) - + Plasma IV (250ml) Плазма для в/в вливания (250 мл) Plasma IV (250ml) @@ -1022,7 +1022,7 @@ Plasma IV (250ml) Plasma IV (250ml) - + Blood IV (1000ml) Кровь для переливания (1000 мл) Sangre IV (1000ml) @@ -1033,7 +1033,7 @@ Sangue IV (1000ml) Sangue IV (1000ml) - + Blood IV, for restoring a patients blood (keep cold) Пакет крови для возмещения объёма потерянной крови (хранить в холодильнике) Sangre intravenosa, para restarurar el volumen sanguíneo (mantener frío) @@ -1044,7 +1044,7 @@ Blut IV, Bluthaushalt des Patienten wiederherstellen. (Kühl halten) Sangue intravenoso, para restaurar o volume sanguinio do paciente.(Manter frio) - + O Negative infusion blood used in strict and rare events to replenish blood supply usually conducted in the transport phase of medical care. Кровь I группы, резус-отрицательная, применяется по жизненным показаниям для возмещения объема потерянной крови на догоспитальном этапе оказания медицинской помощи. Krew 0 Rh-, używana w rzadkich i szczególnych przypadkach do uzupełnienia krwi u pacjenta, zazwyczaj w trakcie fazie transportu rannej osoby do szpitala. @@ -1054,7 +1054,7 @@ O Negative Blutinfusion wird nur in seltenen Fällen verwendet, um den Bluthaushalt des Patienten zu ergänzen. Wird in der Regel wärend der Transportphase durchgeführt. Sangue O- , utilizado em casos raros para rapidamente repor o sangue. Uso habitual ocorre durante o transporte ou em estações de tratamento. - + Blood IV (500ml) Кровь для переливания (500 мл) Sangre IV (500ml) @@ -1065,7 +1065,7 @@ Sangue IV (500ml) Sangue IV (500ml) - + Blood IV (250ml) Кровь для переливания (250 мл) Sangre IV (250ml) @@ -1076,7 +1076,7 @@ Samgue IV (250ml) Sangue IV (250ml) - + Saline IV (1000ml) Физраствор для в/в вливания (1000 мл) Solución Salina IV (1000ml) @@ -1087,7 +1087,7 @@ Soluzione salina IV (1000ml) Soro IV (1000ml) - + Saline IV, for restoring a patients blood Пакет физраствора для возмещения объёма потерянной крови Solución salina intravenosa, para restaurar el volumen sanguíneo @@ -1098,7 +1098,7 @@ Kochsalzlösung, ein medizinisches Volumenersatzmittel Solução Salina Intravenosa 0.9%, para restaurar o volume de sangue temporariamente. - + A medical volume-replenishing agent introduced into the blood system through an IV infusion. Пакет физиологического раствора для возмещения объёма потерянной крови путем внутривенного вливания Suero fisiológico inoculado al torrente sanguíneo de forma intravenosa. @@ -1109,7 +1109,7 @@ Ein medizinisches Volumenersatzmittel, dass durch einen intravenösen Zugang in den Blutkreislauf verabreicht wird. Uma reposição temporaria para restaurar a pressão arterial perdida por perda de sangue. - + Saline IV (500ml) Физраствор для в/в вливания (500 мл) Salino IV (500ml) @@ -1120,7 +1120,7 @@ Soluzione salina IV (500ml) Soro IV (1000ml) - + Saline IV (250ml) Физраствор для в/в вливания (250 мл) Salino IV (250ml) @@ -1131,7 +1131,7 @@ Soluzione salina IV (250ml) Soro IV (1000ml) - + Basic Field Dressing (QuikClot) Первичный перевязочный пакет (QuikClot) Vendaje básico (QuickClot) @@ -1142,7 +1142,7 @@ Bendaggio emostatico (QuikClot) Bandagem básica (Coagulante) - + QuikClot bandage Гемостатический пакет QuikClot Vendaje QuikClot @@ -1153,7 +1153,7 @@ Bendaggio emostatico (QuikClot) Bandagem com agente coagulante - + Hemostatic bandage with coagulant that stops bleeding. Медицинский коагулянт для экстренной остановки кровотечения Un bandage aidant à coaguler les saignements mineurs à moyens. @@ -1164,7 +1164,7 @@ Bendaggio emostatico con coagulante che permette di arrestare perdite di sangue Bandagem Hemostática com coagulante que controla hemorragia médias e grandes com risco de vida. - + Personal Aid Kit Аптечка Botiquín de primeros auxilios @@ -1175,7 +1175,7 @@ Pronto soccorso personale Kit De Primeiros Socorros Pessoal - + Includes various treatment kit needed for stitching or advanced treatment Содержит различные материалы и инструменты для зашивания ран и оказания специальной медпомощи. Incluye material médico para tratamientos avanzados @@ -1186,21 +1186,21 @@ Include vario materiale medico per trattamenti avanzati. Inclui vários tratamentos materiais para custura e tratamento avançado - + Personal Aid Kit for in field stitching or advanced treatment W znacznym stopniu poprawia stan pacjenta Полевая аптчека для продвинутого лечения и зашивания ран Persönliches Verbandspäckchen zum ambulanten Nähen und fortgeschrittener Behandlung. Trousse de premiers soins pour coudre sur le terrain et traitements avancés. - + Use Personal Aid Kit Verbandpäckchen benutzen Использовать аптечку Utiliser la Trousse de premier soins Użyj apteczki osobistej - + Surgical Kit Trousse chirurgicale Хирургический набор @@ -1211,7 +1211,7 @@ Kit chirurgico Kit Cirurgico - + Surgical Kit for in field advanced medical treatment Trousse chirurgicale pour le traitement sur le terrain Набор для хирургической помощи в полевых условиях @@ -1222,7 +1222,7 @@ Kit chirurgico per trattamenti avanzati sul campo. Kit Cirurgico para uso de tratamento médico avançado em campo - + Surgical Kit for in field advanced medical treatment Набор для хирургической помощи в полевых условиях Kit quirúrgico para el tratamiento avanzado en el campo de batalla @@ -1233,7 +1233,7 @@ Kit chirurgico per trattamenti avanzati sul campo. Kit Cirurgico para uso de tratamento médico avançado em campo. - + Use Surgical Kit Operationsset benutzen Usa kit chirurgico @@ -1241,7 +1241,7 @@ Utiliser la trousse chirugicale Zszyj rany - + Bodybag Housse mortuaire Мешок для трупов @@ -1252,7 +1252,7 @@ Sacca per corpi Saco para cadáver - + A bodybag for dead bodies Housse de transport des corps Мешок для упаковки трупов @@ -1263,7 +1263,7 @@ Una sacca nera per trasportare cadaveri. Um saco para corpos mortos - + A bodybag for dead bodies Housse de transport des corps Мешок для упаковки трупов @@ -1274,7 +1274,7 @@ Una sacca nera per trasportare cadaveri. Um saco para corpos mortos. - + Blood Pressure Tension artérielle Артериальное давление @@ -1285,7 +1285,7 @@ Pressione sanguigna Pressão Arterial - + Checking Blood Pressure.. Mesure de la tension ... Проверка артериального давления ... @@ -1296,7 +1296,7 @@ Controllando la pressione sanguigna.. Aferindo Pressão Arterial... - + %1 checked Blood Pressure: %2 %1 kontrollierte Blutdruck: %2 %1 controllata pressione sanguigna: %2 @@ -1304,7 +1304,7 @@ %1 à vérifié la tension: %2 %1 sprawdził ciśnienie krwi: %2 - + You checked %1 Vous diagnostiquez %1 Вы осмотрели раненого %1 @@ -1315,7 +1315,7 @@ Hai diagnosticato %1 Você aferiu o paciente %1 - + You find a blood pressure of %2/%3 Vous avez trouvé une tension de %2/%3 Артериальное давление %2/%3 @@ -1326,7 +1326,7 @@ Der Blutdruck liegt bei %2/%3 A Pressão Arterial é de %2/%3 - + You find a low blood pressure Tension basse Давление низкое @@ -1337,7 +1337,7 @@ La pressione sanguigna è bassa Pressão Arterial baixa - + You find a normal blood pressure Tension normale Давление нормальное @@ -1348,7 +1348,7 @@ La pressione sanguigna è normale Pressão Arterial normal - + You find a high blood pressure Tension haute Давление высокое @@ -1359,7 +1359,7 @@ La pressione sanguigna è alta Pressão Arterial Alta - + You find no blood pressure Pas de tension Давления нет @@ -1370,7 +1370,7 @@ La pressione sanguigna è assente Sem Pressão Arterial - + You fail to find a blood pressure Vous n'avez pas pu mesurer de tension Артериальное давление не определяется @@ -1381,7 +1381,7 @@ Manca strumento per misurare pressione sanguigna Você falhou em aferir a Pressão Arterial - + Low Niedrig Basso @@ -1389,7 +1389,7 @@ Faible Niskie - + Normal Normal Normale @@ -1397,7 +1397,7 @@ Normale Normalne - + High Hoch Alto @@ -1405,7 +1405,7 @@ Haute Wysokie - + No Blood Pressure Kein Blutdruck Nessuna Pressione Sanguigna @@ -1413,7 +1413,7 @@ Aucune tension Brak ciśnienia krwi - + Pulse Пульс Pouls @@ -1424,7 +1424,7 @@ Polso Pulso - + Checking Heart Rate ... Vérification du rythme cardiaque ... Проверка пульса ... @@ -1435,7 +1435,7 @@ Controllando il battito cardiaco ... Aferindo Pulso ... - + You checked %1 Вы осмотрели раненого %1 Vous examinez %1 @@ -1446,7 +1446,7 @@ Hai diagnosticato %1 Você aferiu o paciente %1 - + %1 checked Heart Rate: %2 %1 kontrollierte Herzfrequenz: %2 %1 Controllata Frequenza Cardiaca: %2 @@ -1454,7 +1454,7 @@ %1 à vérifié le rythme cardiaque: %2 %1 sprawdził tętno: %2 - + Weak Schwach Lento @@ -1462,7 +1462,7 @@ Faible Słabe - + Normal Normal Normale @@ -1470,7 +1470,7 @@ Normal Normalne - + Strong Stark Veloce @@ -1478,7 +1478,7 @@ Fort Silne - + You find a Heart Rate of %2 Rythme cardiaque de %2 Пульс %2 уд./мин. @@ -1489,7 +1489,7 @@ Il battito cardiaco è %2 A Freqüência Cardíaca é de %2 - + You find a weak Heart Rate Rythme cardiaque faible Пульс слабый @@ -1500,7 +1500,7 @@ Hai riscontrato un debole battito cardiaco Freqüência Cardíaca baixa - + You find a strong Heart Rate Rythme cardiaque élevé Пульс учащенный @@ -1511,7 +1511,7 @@ Hai riscontrato un forte battito cardiaco Freqüência Cardíaca normal - + You find a normal Heart Rate Rythme cardiaque normal Пульс в норме @@ -1522,7 +1522,7 @@ Hai riscontrato un normale battito cardiaco Freqüência Cardíaca alta - + You find no Heart Rate Pas de rythme cardiaque Пульс не прощупывается @@ -1533,7 +1533,7 @@ Hai riscontrato una assenza di battito cardiaco Sem Freqüência Cardíaca - + Response Etat de Conscience Реакция @@ -1544,7 +1544,7 @@ Risposta Reação - + You check response of patient Vous vérifiez la réponse du patient Вы проверяете реакцию раненого @@ -1555,7 +1555,7 @@ Controlli la risposta del paziente Aferindo se o paciente tem reação... - + %1 is responsive %1 реагирует на раздражители %1 est conscient @@ -1566,7 +1566,7 @@ %1 e' cosciente %1 está respondendo - + %1 is not responsive %1 не реагирует на раздражители %1 est inconscient @@ -1577,7 +1577,7 @@ %1 e' incosciente %1 não está respondendo - + You checked %1 Вы осмотрели раненого %1 Vous avez examiné %1 @@ -1588,7 +1588,7 @@ Hai controllato %1 Você aferiu o paciente %1 - + Patient %1<br/>is %2.<br/>%3.<br/>%4 Paziente %1<br/>è %2.<br/>%3.<br/>%4 Пациент %1<br/>%2.<br/>%3.<br/>%4 @@ -1596,7 +1596,7 @@ Patient %1<br/>est %2.<br/>%3.<br/> Pacjent %1<br/>jest %2.<br/>%3.<br/>%4 - + alive Vivo жив @@ -1604,7 +1604,7 @@ vivant żywy - + dead Morto мёртв @@ -1612,7 +1612,7 @@ mort martwy - + He's lost some blood Ha perso molto sangue Есть кровопотеря @@ -1620,10 +1620,10 @@ Il à perdu du sang Stracił trochę krwi - + He's lost a lot of blood - + He hasn't lost blood Non ha perso sangue Нет кровопотери @@ -1631,7 +1631,7 @@ il n'a pas perdu de sang Nie stracił krwi - + He is in pain è affetto da dolore Испытывает боль @@ -1639,7 +1639,7 @@ il souffre Odczuwa ból - + He is not in pain Non è affetto da dolore Не испытывает боли @@ -1647,7 +1647,7 @@ Il ne souffre pas Nie odczuwa bólu - + Bandaged Bandé Повязка наложена @@ -1658,7 +1658,7 @@ verbunden Enfaixado - + You bandage %1 (%2) Vous bandez %1 (%2) Вы перевязали раненого %1 (%2) @@ -1669,7 +1669,7 @@ Du verbindest %1 (%2) Você aplica bandagem no paciente %1 (%2) - + %1 is bandaging you %1 vous bande %1 перевязывает вас @@ -1680,7 +1680,7 @@ %1 verbindet dich %1 está aplicando uma bandagem em você - + You start stitching injuries from %1 (%2) Вы зашиваете ранения от %1 (%2) Du nähst die Wunden von %1 (%2) @@ -1691,7 +1691,7 @@ Stai suturando le ferite di %1 (%2) Você começa a suturar os ferimentos do %1 (%2) - + Stitching Наложение швов Suturando @@ -1702,7 +1702,7 @@ Suturando Suturando... - + You treat the airway of %1 Вы интубируете раненого %1 Estás intubando a %1 @@ -1713,7 +1713,7 @@ Controlli le vie respiratorie di %1 Você entuba o %1 - + Airway Дыхательные пути Vías aéreas @@ -1724,7 +1724,7 @@ Vie respiratorie Vias Aéreas - + %1 is treating your airway %1 проводит вам интубацию %1 traite vos voies respiratoires @@ -1735,7 +1735,7 @@ %1 ti sta trattando le vie respiratorie %1 está te entubando - + Drag Ziehen Arrastrar @@ -1747,7 +1747,7 @@ Arrastar Trascina - + Carry Tragen Cargar @@ -1759,7 +1759,7 @@ Carregar Trasporta - + Release Loslassen Soltar @@ -1771,7 +1771,7 @@ Soltar Rrilascia - + Load Patient Into Patient Einladen Cargar el paciente en @@ -1783,7 +1783,7 @@ Carregar Paciente Em Carica paziente nel - + Unload Patient Patient Ausladen Descargar el paciente @@ -1817,7 +1817,7 @@ Carica il paziente Carregar Paciente Em - + Place body in bodybag Colocar cuerpo en bolsa para cadáveres Поместить тело в мешок для трупов @@ -1828,7 +1828,7 @@ Metti il corpo nella sacca per cadaveri Colocar corpo dentro do saco para cadáver - + Placing body in bodybag Colocando cuerpo en bolsa para cadáveres Упаковка тела ... @@ -1839,7 +1839,7 @@ Stai mettendo il corpo nella sacca Colocando corpo dentro do saco para cadáver... - + %1 has bandaged patient %1 has vendado al paciente %1 перевязал пациента @@ -1850,7 +1850,7 @@ %1 ha bendato il paziente %1 aplicou bandagem no paciente - + %1 used %2 %1 usó %2 %1 benutzt %2 @@ -1861,7 +1861,7 @@ %1 ha usato %2 %1 usou %2 - + %1 has given an IV %1 has puesto una IV %1 провёл переливание @@ -1872,7 +1872,7 @@ %1 ha somministrato una IV %1 aplicou um intravenoso - + %1 applied a tourniquet %1 aplicado torniquete %1 наложил жгут diff --git a/addons/medical/ui/triagecard.hpp b/addons/medical/ui/triagecard.hpp index a93440d13ad..c4d3145964d 100644 --- a/addons/medical/ui/triagecard.hpp +++ b/addons/medical/ui/triagecard.hpp @@ -49,7 +49,7 @@ class GVAR(triageCard) { font = "PuristaMedium"; colorText[] = {0,0,0,1}; colorBackground[] = {0,0,0,0}; - text = "$STR_ACE_MEDICAL_ACTIONS_TriageCard"; + text = "$STR_ACE_Medical_Actions_TriageCard"; }; class TriageList: ACE_gui_listBoxBase { idc = 200; @@ -103,7 +103,7 @@ class GVAR(triageCard) { y = 0; w = 0; h = 0; - text = $STR_ACE_MEDICAL_TRIAGE_STATUS_NONE; + text = $STR_ACE_Medical_Triage_Status_None; style = 0x02; size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; @@ -121,7 +121,7 @@ class GVAR(triageCard) { y = 0; w = 0; h = 0; - text = $STR_ACE_MEDICAL_TRIAGE_STATUS_MINOR; + text = $STR_ACE_Medical_Triage_Status_Minor; style = 0x02; size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; @@ -139,7 +139,7 @@ class GVAR(triageCard) { y = 0; w = 0; h = 0; - text = $STR_ACE_MEDICAL_TRIAGE_STATUS_DELAYED; + text = $STR_ACE_Medical_Triage_Status_Delayed; style = 0x02; size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; @@ -157,7 +157,7 @@ class GVAR(triageCard) { y = 0; w = 0; h = 0; - text = $STR_ACE_MEDICAL_TRIAGE_STATUS_IMMEDIATE; + text = $STR_ACE_Medical_Triage_Status_Immediate; style = 0x02; size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; @@ -175,7 +175,7 @@ class GVAR(triageCard) { y = 0; w = 0; h = 0; - text = $STR_ACE_MEDICAL_TRIAGE_STATUS_DECEASED; + text = $STR_ACE_Medical_Triage_Status_Deceased; style = 0x02; size = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; From 1ca0d66f30347c662ddaf5df5915f2330c7b2958 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Thu, 30 Apr 2015 22:02:20 +0200 Subject: [PATCH 116/171] Initial categories --- addons/advanced_ballistics/initKeybinds.sqf | 2 +- addons/atragmx/initKeybinds.sqf | 4 +-- addons/fcs/initKeybinds.sqf | 6 ++--- addons/grenades/XEH_postInit.sqf | 2 +- addons/javelin/initKeybinds.sqf | 10 ++++---- addons/kestrel4500/initKeybinds.sqf | 8 +++--- addons/laserpointer/initKeybinds.sqf | 2 +- addons/microdagr/XEH_clientInit.sqf | 4 +-- addons/movement/XEH_postInit.sqf | 2 +- addons/nightvision/XEH_postInitClient.sqf | 4 +-- addons/overheating/XEH_postInit.sqf | 2 +- addons/parachute/XEH_postInit.sqf | 2 +- addons/reload/XEH_postInit.sqf | 2 +- addons/safemode/XEH_postInit.sqf | 2 +- addons/scopes/XEH_postInit.sqf | 18 ++++++------- addons/vector/initKeybinds.sqf | 4 +-- addons/vehicles/XEH_postInit.sqf | 2 +- addons/weaponselect/XEH_postInit.sqf | 28 ++++++++++----------- 18 files changed, 52 insertions(+), 52 deletions(-) diff --git a/addons/advanced_ballistics/initKeybinds.sqf b/addons/advanced_ballistics/initKeybinds.sqf index 59866576aab..cddf47877ae 100644 --- a/addons/advanced_ballistics/initKeybinds.sqf +++ b/addons/advanced_ballistics/initKeybinds.sqf @@ -1,4 +1,4 @@ -["ACE3", QGVAR(ProtractorKey), localize "STR_ACE_AdvancedBallistics_ProtractorKey", +["ACE3 Equipment", QGVAR(ProtractorKey), localize "STR_ACE_AdvancedBallistics_ProtractorKey", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/atragmx/initKeybinds.sqf b/addons/atragmx/initKeybinds.sqf index d8a69a09e3d..796d7f9d97b 100644 --- a/addons/atragmx/initKeybinds.sqf +++ b/addons/atragmx/initKeybinds.sqf @@ -1,8 +1,8 @@ -["ACE3", QGVAR(ATragMXDialogKey), localize "STR_ACE_ATragMX_ATragMXDialogKey", +["ACE3 Equipment", QGVAR(ATragMXDialogKey), localize "STR_ACE_ATragMX_ATragMXDialogKey", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; - + // Statement [] call FUNC(create_dialog); false diff --git a/addons/fcs/initKeybinds.sqf b/addons/fcs/initKeybinds.sqf index 8e79bc8056d..0e5eb7b1172 100644 --- a/addons/fcs/initKeybinds.sqf +++ b/addons/fcs/initKeybinds.sqf @@ -1,6 +1,6 @@ // by commy2 -["ACE3", QGVAR(lazeTarget), localize "STR_ACE_FCS_LaseTarget", +["ACE3 Vehicle", QGVAR(lazeTarget), localize "STR_ACE_FCS_LaseTarget", { // Conditions: canInteract if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -30,7 +30,7 @@ }, [15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key -["ACE3", QGVAR(adjustRangeUp), localize "STR_ACE_FCS_AdjustRangeUp", +["ACE3 Vehicle", QGVAR(adjustRangeUp), localize "STR_ACE_FCS_AdjustRangeUp", { // Conditions: canInteract if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -44,7 +44,7 @@ {false}, [201, [false, false, false]], false] call cba_fnc_addKeybind; //PageUp Key -["ACE3", QGVAR(adjustRangDown), localize "STR_ACE_FCS_AdjustRangeDown", +["ACE3 Vehicle", QGVAR(adjustRangDown), localize "STR_ACE_FCS_AdjustRangeDown", { // Conditions: canInteract if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/grenades/XEH_postInit.sqf b/addons/grenades/XEH_postInit.sqf index 7572a41c10c..e3ed93c4ddb 100644 --- a/addons/grenades/XEH_postInit.sqf +++ b/addons/grenades/XEH_postInit.sqf @@ -10,7 +10,7 @@ GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265]; GVAR(flashbangPPEffectCC) ppEffectForceInNVG true; // Add keybinds -["ACE3", QGVAR(switchGrenadeMode), localize "STR_ACE_Grenades_SwitchGrenadeMode", +["ACE3 Weapon", QGVAR(switchGrenadeMode), localize "STR_ACE_Grenades_SwitchGrenadeMode", { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/javelin/initKeybinds.sqf b/addons/javelin/initKeybinds.sqf index ecce40bbf04..c5a510eb93b 100644 --- a/addons/javelin/initKeybinds.sqf +++ b/addons/javelin/initKeybinds.sqf @@ -1,9 +1,9 @@ // by commy2 -["ACE3", QGVAR(lockTarget), localize "STR_ACE_JAVELIN_LockTarget", +["ACE3 Weapon", QGVAR(lockTarget), localize "STR_ACE_JAVELIN_LockTarget", { if (GETGVAR(isLockKeyDown,false)) exitWith {false}; - + GVAR(isLockKeyDown) = true; // Statement @@ -14,16 +14,16 @@ { // prevent holding down GVAR(isLockKeyDown) = false; - + // Statement [ACE_player] call FUNC(lockKeyUp); false }, [15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key -["ACE3", QGVAR(cycleFireMode), localize "STR_ACE_JAVELIN_CycleFireMode", +["ACE3 Weapon", QGVAR(cycleFireMode), localize "STR_ACE_JAVELIN_CycleFireMode", { false }, -{ +{ [ACE_player] call FUNC(cycleFireMode); false }, diff --git a/addons/kestrel4500/initKeybinds.sqf b/addons/kestrel4500/initKeybinds.sqf index 585856cbbbd..f6b4fec3ce7 100644 --- a/addons/kestrel4500/initKeybinds.sqf +++ b/addons/kestrel4500/initKeybinds.sqf @@ -1,8 +1,8 @@ -["ACE3", QGVAR(KestrelDialogKey), localize "STR_ACE_Kestrel4500_KestrelDialogKey", +["ACE3 Equipment", QGVAR(KestrelDialogKey), localize "STR_ACE_Kestrel4500_KestrelDialogKey", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; - + // Statement [] call FUNC(createKestrelDialog); false @@ -10,11 +10,11 @@ {false}, [0, [false, false, false]], false, 0] call CBA_fnc_addKeybind; // (empty default key) -["ACE3", QGVAR(DisplayKestrelKey), localize "STR_ACE_Kestrel4500_DisplayKestrelKey", +["ACE3 Equipment", QGVAR(DisplayKestrelKey), localize "STR_ACE_Kestrel4500_DisplayKestrelKey", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; - + // Statement [] call FUNC(displayKestrel); false diff --git a/addons/laserpointer/initKeybinds.sqf b/addons/laserpointer/initKeybinds.sqf index 04516f07573..e2197f08b80 100644 --- a/addons/laserpointer/initKeybinds.sqf +++ b/addons/laserpointer/initKeybinds.sqf @@ -1,6 +1,6 @@ // by commy2 -["ACE3", QGVAR(switchLaserLightMode), localize "STR_ACE_Laserpointer_switchLaserLight", +["ACE3 Weapon", QGVAR(switchLaserLightMode), localize "STR_ACE_Laserpointer_switchLaserLight", { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/microdagr/XEH_clientInit.sqf b/addons/microdagr/XEH_clientInit.sqf index 99c94b45127..587bf85ef5a 100644 --- a/addons/microdagr/XEH_clientInit.sqf +++ b/addons/microdagr/XEH_clientInit.sqf @@ -4,7 +4,7 @@ if (!hasInterface) exitWith {}; //Add Keybinds: -["ACE3", QGVAR(openGPS), (localize "STR_ACE_microdagr_toggleUnit"), +["ACE3 Equipment", QGVAR(openGPS), (localize "STR_ACE_microdagr_toggleUnit"), { // canInteractWith (can use on map) if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -17,7 +17,7 @@ if (!hasInterface) exitWith {}; {false}, [0xC7, [false, false, false]], false] call cba_fnc_addKeybind; //Home Key -["ACE3", QGVAR(closeGPS), (localize "STR_ACE_microdagr_closeUnit"), +["ACE3 Equipment", QGVAR(closeGPS), (localize "STR_ACE_microdagr_closeUnit"), { // canInteractWith (can use on map) if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/movement/XEH_postInit.sqf b/addons/movement/XEH_postInit.sqf index 224cd932734..0e451832d92 100644 --- a/addons/movement/XEH_postInit.sqf +++ b/addons/movement/XEH_postInit.sqf @@ -20,7 +20,7 @@ if (!hasInterface) exitWith {}; }] call EFUNC(common,addEventHandler); -["ACE3", QGVAR(climb), localize "STR_ACE_Movement_Climb", +["ACE3 Movement", QGVAR(climb), localize "STR_ACE_Movement_Climb", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/nightvision/XEH_postInitClient.sqf b/addons/nightvision/XEH_postInitClient.sqf index db5d3950969..3edc3edad50 100644 --- a/addons/nightvision/XEH_postInitClient.sqf +++ b/addons/nightvision/XEH_postInitClient.sqf @@ -37,7 +37,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0; ["playerTurretChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler); // Add keybinds -["ACE3", QGVAR(IncreaseNVGBrightness), localize "STR_ACE_NightVision_IncreaseNVGBrightness", +["ACE3 Equipment", QGVAR(IncreaseNVGBrightness), localize "STR_ACE_NightVision_IncreaseNVGBrightness", { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -51,7 +51,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0; {false}, [201, [false, false, true]], false] call cba_fnc_addKeybind; //PageUp + ALT -["ACE3", QGVAR(DecreaseNVGBrightness), localize "STR_ACE_NightVision_DecreaseNVGBrightness", +["ACE3 Equipment", QGVAR(DecreaseNVGBrightness), localize "STR_ACE_NightVision_DecreaseNVGBrightness", { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/overheating/XEH_postInit.sqf b/addons/overheating/XEH_postInit.sqf index 2281a1eeac3..fb97038dd76 100644 --- a/addons/overheating/XEH_postInit.sqf +++ b/addons/overheating/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3", QGVAR(unjamWeapon), localize "STR_ACE_Overheating_UnjamWeapon", +["ACE3 Weapon", QGVAR(unjamWeapon), localize "STR_ACE_Overheating_UnjamWeapon", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/parachute/XEH_postInit.sqf b/addons/parachute/XEH_postInit.sqf index 19e6d413a2a..a6c589a39a2 100644 --- a/addons/parachute/XEH_postInit.sqf +++ b/addons/parachute/XEH_postInit.sqf @@ -17,7 +17,7 @@ if (!hasInterface) exitWith {}; -["ACE3", QGVAR(showAltimeter), localize "STR_ACE_Parachute_showAltimeter", +["ACE3 Equipment", QGVAR(showAltimeter), localize "STR_ACE_Parachute_showAltimeter", { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/reload/XEH_postInit.sqf b/addons/reload/XEH_postInit.sqf index 422ea183d35..c5b47a0f63b 100644 --- a/addons/reload/XEH_postInit.sqf +++ b/addons/reload/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3", QGVAR(checkAmmo), localize "STR_ACE_Reload_checkAmmo", +["ACE3 Weapon", QGVAR(checkAmmo), localize "STR_ACE_Reload_checkAmmo", { // Conditions: canInteract if !([ACE_player, (vehicle ACE_player), ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/safemode/XEH_postInit.sqf b/addons/safemode/XEH_postInit.sqf index be6b79d82a3..1e6c9d7a721 100644 --- a/addons/safemode/XEH_postInit.sqf +++ b/addons/safemode/XEH_postInit.sqf @@ -9,7 +9,7 @@ if (!hasInterface) exitWith {}; // Add keybinds -["ACE3", QGVAR(safeMode), localize "STR_ACE_SafeMode_SafeMode", +["ACE3 Weapon", QGVAR(safeMode), localize "STR_ACE_SafeMode_SafeMode", { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/scopes/XEH_postInit.sqf b/addons/scopes/XEH_postInit.sqf index ca4017222a6..d7affc05347 100644 --- a/addons/scopes/XEH_postInit.sqf +++ b/addons/scopes/XEH_postInit.sqf @@ -33,20 +33,20 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3", QGVAR(AdjustUpMinor), localize "STR_ACE_Scopes_AdjustUpMinor", +["ACE3 Scope Adjustment", QGVAR(AdjustUpMinor), localize "STR_ACE_Scopes_AdjustUpMinor", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; // Conditions: specific [ACE_player] call FUNC(inventoryCheck); - + // Statement [ACE_player, ELEVATION_UP, MINOR_INCREMENT] call FUNC(adjustScope); }, {false}, [201, [false, false, false]], true] call cba_fnc_addKeybind; -["ACE3", QGVAR(AdjustDownMinor), localize "STR_ACE_Scopes_AdjustDownMinor", +["ACE3 Scope Adjustment", QGVAR(AdjustDownMinor), localize "STR_ACE_Scopes_AdjustDownMinor", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -59,7 +59,7 @@ if !(hasInterface) exitWith {}; {false}, [209, [false, false, false]], true] call cba_fnc_addKeybind; -["ACE3", QGVAR(AdjustLeftMinor), localize "STR_ACE_Scopes_AdjustLeftMinor", +["ACE3 Scope Adjustment", QGVAR(AdjustLeftMinor), localize "STR_ACE_Scopes_AdjustLeftMinor", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -72,7 +72,7 @@ if !(hasInterface) exitWith {}; {false}, [209, [false, true, false]], true] call cba_fnc_addKeybind; -["ACE3", QGVAR(AdjustRightMinor), localize "STR_ACE_Scopes_AdjustRightMinor", +["ACE3 Scope Adjustment", QGVAR(AdjustRightMinor), localize "STR_ACE_Scopes_AdjustRightMinor", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -85,7 +85,7 @@ if !(hasInterface) exitWith {}; {false}, [201, [false, true, false]], true] call cba_fnc_addKeybind; -["ACE3", QGVAR(AdjustUpMajor), localize "STR_ACE_Scopes_AdjustUpMajor", +["ACE3 Scope Adjustment", QGVAR(AdjustUpMajor), localize "STR_ACE_Scopes_AdjustUpMajor", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -98,7 +98,7 @@ if !(hasInterface) exitWith {}; {false}, [201, [true, false, false]], true] call cba_fnc_addKeybind; -["ACE3", QGVAR(AdjustDownMajor), localize "STR_ACE_Scopes_AdjustDownMajor", +["ACE3 Scope Adjustment", QGVAR(AdjustDownMajor), localize "STR_ACE_Scopes_AdjustDownMajor", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -111,7 +111,7 @@ if !(hasInterface) exitWith {}; {false}, [209, [true, false, false]], true] call cba_fnc_addKeybind; -["ACE3", QGVAR(AdjustLeftMajor), localize "STR_ACE_Scopes_AdjustLeftMajor", +["ACE3 Scope Adjustment", QGVAR(AdjustLeftMajor), localize "STR_ACE_Scopes_AdjustLeftMajor", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -124,7 +124,7 @@ if !(hasInterface) exitWith {}; {false}, [209, [true, true, false]], true] call cba_fnc_addKeybind; -["ACE3", QGVAR(AdjustRightMajor), localize "STR_ACE_Scopes_AdjustRightMajor", +["ACE3 Scope Adjustment", QGVAR(AdjustRightMajor), localize "STR_ACE_Scopes_AdjustRightMajor", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/vector/initKeybinds.sqf b/addons/vector/initKeybinds.sqf index 31fb3bbd1bd..79df40b0a2a 100644 --- a/addons/vector/initKeybinds.sqf +++ b/addons/vector/initKeybinds.sqf @@ -1,6 +1,6 @@ // by commy2 -["ACE3", QGVAR(AzimuthKey), localize "STR_ACE_Vector_AzimuthKey", +["ACE3 Equipment", QGVAR(AzimuthKey), localize "STR_ACE_Vector_AzimuthKey", { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -29,7 +29,7 @@ [15, [false, false, false]], false, 0] call CBA_fnc_addKeybind; //Tab Key -["ACE3", QGVAR(DistanceKey), localize "STR_ACE_Vector_DistanceKey", +["ACE3 Equipment", QGVAR(DistanceKey), localize "STR_ACE_Vector_DistanceKey", { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/vehicles/XEH_postInit.sqf b/addons/vehicles/XEH_postInit.sqf index c7665cf2aa4..6c9f4afd4b5 100644 --- a/addons/vehicles/XEH_postInit.sqf +++ b/addons/vehicles/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3", QGVAR(speedLimiter), localize "STR_ACE_SpeedLimiter", +["ACE3 Vehicle", QGVAR(speedLimiter), localize "STR_ACE_SpeedLimiter", { // Conditions: canInteract if !([ACE_player, objNull, ["isnotinside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/weaponselect/XEH_postInit.sqf b/addons/weaponselect/XEH_postInit.sqf index 93813b4ed03..19f7d8d7a52 100644 --- a/addons/weaponselect/XEH_postInit.sqf +++ b/addons/weaponselect/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3", QGVAR(SelectPistolNew), localize "STR_ACE_WeaponSelect_SelectPistol", +["ACE3 Weapon", QGVAR(SelectPistolNew), localize "STR_ACE_WeaponSelect_SelectPistol", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -18,7 +18,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key -["ACE3", QGVAR(SelectRifleNew), localize "STR_ACE_WeaponSelect_SelectRifle", +["ACE3 Weapon", QGVAR(SelectRifleNew), localize "STR_ACE_WeaponSelect_SelectRifle", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -32,7 +32,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key -["ACE3", QGVAR(SelectRifleMuzzleNew), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle", +["ACE3 Weapon", QGVAR(SelectRifleMuzzleNew), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -46,7 +46,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key -["ACE3", QGVAR(SelectLauncherNew), localize "STR_ACE_WeaponSelect_SelectLauncher", +["ACE3 Weapon", QGVAR(SelectLauncherNew), localize "STR_ACE_WeaponSelect_SelectLauncher", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -60,7 +60,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key -["ACE3", QGVAR(SelectBinocularNew), localize "STR_ACE_WeaponSelect_SelectBinocular", +["ACE3 Weapon", QGVAR(SelectBinocularNew), localize "STR_ACE_WeaponSelect_SelectBinocular", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -74,7 +74,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key -["ACE3", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag", +["ACE3 Weapon", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -88,7 +88,7 @@ if !(hasInterface) exitWith {}; {false}, [7, [false, false, false]], false] call cba_fnc_addKeybind; //6 Key -["ACE3", QGVAR(SelectGrenadeOther), localize "STR_ACE_WeaponSelect_SelectGrenadeOther", +["ACE3 Weapon", QGVAR(SelectGrenadeOther), localize "STR_ACE_WeaponSelect_SelectGrenadeOther", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -102,7 +102,7 @@ if !(hasInterface) exitWith {}; {false}, [8, [false, false, false]], false] call cba_fnc_addKeybind; //7 Key -["ACE3", QGVAR(HolsterWeapon), localize "STR_ACE_WeaponSelect_HolsterWeapon", +["ACE3 Weapon", QGVAR(HolsterWeapon), localize "STR_ACE_WeaponSelect_HolsterWeapon", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -116,7 +116,7 @@ if !(hasInterface) exitWith {}; {false}, [11, [false, false, false]], false] call cba_fnc_addKeybind; //0 Key -["ACE3", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn", +["ACE3 Vehicle", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -130,7 +130,7 @@ if !(hasInterface) exitWith {}; {false}, [3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key -["ACE3", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff", +["ACE3 Vehicle", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -144,7 +144,7 @@ if !(hasInterface) exitWith {}; {false}, [2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key -["ACE3", QGVAR(SelectMainGunNew), localize "STR_ACE_WeaponSelect_SelectMainGun", +["ACE3 Vehicle", QGVAR(SelectMainGunNew), localize "STR_ACE_WeaponSelect_SelectMainGun", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -158,7 +158,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key -["ACE3", QGVAR(SelectMachineGunNew), localize "STR_ACE_WeaponSelect_SelectMachineGun", +["ACE3 Vehicle", QGVAR(SelectMachineGunNew), localize "STR_ACE_WeaponSelect_SelectMachineGun", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -172,7 +172,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key -["ACE3", QGVAR(SelectMissilesNew), localize "STR_ACE_WeaponSelect_SelectMissiles", +["ACE3 Vehicle", QGVAR(SelectMissilesNew), localize "STR_ACE_WeaponSelect_SelectMissiles", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -186,7 +186,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key -["ACE3", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher", +["ACE3 Vehicle", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; From 270c3adc1e67bdfa111e29fcc04e62a411c64afc Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 30 Apr 2015 22:06:10 +0200 Subject: [PATCH 117/171] Do it again, but properly this time --- addons/medical/ACE_Medical_Treatments.hpp | 6 +- addons/medical/CfgWeapons.hpp | 12 ++-- .../fnc_actionCheckBloodPressureLocal.sqf | 22 +++---- .../functions/fnc_actionCheckPulseLocal.sqf | 18 +++--- addons/medical/stringtable.xml | 62 +++++++++---------- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/addons/medical/ACE_Medical_Treatments.hpp b/addons/medical/ACE_Medical_Treatments.hpp index 4f47e68a0bc..8a42bbbb684 100644 --- a/addons/medical/ACE_Medical_Treatments.hpp +++ b/addons/medical/ACE_Medical_Treatments.hpp @@ -225,7 +225,7 @@ class ACE_Medical_Actions { }; class CheckPulse: fieldDressing { displayName = ""; - displayNameProgress = "$STR_ACE_Medical_Check_Pulse_CONTENT"; + displayNameProgress = "$STR_ACE_Medical_Check_Pulse_Content"; treatmentLocations[] = {"All"}; requiredMedic = 0; treatmentTime = 2; @@ -240,11 +240,11 @@ class ACE_Medical_Actions { }; class CheckBloodPressure: CheckPulse { callbackSuccess = QUOTE(DFUNC(actionCheckBloodPressure)); - displayNameProgress = "$STR_ACE_Medical_Check_Bloodpressure_CONTENT"; + displayNameProgress = "$STR_ACE_Medical_Check_Bloodpressure_Content"; }; class CheckResponse: CheckPulse { callbackSuccess = QUOTE(DFUNC(actionCheckResponse)); - displayNameProgress = "$STR_ACE_Medical_Check_Response_CONTENT"; + displayNameProgress = "$STR_ACE_Medical_Check_Response_Content"; }; class RemoveTourniquet: CheckPulse { treatmentTime = 2.5; diff --git a/addons/medical/CfgWeapons.hpp b/addons/medical/CfgWeapons.hpp index 5fc5a4c9a83..d70b64a1d20 100644 --- a/addons/medical/CfgWeapons.hpp +++ b/addons/medical/CfgWeapons.hpp @@ -102,8 +102,8 @@ class CfgWeapons { scope = 2; displayName = $STR_ACE_Medical_Plasma_IV; picture = QUOTE(PATHTOF(ui\items\plasmaIV_x_ca.paa)); - descriptionShort = $STR_ACE_Medical_Plasma_IV_DESC_SHORT; - descriptionUse = $STR_ACE_Medical_Plasma_IV_DESC_USE; + descriptionShort = $STR_ACE_Medical_Plasma_IV_Desc_Short; + descriptionUse = $STR_ACE_Medical_Plasma_IV_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 10; }; @@ -125,8 +125,8 @@ class CfgWeapons { model = "\A3\Structures_F_EPA\Items\Medical\BloodBag_F.p3d"; displayName = $STR_ACE_Medical_Blood_IV; picture = QUOTE(PATHTOF(ui\items\bloodIV_x_ca.paa)); - descriptionShort = $STR_ACE_Medical_Blood_IV_DESC_SHORT; - descriptionUse = $STR_ACE_Medical_Blood_IV_DESC_USE; + descriptionShort = $STR_ACE_Medical_Blood_IV_Desc_Short; + descriptionUse = $STR_ACE_Medical_Blood_IV_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 10; }; @@ -147,8 +147,8 @@ class CfgWeapons { scope = 2; displayName = $STR_ACE_Medical_Saline_IV; picture = QUOTE(PATHTOF(ui\items\salineIV_x_ca.paa)); - descriptionShort = $STR_ACE_Medical_Saline_IV_DESC_SHORT; - descriptionUse = $STR_ACE_Medical_Saline_IV_DESC_USE; + descriptionShort = $STR_ACE_Medical_Saline_IV_Desc_Short; + descriptionUse = $STR_ACE_Medical_Saline_IV_Desc_Use; class ItemInfo: InventoryItem_Base_F { mass = 10; }; diff --git a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf index 7a0b332400f..560b171400e 100644 --- a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf +++ b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf @@ -28,27 +28,27 @@ _bloodPressureLow = _bloodPressure select 0; _output = ""; _logOutPut = ""; if ([_caller] call FUNC(isMedic)) then { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_1"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_1"; _logOutPut = format["%1/%2",round(_bloodPressureHigh),round(_bloodPressureLow)]; } else { if (_bloodPressureHigh > 20) then { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_2"; - _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_LOW"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_2"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_Low"; if (_bloodPressureHigh > 100) then { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_3"; - _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_NORMAL"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_3"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_Normal"; if (_bloodPressureHigh > 160) then { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_4"; - _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_HIGH"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_4"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_High"; }; }; } else { if (random(10) > 3) then { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_5"; - _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_NOBLOODPRESSURE"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_5"; + _logOutPut = localize "STR_ACE_Medical_Check_Bloodpressure_NoBloodpressure"; } else { - _output = "STR_ACE_Medical_Check_Bloodpressure_OUTPUT_6"; + _output = "STR_ACE_Medical_Check_Bloodpressure_Output_6"; }; }; }; @@ -56,5 +56,5 @@ if ([_caller] call FUNC(isMedic)) then { ["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller]] call EFUNC(common,targetEvent); if (_logOutPut != "") then { - [_target,"activity", localize "STR_ACE_Medical_Check_Bloodpressure_LOG", [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog); + [_target,"activity", localize "STR_ACE_Medical_Check_Bloodpressure_Log", [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog); }; diff --git a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf index 3f49cba6e60..85e9bee8283 100644 --- a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf +++ b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf @@ -23,24 +23,24 @@ _heartRate = _unit getvariable [QGVAR(heartRate), 80]; if (!alive _unit) then { _heartRate = 0; }; -_heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_5"; +_heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_5"; _logOutPut = "No heart rate"; if (_heartRate > 1.0) then { if ([_caller] call FUNC(isMedic)) then { - _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_1"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_1"; _logOutPut = format["%1",round(_heartRate)]; } else { // non medical personel will only find a pulse/HR - _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_2"; - _logOutPut = localize "STR_ACE_Medical_Check_Pulse_WEAK"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_2"; + _logOutPut = localize "STR_ACE_Medical_Check_Pulse_Weak"; if (_heartRate > 60) then { if (_heartRate > 100) then { - _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_3"; - _logOutPut = localize "STR_ACE_Medical_Check_Pulse_STRONG"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_3"; + _logOutPut = localize "STR_ACE_Medical_Check_Pulse_Strong"; } else { - _heartRateOutput = "STR_ACE_Medical_Check_Pulse_OUTPUT_4"; - _logOutPut = localize "STR_ACE_Medical_Check_Pulse_NORMAL"; + _heartRateOutput = "STR_ACE_Medical_Check_Pulse_Output_4"; + _logOutPut = localize "STR_ACE_Medical_Check_Pulse_Normal"; }; }; }; @@ -49,5 +49,5 @@ if (_heartRate > 1.0) then { ["displayTextStructured", [_caller], [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent); if (_logOutPut != "") then { - [_unit,"activity", localize "STR_ACE_Medical_Check_Pulse_LOG",[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog); + [_unit,"activity", localize "STR_ACE_Medical_Check_Pulse_Log",[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog); }; diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 122244f9905..c164b37bf1c 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -978,7 +978,7 @@ Plasma IV (1000ml) Plasma IV (1000ml) - + A volume-expanding blood supplement. Дополнительный препарат, применяемый при возмещении объема крови. Suplemento para expandir el volumen sanguíneo. @@ -989,7 +989,7 @@ Volumenerweiterungsmittel (künstliches Blutvolumen) Suplemento para expandir o volume sanguíneo. - + A volume-expanding blood supplement. Дополнительный препарат, применяемый при возмещении объема крови. Suplemento para expandir el volumen sanguíneo. @@ -1033,7 +1033,7 @@ Sangue IV (1000ml) Sangue IV (1000ml) - + Blood IV, for restoring a patients blood (keep cold) Пакет крови для возмещения объёма потерянной крови (хранить в холодильнике) Sangre intravenosa, para restarurar el volumen sanguíneo (mantener frío) @@ -1044,7 +1044,7 @@ Blut IV, Bluthaushalt des Patienten wiederherstellen. (Kühl halten) Sangue intravenoso, para restaurar o volume sanguinio do paciente.(Manter frio) - + O Negative infusion blood used in strict and rare events to replenish blood supply usually conducted in the transport phase of medical care. Кровь I группы, резус-отрицательная, применяется по жизненным показаниям для возмещения объема потерянной крови на догоспитальном этапе оказания медицинской помощи. Krew 0 Rh-, używana w rzadkich i szczególnych przypadkach do uzupełnienia krwi u pacjenta, zazwyczaj w trakcie fazie transportu rannej osoby do szpitala. @@ -1087,7 +1087,7 @@ Soluzione salina IV (1000ml) Soro IV (1000ml) - + Saline IV, for restoring a patients blood Пакет физраствора для возмещения объёма потерянной крови Solución salina intravenosa, para restaurar el volumen sanguíneo @@ -1098,7 +1098,7 @@ Kochsalzlösung, ein medizinisches Volumenersatzmittel Solução Salina Intravenosa 0.9%, para restaurar o volume de sangue temporariamente. - + A medical volume-replenishing agent introduced into the blood system through an IV infusion. Пакет физиологического раствора для возмещения объёма потерянной крови путем внутривенного вливания Suero fisiológico inoculado al torrente sanguíneo de forma intravenosa. @@ -1285,7 +1285,7 @@ Pressione sanguigna Pressão Arterial - + Checking Blood Pressure.. Mesure de la tension ... Проверка артериального давления ... @@ -1296,7 +1296,7 @@ Controllando la pressione sanguigna.. Aferindo Pressão Arterial... - + %1 checked Blood Pressure: %2 %1 kontrollierte Blutdruck: %2 %1 controllata pressione sanguigna: %2 @@ -1304,7 +1304,7 @@ %1 à vérifié la tension: %2 %1 sprawdził ciśnienie krwi: %2 - + You checked %1 Vous diagnostiquez %1 Вы осмотрели раненого %1 @@ -1315,7 +1315,7 @@ Hai diagnosticato %1 Você aferiu o paciente %1 - + You find a blood pressure of %2/%3 Vous avez trouvé une tension de %2/%3 Артериальное давление %2/%3 @@ -1326,7 +1326,7 @@ Der Blutdruck liegt bei %2/%3 A Pressão Arterial é de %2/%3 - + You find a low blood pressure Tension basse Давление низкое @@ -1337,7 +1337,7 @@ La pressione sanguigna è bassa Pressão Arterial baixa - + You find a normal blood pressure Tension normale Давление нормальное @@ -1348,7 +1348,7 @@ La pressione sanguigna è normale Pressão Arterial normal - + You find a high blood pressure Tension haute Давление высокое @@ -1359,7 +1359,7 @@ La pressione sanguigna è alta Pressão Arterial Alta - + You find no blood pressure Pas de tension Давления нет @@ -1370,7 +1370,7 @@ La pressione sanguigna è assente Sem Pressão Arterial - + You fail to find a blood pressure Vous n'avez pas pu mesurer de tension Артериальное давление не определяется @@ -1381,7 +1381,7 @@ Manca strumento per misurare pressione sanguigna Você falhou em aferir a Pressão Arterial - + Low Niedrig Basso @@ -1389,7 +1389,7 @@ Faible Niskie - + Normal Normal Normale @@ -1397,7 +1397,7 @@ Normale Normalne - + High Hoch Alto @@ -1405,7 +1405,7 @@ Haute Wysokie - + No Blood Pressure Kein Blutdruck Nessuna Pressione Sanguigna @@ -1424,7 +1424,7 @@ Polso Pulso - + Checking Heart Rate ... Vérification du rythme cardiaque ... Проверка пульса ... @@ -1435,7 +1435,7 @@ Controllando il battito cardiaco ... Aferindo Pulso ... - + You checked %1 Вы осмотрели раненого %1 Vous examinez %1 @@ -1446,7 +1446,7 @@ Hai diagnosticato %1 Você aferiu o paciente %1 - + %1 checked Heart Rate: %2 %1 kontrollierte Herzfrequenz: %2 %1 Controllata Frequenza Cardiaca: %2 @@ -1454,7 +1454,7 @@ %1 à vérifié le rythme cardiaque: %2 %1 sprawdził tętno: %2 - + Weak Schwach Lento @@ -1462,7 +1462,7 @@ Faible Słabe - + Normal Normal Normale @@ -1470,7 +1470,7 @@ Normal Normalne - + Strong Stark Veloce @@ -1478,7 +1478,7 @@ Fort Silne - + You find a Heart Rate of %2 Rythme cardiaque de %2 Пульс %2 уд./мин. @@ -1489,7 +1489,7 @@ Il battito cardiaco è %2 A Freqüência Cardíaca é de %2 - + You find a weak Heart Rate Rythme cardiaque faible Пульс слабый @@ -1500,7 +1500,7 @@ Hai riscontrato un debole battito cardiaco Freqüência Cardíaca baixa - + You find a strong Heart Rate Rythme cardiaque élevé Пульс учащенный @@ -1511,7 +1511,7 @@ Hai riscontrato un forte battito cardiaco Freqüência Cardíaca normal - + You find a normal Heart Rate Rythme cardiaque normal Пульс в норме @@ -1522,7 +1522,7 @@ Hai riscontrato un normale battito cardiaco Freqüência Cardíaca alta - + You find no Heart Rate Pas de rythme cardiaque Пульс не прощупывается @@ -1544,7 +1544,7 @@ Risposta Reação - + You check response of patient Vous vérifiez la réponse du patient Вы проверяете реакцию раненого From f28a806938ba9bbcccdc7b1cb938b4e1d8defcc1 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 30 Apr 2015 22:15:40 +0200 Subject: [PATCH 118/171] Remove max unconsciousness time again --- addons/medical/ACE_Settings.hpp | 4 ---- addons/medical/CfgVehicles.hpp | 6 ------ .../functions/fnc_moduleMedicalSettings.sqf | 1 - addons/medical/functions/fnc_setUnconscious.sqf | 16 ---------------- 4 files changed, 27 deletions(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index aa354f7c565..6006515b454 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -63,10 +63,6 @@ class ACE_Settings { typeName = "BOOL"; value = 0; }; - class GVAR(maxUnconsciousTime) { - typeName = "SCALAR"; - value = -1; - }; class GVAR(enableRevive) { typeName = "SCALAR"; value = 0; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 0a0d67559d6..f41ecac36fb 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -113,12 +113,6 @@ class CfgVehicles { typeName = "BOOL"; defaultValue = 0; }; - class maxUnconsciousTime { - displayName = "Max. Uncon. Time"; - description = "Maximum time a unit can be unconscious before dying. Negative Values disable this."; - typeName = "NUMBER"; - defaultValue = -1; - }; class bleedingCoefficient { displayName = "Bleeding coefficient"; description = "Coefficient to modify the bleeding speed"; diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf index 388531a9b13..25020e227bd 100644 --- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf +++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf @@ -31,7 +31,6 @@ if !(_activated) exitWith {}; [_logic, QGVAR(AIDamageThreshold), "AIDamageThreshold"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(enableUnsconsiousnessAI), "enableUnsconsiousnessAI"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(preventInstaDeath), "preventInstaDeath"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(maxUnconsciousTime), "maxUnconsciousTime"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(keepLocalSettingsSynced), "keepLocalSettingsSynced"] call EFUNC(common,readSettingFromModule); diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index ce218b409c8..60ca184bc9a 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -25,12 +25,6 @@ _minWaitingTime = if (count _this > 2) then {_this select 2} else {DEFAULT_DELAY // No change, fuck off. (why is there no xor?) if (_set isEqualTo (_unit getVariable ["ACE_isUnconscious", false])) exitWith {}; -// Remove maximum unconsciousness time handler -_maxUnconHandle = _unit getVariable [QGVAR(maxUnconTimeHandle), -1]; -if (_maxUnconHandle > 0) then { - [_maxUnconHandle] call CBA_fnc_removePerFrameHandler; -}; - if !(_set) exitwith { _unit setvariable ["ACE_isUnconscious", false, true]; }; @@ -101,16 +95,6 @@ _startingTime = time; [DFUNC(unconsciousPFH), 0.1, [_unit,_animState, _originalPos, _startingTime, _minWaitingTime, false, vehicle _unit isKindOf "ParachuteBase"] ] call CBA_fnc_addPerFrameHandler; -// Maximum unconsciousness time -_maxUnconTime = _unit getVariable [QGVAR(maxUnconsciousTime), GVAR(maxUnconsciousTime)]; -if (_maxUnconTime >= 0) then { - _handle = [{ - _unit = _this select 0; - [_unit] call FUNC(setDead); - }, [_unit], _maxUnconTime, 0.5] call EFUNC(common,waitAndExecute); - _unit setVariable [QGVAR(maxUnconTimeHandle), _handle]; -}; - // unconscious can't talk [_unit, "isUnconscious"] call EFUNC(common,muteUnit); From 965a976dafe6d2db3cb8237ac7d0f1c49c64392b Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 30 Apr 2015 22:16:45 +0200 Subject: [PATCH 119/171] Reorganize AI unconsciousness --- addons/medical/ACE_Settings.hpp | 2 +- addons/medical/CfgVehicles.hpp | 8 ++++---- addons/medical/functions/fnc_moduleMedicalSettings.sqf | 2 +- addons/medical/functions/fnc_setUnconscious.sqf | 7 +++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 6006515b454..8e2d0421a77 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -54,7 +54,7 @@ class ACE_Settings { typeName = "SCALAR"; value = 1; }; - class GVAR(enableUnsconsiousnessAI) { + class GVAR(enableUnconsiousnessAI) { value = 1; typeName = "SCALAR"; values[] = {"Disabled", "Enabled", "50/50"}; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index f41ecac36fb..70f88fa9b45 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -87,7 +87,7 @@ class CfgVehicles { typeName = "NUMBER"; defaultValue = 1; }; - class enableUnsconsiousnessAI { + class enableUnconsiousnessAI { displayName = "AI Unconsciousness"; description = "Allow AI to go unconscious"; typeName = "NUMBER"; @@ -97,12 +97,12 @@ class CfgVehicles { value = 0; }; class normal { - name = "Enabled"; + name = "50/50"; value = 1; default = 1; }; - class full { - name = "50/50"; + class full { + name = "Enabled"; value = 2; }; }; diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf index 25020e227bd..ad8fbba18a2 100644 --- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf +++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf @@ -29,7 +29,7 @@ if !(_activated) exitWith {}; [_logic, QGVAR(enableScreams), "enableScreams"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(playerDamageThreshold), "playerDamageThreshold"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(AIDamageThreshold), "AIDamageThreshold"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(enableUnsconsiousnessAI), "enableUnsconsiousnessAI"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(enableUnconsiousnessAI), "enableUnconsiousnessAI"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(preventInstaDeath), "preventInstaDeath"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule); diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 60ca184bc9a..09b3faf07ba 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -46,8 +46,11 @@ if (_unit == ACE_player) then { }; // if we have unconsciousness for AI disabled, we will kill the unit instead -if (!([_unit] call EFUNC(common,IsPlayer)) && (GVAR(enableUnsconsiousnessAI) == 0 || (GVAR(enableUnsconsiousnessAI) == 2 && random(1) <= 0.5))) exitwith { - [_unit, true] call FUNC(setDead); // force, to avoid getting into a loop in case revive is enabled. +if !([_unit] call EFUNC(common,isPlayer)) then { + _enableUncon = _unit getVariable [QGVAR(enableUnconsciousnessAI), GVAR(enableUnconsciousnessAI)]; + if (_enableUncon == 0 or {_enableUncon == 1 and (random 1) < 0.5}) exitWith { + [_unit, true] call FUNC(setDead); + }; }; // If a unit has the launcher out, it will sometimes start selecting the primairy weapon while unconscious, From 8fda984903d0c58a7f141496b3111af49b385e04 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 30 Apr 2015 22:17:25 +0200 Subject: [PATCH 120/171] Fix missing semicolon --- addons/medical/functions/fnc_setUnconscious.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 09b3faf07ba..41b965e7e19 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -84,7 +84,7 @@ if (GVAR(moveUnitsFromGroupOnUnconscious)) then { }; [_unit, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus); -_anim = [_unit] call EFUNC(common,getDeathAnim) +_anim = [_unit] call EFUNC(common,getDeathAnim); [_unit, _anim, 1, true] call EFUNC(common,doAnimation); [{ _unit = _this select 0; From d59436c588138855fd093a60cd755e78799d4470 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Thu, 30 Apr 2015 22:19:31 +0200 Subject: [PATCH 121/171] Only force animation when necessary --- addons/medical/functions/fnc_setUnconscious.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 41b965e7e19..12f5f8832cf 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -89,7 +89,7 @@ _anim = [_unit] call EFUNC(common,getDeathAnim); [{ _unit = _this select 0; _anim = _this select 1; - if (_unit getVariable "ACE_isUnconscious") then { + if ((_unit getVariable "ACE_isUnconscious") and (animationState _unit != _anim)) then { [_unit, _anim, 2, true] call EFUNC(common,doAnimation); }; }, [_unit, _anim], 2, 1] call EFUNC(common,waitAndExecute); From 131468f0d8be257382b5769aa36bd141b9f61039 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Thu, 30 Apr 2015 22:39:33 +0200 Subject: [PATCH 122/171] plurals --- addons/fcs/initKeybinds.sqf | 6 +++--- addons/grenades/XEH_postInit.sqf | 2 +- addons/javelin/initKeybinds.sqf | 4 ++-- addons/laserpointer/initKeybinds.sqf | 2 +- addons/overheating/XEH_postInit.sqf | 2 +- addons/reload/XEH_postInit.sqf | 2 +- addons/safemode/XEH_postInit.sqf | 2 +- addons/vehicles/XEH_postInit.sqf | 2 +- addons/weaponselect/XEH_postInit.sqf | 28 ++++++++++++++-------------- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/addons/fcs/initKeybinds.sqf b/addons/fcs/initKeybinds.sqf index 0e5eb7b1172..96482ddd1cf 100644 --- a/addons/fcs/initKeybinds.sqf +++ b/addons/fcs/initKeybinds.sqf @@ -1,6 +1,6 @@ // by commy2 -["ACE3 Vehicle", QGVAR(lazeTarget), localize "STR_ACE_FCS_LaseTarget", +["ACE3 Vehicles", QGVAR(lazeTarget), localize "STR_ACE_FCS_LaseTarget", { // Conditions: canInteract if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -30,7 +30,7 @@ }, [15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key -["ACE3 Vehicle", QGVAR(adjustRangeUp), localize "STR_ACE_FCS_AdjustRangeUp", +["ACE3 Vehicles", QGVAR(adjustRangeUp), localize "STR_ACE_FCS_AdjustRangeUp", { // Conditions: canInteract if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -44,7 +44,7 @@ {false}, [201, [false, false, false]], false] call cba_fnc_addKeybind; //PageUp Key -["ACE3 Vehicle", QGVAR(adjustRangDown), localize "STR_ACE_FCS_AdjustRangeDown", +["ACE3 Vehicles", QGVAR(adjustRangDown), localize "STR_ACE_FCS_AdjustRangeDown", { // Conditions: canInteract if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/grenades/XEH_postInit.sqf b/addons/grenades/XEH_postInit.sqf index e3ed93c4ddb..63516407f30 100644 --- a/addons/grenades/XEH_postInit.sqf +++ b/addons/grenades/XEH_postInit.sqf @@ -10,7 +10,7 @@ GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265]; GVAR(flashbangPPEffectCC) ppEffectForceInNVG true; // Add keybinds -["ACE3 Weapon", QGVAR(switchGrenadeMode), localize "STR_ACE_Grenades_SwitchGrenadeMode", +["ACE3 Weapons", QGVAR(switchGrenadeMode), localize "STR_ACE_Grenades_SwitchGrenadeMode", { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/javelin/initKeybinds.sqf b/addons/javelin/initKeybinds.sqf index c5a510eb93b..2c095b93fc8 100644 --- a/addons/javelin/initKeybinds.sqf +++ b/addons/javelin/initKeybinds.sqf @@ -1,6 +1,6 @@ // by commy2 -["ACE3 Weapon", QGVAR(lockTarget), localize "STR_ACE_JAVELIN_LockTarget", +["ACE3 Weapons", QGVAR(lockTarget), localize "STR_ACE_JAVELIN_LockTarget", { if (GETGVAR(isLockKeyDown,false)) exitWith {false}; @@ -21,7 +21,7 @@ }, [15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key -["ACE3 Weapon", QGVAR(cycleFireMode), localize "STR_ACE_JAVELIN_CycleFireMode", +["ACE3 Weapons", QGVAR(cycleFireMode), localize "STR_ACE_JAVELIN_CycleFireMode", { false }, { [ACE_player] call FUNC(cycleFireMode); diff --git a/addons/laserpointer/initKeybinds.sqf b/addons/laserpointer/initKeybinds.sqf index e2197f08b80..e01f3be5fa8 100644 --- a/addons/laserpointer/initKeybinds.sqf +++ b/addons/laserpointer/initKeybinds.sqf @@ -1,6 +1,6 @@ // by commy2 -["ACE3 Weapon", QGVAR(switchLaserLightMode), localize "STR_ACE_Laserpointer_switchLaserLight", +["ACE3 Weapons", QGVAR(switchLaserLightMode), localize "STR_ACE_Laserpointer_switchLaserLight", { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/overheating/XEH_postInit.sqf b/addons/overheating/XEH_postInit.sqf index fb97038dd76..5e7089ab75c 100644 --- a/addons/overheating/XEH_postInit.sqf +++ b/addons/overheating/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3 Weapon", QGVAR(unjamWeapon), localize "STR_ACE_Overheating_UnjamWeapon", +["ACE3 Weapons", QGVAR(unjamWeapon), localize "STR_ACE_Overheating_UnjamWeapon", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/reload/XEH_postInit.sqf b/addons/reload/XEH_postInit.sqf index c5b47a0f63b..149317c1366 100644 --- a/addons/reload/XEH_postInit.sqf +++ b/addons/reload/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3 Weapon", QGVAR(checkAmmo), localize "STR_ACE_Reload_checkAmmo", +["ACE3 Weapons", QGVAR(checkAmmo), localize "STR_ACE_Reload_checkAmmo", { // Conditions: canInteract if !([ACE_player, (vehicle ACE_player), ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/safemode/XEH_postInit.sqf b/addons/safemode/XEH_postInit.sqf index 1e6c9d7a721..9c3d9894251 100644 --- a/addons/safemode/XEH_postInit.sqf +++ b/addons/safemode/XEH_postInit.sqf @@ -9,7 +9,7 @@ if (!hasInterface) exitWith {}; // Add keybinds -["ACE3 Weapon", QGVAR(safeMode), localize "STR_ACE_SafeMode_SafeMode", +["ACE3 Weapons", QGVAR(safeMode), localize "STR_ACE_SafeMode_SafeMode", { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/vehicles/XEH_postInit.sqf b/addons/vehicles/XEH_postInit.sqf index 6c9f4afd4b5..6ff723338ba 100644 --- a/addons/vehicles/XEH_postInit.sqf +++ b/addons/vehicles/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3 Vehicle", QGVAR(speedLimiter), localize "STR_ACE_SpeedLimiter", +["ACE3 Vehicles", QGVAR(speedLimiter), localize "STR_ACE_SpeedLimiter", { // Conditions: canInteract if !([ACE_player, objNull, ["isnotinside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/weaponselect/XEH_postInit.sqf b/addons/weaponselect/XEH_postInit.sqf index 19f7d8d7a52..ab77f5d2ee3 100644 --- a/addons/weaponselect/XEH_postInit.sqf +++ b/addons/weaponselect/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3 Weapon", QGVAR(SelectPistolNew), localize "STR_ACE_WeaponSelect_SelectPistol", +["ACE3 Weapons", QGVAR(SelectPistolNew), localize "STR_ACE_WeaponSelect_SelectPistol", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -18,7 +18,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key -["ACE3 Weapon", QGVAR(SelectRifleNew), localize "STR_ACE_WeaponSelect_SelectRifle", +["ACE3 Weapons", QGVAR(SelectRifleNew), localize "STR_ACE_WeaponSelect_SelectRifle", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -32,7 +32,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key -["ACE3 Weapon", QGVAR(SelectRifleMuzzleNew), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle", +["ACE3 Weapons", QGVAR(SelectRifleMuzzleNew), localize "STR_ACE_WeaponSelect_SelectRifleMuzzle", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -46,7 +46,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key -["ACE3 Weapon", QGVAR(SelectLauncherNew), localize "STR_ACE_WeaponSelect_SelectLauncher", +["ACE3 Weapons", QGVAR(SelectLauncherNew), localize "STR_ACE_WeaponSelect_SelectLauncher", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -60,7 +60,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key -["ACE3 Weapon", QGVAR(SelectBinocularNew), localize "STR_ACE_WeaponSelect_SelectBinocular", +["ACE3 Weapons", QGVAR(SelectBinocularNew), localize "STR_ACE_WeaponSelect_SelectBinocular", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -74,7 +74,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key -["ACE3 Weapon", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag", +["ACE3 Weapons", QGVAR(SelectGrenadeFrag), localize "STR_ACE_WeaponSelect_SelectGrenadeFrag", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -88,7 +88,7 @@ if !(hasInterface) exitWith {}; {false}, [7, [false, false, false]], false] call cba_fnc_addKeybind; //6 Key -["ACE3 Weapon", QGVAR(SelectGrenadeOther), localize "STR_ACE_WeaponSelect_SelectGrenadeOther", +["ACE3 Weapons", QGVAR(SelectGrenadeOther), localize "STR_ACE_WeaponSelect_SelectGrenadeOther", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -102,7 +102,7 @@ if !(hasInterface) exitWith {}; {false}, [8, [false, false, false]], false] call cba_fnc_addKeybind; //7 Key -["ACE3 Weapon", QGVAR(HolsterWeapon), localize "STR_ACE_WeaponSelect_HolsterWeapon", +["ACE3 Weapons", QGVAR(HolsterWeapon), localize "STR_ACE_WeaponSelect_HolsterWeapon", { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -116,7 +116,7 @@ if !(hasInterface) exitWith {}; {false}, [11, [false, false, false]], false] call cba_fnc_addKeybind; //0 Key -["ACE3 Vehicle", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn", +["ACE3 Vehicles", QGVAR(EngineOn), localize "STR_ACE_WeaponSelect_EngineOn", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -130,7 +130,7 @@ if !(hasInterface) exitWith {}; {false}, [3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key -["ACE3 Vehicle", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff", +["ACE3 Vehicles", QGVAR(EngineOff), localize "STR_ACE_WeaponSelect_EngineOff", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -144,7 +144,7 @@ if !(hasInterface) exitWith {}; {false}, [2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key -["ACE3 Vehicle", QGVAR(SelectMainGunNew), localize "STR_ACE_WeaponSelect_SelectMainGun", +["ACE3 Vehicles", QGVAR(SelectMainGunNew), localize "STR_ACE_WeaponSelect_SelectMainGun", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -158,7 +158,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //3 Key -["ACE3 Vehicle", QGVAR(SelectMachineGunNew), localize "STR_ACE_WeaponSelect_SelectMachineGun", +["ACE3 Vehicles", QGVAR(SelectMachineGunNew), localize "STR_ACE_WeaponSelect_SelectMachineGun", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -172,7 +172,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //4 Key -["ACE3 Vehicle", QGVAR(SelectMissilesNew), localize "STR_ACE_WeaponSelect_SelectMissiles", +["ACE3 Vehicles", QGVAR(SelectMissilesNew), localize "STR_ACE_WeaponSelect_SelectMissiles", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -186,7 +186,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //5 Key -["ACE3 Vehicle", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher", +["ACE3 Vehicles", QGVAR(FireSmokeLauncher), localize "STR_ACE_WeaponSelect_FireSmokeLauncher", { // Conditions: canInteract if !([ACE_player, ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; From 2ae5538df5948c922e2877d8456e3c5736a91653 Mon Sep 17 00:00:00 2001 From: commy2 Date: Thu, 30 Apr 2015 22:46:08 +0200 Subject: [PATCH 123/171] change wrong strings --- addons/respawn/CfgVehicles.hpp | 12 ++++++------ addons/respawn/stringtable.xml | 8 ++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index 384376b00c1..19efdf77746 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -96,7 +96,7 @@ class CfgVehicles { class ACE_Actions: ACE_Actions { class ACE_Teleport { - displayName = "$STR_ACE_Respawn_TeleportedToRallypoint"; + displayName = "$STR_ACE_Respawn_TeleportToRallypoint"; distance = 4; condition = QUOTE(side group _player == west); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_West')] call FUNC(teleportToRallypoint)); @@ -116,7 +116,7 @@ class CfgVehicles { class ACE_Actions: ACE_Actions { class ACE_Teleport { - displayName = "$STR_ACE_Respawn_TeleportedToRallypoint"; + displayName = "$STR_ACE_Respawn_TeleportToRallypoint"; distance = 4; condition = QUOTE(side group _player == east); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_East')] call FUNC(teleportToRallypoint)); @@ -136,7 +136,7 @@ class CfgVehicles { class ACE_Actions: ACE_Actions { class ACE_Teleport { - displayName = "$STR_ACE_Respawn_TeleportedToRallypoint"; + displayName = "$STR_ACE_Respawn_TeleportToRallypoint"; distance = 4; condition = QUOTE(side group _player == independent); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_Independent')] call FUNC(teleportToRallypoint)); @@ -157,7 +157,7 @@ class CfgVehicles { class ACE_Actions: ACE_Actions { class ACE_Teleport { - displayName = "$STR_ACE_Respawn_TeleportedToBase"; + displayName = "$STR_ACE_Respawn_TeleportToBase"; distance = 4; condition = QUOTE(side group _player == west); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_West_Base')] call FUNC(teleportToRallypoint)); @@ -177,7 +177,7 @@ class CfgVehicles { class ACE_Actions: ACE_Actions { class ACE_Teleport { - displayName = "$STR_ACE_Respawn_TeleportedToBase"; + displayName = "$STR_ACE_Respawn_TeleportToBase"; distance = 4; condition = QUOTE(side group _player == east); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_East_Base')] call FUNC(teleportToRallypoint)); @@ -197,7 +197,7 @@ class CfgVehicles { class ACE_Actions: ACE_Actions { class ACE_Teleport { - displayName = "$STR_ACE_Respawn_TeleportedToBase"; + displayName = "$STR_ACE_Respawn_TeleportToBase"; distance = 4; condition = QUOTE(side group _player == independent); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_Independent_Base')] call FUNC(teleportToRallypoint)); diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml index cfd1d51bb9e..44c0a676e38 100644 --- a/addons/respawn/stringtable.xml +++ b/addons/respawn/stringtable.xml @@ -25,6 +25,14 @@ Rallypoint dispiegato Rallypoints posicionado + + Teleport to Base + Zur Basis teleportieren + + + Teleport to Rallypoint + Zum Rallypoint teleportieren + Teleported to Base Téléporté à la base From 03973f3dcfcd1c40d73843ecc9e1061074e9938a Mon Sep 17 00:00:00 2001 From: Grzegorz Sikora Date: Thu, 30 Apr 2015 22:54:15 +0200 Subject: [PATCH 124/171] PL translation --- addons/interact_menu/stringtable.xml | 6 +++++- addons/medical/stringtable.xml | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 5761815af15..b33e603d05f 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -1,4 +1,5 @@  + @@ -115,15 +116,18 @@ Keep cursor centered Garder le curseur au centre Центрировать курсор + Utrzymaj kursor wyśrodkowany Keeps cursor centered and pans the option menu around. Useful if screen size is limited. Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée. Центрирует курсор и двигает само меню опций. Полезно при ограниченном размере экрана. + Utrzymuje kursor na środku ekranu, zamiast tego ruch myszą powoduje przesuwanie menu interakcji. Użyteczne w przypadku kiedy rozmiar ekranu jest ograniczony. Do action when releasing menu key Aktion nach Loslassen der Taste ausführen + Wykonuj akcje po puszczeniu klawisza menu - + \ No newline at end of file diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index c164b37bf1c..f73915e7af8 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1,4 +1,5 @@  + @@ -1622,6 +1623,7 @@ He's lost a lot of blood + Stracił sporo krwi He hasn't lost blood @@ -1993,15 +1995,19 @@ Style of menu (Medical) + Styl menu medycznego Select the type of menu you prefer; default 3d selections or radial. + Wybierz rodzaj menu, który preferujesz: domyślne pozycje 3D lub radialne Selections (3d) + Pozycje (3D) Radial + Radialne Scrape @@ -2269,6 +2275,7 @@ Treating... + Leczenie... - + \ No newline at end of file From 1e0eaa1971625ca6f4acf062e6ad5fa5a3bd1858 Mon Sep 17 00:00:00 2001 From: Grzegorz Date: Thu, 30 Apr 2015 22:55:43 +0200 Subject: [PATCH 125/171] Update stringtable.xml --- addons/interact_menu/stringtable.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index b33e603d05f..1e322d95d69 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -1,5 +1,4 @@  - @@ -130,4 +129,4 @@ Wykonuj akcje po puszczeniu klawisza menu - \ No newline at end of file + From 3f932c0a939a49307ea5d5d0d3876fcba969f0af Mon Sep 17 00:00:00 2001 From: Grzegorz Date: Thu, 30 Apr 2015 22:55:51 +0200 Subject: [PATCH 126/171] Update stringtable.xml --- addons/medical/stringtable.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index f73915e7af8..5fd2ed9ba7e 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1,5 +1,4 @@  - @@ -2278,4 +2277,4 @@ Leczenie... - \ No newline at end of file + From f301491c7a7833c9f36da26d1bf52b606209b300 Mon Sep 17 00:00:00 2001 From: Kavinsky Date: Thu, 30 Apr 2015 23:18:45 +0200 Subject: [PATCH 127/171] changed variable name to use QGVAR macro --- addons/laserpointer/functions/fnc_onDraw.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/laserpointer/functions/fnc_onDraw.sqf b/addons/laserpointer/functions/fnc_onDraw.sqf index e3236f7cb55..c1e955d0289 100644 --- a/addons/laserpointer/functions/fnc_onDraw.sqf +++ b/addons/laserpointer/functions/fnc_onDraw.sqf @@ -26,7 +26,7 @@ _isIR = _isIR == 1; }; if (_laser != "") then { - _cacheName = format ["ACE_laserpointer_%1", _laser]; + _cacheName = format [QGVAR(laser_%1), _laser]; _laserID = missionNamespace getVariable [_cacheName, -1]; if (missionNamespace getVariable [_cacheName, -1] == -1) then { _laserID = getNumber (configFile >> "CfgWeapons" >> _laser >> "ACE_laserpointer"); From 47acc90db7d88e09d31a559dd2ea7ec2a4226b04 Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Thu, 30 Apr 2015 14:21:13 -0700 Subject: [PATCH 128/171] Pretty up the name. --- mod.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod.cpp b/mod.cpp index f1cef6b6a2f..0caaba29093 100644 --- a/mod.cpp +++ b/mod.cpp @@ -1,4 +1,4 @@ -name = "ACE3"; +name = "Advanced Combat Environment 3.0.0"; picture = "logo_ace3_ca.paa"; actionName = "GitHub"; action = "https://github.com/acemod/ACE3"; @@ -7,6 +7,6 @@ logo = "logo_ace3_ca.paa"; logoOver = "logo_ace3_ca.paa"; tooltip = "ACE3"; tooltipOwned = "ACE3 Owned"; -overview = "ACE3 is a joint effort by the teams behind ACE2, AGM and CSE to improve the realism and authenticity of Arma 3."; +overview = "Advanced Combat Environment 3, or ACE3 is a joint effort by the teams behind ACE2, AGM and CSE to improve the realism and authenticity of Arma 3."; author = "ACE3 Team"; overviewPicture = "logo_ace3_ca.paa"; From d68e744fe2c63d039acd144e81c4da862e0b7b1d Mon Sep 17 00:00:00 2001 From: ViperMaul Date: Thu, 30 Apr 2015 14:41:45 -0700 Subject: [PATCH 129/171] better grammar --- mod.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod.cpp b/mod.cpp index 0caaba29093..b878c76a6d7 100644 --- a/mod.cpp +++ b/mod.cpp @@ -7,6 +7,6 @@ logo = "logo_ace3_ca.paa"; logoOver = "logo_ace3_ca.paa"; tooltip = "ACE3"; tooltipOwned = "ACE3 Owned"; -overview = "Advanced Combat Environment 3, or ACE3 is a joint effort by the teams behind ACE2, AGM and CSE to improve the realism and authenticity of Arma 3."; +overview = "Advanced Combat Environment 3, also known as ACE3, is a joint effort by the teams behind ACE2, AGM and CSE to improve the realism and authenticity of Arma 3."; author = "ACE3 Team"; overviewPicture = "logo_ace3_ca.paa"; From aa9f1c53c7466665920ad2218416ac306584b95c Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:34:18 +0200 Subject: [PATCH 130/171] Whoops --- .../functions/fnc_handleDamage_basic.sqf | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf index 044b35d5f23..68792b16564 100644 --- a/addons/medical/functions/fnc_handleDamage_basic.sqf +++ b/addons/medical/functions/fnc_handleDamage_basic.sqf @@ -24,14 +24,13 @@ #define ARMDAMAGETRESHOLD2 1.7 #define UNCONSCIOUSNESSTRESHOLD 0.7 -<<<<<<< HEAD -private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_threshold"]; +private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_damage", "_armdamage", "_hitPoint", "_index", "_legdamage", "_newDamage", "_otherDamage", "_pain", "_restore"]; -_unit = _this select 0; +_unit = _this select 0; _selectionName = _this select 1; -_damage = _this select 2; -_shooter = _this select 3; -_projectile = _this select 4; +_damage = _this select 2; +_shooter = _this select 3; +_projectile = _this select 4; // Apply damage treshold / coefficient _threshold = [ @@ -39,15 +38,6 @@ _threshold = [ _unit getVariable [QGVAR(damageThreshold), GVAR(playerDamageThreshold)] ] select ([_unit] call EFUNC(common,isPlayer)); _damage = _damage * (1 / _threshold); -======= -private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_damage", "_armdamage", "_hitPoint", "_index", "_legdamage", "_newDamage", "_otherDamage", "_pain", "_restore"]; - -_unit = _this select 0; -_selectionName = _this select 1; -_damage = _this select 2; -_shooter = _this select 3; -_projectile = _this select 4; ->>>>>>> origin/master // This is a new hit, reset variables. // Note: sometimes handleDamage spans over 2 or even 3 frames. From f7f416c8d3af17d64f6bf5551437154604d23632 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:34:38 +0200 Subject: [PATCH 131/171] Proper privates and alignment --- addons/medical/functions/fnc_handleDamage.sqf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index d4577623212..25b65ac0b01 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -17,12 +17,12 @@ #include "script_component.hpp" -private ["_unit", "_selection", "_damage", "_shooter", "_projectile", "_damageReturn", "_typeOfDamage", "_minLethalDamage", "_newDamage", "_typeIndex"]; -_unit = _this select 0; -_selection = _this select 1; -_damage = _this select 2; -_shooter = _this select 3; -_projectile = _this select 4; +private ["_unit", "_selection", "_damage", "_shooter", "_projectile", "_damageReturn", "_typeOfDamage", "_minLethalDamage", "_newDamage", "_typeIndex", "_preventDeath"]; +_unit = _this select 0; +_selection = _this select 1; +_damage = _this select 2; +_shooter = _this select 3; +_projectile = _this select 4; if !(local _unit) exitWith {nil}; From 98e44e86d801e626832fa7b265f24e4b6931d7fe Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:35:50 +0200 Subject: [PATCH 132/171] Offload ejecting to unloadPerson --- addons/medical/functions/fnc_setUnconscious.sqf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 048dd9633c8..b752a514318 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -56,9 +56,7 @@ if !([_unit] call EFUNC(common,isPlayer)) then { // If a unit has the launcher out, it will sometimes start selecting the primairy weapon while unconscious, // therefor we force it to select the primairy weapon before going unconscious if ((vehicle _unit) isKindOf "StaticWeapon") then { - moveOut _unit; - unassignVehicle _unit; - //_unit action ["eject", vehicle _unit]; + [_unit] call EFUNC(common,unloadPerson); }; if (animationState _unit in ["ladderriflestatic","laddercivilstatic"]) then { _unit action ["ladderOff", (nearestBuilding _unit)]; From 67bd2b4e2f30c35f1bb6a4ffa74fb636d304b926 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:36:09 +0200 Subject: [PATCH 133/171] Reduce animation forcing delay --- addons/medical/functions/fnc_setUnconscious.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index b752a514318..0e0e6cf67e7 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -90,7 +90,7 @@ _anim = [_unit] call EFUNC(common,getDeathAnim); if ((_unit getVariable "ACE_isUnconscious") and (animationState _unit != _anim)) then { [_unit, _anim, 2, true] call EFUNC(common,doAnimation); }; -}, [_unit, _anim], 2, 1] call EFUNC(common,waitAndExecute); +}, [_unit, _anim], 0.5, 0] call EFUNC(common,waitAndExecute); _startingTime = time; From 48770f77d222de037e4d2d7e01a36fac7b9d0ad0 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:37:58 +0200 Subject: [PATCH 134/171] Rename caching variables in basic HD --- addons/medical/functions/fnc_handleDamage_basic.sqf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf index 68792b16564..3b8f80a22f7 100644 --- a/addons/medical/functions/fnc_handleDamage_basic.sqf +++ b/addons/medical/functions/fnc_handleDamage_basic.sqf @@ -41,14 +41,13 @@ _damage = _damage * (1 / _threshold); // This is a new hit, reset variables. // Note: sometimes handleDamage spans over 2 or even 3 frames. -if (diag_frameno > (_unit getVariable [QGVAR(frameNo), -3]) + 2) then { - _unit setVariable [QGVAR(frameNo), diag_frameno]; +if (diag_frameno > (_unit getVariable [QGVAR(basic_frameNo), -3]) + 2) then { + _unit setVariable [QGVAR(basic_frameNo), diag_frameno]; _unit setVariable [QGVAR(isFalling), false]; _unit setVariable [QGVAR(projectiles), []]; _unit setVariable [QGVAR(hitPoints), []]; _unit setVariable [QGVAR(damages), []]; _unit setVariable [QGVAR(structDamage), 0]; - _unit setVariable [QGVAR(preventDeath), false]; // Assign orphan structural damage to torso [{ private ["_unit", "_damagesum"]; From cb82b20464012ad8147ca0a629a1a5dabf45f87d Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:38:16 +0200 Subject: [PATCH 135/171] Let setUncon handle AI unconsciousness --- addons/medical/functions/fnc_handleDamage_basic.sqf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf index 3b8f80a22f7..7b308ad1888 100644 --- a/addons/medical/functions/fnc_handleDamage_basic.sqf +++ b/addons/medical/functions/fnc_handleDamage_basic.sqf @@ -178,11 +178,7 @@ if (_selectionName == "" and _damage < 1 and !(_unit getVariable ["ACE_isUnconscious", False] )) then { - if (_unit getVariable [QGVAR(allowUnconscious), ([_unit] call EFUNC(common,isPlayer)) or random 1 > 0.3]) then { - [_unit, true] call FUNC(setUnconscious); - } else { - _damage = 1; - }; + [_unit, true] call FUNC(setUnconscious); }; _damage From e06e1a2f89a0d2ff5f89af80bb0385b547db762a Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 01:38:36 +0200 Subject: [PATCH 136/171] Make preventDeath work --- addons/medical/functions/fnc_handleDamage.sqf | 58 ++++++++++++++----- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf index 25b65ac0b01..1d8c821d1f6 100644 --- a/addons/medical/functions/fnc_handleDamage.sqf +++ b/addons/medical/functions/fnc_handleDamage.sqf @@ -34,6 +34,30 @@ if (typeName _projectile == "OBJECT") then { // If the damage is being weird, we just tell it to fuck off. if !(_selection in (GVAR(SELECTIONS) + [""])) exitWith {0}; +// Exit if we disable damage temporarily +_damageOld = damage _unit; +if (_selection in GVAR(SELECTIONS)) then { + _damageOld = _unit getHit _selection; +}; +if !(_unit getVariable [QGVAR(allowDamage), true]) exitWith {_damageOld}; + +// Figure out whether to prevent death before handling damage +if (diag_frameno > (_unit getVariable [QGVAR(frameNo), -3]) + 2) then { + _unit setVariable [QGVAR(frameNo), diag_frameno]; + _unit setVariable [QGVAR(wasUnconscious), _unit getVariable ["ACE_isUnconscious", false]]; + + _preventDeath = _unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]; + if (_unit getVariable ["ACE_isUnconscious", false]) then { + _preventDeath = _unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]; + if !([_unit] call EFUNC(common,isPlayer)) then { + _preventDeath = _preventDeath - 1; + }; + _preventDeath = _preventDeath > 0; + }; + _unit setVariable [QGVAR(preventDeath), _preventDeath]; +}; + +// Get return damage _damageReturn = _damage; if (GVAR(level) < 2) then { _damageReturn = _this call FUNC(handleDamage_basic); @@ -73,26 +97,30 @@ if (GVAR(level) < 2) then { }; [_unit] call FUNC(addToInjuredCollection); -if (_unit getVariable [QGVAR(preventInstaDeath), GVAR(preventInstaDeath)]) exitWith { - if (_damageReturn >= 0.9 && {_selection in ["", "head", "body"]}) exitWith { - if (_unit getvariable ["ACE_isUnconscious", false]) exitwith { +// Prevent death if necessary +if (_unit getVariable QGVAR(preventDeath)) then { + if (_selection in ["", "head", "body"]) then { + _damageReturn = _damageReturn min 0.89; + }; + + // Move the unit out of the vehicle if necessary + if (vehicle _unit != _unit and damage (vehicle _unit) == 1) then { + [_unit] call EFUNC(common,unloadPerson); + if (_unit getVariable QGVAR(wasUnconscious)) then { [_unit] call FUNC(setDead); - 0.89 + } else { + [_unit, true] call FUNC(setUnconscious); }; - [{ [_this select 0, true] call FUNC(setUnconscious); }, [_unit]] call EFUNC(common,execNextFrame); - 0.89 }; - _damageReturn min 0.89; -}; -if (((_unit getVariable [QGVAR(enableRevive), GVAR(enableRevive)]) > 0) && {_damageReturn >= 0.9} && {_selection in ["", "head", "body"]}) exitWith { - if (vehicle _unit != _unit and {damage (vehicle _unit) >= 1}) then { - // @todo - // [_unit] call FUNC(unload); + // Temporarily disable all damage to prevent stuff like + // being killed during the animation etc. + if (!_wasUnconscious and (_unit getVariable ["ACE_isUnconscious", false])) then { + _unit setVariable [QGVAR(allowDamage), false]; + [{ + _this setVariable [QGVAR(allowDamage), true]; + }, _unit, 0.7, 0] call EFUNC(common,waitAndExecute); }; - [_unit] call FUNC(setDead); - - 0.89 }; _damageReturn From 15f1680c2012eb5f568be11b22d9a3248631609c Mon Sep 17 00:00:00 2001 From: Felix Wiegand Date: Fri, 1 May 2015 01:47:59 +0200 Subject: [PATCH 137/171] Add Bla1337 to AUTHORS file --- AUTHORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index 6585a8eeb7c..9d41ad267f4 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -88,3 +88,4 @@ Coren OnkelDisMaster Dimaslg VyMajoris(W-Cephei) +Bla1337 From 984a1fe3377979bb8fdf98fcbfadd2c71f2f1e39 Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 02:14:23 +0200 Subject: [PATCH 138/171] Rename breakLine to break_line --- ace_breakLine.dll => ace_break_line.dll | Bin addons/interact_menu/config.cpp | 2 +- addons/interact_menu/functions/fnc_renderIcon.sqf | 2 +- extensions/CMakeLists.txt | 2 +- extensions/{breakLine => break_line}/CMakeLists.txt | 2 +- .../ace_break_line.cpp} | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename ace_breakLine.dll => ace_break_line.dll (100%) rename extensions/{breakLine => break_line}/CMakeLists.txt (91%) rename extensions/{breakLine/ace_breakLine.cpp => break_line/ace_break_line.cpp} (98%) diff --git a/ace_breakLine.dll b/ace_break_line.dll similarity index 100% rename from ace_breakLine.dll rename to ace_break_line.dll diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp index 281f66492a8..13ad55ff1d9 100644 --- a/addons/interact_menu/config.cpp +++ b/addons/interact_menu/config.cpp @@ -77,5 +77,5 @@ class ACE_Settings { }; class ACE_Extensions { - extensions[] += {"ace_breakLine"}; + extensions[] += {"ace_break_line"}; }; diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf index 642464028da..15edf7c8bbb 100644 --- a/addons/interact_menu/functions/fnc_renderIcon.sqf +++ b/addons/interact_menu/functions/fnc_renderIcon.sqf @@ -35,7 +35,7 @@ if(_icon == "") then { _text = if (GVAR(UseListMenu)) then { format ["%5", _icon, _iconColor, _textColor, _shadowColor, _text] } else { - format ["
%5", _icon, _iconColor, _textColor, _shadowColor, "ace_breakLine" callExtension _text]; + format ["
%5", _icon, _iconColor, _textColor, _shadowColor, "ace_break_line" callExtension _text]; }; //_ctrl ctrlSetStructuredText parseText _text; diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt index 038bb71d5ca..835cd30fd61 100644 --- a/extensions/CMakeLists.txt +++ b/extensions/CMakeLists.txt @@ -55,7 +55,7 @@ set(GLOBAL_SOURCES ${GLOBAL_RC}) # Add extensions to build here add_subdirectory(fcs) -add_subdirectory(breakLine) +add_subdirectory(break_line) add_subdirectory(advanced_ballistics) message("Build Type: ${CMAKE_BUILD_TYPE}") \ No newline at end of file diff --git a/extensions/breakLine/CMakeLists.txt b/extensions/break_line/CMakeLists.txt similarity index 91% rename from extensions/breakLine/CMakeLists.txt rename to extensions/break_line/CMakeLists.txt index d34ae1b58ec..00a74d4c3a4 100644 --- a/extensions/breakLine/CMakeLists.txt +++ b/extensions/break_line/CMakeLists.txt @@ -1,4 +1,4 @@ -set(ACE_EXTENSION_NAME "ace_breakLine") +set(ACE_EXTENSION_NAME "ace_break_line") file(GLOB SOURCES *.h *.hpp *.c *.cpp) add_library( ${ACE_EXTENSION_NAME} SHARED ${GLOBAL_SOURCES} ${SOURCES}) diff --git a/extensions/breakLine/ace_breakLine.cpp b/extensions/break_line/ace_break_line.cpp similarity index 98% rename from extensions/breakLine/ace_breakLine.cpp rename to extensions/break_line/ace_break_line.cpp index 89ea1cfd851..2b253c05bcc 100644 --- a/extensions/breakLine/ace_breakLine.cpp +++ b/extensions/break_line/ace_break_line.cpp @@ -1,5 +1,5 @@ /* - * ace_breakLine.cpp + * ace_break_line.cpp * * Takes a string and insert as many line breaks as needed so it fits a given width * From fc02bb4e066050ae3eb49dae52d5ec826d638e32 Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Fri, 1 May 2015 00:32:16 -0300 Subject: [PATCH 139/171] Stylistic changes --- .../functions/fnc_renderIcon.sqf | 10 +++---- .../functions/fnc_renderMenu.sqf | 29 +++++++------------ .../functions/fnc_renderSelector.sqf | 14 ++++----- 3 files changed, 23 insertions(+), 30 deletions(-) diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf index 2910cb2d036..180b5a3c36c 100644 --- a/addons/interact_menu/functions/fnc_renderIcon.sqf +++ b/addons/interact_menu/functions/fnc_renderIcon.sqf @@ -25,7 +25,7 @@ if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then { GVAR(iconCtrls) pushBack ((findDisplay _displayNum) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]); }; _ctrl = GVAR(iconCtrls) select GVAR(iconCount); -GVAR(iconCount) = GVAR(iconCount) + 1; + if(_icon == "") then { _icon = DEFAULT_ICON; }; @@ -38,12 +38,12 @@ _text = if (GVAR(UseListMenu)) then { //_ctrl ctrlSetStructuredText parseText _text; [_ctrl, GVAR(iconCount), _text] call FUNC(ctrlSetParsedTextCached); +GVAR(iconCount) = GVAR(iconCount) + 1; -_pos = []; -if (GVAR(UseListMenu)) then { - _pos = [(_sPos select 0)-(0.0095*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.20*SafeZoneW, 0.035*SafeZoneW]; +_pos = if (GVAR(UseListMenu)) then { + [(_sPos select 0)-(0.0095*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.20*SafeZoneW, 0.035*SafeZoneW] } else { - _pos = [(_sPos select 0)-(0.0750*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.15*SafeZoneW, 0.100*SafeZoneW]; + [(_sPos select 0)-(0.0750*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.15*SafeZoneW, 0.100*SafeZoneW] }; if (GVAR(cursorKeepCentered) && {uiNamespace getVariable [QGVAR(cursorMenuOpened),false]}) then { diff --git a/addons/interact_menu/functions/fnc_renderMenu.sqf b/addons/interact_menu/functions/fnc_renderMenu.sqf index c88b6cb862f..84c77996843 100644 --- a/addons/interact_menu/functions/fnc_renderMenu.sqf +++ b/addons/interact_menu/functions/fnc_renderMenu.sqf @@ -87,24 +87,17 @@ if (_numChildren == 1) then { }; // Scale menu based on the amount of children -_scaleX = if (GVAR(UseListMenu)) then { - _textSize = switch (GVAR(textSize)) do { - case (0): {0.75}; - case (1): {0.875}; - case (2): {1}; - case (3): {1.2}; - case (4): {1.4}; - }; - 0.17 * _textSize * 1.1 -} else { - _textSize = if (GVAR(textSize) > 2) then {1.3} else {1}; - _textSize * 0.17 * (((0.8 * (0.46 / sin (0.5 * _angleInterval))) min 1.1) max 0.5) -}; -_scaleY = if (GVAR(UseListMenu)) then { - 0.17 * 0.30 * 4/3 +_scaleX = 1; +_scaleY = 1; + +if (GVAR(UseListMenu)) then { + _textSize = [0.75, 0.875, 1, 1.2, 1.4] select GVAR(textSize); + _scaleX = _textSize * 0.17 * 1.1; + _scaleY = 0.17 * 0.30 * 4/3; } else { _textSize = if (GVAR(textSize) > 2) then {1.3} else {1}; - _textSize * 0.17 * 4/3 * (((0.8 * (0.46 / sin (0.5 * _angleInterval))) min 1.1) max 0.5) + _scaleX = _textSize * 0.17 * (((0.8 * (0.46 / sin (0.5 * _angleInterval))) min 1.1) max 0.5); + _scaleY = _textSize * 0.17 * 4/3 * (((0.8 * (0.46 / sin (0.5 * _angleInterval))) min 1.1) max 0.5); }; // Animate menu scale @@ -123,10 +116,10 @@ _angle = _centerAngle - _angleSpan / 2; private ["_offset","_newPos"]; _newPos = if (GVAR(UseListMenu)) then { [(_sPos select 0) + _scaleX, - (_sPos select 1) + _scaleY * (_foreachindex - _numChildren/2 + 0.5)]; + (_sPos select 1) + _scaleY * (_foreachindex - _numChildren/2 + 0.5)]; } else { [(_sPos select 0) - _scaleX * (cos _angle), - (_sPos select 1) + _scaleY * (sin _angle)]; + (_sPos select 1) + _scaleY * (sin _angle)]; }; //drawLine3D [_pos, _newPos, [1,0,0,0.8]]; diff --git a/addons/interact_menu/functions/fnc_renderSelector.sqf b/addons/interact_menu/functions/fnc_renderSelector.sqf index 569fa791983..7ac9559297b 100644 --- a/addons/interact_menu/functions/fnc_renderSelector.sqf +++ b/addons/interact_menu/functions/fnc_renderSelector.sqf @@ -23,17 +23,17 @@ if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then { }; _ctrl = GVAR(iconCtrls) select GVAR(iconCount); -GVAR(iconCount) = GVAR(iconCount) + 1; -_pos = []; -if (GVAR(UseListMenu)) then { - [_ctrl, GVAR(iconCount), format ["", _icon]] call FUNC(ctrlSetParsedTextCached); - _pos = [(_sPos select 0)-(0.014*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.05*SafeZoneW, 0.035*SafeZoneW]; +_pos = if (GVAR(UseListMenu)) then { + [_ctrl, GVAR(iconCount), format ["", _icon]] call FUNC(ctrlSetParsedTextCached); + [(_sPos select 0)-(0.014*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.05*SafeZoneW, 0.035*SafeZoneW] } else { - [_ctrl, GVAR(iconCount), format ["", _icon]] call FUNC(ctrlSetParsedTextCached); - _pos = [(_sPos select 0)-(0.050*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.1*SafeZoneW, 0.035*SafeZoneW]; + [_ctrl, GVAR(iconCount), format ["", _icon]] call FUNC(ctrlSetParsedTextCached); + [(_sPos select 0)-(0.050*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.1*SafeZoneW, 0.035*SafeZoneW] }; +GVAR(iconCount) = GVAR(iconCount) + 1; + if (GVAR(cursorKeepCentered) && {uiNamespace getVariable [QGVAR(cursorMenuOpened),false]}) then { _pos set [0, ((_pos select 0) - (GVAR(cursorPos) select 0) + 0.5)]; _pos set [1, ((_pos select 1) - (GVAR(cursorPos) select 1) + 0.5)]; From 324b9510e3c9395649052da5f775e2ed64a960e4 Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Fri, 1 May 2015 01:56:39 -0300 Subject: [PATCH 140/171] Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that. --- .../functions/fnc_compileMenu.sqf | 23 +++++++++++-------- .../functions/fnc_compileMenuSelfAction.sqf | 4 ++-- .../functions/fnc_createAction.sqf | 16 ++++++++++--- .../functions/fnc_renderBaseMenu.sqf | 22 +++++++----------- addons/interaction/CfgVehicles.hpp | 2 +- addons/interaction/XEH_preInit.sqf | 1 + .../functions/fnc_getWeaponPos.sqf | 21 +++++++++++++++++ 7 files changed, 60 insertions(+), 29 deletions(-) create mode 100644 addons/interaction/functions/fnc_getWeaponPos.sqf diff --git a/addons/interact_menu/functions/fnc_compileMenu.sqf b/addons/interact_menu/functions/fnc_compileMenu.sqf index f5296ec9cf7..7b995375b71 100644 --- a/addons/interact_menu/functions/fnc_compileMenu.sqf +++ b/addons/interact_menu/functions/fnc_compileMenu.sqf @@ -26,7 +26,7 @@ if !(isNil {missionNamespace getVariable [_actionsVarName, nil]}) exitWith {}; private "_recurseFnc"; _recurseFnc = { - private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_selection", "_condition", "_showDisabled", "_enableInside", "_canCollapse", "_runOnHover", "_children", "_entry", "_entryCfg", "_insertChildren", "_modifierFunction", "_i"]; + private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_position", "_condition", "_showDisabled", "_enableInside", "_canCollapse", "_runOnHover", "_children", "_entry", "_entryCfg", "_insertChildren", "_modifierFunction", "_i"]; EXPLODE_1_PVT(_this,_actionsCfg); _actions = []; @@ -38,13 +38,18 @@ _recurseFnc = { _icon = getText (_entryCfg >> "icon"); _statement = compile (getText (_entryCfg >> "statement")); - _selection = ""; - if (isArray ( _entryCfg >> "selection" )) then { - _selection = getArray ( _entryCfg >> "selection" ) + // If the position entry is present, compile it + _position = getText (_entryCfg >> "position"); + if (_position != "") then { + _position = compile _position; } else { - _selection = getText (_entryCfg >> "selection"); - if (_selection == "") then { - _selection = [0,0,0]; + // If the not, but the selection entry is present use that + _position = getText (_entryCfg >> "selection"); + if (_position != "") then { + _position = compile format ["_target selectionPosition '%1'", _position]; + } else { + // Otherwise, just use the origin + _position = {[0,0,0]}; }; }; @@ -76,7 +81,7 @@ _recurseFnc = { _condition, _insertChildren, [], - _selection, + _position, _distance, [_showDisabled,_enableInside,_canCollapse,_runOnHover], _modifierFunction @@ -105,7 +110,7 @@ missionNamespace setVariable [_actionsVarName, [_actionsCfg] call _recurseFnc]; { true }, {}, [], - [0,0,0], + {[0,0,0]}, 1, [false,false,false] ], diff --git a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf index e4c449ce800..e767c3525d2 100644 --- a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf +++ b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf @@ -64,7 +64,7 @@ _recurseFnc = { _statement, _condition, _insertChildren, - [], + {}, [0,0,0], 10, //distace [_showDisabled,_enableInside,_canCollapse,_runOnHover], @@ -113,7 +113,7 @@ _actions = [ }, {[ACE_player, _target, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)}, {}, - [], + {}, "Spine3", 10, [false,true,false] diff --git a/addons/interact_menu/functions/fnc_createAction.sqf b/addons/interact_menu/functions/fnc_createAction.sqf index a7d939722e8..b26cb186f3f 100644 --- a/addons/interact_menu/functions/fnc_createAction.sqf +++ b/addons/interact_menu/functions/fnc_createAction.sqf @@ -11,7 +11,7 @@ * 4: Condition * 5: Insert children code (Optional) * 6: Action parameters (Optional) - * 7: Position (Position or Selection Name) or (Optional) + * 7: Position (Position array, Position code or Selection Name) , or (Optional) * 8: Distance (Optional) * 9: Other parameters (Optional) * 10: Modifier function (Optional) @@ -44,9 +44,19 @@ _customParams = if (count _this > 6) then { }; _position = if (count _this > 7) then { - _this select 7 + if (typeName (_this select 7) == "STRING") then { + // If the action is set to a selection, create the suitable code + compile format ["_target selectionPosition '%1'", _this select 7]; + } else { + if (typeName (_this select 7) == "ARRAY") then { + // If the action is set to a array position, create the suitable code + compile format ["%1", _this select 7]; + } else { + _this select 7 + }; + } } else { - [0,0,0] + {[0,0,0]} }; _distance = if (count _this > 8) then { diff --git a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf index 841303bcdf3..4daa4a5c90e 100644 --- a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf +++ b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf @@ -24,21 +24,15 @@ EXPLODE_1_PVT(_baseActionNode,_actionData); _distance = _actionData select 8; // Obtain a 3D position for the action -if((count _this) > 2) then { - _pos = _this select 2; +_pos = if((count _this) > 2) then { + _this select 2 } else { - if(typeName (_actionData select 7) == "ARRAY") then { - _pos = _object modelToWorldVisual (_actionData select 7); - } else { - if ((_actionData select 7) == "weapon") then { - // Craft a suitable position for weapon interaction - _weaponDir = _object weaponDirection currentWeapon _object; - _ref = _weaponDir call EFUNC(common,createOrthonormalReference); - _pos = (_object modelToWorldVisual (_object selectionPosition "righthand")) vectorAdd ((_ref select 2) vectorMultiply 0.1); - } else { - _pos = _object modelToWorldVisual (_object selectionPosition (_actionData select 7)); - }; - }; + // Setup scope variables for position code + private ["_target"]; + _target = _object; + + // Get action position + _object modelToWorldVisual (call (_actionData select 7)) }; // For non-self actions, exit if the action is too far away or ocluded diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index 96165d63e3b..0a13dc0870e 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -166,7 +166,7 @@ class CfgVehicles { }; class ACE_Weapon { displayName = "$STR_ACE_Interaction_Weapon"; - selection = "weapon"; + position = QUOTE(call FUNC(getWeaponPos)); distance = 1.50; condition = ""; statement = ""; diff --git a/addons/interaction/XEH_preInit.sqf b/addons/interaction/XEH_preInit.sqf index 34c225c8f0f..c2534b44b9c 100644 --- a/addons/interaction/XEH_preInit.sqf +++ b/addons/interaction/XEH_preInit.sqf @@ -16,6 +16,7 @@ PREP(getDoor); PREP(getDoorAnimations); PREP(getDown); PREP(getSelectedButton); +PREP(getWeaponPos); PREP(hideMenu); PREP(hideMouseHint); PREP(isInRange); diff --git a/addons/interaction/functions/fnc_getWeaponPos.sqf b/addons/interaction/functions/fnc_getWeaponPos.sqf new file mode 100644 index 00000000000..477e74f9bf8 --- /dev/null +++ b/addons/interaction/functions/fnc_getWeaponPos.sqf @@ -0,0 +1,21 @@ +/* + * Author: esteldunedain + * Return a suitable position for the action point for the current weapon + * + * Argument: + * None + * + * Return value: + * Children actions + * + * Public: No + */ +#include "script_component.hpp" +// IGNORE_PRIVATE_WARNING(_target); + +private ["_weaponDir","_refSystem"]; + +_weaponDir = _target weaponDirection currentWeapon _target; +_refSystem = _weaponDir call EFUNC(common,createOrthonormalReference); + +(_target selectionPosition "righthand") vectorAdd ((_refSystem select 2) vectorMultiply 0.1); From a0923aa5c375d02926acf9a6652f3ba9e2c9c0dc Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Fri, 1 May 2015 01:57:37 -0300 Subject: [PATCH 141/171] Tweak the position for rally point actions. Fix #837 --- addons/respawn/CfgVehicles.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index 19efdf77746..ddd8f284053 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -100,7 +100,7 @@ class CfgVehicles { distance = 4; condition = QUOTE(side group _player == west); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_West')] call FUNC(teleportToRallypoint)); - position = "[0,0,-1]"; + position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; priority = 1; }; @@ -120,7 +120,7 @@ class CfgVehicles { distance = 4; condition = QUOTE(side group _player == east); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_East')] call FUNC(teleportToRallypoint)); - position = "[0,0,-1]"; + position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; priority = 1; }; @@ -140,7 +140,7 @@ class CfgVehicles { distance = 4; condition = QUOTE(side group _player == independent); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_Independent')] call FUNC(teleportToRallypoint)); - position = "[0,0,-1]"; + position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; priority = 1; }; @@ -161,7 +161,7 @@ class CfgVehicles { distance = 4; condition = QUOTE(side group _player == west); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_West_Base')] call FUNC(teleportToRallypoint)); - position = "[0,0,-1]"; + position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; priority = 1; }; @@ -181,7 +181,7 @@ class CfgVehicles { distance = 4; condition = QUOTE(side group _player == east); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_East_Base')] call FUNC(teleportToRallypoint)); - position = "[0,0,-1]"; + position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; priority = 1; }; @@ -201,7 +201,7 @@ class CfgVehicles { distance = 4; condition = QUOTE(side group _player == independent); statement = QUOTE([ARR_3(_player,side group _player,'ACE_Rallypoint_Independent_Base')] call FUNC(teleportToRallypoint)); - position = "[0,0,-1]"; + position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; priority = 1; }; From e8264110bb02c1b910367ed6f52c5e8b257e0114 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 10:12:41 +0200 Subject: [PATCH 142/171] Replaced sleep with waitAndExecute --- addons/explosives/functions/fnc_startDefuse.sqf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf index d3631fdb5fb..3d5a620ed20 100644 --- a/addons/explosives/functions/fnc_startDefuse.sqf +++ b/addons/explosives/functions/fnc_startDefuse.sqf @@ -43,15 +43,15 @@ if (ACE_player != _unit) then { if (isPlayer _unit) then { [[_unit, _target], QFUNC(startDefuse), _unit] call EFUNC(common,execRemoteFnc); } else { - // TODO: use scheduled delay execution [_unit, _target, [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime] spawn { (_this select 0) playActionNow _actionToPlay; (_this select 0) disableAI "MOVE"; (_this select 0) disableAI "TARGET"; - sleep (_this select 2); - [(_this select 0), (_this select 1)] call FUNC(defuseExplosive); - (_this select 0) enableAI "MOVE"; - (_this select 0) enableAI "TARGET"; + [{ + [(_this select 0), (_this select 1)] call FUNC(defuseExplosive); + (_this select 0) enableAI "MOVE"; + (_this select 0) enableAI "TARGET"; + }, _this, (_this select 2), 0] call EFUNC(common,waitAndExecute); }; }; } else { From b8599566043d3378a5535b4b886ae308789201b7 Mon Sep 17 00:00:00 2001 From: commy2 Date: Fri, 1 May 2015 10:19:47 +0200 Subject: [PATCH 143/171] rename category ace to ace common --- addons/goggles/XEH_postInit.sqf | 2 +- addons/interact_menu/XEH_clientInit.sqf | 4 ++-- addons/interaction/XEH_postInit.sqf | 6 +++--- addons/nametags/XEH_postInit.sqf | 2 +- addons/weather/XEH_postInit.sqf | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/goggles/XEH_postInit.sqf b/addons/goggles/XEH_postInit.sqf index 4fcf4fc0552..a6fe7c415f7 100644 --- a/addons/goggles/XEH_postInit.sqf +++ b/addons/goggles/XEH_postInit.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" if (!hasInterface) exitWith {}; -["ACE3", QGVAR(wipeGlasses), localize "STR_ACE_Goggles_WipeGlasses", +["ACE3 Common", QGVAR(wipeGlasses), localize "STR_ACE_Goggles_WipeGlasses", { if (!(GETVAR(ace_player,ACE_isUnconscious,false))) exitWith { call FUNC(clearGlasses); diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf index d86ab4bd53c..edb25d99bb0 100644 --- a/addons/interact_menu/XEH_clientInit.sqf +++ b/addons/interact_menu/XEH_clientInit.sqf @@ -28,7 +28,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)]; }; -["ACE3", QGVAR(InteractKey), (localize "STR_ACE_Interact_Menu_InteractKey"), +["ACE3 Common", QGVAR(InteractKey), (localize "STR_ACE_Interact_Menu_InteractKey"), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -37,7 +37,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)]; },{[0,false] call FUNC(keyUp)}, [219, [false, false, false]], false] call cba_fnc_addKeybind; //Left Windows Key -["ACE3", QGVAR(SelfInteractKey), (localize "STR_ACE_Interact_Menu_SelfInteractKey"), +["ACE3 Common", QGVAR(SelfInteractKey), (localize "STR_ACE_Interact_Menu_SelfInteractKey"), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf index 98b1cc15235..6417043df2e 100644 --- a/addons/interaction/XEH_postInit.sqf +++ b/addons/interaction/XEH_postInit.sqf @@ -22,7 +22,7 @@ GVAR(isOpeningDoor) = false; // Add keybinds -["ACE3", QGVAR(openDoor), localize "STR_ACE_Interaction_OpenDoor", +["ACE3 Common", QGVAR(openDoor), localize "STR_ACE_Interaction_OpenDoor", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -42,7 +42,7 @@ GVAR(isOpeningDoor) = false; [57, [false, true, false]], false] call cba_fnc_addKeybind; //Key CTRL+Space -["ACE3", QGVAR(tapShoulder), localize "STR_ACE_Interaction_TapShoulder", +["ACE3 Common", QGVAR(tapShoulder), localize "STR_ACE_Interaction_TapShoulder", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -56,7 +56,7 @@ GVAR(isOpeningDoor) = false; {false}, [20, [true, false, false]], false] call cba_fnc_addKeybind; -["ACE3", QGVAR(modifierKey), localize "STR_ACE_Interaction_ModifierKey", +["ACE3 Common", QGVAR(modifierKey), localize "STR_ACE_Interaction_ModifierKey", { // Conditions: canInteract //if !([ACE_player, objNull, ["isNotDragging"]] call EFUNC(common,canInteractWith)) exitWith {false}; // not needed diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index 1df20e45e7d..cea2025dccf 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -8,7 +8,7 @@ if (!hasInterface) exitWith {}; GVAR(ShowNamesTime) = -10; // Add keybinds -["ACE3", QGVAR(showNameTags), localize "STR_ACE_NameTags_ShowNames", +["ACE3 Common", QGVAR(showNameTags), localize "STR_ACE_NameTags_ShowNames", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/weather/XEH_postInit.sqf b/addons/weather/XEH_postInit.sqf index 1427ff59b18..455c336d964 100644 --- a/addons/weather/XEH_postInit.sqf +++ b/addons/weather/XEH_postInit.sqf @@ -25,7 +25,7 @@ GVAR(rain_period_start_time) = time; }; }; -["ACE3", QGVAR(WindInfoKey), localize "STR_ACE_Weather_WindInfoKey", +["ACE3 Common", QGVAR(WindInfoKey), localize "STR_ACE_Weather_WindInfoKey", { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; From 965e45a53c6010ecacb7676c8123c77377ac9046 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 10:25:33 +0200 Subject: [PATCH 144/171] Takes negative initSpeed values into account --- addons/fcs/functions/fnc_firedEH.sqf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/fcs/functions/fnc_firedEH.sqf b/addons/fcs/functions/fnc_firedEH.sqf index 698a9bef22b..1bdff913d4c 100644 --- a/addons/fcs/functions/fnc_firedEH.sqf +++ b/addons/fcs/functions/fnc_firedEH.sqf @@ -44,9 +44,11 @@ _offset = 0; } forEach _FCSMagazines; // Correct velocity for weapons that have initVelocity -// @todo: Take into account negative initVelocities -_velocityCorrection = (vectorMagnitude velocity _projectile) - - getNumber (configFile >> "CfgMagazines" >> _magazine >> "initSpeed"); +_velocityCorrection = if (getNumber(configFile >> "CfgMagazines" >> _weapon >> "initSpeed") > 0) then { + (vectorMagnitude velocity _projectile) - getNumber(configFile >> "CfgMagazines" >> _magazine >> "initSpeed") +} else { + 0 +}; [_projectile, (_vehicle getVariable format ["%1_%2", QGVAR(Azimuth), _turret]), _offset, -_velocityCorrection] call EFUNC(common,changeProjectileDirection); From 2219339e24f4900cd25b16e16ab23a14cc0832a7 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 10:25:59 +0200 Subject: [PATCH 145/171] Fixed a typo --- addons/advanced_ballistics/XEH_postInit.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf index 3f0e101d3b8..8efdd6799b0 100644 --- a/addons/advanced_ballistics/XEH_postInit.sqf +++ b/addons/advanced_ballistics/XEH_postInit.sqf @@ -24,7 +24,7 @@ GVAR(currentGrid) = 0; GVAR(INIT_MESSAGE_ENABLED) = false; GVAR(extensionAvailable) = true; -/* @TODO: Remove this until verisoning is in sync with cmake/build versioning +/* @TODO: Remove this until versioning is in sync with cmake/build versioning GVAR(extensionVersion) = ("ace_advanced_ballistics" callExtension "version"); GVAR(extensionAvailable) = (GVAR(extensionVersion) == EXTENSION_REQUIRED_VERSION); if (!GVAR(extensionAvailable)) exitWith { From 723ffc21d12088fef82051e8ae74824f2f31b21a Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 10:26:37 +0200 Subject: [PATCH 146/171] Removed unneeded TODO --- addons/advanced_ballistics/functions/fnc_handleFired.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf index b6aae2c7407..e63b1d7dfcf 100644 --- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf +++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf @@ -47,7 +47,7 @@ if (GVAR(onlyActiveForLocalPlayers) && !(local _unit)) then { _abort = true; }; }; -//if (!GVAR(vehicleGunnerEnabled) && !(_unit isKindOf "Man")) then { _abort = true; }; // TODO: We currently do not have firedEHs on vehicles +//if (!GVAR(vehicleGunnerEnabled) && !(_unit isKindOf "Man")) then { _abort = true; }; // We currently do not have firedEHs on vehicles if (GVAR(disabledInFullAutoMode) && getNumber(configFile >> "cfgWeapons" >> _weapon >> _mode >> "autoFire") == 1) then { _abort = true; }; if (_abort || !(GVAR(extensionAvailable))) exitWith { From a97c9346883368c8b99418592347133d327991e0 Mon Sep 17 00:00:00 2001 From: commy2 Date: Fri, 1 May 2015 11:01:07 +0200 Subject: [PATCH 147/171] fix ubc, fix #938 --- addons/frag/CfgAmmo.hpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp index c4841ef96aa..ac20dabf5e9 100644 --- a/addons/frag/CfgAmmo.hpp +++ b/addons/frag/CfgAmmo.hpp @@ -73,14 +73,6 @@ class CfgAmmo { GVAR(gurney_k) = 1/2; }; - class G_40mm_HEDP: GrenadeBase { - // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M433 - GVAR(classes)[] = {"ACE_frag_tiny_HD"}; - GVAR(metal) = 200; - GVAR(charge) = 45; - GVAR(gurney_c) = 2830; - GVAR(gurney_k) = 1/2; - }; class G_40mm_HE: GrenadeBase { // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M441 GVAR(classes)[] = {"ACE_frag_tiny_HD"}; @@ -89,6 +81,14 @@ class CfgAmmo { GVAR(gurney_c) = 2700; GVAR(gurney_k) = 1/2; }; + class G_40mm_HEDP: G_40mm_HE { + // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M433 + GVAR(classes)[] = {"ACE_frag_tiny_HD"}; + GVAR(metal) = 200; + GVAR(charge) = 45; + GVAR(gurney_c) = 2830; + GVAR(gurney_k) = 1/2; + }; class ACE_G_40mm_HEDP: G_40mm_HEDP { }; @@ -105,7 +105,15 @@ class CfgAmmo { // curator ammo entries class ShellBase; class Sh_125mm_HEAT; - class Sh_82mm_AMOS : ShellBase { + class Sh_155mm_AMOS: ShellBase { + // Source: http://www.globalsecurity.org/military/systems/munitions/m795.htm + GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; + GVAR(metal) = 36000; + GVAR(charge) = 9979; + GVAR(gurney_c) = 2440; + GVAR(gurney_k) = 1/2; + }; + class Sh_82mm_AMOS : Sh_155mm_AMOS { // Source: http://www.arsenal-bg.com/defense_police/mortar_bombs_82mm.htm GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"}; GVAR(metal) = 3200; @@ -141,14 +149,6 @@ class CfgAmmo { GVAR(gurney_c) = 2440; GVAR(gurney_k) = 1/2; }; - class Sh_155mm_AMOS: ShellBase { - // Source: http://www.globalsecurity.org/military/systems/munitions/m795.htm - GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; - GVAR(metal) = 36000; - GVAR(charge) = 9979; - GVAR(gurney_c) = 2440; - GVAR(gurney_k) = 1/2; - }; class ModuleOrdnanceHowitzer_F_ammo: Sh_155mm_AMOS { GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"}; GVAR(metal) = 1950; From 940f8e834980abddc3ef09a244ea34729fbc7d2c Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 11:38:09 +0200 Subject: [PATCH 148/171] Cleanup++: *Removed spawn *Added, moved and renamed some privates --- .../explosives/functions/fnc_startDefuse.sqf | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf index 3d5a620ed20..3ec6a21de6e 100644 --- a/addons/explosives/functions/fnc_startDefuse.sqf +++ b/addons/explosives/functions/fnc_startDefuse.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" EXPLODE_2_PVT(_this,_unit,_target); -private["_actionToPlay"]; +private["_actionToPlay", "_defuseTime", "_isEOD"]; _target = attachedTo (_target); @@ -43,23 +43,23 @@ if (ACE_player != _unit) then { if (isPlayer _unit) then { [[_unit, _target], QFUNC(startDefuse), _unit] call EFUNC(common,execRemoteFnc); } else { - [_unit, _target, [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime] spawn { - (_this select 0) playActionNow _actionToPlay; - (_this select 0) disableAI "MOVE"; - (_this select 0) disableAI "TARGET"; - [{ - [(_this select 0), (_this select 1)] call FUNC(defuseExplosive); - (_this select 0) enableAI "MOVE"; - (_this select 0) enableAI "TARGET"; - }, _this, (_this select 2), 0] call EFUNC(common,waitAndExecute); - }; + //[_unit, _target, [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime] spawn { + _unit playActionNow _actionToPlay; + _unit disableAI "MOVE"; + _unit disableAI "TARGET"; + _defuseTime = [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime; + [{ + PARAMS_2(_unit,_target); + [_unit, _target] call FUNC(defuseExplosive); + _unit enableAI "MOVE"; + _unit enableAI "TARGET"; + }, [_unit, _target], _defuseTime, 0] call EFUNC(common,waitAndExecute); }; } else { _unit playActionNow _actionToPlay; - private ["_defuseSeconds", "_isEOD"]; _isEOD = [_unit] call EFUNC(Common,isEOD); - _defuseSeconds = [_isEOD, _target] call _fnc_DefuseTime; + _defuseTime = [_isEOD, _target] call _fnc_DefuseTime; if (_isEOD || {!GVAR(RequireSpecialist)}) then { - [_defuseSeconds, [_unit,_target], {(_this select 0) call FUNC(defuseExplosive)}, {}, (localize "STR_ACE_Explosives_DefusingExplosive")] call EFUNC(common,progressBar); + [_defuseTime, [_unit,_target], {(_this select 0) call FUNC(defuseExplosive)}, {}, (localize "STR_ACE_Explosives_DefusingExplosive")] call EFUNC(common,progressBar); }; }; From 5beca63ae20d15b8b75ceee2b499bc5106f3d39a Mon Sep 17 00:00:00 2001 From: Glowbal Date: Fri, 1 May 2015 11:51:23 +0200 Subject: [PATCH 149/171] Added missing private --- addons/medical/functions/fnc_getBloodLoss.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/functions/fnc_getBloodLoss.sqf b/addons/medical/functions/fnc_getBloodLoss.sqf index 0ccbe6c29e7..1881643d972 100644 --- a/addons/medical/functions/fnc_getBloodLoss.sqf +++ b/addons/medical/functions/fnc_getBloodLoss.sqf @@ -15,7 +15,7 @@ #define BLOODLOSSRATE_BASIC 0.2 -private ["_totalBloodLoss","_tourniquets","_openWounds", "_cardiacOutput", "_internalWounds"]; +private ["_unit", "_totalBloodLoss","_tourniquets","_openWounds", "_cardiacOutput", "_internalWounds"]; // TODO Only use this calculation if medium or higher, otherwise use vanilla calculations (for basic medical). _unit = _this select 0; From 4c0bed609e2709a8b78f65c51b6e2ce4c9282761 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 11:53:53 +0200 Subject: [PATCH 150/171] Fixed a typo --- addons/fcs/functions/fnc_firedEH.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/fcs/functions/fnc_firedEH.sqf b/addons/fcs/functions/fnc_firedEH.sqf index 1bdff913d4c..e8f58298d3f 100644 --- a/addons/fcs/functions/fnc_firedEH.sqf +++ b/addons/fcs/functions/fnc_firedEH.sqf @@ -44,7 +44,7 @@ _offset = 0; } forEach _FCSMagazines; // Correct velocity for weapons that have initVelocity -_velocityCorrection = if (getNumber(configFile >> "CfgMagazines" >> _weapon >> "initSpeed") > 0) then { +_velocityCorrection = if (getNumber(configFile >> "CfgWeapons" >> _weapon >> "initSpeed") > 0) then { (vectorMagnitude velocity _projectile) - getNumber(configFile >> "CfgMagazines" >> _magazine >> "initSpeed") } else { 0 From aa2e5077e49fdfcfdd211041a1da348df8109b3c Mon Sep 17 00:00:00 2001 From: bux578 Date: Fri, 1 May 2015 12:17:28 +0200 Subject: [PATCH 151/171] missing german translation --- addons/interact_menu/stringtable.xml | 12 +++++++++--- addons/medical/stringtable.xml | 12 ++++++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index d694ecceb19..4191c9b6662 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -115,11 +115,13 @@ Keep cursor centered Garder le curseur au centre Центрировать курсор + Cursor zentriert halten - Keeps cursor centered and pans the option menu around. Useful if screen size is limited. + Keeps cursor centered and pans the option menu around. Useful if screen size is limited. Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée. Центрирует курсор и двигает само меню опций. Полезно при ограниченном размере экрана. + Hält den Cursor zentriert und verschiebt das Menü beim Bewegen. Nützlich, wenn bei kleinen Bildschirmen. Do action when releasing menu key @@ -127,15 +129,19 @@ Interaction Text Size + Menü-Schriftgröße Interaction Text Shadow + Menü-Hintergrundschatten - Allows controlling the text's shadow. Outline ignores custom shadow colors. + Allows controlling the text's shadow. Outline ignores custom shadow colors. + Stellt den Hintergrundschatten ein. Die Einstellung 'Kontur' ignoriert die Farbe des Schattens. Outline + Kontur - + \ No newline at end of file diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index c164b37bf1c..681c4ebe042 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -24,6 +24,7 @@ Количество мусора от медицины Dettagli Simulazione Rifiuti Niveau de simulation des détritus + Abfall-Detaillevel Litter simulation detail level sets the number of litter items which will be locally spawned in the client. Excessive amounts in local areas could cause FPS lag, so this is a client only setting. @@ -32,6 +33,7 @@ Устанавливает количество мусора, который появляется после использования мед. препаратов. Большое количество мусора может уменьшить производительность, поэтому данная настройка локальна для клиента. Il livello di dettagli della simulazione dei rifiuti indica il numero di rifiuti che verranno creati localmente nel client. La creazione di troppi rifiuti in aree locali potrebbe causare lag e calo di FPS. Questo è un settaggio client. Le nieau de simulation des détritus règle la quantité de déchets qui vont être créer localement dans le client. Des quantitées excessive dans certaines zones locales aurait pu causer des chutes D'IPS, donc c'est une option client uniquement. + Die Einstellung für das Abfalldetaillevel stellt die Menge der lokal erzeugten medizinischen Abfälle ein. Zuviel erzeugte Abfälle können FPS-Lags erzeugen, deswegen ist diese Einstellung nur clientseitig. Inject Atropine @@ -1622,6 +1624,7 @@ He's lost a lot of blood + Er hat viel Blut verloren He hasn't lost blood @@ -1993,15 +1996,19 @@ Style of menu (Medical) + Menü-Stil (Medical) Select the type of menu you prefer; default 3d selections or radial. + Wähle den Menü-Stil: Standard 3D-Selektion oder kreisförmig. Selections (3d) + 3D-Selektion Radial + Kreisförmig Scrape @@ -2268,7 +2275,8 @@ Femur Cassé - Treating... + Treating ... + Behandlen ... - + \ No newline at end of file From e9a86da8e087d037c490ab6db2a78f9e00040089 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Fri, 1 May 2015 12:18:21 +0200 Subject: [PATCH 152/171] Should be in same order as the module --- addons/medical/ACE_Settings.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 0389c3eba46..a3e6c601674 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -57,7 +57,7 @@ class ACE_Settings { class GVAR(enableUnconsiousnessAI) { value = 1; typeName = "SCALAR"; - values[] = {"Disabled", "Enabled", "50/50"}; + values[] = {"Disabled", "50/50", "Enabled"}; }; class GVAR(preventInstaDeath) { typeName = "BOOL"; From 2acc10ba7053a1cbd2fe9f144af090e95b883a52 Mon Sep 17 00:00:00 2001 From: bux578 Date: Fri, 1 May 2015 12:19:42 +0200 Subject: [PATCH 153/171] meh --- addons/interact_menu/stringtable.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 4191c9b6662..916d76b7818 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -121,7 +121,7 @@ Keeps cursor centered and pans the option menu around. Useful if screen size is limited. Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée. Центрирует курсор и двигает само меню опций. Полезно при ограниченном размере экрана. - Hält den Cursor zentriert und verschiebt das Menü beim Bewegen. Nützlich, wenn bei kleinen Bildschirmen. + Hält den Cursor zentriert und verschiebt das Menü beim Bewegen. Nützlich bei kleinen Bildschirmen. Do action when releasing menu key From a6f4c68ef437085c95eb88844dab5f66906840f5 Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 1 May 2015 13:50:01 +0200 Subject: [PATCH 154/171] Removed obsolete comment --- addons/explosives/functions/fnc_startDefuse.sqf | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf index 3ec6a21de6e..11ca95f894e 100644 --- a/addons/explosives/functions/fnc_startDefuse.sqf +++ b/addons/explosives/functions/fnc_startDefuse.sqf @@ -43,7 +43,6 @@ if (ACE_player != _unit) then { if (isPlayer _unit) then { [[_unit, _target], QFUNC(startDefuse), _unit] call EFUNC(common,execRemoteFnc); } else { - //[_unit, _target, [[_unit] call EFUNC(Common,isEOD), _target] call _fnc_DefuseTime] spawn { _unit playActionNow _actionToPlay; _unit disableAI "MOVE"; _unit disableAI "TARGET"; From 53be70f66145528460a60f5f8df445e7380e5203 Mon Sep 17 00:00:00 2001 From: FreeZbe Date: Fri, 1 May 2015 14:07:08 +0200 Subject: [PATCH 155/171] French : update stringtable --- addons/atragmx/stringtable.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/atragmx/stringtable.xml b/addons/atragmx/stringtable.xml index cd5eff11811..1351c1b8b5b 100644 --- a/addons/atragmx/stringtable.xml +++ b/addons/atragmx/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -28,7 +28,7 @@ Защищенный КПК с ATragMX PDA rugerizada con ATragMX Robuster PDA mit ATragMX - PDA robuste avec ATragMX + PDA avec ATragMX PDA Robusto con ATragMX @@ -41,4 +41,4 @@ Apri ATragMX - \ No newline at end of file + From 820c841b35eb3ac35b847802d064d051bb6c02c1 Mon Sep 17 00:00:00 2001 From: FreeZbe Date: Fri, 1 May 2015 14:12:10 +0200 Subject: [PATCH 156/171] Update stringtable.xml --- addons/ballistics/stringtable.xml | 62 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index eea2f0cb9e9..47509b56321 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -455,7 +455,7 @@ 9.3mm 10Rnd Tracer Mag 9,3mm 10-Patronen-Magazin Leuchtspur Magazynek 9.3mm 10rd Smugacz - Chargeur 9.3mm 10Cps Traçante + Ch. 9.3mm 10Cps Traçante Cargador de 10 balas trazadoras de 9.3mm Магазин из 10-ти 9,3 мм трассирующих 9.3mm 10Rnd Tracer Mag @@ -483,7 +483,7 @@ 9.3mm 10Rnd Tracer IR-DIM Mag 9,3mm 10-Patronen-Magazin Leuchtspur IR-DIM Magazynek 9,3mm 10rd Smugacz IR-DIM - Chargeur 9.3mm 10Cps Traçante IR-DIM + Ch. 9.3mm 10Cps Traçante IR-DIM Cargador de 10 balas trazadoras IR-DIM de 9.3mm Магазин из 10-ти 9,3 мм ИК-трассирующих 9.3mm 10Rnd Tracciante IR-DIM Mag @@ -595,7 +595,7 @@ 9x19mm 16Rnd Mag Magazynek 9x19mm 16rd - Chargeur 9x19mm 16Cps + Ch. 9x19mm 16Cps Cargador de 16 balas de 9x19mm Магазин из 16-ти 9х19 мм 9x19mm 20-Patronen-Magazin @@ -613,7 +613,7 @@ 9x19mm 30Rnd Mag Magazynek 9x19mm 16rd - Chargeur 9x19mm 30Cps + Ch. 9x19mm 30Cps Cargador de 16 balas de 9x19mm Магазин из 16-ти 9х19 мм 9x19mm 30-Patronen-Magazin @@ -622,7 +622,7 @@ 9x19mm 30Rnd Mag Magazynek 9x19mm 30rd - Chargeur 9x19mm 30Cps + Ch. 9x19mm 30Cps Cargador de 30 balas de 9x19mm Магазин из 30-ти 9х19 мм 9x19mm 30-Patronen-Magazin @@ -640,7 +640,7 @@ 9x19mm 30Rnd Mag Magazynek 9x19mm 30rd - Chargeur 9x19mm 30Cps + Ch. 9x19mm 30Cps Cargador de 30 balas de 9x19mm Магазин из 30-ти 9х19 мм 9x19mm 30-Patronen-Magazin @@ -649,7 +649,7 @@ 7.62x54mm 10Rnd Tracer Mag Magazynek 7,62x54mm 10rd Smugacz - Chargeur 7.62x54mm 10Rnd Traçante + Ch. 7.62x54mm 10Rnd Traçante Cargador de 10 balas trazadoras de 7.62x54mm Магазин из 10-ти 7,62 мм ИК-трассирующих 7,62x54mm 10-Patronen-Magazin Leuchtspur @@ -667,7 +667,7 @@ 7.62x54mm 10Rnd Tracer Mag Magazynek 7,62x54mm 10rd Smugacz - Chargeur 7.62x54mm 10Cps Traçante + Ch. 7.62x54mm 10Cps Traçante Cargador de 10 balas trazadoras de 7.62x54mm Магазин из 10-ти 7,62 мм ИК-трассирующих 7,62x54mm 10-Patronen-Magazin Leuchtspur @@ -676,7 +676,7 @@ 6.5mm 100Rnd Tracer IR-DIM Mag Magazynek 6,5mm 100rd Smugacz IR-DIM - Chargeur 6.5mm 100Rnd Traçante IR-DIM + Ch. 6.5mm 100Rnd Traçante IR-DIM Cargador de 100 balas trazadoras IR-DIM de 6.5mm Магазин из 100 6,5 мм ИК-трассирующих 6,5mm 100-Patronen-Magazin IR-DIM Leuchtspur @@ -694,7 +694,7 @@ 6.5mm 100Rnd Tracer IR-DIM Mag<br />Rounds: 100<br />Used in: MX LSW Magazynek 6,5mm 100rd Smugacz IR-DIM - Chargeur 6.5mm 100Rnd Traçante IR-DIM<br />Cartouches: 100<br />Utilisé avec: MX LSW + Ch. 6.5mm 100Rnd Traçante IR-DIM<br />Cartouches: 100<br />Utilisé avec: MX LSW Cargador de 100 balas trazadoras IR-DIM de 6.5mm Магазин из 100 6,5 мм ИК-трассирующих 6,5mm 100-Patronen-Magazin IR-DIM Leuchtspur<br />Patronen: 100<br />Eingesetzt von: MXLSW @@ -757,7 +757,7 @@ 5.56mm 30Rnd Mag (Mk318) Magazynek 5,56mm 30rd (Mk318) - Chargeur 5.56mm 30Cps (Mk318) + Ch. 5.56mm 30Cps (Mk318) Cargador de 30 balas de 5.56mm (Mk318) Магазин из 30-ти 5.56 мм (Mk318) 5,56mm 30-Patronen-Magazin (Mk318) @@ -784,7 +784,7 @@ 5.56mm 30Rnd Mag (M995 AP) Magazynek 5,56mm 30rd (M995 AP) - Chargeur 5.56mm 30Cps (M995 AP) + Ch. 5.56mm 30Cps (M995 AP) Cargador de 30 balas de 5.56mm (M995 AP) Магазин из 30-ти 5.56 мм (M995 бронебойные) 5,56mm 30-Patronen-Magazin (M995AP) @@ -811,7 +811,7 @@ 7.62mm 10Rnd Mag (M118LR) Magazynek 7,62mm 10rd (M118LR) - Chargeur 7.62mm 10Cps (M118LR) + Ch. 7.62mm 10Cps (M118LR) Cargador de 10 balas de 7.62mm (M118LR) Магазин из 10-ти 7,62 мм (M118LR) 7,62mm 10-Patronen-Magazin (M118LR) @@ -838,7 +838,7 @@ 7.62mm 20Rnd Mag (M118LR) Magazynek 7,62mm 20rd (M118LR) - Chargeur 7.62mm 20Cps (M118LR) + Ch. 7.62mm 20Cps (M118LR) Cargador de 20 balas de 7.62mm (M118LR) Магазин из 20-ти 7,62 мм (M118LR) 7,62mm 20-Patronen-Magazin (M118LR) @@ -865,7 +865,7 @@ 7.62mm 10Rnd Mag (Mk316 Mod 0) Magazynek 7,62mm 10rd (Mk316 Mod 0) - Chargeur 7.62mm 10Cps (Mk316 Mod 0) + Ch. 7.62mm 10Cps (Mk316 Mod 0) Cargador de 10 balas de 7.62mm (Mk316 Mod 0) Магазин из 10-ти 7,62 мм (Mk316 Mod 0) 7,62mm 10-Patronen-Magazin (Mk316 Mod 0) @@ -892,7 +892,7 @@ 7.62mm 20Rnd Mag (Mk316 Mod 0) Magazynek 7,62mm 20rd (Mk316 Mod 0) - Chargeur 7.62mm 20Cps (Mk316 Mod 0) + Ch. 7.62mm 20Cps (Mk316 Mod 0) Cargador de 20 balas de 7.62mm (Mk316 Mod 0) Магазин из 20-ти 7,62 мм (Mk316 Mod 0) 7,62mm 20-Patronen-Magazin (Mk316 Mod 0) @@ -919,7 +919,7 @@ 7.62mm 10Rnd Mag (Mk319 Mod 0) Magazynek 7,62mm 10rd (Mk319 Mod 0) - Chargeur 7.62mm 10Cps (Mk319 Mod 0) + Ch. 7.62mm 10Cps (Mk319 Mod 0) Cargador de 10 balas de 7.62mm (Mk319 Mod 0) Магазин из 10-ти 7,62 мм (Mk319 Mod 0) 7,62mm 10-Patronen-Magazin (Mk319 Mod 0) @@ -946,7 +946,7 @@ 7.62mm 20Rnd Mag (Mk319 Mod 0) Magazynek 7,62mm 20rd (Mk319 Mod 0) - Chargeur 7.62mm 20Cps (Mk319 Mod 0) + Ch. 7.62mm 20Cps (Mk319 Mod 0) Cargador de 20 balas de 7.62mm (Mk319 Mod 0) Магазин из 20-ти 7,62 мм (Mk319 Mod 0) 7,62mm 20-Patronen-Magazin (Mk319 Mod 0) @@ -973,7 +973,7 @@ 7.62mm 10Rnd Mag (M993 AP) Magazynek 7,62mm 10rd (M993 AP) - Chargeur 7.62mm 10Cps (M993 AP) + Ch. 7.62mm 10Cps (M993 AP) Cargador de 10 balas de 7.62mm (M993 AP) Магазин из 10-ти 7,62 мм (M993 бронебойные) 7,62mm 10-Patronen-Magazin (M993 AP) @@ -1000,7 +1000,7 @@ 7.62mm 20Rnd Mag (M993 AP) Magazynek 7,62mm 20rd (M993 AP) - Chargeur 7.62mm 20Cps (M993 AP) + Ch. 7.62mm 20Cps (M993 AP) Cargador de 20 balas de 7.62mm (M993 AP) Магазин из 20-ти 7,62 мм (M993 бронебойные) 7,62mm 20-Patronen-Magazin (M993 AP) @@ -1027,7 +1027,7 @@ 7.62mm 20Rnd Mag (Mk248 Mod 0) Magazynek 7,62mm 20rd (Mk248 Mod 0) - Chargeur 7.62mm 20Cps (Mk248 Mod 0) + Ch. 7.62mm 20Cps (Mk248 Mod 0) Cargador de 20 balas de 7.62mm (Mk248 Mod 0) Магазин из 20-ти 7,62 мм (Mk248 Mod 0) 7,62mm 20-Patronen-Magazin (Mk248 Mod 0) @@ -1054,7 +1054,7 @@ 7.62mm 20Rnd Mag (Mk248 Mod 1) Magazynek 7,62mm 20rd (Mk248 Mod 1) - Chargeur 7.62mm 20Cps (Mk248 Mod 1) + Ch. 7.62mm 20Cps (Mk248 Mod 1) Cargador de 20 balas de 7.62mm (Mk248 Mod 1) Магазин из 20-ти 7,62 мм (Mk248 Mod 1) 7,62mm 20-Patronen-Magazin (Mk248 Mod 1) @@ -1081,7 +1081,7 @@ 7.62mm 20Rnd Mag (Berger Hybrid OTM) Magazynek 7,62mm 20rd (Berger Hybrid OTM) - Chargeur 7.62 20Cps (Berger Hybrid OTM) + Ch. 7.62 20Cps (Berger Hybrid OTM) Cargador de 20 balas de 7.62mm (Berger Hybrid OTM) Магазин из 20-ти 7,62 мм (Berger Hybrid OTM) 7,62mm 20-Patronen-Magazin (Berger Hybrid OTM) @@ -1107,7 +1107,7 @@ 6.5x47mm 30Rnd Mag (HPBT Scenar) - Chargeur 6.5x47mm 30Cps (HPBT Scenar) + Ch. 6.5x47mm 30Cps (HPBT Scenar) Cargador de 30 balas de 6.5x47mm (HPBT Scenar) Magazynek 6,5x47mm 30rd (HPBT Scenar) Магазин из 30-ти 6,5x47 мм (экспансивные Scenar) @@ -1138,7 +1138,7 @@ 6.5mm Creedmor 30Rnd Mag Магазин из 30-ти 6,5 мм Creedmor 6,5mm Creedmor 30-Patronen-Magazin - Chargeur 6.5mm Creedmor 30Cps + Ch. 6.5mm Creedmor 30Cps 6.5mm CM @@ -1158,7 +1158,7 @@ .338 10Rnd Mag (300gr Sierra MatchKing HPBT) - Chargeur .338 10 Cps (300gr Sierra MatchKing HPBT) + Ch. .338 10 Cps (300gr Sierra MatchKing HPBT) Cargador de 10 balas de 8.6x70mm (300gr Sierra MatchKing HPBT) Magazynek .338 10rd (300gr Sierra MatchKing HPBT) Магазин из 10-ти .338 (300 гран Sierra MatchKing экспансивные) @@ -1185,7 +1185,7 @@ .338 10Rnd Mag (API526) - Chargeur .338 10Cps (API526) + Ch. .338 10Cps (API526) Cargador de 10 balas de .338 (API526) Magazynek .338 10rd (API526) Магазин из 10-ти .338 (API526) @@ -1212,7 +1212,7 @@ 12.7x99mm 5Rnd Mag - Chargeur 12.7x99mm 5Cps + Ch. 12.7x99mm 5Cps Cargador de 5 balas de 12.7x99mm Magazynek 12,7x99mm 5rd Магазин из 5-ти 12,7x99 мм @@ -1239,7 +1239,7 @@ 12.7x99mm API 5Rnd Mag - Chargeur 12.7x99mm API 5Cps + Ch. 12.7x99mm API 5Cps Cargador de 5 balas de 12.7x99mm API Magazynek 12,7x99mm API 5rd 12.7x99mm API 5Rnd Mag @@ -1266,7 +1266,7 @@ 12.7x99mm 5Rnd Mag (AMAX) - Chargeur 12.7x99mm 5Rnd Mag (AMAX) + Ch. 12.7x99mm 5Cps (AMAX) Cargador de 5 balas de 12.7x99mm (AMAX) Magazynek 12,7x99mm 5rd (AMAX) Магазин из 5-ти 12,7x99 мм (A-MAX) @@ -1292,4 +1292,4 @@ Kaliber:12,7x99mm (AMAX)<br />Patronen: 5 - \ No newline at end of file + From 371aa381ecbe0c27fabad7b5b12a8ff521c51ed0 Mon Sep 17 00:00:00 2001 From: FreeZbe Date: Fri, 1 May 2015 14:12:45 +0200 Subject: [PATCH 157/171] Update stringtable.xml --- addons/explosives/stringtable.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml index 1fbc728cb12..f200e29dc84 100644 --- a/addons/explosives/stringtable.xml +++ b/addons/explosives/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -138,7 +138,7 @@ M57 Zündvorrichtung Dispositivo de detonación M57 Zapalnik M57 - M57 Dispositif de mise à feu + Dispositif de mise à feu M57 Odpalovací zařízení M57 Detonatore M57 M57 Gyújtóeszköz @@ -162,7 +162,7 @@ M26 Zündvorrichtung Dispositivo de detonación MK26 Zapalnik M26 - M26 Dispositif de mise à feu + Dispositif de mise à feu M26 Odpalovací zařízení M26 Detonatore M26 M26 Gyújtóeszköz @@ -282,7 +282,7 @@ "Zünden"-Menü Menú de detonación Menu detonacji - Menu de mise à feu + Menu de mise à feux Menu Detonace Menù di detonazione Robbantási menü @@ -294,7 +294,7 @@ "Platzieren"-Menü Menú de colocación Menu umieszczania - Menu placement + Menu de placement Menu Umístění Menù di collocamento Elhelyezési menü From 7a397459ae6f8edaed1eff1d4ccb672cd93dac60 Mon Sep 17 00:00:00 2001 From: FreeZbe Date: Fri, 1 May 2015 14:13:08 +0200 Subject: [PATCH 158/171] Update stringtable.xml --- addons/disposable/stringtable.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml index d80ac588858..2e6f204b6cf 100644 --- a/addons/disposable/stringtable.xml +++ b/addons/disposable/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -28,7 +28,7 @@ Preloaded Missile Dummy Vorgeladene Racketennachbildung - Missile préchargé Dummy + Missile préchargé Přednabitá dummy střela Wstępnie załadowana atrapa pocisku Preloaded Missile Dummy From acf74dd2ae62fae002c88a5c3b7dadfe4bbff5dd Mon Sep 17 00:00:00 2001 From: FreeZbe Date: Fri, 1 May 2015 14:13:32 +0200 Subject: [PATCH 159/171] Update stringtable.xml --- addons/interact_menu/stringtable.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index d694ecceb19..60fcf4a18eb 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -124,18 +124,23 @@ Do action when releasing menu key Aktion nach Loslassen der Taste ausführen + Action au relachement de touche Interaction Text Size + Taille du texte d'interaction Interaction Text Shadow + Ombre du texte d'interaction Allows controlling the text's shadow. Outline ignores custom shadow colors. + Permet de controler l'ombre du texte. Le contour ne prend pas en compte la couleur des ombres. Outline + Contour From 80ae016021903eaf3da08a44c3741a3cd3bc2f4a Mon Sep 17 00:00:00 2001 From: FreeZbe Date: Fri, 1 May 2015 14:19:15 +0200 Subject: [PATCH 160/171] Update stringtable.xml --- addons/medical/stringtable.xml | 62 ++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index c164b37bf1c..21bc537f226 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -14,7 +14,7 @@ Körperteil nicht verletzt ... Non ci sono lesioni in questa parte del corpo ... Данная часть тела не повреждена ... - Aucune blessures sur cette partie du corps + Aucune blessures sur cette partie du corps ... Brak obrażeń na tej części ciała ... @@ -31,7 +31,7 @@ Detalle simulación de basura establece el número de artículos de basura que se generan a nivel local en el cliente. Las cantidades excesivas en áreas locales podrían causar caída de rendimiento, así que esto es un ajuste de cliente únicamente. Устанавливает количество мусора, который появляется после использования мед. препаратов. Большое количество мусора может уменьшить производительность, поэтому данная настройка локальна для клиента. Il livello di dettagli della simulazione dei rifiuti indica il numero di rifiuti che verranno creati localmente nel client. La creazione di troppi rifiuti in aree locali potrebbe causare lag e calo di FPS. Questo è un settaggio client. - Le nieau de simulation des détritus règle la quantité de déchets qui vont être créer localement dans le client. Des quantitées excessive dans certaines zones locales aurait pu causer des chutes D'IPS, donc c'est une option client uniquement. + Le niveau de simulation des détritus règle la quantité de déchets qui vont être créés localement chez le client. Des quantitées excessive chez certains clients peuvent causer des chutes de FPS, c'est donc une option client uniquement. Inject Atropine @@ -1993,15 +1993,19 @@ Style of menu (Medical) + Style de menu (Médical) Select the type of menu you prefer; default 3d selections or radial. + Selctionne le type de menu préféré; par défaut la sélection 3D ou radiale Selections (3d) + sélections (3D) Radial + Radiale Scrape @@ -2016,7 +2020,7 @@ Kleiner Kratzer Minima Scorticatura Малая ссадина - Eraflure Mineure + Petite éraflure Pomniejsze draśnięcie @@ -2024,7 +2028,7 @@ Mittlerer Kratzer Media Scorticatura Средняя ссадина - Moyenne Eraflure + Moyenne éraflure Średnie draśnięcie @@ -2032,7 +2036,7 @@ Großer Kratzer Alta Scorticatura Большая ссадина - Large Eraflure + Grande éraflure Duże draśnięcie @@ -2048,7 +2052,7 @@ Kleine Avulsion Minima Avulsione Малая рваная рана - Avulsion Mineure + Petite avulsion Pomniejsza rana płatowa @@ -2056,7 +2060,7 @@ Mittlere Avulsion Media Avulsione Средняя рваная рана - Avulsion Moyenne + Moyenne avulsion Średnia rana płatowa @@ -2064,7 +2068,7 @@ Große Avulsion Alta Avulsione Большая рваная рана - Large Avulsion + Grande avulsion Duża rana płatowa @@ -2080,7 +2084,7 @@ Kleine Prellung Minima Contusione Малый ушиб - Hématome Mineur + Petit hématome Pomniejsze stłuczenie @@ -2088,7 +2092,7 @@ Mittlere Prellung Media Contusione Средний ушиб - Hématome Moyen + Hématome moyen Średnie stłuczenie @@ -2096,7 +2100,7 @@ Große Prellung Alta Contusione Большой ушиб - Large Hématome + Hématome important Duże stłuczenie @@ -2112,7 +2116,7 @@ Kleine Quetschverletzung Minimo Tessuto Schiacciato Малая компрессионная травма - Tissu écrasé Mineur + Tissu écrasé léger Pomniejsze zgniecienie tkanek miękkich @@ -2120,7 +2124,7 @@ Mittlere Quetschverletzung Medio Tessuto Schiacciato Средняя компрессионная травма - Tissu écrasé Moyen + Tissu écrasé moyen Średnie zgniecienie tkanek miękkich @@ -2128,7 +2132,7 @@ Große Quetschverletzung Alto Tessuto Schiacciato Большая компрессионная травма - Tissu écrasé Large + Tissu écrasé large Duże zgniecienie tkanek miękkich @@ -2145,7 +2149,7 @@ Piccolo Taglio Малая резаная рана Pomniejsza rana cięta - Petite Coupure + Petite coupure Medium Cut @@ -2153,7 +2157,7 @@ Medio Taglio Средняя резаная рана Średnia rana cięta - Moyenne Coupure + Moyenne coupure Large Cut @@ -2161,7 +2165,7 @@ Grande Taglio Большая резаная рана Duża rana cięta - Large Coupure + Large coupure Tear @@ -2185,7 +2189,7 @@ Medio Strappo Средняя рваная рана Średnie rozerwanie skóry - Moyenne Déchirure + Moyenne déchirure Large Tear @@ -2193,7 +2197,7 @@ Grande Strappo Большая рваная рана Duże rozerwanie skóry - Large Déchirure + Large déchirure Velocity Wound @@ -2209,7 +2213,7 @@ Lenta Velocità Ferita Малая огнестрельная рана Pomniejsza rana postrzałowa - Petite Bessure de vélocité + Petite blessure de vélocité Medium Velocity Wound @@ -2217,7 +2221,7 @@ Media Velocità Ferita Средняя огнестрельная рана Średnia rana postrzałowa - Moyenne Blessure de vélocité + Moyenne blessure de vélocité Large Velocity Wound @@ -2225,7 +2229,7 @@ Alta Velocità Ferita Большая огнестрельная рана Duża rana postrzałowa - Large Blessure de vélocité + Large blessure de vélocité Puncture Wound @@ -2241,7 +2245,7 @@ Piccola Puntura Ferita Малая колотая рана Pomniejsza rana kłuta - Blessure de perforation Mineure + Légère blessure de perforation Medium Puncture Wound @@ -2249,7 +2253,7 @@ Media Puntura Ferita Средняя колотая рана Średnia rana kłuta - Blessure de perforation Moyenne + Moyenne blessure de perforation Large Puncture Wound @@ -2257,7 +2261,7 @@ Grande Puntura Ferita Большая колотая рана Duża rana kłuta - Large Blessure de perforation + Large blessure de perforation Broken Femur @@ -2265,10 +2269,10 @@ Femore Rotto Перелом Zkłamana kość udowa - Femur Cassé + Fémur cassé - Treating... + Treating ... + Traitement ... - From bfb68fe36827eb74ec0bf04f6cbb31d87ff23bbd Mon Sep 17 00:00:00 2001 From: bux578 Date: Fri, 1 May 2015 14:19:30 +0200 Subject: [PATCH 161/171] fix spelling errors --- addons/medical/stringtable.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 681c4ebe042..1553a16e7ab 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -33,7 +33,7 @@ Устанавливает количество мусора, который появляется после использования мед. препаратов. Большое количество мусора может уменьшить производительность, поэтому данная настройка локальна для клиента. Il livello di dettagli della simulazione dei rifiuti indica il numero di rifiuti che verranno creati localmente nel client. La creazione di troppi rifiuti in aree locali potrebbe causare lag e calo di FPS. Questo è un settaggio client. Le nieau de simulation des détritus règle la quantité de déchets qui vont être créer localement dans le client. Des quantitées excessive dans certaines zones locales aurait pu causer des chutes D'IPS, donc c'est une option client uniquement. - Die Einstellung für das Abfalldetaillevel stellt die Menge der lokal erzeugten medizinischen Abfälle ein. Zuviel erzeugte Abfälle können FPS-Lags erzeugen, deswegen ist diese Einstellung nur clientseitig. + Die Einstellung für das Abfall-Detaillevel stellt die Menge der lokal erzeugten medizinischen Abfälle ein. Zuviel erzeugte Abfälle können FPS-Lags erzeugen, deswegen ist diese Einstellung nur clientseitig. Inject Atropine @@ -2276,7 +2276,7 @@ Treating ... - Behandlen ... + Behandeln ... \ No newline at end of file From 79ac41bd9589a4bda65c7b1e1841651439f8ea37 Mon Sep 17 00:00:00 2001 From: FreeZbe Date: Fri, 1 May 2015 14:19:43 +0200 Subject: [PATCH 162/171] Update stringtable.xml --- addons/mk6mortar/stringtable.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml index fe08d320e58..2907bba7515 100644 --- a/addons/mk6mortar/stringtable.xml +++ b/addons/mk6mortar/stringtable.xml @@ -1,11 +1,11 @@ - + 82mm Rangetable 82mm Distanztabelle Tabela strzelnicza 82mm - table de tir 82mm + Table de tir 82mm 82 мм Таблица дальностей и прицелов @@ -19,7 +19,7 @@ Open 82mm Rangetable Öffne 82mm Distanztabelle Otwórz tabelę strzelniczą 82mm - ouvrir la table de tir 82mm + Ouvrir la table de tir 82mm Открыть 82 мм Таблицу дальностей и прицелов From 518614ec0b67e009bb803d0c7e2b6a8bff313535 Mon Sep 17 00:00:00 2001 From: FreeZbe Date: Fri, 1 May 2015 14:20:03 +0200 Subject: [PATCH 163/171] Update stringtable.xml --- addons/reload/stringtable.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/reload/stringtable.xml b/addons/reload/stringtable.xml index 1bad20f53a8..0071c3c6194 100644 --- a/addons/reload/stringtable.xml +++ b/addons/reload/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -63,7 +63,7 @@ Linking belt... - Attache d'une bande + Attache d'une bande... Enlazando cinta... Сцепка лент ... Spojuji pás... From 68d62b00059bff4b7a01f48f07573cbeafca0997 Mon Sep 17 00:00:00 2001 From: FreeZbe Date: Fri, 1 May 2015 14:20:21 +0200 Subject: [PATCH 164/171] Update stringtable.xml --- addons/reloadlaunchers/stringtable.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/reloadlaunchers/stringtable.xml b/addons/reloadlaunchers/stringtable.xml index acb16bc92cb..25853585915 100644 --- a/addons/reloadlaunchers/stringtable.xml +++ b/addons/reloadlaunchers/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -15,7 +15,7 @@ Loading launcher ... - Chargement du lanceur + Chargement du lanceur ... Panzerabwehr wird geladen ... Cargando lanzador ... Зарядка ПУ ... From b255d1040b6d6e8efd97e4dbc7f2917b8e49421f Mon Sep 17 00:00:00 2001 From: commy2 Date: Fri, 1 May 2015 15:30:11 +0200 Subject: [PATCH 165/171] scope 1 for ACE_Comanche_Test, #943 --- addons/missileguidance/CfgVehicles.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/missileguidance/CfgVehicles.hpp b/addons/missileguidance/CfgVehicles.hpp index 301795b8d7a..0d9ef54d07b 100644 --- a/addons/missileguidance/CfgVehicles.hpp +++ b/addons/missileguidance/CfgVehicles.hpp @@ -19,6 +19,7 @@ class CfgVehicles { }; class ACE_Comanche_Test : B_Heli_Attack_01_F { + scope = 1; displayName = "ACE_Comanche_Test"; author = "ACE Team"; class Library { From cde80b29015f24469f0a84201b2e60ed56c9deae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Fri, 1 May 2015 10:38:41 -0300 Subject: [PATCH 166/171] Revert "Takes negative initSpeed values into account" --- addons/fcs/functions/fnc_firedEH.sqf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/fcs/functions/fnc_firedEH.sqf b/addons/fcs/functions/fnc_firedEH.sqf index e8f58298d3f..698a9bef22b 100644 --- a/addons/fcs/functions/fnc_firedEH.sqf +++ b/addons/fcs/functions/fnc_firedEH.sqf @@ -44,11 +44,9 @@ _offset = 0; } forEach _FCSMagazines; // Correct velocity for weapons that have initVelocity -_velocityCorrection = if (getNumber(configFile >> "CfgWeapons" >> _weapon >> "initSpeed") > 0) then { - (vectorMagnitude velocity _projectile) - getNumber(configFile >> "CfgMagazines" >> _magazine >> "initSpeed") -} else { - 0 -}; +// @todo: Take into account negative initVelocities +_velocityCorrection = (vectorMagnitude velocity _projectile) - + getNumber (configFile >> "CfgMagazines" >> _magazine >> "initSpeed"); [_projectile, (_vehicle getVariable format ["%1_%2", QGVAR(Azimuth), _turret]), _offset, -_velocityCorrection] call EFUNC(common,changeProjectileDirection); From 9997b6d46439f2bfc21837461a4d300de1439a41 Mon Sep 17 00:00:00 2001 From: jaynus Date: Fri, 1 May 2015 06:57:49 -0700 Subject: [PATCH 167/171] action is select 1 --- addons/javelin/functions/fnc_onOpticDraw.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/javelin/functions/fnc_onOpticDraw.sqf b/addons/javelin/functions/fnc_onOpticDraw.sqf index 134260c064b..86e59bf6927 100644 --- a/addons/javelin/functions/fnc_onOpticDraw.sqf +++ b/addons/javelin/functions/fnc_onOpticDraw.sqf @@ -134,7 +134,7 @@ FUNC(disableFire) = { if(_firedEH < 0 && difficulty > 0) then { _firedEH = [ACE_player, "DefaultAction", {true}, { - _canFire = _this getVariable["ace_missileguidance_target", nil]; + _canFire = (_this select 1) getVariable["ace_missileguidance_target", nil]; if(!isNil "_canFire") exitWith { false }; true }] call EFUNC(common,addActionEventHandler); From 30e90a377edc629fbccf73b57b2d7295bfc4cfaf Mon Sep 17 00:00:00 2001 From: KoffeinFlummi Date: Fri, 1 May 2015 17:51:31 +0200 Subject: [PATCH 168/171] Fix duplicate entries --- addons/medical/stringtable.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index b988df41736..e0b5f641c39 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -37,10 +37,9 @@ Detalle simulación de basura establece el número de artículos de basura que se generan a nivel local en el cliente. Las cantidades excesivas en áreas locales podrían causar caída de rendimiento, así que esto es un ajuste de cliente únicamente. Устанавливает количество мусора, который появляется после использования мед. препаратов. Большое количество мусора может уменьшить производительность, поэтому данная настройка локальна для клиента. Il livello di dettagli della simulazione dei rifiuti indica il numero di rifiuti che verranno creati localmente nel client. La creazione di troppi rifiuti in aree locali potrebbe causare lag e calo di FPS. Questo è un settaggio client. - Le nieau de simulation des détritus règle la quantité de déchets qui vont être créer localement dans le client. Des quantitées excessive dans certaines zones locales aurait pu causer des chutes D'IPS, donc c'est une option client uniquement. + Le niveau de simulation des détritus règle la quantité de déchets qui vont être créés localement chez le client. Des quantitées excessive chez certains clients peuvent causer des chutes de FPS, c'est donc une option client uniquement. Die Einstellung für das Abfall-Detaillevel stellt die Menge der lokal erzeugten medizinischen Abfälle ein. Zuviel erzeugte Abfälle können FPS-Lags erzeugen, deswegen ist diese Einstellung nur clientseitig. A hulladékszimuláció részletessége megszabja a kliens által megjelenített hulladékobjektumok mennyiségét. Súlyos mennyiségek izolált területeken alacsony FPS-t okozhatnak, így ez egy kliensoldali beállítás. - Le niveau de simulation des détritus règle la quantité de déchets qui vont être créés localement chez le client. Des quantitées excessive chez certains clients peuvent causer des chutes de FPS, c'est donc une option client uniquement. Inject Atropine @@ -2428,3 +2427,4 @@ Traitement ... + From a883517a5efb32139b61e793e2ee8f9e156f816d Mon Sep 17 00:00:00 2001 From: ruPaladin Date: Fri, 1 May 2015 19:18:06 +0300 Subject: [PATCH 169/171] Update stringtable.xml --- addons/medical/stringtable.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index e0b5f641c39..247459152ca 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -1678,6 +1678,7 @@ Er hat viel Blut verloren Sok vért vesztett Stracił sporo krwi + Большая кровопотеря He hasn't lost blood @@ -2070,24 +2071,28 @@ Styl menu medycznego Style de menu (Médical) Menü-Stil (Medical) + Вид меню (медицина) Select the type of menu you prefer; default 3d selections or radial. Wybierz rodzaj menu, który preferujesz: domyślne pozycje 3D lub radialne Selctionne le type de menu préféré; par défaut la sélection 3D ou radiale Wähle den Menü-Stil: Standard 3D-Selektion oder kreisförmig. + Выберите тип меню: стандартный вариант (3D) или радиальный Selections (3d) Pozycje (3D) sélections (3D) 3D-Selektion + Стандартный (3D) Radial Radialne Radiale Kreisförmig + Радиальный Scrape @@ -2425,6 +2430,7 @@ Ellátás ... Leczenie ... Traitement ... + Лечение ... From 2aa788bba207881ce7f2ba61e07b8a877900291d Mon Sep 17 00:00:00 2001 From: ruPaladin Date: Fri, 1 May 2015 19:26:23 +0300 Subject: [PATCH 170/171] Update stringtable.xml --- addons/interact_menu/stringtable.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml index 8b3704239ba..ca53f840bc2 100644 --- a/addons/interact_menu/stringtable.xml +++ b/addons/interact_menu/stringtable.xml @@ -142,26 +142,31 @@ Aktion nach Loslassen der Taste ausführen Wykonuj akcje po puszczeniu klawisza menu Action au relachement de touche + Выполнять действие при отпускании кнопки взаимодействия Interaction Text Size Menü-Schriftgröße Taille du texte d'interaction + Размер текста (меню взаимодействия) Interaction Text Shadow Menü-Hintergrundschatten Ombre du texte d'interaction + Тень от текста (меню взаимодействия) Allows controlling the text's shadow. Outline ignores custom shadow colors. Stellt den Hintergrundschatten ein. Die Einstellung 'Kontur' ignoriert die Farbe des Schattens. Permet de controler l'ombre du texte. Le contour ne prend pas en compte la couleur des ombres. + Дает возможность изменять тень, отбрасываемую текстом. Контур не зависит от выбранного цвета тени. Outline Kontur Contour + Контур From 80162627ecfefb5194b9b3a8e408b3e610e876b2 Mon Sep 17 00:00:00 2001 From: Glowbal Date: Fri, 1 May 2015 18:49:59 +0200 Subject: [PATCH 171/171] Fixed spelling of enableUnconsciousnessAI --- addons/medical/ACE_Settings.hpp | 2 +- addons/medical/CfgVehicles.hpp | 2 +- addons/medical/functions/fnc_moduleMedicalSettings.sqf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index a3e6c601674..b3c2152df1f 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -54,7 +54,7 @@ class ACE_Settings { typeName = "SCALAR"; value = 1; }; - class GVAR(enableUnconsiousnessAI) { + class GVAR(enableUnconsciousnessAI) { value = 1; typeName = "SCALAR"; values[] = {"Disabled", "50/50", "Enabled"}; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 234947c0b6d..6fb2f332c6d 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -87,7 +87,7 @@ class CfgVehicles { typeName = "NUMBER"; defaultValue = 1; }; - class enableUnconsiousnessAI { + class enableUnconsciousnessAI { displayName = "AI Unconsciousness"; description = "Allow AI to go unconscious"; typeName = "NUMBER"; diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf index ad8fbba18a2..296b4f1d56a 100644 --- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf +++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf @@ -29,7 +29,7 @@ if !(_activated) exitWith {}; [_logic, QGVAR(enableScreams), "enableScreams"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(playerDamageThreshold), "playerDamageThreshold"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(AIDamageThreshold), "AIDamageThreshold"] call EFUNC(common,readSettingFromModule); -[_logic, QGVAR(enableUnconsiousnessAI), "enableUnconsiousnessAI"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(enableUnconsciousnessAI), "enableUnconsciousnessAI"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(preventInstaDeath), "preventInstaDeath"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule);