Fix more visible caulk

diff --git a/maps/glowplant.map b/maps/glowplant.map
index be4cc0f35eb1ee7fa5e67df526f1e62299fa2371..b1729fe7217cc0eb8405874e20b36e4166c616dd 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 ) )
 )
 }
 }
@@ -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
@@ -29927,6 +29919,196 @@ 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
+}
 }
 {
 "classname" "trigger_push"
@@ -40012,18 +40194,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 +40206,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 +40221,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 +40245,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 +40281,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 +40301,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 +40313,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"
@@ -44705,3 +44880,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"
+}

diff --git a/maps/glowplant.map.options b/maps/glowplant.map.options
index 1b4077997ec65c38bbe5afb787d6a6d6b6cea0b5..c6f986ae926c1d026b6fb1e17cb175f056c07141 100644 (file)
--- a/maps/glowplant.map.options
+++ b/maps/glowplant.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 16
\ No newline at end of file
+Version: 16a
\ No newline at end of file