From 1d446c5eba5fd920df75fbc99fdeef97e90a89d7 Mon Sep 17 00:00:00 2001 From: Dharma Bellamkonda Date: Wed, 13 May 2015 23:20:36 -0600 Subject: [PATCH 01/34] Improve ballistics/advanced ballistics docs --- documentation/feature/advanced_ballistics.md | 16 +++++++------ documentation/feature/ballistics.md | 25 +++++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/documentation/feature/advanced_ballistics.md b/documentation/feature/advanced_ballistics.md index fd44bb21b9..59d3927e4e 100644 --- a/documentation/feature/advanced_ballistics.md +++ b/documentation/feature/advanced_ballistics.md @@ -5,14 +5,16 @@ group: feature parent: wiki --- # Overview -## Sub-feature 1 -Short description of sub-feature 1. -## Sub-feature 2 -Short description of sub-feature 2. +## Advanced ballistics simulation +Advanced ballistics changes above and beyond the ballistics module. Bullet characteristics, barrel length, air temperature, barometric pressure, ammo temperature and air drag are all used to dynamically calculate ballistics. + +## Protractor +Adds a protractor for quick reference when sniping. # Usage -Short overview of how to use the feature, e.g. menu options, key bindings, -instructions. May not apply to all modules. +Press `Ctrl+Shift+K` to display the protractor. + +This module uses relatively complex scripting. Several options are provided in the ACE menu to reduce the performance impact of this module. # Dependencies -List of modules that must be present for this module to work. +`ace_ballistics`, `ace_weather`, `ace_modules` diff --git a/documentation/feature/ballistics.md b/documentation/feature/ballistics.md index 895f1e37ab..d98eac2d33 100644 --- a/documentation/feature/ballistics.md +++ b/documentation/feature/ballistics.md @@ -5,24 +5,27 @@ group: feature parent: wiki --- # Overview -## Realistic rifle ammunition + +## Realistic ballistics Changes include adjusted muzzle velocity, air friction and dispersion based on real life values. -## Body armour nerf -Nerfs protection values of vests, CSAT uniforms and various campaign only gear to more realistic levels comparable to Arma 2 levels. + +## Weaker body armor +Decreases protection values of vests, CSAT uniforms and various campaign only gear to levels comparable to Arma 2. + ## Realistic silencers and sub-sonic ammunition Silencers no longer decrease the muzzle velocity and are generally less effective when used with normal ammunition. They now only remove the muzzle blast and flash. To prevent the crack caused by super sonic projectiles, AGM introduces sub sonic ammunition. This is also fully compatible with AI. Sub sonic ammunition is available for the calibers 5.56mm, 6.5mm and 7.62mm. + ## Armour piercing ammunition Armour piercing rounds have higher penetration values against light armoured targets or other obstacles on the battlefield. Their drawback is a slighly decreased man-stopping power. AP rounds are available for the calibers 5.56mm, 6.5mm and 7.62mm. + ## IR-Dim tracer ammunition IR-Dim ammunition is similar to tracer rounds, but their tracers are only visible using night vision devices. -## M118 Long range ammunition -The M14 EBR now uses ammunition with decreased muzzle velocity and air friction to improve precission on long ranges. -## Flash suppressors -Flash suppressors are similar to sound suppressors and prevent the muzzle flash reducing visibilty without decreasing combat effectiveness. Flash suppressors are available for the calibers 5.56mm, 6.5mm, 7.62mm, .45 ACP and 9mm. -# Usage -Short overview of how to use the feature, e.g. menu options, key bindings, -instructions. May not apply to all modules. +## M118 Long range ammunition +The M14 EBR now uses ammunition with decreased muzzle velocity and air friction to improve precision on long ranges. + +## Flash suppressors +Flash suppressors are similar to sound suppressors and prevent the muzzle flash reducing visibility without decreasing combat effectiveness. Flash suppressors are available for the calibers 5.56mm, 6.5mm, 7.62mm, .45 ACP and 9mm. # Dependencies -List of modules that must be present for this module to work. +`ace_common` From b930dfe6ba7e4982580dea9d8da41189067faaf7 Mon Sep 17 00:00:00 2001 From: Dharma Bellamkonda Date: Thu, 14 May 2015 01:00:37 -0600 Subject: [PATCH 02/34] Fix typo --- documentation/feature/ballistics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/feature/ballistics.md b/documentation/feature/ballistics.md index d98eac2d33..08366ed49c 100644 --- a/documentation/feature/ballistics.md +++ b/documentation/feature/ballistics.md @@ -16,7 +16,7 @@ Decreases protection values of vests, CSAT uniforms and various campaign only ge Silencers no longer decrease the muzzle velocity and are generally less effective when used with normal ammunition. They now only remove the muzzle blast and flash. To prevent the crack caused by super sonic projectiles, AGM introduces sub sonic ammunition. This is also fully compatible with AI. Sub sonic ammunition is available for the calibers 5.56mm, 6.5mm and 7.62mm. ## Armour piercing ammunition -Armour piercing rounds have higher penetration values against light armoured targets or other obstacles on the battlefield. Their drawback is a slighly decreased man-stopping power. AP rounds are available for the calibers 5.56mm, 6.5mm and 7.62mm. +Armour piercing rounds have higher penetration values against light armoured targets or other obstacles on the battlefield. Their drawback is a slightly decreased man-stopping power. AP rounds are available for the calibers 5.56mm, 6.5mm and 7.62mm. ## IR-Dim tracer ammunition IR-Dim ammunition is similar to tracer rounds, but their tracers are only visible using night vision devices. From dd021334722fffb30adda5d6e28a9d3f1680d0c4 Mon Sep 17 00:00:00 2001 From: Dharma Bellamkonda Date: Thu, 14 May 2015 01:02:25 -0600 Subject: [PATCH 03/34] Use tag for keyboard shortcuts --- documentation/feature/advanced_ballistics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/feature/advanced_ballistics.md b/documentation/feature/advanced_ballistics.md index 59d3927e4e..a8b04df211 100644 --- a/documentation/feature/advanced_ballistics.md +++ b/documentation/feature/advanced_ballistics.md @@ -12,7 +12,7 @@ Advanced ballistics changes above and beyond the ballistics module. Bullet chara Adds a protractor for quick reference when sniping. # Usage -Press `Ctrl+Shift+K` to display the protractor. +Press Ctrl+Shift+K` to display the protractor. This module uses relatively complex scripting. Several options are provided in the ACE menu to reduce the performance impact of this module. From bb947c020434aa96ce1e8c62d62f133569596b6e Mon Sep 17 00:00:00 2001 From: Dharma Bellamkonda Date: Thu, 14 May 2015 01:03:32 -0600 Subject: [PATCH 04/34] Fix tag Thanks, MDN :/ --- documentation/feature/advanced_ballistics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/feature/advanced_ballistics.md b/documentation/feature/advanced_ballistics.md index a8b04df211..449f4027d8 100644 --- a/documentation/feature/advanced_ballistics.md +++ b/documentation/feature/advanced_ballistics.md @@ -12,7 +12,7 @@ Advanced ballistics changes above and beyond the ballistics module. Bullet chara Adds a protractor for quick reference when sniping. # Usage -Press Ctrl+Shift+K` to display the protractor. +Press Ctrl+Shift+K to display the protractor. This module uses relatively complex scripting. Several options are provided in the ACE menu to reduce the performance impact of this module. From 7a6fb5465402a83f46a5351ab0b09594b4d79cd2 Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Thu, 14 May 2015 15:15:07 -0300 Subject: [PATCH 05/34] Small tweaks to viewdistance --- addons/viewdistance/XEH_postInit.sqf | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/addons/viewdistance/XEH_postInit.sqf b/addons/viewdistance/XEH_postInit.sqf index 6c4f41d374..f024f58194 100644 --- a/addons/viewdistance/XEH_postInit.sqf +++ b/addons/viewdistance/XEH_postInit.sqf @@ -2,26 +2,28 @@ if (!hasInterface) exitWith {}; +// Force the view distance down to the limit. if (viewDistance > GVAR(limitViewDistance)) then { - setViewDistance GVAR(limitViewDistance); // force the view distance down to the limit. - setObjectViewDistance (0.8 * GVAR(limitViewDistance)); -} else { - [true] call FUNC(adaptViewDistance); // adapt view distance in the beginning according to whether client is on foot or vehicle. + setViewDistance GVAR(limitViewDistance); }; -// Set the EH which waits for any of the view distance settings to be changed, avoids the player having to enter or leave a vehicle for the changes to have effect. -["SettingChanged",{ - if ((_this select 0 == QGVAR(viewDistanceOnFoot)) || (_this select 0 == QGVAR(viewDistanceLandVehicle)) || (_this select 0 == QGVAR(viewDistanceAirVehicle))) then { - [true] call FUNC(adaptViewDistance); - }; -},true] call ace_common_fnc_addEventHandler; +// Adapt view distance when the player is created or changed according to whether client is on foot or vehicle. +["playerChanged",{ + [false] call FUNC(adaptViewDistance); +}] call ace_common_fnc_addEventHandler; -// Set the EH which waits for the Object View Distance coefficient to be changed, so that the effect is show immediately +// Set the EH which waits for any of the view distance settings to be changed, so that the effect is show immediately ["SettingChanged",{ - if (_this select 0 == QGVAR(objectViewDistanceCoeff)) then { + if ((_this select 0 == QGVAR(viewDistanceOnFoot)) || + (_this select 0 == QGVAR(viewDistanceLandVehicle)) || + (_this select 0 == QGVAR(viewDistanceAirVehicle)) || + (_this select 0 == QGVAR(objectViewDistanceCoeff))) then { + [true] call FUNC(adaptViewDistance); }; -},true] call ace_common_fnc_addEventHandler; +}] call ace_common_fnc_addEventHandler; // Set the EH which waits for a vehicle change to automatically swap to On Foot/In Land Vehicle/In Air Vehicle -["playerVehicleChanged",{[false] call FUNC(adaptViewDistance)},true] call ace_common_fnc_addEventHandler; \ No newline at end of file +["playerVehicleChanged",{ + [false] call FUNC(adaptViewDistance) +}] call ace_common_fnc_addEventHandler; \ No newline at end of file From 2027a289591c9e991efe833af37ae0b5b56363db Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Thu, 14 May 2015 15:16:02 -0300 Subject: [PATCH 06/34] Modify changeViewDistance so: - Displays objects distance percentage instead of coeficient - Only display that if not off --- .../functions/fnc_changeViewDistance.sqf | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/addons/viewdistance/functions/fnc_changeViewDistance.sqf b/addons/viewdistance/functions/fnc_changeViewDistance.sqf index 61b568bc2a..7c70a612eb 100644 --- a/addons/viewdistance/functions/fnc_changeViewDistance.sqf +++ b/addons/viewdistance/functions/fnc_changeViewDistance.sqf @@ -1,7 +1,7 @@ /* * Author: Winter * Sets the player's current view distance according to allowed values. - * + * * * Arguments: * 0: View Distance setting INDEX @@ -26,23 +26,21 @@ _new_view_distance = [_index_requested] call FUNC(returnValue); // changes the s _object_view_distance_coeff = [GVAR(objectViewDistanceCoeff)] call FUNC(returnObjectCoeff); // changes the setting index into a coefficient. _view_distance_limit = GVAR(limitViewDistance); // Grab the limit -if (_new_view_distance <= _view_distance_limit) then { - if (_show_prompt) then { - _text = parseText format ["View Distance: %1
Object View Distance Coefficient: %2",str(_new_view_distance),str(_object_view_distance_coeff)]; - [_text,2] call EFUNC(common,displayTextStructured); +if (_show_prompt) then { + _text = if (_new_view_distance <= _view_distance_limit) then { + format ["View Distance: %1m",str(_new_view_distance)]; + } else { + format ["That option is invalid! The limit is %1m",str(_view_distance_limit)]; + }; + + if (GVAR(objectViewDistanceCoeff) > 0) then { + _text = _text + format ["
Object View Distance is %1%2",str(_object_view_distance_coeff * 100),"%"]; }; - setViewDistance _new_view_distance; - if (_object_view_distance_coeff > 0) then { - setObjectViewDistance (_object_view_distance_coeff * _new_view_distance); - }; -} -else { - if (_show_prompt) then { - _text = parseText format ["That option is invalid! The limit is: %1
Object View Distance Coefficient: %2",str(_view_distance_limit),str(_object_view_distance_coeff)]; - [_text,2] call EFUNC(common,displayTextStructured); - }; - setViewDistance _view_distance_limit; - if (_object_view_distance_coeff > 0) then { - setObjectViewDistance (_object_view_distance_coeff * _view_distance_limit); - }; -}; \ No newline at end of file + [parseText _text,2] call EFUNC(common,displayTextStructured); +}; + +setViewDistance (_new_view_distance min _view_distance_limit); + +if (_object_view_distance_coeff > 0) then { + setObjectViewDistance (_object_view_distance_coeff * _new_view_distance); +}; From 195643d5578288e7d2d3709a092367daeeae5b1c Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Thu, 14 May 2015 15:24:35 -0300 Subject: [PATCH 07/34] Handle player not existing --- addons/viewdistance/functions/fnc_adaptViewDistance.sqf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/viewdistance/functions/fnc_adaptViewDistance.sqf b/addons/viewdistance/functions/fnc_adaptViewDistance.sqf index 5012b40c93..0a60e39339 100644 --- a/addons/viewdistance/functions/fnc_adaptViewDistance.sqf +++ b/addons/viewdistance/functions/fnc_adaptViewDistance.sqf @@ -1,7 +1,7 @@ /* * Author: Winter * Sets the player's current view distance according to whether s/he is on foot, in a land vehicle or in an air vehicle. - * + * * * Arguments: * 0: Show Prompt @@ -21,6 +21,8 @@ PARAMS_1(_show_prompt); private["_land_vehicle","_air_vehicle"]; +if (isNull ACE_player) exitWith {}; + _land_vehicle = (vehicle ACE_player) isKindOf "LandVehicle"; _air_vehicle = (vehicle ACE_player) isKindOf "Air"; From a9197a8e33340f830cc6473f356c62cc7cf27b3f Mon Sep 17 00:00:00 2001 From: esteldunedain Date: Thu, 14 May 2015 16:36:12 -0300 Subject: [PATCH 08/34] Make viewdistance disabable through settings and module --- addons/viewdistance/ACE_Settings.hpp | 6 ++++++ addons/viewdistance/CfgVehicles.hpp | 6 ++++++ addons/viewdistance/XEH_postInit.sqf | 2 +- addons/viewdistance/functions/fnc_adaptViewDistance.sqf | 2 +- addons/viewdistance/functions/fnc_initModule.sqf | 5 +++-- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/addons/viewdistance/ACE_Settings.hpp b/addons/viewdistance/ACE_Settings.hpp index ba773f5fc5..a3460cddf3 100644 --- a/addons/viewdistance/ACE_Settings.hpp +++ b/addons/viewdistance/ACE_Settings.hpp @@ -1,4 +1,10 @@ class ACE_Settings { + class GVAR(enabled) { + typeName = "BOOL"; + value = 1; + displayName = "Enable ACE viewdistance"; + description = "Enables ACE viewdistance module."; + }; class GVAR(viewDistanceOnFoot) { typeName = "SCALAR"; isClientSettable = 1; diff --git a/addons/viewdistance/CfgVehicles.hpp b/addons/viewdistance/CfgVehicles.hpp index 870c669601..63a50cf099 100644 --- a/addons/viewdistance/CfgVehicles.hpp +++ b/addons/viewdistance/CfgVehicles.hpp @@ -9,6 +9,12 @@ class CfgVehicles { isGlobal = 1; //icon = ""; // needs an icon class Arguments { + class moduleViewDistanceEnabled { + displayName = "Enable ACE viewdistance"; + description = "Enables ACE viewdistance"; + typeName = "BOOL"; + defaultValue = 1; + }; class moduleViewDistanceLimit { displayName = "View Distance Limit"; description = "Sets the limit for how high clients can raise their view distance (<= 10000)"; diff --git a/addons/viewdistance/XEH_postInit.sqf b/addons/viewdistance/XEH_postInit.sqf index f024f58194..c49a197c26 100644 --- a/addons/viewdistance/XEH_postInit.sqf +++ b/addons/viewdistance/XEH_postInit.sqf @@ -3,7 +3,7 @@ if (!hasInterface) exitWith {}; // Force the view distance down to the limit. -if (viewDistance > GVAR(limitViewDistance)) then { +if (GVAR(enabled) && {viewDistance > GVAR(limitViewDistance)}) then { setViewDistance GVAR(limitViewDistance); }; diff --git a/addons/viewdistance/functions/fnc_adaptViewDistance.sqf b/addons/viewdistance/functions/fnc_adaptViewDistance.sqf index 0a60e39339..2ef4b84ae6 100644 --- a/addons/viewdistance/functions/fnc_adaptViewDistance.sqf +++ b/addons/viewdistance/functions/fnc_adaptViewDistance.sqf @@ -21,7 +21,7 @@ PARAMS_1(_show_prompt); private["_land_vehicle","_air_vehicle"]; -if (isNull ACE_player) exitWith {}; +if (!GVAR(enabled) || isNull ACE_player) exitWith {}; _land_vehicle = (vehicle ACE_player) isKindOf "LandVehicle"; _air_vehicle = (vehicle ACE_player) isKindOf "Air"; diff --git a/addons/viewdistance/functions/fnc_initModule.sqf b/addons/viewdistance/functions/fnc_initModule.sqf index cff8e9685f..7569383d0c 100644 --- a/addons/viewdistance/functions/fnc_initModule.sqf +++ b/addons/viewdistance/functions/fnc_initModule.sqf @@ -1,7 +1,7 @@ /* * Author: Winter * Initialises the view distance limiter module - * + * * * Arguments: * 0: logic @@ -10,7 +10,7 @@ * * Return Value: * None - * + * */ #include "script_component.hpp" @@ -23,6 +23,7 @@ if (!_activated) exitWith { diag_log text "[ACE]: View Distance Limit Module is placed but NOT active."; }; +[_logic, QGVAR(enabled),"moduleViewDistanceEnabled"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(limitViewDistance),"moduleViewDistanceLimit"] call EFUNC(common,readSettingFromModule); diag_log format ["[ACE]: View Distance Limit Module Initialized. Limit set by module: %1",GVAR(limitViewDistance)]; \ No newline at end of file From ca99b61b6291a5a310ac61a5b2f386704c53a859 Mon Sep 17 00:00:00 2001 From: Dharma Bellamkonda Date: Thu, 14 May 2015 14:27:09 -0600 Subject: [PATCH 09/34] Improve advanced ballistics documenation Incorporated feedback from @ulteq --- documentation/feature/advanced_ballistics.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/documentation/feature/advanced_ballistics.md b/documentation/feature/advanced_ballistics.md index 449f4027d8..575ded2976 100644 --- a/documentation/feature/advanced_ballistics.md +++ b/documentation/feature/advanced_ballistics.md @@ -6,7 +6,21 @@ parent: wiki --- # Overview ## Advanced ballistics simulation -Advanced ballistics changes above and beyond the ballistics module. Bullet characteristics, barrel length, air temperature, barometric pressure, ammo temperature and air drag are all used to dynamically calculate ballistics. +Advanced ballistics changes above and beyond the ballistics module. Bullet velocity and flight paths are dynamically simulated in response to the following factors: + +- Ambient air pressure, temperature and humidity +- Wind drift +- [Magnus effect](https://en.wikipedia.org/wiki/Magnus_effect) (spin drift) +- [Coriolis effect](https://en.wikipedia.org/wiki/Coriolis_effect) and [Eötvös effect](https://en.wikipedia.org/wiki/Eotvos_effect) (Earth rotation) +- Loss of stability during transonic flight +- Ammo temperature +- Barrel length + +## Advanced drag model +Realistic drag modeling based on the G Model and real-world ballistic coefficient data. + +## Wind simulation +Wind speed varies with altitude. Terrain features, buildings and other objects disrupt the wind. ## Protractor Adds a protractor for quick reference when sniping. From fdabce85ac7f85d4cfbbfea3e54f79bebc220bb9 Mon Sep 17 00:00:00 2001 From: Dharma Bellamkonda Date: Thu, 14 May 2015 15:30:50 -0600 Subject: [PATCH 10/34] Improve ballistics documenation Thanks @ulteq and vking for feedback and help --- documentation/feature/advanced_ballistics.md | 13 ++++++++----- documentation/feature/ballistics.md | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/documentation/feature/advanced_ballistics.md b/documentation/feature/advanced_ballistics.md index 575ded2976..671164a2d9 100644 --- a/documentation/feature/advanced_ballistics.md +++ b/documentation/feature/advanced_ballistics.md @@ -6,15 +6,15 @@ parent: wiki --- # Overview ## Advanced ballistics simulation -Advanced ballistics changes above and beyond the ballistics module. Bullet velocity and flight paths are dynamically simulated in response to the following factors: +The advanced ballistics module improves projectile physics by simulating internal and external ballistics. Factors used in the simulation include: - Ambient air pressure, temperature and humidity - Wind drift - [Magnus effect](https://en.wikipedia.org/wiki/Magnus_effect) (spin drift) - [Coriolis effect](https://en.wikipedia.org/wiki/Coriolis_effect) and [Eötvös effect](https://en.wikipedia.org/wiki/Eotvos_effect) (Earth rotation) - Loss of stability during transonic flight -- Ammo temperature -- Barrel length +- Variable muzzle velocity based on on powder burn rate and barrel length +- Barrel length effect on muzzle velocity ## Advanced drag model Realistic drag modeling based on the G Model and real-world ballistic coefficient data. @@ -22,11 +22,14 @@ Realistic drag modeling based on the G Model and real-world ballistic coefficien ## Wind simulation Wind speed varies with altitude. Terrain features, buildings and other objects disrupt the wind. +## Bullet trace effects +Supersonic bullets have a refraction effect due to air pressure waves. + ## Protractor -Adds a protractor for quick reference when sniping. +Adds a protractor for quickly measuring inclination angle. # Usage -Press Ctrl+Shift+K to display the protractor. +Press Ctrl+Shift+K while using a compatible weapon to toggle the protractor. The red line indicates the current inclination angle in degrees. The protractor will disappear if you lower or holster your weapon. This module uses relatively complex scripting. Several options are provided in the ACE menu to reduce the performance impact of this module. diff --git a/documentation/feature/ballistics.md b/documentation/feature/ballistics.md index 08366ed49c..5d2f92baa9 100644 --- a/documentation/feature/ballistics.md +++ b/documentation/feature/ballistics.md @@ -12,20 +12,23 @@ Changes include adjusted muzzle velocity, air friction and dispersion based on r ## Weaker body armor Decreases protection values of vests, CSAT uniforms and various campaign only gear to levels comparable to Arma 2. -## Realistic silencers and sub-sonic ammunition -Silencers no longer decrease the muzzle velocity and are generally less effective when used with normal ammunition. They now only remove the muzzle blast and flash. To prevent the crack caused by super sonic projectiles, AGM introduces sub sonic ammunition. This is also fully compatible with AI. Sub sonic ammunition is available for the calibers 5.56mm, 6.5mm and 7.62mm. +## Realistic silencers and subsonic ammunition +Silencers no longer decrease the muzzle velocity and are generally less effective when used with normal ammunition. They now only remove the muzzle blast and flash. To prevent the crack caused by supersonic projectiles, ACE introduces subsonic ammunition for the 7.62mm caliber. This is also fully compatible with AI. ## Armour piercing ammunition -Armour piercing rounds have higher penetration values against light armoured targets or other obstacles on the battlefield. Their drawback is a slightly decreased man-stopping power. AP rounds are available for the calibers 5.56mm, 6.5mm and 7.62mm. +Armour piercing rounds have higher penetration values against light armoured targets or other obstacles on the battlefield. Their drawback is a slightly decreased man-stopping power. AP rounds are available multiple calibers incudling 5.56mm and 7.62mm. ## IR-Dim tracer ammunition IR-Dim ammunition is similar to tracer rounds, but their tracers are only visible using night vision devices. -## M118 Long range ammunition -The M14 EBR now uses ammunition with decreased muzzle velocity and air friction to improve precision on long ranges. +## M118 long range ammunition +The M14 EBR now uses ammunition with decreased muzzle velocity and air friction to improve precision and energy retention at long ranges. ## Flash suppressors Flash suppressors are similar to sound suppressors and prevent the muzzle flash reducing visibility without decreasing combat effectiveness. Flash suppressors are available for the calibers 5.56mm, 6.5mm, 7.62mm, .45 ACP and 9mm. +## Fully config-based +This module uses configuration changes only and does not decrease game performance. + # Dependencies `ace_common` From c27d84e382bac05d0aa6630358139c18f1863ddd Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 14 May 2015 17:12:40 -0500 Subject: [PATCH 11/34] Common Privates Redo --- addons/common/XEH_postInit.sqf | 8 ++++-- addons/common/XEH_preInit.sqf | 4 ++- .../common/functions/fnc__handleNetEvent.sqf | 4 ++- .../fnc__handleRequestSyncedEvent.sqf | 3 +++ .../functions/fnc_addActionEventHandler.sqf | 1 + .../fnc_addActionMenuEventHandler.sqf | 1 + .../fnc_addCanInteractWithCondition.sqf | 2 ++ addons/common/functions/fnc_addSetting.sqf | 18 +++++++------ .../functions/fnc_addSyncedEventHandler.sqf | 2 ++ .../common/functions/fnc_addToInventory.sqf | 4 +-- addons/common/functions/fnc_cachedCall.sqf | 2 ++ .../fnc_changeProjectileDirection.sqf | 2 +- .../fnc_closeDialogIfTargetMoves.sqf | 2 ++ .../common/functions/fnc_disableUserInput.sqf | 1 + addons/common/functions/fnc_displayIcon.sqf | 4 +-- addons/common/functions/fnc_exportConfig.sqf | 2 +- .../fnc_fixLoweredRifleAnimation.sqf | 2 +- .../functions/fnc_getDisplayConfigName.sqf | 2 +- .../fnc_getFirstObjectIntersection.sqf | 2 +- .../fnc_getFirstTerrainIntersection.sqf | 2 +- addons/common/functions/fnc_getHitPoints.sqf | 2 +- .../fnc_getHitPointsWithSelections.sqf | 2 +- addons/common/functions/fnc_getItemType.sqf | 2 ++ .../functions/fnc_getNumberMagazinesIn.sqf | 4 ++- .../fnc_getReflectorsWithSelections.sqf | 2 +- .../functions/fnc_getTurretConfigPath.sqf | 2 +- .../functions/fnc_getTurretDirection.sqf | 2 +- addons/common/functions/fnc_getTurrets.sqf | 2 +- .../common/functions/fnc_getVehicleCargo.sqf | 2 +- .../functions/fnc_getVehicleCodriver.sqf | 2 +- addons/common/functions/fnc_globalEvent.sqf | 1 + addons/common/functions/fnc_goKneeling.sqf | 2 ++ .../common/functions/fnc_hadamardProduct.sqf | 2 ++ addons/common/functions/fnc_isEOD.sqf | 2 +- addons/common/functions/fnc_localEvent.sqf | 2 ++ addons/common/functions/fnc_logModEntries.sqf | 3 ++- .../common/functions/fnc_moduleCheckPBOs.sqf | 3 +++ .../functions/fnc_moduleLSDVehicles.sqf | 2 ++ .../common/functions/fnc_receiveRequest.sqf | 1 + .../fnc_removeSyncedEventHandler.sqf | 3 +++ .../common/functions/fnc_resetAllDefaults.sqf | 2 +- .../functions/fnc_revertKeyCodeLocalized.sqf | 2 +- addons/common/functions/fnc_serverEvent.sqf | 1 + .../functions/fnc_setSettingFromConfig.sqf | 18 ++++++------- addons/common/functions/fnc_subString.sqf | 26 ------------------- .../common/functions/fnc_syncedEventPFH.sqf | 2 +- addons/common/functions/fnc_targetEvent.sqf | 2 ++ addons/common/functions/fnc_toNumber.sqf | 2 +- .../functions/fnc_translateToModelSpace.sqf | 4 +++ .../functions/fnc_translateToWeaponSpace.sqf | 4 +++ addons/common/functions/fnc_useItem.sqf | 4 ++- addons/common/functions/fnc_useMagazine.sqf | 2 +- .../functions/fnc_worldToScreenBounds.sqf | 2 +- .../scripts/Version/checkVersionNumber.sqf | 2 ++ addons/common/scripts/assignedItemFix.sqf | 2 ++ addons/common/scripts/initScrollWheel.sqf | 13 +++++----- 56 files changed, 117 insertions(+), 82 deletions(-) delete mode 100644 addons/common/functions/fnc_subString.sqf diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf index 696aa16f9b..ba238c2796 100644 --- a/addons/common/XEH_postInit.sqf +++ b/addons/common/XEH_postInit.sqf @@ -1,6 +1,8 @@ // ACE - Common #include "script_component.hpp" +//IGNORE_PRIVATE_WARNING("_handleNetEvent", "_handleRequestAllSyncedEvents", "_handleRequestSyncedEvent", "_handleSyncedEvent"); + // Load settings from profile if (hasInterface) then { call FUNC(loadSettingsFromProfile); @@ -9,10 +11,9 @@ if (hasInterface) then { // Listens for global "SettingChanged" events, to update the force status locally ["SettingChanged", { - PARAMS_2(_name,_value); if !(count _this > 2) exitWith {}; - + private ["_force", "_settingData"]; _force = _this select 2; if (_force) then { _settingData = [_name] call FUNC(getSettingData); @@ -54,6 +55,7 @@ QGVAR(remoteFnc) addPublicVariableEventHandler { [missionNamespace] call FUNC(executePersistent); +private ["_currentVersion", "_previousVersion"]; // check previous version number from profile _currentVersion = getText (configFile >> "CfgPatches" >> QUOTE(ADDON) >> "version"); _previousVersion = profileNamespace getVariable ["ACE_VersionNumberString", ""]; @@ -131,6 +133,7 @@ GVAR(OldPlayerWeapon) = currentWeapon ACE_player; // PFH to raise varios events [{ + private ["_newCameraView", "_newInventoryDisplayIsOpen", "_newPlayerInventory", "_newPlayerTurret", "_newPlayerVehicle", "_newPlayerVisionMode", "_newPlayerWeapon", "_newZeusDisplayIsOpen"]; // "playerInventoryChanged" event _newPlayerInventory = [ACE_player] call FUNC(getAllGear); if !(_newPlayerInventory isEqualTo GVAR(OldPlayerInventory)) then { @@ -212,6 +215,7 @@ GVAR(OldIsCamera) = false; [{ // "activeCameraChanged" event + private ["_isCamera"]; _isCamera = {!isNull _x} count ALL_CAMERAS > 0; if !(_isCamera isEqualTo GVAR(OldIsCamera)) then { // Raise ACE event locally diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf index 7c8f36163a..ce7623ea38 100644 --- a/addons/common/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -1,6 +1,8 @@ // by commy2 #include "script_component.hpp" +//IGNORE_PRIVATE_WARNING("_handleNetEvent", "_handleRequestAllSyncedEvents", "_handleRequestSyncedEvent", "_handleSyncedEvent"); + ADDON = false; // ACE Common Function @@ -170,7 +172,6 @@ PREP(sortAlphabeticallyBy); PREP(stringCompare); PREP(stringToColoredText); PREP(stringRemoveWhiteSpace); -PREP(subString); PREP(switchToGroupSide); PREP(throttledPublicVariable); PREP(toBin); @@ -302,6 +303,7 @@ if (hasInterface) then { // PFH to update the ACE_player variable [{ if !(ACE_player isEqualTo (call FUNC(player))) then { + private ["_oldPlayer"]; _oldPlayer = ACE_player; ACE_player = call FUNC(player); diff --git a/addons/common/functions/fnc__handleNetEvent.sqf b/addons/common/functions/fnc__handleNetEvent.sqf index 587dc379a5..7ee1f9c502 100644 --- a/addons/common/functions/fnc__handleNetEvent.sqf +++ b/addons/common/functions/fnc__handleNetEvent.sqf @@ -2,7 +2,9 @@ // internal handler for net events #include "script_component.hpp" -private ["_eventName", "_eventArgs", "_eventNames", "_eventIndex", "_eventTargets", "_sentEvents", "_owner", "_serverFlagged"]; +private ["_eventName", "_eventArgs", "_eventNames", "_eventIndex", "_eventTargets", "_sentEvents", "_owner", "_serverFlagged", "_events"]; +//IGNORE_PRIVATE_WARNING("_handleNetEvent"); + PARAMS_2(_eventType,_event); diff --git a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf index 2d58aae869..3507071d39 100644 --- a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf +++ b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf @@ -17,6 +17,8 @@ //#define DEBUG_MODE_FULL #include "script_component.hpp" ++//IGNORE_PRIVATE_WARNING("_handleSyncedEvent"); + //SEH_s if(isServer) then { // Find the event name, and shovel out the events to the client @@ -33,6 +35,7 @@ if(isServer) then { ["SEH_s", _client, [_eventName, _eventLog] ] call FUNC(targetEvent); } else { PARAMS_2(_eventName,_eventLog); + private ["_eventArgs"]; // This is the client handling the response from the server // Start running the events { diff --git a/addons/common/functions/fnc_addActionEventHandler.sqf b/addons/common/functions/fnc_addActionEventHandler.sqf index a0e9d24f2c..29b058487b 100644 --- a/addons/common/functions/fnc_addActionEventHandler.sqf +++ b/addons/common/functions/fnc_addActionEventHandler.sqf @@ -15,6 +15,7 @@ #include "script_component.hpp" private ["_unit", "_action", "_condition", "_statement", "_name", "_actionsVar", "_actionID", "_actions", "_id", "_actionIDs"]; +//IGNORE_PRIVATE_WARNING("_count", "_index", "_return", "_target"); _unit = _this select 0; _action = _this select 1; diff --git a/addons/common/functions/fnc_addActionMenuEventHandler.sqf b/addons/common/functions/fnc_addActionMenuEventHandler.sqf index c307783455..268cc18d5a 100644 --- a/addons/common/functions/fnc_addActionMenuEventHandler.sqf +++ b/addons/common/functions/fnc_addActionMenuEventHandler.sqf @@ -19,6 +19,7 @@ #include "script_component.hpp" private ["_name", "_actionsVar", "_id", "_actionIDs", "_actions", "_nameVar", "_addAction", "_actionID"]; +//IGNORE_PRIVATE_WARNING("_target"); PARAMS_8(_unit,_displayName,_action,_condition,_statement,_condition2,_statement2,_priority); diff --git a/addons/common/functions/fnc_addCanInteractWithCondition.sqf b/addons/common/functions/fnc_addCanInteractWithCondition.sqf index ef46b23706..10ea084858 100644 --- a/addons/common/functions/fnc_addCanInteractWithCondition.sqf +++ b/addons/common/functions/fnc_addCanInteractWithCondition.sqf @@ -14,6 +14,8 @@ #include "script_component.hpp" private ["_conditionName", "_conditionFunc"]; +//IGNORE_PRIVATE_WARNING("_player", "_target"); + _conditionName = toLower (_this select 0); _conditionFunc = _this select 1; diff --git a/addons/common/functions/fnc_addSetting.sqf b/addons/common/functions/fnc_addSetting.sqf index ac62f20b3a..42299e6458 100644 --- a/addons/common/functions/fnc_addSetting.sqf +++ b/addons/common/functions/fnc_addSetting.sqf @@ -4,14 +4,14 @@ * If has only local effects. * * Arguments: - * 0: _name (String) - * 1: _typeName (String) - * 2: _isClientSetable (Bool) - * 3: _localizedName (String) - * 4: _localizedDescription (String) - * 5: _possibleValues (Array) - * 6: _isForced (Bool) - * 7: _defaultValue (Any) + * 0: name + * 1: typeName + * 2: isClientSetable + * 3: localizedName + * 4: localizedDescription + * 5: possibleValues + * 6: isForced + * 7: defaultValue (Any) * * Return Value: * None @@ -22,6 +22,8 @@ PARAMS_8(_name,_typeName,_isClientSetable,_localizedName,_localizedDescription,_possibleValues,_isForced,_value); +private ["_settingData"]; + _settingData = [_name] call FUNC(getSettingData); // Exit if the setting already exists diff --git a/addons/common/functions/fnc_addSyncedEventHandler.sqf b/addons/common/functions/fnc_addSyncedEventHandler.sqf index 5d2b221178..60c90672ef 100644 --- a/addons/common/functions/fnc_addSyncedEventHandler.sqf +++ b/addons/common/functions/fnc_addSyncedEventHandler.sqf @@ -13,6 +13,8 @@ */ //#define DEBUG_MODE_FULL #include "script_component.hpp" +//IGNORE_PRIVATE_WARNING("_handleSyncedEvent"); + PARAMS_2(_name,_handler); private["_ttl", "_eventId", "_data"]; diff --git a/addons/common/functions/fnc_addToInventory.sqf b/addons/common/functions/fnc_addToInventory.sqf index b319a92bd4..ba76831ba4 100644 --- a/addons/common/functions/fnc_addToInventory.sqf +++ b/addons/common/functions/fnc_addToInventory.sqf @@ -23,9 +23,7 @@ PARAMS_2(_unit,_classname); DEFAULT_PARAM(2,_container,""); DEFAULT_PARAM(3,_ammoCount,-1); -private "_addedToPlayer"; -private "_canAdd"; -private "_type"; +private ["_addedToPlayer", "_canAdd", "_type", "_pos"]; _canAdd = false; _addedToPlayer = true; diff --git a/addons/common/functions/fnc_cachedCall.sqf b/addons/common/functions/fnc_cachedCall.sqf index f1a351d224..c03d498eaa 100644 --- a/addons/common/functions/fnc_cachedCall.sqf +++ b/addons/common/functions/fnc_cachedCall.sqf @@ -19,6 +19,8 @@ PARAMS_5(_params,_function,_namespace,_uid,_duration); +//IGNORE_PRIVATE_WARNING("_eventName"); + if (((_namespace getVariable [_uid, [-99999]]) select 0) < diag_tickTime) then { _namespace setVariable [_uid, [diag_tickTime + _duration, _params call _function]]; diff --git a/addons/common/functions/fnc_changeProjectileDirection.sqf b/addons/common/functions/fnc_changeProjectileDirection.sqf index 849bf08c6e..b47ff0f96a 100644 --- a/addons/common/functions/fnc_changeProjectileDirection.sqf +++ b/addons/common/functions/fnc_changeProjectileDirection.sqf @@ -14,7 +14,7 @@ */ #include "script_component.hpp" -private ["_adjustSpeed", "_vdir", "_dir", "_up", "_l", "_r", "_vup", "_vel"]; +private ["_adjustSpeed", "_vdir", "_dir", "_up", "_l", "_r", "_vup", "_vel", "_vlat"]; PARAMS_3(_projectile,_adjustDir,_adjustUp); diff --git a/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf b/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf index f487fc5737..db60180bd1 100644 --- a/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf +++ b/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf @@ -14,6 +14,8 @@ _this spawn { PARAMS_2(_target,_ignoreDead); + private["_inVehicle", "_position", "_vehiclePlayer", "_vehicleTarget"]; + if (isNil "_ignoreDead") then {_ignoreDead = false}; _vehicleTarget = vehicle _target; diff --git a/addons/common/functions/fnc_disableUserInput.sqf b/addons/common/functions/fnc_disableUserInput.sqf index 6284ae4551..520e4131b2 100644 --- a/addons/common/functions/fnc_disableUserInput.sqf +++ b/addons/common/functions/fnc_disableUserInput.sqf @@ -37,6 +37,7 @@ if (_state) then { _dlg = uiNamespace getVariable QGVAR(dlgDisableMouse); _dlg displayAddEventHandler ["KeyDown", { + private ["_key", "_dlg", "_ctrl", "_config", "_acc", "_index"]; _key = _this select 1; if (_key == 1 && {alive player}) then { diff --git a/addons/common/functions/fnc_displayIcon.sqf b/addons/common/functions/fnc_displayIcon.sqf index 3058c881a2..6561dbf63b 100644 --- a/addons/common/functions/fnc_displayIcon.sqf +++ b/addons/common/functions/fnc_displayIcon.sqf @@ -2,7 +2,7 @@ * Author: Glowbal * * Draw progress bar and execute given function if succesful. -* Finish/Failure/Conditional are all passed [_args, _elapsedTime, _totalTime, _errorCode] +* Finish/Failure/Conditional are all passed [args, elapsedTime, totalTime, errorCode] * * Argument: * 0: icon ID @@ -61,7 +61,7 @@ _refresh = { _allControls = []; - private ["_ctrl", "_setting"]; + private ["_ctrl", "_setting", "_position"]; _setting = missionNamespace getvariable[QGVAR(settingFeedbackIcons), 0]; if (_setting > 0) then { { diff --git a/addons/common/functions/fnc_exportConfig.sqf b/addons/common/functions/fnc_exportConfig.sqf index b148f20a33..e8370c8f0f 100644 --- a/addons/common/functions/fnc_exportConfig.sqf +++ b/addons/common/functions/fnc_exportConfig.sqf @@ -9,7 +9,7 @@ private "_fnc_logEntries"; _fnc_logEntries = { - private ["_p", "_t", "_e"]; + private ["_p", "_t", "_e", "_a", "_i"]; PARAMS_2(_c,_d); diff --git a/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf b/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf index f07477f11d..f39f85cc94 100644 --- a/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf +++ b/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf @@ -9,7 +9,7 @@ * Nothing * * Example: - * [_player] call ace_common_fnc_fixLoweredRifleAnimation + * [ACE_player] call ace_common_fnc_fixLoweredRifleAnimation * * Public: No */ diff --git a/addons/common/functions/fnc_getDisplayConfigName.sqf b/addons/common/functions/fnc_getDisplayConfigName.sqf index 4b8ffa58a2..92b6700238 100644 --- a/addons/common/functions/fnc_getDisplayConfigName.sqf +++ b/addons/common/functions/fnc_getDisplayConfigName.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -private ["_configName", "_index"]; +private ["_configName", "_index", "_config"]; _configName = ""; diff --git a/addons/common/functions/fnc_getFirstObjectIntersection.sqf b/addons/common/functions/fnc_getFirstObjectIntersection.sqf index a78152c052..3a99f244ed 100644 --- a/addons/common/functions/fnc_getFirstObjectIntersection.sqf +++ b/addons/common/functions/fnc_getFirstObjectIntersection.sqf @@ -9,7 +9,7 @@ */ #include "script_component.hpp" -private ["_distance", "_lower", "_upper", "_mid", "_intersections", "_result"]; +private ["_distance", "_lower", "_upper", "_mid", "_intersections", "_result", "_dir"]; PARAMS_3(_source,_destination,_accuracy); diff --git a/addons/common/functions/fnc_getFirstTerrainIntersection.sqf b/addons/common/functions/fnc_getFirstTerrainIntersection.sqf index 7ec439ee01..2fe8242c15 100644 --- a/addons/common/functions/fnc_getFirstTerrainIntersection.sqf +++ b/addons/common/functions/fnc_getFirstTerrainIntersection.sqf @@ -9,7 +9,7 @@ */ #include "script_component.hpp" -private ["_distance", "_lower", "_upper", "_mid", "_intersection", "_result"]; +private ["_distance", "_lower", "_upper", "_mid", "_intersection", "_result", "_dir"]; PARAMS_3(_source,_destination,_accuracy); diff --git a/addons/common/functions/fnc_getHitPoints.sqf b/addons/common/functions/fnc_getHitPoints.sqf index bb788e4216..06b2b8d40b 100644 --- a/addons/common/functions/fnc_getHitPoints.sqf +++ b/addons/common/functions/fnc_getHitPoints.sqf @@ -11,7 +11,7 @@ */ #include "script_component.hpp" -private ["_config", "_hitpoints"]; +private ["_config", "_hitpoints", "_i"]; PARAMS_1(_vehicle); diff --git a/addons/common/functions/fnc_getHitPointsWithSelections.sqf b/addons/common/functions/fnc_getHitPointsWithSelections.sqf index 6398fa5a9d..2bf568ec8a 100644 --- a/addons/common/functions/fnc_getHitPointsWithSelections.sqf +++ b/addons/common/functions/fnc_getHitPointsWithSelections.sqf @@ -11,7 +11,7 @@ */ #include "script_component.hpp" -private ["_config", "_hitpoints", "_selections"]; +private ["_config", "_hitpoints", "_selections", "_i"]; PARAMS_1(_vehicle); diff --git a/addons/common/functions/fnc_getItemType.sqf b/addons/common/functions/fnc_getItemType.sqf index 174029cccb..4de2bfa862 100644 --- a/addons/common/functions/fnc_getItemType.sqf +++ b/addons/common/functions/fnc_getItemType.sqf @@ -16,6 +16,8 @@ PARAMS_1(_item); +private ["_cfgType"]; + _cfgType = [_item] call FUNC(getConfigType); if (_cfgType == "") exitWith {["",""]}; diff --git a/addons/common/functions/fnc_getNumberMagazinesIn.sqf b/addons/common/functions/fnc_getNumberMagazinesIn.sqf index 6b1d72097c..91921abd77 100644 --- a/addons/common/functions/fnc_getNumberMagazinesIn.sqf +++ b/addons/common/functions/fnc_getNumberMagazinesIn.sqf @@ -12,6 +12,8 @@ PARAMS_2(_unit,_magazine); +private ["_return"]; + _return = 0; if (_unit isKindOf "CAManBase") then { _return = {_x == _magazine} count magazines _unit; @@ -23,4 +25,4 @@ if (_unit isKindOf "CAManBase") then { _return = _return + ({_x == _magazine} count getMagazineCargo _unit); }; -_return \ No newline at end of file +_return diff --git a/addons/common/functions/fnc_getReflectorsWithSelections.sqf b/addons/common/functions/fnc_getReflectorsWithSelections.sqf index 56806d55db..d50269ade8 100644 --- a/addons/common/functions/fnc_getReflectorsWithSelections.sqf +++ b/addons/common/functions/fnc_getReflectorsWithSelections.sqf @@ -13,7 +13,7 @@ */ #include "script_component.hpp" -private ["_config", "_hitpoints", "_selections"]; +private ["_config", "_hitpoints", "_selections", "_i"]; PARAMS_1(_vehicle); diff --git a/addons/common/functions/fnc_getTurretConfigPath.sqf b/addons/common/functions/fnc_getTurretConfigPath.sqf index 8c62b958b5..1fca65eaac 100644 --- a/addons/common/functions/fnc_getTurretConfigPath.sqf +++ b/addons/common/functions/fnc_getTurretConfigPath.sqf @@ -12,7 +12,7 @@ */ #include "script_component.hpp" -private ["_index", "_offset", "_config2", "_foundClasses"]; +private ["_index", "_offset", "_config2", "_foundClasses", "_a"]; PARAMS_2(_config,_turretIndex); diff --git a/addons/common/functions/fnc_getTurretDirection.sqf b/addons/common/functions/fnc_getTurretDirection.sqf index 79977e4d8c..d3a49f84f1 100644 --- a/addons/common/functions/fnc_getTurretDirection.sqf +++ b/addons/common/functions/fnc_getTurretDirection.sqf @@ -13,7 +13,7 @@ #include "script_component.hpp" PARAMS_2(_vehicle,_position); -private ["_turrets", "_turret", "_config", "_turret", "_povPos", "_povDir", "_gunBeginPos", "_gunEndPos", "_pov"]; +private ["_turrets", "_turret", "_config", "_turret", "_povPos", "_povDir", "_gunBeginPos", "_gunEndPos", "_pov", "_gunBeg", "_gunEnd", "_pipDir"]; _turret = [_vehicle, _position] call CBA_fnc_getTurret; _pov = getText (_turret >> "memoryPointGunnerOptics"); diff --git a/addons/common/functions/fnc_getTurrets.sqf b/addons/common/functions/fnc_getTurrets.sqf index 97d80312d3..ea656941e4 100644 --- a/addons/common/functions/fnc_getTurrets.sqf +++ b/addons/common/functions/fnc_getTurrets.sqf @@ -11,7 +11,7 @@ */ #include "script_component.hpp" -private ["_config", "_turrets", "_fnc_addTurret"]; +private ["_config", "_turrets", "_fnc_addTurret", "_varName"]; PARAMS_1(_type); diff --git a/addons/common/functions/fnc_getVehicleCargo.sqf b/addons/common/functions/fnc_getVehicleCargo.sqf index 2988085d19..4b8ca63f5c 100644 --- a/addons/common/functions/fnc_getVehicleCargo.sqf +++ b/addons/common/functions/fnc_getVehicleCargo.sqf @@ -11,7 +11,7 @@ */ #include "script_component.hpp" -private ["_config", "_cargo", "_codrivers"]; +private ["_config", "_cargo", "_codrivers", "_index"]; PARAMS_1(_vehicle); diff --git a/addons/common/functions/fnc_getVehicleCodriver.sqf b/addons/common/functions/fnc_getVehicleCodriver.sqf index 7951c01d13..019c7b9971 100644 --- a/addons/common/functions/fnc_getVehicleCodriver.sqf +++ b/addons/common/functions/fnc_getVehicleCodriver.sqf @@ -11,7 +11,7 @@ */ #include "script_component.hpp" -private ["_config", "_cargo", "_codrivers"]; +private ["_config", "_cargo", "_codrivers", "_index"]; PARAMS_1(_vehicle); diff --git a/addons/common/functions/fnc_globalEvent.sqf b/addons/common/functions/fnc_globalEvent.sqf index af9d080ac9..b605a406b1 100644 --- a/addons/common/functions/fnc_globalEvent.sqf +++ b/addons/common/functions/fnc_globalEvent.sqf @@ -11,6 +11,7 @@ * Nothing */ #include "script_component.hpp" +//IGNORE_PRIVATE_WARNING("_handleNetEvent"); PARAMS_2(_eventName,_eventArgs); diff --git a/addons/common/functions/fnc_goKneeling.sqf b/addons/common/functions/fnc_goKneeling.sqf index 614ea34ee9..0ff25b460f 100644 --- a/addons/common/functions/fnc_goKneeling.sqf +++ b/addons/common/functions/fnc_goKneeling.sqf @@ -13,6 +13,8 @@ PARAMS_1(_unit); +//IGNORE_PRIVATE_WARNING("_exception"); + try { if (_unit == vehicle _unit) then { switch (currentWeapon _unit) do { diff --git a/addons/common/functions/fnc_hadamardProduct.sqf b/addons/common/functions/fnc_hadamardProduct.sqf index 5503643026..b063b35313 100644 --- a/addons/common/functions/fnc_hadamardProduct.sqf +++ b/addons/common/functions/fnc_hadamardProduct.sqf @@ -15,6 +15,8 @@ PARAMS_2(_vector1,_vector2); +private ["_newVector", "_i"]; + _newVector = []; for "_i" from 0 to (((count _vector1) min (count _vector2)) - 1) do { diff --git a/addons/common/functions/fnc_isEOD.sqf b/addons/common/functions/fnc_isEOD.sqf index 11fbf45306..92c5dc6dc4 100644 --- a/addons/common/functions/fnc_isEOD.sqf +++ b/addons/common/functions/fnc_isEOD.sqf @@ -16,7 +16,7 @@ BOOLEAN Example: - _isSpecialist = [player] call FUNC(isEOD); + isSpecialist = [player] call FUNC(isEOD); */ #include "script_component.hpp" diff --git a/addons/common/functions/fnc_localEvent.sqf b/addons/common/functions/fnc_localEvent.sqf index 0b8c218eca..256282f97f 100644 --- a/addons/common/functions/fnc_localEvent.sqf +++ b/addons/common/functions/fnc_localEvent.sqf @@ -14,6 +14,8 @@ PARAMS_2(_eventName,_eventArgs); +private["_eventIndex", "_eventNames", "_events"]; + _eventNames = GVAR(events) select 0; _eventIndex = _eventNames find _eventName; if(_eventIndex != -1) then { diff --git a/addons/common/functions/fnc_logModEntries.sqf b/addons/common/functions/fnc_logModEntries.sqf index 4b94c557bc..ec8c94b190 100644 --- a/addons/common/functions/fnc_logModEntries.sqf +++ b/addons/common/functions/fnc_logModEntries.sqf @@ -1,6 +1,7 @@ // by commy2 +#include "script_component.hpp" -private ["_configs", "_entries"]; +private ["_configs", "_entries", "_name"]; _configs = "true" configClasses (configFile >> _this); diff --git a/addons/common/functions/fnc_moduleCheckPBOs.sqf b/addons/common/functions/fnc_moduleCheckPBOs.sqf index e0fa562e8c..05e1037028 100644 --- a/addons/common/functions/fnc_moduleCheckPBOs.sqf +++ b/addons/common/functions/fnc_moduleCheckPBOs.sqf @@ -13,6 +13,8 @@ PARAMS_3(_logic,_units,_activated); +private ["_mode", "_checkAll", "_whitelist"]; + if !(_activated) exitWith {}; _mode = parseNumber (_logic getVariable "Action"); @@ -30,6 +32,7 @@ ACE_Version_Whitelist = _whitelist; if (!isServer) then { [_mode, _checkAll, _whitelist] spawn { + private ["_mode", "_checkAll", "_whitelist", "_missingAddon", "_missingAddonServer", "_oldVersionClient", "_oldVersionServer", "_text", "_error", "_rscLayer", "_ctrlHint"]; _mode = _this select 0; _checkAll = _this select 1; _whitelist = _this select 2; diff --git a/addons/common/functions/fnc_moduleLSDVehicles.sqf b/addons/common/functions/fnc_moduleLSDVehicles.sqf index dec118231d..59744016ce 100644 --- a/addons/common/functions/fnc_moduleLSDVehicles.sqf +++ b/addons/common/functions/fnc_moduleLSDVehicles.sqf @@ -13,6 +13,8 @@ PARAMS_3(_logic,_units,_activated); +private["_colors", "_hSCount", "_hiddenSelections", "_i", "_index", "_vehicle"]; + if !(_activated) exitWith {}; { diff --git a/addons/common/functions/fnc_receiveRequest.sqf b/addons/common/functions/fnc_receiveRequest.sqf index e6c39c1959..e7857b9436 100644 --- a/addons/common/functions/fnc_receiveRequest.sqf +++ b/addons/common/functions/fnc_receiveRequest.sqf @@ -42,6 +42,7 @@ GVAR(RECIEVE_REQUEST_ADD_ACTION_DECLINE) = _target addAction ["Decline", compile GVAR(RECIEVE_REQUEST_ID_KEY_BINDING) = _requestID; GVAR(RECIEVE_REQUEST_TIME_OUT_SCRIPT) = [time, _target, _requestID] spawn { + private["_id", "_t", "_requestID", "_target"]; _t = (_this select 0) + 40; _target = _this select 1; _requestID = _this select 2; diff --git a/addons/common/functions/fnc_removeSyncedEventHandler.sqf b/addons/common/functions/fnc_removeSyncedEventHandler.sqf index 835b26e526..84aa98c0ea 100644 --- a/addons/common/functions/fnc_removeSyncedEventHandler.sqf +++ b/addons/common/functions/fnc_removeSyncedEventHandler.sqf @@ -10,8 +10,11 @@ * Boolean of success */ #include "script_component.hpp" + PARAMS_1(_name); +private ["_data", "_eventId"]; + if (!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith { diag_log text format["[ACE] Error, synced event key not found."]; false diff --git a/addons/common/functions/fnc_resetAllDefaults.sqf b/addons/common/functions/fnc_resetAllDefaults.sqf index efa69d9059..61dc11f659 100644 --- a/addons/common/functions/fnc_resetAllDefaults.sqf +++ b/addons/common/functions/fnc_resetAllDefaults.sqf @@ -27,7 +27,7 @@ if (isPlayer _unit) then { if !(isnil QGVAR(DISABLE_USER_INPUT_COLLECTION)) then { // clear all disable user input { - [_X, false] call FUNC(setDisableUserInputStatus); + [_x, false] call FUNC(setDisableUserInputStatus); }foreach GVAR(DISABLE_USER_INPUT_COLLECTION); }; }; diff --git a/addons/common/functions/fnc_revertKeyCodeLocalized.sqf b/addons/common/functions/fnc_revertKeyCodeLocalized.sqf index 4acf460438..75168d4e84 100644 --- a/addons/common/functions/fnc_revertKeyCodeLocalized.sqf +++ b/addons/common/functions/fnc_revertKeyCodeLocalized.sqf @@ -11,7 +11,7 @@ */ #include "script_component.hpp" -private ["_key", "_alt", "_ctrl", "_shft"]; +private ["_key", "_alt", "_ctrl", "_shift"]; PARAMS_1(_keyCode); diff --git a/addons/common/functions/fnc_serverEvent.sqf b/addons/common/functions/fnc_serverEvent.sqf index 73bb77c600..9227b1a783 100644 --- a/addons/common/functions/fnc_serverEvent.sqf +++ b/addons/common/functions/fnc_serverEvent.sqf @@ -11,6 +11,7 @@ * Nothing */ #include "script_component.hpp" +//IGNORE_PRIVATE_WARNING("_handleNetEvent"); PARAMS_2(_eventName,_eventArgs); diff --git a/addons/common/functions/fnc_setSettingFromConfig.sqf b/addons/common/functions/fnc_setSettingFromConfig.sqf index adb9f7ef35..9a95819996 100644 --- a/addons/common/functions/fnc_setSettingFromConfig.sqf +++ b/addons/common/functions/fnc_setSettingFromConfig.sqf @@ -14,7 +14,7 @@ PARAMS_1(_optionEntry); -private ["_fnc_getValueWithType", "_value","_name", "_typeName", "_settingData"]; +private ["_fnc_getValueWithType", "_value","_name", "_typeName", "_settingData", "_valueConfig", "_text"]; _fnc_getValueWithType = { EXPLODE_2_PVT(_this,_optionEntry,_typeName); @@ -58,14 +58,14 @@ if (isNil _name) then { // Add the setting to a list on the server // Set the variable to not forced /*_settingData = [ - _name, - _typeName, - _isClientSettable, - _localizedName, - _localizedDescription, - _possibleValues, - _isForced, - _defaultValue + name, + typeName, + isClientSettable, + localizedName, + localizedDescription, + possibleValues, + isForced, + defaultValue ];*/ _settingData = [ _name, diff --git a/addons/common/functions/fnc_subString.sqf b/addons/common/functions/fnc_subString.sqf deleted file mode 100644 index eeadfffa62..0000000000 --- a/addons/common/functions/fnc_subString.sqf +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Author: KoffeinFlummi - * - * Returns a fraction of the given string, starting at a given index, with a given length. - * - * Arguments: - * 0: Source string - * 1: Starting index of new string - * 2: Length of the new string - * - * Return Value: - * String when successfull / False when not - */ -#include "script_component.hpp" - -PARAMS_3(_string,_index,_length); - -_array = toArray _string; -if (_index < 0 or _length < 0 or _index + _length > (count _array) + 1) exitWith {false}; - -_arrayNew = []; -for "_i" from _index to (_index + _length - 1) do { - _arrayNew = _arrayNew + [(_array select _i)]; -}; - -toString _arrayNew diff --git a/addons/common/functions/fnc_syncedEventPFH.sqf b/addons/common/functions/fnc_syncedEventPFH.sqf index e8a21202ab..2762ae2656 100644 --- a/addons/common/functions/fnc_syncedEventPFH.sqf +++ b/addons/common/functions/fnc_syncedEventPFH.sqf @@ -7,7 +7,7 @@ if(!isServer) exitWith { false }; // @TODO: This should be iteration limited to prevent FPS lag private["_data"]; { - private["_data", "_ttl", "_eventLog", "_newEventLog", "_name"]; + private["_data", "_ttl", "_eventLog", "_newEventLog", "_name", "_globalEventTTL"]; _name = _x; _data = HASH_GET(GVAR(syncedEvents),_name); diff --git a/addons/common/functions/fnc_targetEvent.sqf b/addons/common/functions/fnc_targetEvent.sqf index cb78c29c18..22bd7431f5 100644 --- a/addons/common/functions/fnc_targetEvent.sqf +++ b/addons/common/functions/fnc_targetEvent.sqf @@ -16,6 +16,8 @@ */ #include "script_component.hpp" +//IGNORE_PRIVATE_WARNING("_handleNetEvent"); + PARAMS_3(_eventName,_eventTargets,_eventArgs); #ifdef DEBUG_EVENTS diff --git a/addons/common/functions/fnc_toNumber.sqf b/addons/common/functions/fnc_toNumber.sqf index 9c4203e07e..55a9ba2787 100644 --- a/addons/common/functions/fnc_toNumber.sqf +++ b/addons/common/functions/fnc_toNumber.sqf @@ -14,7 +14,7 @@ NUMBER Example: - _number = ["102"] call FUNC(toNumber); + number = ["102"] call FUNC(toNumber); */ #include "script_component.hpp" diff --git a/addons/common/functions/fnc_translateToModelSpace.sqf b/addons/common/functions/fnc_translateToModelSpace.sqf index 1e2e930ac7..d2dfa38643 100644 --- a/addons/common/functions/fnc_translateToModelSpace.sqf +++ b/addons/common/functions/fnc_translateToModelSpace.sqf @@ -1,3 +1,7 @@ +#include "script_component.hpp" + +private["_matrix", "_object", "_offset", "_origin", "_out", "_xVec", "_y", "_yVec", "_z", "_zVec"]; + _object = _this select 0; _origin = getPosASL _object; _matrix = _this select 1; diff --git a/addons/common/functions/fnc_translateToWeaponSpace.sqf b/addons/common/functions/fnc_translateToWeaponSpace.sqf index 2c7dc5e6da..ca1544b317 100644 --- a/addons/common/functions/fnc_translateToWeaponSpace.sqf +++ b/addons/common/functions/fnc_translateToWeaponSpace.sqf @@ -1,3 +1,7 @@ +#include "script_component.hpp" + +private["_matrix", "_object", "_offset", "_origin", "_out", "_xVec", "_y", "_yVec", "_z", "_zVec"]; + _object = _this select 0; _origin = getPosASL _object; _matrix = _this select 1; diff --git a/addons/common/functions/fnc_useItem.sqf b/addons/common/functions/fnc_useItem.sqf index cc4d0491fd..03589cd56d 100644 --- a/addons/common/functions/fnc_useItem.sqf +++ b/addons/common/functions/fnc_useItem.sqf @@ -10,8 +10,10 @@ #include "script_component.hpp" -private ["_return"]; PARAMS_2(_unit,_item); + +private ["_return", "_vehicleUsage"]; + _vehicleUsage = [_this, 2, false, [false]] call BIS_fnc_Param; _return = false; diff --git a/addons/common/functions/fnc_useMagazine.sqf b/addons/common/functions/fnc_useMagazine.sqf index e29c3489ef..f21a04d026 100644 --- a/addons/common/functions/fnc_useMagazine.sqf +++ b/addons/common/functions/fnc_useMagazine.sqf @@ -10,7 +10,7 @@ #include "script_component.hpp" -private ["_return"]; +private ["_return", "_vehicleUsage"]; PARAMS_2(_unit,_magazine); _vehicleUsage = [_this, 2, false, [false]] call BIS_fnc_Param; diff --git a/addons/common/functions/fnc_worldToScreenBounds.sqf b/addons/common/functions/fnc_worldToScreenBounds.sqf index afb5817d81..b3b5ba3f1e 100644 --- a/addons/common/functions/fnc_worldToScreenBounds.sqf +++ b/addons/common/functions/fnc_worldToScreenBounds.sqf @@ -5,7 +5,7 @@ #include "script_component.hpp" -private ["_minX","_minY","_maxX","_maxY"]; +private ["_minX","_minY","_maxX","_maxY", "_bounds", "_boundsCorners", "_boundsMax", "_boundsMaxX", "_boundsMaxY", "_boundsMaxZ", "_boundsMin", "_boundsMinX", "_boundsMinY", "_boundsMinZ"]; PARAMS_3(_object,_margins,_offsets); diff --git a/addons/common/scripts/Version/checkVersionNumber.sqf b/addons/common/scripts/Version/checkVersionNumber.sqf index 74f130596a..07bd443a06 100644 --- a/addons/common/scripts/Version/checkVersionNumber.sqf +++ b/addons/common/scripts/Version/checkVersionNumber.sqf @@ -1,6 +1,8 @@ // by commy2 #include "script_component.hpp" +private["_client", "_clientVersion", "_count", "_error", "_files", "_index", "_missingAddon", "_missingAddonServer", "_missingAddons", "_missingAddonsServer", "_oldVersionClient", "_oldVersionServer", "_oldVersionsClient", "_oldVersionsServer", "_serverFiles", "_serverVersion", "_serverVersions", "_string", "_version", "_versions"]; + _files = []; { diff --git a/addons/common/scripts/assignedItemFix.sqf b/addons/common/scripts/assignedItemFix.sqf index c118115bed..bcf79a3ac1 100644 --- a/addons/common/scripts/assignedItemFix.sqf +++ b/addons/common/scripts/assignedItemFix.sqf @@ -1,6 +1,8 @@ // by commy2 #include "script_component.hpp" +private ["_config"]; + ACE_isMapEnabled = call {_config = missionConfigFile >> "showMap"; !isNumber _config || {getNumber _config == 1}}; // default value is 1, so do isNumber check first ACE_isCompassEnabled = call {_config = missionConfigFile >> "showCompass"; !isNumber _config || {getNumber _config == 1}}; ACE_isWatchEnabled = call {_config = missionConfigFile >> "showWatch"; !isNumber _config || {getNumber _config == 1}}; diff --git a/addons/common/scripts/initScrollWheel.sqf b/addons/common/scripts/initScrollWheel.sqf index 5a8bf57d79..78920bb371 100644 --- a/addons/common/scripts/initScrollWheel.sqf +++ b/addons/common/scripts/initScrollWheel.sqf @@ -4,12 +4,13 @@ GVAR(ScrollWheelFrame) = diag_frameno; GVAR(onScrollWheel) = { - _scroll = _this select 1; + private ["_scroll"]; + _scroll = _this select 1; - if (GVAR(ScrollWheelFrame) == diag_frameno) exitWith {}; - GVAR(ScrollWheelFrame) = diag_frameno; + if (GVAR(ScrollWheelFrame) == diag_frameno) exitWith {}; + GVAR(ScrollWheelFrame) = diag_frameno; - { - [_scroll] call _x; - } count ((missionNamespace getVariable ["ACE_EventHandler_ScrollWheel", [-1, [], []]]) select 2); + { + [_scroll] call _x; + } count ((missionNamespace getVariable ["ACE_EventHandler_ScrollWheel", [-1, [], []]]) select 2); }; From d5db268fc06c060180d2f6e4f174e7bfe1c56997 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 14 May 2015 17:17:41 -0500 Subject: [PATCH 12/34] Clean unused privates --- addons/common/functions/fnc_canInteract.sqf | 2 -- addons/common/functions/fnc_changeProjectileDirection.sqf | 2 +- addons/common/functions/fnc_debug.sqf | 2 +- addons/common/functions/fnc_getTurretDirection.sqf | 2 +- addons/common/functions/fnc_isAwake.sqf | 1 - addons/common/functions/fnc_moveToTempGroup.sqf | 2 +- addons/common/functions/fnc_removeActionEventHandler.sqf | 2 +- addons/common/functions/fnc_resetAllDefaults.sqf | 2 -- addons/common/functions/fnc_setDefinedVariable.sqf | 2 +- addons/common/functions/fnc_syncedEvent.sqf | 2 +- addons/common/functions/fnc_syncedEventPFH.sqf | 2 +- addons/common/functions/fnc_timePFH.sqf | 2 +- 12 files changed, 9 insertions(+), 14 deletions(-) diff --git a/addons/common/functions/fnc_canInteract.sqf b/addons/common/functions/fnc_canInteract.sqf index bdf87b20b7..4b3e22f646 100644 --- a/addons/common/functions/fnc_canInteract.sqf +++ b/addons/common/functions/fnc_canInteract.sqf @@ -9,8 +9,6 @@ */ #include "script_component.hpp" -private ["_return"]; - PARAMS_1(_unit); (((_unit getvariable [QGVAR(canInteract),0]) < 1) && ([_unit] call FUNC(isAwake)) && !([_unit] call FUNC(isArrested))) \ No newline at end of file diff --git a/addons/common/functions/fnc_changeProjectileDirection.sqf b/addons/common/functions/fnc_changeProjectileDirection.sqf index b47ff0f96a..5a65ccff41 100644 --- a/addons/common/functions/fnc_changeProjectileDirection.sqf +++ b/addons/common/functions/fnc_changeProjectileDirection.sqf @@ -14,7 +14,7 @@ */ #include "script_component.hpp" -private ["_adjustSpeed", "_vdir", "_dir", "_up", "_l", "_r", "_vup", "_vel", "_vlat"]; +private ["_adjustSpeed", "_vdir", "_dir", "_up", "_vup", "_vel", "_vlat"]; PARAMS_3(_projectile,_adjustDir,_adjustUp); diff --git a/addons/common/functions/fnc_debug.sqf b/addons/common/functions/fnc_debug.sqf index b430c288a0..fd1d3d59fa 100644 --- a/addons/common/functions/fnc_debug.sqf +++ b/addons/common/functions/fnc_debug.sqf @@ -12,7 +12,7 @@ #define DEFAULT_LOGGING_LEVEL -1 #define DEFAULT_TEXT_DISPLAY -1 -private ["_level", "_prefix", "_defaultLoglevel","_defaultLogDisplayLevel", "_message", "_from"]; +private ["_level", "_prefix", "_defaultLoglevel","_defaultLogDisplayLevel", "_message"]; PARAMS_1(_msg); _level = if (count _this > 1) then {_this select 1} else { 2 }; diff --git a/addons/common/functions/fnc_getTurretDirection.sqf b/addons/common/functions/fnc_getTurretDirection.sqf index d3a49f84f1..31b68ccabc 100644 --- a/addons/common/functions/fnc_getTurretDirection.sqf +++ b/addons/common/functions/fnc_getTurretDirection.sqf @@ -13,7 +13,7 @@ #include "script_component.hpp" PARAMS_2(_vehicle,_position); -private ["_turrets", "_turret", "_config", "_turret", "_povPos", "_povDir", "_gunBeginPos", "_gunEndPos", "_pov", "_gunBeg", "_gunEnd", "_pipDir"]; +private ["_turret", "_povPos", "_povDir", "_gunBeginPos", "_gunEndPos", "_pov", "_gunBeg", "_gunEnd", "_pipDir"]; _turret = [_vehicle, _position] call CBA_fnc_getTurret; _pov = getText (_turret >> "memoryPointGunnerOptics"); diff --git a/addons/common/functions/fnc_isAwake.sqf b/addons/common/functions/fnc_isAwake.sqf index 01c03bfc1f..c0dd59288e 100644 --- a/addons/common/functions/fnc_isAwake.sqf +++ b/addons/common/functions/fnc_isAwake.sqf @@ -10,7 +10,6 @@ #include "script_component.hpp" -private ["_return"]; PARAMS_1(_unit); (!(_unit getvariable ["ACE_isUnconscious",false]) && alive _unit && !(_unit getvariable ["ACE_isDead",false])); diff --git a/addons/common/functions/fnc_moveToTempGroup.sqf b/addons/common/functions/fnc_moveToTempGroup.sqf index 802bc2285d..be7335c705 100644 --- a/addons/common/functions/fnc_moveToTempGroup.sqf +++ b/addons/common/functions/fnc_moveToTempGroup.sqf @@ -10,7 +10,7 @@ #include "script_component.hpp" -private ["_unit","_moveTo","_previousGroup","_newGroup", "_currentGroup", "_switchToGroup"]; +private ["_unit","_moveTo","_previousGroup","_newGroup", "_currentGroup"]; _unit = [_this, 0,ObjNull,[ObjNull]] call BIS_fnc_Param; _moveTo = [_this, 1,false,[false]] call BIS_fnc_Param; diff --git a/addons/common/functions/fnc_removeActionEventHandler.sqf b/addons/common/functions/fnc_removeActionEventHandler.sqf index 693741d193..805a0bdde9 100644 --- a/addons/common/functions/fnc_removeActionEventHandler.sqf +++ b/addons/common/functions/fnc_removeActionEventHandler.sqf @@ -13,7 +13,7 @@ */ #include "script_component.hpp" -private ["_name", "_actionsVar", "_actionID", "_actions", "_currentID", "_actionIDs", "_count"]; +private ["_name", "_actionsVar", "_actionID", "_actions", "_currentID", "_actionIDs"]; PARAMS_3(_unit,_action,_id); diff --git a/addons/common/functions/fnc_resetAllDefaults.sqf b/addons/common/functions/fnc_resetAllDefaults.sqf index 61dc11f659..3040334ad0 100644 --- a/addons/common/functions/fnc_resetAllDefaults.sqf +++ b/addons/common/functions/fnc_resetAllDefaults.sqf @@ -10,8 +10,6 @@ #include "script_component.hpp" -private ["_oldUnit","_sets"]; - PARAMS_1(_unit); _unit setvariable ["ACE_isDead",nil,true]; diff --git a/addons/common/functions/fnc_setDefinedVariable.sqf b/addons/common/functions/fnc_setDefinedVariable.sqf index 54bc8d0c5f..ea8a326f21 100644 --- a/addons/common/functions/fnc_setDefinedVariable.sqf +++ b/addons/common/functions/fnc_setDefinedVariable.sqf @@ -10,7 +10,7 @@ #include "script_component.hpp" -private ["_update","_global","_definedVariable","_defaultGlobal","_currentValue"]; +private ["_global","_definedVariable"]; PARAMS_3(_unit,_variable,_value); diff --git a/addons/common/functions/fnc_syncedEvent.sqf b/addons/common/functions/fnc_syncedEvent.sqf index 2ceb77b073..9100e5a19a 100644 --- a/addons/common/functions/fnc_syncedEvent.sqf +++ b/addons/common/functions/fnc_syncedEvent.sqf @@ -16,7 +16,7 @@ PARAMS_2(_name,_args); -private["_ttl", "_eventData", "_internalData", "_eventLog"]; +private["_ttl", "_eventData"]; if( (count _this) > 2) then { _ttl = _this select 2; diff --git a/addons/common/functions/fnc_syncedEventPFH.sqf b/addons/common/functions/fnc_syncedEventPFH.sqf index 2762ae2656..12ce0b0141 100644 --- a/addons/common/functions/fnc_syncedEventPFH.sqf +++ b/addons/common/functions/fnc_syncedEventPFH.sqf @@ -7,7 +7,7 @@ if(!isServer) exitWith { false }; // @TODO: This should be iteration limited to prevent FPS lag private["_data"]; { - private["_data", "_ttl", "_eventLog", "_newEventLog", "_name", "_globalEventTTL"]; + private["_data", "_eventLog", "_newEventLog", "_name", "_globalEventTTL"]; _name = _x; _data = HASH_GET(GVAR(syncedEvents),_name); diff --git a/addons/common/functions/fnc_timePFH.sqf b/addons/common/functions/fnc_timePFH.sqf index ee8fe4a9bb..6385c4d05e 100644 --- a/addons/common/functions/fnc_timePFH.sqf +++ b/addons/common/functions/fnc_timePFH.sqf @@ -1,7 +1,7 @@ //#define DEBUG_MODE_FULL #include "script_component.hpp" -private["_lastTime", "_lastRealTime", "_lastVirtualTime", "_lastGameTime", "_delta"]; +private["_lastRealTime", "_lastGameTime", "_delta"]; _lastRealTime = ACE_realTime; _lastGameTime = ACE_gameTime; From 8cab041806c6ccf334e961f8e44bf333a44bfa30 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 14 May 2015 17:24:37 -0500 Subject: [PATCH 13/34] Missing Nametag Settings File from #1196 --- addons/nametags/ACE_Settings.hpp | 57 ++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 addons/nametags/ACE_Settings.hpp diff --git a/addons/nametags/ACE_Settings.hpp b/addons/nametags/ACE_Settings.hpp new file mode 100644 index 0000000000..a2c81e61b4 --- /dev/null +++ b/addons/nametags/ACE_Settings.hpp @@ -0,0 +1,57 @@ +class ACE_Settings { + class GVAR(defaultNametagColor) { + value[] = {0.77, 0.51, 0.08, 1}; + typeName = "COLOR"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_DefaultNametagColor"; + }; + class GVAR(showPlayerNames) { + value = 1; + typeName = "SCALAR"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_ShowPlayerNames"; + description = "$STR_ACE_NameTags_ShowPlayerNames_Desc"; + values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_Enabled", "$STR_ACE_Common_OnlyCursor", "$STR_ACE_Common_OnlyOnKeypress", "$STR_ACE_Common_OnlyCursorAndKeyPress"}; + }; + class GVAR(showPlayerRanks) { + value = 1; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_ShowPlayerRanks"; + }; + class GVAR(showVehicleCrewInfo) { + value = 1; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_ShowVehicleCrewInfo"; + }; + class GVAR(showNamesForAI) { + value = 0; + typeName = "BOOL"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_ShowNamesForAI"; + }; + class GVAR(showCursorTagForVehicles) { + value = 0; + typeName = "BOOL"; + isClientSettable = 0; + }; + class GVAR(showSoundWaves) { + value = 1; + typeName = "SCALAR"; + isClientSettable = 1; + displayName = "$STR_ACE_NameTags_ShowSoundWaves"; + description = "$STR_ACE_NameTags_ShowSoundWaves_Desc"; + values[] = {"$STR_ACE_Common_Disabled", "$STR_ACE_Common_NameTagSettings", "$STR_ACE_Common_AlwaysShowAll"}; + }; + class GVAR(PlayerNamesViewDistance) { + value = 5; + typeName = "SCALAR"; + isClientSettable = 0; + }; + class GVAR(PlayerNamesMaxAlpha) { + value = 0.8; + typeName = "SCALAR"; + isClientSettable = 0; + }; +}; \ No newline at end of file From 6ca2be5247967cf0ed49ee938bc42aaf1551186f Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 15 May 2015 01:04:57 +0200 Subject: [PATCH 14/34] Overworked the advanced ballistics documentation --- documentation/feature/advanced_ballistics.md | 29 ++++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/documentation/feature/advanced_ballistics.md b/documentation/feature/advanced_ballistics.md index 671164a2d9..5f67cdebc2 100644 --- a/documentation/feature/advanced_ballistics.md +++ b/documentation/feature/advanced_ballistics.md @@ -4,29 +4,22 @@ title: Advanced Ballistics group: feature parent: wiki --- -# Overview -## Advanced ballistics simulation -The advanced ballistics module improves projectile physics by simulating internal and external ballistics. Factors used in the simulation include: -- Ambient air pressure, temperature and humidity -- Wind drift +# Overview +The advanced ballistics module improves internal- and external ballistics. + +# Features +- Drag modeling based on real-world ballistic coefficients. +- Ambient air density (air pressure, temperature, humidity) affects drag. +- Wind affects drag and deflects the trajectory. +- Wind speed varies with altitude. +- Terrain features, buildings and other objects disrupt the wind. - [Magnus effect](https://en.wikipedia.org/wiki/Magnus_effect) (spin drift) - [Coriolis effect](https://en.wikipedia.org/wiki/Coriolis_effect) and [Eötvös effect](https://en.wikipedia.org/wiki/Eotvos_effect) (Earth rotation) - Loss of stability during transonic flight - Variable muzzle velocity based on on powder burn rate and barrel length -- Barrel length effect on muzzle velocity - -## Advanced drag model -Realistic drag modeling based on the G Model and real-world ballistic coefficient data. - -## Wind simulation -Wind speed varies with altitude. Terrain features, buildings and other objects disrupt the wind. - -## Bullet trace effects -Supersonic bullets have a refraction effect due to air pressure waves. - -## Protractor -Adds a protractor for quickly measuring inclination angle. +- Bullet trace effect for supersonic bullets (light refraction due to air pressure waves). +- A protractor for quickly measuring the inclination angle. # Usage Press Ctrl+Shift+K while using a compatible weapon to toggle the protractor. The red line indicates the current inclination angle in degrees. The protractor will disappear if you lower or holster your weapon. From 049a708464c6015bc7b5bb25215a7566d9f7d5b5 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 15 May 2015 02:05:39 +0300 Subject: [PATCH 15/34] Fix typos --- documentation/feature/ballistics.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/feature/ballistics.md b/documentation/feature/ballistics.md index 5d2f92baa9..238c2fcf6a 100644 --- a/documentation/feature/ballistics.md +++ b/documentation/feature/ballistics.md @@ -16,7 +16,7 @@ Decreases protection values of vests, CSAT uniforms and various campaign only ge Silencers no longer decrease the muzzle velocity and are generally less effective when used with normal ammunition. They now only remove the muzzle blast and flash. To prevent the crack caused by supersonic projectiles, ACE introduces subsonic ammunition for the 7.62mm caliber. This is also fully compatible with AI. ## Armour piercing ammunition -Armour piercing rounds have higher penetration values against light armoured targets or other obstacles on the battlefield. Their drawback is a slightly decreased man-stopping power. AP rounds are available multiple calibers incudling 5.56mm and 7.62mm. +Armour piercing rounds have higher penetration values against light armoured targets or other obstacles on the battlefield. Their drawback is a slightly decreased man-stopping power. AP rounds are available in multiple calibers incudling 5.56mm and 7.62mm. ## IR-Dim tracer ammunition IR-Dim ammunition is similar to tracer rounds, but their tracers are only visible using night vision devices. @@ -25,7 +25,7 @@ IR-Dim ammunition is similar to tracer rounds, but their tracers are only visibl The M14 EBR now uses ammunition with decreased muzzle velocity and air friction to improve precision and energy retention at long ranges. ## Flash suppressors -Flash suppressors are similar to sound suppressors and prevent the muzzle flash reducing visibility without decreasing combat effectiveness. Flash suppressors are available for the calibers 5.56mm, 6.5mm, 7.62mm, .45 ACP and 9mm. +Flash suppressors are similar to sound suppressors and prevent the muzzle flash from reducing visibility without decreasing combat effectiveness. Flash suppressors are available for the calibers 5.56mm, 6.5mm, 7.62mm, .45 ACP and 9mm. ## Fully config-based This module uses configuration changes only and does not decrease game performance. From 3313177d6456153fbc2159c86f35751eefb12dc8 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 15 May 2015 02:11:55 +0300 Subject: [PATCH 16/34] Fix typos --- documentation/feature/aircraft.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/feature/aircraft.md b/documentation/feature/aircraft.md index 2e879c31f6..de9737ac69 100644 --- a/documentation/feature/aircraft.md +++ b/documentation/feature/aircraft.md @@ -12,7 +12,7 @@ parent: wiki Changes the flight behaviour of various aircraft. ### Various adjustments to aircraft and gunships munitions -- Higher capacity magazines for the comanche. +- Higher capacity magazines for the Comanche. - Gatling rate of fire (ROF) increased. - AP rockets have less splash damage. @@ -25,11 +25,11 @@ Adds the semi-automatic flare mode known from Arma 2. The key to switch the mode ### Ejecting from pilot and copilot seats Pilots and copilots of all helicopters can now eject. -### Laser marker for wildcat +### Laser marker for Wildcat Adds a laser marker to the copilot seat of the Wildcat. ### HUD for AH-9 -Adds a HUD to the AH-9 based on the comanches HUD. +Adds a HUD to the AH-9 based on the Comanche's HUD. ## Usage From 666db5e245db35ba0f3b796617ff4e2d57aa56aa Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 14 May 2015 18:13:20 -0500 Subject: [PATCH 17/34] Fix Typo --- addons/common/functions/fnc__handleRequestSyncedEvent.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf index 3507071d39..fe05bc498b 100644 --- a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf +++ b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf @@ -17,7 +17,7 @@ //#define DEBUG_MODE_FULL #include "script_component.hpp" -+//IGNORE_PRIVATE_WARNING("_handleSyncedEvent"); +//IGNORE_PRIVATE_WARNING("_handleSyncedEvent"); //SEH_s if(isServer) then { From 94138df4f244e919e906c07ff4c7e026e3291444 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 15 May 2015 02:15:54 +0300 Subject: [PATCH 18/34] Fix typos/grammar/redundancy --- documentation/feature/attach.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/documentation/feature/attach.md b/documentation/feature/attach.md index b9dd4243f5..f356630bac 100644 --- a/documentation/feature/attach.md +++ b/documentation/feature/attach.md @@ -8,7 +8,7 @@ parent: wiki ## Overview ### Attach items to uniform -Enables player to attach IR grenades and chemlights to themselves. +Allows players to attach IR grenades and chemlights to themselves. ### IR Strobe Adds an attachable IR strobe, which is only visible using night vision devices and offers better visibility than IR grenades. @@ -16,19 +16,17 @@ Adds an attachable IR strobe, which is only visible using night vision devices a ## Usage -### attaching to yourself +### Attaching to yourself - Press the self interaction key -- go to the equipment section -- choose the item to attach +- Go to the equipment section +- Choose the item to attach/detach -same thing to detach - -### attaching to a vehicle +### Attaching to a vehicle - Approach the vehicle and use the interaction key -- Attach item section -- Choose your item and where you want to place it +- Go to the attach item section +- Choose the item and where you want to place it -to detach the item use the interaction key from outside the vehicle +To detach the item use the interaction key from outside the vehicle ## Dependencies From 7fe431113c7891236a9b9914801e30b472cb2747 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 15 May 2015 02:24:53 +0300 Subject: [PATCH 19/34] Fix typos/grammar/redundancy --- documentation/feature/captives.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/documentation/feature/captives.md b/documentation/feature/captives.md index 81a8d268fd..b0bab6da7e 100644 --- a/documentation/feature/captives.md +++ b/documentation/feature/captives.md @@ -17,28 +17,27 @@ You can load and unload captives from vehicles using ACE 3 interactions. You can frisk a restrained captive. ### Surrendering -You can surrender, while surrendering AI will cease fire. +You can surrender. While surrendering AI will cease fire. ## Usage -### Capturing someone +### Capturing a target - You need cable ties. -- Approach the victim / convict and use the interaction button. +- Approach the target and use the interaction button. - The interaction is around the hands in the form of a handcuffs icon. -- To free someone it's the same -- Use the interaction key, check around the hands for the handcuffs icon. +- To release, interact with the captive. ### Escorting a captive - Interact with the captive. -- Select the escort prisoner option. +- Select the "Escort prisoner" option. - To stop escorting just scroll down or use self interaction. -### Loading and unloading a captive in vehicle -- Escort the person. +### Loading and unloading a captive in a vehicle +- Escort the captive. - Approach the vehicle you desire to load the captive in. - Interact with the vehicle and load him. -- Same for unloading, interact with the vehicle then unload. +- To unload, interact with the vehicle. ## Dependencies From a8da880870cadbe74eb019979a4df20dc1e9fe26 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 15 May 2015 02:31:41 +0300 Subject: [PATCH 20/34] Update captives.md --- documentation/feature/captives.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/feature/captives.md b/documentation/feature/captives.md index b0bab6da7e..ef29556481 100644 --- a/documentation/feature/captives.md +++ b/documentation/feature/captives.md @@ -36,7 +36,7 @@ You can surrender. While surrendering AI will cease fire. ### Loading and unloading a captive in a vehicle - Escort the captive. - Approach the vehicle you desire to load the captive in. -- Interact with the vehicle and load him. +- Interact with the vehicle and load the captive. - To unload, interact with the vehicle. From 297cbaef0872e8dbdc8a46ec42855e39cbd1dd2c Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Thu, 14 May 2015 18:49:11 -0500 Subject: [PATCH 21/34] #1212 - Add PREP for explosive's module function --- addons/explosives/XEH_preInit.sqf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/explosives/XEH_preInit.sqf b/addons/explosives/XEH_preInit.sqf index 435624d2a5..d010fd8d1e 100644 --- a/addons/explosives/XEH_preInit.sqf +++ b/addons/explosives/XEH_preInit.sqf @@ -40,6 +40,8 @@ PREP(getDetonators); PREP(getPlacedExplosives); PREP(getSpeedDialExplosive); +PREP(module); + PREP(onLanded); PREP(openTimerSetUI); From c00f2c2e09750392cf6fd07ccfa822b77490d4ad Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 15 May 2015 09:25:36 +0200 Subject: [PATCH 22/34] Fixed the headings in the ab documentation --- documentation/feature/advanced_ballistics.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/feature/advanced_ballistics.md b/documentation/feature/advanced_ballistics.md index 5f67cdebc2..323e0b4383 100644 --- a/documentation/feature/advanced_ballistics.md +++ b/documentation/feature/advanced_ballistics.md @@ -5,10 +5,10 @@ group: feature parent: wiki --- -# Overview +## 1. Overview The advanced ballistics module improves internal- and external ballistics. -# Features +## 2. Features - Drag modeling based on real-world ballistic coefficients. - Ambient air density (air pressure, temperature, humidity) affects drag. - Wind affects drag and deflects the trajectory. @@ -21,10 +21,10 @@ The advanced ballistics module improves internal- and external ballistics. - Bullet trace effect for supersonic bullets (light refraction due to air pressure waves). - A protractor for quickly measuring the inclination angle. -# Usage +## 3. Usage Press Ctrl+Shift+K while using a compatible weapon to toggle the protractor. The red line indicates the current inclination angle in degrees. The protractor will disappear if you lower or holster your weapon. This module uses relatively complex scripting. Several options are provided in the ACE menu to reduce the performance impact of this module. -# Dependencies +## Dependencies `ace_ballistics`, `ace_weather`, `ace_modules` From 4e37f7ea7735625274d46f72700ec03c5f56c421 Mon Sep 17 00:00:00 2001 From: bux578 Date: Fri, 15 May 2015 09:45:15 +0200 Subject: [PATCH 23/34] add description fields to frontmatter header --- documentation/development/ace3-config-entries.md | 1 + documentation/development/ace3-events-system.md | 1 + documentation/development/arma-3-issues.md | 1 + .../development/arma-3-scheduler-and-our-practices.md | 1 + documentation/development/coding-guidelines.md | 1 + documentation/development/extension-guidelines.md | 1 + documentation/development/how-to-translate-ace3.md | 1 + documentation/development/merging-pull-requests.md | 1 + documentation/development/modularity-and-pbo-structure.md | 1 + .../development/setting-up-the-development-environment.md | 1 + documentation/feature/advanced_ballistics.md | 1 + documentation/feature/ai.md | 1 + documentation/feature/aircraft.md | 1 + documentation/feature/apl.md | 1 + documentation/feature/atragmx.md | 1 + documentation/feature/attach.md | 1 + documentation/feature/backpacks.md | 1 + documentation/feature/ballistics.md | 1 + documentation/feature/captives.md | 1 + documentation/feature/common.md | 1 + documentation/feature/difficulties.md | 1 + documentation/feature/disarming.md | 1 + documentation/feature/disposable.md | 1 + documentation/feature/dragging.md | 1 + documentation/feature/explosives.md | 1 + documentation/feature/fcs.md | 1 + documentation/feature/flashsuppressors.md | 1 + documentation/feature/frag.md | 1 + documentation/feature/gforces.md | 1 + documentation/feature/goggles.md | 1 + documentation/feature/grenades.md | 1 + documentation/feature/hearing.md | 1 + documentation/feature/hitreactions.md | 1 + documentation/feature/interact_menu.md | 1 + documentation/feature/interaction.md | 1 + documentation/feature/inventory.md | 1 + documentation/feature/javelin.md | 1 + documentation/feature/kestrel4500.md | 1 + documentation/feature/laser.md | 1 + documentation/feature/laser_selfdesignate.md | 1 + documentation/feature/laserpointer.md | 1 + documentation/feature/logistics_uavbattery.md | 1 + documentation/feature/logistics_wirecutter.md | 1 + documentation/feature/magazinerepack.md | 1 + documentation/feature/main.md | 1 + documentation/feature/map.md | 1 + documentation/feature/maptools.md | 1 + documentation/feature/markers.md | 1 + documentation/feature/medical-system.md | 1 + documentation/feature/microdagr.md | 1 + documentation/feature/missileguidance.md | 1 + documentation/feature/missionmodules.md | 1 + documentation/feature/mk6mortar.md | 1 + documentation/feature/movement.md | 1 + documentation/feature/nametags.md | 1 + documentation/feature/nightvision.md | 1 + documentation/feature/noidle.md | 1 + documentation/feature/noradio.md | 1 + documentation/feature/norearm.md | 1 + documentation/feature/optics.md | 1 + documentation/feature/optionsmenu.md | 1 + documentation/feature/overheating.md | 2 ++ documentation/feature/overpressure.md | 1 + documentation/feature/parachute.md | 1 + documentation/feature/protection.md | 1 + documentation/feature/ragdolls.md | 1 + documentation/feature/realisticnames.md | 1 + documentation/feature/recoil.md | 1 + documentation/feature/reload.md | 1 + documentation/feature/reloadlaunchers.md | 1 + documentation/feature/respawn.md | 1 + documentation/feature/safemode.md | 1 + documentation/feature/scopes.md | 1 + documentation/feature/smallarms.md | 1 + documentation/feature/switchunits.md | 1 + documentation/feature/testmissions.md | 1 + documentation/feature/thermals.md | 1 + documentation/feature/vector.md | 1 + documentation/feature/vehiclelock.md | 1 + documentation/feature/vehicles.md | 1 + documentation/feature/weaponselect.md | 1 + documentation/feature/weather.md | 1 + documentation/feature/windeflection.md | 1 + documentation/framework/advanced-missile-guidance.md | 3 ++- documentation/framework/carry-drag.md | 1 + documentation/framework/fragmentation-configuration.md | 3 ++- documentation/framework/settings.md | 3 ++- documentation/missionmaker/mission-tools.md | 1 + documentation/missionmaker/modules.md | 1 + documentation/user/getting-started.md | 1 + documentation/user/how-to-make-a-feature-request.md | 1 + documentation/user/how-to-report-an-issue.md | 1 + documentation/user/promotional-material.md | 1 + documentation/user/shortcuts.md | 1 + 94 files changed, 98 insertions(+), 3 deletions(-) diff --git a/documentation/development/ace3-config-entries.md b/documentation/development/ace3-config-entries.md index fcd85ccfe1..c6d9009358 100644 --- a/documentation/development/ace3-config-entries.md +++ b/documentation/development/ace3-config-entries.md @@ -1,6 +1,7 @@ --- layout: wiki title: ACE3 Config Entries +description: A list of all ACE3 config entries. group: development parent: wiki order: 2 diff --git a/documentation/development/ace3-events-system.md b/documentation/development/ace3-events-system.md index 393005bdf4..77281c9c7c 100644 --- a/documentation/development/ace3-events-system.md +++ b/documentation/development/ace3-events-system.md @@ -1,6 +1,7 @@ --- layout: wiki title: ACE3 Events System +description: Event handlers in ACE3 are implemented through our event system. They should be used to trigger or allow triggering of specific functionality. group: development parent: wiki order: 3 diff --git a/documentation/development/arma-3-issues.md b/documentation/development/arma-3-issues.md index 79f0336e9b..4a3e9ea0fc 100644 --- a/documentation/development/arma-3-issues.md +++ b/documentation/development/arma-3-issues.md @@ -1,6 +1,7 @@ --- layout: wiki title: Arma 3 Issues +description: Keeping track of Arma 3 issues that need to be fixed. If you want to support us and help raise Bohemia's awareness of those issues, please upvote them. group: development parent: wiki order: 6 diff --git a/documentation/development/arma-3-scheduler-and-our-practices.md b/documentation/development/arma-3-scheduler-and-our-practices.md index 95852792d8..3d9bf0525e 100644 --- a/documentation/development/arma-3-scheduler-and-our-practices.md +++ b/documentation/development/arma-3-scheduler-and-our-practices.md @@ -1,6 +1,7 @@ --- layout: wiki title: Arma 3 Scheduler And Our Practices +description: group: development parent: wiki order: 8 diff --git a/documentation/development/coding-guidelines.md b/documentation/development/coding-guidelines.md index d2ae7b8d28..89f0d91342 100644 --- a/documentation/development/coding-guidelines.md +++ b/documentation/development/coding-guidelines.md @@ -1,6 +1,7 @@ --- layout: wiki title: Coding Guidelines +description: group: development parent: wiki order: 1 diff --git a/documentation/development/extension-guidelines.md b/documentation/development/extension-guidelines.md index 45aa8c5994..d8da6a3974 100644 --- a/documentation/development/extension-guidelines.md +++ b/documentation/development/extension-guidelines.md @@ -1,6 +1,7 @@ --- layout: wiki title: Extension Guidelines +description: group: development parent: wiki order: 9 diff --git a/documentation/development/how-to-translate-ace3.md b/documentation/development/how-to-translate-ace3.md index 576cd3a98b..edb88263b1 100644 --- a/documentation/development/how-to-translate-ace3.md +++ b/documentation/development/how-to-translate-ace3.md @@ -1,6 +1,7 @@ --- layout: wiki title: How to translate ACE3 +description: This page describes in short how you can help translating ACE3 into your language. group: development parent: wiki order: 20 diff --git a/documentation/development/merging-pull-requests.md b/documentation/development/merging-pull-requests.md index 6bc34464f0..208c9c786d 100644 --- a/documentation/development/merging-pull-requests.md +++ b/documentation/development/merging-pull-requests.md @@ -1,6 +1,7 @@ --- layout: wiki title: Merging Pull Requests +description: group: development parent: wiki order: 5 diff --git a/documentation/development/modularity-and-pbo-structure.md b/documentation/development/modularity-and-pbo-structure.md index 036ebb35d4..4b76f2b357 100644 --- a/documentation/development/modularity-and-pbo-structure.md +++ b/documentation/development/modularity-and-pbo-structure.md @@ -1,6 +1,7 @@ --- layout: wiki title: Modularity And PBO Structure +description: group: development parent: wiki order: 4 diff --git a/documentation/development/setting-up-the-development-environment.md b/documentation/development/setting-up-the-development-environment.md index f484c59722..3de25d3ea9 100644 --- a/documentation/development/setting-up-the-development-environment.md +++ b/documentation/development/setting-up-the-development-environment.md @@ -1,6 +1,7 @@ --- layout: wiki title: Setting Up The Development Environment +description: This page describes how you can setup your development environment for ACE3, allowing you to properly build ACE and utilize file patching. group: development parent: wiki order: 0 diff --git a/documentation/feature/advanced_ballistics.md b/documentation/feature/advanced_ballistics.md index 5f67cdebc2..2fd3e65811 100644 --- a/documentation/feature/advanced_ballistics.md +++ b/documentation/feature/advanced_ballistics.md @@ -1,6 +1,7 @@ --- layout: wiki title: Advanced Ballistics +description: The advanced ballistics module improves internal- and external ballistics. group: feature parent: wiki --- diff --git a/documentation/feature/ai.md b/documentation/feature/ai.md index 682295307c..67a8afc7c0 100644 --- a/documentation/feature/ai.md +++ b/documentation/feature/ai.md @@ -1,6 +1,7 @@ --- layout: wiki title: AI (Artifical Intelligence) +description: group: feature order: 5 parent: wiki diff --git a/documentation/feature/aircraft.md b/documentation/feature/aircraft.md index de9737ac69..c3696e37d9 100644 --- a/documentation/feature/aircraft.md +++ b/documentation/feature/aircraft.md @@ -1,6 +1,7 @@ --- layout: wiki title: Aircraft +description: group: feature order: 5 parent: wiki diff --git a/documentation/feature/apl.md b/documentation/feature/apl.md index 5f15cb04b9..c0705a2abe 100644 --- a/documentation/feature/apl.md +++ b/documentation/feature/apl.md @@ -1,6 +1,7 @@ --- layout: wiki title: APL +description: group: feature parent: wiki --- diff --git a/documentation/feature/atragmx.md b/documentation/feature/atragmx.md index b1ff57de25..c7113f7cd2 100644 --- a/documentation/feature/atragmx.md +++ b/documentation/feature/atragmx.md @@ -1,6 +1,7 @@ --- layout: wiki title: ATragMX +description: group: feature parent: wiki --- diff --git a/documentation/feature/attach.md b/documentation/feature/attach.md index f356630bac..ffb43ce263 100644 --- a/documentation/feature/attach.md +++ b/documentation/feature/attach.md @@ -1,6 +1,7 @@ --- layout: wiki title: Attach +description: group: feature parent: wiki --- diff --git a/documentation/feature/backpacks.md b/documentation/feature/backpacks.md index e1b935ee79..857d6aae16 100644 --- a/documentation/feature/backpacks.md +++ b/documentation/feature/backpacks.md @@ -1,6 +1,7 @@ --- layout: wiki title: Backpacks +description: group: feature parent: wiki --- diff --git a/documentation/feature/ballistics.md b/documentation/feature/ballistics.md index 238c2fcf6a..cd44e618ba 100644 --- a/documentation/feature/ballistics.md +++ b/documentation/feature/ballistics.md @@ -1,6 +1,7 @@ --- layout: wiki title: Ballistics +description: group: feature parent: wiki --- diff --git a/documentation/feature/captives.md b/documentation/feature/captives.md index ef29556481..a81d107082 100644 --- a/documentation/feature/captives.md +++ b/documentation/feature/captives.md @@ -1,6 +1,7 @@ --- layout: wiki title: Captives +description: group: feature parent: wiki --- diff --git a/documentation/feature/common.md b/documentation/feature/common.md index 357f2f4578..6a1dba0aa1 100644 --- a/documentation/feature/common.md +++ b/documentation/feature/common.md @@ -1,6 +1,7 @@ --- layout: wiki title: Common +description: group: feature parent: wiki --- diff --git a/documentation/feature/difficulties.md b/documentation/feature/difficulties.md index 3171ecbb39..962d7f9ff0 100644 --- a/documentation/feature/difficulties.md +++ b/documentation/feature/difficulties.md @@ -1,6 +1,7 @@ --- layout: wiki title: Difficulties +description: group: feature parent: wiki --- diff --git a/documentation/feature/disarming.md b/documentation/feature/disarming.md index f1c18e91af..94597c87fc 100644 --- a/documentation/feature/disarming.md +++ b/documentation/feature/disarming.md @@ -1,6 +1,7 @@ --- layout: wiki title: Disarming +description: group: feature parent: wiki --- diff --git a/documentation/feature/disposable.md b/documentation/feature/disposable.md index 737b8631c5..75c85f1280 100644 --- a/documentation/feature/disposable.md +++ b/documentation/feature/disposable.md @@ -1,6 +1,7 @@ --- layout: wiki title: Disposable +description: group: feature parent: wiki --- diff --git a/documentation/feature/dragging.md b/documentation/feature/dragging.md index 1e47bc39e4..befe1b5606 100644 --- a/documentation/feature/dragging.md +++ b/documentation/feature/dragging.md @@ -1,6 +1,7 @@ --- layout: wiki title: Dragging +description: group: feature parent: wiki --- diff --git a/documentation/feature/explosives.md b/documentation/feature/explosives.md index aca67ecc96..43ab609fdd 100644 --- a/documentation/feature/explosives.md +++ b/documentation/feature/explosives.md @@ -1,6 +1,7 @@ --- layout: wiki title: Explosives +description: group: feature parent: wiki --- diff --git a/documentation/feature/fcs.md b/documentation/feature/fcs.md index 52d229e718..8085e47ee8 100644 --- a/documentation/feature/fcs.md +++ b/documentation/feature/fcs.md @@ -1,6 +1,7 @@ --- layout: wiki title: FCS (Fire Control System) +description: group: feature parent: wiki --- diff --git a/documentation/feature/flashsuppressors.md b/documentation/feature/flashsuppressors.md index 8da42ac4ed..c78ba31679 100644 --- a/documentation/feature/flashsuppressors.md +++ b/documentation/feature/flashsuppressors.md @@ -1,6 +1,7 @@ --- layout: wiki title: Flash Suppressors +description: group: feature parent: wiki --- diff --git a/documentation/feature/frag.md b/documentation/feature/frag.md index 644f76de83..e6b74de8e7 100644 --- a/documentation/feature/frag.md +++ b/documentation/feature/frag.md @@ -1,6 +1,7 @@ --- layout: wiki title: Frag +description: group: feature parent: wiki --- diff --git a/documentation/feature/gforces.md b/documentation/feature/gforces.md index bfa1c64ab7..ed4340967c 100644 --- a/documentation/feature/gforces.md +++ b/documentation/feature/gforces.md @@ -1,6 +1,7 @@ --- layout: wiki title: G-Forces +description: group: feature parent: wiki --- diff --git a/documentation/feature/goggles.md b/documentation/feature/goggles.md index b4eaf3b00f..ad65958e82 100644 --- a/documentation/feature/goggles.md +++ b/documentation/feature/goggles.md @@ -1,6 +1,7 @@ --- layout: wiki title: Goggles +description: group: feature parent: wiki --- diff --git a/documentation/feature/grenades.md b/documentation/feature/grenades.md index 1a334160cc..603b5300fe 100644 --- a/documentation/feature/grenades.md +++ b/documentation/feature/grenades.md @@ -1,6 +1,7 @@ --- layout: wiki title: Grenades +description: group: feature parent: wiki --- diff --git a/documentation/feature/hearing.md b/documentation/feature/hearing.md index 11d734dceb..2f4c0b671d 100644 --- a/documentation/feature/hearing.md +++ b/documentation/feature/hearing.md @@ -1,6 +1,7 @@ --- layout: wiki title: Hearing +description: group: feature parent: wiki --- diff --git a/documentation/feature/hitreactions.md b/documentation/feature/hitreactions.md index 7a6f11c4c4..f5a4213908 100644 --- a/documentation/feature/hitreactions.md +++ b/documentation/feature/hitreactions.md @@ -1,6 +1,7 @@ --- layout: wiki title: Hit Reactions +description: group: feature parent: wiki --- diff --git a/documentation/feature/interact_menu.md b/documentation/feature/interact_menu.md index 91da5b6f62..3335b32213 100644 --- a/documentation/feature/interact_menu.md +++ b/documentation/feature/interact_menu.md @@ -1,6 +1,7 @@ --- layout: wiki title: Interact Menu +description: group: feature parent: wiki --- diff --git a/documentation/feature/interaction.md b/documentation/feature/interaction.md index 3c3bc110bb..27b9f05e64 100644 --- a/documentation/feature/interaction.md +++ b/documentation/feature/interaction.md @@ -1,6 +1,7 @@ --- layout: wiki title: Interaction +description: group: feature parent: wiki --- diff --git a/documentation/feature/inventory.md b/documentation/feature/inventory.md index fc60f8920b..fc10822917 100644 --- a/documentation/feature/inventory.md +++ b/documentation/feature/inventory.md @@ -1,6 +1,7 @@ --- layout: wiki title: Inventory +description: group: feature parent: wiki --- diff --git a/documentation/feature/javelin.md b/documentation/feature/javelin.md index 674a90a7fd..7095565ca9 100644 --- a/documentation/feature/javelin.md +++ b/documentation/feature/javelin.md @@ -1,6 +1,7 @@ --- layout: wiki title: Javelin +description: group: feature parent: wiki --- diff --git a/documentation/feature/kestrel4500.md b/documentation/feature/kestrel4500.md index 7376b63c06..f859ed4cd8 100644 --- a/documentation/feature/kestrel4500.md +++ b/documentation/feature/kestrel4500.md @@ -1,6 +1,7 @@ --- layout: wiki title: Kestrel 4500 +description: group: feature parent: wiki --- diff --git a/documentation/feature/laser.md b/documentation/feature/laser.md index cb8450e700..af07f5bc90 100644 --- a/documentation/feature/laser.md +++ b/documentation/feature/laser.md @@ -1,6 +1,7 @@ --- layout: wiki title: Laser +description: group: feature parent: wiki --- diff --git a/documentation/feature/laser_selfdesignate.md b/documentation/feature/laser_selfdesignate.md index 6ad4ed52b9..99432e0b4e 100644 --- a/documentation/feature/laser_selfdesignate.md +++ b/documentation/feature/laser_selfdesignate.md @@ -1,6 +1,7 @@ --- layout: wiki title: Laser Self-Designate +description: group: feature parent: wiki --- diff --git a/documentation/feature/laserpointer.md b/documentation/feature/laserpointer.md index 81757563c4..cbc79effd0 100644 --- a/documentation/feature/laserpointer.md +++ b/documentation/feature/laserpointer.md @@ -1,6 +1,7 @@ --- layout: wiki title: Laser Pointer +description: group: feature parent: wiki --- diff --git a/documentation/feature/logistics_uavbattery.md b/documentation/feature/logistics_uavbattery.md index 6c066deba4..64f4775e46 100644 --- a/documentation/feature/logistics_uavbattery.md +++ b/documentation/feature/logistics_uavbattery.md @@ -1,6 +1,7 @@ --- layout: wiki title: Logistics - UAV Battery +description: group: feature parent: wiki --- diff --git a/documentation/feature/logistics_wirecutter.md b/documentation/feature/logistics_wirecutter.md index b4d68aa452..dccf8d91cb 100644 --- a/documentation/feature/logistics_wirecutter.md +++ b/documentation/feature/logistics_wirecutter.md @@ -1,6 +1,7 @@ --- layout: wiki title: Logistics - Wirecutter +description: group: feature parent: wiki --- diff --git a/documentation/feature/magazinerepack.md b/documentation/feature/magazinerepack.md index 4c288ebe6f..70cea9ac13 100644 --- a/documentation/feature/magazinerepack.md +++ b/documentation/feature/magazinerepack.md @@ -1,6 +1,7 @@ --- layout: wiki title: Magazine Repack +description: group: feature parent: wiki --- diff --git a/documentation/feature/main.md b/documentation/feature/main.md index 0e6a75d5c7..d5005ef163 100644 --- a/documentation/feature/main.md +++ b/documentation/feature/main.md @@ -1,6 +1,7 @@ --- layout: wiki title: Main +description: group: feature parent: wiki --- diff --git a/documentation/feature/map.md b/documentation/feature/map.md index 417bbc6898..116d87eba1 100644 --- a/documentation/feature/map.md +++ b/documentation/feature/map.md @@ -1,6 +1,7 @@ --- layout: wiki title: Map +description: group: feature parent: wiki --- diff --git a/documentation/feature/maptools.md b/documentation/feature/maptools.md index e0577e2b69..71508df3f3 100644 --- a/documentation/feature/maptools.md +++ b/documentation/feature/maptools.md @@ -1,6 +1,7 @@ --- layout: wiki title: Map Tools +description: group: feature parent: wiki --- diff --git a/documentation/feature/markers.md b/documentation/feature/markers.md index f96b8257c6..a63adf89b7 100644 --- a/documentation/feature/markers.md +++ b/documentation/feature/markers.md @@ -1,6 +1,7 @@ --- layout: wiki title: Markers +description: group: feature parent: wiki --- diff --git a/documentation/feature/medical-system.md b/documentation/feature/medical-system.md index 2528cc9c3f..e2a9d35aea 100644 --- a/documentation/feature/medical-system.md +++ b/documentation/feature/medical-system.md @@ -1,6 +1,7 @@ --- layout: wiki title: Medical System +description: ACE provide users with a more realistic medical system and comes in both a basic and advanced version. Both versions have overlap but each have their own unique characteristics. group: feature order: 4 parent: wiki diff --git a/documentation/feature/microdagr.md b/documentation/feature/microdagr.md index e8ffa69d8d..3ff9562293 100644 --- a/documentation/feature/microdagr.md +++ b/documentation/feature/microdagr.md @@ -1,6 +1,7 @@ --- layout: wiki title: MicroDAGR +description: group: feature parent: wiki --- diff --git a/documentation/feature/missileguidance.md b/documentation/feature/missileguidance.md index 65a37b6950..939381a426 100644 --- a/documentation/feature/missileguidance.md +++ b/documentation/feature/missileguidance.md @@ -1,6 +1,7 @@ --- layout: wiki title: Missile Guidance +description: group: feature parent: wiki --- diff --git a/documentation/feature/missionmodules.md b/documentation/feature/missionmodules.md index 1a9be336d5..5ef66a7b31 100644 --- a/documentation/feature/missionmodules.md +++ b/documentation/feature/missionmodules.md @@ -1,6 +1,7 @@ --- layout: wiki title: Mission Modules +description: group: feature parent: wiki --- diff --git a/documentation/feature/mk6mortar.md b/documentation/feature/mk6mortar.md index dd5f8136e3..1693a9e23d 100644 --- a/documentation/feature/mk6mortar.md +++ b/documentation/feature/mk6mortar.md @@ -1,6 +1,7 @@ --- layout: wiki title: Mk6 Mortar +description: group: feature parent: wiki --- diff --git a/documentation/feature/movement.md b/documentation/feature/movement.md index a40be05380..a9a55b4f1b 100644 --- a/documentation/feature/movement.md +++ b/documentation/feature/movement.md @@ -1,6 +1,7 @@ --- layout: wiki title: Movement +description: group: feature parent: wiki --- diff --git a/documentation/feature/nametags.md b/documentation/feature/nametags.md index 4882882c7d..840c8b6a12 100644 --- a/documentation/feature/nametags.md +++ b/documentation/feature/nametags.md @@ -1,6 +1,7 @@ --- layout: wiki title: Nametags +description: group: feature parent: wiki --- diff --git a/documentation/feature/nightvision.md b/documentation/feature/nightvision.md index c600e54f50..91a26cbe12 100644 --- a/documentation/feature/nightvision.md +++ b/documentation/feature/nightvision.md @@ -1,6 +1,7 @@ --- layout: wiki title: Nightvision +description: group: feature parent: wiki --- diff --git a/documentation/feature/noidle.md b/documentation/feature/noidle.md index 67fc875ff9..11f35c87f0 100644 --- a/documentation/feature/noidle.md +++ b/documentation/feature/noidle.md @@ -1,6 +1,7 @@ --- layout: wiki title: No Idle +description: group: feature parent: wiki --- diff --git a/documentation/feature/noradio.md b/documentation/feature/noradio.md index 104d9ae01e..562c8ab7be 100644 --- a/documentation/feature/noradio.md +++ b/documentation/feature/noradio.md @@ -1,6 +1,7 @@ --- layout: wiki title: No Radio +description: group: feature parent: wiki --- diff --git a/documentation/feature/norearm.md b/documentation/feature/norearm.md index 8a6243c1d9..e57e052c01 100644 --- a/documentation/feature/norearm.md +++ b/documentation/feature/norearm.md @@ -1,6 +1,7 @@ --- layout: wiki title: No Rearm +description: group: feature parent: wiki --- diff --git a/documentation/feature/optics.md b/documentation/feature/optics.md index 2b23b70ce8..ed945c6f51 100644 --- a/documentation/feature/optics.md +++ b/documentation/feature/optics.md @@ -1,6 +1,7 @@ --- layout: wiki title: Optics +description: group: feature parent: wiki --- diff --git a/documentation/feature/optionsmenu.md b/documentation/feature/optionsmenu.md index a7e8ddca37..be53472353 100644 --- a/documentation/feature/optionsmenu.md +++ b/documentation/feature/optionsmenu.md @@ -1,6 +1,7 @@ --- layout: wiki title: Options Menu +description: group: feature parent: wiki --- diff --git a/documentation/feature/overheating.md b/documentation/feature/overheating.md index aaf3bbcacf..b6538e49b4 100644 --- a/documentation/feature/overheating.md +++ b/documentation/feature/overheating.md @@ -1,6 +1,8 @@ --- layout: wiki title: Overheating +description: +description: group: feature parent: wiki --- diff --git a/documentation/feature/overpressure.md b/documentation/feature/overpressure.md index 34a357ae0c..f9646722ac 100644 --- a/documentation/feature/overpressure.md +++ b/documentation/feature/overpressure.md @@ -1,6 +1,7 @@ --- layout: wiki title: Overpressure +description: group: feature parent: wiki --- diff --git a/documentation/feature/parachute.md b/documentation/feature/parachute.md index 4c2a9a1a39..fa37e52656 100644 --- a/documentation/feature/parachute.md +++ b/documentation/feature/parachute.md @@ -1,6 +1,7 @@ --- layout: wiki title: Parachute +description: group: feature parent: wiki --- diff --git a/documentation/feature/protection.md b/documentation/feature/protection.md index 3b1e2effce..4a35d1e0ba 100644 --- a/documentation/feature/protection.md +++ b/documentation/feature/protection.md @@ -1,6 +1,7 @@ --- layout: wiki title: Protection +description: group: feature parent: wiki --- diff --git a/documentation/feature/ragdolls.md b/documentation/feature/ragdolls.md index e0bc56017a..3a29c73eb6 100644 --- a/documentation/feature/ragdolls.md +++ b/documentation/feature/ragdolls.md @@ -1,6 +1,7 @@ --- layout: wiki title: Ragdolls +description: group: feature parent: wiki --- diff --git a/documentation/feature/realisticnames.md b/documentation/feature/realisticnames.md index 8482cda456..a60190025a 100644 --- a/documentation/feature/realisticnames.md +++ b/documentation/feature/realisticnames.md @@ -1,6 +1,7 @@ --- layout: wiki title: Realistic Names +description: group: feature parent: wiki --- diff --git a/documentation/feature/recoil.md b/documentation/feature/recoil.md index f7182fc66f..6393a1cd78 100644 --- a/documentation/feature/recoil.md +++ b/documentation/feature/recoil.md @@ -1,6 +1,7 @@ --- layout: wiki title: Recoil +description: group: feature parent: wiki --- diff --git a/documentation/feature/reload.md b/documentation/feature/reload.md index 4efcd26b5e..4b4b4dc19a 100644 --- a/documentation/feature/reload.md +++ b/documentation/feature/reload.md @@ -1,6 +1,7 @@ --- layout: wiki title: Reload +description: group: feature parent: wiki --- diff --git a/documentation/feature/reloadlaunchers.md b/documentation/feature/reloadlaunchers.md index 3cec2ef66f..5dc5003beb 100644 --- a/documentation/feature/reloadlaunchers.md +++ b/documentation/feature/reloadlaunchers.md @@ -1,6 +1,7 @@ --- layout: wiki title: Reload Launchers +description: group: feature parent: wiki --- diff --git a/documentation/feature/respawn.md b/documentation/feature/respawn.md index 2e0009b9cf..1a58597ebd 100644 --- a/documentation/feature/respawn.md +++ b/documentation/feature/respawn.md @@ -1,6 +1,7 @@ --- layout: wiki title: Respawn +description: group: feature parent: wiki --- diff --git a/documentation/feature/safemode.md b/documentation/feature/safemode.md index a7e1481d6e..f6b06ba016 100644 --- a/documentation/feature/safemode.md +++ b/documentation/feature/safemode.md @@ -1,6 +1,7 @@ --- layout: wiki title: Safe Mode +description: group: feature parent: wiki --- diff --git a/documentation/feature/scopes.md b/documentation/feature/scopes.md index 9d84ab81d9..af95bfede4 100644 --- a/documentation/feature/scopes.md +++ b/documentation/feature/scopes.md @@ -1,6 +1,7 @@ --- layout: wiki title: Scopes +description: group: feature parent: wiki --- diff --git a/documentation/feature/smallarms.md b/documentation/feature/smallarms.md index 3f75d065ed..bc346b9cb9 100644 --- a/documentation/feature/smallarms.md +++ b/documentation/feature/smallarms.md @@ -1,6 +1,7 @@ --- layout: wiki title: Small Arms +description: group: feature parent: wiki --- diff --git a/documentation/feature/switchunits.md b/documentation/feature/switchunits.md index 7955241ba1..03fd98b3fd 100644 --- a/documentation/feature/switchunits.md +++ b/documentation/feature/switchunits.md @@ -1,6 +1,7 @@ --- layout: wiki title: Switch Units +description: group: feature parent: wiki --- diff --git a/documentation/feature/testmissions.md b/documentation/feature/testmissions.md index e68dac2758..418e5d06f9 100644 --- a/documentation/feature/testmissions.md +++ b/documentation/feature/testmissions.md @@ -1,6 +1,7 @@ --- layout: wiki title: Test Missions +description: group: feature parent: wiki --- diff --git a/documentation/feature/thermals.md b/documentation/feature/thermals.md index 72d903980e..98cc5ca24e 100644 --- a/documentation/feature/thermals.md +++ b/documentation/feature/thermals.md @@ -1,6 +1,7 @@ --- layout: wiki title: Thermals +description: group: feature parent: wiki --- diff --git a/documentation/feature/vector.md b/documentation/feature/vector.md index 64ec925669..f5dc85dfca 100644 --- a/documentation/feature/vector.md +++ b/documentation/feature/vector.md @@ -1,6 +1,7 @@ --- layout: wiki title: Vector +description: group: feature parent: wiki --- diff --git a/documentation/feature/vehiclelock.md b/documentation/feature/vehiclelock.md index b815ea5150..5431dc1624 100644 --- a/documentation/feature/vehiclelock.md +++ b/documentation/feature/vehiclelock.md @@ -1,6 +1,7 @@ --- layout: wiki title: Vehicle Lock +description: group: feature parent: wiki --- diff --git a/documentation/feature/vehicles.md b/documentation/feature/vehicles.md index 437b2db8be..5c3a07af08 100644 --- a/documentation/feature/vehicles.md +++ b/documentation/feature/vehicles.md @@ -1,6 +1,7 @@ --- layout: wiki title: Vehicles +description: group: feature parent: wiki --- diff --git a/documentation/feature/weaponselect.md b/documentation/feature/weaponselect.md index b843adb01a..8f737d1d1e 100644 --- a/documentation/feature/weaponselect.md +++ b/documentation/feature/weaponselect.md @@ -1,6 +1,7 @@ --- layout: wiki title: Weapon Select +description: group: feature parent: wiki --- diff --git a/documentation/feature/weather.md b/documentation/feature/weather.md index 7b0ff23308..b04a08d9be 100644 --- a/documentation/feature/weather.md +++ b/documentation/feature/weather.md @@ -1,6 +1,7 @@ --- layout: wiki title: Weather +description: group: feature parent: wiki --- diff --git a/documentation/feature/windeflection.md b/documentation/feature/windeflection.md index f665f9a0ae..d2f986d941 100644 --- a/documentation/feature/windeflection.md +++ b/documentation/feature/windeflection.md @@ -1,6 +1,7 @@ --- layout: wiki title: Wind Deflection +description: group: feature parent: wiki --- diff --git a/documentation/framework/advanced-missile-guidance.md b/documentation/framework/advanced-missile-guidance.md index 8beee862b7..14f1d1feae 100644 --- a/documentation/framework/advanced-missile-guidance.md +++ b/documentation/framework/advanced-missile-guidance.md @@ -1,6 +1,7 @@ --- layout: wiki title: Advanced Missile Guidance +description: The ACE3 Advanced Missile Guidance Framework provides a setup of configuration settings, functions and a execution framework for addon makers to integrate with the missile guidance and targeting mechanisms of ACE3. group: framework order: 5 parent: wiki @@ -8,7 +9,7 @@ parent: wiki ## 1. Overview -The ACE Advanced Missile Guidance Framework provides a setup of configuration settings, functions and a execution framework for addon makers to integrate with the missile guidance and targeting mechanisms of ACE. It also provides for mod makers to create their own custom guidance methods within the framework. +The ACE3 Advanced Missile Guidance Framework provides a setup of configuration settings, functions and a execution framework for addon makers to integrate with the missile guidance and targeting mechanisms of ACE3. It also provides for mod makers to create their own custom guidance methods within the framework. The framework provides all the functionality needed for guidance; from laser locking, target specification and selection, to handling the fired events and tracking and steering the vehicle based on provided parameters. This way, all that needs to be defined in addons is the appropriate CfgAmmo entries for the missile. diff --git a/documentation/framework/carry-drag.md b/documentation/framework/carry-drag.md index d117bcbc4a..988797ba79 100644 --- a/documentation/framework/carry-drag.md +++ b/documentation/framework/carry-drag.md @@ -1,6 +1,7 @@ --- layout: wiki title: Carry and Drag System +description: group: framework order: 5 parent: wiki diff --git a/documentation/framework/fragmentation-configuration.md b/documentation/framework/fragmentation-configuration.md index c8a64b2db4..876074e6f4 100644 --- a/documentation/framework/fragmentation-configuration.md +++ b/documentation/framework/fragmentation-configuration.md @@ -1,12 +1,13 @@ --- layout: wiki title: Fragmentation Configuration +description: The fragmentation system (ace_frag) in ACE3 is a significant improvement over the fragmentation system in ACE2. group: framework parent: wiki order: 7 --- -The fragmentation system (sys_frag) in ACE3 is a significant improvement over the fragmentation system in ACE2. Previously the system relied on fuzzy math from the values of `indirectHit` and `indirectHitRange` in CfgAmmo to calculate roughly the velocity and range of fragmentation. This had some serious drawbacks, especially in the case of smaller explosives such as hand grenades and 40mm grenades where casualty production was lower than desired. +The fragmentation system (ace_frag) in ACE3 is a significant improvement over the fragmentation system in ACE2. Previously the system relied on fuzzy math from the values of `indirectHit` and `indirectHitRange` in CfgAmmo to calculate roughly the velocity and range of fragmentation. This had some serious drawbacks, especially in the case of smaller explosives such as hand grenades and 40mm grenades where casualty production was lower than desired. In ACE3 the system has moved away from what "feels" right to actual explosive engineering equations, primarily the [Gurney equations](http://en.wikipedia.org/wiki/Gurney_equations). This allows us to get close to the actual fragmentation velocities that would be produced by an explosive configuration similar to type of ammo we are simulating. diff --git a/documentation/framework/settings.md b/documentation/framework/settings.md index 3106cb2254..bbc17afc95 100644 --- a/documentation/framework/settings.md +++ b/documentation/framework/settings.md @@ -1,12 +1,13 @@ --- layout: wiki title: Settings Framework +description: ACE3 contains an extensive settings framework that allows you to tweak the modification without having to mess around with deleting pbos. group: framework order: 5 parent: wiki --- -ACE contains an extensive settings framework that allows you to tweak the modification without having to mess around with deleting pbos. These settings are all handled server side and broadcasted to the clients connecting to that server. This ensures that everyone playing on the server will have a uniform experience. +ACE3 contains an extensive settings framework that allows you to tweak the modification without having to mess around with deleting pbos. These settings are all handled server side and broadcasted to the clients connecting to that server. This ensures that everyone playing on the server will have a uniform experience. Part of this settings framework are global settings and client settings. Both use the same underlaying framework, with the difference that client settings can be adjusted by clients, where global settings can not. diff --git a/documentation/missionmaker/mission-tools.md b/documentation/missionmaker/mission-tools.md index a7104676f0..ead87303a6 100644 --- a/documentation/missionmaker/mission-tools.md +++ b/documentation/missionmaker/mission-tools.md @@ -1,6 +1,7 @@ --- layout: wiki title: Mission tools +description: A short description of ACE3's mission tools that help mission makers to provide awesome missions group: missionmaker order: 10 parent: wiki diff --git a/documentation/missionmaker/modules.md b/documentation/missionmaker/modules.md index ff18139482..47ee90d044 100644 --- a/documentation/missionmaker/modules.md +++ b/documentation/missionmaker/modules.md @@ -1,6 +1,7 @@ --- layout: wiki title: Modules +description: A list of all modules in ACE3 and all the settings that can be tweaked by them group: missionmaker order: 5 parent: wiki diff --git a/documentation/user/getting-started.md b/documentation/user/getting-started.md index baed16588b..82e65f8399 100644 --- a/documentation/user/getting-started.md +++ b/documentation/user/getting-started.md @@ -1,6 +1,7 @@ --- layout: wiki title: Getting started +description: Downloaded ACE3 and have no idea where to start? This page serves as a document to help new players get started with things like the medical system, or how to adjust your scope. group: user order: 0 parent: wiki diff --git a/documentation/user/how-to-make-a-feature-request.md b/documentation/user/how-to-make-a-feature-request.md index 7b0c52478d..96bec54fb8 100644 --- a/documentation/user/how-to-make-a-feature-request.md +++ b/documentation/user/how-to-make-a-feature-request.md @@ -1,6 +1,7 @@ --- layout: wiki title: How to make a feature request +description: ACE3 requires a special procedure to make feature requests. Because due to our current work load, in the period of weeks prior and posterior to the first release, new feature requests are under embargo. group: user order: 11 parent: wiki diff --git a/documentation/user/how-to-report-an-issue.md b/documentation/user/how-to-report-an-issue.md index acabc3a944..589e171c63 100644 --- a/documentation/user/how-to-report-an-issue.md +++ b/documentation/user/how-to-report-an-issue.md @@ -1,6 +1,7 @@ --- layout: wiki title: How to report an issue +description: If you've found an issue with ACE3 please read this entry before reporting it. group: user order: 10 parent: wiki diff --git a/documentation/user/promotional-material.md b/documentation/user/promotional-material.md index 4c928f1fb3..98a8ace6b5 100644 --- a/documentation/user/promotional-material.md +++ b/documentation/user/promotional-material.md @@ -1,6 +1,7 @@ --- layout: wiki title: Promotional Material +description: Promotional materials like logos and color values. group: user order: 20 parent: wiki diff --git a/documentation/user/shortcuts.md b/documentation/user/shortcuts.md index 66e12ae76f..59b7975340 100644 --- a/documentation/user/shortcuts.md +++ b/documentation/user/shortcuts.md @@ -1,6 +1,7 @@ --- layout: wiki title: Shortcuts +description: A list containing all default shortcuts in ACE3 group: user order: 5 parent: wiki From 7c099c10099ebd4f38074185186f086de9b55c25 Mon Sep 17 00:00:00 2001 From: SAM Date: Fri, 15 May 2015 09:59:57 +0200 Subject: [PATCH 24/34] Weaponselect module macro cleanup --- .../functions/fnc_displayGrenadeTypeAndNumber.sqf | 5 +---- .../weaponselect/functions/fnc_findNextGrenadeMagazine.sqf | 2 +- addons/weaponselect/functions/fnc_findNextGrenadeMuzzle.sqf | 4 ++-- addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf | 4 ++-- .../weaponselect/functions/fnc_playChangeFiremodeSound.sqf | 5 ++--- addons/weaponselect/functions/fnc_putWeaponAway.sqf | 4 +--- addons/weaponselect/functions/fnc_selectWeaponMode.sqf | 6 +----- addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf | 6 +----- addons/weaponselect/functions/fnc_selectWeaponVehicle.sqf | 6 +----- addons/weaponselect/functions/fnc_setNextGrenadeMuzzle.sqf | 5 +---- addons/weaponselect/functions/fnc_throwGrenade.sqf | 6 +++--- 11 files changed, 16 insertions(+), 37 deletions(-) diff --git a/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf b/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf index d7a68e7f50..81cb57d9f3 100644 --- a/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf +++ b/addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf @@ -12,12 +12,9 @@ */ #include "script_component.hpp" -private ["_magazine", "_numberofMagazines"]; - if !(GVAR(DisplayText)) exitwith {}; -_magazine = _this select 0; -_numberofMagazines = _this select 1; +PARAMS_2(_magazine,_numberofMagazines); private ["_color", "_name", "_text", "_picture"]; diff --git a/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf b/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf index 02a13ec932..411df5fe6c 100644 --- a/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf +++ b/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf @@ -3,7 +3,7 @@ private ["_type", "_allMags", "_allMuzzles", "_magazines"]; -_type = _this select 0; //"All", "Frag" or "NonFrag" +PARAMS_1(_type); //"All", "Frag" or "NonFrag" _allMags = missionNamespace getVariable [format [QGVAR(%1Magazines), _type], []]; _allMuzzles = missionNamespace getVariable [format [QGVAR(%1Muzzles), _type], []]; diff --git a/addons/weaponselect/functions/fnc_findNextGrenadeMuzzle.sqf b/addons/weaponselect/functions/fnc_findNextGrenadeMuzzle.sqf index 76b4efd894..0491afa413 100644 --- a/addons/weaponselect/functions/fnc_findNextGrenadeMuzzle.sqf +++ b/addons/weaponselect/functions/fnc_findNextGrenadeMuzzle.sqf @@ -1,9 +1,9 @@ // by commy2 #include "script_component.hpp" -private ["_type", "_allMags", "_allMuzzles", "_magazines"]; +private ["_allMags", "_allMuzzles", "_magazines"]; -_type = _this select 0; //"All", "Frag" or "NonFrag" +PARAMS_1(_type); //"All", "Frag" or "NonFrag" _allMags = missionNamespace getVariable [format [QGVAR(%1Magazines), _type], []]; _allMuzzles = missionNamespace getVariable [format [QGVAR(%1Muzzles), _type], []]; diff --git a/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf b/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf index 6b58fc7bc5..37e2b1c873 100644 --- a/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf +++ b/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf @@ -1,9 +1,9 @@ // by commy2 #include "script_component.hpp" -private ["_vehicle", "_turret", "_weapons"]; +private ["_turret", "_weapons"]; -_vehicle = _this select 0; +PARAMS_1(_vehicle); _turret = [_vehicle] call EFUNC(common,getTurretCommander); diff --git a/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf b/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf index ea671a530d..45e84d631d 100644 --- a/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf +++ b/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf @@ -1,10 +1,9 @@ // by commy2 #include "script_component.hpp" -private ["_unit", "_weapon", "_sound"]; +private ["_sound"]; -_unit = _this select 0; -_weapon = _this select 1; +PARAMS_2(_unit,_weapon); _sound = getArray (configFile >> "CfgWeapons" >> _weapon >> "changeFiremodeSound"); diff --git a/addons/weaponselect/functions/fnc_putWeaponAway.sqf b/addons/weaponselect/functions/fnc_putWeaponAway.sqf index 7c0bc47cd7..a4cd743bfb 100644 --- a/addons/weaponselect/functions/fnc_putWeaponAway.sqf +++ b/addons/weaponselect/functions/fnc_putWeaponAway.sqf @@ -11,9 +11,7 @@ */ #include "script_component.hpp" -private "_unit"; - -_unit = _this select 0; +PARAMS_1(_unit); [_unit] call EFUNC(common,fixLoweredRifleAnimation); diff --git a/addons/weaponselect/functions/fnc_selectWeaponMode.sqf b/addons/weaponselect/functions/fnc_selectWeaponMode.sqf index aea777d709..012bf94898 100644 --- a/addons/weaponselect/functions/fnc_selectWeaponMode.sqf +++ b/addons/weaponselect/functions/fnc_selectWeaponMode.sqf @@ -11,10 +11,7 @@ */ #include "script_component.hpp" -private ["_unit", "_weapon"]; - -_unit = _this select 0; -_weapon = _this select 1; +PARAMS_2(_unit,_weapon); if (_weapon == "") exitWith {}; @@ -32,7 +29,6 @@ private ["_muzzles", "_modes"]; _muzzles = [_weapon] call EFUNC(common,getWeaponMuzzles); _modes = [_weapon] call EFUNC(common,getWeaponModes); - private ["_index", "_muzzle", "_mode"]; _index = (_modes find currentWeaponMode _unit) + 1; diff --git a/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf b/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf index 011108e448..67e63cd830 100644 --- a/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf +++ b/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf @@ -11,10 +11,7 @@ */ #include "script_component.hpp" -private ["_unit", "_weapon"]; - -_unit = _this select 0; -_weapon = _this select 1; +PARAMS_2(_unit,_weapon); if (_weapon == "") exitWith {}; @@ -40,7 +37,6 @@ if (_index > count _muzzles - 1) then {_index = 1}; _muzzle = _muzzles select _index; - _index = 0; while { _index < 100 && {currentMuzzle _unit != _muzzle} diff --git a/addons/weaponselect/functions/fnc_selectWeaponVehicle.sqf b/addons/weaponselect/functions/fnc_selectWeaponVehicle.sqf index 929537b7fa..9507c23a30 100644 --- a/addons/weaponselect/functions/fnc_selectWeaponVehicle.sqf +++ b/addons/weaponselect/functions/fnc_selectWeaponVehicle.sqf @@ -1,11 +1,7 @@ // by commy2 #include "script_component.hpp" -private ["_unit", "_vehicle", "_index"]; - -_unit = _this select 0; -_vehicle = _this select 1; -_index = _this select 2; +PARAMS_3(_unit,_vehicle,_index); private "_turret"; _turret = [_unit] call EFUNC(common,getTurretIndex); diff --git a/addons/weaponselect/functions/fnc_setNextGrenadeMuzzle.sqf b/addons/weaponselect/functions/fnc_setNextGrenadeMuzzle.sqf index 81d1a59ed1..4bf970fab1 100644 --- a/addons/weaponselect/functions/fnc_setNextGrenadeMuzzle.sqf +++ b/addons/weaponselect/functions/fnc_setNextGrenadeMuzzle.sqf @@ -12,10 +12,7 @@ */ #include "script_component.hpp" -private ["_unit", "_muzzle"]; - -_unit = _this select 0; -_muzzle = _this select 1; +PARAMS_2(_unit,_muzzle); private ["_uniformMags", "_vestMags", "_backpackMags", "_i", "_uniformMagsToRemove", "_vestMagsToRemove", "_backpackMagsToRemove", "_firstMagazine", "_throwMuzzleNames"]; diff --git a/addons/weaponselect/functions/fnc_throwGrenade.sqf b/addons/weaponselect/functions/fnc_throwGrenade.sqf index e62e118e71..cb7769df90 100644 --- a/addons/weaponselect/functions/fnc_throwGrenade.sqf +++ b/addons/weaponselect/functions/fnc_throwGrenade.sqf @@ -1,10 +1,10 @@ // by commy2 #include "script_component.hpp" -private ["_unit", "_weapon", "_magazine"]; +private ["_magazine"]; + +PARAMS_2(_unit,_weapon); -_unit = _this select 0; -_weapon = _this select 1; _magazine = _this select 5; if (_weapon != "Throw") exitWith {}; From ca17e7120080e8ea5433bfb50a84c32d4e8c22b4 Mon Sep 17 00:00:00 2001 From: SAM Date: Fri, 15 May 2015 10:06:11 +0200 Subject: [PATCH 25/34] Safemode macro cleanup --- addons/safemode/functions/fnc_firstMode.sqf | 2 +- addons/safemode/functions/fnc_lockSafety.sqf | 2 +- addons/safemode/functions/fnc_playChangeFiremodeSound.sqf | 2 +- addons/safemode/functions/fnc_setSafeModeVisual.sqf | 2 +- addons/safemode/functions/fnc_unlockSafety.sqf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/safemode/functions/fnc_firstMode.sqf b/addons/safemode/functions/fnc_firstMode.sqf index 821090dd32..d10da3f896 100644 --- a/addons/safemode/functions/fnc_firstMode.sqf +++ b/addons/safemode/functions/fnc_firstMode.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -EXPLODE_1_PVT(_this,_weapon); +PARAMS_1(_weapon); private ["_mode"]; _mode = getArray (configFile >> "CfgWeapons" >> _weapon >> "modes") select 0; diff --git a/addons/safemode/functions/fnc_lockSafety.sqf b/addons/safemode/functions/fnc_lockSafety.sqf index 0e365fc221..7df83fe39d 100644 --- a/addons/safemode/functions/fnc_lockSafety.sqf +++ b/addons/safemode/functions/fnc_lockSafety.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -EXPLODE_3_PVT(_this,_unit,_weapon,_muzzle); +PARAMS_3(_unit,_weapon,_muzzle); // don't immediately switch back if (inputAction "nextWeapon" > 0) exitWith {}; diff --git a/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf b/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf index 6c2c797706..f7ef6bcbd3 100644 --- a/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf +++ b/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -EXPLODE_2_PVT(_this,_unit,_weapon); +PARAMS_2(_unit,_weapon); private ["_sound"]; _sound = getArray (configFile >> "CfgWeapons" >> _weapon >> "changeFiremodeSound"); diff --git a/addons/safemode/functions/fnc_setSafeModeVisual.sqf b/addons/safemode/functions/fnc_setSafeModeVisual.sqf index ae449e05e8..52f5fab98f 100644 --- a/addons/safemode/functions/fnc_setSafeModeVisual.sqf +++ b/addons/safemode/functions/fnc_setSafeModeVisual.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -EXPLODE_1_PVT(_this,_show); +PARAMS_1(_show); disableSerialization; diff --git a/addons/safemode/functions/fnc_unlockSafety.sqf b/addons/safemode/functions/fnc_unlockSafety.sqf index 341cad182f..58e7f5bad3 100644 --- a/addons/safemode/functions/fnc_unlockSafety.sqf +++ b/addons/safemode/functions/fnc_unlockSafety.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -EXPLODE_3_PVT(_this,_unit,_weapon,_muzzle); +PARAMS_3(_unit,_weapon,_muzzle); private ["_safedWeapons"]; _safedWeapons = _unit getVariable [QGVAR(safedWeapons), []]; From 8199a4ad34a0bd7a10f4b17aa427eeab78e7f290 Mon Sep 17 00:00:00 2001 From: SAM Date: Fri, 15 May 2015 10:30:15 +0200 Subject: [PATCH 26/34] Removed extra private --- addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf b/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf index 411df5fe6c..65d62826e5 100644 --- a/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf +++ b/addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -private ["_type", "_allMags", "_allMuzzles", "_magazines"]; +private ["_allMags", "_allMuzzles", "_magazines"]; PARAMS_1(_type); //"All", "Frag" or "NonFrag" From bf64e441f0ec15e51d8c65e485c6356606d6b98a Mon Sep 17 00:00:00 2001 From: Glowbal Date: Fri, 15 May 2015 10:41:39 +0200 Subject: [PATCH 27/34] Specified that config exports requires SP --- documentation/framework/settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/framework/settings.md b/documentation/framework/settings.md index bbc17afc95..8a9acfdb8c 100644 --- a/documentation/framework/settings.md +++ b/documentation/framework/settings.md @@ -67,7 +67,7 @@ The server config setting entries are done through our optional ACE_server.pbo, ACE contains a lot of settings; to tweak everything to your liking manually therefor can be quite a task. We have provided the option to export all settings in single player. For this, follow these simple steps: -* Open the editor. +* Open the editor (Singleplayer). * Under modules (f7), find ACE, `Config Export [ACE]`. * Place down the module, ensure that the allow parameter is set to yes. * Press preview, once in game, press Esc and open the ACE Options dialog (top left) From ef04eb373858016e36f96027f7a52a3f90b5a461 Mon Sep 17 00:00:00 2001 From: BullHorn Date: Fri, 15 May 2015 13:56:55 +0300 Subject: [PATCH 28/34] Update windeflection.md --- documentation/feature/windeflection.md | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/documentation/feature/windeflection.md b/documentation/feature/windeflection.md index f665f9a0ae..d7150bafc7 100644 --- a/documentation/feature/windeflection.md +++ b/documentation/feature/windeflection.md @@ -8,14 +8,23 @@ parent: wiki ## Overview ### Wind Deflection -Adds ballistic influences of wind, air density and temperature +The Wind Deflection feature is enabled by default and adds ballistic influences of wind ## Usage +Wind Deflection can be disabled or modified via a Module in the 2D editor. -Short overview of how to use the feature, e.g. menu options, key bindings, -instructions. May not apply to all modules. +### Wind Deflection +- Toggles the Module on or off +### Vehicle Enabled +- Toggles the module on or off for static and vehicle-mounted weapons + +### Simulation Interval +- Defines the interval between every calculation step + +### Simulation Radius +- Defines the radius around the player (in meters) at which projectiles are wind deflected ## Dependencies From 730e0c5963417d5103fc76624712818a9a6be77f Mon Sep 17 00:00:00 2001 From: BullHorn Date: Fri, 15 May 2015 14:02:56 +0300 Subject: [PATCH 29/34] Documentation: Create WindDeflection doc --- documentation/feature/windeflection.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/documentation/feature/windeflection.md b/documentation/feature/windeflection.md index d7150bafc7..31ef26d91f 100644 --- a/documentation/feature/windeflection.md +++ b/documentation/feature/windeflection.md @@ -14,17 +14,13 @@ The Wind Deflection feature is enabled by default and adds ballistic influences ## Usage Wind Deflection can be disabled or modified via a Module in the 2D editor. -### Wind Deflection -- Toggles the Module on or off +**Wind Deflection**: Toggles the Module on or off. -### Vehicle Enabled -- Toggles the module on or off for static and vehicle-mounted weapons +**Vehicle Enabled**: Toggles the module on or off for static and vehicle-mounted weapons. -### Simulation Interval -- Defines the interval between every calculation step +**Simulation Interval**: Defines the interval between every calculation step. -### Simulation Radius -- Defines the radius around the player (in meters) at which projectiles are wind deflected +**Simulation Radius**: Defines the radius around the player (in meters) at which projectiles are wind deflected. ## Dependencies From 56f4a32221c078b6d0c27a42ed402d2160802090 Mon Sep 17 00:00:00 2001 From: BullHorn Date: Fri, 15 May 2015 14:16:54 +0300 Subject: [PATCH 30/34] Documentation: Update WindDeflection Noted compatibility with Advanced Ballistics --- documentation/feature/windeflection.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/feature/windeflection.md b/documentation/feature/windeflection.md index 31ef26d91f..f529d4d2a5 100644 --- a/documentation/feature/windeflection.md +++ b/documentation/feature/windeflection.md @@ -8,7 +8,7 @@ parent: wiki ## Overview ### Wind Deflection -The Wind Deflection feature is enabled by default and adds ballistic influences of wind +The Wind Deflection feature is enabled by default and adds ballistic influences of wind. It's designed to work independently or in conjunction with the Advanced Ballistic feature. ## Usage From 77374212c0d2a9587f74ed6a1aff875fe79736f0 Mon Sep 17 00:00:00 2001 From: BullHorn Date: Fri, 15 May 2015 14:18:11 +0300 Subject: [PATCH 31/34] Authors.txt - add BullHorn --- AUTHORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index 75745d124e..c9fdea1351 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -36,6 +36,7 @@ Anthariel BlackQwar Brakoviejo Brisse +BullHorn Clon1998 Codingboy Crusty From 7e3f8f109bb0313a66b3c2aad4756c6bece414fc Mon Sep 17 00:00:00 2001 From: BullHorn Date: Fri, 15 May 2015 15:04:29 +0300 Subject: [PATCH 32/34] Documentation: Update windeflection.md Remove Usage (it is mentioned in the \missionmaker\modules.md wiki) Improve grammar --- documentation/feature/windeflection.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/documentation/feature/windeflection.md b/documentation/feature/windeflection.md index f529d4d2a5..b5dc1e341b 100644 --- a/documentation/feature/windeflection.md +++ b/documentation/feature/windeflection.md @@ -7,20 +7,13 @@ parent: wiki ## Overview -### Wind Deflection -The Wind Deflection feature is enabled by default and adds ballistic influences of wind. It's designed to work independently or in conjunction with the Advanced Ballistic feature. +Wind Deflection is enabled by default. This feature simulates the wind deflection of projectiles and is designed to work independently or in conjunction with the Advanced Ballistic feature. ## Usage + Wind Deflection can be disabled or modified via a Module in the 2D editor. -**Wind Deflection**: Toggles the Module on or off. - -**Vehicle Enabled**: Toggles the module on or off for static and vehicle-mounted weapons. - -**Simulation Interval**: Defines the interval between every calculation step. - -**Simulation Radius**: Defines the radius around the player (in meters) at which projectiles are wind deflected. ## Dependencies From 7a95e2a7bde5acd434bbd2b85b3454a174f7e73b Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 15 May 2015 14:20:18 +0200 Subject: [PATCH 33/34] Weather module macro cleanup --- addons/weather/functions/fnc_calculateAirDensity.sqf | 7 ++----- addons/weather/functions/fnc_calculateWindSpeed.sqf | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/weather/functions/fnc_calculateAirDensity.sqf b/addons/weather/functions/fnc_calculateAirDensity.sqf index 298049e51d..b30e0c4e01 100644 --- a/addons/weather/functions/fnc_calculateAirDensity.sqf +++ b/addons/weather/functions/fnc_calculateAirDensity.sqf @@ -16,12 +16,9 @@ */ #include "script_component.hpp" -private ["_temperature", "_pressure", "_relativeHumidity"]; -_temperature = _this select 0; // in C -_pressure = _this select 1; // in hPa -_relativeHumidity = _this select 2; // as ratio 0-1 +PARAMS_3(_temperature, _pressure, _relativeHumidity); -_pressure = _pressure * 100; +_pressure = _pressure * 100; // hPa to Pa if (_relativeHumidity > 0) then { private ["_pSat", "_vaporPressure", "_partialPressure"]; diff --git a/addons/weather/functions/fnc_calculateWindSpeed.sqf b/addons/weather/functions/fnc_calculateWindSpeed.sqf index b5cde4e959..d991897b97 100644 --- a/addons/weather/functions/fnc_calculateWindSpeed.sqf +++ b/addons/weather/functions/fnc_calculateWindSpeed.sqf @@ -18,7 +18,7 @@ private ["_windSpeed", "_windDir", "_height", "_newWindSpeed", "_windSource", "_roughnessLength"]; -EXPLODE_4_PVT(_this,_position,_windGradientEnabled,_terrainEffectEnabled,_obstacleEffectEnabled); +PARAMS_4(_position,_windGradientEnabled,_terrainEffectEnabled,_obstacleEffectEnabled); fnc_polar2vect = { private ["_mag2D"]; From 736c4f94e17068947c5abc0f27d7ffdd833647f3 Mon Sep 17 00:00:00 2001 From: SAM Date: Fri, 15 May 2015 14:47:37 +0200 Subject: [PATCH 34/34] Revered macro on fnc_throwGrenade --- addons/weaponselect/functions/fnc_throwGrenade.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/weaponselect/functions/fnc_throwGrenade.sqf b/addons/weaponselect/functions/fnc_throwGrenade.sqf index cb7769df90..ab06fd5b5d 100644 --- a/addons/weaponselect/functions/fnc_throwGrenade.sqf +++ b/addons/weaponselect/functions/fnc_throwGrenade.sqf @@ -1,10 +1,10 @@ // by commy2 #include "script_component.hpp" -private ["_magazine"]; - -PARAMS_2(_unit,_weapon); +private ["_unit","_weapon","_magazine"]; +_unit = _this select 0; +_weapon = _this select 1; _magazine = _this select 5; if (_weapon != "Throw") exitWith {};