From: cbrutail Date: Sat, 22 Jan 2011 20:06:05 +0000 (+0100) Subject: Modified space-elevator so it uses the new effects_beam shaders instead of own ones. X-Git-Tag: xonotic-v0.5.0~107^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e05a9749dbd1be8fc69c19e1e83cd8499c2a75da;p=xonotic%2Fxonotic-maps.pk3dir.git Modified space-elevator so it uses the new effects_beam shaders instead of own ones. --- diff --git a/maps/space-elevator.map b/maps/space-elevator.map index 031fbd35..c2cc754a 100644 --- a/maps/space-elevator.map +++ b/maps/space-elevator.map @@ -1743,7 +1743,7 @@ { patchDef2 { -map_space-elevator/beam-red +effects_beam/beam-red ( 9 3 0 0 0 ) ( ( ( 408 -2304 -256 0 0.015625 ) ( 408 -1536 -256 0 0.265625 ) ( 408 -768 -256 0 0.515625 ) ) @@ -1761,7 +1761,7 @@ map_space-elevator/beam-red { patchDef2 { -map_space-elevator/beam-purple +effects_beam/beam-purple ( 9 3 0 0 0 ) ( ( ( 408 -2304 -256 0 0.515625 ) ( 408 -1536 -256 0 0.265625 ) ( 408 -768 -256 0 0.015625 ) ) @@ -1779,7 +1779,7 @@ map_space-elevator/beam-purple { patchDef2 { -map_space-elevator/beam-red +effects_beam/beam-red ( 9 3 0 0 0 ) ( ( ( -488 -2304 -256 0 0.015625 ) ( -488 -1536 -256 0 0.265625 ) ( -488 -768 -256 0 0.515625 ) ) @@ -1797,7 +1797,7 @@ map_space-elevator/beam-red { patchDef2 { -map_space-elevator/beam-purple +effects_beam/beam-purple ( 9 3 0 0 0 ) ( ( ( -488 -2304 -256 0 0.515625 ) ( -488 -1536 -256 0 0.265625 ) ( -488 -768 -256 0 0.015625 ) ) @@ -2140,7 +2140,7 @@ proceduralx/wall-fruitconcrete { patchDef2 { -map_space-elevator/beam-purple +effects_beam/beam-purple ( 9 3 0 0 0 ) ( ( ( 288 0 -928 0 1 ) ( 288 0 -928 0 0.5 ) ( 288 0 -608 0 0 ) ) @@ -5543,61 +5543,61 @@ trak5x/base-pipe1b { ( -256 -3888 -192 ) ( -512 -2544 -192 ) ( -256 -2544 -192 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -512 -3888 -512 ) ( 512 -3888 -512 ) ( -512 -2480 -512 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -256 -3904 -512 ) ( -448 -3904 -192 ) ( -256 -3904 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -576 -3824 -512 ) ( -576 -2544 -192 ) ( -576 -3824 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -480 -3952 -512 ) ( -544 -3888 -192 ) ( -480 -3952 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -256 -3904 -512 ) ( -448 -3904 -192 ) ( -256 -3904 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -576 -3824 -512 ) ( -576 -2544 -192 ) ( -576 -3824 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -480 -3952 -512 ) ( -544 -3888 -192 ) ( -480 -3952 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -256 -2576 -64 ) ( -128 -2576 -64 ) ( -256 -2576 64 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -224 -2544 -512 ) ( -160 -2608 -192 ) ( -224 -2544 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -224 -2544 -512 ) ( -160 -2608 -192 ) ( -224 -2544 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -144 -2736 -64 ) ( -144 -2800 -64 ) ( -144 -2736 64 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 } { ( 448 -3888 -192 ) ( 256 -2544 -192 ) ( 512 -2544 -192 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 576 -2544 -512 ) ( 576 -3824 -192 ) ( 576 -2544 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 576 -2544 -512 ) ( 576 -3824 -192 ) ( 576 -2544 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -512 -3888 -512 ) ( 512 -3888 -512 ) ( -512 -2480 -512 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 448 -3904 -512 ) ( 256 -3904 -192 ) ( 448 -3904 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 544 -3888 -512 ) ( 480 -3952 -192 ) ( 544 -3888 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 448 -3904 -512 ) ( 256 -3904 -192 ) ( 448 -3904 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 544 -3888 -512 ) ( 480 -3952 -192 ) ( 544 -3888 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -256 -2576 -64 ) ( -128 -2576 -64 ) ( -256 -2576 64 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 160 -2608 -512 ) ( 224 -2544 -192 ) ( 160 -2608 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 160 -2608 -512 ) ( 224 -2544 -192 ) ( 160 -2608 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( 144 -2736 64 ) ( 144 -2800 -64 ) ( 144 -2736 -64 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 } { ( 256 -3888 -192 ) ( -256 -2736 -192 ) ( 256 -2736 -192 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -512 -3888 -512 ) ( 512 -3888 -512 ) ( -512 -2480 -512 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -256 -2624 -512 ) ( 256 -2624 -192 ) ( -256 -2624 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -256 -2624 -512 ) ( 256 -2624 -192 ) ( -256 -2624 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -144 -2736 64 ) ( -144 -2800 -64 ) ( -144 -2736 -64 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( 144 -2736 -64 ) ( 144 -2800 -64 ) ( 144 -2736 64 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -176 -3872 -192 ) ( -112 -3936 -192 ) ( -176 -3872 -512 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 112 -3936 -192 ) ( 176 -3872 -192 ) ( 112 -3936 -512 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -176 -3872 -192 ) ( -112 -3936 -192 ) ( -176 -3872 -512 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 112 -3936 -192 ) ( 176 -3872 -192 ) ( 112 -3936 -512 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -128 -3920 -512 ) ( -128 -3920 -192 ) ( 128 -3920 -512 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 } { ( -320 -3792 -192 ) ( -512 -2448 -192 ) ( -256 -2448 -192 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -448 -2368 -512 ) ( -320 -2368 -192 ) ( -448 -2368 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -192 -2448 -512 ) ( -192 -3728 -192 ) ( -192 -2448 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -448 -2368 -512 ) ( -320 -2368 -192 ) ( -448 -2368 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -192 -2448 -512 ) ( -192 -3728 -192 ) ( -192 -2448 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -1280 -3792 -512 ) ( -256 -3792 -512 ) ( -1280 -2384 -512 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -576 -3792 -512 ) ( -576 -2448 -192 ) ( -576 -3792 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -576 -2416 -512 ) ( -512 -2352 -192 ) ( -576 -2416 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -288 -2320 -512 ) ( -224 -2384 -192 ) ( -288 -2320 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -576 -3792 -512 ) ( -576 -2448 -192 ) ( -576 -3792 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -576 -2416 -512 ) ( -512 -2352 -192 ) ( -576 -2416 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -288 -2320 -512 ) ( -224 -2384 -192 ) ( -288 -2320 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -1024 -2576 64 ) ( -896 -2576 -64 ) ( -1024 -2576 -64 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 } { ( 128 -4256 -192 ) ( -128 -4256 -192 ) ( 64 -2912 -192 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -64 -4352 -192 ) ( 64 -4352 -192 ) ( -64 -4352 -512 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 128 -4256 -192 ) ( 128 -2976 -192 ) ( 128 -4256 -512 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -64 -4352 -192 ) ( 64 -4352 -192 ) ( -64 -4352 -512 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 128 -4256 -192 ) ( 128 -2976 -192 ) ( 128 -4256 -512 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -896 -4320 -512 ) ( 128 -2912 -512 ) ( -896 -2912 -512 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -128 -2912 -192 ) ( -128 -4256 -192 ) ( -128 -2912 -512 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( -144 -4304 -192 ) ( -80 -4368 -192 ) ( -144 -4304 -512 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 80 -4368 -192 ) ( 144 -4304 -192 ) ( 80 -4368 -512 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -128 -2912 -192 ) ( -128 -4256 -192 ) ( -128 -2912 -512 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( -144 -4304 -192 ) ( -80 -4368 -192 ) ( -144 -4304 -512 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 80 -4368 -192 ) ( 144 -4304 -192 ) ( 80 -4368 -512 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -640 -3920 -64 ) ( -512 -3920 -64 ) ( -640 -3920 64 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 } { ( 448 -3792 -192 ) ( 256 -2448 -192 ) ( 512 -2448 -192 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 320 -2368 -512 ) ( 448 -2368 -192 ) ( 320 -2368 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 576 -2448 -512 ) ( 576 -3728 -192 ) ( 576 -2448 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 320 -2368 -512 ) ( 448 -2368 -192 ) ( 320 -2368 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 576 -2448 -512 ) ( 576 -3728 -192 ) ( 576 -2448 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -512 -3792 -512 ) ( 512 -3792 -512 ) ( -512 -2384 -512 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 192 -3792 -512 ) ( 192 -2448 -192 ) ( 192 -3792 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 192 -2416 -512 ) ( 256 -2352 -192 ) ( 192 -2416 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 -( 480 -2320 -512 ) ( 544 -2384 -192 ) ( 480 -2320 -192 ) map_space-elevator/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 192 -3792 -512 ) ( 192 -2448 -192 ) ( 192 -3792 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 192 -2416 -512 ) ( 256 -2352 -192 ) ( 192 -2416 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 +( 480 -2320 -512 ) ( 544 -2384 -192 ) ( 480 -2320 -192 ) effects_beam/beam-red 0 102.4000244141 0 1.25 1.25 134217728 0 0 ( -256 -2576 64 ) ( -128 -2576 -64 ) ( -256 -2576 -64 ) common/nodraw 0 102.4000244141 0 1.25 1.25 134217728 0 0 } { @@ -7592,15 +7592,15 @@ trak5x/base-pipe1b } { ( 64 -3456 -576 ) ( 64 -3584 -576 ) ( -64 -3456 -576 ) common/nodraw 0 184 0 1.75 1.75 134217728 0 0 -( 64 -3440 -576 ) ( -64 -3440 -576 ) ( 64 -3440 -640 ) map_space-elevator/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 -( 80 -3456 -576 ) ( 80 -3456 -640 ) ( 80 -3584 -576 ) map_space-elevator/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 +( 64 -3440 -576 ) ( -64 -3440 -576 ) ( 64 -3440 -640 ) effects_beam/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 +( 80 -3456 -576 ) ( 80 -3456 -640 ) ( 80 -3584 -576 ) effects_beam/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 ( -64 -3584 -896 ) ( 64 -3584 -896 ) ( -64 -3456 -896 ) common/nodraw 0 184 0 1.75 1.75 134217728 0 0 -( -64 -3600 -640 ) ( -64 -3600 -576 ) ( 64 -3600 -640 ) map_space-elevator/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 -( -80 -3584 -640 ) ( -80 -3456 -640 ) ( -80 -3584 -576 ) map_space-elevator/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 -( 64 -3472 -192 ) ( 80 -3488 -192 ) ( 64 -3472 -64 ) map_space-elevator/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 -( 80 -3552 -192 ) ( 64 -3568 -192 ) ( 80 -3552 -64 ) map_space-elevator/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 -( -64 -3568 -192 ) ( -80 -3552 -192 ) ( -64 -3568 -64 ) map_space-elevator/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 -( -80 -3488 -192 ) ( -64 -3472 -192 ) ( -80 -3488 -64 ) map_space-elevator/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 +( -64 -3600 -640 ) ( -64 -3600 -576 ) ( 64 -3600 -640 ) effects_beam/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 +( -80 -3584 -640 ) ( -80 -3456 -640 ) ( -80 -3584 -576 ) effects_beam/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 +( 64 -3472 -192 ) ( 80 -3488 -192 ) ( 64 -3472 -64 ) effects_beam/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 +( 80 -3552 -192 ) ( 64 -3568 -192 ) ( 80 -3552 -64 ) effects_beam/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 +( -64 -3568 -192 ) ( -80 -3552 -192 ) ( -64 -3568 -64 ) effects_beam/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 +( -80 -3488 -192 ) ( -64 -3472 -192 ) ( -80 -3488 -64 ) effects_beam/beam-red 0 46.4000015259 0 1.25 1.25 134217728 0 0 } { patchDef2 @@ -14245,7 +14245,7 @@ trak5x/base-pipe1e { patchDef2 { -map_space-elevator/beam-purple +effects_beam/beam-purple ( 9 3 0 0 0 ) ( ( ( -288 0 -608 0 0 ) ( -288 0 -928 0 0.5 ) ( -288 0 -928 0 1 ) ) @@ -16026,7 +16026,7 @@ proceduralx/wall-fruitconcrete { patchDef2 { -map_space-elevator/beam-blue +effects_beam/beam-blue ( 9 3 0 0 0 ) ( ( ( -408 2304 -256 0 0.015625 ) ( -408 1536 -256 0 0.265625 ) ( -408 768 -256 0 0.515625 ) ) @@ -16044,7 +16044,7 @@ map_space-elevator/beam-blue { patchDef2 { -map_space-elevator/beam-purple +effects_beam/beam-purple ( 9 3 0 0 0 ) ( ( ( -408 2304 -256 0 0.515625 ) ( -408 1536 -256 0 0.265625 ) ( -408 768 -256 0 0.015625 ) ) @@ -16062,7 +16062,7 @@ map_space-elevator/beam-purple { patchDef2 { -map_space-elevator/beam-blue +effects_beam/beam-blue ( 9 3 0 0 0 ) ( ( ( 488 2304 -256 0 0.015625 ) ( 488 1536 -256 0 0.265625 ) ( 488 768 -256 0 0.515625 ) ) @@ -16080,7 +16080,7 @@ map_space-elevator/beam-blue { patchDef2 { -map_space-elevator/beam-purple +effects_beam/beam-purple ( 9 3 0 0 0 ) ( ( ( 488 2304 -256 0 0.515625 ) ( 488 1536 -256 0 0.265625 ) ( 488 768 -256 0 0.015625 ) ) @@ -19808,61 +19808,61 @@ trak5x/base-pipe1c { ( 256 3888 -192 ) ( 512 2544 -192 ) ( 256 2544 -192 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 ( 512 3888 -512 ) ( -512 3888 -512 ) ( 512 2480 -512 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 -( 256 3904 -512 ) ( 448 3904 -192 ) ( 256 3904 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( 576 3824 -512 ) ( 576 2544 -192 ) ( 576 3824 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( 480 3952 -512 ) ( 544 3888 -192 ) ( 480 3952 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 256 3904 -512 ) ( 448 3904 -192 ) ( 256 3904 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 576 3824 -512 ) ( 576 2544 -192 ) ( 576 3824 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 480 3952 -512 ) ( 544 3888 -192 ) ( 480 3952 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 256 2576 -64 ) ( 128 2576 -64 ) ( 256 2576 64 ) common/nodraw 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( 224 2544 -512 ) ( 160 2608 -192 ) ( 224 2544 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 224 2544 -512 ) ( 160 2608 -192 ) ( 224 2544 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 144 2736 -64 ) ( 144 2800 -64 ) ( 144 2736 64 ) common/nodraw 0 102.4000244141 0 -1.25 1.25 134217728 0 0 } { ( -448 3888 -192 ) ( -256 2544 -192 ) ( -512 2544 -192 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 -( -576 2544 -512 ) ( -576 3824 -192 ) ( -576 2544 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -576 2544 -512 ) ( -576 3824 -192 ) ( -576 2544 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 512 3888 -512 ) ( -512 3888 -512 ) ( 512 2480 -512 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 -( -448 3904 -512 ) ( -256 3904 -192 ) ( -448 3904 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( -544 3888 -512 ) ( -480 3952 -192 ) ( -544 3888 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -448 3904 -512 ) ( -256 3904 -192 ) ( -448 3904 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -544 3888 -512 ) ( -480 3952 -192 ) ( -544 3888 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 256 2576 -64 ) ( 128 2576 -64 ) ( 256 2576 64 ) common/nodraw 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( -160 2608 -512 ) ( -224 2544 -192 ) ( -160 2608 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -160 2608 -512 ) ( -224 2544 -192 ) ( -160 2608 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( -144 2736 64 ) ( -144 2800 -64 ) ( -144 2736 -64 ) common/nodraw 0 102.4000244141 0 -1.25 1.25 134217728 0 0 } { ( -256 3888 -192 ) ( 256 2736 -192 ) ( -256 2736 -192 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 ( 512 3888 -512 ) ( -512 3888 -512 ) ( 512 2480 -512 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 -( 256 2624 -512 ) ( -256 2624 -192 ) ( 256 2624 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 256 2624 -512 ) ( -256 2624 -192 ) ( 256 2624 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 144 2736 64 ) ( 144 2800 -64 ) ( 144 2736 -64 ) common/nodraw 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( -144 2736 -64 ) ( -144 2800 -64 ) ( -144 2736 64 ) common/nodraw 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( 176 3872 -192 ) ( 112 3936 -192 ) ( 176 3872 -512 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( -112 3936 -192 ) ( -176 3872 -192 ) ( -112 3936 -512 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 176 3872 -192 ) ( 112 3936 -192 ) ( 176 3872 -512 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -112 3936 -192 ) ( -176 3872 -192 ) ( -112 3936 -512 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 128 3920 -512 ) ( 128 3920 -192 ) ( -128 3920 -512 ) common/nodraw 0 102.4000244141 0 -1.25 1.25 134217728 0 0 } { ( 320 3792 -192 ) ( 512 2448 -192 ) ( 256 2448 -192 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 -( 448 2368 -512 ) ( 320 2368 -192 ) ( 448 2368 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( 192 2448 -512 ) ( 192 3728 -192 ) ( 192 2448 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 448 2368 -512 ) ( 320 2368 -192 ) ( 448 2368 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 192 2448 -512 ) ( 192 3728 -192 ) ( 192 2448 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 1280 3792 -512 ) ( 256 3792 -512 ) ( 1280 2384 -512 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 -( 576 3792 -512 ) ( 576 2448 -192 ) ( 576 3792 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( 576 2416 -512 ) ( 512 2352 -192 ) ( 576 2416 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( 288 2320 -512 ) ( 224 2384 -192 ) ( 288 2320 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 576 3792 -512 ) ( 576 2448 -192 ) ( 576 3792 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 576 2416 -512 ) ( 512 2352 -192 ) ( 576 2416 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 288 2320 -512 ) ( 224 2384 -192 ) ( 288 2320 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 1024 2576 64 ) ( 896 2576 -64 ) ( 1024 2576 -64 ) common/nodraw 0 102.4000244141 0 -1.25 1.25 134217728 0 0 } { ( -128 4256 -192 ) ( 128 4256 -192 ) ( -64 2912 -192 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 -( 64 4352 -192 ) ( -64 4352 -192 ) ( 64 4352 -512 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( -128 4256 -192 ) ( -128 2976 -192 ) ( -128 4256 -512 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 64 4352 -192 ) ( -64 4352 -192 ) ( 64 4352 -512 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -128 4256 -192 ) ( -128 2976 -192 ) ( -128 4256 -512 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 896 4320 -512 ) ( -128 2912 -512 ) ( 896 2912 -512 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 -( 128 2912 -192 ) ( 128 4256 -192 ) ( 128 2912 -512 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( 144 4304 -192 ) ( 80 4368 -192 ) ( 144 4304 -512 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( -80 4368 -192 ) ( -144 4304 -192 ) ( -80 4368 -512 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 128 2912 -192 ) ( 128 4256 -192 ) ( 128 2912 -512 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( 144 4304 -192 ) ( 80 4368 -192 ) ( 144 4304 -512 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -80 4368 -192 ) ( -144 4304 -192 ) ( -80 4368 -512 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 640 3920 -64 ) ( 512 3920 -64 ) ( 640 3920 64 ) common/nodraw 0 102.4000244141 0 -1.25 1.25 134217728 0 0 } { ( -448 3792 -192 ) ( -256 2448 -192 ) ( -512 2448 -192 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 -( -320 2368 -512 ) ( -448 2368 -192 ) ( -320 2368 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( -576 2448 -512 ) ( -576 3728 -192 ) ( -576 2448 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -320 2368 -512 ) ( -448 2368 -192 ) ( -320 2368 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -576 2448 -512 ) ( -576 3728 -192 ) ( -576 2448 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 512 3792 -512 ) ( -512 3792 -512 ) ( 512 2384 -512 ) common/nodraw 256 102.400390625 180 1.25 1.25 134217728 0 0 -( -192 3792 -512 ) ( -192 2448 -192 ) ( -192 3792 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( -192 2416 -512 ) ( -256 2352 -192 ) ( -192 2416 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 -( -480 2320 -512 ) ( -544 2384 -192 ) ( -480 2320 -192 ) map_space-elevator/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -192 3792 -512 ) ( -192 2448 -192 ) ( -192 3792 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -192 2416 -512 ) ( -256 2352 -192 ) ( -192 2416 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 +( -480 2320 -512 ) ( -544 2384 -192 ) ( -480 2320 -192 ) effects_beam/beam-blue 0 102.4000244141 0 -1.25 1.25 134217728 0 0 ( 256 2576 64 ) ( 128 2576 -64 ) ( 256 2576 -64 ) common/nodraw 0 102.4000244141 0 -1.25 1.25 134217728 0 0 } { @@ -21856,15 +21856,15 @@ trak5x/base-pipe1c } { ( -64 3456 -576 ) ( -64 3584 -576 ) ( 64 3456 -576 ) common/nodraw 256 184 180 1.7499998808 1.7499998808 134217728 0 0 -( -64 3440 -576 ) ( 64 3440 -576 ) ( -64 3440 -640 ) map_space-elevator/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 -( -80 3456 -576 ) ( -80 3456 -640 ) ( -80 3584 -576 ) map_space-elevator/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 +( -64 3440 -576 ) ( 64 3440 -576 ) ( -64 3440 -640 ) effects_beam/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 +( -80 3456 -576 ) ( -80 3456 -640 ) ( -80 3584 -576 ) effects_beam/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 ( 64 3584 -896 ) ( -64 3584 -896 ) ( 64 3456 -896 ) common/nodraw 256 184 180 1.7499998808 1.7499998808 134217728 0 0 -( 64 3600 -640 ) ( 64 3600 -576 ) ( -64 3600 -640 ) map_space-elevator/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 -( 80 3584 -640 ) ( 80 3456 -640 ) ( 80 3584 -576 ) map_space-elevator/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 -( -64 3472 -192 ) ( -80 3488 -192 ) ( -64 3472 -64 ) map_space-elevator/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 -( -80 3552 -192 ) ( -64 3568 -192 ) ( -80 3552 -64 ) map_space-elevator/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 -( 64 3568 -192 ) ( 80 3552 -192 ) ( 64 3568 -64 ) map_space-elevator/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 -( 80 3488 -192 ) ( 64 3472 -192 ) ( 80 3488 -64 ) map_space-elevator/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 +( 64 3600 -640 ) ( 64 3600 -576 ) ( -64 3600 -640 ) effects_beam/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 +( 80 3584 -640 ) ( 80 3456 -640 ) ( 80 3584 -576 ) effects_beam/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 +( -64 3472 -192 ) ( -80 3488 -192 ) ( -64 3472 -64 ) effects_beam/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 +( -80 3552 -192 ) ( -64 3568 -192 ) ( -80 3552 -64 ) effects_beam/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 +( 64 3568 -192 ) ( 80 3552 -192 ) ( 64 3568 -64 ) effects_beam/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 +( 80 3488 -192 ) ( 64 3472 -192 ) ( 80 3488 -64 ) effects_beam/beam-blue 0 46.4000015259 0 -1.25 1.25 134217728 0 0 } { patchDef2 diff --git a/scripts/map_space-elevator.shader b/scripts/map_space-elevator.shader index 6f33d320..19353c96 100644 --- a/scripts/map_space-elevator.shader +++ b/scripts/map_space-elevator.shader @@ -58,42 +58,6 @@ textures/map_space-elevator/sign-train-blue } } -textures/map_space-elevator/beam-blue -{ - surfaceparm nonsolid - surfaceparm nomarks - cull none - q3map_surfacelight 3000 - { - map textures/map_space-elevator/beam-blue.tga - blendfunc add - } -} - -textures/map_space-elevator/beam-purple -{ - surfaceparm nonsolid - surfaceparm nomarks - cull none - q3map_surfacelight 3000 - { - map textures/map_space-elevator/beam-purple.tga - blendfunc add - } -} - -textures/map_space-elevator/beam-red -{ - surfaceparm nonsolid - surfaceparm nomarks - cull none - q3map_surfacelight 3000 - { - map textures/map_space-elevator/beam-red.tga - blendfunc add - } -} - textures/map_space-elevator/panels { qer_editorimage textures/map_space-elevator/panels.tga diff --git a/textures/map_space-elevator/beam-blue.tga b/textures/map_space-elevator/beam-blue.tga deleted file mode 100644 index 01ba42be..00000000 Binary files a/textures/map_space-elevator/beam-blue.tga and /dev/null differ diff --git a/textures/map_space-elevator/beam-purple.tga b/textures/map_space-elevator/beam-purple.tga deleted file mode 100644 index 1fd48cef..00000000 Binary files a/textures/map_space-elevator/beam-purple.tga and /dev/null differ diff --git a/textures/map_space-elevator/beam-red.tga b/textures/map_space-elevator/beam-red.tga deleted file mode 100644 index 02f1e140..00000000 Binary files a/textures/map_space-elevator/beam-red.tga and /dev/null differ