From 6d49bbda28697c0a5933cee417249af06f50f636 Mon Sep 17 00:00:00 2001 From: jokoho48 Date: Wed, 6 Jan 2016 17:46:59 +0100 Subject: [PATCH 01/15] add delay to Unconsciousness Captivity(posible fix for #3121) --- addons/medical/ACE_Settings.hpp | 7 +++++++ addons/medical/CfgVehicles.hpp | 7 +++++++ .../medical/functions/fnc_moduleMedicalSettings.sqf | 1 + addons/medical/functions/fnc_setUnconscious.sqf | 10 +++++++++- addons/medical/stringtable.xml | 11 ++++++++++- 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 02b5375e96..b21ff0da59 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -223,4 +223,11 @@ class ACE_Settings { values[] = {CSTRING(useSelection), CSTRING(useRadial), "Disabled"}; isClientSettable = 1; }; + + class GVAR(delayUnconCaptive) { + displayName = CSTRING(delayUnconCaptive); + typeName = "SCALAR"; + value = 10; + values[] = {CSTRING(painEffect_Flash), CSTRING(painEffect_Chroma)}; + }; }; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index e673b27908..8746e1e0d9 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -138,6 +138,13 @@ class CfgVehicles { typeName = "BOOL"; defaultValue = 1; }; + + class delayUnconCaptive { + displayName = CSTRING(MedicalSettings_delayUnconCaptive_DisplayName); + description = CSTRING(MedicalSettings_delayUnconCaptive_Description); + typeName = "NUMBER"; + defaultValue = 10; + } }; class ModuleDescription { diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf index 4e1af0e86c..c75a568600 100644 --- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf +++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf @@ -32,3 +32,4 @@ if !(_activated) exitWith {}; [_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(keepLocalSettingsSynced), "keepLocalSettingsSynced"] call EFUNC(common,readSettingFromModule); +[_logic, QGVAR(delayUnconCaptive), "delayUnconCaptive"] call EFUNC(common,readSettingFromModule); diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 910745d7bb..ccf3b6240f 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -94,8 +94,16 @@ _unit setUnitPos "DOWN"; if (GVAR(moveUnitsFromGroupOnUnconscious)) then { [_unit, true, "ACE_isUnconscious", side group _unit] call EFUNC(common,switchToGroupSide); }; +// Delay Unconscious so the AI dont instant stop shooting on the unit #3121 +if (GVAR(delayUnconCaptive) == 0) then { + [_unit, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus); +} else { + [{ + [_this select 0, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus); + },[_unit], GVAR(delayUnconCaptive)] call EFUNC(common,waitAndExecute); +}; + -[_unit, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus); _anim = [_unit] call EFUNC(common,getDeathAnim); [_unit, _anim, 1, true] call EFUNC(common,doAnimation); [{ diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index a3ae483065..a7aa423955 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -3880,5 +3880,14 @@ Não existe nenhum torniquete nesta parte do corpo! Žádné škrtidlo na této části těla! + + Todo + + + Todo + + + Todo + - \ No newline at end of file + From daf2fc2669655f790e936f1a92d9a5910f9f411e Mon Sep 17 00:00:00 2001 From: jokoho48 Date: Wed, 6 Jan 2016 18:01:24 +0100 Subject: [PATCH 02/15] remove ccp issue in settings prevent setCaptive if unit is wake up --- addons/medical/ACE_Settings.hpp | 1 - addons/medical/functions/fnc_setUnconscious.sqf | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index b21ff0da59..890ac99fb6 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -228,6 +228,5 @@ class ACE_Settings { displayName = CSTRING(delayUnconCaptive); typeName = "SCALAR"; value = 10; - values[] = {CSTRING(painEffect_Flash), CSTRING(painEffect_Chroma)}; }; }; diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index ccf3b6240f..2c3c71cb1b 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -99,7 +99,10 @@ if (GVAR(delayUnconCaptive) == 0) then { [_unit, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus); } else { [{ - [_this select 0, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus); + params ["_unit"]; + if (_unit getVariable ["ACE_isUnconscious", false]) then { + [_unit, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus); + }; },[_unit], GVAR(delayUnconCaptive)] call EFUNC(common,waitAndExecute); }; From 2dbf979ec602500fbcf733d5a570c29b476841b7 Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Sat, 20 Feb 2016 20:05:59 -0300 Subject: [PATCH 03/15] By default, prevent reloading from automatically clearing a weapon jam (like in ACE2) --- addons/overheating/ACE_Settings.hpp | 6 ++++++ addons/overheating/functions/fnc_handleTakeEH.sqf | 2 ++ addons/overheating/stringtable.xml | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/addons/overheating/ACE_Settings.hpp b/addons/overheating/ACE_Settings.hpp index c5a514e5e2..f279558272 100644 --- a/addons/overheating/ACE_Settings.hpp +++ b/addons/overheating/ACE_Settings.hpp @@ -26,4 +26,10 @@ class ACE_Settings { displayName = CSTRING(overheatingDispersion_displayName); description = CSTRING(overheatingDispersion_description); }; + class GVAR(unJamOnreload) { + typeName = "BOOL"; + value = 0; + displayName = CSTRING(unJamOnreload_displayName); + description = CSTRING(unJamOnreload_description); + }; }; diff --git a/addons/overheating/functions/fnc_handleTakeEH.sqf b/addons/overheating/functions/fnc_handleTakeEH.sqf index 05139119e5..ffcead342f 100644 --- a/addons/overheating/functions/fnc_handleTakeEH.sqf +++ b/addons/overheating/functions/fnc_handleTakeEH.sqf @@ -15,6 +15,8 @@ */ #include "script_component.hpp" +if !(GVAR(unJamOnreload)) exitWith {}; + params ["_unit", "_container", "_item"]; TRACE_3("params",_unit,_container,_item); diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml index ede5f94f45..a1246d3748 100644 --- a/addons/overheating/stringtable.xml +++ b/addons/overheating/stringtable.xml @@ -55,6 +55,12 @@ Überhitzte Waffen sind weniger genau und verfügen über eine geringere Mündungsgeschwindigkeit. Wird bei allen Spielern angewendet. Przegrzane bronie będą mniej celne oraz będą miały zmniejszoną prędkość pocisku. Wpływa na wszystkich graczy. + + Unjam weapon on reload + + + Reloading clears a weapon jam. + Spare barrel Ersatzlauf From 11f31893065b50f3fd202b09306ae72e95cf4cc2 Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Sat, 20 Feb 2016 20:19:56 -0300 Subject: [PATCH 04/15] Add an unjam action to the interact menu when the weapon is jammed --- addons/overheating/CfgVehicles.hpp | 9 +++++++ addons/overheating/UI/unjam_ca.paa | Bin 0 -> 22016 bytes addons/overheating/XEH_postInit.sqf | 5 ++-- addons/overheating/XEH_preInit.sqf | 1 + addons/overheating/functions/fnc_canUnjam.sqf | 25 ++++++++++++++++++ addons/overheating/functions/fnc_clearJam.sqf | 2 +- 6 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 addons/overheating/UI/unjam_ca.paa create mode 100644 addons/overheating/functions/fnc_canUnjam.sqf diff --git a/addons/overheating/CfgVehicles.hpp b/addons/overheating/CfgVehicles.hpp index ec9b07f36c..c7d9c6790a 100644 --- a/addons/overheating/CfgVehicles.hpp +++ b/addons/overheating/CfgVehicles.hpp @@ -4,6 +4,15 @@ class CfgVehicles { class CAManBase: Man { class ACE_SelfActions { class ACE_Equipment { + class ACE_UnJam { + displayName = CSTRING(UnjamWeapon); + condition = QUOTE( [_player] call FUNC(canUnjam) ); + exceptions[] = {"isNotInside", "isNotSitting"}; + statement = QUOTE( [ARR_2(_player, currentMuzzle _player)] call FUNC(clearJam); ); + showDisabled = 0; + priority = 4; + icon = QUOTE(PATHTOF(UI\unjam_ca.paa)); + }; class ACE_SwapBarrel { displayName = CSTRING(SwapBarrel); condition = QUOTE( 'ACE_SpareBarrel' in items _player && {getNumber (configFile >> 'CfgWeapons' >> currentWeapon _player >> 'ACE_Overheating_allowSwapBarrel') == 1} ); diff --git a/addons/overheating/UI/unjam_ca.paa b/addons/overheating/UI/unjam_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..45f7dadcea1706620508f692eb9a827b8061198a GIT binary patch literal 22016 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 m#%3_+n<;~-74o@0v^Fnr0ie&HpYZ + * + * Return Value: + * Bool + * + * Public: No + */ +#include "script_component.hpp" + +params ["_unit"]; +TRACE_1("_unit",_unit); + +private _jammedWeapons = _unit getVariable [QGVAR(jammedWeapons), []]; +if !(currentWeapon _unit in _jammedWeapons) exitWith { + false +}; +if !([_unit] call EFUNC(common,canUseWeapon)) exitWith { + false +}; +true diff --git a/addons/overheating/functions/fnc_clearJam.sqf b/addons/overheating/functions/fnc_clearJam.sqf index 33039328e4..a270a8fa6e 100644 --- a/addons/overheating/functions/fnc_clearJam.sqf +++ b/addons/overheating/functions/fnc_clearJam.sqf @@ -17,7 +17,7 @@ */ #include "script_component.hpp" -params ["_unit", "_weapon", "_skipAnim"]; +params ["_unit", "_weapon", ["_skipAnim", false]]; TRACE_3("params",_unit,_weapon,_skipAnim); private _jammedWeapons = _unit getVariable [QGVAR(jammedWeapons), []]; From dc7c4ff4fd0ea3ac921e4380eadfb387b05d1656 Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Sat, 20 Feb 2016 20:26:30 -0300 Subject: [PATCH 05/15] Increase the jam chance of all weapons at high temperatures --- addons/overheating/functions/fnc_firedEH.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/overheating/functions/fnc_firedEH.sqf b/addons/overheating/functions/fnc_firedEH.sqf index 604a2bb31d..2cf607945c 100644 --- a/addons/overheating/functions/fnc_firedEH.sqf +++ b/addons/overheating/functions/fnc_firedEH.sqf @@ -94,7 +94,7 @@ if (GVAR(showParticleEffects) && {(ACE_time > ((_unit getVariable [QGVAR(lastDro // Only compute jamming for the local player if (_unit != ACE_player) exitWith {END_COUNTER(firedEH);}; -_jamChance = _jamChance * ([[0.5, 1.5, 7.5, 37.5], 3 * _scaledTemperature] call EFUNC(common,interpolateFromArray)); +_jamChance = _jamChance * ([[0.5, 1.5, 15, 150], 3 * _scaledTemperature] call EFUNC(common,interpolateFromArray)); // increase jam chance on dusty grounds if prone (and at ground level) if ((stance _unit == "PRONE") && {((getPosATL _unit) select 2) < 1}) then { From e4e2f0d66170e2aa618a8ba385ff7465453d702c Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Sat, 20 Feb 2016 21:09:52 -0300 Subject: [PATCH 06/15] Add a 10% chance for the unjam action to fail (like in ACE2) --- addons/overheating/ACE_Settings.hpp | 6 +++ addons/overheating/functions/fnc_clearJam.sqf | 37 ++++++++++++------- addons/overheating/script_component.hpp | 4 +- addons/overheating/stringtable.xml | 9 +++++ 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/addons/overheating/ACE_Settings.hpp b/addons/overheating/ACE_Settings.hpp index f279558272..6cff3268ff 100644 --- a/addons/overheating/ACE_Settings.hpp +++ b/addons/overheating/ACE_Settings.hpp @@ -32,4 +32,10 @@ class ACE_Settings { displayName = CSTRING(unJamOnreload_displayName); description = CSTRING(unJamOnreload_description); }; + class GVAR(unJamFailChance) { + typeName = "SCALAR"; + value = 0.1; + displayName = CSTRING(unJamFailChance_displayName); + description = CSTRING(unJamFailChance_description); + }; }; diff --git a/addons/overheating/functions/fnc_clearJam.sqf b/addons/overheating/functions/fnc_clearJam.sqf index a270a8fa6e..086e7dce43 100644 --- a/addons/overheating/functions/fnc_clearJam.sqf +++ b/addons/overheating/functions/fnc_clearJam.sqf @@ -23,18 +23,9 @@ TRACE_3("params",_unit,_weapon,_skipAnim); private _jammedWeapons = _unit getVariable [QGVAR(jammedWeapons), []]; if (_weapon in _jammedWeapons) then { - _jammedWeapons = _jammedWeapons - [_weapon]; - - _unit setVariable [QGVAR(jammedWeapons), _jammedWeapons]; - - if (_jammedWeapons isEqualTo []) then { - private _id = _unit getVariable [QGVAR(JammingActionID), -1]; - [_unit, "DefaultAction", _id] call EFUNC(common,removeActionEventHandler); - _unit setVariable [QGVAR(JammingActionID), -1]; - }; - + private _delay = 0; if !(_skipAnim) then { - + _delay = 2.5; private _clearJamAction = getText (configFile >> "CfgWeapons" >> _weapon >> "ACE_clearJamAction"); if (_clearJamAction == "") then { @@ -51,7 +42,27 @@ if (_weapon in _jammedWeapons) then { }; }; - if (GVAR(DisplayTextOnJam)) then { - [localize LSTRING(WeaponUnjammed)] call EFUNC(common,displayTextStructured); + // Check if the jam will be successfull + if (random 1 > GVAR(unJamFailChance)) then { + // Success + _jammedWeapons = _jammedWeapons - [_weapon]; + _unit setVariable [QGVAR(jammedWeapons), _jammedWeapons]; + if (_jammedWeapons isEqualTo []) then { + private _id = _unit getVariable [QGVAR(JammingActionID), -1]; + [_unit, "DefaultAction", _id] call EFUNC(common,removeActionEventHandler); + _unit setVariable [QGVAR(JammingActionID), -1]; + }; + if (GVAR(DisplayTextOnJam)) then { + [{ + [localize LSTRING(WeaponUnjammed)] call EFUNC(common,displayTextStructured); + }, [], _delay] call EFUNC(common,waitAndExecute); + }; + } else { + // Failure + if (GVAR(DisplayTextOnJam)) then { + [{ + [localize LSTRING(WeaponUnjamFailed)] call EFUNC(common,displayTextStructured); + }, [], _delay] call EFUNC(common,waitAndExecute); + }; }; }; diff --git a/addons/overheating/script_component.hpp b/addons/overheating/script_component.hpp index 262accc43b..ba060c69c1 100644 --- a/addons/overheating/script_component.hpp +++ b/addons/overheating/script_component.hpp @@ -1,8 +1,8 @@ #define COMPONENT overheating #include "\z\ace\addons\main\script_mod.hpp" -// #define DEBUG_MODE_FULL -// #define DISABLE_COMPILE_CACHE +#define DEBUG_MODE_FULL +#define DISABLE_COMPILE_CACHE // #define CBA_DEBUG_SYNCHRONOUS // #define ENABLE_PERFORMANCE_COUNTERS diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml index a1246d3748..9fb9399bd5 100644 --- a/addons/overheating/stringtable.xml +++ b/addons/overheating/stringtable.xml @@ -61,6 +61,12 @@ Reloading clears a weapon jam. + + Chance of unjam failing + + + Probability that an unjam action might fail, requiring to be repeated. + Spare barrel Ersatzlauf @@ -121,6 +127,9 @@ Arma destravada Arma pronta al fuoco + + Jam failed to clear + Swap barrel Lauf wechseln From 37eb353edfd7328c0f67e73c3fc8a66ad15d3267 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Mon, 22 Feb 2016 15:03:40 -0600 Subject: [PATCH 07/15] Cleanup Merge --- addons/overheating/XEH_PREP.hpp | 1 + addons/overheating/functions/fnc_canUnjam.sqf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/overheating/XEH_PREP.hpp b/addons/overheating/XEH_PREP.hpp index 76bdef2bef..312b8bb0c5 100644 --- a/addons/overheating/XEH_PREP.hpp +++ b/addons/overheating/XEH_PREP.hpp @@ -1,4 +1,5 @@ +PREP(canUnjam); PREP(checkTemperature); PREP(clearJam); PREP(displayTemperature); diff --git a/addons/overheating/functions/fnc_canUnjam.sqf b/addons/overheating/functions/fnc_canUnjam.sqf index 775459fcb1..610fa9ca22 100644 --- a/addons/overheating/functions/fnc_canUnjam.sqf +++ b/addons/overheating/functions/fnc_canUnjam.sqf @@ -19,7 +19,7 @@ private _jammedWeapons = _unit getVariable [QGVAR(jammedWeapons), []]; if !(currentWeapon _unit in _jammedWeapons) exitWith { false }; -if !([_unit] call EFUNC(common,canUseWeapon)) exitWith { +if !([_unit] call CBA_fnc_canUseWeapon) exitWith { false }; true From c61763edc99bd1f034fcedb63278e75b105d834b Mon Sep 17 00:00:00 2001 From: jokoho48 Date: Tue, 23 Feb 2016 15:37:28 +0100 Subject: [PATCH 08/15] fix simicolon add stringtable entrys --- addons/medical/CfgVehicles.hpp | 4 ++-- addons/medical/stringtable.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index e15434bef6..6e8a32a3f5 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -149,8 +149,8 @@ class CfgVehicles { displayName = CSTRING(MedicalSettings_delayUnconCaptive_DisplayName); description = CSTRING(MedicalSettings_delayUnconCaptive_Description); typeName = "NUMBER"; - defaultValue = 10; - } + defaultValue = 3; + }; }; class ModuleDescription { diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml index 0bef2f15ff..452cab9736 100644 --- a/addons/medical/stringtable.xml +++ b/addons/medical/stringtable.xml @@ -4048,13 +4048,13 @@ L'oggetto in questione sarà un veicolo medico o meno. - Todo + Delay Medical Unconscious Captivity - Todo + Delay Medical Unconscious Captivity - Todo + Delay Medical Unconscious Captivity From 0956b97dce89dca6f34230b3a1036ac2eb96f238 Mon Sep 17 00:00:00 2001 From: jokoho48 Date: Tue, 23 Feb 2016 15:49:03 +0100 Subject: [PATCH 09/15] remove module settings change defualt in ACE_Settings --- addons/medical/ACE_Settings.hpp | 2 +- addons/medical/CfgVehicles.hpp | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index 130eb059ac..bbd12db0b8 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -246,6 +246,6 @@ class ACE_Settings { class GVAR(delayUnconCaptive) { displayName = CSTRING(delayUnconCaptive); typeName = "SCALAR"; - value = 10; + value = 3; }; }; diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 6e8a32a3f5..bddb8fc8a6 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -144,13 +144,6 @@ class CfgVehicles { typeName = "BOOL"; defaultValue = 1; }; - - class delayUnconCaptive { - displayName = CSTRING(MedicalSettings_delayUnconCaptive_DisplayName); - description = CSTRING(MedicalSettings_delayUnconCaptive_Description); - typeName = "NUMBER"; - defaultValue = 3; - }; }; class ModuleDescription { From 8233661d5523addebafd56a05086ca398afe1e1c Mon Sep 17 00:00:00 2001 From: commy2 Date: Wed, 24 Feb 2016 09:39:39 +0100 Subject: [PATCH 10/15] remove unused non API functions --- addons/common/XEH_PREP.hpp | 1 - addons/common/functions/fnc_exportConfig.sqf | 71 ------------------- addons/interaction/XEH_PREP.hpp | 1 - .../interaction/functions/fnc_removeTag.sqf | 36 ---------- addons/respawn/XEH_PREP.hpp | 1 - addons/respawn/functions/fnc_removeBody.sqf | 27 ------- 6 files changed, 137 deletions(-) delete mode 100644 addons/common/functions/fnc_exportConfig.sqf delete mode 100644 addons/interaction/functions/fnc_removeTag.sqf delete mode 100644 addons/respawn/functions/fnc_removeBody.sqf diff --git a/addons/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp index 91f496916a..373f45e96c 100644 --- a/addons/common/XEH_PREP.hpp +++ b/addons/common/XEH_PREP.hpp @@ -225,7 +225,6 @@ PREP(binocularMagazine); PREP(removeBinocularMagazine); // ACE_Debug -PREP(exportConfig); PREP(getChildren); PREP(getDisplayConfigName); PREP(monitor); diff --git a/addons/common/functions/fnc_exportConfig.sqf b/addons/common/functions/fnc_exportConfig.sqf deleted file mode 100644 index c175254e5a..0000000000 --- a/addons/common/functions/fnc_exportConfig.sqf +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Author: commy2 - * Export Config Entrys to RPT logs - * - * Arguments: - * Config Path - * - * Return Value: - * None - * - * Example: - * [configFile >> "CfgAmmo"] call ace_common_fnc_exportConfig; - * - * Public: No - */ -#include "script_component.hpp" - -private _fnc_logEntries = { - params ["_c", "_d"]; - - private _p = inheritsFrom _c; - - private _t = format [["class %1: %2 {", "class %1 {"] select (configName _p == ""), configName _c, configName _p]; - for "_a" from 1 to _d do { - _t = " " + _t; - }; - diag_log text _t; - - private _e = []; - for "_i" from 0 to (count _c - 1) do { - private _e1 = _c select _i; - - private _e2 = switch (true) do { - case (isNumber _e1): {getNumber _e1}; - case (isText _e1): {getText _e1}; - case (isArray _e1): {getArray _e1}; - case (isClass _e1): {[_e1, _d + 1] call _fnc_logEntries; false}; - }; - - if (!(_e2 isEqualType false)) then { - if (_e2 isEqualType []) then { - _e2 = toArray str _e2; - { - if (_x == toArray "[" select 0) then { - _e2 set [_forEachIndex, toArray "{" select 0]; - }; - if (_x == toArray "]" select 0) then { - _e2 set [_forEachIndex, toArray "}" select 0]; - }; - } forEach _e2; - _e2 = toString _e2; - _t = format ["%1[] = %2;", configName _e1, _e2]; - } else { - _t = format ["%1 = %2;", configName _e1, str _e2]; - }; - for "_a" from 0 to _d do { - _t = " " + _t; - }; - diag_log text _t; - }; - }; - - _t = "};"; - for "_a" from 1 to _d do { - _t = " " + _t; - }; - diag_log text _t; - diag_log text ""; -}; - -[_this, 0] call _fnc_logEntries; diff --git a/addons/interaction/XEH_PREP.hpp b/addons/interaction/XEH_PREP.hpp index d24a3623dd..71facedc3f 100644 --- a/addons/interaction/XEH_PREP.hpp +++ b/addons/interaction/XEH_PREP.hpp @@ -4,7 +4,6 @@ PREP(addPassengerActions); PREP(addPassengersActions); PREP(getWeaponPos); PREP(moduleInteraction); -PREP(removeTag); // scroll wheel hint PREP(showMouseHint); diff --git a/addons/interaction/functions/fnc_removeTag.sqf b/addons/interaction/functions/fnc_removeTag.sqf deleted file mode 100644 index b70f04ec99..0000000000 --- a/addons/interaction/functions/fnc_removeTag.sqf +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Author: commy2 - * Removes tag - * - * Arguments: - * None - * - * Return value: - * None - * - * Example: - * call ace_interaction_fnc_removeTag - * - * Public: No - */ -#include "script_component.hpp" - -0 spawn { - private ["_index", "_name"]; - - waitUntil {player getVariable ["ACE_Name", ""] != ""}; - - _name = player getVariable ["ACE_Name", ""]; - _name = toArray _name; - - _index = _name find (toArray "]" select 0); - - if (_index != -1) then { - for "_index" from 0 to _index do { - _name set [_index, -1]; - }; - _name = _name - [-1]; - _name = toString _name; - player setVariable ["ACE_Name", _name, true]; - }; -}; diff --git a/addons/respawn/XEH_PREP.hpp b/addons/respawn/XEH_PREP.hpp index ab8a3c6a1f..f9707c3181 100644 --- a/addons/respawn/XEH_PREP.hpp +++ b/addons/respawn/XEH_PREP.hpp @@ -9,7 +9,6 @@ PREP(module); PREP(moduleFriendlyFire); PREP(moduleRallypoint); PREP(moveRallypoint); -PREP(removeBody); PREP(restoreGear); PREP(showFriendlyFireMessage); PREP(teleportToRallypoint); diff --git a/addons/respawn/functions/fnc_removeBody.sqf b/addons/respawn/functions/fnc_removeBody.sqf deleted file mode 100644 index e9676696a1..0000000000 --- a/addons/respawn/functions/fnc_removeBody.sqf +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Author: bux578, commy2 - * Removes a given body. - * - * Arguments: - * 0: Body - * - * Return Value: - * None - * - * Example: - * [corpse] call ace_respawn_fnc_removeBody - * - * Public: No - */ -#include "script_component.hpp" - -params ["_body", "_forceRemove"]; - -private "_bodyRemoveTimer"; -_bodyRemoveTimer = [GVAR(BodyRemoveTimer) max 0, 2] select _forceRemove; // could be used for SpecOps missions. - -[{ - // hideBody takes ~20s till body is fully underground - // a better hideBody would make this more aesthetic - deleteVehicle _this; -}, _body, _bodyRemoveTimer] call EFUNC(common,waitAndExecute); From 02b2a213007cff7769fdf094a284ee16c045331c Mon Sep 17 00:00:00 2001 From: commy2 Date: Wed, 24 Feb 2016 10:10:31 +0100 Subject: [PATCH 11/15] remove unused non API functions --- addons/common/XEH_PREP.hpp | 4 -- .../fnc_addCuratorUnloadEventhandler.sqf | 22 ---------- .../common/functions/fnc_fixCrateContent.sqf | 43 ------------------- 3 files changed, 69 deletions(-) delete mode 100644 addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf delete mode 100644 addons/common/functions/fnc_fixCrateContent.sqf diff --git a/addons/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp index 373f45e96c..0b125af1aa 100644 --- a/addons/common/XEH_PREP.hpp +++ b/addons/common/XEH_PREP.hpp @@ -233,10 +233,6 @@ PREP(showUser); PREP(dumpPerformanceCounters); PREP(dumpArray); -// ACE_CuratorFix -PREP(addCuratorUnloadEventhandler); -PREP(fixCrateContent); - PREP(globalEvent); PREP(_handleNetEvent); PREP(addEventHandler); diff --git a/addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf b/addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf deleted file mode 100644 index 1bb92130bc..0000000000 --- a/addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Author: commy2 - * - * Arguments: - * Display where the Unload event was added - * - * Return Value: - * None - * - * Public: No - */ -#include "script_component.hpp" - -disableSerialization; - -private _dlg = ctrlParent _this; - -_dlg displayAddEventHandler ["unload", { - if (_this select 1 == 1) then { - [missionnamespace getVariable ["BIS_fnc_initCuratorAttributes_target", objNull]] call FUNC(fixCrateContent); - }; -}]; diff --git a/addons/common/functions/fnc_fixCrateContent.sqf b/addons/common/functions/fnc_fixCrateContent.sqf deleted file mode 100644 index 06d73c39b1..0000000000 --- a/addons/common/functions/fnc_fixCrateContent.sqf +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Author: commy2 - * Fixes zeus placed crates containing buged mine detectors and ace items. - * - * Arguments: - * 0: Crate - * - * Return Value: - * None - * - * Public: No - */ -#include "script_component.hpp" - -params ["_crate"]; - -// get all weapons inside the crate -private _weapons = weaponCargo _crate; -private _items = []; - -// if the "weapon" is supposed to be an item, move those from the weapon array to the item array -{ - if (getText (configFile >> "CfgWeapons" >> _x >> "simulation") == "ItemMineDetector") then { - _weapons set [_forEachIndex, ""]; - _items pushBack _x; - }; -} forEach _weapons; - -_weapons = _weapons - [""]; - -// exit now if everything is fine -if (count _items == 0) exitWith {}; - -// otherwise clear weapon cargo and re-add items and weapons -clearWeaponCargoGlobal _crate; - -{ - _crate addWeaponCargoGlobal [_x, 1]; -} forEach _weapons; - -{ - _crate addItemCargoGlobal [_x, 1]; -} forEach _items; From 7f022eda00ea7f11b9d8b4842851249287c7a683 Mon Sep 17 00:00:00 2001 From: jonpas Date: Wed, 24 Feb 2016 15:06:27 +0100 Subject: [PATCH 12/15] Replace Purista with Roboto - everywhere, close #3401 --- addons/common/CfgLocationTypes.hpp | 2 +- addons/common/HintConfig.hpp | 2 +- addons/common/define.hpp | 16 +++++----- addons/dagr/Dialog.hpp | 8 ++--- addons/dagr/RscTitles.hpp | 4 +-- addons/finger/functions/fnc_perFrameEH.sqf | 2 +- addons/frag/functions/fnc_drawTraces.sqf | 2 +- addons/goggles/define.hpp | 32 +++++++++---------- addons/huntir/Dialog.hpp | 4 +-- addons/huntir/RscTitles.hpp | 4 +-- addons/interaction/RscTitles.hpp | 2 +- addons/map/MapTweaks.hpp | 2 +- .../functions/fnc_drawMapGestures.sqf | 2 +- addons/medical/ui/RscTitles.hpp | 4 +-- addons/medical/ui/triagecard.hpp | 6 ++-- addons/medical_menu/ui/menu.hpp | 2 +- .../functions/fnc_drawNameTagIcon.sqf | 2 +- addons/optionsmenu/gui/define.hpp | 2 +- addons/optionsmenu/gui/pauseMenu.hpp | 14 ++++---- addons/optionsmenu/gui/settingsMenu.hpp | 6 ++-- addons/scopes/RscTitles.hpp | 6 ++-- 21 files changed, 62 insertions(+), 62 deletions(-) diff --git a/addons/common/CfgLocationTypes.hpp b/addons/common/CfgLocationTypes.hpp index 8ff7ba8674..15b56c120c 100644 --- a/addons/common/CfgLocationTypes.hpp +++ b/addons/common/CfgLocationTypes.hpp @@ -5,7 +5,7 @@ class CfgLocationTypes { class ACE_HashLocation { color[] = {0,0,0,0}; drawStyle = "bananas"; - font = "PuristaMedium"; + font = "RobotoCondensed"; importance = 5; name = "HashLocation"; shadow = 0; diff --git a/addons/common/HintConfig.hpp b/addons/common/HintConfig.hpp index bd74ac510a..04c6995318 100644 --- a/addons/common/HintConfig.hpp +++ b/addons/common/HintConfig.hpp @@ -25,7 +25,7 @@ class RscTitles { y = safeZoneY + 0.2 * safezoneH; w = 0.2 * safeZoneW; h = 0.1 * SafeZoneH; - font = "PuristaMedium"; + font = "RobotoCondensed"; }; }; }; diff --git a/addons/common/define.hpp b/addons/common/define.hpp index 98367e72ae..5cb3904f3d 100644 --- a/addons/common/define.hpp +++ b/addons/common/define.hpp @@ -80,7 +80,7 @@ // Listbox styles #define LB_TEXTURES 0x10 #define LB_MULTI 0x20 -#define FontCSE "PuristaMedium" +#define FontCSE "RobotoCondensed" class ACE_gui_backgroundBase { type = CT_STATIC; @@ -125,7 +125,7 @@ class ACE_gui_editBase text = ""; size = 0.2; style = "0x00 + 0x40"; - font = "PuristaMedium"; + font = "RobotoCondensed"; shadow = 2; sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; colorDisabled[] = @@ -463,22 +463,22 @@ class ACE_gui_mapBase { colorGrid[] = {0.1,0.1,0.1,0.6}; colorGridMap[] = {0.1,0.1,0.1,0.6}; colorText[] = {1, 1, 1, 0.85}; -font = "PuristaMedium"; +font = "RobotoCondensed"; sizeEx = 0.0270000; stickX[] = {0.20, {"Gamma", 1.00, 1.50} }; stickY[] = {0.20, {"Gamma", 1.00, 1.50} }; onMouseButtonClick = ""; onMouseButtonDblClick = ""; - fontLabel = "PuristaMedium"; + fontLabel = "RobotoCondensed"; sizeExLabel = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)"; fontGrid = "TahomaB"; sizeExGrid = 0.02; fontUnits = "TahomaB"; sizeExUnits = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)"; - fontNames = "PuristaMedium"; + fontNames = "RobotoCondensed"; sizeExNames = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8) * 2"; - fontInfo = "PuristaMedium"; + fontInfo = "RobotoCondensed"; sizeExInfo = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)"; fontLevel = "TahomaB"; sizeExLevel = 0.02; @@ -493,7 +493,7 @@ onMouseButtonDblClick = ""; y = "SafeZoneY + safezoneH - 4.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)"; h = "3.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - font = "PuristaMedium"; + font = "RobotoCondensed"; sizeEx = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)"; colorBackground[] = {1,1,1,0.5}; color[] = {0,0,0,1}; @@ -787,4 +787,4 @@ onMouseButtonDblClick = ""; }; }; -#endif \ No newline at end of file +#endif diff --git a/addons/dagr/Dialog.hpp b/addons/dagr/Dialog.hpp index 2faeb03879..17c065f830 100644 --- a/addons/dagr/Dialog.hpp +++ b/addons/dagr/Dialog.hpp @@ -71,7 +71,7 @@ // Listbox styles #define LB_TEXTURES 0x10 #define LB_MULTI 0x20 -#define FontM "PuristaMedium" +#define FontM "RobotoCondensed" class RscText; @@ -79,7 +79,7 @@ class DAGR_Button { idc = -1; type = CT_BUTTON; style = ST_LEFT; - font = "PuristaMedium"; + font = "RobotoCondensed"; sizeEx = 0.02; colorText[] = { 0, 1, 0, 1 }; colorFocused[] = { 0, 0, 0, 0 }; // border color for focused state @@ -116,7 +116,7 @@ class DAGR_Menu_Pic { text = ""; colorBackground[] = {}; colorText[] = {}; - font = "PuristaMedium"; + font = "RobotoCondensed"; sizeEx = 0.04; waitForLoad = 0; }; @@ -131,7 +131,7 @@ class DAGR_Menu_Text { h = 0.15; colorBackground[] = { 0, 0, 0, 0 }; colorText[] = { 0.239, 0.216, 0.153, 1 }; - font = "PuristaMedium"; + font = "RobotoCondensed"; sizeEx = 0.03; waitForLoad = 0; text = ""; diff --git a/addons/dagr/RscTitles.hpp b/addons/dagr/RscTitles.hpp index 8467c70f66..9ab34ee86f 100644 --- a/addons/dagr/RscTitles.hpp +++ b/addons/dagr/RscTitles.hpp @@ -10,7 +10,7 @@ class RscTitles { text = ""; colorBackground[] = { 0, 0, 0, 0 }; colorText[] = { 0.239, 0.216, 0.153, 1 }; - font = "PuristaMedium"; + font = "RobotoCondensed"; sizeEx = 0.04; waitForLoad = 0; }; @@ -25,7 +25,7 @@ class RscTitles { text = ""; colorBackground[] = {}; colorText[] = {}; - font = "PuristaMedium"; + font = "RobotoCondensed"; sizeEx = 0.02; waitForLoad = 0; }; diff --git a/addons/finger/functions/fnc_perFrameEH.sqf b/addons/finger/functions/fnc_perFrameEH.sqf index 7f0150c492..61c8f077ab 100644 --- a/addons/finger/functions/fnc_perFrameEH.sqf +++ b/addons/finger/functions/fnc_perFrameEH.sqf @@ -41,7 +41,7 @@ _iconSize = BASE_SIZE * _fovCorrection; _drawColor set [3, ((_drawColor select 3) * (_timeLeftToShow / 0.5))]; }; - drawIcon3D [QUOTE(PATHTOF(UI\fp_icon2.paa)), _drawColor, _pos, _iconSize, _iconSize, 0, _name, 1, 0.03, "PuristaMedium"]; + drawIcon3D [QUOTE(PATHTOF(UI\fp_icon2.paa)), _drawColor, _pos, _iconSize, _iconSize, 0, _name, 1, 0.03, "RobotoCondensed"]; }; } count (GVAR(fingersHash) select 0); diff --git a/addons/frag/functions/fnc_drawTraces.sqf b/addons/frag/functions/fnc_drawTraces.sqf index e61fc9b5ba..ac95957ad4 100644 --- a/addons/frag/functions/fnc_drawTraces.sqf +++ b/addons/frag/functions/fnc_drawTraces.sqf @@ -28,5 +28,5 @@ private ["_color", "_index", "_lastPos", "_lastSpd", "_max", "_positions", "_sta _lastPos = _pos2; _lastSpd = _data1 select 1; }; - // drawIcon3D ["", [1,0,0,1], _lastPos, 0, 0, 0, format["%1m/s", _lastSpd], 1, 0.05, "PuristaMedium"]; + // drawIcon3D ["", [1,0,0,1], _lastPos, 0, 0, 0, format["%1m/s", _lastSpd], 1, 0.05, "RobotoCondensed"]; } forEach GVAR(traces); diff --git a/addons/goggles/define.hpp b/addons/goggles/define.hpp index 34c207bd20..7f83930774 100644 --- a/addons/goggles/define.hpp +++ b/addons/goggles/define.hpp @@ -7,20 +7,20 @@ //////////////// class RscPicture { - access = 0; - idc = -1; - type = CT_STATIC; - style = ST_PICTURE; - colorBackground[] = {0,0,0,0}; - colorText[] = {1,1,1,1}; - font = "puristaMedium"; - sizeEx = 0; - lineSpacing = 0; - fixedWidth = 0; - shadow = 0; - text = ""; - x = safezoneX; - y = safezoneY; - w = safezoneW; - h = safezoneH; + access = 0; + idc = -1; + type = CT_STATIC; + style = ST_PICTURE; + colorBackground[] = {0,0,0,0}; + colorText[] = {1,1,1,1}; + font = "RobotoCondensed"; + sizeEx = 0; + lineSpacing = 0; + fixedWidth = 0; + shadow = 0; + text = ""; + x = safezoneX; + y = safezoneY; + w = safezoneW; + h = safezoneH; }; diff --git a/addons/huntir/Dialog.hpp b/addons/huntir/Dialog.hpp index 97058394a5..ca1e85466b 100644 --- a/addons/huntir/Dialog.hpp +++ b/addons/huntir/Dialog.hpp @@ -50,7 +50,7 @@ #define ST_TILE_PICTURE 144 #define ST_WITH_RECT 160 #define ST_LINE 176 -#define FontM "PuristaMedium" +#define FontM "RobotoCondensed" #define __XA SafeZoneXAbs #define __X SafeZoneX #define __Y SafeZoneY @@ -146,7 +146,7 @@ class ace_huntir_cam_dialog { style = 48; colorText[ ]={ 1,1,1,1 }; colorBackground[ ]={ 0.4,0.4,0.4,1 }; - font = "PuristaMedium"; + font = "RobotoCondensed"; sizeEx = 0.021; lineSpacing = 1; x = __X; diff --git a/addons/huntir/RscTitles.hpp b/addons/huntir/RscTitles.hpp index de94f17a5e..dfb52814d4 100644 --- a/addons/huntir/RscTitles.hpp +++ b/addons/huntir/RscTitles.hpp @@ -15,7 +15,7 @@ class RscTitles { idc = 64432; style = 0; x = 0.497;y = 0.297;w = 0.2;h = 0.2; - font = "PuristaMedium"; + font = "RobotoCondensed"; sizeEx = __FONTHEIGHT; colorText[] = {1, 1, 1, 1}; colorBackground[]={0,0,0,0}; @@ -38,4 +38,4 @@ class RscTitles { }; }; }; -}; \ No newline at end of file +}; diff --git a/addons/interaction/RscTitles.hpp b/addons/interaction/RscTitles.hpp index f75da59cce..d03d3e0f36 100644 --- a/addons/interaction/RscTitles.hpp +++ b/addons/interaction/RscTitles.hpp @@ -11,7 +11,7 @@ class ACE_Interaction_Button_Base { access = 0; type = 1; text = ""; - font = "PuristaMedium"; + font = "RobotoCondensed"; sizeEx = "0.8 / 40 / (getResolution select 5)"; shadow = 2; diff --git a/addons/map/MapTweaks.hpp b/addons/map/MapTweaks.hpp index 2cf5786059..52edf29341 100644 --- a/addons/map/MapTweaks.hpp +++ b/addons/map/MapTweaks.hpp @@ -29,7 +29,7 @@ class Tree { class Legend { x = SafeZoneX+SafeZoneW-.340; y = SafeZoneY+SafeZoneH-.152; - font = "PuristaMedium"; + font = "RobotoCondensed"; w = .340; h = .152; sizeEx = 0.039210; diff --git a/addons/map_gestures/functions/fnc_drawMapGestures.sqf b/addons/map_gestures/functions/fnc_drawMapGestures.sqf index b369686501..13c08a03fc 100644 --- a/addons/map_gestures/functions/fnc_drawMapGestures.sqf +++ b/addons/map_gestures/functions/fnc_drawMapGestures.sqf @@ -19,7 +19,7 @@ #define ICON_TEXT_ALIGN "left" #define ICON_ANGLE 0 #define ICON_SHADOW 1 -#define TEXT_FONT "PuristaBold" +#define TEXT_FONT "RobotoCondensedBold" #define TEXT_ICON_RENDER_SIZE 20 #define TEXT_SIZE 0.030 #define TEXT_SHADOW 0 diff --git a/addons/medical/ui/RscTitles.hpp b/addons/medical/ui/RscTitles.hpp index b81643990c..520a431d7b 100644 --- a/addons/medical/ui/RscTitles.hpp +++ b/addons/medical/ui/RscTitles.hpp @@ -57,7 +57,7 @@ class Rsctitles { h = "0.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)"; style = 0x00 + 0x100; // ST_LEFT + ST_SHADOW - font = "PuristaMedium"; + font = "RobotoCondensed"; colorText[] = {0.95, 0.95, 0.95, 0.75}; colorBackground[] = {"(profilenamespace getVariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getVariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getVariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getVariable ['GUI_BCG_RGB_A',0.9])"}; text = CSTRING(Injuries); @@ -103,7 +103,7 @@ class Rsctitles { h = "0.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)"; style = 0x00 + 0x100; // ST_LEFT + ST_SHADOW - font = "PuristaMedium"; + font = "RobotoCondensed"; colorText[] = {0.95, 0.95, 0.95, 0.75}; colorBackground[] = {0,0,0,0.9}; text = ""; diff --git a/addons/medical/ui/triagecard.hpp b/addons/medical/ui/triagecard.hpp index d07da4337e..1122c2e942 100644 --- a/addons/medical/ui/triagecard.hpp +++ b/addons/medical/ui/triagecard.hpp @@ -14,7 +14,7 @@ class GVAR(triageCard) { w = "15 * (((safezoneW / safezoneH) min 1.2) / 40)"; h = "19 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; style = ST_LEFT + ST_SHADOW; - font = "PuristaMedium"; + font = "RobotoCondensed"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; colorText[] = {0.0, 0.0, 0.0, 1}; colorBackground[] = {1,1,1,1}; @@ -26,7 +26,7 @@ class GVAR(triageCard) { y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)"; w = "5 * (((safezoneW / safezoneH) min 1.2) / 40)"; h = "5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; - font = "PuristaMedium"; + font = "RobotoCondensed"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; colorText[] = {1,1,0,1}; colorBackground[] = {0,0,0,0}; @@ -46,7 +46,7 @@ class GVAR(triageCard) { h = "0.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)"; style = 0x02 + 0x100; // ST_LEFT + ST_SHADOW - font = "PuristaMedium"; + font = "RobotoCondensed"; colorText[] = {0,0,0,1}; colorBackground[] = {0,0,0,0}; text = CSTRING(Actions_TriageCard); diff --git a/addons/medical_menu/ui/menu.hpp b/addons/medical_menu/ui/menu.hpp index 5968a643ff..c443819caa 100644 --- a/addons/medical_menu/ui/menu.hpp +++ b/addons/medical_menu/ui/menu.hpp @@ -37,7 +37,7 @@ class GVAR(medicalMenu) { w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)"; h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"; style = ST_LEFT + ST_SHADOW; - font = "PuristaMedium"; + font = "RobotoCondensed"; SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; colorText[] = {0.95, 0.95, 0.95, 0.75}; colorBackground[] = {"(profilenamespace getVariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getVariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getVariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getVariable ['GUI_BCG_RGB_A',0.9])"}; diff --git a/addons/nametags/functions/fnc_drawNameTagIcon.sqf b/addons/nametags/functions/fnc_drawNameTagIcon.sqf index 3c206c6c57..c564e6e90f 100644 --- a/addons/nametags/functions/fnc_drawNameTagIcon.sqf +++ b/addons/nametags/functions/fnc_drawNameTagIcon.sqf @@ -70,7 +70,7 @@ _fnc_parameters = { _name, 2, (0.05 * _scale), - "PuristaMedium" + "RobotoCondensed" ] }; diff --git a/addons/optionsmenu/gui/define.hpp b/addons/optionsmenu/gui/define.hpp index 2a3fffc736..ef9ef0d02b 100644 --- a/addons/optionsmenu/gui/define.hpp +++ b/addons/optionsmenu/gui/define.hpp @@ -92,6 +92,6 @@ class RscText; // Listbox styles #define LB_TEXTURES 0x10 #define LB_MULTI 0x20 -#define FontCSE "PuristaMedium" +#define FontCSE "RobotoCondensed" #endif diff --git a/addons/optionsmenu/gui/pauseMenu.hpp b/addons/optionsmenu/gui/pauseMenu.hpp index 2c14aecc99..34f368df4a 100644 --- a/addons/optionsmenu/gui/pauseMenu.hpp +++ b/addons/optionsmenu/gui/pauseMenu.hpp @@ -1,13 +1,13 @@ class ACE_Open_SettingsMenu_BtnBase : ACE_gui_buttonBase { class Attributes { - font = "PuristaMedium"; + font = "RobotoCondensed"; color = "#E5E5E5"; align = "left"; shadow = "true"; }; class AttributesImage { - font = "PuristaMedium"; + font = "RobotoCondensed"; color = "#E5E5E5"; align = "left"; }; @@ -46,7 +46,7 @@ class ACE_Open_SettingsMenu_BtnBase : ACE_gui_buttonBase { colorFocused[] = {0,0,0,1}; colorText[] = {1,1,1,1}; default = 0; - font = "PuristaMedium"; + font = "RobotoCondensed"; idc = -1; period = 1.2; periodFocus = 1.2; @@ -149,17 +149,17 @@ class RscDisplayMain: RscStandardDisplay { shadow = 0; class H1 { - font = "PuristaMedium"; - fontBold = "PuristaLight"; + font = "RobotoCondensed"; + fontBold = "RobotoCondensedLight"; sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.4)"; }; class H2: H1 { sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.2)"; - font = "PuristaLight"; + font = "RobotoCondensedLight"; }; class P: H1 { sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)"; - fontBold = "PuristaLight"; + fontBold = "RobotoCondensedLight"; }; colorBold[] = {0.6,0.6,0.6,1}; colorLink[] = {"(profilenamespace getVariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getVariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getVariable ['GUI_BCG_RGB_B',0.5])",1}; diff --git a/addons/optionsmenu/gui/settingsMenu.hpp b/addons/optionsmenu/gui/settingsMenu.hpp index 37950b1c42..e9265e59fd 100644 --- a/addons/optionsmenu/gui/settingsMenu.hpp +++ b/addons/optionsmenu/gui/settingsMenu.hpp @@ -30,7 +30,7 @@ class ACE_settingsMenu { w = W_PART(38); h = H_PART(1); style = ST_LEFT + ST_SHADOW; - font = "PuristaMedium"; + font = "RobotoCondensed"; SizeEx = H_PART(1); colorText[] = {0.95, 0.95, 0.95, 0.75}; colorBackground[] = {"(profilenamespace getVariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getVariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getVariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getVariable ['GUI_BCG_RGB_A',0.9])"}; @@ -67,7 +67,7 @@ class ACE_settingsMenu { w = W_PART(38); h = H_PART(1); style = ST_LEFT + ST_SHADOW; - font = "PuristaMedium"; + font = "RobotoCondensed"; SizeEx = H_PART(1); colorText[] = {0.95, 0.95, 0.95, 0.75}; colorBackground[] = {0,0,0,0}; @@ -287,7 +287,7 @@ class ACE_serverSettingsMenu: ACE_settingsMenu { w = W_PART(38); h = H_PART(1); style = ST_LEFT + ST_SHADOW; - font = "PuristaMedium"; + font = "RobotoCondensed"; SizeEx = H_PART(1); colorText[] = {0.95, 0.95, 0.95, 0.75}; colorBackground[] = {0,0,0,0}; diff --git a/addons/scopes/RscTitles.hpp b/addons/scopes/RscTitles.hpp index 4452c8456c..7aec20458c 100644 --- a/addons/scopes/RscTitles.hpp +++ b/addons/scopes/RscTitles.hpp @@ -21,7 +21,7 @@ class RscTitles { style = 48 + 0x800; scale = 1; sizeEx = 1; - font = "PuristaMedium"; + font = "RobotoCondensed"; colorText[] = { 1, 1, 1, 1 }; colorBackground[] = { 1, 1, 1, 1 }; shadow = 1; @@ -37,7 +37,7 @@ class RscTitles { style = 2; sizeEx = 0.04; lineSpacing = 1; - font = "PuristaMedium"; + font = "RobotoCondensed"; text = ""; colorText[] = { 1, 1, 1, 0.9 }; colorBackground[] = { 1, 0, 0, 0 }; @@ -54,7 +54,7 @@ class RscTitles { style = 0; sizeEx = 0.04; lineSpacing = 1; - font = "PuristaMedium"; + font = "RobotoCondensed"; text = ""; colorText[] = { 1, 1, 1, 0.9 }; colorBackground[] = { 1, 0, 0, 0 }; From 8f775dfba4c30de721b64b947113e0bad951f015 Mon Sep 17 00:00:00 2001 From: jonpas Date: Wed, 24 Feb 2016 15:08:54 +0100 Subject: [PATCH 13/15] Rename FontCSE macro to FONT_ACE --- addons/common/define.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/common/define.hpp b/addons/common/define.hpp index 5cb3904f3d..6c7a90fea9 100644 --- a/addons/common/define.hpp +++ b/addons/common/define.hpp @@ -80,7 +80,7 @@ // Listbox styles #define LB_TEXTURES 0x10 #define LB_MULTI 0x20 -#define FontCSE "RobotoCondensed" +#define FONT_ACE "RobotoCondensed" class ACE_gui_backgroundBase { type = CT_STATIC; @@ -88,7 +88,7 @@ class ACE_gui_backgroundBase { style = ST_PICTURE; colorBackground[] = {0,0,0,0}; colorText[] = {1, 1, 1, 1}; - font = FontCSE; + font = FONT_ACE; text = ""; sizeEx = 0.032; }; @@ -189,19 +189,19 @@ class ACE_gui_buttonBase { animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)"; animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)"; period = 0.5; - font = FontCSE; + font = FONT_ACE; soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1}; soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.0,0}; soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.07,1}; soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1}; class Attributes { - font = FontCSE; + font = FONT_ACE; color = "#E5E5E5"; align = "center"; shadow = "true"; }; class AttributesImage { - font = FontCSE; + font = FONT_ACE; color = "#E5E5E5"; align = "left"; shadow = "true"; @@ -229,7 +229,7 @@ class ACE_gui_staticBase { w = 0.183825; h = 0.104575; style = ST_LEFT; - font = FontCSE; + font = FONT_ACE; sizeEx = 0.03921; colorText[] = {0.95, 0.95, 0.95, 1.0}; colorBackground[] = {0, 0, 0, 0}; @@ -240,7 +240,7 @@ class RscListBox; class ACE_gui_listBoxBase : RscListBox{ type = CT_LISTBOX; style = ST_MULTI; - font = FontCSE; + font = FONT_ACE; sizeEx = 0.03921; color[] = {1, 1, 1, 1}; colorText[] = {0.543, 0.5742, 0.4102, 1.0}; @@ -295,7 +295,7 @@ class ACE_gui_listNBox { style =ST_MULTI; w = 0.4; h = 0.4; - font = FontCSE; + font = FONT_ACE; sizeEx = 0.031; autoScrollSpeed = -1; @@ -375,7 +375,7 @@ class ACE_gui_comboBoxBase: RscCombo { arrowEmpty = ""; arrowFull = ""; wholeHeight = 0.45; - font = FontCSE; + font = FONT_ACE; sizeEx = 0.031; soundSelect[] = {"\A3\ui_f\data\sound\RscCombo\soundSelect",0.1,1}; soundExpand[] = {"\A3\ui_f\data\sound\RscCombo\soundExpand",0.1,1}; From a3d769c4103ba72c6411989e2f091145a0692842 Mon Sep 17 00:00:00 2001 From: jonpas Date: Wed, 24 Feb 2016 19:22:16 +0100 Subject: [PATCH 14/15] Cleanup some module descriptions, close #2561 --- addons/captives/stringtable.xml | 34 ++++++++++++------------ addons/finger/CfgVehicles.hpp | 1 + addons/microdagr/stringtable.xml | 22 ++++++++-------- addons/sitting/CfgVehicles.hpp | 1 + addons/vehiclelock/stringtable.xml | 42 +++++++++++++++--------------- 5 files changed, 51 insertions(+), 49 deletions(-) diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml index 3a1a95ce55..3e14e8f623 100644 --- a/addons/captives/stringtable.xml +++ b/addons/captives/stringtable.xml @@ -170,16 +170,16 @@ Fai arrendere l'unità - Sync a unit to make them surrender.<br />Source: ace_captives - Zsynchronizuj z jednostką, aby skapitulowała.<br />Źródło: ace_captives - Sincroniza una unidad para hacer que se rinda.<br />Fuente: ace_captives - Einheit synchronisieren, um sie kapitulieren zu lassen.<br />Quelle: ace_captives - Synchronizuj s jednotkou, která se má vzdát.<br />Zdroj: ace_captives - Sincroniza uma unidade para fazer com que ela se renda. <br/>Fonte: ace_captives - Synchronise une unité pour la rendre captive. <br/>Source: ace_captives - Egység szinkronizálása, hogy kapituláljon.<br />Forrás: ace_captives - Синхронизируйте с юнитами, чтобы заставить их сдаться в плен.<br />Источник: ace_captives - Sincronizza una unità per farla arrendere.<br/>Fonte: ace_captives + Sync a unit to make them surrender. + Zsynchronizuj z jednostką, aby skapitulowała. + Sincroniza una unidad para hacer que se rinda. + Einheit synchronisieren, um sie kapitulieren zu lassen. + Synchronizuj s jednotkou, která se má vzdát. + Sincroniza uma unidade para fazer com que ela se renda. + Synchronise une unité pour la rendre captive. + Egység szinkronizálása, hogy kapituláljon. + Синхронизируйте с юнитами, чтобы заставить их сдаться в плен.es + Sincronizza una unità per farla arrendere Make Unit Handcuffed @@ -191,13 +191,13 @@ Metti manette all'unità - Sync a unit to make them handcuffed.<br />Source: ace_captives - Synchronisiere eine Einheit um sie in Handschellen zu legen.<br />Quelle: ace_captives - Zsynchronizuj z jednostką, aby została skuta.<br />Źródło: ace_captives - Sincronizar uma unidade para deixá-la algemada.<br/>Source: ace_captives - Синхронизируйте с юнитами, чтобы сделать их связанными.<br />Источник: ace_captives - Synchronizovat s jednotkou, která má být v poutech.<br />Zdroj: ace_captives - Sincronizza un'unità per metterle le manette.<br/>Fonte: ace_captives + Sync a unit to make them handcuffed. + Synchronisiere eine Einheit um sie in Handschellen zu legen. + Zsynchronizuj z jednostką, aby została skuta. + Sincronizar uma unidade para deixá-la algemada. + Синхронизируйте с юнитами, чтобы сделать их связанными. + Synchronizovat s jednotkou, která má být v poutech. + Sincronizza un'unità per metterle le manette. Captives Settings diff --git a/addons/finger/CfgVehicles.hpp b/addons/finger/CfgVehicles.hpp index e78ef50123..74229968e4 100644 --- a/addons/finger/CfgVehicles.hpp +++ b/addons/finger/CfgVehicles.hpp @@ -12,6 +12,7 @@ class CfgVehicles { class Arguments { class enabled { displayName = CSTRING(enabled_DisplayName); + description = CSTRING(enabled_DisplayName); typeName = "BOOL"; defaultValue = 1; }; diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml index 0f70c424f1..ae30f57f62 100644 --- a/addons/microdagr/stringtable.xml +++ b/addons/microdagr/stringtable.xml @@ -374,16 +374,16 @@ Nessuno (Non puoi usare la vista mappa) - Controls how much data is filled on the microDAGR items. Less data restricts the map view to show less on the minimap.<br />Source: microDAGR.pbo - Moduł ten pozwala kontrolować jak duża ilość informacji jest załadowana do przedmiotów MicroDAGR. Mniejsza ilość danych ogranicza widok mapy pokazując mniej rzeczy na minimapie.<br />Źródło: microDAGR.pbo - Controla la cantidad de información disponible en el microDAGR. Menos datos limitan la vista del mapa a mostrar menos en el minimapa.<br />Fuente: microDAGR.pbo - Steuert wie viel Daten auf dem microDAGR zu sehen ist. Weniger Daten schränken die Kartenansicht ein, um mehr auf der Minimap zu sehen.<br />Quelle: microDAGR.pbo - Tento modul umožňuje kontrolovat, kolik informací je obsaženo v MicroDAGR. Menší množství dat omezené zobrazením mapy ukazují méně věcí na minimapě.<br />Zdroj: microDAGR.pbo - Controla quantos dados são preenchidos nos itens microDAGR. Menos dados restringe a visualização de mapa para mostrar menos informações no minimapa<br/>Fonte: MicroDAGR.pbo - Contrôle le nombre d'information disponible sur la carte du MicroDAGR. <br/>Source: microDAGR.pbo - Meghatárroza a MicroDAGR objektumok térképének tartalmát. A kevesebb adat korlátozza a térképnézeti módot az eszközön. <br />Forrás: microDAGR.pbo - Контролирует, сколько данных должно отображаться на карте устройств MicroDAGR. Ограничивает объем отображаемых данных на миникарте.<br />Источник: microDAGR.pbo - Controlla quanti dati sono presenti negli oggetti MicroDAGR. Meno dati costringono la vista mappa a mostrare meno informazioni nella minimappa. <br/>Fonte: microDAGR.pbo + Controls how much data is filled on the microDAGR items. Less data restricts the map view to show less on the minimap. + Moduł ten pozwala kontrolować jak duża ilość informacji jest załadowana do przedmiotów MicroDAGR. Mniejsza ilość danych ogranicza widok mapy pokazując mniej rzeczy na minimapie. + Controla la cantidad de información disponible en el microDAGR. Menos datos limitan la vista del mapa a mostrar menos en el minimapa. + Steuert wie viel Daten auf dem microDAGR zu sehen ist. Weniger Daten schränken die Kartenansicht ein, um mehr auf der Minimap zu sehen. + Tento modul umožňuje kontrolovat, kolik informací je obsaženo v MicroDAGR. Menší množství dat omezené zobrazením mapy ukazují méně věcí na minimapě. + Controla quantos dados são preenchidos nos itens microDAGR. Menos dados restringe a visualização de mapa para mostrar menos informações no minimapa. + Contrôle le nombre d'information disponible sur la carte du MicroDAGR. + Meghatárroza a MicroDAGR objektumok térképének tartalmát. A kevesebb adat korlátozza a térképnézeti módot az eszközön. + Контролирует, сколько данных должно отображаться на карте устройств MicroDAGR. Ограничивает объем отображаемых данных на миникарте.bo + Controlla quanti dati sono presenti negli oggetti MicroDAGR. Meno dati costringono la vista mappa a mostrare meno informazioni nella minimappa. - \ No newline at end of file + diff --git a/addons/sitting/CfgVehicles.hpp b/addons/sitting/CfgVehicles.hpp index cb2422bd6d..9ca5a3cd72 100644 --- a/addons/sitting/CfgVehicles.hpp +++ b/addons/sitting/CfgVehicles.hpp @@ -12,6 +12,7 @@ class CfgVehicles { class Arguments { class enable { displayName = CSTRING(Enable); + description = CSTRING(Enable) typeName = "BOOL"; defaultValue = 1; }; diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml index 5ed439efeb..1b160eaf2a 100644 --- a/addons/vehiclelock/stringtable.xml +++ b/addons/vehiclelock/stringtable.xml @@ -254,16 +254,16 @@ Tempo Default richiesto per forzare serrature (in secondi). Default: 10 - Settings for lockpick strength and initial vehicle lock state. Removes ambiguous lock states.<br />Source: vehiclelock.pbo - Ustawienia czasu włamywania oraz domyślnego stanu blokady pojazdów. Wyłącza dwuznaczne ustawienia blokady. Moduł ten umożliwia więc np. zamknięcie pojazdów przeciwnika na klucz tak, że gracze bez odpowiedniego sprzętu (wytrycha) nie będą mogli ich używać.<br />Źródło: vehiclelock.pbo - Ajustes de la durabilidad de la ganzua y el estado inicial del cierre de los vehículos. Elimina estados de cierre ambiguos.<br />Fuente: vehiclelock.pbo - Einstellungen für Pick-Stärke und anfänglichen Fahrzeugsperrzustand. Entfernt unklare Sperrzustände.<br />Quelle: vehiclelock.pbo - Nastavení síly vypáčení a počáteční stav zámku vozidla. Odstraňuje nejednoznačné stavy zámků.<br />Zdroj: vehiclelock.pbo - Definições para a durabilidade da chave micha e estado inicial da fechadura do veículo. Remove estados de fechadura ambíguas <br /> Fonte: Vehiclelock.pbo - Paramètres pour le crochetage et état inital des véhicules. Supprime les états de verrouillage ambigue. <br/>Source: véhicle.pbo - Beállítások a zártörő erősségére és alapértelmezett zár-állapotra a járműveken. Eltávolítja az azonosíthatatlan zár-állapotokat. <br />Forrás: vehiclelock.pbo - Настройки силы отмычек и начальное состояние замков транспорта. Устраняет неоднозначные состояния замков.<br />Источник: vehiclelock.pbo - Impostazioni per resistenza iniziale delle serrature e stato di blocco dei veicoli. Rimuove stati di blocco ambigui. <br/>Fonte: vehiclelock.pbo + Settings for lockpick strength and initial vehicle lock state. Removes ambiguous lock states. + Ustawienia czasu włamywania oraz domyślnego stanu blokady pojazdów. Wyłącza dwuznaczne ustawienia blokady. Moduł ten umożliwia więc np. zamknięcie pojazdów przeciwnika na klucz tak, że gracze bez odpowiedniego sprzętu (wytrycha) nie będą mogli ich używać. + Ajustes de la durabilidad de la ganzua y el estado inicial del cierre de los vehículos. Elimina estados de cierre ambiguos. + Einstellungen für Pick-Stärke und anfänglichen Fahrzeugsperrzustand. Entfernt unklare Sperrzustände. + Nastavení síly vypáčení a počáteční stav zámku vozidla. Odstraňuje nejednoznačné stavy zámků. + Definições para a durabilidade da chave micha e estado inicial da fechadura do veículo. Remove estados de fechadura ambíguas + Paramètres pour le crochetage et état inital des véhicules. Supprime les états de verrouillage ambigue. + Beállítások a zártörő erősségére és alapértelmezett zár-állapotra a járműveken. Eltávolítja az azonosíthatatlan zár-állapotokat. + Настройки силы отмычек и начальное состояние замков транспорта. Устраняет неоднозначные состояния замков. + Impostazioni per resistenza iniziale delle serrature e stato di blocco dei veicoli. Rimuove stati di blocco ambigui. Vehicle Key Assign @@ -278,16 +278,16 @@ Assegna Chiavi Veicoli - Sync with vehicles and players. Will handout custom keys to players for every synced vehicle. Only valid for objects present at mission start.<br />Source: vehiclelock.pbo - Zsynchronizuj z pojazdami i graczami. Rozda klucze dla graczy dla każdego zsynchronizowanego pojazdu. Działa tylko na pojazdy obecne na misji od samego początku (postawione w edytorze).<br />Źródło: vehiclelock.pbo - Sincronizar con vehiculos y jugadores. Distribuirá llaves personalizadas a los jugadores para todos los vehículos sincronizados. Solo valido para objetos presentes al inicio de la mision.<br />Fuente: vehiclelock.pbo - Synchronisiere mit Fahrzeugen und Spielern. Wird eigene Schlüssel an Spieler für jedes synchronisierte Fahrzeuge aushändigen. Nur gültig für am Missionsstart existierende Fahrzeuge.<br />Quelle: vehiclelock.pbo - Synchronizuj s vozidly a hráči. Hráč dostane klíč ke každému synchonizovanému vozidlu. Platné pouze pro objekty přítomné na začátku mise.<br />Zdroj: vehiclelock.pbo - Sincronizar com veículos e jogadores. Irá distribuir chaves personalizadas para os jogadores para cada veículo sincronizado. Só é válido para objetos presentes no início da missão <br /> Fonte: vehiclelock.pbo - Synchronise avec les véhicules et les joueurs. Distribue les clés aux joueurs pour chaque véhicule synchronisé. Uniquement valide pour les objects présent au démarrage. <br/>Source: vehiclelock.pbo - Szinkronizál a járművekkel és játékosokkal. Egyedi kulcsokat oszt ki a játékosoknak minden szinkronizált járműhöz. Csak a küldetés indításakor jelenlévő járművekhez érvényes. <br />Forrás: vehiclelock.pbo - Синхронизируйте с транспортом и игроком. Это выдаст игроку ключи от всех синхронизированных транспортных средств. Работает только для объектов, присутствующих на старте миссии.<br />Источник: vehiclelock.pbo - Sincronizza con veicoli e giocatori. Distribuirà chiavi ai giocatori per ogni veicolo sincronizzato. Valido solo per oggetti presenti ad inizio missione. <br/>Fonte vehiclelock.pbo + Sync with vehicles and players. Will handout custom keys to players for every synced vehicle. Only valid for objects present at mission start. + Zsynchronizuj z pojazdami i graczami. Rozda klucze dla graczy dla każdego zsynchronizowanego pojazdu. Działa tylko na pojazdy obecne na misji od samego początku (postawione w edytorze). + Sincronizar con vehiculos y jugadores. Distribuirá llaves personalizadas a los jugadores para todos los vehículos sincronizados. Solo valido para objetos presentes al inicio de la mision. + Synchronisiere mit Fahrzeugen und Spielern. Wird eigene Schlüssel an Spieler für jedes synchronisierte Fahrzeuge aushändigen. Nur gültig für am Missionsstart existierende Fahrzeuge. + Synchronizuj s vozidly a hráči. Hráč dostane klíč ke každému synchonizovanému vozidlu. Platné pouze pro objekty přítomné na začátku mise. + Sincronizar com veículos e jogadores. Irá distribuir chaves personalizadas para os jogadores para cada veículo sincronizado. Só é válido para objetos presentes no início da missão. + Synchronise avec les véhicules et les joueurs. Distribue les clés aux joueurs pour chaque véhicule synchronisé. Uniquement valide pour les objects présent au démarrage. + Szinkronizál a járművekkel és játékosokkal. Egyedi kulcsokat oszt ki a játékosoknak minden szinkronizált járműhöz. Csak a küldetés indításakor jelenlévő járművekhez érvényes. + Синхронизируйте с транспортом и игроком. Это выдаст игроку ключи от всех синхронизированных транспортных средств. Работает только для объектов, присутствующих на старте миссииpbo + Sincronizza con veicoli e giocatori. Distribuirà chiavi ai giocatori per ogni veicolo sincronizzato. Valido solo per oggetti presenti ad inizio missione. - \ No newline at end of file + From 1402985133dadc929451e05eee1eb96a47b154e7 Mon Sep 17 00:00:00 2001 From: jonpas Date: Wed, 24 Feb 2016 19:34:03 +0100 Subject: [PATCH 15/15] Fix typos --- addons/captives/stringtable.xml | 6 +++--- addons/microdagr/stringtable.xml | 2 +- addons/sitting/CfgVehicles.hpp | 2 +- addons/vehiclelock/stringtable.xml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml index 3e14e8f623..f10dec9307 100644 --- a/addons/captives/stringtable.xml +++ b/addons/captives/stringtable.xml @@ -178,8 +178,8 @@ Sincroniza uma unidade para fazer com que ela se renda. Synchronise une unité pour la rendre captive. Egység szinkronizálása, hogy kapituláljon. - Синхронизируйте с юнитами, чтобы заставить их сдаться в плен.es - Sincronizza una unità per farla arrendere + Синхронизируйте с юнитами, чтобы заставить их сдаться в плен. + Sincronizza una unità per farla arrendere. Make Unit Handcuffed @@ -197,7 +197,7 @@ Sincronizar uma unidade para deixá-la algemada. Синхронизируйте с юнитами, чтобы сделать их связанными. Synchronizovat s jednotkou, která má být v poutech. - Sincronizza un'unità per metterle le manette. + Sincronizza un'unità per metterle le manette. Captives Settings diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml index ae30f57f62..a3ea19d873 100644 --- a/addons/microdagr/stringtable.xml +++ b/addons/microdagr/stringtable.xml @@ -382,7 +382,7 @@ Controla quantos dados são preenchidos nos itens microDAGR. Menos dados restringe a visualização de mapa para mostrar menos informações no minimapa. Contrôle le nombre d'information disponible sur la carte du MicroDAGR. Meghatárroza a MicroDAGR objektumok térképének tartalmát. A kevesebb adat korlátozza a térképnézeti módot az eszközön. - Контролирует, сколько данных должно отображаться на карте устройств MicroDAGR. Ограничивает объем отображаемых данных на миникарте.bo + Контролирует, сколько данных должно отображаться на карте устройств MicroDAGR. Ограничивает объем отображаемых данных на миникарте. Controlla quanti dati sono presenti negli oggetti MicroDAGR. Meno dati costringono la vista mappa a mostrare meno informazioni nella minimappa. diff --git a/addons/sitting/CfgVehicles.hpp b/addons/sitting/CfgVehicles.hpp index 9ca5a3cd72..fde1786268 100644 --- a/addons/sitting/CfgVehicles.hpp +++ b/addons/sitting/CfgVehicles.hpp @@ -12,7 +12,7 @@ class CfgVehicles { class Arguments { class enable { displayName = CSTRING(Enable); - description = CSTRING(Enable) + description = CSTRING(Enable); typeName = "BOOL"; defaultValue = 1; }; diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml index 1b160eaf2a..9b8b06fd40 100644 --- a/addons/vehiclelock/stringtable.xml +++ b/addons/vehiclelock/stringtable.xml @@ -258,7 +258,7 @@ Ustawienia czasu włamywania oraz domyślnego stanu blokady pojazdów. Wyłącza dwuznaczne ustawienia blokady. Moduł ten umożliwia więc np. zamknięcie pojazdów przeciwnika na klucz tak, że gracze bez odpowiedniego sprzętu (wytrycha) nie będą mogli ich używać. Ajustes de la durabilidad de la ganzua y el estado inicial del cierre de los vehículos. Elimina estados de cierre ambiguos. Einstellungen für Pick-Stärke und anfänglichen Fahrzeugsperrzustand. Entfernt unklare Sperrzustände. - Nastavení síly vypáčení a počáteční stav zámku vozidla. Odstraňuje nejednoznačné stavy zámků. + Nastavení síly vypáčení a počáteční stav zámku vozidla. Odstraňuje nejednoznačné stavy zámků. Definições para a durabilidade da chave micha e estado inicial da fechadura do veículo. Remove estados de fechadura ambíguas Paramètres pour le crochetage et état inital des véhicules. Supprime les états de verrouillage ambigue. Beállítások a zártörő erősségére és alapértelmezett zár-állapotra a járműveken. Eltávolítja az azonosíthatatlan zár-állapotokat. @@ -284,9 +284,9 @@ Synchronisiere mit Fahrzeugen und Spielern. Wird eigene Schlüssel an Spieler für jedes synchronisierte Fahrzeuge aushändigen. Nur gültig für am Missionsstart existierende Fahrzeuge. Synchronizuj s vozidly a hráči. Hráč dostane klíč ke každému synchonizovanému vozidlu. Platné pouze pro objekty přítomné na začátku mise. Sincronizar com veículos e jogadores. Irá distribuir chaves personalizadas para os jogadores para cada veículo sincronizado. Só é válido para objetos presentes no início da missão. - Synchronise avec les véhicules et les joueurs. Distribue les clés aux joueurs pour chaque véhicule synchronisé. Uniquement valide pour les objects présent au démarrage. + Synchronise avec les véhicules et les joueurs. Distribue les clés aux joueurs pour chaque véhicule synchronisé. Uniquement valide pour les objects présent au démarrage. Szinkronizál a járművekkel és játékosokkal. Egyedi kulcsokat oszt ki a játékosoknak minden szinkronizált járműhöz. Csak a küldetés indításakor jelenlévő járművekhez érvényes. - Синхронизируйте с транспортом и игроком. Это выдаст игроку ключи от всех синхронизированных транспортных средств. Работает только для объектов, присутствующих на старте миссииpbo + Синхронизируйте с транспортом и игроком. Это выдаст игроку ключи от всех синхронизированных транспортных средств. Работает только для объектов, присутствующих на старте миссии Sincronizza con veicoli e giocatori. Distribuirà chiavi ai giocatori per ogni veicolo sincronizzato. Valido solo per oggetti presenti ad inizio missione.