Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

ATragMX | Scopes - Fixed typo (#5700)

Browse Source
This commit is contained in:
ulteq 2017-10-28 21:42:03 +02:00 committed by GitHub
parent c4f9b6c19b
commit cd3f2f03a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/atragmx/functions/fnc_calculate_truing_drop.sqf
View File

@ -46,8 +46,8 @@ if (_parseInput) then {
};
switch (_dropUnit) do {
case 0: {
_transonicDrop = MRAD_TO_MOA(_transonicDrop);
_subsonicDrop = MRAD_TO_MOA(_subsonicDrop);
_transonicDrop = MOA_TO_MRAD(_transonicDrop);
_subsonicDrop = MOA_TO_MRAD(_subsonicDrop);
};
case 2: {
_transonicDrop = _transonicDrop / 1.047;

8
addons/atragmx/functions/fnc_update_range_card.sqf
View File

@ -45,9 +45,9 @@ private _speedOfSound = GVAR(temperature) call EFUNC(weather,calculateSpeedOfSou
switch (GVAR(currentScopeUnit)) do {
case 0: {
_elevation = MRAD_TO_MOA(_elevation);
_windage1 = MRAD_TO_MOA(_windage1);
_windage2 = MRAD_TO_MOA(_windage2);
_elevation = MOA_TO_MRAD(_elevation);
_windage1 = MOA_TO_MRAD(_windage1);
_windage2 = MOA_TO_MRAD(_windage2);
};
case 2: {
_elevation = _elevation * 1.047;
@ -55,7 +55,7 @@ private _speedOfSound = GVAR(temperature) call EFUNC(weather,calculateSpeedOfSou
_windage2 = _windage2 * 1.047;
};
case 3: {
private _clickSize = [1, 1 / 1.047, MOA_TO_MRAD(1)] select (GVAR(workingMemory) select 7);
private _clickSize = [1, 1 / 1.047, MRAD_TO_MOA(1)] select (GVAR(workingMemory) select 7);
private _clickNumber = GVAR(workingMemory) select 8;
private _clickInterval = _clickSize / _clickNumber;

16
addons/atragmx/functions/fnc_update_result.sqf
View File

@ -41,16 +41,16 @@ private _lead = GVAR(leadOutput) select GVAR(currentTarget);
switch (GVAR(currentScopeUnit)) do {
case 0: {
_elevationAbs = MRAD_TO_MOA(_elevationAbs);
_windageAbs = MRAD_TO_MOA(_windageAbs);
_elevationAbs = MOA_TO_MRAD(_elevationAbs);
_windageAbs = MOA_TO_MRAD(_windageAbs);
_wind2 = MRAD_TO_MOA(_wind2);
_wind2 = MOA_TO_MRAD(_wind2);
_elevationRel = MRAD_TO_MOA(_elevationRel);
_windageRel = MRAD_TO_MOA(_windageRel);
_elevationRel = MOA_TO_MRAD(_elevationRel);
_windageRel = MOA_TO_MRAD(_windageRel);
_elevationCur = MRAD_TO_MOA(_elevationCur);
_windageCur = MRAD_TO_MOA(_windageCur);
_elevationCur = MOA_TO_MRAD(_elevationCur);
_windageCur = MOA_TO_MRAD(_windageCur);
};
case 2: {
_elevationAbs = _elevationAbs * 1.047;
@ -65,7 +65,7 @@ switch (GVAR(currentScopeUnit)) do {
_windageCur = _windageCur * 1.047;
};
case 3: {
private _clickSize = [1, 1 / 1.047, MOA_TO_MRAD(1)] select (GVAR(workingMemory) select 7);
private _clickSize = [1, 1 / 1.047, MRAD_TO_MOA(1)] select (GVAR(workingMemory) select 7);
private _clickNumber = GVAR(workingMemory) select 8;
private _clickInterval = _clickSize / _clickNumber;

6
addons/atragmx/functions/fnc_update_truing_drop_data.sqf
View File

@ -42,9 +42,9 @@ private _dropData = +GVAR(truingDropDropData);
switch (_dropUnit) do {
case 0: {
_dropData set [0, MRAD_TO_MOA(_dropData select 0)];
_dropData set [1, MRAD_TO_MOA(_dropData select 1)];
_dropData set [2, MRAD_TO_MOA(_dropData select 2)];
_dropData set [0, MOA_TO_MRAD(_dropData select 0)];
_dropData set [1, MOA_TO_MRAD(_dropData select 1)];
_dropData set [2, MOA_TO_MRAD(_dropData select 2)];
};
case 2: {
_dropData set [0, (_dropData select 0) * 1.047];

4
addons/atragmx/script_component.hpp
View File

@ -16,8 +16,8 @@
#include "\z\ace\addons\main\script_macros.hpp"
#define MOA_TO_MRAD(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
#define MRAD_TO_MOA(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
#define MRAD_TO_MOA(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
#define MOA_TO_MRAD(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
#define DEG_TO_MOA(d) (d * 60) // Conversion factor: 60
#define MOA_TO_DEG(d) (d / 60) // Conversion factor: 1 / 60
#define DEG_TO_MRAD(d) (d * 17.45329252) // Conversion factor: (50 * PI) / 9

4
addons/rangecard/script_component.hpp
View File

@ -16,8 +16,8 @@
#include "\z\ace\addons\main\script_macros.hpp"
#define MOA_TO_MRAD(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
#define MRAD_TO_MOA(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
#define MRAD_TO_MOA(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
#define MOA_TO_MRAD(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
#define DEG_TO_MOA(d) (d * 60) // Conversion factor: 60
#define MOA_TO_DEG(d) (d / 60) // Conversion factor: 1 / 60
#define DEG_TO_MRAD(d) (d * 17.45329252) // Conversion factor: (50 * PI) / 9