Fix light and alignments

diff --git a/maps/atelier.map b/maps/atelier.map
index 6d03ba1d0f4d7a066a37092aeab111a49b060e36..d22d5a57af5c45102a2bd37a796404f12cc722a1 100644 (file)
--- a/maps/atelier.map
+++ b/maps/atelier.map
@@ -7,10 +7,10 @@
 {
 ( -704 -624 160 ) ( -704 -624 0 ) ( -704 -608 160 ) common/caulk 128 96 0 -0.25 0.25 0 0 0
 ( -600 -608 0 ) ( -696 -608 0 ) ( -600 -624 0 ) common/caulk 0 128 180 0.25 0.25 0 0 0
-( -592 -128 0 ) ( -592 -128 160 ) ( -688 -128 0 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 0 0 0
-( -704 -192 -64 ) ( -640 -128 -64 ) ( -704 -192 64 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 0 0 0
+( -592 -128 0 ) ( -592 -128 160 ) ( -688 -128 0 ) map_atelier/9techwall03b 128 0 0 0.25 0.25 0 0 0
+( -704 -192 -64 ) ( -640 -128 -64 ) ( -704 -192 64 ) map_atelier/9techwall03b 128 0 0 0.25 0.25 0 0 0
 ( -1088 384 128 ) ( -1064 384 128 ) ( -1088 256 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -576 -136 -64 ) ( -576 -152 -64 ) ( -576 -136 64 ) map_atelier/9techwall03b 256 0 0 0.25 0.25 0 0 0
+( -576 -136 -64 ) ( -576 -152 -64 ) ( -576 -136 64 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 0 0 0
 ( -632 -640 -64 ) ( -656 -640 -64 ) ( -632 -640 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -22,7 +22,7 @@
 ( -296 384 128 ) ( -248 384 128 ) ( -296 256 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -872 -192 192 ) ( -1088 -192 192 ) ( -872 -192 0 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 0 0 0
+( -872 -192 192 ) ( -1088 -192 192 ) ( -872 -192 0 ) map_atelier/9techwall03b 128 0 0 0.25 0.25 0 0 0
 ( -704 -192 192 ) ( -704 -192 0 ) ( -704 -336 192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1088 -336 0 ) ( -872 -336 0 ) ( -1088 -192 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1096 -640 0 ) ( -1096 -640 192 ) ( -880 -640 0 ) common/caulk 32 0 0 0.25 0.25 0 0 0
@@ -59,9 +59,9 @@
 ( -256 -64 192 ) ( -384 -64 192 ) ( -256 -64 0 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 134217728 0 0
 ( -256 -64 192 ) ( -256 -64 0 ) ( -256 -192 192 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 134217728 0 0
 ( -384 -192 0 ) ( -256 -192 0 ) ( -384 -64 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -448 -96 0 ) ( -448 -96 480 ) ( -448 -192 480 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 134217728 0 0
+( -448 -96 0 ) ( -448 -96 480 ) ( -448 -192 480 ) map_atelier/9techwall03b 120 0 0 0.25 0.25 134217728 0 0
 ( -320 -64 -64 ) ( -256 -128 -64 ) ( -320 -64 64 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 134217728 0 0
-( -448 -96 480 ) ( -448 -96 0 ) ( -416 -64 480 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 134217728 0 0
+( -448 -96 480 ) ( -448 -96 0 ) ( -416 -64 480 ) map_atelier/9techwall03b 120 0 0 0.25 0.25 134217728 0 0
 ( -392 384 128 ) ( -368 384 128 ) ( -392 256 128 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -256 -192 -64 ) ( -448 -160 -64 ) ( -256 -192 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
@@ -392,7 +392,7 @@ trak5x/base-pipe1d
 ( -384 1608 768 ) ( -384 1608 128 ) ( -384 1232 768 ) exx/trim-baseboard 256 0 0 0.25 0.25 0 0 0
 ( -584 1280 128 ) ( -584 1280 768 ) ( -448 1280 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -640 1224 128 ) ( -640 1600 128 ) ( -640 1224 768 ) exx/trim-baseboard 256 0 0 0.25 0.25 0 0 0
-( -408 384 512 ) ( -456 384 512 ) ( -408 256 512 ) exx/base-metal01 0 256 0 0.25 0.25 0 0 0
+( -408 384 512 ) ( -456 384 512 ) ( -408 256 512 ) exx/base-metal03 0 256 0 0.25 0.25 0 0 0
 }
 {
 patchDef2
@@ -532,7 +532,7 @@ exx/wall-bigrib02
 ( 640 1408 320 ) ( 512 1408 320 ) ( 640 1408 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1024 1416 320 ) ( 1024 1416 128 ) ( 1024 1352 320 ) common/caulk 224 0 0 0.25 0.25 0 0 0
 ( 512 1344 128 ) ( 640 1344 128 ) ( 512 1408 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 512 1344 128 ) ( 512 1344 320 ) ( 640 1344 128 ) map_atelier/9techwall03b 0 256 0 0.25 0.25 0 0 0
+( 512 1344 128 ) ( 512 1344 320 ) ( 640 1344 128 ) map_atelier/9techwall03b 72 256 0 0.25 0.25 0 0 0
 ( 512 1344 128 ) ( 512 1408 128 ) ( 512 1344 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 552 384 192 ) ( 576 384 192 ) ( 552 256 192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -841,7 +841,7 @@ exx/wall-bigrib02
 ( -1088 192 768 ) ( -1472 192 768 ) ( -1088 192 128 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 0 0 0
 ( -1088 192 768 ) ( -1088 192 128 ) ( -1088 0 768 ) map_atelier/9techwall03b 256 0 0 0.25 0.25 0 0 0
 ( -1488 0 -8 ) ( -1104 0 -8 ) ( -1488 192 -8 ) common/caulk 64 0 0 0.25 0.25 0 0 0
-( -1472 0 128 ) ( -1472 0 768 ) ( -1088 0 128 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 0 0 0
+( -1472 0 128 ) ( -1472 0 768 ) ( -1088 0 128 ) map_atelier/9techwall03b 136 0 0 0.25 0.25 0 0 0
 ( -1472 0 128 ) ( -1472 192 128 ) ( -1472 0 768 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1216 192 -64 ) ( -1088 64 -64 ) ( -1216 192 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1344 0 -64 ) ( -1472 128 -64 ) ( -1344 0 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -891,7 +891,7 @@ effects_jumppad/jumppadfx1_d
 }
 {
 ( -1096 -128 128 ) ( -1096 -192 128 ) ( -1408 -128 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1096 -128 128 ) ( -1408 -128 128 ) ( -1096 -128 0 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 0 0 0
+( -1096 -128 128 ) ( -1408 -128 128 ) ( -1096 -128 0 ) map_atelier/9techwall03b 128 0 0 0.25 0.25 0 0 0
 ( -1088 -128 128 ) ( -1088 -128 0 ) ( -1088 -192 128 ) map_atelier/9techwall03b 256 0 0 0.25 0.25 0 0 0
 ( -1408 -192 -8 ) ( -1096 -192 -8 ) ( -1408 -128 -8 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1408 -192 0 ) ( -1408 -192 128 ) ( -1096 -192 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -1212,7 +1212,7 @@ exx/floor-simple05
 ( -1160 80 0 ) ( -1160 -48 0 ) ( -968 80 0 ) common/caulk 64 224 -90 0.25 0.25 0 0 0
 ( -1080 80 0 ) ( -1080 80 128 ) ( -1088 64 128 ) common/caulk 64 0 0 -0.25 0.25 0 0 0
 ( -1080 80 128 ) ( -1080 80 0 ) ( -968 80 0 ) common/caulk 32 0 0 0.25 0.25 0 0 0
-( -960 64 128 ) ( -960 64 0 ) ( -1160 64 0 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 0 0 0
+( -960 64 128 ) ( -960 64 0 ) ( -1160 64 0 ) map_atelier/9techwall03b -384 0 0 0.25 0.25 0 0 0
 }
 {
 ( -896 320 128 ) ( -896 192 128 ) ( -912 320 128 ) exx/trim-01 9.9982681274 260.4339294434 45 0.25 0.25 0 0 0
@@ -1239,7 +1239,7 @@ exx/floor-simple05
 ( -1096 96 0 ) ( -1096 96 128 ) ( -1208 208 128 ) common/caulk 64 0 0 -0.25 0.25 0 0 0
 }
 {
-( -784 184 128 ) ( -784 -8 128 ) ( -912 184 128 ) exx/trim-01 0 480 0 0.25 0.25 0 0 0
+( -784 184 128 ) ( -784 -8 128 ) ( -912 184 128 ) exx/trim-01 0 504 0 0.25 0.25 0 0 0
 ( -896 192 0 ) ( -896 192 128 ) ( -912 184 128 ) common/caulk 64 0 0 0.25 0.25 0 0 0
 ( -912 -8 0 ) ( -784 -8 0 ) ( -912 184 0 ) common/caulk 64 224 0 0.25 0.25 0 0 0
 ( -912 136 0 ) ( -912 136 128 ) ( -896 128 128 ) common/caulk 64 0 0 0.25 0.25 0 0 0
@@ -1263,7 +1263,7 @@ exx/floor-simple05
 ( -1008 336 0 ) ( -1008 336 128 ) ( -896 448 128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( -1328 200 128 ) ( -1328 392 128 ) ( -1200 200 128 ) exx/trim-01 0 480 180 0.25 0.25 0 0 0
+( -1328 200 128 ) ( -1328 392 128 ) ( -1200 200 128 ) exx/trim-01 0 552 180 0.25 0.25 0 0 0
 ( -1216 192 0 ) ( -1216 192 128 ) ( -1200 200 128 ) common/caulk 64 0 0 -0.25 0.25 0 0 0
 ( -1200 392 0 ) ( -1328 392 0 ) ( -1200 200 0 ) common/caulk 64 224 180 0.25 0.25 0 0 0
 ( -1200 952 0 ) ( -1200 952 128 ) ( -1216 960 128 ) common/caulk 64 0 0 -0.25 0.25 0 0 0
@@ -1297,7 +1297,7 @@ exx/floor-simple05
 {
 ( -56 392 128 ) ( 72 392 128 ) ( -56 376 128 ) exx/trim-01 57.6888656616 478.7149963379 135 0.25 0.25 0 0 0
 ( -112 184 128 ) ( -112 184 0 ) ( -128 192 0 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( -48 272 128 ) ( -48 272 0 ) ( 72 392 0 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 0 0 0
+( -48 272 128 ) ( -48 272 0 ) ( 72 392 0 ) map_atelier/9techwall03b -248 0 0 0.25 0.25 0 0 0
 ( 72 376 0 ) ( 72 392 0 ) ( -56 376 0 ) common/caulk 32 192 90 0.25 0.25 0 0 0
 ( 24 320 0 ) ( 24 320 128 ) ( 0 320 128 ) common/caulk 64 0 0 -0.25 0.25 0 0 0
 ( -112 184 0 ) ( -112 184 128 ) ( 24 320 128 ) common/caulk 224 0 0 -0.25 0.25 0 0 0
@@ -1308,7 +1308,7 @@ exx/floor-simple05
 ( -112 264 0 ) ( -240 264 0 ) ( -112 72 0 ) common/caulk 64 224 180 0.25 0.25 0 0 0
 ( -112 184 0 ) ( -112 184 128 ) ( -128 192 128 ) common/caulk 64 0 0 -0.25 0.25 0 0 0
 ( -112 -176 0 ) ( -112 -176 128 ) ( -112 184 128 ) common/caulk 32 0 0 -0.25 0.25 0 0 0
-( -128 64 128 ) ( -128 64 0 ) ( -128 264 0 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 0 0 0
+( -128 64 128 ) ( -128 64 0 ) ( -128 264 0 ) map_atelier/9techwall03b -264 0 0 0.25 0.25 0 0 0
 }
 {
 ( 0 -304 128 ) ( -192 -304 128 ) ( 0 -176 128 ) exx/trim-01 64 256 -90 0.25 0.25 0 0 0
@@ -1984,7 +1984,7 @@ exx/wall-metal01
 }
 {
 ( -448 -160 128 ) ( -448 -192 128 ) ( -576 -160 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -448 -160 128 ) ( -576 -160 128 ) ( -448 -160 0 ) map_atelier/9techwall03b 0 0 0 0.25 0.25 0 0 0
+( -448 -160 128 ) ( -576 -160 128 ) ( -448 -160 0 ) map_atelier/9techwall03b 256 0 0 0.25 0.25 0 0 0
 ( -256 -192 0 ) ( -256 -192 128 ) ( -448 -160 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -576 -192 0 ) ( -448 -192 0 ) ( -576 -160 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -256 -192 128 ) ( -256 -192 0 ) ( -576 -192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -4078,7 +4078,7 @@ trak5x/base-pipe1a
 ( 808 256 192 ) ( 776 384 192 ) ( 808 384 192 ) trak5x/base/base_base1b 0 256 0 0.25 0.25 0 0 0
 }
 {
-( 1024 960 128 ) ( 1024 960 320 ) ( 512 960 320 ) map_atelier/9techwall03b 0 256 0 0.25 0.25 0 0 0
+( 1024 960 128 ) ( 1024 960 320 ) ( 512 960 320 ) map_atelier/9techwall03b 72 256 0 0.25 0.25 0 0 0
 ( 1024 960 320 ) ( 1024 960 128 ) ( 1088 896 128 ) common/caulk 0 128 0 0.25 0.25 0 0 0
 ( 840 896 128 ) ( 1088 896 128 ) ( 840 1240 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 840 896 288 ) ( 840 896 320 ) ( 1088 896 288 ) map_atelier/9techwall03b 0 256 0 0.25 0.25 0 0 0
@@ -4137,7 +4137,7 @@ exx/wall-crete03b
 ( 1016 960 192 ) ( 1024 968 192 ) ( 1024 956 192 ) trak5x/base/base_base1b 0 256 0 0.25 0.25 0 0 0
 ( 1024 956 128 ) ( 1024 968 128 ) ( 1016 960 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1024 960 128 ) ( 1024 960 192 ) ( 1024 968 192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1024 968 192 ) ( 1016 960 128 ) ( 1024 968 128 ) map_atelier/9techwall03b 256 256 0 0.25 0.25 0 0 0
+( 1024 968 192 ) ( 1016 960 128 ) ( 1024 968 128 ) map_atelier/9techwall03b 160 256 0 0.25 0.25 0 0 0
 ( 1024 960 192 ) ( 1024 960 128 ) ( 1016 960 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -4163,7 +4163,7 @@ exx/wall-crete03b
 ( 1024 1336 192 ) ( 1016 1344 192 ) ( 1028 1344 192 ) trak5x/base/base_base1b 256 0 90 0.25 0.25 0 0 0
 ( 1028 1344 128 ) ( 1016 1344 128 ) ( 1024 1336 128 ) common/caulk 256 0 90 0.25 0.25 0 0 0
 ( 1024 1344 128 ) ( 1024 1344 192 ) ( 1016 1344 192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 1016 1344 192 ) ( 1024 1336 128 ) ( 1016 1344 128 ) map_atelier/9techwall03b 288 256 0 0.25 0.25 0 0 0
+( 1016 1344 192 ) ( 1024 1336 128 ) ( 1016 1344 128 ) map_atelier/9techwall03b 200 256 0 0.25 0.25 0 0 0
 ( 1024 1344 192 ) ( 1024 1344 128 ) ( 1024 1336 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -6769,7 +6769,7 @@ exx/wall-metal01
 {
 ( 576 1016 192 ) ( 576 960 192 ) ( 568 1016 192 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( 576 1016 192 ) ( 568 1016 192 ) ( 576 1016 128 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 576 1016 192 ) ( 576 1016 128 ) ( 576 960 192 ) map_atelier/9techwall03b 32 256 0 0.25 0.25 134217728 0 0
+( 576 1016 192 ) ( 576 1016 128 ) ( 576 960 192 ) map_atelier/9techwall03b 64 256 0 0.25 0.25 134217728 0 0
 ( 568 960 128 ) ( 576 960 128 ) ( 568 1016 128 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( 568 960 128 ) ( 568 960 192 ) ( 576 960 128 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( 568 960 128 ) ( 568 1016 128 ) ( 568 960 192 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
@@ -6812,9 +6812,9 @@ patchDef2
 map_atelier/9techwall03b
 ( 3 3 0 0 0 )
 (
-( ( 576 1016 128 0 0.5 ) ( 576 1016 160 0 0.25 ) ( 576 1016 192 0 0 ) )
-( ( 576 1024 128 0.0625 0.5 ) ( 576 1024 160 0.0625 0.25 ) ( 576 1024 192 0.0625 0 ) )
-( ( 568 1024 128 0.125 0.5 ) ( 568 1024 160 0.125 0.25 ) ( 568 1024 192 0.125 0 ) )
+( ( 576 1016 128 -0.0625 0.5 ) ( 576 1016 160 -0.0625 0.25 ) ( 576 1016 192 -0.0625 0 ) )
+( ( 576 1024 128 0 0.5 ) ( 576 1024 160 0 0.25 ) ( 576 1024 192 0 0 ) )
+( ( 568 1024 128 0.0625 0.5 ) ( 568 1024 160 0.0625 0.25 ) ( 568 1024 192 0.0625 0 ) )
 )
 }
 }
@@ -8977,18 +8977,6 @@ patchDef2
 trak5x/light-light2a-surfacelight
 ( 3 3 0 0 0 )
 (
-( ( 379.3137207031 -192 447 0 1 ) ( 373.6568603516 -186.3431396484 447 0 0.5 ) ( 368 -180.6862792969 447 0 0 ) )
-( ( 373.6568603516 -197.6568603516 447 0.5 1 ) ( 368 -192 447 0.5 0.5 ) ( 362.3431396484 -186.3431396484 447 0.5 0 ) )
-( ( 368 -203.3137207031 447 1 1 ) ( 362.3431396484 -197.6568603516 447 1 0.5 ) ( 356.6862792969 -192 447 1 0 ) )
-)
-}
-}
-{
-patchDef2
-{
-trak5x/light-light2a-surfacelight
-( 3 3 0 0 0 )
-(
 ( ( 1171.3137207031 -200 447 0 1 ) ( 1165.6568603516 -194.3431396484 447 0 0.5 ) ( 1160 -188.6862792969 447 0 0 ) )
 ( ( 1165.6568603516 -205.6568603516 447 0.5 1 ) ( 1160 -200 447 0.5 0.5 ) ( 1154.3431396484 -194.3431396484 447 0.5 0 ) )
 ( ( 1160 -211.3137207031 447 1 1 ) ( 1154.3431396484 -205.6568603516 447 1 0.5 ) ( 1148.6862792969 -200 447 1 0 ) )
@@ -11716,6 +11704,30 @@ common/weapclip
 ( -48 -225.9084320068 136.2215423584 ) ( -48 -209.638961792 172.7633514404 ) ( -32 -225.9084320068 136.2215423584 ) common/clip 0 83.9109039307 0 0.25 0.2580870986 0 0 0
 ( -96.875 -225.4084320068 136.2215423584 ) ( -96.875 -108.474609375 84.1592407227 ) ( -96.875 -209.138961792 172.7633514404 ) common/clip 245.3085479736 35.0507659912 -24 0.2499999702 0.2499999702 0 0 0
 }
+{
+patchDef2
+{
+trak5x/light-light2a-surfacelight
+( 3 3 0 0 0 )
+(
+( ( 304 -376 447 0 1 ) ( 296 -376 447 0 0.5 ) ( 288 -376 447 0 0 ) )
+( ( 304 -384 447 0.5 1 ) ( 296 -384 447 0.5 0.5 ) ( 288 -384 447 0.5 0 ) )
+( ( 304 -392 447 1 1 ) ( 296 -392 447 1 0.5 ) ( 288 -392 447 1 0 ) )
+)
+}
+}
+{
+patchDef2
+{
+trak5x/light-light2a-surfacelight
+( 3 3 0 0 0 )
+(
+( ( 379.3137207031 -192 447 0 1 ) ( 373.6568603516 -186.3431396484 447 0 0.5 ) ( 368 -180.6862792969 447 0 0 ) )
+( ( 373.6568603516 -197.6568603516 447 0.5 1 ) ( 368 -192 447 0.5 0.5 ) ( 362.3431396484 -186.3431396484 447 0.5 0 ) )
+( ( 368 -203.3137207031 447 1 1 ) ( 362.3431396484 -197.6568603516 447 1 0.5 ) ( 356.6862792969 -192 447 1 0 ) )
+)
+}
+}
 }
 {
 "classname" "func_group"
@@ -23974,9 +23986,9 @@ patchDef2
 exx/wall-metal01b
 ( 3 3 0 0 0 )
 (
-( ( 232 -576 640 4.8125 -5 ) ( 192 -576 640 4.5 -5 ) ( 192 -576 600 4.5 -4.6875 ) )
-( ( 192 -576 640 4.5 -5 ) ( 192 -576 640 4.5 -5 ) ( 192 -576 640 4.5 -5 ) )
-( ( 192 -576 640 4.5 -5 ) ( 192 -576 640 4.5 -5 ) ( 192 -576 640 4.5 -5 ) )
+( ( 320 -576 600 4.5 -4.6875 ) ( 320 -576 640 4.5 -5 ) ( 280 -576 640 4.8125 -5 ) )
+( ( 320 -576 640 4.5 -5 ) ( 320 -576 640 4.5 -5 ) ( 320 -576 640 4.5 -5 ) )
+( ( 320 -576 640 4.5 -5 ) ( 320 -576 640 4.5 -5 ) ( 320 -576 640 4.5 -5 ) )
 )
 }
 }
@@ -24085,18 +24097,6 @@ exx/panel-metal01b
 }
 }
 {
-patchDef2
-{
-exx/wall-metal01b
-( 3 3 0 0 0 )
-(
-( ( 320 -576 600 -7 -4.6875 ) ( 320 -576 640 -7 -5 ) ( 280 -576 640 -7 -5 ) )
-( ( 320 -576 640 -7 -5 ) ( 320 -576 640 -7 -5 ) ( 320 -576 640 -7 -5 ) )
-( ( 320 -576 640 -7 -5 ) ( 320 -576 640 -7 -5 ) ( 320 -576 640 -7 -5 ) )
-)
-}
-}
-{
 ( 192 -512 512 ) ( 320 -576 512 ) ( 192 -576 512 ) exx/base-metal07rust 0 256 180 0.25 0.25 134217728 0 0
 ( 192 -576 448 ) ( 192 -512 512 ) ( 192 -576 512 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
 ( 192 -512 504 ) ( 320 -576 504 ) ( 320 -512 504 ) common/caulk 256 0 -90 0.25 -0.25 134217728 0 0
@@ -24116,6 +24116,18 @@ trak5x/light-light2a-surfacelight
 )
 }
 }
+{
+patchDef2
+{
+exx/wall-metal01b
+( 3 3 0 0 0 )
+(
+( ( 232 -576 640 4.8125 -5 ) ( 192 -576 640 4.5 -5 ) ( 192 -576 600 4.5 -4.6875 ) )
+( ( 192 -576 640 4.5 -5 ) ( 192 -576 640 4.5 -5 ) ( 192 -576 640 4.5 -5 ) )
+( ( 192 -576 640 4.5 -5 ) ( 192 -576 640 4.5 -5 ) ( 192 -576 640 4.5 -5 ) )
+)
+}
+}
 }
 {
 "classname" "func_group"
@@ -24388,9 +24400,9 @@ patchDef2
 exx/wall-metal01b
 ( 3 3 0 0 0 )
 (
-( ( 192 -640 600 4.5 -4.6875 ) ( 192 -640 640 4.5 -5 ) ( 232 -640 640 4.8125 -5 ) )
-( ( 192 -640 640 4.5 -5 ) ( 192 -640 640 4.5 -5 ) ( 192 -640 640 4.5 -5 ) )
-( ( 192 -640 640 4.5 -5 ) ( 192 -640 640 4.5 -5 ) ( 192 -640 640 4.5 -5 ) )
+( ( 280 -640 640 4.8125 -5 ) ( 320 -640 640 4.5 -5 ) ( 320 -640 600 4.5 -4.6875 ) )
+( ( 320 -640 640 4.5 -5 ) ( 320 -640 640 4.5 -5 ) ( 320 -640 640 4.5 -5 ) )
+( ( 320 -640 640 4.5 -5 ) ( 320 -640 640 4.5 -5 ) ( 320 -640 640 4.5 -5 ) )
 )
 }
 }
@@ -24437,18 +24449,6 @@ exx/panel-metal01b
 {
 patchDef2
 {
-exx/wall-metal01b
-( 3 3 0 0 0 )
-(
-( ( 280 -640 640 -7.5 -5 ) ( 320 -640 640 -7.5 -5 ) ( 320 -640 600 -7.5 -4.6875 ) )
-( ( 320 -640 640 -7.5 -5 ) ( 320 -640 640 -7.5 -5 ) ( 320 -640 640 -7.5 -5 ) )
-( ( 320 -640 640 -7.5 -5 ) ( 320 -640 640 -7.5 -5 ) ( 320 -640 640 -7.5 -5 ) )
-)
-}
-}
-{
-patchDef2
-{
 exx/panel-metal01b
 ( 3 3 0 0 0 )
 (
@@ -24490,6 +24490,18 @@ trak5x/light-light2a-surfacelight
 )
 }
 }
+{
+patchDef2
+{
+exx/wall-metal01b
+( 3 3 0 0 0 )
+(
+( ( 192 -640 600 4.5 -4.6875 ) ( 192 -640 640 4.5 -5 ) ( 232 -640 640 4.8125 -5 ) )
+( ( 192 -640 640 4.5 -5 ) ( 192 -640 640 4.5 -5 ) ( 192 -640 640 4.5 -5 ) )
+( ( 192 -640 640 4.5 -5 ) ( 192 -640 640 4.5 -5 ) ( 192 -640 640 4.5 -5 ) )
+)
+}
+}
 }
 {
 "classname" "func_group"
@@ -31683,13 +31695,13 @@ map_atelier/9techwall06
 }
 {
 "classname" "misc_model"
-"origin" "-896.000000 -896.000000 463.000000"
+"origin" "-896.000000 -896.000000 464.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "-90.000000"
 }
 {
 "classname" "misc_model"
-"origin" "-927.000000 -386.000000 479.000000"
+"origin" "-927.000000 -386.000000 480.000000"
 "model" "models/lights/xonlight02.md3"
 "angle" "-90.000000"
 }
@@ -32217,13 +32229,13 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "-127.000000 -386.000000 479.000000"
+"origin" "-127.000000 -386.000000 480.000000"
 "model" "models/lights/xonlight02.md3"
 "angle" "-90.000000"
 }
 {
 "classname" "misc_model"
-"origin" "-1248.000000 -64.000000 127.000000"
+"origin" "-1248.000000 -64.000000 128.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "-179.999985"
 "modelscale" "0.500000"
@@ -32236,7 +32248,7 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "-1488.000000 -16.000000 127.000000"
+"origin" "-1488.000000 -16.000000 128.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "135.000000"
 "modelscale" "0.500000"
@@ -32273,7 +32285,7 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "-1536.000000 384.000000 303.000000"
+"origin" "-1536.000000 384.000000 304.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "179.999985"
 }
@@ -33095,7 +33107,7 @@ exx/floor-tile03
 }
 {
 "classname" "misc_model"
-"origin" "-1856.000000 416.000000 575.000000"
+"origin" "-1856.000000 416.000000 576.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "179.999985"
 }
@@ -33107,7 +33119,7 @@ exx/floor-tile03
 }
 {
 "classname" "misc_model"
-"origin" "-1856.000000 736.000000 575.000000"
+"origin" "-1856.000000 736.000000 576.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "179.999985"
 }
@@ -33119,7 +33131,7 @@ exx/floor-tile03
 }
 {
 "classname" "misc_model"
-"origin" "-1711.999878 1392.000000 575.000000"
+"origin" "-1711.999878 1392.000000 576.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "134.999985"
 }
@@ -33131,7 +33143,7 @@ exx/floor-tile03
 }
 {
 "classname" "misc_model"
-"origin" "-1847.999878 1104.000000 575.000000"
+"origin" "-1847.999878 1104.000000 576.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "162.159729"
 }
@@ -33143,7 +33155,7 @@ exx/floor-tile03
 }
 {
 "classname" "misc_model"
-"origin" "-1408.000000 1527.999878 575.000000"
+"origin" "-1408.000000 1527.999878 576.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "101.168465"
 }
@@ -33155,7 +33167,7 @@ exx/floor-tile03
 }
 {
 "classname" "misc_model"
-"origin" "-944.000000 1440.000000 255.000000"
+"origin" "-944.000000 1440.000000 256.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "90.000008"
 "modelscale" "0.500000"
@@ -33168,7 +33180,7 @@ exx/floor-tile03
 }
 {
 "classname" "misc_model"
-"origin" "-512.000000 1440.000000 255.000000"
+"origin" "-512.000000 1440.000000 256.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "90.000008"
 "modelscale" "0.500000"
@@ -33181,7 +33193,7 @@ exx/floor-tile03
 }
 {
 "classname" "misc_model"
-"origin" "-712.000000 1440.000000 255.000000"
+"origin" "-712.000000 1440.000000 256.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "90.000008"
 "modelscale" "0.500000"
@@ -33194,7 +33206,7 @@ exx/floor-tile03
 }
 {
 "classname" "misc_model"
-"origin" "-1087.000000 1346.000000 255.000000"
+"origin" "-1087.000000 1346.000000 256.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "135.000015"
 "modelscale" "0.500000"
@@ -33474,7 +33486,7 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "-800.000000 1464.000000 575.000000"
+"origin" "-800.000000 1464.000000 576.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "179.999985"
 }
@@ -33486,7 +33498,7 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "-831.999878 1152.000000 575.000000"
+"origin" "-831.999878 1152.000000 576.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "134.999985"
 }
@@ -33498,7 +33510,7 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "-223.999969 1119.999878 575.000000"
+"origin" "-223.999969 1119.999878 576.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "44.999985"
 }
@@ -33510,7 +33522,7 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "-1026.000000 735.000000 319.000000"
+"origin" "-1026.000000 735.000000 320.000000"
 "model" "models/lights/xonlight02.md3"
 "angle" "-179.999985"
 }
@@ -33522,7 +33534,7 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "-1088.000000 488.000000 319.000000"
+"origin" "-1088.000000 488.000000 320.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "179.999985"
 }
@@ -33546,7 +33558,7 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "-6.000000 737.000000 319.000000"
+"origin" "-6.000000 737.000000 320.000000"
 "model" "models/lights/xonlight02.md3"
 "angle" "0.000016"
 }
@@ -33558,7 +33570,7 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "56.000122 984.000000 319.000000"
+"origin" "56.000122 984.000000 320.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "0.000010"
 }
@@ -33570,7 +33582,7 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "56.000061 488.000000 319.000000"
+"origin" "56.000061 488.000000 320.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "0.000010"
 }
@@ -35218,7 +35230,7 @@ trak5x/floor-tile4e
 }
 {
 "classname" "misc_model"
-"origin" "-32.000000 1472.000000 575.000000"
+"origin" "-32.000000 1472.000000 576.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "179.999985"
 }
@@ -35230,7 +35242,7 @@ trak5x/floor-tile4e
 }
 {
 "classname" "misc_model"
-"origin" "-264.000000 1472.000000 575.000000"
+"origin" "-264.000000 1472.000000 576.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "179.999985"
 }
@@ -35278,7 +35290,7 @@ trak5x/floor-tile4e
 }
 {
 "classname" "misc_model"
-"origin" "-511.000000 -386.000000 767.000000"
+"origin" "-511.000000 -386.000000 768.000000"
 "model" "models/lights/xonlight02.md3"
 "angle" "-90.000000"
 }
@@ -35290,7 +35302,7 @@ trak5x/floor-tile4e
 }
 {
 "classname" "misc_model"
-"origin" "-127.000000 -386.000000 767.000000"
+"origin" "-127.000000 -386.000000 768.000000"
 "model" "models/lights/xonlight02.md3"
 "angle" "-90.000000"
 }
@@ -35353,7 +35365,7 @@ trak5x/floor-tile4e
 }
 {
 "classname" "misc_model"
-"origin" "-639.999939 -1152.000000 463.000000"
+"origin" "-639.999939 -1152.000000 464.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "-179.999985"
 }
@@ -35365,7 +35377,7 @@ trak5x/floor-tile4e
 }
 {
 "classname" "misc_model"
-"origin" "320.000061 -1440.000000 479.000000"
+"origin" "320.000061 -1440.000000 480.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "-179.999985"
 }
@@ -35377,7 +35389,7 @@ trak5x/floor-tile4e
 }
 {
 "classname" "misc_model"
-"origin" "640.000000 -960.000122 479.000000"
+"origin" "640.000000 -960.000122 480.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "90.000008"
 }
@@ -35389,7 +35401,7 @@ trak5x/floor-tile4e
 }
 {
 "classname" "misc_model"
-"origin" "912.000000 -960.000122 479.000000"
+"origin" "912.000000 -960.000122 480.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "90.000008"
 }
