RJTT ACA 2.2.2

- Fixed bug where JCG would not spawn at RJTT.
2020-12-29 02:57:38 -08:00
parent 20647aa35a
commit 1ebf819af8
4 changed files with 4738 additions and 12192 deletions
@@ -1,4 +1,4 @@
-# `RJTT` ACA 2.2.1
+# `RJTT` ACA 2.2.2
 This is an implementation of the Tokyo ACA (Approach Control Area) for [Endless ATC](https://steamcommunity.com/app/666610) featuring `RJTT` Tokyo International Airport (commonly referred to as Haneda) and `RJAA` Narita International Airport. JSDF-M base `RJTL` Shimofusa is also represented at very high scores (difficulties). The airspace ceiling is FL240.
@@ -263,4 +263,6 @@ Note that traffic data (`airlines = `) is expanded by a python script `expand_ai
 	- Minor adjustments/updates to airline traffic.
 	- Added 'rare' traffic (head of state, navaid check)
 *	2.2.1 - 2020/12/19
-	- Adjusted the distribution of traffic for each departure point.
+	- Adjusted the distribution of traffic for each departure point.
 *	2.2.2 - 2020/12/29
 	- Fixed bug where JCG would not spawn at RJTT.
@@ -1,4 +1,4 @@
-# `RJTT` 進入管制区 2.2.1
+# `RJTT` 進入管制区 2.2.2
 ＊作者は日本人ではないため、圧倒的語彙力のなさと知識不足によるおかしいまたは間違っている表現があるかもしれません。
@@ -17,11 +17,11 @@ STARはこのゲームの進入方式で再現されています。進入方式
 ### `RJTT` 東京（羽田）国際空港
 羽田空港です。国内便が多いですが、国際便もあります。出発便は西へのが多くて、到着便は南西方向から多く飛来します。
 発着便の設定は推測ですが現実とかけ離れてることはないでしょう。
 ＊未翻訳
 The main airport of this sector. Previously only handling domestic traffic and very limited international flights to key East Asian cities, Haneda now handles a fair amount of international traffic along with most of Tokyo's domestic traffic. As such, traffic is biased towards the west for departures and southwest for arrivals. 
 There is custom traffic for `RJTT`. The proportions are very much estimates but shouldn't be too far off from reality.
 Most fixes visible on the map have a defined hold including many fixes along the STARs. The published hold for missed approaches is `UTIBO` for 34L/23/16R, `KASGA` for 34R/22, and `SNOKE` for 16L.
 Aircraft arrive at 6 points:
@@ -113,9 +113,11 @@ A few different configurations are used in real operations; four are available i
 ### `RJAA` 成田国際空港
-＊未翻訳
+成田空港です。国内便が少ないですが、LCCと国際便とカーゴ便が多いです。
 The secondary, yet also major airport of this sector. Previously handling almost all of Tokyo's international traffic, it has lost some of it to Haneda recently. However, it still handles a large chunk of Tokyo's international flights as well as the many cargo flights from FDX/UPS etc. RWY 34R which was too short when Narita opened to handle heavy aircraft has now been extended and can generally handle most aircraft other than the largest of aircraft such as A388.
 発着便の設定は推測ですが現実とかけ離れてることはないでしょう。
 ＊未翻訳
 There is custom traffic for `RJAA`. The proportions are very much estimates but shouldn't be too far off from reality.
 Most fixes visible on the map have a defined hold including many fixes along the STARs. The published hold for missed approaches is `SWIMY` for 16R/34L and `ABBOT` for 16L/34R.
@@ -209,12 +211,13 @@ Approaches are available using APP mode from `TOHNE` and `ASEKI`. Arrival routes
 ## For Developers
-＊未翻訳
+この追加ファイルに貢献したい方はsource/RJTT.txtを変更してから/tools/で"deploy.py RJTT"を実行してください。
 Note that traffic data (`airlines = `) is expanded by a python script `expand_airlines.py` from the shorter `source/RJTT.txt` according to the definitions in '`#!`' comments. If submitting a proposed change, please submit your changes in the source file.
 ## 変更履歴
 *	2.2.0 - 2020/12/02
 	-日本語初リリース
 *	2.2.1 - 2020/12/19
-	-管制区の離脱ポイントの交通量バランスを調整しました。
+	-管制区の離脱ポイントの交通量バランスを調整しました。
 *	2.2.2 - 2020/12/29
 	-RJTTにJCGがスポーンしない不具合を修正。
@@ -1,5 +1,6 @@
-# RJTT ACA 2.2.1
+[meta]
-# See RJTT_readme.md
+header = RJTT ACA 2.2.2
 	See RJTT_readme.md
 [airspace]
 radius = 100
@@ -328,85 +329,85 @@ entrypoints =
 airlines = 
 #rjcc
-#!	ana, 900, b763/b772/b773/b788/b789, all neeppon, n
+	ana, 900, b763/b772/b773/b788/b789, all neeppon, n
-#!	jal, 1000, b763/b772/b773/b788/b789/a359, japan air, n
+	jal, 1000, b763/b772/b773/b788/b789/a359, japan air, n
-#!	ado, 700, b737/b763, air do, n
+	ado, 700, b737/b763, air do, n
-#!	sky, 500, b738, skymark, n
+	sky, 500, b738, skymark, n
 #rjoo
-#!	ana, 800, b763/b772/b773/b788/b789, all neeppon, w
+	ana, 800, b763/b772/b773/b788/b789, all neeppon, w
-#!	jal, 800, b763/b772/b773/b788/b789/a359, japan air, w
+	jal, 800, b763/b772/b773/b788/b789/a359, japan air, w
 #roah
-#!	ana, 600, b763/b772/b773/b788/b789, all neeppon, w
+	ana, 600, b763/b772/b773/b788/b789, all neeppon, w
-#!	jal, 600, b763/b772/b773/b788/b789/a359, japan air, w
+	jal, 600, b763/b772/b773/b788/b789/a359, japan air, w
 #rjff
-#!	ana, 600, b763/b772/b773/b788/b789, all neeppon, w
+	ana, 600, b763/b772/b773/b788/b789, all neeppon, w
-#!	jal, 800, b763/b772/b773/b788/b789/a359, japan air, w
+	jal, 800, b763/b772/b773/b788/b789/a359, japan air, w
-#!	sfj, 600, a320, star flyer, w
+	sfj, 600, a320, star flyer, w
 #domestic
-#!	ana, 400, b772/b773/b789, all neeppon, nsw
+	ana, 400, b772/b773/b789, all neeppon, nsw
-#!	ana, 600, b763/b788, all neeppon, nsw
+	ana, 600, b763/b788, all neeppon, nsw
-#!	ana, 800, b737/b738/a320/a321/a21n, all neeppon, nsw
+	ana, 800, b737/b738/a320/a321/a21n, all neeppon, nsw
-#!	jal, 400, b772/b773/a359, japan air, nsw
+	jal, 400, b772/b773/a359, japan air, nsw
-#!	jal, 600, b763/b788, japan air, nsw
+	jal, 600, b763/b788, japan air, nsw
-#!	jal, 900, b738, japan air, nsw
+	jal, 900, b738, japan air, nsw
-#!	ado, 400, b737/b763, air do, n
+	ado, 400, b737/b763, air do, n
-#!	sky, 800, b738, skymark, nw
+	sky, 800, b738, skymark, nw
-#!	sfj, 600, a320, star flyer, w
+	sfj, 600, a320, star flyer, w
-#!	snj, 600, b738, new sky, w
+	snj, 600, b738, new sky, w
 #international
-#!	ana, 500, b763/b77w/b788/b789/b78x, all neeppon, nswe
+	ana, 500, b763/b77w/b788/b789/b78x, all neeppon, nswe
-#!	jal, 500, a359/b763/b772/b77w/b788/b789, japan air, nswe
+	jal, 500, a359/b763/b772/b77w/b788/b789, japan air, nswe
-#!	afl, 100, b77w, aeroflot, n
+	afl, 100, b77w, aeroflot, n
-#!	xax, 100, a333, xanadu, s
+	xax, 100, a333, xanadu, s
-#!	aca, 100, a333/b789/b77w, air canada, e
+	aca, 100, a333/b789/b77w, air canada, e
-#!	cca, 100, a332/a333, air china, w
+	cca, 100, a332/a333, air china, w
-#!	afr, 100, b77w, air france, n
+	afr, 100, b77w, air france, n
-#!	aza, 100, a332, alitalia, n
+	aza, 100, a332, alitalia, n
-#!	aal, 100, b789, american, e
+	aal, 100, b789, american, e
-#!	aar, 200, a333, asiana, w
+	aar, 200, a333, asiana, w
-#!	baw, 100, b788/b77w, speedbird, n
+	baw, 100, b788/b77w, speedbird, n
-#!	cpa, 200, a35k, cathay, w
+	cpa, 200, a35k, cathay, w
-#!	cal, 200, a333, dynasty, w
+	cal, 200, a333, dynasty, w
-#!	ces, 100, a333, china eastern, w
+	ces, 100, a333, china eastern, w
-#!	csn, 100, a333/b789/b77w, china southern, w
+	csn, 100, a333/b789/b77w, china southern, w
-#!	dal, 300, a333/a339/a359/b772, delta, ne
+	dal, 300, a333/a339/a359/b772, delta, ne
-#!	uae, 100, b77l/b77w, emirates, w
+	uae, 100, b77l/b77w, emirates, w
-#!	eva, 200, a333, eva, w
+	eva, 200, a333, eva, w
-#!	fin, 100, a359, finnair, n
+	fin, 100, a359, finnair, n
-#!	gia, 100, a333/b77w, indonesia, s
+	gia, 100, a333/b77w, indonesia, s
-#!	chh, 100, b738, hainan, w
+	chh, 100, b738, hainan, w
-#!	hal, 100, a332, hawaiian, e
+	hal, 100, a332, hawaiian, e
-#!	hke, 100, a321, hong kong express, w
+	hke, 100, a321, hong kong express, w
-#!	dkh, 100, a320, air juneyao, w
+	dkh, 100, a320, air juneyao, w
-#!	kal, 200, b772/b773, korean air, w
+	kal, 200, b772/b773, korean air, w
-#!	dlh, 100, a343/b748, lufthansa, n
+	dlh, 100, a343/b748, lufthansa, n
-#!	oka, 100, b738/b739, okayjet, w
+	oka, 100, b738/b739, okayjet, w
-#!	apj, 300, a320, air peach, w
+	apj, 300, a320, air peach, w
-#!	pal, 100, a359, philippine, w
+	pal, 100, a359, philippine, w
-#!	qfa, 100, a333, kwan tahs, s
+	qfa, 100, a333, kwan tahs, s
-#!	qtr, 100, a359/a35k, qatar, w
+	qtr, 100, a359/a35k, qatar, w
-#!	sbi, 100, a20n, siberian, n
+	sbi, 100, a20n, siberian, n
-#!	sas, 100, a359, scandinavian, n
+	sas, 100, a359, scandinavian, n
-#!	cdg, 100, b738, shandong, w
+	cdg, 100, b738, shandong, w
-#!	csh, 100, a333/b789, shanghai air, w
+	csh, 100, a333/b789, shanghai air, w
-#!	sia, 100, a359/b77w, singapore, w
+	sia, 100, a359/b77w, singapore, w
-#!	cqh, 100, a320, air spring, w
+	cqh, 100, a320, air spring, w
-#!	tha, 100, b744, thai, w
+	tha, 100, b744, thai, w
-#!	gcr, 100, a333, bohai, w
+	gcr, 100, a333, bohai, w
-#!	ttw, 100, a320, smart cat, w
+	ttw, 100, a320, smart cat, w
-#!	thy, 100, b789, turkish, n
+	thy, 100, b789, turkish, n
-#!	ual, 300, b772/b788/b789/b78x, united, ne
+	ual, 300, b772/b788/b789/b78x, united, ne
-#!	vjc, 100, a321, viet jet air, w
+	vjc, 100, a321, viet jet air, w
-#!	hvn, 100, a359, vietnam airlines, w
+	hvn, 100, a359, vietnam airlines, w
 #cargo
-#!	ana, 300, b763, all neeppon, w
+	ana, 300, b763, all neeppon, w
-#!	ana, 100, b77l, all neeppon, w
+	ana, 100, b77l, all neeppon, w
-#!	vda, 50, a124, volga, nswe
+	vda, 50, a124, volga, nswe
 #jasdf
 	jf-1, 10, b77w, japan force, nswe
 	cygns-1, 10, b77w, sig nus, nswe
 #jcg
-#1	jcg-11, 100, glf5, japan coast guard, nsw
+	jcg-11, 100, glf5, japan coast guard, nsw
 #jcab
 	ckstr-11, 10, c25c, check star, w
 #ga
@@ -441,8 +442,6 @@ airlines =
 #	ja-12ab, 100, be58/p46t/t206/c172/kodi/p68/pa46/c25m/c525/c25a/hdjt/glf5/glf6, 0, nswe
 #	ja-1234, 100, be58/p46t/t206/c172/kodi/p68/pa46/c25m/c525/c25a/hdjt/glf5/glf6, 0, nswe
 #!expansionoutput1
 #!expansionoutputend
 [airport2]
 name = Narita
@@ -494,135 +493,135 @@ entrypoints =
 	73, SUPOK
 airlines = 
-#!	ana, 800, b77w, all neeppon, nse
+	ana, 800, b77w, all neeppon, nse
-#!	ana, 1000, b788/b789, all neeppon, nwse
+	ana, 1000, b788/b789, all neeppon, nwse
-#!	ana, 300, a20n/a21n, all neeppon, w
+	ana, 300, a20n/a21n, all neeppon, w
-#!	ana, 300, b763, all neeppon, nws
+	ana, 300, b763, all neeppon, nws
-#!	ana, 100, a388, all neeppon, e
+	ana, 100, a388, all neeppon, e
-#!	jal, 400, b763, japan air, nsw
+	jal, 400, b763, japan air, nsw
-#!	jal, 1000, b772/b788/b789, japan air, nsw
+	jal, 1000, b772/b788/b789, japan air, nsw
-#!	jal, 600, b77w/a359, japan air, nwe
+	jal, 600, b77w/a359, japan air, nwe
-#!	jal, 300, a359, japan air, nsw
+	jal, 300, a359, japan air, nsw
-#!	jal, 300, b738, japan air, w
+	jal, 300, b738, japan air, w
-#!	jjp, 800, a320, orange liner, w
+	jjp, 800, a320, orange liner, w
-#!	jjp, 200, a320, orange liner, s
+	jjp, 200, a320, orange liner, s
-#!	jjp, 200, a320, orange liner, n
+	jjp, 200, a320, orange liner, n
-#!	apj, 600, a320/a20n, air peach, w
+	apj, 600, a320/a20n, air peach, w
-#!	apj, 200, a320/a20n, air peach, n
+	apj, 200, a320/a20n, air peach, n
-#!	sky, 200, b738, skymark, w
+	sky, 200, b738, skymark, w
-#!	sky, 100, b738, skymark, s
+	sky, 100, b738, skymark, s
-#!	sjo, 300, b738, j spring, w
+	sjo, 300, b738, j spring, w
-#!	sjo, 100, b738, j spring, n
+	sjo, 100, b738, j spring, n
-#!	amx, 100, b788, aero mexico, e
+	amx, 100, b788, aero mexico, e
-#!	xax, 100, a333, xanadu, s
+	xax, 100, a333, xanadu, s
-#!	abl, 200, a320/a321/a21n, air busan, w
+	abl, 200, a320/a321/a21n, air busan, w
-#!	aci, 100, a339, air calin, e
+	aci, 100, a339, air calin, e
-#!	aca, 100, b77w/b788/b789, air canada, ne
+	aca, 100, b77w/b788/b789, air canada, ne
-#!	cca, 200, a332/a333/b772, air china, w
+	cca, 200, a332/a333/b772, air china, w
-#!	afr, 100, b77w, air france, n
+	afr, 100, b77w, air france, n
-#!	aic, 100, b788, air india, w
+	aic, 100, b788, air india, w
-#!	amu, 100, a320/a20n/a321/a20n, air macau, w
+	amu, 100, a320/a20n/a321/a20n, air macau, w
-#!	anz, 100, b789, new zealand, se
+	anz, 100, b789, new zealand, se
-#!	asv, 100, a321, air seoul, w
+	asv, 100, a321, air seoul, w
-#!	tht, 100, b789, tahiti airlines, e
+	tht, 100, b789, tahiti airlines, e
-#!	aal, 100, b788/b77w, american, e
+	aal, 100, b788/b77w, american, e
-#!	aar, 200, a321/a388, asiana, nw
+	aar, 200, a321/a388, asiana, nw
-#!	shu, 100, a319, aurora, n
+	shu, 100, a319, aurora, n
-#!	aua, 100, b772, austrian, n
+	aua, 100, b772, austrian, n
-#!	bav, 100, a21n/b789, bamboo, w
+	bav, 100, a21n/b789, bamboo, w
-#!	cpa, 200, a359/a35k/b773/b77w, cathay, w
+	cpa, 200, a359/a35k/b773/b77w, cathay, w
-#!	ceb, 100, a320/a20n/a333, cebu air, s
+	ceb, 100, a320/a20n/a333, cebu air, s
-#!	cal, 200, a333/a359, dynasty, w
+	cal, 200, a333/a359, dynasty, w
-#!	ces, 100, a333/a359/b77w, china eastern, w
+	ces, 100, a333/a359/b77w, china eastern, w
-#!	ces, 100, a319/a320/a20n/a321, china eastern, w
+	ces, 100, a319/a320/a20n/a321, china eastern, w
-#!	csn, 100, a388, china southern, w
+	csn, 100, a388, china southern, w
-#!	csn, 100, b77w, china southern, w
+	csn, 100, b77w, china southern, w
-#!	csn, 100, a320/a20n/a321, china southern, w
+	csn, 100, a320/a20n/a321, china southern, w
-#!	drk, 100, a319/a20n, royal bhutan, w
+	drk, 100, a319/a20n, royal bhutan, w
-#!	esr, 100, b738, eastar jet, nw
+	esr, 100, b738, eastar jet, nw
-#!	msr, 100, b77w, egypt air, w
+	msr, 100, b77w, egypt air, w
-#!	ely, 100, b789, el al, w
+	ely, 100, b789, el al, w
-#!	uae, 100, a388, emirates, w
+	uae, 100, a388, emirates, w
-#!	eth, 100, b788/b789, ethiopian, w
+	eth, 100, b788/b789, ethiopian, w
-#!	etd, 100, b789, etihad, w
+	etd, 100, b789, etihad, w
-#!	eva, 200, b789, eva, w
+	eva, 200, b789, eva, w
-#!	fji, 100, a332, fiji, e
+	fji, 100, a332, fiji, e
-#!	fin, 100, a359, finnair, n
+	fin, 100, a359, finnair, n
-#!	gia, 100, b77w, indonesia, s
+	gia, 100, b77w, indonesia, s
-#!	chh, 100, a333, hainan, w
+	chh, 100, a333, hainan, w
-#!	hal, 100, a332, hawaiian, e
+	hal, 100, a332, hawaiian, e
-#!	hke, 100, a321, hong kong express, w
+	hke, 100, a321, hong kong express, w
-#!	crk, 100, a332/a333, bauhinia, w
+	crk, 100, a332/a333, bauhinia, w
-#!	ibe, 100, a359, iberia, w
+	ibe, 100, a359, iberia, w
-#!	jja, 100, b738, che ju air, nw
+	jja, 100, b738, che ju air, nw
-#!	jst, 100, b788, jet star, s
+	jst, 100, b788, jet star, s
-#!	jna, 100, b738, jin air, nw
+	jna, 100, b738, jin air, nw
-#!	dkh, 100, b789, air juneyao, w
+	dkh, 100, b789, air juneyao, w
-#!	klm, 100, b772/b77w, k l m, n
+	klm, 100, b772/b77w, k l m, n
-#!	kal, 200, a332/a333/b789, korean air, w
+	kal, 200, a332/a333/b789, korean air, w
-#!	lot, 100, b788/b789, pollot, n
+	lot, 100, b788/b789, pollot, n
-#!	mas, 100, a359/a388, malaysian, w
+	mas, 100, a359/a388, malaysian, w
-#!	mda, 100, e190, mandarin, w
+	mda, 100, e190, mandarin, w
-#!	mgl, 100, b738, mongol air, nw
+	mgl, 100, b738, mongol air, nw
-#!	rna, 100, a332, royal nepal, w
+	rna, 100, a332, royal nepal, w
-#!	pia, 100, b772, pakistan, n
+	pia, 100, b772, pakistan, n
-#!	pal, 100, a321/a20n/a333/a359, philippine, w
+	pal, 100, a321/a20n/a333/a359, philippine, w
-#!	qfa, 100, a333, kwan tahs, s
+	qfa, 100, a333, kwan tahs, s
-#!	rba, 100, a20n, brunei, s
+	rba, 100, a20n, brunei, s
-#!	sbi, 100, a320/a20n, siberian, n
+	sbi, 100, a320/a20n, siberian, n
-#!	vsv, 100, b763, vlasta, n
+	vsv, 100, b763, vlasta, n
-#!	tgw, 100, a320/b788/b789, scooter, w
+	tgw, 100, a320/b788/b789, scooter, w
-#!	csz, 100, b738/a333, shenzhen air, w
+	csz, 100, b738/a333, shenzhen air, w
-#!	csc, 100, a332, sichaun, w
+	csc, 100, a332, sichaun, w
-#!	sia, 100, b78x, singapore, w
+	sia, 100, b78x, singapore, w
-#!	cqh, 100, a20n, air spring, w
+	cqh, 100, a20n, air spring, w
-#!	alk, 100, a333, srilankan, w
+	alk, 100, a333, srilankan, w
-#!	swr, 100, b77w, swiss, n
+	swr, 100, b77w, swiss, n
-#!	tax, 100, a333, express wing, w
+	tax, 100, a333, express wing, w
-#!	tha, 100, a359/b772/b77w, thai, w
+	tha, 100, a359/b772/b77w, thai, w
-#!	tlm, 100, a333/a339, mentari, e
+	tlm, 100, a333/a339, mentari, e
-#!	ttw, 100, a320, smart cat, w
+	ttw, 100, a320, smart cat, w
-#!	thy, 100, a333/b77w, turkish, n
+	thy, 100, a333/b77w, turkish, n
-#!	twb, 100, b738, teeway, nw
+	twb, 100, b738, teeway, nw
-#!	ual, 200, b772/b77w/b789, united, e
+	ual, 200, b772/b77w/b789, united, e
-#!	ual, 100, b738, united, s
+	ual, 100, b738, united, s
-#!	uzb, 100, a20n, uzbek, n
+	uzb, 100, a20n, uzbek, n
-#!	vjc, 100, a20n, viet jet air, w
+	vjc, 100, a20n, viet jet air, w
-#!	hvn, 100, a359/b78x, vietnam airlines, w
+	hvn, 100, a359/b78x, vietnam airlines, w
-#!	hvn, 100, a321/a21n, vietnam airlines, w
+	hvn, 100, a321/a21n, vietnam airlines, w
-#!	cxa, 100, b789, xiamen air, w
+	cxa, 100, b789, xiamen air, w
-#!	cxa, 100, b738, xiamen air, w
+	cxa, 100, b738, xiamen air, w
-#!	tzp, 100, b788, zipair, nwe
+	tzp, 100, b788, zipair, nwe
-#!	sjx, 100, a20n, star walker, w
+	sjx, 100, a20n, star walker, w
 #cargo
-#!	ana, 200, b763, all neeppon, nws
+	ana, 200, b763, all neeppon, nws
-#!	ana, 200, b77l, all neeppon, nws
+	ana, 200, b77l, all neeppon, nws
-#!	cao, 200, b744/b77l, air china freight, w
+	cao, 200, b744/b77l, air china freight, w
-#!	afr, 100, b77l, air france, n
+	afr, 100, b77l, air france, n
-#!	ahk, 100, a306, air hong kong, w
+	ahk, 100, a306, air hong kong, w
-#!	abw, 100, b744/b748, air bridge cargo, nw
+	abw, 100, b744/b748, air bridge cargo, nw
-#!	aar, 100, b744, asiana, nw
+	aar, 100, b744, asiana, nw
-#!	clx, 100, b748, cargolux, nw
+	clx, 100, b748, cargolux, nw
-#!	icv, 100, b744, cargolux italia, nw
+	icv, 100, b744, cargolux italia, nw
-#!	cpa, 200, b744/b748, cathay, w
+	cpa, 200, b744/b748, cathay, w
-#!	cal, 100, b744, dynasty, w
+	cal, 100, b744, dynasty, w
-#!	ckk, 100, b77l, cargo king, w
+	ckk, 100, b77l, cargo king, w
-#!	box, 200, b77l, german cargo, nwe
+	box, 200, b77l, german cargo, nwe
-#!	uae, 100, b77l, emirates, w
+	uae, 100, b77l, emirates, w
-#!	eva, 100, b77l, eva, w
+	eva, 100, b77l, eva, w
-#!	fdx, 300, b77l, fed ex, nswe
+	fdx, 300, b77l, fed ex, nswe
-#!	fdx, 100, md11, fed ex, nswe
+	fdx, 100, md11, fed ex, nswe
-#!	fdx, 100, a306, fed ex, w
+	fdx, 100, a306, fed ex, w
-#!	klm, 100, b744, k l m, n
+	klm, 100, b744, k l m, n
-#!	kal, 100, b748, korean air, w
+	kal, 100, b748, korean air, w
-#!	gec, 100, b77l, lufthansa cargo, n
+	gec, 100, b77l, lufthansa cargo, n
-#!	mas, 100, a332, malaysian, w
+	mas, 100, a332, malaysian, w
-#!	nca, 400, b744/b748, nippon cargo, nswe
+	nca, 400, b744/b748, nippon cargo, nswe
-#!	pac, 200, b744/b748, polar, nswe
+	pac, 200, b744/b748, polar, nswe
-#!	qtr, 100, b77l, qatar, w
+	qtr, 100, b77l, qatar, w
-#!	sia, 100, b744, singapore, w
+	sia, 100, b744, singapore, w
-#!	ups, 200, b763, u p s, nswe
+	ups, 200, b763, u p s, nswe
-#!	hyt, 100, b733, quick air, w
+	hyt, 100, b733, quick air, w
 #ga
 	ja-123a, 10, c25m/c525/c25a/hdjt/glf4/glf5/glf6/lj35/lj60/glex/cl30/cl35, 0, nswe
 	ja-12ab, 10, c25m/c525/c25a/hdjt/glf4/glf5/glf6/lj35/lj60/glex/cl30/cl35, 0, nswe
@@ -649,13 +648,11 @@ airlines =
 	f-abcd, 1, c25m/c525/c25a/hdjt/glf4/glf5/glf6/lj35/lj60/glex/cl30/cl35, 0, nswe
 	n-123ab, 3, b737/b763/a319, 0, nswe
 	bga-1, 1, a3st/a337, beluga, nswe
-	gti, 1, blcf, giant, nswer
+	gti, 1, blcf, giant, nswe
 #	ja-123a, 100, be58/p46t/t206/c172/kodi/p68/pa46/c25m/c525/c25a/hdjt/glf5/glf6, 0, nswe
 #	ja-12ab, 100, be58/p46t/t206/c172/kodi/p68/pa46/c25m/c525/c25a/hdjt/glf5/glf6, 0, nswe
 #	ja-1234, 100, be58/p46t/t206/c172/kodi/p68/pa46/c25m/c525/c25a/hdjt/glf5/glf6, 0, nswe
 #!expansionoutput2
 #!expansionoutputend
 [airport3]
@@ -688,7 +685,7 @@ entrypoints =
 	350, ASEKI
 airlines = 
-#!	atlas-12, 100, p3, atlas, ns
+	atlas-12, 100, p3, atlas, ns
 	tmboy-1, 10, ys11, tomboy, ns
 	tryer-1, 1, h25b, tryer, w
 	tarsel-12, 1, be9l, tarsel, nsw
@@ -697,8 +694,6 @@ airlines =
 	camel-12, 1, c130, camel, nsw
 	cupid-1, 1, lj35, cupid, sw
 #!expansionoutput3
 #!expansionoutputend
 [airport4]
 name = Chofu
@@ -2238,7 +2233,7 @@ route1 =
 [approach15]
 runway = RJTTRWYC
 beacon = MILIT
-route2 = 
+route1 = 
 	278
 #MILIT
 	N35.56.46.79, E141.13.08.89
@@ -2276,7 +2271,7 @@ route2 =
 [approach16]
 runway = RJTTRWYC
 beacon = RUSDA, N35.56.47.49, E140.57.29.87
-route2 = 
+route1 = 
 	277
 #RUSDA
 	N35.56.47.49, E140.57.29.87
@@ -2312,7 +2307,7 @@ route2 =
 [approach17]
 runway = RJTTRWYC
 beacon = ESKEN, N36.05.01.09, E140.41.22.76
-route2 = 
+route1 = 
 	310
 #ESKEN
 	N36.05.01.09, E140.41.22.76
@@ -2346,7 +2341,7 @@ route2 =
 [approach18]
 runway = RJTTRWYC
 beacon = POLIX
-route2 = 
+route1 = 
 	310
 #POLIX =15000
 	N36.12.37.06, E140.26.22.53, 15000
@@ -2408,7 +2403,7 @@ route1 =
 [approach20]
 runway = RJTTRWYC
 beacon = COLOR
-route2 = 
+route1 = 
 	278
 #COLOR <11000
 	N36.01.16.32, E140.12.19.80, 11000
@@ -2436,7 +2431,7 @@ route2 =
 [approach21]
 runway = RJTTRWYC
 beacon = COPSE, N35.46.58.79, E140.12.05.38
-route2 = 
+route1 = 
 	278
 #COPSE
 	N35.46.58.79, E140.12.05.38
@@ -2462,7 +2457,7 @@ route2 =
 [approach22]
 runway = RJTTRWYC
 beacon = COACH
-route2 = 
+route1 = 
 	278
 #COACH =8000
 	N35.37.36.01, E140.12.31.48, 8000, 210
@@ -2524,7 +2519,7 @@ route1 =
 runway = RJTTRWYC
 beacon = RUNSO
-route1 =
+route1 = 
 	38
 #RUNSO
 	N034.29.16.720, E139.43.04.910
@@ -2559,7 +2554,7 @@ route1 =
 runway = RJTTRWYC
 beacon = AKSEL
-route1 =
+route1 = 
 	38
 #AKSEL =12000 230
 	N034.40.39.520, E139.51.26.910
@@ -2624,7 +2619,7 @@ route1 =
 runway = RJTTRWYC
 beacon = AROSA
-route1 =
+route1 = 
 	277
 #AROSA
 	N34.42.01.72, E140.41.57.29
@@ -2658,7 +2653,7 @@ route1 =
 runway = RJTTRWYC
 beacon = RURER
-route1 =
+route1 = 
 	7
 #RURER
 	N34.29.24.72, E140.42.01.15
@@ -2693,7 +2688,7 @@ route1 =
 runway = RJTTRWYC
 beacon = AVEEY
-route1 =
+route1 = 
 	277
 #AVEEY
 	N34.41.55.89, E140.21.57.97, 11000, 230
@@ -5939,9 +5934,8 @@ route1 =
 [departure1]
 runway = RJTTRWYC
 #!sid3x
 #ROVER2B.AKAGI
-route1 = 
+route1 = *3
 	ROVER2B, Rover Two Bravo Akagi
 #ARAKA
 	N35.38.48.83, E139.50.41.88
@@ -5958,9 +5952,8 @@ route1 =
 #AKAGI
 #	N36.23.28.33, E139.41.56.28
 #!sid12x
 #ROVER2B.AGRIS
-route2 = 
+route2 = *12
 	ROVER2B, Rover Two Bravo Bruce
 #ARAKA
 	N35.38.48.83, E139.50.41.88
@@ -6051,9 +6044,8 @@ route5 =
 #ANSAD
 	N34.41.47.92, E141.42.44.41
 #!sid5x
 #BEKLA2B
-route6 = 
+route6 = *5
 	BEKLA2B, Bekla Two Bravo
 #ARAKA
 	N35.38.48.83, E139.50.41.88
@@ -6068,9 +6060,8 @@ route6 =
 #BEKLA
 	N35.49.58.66, E139.10.09.50
 #!sid2x
 #RITLA2B
-route7 = 
+route7 = *2
 	RITLA2B, Ritla Two Bravo
 #ARAKA
 	N35.38.48.83, E139.50.41.88
@@ -6090,9 +6081,8 @@ route7 =
 [departure2]
 runway = RJTTRWYD, rev
 #!sid2x
 #BEKLA2B
-route1 = 
+route1 = *2
 	BEKLA2B, Bekla Two Bravo
 #TT501
 	N35.33.28.7, E139.50.29.9
@@ -6109,9 +6099,8 @@ route1 =
 #BEKLA
 	N35.49.58.66, E139.10.09.50
 #!sid10x
 #RITLA2B
-route2 = 
+route2 = *10
 	RITLA2B, Ritla Two Bravo
 #TT501
 	N35.33.28.7, E139.50.29.9
@@ -6130,9 +6119,8 @@ route2 =
 #RITLA
 	N35.39.44.78, E139.08.13.11
 #!sid12x
 #NINOX3
-route3 = 
+route3 = *12
 	NINOX3, Ninox Three
 #TT501
 	N35.33.28.7, E139.50.29.9
@@ -6147,9 +6135,8 @@ route3 =
 #NINOX
 	N35.29.53.44, E139.09.53.06
 #!sid16x
 #LAXAS3 Y56
-route4 = 
+route4 = *16
 	LAXAS3, Laxas Three
 #TT501
 	N35.33.28.7, E139.50.29.9
@@ -6187,9 +6174,8 @@ route5 =
 [departure3]
 runway = RJTTRWYA, rev
 #!sid2x
 #BEKLA2B
-route1 = 
+route1 = *2
 	BEKLA2B, Bekla Two Bravo
 #T6R13
 	N35.28.00.8, E139.50.06.4
@@ -6202,9 +6188,8 @@ route1 =
 #BEKLA
 	N35.49.58.66, E139.10.09.50
 #!sid10x
 #RITLA2B
-route2 = 
+route2 = *10
 	RITLA2B, Ritla Two Bravo
 #T6R13
 	N35.28.00.8, E139.50.06.4
@@ -6219,9 +6204,8 @@ route2 =
 #RITLA
 	N35.39.44.78, E139.08.13.11
 #!sid12x
 #NINOX3
-route3 = 
+route3 = *12
 	NINOX3, Ninox Three
 #T6R12
 	N35.24.13.6, E139.52.47.1
@@ -6234,9 +6218,8 @@ route3 =
 #NINOX
 	N35.29.53.44, E139.09.53.06
 #!sid16x
 #LAXAS3 Y56
-route4 = 
+route4 = *16
 	LAXAS3, Laxas Three
 #T6R11
 	N35.25.52.5, E139.51.37.2
@@ -6266,9 +6249,8 @@ route5 =
 [departure4]
 runway = RJTTRWYC, rev
 #!sid3x
 #ROVER2B.AKAGI
-route1 = 
+route1 = *3
 	ROVER2B.AKAGI, Rover Two Bravo Akagi
 #T6L23
 	N35.26.27.6, E139.55.39.1
@@ -6287,9 +6269,8 @@ route1 =
 #AKAGI
 #	N36.23.28.33, E139.41.56.28
 #!sid12x
 #ROVER2B.AGRIS
-route2 = 
+route2 = *12
 	ROVER2B.AGRIS, Rover Two Bravo Bruce
 #T6L23
 	N35.26.27.6, E139.55.39.1
@@ -6388,9 +6369,8 @@ route5 =
 #ANSAD
 	N34.41.47.92, E141.42.44.41
 #!sid5x
 #BEKLA2B
-route6 = 
+route6 = *5
 	BEKLA2B, Bekla Two Bravo
 #T6L23
 	N35.26.27.6, E139.55.39.1
@@ -6407,9 +6387,8 @@ route6 =
 #BEKLA
 	N35.49.58.66, E139.10.09.50
 #!sid2x
 #RITLA2B
-route7 = 
+route7 = *2
 	RITLA2B, Ritla Two Bravo
 #T6L23
 	N35.26.27.6, E139.55.39.1
@@ -6431,9 +6410,8 @@ route7 =
 [departure5]
 runway = RJTTRWYB
 #!sid10x
 #RITLA2C
-route1 = 
+route1 = *10
 	RITLA2C, Ritla Two Bravo
 #HOBBS
 	N35.26.53.93, E139.45.41.29
@@ -6450,9 +6428,8 @@ route1 =
 #RITLA
 	N35.39.44.78, E139.08.13.11
 #!sid12x
 #NINOX3
-route2 = 
+route2 = *12
 	NINOX3, Ninox Three
 #HOBBS
 	N35.26.53.93, E139.45.41.29
@@ -6469,9 +6446,8 @@ route2 =
 #NINOX
 	N35.29.53.44, E139.09.53.06
 #!sid16x
 #LAXAS3 Y56
-route3 = 
+route3 = *16
 	LAXAS3, Laxas Three
 #HOBBS
 	N35.26.53.93, E139.45.41.29
@@ -6509,9 +6485,8 @@ route4 =
 [departure6]
 runway = RJTTRWYA2, rev
 #!sid3x
 #ROVER1C.AKAGI
-route1 = 
+route1 = *3
 	ROVER1C.AKAGI, Rover Two Charlie Akagi
 #T6R11
 	N35.25.52.5, E139.51.37.2
@@ -6530,9 +6505,8 @@ route1 =
 #AKAGI
 #	N36.23.28.33, E139.41.56.28
 #!sid12x
 #ROVER1C.AGRIS
-route2 = 
+route2 = *12
 	ROVER1C.AGRIS, Rover Two Charlie Bruce
 #T6R11
 	N35.25.52.5, E139.51.37.2
@@ -6631,9 +6605,8 @@ route5 =
 #ANSAD
 	N34.41.47.92, E141.42.44.41
 #!sid5x
 #BEKLA2C
-route1 = 
+route6 = *5
 	BEKLA2C, Bekla Two Charlie
 #T6R11
 	N35.25.52.5, E139.51.37.2
@@ -6648,9 +6621,8 @@ route1 =
 #BEKLA
 	N35.49.58.66, E139.10.09.50
 #!sid2x
 #RITLA2C
-route2 = 
+route7 = *2
 	RITLA2C, Ritla Two Charlie
 #T6R11
 	N35.25.52.5, E139.51.37.2
@@ -6672,9 +6644,8 @@ route2 =
 [departure7]
 runway = RJTTRWYC2, rev
 #!sid3x
 #ROVER1C.AKAGI
-route1 = 
+route1 = *3
 	ROVER1C.AKAGI, Rover Two Charlie Akagi
 #T6L31
 	N35.28.22.8, E139.56.48.0
@@ -6695,9 +6666,8 @@ route1 =
 #AKAGI
 #	N36.23.28.33, E139.41.56.28
 #!sid12x
 #ROVER1C.AGRIS
-route2 = 
+route2 = *12
 	ROVER1C.AGRIS, Rover Two Charlie Bruce
 #T6L31
 	N35.28.22.8, E139.56.48.0
@@ -8714,9 +8684,8 @@ route1 =
 [departure8]
 runway = RJAARWYA
 #!sid6x
 #TETRA8.ENPAR
-route1 = 
+route1 = *6
 	TETRA8.ENPAR, Tetra Eight Enpar
 #ARIES >4000
 	N35.56.07.38, E140.15.05.88
@@ -8795,9 +8764,8 @@ route3 =
 #KIMIN
 	N36.31.19.50, E140.07.38.18
 #!sid5x
 #REDEK2
-route4 = 
+route4 = *5
 	REDEK2, Redek Two
 #ARIES >4000
 	N35.56.07.38, E140.15.05.88
@@ -8824,9 +8792,8 @@ route4 =
 #MITOP
 	N35.19.10.75, E138.55.50.43
 #!sid7x
 #PIGOK2
-route5 = 
+route5 = *7
 	PIGOK2, Pigok Two
 #ARIES >4000
 	N35.56.07.38, E140.15.05.88
@@ -8921,9 +8888,8 @@ route8 =
 #IRNOK
 	N34.38.32.89, E141.15.58.24
 #!sid3x
 #OLVAN2.SAMUS
-route9 = 
+route9 = *3
 	OLVAN2.SAMUS, Olvan Two Samus
 #ARIES >4000
 	N35.56.07.38, E140.15.05.88
@@ -8953,9 +8919,8 @@ route9 =
 [departure9]
 runway = RJAARWYB
 #!sid6x
 #TETRA8.ENPAR
-route1 = 
+route1 = *6
 	TETRA8.ENPAR, Tetra Eight Enpar
 #BOXER
 	N35.52.13.00, E140.19.51.60
@@ -9028,9 +8993,8 @@ route3 =
 #KIMIN
 	N36.31.19.50, E140.07.38.18
 #!sid5x
 #REDEK2
-route4 = 
+route4 = *5
 	REDEK2, Redek Two
 #BOXER
 	N35.52.13.00, E140.19.51.60
@@ -9053,9 +9017,8 @@ route4 =
 #MITOP
 	N35.19.10.75, E138.55.50.43
 #!sid7x
 #PIGOK2
-route5 = 
+route5 = *7
 	PIGOK2, Pigok Two
 #BOXER
 	N35.52.13.00, E140.19.51.60
@@ -9140,9 +9103,8 @@ route8 =
 #IRNOK
 	N34.38.32.89, E141.15.58.24
 #!sid3x
 #OLVAN2.SAMUS
-route9 = 
+route9 = *3
 	OLVAN2.SAMUS, Olvan Two Samus
 #BOXER
 	N35.52.13.00, E140.19.51.60
@@ -9170,9 +9132,8 @@ route9 =
 [departure10]
 runway = RJAARWYA, rev
 #!sid6x
 #TETRA8.ENPAR
-route1 = 
+route1 = *6
 	TETRA8.ENPAR, Tetra Eight Enpar
 #ASPEN
 	N35.34.51.00, E140.30.28.10
@@ -9233,9 +9194,8 @@ route3 =
 #KIMIN
 	N36.31.19.50, E140.07.38.18
 #!sid5x
 #REDEK2
-route4 = 
+route4 = *5
 	REDEK2, Redek Two
 #ASPEN
 	N35.34.51.00, E140.30.28.10
@@ -9250,9 +9210,8 @@ route4 =
 #MITOP
 	N35.19.10.75, E138.55.50.43
 #!sid7x
 #PIGOK2
-route5 = 
+route5 = *7
 	PIGOK2, Pigok Two
 #ASPEN
 	N35.34.51.00, E140.30.28.10
@@ -9309,9 +9268,8 @@ route8 =
 #IRNOK
 	N34.38.32.89, E141.15.58.24
 #!sid3x
 #OLVAN2.SAMUS
-route9 = 
+route9 = *3
 	OLVAN2.SAMUS, Olvan Two Samus
 #ASPEN
 	N35.34.51.00, E140.30.28.10
@@ -9331,9 +9289,8 @@ route9 =
 [departure11]
 runway = RJAARWYB, rev
 #!sid6x
 #TETRA8.ENPAR
-route1 = 
+route1 = *6
 	TETRA8.ENPAR, Tetra Eight Enpar
 #BEAMS
 	N35.35.33.00, E140.31.53.10
@@ -9400,9 +9357,8 @@ route3 =
 #KIMIN
 	N36.31.19.50, E140.07.38.18
 #!sid5x
 #REDEK2
-route4 = 
+route4 = *5
 	REDEK2, Redek Two
 #BEAMS
 	N35.35.33.00, E140.31.53.10
@@ -9423,9 +9379,8 @@ route4 =
 #MITOP
 	N35.19.10.75, E138.55.50.43
 #!sid7x
 #PIGOK2
-route5 = 
+route5 = *7
 	PIGOK2, Pigok Two
 #BEAMS
 	N35.35.33.00, E140.31.53.10
@@ -9488,9 +9443,8 @@ route8 =
 #IRNOK
 	N34.38.32.89, E141.15.58.24
 #!sid3x
 #OLVAN2.SAMUS
-route9 = 
+route9 = *3
 	OLVAN2.SAMUS, Olvan Two Samus
 #BEAMS
 	N35.35.33.00, E140.31.53.10