Small cleanups on Bromine:

- Delete duplicate brushes
- Fix a small z-fight in the MH room
- Fix a visible caulk (Crylink room) and a few misaligned textures (MH room)

diff --git a/cubemaps/nebulae/nebulaenx.tga b/cubemaps/nebulae/nebulaenx.tga
deleted file mode 100644 (file)
index b7b8abb..0000000
Binary files a/cubemaps/nebulae/nebulaenx.tga and /dev/null differ

diff --git a/cubemaps/nebulae/nebulaeny.tga b/cubemaps/nebulae/nebulaeny.tga
deleted file mode 100644 (file)
index d53a984..0000000
Binary files a/cubemaps/nebulae/nebulaeny.tga and /dev/null differ

diff --git a/cubemaps/nebulae/nebulaenz.tga b/cubemaps/nebulae/nebulaenz.tga
deleted file mode 100644 (file)
index dcf7e92..0000000
Binary files a/cubemaps/nebulae/nebulaenz.tga and /dev/null differ

diff --git a/cubemaps/nebulae/nebulaepx.tga b/cubemaps/nebulae/nebulaepx.tga
deleted file mode 100644 (file)
index d78ee08..0000000
Binary files a/cubemaps/nebulae/nebulaepx.tga and /dev/null differ

diff --git a/cubemaps/nebulae/nebulaepy.tga b/cubemaps/nebulae/nebulaepy.tga
deleted file mode 100644 (file)
index aa46a6d..0000000
Binary files a/cubemaps/nebulae/nebulaepy.tga and /dev/null differ

diff --git a/cubemaps/nebulae/nebulaepz.tga b/cubemaps/nebulae/nebulaepz.tga
deleted file mode 100644 (file)
index c094e8f..0000000
Binary files a/cubemaps/nebulae/nebulaepz.tga and /dev/null differ

