From: cbrutail Date: Tue, 4 Oct 2011 06:40:12 +0000 (+0200) Subject: Merge branch 'master' into cbrutail/map-lightspeed X-Git-Tag: xonotic-v0.6.0~74 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=3f3a9c045591a708df9c8bb47d5f3ddcaf4658ca;hp=18a8fb100ce8f6a96951c10f6ae492cc010f393a Merge branch 'master' into cbrutail/map-lightspeed --- diff --git a/maps/leave_em_behind.map b/maps/leave_em_behind.map index cfaa1eba..c36ebb5d 100644 --- a/maps/leave_em_behind.map +++ b/maps/leave_em_behind.map @@ -1,7 +1,7 @@ { "classname" "worldspawn" -"message" "Leave'em behind by C.Brutail" -"author" "C.Brutail" +"message" "Leave'em behind" +"author" "C.Brutail, Cortez" "_description" "A very small race map." { ( 256 160 64 ) ( 160 -256 64 ) ( 160 256 64 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0 @@ -280,7 +280,7 @@ ( -1248 704 64 ) ( -1216 736 0 ) ( -1216 736 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 } { -( -1152 768 64 ) ( -1152 768 320 ) ( -1024 640 64 ) exx/wall-bplate06 170.6665039063 146.2857666016 0 0.1875 0.4374999702 0 0 0 +( -1152 768 64 ) ( -1152 768 320 ) ( -1024 640 64 ) exx/wall-bplate06 170.6665039062 146.2857666016 0 0.1875 0.4374999702 0 0 0 ( -1056 768 64 ) ( -1152 768 64 ) ( -928 640 64 ) common/caulk 0 0 0 -0.5 0.5 0 0 0 ( -1248 736 -64 ) ( -1152 736 -64 ) ( -1248 736 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -1024 736 -64 ) ( -1024 704 -64 ) ( -1024 736 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 @@ -418,7 +418,7 @@ ( -160 352 -64 ) ( -160 288 -64 ) ( -160 352 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 } { -( -1344 640 64 ) ( -1216 768 320 ) ( -1216 768 64 ) exx/wall-bplate06 170.6665039063 146.2857666016 0 0.1875 0.4374999702 0 0 0 +( -1344 640 64 ) ( -1216 768 320 ) ( -1216 768 64 ) exx/wall-bplate06 170.6665039062 146.2857666016 0 0.1875 0.4374999702 0 0 0 ( -1440 640 64 ) ( -1216 768 64 ) ( -1312 768 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -1248 736 -64 ) ( -1152 736 -64 ) ( -1248 736 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -1344 704 64 ) ( -1344 672 -64 ) ( -1344 704 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 @@ -494,7 +494,7 @@ ( -1728 -448 288 ) ( -1728 -608 256 ) ( -1728 -448 256 ) common/caulk 0 64 0 0.5 0.5 0 0 0 } { -( -1536 -608 288 ) ( -1536 -448 288 ) ( -1536 -448 64 ) exx/wall-metalb01 409.6000976563 146.2857055664 0 0.3125 0.4374999702 0 0 0 +( -1536 -608 288 ) ( -1536 -448 288 ) ( -1536 -448 64 ) exx/wall-metalb01 409.6000976562 146.2857055664 0 0.3125 0.4374999702 0 0 0 ( -1536 -608 64 ) ( -1536 -448 64 ) ( -1568 -448 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -1536 -608 288 ) ( -1568 -448 288 ) ( -1536 -448 288 ) exx/floor-clang01 512 0 180 0.25 0.25 0 0 0 ( -1568 -448 64 ) ( -1536 -448 288 ) ( -1568 -448 288 ) common/caulk 0 0 0 0.5 0.5 0 0 0 @@ -1334,7 +1334,7 @@ trak5x/base-pipe1d } { ( 208 -208 576 ) ( 304 -256 576 ) ( 256 -160 576 ) common/caulk 64.8041229248 255.1960144043 90 0.2500000298 0.2500000298 134217728 0 0 -( 208 -208 576 ) ( 256 -160 576 ) ( 256 -256 640 ) exx/wall-metalb01 256.0000305176 170.6665039063 -135 0.265165031 0.1325825155 134217728 0 0 +( 208 -208 576 ) ( 256 -160 576 ) ( 256 -256 640 ) exx/wall-metalb01 256.0000305176 170.6665039062 -135 0.265165031 0.1325825155 134217728 0 0 ( 256 -176 -64 ) ( 256 -208 -64 ) ( 256 -176 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 ( 208 -256 64 ) ( 224 -256 -64 ) ( 208 -256 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 } @@ -1350,14 +1350,14 @@ trak5x/base-pipe1d ( 928 -560 576 ) ( 1056 -560 576 ) ( 928 -368 576 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 ( 928 -560 576 ) ( 928 -560 640 ) ( 1056 -560 576 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 ( 928 -560 576 ) ( 928 -368 576 ) ( 928 -560 640 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 -( 928 64 640 ) ( 1024 64 576 ) ( 928 -64 640 ) exx/wall-metalb01 469.3333740234 170.6665039063 90 0.375 0.1875 134217728 0 0 +( 928 64 640 ) ( 1024 64 576 ) ( 928 -64 640 ) exx/wall-metalb01 469.3333740234 170.6665039062 90 0.375 0.1875 134217728 0 0 } { ( 1056 -624 640 ) ( 928 -624 640 ) ( 1056 -624 576 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 ( 928 -816 576 ) ( 1056 -816 576 ) ( 928 -624 576 ) common/caulk 0 -0 0 0.25 0.25 134217728 0 0 ( 928 -816 576 ) ( 928 -816 640 ) ( 1056 -816 576 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 ( 928 -816 576 ) ( 928 -624 576 ) ( 928 -816 640 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 -( 928 -192 640 ) ( 1024 -192 576 ) ( 928 -320 640 ) exx/wall-metalb01 128 170.6665039063 90 0.375 0.1875 134217728 0 0 +( 928 -192 640 ) ( 1024 -192 576 ) ( 928 -320 640 ) exx/wall-metalb01 128 170.6665039062 90 0.375 0.1875 134217728 0 0 } { ( 816 -1056 640 ) ( 816 -928 640 ) ( 816 -1056 576 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0 @@ -1861,7 +1861,7 @@ trak5x/base-pipe1d ( 1184 -1432 536 ) ( 1216 -1336 568 ) ( 1216 -1432 568 ) common/caulk 0 96 180 0.25 0.25 0 0 0 } { -( 1216 -1336 376 ) ( 1024 -1432 376 ) ( 1024 -1336 376 ) exx/floor-tile03 216.6665039063 213.3333129883 180 0.1860000044 0.3100000024 0 0 0 +( 1216 -1336 376 ) ( 1024 -1432 376 ) ( 1024 -1336 376 ) exx/floor-tile03 216.6665039062 213.3333129883 180 0.1860000044 0.3100000024 0 0 0 ( 992 -1432 344 ) ( 1024 -1432 376 ) ( 1248 -1432 344 ) common/caulk 128 224 0 -0.25 0.25 0 0 0 ( 960 -1432 344 ) ( 992 -1336 376 ) ( 992 -1432 376 ) common/caulk 0 96 180 0.25 0.25 0 0 0 ( 1248 -1336 344 ) ( 992 -1336 344 ) ( 992 -1432 344 ) exx/trim-horz01 128 96 180 0.25 0.25 0 0 0 @@ -4278,7 +4278,7 @@ exx/wall-metalrib01 ( -924 -64 304 ) ( -912 64 304 ) ( -924 64 304 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 } { -( -392 1064 288 ) ( -1015 1064 288 ) ( -1015 1304 288 ) map_leave_em_behind/biolumi2_yellow 0 0 90 0.25 0.25 0 0 0 +( -392 1064 288 ) ( -1015 1064 288 ) ( -1015 1304 288 ) map_leave_em_behind/biolumi2_yellow_wave 0 0 90 0.25 0.25 0 0 0 ( -392 1304 288 ) ( -1015 1304 192 ) ( -392 1304 192 ) common/caulk 0 128 0 0.25 0.25 0 0 0 ( -392 1064 288 ) ( -392 1304 192 ) ( -392 1064 192 ) common/caulk 0 128 0 0.25 0.25 0 0 0 ( -1015 1064 192 ) ( -392 1064 192 ) ( -392 1304 192 ) common/caulk 0 0 0 0.25 0.25 0 0 0 @@ -4814,7 +4814,7 @@ map_leave_em_behind/biolumi2_green } { ( 1024 208 64 ) ( 992 630 64 ) ( 1024 630 64 ) exx/floor-grate01-cull 0 373 0 0.125 0.2349999994 134217728 0 0 -( 1024 630 64 ) ( 992 630 64 ) ( 1000 630 56 ) common/caulk 0 98 0 0.25 0.25 134217728 0 0 +( 1024 630 64 ) ( 992 630 64 ) ( 1000 630 56 ) exx/base-metal01 0 0 0 -0.5 0.5 134217728 0 0 ( 1016 208 56 ) ( 1024 630 64 ) ( 1016 630 56 ) common/caulk 352 98 0 0.25 0.25 134217728 0 0 ( 1000 208 56 ) ( 1016 630 56 ) ( 1000 630 56 ) common/caulk 0 258 0 0.25 0.25 134217728 0 0 ( 1024 208 64 ) ( 1000 208 56 ) ( 992 208 64 ) common/caulk 0 98 0 0.25 0.25 134217728 0 0 @@ -4826,7 +4826,7 @@ map_leave_em_behind/biolumi2_green ( 1024 208 16 ) ( 992 688 16 ) ( 992 208 16 ) common/caulk 212 0 180 0.5 0.5 0 0 0 ( 1024 688 48 ) ( 992 688 16 ) ( 1024 688 16 ) common/caulk 212 32 0 -0.5 0.5 0 0 0 ( 1024 688 48 ) ( 1024 688 16 ) ( 1024 208 16 ) common/caulk 190.6666259766 182.857208252 0 -0.4687499702 0.4374999702 0 0 0 -( 1024 208 48 ) ( 992 208 48 ) ( 992 688 48 ) map_leave_em_behind/biolumi2_green 52 0 180 0.125 0.125 0 0 0 +( 1024 208 48 ) ( 992 208 48 ) ( 992 688 48 ) map_leave_em_behind/biolumi2_green_wave 52 0 180 0.125 0.125 0 0 0 } { ( 960 240 288 ) ( 992 208 16 ) ( 960 240 16 ) exx/base-metal01 468 0 0 -0.5 0.5 0 0 0 @@ -5095,7 +5095,7 @@ trak5x/base-pipe1d ( 144 1344 576 ) ( 144 1440 640 ) ( 256 1440 640 ) exx/wall-metalb01 131.3334350586 511.9993286133 -0 0.375 0.1875 134217728 0 0 } { -( -160 -304 576 ) ( -256 -256 576 ) ( -208 -352 576 ) common/caulk 64.8040771484 191.1958007813 -0 0.2500000298 -0.2500000298 134217728 0 0 +( -160 -304 576 ) ( -256 -256 576 ) ( -208 -352 576 ) common/caulk 64.8040771484 191.1958007812 -0 0.2500000298 -0.2500000298 134217728 0 0 ( -256 -256 640 ) ( -256 -256 576 ) ( -160 -256 576 ) common/caulk 41.5676879883 0 0 0.5000000596 0.25 134217728 0 0 ( -256 -304 640 ) ( -256 -304 576 ) ( -256 -256 640 ) common/caulk 27.5677490234 0 0 -0.5000000596 0.25 134217728 0 0 ( -256 -256 640 ) ( -160 -256 576 ) ( -256 -304 640 ) exx/wall-metalb01 0.0002441406 341.3328857422 -90 0.375 -0.1875 134217728 0 0 @@ -5255,7 +5255,7 @@ trak5x/base-pipe1d ( 1696 448 64 ) ( 1696 448 256 ) ( 1696 608 256 ) common/caulk 0 0 0 -0.5 0.5 0 0 0 } { -( -1664 -608 272 ) ( -1696 -608 272 ) ( -1696 -448 272 ) map_leave_em_behind/biolumi2_yellow 384 0 180 0.25 0.25 134217728 0 0 +( -1664 -608 272 ) ( -1696 -608 272 ) ( -1696 -448 272 ) map_leave_em_behind/biolumi2_yellow_wave 384 0 180 0.25 0.25 134217728 0 0 ( -1664 -448 272 ) ( -1696 -448 256 ) ( -1664 -448 256 ) common/caulk 64 32 0 0.5 0.5 134217728 0 0 ( -1664 -608 272 ) ( -1664 -448 256 ) ( -1664 -608 256 ) common/caulk 0 32 0 0.5 0.5 134217728 0 0 ( -1664 -608 256 ) ( -1696 -448 256 ) ( -1696 -608 256 ) common/caulk 64 0 0 0.5 0.5 134217728 0 0 @@ -5265,18 +5265,18 @@ trak5x/base-pipe1d { patchDef2 { -map_leave_em_behind/biolumi2_green +map_leave_em_behind/biolumi2_green_wave ( 9 3 0 0 0 ) ( -( ( 1008 640 112.0001220703 0 0 ) ( 1008 640 80.0001220703 0 -0.25 ) ( 1008 640 48.0001220703 0 -0.5 ) ) -( ( 992 640 112.0001220703 0.25 0 ) ( 992 640 80.0001220703 0.25 -0.25 ) ( 992 640 48.0001220703 0.25 -0.5 ) ) -( ( 992 656 112.0001220703 0.5 0 ) ( 992 656 80.0001220703 0.5 -0.25 ) ( 992 656 48.0001220703 0.5 -0.5 ) ) -( ( 992 672 112.0001220703 0.75 0 ) ( 992 672 80.0001220703 0.75 -0.25 ) ( 992 672 48.0001220703 0.75 -0.5 ) ) -( ( 1008 672 112.0001220703 1 0 ) ( 1008 672 80.0001220703 1 -0.25 ) ( 1008 672 48.0001220703 1 -0.5 ) ) -( ( 1024 672 112.0001220703 1.25 0 ) ( 1024 672 80.0001220703 1.25 -0.25 ) ( 1024 672 48.0001220703 1.25 -0.5 ) ) -( ( 1024 656 112.0001220703 1.5 0 ) ( 1024 656 80.0001220703 1.5 -0.25 ) ( 1024 656 48.0001220703 1.5 -0.5 ) ) -( ( 1024 640 112.0001220703 1.75 0 ) ( 1024 640 80.0001220703 1.75 -0.25 ) ( 1024 640 48.0001220703 1.75 -0.5 ) ) -( ( 1008 640 112.0001220703 2 0 ) ( 1008 640 80.0001220703 2 -0.25 ) ( 1008 640 48.0001220703 2 -0.5 ) ) +( ( 1008 644 112.0001220703 0 0 ) ( 1008 644 80.0001220703 0 -0.200000003 ) ( 1008 644 48.0001220703 0 -0.400000006 ) ) +( ( 996 644 112.0001220703 0.3000000119 0 ) ( 996 644 80.0001220703 0.3000000119 -0.200000003 ) ( 996 644 48.0001220703 0.3000000119 -0.400000006 ) ) +( ( 996 656 112.0001220703 0.6000000238 0 ) ( 996 656 80.0001220703 0.6000000238 -0.200000003 ) ( 996 656 48.0001220703 0.6000000238 -0.400000006 ) ) +( ( 996 668 112.0001220703 0.8999999762 0 ) ( 996 668 80.0001220703 0.8999999762 -0.200000003 ) ( 996 668 48.0001220703 0.8999999762 -0.400000006 ) ) +( ( 1008 668 112.0001220703 1.2000000477 0 ) ( 1008 668 80.0001220703 1.2000000477 -0.200000003 ) ( 1008 668 48.0001220703 1.2000000477 -0.400000006 ) ) +( ( 1020 668 112.0001220703 1.5 0 ) ( 1020 668 80.0001220703 1.5 -0.200000003 ) ( 1020 668 48.0001220703 1.5 -0.400000006 ) ) +( ( 1020 656 112.0001220703 1.7999999523 0 ) ( 1020 656 80.0001220703 1.7999999523 -0.200000003 ) ( 1020 656 48.0001220703 1.7999999523 -0.400000006 ) ) +( ( 1020 644 112.0001220703 2.0999999046 0 ) ( 1020 644 80.0001220703 2.0999999046 -0.200000003 ) ( 1020 644 48.0001220703 2.0999999046 -0.400000006 ) ) +( ( 1008 644 112.0001220703 2.4000000954 0 ) ( 1008 644 80.0001220703 2.4000000954 -0.200000003 ) ( 1008 644 48.0001220703 2.4000000954 -0.400000006 ) ) ) } } @@ -5301,18 +5301,18 @@ trak5x/base-pipe1d { patchDef2 { -map_leave_em_behind/biolumi2_yellow +map_leave_em_behind/biolumi2_yellow_wave ( 9 3 0 0 0 ) ( -( ( -1680 -608 312.0001220703 0 0 ) ( -1680 -608 288.0001220703 0 -0.25 ) ( -1680 -608 272.0001220703 0 -0.5 ) ) -( ( -1696 -608 312.0001220703 0.25 0 ) ( -1696 -608 288.0001220703 0.25 -0.25 ) ( -1696 -608 272.0001220703 0.25 -0.5 ) ) -( ( -1696 -592 312.0001220703 0.5 0 ) ( -1696 -592 288.0001220703 0.5 -0.25 ) ( -1696 -592 272.0001220703 0.5 -0.5 ) ) -( ( -1696 -576 312.0001220703 0.75 0 ) ( -1696 -576 288.0001220703 0.75 -0.25 ) ( -1696 -576 272.0001220703 0.75 -0.5 ) ) -( ( -1680 -576 312.0001220703 1 0 ) ( -1680 -576 288.0001220703 1 -0.25 ) ( -1680 -576 272.0001220703 1 -0.5 ) ) -( ( -1664 -576 312.0001220703 1.25 0 ) ( -1664 -576 288.0001220703 1.25 -0.25 ) ( -1664 -576 272.0001220703 1.25 -0.5 ) ) -( ( -1664 -592 312.0001220703 1.5 0 ) ( -1664 -592 288.0001220703 1.5 -0.25 ) ( -1664 -592 272.0001220703 1.5 -0.5 ) ) -( ( -1664 -608 312.0001220703 1.75 0 ) ( -1664 -608 288.0001220703 1.75 -0.25 ) ( -1664 -608 272.0001220703 1.75 -0.5 ) ) -( ( -1680 -608 312.0001220703 2 0 ) ( -1680 -608 288.0001220703 2 -0.25 ) ( -1680 -608 272.0001220703 2 -0.5 ) ) +( ( -1680 -604 312.0001220703 0 0 ) ( -1680 -604 288.0001220703 0 -0.25 ) ( -1680 -604 272.0001220703 0 -0.5 ) ) +( ( -1692 -604 312.0001220703 0.25 0 ) ( -1692 -604 288.0001220703 0.25 -0.25 ) ( -1692 -604 272.0001220703 0.25 -0.5 ) ) +( ( -1692 -592 312.0001220703 0.5 0 ) ( -1692 -592 288.0001220703 0.5 -0.25 ) ( -1692 -592 272.0001220703 0.5 -0.5 ) ) +( ( -1692 -580 312.0001220703 0.75 0 ) ( -1692 -580 288.0001220703 0.75 -0.25 ) ( -1692 -580 272.0001220703 0.75 -0.5 ) ) +( ( -1680 -580 312.0001220703 1 0 ) ( -1680 -580 288.0001220703 1 -0.25 ) ( -1680 -580 272.0001220703 1 -0.5 ) ) +( ( -1668 -580 312.0001220703 1.25 0 ) ( -1668 -580 288.0001220703 1.25 -0.25 ) ( -1668 -580 272.0001220703 1.25 -0.5 ) ) +( ( -1668 -592 312.0001220703 1.5 0 ) ( -1668 -592 288.0001220703 1.5 -0.25 ) ( -1668 -592 272.0001220703 1.5 -0.5 ) ) +( ( -1668 -604 312.0001220703 1.75 0 ) ( -1668 -604 288.0001220703 1.75 -0.25 ) ( -1668 -604 272.0001220703 1.75 -0.5 ) ) +( ( -1680 -604 312.0001220703 2 0 ) ( -1680 -604 288.0001220703 2 -0.25 ) ( -1680 -604 272.0001220703 2 -0.5 ) ) ) } } @@ -5337,18 +5337,18 @@ trak5x/base-pipe1a { patchDef2 { -map_leave_em_behind/biolumi2_yellow +map_leave_em_behind/biolumi2_yellow_wave ( 9 3 0 0 0 ) ( -( ( -1680 -480 312.0001220703 0 0 ) ( -1680 -480 288.0001220703 0 -0.25 ) ( -1680 -480 272.0001220703 0 -0.5 ) ) -( ( -1696 -480 312.0001220703 0.25 0 ) ( -1696 -480 288.0001220703 0.25 -0.25 ) ( -1696 -480 272.0001220703 0.25 -0.5 ) ) -( ( -1696 -464 312.0001220703 0.5 0 ) ( -1696 -464 288.0001220703 0.5 -0.25 ) ( -1696 -464 272.0001220703 0.5 -0.5 ) ) -( ( -1696 -448 312.0001220703 0.75 0 ) ( -1696 -448 288.0001220703 0.75 -0.25 ) ( -1696 -448 272.0001220703 0.75 -0.5 ) ) -( ( -1680 -448 312.0001220703 1 0 ) ( -1680 -448 288.0001220703 1 -0.25 ) ( -1680 -448 272.0001220703 1 -0.5 ) ) -( ( -1664 -448 312.0001220703 1.25 0 ) ( -1664 -448 288.0001220703 1.25 -0.25 ) ( -1664 -448 272.0001220703 1.25 -0.5 ) ) -( ( -1664 -464 312.0001220703 1.5 0 ) ( -1664 -464 288.0001220703 1.5 -0.25 ) ( -1664 -464 272.0001220703 1.5 -0.5 ) ) -( ( -1664 -480 312.0001220703 1.75 0 ) ( -1664 -480 288.0001220703 1.75 -0.25 ) ( -1664 -480 272.0001220703 1.75 -0.5 ) ) -( ( -1680 -480 312.0001220703 2 0 ) ( -1680 -480 288.0001220703 2 -0.25 ) ( -1680 -480 272.0001220703 2 -0.5 ) ) +( ( -1680 -476 312.0001220703 0 0 ) ( -1680 -476 288.0001220703 0 -0.25 ) ( -1680 -476 272.0001220703 0 -0.5 ) ) +( ( -1692 -476 312.0001220703 0.25 0 ) ( -1692 -476 288.0001220703 0.25 -0.25 ) ( -1692 -476 272.0001220703 0.25 -0.5 ) ) +( ( -1692 -464 312.0001220703 0.5 0 ) ( -1692 -464 288.0001220703 0.5 -0.25 ) ( -1692 -464 272.0001220703 0.5 -0.5 ) ) +( ( -1692 -452 312.0001220703 0.75 0 ) ( -1692 -452 288.0001220703 0.75 -0.25 ) ( -1692 -452 272.0001220703 0.75 -0.5 ) ) +( ( -1680 -452 312.0001220703 1 0 ) ( -1680 -452 288.0001220703 1 -0.25 ) ( -1680 -452 272.0001220703 1 -0.5 ) ) +( ( -1668 -452 312.0001220703 1.25 0 ) ( -1668 -452 288.0001220703 1.25 -0.25 ) ( -1668 -452 272.0001220703 1.25 -0.5 ) ) +( ( -1668 -464 312.0001220703 1.5 0 ) ( -1668 -464 288.0001220703 1.5 -0.25 ) ( -1668 -464 272.0001220703 1.5 -0.5 ) ) +( ( -1668 -476 312.0001220703 1.75 0 ) ( -1668 -476 288.0001220703 1.75 -0.25 ) ( -1668 -476 272.0001220703 1.75 -0.5 ) ) +( ( -1680 -476 312.0001220703 2 0 ) ( -1680 -476 288.0001220703 2 -0.25 ) ( -1680 -476 272.0001220703 2 -0.5 ) ) ) } } @@ -5577,7 +5577,7 @@ trak5x/base-pipe1a ( 1728 448 320 ) ( 1728 608 288 ) ( 1728 448 288 ) common/caulk 0 128 0 -0.5 0.5 0 0 0 } { -( 1664 608 272 ) ( 1696 608 272 ) ( 1696 448 272 ) map_leave_em_behind/biolumi2_yellow 64 0 -0 0.25 0.25 134217728 0 0 +( 1664 608 272 ) ( 1696 608 272 ) ( 1696 448 272 ) map_leave_em_behind/biolumi2_yellow_wave 64 0 -0 0.25 0.25 134217728 0 0 ( 1664 448 272 ) ( 1696 448 256 ) ( 1664 448 256 ) common/caulk 64 32 0 -0.5 0.5 134217728 0 0 ( 1664 608 272 ) ( 1664 448 256 ) ( 1664 608 256 ) common/caulk 0 32 0 -0.5 0.5 134217728 0 0 ( 1664 608 256 ) ( 1696 448 256 ) ( 1696 608 256 ) common/caulk 64 0 180 0.5 0.5 134217728 0 0 @@ -5587,18 +5587,18 @@ trak5x/base-pipe1a { patchDef2 { -map_leave_em_behind/biolumi2_yellow +map_leave_em_behind/biolumi2_yellow_wave ( 9 3 0 0 0 ) ( -( ( 1680 608 312.0001220703 0 0 ) ( 1680 608 288.0001220703 0 -0.25 ) ( 1680 608 272.0001220703 0 -0.5 ) ) -( ( 1696 608 312.0001220703 0.25 0 ) ( 1696 608 288.0001220703 0.25 -0.25 ) ( 1696 608 272.0001220703 0.25 -0.5 ) ) -( ( 1696 592 312.0001220703 0.5 0 ) ( 1696 592 288.0001220703 0.5 -0.25 ) ( 1696 592 272.0001220703 0.5 -0.5 ) ) -( ( 1696 576 312.0001220703 0.75 0 ) ( 1696 576 288.0001220703 0.75 -0.25 ) ( 1696 576 272.0001220703 0.75 -0.5 ) ) -( ( 1680 576 312.0001220703 1 0 ) ( 1680 576 288.0001220703 1 -0.25 ) ( 1680 576 272.0001220703 1 -0.5 ) ) -( ( 1664 576 312.0001220703 1.25 0 ) ( 1664 576 288.0001220703 1.25 -0.25 ) ( 1664 576 272.0001220703 1.25 -0.5 ) ) -( ( 1664 592 312.0001220703 1.5 0 ) ( 1664 592 288.0001220703 1.5 -0.25 ) ( 1664 592 272.0001220703 1.5 -0.5 ) ) -( ( 1664 608 312.0001220703 1.75 0 ) ( 1664 608 288.0001220703 1.75 -0.25 ) ( 1664 608 272.0001220703 1.75 -0.5 ) ) -( ( 1680 608 312.0001220703 2 0 ) ( 1680 608 288.0001220703 2 -0.25 ) ( 1680 608 272.0001220703 2 -0.5 ) ) +( ( 1680 604 312.0001220703 0 0 ) ( 1680 604 288.0001220703 0 -0.25 ) ( 1680 604 272.0001220703 0 -0.5 ) ) +( ( 1692 604 312.0001220703 0.25 0 ) ( 1692 604 288.0001220703 0.25 -0.25 ) ( 1692 604 272.0001220703 0.25 -0.5 ) ) +( ( 1692 592 312.0001220703 0.5 0 ) ( 1692 592 288.0001220703 0.5 -0.25 ) ( 1692 592 272.0001220703 0.5 -0.5 ) ) +( ( 1692 580 312.0001220703 0.75 0 ) ( 1692 580 288.0001220703 0.75 -0.25 ) ( 1692 580 272.0001220703 0.75 -0.5 ) ) +( ( 1680 580 312.0001220703 1 0 ) ( 1680 580 288.0001220703 1 -0.25 ) ( 1680 580 272.0001220703 1 -0.5 ) ) +( ( 1668 580 312.0001220703 1.25 0 ) ( 1668 580 288.0001220703 1.25 -0.25 ) ( 1668 580 272.0001220703 1.25 -0.5 ) ) +( ( 1668 592 312.0001220703 1.5 0 ) ( 1668 592 288.0001220703 1.5 -0.25 ) ( 1668 592 272.0001220703 1.5 -0.5 ) ) +( ( 1668 604 312.0001220703 1.75 0 ) ( 1668 604 288.0001220703 1.75 -0.25 ) ( 1668 604 272.0001220703 1.75 -0.5 ) ) +( ( 1680 604 312.0001220703 2 0 ) ( 1680 604 288.0001220703 2 -0.25 ) ( 1680 604 272.0001220703 2 -0.5 ) ) ) } } @@ -5623,18 +5623,18 @@ trak5x/base-pipe1a { patchDef2 { -map_leave_em_behind/biolumi2_yellow +map_leave_em_behind/biolumi2_yellow_wave ( 9 3 0 0 0 ) ( -( ( 1680 480 312.0001220703 0 0 ) ( 1680 480 288.0001220703 0 -0.25 ) ( 1680 480 272.0001220703 0 -0.5 ) ) -( ( 1696 480 312.0001220703 0.25 0 ) ( 1696 480 288.0001220703 0.25 -0.25 ) ( 1696 480 272.0001220703 0.25 -0.5 ) ) -( ( 1696 464 312.0001220703 0.5 0 ) ( 1696 464 288.0001220703 0.5 -0.25 ) ( 1696 464 272.0001220703 0.5 -0.5 ) ) -( ( 1696 448 312.0001220703 0.75 0 ) ( 1696 448 288.0001220703 0.75 -0.25 ) ( 1696 448 272.0001220703 0.75 -0.5 ) ) -( ( 1680 448 312.0001220703 1 0 ) ( 1680 448 288.0001220703 1 -0.25 ) ( 1680 448 272.0001220703 1 -0.5 ) ) -( ( 1664 448 312.0001220703 1.25 0 ) ( 1664 448 288.0001220703 1.25 -0.25 ) ( 1664 448 272.0001220703 1.25 -0.5 ) ) -( ( 1664 464 312.0001220703 1.5 0 ) ( 1664 464 288.0001220703 1.5 -0.25 ) ( 1664 464 272.0001220703 1.5 -0.5 ) ) -( ( 1664 480 312.0001220703 1.75 0 ) ( 1664 480 288.0001220703 1.75 -0.25 ) ( 1664 480 272.0001220703 1.75 -0.5 ) ) -( ( 1680 480 312.0001220703 2 0 ) ( 1680 480 288.0001220703 2 -0.25 ) ( 1680 480 272.0001220703 2 -0.5 ) ) +( ( 1680 476 312.0001220703 0 0 ) ( 1680 476 288.0001220703 0 -0.25 ) ( 1680 476 272.0001220703 0 -0.5 ) ) +( ( 1692 476 312.0001220703 0.25 0 ) ( 1692 476 288.0001220703 0.25 -0.25 ) ( 1692 476 272.0001220703 0.25 -0.5 ) ) +( ( 1692 464 312.0001220703 0.5 0 ) ( 1692 464 288.0001220703 0.5 -0.25 ) ( 1692 464 272.0001220703 0.5 -0.5 ) ) +( ( 1692 452 312.0001220703 0.75 0 ) ( 1692 452 288.0001220703 0.75 -0.25 ) ( 1692 452 272.0001220703 0.75 -0.5 ) ) +( ( 1680 452 312.0001220703 1 0 ) ( 1680 452 288.0001220703 1 -0.25 ) ( 1680 452 272.0001220703 1 -0.5 ) ) +( ( 1668 452 312.0001220703 1.25 0 ) ( 1668 452 288.0001220703 1.25 -0.25 ) ( 1668 452 272.0001220703 1.25 -0.5 ) ) +( ( 1668 464 312.0001220703 1.5 0 ) ( 1668 464 288.0001220703 1.5 -0.25 ) ( 1668 464 272.0001220703 1.5 -0.5 ) ) +( ( 1668 476 312.0001220703 1.75 0 ) ( 1668 476 288.0001220703 1.75 -0.25 ) ( 1668 476 272.0001220703 1.75 -0.5 ) ) +( ( 1680 476 312.0001220703 2 0 ) ( 1680 476 288.0001220703 2 -0.25 ) ( 1680 476 272.0001220703 2 -0.5 ) ) ) } } @@ -6186,18 +6186,18 @@ trak5x/base-pipe1a } { ( 668.13671875 -1240.7509613037 328 ) ( 662.2923431396 -1268.9970703125 312 ) ( 662.2923431396 -1268.9970703125 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 -( 659.1461639404 -1218.4985351563 328 ) ( 662.2923431396 -1268.9970703125 328 ) ( 644.3112182617 -1224.4922485352 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 -( 659.1461639404 -1218.4985351563 312 ) ( 668.13671875 -1240.7509613037 312 ) ( 668.13671875 -1240.7509613037 328 ) common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0 -( 644.3112182617 -1224.4922485352 312 ) ( 659.1461639404 -1218.4985351563 312 ) ( 659.1461639404 -1218.4985351563 328 ) common/caulk 78.7290802002 112 0 0.5392673612 0.5 134217728 0 0 -( 644.3112182617 -1224.4922485352 312 ) ( 662.2923431396 -1268.9970703125 312 ) ( 659.1461639404 -1218.4985351563 312 ) common/caulk 90.6157684326 113.385345459 21.9999980927 0.5 -0.5 134217728 0 0 +( 659.1461639404 -1218.4985351562 328 ) ( 662.2923431396 -1268.9970703125 328 ) ( 644.3112182617 -1224.4922485352 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 +( 659.1461639404 -1218.4985351562 312 ) ( 668.13671875 -1240.7509613037 312 ) ( 668.13671875 -1240.7509613037 328 ) common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0 +( 644.3112182617 -1224.4922485352 312 ) ( 659.1461639404 -1218.4985351562 312 ) ( 659.1461639404 -1218.4985351562 328 ) common/caulk 78.7290802002 112 0 0.5392673612 0.5 134217728 0 0 +( 644.3112182617 -1224.4922485352 312 ) ( 662.2923431396 -1268.9970703125 312 ) ( 659.1461639404 -1218.4985351562 312 ) common/caulk 90.6157684326 113.385345459 21.9999980927 0.5 -0.5 134217728 0 0 ( 644.3112182617 -1224.4922485352 328 ) ( 662.2923431396 -1268.9970703125 328 ) ( 662.2923431396 -1268.9970703125 312 ) common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0 } { ( 629.476272583 -1230.4859466553 312 ) ( 629.476272583 -1230.4859466553 328 ) ( 718.4859313965 -1194.523727417 312 ) common/caulk 66.5418395996 224 180 0.2696336806 0.25 134217728 0 0 -( 629.476272583 -1230.4859466553 312 ) ( 667.5394287109 -1068.4267120361 312 ) ( 578.5297851563 -1104.3889465332 312 ) common/caulk 106.768447876 98.770690918 -158 0.25 0.25 134217728 0 0 -( 629.476272583 -1230.4859466553 328 ) ( 578.5297851563 -1104.3889465332 312 ) ( 578.5297851563 -1104.3889465332 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 -( 578.5297851563 -1104.3889465332 328 ) ( 667.5394287109 -1068.4267120361 312 ) ( 667.5394287109 -1068.4267120361 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 -( 718.4859313965 -1194.523727417 328 ) ( 578.5297851563 -1104.3889465332 328 ) ( 667.5394287109 -1068.4267120361 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 +( 629.476272583 -1230.4859466553 312 ) ( 667.5394287109 -1068.4267120361 312 ) ( 578.5297851562 -1104.3889465332 312 ) common/caulk 106.768447876 98.770690918 -158 0.25 0.25 134217728 0 0 +( 629.476272583 -1230.4859466553 328 ) ( 578.5297851562 -1104.3889465332 312 ) ( 578.5297851562 -1104.3889465332 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 +( 578.5297851562 -1104.3889465332 328 ) ( 667.5394287109 -1068.4267120361 312 ) ( 667.5394287109 -1068.4267120361 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 +( 718.4859313965 -1194.523727417 328 ) ( 578.5297851562 -1104.3889465332 328 ) ( 667.5394287109 -1068.4267120361 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 ( 718.4859313965 -1194.523727417 312 ) ( 667.5394287109 -1068.4267120361 328 ) ( 667.5394287109 -1068.4267120361 312 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 } { @@ -6218,11 +6218,11 @@ trak5x/base-pipe1a } { ( 668.13671875 -1240.7509613037 328 ) ( 688.9653625488 -1249.5921936035 328 ) ( 688.9653625488 -1249.5921936035 312 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 -( 673.9811096191 -1212.5048370361 328 ) ( 688.9653625488 -1249.5921936035 328 ) ( 659.1461639404 -1218.4985351563 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 +( 673.9811096191 -1212.5048370361 328 ) ( 688.9653625488 -1249.5921936035 328 ) ( 659.1461639404 -1218.4985351562 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 ( 673.9811096191 -1212.5048370361 312 ) ( 688.9653625488 -1249.5921936035 312 ) ( 688.9653625488 -1249.5921936035 328 ) common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0 -( 659.1461639404 -1218.4985351563 312 ) ( 673.9811096191 -1212.5048370361 312 ) ( 673.9811096191 -1212.5048370361 328 ) common/caulk 46.7290802002 112 0 0.5392673612 0.5 134217728 0 0 -( 668.13671875 -1240.7509613037 312 ) ( 688.9653625488 -1249.5921936035 312 ) ( 659.1461639404 -1218.4985351563 312 ) common/caulk 58.6157684326 113.385345459 21.9999980927 0.5 -0.5 134217728 0 0 -( 659.1461639404 -1218.4985351563 328 ) ( 668.13671875 -1240.7509613037 328 ) ( 668.13671875 -1240.7509613037 312 ) common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0 +( 659.1461639404 -1218.4985351562 312 ) ( 673.9811096191 -1212.5048370361 312 ) ( 673.9811096191 -1212.5048370361 328 ) common/caulk 46.7290802002 112 0 0.5392673612 0.5 134217728 0 0 +( 668.13671875 -1240.7509613037 312 ) ( 688.9653625488 -1249.5921936035 312 ) ( 659.1461639404 -1218.4985351562 312 ) common/caulk 58.6157684326 113.385345459 21.9999980927 0.5 -0.5 134217728 0 0 +( 659.1461639404 -1218.4985351562 328 ) ( 668.13671875 -1240.7509613037 328 ) ( 668.13671875 -1240.7509613037 312 ) common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0 } { ( 641.463684082 -1260.1558380127 328 ) ( 662.2923431396 -1268.9970703125 328 ) ( 662.2923431396 -1268.9970703125 312 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 @@ -6405,20 +6405,20 @@ trak5x/base-pipe1a ( -176 256 -64 ) ( -208 256 -64 ) ( -176 256 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 } { -( -208 208 576 ) ( -304 256 576 ) ( -256 160 576 ) common/caulk 64.8041992188 255.1958007813 -90 0.2500000298 0.2500000298 134217728 0 0 +( -208 208 576 ) ( -304 256 576 ) ( -256 160 576 ) common/caulk 64.8041992188 255.1958007812 -90 0.2500000298 0.2500000298 134217728 0 0 ( -208 208 576 ) ( -256 160 576 ) ( -256 256 640 ) exx/wall-metalb01 255.9999389648 170.6667480469 45 0.265165031 0.1325825155 134217728 0 0 ( -256 176 -64 ) ( -256 208 -64 ) ( -256 176 64 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0 ( -208 256 64 ) ( -224 256 -64 ) ( -208 256 -64 ) common/caulk -0 0 0 -0.25 0.25 134217728 0 0 } { -( -208 208 576 ) ( -304 256 576 ) ( -256 160 576 ) common/caulk 64.8041992188 255.1958007813 -90 0.2500000298 0.2500000298 134217728 0 0 +( -208 208 576 ) ( -304 256 576 ) ( -256 160 576 ) common/caulk 64.8041992188 255.1958007812 -90 0.2500000298 0.2500000298 134217728 0 0 ( -304 160 576 ) ( -304 256 576 ) ( -304 256 640 ) common/caulk 41.5678710938 0 0 -0.5000000596 0.25 134217728 0 0 ( -304 256 640 ) ( -256 256 576 ) ( -256 256 640 ) common/caulk 123.5673828125 0 0 0.5000000596 0.25 134217728 0 0 ( -256 256 640 ) ( -304 160 576 ) ( -304 256 640 ) exx/wall-metalb01 469.3336486816 341.3336486816 -0 0.375 0.1875 134217728 0 0 ( -256 176 64 ) ( -256 208 -64 ) ( -256 176 -64 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0 } { -( 256 1184 576 ) ( 304 1280 576 ) ( 208 1232 576 ) common/caulk 61.8036499023 255.1958007813 -90 0.2500000298 -0.2500000298 134217728 0 0 +( 256 1184 576 ) ( 304 1280 576 ) ( 208 1232 576 ) common/caulk 61.8036499023 255.1958007812 -90 0.2500000298 -0.2500000298 134217728 0 0 ( 304 1280 640 ) ( 304 1280 576 ) ( 304 1184 576 ) common/caulk 38.5670776367 0 0 -0.5000000596 0.25 134217728 0 0 ( 256 1280 640 ) ( 256 1280 576 ) ( 304 1280 640 ) common/caulk 120.5678710938 0 0 -0.5000000596 0.25 134217728 0 0 ( 304 1280 640 ) ( 304 1184 576 ) ( 256 1280 640 ) exx/wall-metalb01 466.3338623047 170.6658935547 0 -0.375 0.1875 134217728 0 0 @@ -6445,13 +6445,13 @@ trak5x/base-pipe1a ( 176 672 -64 ) ( 208 672 -64 ) ( 176 672 64 ) common/caulk 253 0 0 -0.25 0.25 134217728 0 0 } { -( 208 720 576 ) ( 304 672 576 ) ( 256 768 576 ) common/caulk 189.8045654297 255.1958007813 90 0.2500000298 0.2500000298 134217728 0 0 +( 208 720 576 ) ( 304 672 576 ) ( 256 768 576 ) common/caulk 189.8045654297 255.1958007812 90 0.2500000298 0.2500000298 134217728 0 0 ( 208 720 576 ) ( 256 768 576 ) ( 256 672 640 ) exx/wall-metalb01 167.6665649414 341.3331298828 -135 0.265165031 0.1325825155 134217728 0 0 ( 256 752 -64 ) ( 256 720 -64 ) ( 256 752 64 ) common/caulk 125 0 0 0.25 0.25 134217728 0 0 ( 208 672 64 ) ( 224 672 -64 ) ( 208 672 -64 ) common/caulk 253 0 0 0.25 0.25 134217728 0 0 } { -( 208 720 576 ) ( 304 672 576 ) ( 256 768 576 ) common/caulk 189.8045654297 255.1958007813 90 0.2500000298 0.2500000298 134217728 0 0 +( 208 720 576 ) ( 304 672 576 ) ( 256 768 576 ) common/caulk 189.8045654297 255.1958007812 90 0.2500000298 0.2500000298 134217728 0 0 ( 304 768 576 ) ( 304 672 576 ) ( 304 672 640 ) common/caulk 230.5680541992 0 0 0.5000000596 0.25 134217728 0 0 ( 304 672 640 ) ( 256 672 576 ) ( 256 672 640 ) common/caulk 120.5673828125 0 0 -0.5000000596 0.25 134217728 0 0 ( 256 672 640 ) ( 304 768 576 ) ( 304 672 640 ) exx/wall-metalb01 466.3336791992 0.0003662109 180 0.375 0.1875 134217728 0 0 @@ -8647,7 +8647,7 @@ effects_jumppad/jumppadfx1_c ( 352 -1440 640 ) ( 480 -1344 576 ) ( 480 -1440 640 ) exx/wall-metalb01 384.0001220703 0.0004882812 0 0.375 -0.1875 134217728 0 0 } { -( 256 416 576 ) ( 304 512 576 ) ( 208 464 576 ) common/caulk 61.8040771484 255.1958007813 -90 0.2500000298 -0.2500000298 134217728 0 0 +( 256 416 576 ) ( 304 512 576 ) ( 208 464 576 ) common/caulk 61.8040771484 255.1958007812 -90 0.2500000298 -0.2500000298 134217728 0 0 ( 304 512 640 ) ( 304 512 576 ) ( 304 416 576 ) common/caulk 38.5673217773 0 0 -0.5000000596 0.25 134217728 0 0 ( 256 512 640 ) ( 256 512 576 ) ( 304 512 640 ) common/caulk 120.5678710938 0 0 -0.5000000596 0.25 134217728 0 0 ( 304 512 640 ) ( 304 416 576 ) ( 256 512 640 ) exx/wall-metalb01 466.3338623047 170.6657714844 0 -0.375 0.1875 134217728 0 0 @@ -10239,7 +10239,7 @@ exx/trim-simple01 } { ( 176 1104 464 ) ( 216 1104 464 ) ( 216 1112 456 ) common/caulk 96 130 -0 0.5 -0.5 0 0 0 -( 176 1256 456 ) ( 216 1112 456 ) ( 216 1256 456 ) exx/light-panel01-surfacelight 72.0004882813 387.9998474121 -0 0.3100000024 0.2800000012 0 0 0 +( 176 1256 456 ) ( 216 1112 456 ) ( 216 1256 456 ) exx/light-panel01-surfacelight 72.0004882812 387.9998474121 -0 0.3100000024 0.2800000012 0 0 0 ( 176 1264 464 ) ( 216 1256 456 ) ( 216 1264 464 ) common/caulk 96 130 -0 0.5 -0.5 0 0 0 ( 176 1264 464 ) ( 216 1264 464 ) ( 216 1104 464 ) common/caulk 66 16 -0 0.5 -0.5 0 0 0 ( 216 1264 464 ) ( 216 1112 456 ) ( 216 1104 464 ) common/caulk 16 16 -90 0.5 -0.5 0 0 0 @@ -10352,7 +10352,7 @@ exx/trim-simple01 ( -1351 0 192 ) ( -1415 64 192 ) ( -1351 64 192 ) common/nodrawnonsolid 256 238 90 0.5 -0.5 134217728 0 0 ( -1415 0 192 ) ( -1351 0 160 ) ( -1415 0 160 ) common/nodrawnonsolid 256 238 90 0.5 -0.5 134217728 0 0 ( -1351 0 160 ) ( -1415 64 160 ) ( -1415 0 160 ) common/nodrawnonsolid 256 238 90 0.5 -0.5 134217728 0 0 -( -1352 688 171 ) ( -1352 816 173 ) ( -1352 816 171 ) effects_jumppad/jumppadfx1_c 0 0 90 0.0625 -0.03125 134217728 0 0 +( -1352 688 171 ) ( -1352 816 173 ) ( -1352 816 171 ) effects_jumppad/jumppadfx1_c 0 0 -90 0.0625 -0.03125 134217728 0 0 ( -1353 816 163 ) ( -1353 816 164 ) ( -1353 688 163 ) common/nodrawnonsolid 0 224 90 0.5 -0.5 134217728 0 0 } { @@ -11214,7 +11214,7 @@ exx/trim-simple01 ( -848 1316 580 ) ( -848 1316 576 ) ( -720 1316 580 ) exx/trim-vert01 0 475.4280395508 90 0.125 -0.1093749925 134217728 0 0 } { -( -564 1372 644 ) ( -564 1308 644 ) ( -564 1372 388 ) exx/trim-horz01 391.5297851563 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0 +( -564 1372 644 ) ( -564 1308 644 ) ( -564 1372 388 ) exx/trim-horz01 391.5297851562 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0 ( -560 1308 392 ) ( -560 1308 648 ) ( -560 1372 392 ) exx/panel-q201b 0 341.3334960938 0 0.125 0.1875 134217728 0 0 ( -556 1312 384 ) ( -620 1312 384 ) ( -556 1312 640 ) exx/trim-simple01 64 0 0 -0.25 0.25 134217728 0 0 ( -716 1292 596 ) ( -844 1324 564 ) ( -844 1292 596 ) exx/trim-horz01 0 32 90 0.0625 0.125 134217728 0 0 @@ -11276,7 +11276,7 @@ exx/trim-simple01 ( -592 1316 580 ) ( -592 1316 576 ) ( -464 1316 580 ) exx/trim-vert01 0 255.9993286133 90 0.125 -0.1093749925 134217728 0 0 } { -( -308 1372 644 ) ( -308 1308 644 ) ( -308 1372 388 ) exx/trim-horz01 391.5297851563 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0 +( -308 1372 644 ) ( -308 1308 644 ) ( -308 1372 388 ) exx/trim-horz01 391.5297851562 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0 ( -304 1308 392 ) ( -304 1308 648 ) ( -304 1372 392 ) exx/panel-q201b 0 341.3334960938 0 0.125 0.1875 134217728 0 0 ( -300 1312 384 ) ( -364 1312 384 ) ( -300 1312 640 ) exx/trim-simple01 64 0 0 -0.25 0.25 134217728 0 0 ( -460 1292 596 ) ( -588 1324 564 ) ( -588 1292 596 ) exx/trim-horz01 0 32 90 0.0625 0.125 134217728 0 0 @@ -12439,7 +12439,7 @@ exx/trim-simple01 ( -1344 1316 580 ) ( -1344 1316 576 ) ( -1216 1316 580 ) exx/trim-vert01 0 36.5709228516 90 0.125 -0.1093749925 134217728 0 0 } { -( -1060 1372 644 ) ( -1060 1308 644 ) ( -1060 1372 388 ) exx/trim-horz01 391.5297851563 31.9985961914 135 0.0939126164 0.0883883536 134217728 0 0 +( -1060 1372 644 ) ( -1060 1308 644 ) ( -1060 1372 388 ) exx/trim-horz01 391.5297851562 31.9985961914 135 0.0939126164 0.0883883536 134217728 0 0 ( -1056 1308 392 ) ( -1056 1308 648 ) ( -1056 1372 392 ) exx/panel-q201b 0 341.3334960938 0 0.125 0.1875 134217728 0 0 ( -1052 1312 384 ) ( -1116 1312 384 ) ( -1052 1312 640 ) exx/trim-simple01 128 0 0 -0.25 0.25 134217728 0 0 ( -1212 1292 596 ) ( -1340 1324 564 ) ( -1340 1292 596 ) exx/trim-horz01 0 0 90 0.0625 0.125 134217728 0 0 @@ -14104,7 +14104,7 @@ exx/trim-psimple04 ( -128 -368 640 ) ( -128 -304 384 ) ( -128 -368 384 ) exx/trim-simple01 192 0 0 0.25 0.25 134217728 0 0 ( -108 -80 596 ) ( -140 -80 564 ) ( -108 -208 596 ) exx/trim-vert01 0 256 0 -0.125 0.1093749925 134217728 0 0 ( -124 -208 584 ) ( -128 -80 580 ) ( -124 -80 584 ) common/caulk 160 192 0 -0.25 0.25 134217728 0 0 -( -132 -208 580 ) ( -132 -80 576 ) ( -132 -80 580 ) exx/trim-vert01 32 256.0004882813 90 0.125 0.1093749925 134217728 0 0 +( -132 -208 580 ) ( -132 -80 576 ) ( -132 -80 580 ) exx/trim-vert01 32 256.0004882812 90 0.125 0.1093749925 134217728 0 0 } { ( -188 -364 388 ) ( -124 -364 644 ) ( -188 -364 644 ) exx/trim-horz01 180.7058105469 31.9987792969 45 0.0939126164 -0.0883883536 134217728 0 0 @@ -14257,7 +14257,7 @@ exx/trim-psimple04 ( -128 -880 640 ) ( -128 -816 384 ) ( -128 -880 384 ) exx/trim-simple01 192 0 0 0.25 0.25 134217728 0 0 ( -108 -592 596 ) ( -140 -592 564 ) ( -108 -720 596 ) exx/trim-vert01 0 182.857421875 0 -0.125 0.1093749925 134217728 0 0 ( -124 -720 584 ) ( -128 -592 580 ) ( -124 -592 584 ) common/caulk 160 192 0 -0.25 0.25 134217728 0 0 -( -132 -720 580 ) ( -132 -592 576 ) ( -132 -592 580 ) exx/trim-vert01 32 329.1430664063 90 0.125 0.1093749925 134217728 0 0 +( -132 -720 580 ) ( -132 -592 576 ) ( -132 -592 580 ) exx/trim-vert01 32 329.1430664062 90 0.125 0.1093749925 134217728 0 0 } { ( -188 -876 388 ) ( -124 -876 644 ) ( -188 -876 644 ) exx/trim-horz01 180.7058105469 31.9987792969 45 0.0939126164 -0.0883883536 134217728 0 0 @@ -14420,7 +14420,7 @@ exx/trim-psimple04 { "classname" "func_group" { -( -52 1372 644 ) ( -52 1308 644 ) ( -52 1372 388 ) exx/trim-horz01 391.5297851563 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0 +( -52 1372 644 ) ( -52 1308 644 ) ( -52 1372 388 ) exx/trim-horz01 391.5297851562 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0 ( -48 1308 392 ) ( -48 1308 648 ) ( -48 1372 392 ) exx/panel-q201b 0 341.3334960938 0 0.125 0.1875 134217728 0 0 ( -44 1312 384 ) ( -108 1312 384 ) ( -44 1312 640 ) exx/trim-simple01 64 0 0 -0.25 0.25 134217728 0 0 ( -204 1292 596 ) ( -332 1324 564 ) ( -332 1292 596 ) exx/trim-horz01 0 32 90 0.0625 0.125 134217728 0 0 @@ -15317,7 +15317,7 @@ exx/panel-q201 } { ( 624 -1372 644 ) ( 624 -1308 644 ) ( 624 -1372 388 ) exx/panel-q201b -0 341.3334960938 0 -0.125 0.1875 134217728 0 0 -( 620 -1308 392 ) ( 620 -1308 648 ) ( 620 -1372 392 ) exx/trim-horz01 120.470703125 31.9985351563 -135 0.0939126164 -0.0883883536 134217728 0 0 +( 620 -1308 392 ) ( 620 -1308 648 ) ( 620 -1372 392 ) exx/trim-horz01 120.470703125 31.9985351562 -135 0.0939126164 -0.0883883536 134217728 0 0 ( 616 -1312 384 ) ( 680 -1312 384 ) ( 616 -1312 640 ) exx/trim-simple01 64 0 0 0.25 0.25 134217728 0 0 ( 776 -1292 596 ) ( 904 -1324 564 ) ( 904 -1292 596 ) exx/trim-horz01 -0 32 -90 0.0625 0.125 134217728 0 0 ( 904 -1332 560 ) ( 904 -1336 556 ) ( 776 -1332 560 ) common/caulk 192 32 -90 0.25 0.25 134217728 0 0 @@ -15379,7 +15379,7 @@ exx/panel-q201 } { ( 368 -1372 644 ) ( 368 -1308 644 ) ( 368 -1372 388 ) exx/panel-q201b 0 341.3334960938 0 -0.125 0.1875 134217728 0 0 -( 364 -1308 392 ) ( 364 -1308 648 ) ( 364 -1372 392 ) exx/trim-horz01 120.470703125 31.9985351563 -135 0.0939126164 -0.0883883536 134217728 0 0 +( 364 -1308 392 ) ( 364 -1308 648 ) ( 364 -1372 392 ) exx/trim-horz01 120.470703125 31.9985351562 -135 0.0939126164 -0.0883883536 134217728 0 0 ( 360 -1312 384 ) ( 424 -1312 384 ) ( 360 -1312 640 ) exx/trim-simple01 64 0 0 0.25 0.25 134217728 0 0 ( 520 -1292 596 ) ( 648 -1324 564 ) ( 648 -1292 596 ) exx/trim-horz01 0 -0 -90 0.0625 0.125 134217728 0 0 ( 648 -1332 560 ) ( 648 -1336 556 ) ( 520 -1332 560 ) common/caulk 192 32 -90 0.25 0.25 134217728 0 0 @@ -15601,14 +15601,14 @@ exx/panel-q201 ( 1376 -1076 640 ) ( 1312 -1076 640 ) ( 1376 -1076 384 ) common/caulk 0 85.3334960938 0 0.125 0.1875 134217728 0 0 ( 1312 -1132 388 ) ( 1312 -1132 644 ) ( 1376 -1132 388 ) common/caulk 0 106.6668395996 0 0.125 0.1875 134217728 0 0 ( 1344 -848 640 ) ( 1344 -848 608 ) ( 1344 -976 640 ) common/caulk 64 0 0 0.25 0.25 134217728 0 0 -( 1316 -976 572 ) ( 1348 -848 540 ) ( 1316 -848 572 ) exx/trim-vert01 0 402.2856445313 0 0.125 0.1093749925 134217728 0 0 -( 1340 -848 548 ) ( 1344 -848 548 ) ( 1340 -976 548 ) exx/trim-vert01 0 402.2856445313 0 0.125 0.1093749925 134217728 0 0 +( 1316 -976 572 ) ( 1348 -848 540 ) ( 1316 -848 572 ) exx/trim-vert01 0 402.2856445312 0 0.125 0.1093749925 134217728 0 0 +( 1340 -848 548 ) ( 1344 -848 548 ) ( 1340 -976 548 ) exx/trim-vert01 0 402.2856445312 0 0.125 0.1093749925 134217728 0 0 } { ( 1376 -1076 640 ) ( 1312 -1076 640 ) ( 1376 -1076 384 ) common/nodraw 0 85.3334960938 0 0.125 0.1875 134217728 0 0 ( 1312 -1132 388 ) ( 1312 -1132 644 ) ( 1376 -1132 388 ) common/nodraw 0 106.6668395996 0 0.125 0.1875 134217728 0 0 ( 1316 -1136 380 ) ( 1316 -1072 380 ) ( 1316 -1136 636 ) common/nodraw 192 112 0 0.25 0.25 134217728 0 0 -( 1316 -976 572 ) ( 1348 -848 540 ) ( 1316 -848 572 ) exx/floor-grate01 85.33203125 402.2856445313 0 0.046875 0.1093749925 134217728 0 0 +( 1316 -976 572 ) ( 1348 -848 540 ) ( 1316 -848 572 ) exx/floor-grate01 85.33203125 402.2856445312 0 0.046875 0.1093749925 134217728 0 0 ( 1312 -848 580 ) ( 1316 -848 576 ) ( 1312 -976 580 ) common/nodraw 16 192 0 0.25 0.25 134217728 0 0 ( 1340 -976 548 ) ( 1344 -848 548 ) ( 1340 -848 548 ) common/nodraw 0 192 0 0.25 0.25 134217728 0 0 } @@ -15624,7 +15624,7 @@ exx/panel-q201 ( 1372 -1076 644 ) ( 1308 -1076 644 ) ( 1372 -1076 388 ) common/caulk 32 106.6668395996 0 0.125 0.1875 134217728 0 0 ( 1308 -1132 392 ) ( 1308 -1132 648 ) ( 1372 -1132 392 ) common/caulk 32 128.0001831055 0 0.125 0.1875 134217728 0 0 ( 1312 -1136 384 ) ( 1312 -1072 384 ) ( 1312 -1136 640 ) exx/trim-simple01 192 0 0 0.25 0.25 134217728 0 0 -( 1292 -976 596 ) ( 1324 -848 564 ) ( 1292 -848 596 ) exx/trim-vert01 0 402.2856445313 0 0.125 0.1093749925 134217728 0 0 +( 1292 -976 596 ) ( 1324 -848 564 ) ( 1292 -848 596 ) exx/trim-vert01 0 402.2856445312 0 0.125 0.1093749925 134217728 0 0 ( 1308 -848 584 ) ( 1312 -848 580 ) ( 1308 -976 584 ) common/caulk 32 192 0 0.25 0.25 134217728 0 0 ( 1316 -848 580 ) ( 1316 -848 576 ) ( 1316 -976 580 ) exx/trim-vert01 0 109.71484375 90 0.125 0.1093749925 134217728 0 0 } @@ -15805,11 +15805,11 @@ exx/panel-q201 ( 48 -1312 384 ) ( 112 -1312 384 ) ( 48 -1312 640 ) exx/trim-simple01 64 0 0 0.25 0.25 134217728 0 0 ( 208 -1292 596 ) ( 336 -1324 564 ) ( 336 -1292 596 ) exx/trim-vert01 0 475.4291992188 -90 0.125 0.1093749925 134217728 0 0 ( 336 -1308 584 ) ( 336 -1312 580 ) ( 208 -1308 584 ) common/caulk 32 64 -90 0.25 0.25 134217728 0 0 -( 336 -1316 580 ) ( 336 -1316 576 ) ( 208 -1316 580 ) exx/trim-vert01 0 36.5708007813 90 0.125 0.1093749925 134217728 0 0 +( 336 -1316 580 ) ( 336 -1316 576 ) ( 208 -1316 580 ) exx/trim-vert01 0 36.5708007812 90 0.125 0.1093749925 134217728 0 0 } { ( 112 -1372 644 ) ( 112 -1308 644 ) ( 112 -1372 388 ) exx/panel-q201b 0 341.3334960938 0 -0.125 0.1875 134217728 0 0 -( 108 -1308 392 ) ( 108 -1308 648 ) ( 108 -1372 392 ) exx/trim-horz01 120.470703125 31.9985351563 -135 0.0939126164 -0.0883883536 134217728 0 0 +( 108 -1308 392 ) ( 108 -1308 648 ) ( 108 -1372 392 ) exx/trim-horz01 120.470703125 31.9985351562 -135 0.0939126164 -0.0883883536 134217728 0 0 ( 104 -1312 384 ) ( 168 -1312 384 ) ( 104 -1312 640 ) exx/trim-simple01 64 0 0 0.25 0.25 134217728 0 0 ( 264 -1292 596 ) ( 392 -1324 564 ) ( 392 -1292 596 ) exx/trim-horz01 0 -0 -90 0.0625 0.125 134217728 0 0 ( 392 -1332 560 ) ( 392 -1336 556 ) ( 264 -1332 560 ) common/caulk 192 32 -90 0.25 0.25 134217728 0 0 @@ -16130,7 +16130,7 @@ exx/panel-q201 ( -1104 1316 580 ) ( -1104 1316 576 ) ( -976 1316 580 ) exx/trim-vert01 0 182.8567504883 90 0.125 -0.1093749925 134217728 0 0 } { -( -820 1372 644 ) ( -820 1308 644 ) ( -820 1372 388 ) exx/trim-horz01 391.5297851563 31.9985961914 135 0.0939126164 0.0883883536 134217728 0 0 +( -820 1372 644 ) ( -820 1308 644 ) ( -820 1372 388 ) exx/trim-horz01 391.5297851562 31.9985961914 135 0.0939126164 0.0883883536 134217728 0 0 ( -816 1308 392 ) ( -816 1308 648 ) ( -816 1372 392 ) exx/panel-q201b 0 341.3334960938 0 0.125 0.1875 134217728 0 0 ( -812 1312 384 ) ( -876 1312 384 ) ( -812 1312 640 ) exx/trim-simple01 64 0 0 -0.25 0.25 134217728 0 0 ( -972 1292 596 ) ( -1100 1324 564 ) ( -1100 1292 596 ) exx/trim-horz01 0 32 90 0.0625 0.125 134217728 0 0 diff --git a/scripts/common.shader b/scripts/common.shader index fbcd776b..466e522c 100644 --- a/scripts/common.shader +++ b/scripts/common.shader @@ -9,6 +9,18 @@ textures/common/antiportal surfaceparm antiportal } +textures/common/botclip +{ + qer_trans 0.40 + surfaceparm nodraw + surfaceparm nolightmap + surfaceparm nonsolid + surfaceparm trans + surfaceparm nomarks + surfaceparm noimpact + surfaceparm botclip +} + textures/common/caulk { surfaceparm nodraw diff --git a/scripts/facility114invx.shader b/scripts/facility114invx.shader index aa0218ee..092aa6a3 100644 --- a/scripts/facility114invx.shader +++ b/scripts/facility114invx.shader @@ -288,6 +288,26 @@ textures/facility114invx/trim-trim02inv map textures/facility114invx/trim/trim02inv.tga + } + { + map $lightmap + rgbGen identity + tcGen lightmap + blendfunc filter + } +} +textures/facility114invx/trim-trim01invg +{ + qer_editorimage textures/facility114invx/trim/trim01invg.tga + dpoffsetmapping - 1 match8 69 + + q3map_bounceScale 1.25 + + + { + map textures/facility114invx/trim/trim01invg.tga + + } { map $lightmap diff --git a/scripts/map_leave_em_behind.shader b/scripts/map_leave_em_behind.shader index 5e24f756..6f8d0641 100644 --- a/scripts/map_leave_em_behind.shader +++ b/scripts/map_leave_em_behind.shader @@ -1,4 +1,4 @@ -textures/map_leave_em_behind/biolumi2_yellow +textures/map_leave_em_behind/biolumi2_yellow_wave { q3map_lightimage textures/map_leave_em_behind/biolumi2_yellow.tga qer_editorimage textures/map_leave_em_behind/biolumi2_yellow.tga @@ -6,6 +6,7 @@ textures/map_leave_em_behind/biolumi2_yellow surfaceparm nolightmap surfaceparm trans surfaceparm nomarks + deformVertexes wave 10 sin 1 2 0.25 0.1 cull disable qer_trans 0.5 q3map_lightsubdivide 16 @@ -15,7 +16,7 @@ textures/map_leave_em_behind/biolumi2_yellow map textures/map_leave_em_behind/biolumi2_yellow.tga } } -textures/map_leave_em_behind/biolumi2_green +textures/map_leave_em_behind/biolumi2_green_wave { q3map_lightimage textures/map_leave_em_behind/biolumi2_green.tga qer_editorimage textures/map_leave_em_behind/biolumi2_green.tga @@ -23,6 +24,7 @@ textures/map_leave_em_behind/biolumi2_green surfaceparm nolightmap surfaceparm trans surfaceparm nomarks + deformVertexes wave 10 sin 1 2 0.25 0.1 cull disable qer_trans 0.5 q3map_lightsubdivide 16 @@ -34,3 +36,22 @@ textures/map_leave_em_behind/biolumi2_green } +textures/map_leave_em_behind/biolumi2_green +{ + q3map_lightimage textures/map_leave_em_behind/biolumi2_green.tga + qer_editorimage textures/map_leave_em_behind/biolumi2_green.tga + q3map_lightmapFilterRadius 0 4 + surfaceparm nolightmap + surfaceparm trans + surfaceparm nomarks +// deformVertexes wave 50 sin 2 5 0.25 0.1 + cull disable + qer_trans 0.5 + q3map_lightsubdivide 16 + q3map_surfacelight 2500 + { + tcMod scroll 0 0.05 + map textures/map_leave_em_behind/biolumi2_green.tga + } + +} diff --git a/textures/facility114invx/trim/trim01invg.tga b/textures/facility114invx/trim/trim01invg.tga new file mode 100644 index 00000000..0635352a Binary files /dev/null and b/textures/facility114invx/trim/trim01invg.tga differ diff --git a/textures/facility114invx/trim/trim01invg_gloss.tga b/textures/facility114invx/trim/trim01invg_gloss.tga new file mode 100644 index 00000000..95b28869 Binary files /dev/null and b/textures/facility114invx/trim/trim01invg_gloss.tga differ diff --git a/textures/facility114invx/trim/trim01invg_norm.tga b/textures/facility114invx/trim/trim01invg_norm.tga new file mode 100644 index 00000000..7806481e Binary files /dev/null and b/textures/facility114invx/trim/trim01invg_norm.tga differ