add support for location system %l

diff --git a/maps/apace.map b/maps/apace.map
index 4243ea23ad05019c513a7c9b3137a822cbc30738..2a3f74eb322673997cf2b209ccce6469bac2ab9e 100644 (file)
--- a/maps/apace.map
+++ b/maps/apace.map
@@ -3465,7 +3465,7 @@ trak6x/base-pitted1
 }
 {
 ( -384 2496 64 ) ( -384 2480 64 ) ( -512 2496 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -384 2496 64 ) ( -512 2496 64 ) ( -384 2496 -256 ) trak6x/base-base1c 0 0 0 0.25 0.25 0 0 0
+( -384 2496 64 ) ( -512 2496 64 ) ( -384 2496 -256 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( -512 2480 -320 ) ( -512 2480 0 ) ( -384 2480 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -512 2480 -320 ) ( -512 2496 -320 ) ( -512 2480 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -384 2496 -64 ) ( -400 2480 -64 ) ( -384 2496 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -3473,7 +3473,7 @@ trak6x/base-pitted1
 }
 {
 ( -384 2488 64 ) ( -384 2376 64 ) ( -400 2488 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -384 2496 0 ) ( -384 2496 -320 ) ( -384 2384 0 ) trak6x/base-base1c 0 0 0 0.25 0.25 0 0 0
+( -384 2496 0 ) ( -384 2496 -320 ) ( -384 2384 0 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( -400 2368 -320 ) ( -400 2368 0 ) ( -384 2368 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -400 2384 -320 ) ( -400 2496 -320 ) ( -400 2384 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -400 2480 -64 ) ( -384 2496 -64 ) ( -400 2480 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -3498,14 +3498,14 @@ trak6x/base-pitted1
 {
 ( -192 2888 64 ) ( -192 2880 64 ) ( -368 2888 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -192 2888 64 ) ( -368 2888 64 ) ( -192 2888 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -368 2880 -128 ) ( -368 2880 64 ) ( -192 2880 -128 ) trak6x/base-base1c 0 0 0 0.25 0.25 0 0 0
+( -368 2880 -128 ) ( -368 2880 64 ) ( -192 2880 -128 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( -512 2880 -128 ) ( -512 2888 -128 ) ( -512 2880 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -200 2888 -64 ) ( -192 2880 -64 ) ( -200 2888 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -704 64 0 ) ( -728 64 0 ) ( -704 -64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -256 2368 64 ) ( -256 2352 64 ) ( -384 2368 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -256 2368 64 ) ( -384 2368 64 ) ( -256 2368 -320 ) trak6x/base-base1c 0 0 0 0.25 0.25 0 0 0
+( -256 2368 64 ) ( -384 2368 64 ) ( -256 2368 -320 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( -256 2368 64 ) ( -256 2368 -320 ) ( -256 2352 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -384 2352 -320 ) ( -384 2352 64 ) ( -256 2352 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -384 2352 -320 ) ( -384 2368 -320 ) ( -384 2352 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -3603,13 +3603,13 @@ trak6x/base-pitted1
 ( 264 2496 64 ) ( 264 2368 64 ) ( 256 2496 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 264 2496 64 ) ( 264 2496 -320 ) ( 264 2368 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 256 2368 -320 ) ( 256 2368 64 ) ( 264 2368 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 256 2368 -320 ) ( 256 2496 -320 ) ( 256 2368 64 ) trak6x/base-base1c 0 0 0 0.25 0.25 0 0 0
+( 256 2368 -320 ) ( 256 2496 -320 ) ( 256 2368 64 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( 256 2496 -64 ) ( 264 2488 -64 ) ( 256 2496 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 2368 0 ) ( -64 2360 0 ) ( 64 2368 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 384 2496 64 ) ( 384 2488 64 ) ( 256 2496 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 384 2496 64 ) ( 256 2496 64 ) ( 384 2496 -320 ) trak6x/base-base1c 0 0 0 0.25 0.25 0 0 0
+( 384 2496 64 ) ( 256 2496 64 ) ( 384 2496 -320 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( 384 2496 64 ) ( 384 2496 -320 ) ( 384 2488 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 256 2488 -320 ) ( 256 2488 64 ) ( 384 2488 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 264 2488 -64 ) ( 256 2496 -64 ) ( 264 2488 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -3617,7 +3617,7 @@ trak6x/base-pitted1
 }
 {
 ( 256 2368 64 ) ( 256 2360 64 ) ( 128 2368 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 256 2368 64 ) ( 128 2368 64 ) ( 256 2368 -320 ) trak6x/base-base1c 0 0 0 0.25 0.25 0 0 0
+( 256 2368 64 ) ( 128 2368 64 ) ( 256 2368 -320 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( 256 2368 64 ) ( 256 2368 -320 ) ( 256 2360 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 128 2360 -320 ) ( 128 2360 64 ) ( 256 2360 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 128 2360 -320 ) ( 128 2368 -320 ) ( 128 2360 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -3627,7 +3627,7 @@ trak6x/base-pitted1
 ( 256 2888 64 ) ( 256 2880 64 ) ( 64 2888 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 384 2888 64 ) ( 192 2888 64 ) ( 384 2888 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 384 2888 64 ) ( 384 2888 -128 ) ( 384 2880 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 64 2880 -128 ) ( 64 2880 64 ) ( 256 2880 -128 ) trak6x/base-base1c 0 0 0 0.25 0.25 0 0 0
+( 64 2880 -128 ) ( 64 2880 64 ) ( 256 2880 -128 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( 64 2880 -64 ) ( 72 2888 -64 ) ( 64 2880 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -704 64 0 ) ( -728 64 0 ) ( -704 -64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -41377,7 +41377,7 @@ ex2x/light-1
 ( 1088 5136 -200 ) ( 1088 4840 -200 ) ( 1088 5136 -192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -48 4992 -64 ) ( -24 4992 -64 ) ( -48 4992 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 4864 64 ) ( -16 4864 -64 ) ( -64 4864 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 64 4912 -64 ) ( 64 4936 -64 ) ( 64 4912 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( 0 4920 -64 ) ( 0 4944 -64 ) ( 0 4920 64 ) common/caulk 32 0 0 -0.25 0.25 0 0 0
 }
 {
 ( -1088 4824 -192 ) ( -1088 5120 -192 ) ( -40 4824 -192 ) trak6x/floor-tile3 768 0 180 0.25 0.25 0 0 0
@@ -41385,47 +41385,47 @@ ex2x/light-1
 ( -40 5120 -200 ) ( -1088 5120 -200 ) ( -40 4824 -200 ) common/caulk 0 0 180 0.25 0.25 0 0 0
 ( -48 4992 -64 ) ( -24 4992 -64 ) ( -48 4992 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 4864 64 ) ( -16 4864 -64 ) ( -64 4864 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -64 4896 64 ) ( -64 4920 -64 ) ( -64 4896 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -128 4896 64 ) ( -128 4920 -64 ) ( -128 4896 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( -704 4800 -192 ) ( -704 4992 -192 ) ( -544 4800 -192 ) trak5x/panel-block1 256 0 180 0.25 0.25 0 0 0
-( -512 4992 -208 ) ( -672 4992 -208 ) ( -512 4800 -208 ) common/caulk 0 0 180 0.25 0.25 0 0 0
-( -64 4872 64 ) ( -64 4896 64 ) ( -64 4872 192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 64 4872 192 ) ( 64 4896 64 ) ( 64 4872 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -64 4864 192 ) ( -32 4864 64 ) ( -64 4864 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -40 4880 56 ) ( -24 4880 56 ) ( -40 4880 184 ) trak6x/base-pitted1 256 480 0 -0.25 0.25 0 0 0
+( -768 4800 -192 ) ( -768 4992 -192 ) ( -608 4800 -192 ) trak5x/panel-block1 0 0 180 0.25 0.25 0 0 0
+( -576 4992 -208 ) ( -736 4992 -208 ) ( -576 4800 -208 ) common/caulk 0 0 180 0.25 0.25 0 0 0
+( -128 4872 64 ) ( -128 4896 64 ) ( -128 4872 192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( 0 4872 192 ) ( 0 4896 64 ) ( 0 4872 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -128 4864 192 ) ( -96 4864 64 ) ( -128 4864 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -104 4880 56 ) ( -88 4880 56 ) ( -104 4880 184 ) trak6x/base-pitted1 0 480 0 -0.25 0.25 0 0 0
 }
 {
-( -704 4800 -192 ) ( -704 4992 -192 ) ( -544 4800 -192 ) trak5x/panel-block1 256 0 180 0.25 0.25 0 0 0
-( -512 4992 -208 ) ( -672 4992 -208 ) ( -512 4800 -208 ) common/caulk 0 0 180 0.25 0.25 0 0 0
-( 64 4872 192 ) ( 64 4896 64 ) ( 64 4872 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -40 4880 184 ) ( -24 4880 56 ) ( -40 4880 56 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
-( -32 4976 56 ) ( -8 4976 56 ) ( -32 4976 184 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
-( 48 4904 64 ) ( 48 4912 64 ) ( 48 4904 192 ) trak6x/base-pitted1 256 0 0 -0.25 0.25 0 0 0
+( -768 4800 -192 ) ( -768 4992 -192 ) ( -608 4800 -192 ) trak5x/panel-block1 0 0 180 0.25 0.25 0 0 0
+( -576 4992 -208 ) ( -736 4992 -208 ) ( -576 4800 -208 ) common/caulk 0 0 180 0.25 0.25 0 0 0
+( 0 4872 192 ) ( 0 4896 64 ) ( 0 4872 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -104 4880 184 ) ( -88 4880 56 ) ( -104 4880 56 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
+( -96 4976 56 ) ( -72 4976 56 ) ( -96 4976 184 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
+( -16 4904 64 ) ( -16 4912 64 ) ( -16 4904 192 ) trak6x/base-pitted1 256 0 0 -0.25 0.25 0 0 0
 }
 {
-( -704 4800 -192 ) ( -704 4992 -192 ) ( -544 4800 -192 ) trak5x/panel-block1 256 0 180 0.25 0.25 0 0 0
-( -512 4992 -208 ) ( -672 4992 -208 ) ( -512 4800 -208 ) common/caulk 0 0 180 0.25 0.25 0 0 0
-( -64 4872 64 ) ( -64 4896 64 ) ( -64 4872 192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 64 4872 192 ) ( 64 4896 64 ) ( 64 4872 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -56 4992 64 ) ( -8 4992 64 ) ( -56 4992 192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -32 4976 184 ) ( -8 4976 56 ) ( -32 4976 56 ) trak6x/base-pitted1 256 480 0 -0.25 0.25 0 0 0
+( -768 4800 -192 ) ( -768 4992 -192 ) ( -608 4800 -192 ) trak5x/panel-block1 0 0 180 0.25 0.25 0 0 0
+( -576 4992 -208 ) ( -736 4992 -208 ) ( -576 4800 -208 ) common/caulk 0 0 180 0.25 0.25 0 0 0
+( -128 4872 64 ) ( -128 4896 64 ) ( -128 4872 192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( 0 4872 192 ) ( 0 4896 64 ) ( 0 4872 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -120 4992 64 ) ( -72 4992 64 ) ( -120 4992 192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -96 4976 184 ) ( -72 4976 56 ) ( -96 4976 56 ) trak6x/base-pitted1 0 480 0 -0.25 0.25 0 0 0
 }
 {
-( -704 4800 -192 ) ( -704 4992 -192 ) ( -544 4800 -192 ) trak5x/panel-block1 256 0 180 0.25 0.25 0 0 0
-( -512 4992 -208 ) ( -672 4992 -208 ) ( -512 4800 -208 ) common/caulk 0 0 180 0.25 0.25 0 0 0
-( -64 4872 64 ) ( -64 4896 64 ) ( -64 4872 192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -40 4880 184 ) ( -24 4880 56 ) ( -40 4880 56 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
-( -32 4976 56 ) ( -8 4976 56 ) ( -32 4976 184 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
-( -48 4896 192 ) ( -48 4904 64 ) ( -48 4896 64 ) trak6x/base-pitted1 256 0 0 -0.25 0.25 0 0 0
+( -768 4800 -192 ) ( -768 4992 -192 ) ( -608 4800 -192 ) trak5x/panel-block1 0 0 180 0.25 0.25 0 0 0
+( -576 4992 -208 ) ( -736 4992 -208 ) ( -576 4800 -208 ) common/caulk 0 0 180 0.25 0.25 0 0 0
+( -128 4872 64 ) ( -128 4896 64 ) ( -128 4872 192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -104 4880 184 ) ( -88 4880 56 ) ( -104 4880 56 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
+( -96 4976 56 ) ( -72 4976 56 ) ( -96 4976 184 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
+( -112 4896 192 ) ( -112 4904 64 ) ( -112 4896 64 ) trak6x/base-pitted1 256 0 0 -0.25 0.25 0 0 0
 }
 {
-( -704 4800 -208 ) ( -704 4992 -208 ) ( -544 4800 -208 ) trak5x/panel-panel2a 255.9993286133 85.3325195313 180 0.1875 0.1875 0 0 0
-( -512 4992 -216 ) ( -672 4992 -216 ) ( -512 4800 -216 ) common/caulk 0 0 180 0.25 0.25 0 0 0
-( -40 4880 176 ) ( -24 4880 48 ) ( -40 4880 48 ) common/caulk 0 192 0 -0.25 0.25 0 0 0
-( -32 4976 48 ) ( -8 4976 48 ) ( -32 4976 176 ) common/caulk 0 192 0 -0.25 0.25 0 0 0
-( -48 4896 48 ) ( -48 4904 48 ) ( -48 4896 176 ) common/caulk 0 192 0 -0.25 0.25 0 0 0
-( 48 4904 176 ) ( 48 4912 48 ) ( 48 4904 48 ) common/caulk 0 192 0 -0.25 0.25 0 0 0
+( -768 4800 -208 ) ( -768 4992 -208 ) ( -608 4800 -208 ) trak5x/panel-panel2a 426.6659851074 85.3325195313 180 0.1875 0.1875 0 0 0
+( -576 4992 -216 ) ( -736 4992 -216 ) ( -576 4800 -216 ) common/caulk 0 0 180 0.25 0.25 0 0 0
+( -104 4880 176 ) ( -88 4880 48 ) ( -104 4880 48 ) common/caulk 0 192 0 -0.25 0.25 0 0 0
+( -96 4976 48 ) ( -72 4976 48 ) ( -96 4976 176 ) common/caulk 0 192 0 -0.25 0.25 0 0 0
+( -112 4896 48 ) ( -112 4904 48 ) ( -112 4896 176 ) common/caulk 0 192 0 -0.25 0.25 0 0 0
+( -16 4904 176 ) ( -16 4912 48 ) ( -16 4904 48 ) common/caulk 0 192 0 -0.25 0.25 0 0 0
 }
 {
 patchDef2
@@ -41433,15 +41433,15 @@ patchDef2
 ex2x/light-1
 ( 9 7 0 0 0 )
 (
-( ( 0 4964 -196 0 0 ) ( -12 4964 -196 0 0.1666666716 ) ( -24 4964 -196 0 0.3333333433 ) ( -36 4964 -196 0 0.5 ) ( -36 4952 -196 0 0.6666666865 ) ( -36 4940 -196 0 0.8333333731 ) ( -36 4928 -196 0 1 ) )
-( ( 0 4968 -196 0.125 0 ) ( -12 4968 -196 0.125 0.1666666716 ) ( -24 4968 -196 0.125 0.3333333433 ) ( -40 4968 -196 0.125 0.5 ) ( -40 4952 -196 0.125 0.6666666865 ) ( -40 4940 -196 0.125 0.8333333731 ) ( -40 4928 -196 0.125 1 ) )
-( ( 0 4968 -200 0.25 0 ) ( -12 4968 -200 0.25 0.1666666716 ) ( -24 4968 -200 0.25 0.3333333433 ) ( -40 4968 -200 0.25 0.5 ) ( -40 4952 -200 0.25 0.6666666865 ) ( -40 4940 -200 0.25 0.8333333731 ) ( -40 4928 -200 0.25 1 ) )
-( ( 0 4968 -204 0.375 0 ) ( -12 4968 -204 0.375 0.1666666716 ) ( -24 4968 -204 0.375 0.3333333433 ) ( -40 4968 -204 0.375 0.5 ) ( -40 4952 -204 0.375 0.6666666865 ) ( -40 4940 -204 0.375 0.8333333731 ) ( -40 4928 -204 0.375 1 ) )
-( ( 0 4964 -204 0.5 0 ) ( -12 4964 -204 0.5 0.1666666716 ) ( -24 4964 -204 0.5 0.3333333433 ) ( -36 4964 -204 0.5 0.5 ) ( -36 4952 -204 0.5 0.6666666865 ) ( -36 4940 -204 0.5 0.8333333731 ) ( -36 4928 -204 0.5 1 ) )
-( ( 0 4960 -204 0.625 0 ) ( -12 4960 -204 0.625 0.1666666716 ) ( -24 4960 -204 0.625 0.3333333433 ) ( -32 4960 -204 0.625 0.5 ) ( -32 4952 -204 0.625 0.6666666865 ) ( -32 4940 -204 0.625 0.8333333731 ) ( -32 4928 -204 0.625 1 ) )
-( ( 0 4960 -200 0.75 0 ) ( -12 4960 -200 0.75 0.1666666716 ) ( -24 4960 -200 0.75 0.3333333433 ) ( -32 4960 -200 0.75 0.5 ) ( -32 4952 -200 0.75 0.6666666865 ) ( -32 4940 -200 0.75 0.8333333731 ) ( -32 4928 -200 0.75 1 ) )
-( ( 0 4960 -196 0.875 0 ) ( -12 4960 -196 0.875 0.1666666716 ) ( -24 4960 -196 0.875 0.3333333433 ) ( -32 4960 -196 0.875 0.5 ) ( -32 4952 -196 0.875 0.6666666865 ) ( -32 4940 -196 0.875 0.8333333731 ) ( -32 4928 -196 0.875 1 ) )
-( ( 0 4964 -196 1 0 ) ( -12 4964 -196 1 0.1666666716 ) ( -24 4964 -196 1 0.3333333433 ) ( -36 4964 -196 1 0.5 ) ( -36 4952 -196 1 0.6666666865 ) ( -36 4940 -196 1 0.8333333731 ) ( -36 4928 -196 1 1 ) )
+( ( -64 4964 -196 0 0 ) ( -76 4964 -196 0 0.1666666716 ) ( -88 4964 -196 0 0.3333333433 ) ( -100 4964 -196 0 0.5 ) ( -100 4952 -196 0 0.6666666865 ) ( -100 4940 -196 0 0.8333333731 ) ( -100 4928 -196 0 1 ) )
+( ( -64 4968 -196 0.125 0 ) ( -76 4968 -196 0.125 0.1666666716 ) ( -88 4968 -196 0.125 0.3333333433 ) ( -104 4968 -196 0.125 0.5 ) ( -104 4952 -196 0.125 0.6666666865 ) ( -104 4940 -196 0.125 0.8333333731 ) ( -104 4928 -196 0.125 1 ) )
+( ( -64 4968 -200 0.25 0 ) ( -76 4968 -200 0.25 0.1666666716 ) ( -88 4968 -200 0.25 0.3333333433 ) ( -104 4968 -200 0.25 0.5 ) ( -104 4952 -200 0.25 0.6666666865 ) ( -104 4940 -200 0.25 0.8333333731 ) ( -104 4928 -200 0.25 1 ) )
+( ( -64 4968 -204 0.375 0 ) ( -76 4968 -204 0.375 0.1666666716 ) ( -88 4968 -204 0.375 0.3333333433 ) ( -104 4968 -204 0.375 0.5 ) ( -104 4952 -204 0.375 0.6666666865 ) ( -104 4940 -204 0.375 0.8333333731 ) ( -104 4928 -204 0.375 1 ) )
+( ( -64 4964 -204 0.5 0 ) ( -76 4964 -204 0.5 0.1666666716 ) ( -88 4964 -204 0.5 0.3333333433 ) ( -100 4964 -204 0.5 0.5 ) ( -100 4952 -204 0.5 0.6666666865 ) ( -100 4940 -204 0.5 0.8333333731 ) ( -100 4928 -204 0.5 1 ) )
+( ( -64 4960 -204 0.625 0 ) ( -76 4960 -204 0.625 0.1666666716 ) ( -88 4960 -204 0.625 0.3333333433 ) ( -96 4960 -204 0.625 0.5 ) ( -96 4952 -204 0.625 0.6666666865 ) ( -96 4940 -204 0.625 0.8333333731 ) ( -96 4928 -204 0.625 1 ) )
+( ( -64 4960 -200 0.75 0 ) ( -76 4960 -200 0.75 0.1666666716 ) ( -88 4960 -200 0.75 0.3333333433 ) ( -96 4960 -200 0.75 0.5 ) ( -96 4952 -200 0.75 0.6666666865 ) ( -96 4940 -200 0.75 0.8333333731 ) ( -96 4928 -200 0.75 1 ) )
+( ( -64 4960 -196 0.875 0 ) ( -76 4960 -196 0.875 0.1666666716 ) ( -88 4960 -196 0.875 0.3333333433 ) ( -96 4960 -196 0.875 0.5 ) ( -96 4952 -196 0.875 0.6666666865 ) ( -96 4940 -196 0.875 0.8333333731 ) ( -96 4928 -196 0.875 1 ) )
+( ( -64 4964 -196 1 0 ) ( -76 4964 -196 1 0.1666666716 ) ( -88 4964 -196 1 0.3333333433 ) ( -100 4964 -196 1 0.5 ) ( -100 4952 -196 1 0.6666666865 ) ( -100 4940 -196 1 0.8333333731 ) ( -100 4928 -196 1 1 ) )
 )
 }
 }
@@ -41451,15 +41451,15 @@ patchDef2
 ex2x/light-1
 ( 9 7 0 0 0 )
 (
-( ( 36 4928 -196 0 0 ) ( 36 4940 -196 0 0.1666666716 ) ( 36 4952 -196 0 0.3333333433 ) ( 36 4964 -196 0 0.5 ) ( 24 4964 -196 0 0.6666666865 ) ( 12 4964 -196 0 0.8333333731 ) ( 0 4964 -196 0 1 ) )
-( ( 40 4928 -196 0.125 0 ) ( 40 4940 -196 0.125 0.1666666716 ) ( 40 4952 -196 0.125 0.3333333433 ) ( 40 4968 -196 0.125 0.5 ) ( 24 4968 -196 0.125 0.6666666865 ) ( 12 4968 -196 0.125 0.8333333731 ) ( 0 4968 -196 0.125 1 ) )
-( ( 40 4928 -200 0.25 0 ) ( 40 4940 -200 0.25 0.1666666716 ) ( 40 4952 -200 0.25 0.3333333433 ) ( 40 4968 -200 0.25 0.5 ) ( 24 4968 -200 0.25 0.6666666865 ) ( 12 4968 -200 0.25 0.8333333731 ) ( 0 4968 -200 0.25 1 ) )
-( ( 40 4928 -204 0.375 0 ) ( 40 4940 -204 0.375 0.1666666716 ) ( 40 4952 -204 0.375 0.3333333433 ) ( 40 4968 -204 0.375 0.5 ) ( 24 4968 -204 0.375 0.6666666865 ) ( 12 4968 -204 0.375 0.8333333731 ) ( 0 4968 -204 0.375 1 ) )
-( ( 36 4928 -204 0.5 0 ) ( 36 4940 -204 0.5 0.1666666716 ) ( 36 4952 -204 0.5 0.3333333433 ) ( 36 4964 -204 0.5 0.5 ) ( 24 4964 -204 0.5 0.6666666865 ) ( 12 4964 -204 0.5 0.8333333731 ) ( 0 4964 -204 0.5 1 ) )
-( ( 32 4928 -204 0.625 0 ) ( 32 4940 -204 0.625 0.1666666716 ) ( 32 4952 -204 0.625 0.3333333433 ) ( 32 4960 -204 0.625 0.5 ) ( 24 4960 -204 0.625 0.6666666865 ) ( 12 4960 -204 0.625 0.8333333731 ) ( 0 4960 -204 0.625 1 ) )
-( ( 32 4928 -200 0.75 0 ) ( 32 4940 -200 0.75 0.1666666716 ) ( 32 4952 -200 0.75 0.3333333433 ) ( 32 4960 -200 0.75 0.5 ) ( 24 4960 -200 0.75 0.6666666865 ) ( 12 4960 -200 0.75 0.8333333731 ) ( 0 4960 -200 0.75 1 ) )
-( ( 32 4928 -196 0.875 0 ) ( 32 4940 -196 0.875 0.1666666716 ) ( 32 4952 -196 0.875 0.3333333433 ) ( 32 4960 -196 0.875 0.5 ) ( 24 4960 -196 0.875 0.6666666865 ) ( 12 4960 -196 0.875 0.8333333731 ) ( 0 4960 -196 0.875 1 ) )
-( ( 36 4928 -196 1 0 ) ( 36 4940 -196 1 0.1666666716 ) ( 36 4952 -196 1 0.3333333433 ) ( 36 4964 -196 1 0.5 ) ( 24 4964 -196 1 0.6666666865 ) ( 12 4964 -196 1 0.8333333731 ) ( 0 4964 -196 1 1 ) )
+( ( -28 4928 -196 0 0 ) ( -28 4940 -196 0 0.1666666716 ) ( -28 4952 -196 0 0.3333333433 ) ( -28 4964 -196 0 0.5 ) ( -40 4964 -196 0 0.6666666865 ) ( -52 4964 -196 0 0.8333333731 ) ( -64 4964 -196 0 1 ) )
+( ( -24 4928 -196 0.125 0 ) ( -24 4940 -196 0.125 0.1666666716 ) ( -24 4952 -196 0.125 0.3333333433 ) ( -24 4968 -196 0.125 0.5 ) ( -40 4968 -196 0.125 0.6666666865 ) ( -52 4968 -196 0.125 0.8333333731 ) ( -64 4968 -196 0.125 1 ) )
+( ( -24 4928 -200 0.25 0 ) ( -24 4940 -200 0.25 0.1666666716 ) ( -24 4952 -200 0.25 0.3333333433 ) ( -24 4968 -200 0.25 0.5 ) ( -40 4968 -200 0.25 0.6666666865 ) ( -52 4968 -200 0.25 0.8333333731 ) ( -64 4968 -200 0.25 1 ) )
+( ( -24 4928 -204 0.375 0 ) ( -24 4940 -204 0.375 0.1666666716 ) ( -24 4952 -204 0.375 0.3333333433 ) ( -24 4968 -204 0.375 0.5 ) ( -40 4968 -204 0.375 0.6666666865 ) ( -52 4968 -204 0.375 0.8333333731 ) ( -64 4968 -204 0.375 1 ) )
+( ( -28 4928 -204 0.5 0 ) ( -28 4940 -204 0.5 0.1666666716 ) ( -28 4952 -204 0.5 0.3333333433 ) ( -28 4964 -204 0.5 0.5 ) ( -40 4964 -204 0.5 0.6666666865 ) ( -52 4964 -204 0.5 0.8333333731 ) ( -64 4964 -204 0.5 1 ) )
+( ( -32 4928 -204 0.625 0 ) ( -32 4940 -204 0.625 0.1666666716 ) ( -32 4952 -204 0.625 0.3333333433 ) ( -32 4960 -204 0.625 0.5 ) ( -40 4960 -204 0.625 0.6666666865 ) ( -52 4960 -204 0.625 0.8333333731 ) ( -64 4960 -204 0.625 1 ) )
+( ( -32 4928 -200 0.75 0 ) ( -32 4940 -200 0.75 0.1666666716 ) ( -32 4952 -200 0.75 0.3333333433 ) ( -32 4960 -200 0.75 0.5 ) ( -40 4960 -200 0.75 0.6666666865 ) ( -52 4960 -200 0.75 0.8333333731 ) ( -64 4960 -200 0.75 1 ) )
+( ( -32 4928 -196 0.875 0 ) ( -32 4940 -196 0.875 0.1666666716 ) ( -32 4952 -196 0.875 0.3333333433 ) ( -32 4960 -196 0.875 0.5 ) ( -40 4960 -196 0.875 0.6666666865 ) ( -52 4960 -196 0.875 0.8333333731 ) ( -64 4960 -196 0.875 1 ) )
+( ( -28 4928 -196 1 0 ) ( -28 4940 -196 1 0.1666666716 ) ( -28 4952 -196 1 0.3333333433 ) ( -28 4964 -196 1 0.5 ) ( -40 4964 -196 1 0.6666666865 ) ( -52 4964 -196 1 0.8333333731 ) ( -64 4964 -196 1 1 ) )
 )
 }
 }
@@ -41469,15 +41469,15 @@ patchDef2
 ex2x/light-1
 ( 9 7 0 0 0 )
 (
-( ( 0 4892 -196 0 0 ) ( 12 4892 -196 0 0.1666666716 ) ( 24 4892 -196 0 0.3333333433 ) ( 36 4892 -196 0 0.5 ) ( 36 4904 -196 0 0.6666666865 ) ( 36 4916 -196 0 0.8333333731 ) ( 36 4928 -196 0 1 ) )
-( ( 0 4888 -196 0.125 0 ) ( 12 4888 -196 0.125 0.1666666716 ) ( 24 4888 -196 0.125 0.3333333433 ) ( 40 4888 -196 0.125 0.5 ) ( 40 4904 -196 0.125 0.6666666865 ) ( 40 4916 -196 0.125 0.8333333731 ) ( 40 4928 -196 0.125 1 ) )
-( ( 0 4888 -200 0.25 0 ) ( 12 4888 -200 0.25 0.1666666716 ) ( 24 4888 -200 0.25 0.3333333433 ) ( 40 4888 -200 0.25 0.5 ) ( 40 4904 -200 0.25 0.6666666865 ) ( 40 4916 -200 0.25 0.8333333731 ) ( 40 4928 -200 0.25 1 ) )
-( ( 0 4888 -204 0.375 0 ) ( 12 4888 -204 0.375 0.1666666716 ) ( 24 4888 -204 0.375 0.3333333433 ) ( 40 4888 -204 0.375 0.5 ) ( 40 4904 -204 0.375 0.6666666865 ) ( 40 4916 -204 0.375 0.8333333731 ) ( 40 4928 -204 0.375 1 ) )
-( ( 0 4892 -204 0.5 0 ) ( 12 4892 -204 0.5 0.1666666716 ) ( 24 4892 -204 0.5 0.3333333433 ) ( 36 4892 -204 0.5 0.5 ) ( 36 4904 -204 0.5 0.6666666865 ) ( 36 4916 -204 0.5 0.8333333731 ) ( 36 4928 -204 0.5 1 ) )
-( ( 0 4896 -204 0.625 0 ) ( 12 4896 -204 0.625 0.1666666716 ) ( 24 4896 -204 0.625 0.3333333433 ) ( 32 4896 -204 0.625 0.5 ) ( 32 4904 -204 0.625 0.6666666865 ) ( 32 4916 -204 0.625 0.8333333731 ) ( 32 4928 -204 0.625 1 ) )
-( ( 0 4896 -200 0.75 0 ) ( 12 4896 -200 0.75 0.1666666716 ) ( 24 4896 -200 0.75 0.3333333433 ) ( 32 4896 -200 0.75 0.5 ) ( 32 4904 -200 0.75 0.6666666865 ) ( 32 4916 -200 0.75 0.8333333731 ) ( 32 4928 -200 0.75 1 ) )
-( ( 0 4896 -196 0.875 0 ) ( 12 4896 -196 0.875 0.1666666716 ) ( 24 4896 -196 0.875 0.3333333433 ) ( 32 4896 -196 0.875 0.5 ) ( 32 4904 -196 0.875 0.6666666865 ) ( 32 4916 -196 0.875 0.8333333731 ) ( 32 4928 -196 0.875 1 ) )
-( ( 0 4892 -196 1 0 ) ( 12 4892 -196 1 0.1666666716 ) ( 24 4892 -196 1 0.3333333433 ) ( 36 4892 -196 1 0.5 ) ( 36 4904 -196 1 0.6666666865 ) ( 36 4916 -196 1 0.8333333731 ) ( 36 4928 -196 1 1 ) )
+( ( -64 4892 -196 0 0 ) ( -52 4892 -196 0 0.1666666716 ) ( -40 4892 -196 0 0.3333333433 ) ( -28 4892 -196 0 0.5 ) ( -28 4904 -196 0 0.6666666865 ) ( -28 4916 -196 0 0.8333333731 ) ( -28 4928 -196 0 1 ) )
+( ( -64 4888 -196 0.125 0 ) ( -52 4888 -196 0.125 0.1666666716 ) ( -40 4888 -196 0.125 0.3333333433 ) ( -24 4888 -196 0.125 0.5 ) ( -24 4904 -196 0.125 0.6666666865 ) ( -24 4916 -196 0.125 0.8333333731 ) ( -24 4928 -196 0.125 1 ) )
+( ( -64 4888 -200 0.25 0 ) ( -52 4888 -200 0.25 0.1666666716 ) ( -40 4888 -200 0.25 0.3333333433 ) ( -24 4888 -200 0.25 0.5 ) ( -24 4904 -200 0.25 0.6666666865 ) ( -24 4916 -200 0.25 0.8333333731 ) ( -24 4928 -200 0.25 1 ) )
+( ( -64 4888 -204 0.375 0 ) ( -52 4888 -204 0.375 0.1666666716 ) ( -40 4888 -204 0.375 0.3333333433 ) ( -24 4888 -204 0.375 0.5 ) ( -24 4904 -204 0.375 0.6666666865 ) ( -24 4916 -204 0.375 0.8333333731 ) ( -24 4928 -204 0.375 1 ) )
+( ( -64 4892 -204 0.5 0 ) ( -52 4892 -204 0.5 0.1666666716 ) ( -40 4892 -204 0.5 0.3333333433 ) ( -28 4892 -204 0.5 0.5 ) ( -28 4904 -204 0.5 0.6666666865 ) ( -28 4916 -204 0.5 0.8333333731 ) ( -28 4928 -204 0.5 1 ) )
+( ( -64 4896 -204 0.625 0 ) ( -52 4896 -204 0.625 0.1666666716 ) ( -40 4896 -204 0.625 0.3333333433 ) ( -32 4896 -204 0.625 0.5 ) ( -32 4904 -204 0.625 0.6666666865 ) ( -32 4916 -204 0.625 0.8333333731 ) ( -32 4928 -204 0.625 1 ) )
+( ( -64 4896 -200 0.75 0 ) ( -52 4896 -200 0.75 0.1666666716 ) ( -40 4896 -200 0.75 0.3333333433 ) ( -32 4896 -200 0.75 0.5 ) ( -32 4904 -200 0.75 0.6666666865 ) ( -32 4916 -200 0.75 0.8333333731 ) ( -32 4928 -200 0.75 1 ) )
+( ( -64 4896 -196 0.875 0 ) ( -52 4896 -196 0.875 0.1666666716 ) ( -40 4896 -196 0.875 0.3333333433 ) ( -32 4896 -196 0.875 0.5 ) ( -32 4904 -196 0.875 0.6666666865 ) ( -32 4916 -196 0.875 0.8333333731 ) ( -32 4928 -196 0.875 1 ) )
+( ( -64 4892 -196 1 0 ) ( -52 4892 -196 1 0.1666666716 ) ( -40 4892 -196 1 0.3333333433 ) ( -28 4892 -196 1 0.5 ) ( -28 4904 -196 1 0.6666666865 ) ( -28 4916 -196 1 0.8333333731 ) ( -28 4928 -196 1 1 ) )
 )
 }
 }
@@ -41487,29 +41487,29 @@ patchDef2
 ex2x/light-1
 ( 9 7 0 0 0 )
 (
-( ( -36 4928 -196 0 0 ) ( -36 4916 -196 0 0.1666666716 ) ( -36 4904 -196 0 0.3333333433 ) ( -36 4892 -196 0 0.5 ) ( -24 4892 -196 0 0.6666666865 ) ( -12 4892 -196 0 0.8333333731 ) ( 0 4892 -196 0 1 ) )
-( ( -40 4928 -196 0.125 0 ) ( -40 4916 -196 0.125 0.1666666716 ) ( -40 4904 -196 0.125 0.3333333433 ) ( -40 4888 -196 0.125 0.5 ) ( -24 4888 -196 0.125 0.6666666865 ) ( -12 4888 -196 0.125 0.8333333731 ) ( 0 4888 -196 0.125 1 ) )
-( ( -40 4928 -200 0.25 0 ) ( -40 4916 -200 0.25 0.1666666716 ) ( -40 4904 -200 0.25 0.3333333433 ) ( -40 4888 -200 0.25 0.5 ) ( -24 4888 -200 0.25 0.6666666865 ) ( -12 4888 -200 0.25 0.8333333731 ) ( 0 4888 -200 0.25 1 ) )
-( ( -40 4928 -204 0.375 0 ) ( -40 4916 -204 0.375 0.1666666716 ) ( -40 4904 -204 0.375 0.3333333433 ) ( -40 4888 -204 0.375 0.5 ) ( -24 4888 -204 0.375 0.6666666865 ) ( -12 4888 -204 0.375 0.8333333731 ) ( 0 4888 -204 0.375 1 ) )
-( ( -36 4928 -204 0.5 0 ) ( -36 4916 -204 0.5 0.1666666716 ) ( -36 4904 -204 0.5 0.3333333433 ) ( -36 4892 -204 0.5 0.5 ) ( -24 4892 -204 0.5 0.6666666865 ) ( -12 4892 -204 0.5 0.8333333731 ) ( 0 4892 -204 0.5 1 ) )
-( ( -32 4928 -204 0.625 0 ) ( -32 4916 -204 0.625 0.1666666716 ) ( -32 4904 -204 0.625 0.3333333433 ) ( -32 4896 -204 0.625 0.5 ) ( -24 4896 -204 0.625 0.6666666865 ) ( -12 4896 -204 0.625 0.8333333731 ) ( 0 4896 -204 0.625 1 ) )
-( ( -32 4928 -200 0.75 0 ) ( -32 4916 -200 0.75 0.1666666716 ) ( -32 4904 -200 0.75 0.3333333433 ) ( -32 4896 -200 0.75 0.5 ) ( -24 4896 -200 0.75 0.6666666865 ) ( -12 4896 -200 0.75 0.8333333731 ) ( 0 4896 -200 0.75 1 ) )
-( ( -32 4928 -196 0.875 0 ) ( -32 4916 -196 0.875 0.1666666716 ) ( -32 4904 -196 0.875 0.3333333433 ) ( -32 4896 -196 0.875 0.5 ) ( -24 4896 -196 0.875 0.6666666865 ) ( -12 4896 -196 0.875 0.8333333731 ) ( 0 4896 -196 0.875 1 ) )
-( ( -36 4928 -196 1 0 ) ( -36 4916 -196 1 0.1666666716 ) ( -36 4904 -196 1 0.3333333433 ) ( -36 4892 -196 1 0.5 ) ( -24 4892 -196 1 0.6666666865 ) ( -12 4892 -196 1 0.8333333731 ) ( 0 4892 -196 1 1 ) )
+( ( -100 4928 -196 0 0 ) ( -100 4916 -196 0 0.1666666716 ) ( -100 4904 -196 0 0.3333333433 ) ( -100 4892 -196 0 0.5 ) ( -88 4892 -196 0 0.6666666865 ) ( -76 4892 -196 0 0.8333333731 ) ( -64 4892 -196 0 1 ) )
+( ( -104 4928 -196 0.125 0 ) ( -104 4916 -196 0.125 0.1666666716 ) ( -104 4904 -196 0.125 0.3333333433 ) ( -104 4888 -196 0.125 0.5 ) ( -88 4888 -196 0.125 0.6666666865 ) ( -76 4888 -196 0.125 0.8333333731 ) ( -64 4888 -196 0.125 1 ) )
+( ( -104 4928 -200 0.25 0 ) ( -104 4916 -200 0.25 0.1666666716 ) ( -104 4904 -200 0.25 0.3333333433 ) ( -104 4888 -200 0.25 0.5 ) ( -88 4888 -200 0.25 0.6666666865 ) ( -76 4888 -200 0.25 0.8333333731 ) ( -64 4888 -200 0.25 1 ) )
+( ( -104 4928 -204 0.375 0 ) ( -104 4916 -204 0.375 0.1666666716 ) ( -104 4904 -204 0.375 0.3333333433 ) ( -104 4888 -204 0.375 0.5 ) ( -88 4888 -204 0.375 0.6666666865 ) ( -76 4888 -204 0.375 0.8333333731 ) ( -64 4888 -204 0.375 1 ) )
+( ( -100 4928 -204 0.5 0 ) ( -100 4916 -204 0.5 0.1666666716 ) ( -100 4904 -204 0.5 0.3333333433 ) ( -100 4892 -204 0.5 0.5 ) ( -88 4892 -204 0.5 0.6666666865 ) ( -76 4892 -204 0.5 0.8333333731 ) ( -64 4892 -204 0.5 1 ) )
+( ( -96 4928 -204 0.625 0 ) ( -96 4916 -204 0.625 0.1666666716 ) ( -96 4904 -204 0.625 0.3333333433 ) ( -96 4896 -204 0.625 0.5 ) ( -88 4896 -204 0.625 0.6666666865 ) ( -76 4896 -204 0.625 0.8333333731 ) ( -64 4896 -204 0.625 1 ) )
+( ( -96 4928 -200 0.75 0 ) ( -96 4916 -200 0.75 0.1666666716 ) ( -96 4904 -200 0.75 0.3333333433 ) ( -96 4896 -200 0.75 0.5 ) ( -88 4896 -200 0.75 0.6666666865 ) ( -76 4896 -200 0.75 0.8333333731 ) ( -64 4896 -200 0.75 1 ) )
+( ( -96 4928 -196 0.875 0 ) ( -96 4916 -196 0.875 0.1666666716 ) ( -96 4904 -196 0.875 0.3333333433 ) ( -96 4896 -196 0.875 0.5 ) ( -88 4896 -196 0.875 0.6666666865 ) ( -76 4896 -196 0.875 0.8333333731 ) ( -64 4896 -196 0.875 1 ) )
+( ( -100 4928 -196 1 0 ) ( -100 4916 -196 1 0.1666666716 ) ( -100 4904 -196 1 0.3333333433 ) ( -100 4892 -196 1 0.5 ) ( -88 4892 -196 1 0.6666666865 ) ( -76 4892 -196 1 0.8333333731 ) ( -64 4892 -196 1 1 ) )
 )
 }
 }
 {
-( -48 4880 -192 ) ( -48 4928 -192 ) ( 48 4880 -192 ) trak5x/misc-glass 0 0 180 0.25 0.25 0 0 0
-( -48 4880 -192 ) ( 48 4880 -192 ) ( -48 4880 -208 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -48 4880 -192 ) ( -48 4880 -208 ) ( -48 4928 -192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 48 4928 -200 ) ( -48 4928 -200 ) ( 48 4880 -200 ) common/caulk 0 0 180 0.25 0.25 0 0 0
-( 56 4976 -208 ) ( 56 4976 -192 ) ( -40 4976 -208 ) common/caulk 32 0 0 -0.25 0.25 0 0 0
-( 48 4928 -208 ) ( 48 4880 -208 ) ( 48 4928 -192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -112 4880 -192 ) ( -112 4928 -192 ) ( -16 4880 -192 ) trak5x/misc-glass 0 0 180 0.25 0.25 0 0 0
+( -112 4880 -192 ) ( -16 4880 -192 ) ( -112 4880 -208 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -112 4880 -192 ) ( -112 4880 -208 ) ( -112 4928 -192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -16 4928 -200 ) ( -112 4928 -200 ) ( -16 4880 -200 ) common/caulk 0 0 180 0.25 0.25 0 0 0
+( -8 4976 -208 ) ( -8 4976 -192 ) ( -104 4976 -208 ) common/caulk 32 0 0 -0.25 0.25 0 0 0
+( -16 4928 -208 ) ( -16 4880 -208 ) ( -16 4928 -192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
 ( -528 2880 112 ) ( -544 2880 112 ) ( -528 2880 -272 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -512 2536 112 ) ( -512 2536 -272 ) ( -512 2496 112 ) trak6x/base-base1c 0 0 0 0.25 0.25 0 0 0
+( -512 2536 112 ) ( -512 2536 -272 ) ( -512 2496 112 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( -528 2496 -272 ) ( -528 2496 112 ) ( -512 2496 -272 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -528 2496 -272 ) ( -528 2536 -272 ) ( -528 2496 112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -512 64 0 ) ( -528 64 16 ) ( -512 -64 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -41548,7 +41548,7 @@ ex2x/light-1
 ( -320 -64 224 ) ( -328 64 224 ) ( -320 64 224 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -32 2368 192 ) ( -256 2368 192 ) ( -32 2368 0 ) trak6x/base-base1c 0 256 0 0.25 0.25 0 0 0
+( -32 2368 192 ) ( -256 2368 192 ) ( -32 2368 0 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( 128 2368 256 ) ( 128 2368 64 ) ( 128 2352 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -256 2352 0 ) ( -32 2352 0 ) ( -256 2368 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -256 2352 64 ) ( -256 2352 256 ) ( -32 2352 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -41589,7 +41589,7 @@ ex2x/light-1
 }
 {
 ( 400 2496 112 ) ( 416 2496 112 ) ( 400 2496 -272 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 384 2840 112 ) ( 384 2840 -272 ) ( 384 2880 112 ) trak6x/base-base1c 0 0 0 0.25 0.25 0 0 0
+( 384 2840 112 ) ( 384 2840 -272 ) ( 384 2880 112 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( 400 2880 -272 ) ( 400 2880 112 ) ( 384 2880 -272 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 400 2880 -272 ) ( 400 2840 -272 ) ( 400 2880 112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 384 5312 0 ) ( 400 5312 16 ) ( 384 5440 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -44937,7 +44937,7 @@ trak6x/base-pitted1
 }
 {
 ( 256 6208 64 ) ( 256 6224 64 ) ( 384 6208 64 ) common/caulk 0 256 180 0.25 0.25 0 0 0
-( 256 6208 64 ) ( 384 6208 64 ) ( 256 6208 -256 ) trak6x/base-base1c 0 0 0 -0.25 0.25 0 0 0
+( 256 6208 64 ) ( 384 6208 64 ) ( 256 6208 -256 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( 384 6224 -320 ) ( 384 6224 0 ) ( 256 6224 -320 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 384 6224 -320 ) ( 384 6208 -320 ) ( 384 6224 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 256 6208 -64 ) ( 272 6224 -64 ) ( 256 6208 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -44945,7 +44945,7 @@ trak6x/base-pitted1
 }
 {
 ( 256 6216 64 ) ( 256 6328 64 ) ( 272 6216 64 ) common/caulk 0 256 180 0.25 0.25 0 0 0
-( 256 6208 0 ) ( 256 6208 -320 ) ( 256 6320 0 ) trak6x/base-base1c 0 0 0 -0.25 0.25 0 0 0
+( 256 6208 0 ) ( 256 6208 -320 ) ( 256 6320 0 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( 272 6336 -320 ) ( 272 6336 0 ) ( 256 6336 -320 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 272 6320 -320 ) ( 272 6208 -320 ) ( 272 6320 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 272 6224 -64 ) ( 256 6208 -64 ) ( 272 6224 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -44970,14 +44970,14 @@ trak6x/base-pitted1
 {
 ( 64 5816 64 ) ( 64 5824 64 ) ( 240 5816 64 ) common/caulk 0 256 180 0.25 0.25 0 0 0
 ( 64 5816 64 ) ( 240 5816 64 ) ( 64 5816 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 240 5824 -128 ) ( 240 5824 64 ) ( 64 5824 -128 ) trak6x/base-base1c 0 0 0 -0.25 0.25 0 0 0
+( 240 5824 -128 ) ( 240 5824 64 ) ( 64 5824 -128 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( 384 5824 -128 ) ( 384 5816 -128 ) ( 384 5824 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 72 5816 -64 ) ( 64 5824 -64 ) ( 72 5816 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 576 8640 0 ) ( 600 8640 0 ) ( 576 8768 0 ) common/caulk 0 256 180 0.25 0.25 0 0 0
 }
 {
 ( 128 6336 64 ) ( 128 6352 64 ) ( 256 6336 64 ) common/caulk 0 256 180 0.25 0.25 0 0 0
-( 128 6336 64 ) ( 256 6336 64 ) ( 128 6336 -320 ) trak6x/base-base1c 0 0 0 -0.25 0.25 0 0 0
+( 128 6336 64 ) ( 256 6336 64 ) ( 128 6336 -320 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( 128 6336 64 ) ( 128 6336 -320 ) ( 128 6352 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 256 6352 -320 ) ( 256 6352 64 ) ( 128 6352 -320 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 256 6352 -320 ) ( 256 6336 -320 ) ( 256 6352 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -45075,13 +45075,13 @@ trak6x/base-pitted1
 ( -392 6208 64 ) ( -392 6336 64 ) ( -384 6208 64 ) common/caulk 0 256 180 0.25 0.25 0 0 0
 ( -392 6208 64 ) ( -392 6208 -320 ) ( -392 6336 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -384 6336 -320 ) ( -384 6336 64 ) ( -392 6336 -320 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -384 6336 -320 ) ( -384 6208 -320 ) ( -384 6336 64 ) trak6x/base-base1c 0 0 0 -0.25 0.25 0 0 0
+( -384 6336 -320 ) ( -384 6208 -320 ) ( -384 6336 64 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( -384 6208 -64 ) ( -392 6216 -64 ) ( -384 6208 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 6336 0 ) ( -64 6344 0 ) ( -192 6336 0 ) common/caulk 0 256 180 0.25 0.25 0 0 0
 }
 {
 ( -512 6208 64 ) ( -512 6216 64 ) ( -384 6208 64 ) common/caulk 0 256 180 0.25 0.25 0 0 0
-( -512 6208 64 ) ( -384 6208 64 ) ( -512 6208 -320 ) trak6x/base-base1c 0 0 0 -0.25 0.25 0 0 0
+( -512 6208 64 ) ( -384 6208 64 ) ( -512 6208 -320 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( -512 6208 64 ) ( -512 6208 -320 ) ( -512 6216 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -384 6216 -320 ) ( -384 6216 64 ) ( -512 6216 -320 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -392 6216 -64 ) ( -384 6208 -64 ) ( -392 6216 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -45089,7 +45089,7 @@ trak6x/base-pitted1
 }
 {
 ( -384 6336 64 ) ( -384 6344 64 ) ( -256 6336 64 ) common/caulk 0 256 180 0.25 0.25 0 0 0
-( -384 6336 64 ) ( -256 6336 64 ) ( -384 6336 -320 ) trak6x/base-base1c 0 0 0 -0.25 0.25 0 0 0
+( -384 6336 64 ) ( -256 6336 64 ) ( -384 6336 -320 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( -384 6336 64 ) ( -384 6336 -320 ) ( -384 6344 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -256 6344 -320 ) ( -256 6344 64 ) ( -384 6344 -320 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -256 6344 -320 ) ( -256 6336 -320 ) ( -256 6344 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -45099,7 +45099,7 @@ trak6x/base-pitted1
 ( -384 5816 64 ) ( -384 5824 64 ) ( -192 5816 64 ) common/caulk 0 256 180 0.25 0.25 0 0 0
 ( -512 5816 64 ) ( -320 5816 64 ) ( -512 5816 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -512 5816 64 ) ( -512 5816 -128 ) ( -512 5824 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -192 5824 -128 ) ( -192 5824 64 ) ( -384 5824 -128 ) trak6x/base-base1c 0 0 0 -0.25 0.25 0 0 0
+( -192 5824 -128 ) ( -192 5824 64 ) ( -384 5824 -128 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( -192 5824 -64 ) ( -200 5816 -64 ) ( -192 5824 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 576 8640 0 ) ( 600 8640 0 ) ( 576 8768 0 ) common/caulk 0 256 180 0.25 0.25 0 0 0
 }
@@ -81276,7 +81276,7 @@ trak5x/light-light2a
 }
 {
 ( 400 5824 112 ) ( 416 5824 112 ) ( 400 5824 -272 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 384 6168 112 ) ( 384 6168 -272 ) ( 384 6208 112 ) trak6x/base-base1c 0 0 0 -0.25 0.25 0 0 0
+( 384 6168 112 ) ( 384 6168 -272 ) ( 384 6208 112 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( 400 6208 -272 ) ( 400 6208 112 ) ( 384 6208 -272 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 400 6208 -272 ) ( 400 6168 -272 ) ( 400 6208 112 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 384 8640 0 ) ( 400 8640 16 ) ( 384 8768 0 ) common/caulk 0 256 180 0.25 0.25 0 0 0
@@ -81315,7 +81315,7 @@ trak5x/light-light2a
 ( 192 8768 224 ) ( 200 8640 224 ) ( 192 8640 224 ) common/caulk 0 256 180 0.25 0.25 0 0 0
 }
 {
-( -96 6336 192 ) ( 128 6336 192 ) ( -96 6336 0 ) trak6x/base-base1c 0 256 0 -0.25 0.25 0 0 0
+( -96 6336 192 ) ( 128 6336 192 ) ( -96 6336 0 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( -256 6336 256 ) ( -256 6336 64 ) ( -256 6352 256 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( 128 6352 0 ) ( -96 6352 0 ) ( 128 6336 0 ) common/caulk 0 256 180 0.25 0.25 0 0 0
 ( 128 6352 64 ) ( 128 6352 256 ) ( -96 6352 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
@@ -81356,7 +81356,7 @@ trak5x/light-light2a
 }
 {
 ( -528 6208 112 ) ( -544 6208 112 ) ( -528 6208 -272 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -512 5864 112 ) ( -512 5864 -272 ) ( -512 5824 112 ) trak6x/base-base1c 0 0 0 -0.25 0.25 0 0 0
+( -512 5864 112 ) ( -512 5864 -272 ) ( -512 5824 112 ) trak5x/trim-vert1 0 0 90 0.25 0.25 0 0 0
 ( -528 5824 -272 ) ( -528 5824 112 ) ( -512 5824 -272 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -528 5824 -272 ) ( -528 5864 -272 ) ( -528 5824 112 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -512 3392 0 ) ( -528 3392 16 ) ( -512 3264 0 ) common/caulk 0 256 180 0.25 0.25 0 0 0
@@ -90302,7 +90302,7 @@ trak5x/light-light2a
 }
 {
 "classname" "light"
-"origin" "0.000000 4928.000000 -144.000000"
+"origin" "-64.000000 4928.000000 -144.000000"
 "light" "250"
 }
 {
@@ -94936,3 +94936,276 @@ common/trigger
 ( -1632 8160 -392 ) ( -1632 8328 -392 ) ( -1632 8160 -360 ) common/trigger 224 128 0 0.25 0.25 0 0 0
 }
 }
+{
+"classname" "info_location"
+"origin" "-64.000000 96.000000 40.000000"
+"netname" "Red Base"
+}
+{
+"classname" "info_location"
+"origin" "-64.000000 1280.000000 40.000000"
+"netname" "Red Main Hall"
+}
+{
+"classname" "info_location"
+"origin" "-1088.000000 768.000000 40.000000"
+"netname" "Red Main Hall"
+}
+{
+"classname" "info_location"
+"origin" "416.000000 1280.000000 40.000000"
+"netname" "Red Main Hall"
+}
+{
+"classname" "info_location"
+"origin" "448.000000 2304.000000 -272.000000"
+"netname" "Red Electro Crossing"
+}
+{
+"classname" "info_location"
+"origin" "896.000000 2688.000000 -272.000000"
+"netname" "Red Mega Health Corridor"
+}
+{
+"classname" "info_location"
+"origin" "896.000000 3392.000000 -272.000000"
+"netname" "Red Mega Health Corridor"
+}
+{
+"classname" "info_location"
+"origin" "1024.000000 1856.000000 -272.000000"
+"netname" "Red Electro Crossing"
+}
+{
+"classname" "info_location"
+"origin" "1728.000000 384.000000 -272.000000"
+"netname" "Red Nex Area"
+}
+{
+"classname" "info_location"
+"origin" "1216.000000 832.000000 -272.000000"
+"netname" "Red Nex Area"
+}
+{
+"classname" "info_location"
+"origin" "320.000000 384.000000 40.000000"
+"netname" "Red Main Hall"
+}
+{
+"classname" "info_location"
+"origin" "896.000000 -448.000000 -272.000000"
+"netname" "Red Nex Area"
+}
+{
+"classname" "info_location"
+"origin" "-896.000000 -384.000000 -272.000000"
+"netname" "Red Armour Room"
+}
+{
+"classname" "info_location"
+"origin" "-2240.000000 -384.000000 -272.000000"
+"netname" "Red Armour Room"
+}
+{
+"classname" "info_location"
+"origin" "-2048.000000 1536.000000 -272.000000"
+"netname" "Red Hallway To Armour"
+}
+{
+"classname" "info_location"
+"origin" "-1408.000000 2304.000000 -144.000000"
+"netname" "Red Hallway To Armour"
+}
+{
+"classname" "info_location"
+"origin" "-1024.000000 3264.000000 -144.000000"
+"netname" "Central Hall"
+}
+{
+"classname" "info_location"
+"origin" "-776.000000 3904.000000 -144.000000"
+"netname" "Central Hall"
+}
+{
+"classname" "info_location"
+"origin" "640.000000 3904.000000 -144.000000"
+"netname" "Central Hall"
+}
+{
+"classname" "info_location"
+"origin" "896.000000 3392.000000 -144.000000"
+"netname" "Central Hall"
+}
+{
+"classname" "info_location"
+"origin" "912.000000 2688.000000 -144.000000"
+"netname" "Central Hall"
+}
+{
+"classname" "info_location"
+"origin" "-64.000000 2560.000000 -232.000000"
+"netname" "Red Main Entrance"
+}
+{
+"classname" "info_location"
+"origin" "-64.000000 1872.000000 -232.000000"
+"netname" "Red Main Entrance"
+}
+{
+"classname" "info_location"
+"origin" "-64.000000 8608.000000 40.000000"
+"netname" "Blue Base"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-64.000000 7424.000000 40.000000"
+"netname" "Blue Main Hall"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "960.000000 7936.000000 40.000000"
+"netname" "Blue Main Hall"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-544.000000 7424.000000 40.000000"
+"netname" "Blue Main Hall"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-576.000000 6400.000000 -272.000000"
+"netname" "Blue Electro Crossing"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-1024.000000 6016.000000 -272.000000"
+"netname" "Blue Mega Health Corridor"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-1024.000000 5312.000000 -272.000000"
+"netname" "Blue Mega Health Corridor"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-1152.000000 6848.000000 -272.000000"
+"netname" "Blue Electro Crossing"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-1856.000000 8320.000000 -272.000000"
+"netname" "Blue Nex Area"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-1344.000000 7872.000000 -272.000000"
+"netname" "Blue Nex Area"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-448.000000 8320.000000 40.000000"
+"netname" "Blue Main Hall"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-1024.000000 9152.000000 -272.000000"
+"netname" "Blue Nex Area"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "768.000000 9088.000000 -272.000000"
+"netname" "Blue Armour Room"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "2112.000000 9088.000000 -272.000000"
+"netname" "Blue Armour Room"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "1920.000000 7168.000000 -272.000000"
+"netname" "Blue Hallway To Armour"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "1280.000000 6400.000000 -144.000000"
+"netname" "Blue Hallway To Armour"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "896.000000 5440.000000 -144.000000"
+"netname" "Central Hall"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "648.000000 4800.000000 -144.000000"
+"netname" "Central Hall"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-768.000000 4800.000000 -144.000000"
+"netname" "Central Hall"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-1024.000000 5312.000000 -144.000000"
+"netname" "Central Hall"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-1040.000000 6016.000000 -144.000000"
+"netname" "Central Hall"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-64.000000 6144.000000 -232.000000"
+"netname" "Red Main Entrance"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-64.000000 6832.000000 -232.000000"
+"netname" "Red Main Entrance"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-64.000000 3264.000000 64.000000"
+"netname" "Red Rocket Hideout"
+}
+{
+"classname" "info_location"
+"origin" "-64.000000 5440.000000 64.000000"
+"netname" "Blue Rocket Hideout"
+}
+{
+"classname" "info_location"
+"origin" "-64.000000 3824.000000 -144.000000"
+"netname" "Central Hall"
+}
+{
+"classname" "info_location"
+"origin" "-64.000000 4880.000000 -144.000000"
+"netname" "Central Hall"
+}

diff --git a/maps/apace.map.options b/maps/apace.map.options
index d5fbdab0fad9d2909c3ce52c856b0793b1022d46..09662c4088bd4d518d5201a691adf60cc1f9c271 100644 (file)
--- a/maps/apace.map.options
+++ b/maps/apace.map.options
@@ -2,4 +2,4 @@
 -light +
 -vis +
 -minimap +
-Version: 2
+Version: 3

diff --git a/maps/apace.mapinfo b/maps/apace.mapinfo
index 3c97035c18c54e8dd7d1208f75eed517f87208c1..ddfef4d4c2f31f79cbc89d77d764078a3cb041ab 100644 (file)
--- a/maps/apace.mapinfo
+++ b/maps/apace.mapinfo
@@ -2,4 +2,5 @@ title Apace
 description CTF arena inside of a large spacebase.
 author kuniu the frogg
 has weapons
-gametype ctf 300 20 10
+cdtrack 12
+gametype ctf