Some tiny tweaks

diff --git a/maps/lab-610.map b/maps/lab-610.map
index 41e41c189528e600172bf8e5bb4ebabfb9bc8536..c9d05a0c62969771ce187f217899741103bcc56b 100644 (file)
--- a/maps/lab-610.map
+++ b/maps/lab-610.map
@@ -17541,7 +17541,7 @@ trak5x/base-pipe1d
 {
 "classname" "item_armor_large"
 "origin" "3520.000000 0.000000 -528.000000"
-"gametypefilter" "noteamspawns"
+"gametypefilter" "-ctf,ons,nexball"
 }
 {
 "classname" "item_armor_small"
@@ -17829,7 +17829,7 @@ trak5x/base-pipe1d
 {
 "classname" "item_armor_large"
 "origin" "-3520.000000 0.000000 496.000000"
-"gametypefilter" "noteamspawns"
+"gametypefilter" "-ctf,ons,nexball"
 }
 {
 "classname" "item_armor_small"
@@ -62719,32 +62719,32 @@ trak5x/base-pipe1b
 {
 ( -32 -576 20 ) ( 32 -512 20 ) ( 32 -576 20 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( -32 -576 16 ) ( 32 -512 16 ) ( -32 -512 16 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -32 -512 32 ) ( -32 -576 0 ) ( -32 -512 0 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -24 -576 -64 ) ( -32 -568 -64 ) ( -24 -576 64 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( -32 -512 32 ) ( -32 -576 0 ) ( -32 -512 0 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( -24 -576 -64 ) ( -32 -568 -64 ) ( -24 -576 64 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( 28 -516 64 ) ( -32 -516 -64 ) ( 28 -516 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( -28 -532 64 ) ( -28 -528 -64 ) ( -28 -532 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( -32 -576 20 ) ( 32 -512 20 ) ( 32 -576 20 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( -32 -576 16 ) ( 32 -512 16 ) ( -32 -512 16 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -24 -576 -64 ) ( -32 -568 -64 ) ( -24 -576 64 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 32 -576 0 ) ( -32 -576 32 ) ( 32 -576 32 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 32 -512 32 ) ( 32 -576 0 ) ( 32 -576 32 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( -24 -576 -64 ) ( -32 -568 -64 ) ( -24 -576 64 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( 32 -576 0 ) ( -32 -576 32 ) ( 32 -576 32 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( 32 -512 32 ) ( 32 -576 0 ) ( 32 -576 32 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( -28 -572 -64 ) ( 32 -572 -64 ) ( -28 -572 64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( -32 -576 20 ) ( 32 -512 20 ) ( 32 -576 20 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( -32 -576 16 ) ( 32 -512 16 ) ( -32 -512 16 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 32 -512 0 ) ( -32 -512 32 ) ( -32 -512 0 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -32 -512 32 ) ( -32 -576 0 ) ( -32 -512 0 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 32 -520 64 ) ( 24 -512 -64 ) ( 32 -520 -64 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( 32 -512 0 ) ( -32 -512 32 ) ( -32 -512 0 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( -32 -512 32 ) ( -32 -576 0 ) ( -32 -512 0 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( 32 -520 64 ) ( 24 -512 -64 ) ( 32 -520 -64 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( 28 -516 -64 ) ( -32 -516 -64 ) ( 28 -516 64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( -32 -576 20 ) ( 32 -512 20 ) ( 32 -576 20 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( -32 -576 16 ) ( 32 -512 16 ) ( -32 -512 16 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 32 -512 32 ) ( 32 -576 0 ) ( 32 -576 32 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 32 -520 64 ) ( 24 -512 -64 ) ( 32 -520 -64 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( 32 -512 32 ) ( 32 -576 0 ) ( 32 -576 32 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( 32 -520 64 ) ( 24 -512 -64 ) ( 32 -520 -64 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( -28 -572 64 ) ( 32 -572 -64 ) ( -28 -572 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 28 -532 64 ) ( 28 -556 -64 ) ( 28 -532 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
@@ -62878,25 +62878,25 @@ trak5x/base-pipe1b
 {
 ( 32 576 20 ) ( -32 512 20 ) ( -32 576 20 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( 32 576 16 ) ( -32 512 16 ) ( 32 512 16 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -32 512 32 ) ( -32 576 0 ) ( -32 576 32 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -32 520 64 ) ( -24 512 -64 ) ( -32 520 -64 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( -32 512 32 ) ( -32 576 0 ) ( -32 576 32 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( -32 520 64 ) ( -24 512 -64 ) ( -32 520 -64 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( 28 572 64 ) ( -32 572 -64 ) ( 28 572 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( -28 520 64 ) ( -28 528 -64 ) ( -28 520 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( 32 576 20 ) ( -32 512 20 ) ( -32 576 20 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( 32 576 16 ) ( -32 512 16 ) ( 32 512 16 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -32 512 0 ) ( 32 512 32 ) ( 32 512 0 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 32 512 32 ) ( 32 576 0 ) ( 32 512 0 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -32 520 64 ) ( -24 512 -64 ) ( -32 520 -64 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( -32 512 0 ) ( 32 512 32 ) ( 32 512 0 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( 32 512 32 ) ( 32 576 0 ) ( 32 512 0 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( -32 520 64 ) ( -24 512 -64 ) ( -32 520 -64 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( -28 516 -64 ) ( 32 516 -64 ) ( -28 516 64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( 32 576 20 ) ( -32 512 20 ) ( -32 576 20 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( 32 576 16 ) ( -32 512 16 ) ( 32 512 16 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 24 576 -64 ) ( 32 568 -64 ) ( 24 576 64 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -32 576 0 ) ( 32 576 32 ) ( -32 576 32 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -32 512 32 ) ( -32 576 0 ) ( -32 576 32 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( 24 576 -64 ) ( 32 568 -64 ) ( 24 576 64 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( -32 576 0 ) ( 32 576 32 ) ( -32 576 32 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( -32 512 32 ) ( -32 576 0 ) ( -32 576 32 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( 28 572 -64 ) ( -32 572 -64 ) ( 28 572 64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
@@ -62910,8 +62910,8 @@ trak5x/base-pipe1b
 {
 ( 32 576 20 ) ( -32 512 20 ) ( -32 576 20 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( 32 576 16 ) ( -32 512 16 ) ( 32 512 16 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 32 512 32 ) ( 32 576 0 ) ( 32 512 0 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 24 576 -64 ) ( 32 568 -64 ) ( 24 576 64 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( 32 512 32 ) ( 32 576 0 ) ( 32 512 0 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( 24 576 -64 ) ( 32 568 -64 ) ( 24 576 64 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( -28 516 64 ) ( 32 516 -64 ) ( -28 516 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 28 520 -64 ) ( 28 528 -64 ) ( 28 520 64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
@@ -62936,32 +62936,32 @@ trak5x/base-pipe1b
 {
 ( 1376 192 4 ) ( 1440 256 4 ) ( 1440 192 4 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( 1376 192 0 ) ( 1440 256 0 ) ( 1376 256 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1376 256 16 ) ( 1376 192 -16 ) ( 1376 256 -16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 1384 192 -80 ) ( 1376 200 -80 ) ( 1384 192 48 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( 1376 256 16 ) ( 1376 192 -16 ) ( 1376 256 -16 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( 1384 192 -80 ) ( 1376 200 -80 ) ( 1384 192 48 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( 1436 252 48 ) ( 1376 252 -80 ) ( 1436 252 -80 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 1380 236 48 ) ( 1380 240 -80 ) ( 1380 236 -80 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( 1376 192 4 ) ( 1440 256 4 ) ( 1440 192 4 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( 1376 192 0 ) ( 1440 256 0 ) ( 1376 256 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1384 192 -80 ) ( 1376 200 -80 ) ( 1384 192 48 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 1440 192 -16 ) ( 1376 192 16 ) ( 1440 192 16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 1440 256 16 ) ( 1440 192 -16 ) ( 1440 192 16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( 1384 192 -80 ) ( 1376 200 -80 ) ( 1384 192 48 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( 1440 192 -16 ) ( 1376 192 16 ) ( 1440 192 16 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( 1440 256 16 ) ( 1440 192 -16 ) ( 1440 192 16 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( 1380 196 -80 ) ( 1440 196 -80 ) ( 1380 196 48 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( 1376 192 4 ) ( 1440 256 4 ) ( 1440 192 4 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( 1376 192 0 ) ( 1440 256 0 ) ( 1376 256 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1440 256 -16 ) ( 1376 256 16 ) ( 1376 256 -16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 1376 256 16 ) ( 1376 192 -16 ) ( 1376 256 -16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 1440 248 48 ) ( 1432 256 -80 ) ( 1440 248 -80 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( 1440 256 -16 ) ( 1376 256 16 ) ( 1376 256 -16 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( 1376 256 16 ) ( 1376 192 -16 ) ( 1376 256 -16 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( 1440 248 48 ) ( 1432 256 -80 ) ( 1440 248 -80 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( 1436 252 -80 ) ( 1376 252 -80 ) ( 1436 252 48 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( 1376 192 4 ) ( 1440 256 4 ) ( 1440 192 4 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( 1376 192 0 ) ( 1440 256 0 ) ( 1376 256 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1440 256 16 ) ( 1440 192 -16 ) ( 1440 192 16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( 1440 248 48 ) ( 1432 256 -80 ) ( 1440 248 -80 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( 1440 256 16 ) ( 1440 192 -16 ) ( 1440 192 16 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
+( 1440 248 48 ) ( 1432 256 -80 ) ( 1440 248 -80 ) trak5x/base-pipe1b 0 0 0 0.25 0.25 134217728 0 0
 ( 1380 196 48 ) ( 1440 196 -80 ) ( 1380 196 -80 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 1436 236 48 ) ( 1436 212 -80 ) ( 1436 236 -80 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
@@ -62987,25 +62987,25 @@ trak5x/base-pipe1b
 {
 ( -1376 -192 4 ) ( -1440 -256 4 ) ( -1440 -192 4 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( -1376 -192 0 ) ( -1440 -256 0 ) ( -1376 -256 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -1440 -256 16 ) ( -1440 -192 -16 ) ( -1440 -192 16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -1440 -248 48 ) ( -1432 -256 -80 ) ( -1440 -248 -80 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( -1440 -256 16 ) ( -1440 -192 -16 ) ( -1440 -192 16 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( -1440 -248 48 ) ( -1432 -256 -80 ) ( -1440 -248 -80 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( -1380 -196 48 ) ( -1440 -196 -80 ) ( -1380 -196 -80 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( -1436 -248 48 ) ( -1436 -240 -80 ) ( -1436 -248 -80 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( -1376 -192 4 ) ( -1440 -256 4 ) ( -1440 -192 4 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( -1376 -192 0 ) ( -1440 -256 0 ) ( -1376 -256 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -1440 -256 -16 ) ( -1376 -256 16 ) ( -1376 -256 -16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -1376 -256 16 ) ( -1376 -192 -16 ) ( -1376 -256 -16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -1440 -248 48 ) ( -1432 -256 -80 ) ( -1440 -248 -80 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( -1440 -256 -16 ) ( -1376 -256 16 ) ( -1376 -256 -16 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( -1376 -256 16 ) ( -1376 -192 -16 ) ( -1376 -256 -16 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( -1440 -248 48 ) ( -1432 -256 -80 ) ( -1440 -248 -80 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( -1436 -252 -80 ) ( -1376 -252 -80 ) ( -1436 -252 48 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( -1376 -192 4 ) ( -1440 -256 4 ) ( -1440 -192 4 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( -1376 -192 0 ) ( -1440 -256 0 ) ( -1376 -256 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -1384 -192 -80 ) ( -1376 -200 -80 ) ( -1384 -192 48 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -1440 -192 -16 ) ( -1376 -192 16 ) ( -1440 -192 16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -1440 -256 16 ) ( -1440 -192 -16 ) ( -1440 -192 16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( -1384 -192 -80 ) ( -1376 -200 -80 ) ( -1384 -192 48 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( -1440 -192 -16 ) ( -1376 -192 16 ) ( -1440 -192 16 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( -1440 -256 16 ) ( -1440 -192 -16 ) ( -1440 -192 16 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( -1380 -196 -80 ) ( -1440 -196 -80 ) ( -1380 -196 48 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
@@ -63019,8 +63019,8 @@ trak5x/base-pipe1b
 {
 ( -1376 -192 4 ) ( -1440 -256 4 ) ( -1440 -192 4 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( -1376 -192 0 ) ( -1440 -256 0 ) ( -1376 -256 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -1376 -256 16 ) ( -1376 -192 -16 ) ( -1376 -256 -16 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-( -1384 -192 -80 ) ( -1376 -200 -80 ) ( -1384 -192 48 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( -1376 -256 16 ) ( -1376 -192 -16 ) ( -1376 -256 -16 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
+( -1384 -192 -80 ) ( -1376 -200 -80 ) ( -1384 -192 48 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 134217728 0 0
 ( -1436 -252 48 ) ( -1376 -252 -80 ) ( -1436 -252 -80 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( -1380 -248 -80 ) ( -1380 -240 -80 ) ( -1380 -248 48 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }