diff --git a/addons/common/functions/fnc_getMagneticBearing.sqf b/addons/common/functions/fnc_getMagneticBearing.sqf index 042755760a..7b56019a8d 100644 --- a/addons/common/functions/fnc_getMagneticBearing.sqf +++ b/addons/common/functions/fnc_getMagneticBearing.sqf @@ -1,7 +1,7 @@ #include "..\script_component.hpp" /* * Author: PabstMirror - * + * Returns magnetic heading (0..360) * * Arguments: * 0: Object or Bearing @@ -17,5 +17,7 @@ params [["_source", ace_player, [objNull, 0]]]; -(missionNamespace getVariable [QGVAR(magneticDeclinationOffset), 0]) + -(if (_source isEqualType 0) then { _source } else { getDir _source }) +[ + (if (_source isEqualType 0) then { _source } else { getDir _source }) + + (missionNamespace getVariable [QGVAR(magneticDeclinationOffset), 0]) +] call CBA_fnc_simplifyAngle; diff --git a/addons/common/functions/fnc_getMagneticBearingOffset.sqf b/addons/common/functions/fnc_getMagneticBearingOffset.sqf index d3b78452fc..3724695eb3 100644 --- a/addons/common/functions/fnc_getMagneticBearingOffset.sqf +++ b/addons/common/functions/fnc_getMagneticBearingOffset.sqf @@ -1,7 +1,7 @@ #include "..\script_component.hpp" /* * Author: PabstMirror - * + * Calculate magnetic offset based on lat/long * * Arguments: * None @@ -28,81 +28,81 @@ private _lat = GVAR(mapLatitude); private _size = 5; private _data = [ -[148.674,141.141,128.977,110.077,85.874,63.858,48.477,38.438,31.607,26.630,22.789,19.712,17.205,15.163,13.522,12.238,11.268,10.559,10.042,9.634,9.240,8.764,8.133,7.315,6.332,5.258,4.195,3.237,2.431,1.763,1.158,0.483,-0.467,-2.062,-5.424,-22.252,-167.584], -[143.674,135.505,122.743,104.017,81.615,61.843,47.796,38.360,31.791,26.930,23.129,20.049,17.508,15.409,13.698,12.339,11.300,10.544,10.016,9.651,9.365,9.069,8.683,8.157,7.487,6.720,5.933,5.206,4.587,4.070,3.593,3.037,2.196,0.674,-2.771,-20.731,-162.584], -[138.674,129.953,116.793,98.520,77.849,59.954,47.022,38.115,31.794,27.054,23.312,20.249,17.693,15.552,13.778,12.342,11.226,10.404,9.841,9.487,9.278,9.134,8.981,8.755,8.427,8.009,7.546,7.094,6.692,6.346,6.011,5.579,4.848,3.392,-0.166,-19.498,-157.584], -[133.674,124.487,111.118,93.497,74.463,58.177,46.202,37.760,31.664,27.044,23.371,20.345,17.798,15.637,13.818,12.319,11.131,10.243,9.636,9.276,9.117,9.097,9.148,9.203,9.211,9.152,9.030,8.874,8.712,8.555,8.372,8.073,7.455,6.055,2.341,-18.671,-152.584], -[128.674,119.110,105.700,88.869,71.374,56.501,45.368,37.340,31.444,26.933,23.331,20.355,17.836,15.681,13.842,12.303,11.063,10.125,9.483,9.119,9.002,9.084,9.306,9.602,9.910,10.179,10.382,10.519,10.604,10.649,10.635,10.480,9.978,8.622,4.694,-18.384,-147.584], -[123.674,113.822,100.519,84.567,68.516,54.915,44.547,36.896,31.175,26.753,23.213,20.287,17.810,15.680,13.846,12.293,11.028,10.064,9.409,9.057,8.987,9.162,9.527,10.019,10.568,11.109,11.594,11.998,12.324,12.579,12.748,12.751,12.371,11.044,6.827,-18.785,-142.584], -[118.674,108.624,95.551,80.532,65.838,53.405,43.754,36.461,30.896,26.542,23.041,20.153,17.715,15.619,13.808,12.263,10.997,10.033,9.388,9.068,9.058,9.322,9.809,10.454,11.185,11.933,12.640,13.273,13.823,14.290,14.655,14.832,14.579,13.260,8.654,-20.030,-137.584], -[113.674,103.513,90.774,76.709,63.292,51.952,42.995,36.059,30.643,26.336,22.848,19.972,17.556,15.490,13.706,12.183,10.933,9.985,9.367,9.091,9.146,9.498,10.090,10.853,11.715,12.609,13.481,14.299,15.050,15.725,16.295,16.657,16.534,15.193,10.067,-22.266,-132.584], -[108.674,98.486,86.163,73.055,60.838,50.531,42.263,35.700,30.440,26.169,22.666,19.769,17.347,15.291,13.528,12.028,10.800,9.875,9.287,9.056,9.172,9.600,10.279,11.134,12.089,13.083,14.072,15.031,15.953,16.823,17.598,18.152,18.153,16.746,10.922,-25.575,-127.584], -[103.674,93.539,81.698,69.530,58.437,49.112,41.535,35.375,30.297,26.064,22.526,19.575,17.110,15.034,13.273,11.787,10.579,9.677,9.115,8.917,9.078,9.562,10.303,11.223,12.242,13.300,14.364,15.425,16.481,17.521,18.488,19.223,19.330,17.787,11.028,-29.906,-122.584], -[98.674,88.668,77.357,66.099,56.054,47.660,40.776,35.057,30.200,26.026,22.448,19.416,16.872,14.742,12.958,11.473,10.279,9.395,8.851,8.670,8.850,9.357,10.128,11.079,12.129,13.217,14.319,15.437,16.584,17.752,18.876,19.761,19.927,18.145,10.137,-35.000,-117.584], -[93.674,83.868,73.122,62.734,53.656,46.137,39.942,34.699,30.113,26.036,22.432,19.309,16.662,14.451,12.621,11.124,9.937,9.067,8.531,8.346,8.512,9.001,9.754,10.691,11.728,12.806,13.902,15.028,16.208,17.442,18.659,19.630,19.772,17.593,7.938,-40.381,-112.584], -[88.674,79.135,68.976,59.410,51.215,44.506,38.981,34.239,29.976,26.048,22.456,19.259,16.506,14.202,12.313,10.793,9.609,8.744,8.201,7.986,8.099,8.517,9.194,10.056,11.025,12.040,13.076,14.150,15.290,16.505,17.719,18.666,18.647,15.840,4.096,-45.476,-107.584], -[83.674,74.462,64.905,56.107,48.708,42.733,37.841,33.608,29.709,25.991,22.466,19.236,16.403,14.016,12.068,10.521,9.328,8.453,7.879,7.599,7.611,7.901,8.435,9.156,9.991,10.882,11.798,12.749,13.764,14.852,15.928,16.687,16.298,12.555,-1.624,-49.794,-102.584], -[78.674,69.845,60.895,52.809,46.118,40.792,36.475,32.733,29.222,25.766,22.374,19.170,16.301,13.858,11.862,10.283,9.063,8.152,7.511,7.124,6.987,7.094,7.425,7.940,8.579,9.283,10.015,10.771,11.567,12.400,13.170,13.522,12.479,7.448,-9.100,-53.054,-97.584], -[73.674,65.279,56.936,49.507,43.434,38.663,34.845,31.551,28.422,25.259,22.053,18.936,16.081,13.614,11.581,9.958,8.689,7.706,6.962,6.431,6.106,5.989,6.075,6.337,6.729,7.194,7.685,8.176,8.661,9.109,9.388,9.078,7.061,0.484,-17.596,-55.186,-92.584], -[68.674,60.759,53.020,46.193,40.651,36.337,32.927,30.009,27.223,24.348,21.354,18.362,15.559,13.090,11.022,9.343,7.997,6.916,6.045,5.350,4.825,4.473,4.298,4.289,4.407,4.598,4.806,4.980,5.080,5.033,4.656,3.458,0.227,-7.828,-25.877,-56.261,-87.584], -[63.674,56.279,49.140,42.864,37.772,33.818,30.712,28.076,25.558,22.926,20.126,17.263,14.520,12.054,9.945,8.196,6.761,5.575,4.580,3.738,3.034,2.472,2.059,1.790,1.637,1.549,1.458,1.291,0.969,0.369,-0.752,-2.939,-7.383,-16.376,-32.810,-56.414,-82.584], -[58.674,51.836,45.289,39.521,34.807,31.118,28.210,25.743,23.388,20.912,18.245,15.474,12.770,10.293,8.135,6.316,4.804,3.540,2.464,1.528,0.707,-0.004,-0.598,-1.078,-1.465,-1.806,-2.177,-2.668,-3.397,-4.531,-6.360,-9.440,-14.792,-23.918,-37.856,-55.796,-77.584], -[53.674,47.425,41.464,36.167,31.768,28.260,25.445,23.027,20.710,18.273,15.642,12.891,10.183,7.676,5.473,3.610,2.066,0.788,-0.290,-1.232,-2.078,-2.846,-3.536,-4.148,-4.699,-5.233,-5.826,-6.585,-7.651,-9.222,-11.610,-15.321,-21.103,-29.691,-41.034,-54.542,-72.584], -[48.674,43.041,37.662,32.807,28.676,25.279,22.461,19.976,17.564,15.033,12.322,9.508,6.749,4.204,1.984,0.132,-1.364,-2.562,-3.544,-4.388,-5.154,-5.873,-6.554,-7.197,-7.816,-8.453,-9.185,-10.124,-11.423,-13.294,-16.035,-20.063,-25.845,-33.551,-42.628,-52.771,-67.584], -[43.674,38.681,33.878,29.448,25.552,22.215,19.320,16.665,14.037,11.285,8.385,5.433,2.594,0.029,-2.153,-3.908,-5.259,-6.279,-7.066,-7.717,-8.304,-8.870,-9.430,-9.990,-10.568,-11.207,-11.984,-13.011,-14.440,-16.474,-19.377,-23.464,-28.970,-35.722,-42.972,-50.578,-62.584], -[38.674,34.339,30.110,26.094,22.419,19.114,16.093,13.194,10.256,7.187,4.018,0.887,-2.025,-4.560,-6.622,-8.188,-9.303,-10.063,-10.583,-10.968,-11.296,-11.616,-11.952,-12.323,-12.758,-13.308,-14.050,-15.089,-16.565,-18.658,-21.587,-25.570,-30.673,-36.536,-42.356,-48.040,-57.584], -[33.674,30.013,26.356,22.753,19.299,16.023,12.858,9.681,6.383,2.948,-0.517,-3.816,-6.753,-9.184,-11.045,-12.345,-13.162,-13.614,-13.824,-13.898,-13.910,-13.912,-13.943,-14.044,-14.263,-14.661,-15.315,-16.319,-17.791,-19.880,-22.754,-26.550,-31.218,-36.305,-41.010,-45.219,-52.584], -[28.674,25.697,22.611,19.428,16.212,12.986,9.695,6.248,2.594,-1.198,-4.925,-8.335,-11.221,-13.473,-15.068,-16.057,-16.547,-16.670,-16.550,-16.285,-15.947,-15.591,-15.277,-15.070,-15.040,-15.262,-15.807,-16.755,-18.199,-20.250,-23.030,-26.607,-30.856,-35.280,-39.105,-42.165,-47.584], -[23.674,21.389,18.873,16.119,13.171,10.039,6.674,3.010,-0.944,-5.028,-8.940,-12.372,-15.128,-17.141,-18.437,-19.099,-19.253,-19.036,-18.572,-17.955,-17.256,-16.542,-15.890,-15.387,-15.124,-15.180,-15.622,-16.512,-17.916,-19.913,-22.580,-25.933,-29.794,-33.651,-36.770,-38.917,-42.584], -[18.674,17.084,15.135,12.824,10.182,7.205,3.846,0.058,-4.099,-8.371,-12.366,-15.733,-18.298,-20.042,-21.027,-21.355,-21.161,-20.589,-19.769,-18.799,-17.760,-16.728,-15.793,-15.054,-14.607,-14.532,-14.889,-15.724,-17.081,-19.012,-21.558,-24.690,-28.195,-31.564,-34.099,-35.507,-37.584], -[13.674,12.779,11.393,9.538,7.241,4.492,1.239,-2.555,-6.787,-11.129,-15.112,-18.352,-20.696,-22.162,-22.829,-22.807,-22.237,-21.284,-20.096,-18.792,-17.464,-16.192,-15.065,-14.176,-13.615,-13.454,-13.746,-14.527,-15.828,-17.680,-20.095,-23.010,-26.186,-29.123,-31.165,-31.962,-32.584], -[8.674,8.469,7.640,6.251,4.338,1.888,-1.153,-4.818,-8.986,-13.283,-17.182,-20.271,-22.399,-23.590,-23.923,-23.510,-22.516,-21.148,-19.594,-17.998,-16.456,-15.042,-13.826,-12.879,-12.274,-12.069,-12.313,-13.037,-14.268,-16.026,-18.299,-20.999,-23.865,-26.412,-28.024,-28.303,-27.584], -[3.674,4.151,3.870,2.951,1.451,-0.635,-3.363,-6.768,-10.735,-14.881,-18.654,-21.603,-23.542,-24.465,-24.429,-23.562,-22.086,-20.276,-18.375,-16.546,-14.878,-13.420,-12.207,-11.281,-10.688,-10.473,-10.679,-11.343,-12.491,-14.139,-16.260,-18.741,-21.308,-23.491,-24.718,-24.548,-22.584], -[-1.326,-0.178,0.075,-0.377,-1.447,-3.123,-5.454,-8.483,-12.121,-16.023,-19.640,-22.474,-24.256,-24.905,-24.452,-23.065,-21.060,-18.808,-16.603,-14.612,-12.899,-11.472,-10.330,-9.477,-8.933,-8.731,-8.910,-9.510,-10.567,-12.091,-14.048,-16.302,-18.573,-20.409,-21.282,-20.712,-17.584], -[-6.326,-4.523,-3.753,-3.749,-4.386,-5.630,-7.510,-10.073,-13.272,-16.834,-20.252,-22.975,-24.609,-24.961,-24.038,-22.088,-19.554,-16.905,-14.467,-12.389,-10.693,-9.346,-8.306,-7.549,-7.071,-6.894,-7.053,-7.593,-8.552,-9.943,-11.722,-13.739,-15.707,-17.204,-17.742,-16.807,-12.584], -[-11.326,-8.887,-7.619,-7.179,-7.399,-8.213,-9.624,-11.669,-14.340,-17.455,-20.588,-23.148,-24.592,-24.595,-23.163,-20.660,-17.670,-14.729,-12.161,-10.071,-8.436,-7.187,-6.253,-5.589,-5.175,-5.023,-5.164,-5.643,-6.501,-7.749,-9.333,-11.094,-12.750,-13.907,-14.121,-12.845,-7.584], -[-16.326,-13.273,-11.530,-10.682,-10.516,-10.927,-11.885,-13.404,-15.491,-18.048,-20.750,-23.008,-24.147,-23.721,-21.767,-18.795,-15.500,-12.432,-9.860,-7.835,-6.293,-5.142,-4.298,-3.705,-3.336,-3.195,-3.310,-3.723,-4.471,-5.559,-6.925,-8.407,-9.733,-10.544,-10.438,-8.835,-2.584], -[-21.326,-17.683,-15.492,-14.270,-13.758,-13.816,-14.371,-15.396,-16.886,-18.791,-20.882,-22.616,-23.253,-22.286,-19.830,-16.537,-13.144,-10.138,-7.698,-5.813,-4.393,-3.337,-2.561,-2.009,-1.655,-1.501,-1.570,-1.899,-2.517,-3.419,-4.537,-5.709,-6.681,-7.135,-6.709,-4.785,2.416], -[-26.326,-22.122,-19.509,-17.949,-17.142,-16.909,-17.132,-17.733,-18.665,-19.877,-21.193,-22.142,-22.019,-20.370,-17.445,-13.995,-10.709,-7.937,-5.746,-4.069,-2.800,-1.841,-1.117,-0.582,-0.214,-0.017,-0.013,-0.230,-0.686,-1.367,-2.198,-3.023,-3.615,-3.699,-2.948,-0.702,7.416], -[-31.326,-26.590,-23.585,-21.725,-20.674,-20.217,-20.190,-20.460,-20.921,-21.474,-21.936,-21.887,-20.740,-18.240,-14.846,-11.354,-8.307,-5.873,-4.002,-2.579,-1.488,-0.638,0.033,0.561,0.960,1.220,1.324,1.250,0.990,0.570,0.070,-0.370,-0.554,-0.252,0.833,3.406,12.416], -[-36.326,-31.092,-27.722,-25.597,-24.351,-23.733,-23.535,-23.573,-23.676,-23.675,-23.323,-22.194,-19.840,-16.317,-12.380,-8.843,-6.049,-3.963,-2.422,-1.265,-0.366,0.358,0.963,1.475,1.900,2.229,2.444,2.534,2.502,2.383,2.254,2.237,2.487,3.191,4.621,7.535,17.416], -[-41.326,-35.629,-31.920,-29.563,-28.162,-27.433,-27.130,-27.020,-26.878,-26.460,-25.427,-23.293,-19.702,-15.043,-10.426,-6.713,-4.059,-2.235,-0.968,-0.048,0.665,1.256,1.777,2.251,2.682,3.064,3.386,3.647,3.863,4.076,4.353,4.788,5.494,6.615,8.404,11.678,22.416], -[-46.326,-40.203,-36.180,-33.616,-32.089,-31.283,-30.916,-30.716,-30.413,-29.699,-28.145,-25.184,-20.489,-14.706,-9.284,-5.200,-2.491,-0.774,0.330,1.082,1.644,2.113,2.543,2.959,3.373,3.785,4.198,4.627,5.100,5.661,6.366,7.274,8.452,10.004,12.171,15.830,27.416], -[-51.326,-44.816,-40.501,-37.747,-36.110,-35.240,-34.823,-34.556,-34.131,-33.191,-31.241,-27.650,-22.092,-15.347,-9.104,-4.490,-1.524,0.269,1.349,2.032,2.509,2.892,3.246,3.605,3.990,4.419,4.912,5.503,6.235,7.153,8.296,9.686,11.346,13.343,15.909,19.986,32.416], -[-56.326,-49.471,-44.882,-41.947,-40.199,-39.259,-38.781,-38.432,-37.877,-36.725,-34.439,-30.372,-24.213,-16.783,-9.851,-4.664,-1.302,0.722,1.917,2.639,3.113,3.470,3.789,4.117,4.491,4.947,5.527,6.286,7.281,8.559,10.140,12.011,14.156,16.612,19.605,24.141,37.416], -[-61.326,-54.168,-49.322,-46.206,-44.334,-43.297,-42.719,-42.246,-41.517,-40.116,-37.498,-33.045,-26.506,-18.694,-11.316,-5.648,-1.861,0.484,1.895,2.752,3.304,3.704,4.045,4.392,4.798,5.318,6.016,6.966,8.237,9.874,11.883,14.226,16.858,19.788,23.243,28.289,42.416], -[-66.326,-58.909,-53.820,-50.514,-48.492,-47.313,-46.579,-45.915,-44.942,-43.228,-40.241,-35.437,-28.666,-20.726,-13.173,-7.207,-3.066,-0.396,1.274,2.324,3.014,3.514,3.934,4.356,4.850,5.487,6.350,7.524,9.085,11.079,13.502,16.303,19.420,22.846,26.806,32.426,47.416], -[-71.326,-63.698,-58.376,-54.865,-52.653,-51.275,-50.312,-49.374,-48.070,-45.961,-42.549,-37.389,-30.460,-22.558,-15.054,-8.994,-4.635,-1.704,0.210,1.461,2.312,2.942,3.478,4.016,4.644,5.447,6.516,7.943,9.804,12.144,14.959,18.201,21.802,25.751,30.272,36.546,52.416], -[-76.326,-68.534,-62.991,-59.253,-56.803,-55.156,-53.880,-52.574,-50.841,-48.248,-44.341,-38.793,-31.723,-23.938,-16.624,-10.643,-6.216,-3.128,-1.033,0.388,1.386,2.144,2.801,3.470,4.251,5.240,6.533,8.218,10.369,13.029,16.206,19.866,23.955,28.463,33.614,40.642,57.416], -[-81.326,-73.421,-67.667,-63.676,-60.932,-58.938,-57.254,-55.477,-53.210,-50.035,-45.556,-39.571,-32.346,-24.700,-17.650,-11.869,-7.505,-4.373,-2.180,-0.646,0.459,1.318,2.077,2.860,3.780,4.940,6.436,8.350,10.751,13.687,17.183,21.234,25.814,30.926,36.800,44.708,62.416], -[-86.326,-78.361,-72.407,-68.135,-65.036,-62.609,-60.413,-58.051,-55.135,-51.274,-46.142,-39.673,-32.271,-24.768,-18.022,-12.520,-8.326,-5.255,-3.051,-1.470,-0.306,0.616,1.443,2.308,3.329,4.614,6.257,8.336,10.919,14.064,17.821,22.227,27.300,33.075,39.788,48.735,67.416], -[-91.326,-83.355,-77.217,-72.635,-69.117,-66.165,-63.344,-60.273,-56.582,-51.922,-46.059,-39.071,-31.494,-24.151,-17.745,-12.587,-8.648,-5.728,-3.594,-2.031,-0.856,0.092,0.954,1.862,2.936,4.285,6.000,8.159,10.834,14.099,18.040,22.750,28.314,34.818,42.521,52.714,72.416], -[-96.326,-88.407,-82.103,-77.185,-73.181,-69.604,-66.036,-62.116,-57.512,-51.937,-45.275,-37.765,-30.051,-22.918,-16.902,-12.148,-8.536,-5.845,-3.853,-2.367,-1.225,-0.286,0.581,1.499,2.581,3.931,5.639,7.785,10.448,13.727,17.755,22.695,28.728,36.036,44.923,56.633,77.416], -[-101.326,-93.518,-87.075,-81.799,-77.242,-72.934,-68.479,-63.552,-57.880,-51.274,-43.770,-35.776,-28.010,-21.166,-15.597,-11.299,-8.073,-5.675,-3.887,-2.534,-1.472,-0.576,0.266,1.161,2.209,3.504,5.131,7.170,9.715,12.890,16.880,21.941,28.390,36.571,46.889,60.477,82.416], -[-106.326,-98.692,-92.142,-86.496,-81.320,-76.164,-70.661,-64.543,-57.630,-49.884,-41.533,-33.144,-25.447,-18.983,-13.916,-10.111,-7.308,-5.249,-3.719,-2.551,-1.616,-0.807,-0.030,0.803,1.773,2.958,4.433,6.279,8.596,11.537,15.339,20.365,27.118,36.210,48.268,64.226,87.416], -[-111.326,-103.929,-97.319,-91.301,-85.443,-79.307,-72.564,-65.032,-56.686,-47.710,-38.563,-29.926,-22.441,-16.444,-11.915,-8.616,-6.253,-4.559,-3.323,-2.388,-1.633,-0.964,-0.304,0.414,1.253,2.269,3.525,5.092,7.075,9.645,13.085,17.863,24.716,34.677,48.842,67.855,92.416], -[-116.326,-109.234,-102.620,-96.243,-89.647,-82.381,-74.158,-64.934,-54.943,-44.695,-34.888,-26.207,-19.092,-13.636,-9.658,-6.858,-4.926,-3.602,-2.683,-2.017,-1.490,-1.018,-0.536,0.006,0.651,1.435,2.402,3.612,5.163,7.229,10.121,14.393,21.027,31.647,48.290,71.327,97.416], -[-121.326,-114.606,-108.061,-101.363,-93.981,-85.408,-75.392,-64.119,-52.269,-40.803,-30.585,-22.125,-15.547,-10.694,-7.269,-4.944,-3.418,-2.450,-1.848,-1.469,-1.206,-0.977,-0.728,-0.420,-0.030,0.462,1.079,1.865,2.903,4.357,6.535,10.032,16.018,26.808,46.143,74.590,102.416], -[-126.326,-120.048,-113.660,-106.707,-98.511,-88.416,-76.179,-62.397,-48.518,-36.054,-25.813,-17.887,-12.011,-7.819,-4.945,-3.066,-1.912,-1.268,-0.964,-0.867,-0.875,-0.913,-0.930,-0.898,-0.806,-0.650,-0.424,-0.103,0.377,1.156,2.514,5.022,9.908,20.050,41.762,77.564,107.416], -[-131.326,-125.560,-119.436,-112.333,-103.326,-91.445,-76.376,-59.492,-43.558,-30.566,-20.808,-13.734,-8.711,-5.230,-2.908,-1.453,-0.636,-0.277,-0.233,-0.388,-0.648,-0.944,-1.229,-1.484,-1.705,-1.901,-2.077,-2.225,-2.300,-2.190,-1.662,-0.227,3.238,11.757,34.442,80.124,112.416], -[-136.326,-131.141,-125.406,-118.308,-108.551,-94.551,-75.735,-55.025,-37.339,-24.566,-15.834,-9.880,-5.815,-3.080,-1.315,-0.271,0.237,0.347,0.174,-0.187,-0.657,-1.175,-1.703,-2.224,-2.742,-3.272,-3.826,-4.405,-4.976,-5.457,-5.668,-5.229,-3.243,2.952,23.932,82.056,117.416], -[-141.326,-136.791,-131.588,-124.712,-114.365,-97.831,-73.809,-48.521,-29.971,-18.356,-11.111,-6.442,-3.380,-1.399,-0.187,0.457,0.673,0.565,0.215,-0.306,-0.937,-1.630,-2.357,-3.106,-3.883,-4.703,-5.580,-6.514,-7.483,-8.422,-9.203,-9.560,-8.856,-5.086,11.382,82.966,122.416], -[-146.326,-142.505,-137.993,-131.634,-121.030,-101.462,-69.727,-39.525,-21.784,-12.237,-6.756,-3.417,-1.339,-0.082,0.602,0.865,0.809,0.506,0.010,-0.633,-1.385,-2.213,-3.098,-4.034,-5.024,-6.080,-7.208,-8.404,-9.647,-10.891,-12.049,-12.956,-13.205,-11.459,-0.625,82.048,127.416], -[-151.326,-148.279,-144.630,-139.168,-128.933,-105.822,-61.689,-27.973,-13.292,-6.431,-2.787,-0.719,0.454,1.056,1.264,1.186,0.890,0.418,-0.200,-0.943,-1.793,-2.733,-3.753,-4.846,-6.012,-7.250,-8.558,-9.924,-11.327,-12.733,-14.095,-15.328,-16.205,-15.915,-9.946,77.445,132.416], -[-156.326,-154.108,-151.498,-147.397,-138.636,-111.905,-46.098,-14.726,-5.060,-1.066,0.844,1.773,2.156,2.199,2.011,1.654,1.164,0.557,-0.162,-0.994,-1.936,-2.984,-4.132,-5.368,-6.683,-8.064,-9.494,-10.956,-12.427,-13.888,-15.326,-16.718,-17.969,-18.633,-16.100,64.386,137.416], -[-161.326,-159.985,-158.584,-156.375,-150.876,-123.342,-19.367,-1.580,2.464,3.807,4.197,4.153,3.879,3.471,2.975,2.410,1.780,1.075,0.278,-0.632,-1.665,-2.824,-4.099,-5.472,-6.919,-8.413,-9.926,-11.432,-12.912,-14.362,-15.795,-17.239,-18.690,-19.944,-19.623,34.104,142.416], -[-166.326,-165.899,-165.863,-166.089,-166.325,-163.622,9.960,9.772,9.028,8.177,7.311,6.467,5.662,4.900,4.173,3.463,2.743,1.977,1.127,0.157,-0.956,-2.218,-3.613,-5.111,-6.673,-8.258,-9.826,-11.346,-12.804,-14.207,-15.594,-17.029,-18.568,-20.171,-21.227,-1.725,147.416], -[-171.326,-171.841,-173.297,-176.424,175.211,112.878,28.983,18.645,14.558,12.047,10.193,8.710,7.479,6.436,5.533,4.720,3.944,3.149,2.276,1.272,0.106,-1.232,-2.719,-4.316,-5.969,-7.621,-9.224,-10.742,-12.163,-13.508,-14.831,-16.223,-17.785,-19.581,-21.489,-20.030,152.416], -[-176.326,-177.799,179.169,172.852,155.709,90.781,39.071,25.195,19.094,15.421,12.828,10.845,9.272,7.999,6.949,6.054,5.243,4.440,3.571,2.570,1.392,0.024,-1.513,-3.168,-4.877,-6.570,-8.191,-9.697,-11.078,-12.360,-13.613,-14.945,-16.488,-18.379,-20.815,-27.106,157.416], -[178.674,176.241,171.597,162.068,138.008,82.503,44.397,29.886,22.729,18.305,15.186,12.826,10.980,9.513,8.335,7.367,6.528,5.733,4.894,3.931,2.787,1.440,-0.093,-1.760,-3.486,-5.194,-6.815,-8.301,-9.639,-10.858,-12.038,-13.301,-14.798,-16.720,-19.483,-29.458,162.416], -[173.674,170.291,164.059,151.579,123.616,77.580,47.231,33.176,25.573,20.710,17.241,14.609,12.551,10.925,9.636,8.602,7.742,6.965,6.175,5.282,4.214,2.935,1.455,-0.178,-1.885,-3.582,-5.188,-6.644,-7.934,-9.089,-10.192,-11.376,-12.808,-14.720,-17.687,-29.662,167.416], -[168.674,164.365,156.623,141.679,112.399,73.953,48.664,35.427,27.739,22.657,18.974,16.155,13.942,12.191,10.811,9.724,8.850,8.099,7.373,6.572,5.612,4.443,3.058,1.499,-0.157,-1.817,-3.389,-4.805,-6.039,-7.122,-8.143,-9.239,-10.592,-12.464,-15.560,-28.797,172.416], -[163.674,158.475,149.352,132.552,103.621,70.972,49.252,36.906,29.332,24.176,20.376,17.439,15.116,13.272,11.820,10.689,9.806,9.086,8.430,7.735,6.908,5.880,4.630,3.185,1.616,0.024,-1.491,-2.847,-4.012,-5.015,-5.945,-6.946,-8.207,-10.022,-13.202,-27.382,177.416], -[158.674,152.634,142.298,124.264,96.587,68.371,49.305,37.809,30.451,25.309,21.458,18.448,16.047,14.130,12.617,11.446,10.551,9.855,9.266,8.682,8.001,7.144,6.066,4.780,3.345,1.863,0.442,-0.825,-1.901,-2.809,-3.641,-4.538,-5.701,-7.446,-10.688,-25.704,-177.584], -[153.674,146.853,135.498,116.796,90.787,66.022,49.007,38.283,31.182,26.108,22.248,19.194,16.734,14.753,13.180,11.960,11.038,10.349,9.810,9.326,8.795,8.126,7.259,6.182,4.941,3.627,2.354,1.215,0.258,-0.540,-1.263,-2.052,-3.110,-4.780,-8.078,-23.949,-172.584] +[148.667,141.133,128.969,110.073,85.876,63.866,48.485,38.446,31.613,26.636,22.794,19.716,17.209,15.167,13.526,12.242,11.272,10.563,10.046,9.638,9.243,8.766,8.135,7.315,6.331,5.256,4.192,3.232,2.424,1.754,1.146,0.468,-0.487,-2.091,-5.472,-22.385,-167.474], +[143.667,135.498,122.735,104.013,81.617,61.849,47.803,38.367,31.798,26.935,23.134,20.053,17.512,15.413,13.702,12.343,11.305,10.548,10.020,9.655,9.368,9.072,8.685,8.158,7.486,6.717,5.929,5.200,4.579,4.060,3.581,3.021,2.175,0.644,-2.820,-20.855,-162.474], +[138.667,129.945,116.786,98.516,77.850,59.960,47.029,38.122,31.800,27.059,23.316,20.253,17.697,15.556,13.781,12.346,11.230,10.408,9.845,9.491,9.280,9.137,8.982,8.755,8.426,8.007,7.542,7.088,6.685,6.337,5.998,5.562,4.826,3.361,-0.216,-19.612,-157.474], +[133.667,124.479,111.112,93.493,74.464,58.182,46.208,37.766,31.669,27.049,23.375,20.349,17.801,15.640,13.821,12.322,11.134,10.246,9.639,9.279,9.119,9.099,9.149,9.202,9.210,9.149,9.026,8.868,8.704,8.545,8.360,8.057,7.433,6.024,2.291,-18.776,-152.474], +[128.667,119.103,105.694,88.866,71.375,56.505,45.373,37.345,31.448,26.937,23.334,20.358,17.839,15.684,13.844,12.305,11.066,10.127,9.485,9.121,9.003,9.085,9.307,9.602,9.909,10.176,10.378,10.514,10.597,10.639,10.622,10.463,9.956,8.591,4.645,-18.478,-147.474], +[123.667,113.816,100.513,84.564,68.517,54.918,44.551,36.900,31.179,26.757,23.216,20.289,17.812,15.681,13.847,12.294,11.029,10.065,9.410,9.058,8.988,9.162,9.527,10.018,10.567,11.107,11.590,11.993,12.317,12.570,12.736,12.735,12.349,11.013,6.777,-18.864,-142.474], +[118.667,108.618,95.545,80.529,65.838,53.407,43.757,36.465,30.900,26.545,23.043,20.155,17.716,15.620,13.808,12.264,10.998,10.033,9.389,9.068,9.058,9.322,9.809,10.453,11.183,11.930,12.636,13.268,13.817,14.282,14.644,14.816,14.557,13.229,8.604,-20.091,-137.474], +[113.667,103.506,90.768,76.706,63.292,51.954,42.998,36.062,30.646,26.338,22.849,19.973,17.557,15.490,13.706,12.183,10.933,9.985,9.366,9.090,9.146,9.497,10.089,10.852,11.713,12.606,13.478,14.295,15.043,15.717,16.284,16.643,16.513,15.162,10.018,-22.302,-132.474], +[108.667,98.480,86.158,73.052,60.838,50.532,42.265,35.702,30.442,26.171,22.667,19.770,17.347,15.291,13.528,12.027,10.799,9.874,9.287,9.055,9.171,9.599,10.278,11.132,12.087,13.080,14.068,15.027,15.947,16.815,17.588,18.138,18.133,16.715,10.874,-25.580,-127.474], +[103.667,93.533,81.693,69.527,58.436,49.113,41.536,35.377,30.299,26.065,22.527,19.575,17.109,15.033,13.272,11.786,10.578,9.675,9.114,8.916,9.076,9.560,10.302,11.221,12.239,13.296,14.360,15.420,16.476,17.514,18.479,19.210,19.311,17.758,10.983,-29.874,-122.474], +[98.667,88.662,77.353,66.096,56.052,47.660,40.777,35.058,30.202,26.027,22.448,19.415,16.871,14.741,12.956,11.471,10.277,9.393,8.849,8.668,8.847,9.354,10.125,11.076,12.126,13.213,14.315,15.433,16.579,17.746,18.868,19.749,19.910,18.118,10.097,-34.930,-117.474], +[93.667,83.862,73.118,62.731,53.654,46.137,39.942,34.700,30.114,26.036,22.431,19.309,16.661,14.450,12.619,11.121,9.935,9.064,8.527,8.343,8.509,8.997,9.750,10.687,11.724,12.802,13.897,15.023,16.202,17.436,18.652,19.619,19.757,17.569,7.907,-40.277,-112.474], +[88.667,79.129,68.972,59.406,51.213,44.505,38.981,34.240,29.976,26.048,22.455,19.258,16.505,14.200,12.311,10.790,9.605,8.740,8.197,7.982,8.095,8.513,9.189,10.051,11.021,12.035,13.072,14.145,15.285,16.500,17.713,18.657,18.634,15.821,4.079,-45.348,-107.474], +[83.667,74.456,64.900,56.103,48.706,42.732,37.840,33.608,29.709,25.991,22.466,19.235,16.401,14.013,12.065,10.518,9.324,8.449,7.874,7.594,7.606,7.896,8.430,9.151,9.986,10.877,11.794,12.745,13.760,14.847,15.923,16.681,16.289,12.544,-1.619,-49.654,-102.474], +[78.667,69.840,60.891,52.806,46.115,40.790,36.473,32.733,29.221,25.765,22.373,19.169,16.299,13.855,11.859,10.279,9.059,8.147,7.506,7.119,6.981,7.088,7.420,7.934,8.574,9.278,10.010,10.766,11.562,12.396,13.166,13.519,12.475,7.448,-9.069,-52.912,-97.474], +[73.667,65.273,56.932,49.504,43.431,38.661,34.843,31.550,28.421,25.257,22.051,18.934,16.078,13.611,11.577,9.955,8.684,7.701,6.957,6.425,6.100,5.983,6.069,6.331,6.724,7.189,7.680,8.172,8.657,9.106,9.386,9.079,7.065,0.499,-17.538,-55.048,-92.474], +[68.667,60.753,53.016,46.190,40.648,36.335,32.925,30.007,27.221,24.346,21.352,18.360,15.556,13.087,11.019,9.339,7.992,6.911,6.039,5.344,4.818,4.467,4.292,4.283,4.401,4.593,4.801,4.977,5.077,5.032,4.657,3.463,0.240,-7.796,-25.800,-56.131,-87.474], +[63.667,56.274,49.136,42.861,37.769,33.815,30.710,28.074,25.555,22.923,20.123,17.260,14.517,12.050,9.941,8.191,6.756,5.569,4.574,3.731,3.027,2.465,2.053,1.784,1.632,1.544,1.454,1.288,0.967,0.369,-0.748,-2.928,-7.361,-16.331,-32.725,-56.294,-82.474], +[58.667,51.831,45.285,39.518,34.804,31.115,28.207,25.740,23.385,20.909,18.241,15.469,12.765,10.288,8.130,6.310,4.797,3.533,2.457,1.521,0.700,-0.010,-0.604,-1.084,-1.470,-1.811,-2.180,-2.670,-3.397,-4.528,-6.353,-9.425,-14.763,-23.866,-37.772,-55.686,-77.474], +[53.667,47.420,41.460,36.164,31.765,28.257,25.441,23.024,20.706,18.268,15.637,12.886,10.177,7.670,5.467,3.603,2.059,0.781,-0.298,-1.239,-2.085,-2.852,-3.541,-4.153,-4.703,-5.236,-5.828,-6.585,-7.649,-9.217,-11.599,-15.302,-21.071,-29.638,-40.955,-54.441,-72.474], +[48.667,43.036,37.657,32.804,28.673,25.276,22.458,19.973,17.560,15.028,12.316,9.502,6.742,4.196,1.975,0.123,-1.373,-2.571,-3.552,-4.396,-5.161,-5.880,-6.559,-7.201,-7.819,-8.455,-9.185,-10.122,-11.419,-13.286,-16.022,-20.042,-25.811,-33.500,-42.556,-52.678,-67.474], +[43.667,38.675,33.874,29.444,25.549,22.212,19.317,16.661,14.032,11.279,8.378,5.424,2.585,0.019,-2.163,-3.918,-5.269,-6.288,-7.075,-7.724,-8.311,-8.875,-9.434,-9.993,-10.570,-11.208,-11.983,-13.008,-14.434,-16.464,-19.362,-23.442,-28.938,-35.674,-42.906,-50.493,-62.474], +[38.667,34.334,30.106,26.091,22.416,19.111,16.089,13.190,10.251,7.180,4.010,0.878,-2.035,-4.571,-6.633,-8.199,-9.314,-10.073,-10.592,-10.975,-11.303,-11.621,-11.955,-12.325,-12.759,-13.307,-14.047,-15.084,-16.558,-18.648,-21.572,-25.548,-30.642,-36.492,-42.297,-47.961,-57.474], +[33.667,30.007,26.352,22.750,19.297,16.020,12.855,9.677,6.378,2.941,-0.524,-3.825,-6.763,-9.195,-11.056,-12.356,-13.172,-13.623,-13.832,-13.904,-13.915,-13.915,-13.945,-14.045,-14.262,-14.658,-15.310,-16.312,-17.783,-19.869,-22.739,-26.528,-31.189,-36.265,-40.957,-45.146,-52.474], +[28.667,25.692,22.607,19.425,16.210,12.984,9.693,6.245,2.590,-1.203,-4.932,-8.343,-11.230,-13.483,-15.078,-16.067,-16.556,-16.678,-16.556,-16.290,-15.950,-15.593,-15.277,-15.068,-15.037,-15.257,-15.801,-16.748,-18.190,-20.238,-23.014,-26.586,-30.829,-35.243,-39.057,-42.097,-47.474], +[23.667,21.384,18.869,16.116,13.169,10.037,6.672,3.008,-0.948,-5.032,-8.946,-12.379,-15.136,-17.150,-18.446,-19.107,-19.259,-19.041,-18.577,-17.958,-17.258,-16.542,-15.888,-15.384,-15.120,-15.174,-15.615,-16.503,-17.906,-19.901,-22.565,-25.913,-29.768,-33.618,-36.725,-38.853,-42.474], +[18.667,17.079,15.131,12.821,10.180,7.204,3.845,0.056,-4.101,-8.374,-12.370,-15.739,-18.304,-20.048,-21.033,-21.361,-21.165,-20.592,-19.770,-18.799,-17.758,-16.726,-15.789,-15.049,-14.601,-14.526,-14.882,-15.715,-17.071,-19.000,-21.543,-24.671,-28.171,-31.532,-34.057,-35.447,-37.474], +[13.667,12.774,11.389,9.535,7.239,4.491,1.238,-2.555,-6.787,-11.130,-15.114,-18.355,-20.700,-22.166,-22.833,-22.809,-22.239,-21.284,-20.095,-18.790,-17.460,-16.188,-15.060,-14.170,-13.608,-13.447,-13.738,-14.518,-15.818,-17.667,-20.080,-22.992,-26.164,-29.094,-31.126,-31.905,-32.474], +[8.667,8.464,7.636,6.248,4.336,1.888,-1.153,-4.817,-8.985,-13.282,-17.181,-20.272,-22.401,-23.592,-23.925,-23.510,-22.515,-21.145,-19.590,-17.993,-16.450,-15.036,-13.819,-12.872,-12.266,-12.061,-12.304,-13.027,-14.258,-16.013,-18.285,-20.981,-23.844,-26.384,-27.987,-28.249,-27.474], +[3.667,4.146,3.866,2.948,1.449,-0.635,-3.362,-6.766,-10.732,-14.878,-18.651,-21.601,-23.542,-24.464,-24.428,-23.560,-22.082,-20.270,-18.369,-16.539,-14.871,-13.412,-12.199,-11.273,-10.680,-10.465,-10.671,-11.333,-12.481,-14.126,-16.246,-18.724,-21.287,-23.465,-24.684,-24.497,-22.474], +[-1.333,-0.184,0.070,-0.380,-1.448,-3.123,-5.453,-8.480,-12.116,-16.018,-19.636,-22.470,-24.253,-24.903,-24.449,-23.060,-21.054,-18.800,-16.595,-14.604,-12.890,-11.464,-10.321,-9.468,-8.924,-8.722,-8.901,-9.501,-10.556,-12.079,-14.034,-16.286,-18.553,-20.384,-21.249,-20.663,-17.474], +[-6.333,-4.529,-3.757,-3.752,-4.388,-5.629,-7.508,-10.069,-13.266,-16.827,-20.245,-22.970,-24.605,-24.957,-24.033,-22.081,-19.546,-16.895,-14.458,-12.380,-10.684,-9.337,-8.298,-7.540,-7.063,-6.885,-7.044,-7.583,-8.541,-9.931,-11.708,-13.723,-15.689,-17.181,-17.711,-16.760,-12.474], +[-11.333,-8.893,-7.623,-7.182,-7.401,-8.213,-9.622,-11.665,-14.334,-17.448,-20.580,-23.140,-24.585,-24.589,-23.155,-20.651,-17.660,-14.719,-12.151,-10.062,-8.427,-7.178,-6.245,-5.580,-5.167,-5.014,-5.154,-5.633,-6.491,-7.737,-9.319,-11.079,-12.732,-13.885,-14.091,-12.799,-7.474], +[-16.333,-13.278,-11.535,-10.686,-10.518,-10.927,-11.884,-13.400,-15.484,-18.040,-20.741,-22.999,-24.138,-23.712,-21.757,-18.785,-15.490,-12.421,-9.850,-7.825,-6.284,-5.133,-4.290,-3.697,-3.328,-3.186,-3.301,-3.713,-4.461,-5.548,-6.912,-8.393,-9.716,-10.522,-10.410,-8.791,-2.474], +[-21.333,-17.689,-15.497,-14.274,-13.761,-13.817,-14.370,-15.393,-16.880,-18.783,-20.872,-22.606,-23.242,-22.274,-19.818,-16.525,-13.133,-10.128,-7.689,-5.805,-4.385,-3.329,-2.553,-2.001,-1.647,-1.493,-1.562,-1.890,-2.506,-3.408,-4.524,-5.694,-6.664,-7.114,-6.682,-4.742,2.526], +[-26.333,-22.128,-19.515,-17.953,-17.145,-16.911,-17.132,-17.731,-18.661,-19.871,-21.184,-22.132,-22.007,-20.356,-17.432,-13.982,-10.698,-7.927,-5.737,-4.061,-2.793,-1.834,-1.111,-0.575,-0.207,-0.010,-0.005,-0.221,-0.676,-1.357,-2.186,-3.009,-3.599,-3.679,-2.921,-0.660,7.526], +[-31.333,-26.597,-23.591,-21.730,-20.678,-20.220,-20.192,-20.460,-20.919,-21.470,-21.930,-21.878,-20.728,-18.226,-14.832,-11.341,-8.296,-5.863,-3.994,-2.572,-1.481,-0.632,0.039,0.567,0.966,1.227,1.332,1.258,0.999,0.580,0.081,-0.357,-0.538,-0.233,0.859,3.448,12.526], +[-36.333,-31.099,-27.728,-25.603,-24.356,-23.736,-23.538,-23.575,-23.676,-23.674,-23.320,-22.188,-19.831,-16.306,-12.368,-8.831,-6.039,-3.954,-2.415,-1.258,-0.361,0.364,0.968,1.481,1.906,2.235,2.451,2.542,2.511,2.393,2.266,2.250,2.502,3.209,4.646,7.576,17.526], +[-41.333,-35.636,-31.926,-29.569,-28.167,-27.437,-27.134,-27.024,-26.881,-26.462,-25.428,-23.291,-19.697,-15.036,-10.417,-6.704,-4.050,-2.227,-0.961,-0.042,0.670,1.261,1.782,2.256,2.688,3.070,3.393,3.655,3.872,4.085,4.364,4.800,5.509,6.633,8.428,11.718,22.526], +[-46.333,-40.210,-36.186,-33.622,-32.095,-31.288,-30.921,-30.722,-30.418,-29.704,-28.149,-25.187,-20.490,-14.704,-9.279,-5.194,-2.484,-0.767,0.336,1.087,1.649,2.118,2.548,2.964,3.378,3.790,4.205,4.634,5.108,5.670,6.377,7.286,8.467,10.022,12.195,15.870,27.526], +[-51.333,-44.823,-40.507,-37.753,-36.116,-35.246,-34.830,-34.563,-34.138,-33.198,-31.249,-27.657,-22.097,-15.350,-9.104,-4.487,-1.519,0.274,1.355,2.037,2.513,2.896,3.250,3.609,3.995,4.424,4.918,5.509,6.242,7.162,8.306,9.698,11.360,13.360,15.933,20.026,32.526], +[-56.333,-49.478,-44.889,-41.954,-40.206,-39.266,-38.788,-38.440,-37.886,-36.734,-34.449,-30.381,-24.222,-16.789,-9.854,-4.664,-1.300,0.726,1.921,2.643,3.117,3.474,3.793,4.121,4.496,4.951,5.532,6.292,7.288,8.568,10.149,12.022,14.170,16.628,19.629,24.181,37.526], +[-61.333,-54.175,-49.329,-46.213,-44.342,-43.304,-42.727,-42.255,-41.526,-40.126,-37.509,-33.055,-26.515,-18.701,-11.321,-5.650,-1.861,0.485,1.897,2.755,3.307,3.707,4.048,4.396,4.802,5.322,6.021,6.971,8.243,9.882,11.892,14.237,16.871,19.805,23.267,28.329,42.526], +[-66.333,-58.917,-53.827,-50.522,-48.500,-47.321,-46.588,-45.924,-44.951,-43.238,-40.252,-35.447,-28.675,-20.733,-13.179,-7.211,-3.068,-0.397,1.275,2.325,3.016,3.516,3.937,4.359,4.853,5.491,6.354,7.528,9.091,11.086,13.510,16.314,19.432,22.862,26.829,32.467,47.526], +[-71.333,-63.705,-58.384,-54.873,-52.661,-51.283,-50.321,-49.384,-48.079,-45.971,-42.559,-37.398,-30.467,-22.565,-15.059,-8.998,-4.638,-1.706,0.209,1.462,2.313,2.943,3.479,4.018,4.646,5.449,6.519,7.947,9.809,12.150,14.967,18.210,21.814,25.767,30.295,36.587,52.526], +[-76.333,-68.542,-62.999,-59.262,-56.812,-55.165,-53.889,-52.584,-50.851,-48.258,-44.350,-38.800,-31.729,-23.943,-16.628,-10.647,-6.219,-3.130,-1.034,0.388,1.386,2.145,2.802,3.472,4.253,5.242,6.535,8.221,10.373,13.035,16.213,19.875,23.966,28.478,33.637,40.684,57.526], +[-81.333,-73.429,-67.675,-63.685,-60.941,-58.947,-57.263,-55.486,-53.218,-50.043,-45.563,-39.577,-32.350,-24.703,-17.653,-11.871,-7.507,-4.374,-2.181,-0.646,0.460,1.319,2.078,2.862,3.782,4.943,6.439,8.353,10.755,13.692,17.190,21.243,25.825,30.941,36.823,44.751,62.526], +[-86.333,-78.368,-72.416,-68.144,-65.045,-62.619,-60.422,-58.060,-55.143,-51.281,-46.147,-39.677,-32.273,-24.769,-18.023,-12.521,-8.326,-5.255,-3.051,-1.470,-0.305,0.617,1.445,2.310,3.331,4.616,6.259,8.339,10.923,14.068,17.826,22.234,27.310,33.089,39.811,48.780,67.526], +[-91.333,-83.363,-77.226,-72.644,-69.126,-66.174,-63.353,-60.281,-56.589,-51.928,-46.062,-39.073,-31.494,-24.150,-17.744,-12.587,-8.648,-5.728,-3.593,-2.030,-0.854,0.094,0.956,1.864,2.939,4.287,6.003,8.162,10.837,14.102,18.044,22.756,28.322,34.831,42.545,52.761,72.526], +[-96.333,-88.415,-82.112,-77.195,-73.190,-69.613,-66.044,-62.123,-57.517,-51.941,-45.276,-37.764,-30.049,-22.916,-16.899,-12.146,-8.534,-5.844,-3.851,-2.365,-1.224,-0.284,0.583,1.501,2.583,3.934,5.642,7.787,10.450,13.730,17.758,22.699,28.735,36.048,44.947,56.682,77.526], +[-101.333,-93.526,-87.084,-81.809,-77.252,-72.943,-68.487,-63.559,-57.884,-51.276,-43.770,-35.773,-28.006,-21.162,-15.593,-11.296,-8.070,-5.673,-3.886,-2.533,-1.470,-0.574,0.268,1.163,2.211,3.506,5.133,7.172,9.716,12.891,16.882,21.943,28.395,36.582,46.913,60.528,82.526], +[-106.333,-98.700,-92.152,-86.506,-81.330,-76.173,-70.669,-64.549,-57.633,-49.884,-41.530,-33.140,-25.441,-18.977,-13.911,-10.107,-7.305,-5.247,-3.717,-2.549,-1.615,-0.806,-0.029,0.804,1.774,2.959,4.435,6.280,8.597,11.537,15.339,20.365,27.120,36.218,48.291,64.281,87.526], +[-111.333,-103.938,-97.329,-91.311,-85.453,-79.316,-72.572,-65.037,-56.687,-47.708,-38.559,-29.920,-22.435,-16.438,-11.909,-8.612,-6.249,-4.556,-3.322,-2.387,-1.632,-0.964,-0.304,0.415,1.253,2.269,3.525,5.091,7.074,9.643,13.082,17.860,24.715,34.683,48.865,67.914,92.526], +[-116.333,-109.242,-102.630,-96.254,-89.657,-82.391,-74.166,-64.938,-54.943,-44.692,-34.882,-26.201,-19.086,-13.630,-9.653,-6.854,-4.923,-3.600,-2.681,-2.016,-1.490,-1.019,-0.537,0.006,0.650,1.434,2.401,3.610,5.160,7.225,10.116,14.388,21.023,31.648,48.311,71.391,97.526], +[-121.333,-114.615,-108.071,-101.374,-93.992,-85.418,-75.399,-64.122,-52.268,-40.799,-30.579,-22.119,-15.541,-10.689,-7.265,-4.940,-3.416,-2.448,-1.847,-1.469,-1.206,-0.978,-0.729,-0.422,-0.032,0.460,1.077,1.862,2.899,4.351,6.527,10.023,16.009,26.803,46.161,74.660,102.526], +[-126.333,-120.057,-113.671,-106.719,-98.522,-88.427,-76.186,-62.399,-48.516,-36.049,-25.807,-17.881,-12.007,-7.815,-4.942,-3.064,-1.911,-1.267,-0.963,-0.867,-0.876,-0.914,-0.932,-0.900,-0.808,-0.653,-0.428,-0.108,0.371,1.148,2.505,5.011,9.895,20.038,41.772,77.643,107.526], +[-131.333,-125.569,-119.447,-112.345,-103.338,-91.456,-76.383,-59.494,-43.555,-30.561,-20.802,-13.730,-8.707,-5.227,-2.907,-1.452,-0.635,-0.277,-0.234,-0.389,-0.650,-0.946,-1.232,-1.487,-1.708,-1.905,-2.082,-2.231,-2.307,-2.198,-1.672,-0.239,3.223,11.738,34.438,80.213,112.526], +[-136.333,-131.150,-125.417,-118.321,-108.565,-94.563,-75.743,-55.026,-37.335,-24.561,-15.830,-9.877,-5.813,-3.079,-1.315,-0.271,0.236,0.346,0.173,-0.189,-0.659,-1.178,-1.706,-2.227,-2.746,-3.277,-3.832,-4.411,-4.984,-5.466,-5.678,-5.241,-3.260,2.927,23.905,82.158,117.526], +[-141.333,-136.800,-131.599,-124.725,-114.380,-97.845,-73.817,-48.519,-29.966,-18.352,-11.107,-6.440,-3.380,-1.399,-0.188,0.456,0.671,0.563,0.212,-0.309,-0.940,-1.634,-2.360,-3.110,-3.887,-4.708,-5.586,-6.521,-7.490,-8.430,-9.212,-9.571,-8.871,-5.113,11.332,83.083,122.526], +[-146.333,-142.514,-138.004,-131.648,-121.047,-101.479,-69.734,-39.521,-21.778,-12.232,-6.754,-3.416,-1.339,-0.083,0.600,0.863,0.806,0.503,0.006,-0.637,-1.389,-2.217,-3.102,-4.038,-5.029,-6.085,-7.213,-8.410,-9.654,-10.898,-12.057,-12.965,-13.219,-11.486,-0.691,82.184,127.526], +[-151.333,-148.288,-144.642,-139.183,-128.953,-105.845,-61.693,-27.966,-13.286,-6.427,-2.785,-0.718,0.453,1.054,1.262,1.183,0.886,0.414,-0.204,-0.948,-1.798,-2.738,-3.758,-4.851,-6.017,-7.255,-8.563,-9.930,-11.333,-12.739,-14.101,-15.336,-16.218,-15.941,-10.016,77.586,132.526], +[-156.333,-154.118,-151.509,-147.413,-138.659,-111.937,-46.094,-14.716,-5.053,-1.063,0.845,1.773,2.155,2.197,2.008,1.651,1.160,0.552,-0.167,-0.999,-1.941,-2.990,-4.137,-5.373,-6.688,-8.068,-9.499,-10.961,-12.432,-13.893,-15.331,-16.725,-17.981,-18.658,-16.167,64.445,137.526], +[-161.333,-159.994,-158.596,-156.391,-150.901,-123.400,-19.343,-1.568,2.471,3.810,4.198,4.153,3.878,3.469,2.972,2.406,1.776,1.071,0.272,-0.637,-1.670,-2.829,-4.104,-5.477,-6.924,-8.417,-9.930,-11.436,-12.916,-14.365,-15.799,-17.245,-18.700,-19.967,-19.686,33.766,142.526], +[-166.333,-165.908,-165.875,-166.105,-166.352,-163.756,9.995,9.785,9.035,8.181,7.313,6.467,5.661,4.898,4.170,3.460,2.739,1.973,1.122,0.152,-0.961,-2.223,-3.617,-5.115,-6.677,-8.262,-9.829,-11.350,-12.807,-14.210,-15.598,-17.034,-18.579,-20.193,-21.286,-2.315,147.526], +[-171.333,-171.850,-173.309,-176.440,175.186,112.896,29.013,18.657,14.565,12.051,10.196,8.711,7.479,6.435,5.531,4.717,3.941,3.146,2.272,1.268,0.102,-1.236,-2.723,-4.320,-5.972,-7.624,-9.227,-10.745,-12.166,-13.510,-14.835,-16.229,-17.796,-19.603,-21.544,-20.488,152.526], +[-176.333,-177.808,179.157,172.837,155.690,90.806,39.094,25.207,19.101,15.426,12.830,10.847,9.272,7.999,6.948,6.053,5.241,4.438,3.568,2.567,1.389,0.021,-1.516,-3.171,-4.879,-6.573,-8.193,-9.699,-11.080,-12.362,-13.617,-14.952,-16.500,-18.402,-20.868,-27.445,157.526], +[178.667,176.232,171.586,162.055,137.998,82.523,44.416,29.897,22.736,18.310,15.189,12.828,10.981,9.514,8.335,7.367,6.527,5.732,4.892,3.930,2.786,1.438,-0.095,-1.762,-3.488,-5.197,-6.818,-8.304,-9.641,-10.861,-12.043,-13.308,-14.811,-16.744,-19.534,-29.724,162.526], +[173.667,170.282,164.048,151.567,123.611,77.595,47.246,33.187,25.580,20.716,17.245,14.612,12.553,10.926,9.636,8.603,7.742,6.965,6.175,5.282,4.213,2.935,1.454,-0.179,-1.887,-3.584,-5.190,-6.647,-7.937,-9.093,-10.198,-11.384,-12.822,-14.744,-17.736,-29.884,167.526], +[168.667,164.356,156.613,141.669,112.398,73.966,48.677,35.437,27.746,22.662,18.978,16.159,13.944,12.193,10.813,9.726,8.851,8.100,7.374,6.573,5.613,4.443,3.058,1.499,-0.158,-1.819,-3.391,-4.808,-6.043,-7.127,-8.150,-9.249,-10.607,-12.490,-15.609,-28.988,172.526], +[163.667,158.467,149.342,132.543,103.622,70.983,49.264,36.915,29.340,24.181,20.381,17.442,15.119,13.274,11.822,10.692,9.809,9.088,8.432,7.737,6.909,5.881,4.630,3.184,1.615,0.022,-1.494,-2.851,-4.017,-5.021,-5.954,-6.957,-8.224,-10.048,-13.250,-27.552,177.526], +[158.667,152.626,142.289,124.257,96.589,68.380,49.316,37.818,30.458,25.314,21.463,18.451,16.051,14.133,12.621,11.449,10.554,9.858,9.269,8.684,8.003,7.145,6.067,4.780,3.345,1.861,0.439,-0.830,-1.906,-2.817,-3.650,-4.551,-5.719,-7.473,-10.737,-25.858,-177.474], +[153.667,146.845,135.490,116.790,90.789,66.030,49.017,38.291,31.189,26.114,22.253,19.198,16.738,14.757,13.183,11.963,11.042,10.352,9.813,9.329,8.798,8.128,7.260,6.182,4.940,3.625,2.350,1.211,0.251,-0.549,-1.274,-2.066,-3.129,-4.808,-8.127,-24.091,-172.474] ]; - +// Bilinear interpolation private _x = (_long + 180) / _size; private _x1 = floor _x; private _x2 = (_x1 + 1) % (360 / _size); @@ -120,3 +120,32 @@ private _q22 = _x * _y * (_data # _x2 # _y2); GVAR(magneticDeclinationOffset) = _q11 + _q12 + _q21 + _q22; setCompassDeclination rad GVAR(magneticDeclinationOffset); + + +/* +Table generated with https://github.com/cmweiss/geomag +gm = GeoMag("WMM.COF") +size = 5 +whole = "[" +whole_first = True +for x in range(-180, 180, size): + if (whole_first): + whole_first = False + else: + whole += "," + line = "\n[" + line_first = True + for y in range(-90, 90+size, size): + if (line_first): + line_first = False + else: + line += "," + mag = gm.GeoMag(y,x) + line += f"{mag.dec:.3f}" #f"[{x}, {y}]" + line += "]" + whole += line +whole += "\n]" +print(f"--- START ---") +print(f"{whole}") +print(f"--- END ---") +*/ diff --git a/addons/common/initSettings.inc.sqf b/addons/common/initSettings.inc.sqf index 4baab81d6f..013207ee31 100644 --- a/addons/common/initSettings.inc.sqf +++ b/addons/common/initSettings.inc.sqf @@ -104,7 +104,7 @@ private _categoryColors = [_category, format ["| %1 |", LLSTRING(subcategory_col [ QGVAR(magneticDeclination), "CHECKBOX", - ["mag test"], // [LSTRING(magneticDeclination), LSTRING(magneticDeclinationooltip)], + [LSTRING(magneticDeclination), LSTRING(magneticDeclinationooltip)], format ["ACE %1", localize LSTRING(DisplayName)], false, true, diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index 64d5fc61f3..380ef1ba90 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -1619,6 +1619,12 @@ Tiempo restante Tempo restante + + Realistic Compass Declination + + + Compass will point to magnetic north + None Žádná