Merge branch 'Mario/model_lod' into 'master'

[xonotic/xonotic-maps.pk3dir.git] / maps / glowplant.map

diff --git a/maps/glowplant.map b/maps/glowplant.map
index be4cc0f35eb1ee7fa5e67df526f1e62299fa2371..1509d7095de6f9a80cef7b3dc64ea0afbb38559f 100644 (file)
--- a/maps/glowplant.map
+++ b/maps/glowplant.map
@@ -4384,12 +4384,12 @@ exx/wall-metal02
 {
 patchDef2
 {
-exx/trim-01
+exx/wall-bigrib02
 ( 3 3 0 0 0 )
 (
-( ( 320 544 656 0 0 ) ( 320 544 648 -0.5 0 ) ( 320 544 639.9999389648 -1.0000040531 0 ) )
-( ( 320 512 656 0 -0.25 ) ( 320 512 648 -0.5 -0.25 ) ( 320 512 639.9999389648 -1.0000040531 -0.25 ) )
-( ( 352 512 656 0 -0.5 ) ( 352 512 648 -0.5 -0.5 ) ( 352 512 639.9999389648 -1.0000040531 -0.5 ) )
+( ( 320 544 791.9998779297 0 -0.09375 ) ( 320 544 724.0001220703 0 -0.6249980927 ) ( 320 544 655.9999389648 0 -1.1562495232 ) )
+( ( 320 512 791.9998779297 0.25 -0.09375 ) ( 320 512 724.0001220703 0.25 -0.6249980927 ) ( 320 512 655.9999389648 0.25 -1.1562495232 ) )
+( ( 352 512 791.9998779297 0.5 -0.09375 ) ( 352 512 724.0001220703 0.5 -0.6249980927 ) ( 352 512 655.9999389648 0.5 -1.1562495232 ) )
 )
 }
 }
