From 49245f9df621ea076aedbcef7c066b06e563cd4b Mon Sep 17 00:00:00 2001 From: Mirio Date: Tue, 25 Aug 2015 16:43:35 +0200 Subject: [PATCH] Improve triggers, fix zfights --- maps/implosion.map | 102 +++++++------------------------------ maps/implosion.map.options | 2 +- 2 files changed, 18 insertions(+), 86 deletions(-) diff --git a/maps/implosion.map b/maps/implosion.map index a0c3fb6f..6c97e592 100644 --- a/maps/implosion.map +++ b/maps/implosion.map @@ -1,8 +1,8 @@ { "classname" "worldspawn" "hurt" "20" -"message" "implosion by mintOX" -"author" "mintOX" +"message" "Implosion" +"author" "MintOX, Mirio, Mario" { ( 440 64 72 ) ( 440 -192 72 ) ( 184 64 72 ) map_implosion/s_solarpanel 0 42 90 0.5 0.5 134217728 0 0 ( 472 -64 128 ) ( 216 -64 128 ) ( 472 -64 64 ) map_implosion/s_solarpanel 8 42 90 0.5 0.5 134217728 0 0 @@ -63888,54 +63888,6 @@ trak5x/trim-trim1b } } { -patchDef2 -{ -trak5x/light-light2c-surfacelight -( 3 3 0 0 0 ) -( -( ( -288.125 -2240 80 0 0 ) ( -288.125 -2240 64 0 0.5 ) ( -288.125 -2240 48 0 1 ) ) -( ( -288.125 -2208 80 0.5 0 ) ( -288.125 -2208 64 0.5 0.5 ) ( -288.125 -2208 48 0.5 1 ) ) -( ( -288.125 -2176 80 1 0 ) ( -288.125 -2176 64 1 0.5 ) ( -288.125 -2176 48 1 1 ) ) -) -} -} -{ -patchDef2 -{ -trak5x/light-light2c-surfacelight -( 3 3 0 0 0 ) -( -( ( -640 -1920.125 48 0 0 ) ( -640 -1920.125 64 0 -0.5 ) ( -640 -1920.125 80 0 -1 ) ) -( ( -608 -1920.125 48 0.5 0 ) ( -608 -1920.125 64 0.5 -0.5 ) ( -608 -1920.125 80 0.5 -1 ) ) -( ( -576 -1920.125 48 1 0 ) ( -576 -1920.125 64 1 -0.5 ) ( -576 -1920.125 80 1 -1 ) ) -) -} -} -{ -patchDef2 -{ -trak5x/light-light2b-surfacelight -( 3 3 0 0 0 ) -( -( ( 4704.125 -3712 48 0 0 ) ( 4704.125 -3712 64 0 -0.5 ) ( 4704.125 -3712 80 0 -1 ) ) -( ( 4704.125 -3680 48 0.5 0 ) ( 4704.125 -3680 64 0.5 -0.5 ) ( 4704.125 -3680 80 0.5 -1 ) ) -( ( 4704.125 -3648 48 1 0 ) ( 4704.125 -3648 64 1 -0.5 ) ( 4704.125 -3648 80 1 -1 ) ) -) -} -} -{ -patchDef2 -{ -trak5x/light-light2b-surfacelight -( 3 3 0 0 0 ) -( -( ( 4992 -3967.875 80 0 -1 ) ( 4992 -3967.875 64 0 -0.5 ) ( 4992 -3967.875 48 0 0 ) ) -( ( 5024 -3967.875 80 0.5 -1 ) ( 5024 -3967.875 64 0.5 -0.5 ) ( 5024 -3967.875 48 0.5 0 ) ) -( ( 5056 -3967.875 80 1 -1 ) ( 5056 -3967.875 64 1 -0.5 ) ( 5056 -3967.875 48 1 0 ) ) -) -} -} -{ ( 3056 -3560 -388 ) ( 3056 -3688 -388 ) ( 2640 -3560 -388 ) trak5x/trim-trim1b 64 64 90 0.5 0.5 134217728 0 0 ( 2816 -3560 -392 ) ( 2400 -3560 -392 ) ( 2816 -3560 -496 ) common/caulk 0 0 90 0.5 0.5 134217728 0 0 ( 3408 -3560 -384 ) ( 3408 -3560 -488 ) ( 3408 -3688 -384 ) trak5x/trim-trim1b 0 0 90 0.5 0.5 134217728 0 0 @@ -77127,16 +77079,6 @@ logos/logo02_yellow_glowy } { "classname" "light" -"origin" "-609.000000 -1937.000000 64.000000" -"light" "500" -} -{ -"classname" "light" -"origin" "-320.000000 -2208.000000 64.000000" -"light" "500" -} -{ -"classname" "light" "origin" "-64.000000 -1408.000000 -24.000000" "light" "1000" } @@ -77384,16 +77326,6 @@ logos/logo02_yellow_glowy } { "classname" "light" -"origin" "5025.000000 -3951.000000 64.000000" -"light" "500" -} -{ -"classname" "light" -"origin" "4736.000000 -3680.000000 64.000000" -"light" "500" -} -{ -"classname" "light" "origin" "4480.000000 -4480.000000 -24.000000" "light" "1000" } @@ -78349,9 +78281,9 @@ logos/logo02_yellow_glowy } { "classname" "misc_gamemodel" -"origin" "1703.999878 -2944.000000 -384.000000" +"origin" "1667.374878 -2944.000000 -384.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" -"angle" "-86.101425" +"angle" "-86.101440" "scale" "2" "skin" "0" } @@ -78413,7 +78345,7 @@ logos/logo02_yellow_glowy } { "classname" "misc_gamemodel" -"origin" "2712.000000 -2944.000244 -384.000000" +"origin" "2747.500000 -2941.750244 -384.000000" "model" "models/xonotic_jumppad01/xonotic_launchpad01.md3" "angle" "94.612640" "scale" "2" @@ -78743,23 +78675,23 @@ logos/logo02_yellow_glowy "classname" "trigger_push" "target" "t14" { -( 2775.1009674072 -2906.0535888672 -362.625 ) ( 2780.3245391846 -2969.5892181396 -362.625 ) ( 2674.3160095215 -2914.339630127 -362.625 ) common/trigger 232.3933410645 169.3223266602 4.7000002861 0.2500000298 0.2500000298 0 0 0 -( 2775.3509674072 -2911.8035888672 -360 ) ( 2674.5660095215 -2920.089630127 -360 ) ( 2775.3509674072 -2911.8035888672 -384 ) common/trigger 120.2731704712 0 0 0.2540512681 0.25 0 0 0 -( 2767.1937713623 -2907.3882904053 -360 ) ( 2767.1937713623 -2907.3882904053 -384 ) ( 2772.4173583984 -2970.9239196777 -360 ) common/trigger 207.5123596191 0 0 0.2540512681 0.25 0 0 0 -( 2679.4145965576 -2977.8752593994 -384 ) ( 2780.1995391846 -2969.5892181396 -384 ) ( 2674.1910095215 -2914.339630127 -384 ) common/trigger 232.8916625977 169.3632965088 4.7000002861 0.2500000298 0.2500000298 0 0 0 -( 2678.9145965576 -2974.3752593994 -384 ) ( 2678.9145965576 -2974.3752593994 -360 ) ( 2779.6995391846 -2966.0892181396 -384 ) common/trigger 123.7173614502 0 0 0.2540512681 0.25 0 0 0 -( 2688.9145965576 -2977.5002593994 -384 ) ( 2683.6910095215 -2913.964630127 -384 ) ( 2688.9145965576 -2977.5002593994 -360 ) common/trigger 200.1310424805 0 0 0.2540512681 0.25 0 0 0 +( 2810.6009674072 -2903.8035888672 -362.625 ) ( 2815.8245391846 -2967.3392181396 -362.625 ) ( 2709.8160095215 -2912.089630127 -362.625 ) common/trigger 95.1334075928 166.6567993164 4.7000002861 0.2500000298 0.2500000298 0 0 0 +( 2810.8509674072 -2909.5535888672 -360 ) ( 2710.0660095215 -2917.839630127 -360 ) ( 2810.8509674072 -2909.5535888672 -384 ) common/trigger 241.5375976563 0 0 0.2540512681 0.25 0 0 0 +( 2802.6937713623 -2905.1382904053 -360 ) ( 2802.6937713623 -2905.1382904053 -384 ) ( 2807.9173583984 -2968.6739196777 -360 ) common/trigger 203.6558837891 0 0 0.2540512681 0.25 0 0 0 +( 2714.9145965576 -2975.6252593994 -384 ) ( 2815.6995391846 -2967.3392181396 -384 ) ( 2709.6910095215 -2912.089630127 -384 ) common/trigger 95.631729126 166.697769165 4.7000002861 0.2500000298 0.2500000298 0 0 0 +( 2714.4145965576 -2972.1252593994 -384 ) ( 2714.4145965576 -2972.1252593994 -360 ) ( 2815.1995391846 -2963.8392181396 -384 ) common/trigger 244.9817810059 0 0 0.2540512681 0.25 0 0 0 +( 2724.4145965576 -2975.2502593994 -384 ) ( 2719.1910095215 -2911.714630127 -384 ) ( 2724.4145965576 -2975.2502593994 -360 ) common/trigger 196.2745666504 0 0 0.2540512681 0.25 0 0 0 } } { "classname" "trigger_push" "target" "t12" { -( 1736.6657104492 -2911.0578155518 -362.625 ) ( 1740.8074951172 -2970.288192749 -362.625 ) ( 1631.048614502 -2918.4432830811 -362.625 ) common/trigger 70.0195617676 71.0594177246 3.9999992847 0.25 0.25 0 0 0 -( 1736.6657104492 -2914.1828155518 -360 ) ( 1631.048614502 -2921.5682830811 -360 ) ( 1736.6657104492 -2914.1828155518 -384 ) common/trigger 93.3744049072 0 0 0.2514536679 0.25 0 0 0 -( 1727.6657104492 -2913.0578155518 -360 ) ( 1727.6657104492 -2913.0578155518 -384 ) ( 1731.8074951172 -2972.288192749 -360 ) common/trigger 153.915802002 0 0 0.2514536679 0.25 0 0 0 -( 1635.1903991699 -2977.6736602783 -384 ) ( 1740.8074951172 -2970.288192749 -384 ) ( 1631.048614502 -2918.4432830811 -384 ) common/trigger 70.0195617676 71.0594177246 3.9999995232 0.25 0.25 0 0 0 -( 1634.9403991699 -2975.7986602783 -384 ) ( 1634.9403991699 -2975.7986602783 -360 ) ( 1740.5574951172 -2968.413192749 -384 ) common/trigger 94.3686218262 0 0 0.2514536679 0.25 0 0 0 -( 1647.8755645752 -2972.5652618408 -384 ) ( 1643.7337799072 -2913.3348846436 -384 ) ( 1647.8755645752 -2972.5652618408 -360 ) common/trigger 124.082572937 0 0 0.2514536679 0.25 0 0 0 +( 1700.0407104492 -2911.0578155518 -362.625 ) ( 1704.1824951172 -2970.288192749 -362.625 ) ( 1594.423614502 -2918.4432830811 -362.625 ) common/trigger 216.1627044678 81.2787399292 3.9999992847 0.25 0.25 0 0 0 +( 1700.0407104492 -2914.1828155518 -360 ) ( 1594.423614502 -2921.5682830811 -360 ) ( 1700.0407104492 -2914.1828155518 -384 ) common/trigger 239.0274963379 0 0 0.2514536679 0.25 0 0 0 +( 1691.0407104492 -2913.0578155518 -360 ) ( 1691.0407104492 -2913.0578155518 -384 ) ( 1695.1824951172 -2972.288192749 -360 ) common/trigger 153.915802002 0 0 0.2514536679 0.25 0 0 0 +( 1598.5653991699 -2977.6736602783 -384 ) ( 1704.1824951172 -2970.288192749 -384 ) ( 1594.423614502 -2918.4432830811 -384 ) common/trigger 216.1627044678 81.2787399292 3.9999992847 0.25 0.25 0 0 0 +( 1598.3153991699 -2975.7986602783 -384 ) ( 1598.3153991699 -2975.7986602783 -360 ) ( 1703.9324951172 -2968.413192749 -384 ) common/trigger 240.0217132568 0 0 0.2514536679 0.25 0 0 0 +( 1611.2505645752 -2972.5652618408 -384 ) ( 1607.1087799072 -2913.3348846436 -384 ) ( 1611.2505645752 -2972.5652618408 -360 ) common/trigger 124.082572937 0 0 0.2514536679 0.25 0 0 0 } } diff --git a/maps/implosion.map.options b/maps/implosion.map.options index e07e0cec..5abf6e75 100644 --- a/maps/implosion.map.options +++ b/maps/implosion.map.options @@ -2,4 +2,4 @@ -vis -fast + -light -fast -deluxe -patchshadows -samples 3 -lightmapsize 512 -bounce 1 -fastbounce -bouncegrid -dirty -dirtscale 2 -minimap + -Version: 1c \ No newline at end of file +Version: 1d \ No newline at end of file -- 2.39.2