From: kuniuthefrogg Date: Tue, 7 May 2013 22:14:17 +0000 (+0200) Subject: More bugs reported. And fixed. X-Git-Tag: xonotic-v0.7.0~33^2~2 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=d8a4ef1b109c1a7cdc714e3b419729e40fa25290 More bugs reported. And fixed. --- diff --git a/maps/fuse.map b/maps/fuse.map index 35bd48e4..628db4bc 100644 --- a/maps/fuse.map +++ b/maps/fuse.map @@ -4275,7 +4275,7 @@ brushDef { patchDef2 { -ct_fuse/floor-simplines +exx/floor-clang01 ( 9 3 0 0 0 ) ( ( ( -266 -310 300 0 0 ) ( -183 -220 301 0.956512928 0 ) ( -145 -180 354 1.554207325 0 ) ) @@ -4293,7 +4293,7 @@ ct_fuse/floor-simplines { patchDef2 { -ct_fuse/floor-simplines +exx/floor-clang01 ( 9 3 0 0 0 ) ( ( ( -310 -266 300 0 0 ) ( -227 -176 301 0.956512928 0 ) ( -189 -136 354 1.554207325 0 ) ) @@ -5421,7 +5421,7 @@ brushDef { patchDef2 { -ct_fuse/floor-simplines +exx/floor-clang01 ( 9 3 0 0 0 ) ( ( ( -37.4903259277 -573.8233642578 324 0 0 ) ( -184.4852752686 -482.8284301758 244 1.4723938704 0 ) ( -315.4802246094 -399.8334655762 324 2.7774302959 0 ) ) @@ -5439,7 +5439,7 @@ ct_fuse/floor-simplines { patchDef2 { -ct_fuse/floor-simplines +exx/floor-clang01 ( 9 3 0 0 0 ) ( ( ( -5.4903259277 -541.8233642578 324 0 0 ) ( -152.4852752686 -450.8284301758 244 1.4723938704 0 ) ( -283.4802246094 -367.8334655762 324 2.7774302959 0 ) ) @@ -6280,7 +6280,7 @@ exx/panel-rs01 { patchDef2 { -ct_fuse/lava0_blue_flow_pipe_100 +liquids_lava/lava0_blue_flow_pipe ( 9 3 0 0 0 ) ( ( ( -1556 30.0000019073 156 0 0 ) ( -1530 30.0000019073 156 0 -0.203125 ) ( -1504 30.0000019073 156 0 -0.40625 ) ) @@ -8525,7 +8525,7 @@ brushDef brushDef { ( 656 -192 -56 ) ( 640 -192 -56 ) ( 640 -176 -56 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.25 ) ) common/caulk 134217728 0 0 -( 656 -176 -56 ) ( 640 -176 -56 ) ( 672 -176 -448 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0 +( 656 -176 -56 ) ( 640 -176 -56 ) ( 672 -176 -448 ) ( ( 0.03125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-metalsupp01 134217728 0 0 ( 656 -192 -56 ) ( 656 -176 -56 ) ( 672 -192 -448 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0 ( 656 -192 -448 ) ( 672 -192 -448 ) ( 656 -184 -448 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0 ( 640 -192 -56 ) ( 656 -192 -56 ) ( 672 -192 -448 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0 @@ -9028,7 +9028,7 @@ brushDef { patchDef2 { -ct_fuse/lava0_blue_flow_pipe_100 +liquids_lava/lava0_blue_flow_pipe ( 9 3 0 0 0 ) ( ( ( 520 374 68 0 0 ) ( 542 374 68 0 -0.171875 ) ( 564 374 68 0 -0.34375 ) ) @@ -10749,7 +10749,7 @@ exx/panel-q201 { patchDef2 { -ct_fuse/lava0_flow_pipe_100 +liquids_lava/lava0_blue_flow_pipe ( 9 3 0 0 0 ) ( ( ( -226 -868 -264 0 0 ) ( -226 -868 -244 0 -0.15625 ) ( -226 -868 -224 0 -0.3125 ) ) @@ -11714,7 +11714,7 @@ exx/panel-rs01 { patchDef2 { -ct_fuse/lava0_blue_flow_pipe_100 +liquids_lava/lava0_blue_flow_pipe ( 9 3 0 0 0 ) ( ( ( -470 -1440 128 0 0 ) ( -470 -1440 160 0 -0.25 ) ( -470 -1440 192 0 -0.5 ) ) @@ -22965,7 +22965,7 @@ brushDef { patchDef2 { -ct_fuse/lava0_blue_flow_pipe +liquids_lava/lava0_blue_flow_pipe ( 9 3 0 0 0 ) ( ( ( -842 -260 72 0 0 ) ( -842 -260 50 0 -0.171875 ) ( -842 -260 28 0 -0.34375 ) ) @@ -23025,7 +23025,7 @@ exx/base-metal01 { patchDef2 { -ct_fuse/lava0_blue_flow_pipe_100 +liquids_lava/lava0_blue_flow_pipe ( 9 3 0 0 0 ) ( ( ( 264 -266 140 0 0 ) ( 286.5 -266 140 0 -0.17578125 ) ( 309 -266 140 0 -0.3515625 ) ) @@ -23401,7 +23401,7 @@ exx/panel-rs01 { patchDef2 { -ct_fuse/lava0_blue_flow_pipe_100 +liquids_lava/lava0_blue_flow_pipe ( 9 3 0 0 0 ) ( ( ( -485 302 272 0 0 ) ( -462.5 302 272 0 -0.17578125 ) ( -440 302 272 0 -0.3515625 ) ) @@ -25281,89 +25281,89 @@ brushDef { brushDef { -( -1712 832 1280 ) ( -1712 584 1280 ) ( -2200 832 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -1728 832 960 ) ( -2216 832 960 ) ( -1728 832 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -1728 832 960 ) ( -1728 832 384 ) ( -1728 584 960 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2216 584 384 ) ( -1728 584 384 ) ( -2216 832 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2216 576 384 ) ( -2216 576 960 ) ( -1728 576 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2368 592 384 ) ( -2368 840 384 ) ( -2368 592 960 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 +( -1712 832 1280 ) ( -1712 584 1280 ) ( -2200 832 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -1728 832 960 ) ( -2216 832 960 ) ( -1728 832 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -1728 832 960 ) ( -1728 832 384 ) ( -1728 584 960 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2216 584 384 ) ( -1728 584 384 ) ( -2216 832 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2216 576 384 ) ( -2216 576 960 ) ( -1728 576 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2368 592 384 ) ( -2368 840 384 ) ( -2368 592 960 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 } } { brushDef { -( -2368 584 1280 ) ( -2368 528 1280 ) ( -2432 584 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2368 576 1280 ) ( -2432 576 1280 ) ( -2368 576 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2368 584 1280 ) ( -2368 584 384 ) ( -2368 528 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2432 528 384 ) ( -2368 528 384 ) ( -2432 584 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2464 -1472 384 ) ( -2464 -1472 1280 ) ( -2400 -1472 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2432 528 384 ) ( -2432 584 384 ) ( -2432 528 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 +( -2368 584 1280 ) ( -2368 528 1280 ) ( -2432 584 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2368 576 1280 ) ( -2432 576 1280 ) ( -2368 576 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2368 584 1280 ) ( -2368 584 384 ) ( -2368 528 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2432 528 384 ) ( -2368 528 384 ) ( -2432 584 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2464 -1472 384 ) ( -2464 -1472 1280 ) ( -2400 -1472 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2432 528 384 ) ( -2432 584 384 ) ( -2432 528 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 } } { brushDef { -( -640 -1472 1280 ) ( -640 -1536 1280 ) ( -2368 -1472 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -640 -1472 1280 ) ( -2368 -1472 1280 ) ( -640 -1472 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -640 -1472 1280 ) ( -640 -1472 384 ) ( -640 -1536 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2368 -1536 384 ) ( -640 -1536 384 ) ( -2368 -1472 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2368 -1536 384 ) ( -2368 -1536 1280 ) ( -640 -1536 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2368 -1536 384 ) ( -2368 -1472 384 ) ( -2368 -1536 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 +( -640 -1472 1280 ) ( -640 -1536 1280 ) ( -2368 -1472 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -640 -1472 1280 ) ( -2368 -1472 1280 ) ( -640 -1472 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -640 -1472 1280 ) ( -640 -1472 384 ) ( -640 -1536 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2368 -1536 384 ) ( -640 -1536 384 ) ( -2368 -1472 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2368 -1536 384 ) ( -2368 -1536 1280 ) ( -640 -1536 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2368 -1536 384 ) ( -2368 -1472 384 ) ( -2368 -1536 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 } } { brushDef { -( -640 -1536 1280 ) ( -640 -1776 1280 ) ( -712 -1536 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) ct_fuse/heaven 0 0 0 -( -640 -1536 1280 ) ( -712 -1536 1280 ) ( -640 -1536 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) ct_fuse/heaven 0 0 0 -( -640 -1536 1280 ) ( -640 -1536 384 ) ( -640 -1776 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) ct_fuse/heaven 0 0 0 -( -712 -1776 384 ) ( -640 -1776 384 ) ( -712 -1536 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) ct_fuse/heaven 0 0 0 -( -728 -1920 384 ) ( -728 -1920 1280 ) ( -656 -1920 384 ) ( ( 0.0004340278 0 0.0069444445 ) ( 0 0.00390625 0 ) ) ct_fuse/heaven 0 0 0 -( -704 -1776 384 ) ( -704 -1536 384 ) ( -704 -1776 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) ct_fuse/heaven 0 0 0 +( -640 -1536 1280 ) ( -640 -1776 1280 ) ( -712 -1536 1280 ) ( ( 0.000036169 0 0 ) ( 0 0.0009765625 0 ) ) skies/heaven 0 0 0 +( -640 -1536 1280 ) ( -712 -1536 1280 ) ( -640 -1536 384 ) ( ( 0.000036169 0 0 ) ( 0 0.0009765625 0 ) ) skies/heaven 0 0 0 +( -640 -1536 1280 ) ( -640 -1536 384 ) ( -640 -1776 1280 ) ( ( 0.000036169 0 0 ) ( 0 0.0009765625 0 ) ) skies/heaven 0 0 0 +( -712 -1776 384 ) ( -640 -1776 384 ) ( -712 -1536 384 ) ( ( 0.000036169 0 0 ) ( 0 0.0009765625 0 ) ) skies/heaven 0 0 0 +( -728 -1920 384 ) ( -728 -1920 1280 ) ( -656 -1920 384 ) ( ( 0.000036169 0 0.0005787037 ) ( 0 0.0009765625 0 ) ) skies/heaven 0 0 0 +( -704 -1776 384 ) ( -704 -1536 384 ) ( -704 -1776 1280 ) ( ( 0.000036169 0 0 ) ( 0 0.0009765625 0 ) ) skies/heaven 0 0 0 } } { brushDef { -( -368 -1920 1280 ) ( -368 -1992 1280 ) ( -632 -1920 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -368 -1920 1280 ) ( -632 -1920 1280 ) ( -368 -1920 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( 864 -1896 1280 ) ( 864 -1896 384 ) ( 864 -1968 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -632 -1992 384 ) ( -368 -1992 384 ) ( -632 -1920 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -632 -1984 384 ) ( -632 -1984 1280 ) ( -368 -1984 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -640 -1992 384 ) ( -640 -1920 384 ) ( -640 -1992 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 +( -368 -1920 1280 ) ( -368 -1992 1280 ) ( -632 -1920 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -368 -1920 1280 ) ( -632 -1920 1280 ) ( -368 -1920 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( 864 -1896 1280 ) ( 864 -1896 384 ) ( 864 -1968 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -632 -1992 384 ) ( -368 -1992 384 ) ( -632 -1920 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -632 -1984 384 ) ( -632 -1984 1280 ) ( -368 -1984 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -640 -1992 384 ) ( -640 -1920 384 ) ( -640 -1992 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 } } { brushDef { -( 928 -1864 1280 ) ( 928 -1920 1280 ) ( 864 -1864 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( 856 832 1280 ) ( 792 832 1280 ) ( 856 832 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( 928 -1864 1280 ) ( 928 -1864 384 ) ( 928 -1920 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( 864 -1920 384 ) ( 928 -1920 384 ) ( 864 -1864 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( 864 -1920 384 ) ( 864 -1920 1280 ) ( 928 -1920 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( 864 -1920 384 ) ( 864 -1864 384 ) ( 864 -1920 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 +( 928 -1864 1280 ) ( 928 -1920 1280 ) ( 864 -1864 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( 856 832 1280 ) ( 792 832 1280 ) ( 856 832 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( 928 -1864 1280 ) ( 928 -1864 384 ) ( 928 -1920 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( 864 -1920 384 ) ( 928 -1920 384 ) ( 864 -1864 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( 864 -1920 384 ) ( 864 -1920 1280 ) ( 928 -1920 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( 864 -1920 384 ) ( 864 -1864 384 ) ( 864 -1920 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 } } { brushDef { -( 864 896 1280 ) ( 864 832 1280 ) ( 720 896 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( 864 896 1280 ) ( 720 896 1280 ) ( 864 896 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( 864 896 1280 ) ( 864 896 384 ) ( 864 832 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( 720 832 384 ) ( 864 832 384 ) ( 720 896 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( 720 832 384 ) ( 720 832 1280 ) ( 864 832 384 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -1728 808 384 ) ( -1728 872 384 ) ( -1728 808 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 +( 864 896 1280 ) ( 864 832 1280 ) ( 720 896 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( 864 896 1280 ) ( 720 896 1280 ) ( 864 896 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( 864 896 1280 ) ( 864 896 384 ) ( 864 832 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( 720 832 384 ) ( 864 832 384 ) ( 720 896 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( 720 832 384 ) ( 720 832 1280 ) ( 864 832 384 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -1728 808 384 ) ( -1728 872 384 ) ( -1728 808 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 } } { brushDef { -( -2376 896 1344 ) ( -2376 -1984 1344 ) ( -2432 896 1344 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2376 896 1344 ) ( -2432 896 1344 ) ( -2376 896 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( 928 904 1336 ) ( 928 904 1272 ) ( 928 -1976 1336 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2432 -1984 1280 ) ( -2376 -1984 1280 ) ( -2432 896 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2432 -1984 1280 ) ( -2432 -1984 1344 ) ( -2376 -1984 1280 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 -( -2432 -1984 1280 ) ( -2432 896 1280 ) ( -2432 -1984 1344 ) ( ( 0.0052083335 0 0 ) ( 0 0.015625 0 ) ) ct_fuse/heaven 0 0 0 +( -2376 896 1344 ) ( -2376 -1984 1344 ) ( -2432 896 1344 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2376 896 1344 ) ( -2432 896 1344 ) ( -2376 896 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( 928 904 1336 ) ( 928 904 1272 ) ( 928 -1976 1336 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2432 -1984 1280 ) ( -2376 -1984 1280 ) ( -2432 896 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2432 -1984 1280 ) ( -2432 -1984 1344 ) ( -2376 -1984 1280 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 +( -2432 -1984 1280 ) ( -2432 896 1280 ) ( -2432 -1984 1344 ) ( ( 0.0004340278 0 0 ) ( 0 0.00390625 0 ) ) skies/heaven 0 0 0 } } { @@ -28284,6 +28284,61 @@ brushDef ( -1216 -840 -64 ) ( -1218 -832 -64 ) ( -1216 -840 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 } } +{ +brushDef +{ +( 176 136 -192 ) ( 176 128 -192 ) ( 152 136 -192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 176 136 -192 ) ( 176 136 -440 ) ( 176 128 -192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 152 128 -440 ) ( 176 128 -440 ) ( 152 136 -440 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 152 128 -440 ) ( 152 128 -192 ) ( 176 128 -440 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 152 128 -64 ) ( 176 136 -64 ) ( 152 128 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +} +} +{ +brushDef +{ +( 192 128 -448 ) ( 200 128 -448 ) ( 192 136 -448 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 192 128 -448 ) ( 192 128 -320 ) ( 200 128 -448 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 192 128 -448 ) ( 192 136 -448 ) ( 192 128 -320 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 192 136 -64 ) ( 200 128 -64 ) ( 192 136 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 192 64 -320 ) ( 200 64 -448 ) ( 192 -64 -320 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +} +} +{ +brushDef +{ +( 176 320 -344 ) ( 176 304 -344 ) ( 160 320 -344 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 176 320 -344 ) ( 160 320 -344 ) ( 176 320 -384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 176 320 -344 ) ( 176 320 -384 ) ( 176 304 -344 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 160 304 -384 ) ( 176 304 -384 ) ( 160 320 -384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 176 304 -64 ) ( 160 320 -64 ) ( 176 304 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( -64 304 -352 ) ( -64 312 -344 ) ( 64 304 -352 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +} +} +{ +brushDef +{ +( 176 320 -160 ) ( 176 312 -160 ) ( 160 320 -160 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 176 320 -160 ) ( 160 320 -160 ) ( 176 320 -384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 176 320 -160 ) ( 176 320 -384 ) ( 176 312 -160 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 160 312 -384 ) ( 176 312 -384 ) ( 160 320 -384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 160 312 -384 ) ( 160 312 -160 ) ( 176 312 -384 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 168 312 -64 ) ( 160 320 -64 ) ( 168 312 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +} +} +{ +brushDef +{ +( 216 -256 -152 ) ( 216 -368 -152 ) ( 192 -256 -152 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 216 -240 -152 ) ( 192 -240 -152 ) ( 216 -240 -448 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 0 0 0 +( 216 -256 -152 ) ( 216 -256 -448 ) ( 216 -368 -152 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 192 -368 -448 ) ( 216 -368 -448 ) ( 192 -256 -448 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 184 -432 -448 ) ( 184 -432 -152 ) ( 208 -432 -448 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/clip 0 0 0 +( 192 -368 -448 ) ( 192 -256 -448 ) ( 192 -368 -152 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 208 -240 -64 ) ( 216 -280 -64 ) ( 208 -240 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +( 216 -408 -64 ) ( 208 -432 -64 ) ( 216 -408 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0 +} +} } { "classname" "func_group" @@ -35685,7 +35740,7 @@ brushDef ( -1308.7106781006 -1071.661895752 -184 ) ( -1300.2253875732 -1080.1471710205 -184 ) ( -1308.7106781006 -1071.661895752 -280 ) ( ( 0.0156249935 0 248.8065643311 ) ( 0 0.015625 1.25 ) ) common/nodrawnonsolid 134217728 0 0 ( -1314.5390930176 -1071.8334655762 -184 ) ( -1314.5390930176 -1071.8334655762 -280 ) ( -1311.7106781006 -1069.0050354004 -184 ) ( ( 0.0156250019 0 235.1340484619 ) ( 0 0.015625 1.25 ) ) common/nodrawnonsolid 134217728 0 0 ( -1300.3969573975 -1080.3187561035 -288 ) ( -1308.8822479248 -1071.8334655762 -288 ) ( -1303.2253875732 -1083.1471710205 -288 ) ( ( -0.0110485433 0.0110485433 235.1340637207 ) ( -0.0110485433 -0.0110485433 248.8065490723 ) ) common/nodrawnonsolid 134217728 0 0 -( -1296.5685424805 -1083.1471710205 -280 ) ( -1296.5685424805 -1083.1471710205 -184 ) ( -1305.053817749 -1074.661895752 -280 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) ct_fuse/fuse_scanlines 134217728 0 0 +( -1296.5685424805 -1083.1471710205 -280 ) ( -1296.5685424805 -1083.1471710205 -184 ) ( -1305.053817749 -1074.661895752 -280 ) ( ( 0.0041666655 0 0.2849217653 ) ( 0 0.0089285718 510.4285583496 ) ) logos/logo02_yellow_glowy 134217728 0 0 ( -1142.0050506592 -1238.7106628418 -272 ) ( -1144.833480835 -1241.5390930176 -272 ) ( -1142.0050506592 -1238.7106628418 -176 ) ( ( 0.0156250019 0 20.8659648895 ) ( 0 0.015625 1.25 ) ) common/nodrawnonsolid 134217728 0 0 } } @@ -36346,7 +36401,7 @@ brushDef ( 628 348 -264 ) ( 616 348 -264 ) ( 628 348 -360 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 ( 632 352 -264 ) ( 632 352 -360 ) ( 632 348 -264 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 ( 616 348 -368 ) ( 628 348 -368 ) ( 616 352 -368 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( 612 347 -360 ) ( 612 347 -264 ) ( 624 347 -360 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) ct_fuse/fuse_scanlines 134217728 0 0 +( 612 347 -360 ) ( 612 347 -264 ) ( 624 347 -360 ) ( ( 0.0041666669 0 1022.3666381836 ) ( 0 0.0089285718 509.7142944336 ) ) logos/logo02_blue_glowy 134217728 0 0 ( 392 348 -352 ) ( 392 352 -352 ) ( 392 348 -256 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 } } @@ -36942,7 +36997,7 @@ brushDef ( -371 -644 -216 ) ( -359 -644 -216 ) ( -371 -644 -312 ) ( ( 0.015625 0 251.984375 ) ( 0 0.015625 0.75 ) ) common/nodrawnonsolid 134217728 0 0 ( -376 -648 -216 ) ( -376 -648 -312 ) ( -376 -644 -216 ) ( ( 0.015625 0 251.375 ) ( 0 0.015625 0.75 ) ) common/nodrawnonsolid 134217728 0 0 ( -360 -644 -320 ) ( -372 -644 -320 ) ( -360 -648 -320 ) ( ( -0.015625 0 251.375 ) ( 0 -0.015625 252 ) ) common/nodrawnonsolid 134217728 0 0 -( -356 -643 -312 ) ( -356 -643 -216 ) ( -368 -643 -312 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) ct_fuse/fuse_scanlines 134217728 0 0 +( -356 -643 -312 ) ( -356 -643 -216 ) ( -368 -643 -312 ) ( ( 0.0041666669 0 1023.4333496094 ) ( 0 0.0089285718 510.1428527832 ) ) logos/logo02_red_glowy 134217728 0 0 ( -136 -644 -304 ) ( -136 -648 -304 ) ( -136 -644 -208 ) ( ( 0.015625 0 4.625 ) ( 0 0.015625 0.75 ) ) common/nodrawnonsolid 134217728 0 0 } } @@ -37534,164 +37589,6 @@ brushDef "origin" "-1760.000000 -736.000000 160.000000" } { -"classname" "func_rotating" -"speed" "5" -{ -brushDef -{ -( -816 -456 1280 ) ( -856 -488 1280 ) ( -856 -456 1280 ) ( ( 0.015625 0 0 ) ( 0 -0.015625 233.5 ) ) common/origin 134217728 0 0 -( -856 -464 1152 ) ( -816 -464 1312 ) ( -856 -464 1312 ) ( ( -0.015625 0 22.5 ) ( 0 0.015625 1.125 ) ) common/origin 134217728 0 0 -( -848 -488 1312 ) ( -848 -456 1152 ) ( -848 -456 1312 ) ( ( -0.015625 0 0 ) ( 0 0.015625 1.125 ) ) common/origin 134217728 0 0 -( -816 -456 1160 ) ( -856 -488 1160 ) ( -816 -488 1160 ) ( ( 0.015625 0 0 ) ( 0 -0.015625 22.5 ) ) common/origin 134217728 0 0 -( -856 -496 1152 ) ( -816 -496 1312 ) ( -816 -496 1152 ) ( ( -0.015625 0 233.5 ) ( 0 0.015625 1.125 ) ) common/origin 134217728 0 0 -( -816 -488 1312 ) ( -816 -456 1152 ) ( -816 -488 1152 ) ( ( -0.015625 0 0 ) ( 0 0.015625 1.125 ) ) common/origin 134217728 0 0 -} -} -{ -brushDef -{ -( -605.3845977783 110.3983764648 1272 ) ( -660.8780822754 71.3026885986 1272 ) ( -652.67918396 118.5972747803 1272 ) ( ( 0.0153953731 0.0026689123 254.9160919189 ) ( 0.0026689123 -0.0153953731 233.2602233887 ) ) common/nodrawnonsolid 134217728 0 0 -( -635.5478515625 123.7467346191 1200 ) ( -588.2532501221 115.5478363037 1360 ) ( -635.5478515625 123.7467346191 1360 ) ( ( -0.0156249991 0 22.7397708893 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -652.9956512451 69.9362030029 1360 ) ( -644.7967529297 117.2307891846 1200 ) ( -644.7967529297 117.2307891846 1360 ) ( ( -0.015625 0 254.9160919189 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -589.6197357178 107.6654052734 1264 ) ( -645.1132202148 68.5697174072 1264 ) ( -597.8186340332 60.3708190918 1264 ) ( ( 0.0175947137 -0.0030501855 0.7612609863 ) ( -0.0030501287 -0.017594384 11.7023620605 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -645.1132202148 68.5697174072 1200 ) ( -597.8186340332 60.3708190918 1360 ) ( -597.8186340332 60.3708190918 1200 ) ( ( -0.0156249991 0 233.2602233887 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -597.8186340332 60.3708190918 1360 ) ( -589.6197357178 107.6654052734 1200 ) ( -597.8186340332 60.3708190918 1200 ) ( ( -0.015625 0 1.0839064121 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -840 112 1208 ) ( -888 64 1208 ) ( -888 112 1208 ) ( ( 0.015625 0 253.25 ) ( 0 -0.015625 233.375 ) ) common/nodrawnonsolid 134217728 0 0 -( -872 112 1136 ) ( -824 112 1296 ) ( -872 112 1296 ) ( ( -0.015625 0 22.625 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -872 64 1296 ) ( -872 112 1136 ) ( -872 112 1296 ) ( ( -0.015625 0 253.25 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -816 112 1200 ) ( -864 64 1200 ) ( -816 64 1200 ) ( ( 0.0250000004 0 254.1999969482 ) ( 0 -0.0249993764 21.7994384766 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -880 72 1136 ) ( -832 72 1296 ) ( -832 72 1136 ) ( ( -0.015625 0 233.375 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -832 48 1296 ) ( -832 96 1136 ) ( -832 48 1136 ) ( ( -0.015625 0 2.75 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -588.6733093262 309.4121246338 1232 ) ( -643.1558837891 268.9195404053 1232 ) ( -636.1608886719 316.407119751 1232 ) ( ( 0.0154581955 0.002277018 253.0574493408 ) ( 0.002277018 -0.0154581955 235.9456329346 ) ) common/nodrawnonsolid 134217728 0 0 -( -619.1658630371 321.9900512695 1160 ) ( -571.6782836914 314.9950561523 1320 ) ( -619.1658630371 321.9900512695 1320 ) ( ( -0.015625 0 20.0543518066 ) ( 0 0.015625 1.625 ) ) common/nodrawnonsolid 134217728 0 0 -( -635.2412872314 267.7537078857 1320 ) ( -628.2462921143 315.2412872314 1160 ) ( -628.2462921143 315.2412872314 1320 ) ( ( -0.015625 0 253.0574493408 ) ( 0 0.015625 1.625 ) ) common/nodrawnonsolid 134217728 0 0 -( -572.8441162109 307.0804595947 1224 ) ( -627.3266906738 266.5878753662 1224 ) ( -579.8391113281 259.592880249 1224 ) ( ( 0.0176665094 -0.0026023064 252.9228210449 ) ( -0.0026022487 -0.0176661182 11.9190063477 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -627.3266906738 266.5878753662 1160 ) ( -579.8391113281 259.592880249 1320 ) ( -579.8391113281 259.592880249 1160 ) ( ( -0.015625 0 235.9456329346 ) ( 0 0.015625 1.625 ) ) common/nodrawnonsolid 134217728 0 0 -( -579.8391113281 259.592880249 1320 ) ( -572.8441162109 307.0804595947 1160 ) ( -579.8391113281 259.592880249 1160 ) ( ( -0.015625 0 2.942533493 ) ( 0 0.015625 1.625 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -832 160 1224 ) ( -880 112 1224 ) ( -880 160 1224 ) ( ( 0.015625 0 253.25 ) ( 0 -0.015625 233.375 ) ) common/nodrawnonsolid 134217728 0 0 -( -864 168 1152 ) ( -816 168 1312 ) ( -864 168 1312 ) ( ( -0.015625 0 22.625 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -872 112 1312 ) ( -872 160 1152 ) ( -872 160 1312 ) ( ( -0.015625 0 253.25 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -816 160 1216 ) ( -864 112 1216 ) ( -816 112 1216 ) ( ( 0.0178571437 0 255 ) ( 0 -0.0178571437 15.5714111328 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -864 112 1152 ) ( -816 112 1312 ) ( -816 112 1152 ) ( ( -0.015625 0 233.375 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -816 112 1312 ) ( -816 160 1152 ) ( -816 112 1152 ) ( ( -0.015625 0 2.75 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -568 40 1200 ) ( -616 -8 1200 ) ( -616 40 1200 ) ( ( 0.015625 0 254.5 ) ( 0 -0.015625 236.375 ) ) common/nodrawnonsolid 134217728 0 0 -( -600 48 1128 ) ( -552 48 1288 ) ( -600 48 1288 ) ( ( -0.015625 0 19.625 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( -608 -8 1288 ) ( -608 40 1128 ) ( -608 40 1288 ) ( ( -0.015625 0 254.5 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( -552 40 1192 ) ( -600 -8 1192 ) ( -552 -8 1192 ) ( ( 0.020833334 0 0 ) ( 0 -0.020833334 12.6666669846 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -600 0 1128 ) ( -552 0 1288 ) ( -552 0 1128 ) ( ( -0.015625 0 236.375 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( -560 -8 1288 ) ( -560 40 1128 ) ( -560 -8 1128 ) ( ( -0.015625 0 1.5 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -760 120 1272 ) ( -808 72 1272 ) ( -808 120 1272 ) ( ( 0.015625 0 253.25 ) ( 0 -0.015625 233.375 ) ) common/nodrawnonsolid 134217728 0 0 -( -792 128 1200 ) ( -744 128 1360 ) ( -792 128 1360 ) ( ( -0.015625 0 22.625 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -800 72 1360 ) ( -800 120 1200 ) ( -800 120 1360 ) ( ( -0.015625 0 253.25 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -744 120 1264 ) ( -792 72 1264 ) ( -744 72 1264 ) ( ( 0.0178571437 0 254.7142791748 ) ( 0 -0.0178571176 14.2857055664 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -792 72 1200 ) ( -744 72 1360 ) ( -744 72 1200 ) ( ( -0.015625 0 233.375 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -744 72 1360 ) ( -744 120 1200 ) ( -744 72 1200 ) ( ( -0.015625 0 2.75 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -688 56 1200 ) ( -736 8 1200 ) ( -736 56 1200 ) ( ( 0.015625 0 254.25 ) ( 0 -0.015625 234.5 ) ) common/nodrawnonsolid 134217728 0 0 -( -720 64 1128 ) ( -672 64 1288 ) ( -720 64 1288 ) ( ( -0.015625 0 21.5 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( -728 8 1288 ) ( -728 56 1128 ) ( -728 56 1288 ) ( ( -0.015625 0 254.25 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( -672 56 1192 ) ( -720 8 1192 ) ( -672 8 1192 ) ( ( 0.0178571437 0 255.8571472168 ) ( 0 -0.0178571176 13 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -720 8 1128 ) ( -672 8 1288 ) ( -672 8 1128 ) ( ( -0.015625 0 234.5 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( -672 8 1288 ) ( -672 56 1128 ) ( -672 8 1128 ) ( ( -0.015625 0 1.75 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -792 208 1200 ) ( -840 160 1200 ) ( -840 208 1200 ) ( ( 0.015625 0 253.25 ) ( 0 -0.015625 233.375 ) ) common/nodrawnonsolid 134217728 0 0 -( -824 216 1128 ) ( -776 216 1288 ) ( -824 216 1288 ) ( ( -0.015625 0 22.625 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -832 160 1288 ) ( -832 208 1128 ) ( -832 208 1288 ) ( ( -0.015625 0 253.25 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -776 208 1192 ) ( -824 160 1192 ) ( -776 160 1192 ) ( ( 0.0178571437 0 253.1428527832 ) ( 0 -0.0178567469 14.8568115234 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -824 160 1128 ) ( -776 160 1288 ) ( -776 160 1128 ) ( ( -0.015625 0 233.375 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -776 160 1288 ) ( -776 208 1128 ) ( -776 160 1128 ) ( ( -0.015625 0 2.75 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -680 320 1200 ) ( -728 272 1200 ) ( -728 320 1200 ) ( ( 0.015625 0 251.5 ) ( 0 -0.015625 235.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -712 328 1128 ) ( -664 328 1288 ) ( -712 328 1288 ) ( ( -0.015625 0 20.875 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -720 272 1288 ) ( -720 320 1128 ) ( -720 320 1288 ) ( ( -0.015625 0 251.5 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -664 320 1192 ) ( -712 272 1192 ) ( -664 272 1192 ) ( ( 0.0178571437 0 251.142868042 ) ( 0 -0.0178567469 12.856842041 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -712 272 1128 ) ( -664 272 1288 ) ( -664 272 1128 ) ( ( -0.015625 0 235.125 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -664 272 1288 ) ( -664 320 1128 ) ( -664 272 1128 ) ( ( -0.015625 0 4.5 ) ( 0 0.015625 1.125 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -736 256 1240 ) ( -784 208 1240 ) ( -784 256 1240 ) ( ( 0.015625 0 252.5 ) ( 0 -0.015625 234.25 ) ) common/nodrawnonsolid 134217728 0 0 -( -768 264 1168 ) ( -720 264 1328 ) ( -768 264 1328 ) ( ( -0.015625 0 21.75 ) ( 0 0.015625 1.75 ) ) common/nodrawnonsolid 134217728 0 0 -( -760 208 1328 ) ( -760 256 1168 ) ( -760 256 1328 ) ( ( -0.015625 0 252.5 ) ( 0 0.015625 1.75 ) ) common/nodrawnonsolid 134217728 0 0 -( -720 256 1232 ) ( -768 208 1232 ) ( -720 208 1232 ) ( ( 0.0250000004 0 250.3999938965 ) ( 0 -0.0250000022 19.0000019073 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -768 224 1168 ) ( -720 224 1328 ) ( -720 224 1168 ) ( ( -0.015625 0 234.25 ) ( 0 0.015625 1.75 ) ) common/nodrawnonsolid 134217728 0 0 -( -720 208 1328 ) ( -720 256 1168 ) ( -720 208 1168 ) ( ( -0.015625 0 3.5 ) ( 0 0.015625 1.75 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -704 176 1176 ) ( -752 128 1176 ) ( -752 176 1176 ) ( ( 0.015625 0 253.75 ) ( 0 -0.015625 234.75 ) ) common/nodrawnonsolid 134217728 0 0 -( -736 184 1104 ) ( -688 184 1264 ) ( -736 184 1264 ) ( ( -0.015625 0 21.25 ) ( 0 0.015625 0.75 ) ) common/nodrawnonsolid 134217728 0 0 -( -744 128 1264 ) ( -744 176 1104 ) ( -744 176 1264 ) ( ( -0.015625 0 253.75 ) ( 0 0.015625 0.75 ) ) common/nodrawnonsolid 134217728 0 0 -( -688 176 1168 ) ( -736 128 1168 ) ( -688 128 1168 ) ( ( 0.0178571437 0 253.7142944336 ) ( 0 -0.0178567469 13.2854003906 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -736 128 1104 ) ( -688 128 1264 ) ( -688 128 1104 ) ( ( -0.015625 0 234.75 ) ( 0 0.015625 0.75 ) ) common/nodrawnonsolid 134217728 0 0 -( -688 128 1264 ) ( -688 176 1104 ) ( -688 128 1104 ) ( ( -0.015625 0 2.25 ) ( 0 0.015625 0.75 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -516.6733093262 357.4121246338 1176 ) ( -571.1558837891 316.9195404053 1176 ) ( -564.1608886719 364.407119751 1176 ) ( ( 0.0154581955 0.002277018 252.1515197754 ) ( 0.002277018 -0.0154581955 236.9493255615 ) ) common/nodrawnonsolid 134217728 0 0 -( -547.1658630371 369.9900512695 1104 ) ( -499.6782836914 362.9950561523 1264 ) ( -547.1658630371 369.9900512695 1264 ) ( ( -0.015625 0 19.0506591797 ) ( 0 0.015625 0.75 ) ) common/nodrawnonsolid 134217728 0 0 -( -563.2412872314 315.7537078857 1264 ) ( -556.2462921143 363.2412872314 1104 ) ( -556.2462921143 363.2412872314 1264 ) ( ( -0.015625 0 252.1515197754 ) ( 0 0.015625 0.75 ) ) common/nodrawnonsolid 134217728 0 0 -( -500.8441162109 355.0804595947 1168 ) ( -555.3266906738 314.5878753662 1168 ) ( -507.8391113281 307.592880249 1168 ) ( ( 0.0176665094 -0.0026023064 251.8874511719 ) ( -0.0026022487 -0.0176661182 10.7719421387 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -555.3266906738 314.5878753662 1104 ) ( -507.8391113281 307.592880249 1264 ) ( -507.8391113281 307.592880249 1104 ) ( ( -0.015625 0 236.9493255615 ) ( 0 0.015625 0.75 ) ) common/nodrawnonsolid 134217728 0 0 -( -507.8391113281 307.592880249 1264 ) ( -500.8441162109 355.0804595947 1104 ) ( -507.8391113281 307.592880249 1104 ) ( ( -0.015625 0 3.8484716415 ) ( 0 0.015625 0.75 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -{ -brushDef -{ -( -648 88 1240 ) ( -696 40 1240 ) ( -696 88 1240 ) ( ( 0.015625 0 253.75 ) ( 0 -0.015625 235.125 ) ) common/nodrawnonsolid 134217728 0 0 -( -680 96 1168 ) ( -632 96 1328 ) ( -680 96 1328 ) ( ( -0.015625 0 20.875 ) ( 0 0.015625 0.625 ) ) common/nodrawnonsolid 134217728 0 0 -( -688 40 1328 ) ( -688 88 1168 ) ( -688 88 1328 ) ( ( -0.015625 0 253.75 ) ( 0 0.015625 0.625 ) ) common/nodrawnonsolid 134217728 0 0 -( -632 88 1232 ) ( -680 40 1232 ) ( -632 40 1232 ) ( ( 0.0178571437 0 255.2857208252 ) ( 0 -0.0178571176 12.2857055664 ) ) ct_fuse/fuse_bird 134217728 0 0 -( -680 40 1168 ) ( -632 40 1328 ) ( -632 40 1168 ) ( ( -0.015625 0 235.125 ) ( 0 0.015625 0.625 ) ) common/nodrawnonsolid 134217728 0 0 -( -632 40 1328 ) ( -632 88 1168 ) ( -632 40 1168 ) ( ( -0.015625 0 2.25 ) ( 0 0.015625 0.625 ) ) common/nodrawnonsolid 134217728 0 0 -} -} -} -{ "classname" "func_bobbing" "height" "1" "speed" "4" @@ -37714,7 +37611,7 @@ brushDef ( 744 168 -424 ) ( 744 168 -432 ) ( 744 160 -424 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 ( 728 160 -432 ) ( 744 160 -432 ) ( 728 168 -432 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 ( 728 160 -432 ) ( 728 160 -424 ) ( 744 160 -432 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( 736 160 -432 ) ( 736 168 -432 ) ( 736 160 -424 ) ( ( 0.015625 0 3.5 ) ( 0 0.0096153505 252.8461608887 ) ) ct_fuse/fuse_teleporter_beam 134217728 0 0 +( 736 160 -432 ) ( 736 168 -432 ) ( 736 160 -424 ) ( ( 0.015625 0 3.5 ) ( 0 0.0096152909 508.8461914063 ) ) effects_warpzone/blueedge 134217728 0 0 } } { @@ -37792,7 +37689,7 @@ brushDef brushDef { ( -584 -512 -216 ) ( -584 -528 -216 ) ( -592 -512 -216 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 -( -584 -528 -368 ) ( -584 -528 80 ) ( -592 -520 80 ) ( ( 0.0098209279 0 0.5 ) ( 0 0.0065789418 254.5789489746 ) ) ct_fuse/fuse_teleporter_beam 134217728 0 0 +( -584 -528 -368 ) ( -584 -528 80 ) ( -592 -520 80 ) ( ( 0.0098209279 0 0.5 ) ( 0 0.0065789451 510.5789489746 ) ) effects_warpzone/blueedge 134217728 0 0 ( -504 -576 80 ) ( -504 -576 -368 ) ( -520 -592 -368 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 ( -584 -528 -368 ) ( -576 -528 -368 ) ( -584 -512 -368 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 ( -592 -536 80 ) ( -592 -536 -368 ) ( -600 -528 80 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/nodrawnonsolid 134217728 0 0 diff --git a/maps/fuse.map.options b/maps/fuse.map.options index 714034c6..d2d67a96 100644 --- a/maps/fuse.map.options +++ b/maps/fuse.map.options @@ -3,4 +3,4 @@ -vis + -minimap + -sRGB -Version: 5 +Version: 6 diff --git a/scripts/map_fuse.shader b/scripts/map_fuse.shader deleted file mode 100644 index 4b9c308f..00000000 --- a/scripts/map_fuse.shader +++ /dev/null @@ -1,175 +0,0 @@ -textures/map_fuse/fuse_teleporter_beam -{ - surfaceparm nonsolid - surfaceparm nomarks - cull none - q3map_surfacelight 500 - { - map textures/map_fuse/fuse_teleporter_beam.tga - blendfunc GL_SRC_ALPHA GL_ONE - } - { - map textures/map_fuse/fuse_teleporter_numbers_01.tga - blendfunc GL_SRC_ALPHA GL_ONE - tcmod scroll 0 0.7 - } - { - map textures/map_fuse/fuse_teleporter_numbers_02.tga - blendfunc GL_SRC_ALPHA GL_ONE - tcmod scroll 0 0.9 - } -} - -textures/map_fuse/lava0_blue_flow_pipe -{ - qer_editorimage textures/liquids_lava/lava0_blue.tga - surfaceparm lava - surfaceparm noimpact - surfaceparm trans - cull disable - //deformVertexes wave 2 sin 1 2 0.25 0.1 - q3map_surfacelight 400 - q3map_lightSubdivide 64 - { - map textures/liquids_lava/lava0_blue.tga - blendfunc GL_SRC_ALPHA GL_ONE - tcMod scroll 0 -0.25 - } -} - -textures/map_fuse/lava0_blue_flow_pipe_100 -{ - qer_editorimage textures/liquids_lava/lava0_blue.tga - surfaceparm lava - surfaceparm noimpact - surfaceparm trans - cull disable - //deformVertexes wave 2 sin 1 2 0.25 0.1 - q3map_surfacelight 100 - q3map_lightSubdivide 64 - { - map textures/liquids_lava/lava0_blue.tga - blendfunc GL_SRC_ALPHA GL_ONE - tcMod scroll 0 -0.25 - } -} - -textures/map_fuse/lava0_flow_pipe_100 -{ - qer_editorimage textures/liquids_lava/lava0.tga - surfaceparm lava - surfaceparm noimpact - surfaceparm trans - cull disable - //deformVertexes wave 2 sin 1 2 0.25 0.1 - q3map_surfacelight 100 - q3map_lightSubdivide 64 - { - map textures/liquids_lava/lava0.tga - blendfunc GL_SRC_ALPHA GL_ONE - tcMod scroll 0 -0.25 - } -} - -textures/map_fuse/fuse_heaven -{ - qer_editorimage textures/map_fuse/fuse_heaven.tga - - surfaceparm noimpact - surfaceparm nolightmap - surfaceparm nomarks - surfaceparm sky - - //q3map_sun - q3map_sun .3803921568627451 .7176470588235294 .9607843137254902 250 270 10 - q3map_skylight 200 4 - skyparms textures/map_fuse/env/fuse_heaven - - -} - -textures/map_fuse/heaven -{ - qer_editorimage textures/skies/heaven.tga - - surfaceparm noimpact - surfaceparm nolightmap - surfaceparm nomarks - surfaceparm sky - - //q3map_sun - q3map_sun .9607843137254902 .7176470588235294 .3803921568627451 250 270 10 - q3map_skylight 200 4 - skyparms env/heaven/heaven - - -} - -textures/map_fuse/fuse_bird -{ - qer_editorimage textures/map_fuse/fuse_bird.tga - surfaceparm lava - surfaceparm noimpact - surfaceparm trans - cull disable - nopicmip - { - map textures/map_fuse/fuse_bird.tga - blendFunc filter - alphaFunc GT0 - rgbgen identity - } -} - -textures/map_fuse/floor-simplines -{ - qer_editorimage textures/exx/floor/floor_simplines.tga - q3map_bounceScale 0.75 - dpoffsetmapping - 1 match8 244 - dpglossintensitymod 3 - dpglossexponentmod 4 - surfaceparm nonsolid - { - map textures/exx/floor/floor_simplines.tga - } - { - map $lightmap - rgbGen identity - tcGen lightmap - blendfunc filter - } -} - -//AD BOARD SCANLINES - -textures/map_fuse/fuse_scanlines -{ - qer_editorimage textures/map_fuse/fuse_scanlines.tga - surfaceparm noimpact - surfaceparm trans - cull disable - surfaceparm nonsolid - qer_trans 0.25 - { - map textures/map_fuse/fuse_scanlines.tga - blendfunc GL_SRC_ALPHA GL_ONE - tcMod scroll 0 -0.75 - } -} - -textures/map_fuse/ad_msg -{ - surfaceparm nomarks - qer_editorimage textures/map_fuse/ad_msg.tga - nopicmip - { - map textures/map_fuse/ad_msg.tga - } -} - -textures/map_fuse/ad_xonotic -{ - surfaceparm nomarks - qer_editorimage textures/map_fuse/ad_xonotic.tga - nopicmip - { - map textures/map_fuse/ad_xonotic.tga - } -} - diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt index ba3b4171..57226fa3 100644 --- a/scripts/shaderlist.txt +++ b/scripts/shaderlist.txt @@ -19,7 +19,6 @@ liquids_water logos map_courtfun map_darkzone -map_fuse map_g-23 map_glowplant map_leave_em_behind diff --git a/textures/map_fuse/ad_xonotic.jpg b/textures/map_fuse/ad_xonotic.jpg deleted file mode 100644 index 3cdee345..00000000 Binary files a/textures/map_fuse/ad_xonotic.jpg and /dev/null differ diff --git a/textures/map_fuse/env/fuse_heaven_bk.jpg b/textures/map_fuse/env/fuse_heaven_bk.jpg deleted file mode 100644 index 272d5bb0..00000000 Binary files a/textures/map_fuse/env/fuse_heaven_bk.jpg and /dev/null differ diff --git a/textures/map_fuse/env/fuse_heaven_dn.jpg b/textures/map_fuse/env/fuse_heaven_dn.jpg deleted file mode 100644 index 4f1beac5..00000000 Binary files a/textures/map_fuse/env/fuse_heaven_dn.jpg and /dev/null differ diff --git a/textures/map_fuse/env/fuse_heaven_ft.jpg b/textures/map_fuse/env/fuse_heaven_ft.jpg deleted file mode 100644 index ef523df1..00000000 Binary files a/textures/map_fuse/env/fuse_heaven_ft.jpg and /dev/null differ diff --git a/textures/map_fuse/env/fuse_heaven_lf.jpg b/textures/map_fuse/env/fuse_heaven_lf.jpg deleted file mode 100644 index e08c8b5b..00000000 Binary files a/textures/map_fuse/env/fuse_heaven_lf.jpg and /dev/null differ diff --git a/textures/map_fuse/env/fuse_heaven_rt.jpg b/textures/map_fuse/env/fuse_heaven_rt.jpg deleted file mode 100644 index 7f81d7c1..00000000 Binary files a/textures/map_fuse/env/fuse_heaven_rt.jpg and /dev/null differ diff --git a/textures/map_fuse/env/fuse_heaven_up.jpg b/textures/map_fuse/env/fuse_heaven_up.jpg deleted file mode 100644 index 9b69524a..00000000 Binary files a/textures/map_fuse/env/fuse_heaven_up.jpg and /dev/null differ diff --git a/textures/map_fuse/fuse_bird.jpg b/textures/map_fuse/fuse_bird.jpg deleted file mode 100644 index df1f18a6..00000000 Binary files a/textures/map_fuse/fuse_bird.jpg and /dev/null differ diff --git a/textures/map_fuse/fuse_bird_alpha.jpg b/textures/map_fuse/fuse_bird_alpha.jpg deleted file mode 100644 index b7b85eea..00000000 Binary files a/textures/map_fuse/fuse_bird_alpha.jpg and /dev/null differ diff --git a/textures/map_fuse/fuse_heaven.jpg b/textures/map_fuse/fuse_heaven.jpg deleted file mode 100644 index a7576600..00000000 Binary files a/textures/map_fuse/fuse_heaven.jpg and /dev/null differ diff --git a/textures/map_fuse/fuse_scanlines.jpg b/textures/map_fuse/fuse_scanlines.jpg deleted file mode 100644 index 0c4d7ff3..00000000 Binary files a/textures/map_fuse/fuse_scanlines.jpg and /dev/null differ diff --git a/textures/map_fuse/fuse_scanlines_alpha.jpg b/textures/map_fuse/fuse_scanlines_alpha.jpg deleted file mode 100644 index 0c4d7ff3..00000000 Binary files a/textures/map_fuse/fuse_scanlines_alpha.jpg and /dev/null differ diff --git a/textures/map_fuse/fuse_teleporter_beam.jpg b/textures/map_fuse/fuse_teleporter_beam.jpg deleted file mode 100644 index c707cd13..00000000 Binary files a/textures/map_fuse/fuse_teleporter_beam.jpg and /dev/null differ diff --git a/textures/map_fuse/fuse_teleporter_numbers_01.jpg b/textures/map_fuse/fuse_teleporter_numbers_01.jpg deleted file mode 100644 index bcc31b73..00000000 Binary files a/textures/map_fuse/fuse_teleporter_numbers_01.jpg and /dev/null differ diff --git a/textures/map_fuse/fuse_teleporter_numbers_01_alpha.jpg b/textures/map_fuse/fuse_teleporter_numbers_01_alpha.jpg deleted file mode 100644 index bcc31b73..00000000 Binary files a/textures/map_fuse/fuse_teleporter_numbers_01_alpha.jpg and /dev/null differ diff --git a/textures/map_fuse/fuse_teleporter_numbers_02.jpg b/textures/map_fuse/fuse_teleporter_numbers_02.jpg deleted file mode 100644 index c9803f7b..00000000 Binary files a/textures/map_fuse/fuse_teleporter_numbers_02.jpg and /dev/null differ diff --git a/textures/map_fuse/fuse_teleporter_numbers_02_alpha.jpg b/textures/map_fuse/fuse_teleporter_numbers_02_alpha.jpg deleted file mode 100644 index c9803f7b..00000000 Binary files a/textures/map_fuse/fuse_teleporter_numbers_02_alpha.jpg and /dev/null differ diff --git a/textures/map_fuse/logo_2_1.png b/textures/map_fuse/logo_2_1.png deleted file mode 100644 index ce19f799..00000000 Binary files a/textures/map_fuse/logo_2_1.png and /dev/null differ diff --git a/textures/map_fuse/xonotic_board.xcf b/textures/map_fuse/xonotic_board.xcf deleted file mode 100644 index 01ae67d7..00000000 Binary files a/textures/map_fuse/xonotic_board.xcf and /dev/null differ