@@ -35401,7 +35413,7 @@ trak5x/floor-tile4e
 }
 {
 "classname" "misc_model"
-"origin" "640.000000 -1280.000122 479.000000"
+"origin" "640.000000 -1280.000122 480.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "90.000008"
 }
@@ -36478,24 +36490,6 @@ trak5x/light-light2a-surfacelight
 }
 {
 "classname" "light"
-"origin" "368.000000 -192.000000 424.000000"
-"light" "30"
-}
-{
-"classname" "light"
-"origin" "368.000000 -192.000000 432.000000"
-"light" "30"
-"_color" "1 0.977478 0.598703"
-"target" "target_position35"
-}
-{
-"classname" "target_position"
-"origin" "368.000000 -192.000000 352.000000"
-"targetname" "target_position35"
-"angle" "-179.999985"
-}
-{
-"classname" "light"
 "origin" "1160.000000 -200.000000 424.000000"
 "light" "30"
 }
@@ -36532,7 +36526,7 @@ trak5x/light-light2a-surfacelight
 }
 {
 "classname" "misc_model"
-"origin" "296.000000 -384.000000 799.000000"
+"origin" "296.000000 -384.000000 800.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "179.999985"
 }
@@ -36544,7 +36538,7 @@ trak5x/light-light2a-surfacelight
 }
 {
 "classname" "misc_model"
-"origin" "600.000000 -384.000000 799.000000"
+"origin" "600.000000 -384.000000 800.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "179.999985"
 }
