Trident: Extend a clip that was too short + fix a tiny z-fight

diff --git a/maps/trident.map b/maps/trident.map
index 3a05b68e506d4a7ecdbcab452edb436a40eae0c2..c25187165dc7111b47362cd41efefedb71201bc0 100644 (file)
--- a/maps/trident.map
+++ b/maps/trident.map
@@ -419,7 +419,7 @@ brushDef
 ( -416 -416 256 ) ( -496 -416 192 ) ( -512 -416 256 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0
 ( -416 -400 192 ) ( -416 -336 256 ) ( -416 -336 192 ) ( ( 0.0078125 0 1 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( -416 -400 192 ) ( -496 -400 192 ) ( -496 -416 192 ) ( ( 0.0625 0 8 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0
-( -528 -64 208 ) ( -528 -64 240 ) ( -528 -192 208 ) ( ( 0.0625 0 56 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0
+( -512 -64 256 ) ( -528 64 192 ) ( -512 64 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -1419,7 +1419,7 @@ brushDef
 brushDef
 {
 ( -512 416 256 ) ( -512 -352 256 ) ( -544 -352 256 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
-( -560 -512 256 ) ( -528 -512 256 ) ( -560 -512 192 ) ( ( 0.0078125 0 510.125 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
+( -560 -512 256 ) ( -528 -512 256 ) ( -560 -512 192 ) ( ( 0.015625 0 1020.25 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -512 -352 256 ) ( -512 416 256 ) ( -528 416 192 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( -544 256 256 ) ( -544 320 192 ) ( -544 320 256 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0
 ( -464 -224 192 ) ( -464 -224 256 ) ( -528 -224 192 ) ( ( 0.0078125 0 2 ) ( 0 0.0078125 0 ) ) exx/base-metal03 0 0 0
@@ -4221,7 +4221,7 @@ brushDef
 {
 ( -32 -400 256 ) ( -288 -400 256 ) ( -32 -400 -512 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak4x/base-concrete4b 0 0 0
 ( 16 -272 704 ) ( 16 -272 -64 ) ( 16 -528 704 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) trak4x/base-concrete4a 0 0 0
-( -256 -512 0 ) ( 0 -512 0 ) ( -256 -256 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak4x/base-concrete4a 0 0 0
+( -256 -512 0 ) ( 0 -512 0 ) ( -256 -256 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -272 -528 -64 ) ( -272 -272 -64 ) ( -272 -528 704 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) trak4x/base-concrete4a 0 0 0
 ( -96 -512 64 ) ( -32 -512 -64 ) ( -96 -512 -64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak4x/wall-brick1 0 0 0
 ( -224 64 64 ) ( -32 64 64 ) ( -224 -64 64 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) common/caulk 0 0 0
@@ -4233,7 +4233,7 @@ brushDef
 ( -32 -400 256 ) ( -288 -400 256 ) ( -32 -400 -512 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak4x/base-concrete4a 0 0 0
 ( 16 -272 704 ) ( 16 -272 -64 ) ( 16 -528 704 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) trak4x/base-concrete4a 0 0 0
 ( -272 -528 -64 ) ( -272 -272 -64 ) ( -272 -528 704 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) trak4x/base-concrete4a 0 0 0
-( 256 -64 192 ) ( 96 64 192 ) ( 256 64 192 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak4x/base-concrete4a 0 0 0
+( 256 -64 192 ) ( 96 64 192 ) ( 256 64 192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -96 -512 64 ) ( -32 -512 -64 ) ( -96 -512 -64 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak4x/wall-brick1 0 0 0
 ( -320 -64 128 ) ( -256 64 128 ) ( -320 64 128 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) common/caulk 0 0 0
 }
@@ -4960,7 +4960,7 @@ brushDef
 ( -256 384 704 ) ( -272 384 704 ) ( -256 384 192 ) ( ( 0.015625 0 0 ) ( 0 0.015625 3 ) ) common/clip 0 0 0
 ( -256 384 512 ) ( -256 384 0 ) ( -256 160 512 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -272 160 192 ) ( -256 160 192 ) ( -272 384 192 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
-( -272 160 0 ) ( -272 160 512 ) ( -256 160 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
+( -272 128 0 ) ( -272 128 512 ) ( -256 128 0 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -288 160 0 ) ( -288 384 0 ) ( -288 160 512 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 }
 }
@@ -5263,12 +5263,12 @@ brushDef
 ( -1421.9412841797 -178.8479766846 -205.7306976318 ) ( -1716.2330322266 -147.4272613525 -210.3230133057 ) ( -1434.7342529297 -335.3430175781 -456.6522827148 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
 ( -1637.2293701172 -398.0263671875 847.0505371094 ) ( -1931.9188232422 -425.1572570801 840.8784179688 ) ( -1654.5367431641 -167.8765869141 661.7196044922 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
 ( -1258.9534912109 -375.6434936523 109.8242340088 ) ( -1261.5889892578 -79.760559082 117.7216186523 ) ( -1299.9801025391 -368.1871948242 -183.2239074707 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
-( -1325.0422363281 -112.2171325684 289.1900634766 ) ( -1432.7299804688 -387.7732543945 279.8006591797 ) ( -1311.2490234375 -107.5336914063 -6.4513244629 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
+( -1325.0422363281 -112.2171325684 289.1900634766 ) ( -1432.7299804688 -387.7732543945 279.8006591797 ) ( -1311.2490234375 -107.5336914062 -6.4513244629 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
 ( -1080.0626220703 -290.3201904297 633.0038452148 ) ( -798.6701049805 -382.1177978516 635.7364501953 ) ( -1099.2458496094 -357.6842956543 345.4102172852 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
 ( -1384.3074951172 -71.405456543 276.4613342285 ) ( -1650.2517089844 58.5470275879 275.0387573242 ) ( -1384.8446044922 -75.7444000244 -19.5063781738 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
 ( -1024.3276367188 -171.3375854492 -324.182800293 ) ( -754.4768066406 -292.9666442871 -322.4645385742 ) ( -946.8759765625 -2.7588043213 -554.8306274414 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
-( -1488.2368164063 -239.7811279297 848.370300293 ) ( -1738.4645996094 -81.6611633301 847.9945068359 ) ( -1371.0491943359 -54.8030548096 649.2065429688 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
-( -1383.4458007813 -68.3261108398 -125.9170837402 ) ( -1441.0069580078 50.3760223389 -123.7925415039 ) ( -1465.5495605469 29.8661499023 -124.7966918945 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -1488.2368164062 -239.7811279297 848.370300293 ) ( -1738.4645996094 -81.6611633301 847.9945068359 ) ( -1371.0491943359 -54.8030548096 649.2065429688 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
+( -1383.4458007812 -68.3261108398 -125.9170837402 ) ( -1441.0069580078 50.3760223389 -123.7925415039 ) ( -1465.5495605469 29.8661499023 -124.7966918945 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1376 64 576 ) ( -1248 64 704 ) ( -1376 -64 576 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
 ( -1280 64 672 ) ( -1216 64 672 ) ( -1280 -64 672 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 0 0 0
 }
@@ -5291,7 +5291,7 @@ brushDef
 {
 ( -1195.7922363281 -794.8645019531 -512.5079956055 ) ( -1971.7803955078 -817.016784668 -884.4820556641 ) ( -1086.5070800781 -841.3889160156 -1021.1953735352 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( -665.0387573242 -764.8630371094 108.2463378906 ) ( -115.2556304932 -712.5738525391 364.3165893555 ) ( -336.9987487793 -813.6440429688 -242.3419952393 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( -1027.5112304688 -864.2995605469 -576.0630493164 ) ( -704.6392822266 -809.5864257813 -430.5812683105 ) ( -1294.4538574219 -905.4790039063 -1188.3184814453 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( -1027.5112304688 -864.2995605469 -576.0630493164 ) ( -704.6392822266 -809.5864257812 -430.5812683105 ) ( -1294.4538574219 -905.4790039062 -1188.3184814453 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( -36.0966033936 -788.8937988281 -156.6766967773 ) ( 552.8465576172 -801.3742675781 131.6168365479 ) ( 352.7414550781 -794.5417480469 -427.4252929688 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( -1208 -760 64 ) ( -776 -792 -64 ) ( -1208 -760 -64 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( -1040 -64 -128 ) ( -1000 64 -128 ) ( -1040 64 -128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
@@ -5309,7 +5309,7 @@ brushDef
 ( 202.4176635742 848.6323242188 72.3380737305 ) ( 101.735168457 791.0212402344 72.3380737305 ) ( 204.236328125 845.453918457 -43.6041107178 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( 350.7221069336 819.0294799805 62.5718231201 ) ( 279.2119140625 910.3656005859 62.5718231201 ) ( 340.1490478516 810.7514648438 -52.6483306885 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( 277.6628417969 792.2689208984 -157.7557983398 ) ( 169.9220581055 835.2564086914 -157.7557983398 ) ( 238.4716796875 694.04296875 -205.4182739258 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
-( 268.5412597656 728.9390258789 190.1040039063 ) ( 374.3991699219 776.374206543 190.1040039063 ) ( 315.2011108398 624.8112792969 169.2168121338 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
+( 268.5412597656 728.9390258789 190.1040039062 ) ( 374.3991699219 776.374206543 190.1040039062 ) ( 315.2011108398 624.8112792969 169.2168121338 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( 361.3139648438 746.27734375 -108.4669342041 ) ( 363.2860717773 862.260559082 -108.4669342041 ) ( 304.8551635742 747.2373046875 -209.7955322266 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( 330.9879150391 778.5114746094 162.520324707 ) ( 285.1815185547 885.0843505859 162.520324707 ) ( 410.4768676758 812.6768188477 85.253036499 ) ( ( 0.00390625 0 -0 ) ( -0 0.00390625 0 ) ) phillipk2x/natural-pk02_rock01 134217728 0 0
 ( 256 800 -64 ) ( 256 864 -64 ) ( 256 800 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
@@ -5323,7 +5323,7 @@ brushDef
 ( -128 384 256 ) ( -128 -896 256 ) ( -896 384 256 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak4x/floor-tile1 0 0 0
 ( -80 96 256 ) ( -848 96 256 ) ( -80 96 -512 ) ( ( 0.015625 0 0.75 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -544 384 512 ) ( -544 384 -256 ) ( -544 -896 512 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -896 -896 192 ) ( -128 -896 192 ) ( -896 384 192 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) trak4x/wood1c 0 0 0
+( -896 -896 192 ) ( -128 -896 192 ) ( -896 384 192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -896 -480 -512 ) ( -896 -480 256 ) ( -128 -480 -512 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( -736 -912 -256 ) ( -736 368 -256 ) ( -736 -912 512 ) ( ( 0.015625 0 0.25 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 }
@@ -6325,8 +6325,8 @@ brushDef
 brushDef
 {
 ( 382.796875 519.8132324219 320 ) ( 319.2671508789 512.069152832 320 ) ( 382.796875 519.8132324219 288 ) ( ( 0.0078125009 0 2.2100188732 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
-( 321.2031555176 496.1867370605 288 ) ( 384.7329101563 503.930847168 288 ) ( 317.3311157227 527.9515991211 288 ) ( ( -0.0009453244 0.0077550965 511.9600219727 ) ( -0.0077550965 -0.0009453244 511.544342041 ) ) trak4x/wall-brick1 134217728 0 0
-( 321.2031555176 496.1867370605 288 ) ( 321.2031555176 496.1867370605 320 ) ( 384.7329101563 503.930847168 288 ) ( ( 0.0156250019 0 251.5799713135 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 321.2031555176 496.1867370605 288 ) ( 384.7329101562 503.930847168 288 ) ( 317.3311157227 527.9515991211 288 ) ( ( -0.0009453244 0.0077550965 511.9600219727 ) ( -0.0077550965 -0.0009453244 511.544342041 ) ) trak4x/wall-brick1 134217728 0 0
+( 321.2031555176 496.1867370605 288 ) ( 321.2031555176 496.1867370605 320 ) ( 384.7329101562 503.930847168 288 ) ( ( 0.0156250019 0 251.5799713135 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 399.2354736328 54.3825378418 304 ) ( 415.1179199219 56.318572998 304 ) ( 414.7236938477 -72.6769561768 304 ) ( ( 0.0009453244 0.0077550965 511.0399780273 ) ( -0.0077550965 0.0009453244 0.5443348289 ) ) trak4x/wall-brick1 134217728 0 0
 ( 406.7824707031 -73.6449584961 304 ) ( 391.2942504883 53.4145355225 288 ) ( 391.2942504883 53.4145355225 304 ) ( ( 0.0078125009 0 511.544342041 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
 ( 423.0591430664 57.2865753174 296 ) ( 423.0591430664 57.2865753174 288 ) ( 438.5473327637 -69.7729187012 296 ) ( ( 0.0078125009 0 0.4556651711 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
@@ -6416,7 +6416,7 @@ brushDef
 ( -318.6409912109 -372.8785095215 320 ) ( -382.3204345703 -366.4807128906 320 ) ( -318.6409912109 -372.8785095215 288 ) ( ( 0.0078125 0 508.5643005371 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
 ( -383.9198608398 -382.4005737305 288 ) ( -383.9198608398 -382.4005737305 320 ) ( -320.240447998 -388.7983398438 288 ) ( ( 0.015625 0 6.8714036942 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( -383.9198608398 -382.4005737305 288 ) ( -380.7209472656 -350.5608520508 288 ) ( -383.9198608398 -382.4005737305 320 ) ( ( 0.0078125 0 503.8526306152 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
-( -417.620300293 -957.9144897461 304 ) ( -388.9048461914 -832.155090332 304 ) ( -404.8247070313 -830.5556640625 304 ) ( ( 0.0007809819 0.0077733663 506.4393005371 ) ( -0.0077733663 0.0007809819 504.7276306152 ) ) trak4x/wall-brick1 134217728 0 0
+( -417.620300293 -957.9144897461 304 ) ( -388.9048461914 -832.155090332 304 ) ( -404.8247070312 -830.5556640625 304 ) ( ( 0.0007809819 0.0077733663 506.4393005371 ) ( -0.0077733663 0.0007809819 504.7276306152 ) ) trak4x/wall-brick1 134217728 0 0
 ( -350.8805541992 -373.6595458984 -64 ) ( -351.4803466797 -379.6295166016 -64 ) ( -350.8805541992 -373.6595458984 64 ) ( ( 0.0078125 0 6.3973741531 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
 }
 }
@@ -6424,9 +6424,9 @@ brushDef
 brushDef
 {
 ( -385.3022766113 -375.9314575195 320 ) ( -448.7655639648 -384.2026977539 320 ) ( -385.3022766113 -375.9314575195 288 ) ( ( 0.0078125 0 507.3855285645 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
-( -446.6977539063 -400.0685119629 288 ) ( -383.2344665527 -391.7973022461 288 ) ( -450.8333435059 -368.3368530273 288 ) ( ( -0.0010096699 0.0077469815 505.1355285645 ) ( -0.0077469815 -0.0010096699 505.3517150879 ) ) trak4x/wall-brick1 134217728 0 0
-( -446.6977539063 -400.0685119629 288 ) ( -446.6977539063 -400.0685119629 320 ) ( -383.2344665527 -391.7973022461 288 ) ( ( 0.015625 0 9.2289924622 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( -365.0004882813 -841.2097167969 304 ) ( -349.1347045898 -839.1419067383 304 ) ( -348.4580688477 -968.1362304688 304 ) ( ( 0.0010096699 0.0077469815 5.8644962311 ) ( -0.0077469815 0.0010096699 506.3517150879 ) ) trak4x/wall-brick1 134217728 0 0
+( -446.6977539062 -400.0685119629 288 ) ( -383.2344665527 -391.7973022461 288 ) ( -450.8333435059 -368.3368530273 288 ) ( ( -0.0010096699 0.0077469815 505.1355285645 ) ( -0.0077469815 -0.0010096699 505.3517150879 ) ) trak4x/wall-brick1 134217728 0 0
+( -446.6977539062 -400.0685119629 288 ) ( -446.6977539062 -400.0685119629 320 ) ( -383.2344665527 -391.7973022461 288 ) ( ( 0.015625 0 9.2289924622 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( -365.0004882812 -841.2097167969 304 ) ( -349.1347045898 -839.1419067383 304 ) ( -348.4580688477 -968.1362304688 304 ) ( ( 0.0010096699 0.0077469815 5.8644962311 ) ( -0.0077469815 0.0010096699 506.3517150879 ) ) trak4x/wall-brick1 134217728 0 0
 ( -356.3909912109 -969.1701660156 304 ) ( -372.9334106445 -842.2435913086 288 ) ( -372.9334106445 -842.2435913086 304 ) ( ( 0.0078125 0 505.3517150879 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
 ( -341.2017822266 -838.1080322266 296 ) ( -341.2017822266 -838.1080322266 288 ) ( -324.659362793 -965.0345458984 296 ) ( ( 0.0078125 0 6.6483058929 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
 }
@@ -6437,17 +6437,17 @@ brushDef
 ( -319.0304260254 -382.9965209961 352 ) ( -381.5630493164 -369.3703613281 352 ) ( -319.0304260254 -382.9965209961 320 ) ( ( 0.0078125 0 508.9517822266 ) ( 0 0.0078125 0.25 ) ) trak4x/wall-brick1 134217728 0 0
 ( -384.9696044922 -385.0035400391 320 ) ( -322.4369506836 -398.6296386719 320 ) ( -378.1565246582 -353.7372131348 320 ) ( ( 0.0016633468 0.0076333764 506.7017822266 ) ( -0.0076333764 0.0016633468 504.4207763672 ) ) trak4x/wall-brick1 134217728 0 0
 ( -384.9696044922 -385.0035400391 320 ) ( -384.9696044922 -385.0035400391 352 ) ( -322.4369506836 -398.6296386719 320 ) ( ( 0.015625 0 6.0964465141 ) ( 0 0.015625 0.5 ) ) common/caulk 134217728 0 0
-( -456.9028320313 -827.8416748047 336 ) ( -441.2696533203 -831.2481689453 336 ) ( -484.155090332 -952.9068603516 336 ) ( ( -0.0016633468 0.0076333764 4.2982234955 ) ( -0.0076333764 -0.0016633468 505.4207763672 ) ) trak4x/wall-brick1 134217728 0 0
-( -491.9716796875 -951.2036132813 336 ) ( -464.7193908691 -826.1384277344 320 ) ( -464.7193908691 -826.1384277344 336 ) ( ( 0.0078125 0 504.4207763672 ) ( 0 0.0078125 0.25 ) ) trak4x/wall-brick1 134217728 0 0
+( -456.9028320312 -827.8416748047 336 ) ( -441.2696533203 -831.2481689453 336 ) ( -484.155090332 -952.9068603516 336 ) ( ( -0.0016633468 0.0076333764 4.2982234955 ) ( -0.0076333764 -0.0016633468 505.4207763672 ) ) trak4x/wall-brick1 134217728 0 0
+( -491.9716796875 -951.2036132812 336 ) ( -464.7193908691 -826.1384277344 320 ) ( -464.7193908691 -826.1384277344 336 ) ( ( 0.0078125 0 504.4207763672 ) ( 0 0.0078125 0.25 ) ) trak4x/wall-brick1 134217728 0 0
 ( -433.4530639648 -832.9514770508 328 ) ( -433.4530639648 -832.9514770508 320 ) ( -460.7053527832 -958.0167236328 328 ) ( ( 0.0078125 0 7.5792145729 ) ( 0 0.0078125 0.25 ) ) trak4x/wall-brick1 134217728 0 0
 }
 }
 {
 brushDef
 {
-( 572.0285644531 -529.3778076172 320 ) ( 578.752746582 -498.0922851563 320 ) ( 634.599609375 -542.8262329102 320 ) ( ( 0.0016416505 -0.0076380721 8.3632478714 ) ( 0.0076380721 0.0016416505 510.8543701172 ) ) trak4x/wall-brick1 134217728 0 0
+( 572.0285644531 -529.3778076172 320 ) ( 578.752746582 -498.0922851562 320 ) ( 634.599609375 -542.8262329102 320 ) ( ( 0.0016416505 -0.0076380721 8.3632478714 ) ( 0.0076380721 0.0016416505 510.8543701172 ) ) trak4x/wall-brick1 134217728 0 0
 ( 575.390625 -513.7350463867 320 ) ( 637.961730957 -527.1834716797 320 ) ( 575.390625 -513.7350463867 288 ) ( ( 0.0078125009 0 505.5117492676 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
-( 641.3238525391 -511.5407104492 288 ) ( 641.3238525391 -511.5407104492 320 ) ( 578.752746582 -498.0922851563 288 ) ( ( 0.0156250019 0 12.9764966965 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 641.3238525391 -511.5407104492 288 ) ( 641.3238525391 -511.5407104492 320 ) ( 578.752746582 -498.0922851562 288 ) ( ( 0.0156250019 0 12.9764966965 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 641.3238525391 -511.5407104492 288 ) ( 634.599609375 -542.8262329102 288 ) ( 641.3238525391 -511.5407104492 320 ) ( ( 0.0078125009 0 509.9793701172 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
 ( 738.8952636719 56.6421966553 304 ) ( 696.3557128906 -65.1378631592 304 ) ( 711.9984741211 -68.4999694824 304 ) ( ( -0.0016416505 -0.0076380721 503.3867492676 ) ( 0.0076380721 -0.0016416505 510.8543701172 ) ) trak4x/wall-brick1 134217728 0 0
 ( 607.5167236328 -516.5485839844 -64 ) ( 608.7774658203 -510.6825561523 -64 ) ( 607.5167236328 -516.5485839844 64 ) ( ( 0.0078125009 0 0.2706646025 ) ( 0 0.0078125 0 ) ) trak4x/wall-brick1 134217728 0 0
@@ -6479,18 +6479,18 @@ brushDef
 brushDef
 {
 ( 640.8671264648 -527.0429077148 319.9331359863 ) ( 704.6022949219 -521.2268676758 319.9535522461 ) ( 640.8569335938 -526.8186645508 287.9338989258 ) ( ( 0.0078124995 -0.000002493 506.1373291016 ) ( 0.000002493 0.0078124995 0.02986921 ) ) trak4x/wall-brick1 134217728 0 0
-( 703.1381225586 -505.0692138672 288.0664672852 ) ( 639.4029541016 -510.8852539063 288.0460510254 ) ( 706.0461425781 -536.9359741211 287.8422241211 ) ( ( -0.0078044133 -0.0003553566 503.8873291016 ) ( 0.0003553566 -0.0078044133 0.4128417969 ) ) trak4x/wall-brick1 134217728 0 0
-( 703.1381225586 -505.0692138672 288.0664672852 ) ( 703.1483154297 -505.2934570313 320.0656738281 ) ( 639.4029541016 -510.8852539063 288.0460510254 ) ( ( 0.0156249991 0.0000049859 11.7253408432 ) ( -0.0000049859 0.0156249991 0.05973842 ) ) common/caulk 134217728 0 0
+( 703.1381225586 -505.0692138672 288.0664672852 ) ( 639.4029541016 -510.8852539062 288.0460510254 ) ( 706.0461425781 -536.9359741211 287.8422241211 ) ( ( -0.0078044133 -0.0003553566 503.8873291016 ) ( 0.0003553566 -0.0078044133 0.4128417969 ) ) trak4x/wall-brick1 134217728 0 0
+( 703.1381225586 -505.0692138672 288.0664672852 ) ( 703.1483154297 -505.2934570312 320.0656738281 ) ( 639.4029541016 -510.8852539062 288.0460510254 ) ( ( 0.0156249991 0.0000049859 11.7253408432 ) ( -0.0000049859 0.0156249991 0.05973842 ) ) common/caulk 134217728 0 0
 ( 638.5300292969 -61.2271118164 307.1979980469 ) ( 622.5962524414 -62.681137085 307.1928710938 ) ( 626.8978881836 66.2400970459 308.0950012207 ) ( ( -0.0078044133 0.0003553566 7.1126704216 ) ( -0.0003553566 -0.0078044133 1.4128633738 ) ) trak4x/wall-brick1 134217728 0 0
 ( 634.8648071289 66.9671020508 308.0975646973 ) ( 646.4918212891 -60.3879852295 291.2009277344 ) ( 646.4969482422 -60.5001068115 307.2005615234 ) ( ( 0.0078123081 -0.0000547498 0.4128417969 ) ( 0.0000547498 0.0078123081 0.0298692081 ) ) trak4x/wall-brick1 134217728 0 0
-( 614.6268310547 -63.3520812988 299.1905212402 ) ( 614.6242675781 -63.296005249 291.1907348633 ) ( 602.9946289063 64.1151275635 300.0875244141 ) ( ( 0.0078123081 0.0000547498 511.5871276855 ) ( -0.0000547498 0.0078123081 0.0298692081 ) ) trak4x/wall-brick1 134217728 0 0
+( 614.6268310547 -63.3520812988 299.1905212402 ) ( 614.6242675781 -63.296005249 291.1907348633 ) ( 602.9946289062 64.1151275635 300.0875244141 ) ( ( 0.0078123081 0.0000547498 511.5871276855 ) ( -0.0000547498 0.0078123081 0.0298692081 ) ) trak4x/wall-brick1 134217728 0 0
 }
 }
 {
 brushDef
 {
 ( 608 -536.7130126953 285.4097900391 ) ( 608 -504.8934936523 288.8032836914 ) ( 672 -536.7130126953 285.4097900391 ) ( ( -0.0078125 0 7.875 ) ( 0 -0.0078125 511.6829528809 ) ) trak4x/wall-brick1 134217728 0 0
-( 608 -520.8032226563 287.1065368652 ) ( 672 -520.8032226563 287.1065368652 ) ( 608 -517.4097900391 255.2869720459 ) ( ( 0.0078125 0 506 ) ( 0 0.0078125 0.1618652344 ) ) trak4x/wall-brick1 134217728 0 0
+( 608 -520.8032226562 287.1065368652 ) ( 672 -520.8032226562 287.1065368652 ) ( 608 -517.4097900391 255.2869720459 ) ( ( 0.0078125 0 506 ) ( 0 0.0078125 0.1618652344 ) ) trak4x/wall-brick1 134217728 0 0
 ( 672 -501.5 256.9837036133 ) ( 672 -504.8934936523 288.8032836914 ) ( 608 -501.5 256.9837036133 ) ( ( 0.015625 0 12 ) ( 0 0.015625 0.3236999512 ) ) common/caulk 134217728 0 0
 ( 672 -501.5 256.9837036133 ) ( 672 -533.319519043 253.5902252197 ) ( 672 -504.8934936523 288.8032836914 ) ( ( 0.0077684466 -0.000828489 510.8079528809 ) ( 0.000828489 0.0077684466 0.1618652344 ) ) trak4x/wall-brick1 134217728 0 0
 ( 648 69.5552978516 333.9763183594 ) ( 632 -57.7229309082 320.4023742676 ) ( 648 -57.7229309082 320.4023742676 ) ( ( -0.0078125 0 503.875 ) ( 0 -0.0078125 511.6829528809 ) ) trak4x/wall-brick1 134217728 0 0
@@ -6555,9 +6555,9 @@ brushDef
 {
 brushDef
 {
-( 164.7374267578 -543.7545166016 192 ) ( 159.3383789063 -512.2132568359 192 ) ( 227.8199157715 -532.9564208984 192 ) ( ( -0.0013181283 -0.0077004996 3.6768221855 ) ( 0.0077004996 -0.0013181283 0.1543266475 ) ) trak4x/wall-brick1 134217728 0 0
+( 164.7374267578 -543.7545166016 192 ) ( 159.3383789062 -512.2132568359 192 ) ( 227.8199157715 -532.9564208984 192 ) ( ( -0.0013181283 -0.0077004996 3.6768221855 ) ( 0.0077004996 -0.0013181283 0.1543266475 ) ) trak4x/wall-brick1 134217728 0 0
 ( 162.037902832 -527.9838867188 192 ) ( 225.1203918457 -517.1857910156 192 ) ( 162.037902832 -527.9838867188 160 ) ( ( 0.0078125 0 510.1981506348 ) ( 0 0.0078125 511 ) ) trak4x/wall-brick1 134217728 0 0
-( 222.4208679199 -501.4151611328 160 ) ( 222.4208679199 -501.4151611328 192 ) ( 159.3383789063 -512.2132568359 160 ) ( ( 0.015625 0 3.603644371 ) ( 0 0.015625 254 ) ) common/caulk 134217728 0 0
+( 222.4208679199 -501.4151611328 160 ) ( 222.4208679199 -501.4151611328 192 ) ( 159.3383789062 -512.2132568359 160 ) ( ( 0.015625 0 3.603644371 ) ( 0 0.015625 254 ) ) common/caulk 134217728 0 0
 ( 222.4208679199 -501.4151611328 160 ) ( 227.8199157715 -532.9564208984 160 ) ( 222.4208679199 -501.4151611328 192 ) ( ( 0.0078125 0 511.2793273926 ) ( 0 0.0078125 511 ) ) trak4x/wall-brick1 134217728 0 0
 ( 101.5819702148 62.2779693604 176 ) ( 107.4075622559 -66.5865478516 176 ) ( 123.1781768799 -63.8870239258 176 ) ( ( 0.0013181283 -0.0077004996 508.0731506348 ) ( 0.0077004996 0.0013181283 0.1543266475 ) ) trak4x/wall-brick1 134217728 0 0
 ( 192.9042663574 -518.6422119141 -192 ) ( 191.8919372559 -512.7282104492 -192 ) ( 192.9042663574 -518.6422119141 -64 ) ( ( 0.0078125 0 510.9706726074 ) ( 0 0.0078125 511 ) ) trak4x/wall-brick1 134217728 0 0
@@ -6650,7 +6650,7 @@ brushDef
 ( 590.3779296875 -387.0758361816 624 ) ( 590.3779296875 -387.0758361816 656 ) ( 651.6900024414 -405.4286193848 624 ) ( ( 0.015625 0 246.9284057617 ) ( 0 0.015625 5.25 ) ) common/caulk 134217728 0 0
 ( 590.3779296875 -387.0758361816 624 ) ( 599.5543212891 -356.4197692871 624 ) ( 590.3779296875 -387.0758361816 656 ) ( ( 0.0078125 0 505.5506286621 ) ( 0 0.0078125 2.625 ) ) trak4x/wall-brick1 134217728 0 0
 ( 448.1947631836 -945.7670898438 640 ) ( 500.2283935547 -827.7310791016 640 ) ( 484.9003601074 -823.1428833008 640 ) ( ( 0.0022403316 0.0074843885 2.4107956886 ) ( -0.0074843885 0.0022403316 506.4256286621 ) ) trak4x/wall-brick1 134217728 0 0
-( 624.4750976563 -384.7562255859 272 ) ( 622.7545166016 -390.5042114258 272 ) ( 624.4750976563 -384.7562255859 400 ) ( ( 0.0078125 0 4.6993837357 ) ( 0 0.0078125 2.625 ) ) trak4x/wall-brick1 134217728 0 0
+( 624.4750976562 -384.7562255859 272 ) ( 622.7545166016 -390.5042114258 272 ) ( 624.4750976562 -384.7562255859 400 ) ( ( 0.0078125 0 4.6993837357 ) ( 0 0.0078125 2.625 ) ) trak4x/wall-brick1 134217728 0 0
 }
 }
 {
@@ -6671,7 +6671,7 @@ brushDef
 ( 655.0303955078 -385.0035400391 624 ) ( 717.5630493164 -398.6296386719 624 ) ( 661.8435058594 -353.7372131348 624 ) ( ( 0.0016633468 0.0076333764 2.6405055523 ) ( -0.0076333764 0.0016633468 506.1506652832 ) ) trak4x/wall-brick1 134217728 0 0
 ( 655.0303955078 -385.0035400391 624 ) ( 655.0303955078 -385.0035400391 656 ) ( 717.5630493164 -398.6296386719 624 ) ( ( 0.015625 0 246.2190246582 ) ( 0 0.015625 5.25 ) ) common/caulk 134217728 0 0
 ( 583.0971679688 -827.8416748047 640 ) ( 598.7303466797 -831.2481689453 640 ) ( 555.844909668 -952.9068603516 640 ) ( ( -0.0016633468 0.0076333764 508.3595275879 ) ( -0.0076333764 -0.0016633468 507.1506652832 ) ) trak4x/wall-brick1 134217728 0 0
-( 548.0283203125 -951.2036132813 640 ) ( 575.2806396484 -826.1384277344 624 ) ( 575.2806396484 -826.1384277344 640 ) ( ( 0.0078125 0 506.1506652832 ) ( 0 0.0078125 2.625 ) ) trak4x/wall-brick1 134217728 0 0
+( 548.0283203125 -951.2036132812 640 ) ( 575.2806396484 -826.1384277344 624 ) ( 575.2806396484 -826.1384277344 640 ) ( ( 0.0078125 0 506.1506652832 ) ( 0 0.0078125 2.625 ) ) trak4x/wall-brick1 134217728 0 0
 ( 606.5469360352 -832.9514770508 632 ) ( 606.5469360352 -832.9514770508 624 ) ( 579.2946777344 -958.0167236328 632 ) ( ( 0.0078125 0 5.8493328094 ) ( 0 0.0078125 2.625 ) ) trak4x/wall-brick1 134217728 0 0
 }
 }
@@ -9058,7 +9058,7 @@ brushDef
 ( 336 320 416 ) ( 336 320 264 ) ( 352 320 280 ) ( ( 0.0625 0 20 ) ( 0 0.015625 5.02734375 ) ) exx/trim-psimple04 134217728 0 0
 ( 352 320 400 ) ( 352 320 280 ) ( 352 288 280 ) ( ( 0.03125 0 249 ) ( 0 0.015625 5.2578125 ) ) exx/trim-psimple05 134217728 0 0
 ( 388 240 268 ) ( 492.5119628906 449.0230102539 163.4880065918 ) ( 535.8020019531 92.1979980469 120.1979980469 ) ( ( 0.03125 0 120.4999847412 ) ( -0 0.03125 125.3483428955 ) ) exx/base-metal01 134217728 0 0
-( 344 240 272 ) ( 239.4880371094 30.9770507813 167.4880065918 ) ( 491.8020019531 92.1979980469 419.8020019531 ) ( ( 0.0625 0 240.9999694824 ) ( 0 0.0625 27.2235889435 ) ) common/caulk 134217728 0 0
+( 344 240 272 ) ( 239.4880371094 30.9770507812 167.4880065918 ) ( 491.8020019531 92.1979980469 419.8020019531 ) ( ( 0.0625 0 240.9999694824 ) ( 0 0.0625 27.2235889435 ) ) common/caulk 134217728 0 0
 }
 }
 {
@@ -9118,7 +9118,7 @@ trak5x/base-pipe1c
 {
 brushDef
 {
-( 360 240 336 ) ( 255.4880371094 30.9770507813 440.5119628906 ) ( 507.8020019531 92.1979980469 188.1979980469 ) ( ( 0.0625 0 15 ) ( 0 0.0625 254.9393615723 ) ) common/caulk 134217728 0 0
+( 360 240 336 ) ( 255.4880371094 30.9770507812 440.5119628906 ) ( 507.8020019531 92.1979980469 188.1979980469 ) ( ( 0.0625 0 15 ) ( 0 0.0625 254.9393615723 ) ) common/caulk 134217728 0 0
 ( 432 320 264 ) ( 432 288 264 ) ( 432 288 416 ) ( ( 0.03125 0 249 ) ( 0 0.015625 5.138671875 ) ) exx/trim-psimple05 134217728 0 0
 ( 432 320 416 ) ( 416 320 400 ) ( 416 320 280 ) ( ( 0.0625 0 20 ) ( 0 0.015625 4.65625 ) ) exx/trim-psimple04 134217728 0 0
 ( 416 288 280 ) ( 416 320 280 ) ( 416 320 400 ) ( ( -0.03125 0 249 ) ( 0 0.015625 5.25 ) ) exx/trim-psimple05 134217728 0 0

diff --git a/maps/trident.map.options b/maps/trident.map.options
index a408e5311c64a726a2ba3ee329bd9bff98ffcd64..2de79d519c9f0f9b602b094795740e53040e3d0a 100644 (file)
--- a/maps/trident.map.options
+++ b/maps/trident.map.options
@@ -3,4 +3,4 @@
 -light +
 -minimap +
 -sRGB
-Version: 1d
+Version: 1e