From d53d03b4cd4d8892e1e965429a1038102faa1cf4 Mon Sep 17 00:00:00 2001 From: Debugger Date: Mon, 1 Jul 2013 17:02:33 +0200 Subject: [PATCH] new version of aurora ctf, using northern lights again plus some more fixes --- maps/aurora.map | 44 ++++++++++++++++++++++++++++++--------- maps/aurora.map.options | 2 +- scripts/map_aurora.shader | 24 ++++++++++----------- scripts/shaderlist.txt | 1 + 4 files changed, 48 insertions(+), 23 deletions(-) diff --git a/maps/aurora.map b/maps/aurora.map index dab5ce87..1f5888a5 100644 --- a/maps/aurora.map +++ b/maps/aurora.map @@ -4231,23 +4231,23 @@ exx/floor-wrn01 ( 3359.0581054688 -3113.7153930664 -2048 ) ( 9513.715423584 3040.9419250488 -2048 ) ( -3157.637878418 3402.9805908203 -2048 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 ( 1823.0581054688 -4393.7153930664 -1280 ) ( -4693.637878418 2122.9805908203 -1280 ) ( 1823.0581054688 -4393.7153930664 -1024 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 ( 5435.4517822266 8249.2442321777 2560 ) ( -719.2055358887 2094.5869140625 2816 ) ( 5435.4517822266 8249.2442321777 2816 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 -( 280 64 2560 ) ( 544 64 2560 ) ( 280 -64 2560 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0 +( 280 64 4672 ) ( 544 64 4672 ) ( 280 -64 4672 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0 } { -( 5344.9421081543 8339.75390625 -512 ) ( -809.7152099609 2185.0965881348 -512 ) ( 5344.9421081543 8339.75390625 -768 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 +( 5344.9421081543 8339.75390625 1600 ) ( -809.7152099609 2185.0965881348 1600 ) ( 5344.9421081543 8339.75390625 1344 ) skies/extragalactic_planets_intensity_256 0 256 0 0.25 0.25 0 0 0 ( 4021.0194396973 11093.6379089355 -1024 ) ( 4021.0194396973 11093.6379089355 -1280 ) ( 10537.715423584 4576.9419250488 -1024 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 ( 3359.0581054688 -3113.7153930664 -2048 ) ( 9513.715423584 3040.9419250488 -2048 ) ( -3157.637878418 3402.9805908203 -2048 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 ( 1161.0967712402 -1683.7540588379 -1280 ) ( 1161.0967712402 -1683.7540588379 -1024 ) ( 7315.7540893555 4470.9032592773 -1280 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 -( 10447.2057495117 4486.4322509766 -512 ) ( 3930.509765625 11003.1282348633 -768 ) ( 3930.509765625 11003.1282348633 -512 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 -( 280 64 2560 ) ( 544 64 2560 ) ( 280 -64 2560 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0 +( 10447.2057495117 4486.4322509766 1600 ) ( 3930.509765625 11003.1282348633 1344 ) ( 3930.509765625 11003.1282348633 1600 ) skies/extragalactic_planets_intensity_256 0 256 0 0.25 0.25 0 0 0 +( 280 64 4672 ) ( 544 64 4672 ) ( 280 -64 4672 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0 } { ( 4021.0194396973 11093.6379089355 -1024 ) ( 4021.0194396973 11093.6379089355 -1280 ) ( 10537.715423584 4576.9419250488 -1024 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 ( 3359.0581054688 -3113.7153930664 -2048 ) ( 9513.715423584 3040.9419250488 -2048 ) ( -3157.637878418 3402.9805908203 -2048 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 ( 1161.0967712402 -1683.7540588379 -1280 ) ( 1161.0967712402 -1683.7540588379 -1024 ) ( 7315.7540893555 4470.9032592773 -1280 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 -( 1823.0581054688 -4393.7153930664 -1024 ) ( -4693.637878418 2122.9805908203 -1024 ) ( 1823.0581054688 -4393.7153930664 -768 ) skies/extragalactic_planets_intensity_256 0 -0 0 0.25 0.25 0 0 0 -( 7225.2444152832 4561.4129333496 -1024 ) ( 1070.587097168 -1593.2443847656 -768 ) ( 1070.587097168 -1593.2443847656 -1024 ) skies/extragalactic_planets_intensity_256 0 -0 0 0.25 0.25 0 0 0 -( 280 64 2560 ) ( 544 64 2560 ) ( 280 -64 2560 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0 +( 1823.0581054688 -4393.7153930664 1088 ) ( -4693.637878418 2122.9805908203 1088 ) ( 1823.0581054688 -4393.7153930664 1344 ) skies/extragalactic_planets_intensity_256 0 256 0 0.25 0.25 0 0 0 +( 7225.2444152832 4561.4129333496 1088 ) ( 1070.587097168 -1593.2443847656 1344 ) ( 1070.587097168 -1593.2443847656 1088 ) skies/extragalactic_planets_intensity_256 0 256 0 0.25 0.25 0 0 0 +( 280 64 4672 ) ( 544 64 4672 ) ( 280 -64 4672 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0 } { ( 5344.9421081543 8339.75390625 -1024 ) ( -809.7152099609 2185.0965881348 -1024 ) ( 5344.9421081543 8339.75390625 -1280 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 @@ -4255,7 +4255,7 @@ exx/floor-wrn01 ( 1161.0967712402 -1683.7540588379 2560 ) ( 1161.0967712402 -1683.7540588379 2816 ) ( 7315.7540893555 4470.9032592773 2560 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 ( 1823.0581054688 -4393.7153930664 -1280 ) ( -4693.637878418 2122.9805908203 -1280 ) ( 1823.0581054688 -4393.7153930664 -1024 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 ( 1913.567779541 -4303.2057189941 2816 ) ( -4603.1282043457 2213.4902648926 2560 ) ( 1913.567779541 -4303.2057189941 2560 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 -( 280 64 2560 ) ( 544 64 2560 ) ( 280 -64 2560 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0 +( 280 64 4672 ) ( 544 64 4672 ) ( 280 -64 4672 ) trak5x/base-pipe1c 0 0 0 0.25 0.25 0 0 0 } { ( 3184 3104 -928 ) ( 3204 3124 -928 ) ( 3456 2832 -928 ) narmorx/base-wood02 0 0 0 0.25 0.25 0 0 0 @@ -4284,8 +4284,8 @@ exx/floor-wrn01 ( 2912 64 -1608 ) ( 2904 64 -1608 ) ( 2912 -64 -1608 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { -( 2741.0194396973 9557.6379089355 2560 ) ( 9257.715423584 3040.9419250488 2560 ) ( -3413.637878418 3402.9805908203 2560 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 -( -3413.637878418 3402.9805908203 2432 ) ( 9257.715423584 3040.9419250488 2432 ) ( 2741.0194396973 9557.6379089355 2432 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 +( 2845.0194396973 9557.6379089355 4672 ) ( 9361.715423584 3040.9419250488 4672 ) ( -3309.637878418 3402.9805908203 4672 ) skies/extragalactic_planets_intensity_256 96 0 0 0.25 0.25 0 0 0 +( -3349.637878418 3402.9805908203 4608 ) ( 9321.715423584 3040.9419250488 4608 ) ( 2805.0194396973 9557.6379089355 4608 ) skies/extragalactic_planets_intensity_256 256 0 0 0.25 0.25 0 0 0 ( 5435.4517822266 8249.2442321777 128 ) ( -719.2055358887 2094.5869140625 128 ) ( 5435.4517822266 8249.2442321777 -128 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 ( 3930.509765625 11003.1282348633 -3712 ) ( 3930.509765625 11003.1282348633 -3968 ) ( 10447.2057495117 4486.4322509766 -3712 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 ( 1070.587097168 -1593.2443847656 -3968 ) ( 1070.587097168 -1593.2443847656 -3712 ) ( 7225.2444152832 4561.4129333496 -3968 ) skies/extragalactic_planets_intensity_256 0 0 0 0.25 0.25 0 0 0 @@ -17860,6 +17860,20 @@ trak5x/floor-floor2c ( -860 -496 -348 ) ( -684 -496 -348 ) ( -684 -496 -356 ) common/weapclip 0 64 0 -0.25 0.25 134217728 5 0 ( -688 -480 -348 ) ( -688 -304 -348 ) ( -688 -304 -356 ) common/weapclip 96 64 0 -0.25 0.25 134217728 5 0 } +{ +patchDef2 +{ +map_aurora/northern_lights +( 5 5 0 0 0 ) +( +( ( -2479.7470703125 248 160 0 0 ) ( -2242.9233398438 91.17578125 120 0 0.25 ) ( -1174.0991210938 -1017.6481933594 120 0 0.5 ) ( -105.2750244141 -2046.4721679688 120 0 0.75 ) ( 203.5490722656 -2355.2963867188 280 0 1 ) ) +( ( -2354.9233398438 372.82421875 160 0.25 0 ) ( -1966.0991210938 328 4544 0.25 0.25 ) ( -897.2749023438 -780.8239746094 4544 0.25 0.5 ) ( 171.5490722656 -1809.6481933594 4544 0.25 0.75 ) ( 528.373046875 -2030.4721679688 280 0.25 1 ) ) +( ( 1641.9011230469 4329.6484375 160 0.5 0 ) ( 2030.7250976563 4284.82421875 4544 0.5 0.25 ) ( 3099.5493164063 3176 4544 0.5 0.5 ) ( 4168.373046875 2147.1760253906 4544 0.5 0.75 ) ( 4525.197265625 1926.3518066406 280 0.5 1 ) ) +( ( 5486.7250976563 8166.47265625 160 0.75 0 ) ( 5875.548828125 8121.6484375 4544 0.75 0.25 ) ( 6944.373046875 7012.82421875 4544 0.75 0.5 ) ( 8013.197265625 5984 4544 0.75 0.75 ) ( 8370.021484375 5763.17578125 280 0.75 1 ) ) +( ( 6107.5493164063 8779.296875 408 1 0 ) ( 6320.373046875 8558.47265625 408 1 0.25 ) ( 7389.197265625 7449.6484375 408 1 0.5 ) ( 8458.021484375 6420.82421875 408 1 0.75 ) ( 8622.845703125 6144 408 1 1 ) ) +) +} +} } { "classname" "light" @@ -18105,6 +18119,7 @@ trak5x/floor-floor2c "origin" "5856.000000 4256.000000 -1264.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "modelscale" "1.250000" +"skin" "0" } { "classname" "light" @@ -18196,6 +18211,7 @@ trak5x/floor-floor2c "origin" "6192.000000 5968.000000 -1264.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "modelscale" "1.250000" +"skin" "0" } { "classname" "light" @@ -18236,12 +18252,14 @@ trak5x/floor-floor2c "origin" "5952.000000 5696.000000 -784.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "modelscale" "1.250000" +"skin" "0" } { "classname" "misc_gamemodel" "origin" "6336.000000 6736.000000 -336.000000" "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "modelscale" "1.250000" +"skin" "0" } { "classname" "misc_gamemodel" @@ -18249,6 +18267,7 @@ trak5x/floor-floor2c "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "modelscale" "1.250000" "angle" "90.000000" +"skin" "0" } { "classname" "trigger_hurt" @@ -18604,6 +18623,7 @@ trak5x/floor-floor2c "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "modelscale" "1.250000" "angle" "-179.999985" +"skin" "1" } { "classname" "light" @@ -18691,6 +18711,7 @@ trak5x/floor-floor2c "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "modelscale" "1.250000" "angle" "-179.999985" +"skin" "1" } { "classname" "light" @@ -18728,6 +18749,7 @@ trak5x/floor-floor2c "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "modelscale" "1.250000" "angle" "-179.999985" +"skin" "1" } { "classname" "misc_gamemodel" @@ -18735,6 +18757,7 @@ trak5x/floor-floor2c "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "modelscale" "1.250000" "angle" "-179.999985" +"skin" "1" } { "classname" "misc_gamemodel" @@ -18742,6 +18765,7 @@ trak5x/floor-floor2c "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3" "modelscale" "1.250000" "angle" "-90.000000" +"skin" "1" } { "classname" "trigger_hurt" diff --git a/maps/aurora.map.options b/maps/aurora.map.options index 4636a632..0bbfeed5 100644 --- a/maps/aurora.map.options +++ b/maps/aurora.map.options @@ -2,5 +2,5 @@ -light + -bounce 8 -dirtscale 2 -vis + -minimap + -Version: 3 +Version: 4 diff --git a/scripts/map_aurora.shader b/scripts/map_aurora.shader index b49b1073..b32b5fbc 100644 --- a/scripts/map_aurora.shader +++ b/scripts/map_aurora.shader @@ -1,6 +1,6 @@ textures/map_aurora/northern-lights { - qer_editorimage textures/map_aurora/northern_lights.tga + qer_editorimage textures/map_aurora/northern_lights.tga surfaceparm trans qer_trans .01 surfaceparm nonsolid @@ -8,20 +8,20 @@ textures/map_aurora/northern-lights surfaceparm nomarks // deformVertexes wave div func base amplitude phase freq deformVertexes wave 750.0 sin 7 150 0.25 .2 - Q3map_TessSize 128 - q3map_surfacelight1000 - cull none + // Q3map_TessSize 128 WHY? + q3map_surfacelight 2500 + cull none { - map textures/map_aurora/northern_lights.tga - rgbGen identity - depthWrite - alphaFunc GE128 + map textures/map_aurora/northern_lights.tga + rgbGen identity + depthWrite + alphaFunc GE128 } { - blendfunc filter - map $lightmap - blendfunc filter - tcGen lightmap + blendfunc filter + map $lightmap + blendfunc filter + tcGen lightmap } } diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt index 41176210..3d8b1373 100644 --- a/scripts/shaderlist.txt +++ b/scripts/shaderlist.txt @@ -18,6 +18,7 @@ liquids_lava liquids_slime liquids_water logos +map_aurora map_courtfun map_darkzone map_g-23 -- 2.39.2