@@ -37034,7 +37028,7 @@ exx/base-metal01
 }
 {
 "classname" "misc_model"
-"origin" "800.000000 -160.000000 399.000000"
+"origin" "800.000000 -160.000000 400.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "45.000000"
 }
@@ -37221,7 +37215,7 @@ exx/trim-psimple04
 }
 {
 "classname" "misc_model"
-"origin" "-511.000000 -386.000000 479.000000"
+"origin" "-511.000000 -386.000000 480.000000"
 "model" "models/lights/xonlight02.md3"
 "angle" "-90.000000"
 }
@@ -38259,7 +38253,7 @@ exx/floor-tile03
 }
 {
 "classname" "misc_model"
-"origin" "800.000000 1248.000000 319.000000"
+"origin" "800.000000 1248.000000 320.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "179.999985"
 }
@@ -38271,7 +38265,7 @@ exx/floor-tile03
 }
 {
 "classname" "misc_model"
-"origin" "800.000000 1056.000000 319.000000"
+"origin" "800.000000 1056.000000 320.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "179.999985"
 }
@@ -40676,7 +40670,7 @@ common/weapclip
 }
 {
 "classname" "misc_model"
-"origin" "-512.000000 832.000000 351.000000"
+"origin" "-512.000000 832.000000 352.000000"
 "model" "models/lights/xonlight01.md3"
 "angle" "90.000000"
 }