@@ -10918,12 +10918,12 @@ common/clip
 ( -1632 -736 64 ) ( -1504 -736 64 ) ( -1504 -600 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
 }
 {
-( -1054 -800 62 ) ( -1017 -800 192 ) ( -1017 -672 192 ) common/full_clip 0 160 0 0.25 0.2403180003 134217728 5 0
+( -1054 -800 62 ) ( -1017 -800 192 ) ( -1017 -672 192 ) common/weapclip 0 160 0 0.25 0.2403180003 134217728 5 0
 ( -1024 -672 195 ) ( -1024 -800 195 ) ( -1062 -800 64 ) exx/floor-grate01 -127 297 -180 0.25 -0.2403109968 134217728 256 0
-( -1044 -680 67 ) ( -1067 -680 74 ) ( -1067 -808 74 ) common/full_clip 0 7 90 0.25 -0.2402949929 134217728 5 0
-( -1009 -672 190 ) ( -1032 -672 197 ) ( -1069 -672 66 ) common/full_clip -3 7 74 0.2500100136 -0.249981001 134217728 5 0
-( -1009 -800 190 ) ( -1032 -800 197 ) ( -1032 -672 197 ) common/full_clip 0 -101 90 0.25 -0.2402949929 134217728 5 0
-( -1046 -800 59 ) ( -1069 -800 66 ) ( -1032 -800 197 ) common/full_clip -3 7 74 0.2500100136 -0.249981001 134217728 5 0
+( -1044 -680 67 ) ( -1067 -680 74 ) ( -1067 -808 74 ) common/weapclip 0 7 90 0.25 -0.2402949929 134217728 5 0
+( -1009 -672 190 ) ( -1032 -672 197 ) ( -1069 -672 66 ) common/weapclip -3 7 74 0.2500100136 -0.249981001 134217728 5 0
+( -1009 -800 190 ) ( -1032 -800 197 ) ( -1032 -672 197 ) common/weapclip 0 -101 90 0.25 -0.2402949929 134217728 5 0
+( -1046 -800 59 ) ( -1069 -800 66 ) ( -1032 -800 197 ) common/weapclip -3 7 74 0.2500100136 -0.249981001 134217728 5 0
 }
 {
 ( -240 752 8 ) ( -264 752 136 ) ( -264 688 136 ) common/weapclip -64 -193 -180 0.25 -0.25 134217728 5 0
@@ -13516,9 +13516,9 @@ trak5x/base-pipe1a
 ( 9 7 0 0 0 )
 (
 ( ( -141.469329834 215 27.7594337463 0 0 ) ( -146.4503173828 215 27.3236579895 0 -0.078125 ) ( -146.9732666016 215 33.3008270264 0 -0.171875 ) ( -147.1475524902 215 35.2932167053 0 -0.203125 ) ( -147.3218688965 215 37.2855987549 0 -0.234375 ) ( -147.8448181152 215 43.2627716064 0 -0.328125 ) ( -142.8638305664 215 43.698551178 0 -0.40625 ) )
-( ( -141.5564880371 215 28.7556285858 0.0220970009 0 ) ( -145.5412750244 215 28.4070034027 0.0220970009 -0.078125 ) ( -145.9770507813 215 33.3879776001 0.0220970009 -0.171875 ) ( -146.1513671875 215 35.3803710938 0.0220970009 -0.203125 ) ( -146.3256835938 215 37.3727531433 0.0220970009 -0.234375 ) ( -146.7614440918 215 42.3537330627 0.0220970009 -0.328125 ) ( -142.7766723633 215 42.7023544312 0.0220970009 -0.40625 ) )
-( ( -141.5564880371 216 28.7556285858 0.037721999 0 ) ( -145.5412750244 216 28.4070034027 0.037721999 -0.078125 ) ( -145.9770507813 216 33.3879776001 0.037721999 -0.171875 ) ( -146.1513671875 216 35.3803710938 0.037721999 -0.203125 ) ( -146.3256835938 216 37.3727531433 0.037721999 -0.234375 ) ( -146.7614440918 216 42.3537330627 0.037721999 -0.328125 ) ( -142.7766723633 216 42.7023544312 0.037721999 -0.40625 ) )
-( ( -141.5564880371 217 28.7556285858 0.053346999 0 ) ( -145.5412750244 217 28.4070034027 0.053346999 -0.078125 ) ( -145.9770507813 217 33.3879776001 0.053346999 -0.171875 ) ( -146.1513671875 217 35.3803710938 0.053346999 -0.203125 ) ( -146.3256835938 217 37.3727531433 0.053346999 -0.234375 ) ( -146.7614440918 217 42.3537330627 0.053346999 -0.328125 ) ( -142.7766723633 217 42.7023544312 0.053346999 -0.40625 ) )
+( ( -141.5564880371 215 28.7556285858 0.0220970009 0 ) ( -145.5412750244 215 28.4070034027 0.0220970009 -0.078125 ) ( -145.9770507812 215 33.3879776001 0.0220970009 -0.171875 ) ( -146.1513671875 215 35.3803710938 0.0220970009 -0.203125 ) ( -146.3256835938 215 37.3727531433 0.0220970009 -0.234375 ) ( -146.7614440918 215 42.3537330627 0.0220970009 -0.328125 ) ( -142.7766723633 215 42.7023544312 0.0220970009 -0.40625 ) )
+( ( -141.5564880371 216 28.7556285858 0.037721999 0 ) ( -145.5412750244 216 28.4070034027 0.037721999 -0.078125 ) ( -145.9770507812 216 33.3879776001 0.037721999 -0.171875 ) ( -146.1513671875 216 35.3803710938 0.037721999 -0.203125 ) ( -146.3256835938 216 37.3727531433 0.037721999 -0.234375 ) ( -146.7614440918 216 42.3537330627 0.037721999 -0.328125 ) ( -142.7766723633 216 42.7023544312 0.037721999 -0.40625 ) )
+( ( -141.5564880371 217 28.7556285858 0.053346999 0 ) ( -145.5412750244 217 28.4070034027 0.053346999 -0.078125 ) ( -145.9770507812 217 33.3879776001 0.053346999 -0.171875 ) ( -146.1513671875 217 35.3803710938 0.053346999 -0.203125 ) ( -146.3256835938 217 37.3727531433 0.053346999 -0.234375 ) ( -146.7614440918 217 42.3537330627 0.053346999 -0.328125 ) ( -142.7766723633 217 42.7023544312 0.053346999 -0.40625 ) )
 ( ( -141.469329834 217 27.7594337463 0.075443998 0 ) ( -146.4503173828 217 27.3236579895 0.075443998 -0.078125 ) ( -146.9732666016 217 33.3008270264 0.075443998 -0.171875 ) ( -147.1475524902 217 35.2932167053 0.075443998 -0.203125 ) ( -147.3218688965 217 37.2855987549 0.075443998 -0.234375 ) ( -147.8448181152 217 43.2627716064 0.075443998 -0.328125 ) ( -142.8638305664 217 43.698551178 0.075443998 -0.40625 ) )
 ( ( -141.3821868896 217 26.7632369995 0.097540997 0 ) ( -147.3593444824 217 26.2403049469 0.097540997 -0.078125 ) ( -147.9694519043 217 33.2136650085 0.097540997 -0.171875 ) ( -148.143737793 217 35.2060546875 0.097540997 -0.203125 ) ( -148.318069458 217 37.1984443665 0.097540997 -0.234375 ) ( -148.9281616211 217 44.1718101501 0.097540997 -0.328125 ) ( -142.9509887695 217 44.6947441101 0.097540997 -0.40625 ) )
 ( ( -141.3821868896 216 26.7632369995 0.113165997 0 ) ( -147.3593444824 216 26.2403049469 0.113165997 -0.078125 ) ( -147.9694519043 216 33.2136650085 0.113165997 -0.171875 ) ( -148.143737793 216 35.2060546875 0.113165997 -0.203125 ) ( -148.318069458 216 37.1984443665 0.113165997 -0.234375 ) ( -148.9281616211 216 44.1718101501 0.113165997 -0.328125 ) ( -142.9509887695 216 44.6947441101 0.113165997 -0.40625 ) )
@@ -16841,12 +16841,12 @@ map_glowplant/biolumi2_blue-lowlight
 ( 448 464 256 ) ( 448 528 256 ) ( 704 528 256 ) exx/floor-rnd01 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 544 656 656 ) ( 544 512 656 ) ( 512 656 656 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 544 768 528 ) ( 512 768 528 ) ( 544 768 336 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( 544 656 528 ) ( 544 656 336 ) ( 544 512 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( 512 512 640 ) ( 544 512 640 ) ( 512 656 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 512 512 336 ) ( 512 512 528 ) ( 544 512 336 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( 512 512 336 ) ( 512 656 336 ) ( 512 512 528 ) exx/trim-01 0 0 90 0.25 0.25 0 0 0
+( 544 656 792 ) ( 544 512 792 ) ( 512 656 792 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 544 768 664 ) ( 512 768 664 ) ( 544 768 472 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 544 656 544 ) ( 544 656 352 ) ( 544 512 544 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 512 512 656 ) ( 544 512 656 ) ( 512 656 656 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 512 512 472 ) ( 512 512 664 ) ( 544 512 472 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 512 512 352 ) ( 512 656 352 ) ( 512 512 544 ) exx/wall-bigrib02 0 -24 0 0.25 0.25 0 0 0
 }
 {
 ( 320 816 288 ) ( 320 512 288 ) ( 288 816 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -16857,12 +16857,12 @@ map_glowplant/biolumi2_blue-lowlight
 ( 288 512 256 ) ( 288 816 256 ) ( 288 512 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 512 800 656 ) ( 512 768 656 ) ( 320 800 656 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 512 800 528 ) ( 320 800 528 ) ( 512 800 336 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( 512 800 528 ) ( 512 800 336 ) ( 512 768 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( 320 768 640 ) ( 512 768 640 ) ( 320 800 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 320 768 336 ) ( 320 768 528 ) ( 512 768 336 ) exx/trim-01 0 0 90 0.25 0.25 0 0 0
-( 320 768 336 ) ( 320 800 336 ) ( 320 768 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 512 800 792 ) ( 512 768 792 ) ( 320 800 792 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 512 800 544 ) ( 320 800 544 ) ( 512 800 352 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 512 800 544 ) ( 512 800 352 ) ( 512 768 544 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 320 768 656 ) ( 512 768 656 ) ( 320 800 656 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 320 768 472 ) ( 320 768 664 ) ( 512 768 472 ) exx/wall-bigrib02 0 -24 0 0.25 0.25 0 0 0
+( 320 768 352 ) ( 320 800 352 ) ( 320 768 544 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
 }
 {
 patchDef2
@@ -16879,32 +16879,32 @@ exx/panel-metal01c
 {
 patchDef2
 {
-exx/trim-01
+exx/wall-bigrib02
 ( 3 3 0 0 0 )
 (
-( ( 512 544 640 0 0 ) ( 512 544 648 -0.5 0 ) ( 512 544 656.0000610352 -1.0000040531 0 ) )
-( ( 512 512 640 0 -0.25 ) ( 512 512 648 -0.5 -0.25 ) ( 512 512 656.0000610352 -1.0000040531 -0.25 ) )
-( ( 480 512 640 0 -0.5 ) ( 480 512 648 -0.5 -0.5 ) ( 480 512 656.0000610352 -1.0000040531 -0.5 ) )
+( ( 512 544 656.0001220703 0 0 ) ( 512 544 723.9996948242 0 -0.5312466621 ) ( 512 544 791.9999389648 0 -1.0624985695 ) )
+( ( 512 512 656.0001220703 0.25 0 ) ( 512 512 723.9996948242 0.25 -0.5312466621 ) ( 512 512 791.9999389648 0.25 -1.0624985695 ) )
+( ( 480 512 656.0001220703 0.5 0 ) ( 480 512 723.9996948242 0.5 -0.5312466621 ) ( 480 512 791.9999389648 0.5 -1.0624985695 ) )
 )
 }
 }
 {
-( 320 704 656 ) ( 320 512 656 ) ( 288 704 656 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 320 768 560 ) ( 288 768 560 ) ( 320 768 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( 320 704 560 ) ( 320 704 528 ) ( 320 512 560 ) exx/trim-01 0 0 90 0.25 0.25 0 0 0
-( 288 512 640 ) ( 320 512 640 ) ( 288 704 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 288 512 528 ) ( 288 512 560 ) ( 320 512 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( 288 512 528 ) ( 288 704 528 ) ( 288 512 560 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 320 704 792 ) ( 320 512 792 ) ( 288 704 792 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 320 768 696 ) ( 288 768 696 ) ( 320 768 664 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 320 704 576 ) ( 320 704 544 ) ( 320 512 576 ) exx/wall-bigrib02 0 -24 0 0.25 0.25 0 0 0
+( 288 512 656 ) ( 320 512 656 ) ( 288 704 656 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 288 512 664 ) ( 288 512 696 ) ( 320 512 664 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 288 512 544 ) ( 288 704 544 ) ( 288 512 576 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
 }
 {
 patchDef2
 {
-exx/trim-01
+exx/wall-bigrib02
 ( 3 3 0 0 0 )
 (
-( ( 512 704 656 0 0 ) ( 512 704 648 -0.5 0 ) ( 512 704 639.9999389648 -1.0000040531 0 ) )
-( ( 512 768 656 0 -0.5 ) ( 512 768 648 -0.5000010133 -0.5 ) ( 512 768 639.9999389648 -1.0000040531 -0.5 ) )
-( ( 448 768 656 0 -1 ) ( 448 768 648 -0.5000010133 -1 ) ( 448 768 639.9999389648 -1.0000059605 -1 ) )
+( ( 512 704 791.9998779297 0 -0.09375 ) ( 512 704 724.0001220703 0 -0.6249980927 ) ( 512 704 655.9999389648 0 -1.1562495232 ) )
+( ( 512 768 791.9998779297 0.5 -0.09375 ) ( 512 768 724.0001220703 0.5 -0.6249980927 ) ( 512 768 655.9999389648 0.5 -1.1562495232 ) )
+( ( 448 768 791.9998779297 1 -0.09375 ) ( 448 768 724.0001220703 1 -0.6249980927 ) ( 448 768 655.9999389648 1 -1.1562495232 ) )
 )
 }
 }
@@ -16921,12 +16921,12 @@ exx/trim-horz01
 }
 }
 {
-( 512 512 528 ) ( 320 512 528 ) ( 512 512 464 ) exx/trim-01 0 0 90 0.25 0.25 0 0 0
-( 512 512 528 ) ( 512 512 464 ) ( 512 464 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( 320 464 640 ) ( 512 464 640 ) ( 320 512 640 ) exx/trim-psimple05 0 128 90 0.25 0.25 0 0 0
-( 320 448 464 ) ( 320 448 528 ) ( 512 448 464 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( 320 464 464 ) ( 320 512 464 ) ( 320 464 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( 512 512 656 ) ( 512 480 656 ) ( 320 512 656 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 512 512 664 ) ( 320 512 664 ) ( 512 512 600 ) exx/wall-bigrib02 0 -24 0 0.25 0.25 0 0 0
+( 512 512 544 ) ( 512 512 480 ) ( 512 464 544 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 320 464 656 ) ( 512 464 656 ) ( 320 512 656 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 320 448 480 ) ( 320 448 544 ) ( 512 448 480 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 320 464 480 ) ( 320 512 480 ) ( 320 464 544 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
+( 512 512 792 ) ( 512 480 792 ) ( 320 512 792 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 512 632 656 ) ( 512 512 656 ) ( 320 632 656 ) common/clip 0 0 0 0.25 0.25 0 0 0
@@ -17208,12 +17208,12 @@ trak5x/base-pipe1a
 {
 patchDef2
 {
-exx/trim-01
+exx/wall-bigrib02
 ( 3 3 0 0 0 )
 (
-( ( 320 704 639.9999389648 0 0 ) ( 320 704 648 -0.5000039935 0 ) ( 320 704 656 -1.0000040531 0 ) )
-( ( 320 768 639.9999389648 0 -0.5 ) ( 320 768 648 -0.5000029802 -0.5 ) ( 320 768 656 -1.0000040531 -0.5 ) )
-( ( 384 768 639.9999389648 0 -1 ) ( 384 768 648 -0.5000060201 -1 ) ( 384 768 656 -1.0000059605 -1 ) )
+( ( 320 704 656 0 0 ) ( 320 704 724.0001831055 0 -0.5312514305 ) ( 320 704 791.9999389648 0 -1.0624995232 ) )
+( ( 320 768 656 0.5 0 ) ( 320 768 724.0001831055 0.5 -0.5312514305 ) ( 320 768 791.9999389648 0.5 -1.0624995232 ) )
+( ( 384 768 656 1 0 ) ( 384 768 724.0001831055 1 -0.5312514305 ) ( 384 768 791.9999389648 1 -1.0624995232 ) )
 )
 }
 }
@@ -17334,14 +17334,6 @@ exx/wall-bigrib02
 }
 }
 {
-( 512 632 688 ) ( 512 512 688 ) ( 320 632 688 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 512 768 664 ) ( 320 768 664 ) ( 512 768 656 ) common/caulk 0 192 0 0.25 0.25 0 0 0
-( 512 632 664 ) ( 512 632 656 ) ( 512 512 664 ) common/caulk 0 192 0 0.25 0.25 0 0 0
-( 320 512 656 ) ( 512 512 656 ) ( 320 632 656 ) map_glowplant/sky 0 0 0 0.25 0.25 0 0 0
-( 320 512 656 ) ( 320 512 664 ) ( 512 512 656 ) common/caulk 0 192 0 0.25 0.25 0 0 0
-( 320 512 656 ) ( 320 632 656 ) ( 320 512 664 ) common/caulk 0 192 0 0.25 0.25 0 0 0
-}
-{
 ( -1504 -576 -152 ) ( -1504 -768 -152 ) ( -1632 -576 -152 ) exx/base-metal05rust 256 256 0 0.25 0.25 0 0 0
 ( -1504 -608 -152 ) ( -1632 -608 -152 ) ( -1504 -608 -184 ) common/caulk 0 160 0 0.25 0.25 0 0 0
 ( -1504 -576 -152 ) ( -1504 -576 -184 ) ( -1504 -768 -152 ) common/caulk 0 160 0 0.25 0.25 0 0 0
@@ -22040,9 +22032,9 @@ trak5x/base-base1b
 (
 ( ( 293.854309082 -329.7939147949 353.8482971191 0 0 ) ( 293.354309082 -328.9279174805 352.1162414551 0 -0.03125 ) ( 292.8543395996 -328.0618896484 350.384185791 0 -0.0625 ) )
 ( ( 294.2604064941 -323.4972839355 356.8793640137 0.125 0 ) ( 293.7604064941 -322.6312561035 355.1473083496 0.125 -0.03125 ) ( 293.2604064941 -321.7652587891 353.4153137207 0.125 -0.0625 ) )
-( ( 301.0260009766 -323.091217041 355.1293945313 0.25 0 ) ( 300.5260009766 -322.225189209 353.3973388672 0.25 -0.03125 ) ( 300.0260009766 -321.3591308594 351.6652832031 0.25 -0.0625 ) )
+( ( 301.0260009766 -323.091217041 355.1293945312 0.25 0 ) ( 300.5260009766 -322.225189209 353.3973388672 0.25 -0.03125 ) ( 300.0260009766 -321.3591308594 351.6652832031 0.25 -0.0625 ) )
 ( ( 307.7914733887 -322.6851196289 353.3793334961 0.375 0 ) ( 307.2915344238 -321.8190917969 351.6473388672 0.375 -0.03125 ) ( 306.7915344238 -320.9530639648 349.9152832031 0.375 -0.0625 ) )
-( ( 307.385345459 -328.9817199707 350.3482666016 0.5 0 ) ( 306.8854370117 -328.1157226563 348.6162719727 0.5 -0.03125 ) ( 306.3854370117 -327.2496948242 346.8842163086 0.5 -0.0625 ) )
+( ( 307.385345459 -328.9817199707 350.3482666016 0.5 0 ) ( 306.8854370117 -328.1157226562 348.6162719727 0.5 -0.03125 ) ( 306.3854370117 -327.2496948242 346.8842163086 0.5 -0.0625 ) )
 ( ( 306.9792785645 -335.2783508301 347.3171691895 0.625 0 ) ( 306.4793395996 -334.4123535156 345.5851745605 0.625 -0.03125 ) ( 305.9793395996 -333.5463256836 343.8531188965 0.625 -0.0625 ) )
 ( ( 300.2138366699 -335.6844787598 349.067199707 0.75 0 ) ( 299.7138366699 -334.8184509277 347.3351745605 0.75 -0.03125 ) ( 299.2138366699 -333.9524230957 345.6031188965 0.75 -0.0625 ) )
 ( ( 293.4482116699 -336.0905761719 350.817199707 0.875 0 ) ( 292.9482116699 -335.2245178223 349.085144043 0.875 -0.03125 ) ( 292.4482116699 -334.3585205078 347.3531188965 0.875 -0.0625 ) )
@@ -22259,15 +22251,15 @@ patchDef2
 trak5x/base-base1b
 ( 9 3 0 0 0 )
 (
-( ( 301.2344970703 -306.451385498 414.1320495605 0 -0.0625 ) ( 299.5024414063 -307.4513549805 414.1320495605 0 -0.03125 ) ( 297.7703857422 -308.451385498 414.1320495605 0 0 ) )
+( ( 301.2344970703 -306.451385498 414.1320495605 0 -0.0625 ) ( 299.5024414062 -307.4513549805 414.1320495605 0 -0.03125 ) ( 297.7703857422 -308.451385498 414.1320495605 0 0 ) )
 ( ( 298.2033996582 -301.2013549805 410.6320495605 0.125 -0.0625 ) ( 296.4713745117 -302.2013549805 410.6320495605 0.125 -0.03125 ) ( 294.7393188477 -303.2013549805 410.6320495605 0.125 0 ) )
 ( ( 299.9533996582 -304.2324523926 404.5698547363 0.25 -0.0625 ) ( 298.2213745117 -305.2324523926 404.5698547363 0.25 -0.03125 ) ( 296.4893188477 -306.2324523926 404.5698547363 0.25 0 ) )
 ( ( 301.7033996582 -307.2635498047 398.5076904297 0.375 -0.0625 ) ( 299.9713745117 -308.2635498047 398.5076904297 0.375 -0.03125 ) ( 298.2393188477 -309.2635498047 398.5076904297 0.375 0 ) )
-( ( 304.7344970703 -312.5135803223 402.0076904297 0.5 -0.0625 ) ( 303.0024414063 -313.5135192871 402.0076904297 0.5 -0.03125 ) ( 301.2703857422 -314.5135803223 402.0076904297 0.5 0 ) )
+( ( 304.7344970703 -312.5135803223 402.0076904297 0.5 -0.0625 ) ( 303.0024414062 -313.5135192871 402.0076904297 0.5 -0.03125 ) ( 301.2703857422 -314.5135803223 402.0076904297 0.5 0 ) )
 ( ( 307.7655944824 -317.7635498047 405.5076904297 0.625 -0.0625 ) ( 306.0335388184 -318.7635498047 405.5076904297 0.625 -0.03125 ) ( 304.3014831543 -319.7635498047 405.5076904297 0.625 0 ) )
 ( ( 306.0155944824 -314.7324523926 411.5698547363 0.75 -0.0625 ) ( 304.2835388184 -315.7324523926 411.5698547363 0.75 -0.03125 ) ( 302.5514831543 -316.7324523926 411.5698547363 0.75 0 ) )
 ( ( 304.2655944824 -311.7013549805 417.6320495605 0.875 -0.0625 ) ( 302.5335388184 -312.7013549805 417.6320495605 0.875 -0.03125 ) ( 300.8014831543 -313.7013549805 417.6320495605 0.875 0 ) )
-( ( 301.2344970703 -306.451385498 414.1320495605 1 -0.0625 ) ( 299.5024414063 -307.4513549805 414.1320495605 1 -0.03125 ) ( 297.7703857422 -308.451385498 414.1320495605 1 0 ) )
+( ( 301.2344970703 -306.451385498 414.1320495605 1 -0.0625 ) ( 299.5024414062 -307.4513549805 414.1320495605 1 -0.03125 ) ( 297.7703857422 -308.451385498 414.1320495605 1 0 ) )
 )
 }
 }
@@ -22279,11 +22271,11 @@ trak5x/base-base1b
 (
 ( ( 311.9807434082 -325.0644226074 369.4556274414 0 -0.0625 ) ( 310.2486877441 -326.0643920898 369.4555969238 0 -0.03125 ) ( 308.5166320801 -327.0644226074 369.4556274414 0 0 ) )
 ( ( 310.2307434082 -322.0332946777 363.3934326172 0.125 -0.0625 ) ( 308.4986877441 -323.0332946777 363.3934326172 0.125 -0.03125 ) ( 306.7666320801 -324.0332946777 363.3934326172 0.125 0 ) )
-( ( 313.2618408203 -327.2833251953 359.8934326172 0.25 -0.0625 ) ( 311.5297851563 -328.2833251953 359.8934326172 0.25 -0.03125 ) ( 309.7977294922 -329.2833251953 359.8934326172 0.25 0 ) )
+( ( 313.2618408203 -327.2833251953 359.8934326172 0.25 -0.0625 ) ( 311.5297851562 -328.2833251953 359.8934326172 0.25 -0.03125 ) ( 309.7977294922 -329.2833251953 359.8934326172 0.25 0 ) )
 ( ( 316.2929077148 -332.5332946777 356.3934326172 0.375 -0.0625 ) ( 314.5608825684 -333.5332946777 356.3934326172 0.375 -0.03125 ) ( 312.8288269043 -334.5332946777 356.3934326172 0.375 0 ) )
 ( ( 318.0429077148 -335.564453125 362.4556274414 0.5 -0.0625 ) ( 316.3108825684 -336.5643920898 362.4555969238 0.5 -0.03125 ) ( 314.5787963867 -337.564453125 362.4556274414 0.5 0 ) )
 ( ( 319.7929077148 -338.595489502 368.517791748 0.625 -0.0625 ) ( 318.0608825684 -339.595489502 368.517791748 0.625 -0.03125 ) ( 316.3288269043 -340.595489502 368.517791748 0.625 0 ) )
-( ( 316.7618408203 -333.345489502 372.017791748 0.75 -0.0625 ) ( 315.0297851563 -334.345489502 372.017791748 0.75 -0.03125 ) ( 313.2977294922 -335.345489502 372.017791748 0.75 0 ) )
+( ( 316.7618408203 -333.345489502 372.017791748 0.75 -0.0625 ) ( 315.0297851562 -334.345489502 372.017791748 0.75 -0.03125 ) ( 313.2977294922 -335.345489502 372.017791748 0.75 0 ) )
 ( ( 313.7307434082 -328.095489502 375.517791748 0.875 -0.0625 ) ( 311.9986877441 -329.095489502 375.517791748 0.875 -0.03125 ) ( 310.2666320801 -330.095489502 375.517791748 0.875 0 ) )
 ( ( 311.9807434082 -325.0644226074 369.4556274414 1 -0.0625 ) ( 310.2486877441 -326.0643920898 369.4555969238 1 -0.03125 ) ( 308.5166320801 -327.0644226074 369.4556274414 1 0 ) )
 )
@@ -29240,7 +29232,7 @@ trak5x/base-base1b
 }
 }
 {
-( -1144 1344 616 ) ( -1144 1168 616 ) ( -1408 1344 616 ) exx/panel-metal01c 170.6667480469 73.1430664063 0 0.515625 0.4375 0 0 0
+( -1144 1344 616 ) ( -1144 1168 616 ) ( -1408 1344 616 ) exx/panel-metal01c 170.6667480469 73.1430664062 0 0.515625 0.4375 0 0 0
 ( -1144 1376 616 ) ( -1408 1376 616 ) ( -1144 1376 600 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1144 1328 616 ) ( -1144 1328 600 ) ( -1144 1152 616 ) common/caulk 64 0 0 0.25 0.25 0 0 0
 ( -1408 1168 600 ) ( -1144 1168 600 ) ( -1408 1344 600 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -29504,7 +29496,7 @@ trak5x/base-pipe1c
 {
 ( -136 456 872 ) ( -136 488 872 ) ( -136 488 1000 ) exx/panel-q201b 96 352 180 0.25 0.25 134217728 0 0
 ( -88 600 880 ) ( -88 600 864 ) ( -88 472 880 ) exx/panel-q201b 96 352 180 0.25 0.25 134217728 0 0
-( -80 472 962 ) ( -144 472 962 ) ( -144 510 1000 ) exx/panel-q201e 147.9614257813 42.3333511353 90 0.1484339982 -0.1875 134217728 0 0
+( -80 472 962 ) ( -144 472 962 ) ( -144 510 1000 ) exx/panel-q201e 147.9614257812 42.3333511353 90 0.1484339982 -0.1875 134217728 0 0
 ( -80 600 910 ) ( -144 600 910 ) ( -144 562 872 ) exx/panel-q201e 53.4042816162 42.3333511353 90 0.1484369934 -0.1875 134217728 0 0
 ( -80 562 1000 ) ( -144 562 1000 ) ( -144 600 962 ) exx/panel-q201e 202.0268859863 42.3333511353 -90 0.1484339982 0.1875 134217728 0 0
 ( -80 510 872 ) ( -144 510 872 ) ( -144 472 910 ) exx/panel-q201e 107.3666992188 42.3333511353 -90 0.1484339982 0.1875 134217728 0 0
@@ -29588,8 +29580,8 @@ trak5x/base-pipe1c
 ( 1262 -104 584 ) ( 1262 -40 584 ) ( 1224 -40 622 ) exx/panel-q201e 53.5911865234 255.6667480469 180 0.1484339982 0.1875 134217728 0 0
 ( 1314 -40 584 ) ( 1262 -40 584 ) ( 1262 -104 584 ) exx/panel-q201e 186.3849182129 255.6667480469 -0 0.2031249851 -0.1875 134217728 0 0
 ( 1262 -40 712 ) ( 1314 -40 712 ) ( 1314 -104 712 ) exx/panel-q201e 186.3849182129 255.6667480469 -0 0.2031249851 -0.1875 134217728 0 0
-( 1224 -40 622 ) ( 1224 -40 674 ) ( 1224 -104 674 ) exx/panel-q201e 9.6921691895 255.6665039063 90 0.2031249851 0.1875 134217728 0 0
-( 1352 -40 674 ) ( 1352 -40 622 ) ( 1352 -104 622 ) exx/panel-q201e 9.6921691895 255.6665039063 90 0.2031249851 0.1875 134217728 0 0
+( 1224 -40 622 ) ( 1224 -40 674 ) ( 1224 -104 674 ) exx/panel-q201e 9.6921691895 255.6665039062 90 0.2031249851 0.1875 134217728 0 0
+( 1352 -40 674 ) ( 1352 -40 622 ) ( 1352 -104 622 ) exx/panel-q201e 9.6921691895 255.6665039062 90 0.2031249851 0.1875 134217728 0 0
 }
 {
 ( 1352 -88 584 ) ( 1352 -104 584 ) ( 1224 -88 584 ) exx/base-metal04 0 0 0 0.25 0.25 0 0 0
@@ -29927,6 +29919,212 @@ trak5x/base-pipe1c
 ( -256 1056 640 ) ( -256 1056 656 ) ( 256 1056 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -272 1136 640 ) ( -272 1160 640 ) ( -272 1136 656 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
+{
+( -2048 -816 1216 ) ( -2048 -272 1216 ) ( -1888 -816 1216 ) common/clip 64 0 180 0.25 0.25 0 0 0
+( -2048 -896 1192 ) ( -1888 -896 1192 ) ( -2048 -896 1080 ) common/clip 64 160 0 -0.25 0.25 0 0 0
+( -2048 -816 1216 ) ( -2048 -816 1104 ) ( -2048 -272 1216 ) common/clip -0 0 0 -0.25 0.25 0 0 0
+( -368 -272 1104 ) ( -368 -816 1104 ) ( -368 -272 1216 ) common/clip -0 0 0 -0.25 0.25 0 0 0
+( -2352 -816 1024 ) ( -2352 -272 1216 ) ( -2480 -816 1024 ) common/clip 64 0 180 0.25 0.25 0 0 0
+}
+{
+( -1040 872 1216 ) ( -1040 816 1216 ) ( -1152 872 1216 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -1040 1088 1216 ) ( -1152 1088 1216 ) ( -1040 1088 1024 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -1040 872 1216 ) ( -1040 872 1024 ) ( -1040 816 1216 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -1152 816 1024 ) ( -1040 816 1024 ) ( -1152 872 1024 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -1152 816 1024 ) ( -1152 816 1216 ) ( -1040 816 1024 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -2048 832 1024 ) ( -2048 888 1024 ) ( -2048 832 1216 ) common/clip 192 0 0 0.25 0.25 0 0 0
+}
+{
+( -368 816 1216 ) ( -368 272 1216 ) ( -528 816 1216 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -368 816 1216 ) ( -528 816 1216 ) ( -368 816 1104 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -368 816 1216 ) ( -368 816 1104 ) ( -368 272 1216 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -2048 272 1104 ) ( -2048 816 1104 ) ( -2048 272 1216 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -64 816 1024 ) ( -64 272 1216 ) ( 64 816 1024 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+patchDef2
+{
+exx/trim-01
+( 3 3 0 0 0 )
+(
+( ( 320 544 808 0 0 ) ( 320 544 800 -0.5 0 ) ( 320 544 791.9999389648 -1.0000040531 0 ) )
+( ( 320 512 808 0 -0.25 ) ( 320 512 800 -0.5 -0.25 ) ( 320 512 791.9999389648 -1.0000040531 -0.25 ) )
+( ( 352 512 808 0 -0.5 ) ( 352 512 800 -0.5 -0.5 ) ( 352 512 791.9999389648 -1.0000040531 -0.5 ) )
+)
+}
+}
+{
+( 544 656 808 ) ( 544 512 808 ) ( 512 656 808 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 544 768 680 ) ( 512 768 680 ) ( 544 768 488 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+( 544 656 680 ) ( 544 656 488 ) ( 544 512 680 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+( 512 512 792 ) ( 544 512 792 ) ( 512 656 792 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 512 512 488 ) ( 512 512 680 ) ( 544 512 488 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+( 512 512 488 ) ( 512 656 488 ) ( 512 512 680 ) exx/trim-01 32 0 90 0.25 0.25 0 0 0
+}
+{
+( 512 800 808 ) ( 512 768 808 ) ( 320 800 808 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 512 800 680 ) ( 320 800 680 ) ( 512 800 488 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+( 512 800 680 ) ( 512 800 488 ) ( 512 768 680 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+( 320 768 792 ) ( 512 768 792 ) ( 320 800 792 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 320 768 488 ) ( 320 768 680 ) ( 512 768 488 ) exx/trim-01 32 0 90 0.25 0.25 0 0 0
+( 320 768 488 ) ( 320 800 488 ) ( 320 768 680 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+}
+{
+( 512 512 680 ) ( 320 512 680 ) ( 512 512 616 ) exx/trim-01 32 0 90 0.25 0.25 0 0 0
+( 512 512 680 ) ( 512 512 616 ) ( 512 464 680 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+( 320 464 792 ) ( 512 464 792 ) ( 320 512 792 ) exx/trim-psimple05 0 128 90 0.25 0.25 0 0 0
+( 320 448 616 ) ( 320 448 680 ) ( 512 448 616 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+( 320 464 616 ) ( 320 512 616 ) ( 320 464 680 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+( 512 512 808 ) ( 512 480 808 ) ( 320 512 808 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 320 704 808 ) ( 320 512 808 ) ( 288 704 808 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 320 768 712 ) ( 288 768 712 ) ( 320 768 680 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+( 320 704 712 ) ( 320 704 680 ) ( 320 512 712 ) exx/trim-01 32 0 90 0.25 0.25 0 0 0
+( 288 512 792 ) ( 320 512 792 ) ( 288 704 792 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 288 512 680 ) ( 288 512 712 ) ( 320 512 680 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+( 288 512 680 ) ( 288 704 680 ) ( 288 512 712 ) common/caulk 0 160 0 0.25 0.25 0 0 0
+}
+{
+patchDef2
+{
+exx/trim-01
+( 3 3 0 0 0 )
+(
+( ( 512 544 792 0 0 ) ( 512 544 800 -0.5 0 ) ( 512 544 808.0000610352 -1.0000040531 0 ) )
+( ( 512 512 792 0 -0.25 ) ( 512 512 800 -0.5 -0.25 ) ( 512 512 808.0000610352 -1.0000040531 -0.25 ) )
+( ( 480 512 792 0 -0.5 ) ( 480 512 800 -0.5 -0.5 ) ( 480 512 808.0000610352 -1.0000040531 -0.5 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/trim-01
+( 3 3 0 0 0 )
+(
+( ( 512 704 808 0 0 ) ( 512 704 800 -0.5 0 ) ( 512 704 791.9999389648 -1.0000040531 0 ) )
+( ( 512 768 808 0 -0.5 ) ( 512 768 800 -0.5000010133 -0.5 ) ( 512 768 791.9999389648 -1.0000040531 -0.5 ) )
+( ( 448 768 808 0 -1 ) ( 448 768 800 -0.5000010133 -1 ) ( 448 768 791.9999389648 -1.0000059605 -1 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/trim-01
+( 3 3 0 0 0 )
+(
+( ( 320 704 791.9999389648 0 0 ) ( 320 704 800 -0.5000039935 0 ) ( 320 704 808 -1.0000040531 0 ) )
+( ( 320 768 791.9999389648 0 -0.5 ) ( 320 768 800 -0.5000029802 -0.5 ) ( 320 768 808 -1.0000040531 -0.5 ) )
+( ( 384 768 791.9999389648 0 -1 ) ( 384 768 800 -0.5000060201 -1 ) ( 384 768 808 -1.0000059605 -1 ) )
+)
+}
+}
+{
+( 320 704 656 ) ( 320 512 656 ) ( 288 704 656 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 320 768 560 ) ( 288 768 560 ) ( 320 768 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 320 704 560 ) ( 320 704 528 ) ( 320 512 560 ) exx/trim-01 0 0 90 0.25 0.25 0 0 0
+( 288 512 640 ) ( 320 512 640 ) ( 288 704 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 288 512 528 ) ( 288 512 560 ) ( 320 512 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 288 512 528 ) ( 288 704 528 ) ( 288 512 560 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+}
+{
+( 544 656 656 ) ( 544 512 656 ) ( 512 656 656 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 544 768 528 ) ( 512 768 528 ) ( 544 768 336 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 544 656 528 ) ( 544 656 336 ) ( 544 512 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 512 512 640 ) ( 544 512 640 ) ( 512 656 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 512 512 336 ) ( 512 512 528 ) ( 544 512 336 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 512 512 336 ) ( 512 656 336 ) ( 512 512 528 ) exx/trim-01 0 0 90 0.25 0.25 0 0 0
+}
+{
+( 512 800 656 ) ( 512 768 656 ) ( 320 800 656 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 512 800 528 ) ( 320 800 528 ) ( 512 800 336 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 512 800 528 ) ( 512 800 336 ) ( 512 768 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 320 768 640 ) ( 512 768 640 ) ( 320 800 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 320 768 336 ) ( 320 768 528 ) ( 512 768 336 ) exx/trim-01 0 0 90 0.25 0.25 0 0 0
+( 320 768 336 ) ( 320 800 336 ) ( 320 768 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+}
+{
+( 512 512 528 ) ( 320 512 528 ) ( 512 512 464 ) exx/trim-01 0 0 90 0.25 0.25 0 0 0
+( 512 512 528 ) ( 512 512 464 ) ( 512 464 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 320 464 640 ) ( 512 464 640 ) ( 320 512 640 ) exx/trim-psimple05 0 128 90 0.25 0.25 0 0 0
+( 320 448 464 ) ( 320 448 528 ) ( 512 448 464 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 320 464 464 ) ( 320 512 464 ) ( 320 464 528 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( 512 512 656 ) ( 512 480 656 ) ( 320 512 656 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+patchDef2
+{
+exx/trim-01
+( 3 3 0 0 0 )
+(
+( ( 512 704 656 0 0 ) ( 512 704 648 -0.5 0 ) ( 512 704 639.9999389648 -1.0000040531 0 ) )
+( ( 512 768 656 0 -0.5 ) ( 512 768 648 -0.5000010133 -0.5 ) ( 512 768 639.9999389648 -1.0000040531 -0.5 ) )
+( ( 448 768 656 0 -1 ) ( 448 768 648 -0.5000010133 -1 ) ( 448 768 639.9999389648 -1.0000059605 -1 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/trim-01
+( 3 3 0 0 0 )
+(
+( ( 320 544 656 0 0 ) ( 320 544 648 -0.5 0 ) ( 320 544 639.9999389648 -1.0000040531 0 ) )
+( ( 320 512 656 0 -0.25 ) ( 320 512 648 -0.5 -0.25 ) ( 320 512 639.9999389648 -1.0000040531 -0.25 ) )
+( ( 352 512 656 0 -0.5 ) ( 352 512 648 -0.5 -0.5 ) ( 352 512 639.9999389648 -1.0000040531 -0.5 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/trim-01
+( 3 3 0 0 0 )
+(
+( ( 512 544 640 0 0 ) ( 512 544 648 -0.5 0 ) ( 512 544 656.0000610352 -1.0000040531 0 ) )
+( ( 512 512 640 0 -0.25 ) ( 512 512 648 -0.5 -0.25 ) ( 512 512 656.0000610352 -1.0000040531 -0.25 ) )
+( ( 480 512 640 0 -0.5 ) ( 480 512 648 -0.5 -0.5 ) ( 480 512 656.0000610352 -1.0000040531 -0.5 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/trim-01
+( 3 3 0 0 0 )
+(
+( ( 320 704 639.9999389648 0 0 ) ( 320 704 648 -0.5000039935 0 ) ( 320 704 656 -1.0000040531 0 ) )
+( ( 320 768 639.9999389648 0 -0.5 ) ( 320 768 648 -0.5000029802 -0.5 ) ( 320 768 656 -1.0000040531 -0.5 ) )
+( ( 384 768 639.9999389648 0 -1 ) ( 384 768 648 -0.5000060201 -1 ) ( 384 768 656 -1.0000059605 -1 ) )
+)
+}
+}
+{
+( 512 752 832 ) ( 512 512 832 ) ( 320 752 832 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 512 768 832 ) ( 320 768 832 ) ( 512 768 808 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 512 752 832 ) ( 512 752 808 ) ( 512 512 832 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 320 512 808 ) ( 512 512 808 ) ( 320 752 808 ) map_glowplant/sky 0 0 0 0.25 0.25 0 0 0
+( 320 512 808 ) ( 320 512 832 ) ( 512 512 808 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 320 512 808 ) ( 320 752 808 ) ( 320 512 832 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 192 1056 608 ) ( 192 1032 608 ) ( 64 1056 608 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 192 1056 608 ) ( 64 1056 608 ) ( 192 1056 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 192 1056 608 ) ( 192 1056 480 ) ( 192 1032 608 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 1032 480 ) ( 192 1032 480 ) ( 64 1056 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 1032 480 ) ( 64 1032 608 ) ( 192 1032 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 1032 480 ) ( 64 1056 480 ) ( 64 1032 608 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -64 1056 608 ) ( -64 1032 608 ) ( -192 1056 608 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -64 1056 608 ) ( -192 1056 608 ) ( -64 1056 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -64 1056 608 ) ( -64 1056 480 ) ( -64 1032 608 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -192 1032 480 ) ( -64 1032 480 ) ( -192 1056 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -192 1032 480 ) ( -192 1032 608 ) ( -64 1032 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -192 1032 480 ) ( -192 1056 480 ) ( -192 1032 608 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "trigger_push"
@@ -37289,7 +37487,7 @@ exx/trim-psimple04
 "origin" "288 -392 32"
 }
 {
-"classname" "weapon_rocketlauncher"
+"classname" "weapon_devastator"
 "origin" "-1824 128 344"
 "targetname" "t234"
 }
@@ -40012,18 +40210,6 @@ exx/wall-bigrib02
 {
 "classname" "func_group"
 {
-patchDef2
-{
-exx/wall-bigrib02
-( 3 3 0 0 0 )
-(
-( ( 192 1024 544 1.5 -4.25 ) ( 192 1024 608 1.5 -4.75 ) ( 128 1024 608 1 -4.75 ) )
-( ( 192 1024 608 1.5 -4.75 ) ( 192 1024 608 1.5 -4.75 ) ( 192 1024 608 1.5 -4.75 ) )
-( ( 192 1024 608 1.5 -4.75 ) ( 192 1024 608 1.5 -4.75 ) ( 192 1024 608 1.5 -4.75 ) )
-)
-}
-}
-{
 ( 64 1042 548 ) ( 64 1046 552 ) ( 192 1042 548 ) exx/base-metal03 192 256 0 0.25 0.25 134217728 0 0
 ( 64 1046 536 ) ( 64 1042 540 ) ( 192 1046 536 ) exx/base-metal03 192 0 0 0.25 0.25 134217728 0 0
 ( 64 1034 548 ) ( 64 1026 548 ) ( 64 1026 540 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
@@ -40036,12 +40222,12 @@ exx/wall-bigrib02
 {
 patchDef2
 {
-exx/trim-baseboard02
+exx/wall-bigrib02
 ( 3 3 0 0 0 )
 (
-( ( 128 1024 608 0 0.75 ) ( 128 1040 608 0 0.375 ) ( 128 1056 608 0 0 ) )
-( ( 64 1024 608 0.5 0.75 ) ( 64 1040 608 0.5 0.375 ) ( 64 1056 608 0.5 0 ) )
-( ( 64 1024 544 1 0.75 ) ( 64 1040 544 1 0.375 ) ( 64 1056 544 1 0 ) )
+( ( 128 1024 480 1 -3.75 ) ( 192 1024 480 1.5 -3.75 ) ( 192 1024 544 1.5 -4.25 ) )
+( ( 192 1024 480 1.5 -3.75 ) ( 192 1024 480 1.5 -3.75 ) ( 192 1024 480 1.5 -3.75 ) )
+( ( 192 1024 480 1.5 -3.75 ) ( 192 1024 480 1.5 -3.75 ) ( 192 1024 480 1.5 -3.75 ) )
 )
 }
 }
@@ -40051,9 +40237,9 @@ patchDef2
 exx/trim-baseboard02
 ( 3 3 0 0 0 )
 (
-( ( 64 1024 544 0 0.75 ) ( 64 1040 544 0 0.375 ) ( 64 1056 544 0 0 ) )
-( ( 64 1024 480 0.5 0.75 ) ( 64 1040 480 0.5 0.375 ) ( 64 1056 480 0.5 0 ) )
-( ( 128 1024 480 1 0.75 ) ( 128 1040 480 1 0.375 ) ( 128 1056 480 1 0 ) )
+( ( 128 1024 608 0 0.75 ) ( 128 1040 608 0 0.375 ) ( 128 1056 608 0 0 ) )
+( ( 64 1024 608 0.5 0.75 ) ( 64 1040 608 0.5 0.375 ) ( 64 1056 608 0.5 0 ) )
+( ( 64 1024 544 1 0.75 ) ( 64 1040 544 1 0.375 ) ( 64 1056 544 1 0 ) )
 )
 }
 }
@@ -40075,21 +40261,21 @@ patchDef2
 exx/wall-bigrib02
 ( 3 3 0 0 0 )
 (
-( ( 128 1024 480 1 -3.75 ) ( 192 1024 480 1.5 -3.75 ) ( 192 1024 544 1.5 -4.25 ) )
-( ( 192 1024 480 1.5 -3.75 ) ( 192 1024 480 1.5 -3.75 ) ( 192 1024 480 1.5 -3.75 ) )
-( ( 192 1024 480 1.5 -3.75 ) ( 192 1024 480 1.5 -3.75 ) ( 192 1024 480 1.5 -3.75 ) )
+( ( 192 1024 544 1.5 -4.25 ) ( 192 1024 608 1.5 -4.75 ) ( 128 1024 608 1 -4.75 ) )
+( ( 192 1024 608 1.5 -4.75 ) ( 192 1024 608 1.5 -4.75 ) ( 192 1024 608 1.5 -4.75 ) )
+( ( 192 1024 608 1.5 -4.75 ) ( 192 1024 608 1.5 -4.75 ) ( 192 1024 608 1.5 -4.75 ) )
 )
 }
 }
 {
 patchDef2
 {
-exx/wall-bigrib02
+exx/trim-baseboard02
 ( 3 3 0 0 0 )
 (
-( ( 64 1024 544 0.5 -4.25 ) ( 64 1024 480 0.5 -3.75 ) ( 128 1024 480 1 -3.75 ) )
-( ( 64 1024 480 0.5 -3.75 ) ( 64 1024 480 0.5 -3.75 ) ( 64 1024 480 0.5 -3.75 ) )
-( ( 64 1024 480 0.5 -3.75 ) ( 64 1024 480 0.5 -3.75 ) ( 64 1024 480 0.5 -3.75 ) )
+( ( 64 1024 544 0 0.75 ) ( 64 1040 544 0 0.375 ) ( 64 1056 544 0 0 ) )
+( ( 64 1024 480 0.5 0.75 ) ( 64 1040 480 0.5 0.375 ) ( 64 1056 480 0.5 0 ) )
+( ( 128 1024 480 1 0.75 ) ( 128 1040 480 1 0.375 ) ( 128 1056 480 1 0 ) )
 )
 }
 }
@@ -40111,6 +40297,18 @@ patchDef2
 exx/wall-bigrib02
 ( 3 3 0 0 0 )
 (
+( ( 64 1024 544 0.5 -4.25 ) ( 64 1024 480 0.5 -3.75 ) ( 128 1024 480 1 -3.75 ) )
+( ( 64 1024 480 0.5 -3.75 ) ( 64 1024 480 0.5 -3.75 ) ( 64 1024 480 0.5 -3.75 ) )
+( ( 64 1024 480 0.5 -3.75 ) ( 64 1024 480 0.5 -3.75 ) ( 64 1024 480 0.5 -3.75 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/wall-bigrib02
+( 3 3 0 0 0 )
+(
 ( ( 128 1024 608 1 -4.75 ) ( 64 1024 608 0.5 -4.75 ) ( 64 1024 544 0.5 -4.25 ) )
 ( ( 64 1024 608 0.5 -4.75 ) ( 64 1024 608 0.5 -4.75 ) ( 64 1024 608 0.5 -4.75 ) )
 ( ( 64 1024 608 0.5 -4.75 ) ( 64 1024 608 0.5 -4.75 ) ( 64 1024 608 0.5 -4.75 ) )
@@ -40119,26 +40317,11 @@ exx/wall-bigrib02
 }
 }
 {
-"classname" "misc_model"
-"origin" "128 1040 544"
-"model" "models/fans/turbineblades.ase"
-"angles" "90 -90 0"
-"target" "t250"
-}
-{
 "classname" "func_rotating"
 "targetname" "t250"
 "spawnflags" "8"
 "speed" "20"
 {
-( 136 1000 536 ) ( 120 1000 536 ) ( 120 992 536 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
-( 120 992 552 ) ( 120 1000 552 ) ( 136 1000 552 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
-( 136 992 552 ) ( 136 1000 552 ) ( 136 1000 536 ) common/nodraw 0 128 0 0.25 0.25 0 12 0
-( 136 1030 552 ) ( 120 1030 552 ) ( 120 1030 536 ) common/nodraw 0 128 0 0.25 0.25 0 12 0
-( 120 1000 552 ) ( 120 992 552 ) ( 120 992 536 ) common/nodraw 0 128 0 0.25 0.25 0 12 0
-( 118 1028 544 ) ( 118 1028 560 ) ( 134 1028 560 ) common/nodraw 0 128 0 0.25 0.25 0 12 0
-}
-{
 ( 136 1006 536 ) ( 120 1006 536 ) ( 120 998 536 ) common/origin 0 0 0 0.25 0.25 0 14 0
 ( 120 998 552 ) ( 120 1006 552 ) ( 136 1006 552 ) common/origin 0 0 0 0.25 0.25 0 14 0
 ( 120 1026 552 ) ( 136 1026 552 ) ( 136 1026 536 ) common/origin 0 128 0 0.25 0.25 0 14 0
@@ -40146,6 +40329,14 @@ exx/wall-bigrib02
 ( 120 1006 552 ) ( 120 998 552 ) ( 120 998 536 ) common/origin 0 128 0 0.25 0.25 0 14 0
 ( 120 1028 560 ) ( 120 1028 544 ) ( 136 1028 560 ) common/origin 0 128 0 0.25 0.25 0 14 0
 }
+{
+( 136 1000 536 ) ( 120 1000 536 ) ( 120 992 536 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
+( 120 992 552 ) ( 120 1000 552 ) ( 136 1000 552 ) common/nodraw 0 0 0 0.25 0.25 0 12 0
+( 136 992 552 ) ( 136 1000 552 ) ( 136 1000 536 ) common/nodraw 0 128 0 0.25 0.25 0 12 0
+( 136 1030 552 ) ( 120 1030 552 ) ( 120 1030 536 ) common/nodraw 0 128 0 0.25 0.25 0 12 0
+( 120 1000 552 ) ( 120 992 552 ) ( 120 992 536 ) common/nodraw 0 128 0 0.25 0.25 0 12 0
+( 118 1028 544 ) ( 118 1028 560 ) ( 134 1028 560 ) common/nodraw 0 128 0 0.25 0.25 0 12 0
+}
 }
 {
 "classname" "func_group"
@@ -44396,7 +44587,7 @@ trak5x/base-pipe1a
 "angle" "45.000000"
 }
 {
-"classname" "weapon_nex"
+"classname" "weapon_vortex"
 "origin" "-784 0 512"
 }
 {
@@ -44404,11 +44595,11 @@ trak5x/base-pipe1a
 "origin" "0 1040 76"
 }
 {
-"classname" "weapon_uzi"
+"classname" "weapon_machinegun"
 "origin" "0 752 296"
 }
 {
-"classname" "weapon_grenadelauncher"
+"classname" "weapon_mortar"
 "origin" "448.000000 640.000000 256.000000"
 "angle" "-90.000000"
 }
@@ -44444,7 +44635,7 @@ trak5x/base-pipe1a
 "message" "was killed by an explosive barrel"
 "message2" "was killed with an explosive barrel by"
 "noise" "sound/weapons/rocket_impact.ogg"
-"respawntime" "40"
+"respawntime" "35"
 "respawntimejitter" "10"
 }
 {
@@ -44469,7 +44660,7 @@ trak5x/base-pipe1a
 "message" "was killed by an explosive barrel"
 "message2" "was killed with an explosive barrel by"
 "noise" "sound/weapons/rocket_impact.ogg"
-"respawntime" "40"
+"respawntime" "35"
 "respawntimejitter" "10"
 }
 {
@@ -44494,7 +44685,7 @@ trak5x/base-pipe1a
 "message" "was killed by an explosive barrel"
 "message2" "was killed with an explosive barrel by"
 "noise" "sound/weapons/rocket_impact.ogg"
-"respawntime" "40"
+"respawntime" "35"
 "respawntimejitter" "10"
 }
 {
@@ -44519,7 +44710,7 @@ trak5x/base-pipe1a
 "message" "was killed by an explosive barrel"
 "message2" "was killed with an explosive barrel by"
 "noise" "sound/weapons/rocket_impact.ogg"
-"respawntime" "40"
+"respawntime" "35"
 "respawntimejitter" "10"
 }
 {
@@ -44544,7 +44735,7 @@ trak5x/base-pipe1a
 "message" "was killed by an explosive barrel"
 "message2" "was killed with an explosive barrel by"
 "noise" "sound/weapons/rocket_impact.ogg"
-"respawntime" "40"
+"respawntime" "35"
 "respawntimejitter" "10"
 }
 {
@@ -44569,7 +44760,7 @@ trak5x/base-pipe1a
 "message" "was killed by an explosive barrel"
 "message2" "was killed with an explosive barrel by"
 "noise" "sound/weapons/rocket_impact.ogg"
-"respawntime" "40"
+"respawntime" "35"
 "respawntimejitter" "10"
 }
 {
@@ -44633,7 +44824,7 @@ trak5x/base-pipe1a
 {
 "classname" "dom_controlpoint"
 "origin" "-1408.000000 -32.000000 48.000000"
-"message" " has captured the ^2Rocket Launcher ^3control point"
+"message" " has captured the ^2Devastator ^3control point"
 }
 {
 "classname" "dom_controlpoint"
@@ -44705,3 +44896,10 @@ trak5x/base-pipe1a
 "origin" "271.835205 -357.587097 136.00856"
 "angles" "7.6574707 -143.399048 0"
 }
+{
+"classname" "misc_model"
+"origin" "128 1040 544"
+"model" "models/fans/turbineblades.ase"
+"angles" "90 -90 0"
+"target" "t250"
+}