fix my shader messup, sorry

diff --git a/maps/lsp.map b/maps/lsp.map
index 2788dd10860ccd73b8a20ca40041e3aab5a40757..e042d1f211ae77e7ff90ff7477f1a57c0778e310 100644 (file)
--- a/maps/lsp.map
+++ b/maps/lsp.map
@@ -390,9 +390,9 @@
 ( -648 3608 32 ) ( -456 3608 32 ) ( -456 3640 32 ) trak5x/floor-tile4b 288 32 0 0.25 -0.25 0 0 0
 ( -456 3640 48 ) ( -456 3608 48 ) ( -648 3608 48 ) trak5x/floor-tile4b 256 256 0 0.25 -0.25 0 0 0
 ( -456 3608 160 ) ( -648 3608 160 ) ( -648 3608 0 ) trak5x/floor-tile4b 400 0 0 0.5 0.5 0 0 0
-( -520 3600 160 ) ( -328 3600 160 ) ( -328 3600 0 ) trak5x/light/light_light3a 0 -0 -90 0.125 0.125 0 0 0
+( -520 3600 160 ) ( -328 3600 160 ) ( -328 3600 0 ) trak5x/light-light3a-surfacelight 0 -0 -90 0.125 0.125 0 0 0
 ( -616 3600 64 ) ( -616 3608 -64 ) ( -616 3600 -64 ) trak5x/light-light1b 0 0 0 0.25 0.25 0 0 0