@@ -40686,3 +40680,38 @@ common/weapclip
 "light" "180"
 "_color" "1 0.900877 0.745953"
 }
+{
+"classname" "light"
+"origin" "296.000000 -384.000000 424.000000"
+"light" "30"
+}
+{
+"classname" "light"
+"origin" "368.000000 -192.000000 424.000000"
+"light" "30"
+}
+{
+"classname" "light"
+"origin" "368.000000 -192.000000 432.000000"
+"light" "30"
+"_color" "1 0.977478 0.598703"
+"target" "target_position35"
+}
+{
+"classname" "target_position"
+"origin" "368.000000 -192.000000 352.000000"
+"targetname" "target_position35"
+"angle" "-179.999985"
+}
+{
+"classname" "light"
+"origin" "296.000000 -384.000000 432.000000"
+"light" "30"
+"_color" "1 0.977478 0.598703"
+"target" "target_position38"
+}
+{
+"classname" "target_position"
+"origin" "296.000000 -384.000000 352.000000"
+"targetname" "target_position38"
+}

diff --git a/maps/atelier.map.options b/maps/atelier.map.options
index 268fd0fc4dd9ab3a2c804aded260fe91c234ee86..6e919deb76eb20b88b59cb4165cb1eb2f8fdbd41 100644 (file)
--- a/maps/atelier.map.options
+++ b/maps/atelier.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 5d
+Version: 5e