Close hole, fix clips/zfights

diff --git a/maps/atelier.map b/maps/atelier.map
index ad6d4b00046119bad063528d2f4d8682c87055bb..c509b0efad787afe3db35400331d4de3f16f9cc3 100644 (file)
--- a/maps/atelier.map
+++ b/maps/atelier.map
@@ -3642,14 +3642,6 @@ trak5x/base-pipe1a
 ( 192 960 224 ) ( -48 1200 96 ) ( 192 960 96 ) common/caulk 0 128 0 0.25 0.25 0 0 0
 }
 {
-( 680 360 256 ) ( 680 360 0 ) ( 424 104 0 ) exx/trim-metalsupp01 85.3334960938 0 0 -0.1875 0.25 0 0 0
-( 728 472 0 ) ( 728 472 256 ) ( 472 216 256 ) common/caulk 96 0 0 -0.25 0.25 0 0 0
-( 768 448 64 ) ( 704 512 -64 ) ( 768 448 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 616 1088 256 ) ( 664 1088 256 ) ( 616 1216 256 ) common/caulk 0 256 180 0.25 0.25 0 0 0
-( 736 1088 576 ) ( 712 1088 576 ) ( 736 1216 576 ) common/caulk 0 256 180 0.25 0.25 0 0 0
-( 744 424 -64 ) ( 736 432 -64 ) ( 744 424 64 ) common/caulk 96 0 0 -0.25 0.25 0 0 0
-}
-{
 ( 232 -88 256 ) ( 232 -88 0 ) ( -24 -344 0 ) exx/wall-metalb01 82.6667480469 0 0 0.150000006 0.25 0 0 0
 ( 280 24 0 ) ( 280 24 256 ) ( 24 -232 256 ) common/caulk 96 0 0 -0.25 0.25 0 0 0
 ( 152 -168 -64 ) ( 136 -152 -64 ) ( 152 -168 64 ) common/caulk 96 0 0 -0.25 0.25 0 0 0
@@ -10924,46 +10916,6 @@ effects_item/respawnring-blue
 ( -1976 -152 144 ) ( -1976 1704 144 ) ( -1976 -152 256 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-patchDef2
-{
-common/clip
-( 3 3 0 0 0 )
-(
-( ( -1480 128 0 0 0 ) ( -1480 128 64 0 -0.5 ) ( -1480 128 128 0 -1 ) )
-( ( -1480 -8 0 1 0 ) ( -1480 -8 64 1 -0.5 ) ( -1480 -8 128 1 -1 ) )
-( ( -1344 -8 0 2 0 ) ( -1344 -8 64 2 -0.5 ) ( -1344 -8 128 2 -1 ) )
-)
-}
-}
-{
-( -1312 0 128 ) ( -1312 -8 128 ) ( -1344 0 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -1312 0 128 ) ( -1344 0 128 ) ( -1312 0 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -1152 0 128 ) ( -1152 0 0 ) ( -1152 -8 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -1344 -8 0 ) ( -1312 -8 0 ) ( -1344 0 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -1344 -8 0 ) ( -1344 -8 128 ) ( -1312 -8 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -1344 -8 0 ) ( -1344 0 0 ) ( -1344 -8 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
-( -1312 -120 128 ) ( -1312 -128 128 ) ( -1344 -120 128 ) common/clip 0 32 0 0.25 0.25 0 0 0
-( -1312 -120 128 ) ( -1344 -120 128 ) ( -1312 -120 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -1152 -120 128 ) ( -1152 -120 0 ) ( -1152 -128 128 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -1344 -128 0 ) ( -1312 -128 0 ) ( -1344 -120 0 ) common/clip 0 32 0 0.25 0.25 0 0 0
-( -1344 -128 0 ) ( -1344 -128 128 ) ( -1312 -128 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -1344 -128 0 ) ( -1344 -120 0 ) ( -1344 -128 128 ) common/clip 224 0 0 0.25 0.25 0 0 0
-}
-{
-patchDef2
-{
-common/clip
-( 3 3 0 0 0 )
-(
-( ( -1592 128 128 0 0 ) ( -1592 128 64 0 0.4999999404 ) ( -1592 128 0 0 0.9999998808 ) )
-( ( -1592 -120 128 -1.9999997616 0 ) ( -1592 -120 64 -1.9999998808 0.4999999404 ) ( -1592 -120 0 -1.9999998808 0.9999999404 ) )
-( ( -1344 -120 128 -3.9999995232 0 ) ( -1344 -120 64 -3.9999995232 0.499999851 ) ( -1344 -120 0 -3.9999997616 0.9999998808 ) )
-)
-}
-}
-{
 ( -1216 128 1 ) ( -1216 -120 1 ) ( -1600 128 1 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -1216 128 0 ) ( -1600 128 0 ) ( -1216 128 -8 ) common/clip 0 224 0 0.25 0.25 0 0 0
 ( -1216 128 0 ) ( -1216 128 -8 ) ( -1216 -120 0 ) common/clip 0 224 0 0.25 0.25 0 0 0
@@ -11020,54 +10972,6 @@ common/clip
 ( -1280 288 144 ) ( -1280 472 144 ) ( -1280 288 256 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -768 -768 464 ) ( -768 -896 464 ) ( -800 -768 464 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -768 -768 320 ) ( -800 -768 320 ) ( -768 -768 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -768 -768 320 ) ( -768 -768 192 ) ( -768 -896 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -800 -896 192 ) ( -768 -896 192 ) ( -800 -768 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -800 -896 192 ) ( -800 -896 320 ) ( -768 -896 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -800 -896 192 ) ( -800 -768 192 ) ( -800 -896 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
-( -512 -1280 464 ) ( -640 -1280 464 ) ( -512 -1248 464 ) common/clip 256 0 -90 0.25 0.25 0 0 0
-( -512 -1280 320 ) ( -512 -1248 320 ) ( -512 -1280 192 ) common/clip 0 0 0 -0.25 0.25 0 0 0
-( -512 -1280 320 ) ( -512 -1280 192 ) ( -640 -1280 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -640 -1248 192 ) ( -640 -1280 192 ) ( -512 -1248 192 ) common/clip 256 0 -90 0.25 0.25 0 0 0
-( -640 -1248 192 ) ( -640 -1248 320 ) ( -640 -1280 192 ) common/clip 0 0 0 -0.25 0.25 0 0 0
-( -640 -1248 192 ) ( -512 -1248 192 ) ( -640 -1248 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
-patchDef2
-{
-common/clip
-( 3 3 0 0 0 )
-(
-( ( -800 -896 192 0 0 ) ( -800 -896 328 0 -0.5 ) ( -800 -896 464 0 -1 ) )
-( ( -800 -1056 192 1 0 ) ( -800 -1056 328 1 -0.5 ) ( -800 -1056 464 1 -1 ) )
-( ( -640 -1056 192 2 0 ) ( -640 -1056 328 2 -0.5 ) ( -640 -1056 464 2 -1 ) )
-)
-}
-}
-{
-( -992 -768 464 ) ( -992 -896 464 ) ( -1024 -768 464 ) common/clip 128 0 0 0.25 0.25 0 0 0
-( -992 -768 320 ) ( -1024 -768 320 ) ( -992 -768 192 ) common/clip 128 0 0 0.25 0.25 0 0 0
-( -992 -768 320 ) ( -992 -768 192 ) ( -992 -896 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -1024 -896 192 ) ( -992 -896 192 ) ( -1024 -768 192 ) common/clip 128 0 0 0.25 0.25 0 0 0
-( -1024 -896 192 ) ( -1024 -896 320 ) ( -992 -896 192 ) common/clip 128 0 0 0.25 0.25 0 0 0
-( -1024 -896 192 ) ( -1024 -768 192 ) ( -1024 -896 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
-patchDef2
-{
-common/clip
-( 3 3 0 0 0 )
-(
-( ( -992 -896 464 0 -1 ) ( -992 -896 328 0 -0.5 ) ( -992 -896 192 0 0 ) )
-( ( -992 -1248 464 1 -1 ) ( -992 -1248 328 1 -0.5 ) ( -992 -1248 192 1 0 ) )
-( ( -640 -1248 464 2 -1 ) ( -640 -1248 328 2 -0.5 ) ( -640 -1248 192 2 0 ) )
-)
-}
-}
-{
 ( -576 -1024 193 ) ( -576 -1152 193 ) ( -640 -1024 193 ) common/clip 128 0 90 0.25 0.25 0 0 0
 ( -512 -1024 192 ) ( -512 -1024 128 ) ( -512 -1152 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -640 -1152 128 ) ( -576 -1152 128 ) ( -640 -1024 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
@@ -11092,14 +10996,6 @@ common/clip
 ( -512 -1056 128 ) ( -384 -1056 128 ) ( -512 -1056 193 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -512 -1056 464 ) ( -640 -1056 464 ) ( -512 -1024 464 ) common/clip 128 0 -90 0.25 0.25 0 0 0
-( -512 -1056 320 ) ( -512 -1024 320 ) ( -512 -1056 192 ) common/clip 128 0 0 -0.25 0.25 0 0 0
-( -512 -1056 320 ) ( -512 -1056 192 ) ( -640 -1056 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -640 -1024 192 ) ( -640 -1056 192 ) ( -512 -1024 192 ) common/clip 128 0 -90 0.25 0.25 0 0 0
-( -640 -1024 192 ) ( -640 -1024 320 ) ( -640 -1056 192 ) common/clip 128 0 0 -0.25 0.25 0 0 0
-( -640 -1024 192 ) ( -512 -1024 192 ) ( -640 -1024 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( -184 -1464 768 ) ( -184 -1544 768 ) ( -384 -1464 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -184 -1472 768 ) ( -384 -1472 768 ) ( -184 -1472 192 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 192 -1464 768 ) ( 192 -1464 192 ) ( 192 -1544 768 ) common/clip 0 0 0 0.25 0.25 0 0 0
@@ -11152,7 +11048,7 @@ common/clip
 {
 patchDef2
 {
-common/clip
+common/weapclip
 ( 3 3 0 0 0 )
 (
 ( ( 704 -1472 480 0 -1 ) ( 704 -1472 336 0 -0.5 ) ( 704 -1472 192 0 0 ) )
@@ -11932,6 +11828,18 @@ trak5x/base-pipe1a
 ( -245.5600585938 -831.059753418 195.9983825684 ) ( -245.5600585938 -831.059753418 203.6117095947 ) ( -276.0973358154 -900.80027771 195.9983825684 ) common/weapclip 210.6493835449 55.8125724792 0 -0.4650038481 0.2379163057 0 0 0
 ( -255.5877532959 -834.9800720215 195.9983825684 ) ( -185.8472290039 -865.5174102783 195.9983825684 ) ( -255.5877532959 -834.9800720215 203.6117095947 ) common/weapclip 17.5682373047 55.8125724792 0 0.4650038481 0.2379163057 0 0 0
 }
+{
+patchDef2
+{
+common/weapclip
+( 3 3 0 0 0 )
+(
+( ( 704 -1472.125 320 0 -1 ) ( 704 -1472.125 256 0 -0.5 ) ( 704 -1472.125 192 0 0 ) )
+( ( 768 -1472.125 320 0.5 -1 ) ( 768 -1472.125 256 0.5 -0.5 ) ( 768 -1472.125 192 0.5 0 ) )
+( ( 768 -1408.125 320 1 -1 ) ( 768 -1408.125 256 1 -0.5 ) ( 768 -1408.125 192 1 0 ) )
+)
+}
+}
 }
 {
 "classname" "func_group"
@@ -31484,36 +31392,36 @@ exx/wall-metal01b
 {
 "classname" "func_group"
 {
-( -560 -128 104 ) ( -560 -152 104 ) ( -568 -152 112 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -552 -128 128 ) ( -568 -128 128 ) ( -552 -128 0 ) trak5x/base-ribs1a 32 0 0 0.25 0.25 134217728 0 0
-( -560 -128 16 ) ( -560 -152 16 ) ( -560 -152 104 ) trak5x/base-ribs1a 288 0 0 0.25 0.25 134217728 0 0
-( -560 -152 16 ) ( -560 -128 16 ) ( -568 -152 8 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -568 -152 0 ) ( -568 -152 128 ) ( -552 -152 0 ) trak5x/base-ribs1a 32 0 0 0.25 0.25 134217728 0 0
-( -568 -144 8 ) ( -568 -128 8 ) ( -568 -144 136 ) trak5x/base-ribs1a 288 32 0 0.25 0.25 134217728 0 0
+( -548 -128 104 ) ( -548 -152 104 ) ( -556 -152 112 ) common/caulk 208 0 0 0.25 0.25 134217728 0 0
+( -540 -128 128 ) ( -556 -128 128 ) ( -540 -128 0 ) trak5x/base-ribs1a 496 0 0 0.25 0.25 134217728 0 0
+( -548 -128 16 ) ( -548 -152 16 ) ( -548 -152 104 ) trak5x/base-ribs1a 288 0 0 0.25 0.25 134217728 0 0
+( -548 -152 16 ) ( -548 -128 16 ) ( -556 -152 8 ) common/caulk 208 0 0 0.25 0.25 134217728 0 0
+( -556 -152 0 ) ( -556 -152 128 ) ( -540 -152 0 ) trak5x/base-ribs1a 496 0 0 0.25 0.25 134217728 0 0
+( -556 -144 8 ) ( -556 -128 8 ) ( -556 -144 136 ) trak5x/base-ribs1a 288 32 0 0.25 0.25 134217728 0 0
 }
 {
-( -488 -128 104 ) ( -488 -152 104 ) ( -480 -152 112 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -448 -128 96 ) ( -448 -128 112 ) ( -576 -128 96 ) trak5x/base-ribs1a 256 256 -90 0.25 0.25 134217728 0 0
-( -560 -128 104 ) ( -560 -152 104 ) ( -472 -152 104 ) trak5x/base-ribs1a 288 256 90 0.25 -0.25 134217728 0 0
-( -560 -152 104 ) ( -560 -128 104 ) ( -568 -152 112 ) common/caulk 96 0 0 0.25 0.25 134217728 0 0
-( -576 -152 112 ) ( -448 -152 112 ) ( -576 -152 96 ) trak5x/base-ribs1a 256 256 -90 0.25 0.25 134217728 0 0
-( -568 -144 112 ) ( -568 -128 112 ) ( -440 -144 112 ) trak5x/base-ribs1a 288 288 90 0.25 -0.25 134217728 0 0
+( -476 -128 104 ) ( -476 -152 104 ) ( -468 -152 112 ) common/caulk 208 0 0 0.25 0.25 134217728 0 0
+( -436 -128 96 ) ( -436 -128 112 ) ( -564 -128 96 ) trak5x/base-ribs1a 256 304 -90 0.25 0.25 134217728 0 0
+( -548 -128 104 ) ( -548 -152 104 ) ( -460 -152 104 ) trak5x/base-ribs1a 288 304 90 0.25 -0.25 134217728 0 0
+( -548 -152 104 ) ( -548 -128 104 ) ( -556 -152 112 ) common/caulk 48 0 0 0.25 0.25 134217728 0 0
+( -564 -152 112 ) ( -436 -152 112 ) ( -564 -152 96 ) trak5x/base-ribs1a 256 304 -90 0.25 0.25 134217728 0 0
+( -556 -144 112 ) ( -556 -128 112 ) ( -428 -144 112 ) trak5x/base-ribs1a 288 336 90 0.25 -0.25 134217728 0 0
 }
 {
-( -488 -128 16 ) ( -488 -152 16 ) ( -480 -152 8 ) common/caulk 160 0 0 -0.25 0.25 134217728 0 0
-( -496 -128 -8 ) ( -480 -128 -8 ) ( -496 -128 120 ) trak5x/base-ribs1a 448 32 180 0.25 0.25 134217728 0 0
-( -488 -128 104 ) ( -488 -152 104 ) ( -488 -152 16 ) trak5x/base-ribs1a 288 32 0 0.25 -0.25 134217728 0 0
-( -488 -152 104 ) ( -488 -128 104 ) ( -480 -152 112 ) common/caulk 160 0 0 -0.25 0.25 134217728 0 0
-( -480 -152 120 ) ( -480 -152 -8 ) ( -496 -152 120 ) trak5x/base-ribs1a 448 32 180 0.25 0.25 134217728 0 0
-( -480 -144 112 ) ( -480 -128 112 ) ( -480 -144 -16 ) trak5x/base-ribs1a 288 64 0 0.25 -0.25 134217728 0 0
+( -476 -128 16 ) ( -476 -152 16 ) ( -468 -152 8 ) common/caulk 208 0 0 -0.25 0.25 134217728 0 0
+( -484 -128 -8 ) ( -468 -128 -8 ) ( -484 -128 120 ) trak5x/base-ribs1a 496 32 180 0.25 0.25 134217728 0 0
+( -476 -128 104 ) ( -476 -152 104 ) ( -476 -152 16 ) trak5x/base-ribs1a 288 32 0 0.25 -0.25 134217728 0 0
+( -476 -152 104 ) ( -476 -128 104 ) ( -468 -152 112 ) common/caulk 208 0 0 -0.25 0.25 134217728 0 0
+( -468 -152 120 ) ( -468 -152 -8 ) ( -484 -152 120 ) trak5x/base-ribs1a 496 32 180 0.25 0.25 134217728 0 0
+( -468 -144 112 ) ( -468 -128 112 ) ( -468 -144 -16 ) trak5x/base-ribs1a 288 64 0 0.25 -0.25 134217728 0 0
 }
 {
-( -560 -128 16 ) ( -560 -152 16 ) ( -568 -152 8 ) common/caulk 160 0 0 -0.25 0.25 134217728 0 0
-( -600 -128 24 ) ( -600 -128 8 ) ( -472 -128 24 ) trak5x/base-ribs1a 288 352 90 0.25 0.25 134217728 0 0
-( -488 -128 16 ) ( -488 -152 16 ) ( -576 -152 16 ) trak5x/base-ribs1a 288 352 90 0.25 0.25 134217728 0 0
-( -488 -152 16 ) ( -488 -128 16 ) ( -480 -152 8 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
-( -472 -152 8 ) ( -600 -152 8 ) ( -472 -152 24 ) trak5x/base-ribs1a 288 352 90 0.25 0.25 134217728 0 0
-( -480 -144 8 ) ( -480 -128 8 ) ( -608 -144 8 ) trak5x/base-ribs1a 288 384 90 0.25 0.25 134217728 0 0
+( -548 -128 16 ) ( -548 -152 16 ) ( -556 -152 8 ) common/caulk 208 0 0 -0.25 0.25 134217728 0 0
+( -588 -128 24 ) ( -588 -128 8 ) ( -460 -128 24 ) trak5x/base-ribs1a 288 304 90 0.25 0.25 134217728 0 0
+( -476 -128 16 ) ( -476 -152 16 ) ( -564 -152 16 ) trak5x/base-ribs1a 288 304 90 0.25 0.25 134217728 0 0
+( -476 -152 16 ) ( -476 -128 16 ) ( -468 -152 8 ) common/caulk 48 0 0 -0.25 0.25 134217728 0 0
+( -460 -152 8 ) ( -588 -152 8 ) ( -460 -152 24 ) trak5x/base-ribs1a 288 304 90 0.25 0.25 134217728 0 0
+( -468 -144 8 ) ( -468 -128 8 ) ( -596 -144 8 ) trak5x/base-ribs1a 288 336 90 0.25 0.25 134217728 0 0
 }
 }
 {
@@ -37191,11 +37099,11 @@ exx/base-metal01
 }
 {
 "classname" "item_rockets"
-"origin" "32.000000 -992.000000 200.000000"
+"origin" "32.000000 -1008.000000 200.000000"
 }
 {
 "classname" "item_cells"
-"origin" "224.000000 -992.000000 200.000000"
+"origin" "224.000000 -1008.000000 200.000000"
 }
 {
 "classname" "item_rockets"
@@ -38501,11 +38409,11 @@ exx/floor-tile03
 "classname" "trigger_teleport"
 "target" "misc_teleporter_dest1"
 {
-( -448 -120 120 ) ( -448 -136 120 ) ( -576 -120 120 ) common/trigger 0 224 0 0.25 0.25 0 0 0
-( -448 -120 192 ) ( -576 -120 192 ) ( -448 -120 0 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -470 -120 192 ) ( -470 -120 0 ) ( -470 -136 192 ) common/trigger 32 0 0 0.25 0.25 0 0 0
-( -576 -136 0 ) ( -448 -136 0 ) ( -576 -120 0 ) common/trigger 0 224 0 0.25 0.25 0 0 0
-( -576 -128 0 ) ( -576 -128 192 ) ( -448 -128 0 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -436 -120 120 ) ( -436 -136 120 ) ( -564 -120 120 ) common/trigger 208 224 0 0.25 0.25 0 0 0
+( -436 -120 192 ) ( -564 -120 192 ) ( -436 -120 0 ) common/trigger 208 0 0 0.25 0.25 0 0 0
+( -450 -120 192 ) ( -450 -120 0 ) ( -450 -136 192 ) common/trigger 32 0 0 0.25 0.25 0 0 0
+( -564 -136 0 ) ( -436 -136 0 ) ( -564 -120 0 ) common/trigger 208 224 0 0.25 0.25 0 0 0
+( -564 -128 0 ) ( -564 -128 192 ) ( -436 -128 0 ) common/trigger 208 0 0 0.25 0.25 0 0 0
 ( -576 -136 0 ) ( -576 -120 0 ) ( -576 -136 192 ) common/trigger 32 0 0 0.25 0.25 0 0 0
 }
 }
@@ -38517,12 +38425,12 @@ exx/floor-tile03
 {
 "classname" "func_group"
 {
-( -488 -136 104 ) ( -488 -152 104 ) ( -560 -136 104 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
-( -488 -136 112 ) ( -560 -136 112 ) ( -488 -136 8 ) liquids_water/water1 0 0 0 0.25 0.25 134217728 0 0
-( -488 -136 112 ) ( -488 -136 8 ) ( -488 -152 112 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
-( -560 -152 16 ) ( -488 -152 16 ) ( -560 -136 16 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
-( -560 -152 8 ) ( -560 -152 112 ) ( -488 -152 8 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
-( -560 -152 8 ) ( -560 -136 8 ) ( -560 -152 112 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
+( -476 -136 104 ) ( -476 -152 104 ) ( -548 -136 104 ) common/nodrawnonsolid 208 0 0 0.25 0.25 134217728 0 0
+( -476 -136 112 ) ( -548 -136 112 ) ( -476 -136 8 ) liquids_water/water1 464 0 0 0.25 0.25 134217728 0 0
+( -476 -136 112 ) ( -476 -136 8 ) ( -476 -152 112 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
+( -548 -152 16 ) ( -476 -152 16 ) ( -548 -136 16 ) common/nodrawnonsolid 208 0 0 0.25 0.25 134217728 0 0
+( -548 -152 8 ) ( -548 -152 112 ) ( -476 -152 8 ) common/nodrawnonsolid 208 0 0 0.25 0.25 134217728 0 0
+( -548 -152 8 ) ( -548 -136 8 ) ( -548 -152 112 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
 }
 }
 {
@@ -40174,7 +40082,7 @@ common/clip
 }
 {
 "classname" "target_speaker"
-"origin" "-520.000000 -96.000000 56.000000"
+"origin" "-508.000000 -96.000000 56.000000"
 "noise" "sound/machines/portal_idle.wav"
 "spawnflags" "1"
 }
@@ -40455,69 +40363,12 @@ common/clip
 {
 patchDef2
 {
-common/clip
-( 3 3 0 0 0 )
-(
-( ( 864 -15.5 960 0 0 ) ( 699.5555419922 144.5 960 2.9999997616 0 ) ( 592.6666870117 248.5 960 5.9999995232 0 ) )
-( ( 864 -15.5 768 0 0.4999999702 ) ( 699.5555419922 144.5 768 2.9999997616 0.5000005364 ) ( 592.6666870117 248.5 768 5.9999995232 0.5000005364 ) )
-( ( 839.3333129883 -39.5 768 0 0.9999999404 ) ( 674.8889160156 120.5 768 3 0.999999702 ) ( 568 224.5 768 5.9999995232 1.0000010729 ) )
-)
-}
-}
-}
-{
-"classname" "func_group"
-{
-patchDef2
-{
-common/clip
-( 3 3 0 0 0 )
-(
-( ( 1192 -15.5 960 0 0 ) ( 1024 -167.5 960 2.9999997616 0 ) ( 856 -15.5 960 5.9999995232 0 ) )
-( ( 1192 -15.5 768 0 0.4999999702 ) ( 1024 -167.5 768 2.9999997616 0.5000005364 ) ( 856 -15.5 768 5.9999995232 0.5000005364 ) )
-( ( 1216 -39.5 768 0 0.9999999404 ) ( 1024 -215.5 768 3 0.999999702 ) ( 832 -39.5 768 5.9999995232 1.0000010729 ) )
-)
-}
-}
-}
-{
-"classname" "func_group"
-{
-patchDef2
-{
-common/clip
-( 3 3 0 0 0 )
-(
-( ( 1392 184.5 960 5.9999995232 0 ) ( 1288 80.5 960 2.9999997616 0 ) ( 1192 -15.4999961853 960 0 0 ) )
-( ( 1392 184.5 768 5.9999995232 0.5000005364 ) ( 1288 80.5 768 2.9999997616 0.5000005364 ) ( 1192 -15.4999961853 768 0 0.4999999702 ) )
-( ( 1408 152.5 768 5.9999995232 1.0000010729 ) ( 1312 56.5000038147 768 3 0.999999702 ) ( 1216 -39.4999923706 768 0 0.9999999404 ) )
-)
-}
-}
-{
-patchDef2
-{
-common/clip
-( 3 3 0 0 0 )
-(
-( ( 1544 184.5 960 5.9999995232 0 ) ( 1468 184.5 960 2.9999997616 0 ) ( 1392 184.5 960 0 0 ) )
-( ( 1544 184.5 768 5.9999995232 0.5000005364 ) ( 1468 184.5 768 2.9999997616 0.5000005364 ) ( 1392 184.5 768 0 0.4999999702 ) )
-( ( 1528.8000488281 152.5 768 5.9999995232 1.0000010729 ) ( 1468 152.5 768 3 0.999999702 ) ( 1407.1999511719 152.5 768 0 0.9999999404 ) )
-)
-}
-}
-}
-{
-"classname" "func_group"
-{
-patchDef2
-{
 common/weapclip
 ( 3 3 0 0 0 )
 (
-( ( 864 -15.5 960 0 0 ) ( 699.5555419922 144.5 960 2.9999997616 0 ) ( 592.6666870117 248.5 960 5.9999995232 0 ) )
-( ( 864 -15.5 768 0 0.4999999702 ) ( 699.5555419922 144.5 768 2.9999997616 0.5000005364 ) ( 592.6666870117 248.5 768 5.9999995232 0.5000005364 ) )
-( ( 839.3333129883 -39.5 768 0 0.9999999404 ) ( 674.8889160156 120.5 768 3 0.999999702 ) ( 568 224.5 768 5.9999995232 1.0000010729 ) )
+( ( 856 -15.5 960 0 0 ) ( 691.5555419922 144.5 960 2.9999997616 0 ) ( 584.6666870117 248.5 960 5.9999995232 0 ) )
+( ( 856 -15.5 768 0 0.4999999702 ) ( 691.5555419922 144.5 768 2.9999997616 0.5000005364 ) ( 584.6666870117 248.5 768 5.9999995232 0.5000005364 ) )
+( ( 831.3333129883 -39.5 768 0 0.9999999404 ) ( 666.8889160156 120.5 768 3 0.999999702 ) ( 560 224.5 768 5.9999995232 1.0000010729 ) )
 )
 }
 }
@@ -40611,21 +40462,6 @@ exx/wall-metal01
 {
 patchDef2
 {
-common/clip
-( 3 3 0 0 0 )
-(
-( ( 18 158.375 960.0000610352 -0.25 0 ) ( 18 -129.625 960.0000610352 2.7499997616 0 ) ( -270 -129.625 960.0000610352 5.7499995232 0 ) )
-( ( 18 158.375 764.0000610352 -0.25 0.4999999702 ) ( 18 -129.625 764.0000610352 2.7499997616 0.5000005364 ) ( -270 -129.625 764.0000610352 5.7499995232 0.5000005364 ) )
-( ( 50 158.375 764.0000610352 -0.25 0.9999999404 ) ( 50 -161.625 764.0000610352 2.75 0.999999702 ) ( -270 -161.625 764.0000610352 5.7499995232 1.0000010729 ) )
-)
-}
-}
-}
-{
-"classname" "func_group"
-{
-patchDef2
-{
 common/weapclip
 ( 3 3 0 0 0 )
 (
@@ -40641,21 +40477,6 @@ common/weapclip
 {
 patchDef2
 {
-common/clip
-( 3 3 0 0 0 )
-(
-( ( -734.75 -128.625 960 -0.0625 0 ) ( -1022.75 -128.625 960 2.9374997616 0 ) ( -1022.75 159.375 960 5.9374995232 0 ) )
-( ( -734.75 -128.625 764 -0.0625 0.4999999702 ) ( -1022.75 -128.625 764 2.9374997616 0.5000005364 ) ( -1022.75 159.375 764 5.9374995232 0.5000005364 ) )
-( ( -734.75 -160.625 764 -0.0625 0.9999999404 ) ( -1054.75 -160.625 764 2.9375 0.999999702 ) ( -1054.75 159.375 764 5.9374995232 1.0000010729 ) )
-)
-}
-}
-}
-{
-"classname" "func_group"
-{
-patchDef2
-{
 common/weapclip
 ( 3 3 0 0 0 )
 (
@@ -40671,21 +40492,6 @@ common/weapclip
 {
 patchDef2
 {
-common/clip
-( 3 3 0 0 0 )
-(
-( ( -270.25 -129.625 960 -0.25 0 ) ( -502.5 -129.625 960 2.7499997616 0 ) ( -734.75 -129.625 960 5.7499995232 0 ) )
-( ( -270.25 -129.625 763 -0.25 0.4999999702 ) ( -502.5 -129.625 763 2.7499997616 0.5000005364 ) ( -734.75 -129.625 763 5.7499995232 0.5000005364 ) )
-( ( -270.25 -161.625 763 -0.25 0.9999999404 ) ( -502.5 -161.625 763 2.75 0.999999702 ) ( -734.75 -161.625 763 5.7499995232 1.0000010729 ) )
-)
-}
-}
-}
-{
-"classname" "func_group"
-{
-patchDef2
-{
 common/weapclip
 ( 3 3 0 0 0 )
 (
@@ -40801,7 +40607,7 @@ common/weapclip
 }
 {
 "classname" "weapon_uzi"
-"origin" "-512.000000 824.000000 128.000000"
+"origin" "-512.000000 832.000000 128.000000"
 }
 {
 "classname" "item_health_small"

diff --git a/maps/atelier.map.options b/maps/atelier.map.options
index a5e527cce7e788e8cf16576e545913ebe46381ab..e108d6394067d82cb925e345c1d92bca86bdbf31 100644 (file)
--- a/maps/atelier.map.options
+++ b/maps/atelier.map.options
@@ -2,5 +2,4 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 2
-
+Version: 2a
\ No newline at end of file