Merge hotfix/943 (#952)

Fix random spawn calculations to ensure arrivals are available quickly and fix bug of a/c not descending
openscope · Apr 20, 2019 · 53e1722 · 53e1722
2 parents 8f2e50f + 8bec0ae
commit 53e1722
Show file tree

Hide file tree

Showing 16 changed files with 695 additions and 718 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 6.12.2 (April 15, 2019)
+### Hotfixes
+- [#943](https://github.com/openscope/openscope/issues/943) - Fix random spawn calculations to ensure arrivals are available quickly
+- [#1355](https://github.com/openscope/openscope/issues/1355) - Ensure LSZH arrivals descend properly
+
+
 # 6.12.1 (April 4, 2019)
 ### Hotfixes
 - [#1358](https://github.com/openscope/openscope/issues/1358) - Ensure traffic resumes spawning after a spawn pattern is turned off and back on

diff --git a/assets/airports/cyhz.json b/assets/airports/cyhz.json
@@ -1380,30 +1380,6 @@
                 ["wja", 15]
             ]
         },
-        {
-            "origin": "",
-            "destination": "CYHZ",
-            "category": "arrival",
-            "route": "EBONY.FUNDY2.CYHZ23",
-            "altitude": [18000, 24000],
-            "speed": 250,
-            "method": "random",
-            "rate": 1,
-            "airlines": [
-                ["aal", 1],
-                ["aca", 29],
-                ["dal", 1],
-                ["emb", 3],
-                ["fdx", 1],
-                ["fle", 2],
-                ["n/cessna", 8],
-                ["poe", 5],
-                ["pvl", 1],
-                ["ual", 1],
-                ["wen", 5],
-                ["wja", 15]
-            ]
-        },
         {
             "origin": "",
             "destination": "CYHZ",
@@ -1412,7 +1388,7 @@
             "altitude": [18000, 24000],
             "speed": 250,
             "method": "random",
-            "rate": 1,
+            "rate": 2,
             "airlines": [
                 ["aal", 1],
                 ["aca", 29],

diff --git a/assets/airports/cyow.json b/assets/airports/cyow.json
@@ -2002,24 +2002,7 @@
             "altitude": [23000, 27000],
             "speed": 300,
             "method": "cyclic",
-            "rate": 2,
-            "airlines": [
-                ["aca", 7],
-                ["dal", 2],
-                ["poe", 5],
-                ["ual", 3],
-                ["wja", 5]
-            ]
-        },
-        {
-            "origin": "",
-            "destination": "CYOW",
-            "category": "arrival",
-            "route": "ELSUB.CAPTL4.CYOW32",
-            "altitude": [24000, 25000],
-            "speed": 300,
-            "method": "cyclic",
-            "rate": 1,
+            "rate": 3,
             "airlines": [
                 ["aca", 7],
                 ["dal", 2],
@@ -2036,26 +2019,13 @@
             "altitude": [18000, 24000],
             "speed": 300,
             "method": "cyclic",
-            "rate": 1,
+            "rate": 2,
             "airlines": [
                 ["aca/long", 12],
                 ["aal", 1],
                 ["ual", 3]
             ]
         },
-        {
-            "origin": "",
-            "destination": "CYOW",
-            "category": "arrival",
-            "route": "BUGSY.DEANS8.CYOW32",
-            "altitude": [18000, 21000],
-            "speed": 300,
-            "method": "cyclic",
-            "rate": 1,
-            "airlines": [
-                ["aca/long", 12]
-            ]
-        },
         {
             "origin": "",
             "destination": "CYOW",