-( -624 3608 64 ) ( -624 3600 -64 ) ( -624 3608 -64 ) trak5x/light/light_light3a 0 0 0 0.25 0.25 0 0 0
+( -624 3608 64 ) ( -624 3600 -64 ) ( -624 3608 -64 ) trak5x/light-light3a-surfacelight 0 0 0 0.25 0.25 0 0 0
 }
 // brush 44
 {
@@ -725,7 +725,7 @@
 }
 // brush 77
 {
-( 112 4056 360 ) ( -48 4056 376 ) ( -48 4056 360 ) trak5x/light/light_light3a 0 0 90 0.125 0.125 0 0 0
+( 112 4056 360 ) ( -48 4056 376 ) ( -48 4056 360 ) trak5x/light-light3a-surfacelight 0 0 90 0.125 0.125 0 0 0
 ( 96 4040 368 ) ( -48 4056 368 ) ( 112 4056 368 ) trak5x/floor-floor2c 0 481 0 -0.25 0.25 0 0 0
 ( 112 4056 352 ) ( -48 4056 352 ) ( 96 4040 352 ) trak5x/floor-floor2c 0 0 0 -0.25 0.25 0 0 0
 ( -48 4056 368 ) ( -32 4040 352 ) ( -48 4056 352 ) trak5x/floor-floor2c 0 32 0 -0.25 0.25 0 0 0
@@ -1539,8 +1539,8 @@
 ( 128 4256 320 ) ( 128 4032 320 ) ( -64 4032 320 ) trak5x/trim-trim6b 128 0 0 0.125 0.125 0 0 0
 ( -80 4032 304 ) ( 112 4032 304 ) ( 112 4256 304 ) trak5x/trim-trim6b 64 128 180 0.25 0.25 0 0 0
 ( -112 4166 0 ) ( -112 4166 320 ) ( -112 4352 320 ) trak5x/trim-trim6b -128 0 -180 0.5 -0.5 0 0 0
-( -112 4120 -64 ) ( -120 4128 -64 ) ( -112 4120 64 ) trak5x/light/light_light3a 96 0 0 0.25 0.25 0 0 0
-( -112 4128 -64 ) ( -120 4128 -64 ) ( -112 4128 64 ) trak5x/light/light_light3a 0 0 0 0.25 0.25 0 0 0
+( -112 4120 -64 ) ( -120 4128 -64 ) ( -112 4120 64 ) trak5x/light-light3a-surfacelight 96 0 0 0.25 0.25 0 0 0
+( -112 4128 -64 ) ( -120 4128 -64 ) ( -112 4128 64 ) trak5x/light-light3a-surfacelight 0 0 0 0.25 0.25 0 0 0
 }
 // brush 166
 {
@@ -2525,21 +2525,21 @@
 }
 // brush 272
 {
-( -232 3968 408 ) ( -216 3968 408 ) ( -216 3880 408 ) trak5x/trim/trim_basictrim1a -0 128 180 0.25 0.25 0 0 0
-( -232 3784 384 ) ( -232 3816 384 ) ( -232 3784 512 ) trak5x/trim/trim_basictrim1a -0 0 0 -0.5 0.5 0 0 0
-( -216 3800 384 ) ( -216 3776 384 ) ( -216 3776 512 ) trak5x/trim/trim_basictrim1a -0 0 0 -0.5 0.5 0 0 0
-( -280 3880 384 ) ( -304 3880 384 ) ( -304 3880 512 ) trak5x/trim/trim_basictrim1a -0 0 0 -0.5 0.5 0 0 0
-( -216 3968 408 ) ( -232 3968 408 ) ( -232 3976 384 ) trak5x/trim/trim_basictrim1a 63 0 0 -0.25 0.25 0 0 0
-( -316 3776 384 ) ( -124 3776 384 ) ( -124 3968 384 ) trak5x/trim/trim_basictrim1a -0 128 180 0.25 0.25 0 0 0
+( -232 3968 408 ) ( -216 3968 408 ) ( -216 3880 408 ) trak5x/trim-basictrim1a -0 128 180 0.25 0.25 0 0 0
+( -232 3784 384 ) ( -232 3816 384 ) ( -232 3784 512 ) trak5x/trim-basictrim1a -0 0 0 -0.5 0.5 0 0 0
+( -216 3800 384 ) ( -216 3776 384 ) ( -216 3776 512 ) trak5x/trim-basictrim1a -0 0 0 -0.5 0.5 0 0 0
+( -280 3880 384 ) ( -304 3880 384 ) ( -304 3880 512 ) trak5x/trim-basictrim1a -0 0 0 -0.5 0.5 0 0 0
+( -216 3968 408 ) ( -232 3968 408 ) ( -232 3976 384 ) trak5x/trim-basictrim1a 63 0 0 -0.25 0.25 0 0 0
+( -316 3776 384 ) ( -124 3776 384 ) ( -124 3968 384 ) trak5x/trim-basictrim1a -0 128 180 0.25 0.25 0 0 0
 }
 // brush 273
 {
-( -320 3864 408 ) ( -320 3880 408 ) ( -128 3880 408 ) trak5x/trim/trim_basictrim1a -0 128 180 0.25 0.25 0 0 0
-( -304 3880 384 ) ( -280 3880 384 ) ( -304 3880 512 ) trak5x/trim/trim_basictrim1a -0 0 0 -0.5 0.5 0 0 0
-( -296 3864 384 ) ( -312 3864 384 ) ( -296 3864 512 ) trak5x/trim/trim_basictrim1a -0 0 0 -0.5 0.5 0 0 0
-( -128 3864 408 ) ( -128 3880 408 ) ( -120 3880 384 ) trak5x/trim/trim_basictrim1a 63 0 0 -0.25 0.25 0 0 0
-( -320 3880 408 ) ( -320 3864 408 ) ( -328 3864 384 ) trak5x/trim/trim_basictrim1a 63 0 0 -0.25 0.25 0 0 0
-( -316 3776 384 ) ( -124 3776 384 ) ( -124 3968 384 ) trak5x/trim/trim_basictrim1a -0 128 180 0.25 0.25 0 0 0
+( -320 3864 408 ) ( -320 3880 408 ) ( -128 3880 408 ) trak5x/trim-basictrim1a -0 128 180 0.25 0.25 0 0 0
+( -304 3880 384 ) ( -280 3880 384 ) ( -304 3880 512 ) trak5x/trim-basictrim1a -0 0 0 -0.5 0.5 0 0 0
+( -296 3864 384 ) ( -312 3864 384 ) ( -296 3864 512 ) trak5x/trim-basictrim1a -0 0 0 -0.5 0.5 0 0 0
+( -128 3864 408 ) ( -128 3880 408 ) ( -120 3880 384 ) trak5x/trim-basictrim1a 63 0 0 -0.25 0.25 0 0 0
+( -320 3880 408 ) ( -320 3864 408 ) ( -328 3864 384 ) trak5x/trim-basictrim1a 63 0 0 -0.25 0.25 0 0 0
+( -316 3776 384 ) ( -124 3776 384 ) ( -124 3968 384 ) trak5x/trim-basictrim1a -0 128 180 0.25 0.25 0 0 0
 }
 // brush 274
 {
@@ -2552,12 +2552,12 @@
 }
 // brush 275
 {
-( -216 3952 424 ) ( -232 3952 424 ) ( -232 3880 424 ) trak5x/trim/trim_basictrim1a -0 128 180 0.25 0.25 0 0 0
-( -232 3784 392 ) ( -232 3816 392 ) ( -232 3784 520 ) trak5x/trim/trim_basictrim1a 0 16 0 -0.5 0.5 0 0 0
-( -216 3800 392 ) ( -216 3776 392 ) ( -216 3776 520 ) trak5x/trim/trim_basictrim1a 0 16 0 -0.5 0.5 0 0 0
-( -280 3880 384 ) ( -304 3880 384 ) ( -304 3880 512 ) trak5x/trim/trim_basictrim1a -0 0 0 -0.5 0.5 0 0 0
-( -124 3872 520 ) ( -124 3808 520 ) ( -316 3872 520 ) trak5x/trim/trim_basictrim1a 64 0 0 -0.25 0.25 0 0 0
-( -232 3952 424 ) ( -216 3952 424 ) ( -216 3976 512 ) trak5x/trim/trim_basictrim1a 63 0 0 -0.25 0.25 0 0 0
+( -216 3952 424 ) ( -232 3952 424 ) ( -232 3880 424 ) trak5x/trim-basictrim1a -0 128 180 0.25 0.25 0 0 0
+( -232 3784 392 ) ( -232 3816 392 ) ( -232 3784 520 ) trak5x/trim-basictrim1a 0 16 0 -0.5 0.5 0 0 0
+( -216 3800 392 ) ( -216 3776 392 ) ( -216 3776 520 ) trak5x/trim-basictrim1a 0 16 0 -0.5 0.5 0 0 0
+( -280 3880 384 ) ( -304 3880 384 ) ( -304 3880 512 ) trak5x/trim-basictrim1a -0 0 0 -0.5 0.5 0 0 0
+( -124 3872 520 ) ( -124 3808 520 ) ( -316 3872 520 ) trak5x/trim-basictrim1a 64 0 0 -0.25 0.25 0 0 0
+( -232 3952 424 ) ( -216 3952 424 ) ( -216 3976 512 ) trak5x/trim-basictrim1a 63 0 0 -0.25 0.25 0 0 0
 }
 // brush 276
 {
@@ -2570,21 +2570,21 @@
 }
 // brush 277
 {
-( -304 3880 424 ) ( -304 3864 424 ) ( -144 3864 424 ) trak5x/trim/trim_basictrim1a -0 128 180 0.25 0.25 0 0 0
-( -304 3880 384 ) ( -280 3880 384 ) ( -304 3880 512 ) trak5x/trim/trim_basictrim1a -0 0 0 -0.5 0.5 0 0 0
-( -296 3864 384 ) ( -312 3864 384 ) ( -296 3864 512 ) trak5x/trim/trim_basictrim1a -0 0 0 -0.5 0.5 0 0 0
-( -124 3872 520 ) ( -124 3808 520 ) ( -316 3872 520 ) trak5x/trim/trim_basictrim1a 64 0 0 -0.25 0.25 0 0 0
-( -144 3880 424 ) ( -144 3864 424 ) ( -120 3864 512 ) trak5x/trim/trim_basictrim1a 63 0 0 -0.25 0.25 0 0 0
-( -304 3864 424 ) ( -304 3880 424 ) ( -328 3880 512 ) trak5x/trim/trim_basictrim1a 63 0 0 -0.25 0.25 0 0 0
+( -304 3880 424 ) ( -304 3864 424 ) ( -144 3864 424 ) trak5x/trim-basictrim1a -0 128 180 0.25 0.25 0 0 0
+( -304 3880 384 ) ( -280 3880 384 ) ( -304 3880 512 ) trak5x/trim-basictrim1a -0 0 0 -0.5 0.5 0 0 0
+( -296 3864 384 ) ( -312 3864 384 ) ( -296 3864 512 ) trak5x/trim-basictrim1a -0 0 0 -0.5 0.5 0 0 0
+( -124 3872 520 ) ( -124 3808 520 ) ( -316 3872 520 ) trak5x/trim-basictrim1a 64 0 0 -0.25 0.25 0 0 0
+( -144 3880 424 ) ( -144 3864 424 ) ( -120 3864 512 ) trak5x/trim-basictrim1a 63 0 0 -0.25 0.25 0 0 0
+( -304 3864 424 ) ( -304 3880 424 ) ( -328 3880 512 ) trak5x/trim-basictrim1a 63 0 0 -0.25 0.25 0 0 0
 }
 // brush 278
 {
-( -132 3968 384 ) ( -324 3968 384 ) ( -324 3776 384 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
-( -232 3776 408 ) ( -216 3776 408 ) ( -216 3768 384 ) trak5x/trim/trim_basictrim1a 63 0 0 -0.25 0.25 0 0 0
-( -168 3864 384 ) ( -144 3864 384 ) ( -144 3864 512 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
-( -232 3944 384 ) ( -232 3968 384 ) ( -232 3968 512 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
-( -216 3960 384 ) ( -216 3928 384 ) ( -216 3960 512 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
-( -216 3776 408 ) ( -232 3776 408 ) ( -232 3864 408 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
+( -132 3968 384 ) ( -324 3968 384 ) ( -324 3776 384 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
+( -232 3776 408 ) ( -216 3776 408 ) ( -216 3768 384 ) trak5x/trim-basictrim1a 63 0 0 -0.25 0.25 0 0 0
+( -168 3864 384 ) ( -144 3864 384 ) ( -144 3864 512 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
+( -232 3944 384 ) ( -232 3968 384 ) ( -232 3968 512 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
+( -216 3960 384 ) ( -216 3928 384 ) ( -216 3960 512 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
+( -216 3776 408 ) ( -232 3776 408 ) ( -232 3864 408 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
 }
 // brush 279
 {
@@ -2597,12 +2597,12 @@
 }
 // brush 280
 {
-( -216 3792 424 ) ( -232 3792 424 ) ( -232 3768 512 ) trak5x/trim/trim_basictrim1a 63 0 0 -0.25 0.25 0 0 0
-( -324 3872 520 ) ( -324 3936 520 ) ( -132 3872 520 ) trak5x/trim/trim_basictrim1a 64 0 0 -0.25 0.25 0 0 0
-( -168 3864 384 ) ( -144 3864 384 ) ( -144 3864 512 ) trak5x/trim/trim_basictrim1a 64 0 0 -0.25 0.25 0 0 0
-( -232 3944 392 ) ( -232 3968 392 ) ( -232 3968 520 ) trak5x/trim/trim_basictrim1a 64 0 0 -0.25 0.25 0 0 0
-( -216 3960 392 ) ( -216 3928 392 ) ( -216 3960 520 ) trak5x/trim/trim_basictrim1a 64 0 0 -0.25 0.25 0 0 0
-( -232 3792 424 ) ( -216 3792 424 ) ( -216 3864 424 ) trak5x/trim/trim_basictrim1a 64 0 0 -0.25 0.25 0 0 0
+( -216 3792 424 ) ( -232 3792 424 ) ( -232 3768 512 ) trak5x/trim-basictrim1a 63 0 0 -0.25 0.25 0 0 0
+( -324 3872 520 ) ( -324 3936 520 ) ( -132 3872 520 ) trak5x/trim-basictrim1a 64 0 0 -0.25 0.25 0 0 0
+( -168 3864 384 ) ( -144 3864 384 ) ( -144 3864 512 ) trak5x/trim-basictrim1a 64 0 0 -0.25 0.25 0 0 0
+( -232 3944 392 ) ( -232 3968 392 ) ( -232 3968 520 ) trak5x/trim-basictrim1a 64 0 0 -0.25 0.25 0 0 0
+( -216 3960 392 ) ( -216 3928 392 ) ( -216 3960 520 ) trak5x/trim-basictrim1a 64 0 0 -0.25 0.25 0 0 0
+( -232 3792 424 ) ( -216 3792 424 ) ( -216 3864 424 ) trak5x/trim-basictrim1a 64 0 0 -0.25 0.25 0 0 0
 }
 // brush 281
 {
@@ -29583,7 +29583,7 @@ evil8_wall/e8_mtlwall4
 ( -704 4608 1280 ) ( -544 4608 1280 ) ( -544 4608 1072 ) trak5x/floor-tile3b 8192 0 0 0.25 0.25 0 0 0
 ( -64 -64 1024 ) ( -56 64 1024 ) ( -64 64 1024 ) trak5x/floor-tile5b 0 0 0 0.25 0.25 0 0 0
 ( 960 4704 1088 ) ( 960 4720 1088 ) ( 960 4720 880 ) trak5x/floor-tile3b 0 0 0 0.25 0.25 0 0 0
-( -64 64 1024 ) ( -64 64 1032 ) ( -64 -64 1024 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
+( -64 64 1024 ) ( -64 64 1032 ) ( -64 -64 1024 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3301
 {
@@ -29627,21 +29627,21 @@ evil8_wall/e8_mtlwall4
 }
 // brush 3305
 {
-( 280 3968 408 ) ( 296 3968 408 ) ( 296 3880 408 ) trak5x/trim/trim_basictrim1a 128 128 -180 0.25 0.25 0 0 0
-( 280 3784 384 ) ( 280 3816 384 ) ( 280 3784 512 ) trak5x/trim/trim_basictrim1a -128 0 -180 0.5 -0.5 0 0 0
-( 296 3800 384 ) ( 296 3776 384 ) ( 296 3776 512 ) trak5x/trim/trim_basictrim1a -128 0 -180 0.5 -0.5 0 0 0
-( 232 3880 384 ) ( 208 3880 384 ) ( 208 3880 512 ) trak5x/trim/trim_basictrim1a 128 0 -180 0.5 -0.5 0 0 0
-( 296 3968 408 ) ( 280 3968 408 ) ( 280 3976 384 ) trak5x/trim/trim_basictrim1a 63 0 -180 0.25 -0.25 0 0 0
-( 196 3776 384 ) ( 388 3776 384 ) ( 388 3968 384 ) trak5x/trim/trim_basictrim1a 128 128 -180 0.25 0.25 0 0 0
+( 280 3968 408 ) ( 296 3968 408 ) ( 296 3880 408 ) trak5x/trim-basictrim1a 128 128 -180 0.25 0.25 0 0 0
+( 280 3784 384 ) ( 280 3816 384 ) ( 280 3784 512 ) trak5x/trim-basictrim1a -128 0 -180 0.5 -0.5 0 0 0
+( 296 3800 384 ) ( 296 3776 384 ) ( 296 3776 512 ) trak5x/trim-basictrim1a -128 0 -180 0.5 -0.5 0 0 0
+( 232 3880 384 ) ( 208 3880 384 ) ( 208 3880 512 ) trak5x/trim-basictrim1a 128 0 -180 0.5 -0.5 0 0 0
+( 296 3968 408 ) ( 280 3968 408 ) ( 280 3976 384 ) trak5x/trim-basictrim1a 63 0 -180 0.25 -0.25 0 0 0
+( 196 3776 384 ) ( 388 3776 384 ) ( 388 3968 384 ) trak5x/trim-basictrim1a 128 128 -180 0.25 0.25 0 0 0
 }
 // brush 3306
 {
-( 192 3864 408 ) ( 192 3880 408 ) ( 384 3880 408 ) trak5x/trim/trim_basictrim1a 128 128 -180 0.25 0.25 0 0 0
-( 208 3880 384 ) ( 232 3880 384 ) ( 208 3880 512 ) trak5x/trim/trim_basictrim1a 128 0 -180 0.5 -0.5 0 0 0
-( 216 3864 384 ) ( 200 3864 384 ) ( 216 3864 512 ) trak5x/trim/trim_basictrim1a 128 0 -180 0.5 -0.5 0 0 0
-( 384 3864 408 ) ( 384 3880 408 ) ( 392 3880 384 ) trak5x/trim/trim_basictrim1a 63 0 -180 0.25 -0.25 0 0 0
-( 192 3880 408 ) ( 192 3864 408 ) ( 184 3864 384 ) trak5x/trim/trim_basictrim1a 63 0 -180 0.25 -0.25 0 0 0
-( 196 3776 384 ) ( 388 3776 384 ) ( 388 3968 384 ) trak5x/trim/trim_basictrim1a 128 128 -180 0.25 0.25 0 0 0
+( 192 3864 408 ) ( 192 3880 408 ) ( 384 3880 408 ) trak5x/trim-basictrim1a 128 128 -180 0.25 0.25 0 0 0
+( 208 3880 384 ) ( 232 3880 384 ) ( 208 3880 512 ) trak5x/trim-basictrim1a 128 0 -180 0.5 -0.5 0 0 0
+( 216 3864 384 ) ( 200 3864 384 ) ( 216 3864 512 ) trak5x/trim-basictrim1a 128 0 -180 0.5 -0.5 0 0 0
+( 384 3864 408 ) ( 384 3880 408 ) ( 392 3880 384 ) trak5x/trim-basictrim1a 63 0 -180 0.25 -0.25 0 0 0
+( 192 3880 408 ) ( 192 3864 408 ) ( 184 3864 384 ) trak5x/trim-basictrim1a 63 0 -180 0.25 -0.25 0 0 0
+( 196 3776 384 ) ( 388 3776 384 ) ( 388 3968 384 ) trak5x/trim-basictrim1a 128 128 -180 0.25 0.25 0 0 0
 }
 // brush 3307
 {
@@ -29654,12 +29654,12 @@ evil8_wall/e8_mtlwall4
 }
 // brush 3308
 {
-( 296 3952 424 ) ( 280 3952 424 ) ( 280 3880 424 ) trak5x/trim/trim_basictrim1a 128 128 -180 0.25 0.25 0 0 0
-( 280 3784 392 ) ( 280 3816 392 ) ( 280 3784 520 ) trak5x/trim/trim_basictrim1a 0 16 0 -0.5 0.5 0 0 0
-( 296 3800 392 ) ( 296 3776 392 ) ( 296 3776 520 ) trak5x/trim/trim_basictrim1a 0 16 0 -0.5 0.5 0 0 0
-( 232 3880 384 ) ( 208 3880 384 ) ( 208 3880 512 ) trak5x/trim/trim_basictrim1a 128 0 -180 0.5 -0.5 0 0 0
-( 388 3872 520 ) ( 388 3808 520 ) ( 196 3872 520 ) trak5x/trim/trim_basictrim1a 64 0 -180 0.25 -0.25 0 0 0
-( 280 3952 424 ) ( 296 3952 424 ) ( 296 3976 512 ) trak5x/trim/trim_basictrim1a 63 0 -180 0.25 -0.25 0 0 0
+( 296 3952 424 ) ( 280 3952 424 ) ( 280 3880 424 ) trak5x/trim-basictrim1a 128 128 -180 0.25 0.25 0 0 0
+( 280 3784 392 ) ( 280 3816 392 ) ( 280 3784 520 ) trak5x/trim-basictrim1a 0 16 0 -0.5 0.5 0 0 0
+( 296 3800 392 ) ( 296 3776 392 ) ( 296 3776 520 ) trak5x/trim-basictrim1a 0 16 0 -0.5 0.5 0 0 0
+( 232 3880 384 ) ( 208 3880 384 ) ( 208 3880 512 ) trak5x/trim-basictrim1a 128 0 -180 0.5 -0.5 0 0 0
+( 388 3872 520 ) ( 388 3808 520 ) ( 196 3872 520 ) trak5x/trim-basictrim1a 64 0 -180 0.25 -0.25 0 0 0
+( 280 3952 424 ) ( 296 3952 424 ) ( 296 3976 512 ) trak5x/trim-basictrim1a 63 0 -180 0.25 -0.25 0 0 0
 }
 // brush 3309
 {
@@ -29672,21 +29672,21 @@ evil8_wall/e8_mtlwall4
 }
 // brush 3310
 {
-( 208 3880 424 ) ( 208 3864 424 ) ( 368 3864 424 ) trak5x/trim/trim_basictrim1a 128 128 -180 0.25 0.25 0 0 0
-( 208 3880 384 ) ( 232 3880 384 ) ( 208 3880 512 ) trak5x/trim/trim_basictrim1a 128 0 -180 0.5 -0.5 0 0 0
-( 216 3864 384 ) ( 200 3864 384 ) ( 216 3864 512 ) trak5x/trim/trim_basictrim1a 128 0 -180 0.5 -0.5 0 0 0
-( 388 3872 520 ) ( 388 3808 520 ) ( 196 3872 520 ) trak5x/trim/trim_basictrim1a 64 0 -180 0.25 -0.25 0 0 0
-( 368 3880 424 ) ( 368 3864 424 ) ( 392 3864 512 ) trak5x/trim/trim_basictrim1a 63 0 -180 0.25 -0.25 0 0 0
-( 208 3864 424 ) ( 208 3880 424 ) ( 184 3880 512 ) trak5x/trim/trim_basictrim1a 63 0 -180 0.25 -0.25 0 0 0
+( 208 3880 424 ) ( 208 3864 424 ) ( 368 3864 424 ) trak5x/trim-basictrim1a 128 128 -180 0.25 0.25 0 0 0
+( 208 3880 384 ) ( 232 3880 384 ) ( 208 3880 512 ) trak5x/trim-basictrim1a 128 0 -180 0.5 -0.5 0 0 0
+( 216 3864 384 ) ( 200 3864 384 ) ( 216 3864 512 ) trak5x/trim-basictrim1a 128 0 -180 0.5 -0.5 0 0 0
+( 388 3872 520 ) ( 388 3808 520 ) ( 196 3872 520 ) trak5x/trim-basictrim1a 64 0 -180 0.25 -0.25 0 0 0
+( 368 3880 424 ) ( 368 3864 424 ) ( 392 3864 512 ) trak5x/trim-basictrim1a 63 0 -180 0.25 -0.25 0 0 0
+( 208 3864 424 ) ( 208 3880 424 ) ( 184 3880 512 ) trak5x/trim-basictrim1a 63 0 -180 0.25 -0.25 0 0 0
 }
 // brush 3311
 {
-( 380 3968 384 ) ( 188 3968 384 ) ( 188 3776 384 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
-( 280 3776 408 ) ( 296 3776 408 ) ( 296 3768 384 ) trak5x/trim/trim_basictrim1a 63 0 -180 0.25 -0.25 0 0 0
-( 344 3864 384 ) ( 368 3864 384 ) ( 368 3864 512 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
-( 280 3944 384 ) ( 280 3968 384 ) ( 280 3968 512 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
-( 296 3960 384 ) ( 296 3928 384 ) ( 296 3960 512 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
-( 296 3776 408 ) ( 280 3776 408 ) ( 280 3864 408 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
+( 380 3968 384 ) ( 188 3968 384 ) ( 188 3776 384 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
+( 280 3776 408 ) ( 296 3776 408 ) ( 296 3768 384 ) trak5x/trim-basictrim1a 63 0 -180 0.25 -0.25 0 0 0
+( 344 3864 384 ) ( 368 3864 384 ) ( 368 3864 512 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
+( 280 3944 384 ) ( 280 3968 384 ) ( 280 3968 512 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
+( 296 3960 384 ) ( 296 3928 384 ) ( 296 3960 512 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
+( 296 3776 408 ) ( 280 3776 408 ) ( 280 3864 408 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3312
 {
@@ -29699,12 +29699,12 @@ evil8_wall/e8_mtlwall4
 }
 // brush 3313
 {
-( 296 3792 424 ) ( 280 3792 424 ) ( 280 3768 512 ) trak5x/trim/trim_basictrim1a 63 0 -180 0.25 -0.25 0 0 0
-( 188 3872 520 ) ( 188 3936 520 ) ( 380 3872 520 ) trak5x/trim/trim_basictrim1a 64 0 -180 0.25 -0.25 0 0 0
-( 344 3864 384 ) ( 368 3864 384 ) ( 368 3864 512 ) trak5x/trim/trim_basictrim1a 64 0 -180 0.25 -0.25 0 0 0
-( 280 3944 392 ) ( 280 3968 392 ) ( 280 3968 520 ) trak5x/trim/trim_basictrim1a 64 0 -180 0.25 -0.25 0 0 0
-( 296 3960 392 ) ( 296 3928 392 ) ( 296 3960 520 ) trak5x/trim/trim_basictrim1a 64 0 -180 0.25 -0.25 0 0 0
-( 280 3792 424 ) ( 296 3792 424 ) ( 296 3864 424 ) trak5x/trim/trim_basictrim1a 64 0 -180 0.25 -0.25 0 0 0
+( 296 3792 424 ) ( 280 3792 424 ) ( 280 3768 512 ) trak5x/trim-basictrim1a 63 0 -180 0.25 -0.25 0 0 0
+( 188 3872 520 ) ( 188 3936 520 ) ( 380 3872 520 ) trak5x/trim-basictrim1a 64 0 -180 0.25 -0.25 0 0 0
+( 344 3864 384 ) ( 368 3864 384 ) ( 368 3864 512 ) trak5x/trim-basictrim1a 64 0 -180 0.25 -0.25 0 0 0
+( 280 3944 392 ) ( 280 3968 392 ) ( 280 3968 520 ) trak5x/trim-basictrim1a 64 0 -180 0.25 -0.25 0 0 0
+( 296 3960 392 ) ( 296 3928 392 ) ( 296 3960 520 ) trak5x/trim-basictrim1a 64 0 -180 0.25 -0.25 0 0 0
+( 280 3792 424 ) ( 296 3792 424 ) ( 296 3864 424 ) trak5x/trim-basictrim1a 64 0 -180 0.25 -0.25 0 0 0
 }
 // brush 3314
 {
@@ -30208,7 +30208,7 @@ evil8_wall/e8_mtlwall4
 }
 // brush 3367
 {
-( 112 4056 360 ) ( -48 4056 376 ) ( -48 4056 360 ) trak5x/light/light_light3a 0 0 90 0.125 0.125 0 0 0
+( 112 4056 360 ) ( -48 4056 376 ) ( -48 4056 360 ) trak5x/light-light3a-surfacelight 0 0 90 0.125 0.125 0 0 0
 ( 96 4040 368 ) ( -48 4056 368 ) ( 112 4056 368 ) trak5x/floor-floor2c 0 481 0 -0.25 0.25 0 0 0
 ( 112 4056 352 ) ( -48 4056 352 ) ( 96 4040 352 ) trak5x/floor-floor2c 0 0 0 -0.25 0.25 0 0 0
 ( 112 4056 352 ) ( 96 4040 368 ) ( 112 4056 368 ) trak5x/floor-floor2c 0 32 0 -0.25 0.25 0 0 0
@@ -30217,19 +30217,19 @@ evil8_wall/e8_mtlwall4
 }
 // brush 3368
 {
-( -80 4088 352 ) ( 144 4088 336 ) ( 144 4088 352 ) trak5x/light/light_light3a 0 0 90 0.125 0.125 0 0 0
+( -80 4088 352 ) ( 144 4088 336 ) ( 144 4088 352 ) trak5x/light-light3a-surfacelight 0 0 90 0.125 0.125 0 0 0
 ( -80 4088 352 ) ( 144 4088 352 ) ( -48 4056 352 ) trak5x/floor-floor2c 0 478 -180 0.25 -0.25 0 0 0
 ( -80 4088 336 ) ( 112 4056 336 ) ( 144 4088 336 ) trak5x/floor-floor2c 0 0 0 -0.25 0.25 0 0 0
 ( -48 4056 352 ) ( -80 4088 336 ) ( -80 4088 352 ) trak5x/floor-floor2c 0 0 -180 0.25 -0.25 0 0 0
-( -64 4088 -64 ) ( -64 4080 -64 ) ( -64 4088 64 ) trak5x/light/light_light3a 0 0 0 0.25 0.25 0 0 0
+( -64 4088 -64 ) ( -64 4080 -64 ) ( -64 4088 64 ) trak5x/light-light3a-surfacelight 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3369
 {
-( -80 4088 352 ) ( 144 4088 336 ) ( 144 4088 352 ) trak5x/light/light_light3a 0 0 90 0.125 0.125 0 0 0
+( -80 4088 352 ) ( 144 4088 336 ) ( 144 4088 352 ) trak5x/light-light3a-surfacelight 0 0 90 0.125 0.125 0 0 0
 ( -80 4088 352 ) ( 144 4088 352 ) ( -48 4056 352 ) trak5x/floor-floor2c 0 478 -180 0.25 -0.25 0 0 0
 ( -80 4088 336 ) ( 112 4056 336 ) ( 144 4088 336 ) trak5x/floor-floor2c 0 0 0 -0.25 0.25 0 0 0
 ( 144 4088 336 ) ( 112 4056 352 ) ( 144 4088 352 ) trak5x/floor-floor2c 0 0 -180 0.25 -0.25 0 0 0
-( 128 4088 64 ) ( 128 4080 -64 ) ( 128 4088 -64 ) trak5x/light/light_light3a 0 0 0 0.25 0.25 0 0 0
+( 128 4088 64 ) ( 128 4080 -64 ) ( 128 4088 -64 ) trak5x/light-light3a-surfacelight 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3370
 {
@@ -30238,13 +30238,13 @@ evil8_wall/e8_mtlwall4
 ( -80 4088 352 ) ( 144 4088 352 ) ( -48 4056 352 ) trak5x/floor-floor2c 0 478 -180 0.25 -0.25 0 0 0
 ( -80 4088 336 ) ( 112 4056 336 ) ( 144 4088 336 ) trak5x/floor-floor2c 0 0 0 -0.25 0.25 0 0 0
 ( 144 4088 336 ) ( 112 4056 352 ) ( 144 4088 352 ) trak5x/floor-floor2c 0 0 -180 0.25 -0.25 0 0 0
-( 128 4088 -64 ) ( 128 4080 -64 ) ( 128 4088 64 ) trak5x/light/light_light3a 0 0 0 0.25 0.25 0 0 0
+( 128 4088 -64 ) ( 128 4080 -64 ) ( 128 4088 64 ) trak5x/light-light3a-surfacelight 0 0 0 0.25 0.25 0 0 0
 ( -48 4056 352 ) ( -80 4088 336 ) ( -80 4088 352 ) trak5x/floor-floor2c 0 0 -180 0.25 -0.25 0 0 0
-( -64 4088 64 ) ( -64 4080 -64 ) ( -64 4088 -64 ) trak5x/light/light_light3a 0 0 0 0.25 0.25 0 0 0
+( -64 4088 64 ) ( -64 4080 -64 ) ( -64 4088 -64 ) trak5x/light-light3a-surfacelight 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3371
 {
-( -120 4128 336 ) ( 184 4128 320 ) ( 184 4128 336 ) trak5x/light/light_light3a 0 0 90 0.125 0.125 0 0 0
+( -120 4128 336 ) ( 184 4128 320 ) ( 184 4128 336 ) trak5x/light-light3a-surfacelight 0 0 90 0.125 0.125 0 0 0
 ( -120 4128 336 ) ( 184 4128 336 ) ( -80 4088 336 ) trak5x/floor-floor2c 0 0 -180 0.25 -0.25 0 0 0
 ( -120 4128 320 ) ( 144 4088 320 ) ( 184 4128 320 ) trak5x/floor-floor2c 0 0 -180 0.25 -0.25 0 0 0
 ( -80 4088 336 ) ( -120 4128 320 ) ( -120 4128 336 ) trak5x/floor-floor2c 0 0 -180 0.25 -0.25 0 0 0
@@ -30253,7 +30253,7 @@ evil8_wall/e8_mtlwall4
 }
 // brush 3372
 {
-( -120 4128 336 ) ( 184 4128 320 ) ( 184 4128 336 ) trak5x/light/light_light3a 0 0 90 0.125 0.125 0 0 0
+( -120 4128 336 ) ( 184 4128 320 ) ( 184 4128 336 ) trak5x/light-light3a-surfacelight 0 0 90 0.125 0.125 0 0 0
 ( -120 4128 336 ) ( 184 4128 336 ) ( -80 4088 336 ) trak5x/floor-floor2c 0 0 -180 0.25 -0.25 0 0 0
 ( -120 4128 320 ) ( 144 4088 320 ) ( 184 4128 320 ) trak5x/floor-floor2c 0 0 -180 0.25 -0.25 0 0 0
 ( 144 4088 320 ) ( -80 4088 336 ) ( 144 4088 336 ) trak5x/floor-floor2c 0 0 -180 0.25 -0.25 0 0 0
@@ -30698,7 +30698,7 @@ evil8_wall/e8_mtlwall4
 ( -440 3640 48 ) ( -440 3608 48 ) ( -632 3608 48 ) trak5x/floor-tile4b 256 256 0 0.25 -0.25 0 0 0
 ( -440 3608 160 ) ( -632 3608 160 ) ( -632 3608 0 ) trak5x/floor-tile4b 368 0 0 0.5 0.5 0 0 0
 ( -424 3632 160 ) ( -424 3600 160 ) ( -424 3600 0 ) trak5x/floor-tile4b 480 0 0 -0.5 0.5 0 0 0
-( -504 3600 160 ) ( -312 3600 160 ) ( -312 3600 0 ) trak5x/light/light_light3a 0 -0 -90 0.125 0.125 0 0 0
+( -504 3600 160 ) ( -312 3600 160 ) ( -312 3600 0 ) trak5x/light-light3a-surfacelight 0 -0 -90 0.125 0.125 0 0 0
 ( -416 3608 -64 ) ( -416 3600 -64 ) ( -416 3608 64 ) trak5x/light-light1b 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3422
@@ -30708,7 +30708,7 @@ evil8_wall/e8_mtlwall4
 ( -456 3608 160 ) ( -648 3608 160 ) ( -648 3608 0 ) trak5x/floor-tile4b 400 0 0 0.5 0.5 0 0 0
 ( -640 3640 160 ) ( -640 3608 160 ) ( -640 3608 0 ) trak5x/floor-tile4b 496 0 0 -0.5 0.5 0 0 0
 ( -520 3600 160 ) ( -328 3600 160 ) ( -328 3600 0 ) trak5x/light-light2b 0 0 0 0.125 0.125 0 0 0
-( -624 3608 -64 ) ( -624 3600 -64 ) ( -624 3608 64 ) trak5x/light/light_light3a 0 0 0 0.25 0.25 0 0 0
+( -624 3608 -64 ) ( -624 3600 -64 ) ( -624 3608 64 ) trak5x/light-light3a-surfacelight 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3423
 {
@@ -30726,7 +30726,7 @@ evil8_wall/e8_mtlwall4
 ( -312 3560 160 ) ( -504 3560 160 ) ( -504 3560 0 ) trak5x/floor-tile4b 368 0 0 0.5 0.5 0 0 0
 ( -464 3600 32 ) ( -464 3568 32 ) ( -656 3568 32 ) trak5x/floor-tile4b 320 0 0 0.25 -0.25 0 0 0
 ( -656 3568 16 ) ( -464 3568 16 ) ( -464 3600 16 ) trak5x/floor-tile4b 320 512 0 0.25 -0.25 0 0 0
-( -592 3552 64 ) ( -592 3560 -64 ) ( -592 3552 -64 ) trak5x/light/light_light3a 0 0 0 0.25 0.25 0 0 0
+( -592 3552 64 ) ( -592 3560 -64 ) ( -592 3552 -64 ) trak5x/light-light3a-surfacelight 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3425
 {
@@ -30735,7 +30735,7 @@ evil8_wall/e8_mtlwall4
 ( -296 3560 160 ) ( -488 3560 160 ) ( -488 3560 0 ) trak5x/floor-tile4b 0 383.3901367188 90 0.125 -0.125 0 0 0
 ( -440 3600 32 ) ( -440 3568 32 ) ( -632 3568 32 ) trak5x/floor-tile4b 256 0 -0 0.25 -0.25 0 0 0
 ( -632 3568 16 ) ( -440 3568 16 ) ( -440 3600 16 ) trak5x/floor-tile4b 0 383.3901367188 90 0.125 -0.125 0 0 0
-( -400 3552 64 ) ( -400 3560 -64 ) ( -400 3552 -64 ) trak5x/light/light_light3a 0 63.3900146484 90 0.125 0.125 0 0 0
+( -400 3552 64 ) ( -400 3560 -64 ) ( -400 3552 -64 ) trak5x/light-light3a-surfacelight 0 63.3900146484 90 0.125 0.125 0 0 0
 }
 // brush 3426
 {
@@ -30814,9 +30814,9 @@ evil8_wall/e8_mtlwall4
 ( 520 3640 32 ) ( 520 3608 32 ) ( 712 3608 32 ) trak5x/floor-tile4b 32 32 180 0.25 0.25 0 0 0
 ( 712 3608 48 ) ( 520 3608 48 ) ( 520 3640 48 ) trak5x/floor-tile4b 512 256 180 0.25 0.25 0 0 0
 ( 712 3608 0 ) ( 712 3608 160 ) ( 520 3608 160 ) trak5x/floor-tile4b 16 0 0 -0.5 0.5 0 0 0
-( 392 3600 0 ) ( 392 3600 160 ) ( 584 3600 160 ) trak5x/light/light_light3a 0 -0 -90 0.125 -0.125 0 0 0
+( 392 3600 0 ) ( 392 3600 160 ) ( 584 3600 160 ) trak5x/light-light3a-surfacelight 0 -0 -90 0.125 -0.125 0 0 0
 ( 680 3600 -64 ) ( 680 3608 -64 ) ( 680 3600 64 ) trak5x/light-light1b 0 0 0 0.25 0.25 0 0 0
-( 688 3608 -64 ) ( 688 3600 -64 ) ( 688 3608 64 ) trak5x/light/light_light3a 0 0 0 0.25 0.25 0 0 0
+( 688 3608 -64 ) ( 688 3600 -64 ) ( 688 3608 64 ) trak5x/light-light3a-surfacelight 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3435
 {
@@ -31312,7 +31312,7 @@ evil8_wall/e8_mtlwall4
 ( 696 3608 48 ) ( 504 3608 48 ) ( 504 3640 48 ) trak5x/floor-tile4b 512 256 180 0.25 0.25 0 0 0
 ( 696 3608 0 ) ( 696 3608 160 ) ( 504 3608 160 ) trak5x/floor-tile4b 496 0 0 -0.5 0.5 0 0 0
 ( 488 3600 0 ) ( 488 3600 160 ) ( 488 3632 160 ) trak5x/floor-tile4b 480 0 0 -0.5 0.5 0 0 0
-( 376 3600 0 ) ( 376 3600 160 ) ( 568 3600 160 ) trak5x/light/light_light3a 0 -0 -90 0.125 -0.125 0 0 0
+( 376 3600 0 ) ( 376 3600 160 ) ( 568 3600 160 ) trak5x/light-light3a-surfacelight 0 -0 -90 0.125 -0.125 0 0 0
 ( 480 3608 64 ) ( 480 3600 -64 ) ( 480 3608 -64 ) trak5x/light-light1b 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3490
@@ -31322,7 +31322,7 @@ evil8_wall/e8_mtlwall4
 ( 712 3608 0 ) ( 712 3608 160 ) ( 520 3608 160 ) trak5x/floor-tile4b 16 0 0 -0.5 0.5 0 0 0
 ( 704 3608 0 ) ( 704 3608 160 ) ( 704 3640 160 ) trak5x/floor-tile4b 496 0 0 -0.5 0.5 0 0 0
 ( 392 3600 0 ) ( 392 3600 160 ) ( 584 3600 160 ) trak5x/light-light2b 0 0 0 -0.125 0.125 0 0 0
-( 688 3608 64 ) ( 688 3600 -64 ) ( 688 3608 -64 ) trak5x/light/light_light3a 0 0 0 0.25 0.25 0 0 0
+( 688 3608 64 ) ( 688 3600 -64 ) ( 688 3608 -64 ) trak5x/light-light3a-surfacelight 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3491
 {
@@ -31340,7 +31340,7 @@ evil8_wall/e8_mtlwall4
 ( 568 3560 0 ) ( 568 3560 160 ) ( 376 3560 160 ) trak5x/floor-tile4b 496 0 0 -0.5 0.5 0 0 0
 ( 720 3568 32 ) ( 528 3568 32 ) ( 528 3600 32 ) trak5x/floor-tile4b 64 0 180 0.25 0.25 0 0 0
 ( 528 3600 16 ) ( 528 3568 16 ) ( 720 3568 16 ) trak5x/floor-tile4b 64 512 180 0.25 0.25 0 0 0
-( 656 3552 -64 ) ( 656 3560 -64 ) ( 656 3552 64 ) trak5x/light/light_light3a 0 0 0 0.25 0.25 0 0 0
+( 656 3552 -64 ) ( 656 3560 -64 ) ( 656 3552 64 ) trak5x/light-light3a-surfacelight 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3493
 {
@@ -31349,7 +31349,7 @@ evil8_wall/e8_mtlwall4
 ( 552 3560 0 ) ( 552 3560 160 ) ( 360 3560 160 ) trak5x/floor-tile4b 0 383.3900146484 90 0.125 0.125 0 0 0
 ( 696 3568 32 ) ( 504 3568 32 ) ( 504 3600 32 ) trak5x/floor-tile4b 512 0 -180 0.25 0.25 0 0 0
 ( 504 3600 16 ) ( 504 3568 16 ) ( 696 3568 16 ) trak5x/floor-tile4b 0 383.3900146484 90 0.125 0.125 0 0 0
-( 464 3552 -64 ) ( 464 3560 -64 ) ( 464 3552 64 ) trak5x/light/light_light3a 0 63.3900146484 90 0.125 0.125 0 0 0
+( 464 3552 -64 ) ( 464 3560 -64 ) ( 464 3552 64 ) trak5x/light-light3a-surfacelight 0 63.3900146484 90 0.125 0.125 0 0 0
 }
 // brush 3494
 {
@@ -32219,7 +32219,7 @@ evil8_wall/e8_mtlwall4
 ( 376 2936 672 ) ( 376 2936 416 ) ( 504 3056 672 ) trak5x/wall-wall3b 480 121 0 -0.25 0.25 0 0 0
 ( 536 3056 672 ) ( 376 2904 672 ) ( 504 3056 672 ) common/caulk 32 191.549987793 0 0.25 -0.25 0 4 0
 ( 536 3056 416 ) ( 376 2904 416 ) ( 568 3024 416 ) common/caulk 32 191.549987793 0 0.25 -0.25 0 4 0
-( 376 2904 416 ) ( 376 2904 672 ) ( 568 2992 416 ) trak5x/light/light_light3a 96 0 0 -0.25 0.25 0 0 0
+( 376 2904 416 ) ( 376 2904 672 ) ( 568 2992 416 ) trak5x/light-light3a-surfacelight 96 0 0 -0.25 0.25 0 0 0
 }
 // brush 3590
 {
@@ -32274,7 +32274,7 @@ evil8_wall/e8_mtlwall4
 ( -440 3056 672 ) ( -312 2936 416 ) ( -312 2936 672 ) trak5x/wall-wall3b 224 121 0 0.25 0.25 0 0 0
 ( -440 3056 672 ) ( -312 2904 672 ) ( -472 3056 672 ) common/caulk 32 191.549987793 180 0.25 0.25 0 4 0
 ( -504 3024 416 ) ( -312 2904 416 ) ( -472 3056 416 ) common/caulk 32 191.549987793 180 0.25 0.25 0 4 0
-( -504 2992 416 ) ( -312 2904 672 ) ( -312 2904 416 ) trak5x/light/light_light3a 96 0 0 0.25 0.25 0 0 0
+( -504 2992 416 ) ( -312 2904 672 ) ( -312 2904 416 ) trak5x/light-light3a-surfacelight 96 0 0 0.25 0.25 0 0 0
 }
 // brush 3595
 {
@@ -32377,7 +32377,7 @@ evil8_wall/e8_mtlwall4
 ( -896 4624 1088 ) ( -896 4608 1088 ) ( -896 4608 880 ) trak5x/floor-tile3b 0 0 0 0.25 0.25 0 0 0
 ( -704 4608 1280 ) ( -544 4608 1280 ) ( -544 4608 1072 ) trak5x/floor-tile3b 8192 0 0 0.25 0.25 0 0 0
 ( -64 -64 1000 ) ( -56 64 1000 ) ( -64 64 1000 ) trak5x/floor-tile5b 0 0 0 0.25 0.25 0 0 0
-( -64 -64 1024 ) ( -64 64 1032 ) ( -64 64 1024 ) trak5x/trim/trim_basictrim1a 0 0 0 0.25 0.25 0 0 0
+( -64 -64 1024 ) ( -64 64 1032 ) ( -64 64 1024 ) trak5x/trim-basictrim1a 0 0 0 0.25 0.25 0 0 0
 }
 // brush 3606
 {
@@ -32475,7 +32475,7 @@ evil8_wall/e8_mtlwall4
 }
 // brush 3616
 {
-( -64 4488 1040 ) ( -144 4424 1040 ) ( -64 4624 1040 ) trak5x/trim/trim_basictrim1a 85.3300018311 406.4189453125 0 0.1875 0.1875 0 0 0
+( -64 4488 1040 ) ( -144 4424 1040 ) ( -64 4624 1040 ) trak5x/trim-basictrim1a 85.3300018311 406.4189453125 0 0.1875 0.1875 0 0 0
 ( -64 4624 1024 ) ( -144 4424 1024 ) ( -64 4488 1024 ) trak5x/trim-trim9b 14.8606262207 190.2153625488 -90 0.1249999553 0.1249999553 0 0 0
 ( -64 4488 1040 ) ( -144 4424 1024 ) ( -144 4424 1040 ) trak5x/trim-trim9b 128 226.1900024414 90 0.125 0.1767766774 0 0 0
 ( -64 4624 1040 ) ( -64 4488 1024 ) ( -64 4488 1040 ) trak5x/trim-trim9b 0 180.9351654053 90 0.125 0.1767766774 0 0 0
@@ -32498,7 +32498,7 @@ evil8_wall/e8_mtlwall4
 ( 960 4608 1024 ) ( 160 4608 1024 ) ( 960 4608 896 ) trak5x/wall-wall5b 384 0 0 0.5 0.5 0 4 0
 ( 448 4632 896 ) ( 448 4440 896 ) ( 448 4632 1024 ) trak5x/wall-wall5b 416 0 0 0.25 0.25 0 4 0
 ( 208 4416 896 ) ( 208 4416 1024 ) ( 448 4416 896 ) trak5x/wall-wall5b 128 0 -0 0.25 0.25 0 0 0
-( 448 4416 1024 ) ( 128 4480 1024 ) ( 448 4608 1024 ) trak5x/trim/trim_basictrim1a 85.3300018311 406.4189453125 0 0.1875 0.1875 0 0 0
+( 448 4416 1024 ) ( 128 4480 1024 ) ( 448 4608 1024 ) trak5x/trim-basictrim1a 85.3300018311 406.4189453125 0 0.1875 0.1875 0 0 0
 ( 128 4488 64 ) ( 208 4424 -64 ) ( 128 4488 -64 ) trak5x/wall-wall5b 128 0 -0 0.25 0.25 0 0 0
 }
 // brush 3619
@@ -32513,7 +32513,7 @@ evil8_wall/e8_mtlwall4
 }
 // brush 3620
 {
-( -64 4488 1040 ) ( -144 4424 1040 ) ( -64 4624 1040 ) trak5x/trim/trim_basictrim1a 62.8600006104 190.2153625488 0 0.1249999553 0.1249999553 0 0 0
+( -64 4488 1040 ) ( -144 4424 1040 ) ( -64 4624 1040 ) trak5x/trim-basictrim1a 62.8600006104 190.2153625488 0 0.1249999553 0.1249999553 0 0 0
 ( -64 4624 1024 ) ( -144 4424 1024 ) ( -64 4488 1024 ) trak5x/trim-trim9b 14.8606262207 190.2153625488 -90 0.1249999553 0.1249999553 0 0 0
 ( -144 4544 1024 ) ( -80 4608 1040 ) ( -144 4544 1040 ) trak5x/trim-trim9b 0 483.0107421875 90 0.125 -0.7071065903 0 0 0
 ( -144 4544 1024 ) ( -144 4424 1040 ) ( -144 4424 1024 ) trak5x/trim-trim9b 32.1217193604 0 0 -0.9999997616 0.25 0 0 0