diff --git a/maps/bromine.map b/maps/bromine.map
index 48bba71bc2cd3e9ccb8032ee27e3e04403ecdff2..a4a3bf8e8f0458a221aa943af583ff97022f6a8b 100644 (file)
--- a/maps/bromine.map
+++ b/maps/bromine.map
@@ -3630,11 +3630,11 @@ brushDef
 {
 brushDef
 {
-( -2528 2792 192 ) ( -2528 2696 192 ) ( -2592 2792 192 ) ( ( -0.0078125 0 27.1875 ) ( 0 -0.0078125 507.25 ) ) exx/floor-clang01b 0 0 0
+( -2528 2792 192 ) ( -2528 2696 192 ) ( -2592 2792 192 ) ( ( -0.0078125 0 27 ) ( 0 -0.0078125 508 ) ) exx/floor-clang01b 0 0 0
 ( -2464 2696 64 ) ( -2464 2792 64 ) ( -2464 2696 1408 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2424 1864 144 ) ( -2408 1992 144 ) ( -2424 1992 144 ) ( ( 0 -0.015625 35.25 ) ( 0.0078125 0 502.8125 ) ) exx/panel-q201b 0 0 0
-( -2456 2488 -64 ) ( -2448 2488 -192 ) ( -2456 2488 -192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2464 2520 -64 ) ( -2456 2512 -64 ) ( -2464 2520 64 ) ( ( -0.0078125 0 27.6446075439 ) ( 0 -0.0078125 508 ) ) exx/floor-clang01b 0 0 0
+( -2448 2496 64 ) ( -2432 2496 -64 ) ( -2448 2496 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -4917,7 +4917,7 @@ brushDef
 ( -896 -208 816 ) ( -896 -272 816 ) ( -960 -208 816 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -896 -208 816 ) ( -896 -208 752 ) ( -896 -272 816 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -960 -272 800 ) ( -896 -272 800 ) ( -960 -208 800 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -960 -272 752 ) ( -960 -272 816 ) ( -896 -272 752 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -960 -272 752 ) ( -960 -272 816 ) ( -896 -272 752 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-clang01b 0 0 0
 ( -960 -384 800 ) ( -976 -384 816 ) ( -960 -512 800 ) ( ( 0.0078125 0 20.2431640625 ) ( 0 -0.0078125 494.8908081055 ) ) exx/floor-clang01b 0 0 0
 ( -2128 -192 816 ) ( -2128 -208 800 ) ( -2000 -192 816 ) ( ( 0.0078125 0 7.6181640625 ) ( 0 -0.0078125 508.767791748 ) ) exx/floor-clang01b 0 0 0
 }
@@ -7272,28 +7272,6 @@ brushDef
 {
 brushDef
 {
-( -1200 608 704 ) ( -1200 608 240 ) ( -1200 488 704 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1232 520 224 ) ( -1200 520 224 ) ( -1232 640 224 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1232 528 240 ) ( -1232 528 704 ) ( -1200 528 240 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1232 488 240 ) ( -1232 608 240 ) ( -1232 488 704 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1232 560 -64 ) ( -1216 560 -64 ) ( -1232 560 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 64 600 256 ) ( -64 584 256 ) ( -64 600 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{
-( -1360 608 704 ) ( -1360 608 240 ) ( -1360 488 704 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1392 520 224 ) ( -1360 520 224 ) ( -1392 640 224 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1392 528 240 ) ( -1392 528 704 ) ( -1360 528 240 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1392 488 240 ) ( -1392 608 240 ) ( -1392 488 704 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1232 560 -64 ) ( -1216 560 -64 ) ( -1232 560 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 64 600 256 ) ( -64 584 256 ) ( -64 600 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{
 ( 32 2288 960 ) ( 32 2288 496 ) ( 32 2408 960 ) ( ( 0.03125 0 90.5 ) ( 0 0.0078125 2 ) ) exx/trim-metalsupp01 134217728 0 0
 ( 64 2408 496 ) ( 64 2288 496 ) ( 64 2408 960 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 134217728 0 0
 ( -1264 2272 528 ) ( -1264 2320 480 ) ( -1392 2272 528 ) ( ( 0.03125 0 41 ) ( 0 0.0078125 497.4159240723 ) ) exx/trim-metalsupp01 134217728 0 0
@@ -9423,7 +9401,7 @@ brushDef
 ( -3504 1728 304 ) ( -3504 1824 304 ) ( -3504 1728 1648 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -3464 896 384 ) ( -3448 1024 384 ) ( -3464 1024 384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -3560 1216 48 ) ( -3592 1216 48 ) ( -3560 1216 176 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -3488 1520 48 ) ( -3472 1520 48 ) ( -3488 1520 176 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -3488 1504 -64 ) ( -3456 1504 -64 ) ( -3488 1504 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -9434,7 +9412,7 @@ brushDef
 ( -3504 1728 304 ) ( -3504 1824 304 ) ( -3504 1728 1648 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -3464 1024 384 ) ( -3448 1024 384 ) ( -3464 896 384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -3560 1216 48 ) ( -3592 1216 48 ) ( -3560 1216 176 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -3488 1520 48 ) ( -3472 1520 48 ) ( -3488 1520 176 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -3488 1504 -64 ) ( -3456 1504 -64 ) ( -3488 1504 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -15312,8 +15290,8 @@ brushDef
 ( -1360 2544 656 ) ( -1472 2544 656 ) ( -1360 2544 592 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1312 2128 656 ) ( -1312 2128 592 ) ( -1312 2064 656 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1440 2064 592 ) ( -1328 2064 592 ) ( -1440 2128 592 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal05rust 0 0 0
-( -1440 2064 592 ) ( -1440 2064 656 ) ( -1328 2064 592 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1440 2064 592 ) ( -1440 2128 592 ) ( -1440 2064 656 ) ( ( 0 0.03125 4.5 ) ( -0.0078125 0 6.625 ) ) exx/trim-metalsupp01 0 0 0
+( -1408 2128 64 ) ( -1392 2128 -64 ) ( -1408 2128 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -16445,7 +16423,7 @@ brushDef
 ( -2240 2360 -128 ) ( -2240 2376 -256 ) ( -2240 2360 -256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2256 2416 64 ) ( -2256 2408 -64 ) ( -2256 2416 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2240 2224 -64 ) ( -2256 2224 -64 ) ( -2240 2224 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2232 2384 384 ) ( -2232 2384 320 ) ( -2168 2384 384 ) ( ( 0 0.03125 122 ) ( -0.0078125 0 10.5625 ) ) exx/trim-metalsupp01 0 0 0
+( -2232 2384 384 ) ( -2232 2384 320 ) ( -2168 2384 384 ) ( ( 0 0.03125 122 ) ( -0.0078125 0 10.625 ) ) exx/trim-metalsupp01 0 0 0
 }
 }
 {
@@ -53784,17 +53762,6 @@ brushDef
 {
 brushDef
 {
-( -2020 1288 616 ) ( -2036 1288 616 ) ( -2020 1352 616 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( -2032 1288 616 ) ( -2032 1352 616 ) ( -2032 1288 600 ) ( ( 0.0078125 0 507.3125 ) ( 0 0.0078125 0.8125 ) ) exx/floor-clang01 134217728 0 0
-( -2036 1352 608 ) ( -2036 1288 608 ) ( -2020 1352 608 ) ( ( 0.0078125 0 507.3125 ) ( 0 0.0078125 493.84375 ) ) exx/floor-clang01 134217728 0 0
-( -2036 1352 608 ) ( -2036 1352 624 ) ( -2036 1288 608 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( -2036 1336 48 ) ( -2020 1352 48 ) ( -2036 1336 176 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( -2020 1288 48 ) ( -2036 1304 48 ) ( -2020 1288 176 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-}
-}
-{
-brushDef
-{
 ( -2020 1016 616 ) ( -2036 1016 616 ) ( -2020 1080 616 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( -2032 1016 616 ) ( -2032 1080 616 ) ( -2032 1016 600 ) ( ( 0.0078125 0 509.4375 ) ( 0 0.0078125 0.8125 ) ) exx/floor-clang01 134217728 0 0
 ( -2036 1080 608 ) ( -2036 1016 608 ) ( -2020 1080 608 ) ( ( 0.0078125 0 509.4375 ) ( 0 0.0078125 493.84375 ) ) exx/floor-clang01 134217728 0 0
@@ -56023,16 +55990,6 @@ brushDef
 {
 brushDef
 {
-( -1200 1592 224 ) ( -1200 1976 224 ) ( -1168 1592 224 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1200 1976 224 ) ( -1200 1592 224 ) ( -1168 1592 192 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal02 0 0 0
-( -1168 1592 224 ) ( -1168 1976 224 ) ( -1168 1976 192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1200 1696 -64 ) ( -1192 1704 -64 ) ( -1200 1696 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1184 1584 -64 ) ( -1200 1584 -64 ) ( -1184 1584 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{
 ( -1264 1832 224 ) ( -1264 1656 224 ) ( -1456 1832 224 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1504 1840 -64 ) ( -1504 1824 -64 ) ( -1504 1840 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1528 48 216 ) ( -1536 48 224 ) ( -1528 -80 216 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal06rust 0 0 0
@@ -56990,17 +56947,6 @@ brushDef
 {
 brushDef
 {
-( -1576 1784 200 ) ( -1576 1776 200 ) ( -1656 1784 200 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( -1576 1780 200 ) ( -1656 1780 200 ) ( -1576 1780 192 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/floor/floor_clang01 134217728 0 0
-( -1656 1776 192 ) ( -1576 1776 192 ) ( -1656 1784 192 ) ( ( 0.0078125 0 1.3125 ) ( 0 0.0078125 0 ) ) exx/floor/floor_clang01 134217728 0 0
-( -1656 1776 192 ) ( -1656 1776 200 ) ( -1576 1776 192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( -1576 1784 -64 ) ( -1584 1776 -64 ) ( -1576 1784 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( -1648 1776 -64 ) ( -1656 1784 -64 ) ( -1648 1776 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-}
-}
-{
-brushDef
-{
 ( -1424 1600 208 ) ( -1440 1600 208 ) ( -1424 1648 208 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( -1416 1600 208 ) ( -1416 1648 208 ) ( -1416 1600 200 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal02 134217728 0 0
 ( -1424 1584 208 ) ( -1424 1584 200 ) ( -1440 1584 208 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal02 134217728 0 0
@@ -75429,7 +75375,7 @@ brushDef
 brushDef
 {
 ( -2560 2464 992 ) ( -2560 2448 992 ) ( -2720 2464 992 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2544 2464 1120 ) ( -2704 2464 1120 ) ( -2544 2464 944 ) ( ( -0.0078125 0 120.3739318848 ) ( 0 0.0078125 2.25 ) ) exx/wall-metalrib01 0 0 0
+( -2544 2464 1120 ) ( -2704 2464 1120 ) ( -2544 2464 944 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/wall-metalrib01 0 0 0
 ( -2560 2464 1120 ) ( -2560 2464 944 ) ( -2560 2448 1120 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2704 2448 944 ) ( -2544 2448 944 ) ( -2704 2464 944 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2704 2448 944 ) ( -2704 2448 1120 ) ( -2544 2448 944 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -75465,7 +75411,7 @@ brushDef
 ( -2560 2432 1008 ) ( -2560 2432 736 ) ( -2704 2288 1008 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2704 2272 720 ) ( -2704 2352 720 ) ( -2704 2272 816 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -64 2528 992 ) ( -64 2496 992 ) ( 64 2528 992 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2640 2464 -64 ) ( -2608 2464 -64 ) ( -2640 2464 64 ) ( ( -0.0078125 0 120.3739318848 ) ( 0 0.0078125 2.25 ) ) exx/wall-metalrib01 0 0 0
+( -2640 2464 -64 ) ( -2608 2464 -64 ) ( -2640 2464 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/wall-metalrib01 0 0 0
 ( -2560 2448 -64 ) ( -2560 2432 -64 ) ( -2560 2448 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
@@ -75485,7 +75431,7 @@ brushDef
 brushDef
 {
 ( -2496 2432 1120 ) ( -2496 2416 1120 ) ( -2592 2432 1120 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2464 2464 944 ) ( -2560 2464 944 ) ( -2464 2464 672 ) ( ( -0.0078125 0 120.3739318848 ) ( 0 0.0078125 2.25 ) ) exx/wall-metalrib01 0 0 0
+( -2464 2464 944 ) ( -2560 2464 944 ) ( -2464 2464 672 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/wall-metalrib01 0 0 0
 ( -2464 2432 944 ) ( -2464 2432 672 ) ( -2464 2416 944 ) ( ( -0.0078125 0 120.2489318848 ) ( 0 0.0078125 2.25 ) ) exx/wall-metalrib01 0 0 0
 ( -2672 -64 904 ) ( -2656 64 904 ) ( -2672 64 904 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2472 2264 -64 ) ( -2472 2280 -64 ) ( -2472 2264 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -75496,7 +75442,7 @@ brushDef
 brushDef
 {
 ( -2656 2512 1120 ) ( -2576 2512 1120 ) ( -2656 2400 1120 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2656 2464 752 ) ( -2656 2464 656 ) ( -2576 2464 752 ) ( ( -0.0078125 0 118.6239318848 ) ( 0 0.0078125 2.25 ) ) exx/wall-metalrib01 0 0 0
+( -2656 2464 752 ) ( -2656 2464 656 ) ( -2576 2464 752 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/wall-metalrib01 0 0 0
 ( -2704 2400 656 ) ( -2704 2400 752 ) ( -2704 2512 656 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2496 2432 656 ) ( -2576 2432 656 ) ( -2496 2432 752 ) ( ( -0.0078125 0 121.9989318848 ) ( 0 0.0078125 2.25 ) ) exx/wall-metalrib01 0 0 0
 ( -240 2448 944 ) ( -368 2480 944 ) ( -368 2448 944 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -75627,7 +75573,7 @@ brushDef
 brushDef
 {
 ( -2496 2432 1120 ) ( -2496 2416 1120 ) ( -2592 2432 1120 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2456 2464 904 ) ( -2552 2464 904 ) ( -2456 2464 632 ) ( ( -0.0078125 0 120.3114318848 ) ( 0 0.0078125 1.9375 ) ) exx/wall-metalrib01 0 0 0
+( -2456 2464 904 ) ( -2552 2464 904 ) ( -2456 2464 632 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/wall-metalrib01 0 0 0
 ( -2560 2264 672 ) ( -2560 2264 944 ) ( -2464 2264 672 ) ( ( 0.0078125 0 507.5 ) ( 0 0.0078125 0 ) ) exx/floor-wrn01-red 0 0 0
 ( -2664 -64 904 ) ( -2648 64 904 ) ( -2664 64 904 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2472 2264 64 ) ( -2472 2280 -64 ) ( -2472 2264 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -75638,7 +75584,7 @@ brushDef
 brushDef
 {
 ( -2496 2432 1120 ) ( -2496 2416 1120 ) ( -2592 2432 1120 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2464 2464 912 ) ( -2560 2464 912 ) ( -2464 2464 640 ) ( ( -0.0078125 0 120.3739318848 ) ( 0 0.0078125 2 ) ) exx/wall-metalrib01 0 0 0
+( -2464 2464 912 ) ( -2560 2464 912 ) ( -2464 2464 640 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/wall-metalrib01 0 0 0
 ( -2560 2416 800 ) ( -2560 2432 800 ) ( -2560 2416 1072 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2672 -64 904 ) ( -2656 64 904 ) ( -2672 64 904 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2552 2256 32 ) ( -2552 2272 -96 ) ( -2552 2256 -96 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -80119,17 +80065,6 @@ brushDef
 {
 brushDef
 {
-( -1248 1568 224 ) ( -1248 1552 224 ) ( -1264 1568 224 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
-( -1248 1568 248 ) ( -1264 1568 248 ) ( -1248 1568 208 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1248 1568 248 ) ( -1248 1568 208 ) ( -1248 1552 248 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1264 1552 208 ) ( -1248 1552 208 ) ( -1264 1568 208 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1264 1552 208 ) ( -1264 1552 248 ) ( -1248 1552 208 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1264 1552 208 ) ( -1264 1568 208 ) ( -1264 1552 248 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{
 ( -1360 560 800 ) ( -1360 480 800 ) ( -1392 560 800 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1360 528 800 ) ( -1392 528 800 ) ( -1360 528 768 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1360 560 800 ) ( -1360 560 768 ) ( -1360 480 800 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0

diff --git a/maps/trident.map b/maps/trident.map
index f51ac8bec1e79d2dc576d1c73c09fdfdff935ad8..9e4cc596b0b9d53f1dbd07910c5aed219e346810 100644 (file)
--- a/maps/trident.map
+++ b/maps/trident.map
@@ -338,9 +338,9 @@ brushDef
 brushDef
 {
 ( 288 -384 256 ) ( 256 -384 256 ) ( 256 384 256 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
-( 288 384 192 ) ( 256 384 256 ) ( 272 384 192 ) ( ( 0.0078125 0 0.125 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
-( 288 128 256 ) ( 288 128 192 ) ( 288 0 256 ) ( ( 0.0078125 0 1 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
-( 272 0 192 ) ( 304 0 192 ) ( 272 128 192 ) ( ( 0.0078125 0 1 ) ( 0 0.0078125 0.125 ) ) exx/base-metal03 0 0 0
+( 288 384 192 ) ( 256 384 256 ) ( 272 384 192 ) ( ( 0.015625 0 0.25 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 288 128 256 ) ( 288 128 192 ) ( 288 0 256 ) ( ( 0.015625 0 2 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 272 0 192 ) ( 304 0 192 ) ( 272 128 192 ) ( ( 0.015625 0 2 ) ( 0 0.015625 0.25 ) ) common/caulk 0 0 0
 ( 272 384 192 ) ( 256 384 256 ) ( 256 -384 256 ) ( ( -0.0078125 0 0.25 ) ( 0 -0.0078125 0.0303169526 ) ) exx/base-metal03 0 0 0
 ( 272 288 192 ) ( 208 288 256 ) ( 272 288 256 ) ( ( 0.015625 0 1023.75 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 }
@@ -578,14 +578,14 @@ brushDef
 ( 736 416 64 ) ( 544 416 128 ) ( 544 416 64 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) common/caulk 0 0 0
 ( 736 384 64 ) ( 736 416 128 ) ( 736 416 64 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) common/caulk 0 0 0
 ( 736 384 64 ) ( 544 416 64 ) ( 544 384 64 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) common/caulk 0 0 0
-( 736 392 128 ) ( 480 392 64 ) ( 480 392 128 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( 736 392 128 ) ( 480 392 64 ) ( 480 392 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( 544 384 128 ) ( 544 416 64 ) ( 544 416 128 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) common/caulk 0 0 0
 }
 }
 {
 brushDef
 {
-( 696 360 112 ) ( 696 352 112 ) ( 544 360 112 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
+( 696 360 112 ) ( 696 352 112 ) ( 544 360 112 ) ( ( 0 0.0078125 0 ) ( -0.0078125 0 0 ) ) exx/floor-wrn01 134217728 0 0
 ( 696 360 112 ) ( 544 360 112 ) ( 696 360 96 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 736 360 112 ) ( 736 360 96 ) ( 736 352 112 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 544 352 96 ) ( 544 352 112 ) ( 696 352 96 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
@@ -606,7 +606,7 @@ brushDef
 {
 brushDef
 {
-( 696 328 96 ) ( 696 320 96 ) ( 544 328 96 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
+( 696 328 96 ) ( 696 320 96 ) ( 544 328 96 ) ( ( 0 0.0078125 0 ) ( -0.0078125 0 0 ) ) exx/floor-wrn01 134217728 0 0
 ( 696 328 96 ) ( 544 328 96 ) ( 696 328 80 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 736 328 96 ) ( 736 328 80 ) ( 736 320 96 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 544 320 80 ) ( 544 320 96 ) ( 696 320 80 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
@@ -627,7 +627,7 @@ brushDef
 {
 brushDef
 {
-( 696 296 80 ) ( 696 288 80 ) ( 544 296 80 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
+( 696 296 80 ) ( 696 288 80 ) ( 544 296 80 ) ( ( 0 0.0078125 0 ) ( -0.0078125 0 0 ) ) exx/floor-wrn01 134217728 0 0
 ( 696 296 80 ) ( 544 296 80 ) ( 696 296 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 736 296 80 ) ( 736 296 64 ) ( 736 288 80 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 544 288 64 ) ( 544 288 80 ) ( 696 288 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
@@ -648,7 +648,7 @@ brushDef
 {
 brushDef
 {
-( 696 264 64 ) ( 696 256 64 ) ( 544 264 64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
+( 696 264 64 ) ( 696 256 64 ) ( 544 264 64 ) ( ( 0 0.0078125 0 ) ( -0.0078125 0 0 ) ) exx/floor-wrn01 134217728 0 0
 ( 696 264 64 ) ( 544 264 64 ) ( 696 264 48 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 736 264 64 ) ( 736 264 48 ) ( 736 256 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 544 256 48 ) ( 544 256 64 ) ( 696 256 48 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
@@ -669,7 +669,7 @@ brushDef
 {
 brushDef
 {
-( 696 232 48 ) ( 696 224 48 ) ( 544 232 48 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
+( 696 232 48 ) ( 696 224 48 ) ( 544 232 48 ) ( ( 0 0.0078125 0 ) ( -0.0078125 0 0 ) ) exx/floor-wrn01 134217728 0 0
 ( 696 232 48 ) ( 544 232 48 ) ( 696 232 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 736 232 48 ) ( 736 232 32 ) ( 736 224 48 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 544 224 32 ) ( 544 224 48 ) ( 696 224 32 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
@@ -690,7 +690,7 @@ brushDef
 {
 brushDef
 {
-( 696 200 32 ) ( 696 192 32 ) ( 544 200 32 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
+( 696 200 32 ) ( 696 192 32 ) ( 544 200 32 ) ( ( 0 0.0078125 0 ) ( -0.0078125 0 0 ) ) exx/floor-wrn01 134217728 0 0
 ( 696 200 32 ) ( 544 200 32 ) ( 696 200 16 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 736 200 32 ) ( 736 200 16 ) ( 736 192 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 544 192 16 ) ( 544 192 32 ) ( 696 192 16 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
@@ -711,7 +711,7 @@ brushDef
 {
 brushDef
 {
-( 696 168 16 ) ( 696 160 16 ) ( 544 168 16 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
+( 696 168 16 ) ( 696 160 16 ) ( 544 168 16 ) ( ( 0 0.0078125 0 ) ( -0.0078125 0 0 ) ) exx/floor-wrn01 134217728 0 0
 ( 696 168 16 ) ( 544 168 16 ) ( 696 168 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 736 168 16 ) ( 736 168 0 ) ( 736 160 16 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 544 160 0 ) ( 544 160 16 ) ( 696 160 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
@@ -725,7 +725,7 @@ brushDef
 ( 544 384 128 ) ( 512 384 128 ) ( 544 384 64 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0
 ( 544 384 128 ) ( 544 384 64 ) ( 544 344 128 ) ( ( 0.0078125 0 1 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( 512 344 0 ) ( 544 344 0 ) ( 512 384 0 ) ( ( 0.0625 0 8 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0
-( 512 344 64 ) ( 512 384 64 ) ( 512 344 128 ) ( ( 0.0078125 0 7 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( 512 344 64 ) ( 512 384 64 ) ( 512 344 128 ) ( ( 0.015625 0 14 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( 64 384 128 ) ( -64 128 0 ) ( -64 384 128 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 511.1055603027 ) ) exx/base-metal03 0 0 0
 }
 }
@@ -742,7 +742,7 @@ brushDef
 {
 brushDef
 {
-( 696 392 128 ) ( 696 384 128 ) ( 544 392 128 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 0 0 0
+( 696 392 128 ) ( 696 384 128 ) ( 544 392 128 ) ( ( 0 0.0078125 0 ) ( -0.0078125 0 0 ) ) exx/floor-wrn01 0 0 0
 ( 696 392 128 ) ( 544 392 128 ) ( 696 392 112 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( 736 392 128 ) ( 736 392 112 ) ( 736 384 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( 544 384 112 ) ( 696 384 112 ) ( 544 392 112 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -969,7 +969,7 @@ brushDef
 ( 256 1040 256 ) ( 256 1040 192 ) ( 256 816 256 ) ( ( 0.0078125 0 2 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( 224 816 192 ) ( 256 816 192 ) ( 224 1040 192 ) ( ( 0.0078125 0 2 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( 224 736 192 ) ( 224 736 256 ) ( 256 736 192 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
-( 224 816 192 ) ( 224 1040 192 ) ( 224 816 256 ) ( ( 0.0078125 0 510 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( 224 816 192 ) ( 224 1040 192 ) ( 224 816 256 ) ( ( 0.015625 0 1020 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -2316,9 +2316,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( 512 -384 192 4 -1.5 ) ( 512 -384 192 4 -1.5 ) ( 512 -384 192 4 -1.5 ) )
-( ( 512 -384 192 4 -1.5 ) ( 512 -384 192 4 -1.5 ) ( 512 -384 192 4 -1.5 ) )
-( ( 640 -384 192 5 -1.5 ) ( 512 -384 192 4 -1.5 ) ( 512 -384 64 4 -0.5 ) )
+( ( 512 -384 192 1 -1.5 ) ( 512 -384 192 1 -1.5 ) ( 512 -384 192 1 -1.5 ) )
+( ( 512 -384 192 1 -1.5 ) ( 512 -384 192 1 -1.5 ) ( 512 -384 192 1 -1.5 ) )
+( ( 640 -384 192 0 -1.5 ) ( 512 -384 192 1 -1.5 ) ( 512 -384 64 1 -0.5 ) )
 )
 }
 }
@@ -2340,9 +2340,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( 768 -384 192 6 -1.5 ) ( 768 -384 192 6 -1.5 ) ( 768 -384 192 6 -1.5 ) )
-( ( 768 -384 192 6 -1.5 ) ( 768 -384 192 6 -1.5 ) ( 768 -384 192 6 -1.5 ) )
-( ( 768 -384 64 6 -0.5 ) ( 768 -384 192 6 -1.5 ) ( 640 -384 192 5 -1.5 ) )
+( ( 768 -384 192 -1 -1.5 ) ( 768 -384 192 -1 -1.5 ) ( 768 -384 192 -1 -1.5 ) )
+( ( 768 -384 192 -1 -1.5 ) ( 768 -384 192 -1 -1.5 ) ( 768 -384 192 -1 -1.5 ) )
+( ( 768 -384 64 -1 -0.5 ) ( 768 -384 192 -1 -1.5 ) ( 640 -384 192 0 -1.5 ) )
 )
 }
 }
@@ -2436,7 +2436,7 @@ brushDef
 ( 992 512 64 ) ( 992 512 -192 ) ( 992 768 64 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 511 ) ) trak4x/base-concrete4b 0 0 0
 ( 1024 768 -64 ) ( 1024 768 192 ) ( 992 768 -64 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0
 ( 1024 1024 -64 ) ( 1024 768 -64 ) ( 1024 1024 192 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak4x/wall-brick1 0 0 0
-( 1056 1344 -128 ) ( 992 1216 -128 ) ( 1056 1216 -128 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( 1056 1344 -128 ) ( 992 1216 -128 ) ( 1056 1216 -128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -64 256 64 ) ( -64 320 64 ) ( 64 256 64 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) common/caulk 0 0 0
 }
 }
@@ -4891,9 +4891,9 @@ patchDef2
 exx/base-metal03
 ( 3 5 0 0 0 )
 (
-( ( 1024 896 192 0.8535534143 0 ) ( 1024 1024 192 0.8535534143 -0.75 ) ( 896 1024 192 0.8535534143 -1.5 ) ( 768 1024 192 0.8535534143 -2.25 ) ( 768 896 192 0.8535534143 -3 ) )
-( ( 1008 896 192 1.0303300619 0 ) ( 1008 1008 192 1.0303300619 -0.75 ) ( 896 1008 192 1.0303300619 -1.5 ) ( 784 1008 192 1.0303300619 -2.25 ) ( 784 896 192 1.0303300619 -3 ) )
-( ( 992 896 192 1.2071068287 0 ) ( 992 992 192 1.2071068287 -0.75 ) ( 896 992 192 1.2071068287 -1.5 ) ( 800 992 192 1.2071068287 -2.25 ) ( 800 896 192 1.2071068287 -3 ) )
+( ( 1024 896 192 7 -8 ) ( 1024 1024 192 8 -8 ) ( 896 1024 192 8 -7 ) ( 768 1024 192 8 -6 ) ( 768 896 192 7 -6 ) )
+( ( 1008 896 192 7 -7.875 ) ( 1008 1008 192 7.875 -7.875 ) ( 896 1008 192 7.875 -7 ) ( 784 1008 192 7.875 -6.125 ) ( 784 896 192 7 -6.125 ) )
+( ( 992 896 192 7 -7.75 ) ( 992 992 192 7.75 -7.75 ) ( 896 992 192 7.75 -7 ) ( 800 992 192 7.75 -6.25 ) ( 800 896 192 7 -6.25 ) )
 )
 }
 }
@@ -4917,11 +4917,11 @@ patchDef2
 exx/base-metal03
 ( 5 3 0 0 0 )
 (
-( ( 800 896 256 0 0 ) ( 784 896 256 0 -0.125 ) ( 768 896 256 0 -0.25 ) )
-( ( 800 992 256 1 0 ) ( 784 1008 256 1 -0.125 ) ( 768 1024 256 1 -0.25 ) )
-( ( 896 992 256 2 0 ) ( 896 1008 256 2 -0.125 ) ( 896 1024 256 2 -0.25 ) )
-( ( 992 992 256 3 0 ) ( 1008 1008 256 3 -0.125 ) ( 1024 1024 256 3 -0.25 ) )
-( ( 992 896 256 4 0 ) ( 1008 896 256 4 -0.125 ) ( 1024 896 256 4 -0.25 ) )
+( ( 800 896 256 7 6.25 ) ( 784 896 256 7 6.125 ) ( 768 896 256 7 6 ) )
+( ( 800 992 256 7.75 6.25 ) ( 784 1008 256 7.875 6.125 ) ( 768 1024 256 8 6 ) )
+( ( 896 992 256 7.75 7 ) ( 896 1008 256 7.875 7 ) ( 896 1024 256 8 7 ) )
+( ( 992 992 256 7.75 7.75 ) ( 1008 1008 256 7.875 7.875 ) ( 1024 1024 256 8 8 ) )
+( ( 992 896 256 7 7.75 ) ( 1008 896 256 7 7.875 ) ( 1024 896 256 7 8 ) )
 )
 }
 }
@@ -4931,9 +4931,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( 128 1248 192 0 0 ) ( 224 1248 192 0 -0.75 ) ( 224 1152 192 0 -1.5 ) )
-( ( 128 1264 192 0.1767766923 0 ) ( 240 1264 192 0.1767766923 -0.75 ) ( 240 1152 192 0.1767766923 -1.5 ) )
-( ( 128 1280 192 0.3535533845 0 ) ( 256 1280 192 0.3535533845 -0.75 ) ( 256 1152 192 0.3535533845 -1.5 ) )
+( ( 128 1248 192 11.75 -1 ) ( 224 1248 192 11.75 -1.75 ) ( 224 1152 192 11 -1.75 ) )
+( ( 128 1264 192 11.875 -1 ) ( 240 1264 192 11.875 -1.875 ) ( 240 1152 192 11 -1.875 ) )
+( ( 128 1280 192 12 -1 ) ( 256 1280 192 12 -2 ) ( 256 1152 192 11 -2 ) )
 )
 }
 }
@@ -4943,9 +4943,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( 128 1280 256 0.8535534143 0 ) ( 256 1280 256 0.8535534143 -0.75 ) ( 256 1152 256 0.8535534143 -1.5 ) )
-( ( 128 1264 256 1.0303300619 0 ) ( 240 1264 256 1.0303300619 -0.75 ) ( 240 1152 256 1.0303300619 -1.5 ) )
-( ( 128 1248 256 1.2071068287 0 ) ( 224 1248 256 1.2071068287 -0.75 ) ( 224 1152 256 1.2071068287 -1.5 ) )
+( ( 128 1280 256 12 1 ) ( 256 1280 256 12 2 ) ( 256 1152 256 11 2 ) )
+( ( 128 1264 256 11.875 1 ) ( 240 1264 256 11.875 1.875 ) ( 240 1152 256 11 1.875 ) )
+( ( 128 1248 256 11.75 1 ) ( 224 1248 256 11.75 1.75 ) ( 224 1152 256 11 1.75 ) )
 )
 }
 }
@@ -4967,9 +4967,9 @@ patchDef2
 exx/base-metal03
 ( 3 5 0 0 0 )
 (
-( ( -288 1152 512 0 0 ) ( -288 1248 512 0 -0.75 ) ( -384 1248 512 0 -1.5 ) ( -480 1248 512 0 -2.25 ) ( -480 1152 512 0 -3 ) )
-( ( -272 1152 512 0.1767766923 0 ) ( -272 1264 512 0.1767766923 -0.75 ) ( -384 1264 512 0.1767766923 -1.5 ) ( -496 1264 512 0.1767766923 -2.25 ) ( -496 1152 512 0.1767766923 -3 ) )
-( ( -256 1152 512 0.3535533845 0 ) ( -256 1280 512 0.3535533845 -0.75 ) ( -384 1280 512 0.3535533845 -1.5 ) ( -512 1280 512 0.3535533845 -2.25 ) ( -512 1152 512 0.3535533845 -3 ) )
+( ( -288 1152 512 9 -2.25 ) ( -288 1248 512 9.75 -2.25 ) ( -384 1248 512 9.75 -3 ) ( -480 1248 512 9.75 -3.75 ) ( -480 1152 512 9 -3.75 ) )
+( ( -272 1152 512 9 -2.125 ) ( -272 1264 512 9.875 -2.125 ) ( -384 1264 512 9.875 -3 ) ( -496 1264 512 9.875 -3.875 ) ( -496 1152 512 9 -3.875 ) )
+( ( -256 1152 512 9 -2 ) ( -256 1280 512 10 -2 ) ( -384 1280 512 10 -3 ) ( -512 1280 512 10 -4 ) ( -512 1152 512 9 -4 ) )
 )
 }
 }
@@ -4979,9 +4979,9 @@ patchDef2
 exx/base-metal03
 ( 3 5 0 0 0 )
 (
-( ( -256 1152 448 0.8535534143 0 ) ( -256 1280 448 0.8535534143 -0.75 ) ( -384 1280 448 0.8535534143 -1.5 ) ( -512 1280 448 0.8535534143 -2.25 ) ( -512 1152 448 0.8535534143 -3 ) )
-( ( -272 1152 448 1.0303300619 0 ) ( -272 1264 448 1.0303300619 -0.75 ) ( -384 1264 448 1.0303300619 -1.5 ) ( -496 1264 448 1.0303300619 -2.25 ) ( -496 1152 448 1.0303300619 -3 ) )
-( ( -288 1152 448 1.2071068287 0 ) ( -288 1248 448 1.2071068287 -0.75 ) ( -384 1248 448 1.2071068287 -1.5 ) ( -480 1248 448 1.2071068287 -2.25 ) ( -480 1152 448 1.2071068287 -3 ) )
+( ( -256 1152 448 11 2 ) ( -256 1280 448 12 2 ) ( -384 1280 448 12 3 ) ( -512 1280 448 12 4 ) ( -512 1152 448 11 4 ) )
+( ( -272 1152 448 11 2.125 ) ( -272 1264 448 11.875 2.125 ) ( -384 1264 448 11.875 3 ) ( -496 1264 448 11.875 3.875 ) ( -496 1152 448 11 3.875 ) )
+( ( -288 1152 448 11 2.25 ) ( -288 1248 448 11.75 2.25 ) ( -384 1248 448 11.75 3 ) ( -480 1248 448 11.75 3.75 ) ( -480 1152 448 11 3.75 ) )
 )
 }
 }
@@ -5017,9 +5017,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( 800 -384 256 0 0 ) ( 992 -384 256 0 -2 ) ( 992 -192 256 0 -4 ) )
-( ( 800 -400 256 0.1767766923 0 ) ( 1008 -400 256 0.1767766923 -2 ) ( 1008 -192 256 0.1767766923 -4 ) )
-( ( 800 -416 256 0.3535533845 0 ) ( 1024 -416 256 0.3535533845 -2 ) ( 1024 -192 256 0.3535533845 -4 ) )
+( ( 800 -384 256 -3 6.25 ) ( 992 -384 256 -3 7.75 ) ( 992 -192 256 -1.5 7.75 ) )
+( ( 800 -400 256 -3.125 6.25 ) ( 1008 -400 256 -3.125 7.875 ) ( 1008 -192 256 -1.5 7.875 ) )
+( ( 800 -416 256 -3.25 6.25 ) ( 1024 -416 256 -3.25 8 ) ( 1024 -192 256 -1.5 8 ) )
 )
 }
 }
@@ -5029,9 +5029,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( 288 -992 256 0 0 ) ( 480 -992 256 0 -1.5 ) ( 480 -800 256 0 -3 ) )
-( ( 288 -1008 256 0.1767766923 0 ) ( 496 -1008 256 0.1767766923 -1.5 ) ( 496 -800 256 0.1767766923 -3 ) )
-( ( 288 -1024 256 0.3535533845 0 ) ( 512 -1024 256 0.3535533845 -1.5 ) ( 512 -800 256 0.3535533845 -3 ) )
+( ( 288 -992 256 -7.75 2.25 ) ( 480 -992 256 -7.75 3.75 ) ( 480 -800 256 -6.25 3.75 ) )
+( ( 288 -1008 256 -7.875 2.25 ) ( 496 -1008 256 -7.875 3.875 ) ( 496 -800 256 -6.25 3.875 ) )
+( ( 288 -1024 256 -8 2.25 ) ( 512 -1024 256 -8 4 ) ( 512 -800 256 -6.25 4 ) )
 )
 }
 }
@@ -5041,9 +5041,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( 288 -1024 192 0.8535534143 0 ) ( 512 -1024 192 0.8535534143 -1.5 ) ( 512 -800 192 0.8535534143 -3 ) )
-( ( 288 -1008 192 1.0303300619 0 ) ( 496 -1008 192 1.0303300619 -1.5 ) ( 496 -800 192 1.0303300619 -3 ) )
-( ( 288 -992 192 1.2071068287 0 ) ( 480 -992 192 1.2071068287 -1.5 ) ( 480 -800 192 1.2071068287 -3 ) )
+( ( 288 -1024 192 -8 -2.25 ) ( 512 -1024 192 -8 -4 ) ( 512 -800 192 -6.25 -4 ) )
+( ( 288 -1008 192 -7.875 -2.25 ) ( 496 -1008 192 -7.875 -3.875 ) ( 496 -800 192 -6.25 -3.875 ) )
+( ( 288 -992 192 -7.75 -2.25 ) ( 480 -992 192 -7.75 -3.75 ) ( 480 -800 192 -6.25 -3.75 ) )
 )
 }
 }
@@ -5065,9 +5065,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( -224 -800 384 0 0 ) ( -224 -992 384 0 -1.5 ) ( -32 -992 384 0 -3 ) )
-( ( -240 -800 384 0.1767766923 0 ) ( -240 -1008 384 0.1767766923 -1.5 ) ( -32 -1008 384 0.1767766923 -3 ) )
-( ( -256 -800 384 0.3535533845 0 ) ( -256 -1024 384 0.3535533845 -1.5 ) ( -32 -1024 384 0.3535533845 -3 ) )
+( ( -224 -800 384 -6.25 -1.75 ) ( -224 -992 384 -7.75 -1.75 ) ( -32 -992 384 -7.75 -0.25 ) )
+( ( -240 -800 384 -6.25 -1.875 ) ( -240 -1008 384 -7.875 -1.875 ) ( -32 -1008 384 -7.875 -0.25 ) )
+( ( -256 -800 384 -6.25 -2 ) ( -256 -1024 384 -8 -2 ) ( -32 -1024 384 -8 -0.25 ) )
 )
 }
 }
@@ -5077,9 +5077,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( -256 -800 320 0.8535534143 0 ) ( -256 -1024 320 0.8535534143 -1.5 ) ( -32 -1024 320 0.8535534143 -3 ) )
-( ( -240 -800 320 1.0303300619 0 ) ( -240 -1008 320 1.0303300619 -1.5 ) ( -32 -1008 320 1.0303300619 -3 ) )
-( ( -224 -800 320 1.2071068287 0 ) ( -224 -992 320 1.2071068287 -1.5 ) ( -32 -992 320 1.2071068287 -3 ) )
+( ( -256 -800 320 -6.25 2 ) ( -256 -1024 320 -8 2 ) ( -32 -1024 320 -8 0.25 ) )
+( ( -240 -800 320 -6.25 1.875 ) ( -240 -1008 320 -7.875 1.875 ) ( -32 -1008 320 -7.875 0.25 ) )
+( ( -224 -800 320 -6.25 1.75 ) ( -224 -992 320 -7.75 1.75 ) ( -32 -992 320 -7.75 0.25 ) )
 )
 }
 }
@@ -5101,9 +5101,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( -1248 -640 512 0 0 ) ( -1248 -736 512 0 -1 ) ( -1152 -736 512 0 -2 ) )
-( ( -1264 -640 512 0.1767766923 0 ) ( -1264 -752 512 0.1767766923 -1 ) ( -1152 -752 512 0.1767766923 -2 ) )
-( ( -1280 -640 512 0.3535533845 0 ) ( -1280 -768 512 0.3535533845 -1 ) ( -1152 -768 512 0.3535533845 -2 ) )
+( ( -1248 -640 512 -5 -9.75 ) ( -1248 -736 512 -5.75 -9.75 ) ( -1152 -736 512 -5.75 -9 ) )
+( ( -1264 -640 512 -5 -9.875 ) ( -1264 -752 512 -5.875 -9.875 ) ( -1152 -752 512 -5.875 -9 ) )
+( ( -1280 -640 512 -5 -10 ) ( -1280 -768 512 -6 -10 ) ( -1152 -768 512 -6 -9 ) )
 )
 }
 }
@@ -5123,7 +5123,7 @@ exx/base-metal03
 brushDef
 {
 ( -480 944 256 ) ( -1152 944 256 ) ( -480 944 0 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( -1152 848 -128 ) ( -480 848 -128 ) ( -1152 912 -128 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( -1152 848 -128 ) ( -480 848 -128 ) ( -1152 912 -128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( -560 952 56 ) ( -368 928 104 ) ( -768 912 352 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( -1184 896 72 ) ( -1024 928 72 ) ( -1088 888 400 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( -448 872 64 ) ( -680 936 -64 ) ( -448 872 -64 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
@@ -5751,9 +5751,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( -1280 416 448 3.25 -3.5 ) ( -1280 416 448 3.25 -3.5 ) ( -1280 416 448 3.25 -3.5 ) )
-( ( -1280 416 448 3.25 -3.5 ) ( -1280 416 448 3.25 -3.5 ) ( -1280 416 448 3.25 -3.5 ) )
-( ( -1280 416 320 3.25 -2.5 ) ( -1280 416 448 3.25 -3.5 ) ( -1280 288 448 2.25 -3.5 ) )
+( ( -1280 416 448 -1.875 -3.5 ) ( -1280 416 448 -1.875 -3.5 ) ( -1280 416 448 -1.875 -3.5 ) )
+( ( -1280 416 448 -1.875 -3.5 ) ( -1280 416 448 -1.875 -3.5 ) ( -1280 416 448 -1.875 -3.5 ) )
+( ( -1280 416 320 -1.875 -2.5 ) ( -1280 416 448 -1.875 -3.5 ) ( -1280 288 448 -0.875 -3.5 ) )
 )
 }
 }
@@ -5775,9 +5775,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( -1280 160 448 1.25 -3.5 ) ( -1280 160 448 1.25 -3.5 ) ( -1280 160 448 1.25 -3.5 ) )
-( ( -1280 160 448 1.25 -3.5 ) ( -1280 160 448 1.25 -3.5 ) ( -1280 160 448 1.25 -3.5 ) )
-( ( -1280 288 448 2.25 -3.5 ) ( -1280 160 448 1.25 -3.5 ) ( -1280 160 320 1.25 -2.5 ) )
+( ( -1280 160 448 0.125 -3.5 ) ( -1280 160 448 0.125 -3.5 ) ( -1280 160 448 0.125 -3.5 ) )
+( ( -1280 160 448 0.125 -3.5 ) ( -1280 160 448 0.125 -3.5 ) ( -1280 160 448 0.125 -3.5 ) )
+( ( -1280 288 448 -0.875 -3.5 ) ( -1280 160 448 0.125 -3.5 ) ( -1280 160 320 0.125 -2.5 ) )
 )
 }
 }
@@ -5882,9 +5882,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( -1504 0 256 0 0 ) ( -1504 -192 256 0 -1.5 ) ( -1312 -192 256 0 -3 ) )
-( ( -1520 0 256 0.1767766923 0 ) ( -1520 -208 256 0.1767766923 -1.5 ) ( -1312 -208 256 0.1767766923 -3 ) )
-( ( -1536 0 256 0.3535533845 0 ) ( -1536 -224 256 0.3535533845 -1.5 ) ( -1312 -224 256 0.3535533845 -3 ) )
+( ( -1504 0 256 0 -11.75 ) ( -1504 -192 256 -1.5 -11.75 ) ( -1312 -192 256 -1.5 -10.25 ) )
+( ( -1520 0 256 0 -11.875 ) ( -1520 -208 256 -1.625 -11.875 ) ( -1312 -208 256 -1.625 -10.25 ) )
+( ( -1536 0 256 0 -12 ) ( -1536 -224 256 -1.75 -12 ) ( -1312 -224 256 -1.75 -10.25 ) )
 )
 }
 }
@@ -5894,9 +5894,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( -1536 0 192 0.8535534143 0 ) ( -1536 -224 192 0.8535534143 -1.5 ) ( -1312 -224 192 0.8535534143 -3 ) )
-( ( -1520 0 192 1.0303300619 0 ) ( -1520 -208 192 1.0303300619 -1.5 ) ( -1312 -208 192 1.0303300619 -3 ) )
-( ( -1504 0 192 1.2071068287 0 ) ( -1504 -192 192 1.2071068287 -1.5 ) ( -1312 -192 192 1.2071068287 -3 ) )
+( ( -1536 0 192 0 12 ) ( -1536 -224 192 -1.75 12 ) ( -1312 -224 192 -1.75 10.25 ) )
+( ( -1520 0 192 0 11.875 ) ( -1520 -208 192 -1.625 11.875 ) ( -1312 -208 192 -1.625 10.25 ) )
+( ( -1504 0 192 0 11.75 ) ( -1504 -192 192 -1.5 11.75 ) ( -1312 -192 192 -1.5 10.25 ) )
 )
 }
 }
@@ -5942,9 +5942,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( -1312 384 256 0 0 ) ( -1504 384 256 0 -1.5 ) ( -1504 192 256 0 -3 ) )
-( ( -1312 400 256 0.1767766923 0 ) ( -1520 400 256 0.1767766923 -1.5 ) ( -1520 192 256 0.1767766923 -3 ) )
-( ( -1312 416 256 0.3535533845 0 ) ( -1536 416 256 0.3535533845 -1.5 ) ( -1536 192 256 0.3535533845 -3 ) )
+( ( -1312 384 256 3 -10.25 ) ( -1504 384 256 3 -11.75 ) ( -1504 192 256 1.5 -11.75 ) )
+( ( -1312 400 256 3.125 -10.25 ) ( -1520 400 256 3.125 -11.875 ) ( -1520 192 256 1.5 -11.875 ) )
+( ( -1312 416 256 3.25 -10.25 ) ( -1536 416 256 3.25 -12 ) ( -1536 192 256 1.5 -12 ) )
 )
 }
 }
@@ -5954,9 +5954,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( -1312 416 192 0.8535534143 0 ) ( -1536 416 192 0.8535534143 -1.5 ) ( -1536 192 192 0.8535534143 -3 ) )
-( ( -1312 400 192 1.0303300619 0 ) ( -1520 400 192 1.0303300619 -1.5 ) ( -1520 192 192 1.0303300619 -3 ) )
-( ( -1312 384 192 1.2071068287 0 ) ( -1504 384 192 1.2071068287 -1.5 ) ( -1504 192 192 1.2071068287 -3 ) )
+( ( -1312 416 192 3.25 10.25 ) ( -1536 416 192 3.25 12 ) ( -1536 192 192 1.5 12 ) )
+( ( -1312 400 192 3.125 10.25 ) ( -1520 400 192 3.125 11.875 ) ( -1520 192 192 1.5 11.875 ) )
+( ( -1312 384 192 3 10.25 ) ( -1504 384 192 3 11.75 ) ( -1504 192 192 1.5 11.75 ) )
 )
 }
 }
@@ -5986,10 +5986,10 @@ brushDef
 {
 brushDef
 {
-( -1504 192 256 ) ( -1504 0 256 ) ( -1536 192 256 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.25 ) ) exx/base-metal03 0 0 0
+( -1504 192 256 ) ( -1504 0 256 ) ( -1536 192 256 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( -1504 192 256 ) ( -1536 192 256 ) ( -1504 192 192 ) ( ( 0.015625 0 255.5 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1504 192 256 ) ( -1504 192 192 ) ( -1504 0 256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
-( -1536 0 192 ) ( -1504 0 192 ) ( -1536 192 192 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 511.75 ) ) exx/base-metal03 0 0 0
+( -1536 0 192 ) ( -1504 0 192 ) ( -1536 192 192 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( -1536 0 192 ) ( -1536 0 256 ) ( -1504 0 192 ) ( ( 0.015625 0 0.5 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1536 0 192 ) ( -1536 192 192 ) ( -1536 0 256 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 }
@@ -6693,7 +6693,7 @@ brushDef
 ( 800 -480 32 ) ( 800 -512 32 ) ( 768 -480 32 ) ( ( 0.015625 0 251.5 ) ( 0 0.015625 251.5 ) ) common/caulk 0 0 0
 ( 800 -480 192 ) ( 768 -480 192 ) ( 800 -480 -128 ) ( ( 0.015625 0 4.5 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( 800 -480 192 ) ( 800 -480 -128 ) ( 800 -512 192 ) ( ( 0.0078125 -0 -0 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 0 0 0
-( 768 -512 -128 ) ( 800 -512 -128 ) ( 768 -480 -128 ) ( ( 0.0078125 0 125.75 ) ( 0 0.0078125 2.25 ) ) trak4x/wall-brick1 0 0 0
+( 768 -512 -128 ) ( 800 -512 -128 ) ( 768 -480 -128 ) ( ( 0.015625 0 251.5 ) ( 0 0.015625 4.5 ) ) common/caulk 0 0 0
 ( 768 -512 -128 ) ( 768 -512 192 ) ( 800 -512 -128 ) ( ( 0.015625 0 251.5 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( 768 -512 -128 ) ( 768 -480 -128 ) ( 768 -512 192 ) ( ( 0.015625 0 4.5 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 }
@@ -6716,9 +6716,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( 544 -736 64 0 0 ) ( 768 -736 64 0 -2 ) ( 768 -512 64 0 -4 ) )
-( ( 544 -752 64 0.1767766923 0 ) ( 784 -752 64 0.1767766923 -2 ) ( 784 -512 64 0.1767766923 -4 ) )
-( ( 544 -768 64 0.3535533845 0 ) ( 800 -768 64 0.3535533845 -2 ) ( 800 -512 64 0.3535533845 -4 ) )
+( ( 544 -736 64 -5.75 4.25 ) ( 768 -736 64 -5.75 6 ) ( 768 -512 64 -4 6 ) )
+( ( 544 -752 64 -5.875 4.25 ) ( 784 -752 64 -5.875 6.125 ) ( 784 -512 64 -4 6.125 ) )
+( ( 544 -768 64 -6 4.25 ) ( 800 -768 64 -6 6.25 ) ( 800 -512 64 -4 6.25 ) )
 )
 }
 }
@@ -6752,9 +6752,9 @@ brushDef
 ( 544 -736 64 ) ( 544 -768 64 ) ( 0 -736 64 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( 544 -736 64 ) ( 0 -736 64 ) ( 544 -736 -96 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.25 ) ) exx/base-metal03 0 0 0
 ( 544 -736 64 ) ( 544 -736 -96 ) ( 544 -768 64 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.5 ) ) common/caulk 0 0 0
-( 0 -768 32 ) ( 544 -768 32 ) ( 0 -736 32 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( 0 -768 32 ) ( 544 -768 32 ) ( 0 -736 32 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( 0 -768 -96 ) ( 0 -768 64 ) ( 544 -768 -96 ) ( ( 0.0078125 -0 -0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
-( 0 -768 -96 ) ( 0 -736 -96 ) ( 0 -768 64 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.25 ) ) exx/base-metal03 0 0 0
+( 0 -768 -96 ) ( 0 -736 -96 ) ( 0 -768 64 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.5 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -7005,7 +7005,7 @@ brushDef
 ( 768 -512 0 ) ( 752 -512 48 ) ( 768 -512 80 ) ( ( 0.0078125 0 509 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
 ( 736 -384 0 ) ( 736 -512 0 ) ( 768 -384 0 ) ( ( 0 -0.015625 1018 ) ( 0.015625 0 12 ) ) common/caulk 134217728 0 0
 ( 752 -512 0 ) ( 752 -384 48 ) ( 752 -512 48 ) ( ( 0.0078125 0 506 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 768 -384 0 ) ( 752 -384 48 ) ( 752 -384 0 ) ( ( 0.0078125 0 3 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 768 -384 0 ) ( 752 -384 48 ) ( 752 -384 0 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
 }
 }
 {
@@ -7013,7 +7013,7 @@ brushDef
 {
 ( 512 -512 64 ) ( 528 -384 32 ) ( 528 -512 32 ) ( ( 0.0078125 0 1 ) ( 0 0.0078125 508.7576599121 ) ) exx/base-metal03 134217728 0 0
 ( 512 -384 0 ) ( 512 -384 80 ) ( 512 -512 80 ) ( ( 0.015625 0 1022 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 512 -384 0 ) ( 528 -384 48 ) ( 512 -384 80 ) ( ( 0.0078125 0 7 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 512 -384 0 ) ( 528 -384 48 ) ( 512 -384 80 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
 ( 544 -512 0 ) ( 544 -384 0 ) ( 512 -512 0 ) ( ( 0 0.015625 14 ) ( -0.015625 0 1022 ) ) common/caulk 134217728 0 0
 ( 528 -384 0 ) ( 528 -512 48 ) ( 528 -384 48 ) ( ( 0.0078125 0 1 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
 ( 512 -512 0 ) ( 528 -512 48 ) ( 528 -512 0 ) ( ( 0.0078125 0 505 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
@@ -8352,10 +8352,10 @@ exx/floor-simplines
 {
 brushDef
 {
-( -858 788 520 ) ( -860 790 520 ) ( -860 794 520 ) ( ( -0.015625 0 13.84375 ) ( 0 -0.015625 499.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -858 788 520 ) ( -860 790 520 ) ( -860 794 520 ) ( ( -0.03125 0 27.6875 ) ( 0 -0.03125 998.875 ) ) common/caulk 134217728 0 0
 ( -860 790 512 ) ( -860 794 512 ) ( -860 794 520 ) ( ( 0.015625 0 13.84375 ) ( 0 0.015625 9.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -858 796 520 ) ( -860 794 520 ) ( -860 794 512 ) ( ( -0.0110484734 0.00000002 0.1718738824 ) ( 0 0.0156248296 9.437412262 ) ) exx/base-metal06rust 134217728 0 0
-( -854 796 512 ) ( -858 796 512 ) ( -860 794 512 ) ( ( -0.015625 0 13.84375 ) ( 0 0.015625 499.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -854 796 512 ) ( -858 796 512 ) ( -860 794 512 ) ( ( -0.03125 0 27.6875 ) ( 0 0.03125 998.875 ) ) common/caulk 134217728 0 0
 ( -858 788 512 ) ( -860 790 512 ) ( -860 790 520 ) ( ( 0.01104856 0.00000001 13.5468978882 ) ( 0 0.0156250801 9.4375419617 ) ) exx/base-metal06rust 134217728 0 0
 ( -854 788 512 ) ( -858 788 512 ) ( -858 788 520 ) ( ( 0.015625 0 13.09375 ) ( 0 0.015625 9.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -854 796 520 ) ( -858 796 520 ) ( -858 796 512 ) ( ( -0.0156250093 -0.00000001 13.0937509537 ) ( 0 0.015625 9.4375 ) ) exx/base-metal06rust 134217728 0 0
@@ -8367,10 +8367,10 @@ brushDef
 {
 brushDef
 {
-( -938 804 520 ) ( -940 806 520 ) ( -940 810 520 ) ( ( -0.015625 0 13.84375 ) ( 0 -0.015625 499.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -938 804 520 ) ( -940 806 520 ) ( -940 810 520 ) ( ( -0.03125 0 27.6875 ) ( 0 -0.03125 998.875 ) ) common/caulk 134217728 0 0
 ( -940 806 512 ) ( -940 810 512 ) ( -940 810 520 ) ( ( 0.0156250596 -0.00000001 13.843793869 ) ( 0 0.0156250596 9.4375305176 ) ) exx/base-metal06rust 134217728 0 0
 ( -938 812 520 ) ( -940 810 520 ) ( -940 810 512 ) ( ( -0.0110484101 -0.00000004 0.4218162 ) ( 0 0.0156248296 9.4374113083 ) ) exx/base-metal06rust 134217728 0 0
-( -934 812 512 ) ( -938 812 512 ) ( -940 810 512 ) ( ( -0.015625 0 13.84375 ) ( 0 0.015625 499.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -934 812 512 ) ( -938 812 512 ) ( -940 810 512 ) ( ( -0.03125 0 27.6875 ) ( 0 0.03125 998.875 ) ) common/caulk 134217728 0 0
 ( -938 804 512 ) ( -940 806 512 ) ( -940 806 520 ) ( ( 0.0110485004 0.00000003 14.046836853 ) ( 0 0.0156249199 9.4374580383 ) ) exx/base-metal06rust 134217728 0 0
 ( -934 804 512 ) ( -938 804 512 ) ( -938 804 520 ) ( ( 0.015625 0 13.09375 ) ( 0 0.015625 9.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -934 812 520 ) ( -938 812 520 ) ( -938 812 512 ) ( ( -0.0156249702 0 13.09375 ) ( 0 0.015625 9.4375 ) ) exx/base-metal06rust 134217728 0 0
@@ -8520,10 +8520,10 @@ brushDef
 {
 brushDef
 {
-( -858 804 520 ) ( -860 806 520 ) ( -860 810 520 ) ( ( -0.015625 0 13.84375 ) ( 0 -0.015625 499.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -858 804 520 ) ( -860 806 520 ) ( -860 810 520 ) ( ( -0.03125 0 27.6875 ) ( 0 -0.03125 998.875 ) ) common/caulk 134217728 0 0
 ( -860 806 512 ) ( -860 810 512 ) ( -860 810 520 ) ( ( 0.015625 0 13.84375 ) ( 0 0.015625 9.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -858 812 520 ) ( -860 810 520 ) ( -860 810 512 ) ( ( -0.0110485321 0.00000004 0.0468727611 ) ( 0 0.015625 9.4375 ) ) exx/base-metal06rust 134217728 0 0
-( -854 812 512 ) ( -858 812 512 ) ( -860 810 512 ) ( ( -0.015625 0 13.84375 ) ( 0 0.015625 499.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -854 812 512 ) ( -858 812 512 ) ( -860 810 512 ) ( ( -0.03125 0 27.6875 ) ( 0 0.03125 998.875 ) ) common/caulk 134217728 0 0
 ( -858 804 512 ) ( -860 806 512 ) ( -860 806 520 ) ( ( 0.0110485321 -0.00000001 13.6718549728 ) ( 0 0.015625 9.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -854 804 512 ) ( -858 804 512 ) ( -858 804 520 ) ( ( 0.015625 0 13.09375 ) ( 0 0.015625 9.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -854 812 520 ) ( -858 812 520 ) ( -858 812 512 ) ( ( -0.0156249898 0.00000003 13.0937480927 ) ( 0 0.0156249702 9.4374847412 ) ) exx/base-metal06rust 134217728 0 0
@@ -8586,10 +8586,10 @@ trak5x/base-pipe1c
 {
 brushDef
 {
-( -938 788 520 ) ( -940 790 520 ) ( -940 794 520 ) ( ( -0.015625 0 13.84375 ) ( 0 -0.015625 499.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -938 788 520 ) ( -940 790 520 ) ( -940 794 520 ) ( ( -0.03125 0 27.6875 ) ( 0 -0.03125 998.875 ) ) common/caulk 134217728 0 0
 ( -940 790 512 ) ( -940 794 512 ) ( -940 794 520 ) ( ( 0.0156249702 -0.00000001 13.8437223434 ) ( 0 0.0156249404 9.4374694824 ) ) exx/base-metal06rust 134217728 0 0
 ( -938 796 520 ) ( -940 794 520 ) ( -940 794 512 ) ( ( -0.0110484734 -0.00000006 0.5468783379 ) ( 0 0.0156248296 9.437412262 ) ) exx/base-metal06rust 134217728 0 0
-( -934 796 512 ) ( -938 796 512 ) ( -940 794 512 ) ( ( -0.015625 0 13.84375 ) ( 0 0.015625 499.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -934 796 512 ) ( -938 796 512 ) ( -940 794 512 ) ( ( -0.03125 0 27.6875 ) ( 0 0.03125 998.875 ) ) common/caulk 134217728 0 0
 ( -938 788 512 ) ( -940 790 512 ) ( -940 790 520 ) ( ( 0.0110485507 0.00000001 13.9218883514 ) ( 0 0.0156250391 9.4375190735 ) ) exx/base-metal06rust 134217728 0 0
 ( -934 788 512 ) ( -938 788 512 ) ( -938 788 520 ) ( ( 0.015625 0 13.09375 ) ( 0 0.015625 9.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -934 796 520 ) ( -938 796 520 ) ( -938 796 512 ) ( ( -0.0156249702 0 13.09375 ) ( 0 0.015625 9.4375 ) ) exx/base-metal06rust 134217728 0 0
@@ -8669,10 +8669,10 @@ exx/floor-simplines
 {
 brushDef
 {
-( 20 -662 8 ) ( 22 -660 8 ) ( 26 -660 8 ) ( ( 0 -0.015625 1.84375 ) ( 0.015625 0 11.1875 ) ) exx/base-metal06rust 134217728 0 0
+( 20 -662 8 ) ( 22 -660 8 ) ( 26 -660 8 ) ( ( 0 -0.03125 3.6875 ) ( 0.03125 0 22.375 ) ) common/caulk 134217728 0 0
 ( 22 -660 0 ) ( 26 -660 0 ) ( 26 -660 8 ) ( ( 0.015625 0 1.84375 ) ( 0 0.015625 1.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 28 -662 8 ) ( 26 -660 8 ) ( 26 -660 0 ) ( ( -0.0110484734 0.00000002 506.2969055176 ) ( 0 0.0156248296 1.437499404 ) ) exx/base-metal06rust 134217728 0 0
-( 28 -666 0 ) ( 28 -662 0 ) ( 26 -660 0 ) ( ( 0 0.015625 1.84375 ) ( 0.015625 0 11.1875 ) ) exx/base-metal06rust 134217728 0 0
+( 28 -666 0 ) ( 28 -662 0 ) ( 26 -660 0 ) ( ( 0 0.03125 3.6875 ) ( 0.03125 0 22.375 ) ) common/caulk 134217728 0 0
 ( 20 -662 0 ) ( 22 -660 0 ) ( 22 -660 8 ) ( ( 0.01104856 0.00000001 507.671875 ) ( 0 0.0156250801 1.4375003576 ) ) exx/base-metal06rust 134217728 0 0
 ( 20 -666 0 ) ( 20 -662 0 ) ( 20 -662 8 ) ( ( 0.015625 0 501.34375 ) ( 0 0.015625 1.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 28 -666 8 ) ( 28 -662 8 ) ( 28 -662 0 ) ( ( -0.0156250093 -0.00000001 501.34375 ) ( 0 0.015625 1.4375 ) ) exx/base-metal06rust 134217728 0 0
@@ -8684,10 +8684,10 @@ brushDef
 {
 brushDef
 {
-( 36 -582 8 ) ( 38 -580 8 ) ( 42 -580 8 ) ( ( 0 -0.015625 1.84375 ) ( 0.015625 0 11.1875 ) ) exx/base-metal06rust 134217728 0 0
+( 36 -582 8 ) ( 38 -580 8 ) ( 42 -580 8 ) ( ( 0 -0.03125 3.6875 ) ( 0.03125 0 22.375 ) ) common/caulk 134217728 0 0
 ( 38 -580 0 ) ( 42 -580 0 ) ( 42 -580 8 ) ( ( 0.0156250596 -0.00000001 1.8437457085 ) ( 0 0.0156250596 1.4374995232 ) ) exx/base-metal06rust 134217728 0 0
 ( 44 -582 8 ) ( 42 -580 8 ) ( 42 -580 0 ) ( ( -0.0110484101 -0.00000004 506.5469055176 ) ( 0 0.0156248296 1.4374984503 ) ) exx/base-metal06rust 134217728 0 0
-( 44 -586 0 ) ( 44 -582 0 ) ( 42 -580 0 ) ( ( 0 0.015625 1.84375 ) ( 0.015625 0 11.1875 ) ) exx/base-metal06rust 134217728 0 0
+( 44 -586 0 ) ( 44 -582 0 ) ( 42 -580 0 ) ( ( 0 0.03125 3.6875 ) ( 0.03125 0 22.375 ) ) common/caulk 134217728 0 0
 ( 36 -582 0 ) ( 38 -580 0 ) ( 38 -580 8 ) ( ( 0.0110485004 0.00000003 508.171875 ) ( 0 0.0156249199 1.4374996424 ) ) exx/base-metal06rust 134217728 0 0
 ( 36 -586 0 ) ( 36 -582 0 ) ( 36 -582 8 ) ( ( 0.015625 0 501.34375 ) ( 0 0.015625 1.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 44 -586 8 ) ( 44 -582 8 ) ( 44 -582 0 ) ( ( -0.0156249702 0 501.3438110352 ) ( 0 0.015625 1.4375 ) ) exx/base-metal06rust 134217728 0 0
@@ -8837,10 +8837,10 @@ brushDef
 {
 brushDef
 {
-( 36 -662 8 ) ( 38 -660 8 ) ( 42 -660 8 ) ( ( 0 -0.015625 1.84375 ) ( 0.015625 0 11.1875 ) ) exx/base-metal06rust 134217728 0 0
+( 36 -662 8 ) ( 38 -660 8 ) ( 42 -660 8 ) ( ( 0 -0.03125 3.6875 ) ( 0.03125 0 22.375 ) ) common/caulk 134217728 0 0
 ( 38 -660 0 ) ( 42 -660 0 ) ( 42 -660 8 ) ( ( 0.015625 0 1.84375 ) ( 0 0.015625 1.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 44 -662 8 ) ( 42 -660 8 ) ( 42 -660 0 ) ( ( -0.0110485321 0.00000004 506.1718444824 ) ( 0 0.015625 1.4375 ) ) exx/base-metal06rust 134217728 0 0
-( 44 -666 0 ) ( 44 -662 0 ) ( 42 -660 0 ) ( ( 0 0.015625 1.84375 ) ( 0.015625 0 11.1875 ) ) exx/base-metal06rust 134217728 0 0
+( 44 -666 0 ) ( 44 -662 0 ) ( 42 -660 0 ) ( ( 0 0.03125 3.6875 ) ( 0.03125 0 22.375 ) ) common/caulk 134217728 0 0
 ( 36 -662 0 ) ( 38 -660 0 ) ( 38 -660 8 ) ( ( 0.0110485321 -0.00000001 507.796875 ) ( 0 0.015625 1.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 36 -666 0 ) ( 36 -662 0 ) ( 36 -662 8 ) ( ( 0.015625 0 501.34375 ) ( 0 0.015625 1.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 44 -666 8 ) ( 44 -662 8 ) ( 44 -662 0 ) ( ( -0.0156249898 0.00000003 501.34375 ) ( 0 0.0156249702 1.4374997616 ) ) exx/base-metal06rust 134217728 0 0
@@ -8903,10 +8903,10 @@ trak5x/base-pipe1c
 {
 brushDef
 {
-( 20 -582 8 ) ( 22 -580 8 ) ( 26 -580 8 ) ( ( 0 -0.015625 1.84375 ) ( 0.015625 0 11.1875 ) ) exx/base-metal06rust 134217728 0 0
+( 20 -582 8 ) ( 22 -580 8 ) ( 26 -580 8 ) ( ( 0 -0.03125 3.6875 ) ( 0.03125 0 22.375 ) ) common/caulk 134217728 0 0
 ( 22 -580 0 ) ( 26 -580 0 ) ( 26 -580 8 ) ( ( 0.0156249702 -0.00000001 1.8437521458 ) ( 0 0.0156249404 1.4374995232 ) ) exx/base-metal06rust 134217728 0 0
 ( 28 -582 8 ) ( 26 -580 8 ) ( 26 -580 0 ) ( ( -0.0110484734 -0.00000006 506.6719360352 ) ( 0 0.0156248296 1.437499404 ) ) exx/base-metal06rust 134217728 0 0
-( 28 -586 0 ) ( 28 -582 0 ) ( 26 -580 0 ) ( ( 0 0.015625 1.84375 ) ( 0.015625 0 11.1875 ) ) exx/base-metal06rust 134217728 0 0
+( 28 -586 0 ) ( 28 -582 0 ) ( 26 -580 0 ) ( ( 0 0.03125 3.6875 ) ( 0.03125 0 22.375 ) ) common/caulk 134217728 0 0
 ( 20 -582 0 ) ( 22 -580 0 ) ( 22 -580 8 ) ( ( 0.0110485507 0.00000001 508.046875 ) ( 0 0.0156250391 1.4374996424 ) ) exx/base-metal06rust 134217728 0 0
 ( 20 -586 0 ) ( 20 -582 0 ) ( 20 -582 8 ) ( ( 0.015625 0 501.34375 ) ( 0 0.015625 1.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 28 -586 8 ) ( 28 -582 8 ) ( 28 -582 0 ) ( ( -0.0156249702 0 501.3438110352 ) ( 0 0.015625 1.4375 ) ) exx/base-metal06rust 134217728 0 0
@@ -8986,10 +8986,10 @@ exx/floor-simplines
 {
 brushDef
 {
-( -76 602 264 ) ( -74 604 264 ) ( -70 604 264 ) ( ( 0 -0.015625 0.34375 ) ( 0.015625 0 503.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -76 602 264 ) ( -74 604 264 ) ( -70 604 264 ) ( ( 0 -0.03125 0.6875 ) ( 0.03125 0 1006.875 ) ) common/caulk 134217728 0 0
 ( -74 604 256 ) ( -70 604 256 ) ( -70 604 264 ) ( ( 0.015625 0 0.34375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -68 602 264 ) ( -70 604 264 ) ( -70 604 256 ) ( ( -0.0110484734 0.00000002 4.9218187332 ) ( 0 0.0156248296 5.4374556541 ) ) exx/base-metal06rust 134217728 0 0
-( -68 598 256 ) ( -68 602 256 ) ( -70 604 256 ) ( ( 0 0.015625 0.34375 ) ( 0.015625 0 503.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -68 598 256 ) ( -68 602 256 ) ( -70 604 256 ) ( ( 0 0.03125 0.6875 ) ( 0.03125 0 1006.875 ) ) common/caulk 134217728 0 0
 ( -76 602 256 ) ( -74 604 256 ) ( -74 604 264 ) ( ( 0.01104856 0.00000001 4.796877861 ) ( 0 0.0156250801 5.4375209808 ) ) exx/base-metal06rust 134217728 0 0
 ( -76 598 256 ) ( -76 602 256 ) ( -76 602 264 ) ( ( 0.015625 0 9.09375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -68 598 264 ) ( -68 602 264 ) ( -68 602 256 ) ( ( -0.0156250093 -0.00000001 9.093747139 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
@@ -9001,10 +9001,10 @@ brushDef
 {
 brushDef
 {
-( -60 682 264 ) ( -58 684 264 ) ( -54 684 264 ) ( ( 0 -0.015625 0.34375 ) ( 0.015625 0 503.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -60 682 264 ) ( -58 684 264 ) ( -54 684 264 ) ( ( 0 -0.03125 0.6875 ) ( 0.03125 0 1006.875 ) ) common/caulk 134217728 0 0
 ( -58 684 256 ) ( -54 684 256 ) ( -54 684 264 ) ( ( 0.0156250596 -0.00000001 0.3437374234 ) ( 0 0.0156250596 5.437514782 ) ) exx/base-metal06rust 134217728 0 0
 ( -52 682 264 ) ( -54 684 264 ) ( -54 684 256 ) ( ( -0.0110484101 -0.00000004 5.1717414856 ) ( 0 0.0156248296 5.4374547005 ) ) exx/base-metal06rust 134217728 0 0
-( -52 678 256 ) ( -52 682 256 ) ( -54 684 256 ) ( ( 0 0.015625 0.34375 ) ( 0.015625 0 503.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -52 678 256 ) ( -52 682 256 ) ( -54 684 256 ) ( ( 0 0.03125 0.6875 ) ( 0.03125 0 1006.875 ) ) common/caulk 134217728 0 0
 ( -60 682 256 ) ( -58 684 256 ) ( -58 684 264 ) ( ( 0.0110485004 0.00000003 5.2968211174 ) ( 0 0.0156249199 5.4374790192 ) ) exx/base-metal06rust 134217728 0 0
 ( -60 678 256 ) ( -60 682 256 ) ( -60 682 264 ) ( ( 0.015625 0 9.09375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -52 678 264 ) ( -52 682 264 ) ( -52 682 256 ) ( ( -0.0156249702 0 9.09375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
@@ -9154,10 +9154,10 @@ brushDef
 {
 brushDef
 {
-( -60 602 264 ) ( -58 604 264 ) ( -54 604 264 ) ( ( 0 -0.015625 0.34375 ) ( 0.015625 0 503.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -60 602 264 ) ( -58 604 264 ) ( -54 604 264 ) ( ( 0 -0.03125 0.6875 ) ( 0.03125 0 1006.875 ) ) common/caulk 134217728 0 0
 ( -58 604 256 ) ( -54 604 256 ) ( -54 604 264 ) ( ( 0.015625 0 0.34375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -52 602 264 ) ( -54 604 264 ) ( -54 604 256 ) ( ( -0.0110485321 0.00000004 4.7968235016 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
-( -52 598 256 ) ( -52 602 256 ) ( -54 604 256 ) ( ( 0 0.015625 0.34375 ) ( 0.015625 0 503.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -52 598 256 ) ( -52 602 256 ) ( -54 604 256 ) ( ( 0 0.03125 0.6875 ) ( 0.03125 0 1006.875 ) ) common/caulk 134217728 0 0
 ( -60 602 256 ) ( -58 604 256 ) ( -58 604 264 ) ( ( 0.0110485321 -0.00000001 4.921872139 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -60 598 256 ) ( -60 602 256 ) ( -60 602 264 ) ( ( 0.015625 0 9.09375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -52 598 264 ) ( -52 602 264 ) ( -52 602 256 ) ( ( -0.0156249898 0.00000003 9.0937576294 ) ( 0 0.0156249702 5.4374923706 ) ) exx/base-metal06rust 134217728 0 0
@@ -9220,10 +9220,10 @@ trak5x/base-pipe1c
 {
 brushDef
 {
-( -76 682 264 ) ( -74 684 264 ) ( -70 684 264 ) ( ( 0 -0.015625 0.34375 ) ( 0.015625 0 503.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -76 682 264 ) ( -74 684 264 ) ( -70 684 264 ) ( ( 0 -0.03125 0.6875 ) ( 0.03125 0 1006.875 ) ) common/caulk 134217728 0 0
 ( -74 684 256 ) ( -70 684 256 ) ( -70 684 264 ) ( ( 0.0156249702 -0.00000001 0.3437524438 ) ( 0 0.0156249404 5.4374842644 ) ) exx/base-metal06rust 134217728 0 0
 ( -68 682 264 ) ( -70 684 264 ) ( -70 684 256 ) ( ( -0.0110484734 -0.00000006 5.2968592644 ) ( 0 0.0156248296 5.4374556541 ) ) exx/base-metal06rust 134217728 0 0
-( -68 678 256 ) ( -68 682 256 ) ( -70 684 256 ) ( ( 0 0.015625 0.34375 ) ( 0.015625 0 503.4375 ) ) exx/base-metal06rust 134217728 0 0
+( -68 678 256 ) ( -68 682 256 ) ( -70 684 256 ) ( ( 0 0.03125 0.6875 ) ( 0.03125 0 1006.875 ) ) common/caulk 134217728 0 0
 ( -76 682 256 ) ( -74 684 256 ) ( -74 684 264 ) ( ( 0.0110485507 0.00000001 5.1718773842 ) ( 0 0.0156250391 5.4375095367 ) ) exx/base-metal06rust 134217728 0 0
 ( -76 678 256 ) ( -76 682 256 ) ( -76 682 264 ) ( ( 0.015625 0 9.09375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( -68 678 264 ) ( -68 682 264 ) ( -68 682 256 ) ( ( -0.0156249702 0 9.09375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
@@ -9321,10 +9321,10 @@ brushDef
 {
 brushDef
 {
-( 346 316 264 ) ( 348 314 264 ) ( 348 310 264 ) ( ( 0.015625 0 508.59375 ) ( 0 0.015625 507.4375 ) ) exx/base-metal06rust 134217728 0 0
+( 346 316 264 ) ( 348 314 264 ) ( 348 310 264 ) ( ( 0.03125 0 1017.1875 ) ( 0 0.03125 1014.875 ) ) common/caulk 134217728 0 0
 ( 348 314 256 ) ( 348 310 256 ) ( 348 310 264 ) ( ( 0.015625 0 508.59375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 346 308 264 ) ( 348 310 264 ) ( 348 310 256 ) ( ( -0.0110484734 0.00000002 4.7968130112 ) ( 0 0.0156248296 5.4374556541 ) ) exx/base-metal06rust 134217728 0 0
-( 342 308 256 ) ( 346 308 256 ) ( 348 310 256 ) ( ( 0.015625 0 508.59375 ) ( 0 -0.015625 507.4375 ) ) exx/base-metal06rust 134217728 0 0
+( 342 308 256 ) ( 346 308 256 ) ( 348 310 256 ) ( ( 0.03125 0 1017.1875 ) ( 0 -0.03125 1014.875 ) ) common/caulk 134217728 0 0
 ( 346 316 256 ) ( 348 314 256 ) ( 348 314 264 ) ( ( 0.01104856 0.00000001 0.9218719602 ) ( 0 0.0156250801 5.4375209808 ) ) exx/base-metal06rust 134217728 0 0
 ( 342 316 256 ) ( 346 316 256 ) ( 346 316 264 ) ( ( 0.015625 0 5.09375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 342 308 264 ) ( 346 308 264 ) ( 346 308 256 ) ( ( -0.0156250093 -0.00000001 5.0937447548 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
@@ -9336,10 +9336,10 @@ brushDef
 {
 brushDef
 {
-( 426 300 264 ) ( 428 298 264 ) ( 428 294 264 ) ( ( 0.015625 0 508.59375 ) ( 0 0.015625 507.4375 ) ) exx/base-metal06rust 134217728 0 0
+( 426 300 264 ) ( 428 298 264 ) ( 428 294 264 ) ( ( 0.03125 0 1017.1875 ) ( 0 0.03125 1014.875 ) ) common/caulk 134217728 0 0
 ( 428 298 256 ) ( 428 294 256 ) ( 428 294 264 ) ( ( 0.0156250596 -0.00000001 508.5937194824 ) ( 0 0.0156250596 5.437514782 ) ) exx/base-metal06rust 134217728 0 0
 ( 426 292 264 ) ( 428 294 264 ) ( 428 294 256 ) ( ( -0.0110484101 -0.00000004 5.0467514992 ) ( 0 0.0156248296 5.4374547005 ) ) exx/base-metal06rust 134217728 0 0
-( 422 292 256 ) ( 426 292 256 ) ( 428 294 256 ) ( ( 0.015625 0 508.59375 ) ( 0 -0.015625 507.4375 ) ) exx/base-metal06rust 134217728 0 0
+( 422 292 256 ) ( 426 292 256 ) ( 428 294 256 ) ( ( 0.03125 0 1017.1875 ) ( 0 -0.03125 1014.875 ) ) common/caulk 134217728 0 0
 ( 426 300 256 ) ( 428 298 256 ) ( 428 298 264 ) ( ( 0.0110485004 0.00000003 1.4218354225 ) ( 0 0.0156249199 5.4374790192 ) ) exx/base-metal06rust 134217728 0 0
 ( 422 300 256 ) ( 426 300 256 ) ( 426 300 264 ) ( ( 0.015625 0 5.09375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 422 292 264 ) ( 426 292 264 ) ( 426 292 256 ) ( ( -0.0156249702 0 5.0937576294 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
@@ -9460,10 +9460,10 @@ brushDef
 {
 brushDef
 {
-( 346 300 264 ) ( 348 298 264 ) ( 348 294 264 ) ( ( 0.015625 0 508.59375 ) ( 0 0.015625 507.4375 ) ) exx/base-metal06rust 134217728 0 0
+( 346 300 264 ) ( 348 298 264 ) ( 348 294 264 ) ( ( 0.03125 0 1017.1875 ) ( 0 0.03125 1014.875 ) ) common/caulk 134217728 0 0
 ( 348 298 256 ) ( 348 294 256 ) ( 348 294 264 ) ( ( 0.015625 0 508.59375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 346 292 264 ) ( 348 294 264 ) ( 348 294 256 ) ( ( -0.0110485321 0.00000004 4.6718139648 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
-( 342 292 256 ) ( 346 292 256 ) ( 348 294 256 ) ( ( 0.015625 0 508.59375 ) ( 0 -0.015625 507.4375 ) ) exx/base-metal06rust 134217728 0 0
+( 342 292 256 ) ( 346 292 256 ) ( 348 294 256 ) ( ( 0.03125 0 1017.1875 ) ( 0 -0.03125 1014.875 ) ) common/caulk 134217728 0 0
 ( 346 300 256 ) ( 348 298 256 ) ( 348 298 264 ) ( ( 0.0110485321 -0.00000001 1.0468760729 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 342 300 256 ) ( 346 300 256 ) ( 346 300 264 ) ( ( 0.015625 0 5.09375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 342 292 264 ) ( 346 292 264 ) ( 346 292 256 ) ( ( -0.0156249898 0.00000003 5.0937604904 ) ( 0 0.0156249702 5.4374923706 ) ) exx/base-metal06rust 134217728 0 0
@@ -9497,10 +9497,10 @@ brushDef
 {
 brushDef
 {
-( 426 316 264 ) ( 428 314 264 ) ( 428 310 264 ) ( ( 0.015625 0 508.59375 ) ( 0 0.015625 507.4375 ) ) exx/base-metal06rust 134217728 0 0
+( 426 316 264 ) ( 428 314 264 ) ( 428 310 264 ) ( ( 0.03125 0 1017.1875 ) ( 0 0.03125 1014.875 ) ) common/caulk 134217728 0 0
 ( 428 314 256 ) ( 428 310 256 ) ( 428 310 264 ) ( ( 0.0156249702 -0.00000001 508.59375 ) ( 0 0.0156249404 5.4374842644 ) ) exx/base-metal06rust 134217728 0 0
 ( 426 308 264 ) ( 428 310 264 ) ( 428 310 256 ) ( ( -0.0110484734 -0.00000006 5.1718740463 ) ( 0 0.0156248296 5.4374556541 ) ) exx/base-metal06rust 134217728 0 0
-( 422 308 256 ) ( 426 308 256 ) ( 428 310 256 ) ( ( 0.015625 0 508.59375 ) ( 0 -0.015625 507.4375 ) ) exx/base-metal06rust 134217728 0 0
+( 422 308 256 ) ( 426 308 256 ) ( 428 310 256 ) ( ( 0.03125 0 1017.1875 ) ( 0 -0.03125 1014.875 ) ) common/caulk 134217728 0 0
 ( 426 316 256 ) ( 428 314 256 ) ( 428 314 264 ) ( ( 0.0110485507 0.00000001 1.296874404 ) ( 0 0.0156250391 5.4375095367 ) ) exx/base-metal06rust 134217728 0 0
 ( 422 316 256 ) ( 426 316 256 ) ( 426 316 264 ) ( ( 0.015625 0 5.09375 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0
 ( 422 308 264 ) ( 426 308 264 ) ( 426 308 256 ) ( ( -0.0156249702 0 5.0937576294 ) ( 0 0.015625 5.4375 ) ) exx/base-metal06rust 134217728 0 0

diff --git a/scripts/map_implosion.shader b/scripts/map_implosion.shader
index f90b8895d8f5e3480fd7eec0588142ce449ead25..d8c2691a7e51fb48146c03a47d5451888d47c8a0 100644 (file)
--- a/scripts/map_implosion.shader
+++ b/scripts/map_implosion.shader
@@ -122,7 +122,6 @@ textures/map_implosion/sky
        surfaceparm nomarks
        q3map_globaltexture
        q3map_surfacelight 50
-       surfaceparm sky
 
                nopicmip
                nomipmaps

diff --git a/scripts/map_space-elevator.shader b/scripts/map_space-elevator.shader
index 6b76821c3c8a06142ba933d48841e01cd8a19192..24d6bce0acbd024999d549d2a405e9bdd421ad62 100644 (file)
--- a/scripts/map_space-elevator.shader
+++ b/scripts/map_space-elevator.shader
@@ -97,7 +97,6 @@ textures/map_space-elevator/polluted_earth
        surfaceparm nomarks
        q3map_globaltexture
        q3map_surfacelight 5
-       surfaceparm sky
 
         nopicmip
         nomipmaps

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index ebe86d2ad2dc36c9d53b8166403885219c2fc500..f7a347d43cc420e00444e0bfc32708b4226489fb 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -61,6 +61,7 @@ skies_extragalactic
 skies_heaven
 skies_polluted_earth
 skies_purple_nebulae
+solarpanel
 stein1x
 techpanelx
 terrain01x

diff --git a/scripts/skies_calm_sea.shader b/scripts/skies_calm_sea.shader
index 822778dd76ad9ac7a769691dec1fbf4866919537..6e3a5bfbc63c6713c6b689de52a9a4aafc1cceaf 100644 (file)
--- a/scripts/skies_calm_sea.shader
+++ b/scripts/skies_calm_sea.shader
@@ -9,7 +9,6 @@ textures/skies/calm_sea
        surfaceparm nomarks
        q3map_globaltexture
        q3map_skylight 150 4
-       surfaceparm sky
 
         nopicmip
         nomipmaps

diff --git a/scripts/skies_distant_sunset.shader b/scripts/skies_distant_sunset.shader
index ee566d0664dd619313d4d9c203ef9aba676ef827..015777e5939ea55dc7d38713e1ec1302aea631e3 100644 (file)
--- a/scripts/skies_distant_sunset.shader
+++ b/scripts/skies_distant_sunset.shader
@@ -8,7 +8,6 @@ textures/skies/distant_sunset
        surfaceparm nomarks
        q3map_globaltexture
        q3map_skylight 50 4
-       surfaceparm sky
 
         nopicmip
         nomipmaps

diff --git a/scripts/skies_polluted_earth.shader b/scripts/skies_polluted_earth.shader
index b270055930456e79404cfb0bbcd9a3864bbe798e..8f60b47da19656692cd0a1e0da0c64e9ba06e430 100644 (file)
--- a/scripts/skies_polluted_earth.shader
+++ b/scripts/skies_polluted_earth.shader
@@ -9,7 +9,6 @@ textures/skies/polluted_earth
        surfaceparm nomarks
        q3map_globaltexture
        q3map_surfacelight 120
-       surfaceparm sky
 
         nopicmip
         nomipmaps