diff --git a/testmaps/lightstest1.map b/testmaps/lightstest1.map index 759ebe6a..97a6b394 100644 --- a/testmaps/lightstest1.map +++ b/testmaps/lightstest1.map @@ -375,6 +375,15 @@ ( 1104 -1360 512 ) ( 1184 -1344 512 ) ( 1184 -1360 512 ) bolt15 -0 16 -0 1 1 ( 1104 -1360 80 ) ( 1184 -1344 80 ) ( 1104 -1344 80 ) bolt15 -0 16 -0 1 1 } +// brush 41 +{ +( 1184 1072 80 ) ( 1184 1088 96 ) ( 1184 1088 80 ) bolt15 -16 -0 -0 1 1 +( 1056 1072 80 ) ( 1056 1088 96 ) ( 1056 1072 96 ) bolt15 -16 -0 -0 1 1 +( 1104 1088 80 ) ( 1184 1088 96 ) ( 1104 1088 96 ) bolt15 -0 -0 -0 1 1 +( 1104 1072 80 ) ( 1184 1072 96 ) ( 1184 1072 80 ) bolt15 -0 -0 -0 1 1 +( 1104 1072 512 ) ( 1184 1088 512 ) ( 1184 1072 512 ) bolt15 -0 16 -0 1 1 +( 1104 1072 80 ) ( 1184 1088 80 ) ( 1104 1088 80 ) bolt15 -0 16 -0 1 1 +} } // entity 1 { @@ -2050,12 +2059,12 @@ "_minlight" "200" // brush 0 { -( 1152 -1248 80 ) ( 1168 -1248 96 ) ( 1168 -1248 80 ) gray_brick 0 0 0 1 1 -( 1152 -1248 80 ) ( 1152 -1168 96 ) ( 1152 -1248 96 ) gray_brick 0 0 0 1 1 -( 1152 -1248 80 ) ( 1168 -1168 80 ) ( 1152 -1168 80 ) gray_brick 0 0 0 1 1 -( 1152 -1248 224 ) ( 1168 -1168 224 ) ( 1168 -1248 224 ) gray_brick -0 -0 -0 1 1 -( 1152 -1168 80 ) ( 1168 -1168 96 ) ( 1152 -1168 96 ) gray_brick 0 0 0 1 1 ( 1168 -1248 80 ) ( 1168 -1168 96 ) ( 1168 -1168 80 ) gray_brick 0 0 0 1 1 +( 1152 -1248 80 ) ( 1152 -1168 96 ) ( 1152 -1248 96 ) gray_brick 0 0 0 1 1 +( 1152 -1168 80 ) ( 1168 -1168 96 ) ( 1152 -1168 96 ) gray_brick 0 0 0 1 1 +( 1152 -1248 80 ) ( 1168 -1248 96 ) ( 1168 -1248 80 ) gray_brick 0 0 0 1 1 +( 1152 -1248 224 ) ( 1168 -1168 224 ) ( 1168 -1248 224 ) gray_brick -0 -0 -0 1 1 +( 1152 -1248 80 ) ( 1168 -1168 80 ) ( 1152 -1168 80 ) gray_brick 0 0 0 1 1 } } // entity 87 @@ -2065,12 +2074,12 @@ "_mincolor" "0.1 0.4 1.0" // brush 0 { -( 1152 -1248 224 ) ( 1168 -1248 240 ) ( 1168 -1248 224 ) gray_brick -0 0 -0 1 1 -( 1152 -1248 224 ) ( 1152 -1168 240 ) ( 1152 -1248 240 ) gray_brick -0 0 -0 1 1 -( 1152 -1248 224 ) ( 1168 -1168 224 ) ( 1152 -1168 224 ) gray_brick -0 -0 -0 1 1 -( 1152 -1248 368 ) ( 1168 -1168 368 ) ( 1168 -1248 368 ) gray_brick -0 -0 -0 1 1 -( 1152 -1168 224 ) ( 1168 -1168 240 ) ( 1152 -1168 240 ) gray_brick -0 0 -0 1 1 ( 1168 -1248 224 ) ( 1168 -1168 240 ) ( 1168 -1168 224 ) gray_brick -0 0 -0 1 1 +( 1152 -1248 224 ) ( 1152 -1168 240 ) ( 1152 -1248 240 ) gray_brick -0 0 -0 1 1 +( 1152 -1168 224 ) ( 1168 -1168 240 ) ( 1152 -1168 240 ) gray_brick -0 0 -0 1 1 +( 1152 -1248 224 ) ( 1168 -1248 240 ) ( 1168 -1248 224 ) gray_brick -0 0 -0 1 1 +( 1152 -1248 368 ) ( 1168 -1168 368 ) ( 1168 -1248 368 ) gray_brick -0 -0 -0 1 1 +( 1152 -1248 224 ) ( 1168 -1168 224 ) ( 1152 -1168 224 ) gray_brick -0 -0 -0 1 1 } } // entity 88 @@ -2134,12 +2143,12 @@ "_mincolor" "0.1 0.4 1.0" // brush 0 { -( 1152 -1344 224 ) ( 1168 -1344 240 ) ( 1168 -1344 224 ) gray_brick -0 -0 -0 1 1 -( 1152 -1344 224 ) ( 1152 -1264 240 ) ( 1152 -1344 240 ) gray_brick 96 -0 -0 1 1 -( 1152 -1344 224 ) ( 1168 -1264 224 ) ( 1152 -1264 224 ) gray_brick -0 -96 -0 1 1 -( 1152 -1344 368 ) ( 1168 -1264 368 ) ( 1168 -1344 368 ) gray_brick -0 -96 -0 1 1 -( 1152 -1264 224 ) ( 1168 -1264 240 ) ( 1152 -1264 240 ) gray_brick -0 -0 -0 1 1 ( 1168 -1344 224 ) ( 1168 -1264 240 ) ( 1168 -1264 224 ) gray_brick 96 -0 -0 1 1 +( 1152 -1344 224 ) ( 1152 -1264 240 ) ( 1152 -1344 240 ) gray_brick 96 -0 -0 1 1 +( 1152 -1264 224 ) ( 1168 -1264 240 ) ( 1152 -1264 240 ) gray_brick -0 -0 -0 1 1 +( 1152 -1344 224 ) ( 1168 -1344 240 ) ( 1168 -1344 224 ) gray_brick -0 -0 -0 1 1 +( 1152 -1344 368 ) ( 1168 -1264 368 ) ( 1168 -1344 368 ) gray_brick -0 -96 -0 1 1 +( 1152 -1344 224 ) ( 1168 -1264 224 ) ( 1152 -1264 224 ) gray_brick -0 -96 -0 1 1 } } // entity 91 @@ -2148,12 +2157,12 @@ "_minlight" "200" // brush 0 { -( 1152 -1344 80 ) ( 1168 -1344 96 ) ( 1168 -1344 80 ) gray_brick -0 -0 -0 1 1 -( 1152 -1344 80 ) ( 1152 -1264 96 ) ( 1152 -1344 96 ) gray_brick 96 -0 -0 1 1 -( 1152 -1344 80 ) ( 1168 -1264 80 ) ( 1152 -1264 80 ) gray_brick -0 -96 -0 1 1 -( 1152 -1344 224 ) ( 1168 -1264 224 ) ( 1168 -1344 224 ) gray_brick -0 -96 -0 1 1 -( 1152 -1264 80 ) ( 1168 -1264 96 ) ( 1152 -1264 96 ) gray_brick -0 -0 -0 1 1 ( 1168 -1344 80 ) ( 1168 -1264 96 ) ( 1168 -1264 80 ) gray_brick 96 -0 -0 1 1 +( 1152 -1344 80 ) ( 1152 -1264 96 ) ( 1152 -1344 96 ) gray_brick 96 -0 -0 1 1 +( 1152 -1264 80 ) ( 1168 -1264 96 ) ( 1152 -1264 96 ) gray_brick -0 -0 -0 1 1 +( 1152 -1344 80 ) ( 1168 -1344 96 ) ( 1168 -1344 80 ) gray_brick -0 -0 -0 1 1 +( 1152 -1344 224 ) ( 1168 -1264 224 ) ( 1168 -1344 224 ) gray_brick -0 -96 -0 1 1 +( 1152 -1344 80 ) ( 1168 -1264 80 ) ( 1152 -1264 80 ) gray_brick -0 -96 -0 1 1 } } // entity 92 @@ -2210,3 +2219,123 @@ ( 864 -1360 80 ) ( 896 -1264 80 ) ( 864 -1264 80 ) trigger -0 -32 -0 1 1 } } +// entity 94 +{ +"classname" "trigger_multiple" +"message" "lights behind glass with alpha" +// brush 0 +{ +( 896 992 80 ) ( 896 1088 96 ) ( 896 1088 80 ) trigger -16 -0 -0 1 1 +( 864 992 80 ) ( 864 1088 96 ) ( 864 992 96 ) trigger -16 -0 -0 1 1 +( 864 1072 80 ) ( 896 1072 96 ) ( 864 1072 96 ) trigger -0 -0 -0 1 1 +( 864 992 80 ) ( 896 992 96 ) ( 896 992 80 ) trigger -0 -0 -0 1 1 +( 864 992 96 ) ( 896 1088 96 ) ( 896 992 96 ) trigger -0 16 -0 1 1 +( 864 992 80 ) ( 896 1088 80 ) ( 864 1088 80 ) trigger -0 16 -0 1 1 +} +} +// entity 95 +{ +"classname" "func_detail" +// brush 0 +{ +( 904 1016 108 ) ( 904 1144 100 ) ( 904 1016 100 ) monitor_back -24 -16 -0 1 1 +( 896 1016 48 ) ( 896 1080 48 ) ( 896 1080 80 ) +0xmonitor -24 -16 -0 1 1 +( 928 1048 48 ) ( 928 1048 80 ) ( 896 1048 80 ) monitor_side -0 -16.0004 180 1 -1 +( 928 1016 48 ) ( 896 1016 48 ) ( 896 1016 80 ) monitor_side -0 -16.0004 180 1 -1 +( 928 1016 112 ) ( 896 1016 112 ) ( 896 1080 112 ) monitor_top 23.9995 24.0002 270 1 -1 +( 896 1016 88 ) ( 904 1016 88 ) ( 904 1144 88 ) monitor_top 23.9995 24.0002 270 1 -1 +} +// brush 1 +{ +( 928 1016 48 ) ( 928 1016 80 ) ( 928 1080 80 ) monitor_back -24 -16 -0 1 1 +( 904 1016 108 ) ( 904 1016 100 ) ( 904 1144 100 ) +0xmonitor -24 -16 -0 1 1 +( 928 1046 48 ) ( 928 1046 80 ) ( 896 1046 80 ) monitor_side -0 -16.0004 180 1 -1 +( 928 1018 48 ) ( 896 1018 48 ) ( 896 1018 80 ) monitor_side -0 -16.0004 180 1 -1 +( 928 1016 109 ) ( 896 1016 109 ) ( 896 1080 109 ) monitor_top 23.9995 24.0002 270 1 -1 +( 921 1018 85 ) ( 923 1018 85 ) ( 923 1146 85 ) black 32.0004 56 180 1 -1 +} +// brush 2 +{ +( 928 1016 48 ) ( 928 1016 80 ) ( 928 1080 80 ) monitor_back -24 -16 -0 1 1 +( 904 1016 108 ) ( 904 1016 100 ) ( 904 1144 100 ) +0xmonitor -24 -16 -0 1 1 +( 928 1046 48 ) ( 928 1046 80 ) ( 896 1046 80 ) monitor_side -0 -16.0004 180 1 -1 +( 928 1018 48 ) ( 896 1018 48 ) ( 896 1018 80 ) monitor_side -0 -16.0004 180 1 -1 +( 916 1018 82 ) ( 920 1146 82 ) ( 920 1018 82 ) monitor_top 23.9995 24.0002 270 1 -1 +( 928 1016 80 ) ( 928 1080 80 ) ( 896 1080 80 ) black 32.0004 56 180 1 -1 +} +// brush 3 +{ +( 919 1016 48 ) ( 919 1016 80 ) ( 919 1080 80 ) monitor_back -24 -16 -0 1 1 +( 904 1016 108 ) ( 904 1016 100 ) ( 904 1144 100 ) +0xmonitor -24 -16 -0 1 1 +( 928 1039 48 ) ( 928 1039 80 ) ( 896 1039 80 ) monitor_side -0 -16.0004 180 1 -1 +( 928 1026 48 ) ( 896 1026 48 ) ( 896 1026 80 ) monitor_side -0 -16.0004 180 1 -1 +( 921 1018 85 ) ( 923 1146 85 ) ( 923 1018 85 ) monitor_top 23.9995 24.0002 270 1 -1 +( 916 1018 82 ) ( 920 1018 82 ) ( 920 1146 82 ) black 32.0004 56 180 1 -1 +} +} +// entity 96 +{ +"classname" "light" +"origin" "1152 1008 168" +"angle" "-0" +"delay" "2" +"light" "100" +} +// entity 97 +{ +"classname" "light" +"origin" "1152 1008 312" +"angle" "-0" +"delay" "2" +"light" "100" +} +// entity 98 +{ +"classname" "light" +"origin" "1152 1008 440" +"angle" "-0" +"delay" "2" +"light" "100" +} +// entity 99 +{ +"classname" "func_wall" +"alpha" "0.2" +// brush 0 +{ +( 1024 960 112 ) ( 1056 960 144 ) ( 1056 960 112 ) brown -16 -0 -0 1 1 +( 1040 960 112 ) ( 1040 1088 144 ) ( 1040 960 144 ) brown -0 -0 -0 1 1 +( 1024 960 80 ) ( 1056 1088 80 ) ( 1024 1088 80 ) brown -16 -0 -0 1 1 +( 1024 960 224 ) ( 1056 1088 224 ) ( 1056 960 224 ) brown -16 -0 -0 1 1 +( 1024 1072 112 ) ( 1056 1072 144 ) ( 1024 1072 144 ) brown -16 -0 -0 1 1 +( 1056 960 112 ) ( 1056 1088 144 ) ( 1056 1088 112 ) brown -0 -0 -0 1 1 +} +} +// entity 100 +{ +"classname" "func_wall" +"alpha" "0.5" +// brush 0 +{ +( 1024 960 240 ) ( 1056 960 272 ) ( 1056 960 240 ) brown -16 -16 -0 1 1 +( 1040 960 240 ) ( 1040 1088 272 ) ( 1040 960 272 ) brown -0 -16 -0 1 1 +( 1024 960 240 ) ( 1056 1088 240 ) ( 1024 1088 240 ) brown -16 -0 -0 1 1 +( 1024 960 368 ) ( 1056 1088 368 ) ( 1056 960 368 ) brown -16 -0 -0 1 1 +( 1024 1072 240 ) ( 1056 1072 272 ) ( 1024 1072 272 ) brown -16 -16 -0 1 1 +( 1056 960 240 ) ( 1056 1088 272 ) ( 1056 1088 240 ) brown -0 -16 -0 1 1 +} +} +// entity 101 +{ +"classname" "func_wall" +"alpha" "0.8" +// brush 0 +{ +( 1024 960 384 ) ( 1056 960 416 ) ( 1056 960 384 ) brown -16 -0 -0 1 1 +( 1040 960 384 ) ( 1040 1088 416 ) ( 1040 960 416 ) brown -0 -0 -0 1 1 +( 1024 960 384 ) ( 1056 1088 384 ) ( 1024 1088 384 ) brown -16 -0 -0 1 1 +( 1024 960 512 ) ( 1056 1088 512 ) ( 1056 960 512 ) brown -16 -0 -0 1 1 +( 1024 1072 384 ) ( 1056 1072 416 ) ( 1024 1072 416 ) brown -16 -0 -0 1 1 +( 1056 960 384 ) ( 1056 1088 416 ) ( 1056 1088 384 ) brown -0 -0 -0 1 1 +} +}