fix: updated PostScriptum mortar ranges

Endebert · Jan 18, 2020 · 6c5fa85 · 6c5fa85
1 parent 8a152c0
commit 6c5fa85
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 50 deletions.
diff --git a/calcMortarSettings.js b/calcMortarSettings.js
@@ -28,54 +28,66 @@ const squadTable = [
 ];
 
 const gerTable = [
-  [200, 1487],
-  [250, 1465],
-  [300, 1444],
-  [350, 1422],
-  [400, 1401],
-  [450, 1378],
-  [500, 1356],
-  [550, 1333],
-  [600, 1309],
-  [650, 1284],
-  [700, 1259],
-  [750, 1233],
-  [800, 1206],
-  [850, 1177],
-  [900, 1147],
-  [950, 1114],
-  [1000, 1079],
-  [1050, 1039],
-  [1100, 992],
-  [1150, 931],
-  [1200, 808],
+  [100, 1536],
+  [150, 1519],
+  [200, 1502],
+  [250, 1485],
+  [300, 1467],
+  [350, 1450],
+  [400, 1432],
+  [450, 1415],
+  [500, 1397],
+  [550, 1378],
+  [600, 1360],
+  [650, 1341],
+  [700, 1322],
+  [750, 1302],
+  [800, 1282],
+  [850, 1262],
+  [900, 1241],
+  [950, 1219],
+  [1000, 1196],
+  [1050, 1172],
+  [1100, 1147],
+  [1150, 1121],
+  [1200, 1092],
+  [1250, 1062],
+  [1300, 1027],
+  [1350, 988],
+  [1400, 939],
 ];
 
 const br4inchTable = [
-  [450, 1484],
-  [550, 1464],
-  [650, 1445],
-  [750, 1425],
-  [850, 1405],
-  [950, 1384],
-  [1050, 1363],
-  [1150, 1342],
-  [1250, 1321],
-  [1350, 1299],
-  [1450, 1276],
-  [1550, 1253],
-  [1650, 1228],
-  [1750, 1203],
-  [1850, 1177],
-  [1950, 1149],
-  [2050, 1119],
-  [2150, 1087],
-  [2250, 1051],
-  [2350, 1011],
-  [2450, 962],
+  [200, 1535],
+  [300, 1517],
+  [400, 1500],
+  [500, 1482],
+  [600, 1464],
+  [700, 1446],
+  [800, 1428],
+  [900, 1409],
+  [1000, 1391],
+  [1100, 1372],
+  [1200, 1353],
+  [1300, 1333],
+  [1400, 1313],
+  [1500, 1293],
+  [1600, 1272],
+  [1700, 1250],
+  [1800, 1228],
+  [1900, 1205],
+  [2000, 1181],
+  [2100, 1155],
+  [2200, 1128],
+  [2300, 1100],
+  [2400, 1069],
+  [2500, 1034],
 ];
 
 const br3inchTable = [
+  [100, 1536],
+  [150, 1519],
+  [200, 1502],
   [250, 1485],
   [300, 1467],
   [350, 1450],
@@ -103,6 +115,9 @@ const br3inchTable = [
 ];
 
 const usa6cmTable = [
+  [100, 1536],
+  [150, 1519],
+  [200, 1502],
   [250, 1485],
   [300, 1467],
   [350, 1450],

diff --git a/src/assets/Vars.js b/src/assets/Vars.js
@@ -41,20 +41,20 @@ export const SQUAD_VELOCITY = 109.890938;
 export const SQUAD_MAX_DISTANCE = 1232;
 
 export const PS_8CM_NAME = "GER 8cm";
-export const PS_8CM_VELOCITY = 105.762785;
-export const PS_8CM_MAX_DISTANCE = 1141;
+export const PS_8CM_VELOCITY = 116.179939;
+export const PS_8CM_MAX_DISTANCE = 1377;
 
 export const PS_3INCH_NAME = "BRIT 3″";
-export const PS_3INCH_VELOCITY = 116.604952;
-export const PS_3INCH_MAX_DISTANCE = 1387;
+export const PS_3INCH_VELOCITY = 116.179939;
+export const PS_3INCH_MAX_DISTANCE = 1377;
 
 export const PS_4INCH_NAME = "BRIT 4″";
-export const PS_4INCH_VELOCITY = 155.244413;
-export const PS_4INCH_MAX_DISTANCE = 2459;
+export const PS_4INCH_VELOCITY = 160.598197;
+export const PS_4INCH_MAX_DISTANCE = 2632;
 
 export const PS_6CM_NAME = "US 6cm";
-export const PS_6CM_VELOCITY = 116.604952;
-export const PS_6CM_MAX_DISTANCE = 1387;
+export const PS_6CM_VELOCITY = 116.179939;
+export const PS_6CM_MAX_DISTANCE = 1377;
 
 export const GRAVITY = 9.8;
 export const MIL_TO_DEG_FACTOR = 360 / 6400;