Rework lighting

diff --git a/maps/zenith.map b/maps/zenith.map
index 6048c613cdc7547e143a96f71aa775bddb0b16aa..faeb8bbbf51b6f74a822b32a3b5bc9ccefd60947 100644 (file)
--- a/maps/zenith.map
+++ b/maps/zenith.map
@@ -1477,7 +1477,7 @@ brushDef
 ( 960 -320 192 ) ( 960 -320 128 ) ( 960 -64 192 ) ( ( 0.0078125 0 127 ) ( 0 0.0078125 1 ) ) phillipk2x/walls-pk02_wall04a 0 0 0
 ( 1024 -64 128 ) ( 1024 -64 192 ) ( 960 -64 128 ) ( ( 0.015625 0 34 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( 1024 -64 128 ) ( 1024 -320 128 ) ( 1024 -64 192 ) ( ( 0.0078125 0 127 ) ( 0 0.0078125 1 ) ) phillipk2x/walls-pk02_wall04a 0 0 0
-( 2112 -64 128 ) ( 2240 -80 160 ) ( 2240 -64 128 ) ( ( 0.015625 0 241 ) ( 0 0.0279508438 4.9999990463 ) ) phillipk2x/lights-pk02_light02b-surfacelight 0 0 0
+( 2112 -64 128 ) ( 2240 -80 160 ) ( 2240 -64 128 ) ( ( 0.015625 0 241 ) ( 0 0.0279508438 4.9999990463 ) ) phillipk2x/lights-pk02_light02b 0 0 0
 ( 2112 -80 160 ) ( 2240 -80 176 ) ( 2240 -80 160 ) ( ( -0.015625 0 34 ) ( 0 -0.0078125 0 ) ) phillipk2x/panels-pk02_door02 0 0 0
 }
 }
@@ -1499,7 +1499,7 @@ brushDef
 ( 1216 -64 192 ) ( 1216 -320 128 ) ( 1216 -320 192 ) ( ( 0.015625 0 254.34375 ) ( 0 -0.0078125 1 ) ) phillipk2x/panels-pk02_door02 0 0 0
 ( 1216 -64 128 ) ( 1152 -64 192 ) ( 1152 -64 128 ) ( ( -0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( 1152 -64 192 ) ( 1152 -320 128 ) ( 1152 -64 128 ) ( ( 0.0078125 0 127 ) ( 0 0.0078125 1 ) ) phillipk2x/walls-pk02_wall04a 0 0 0
-( -64 -64 128 ) ( -64 -80 160 ) ( 64 -64 128 ) ( ( -0.015625 0 19 ) ( 0 0.0279508438 4.9999990463 ) ) phillipk2x/lights-pk02_light02b-surfacelight 0 0 0
+( -64 -64 128 ) ( -64 -80 160 ) ( 64 -64 128 ) ( ( -0.015625 0 19 ) ( 0 0.0279508438 4.9999990463 ) ) phillipk2x/lights-pk02_light02b 0 0 0
 ( -64 -80 160 ) ( -64 -80 176 ) ( 64 -80 160 ) ( ( 0.015625 0 0 ) ( 0 -0.0078125 0 ) ) phillipk2x/panels-pk02_door02 0 0 0
 }
 }
@@ -2700,17 +2700,6 @@ brushDef
 {
 brushDef
 {
-( 576 -256 32 ) ( 576 -384 32 ) ( 448 -256 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 576 -256 160 ) ( 448 -256 160 ) ( 576 -256 0 ) ( ( 0.00390625 0 -0 ) ( -0 0.015625 0 ) ) phillipk2x/trims-pk02_trim03 0 0 0
-( 576 -256 160 ) ( 576 -256 0 ) ( 576 -384 160 ) ( ( 0.00390625 0 -0.09375 ) ( -0 0.015625 0 ) ) phillipk2x/trims-pk02_trim03 0 0 0
-( 448 -384 0 ) ( 576 -384 0 ) ( 448 -256 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 448 -384 0 ) ( 448 -384 160 ) ( 576 -384 0 ) ( ( 0.00390625 0 -0 ) ( -0 0.015625 0 ) ) phillipk2x/trims-pk02_trim03 0 0 0
-( 448 -384 0 ) ( 448 -256 0 ) ( 448 -384 160 ) ( ( 0.00390625 0 -0.59375 ) ( -0 0.015625 0 ) ) phillipk2x/trims-pk02_trim03 0 0 0
-}
-}
-{
-brushDef
-{
 ( 848 -64 128 ) ( 848 -256 128 ) ( 832 -64 128 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
 ( 848 -240 0 ) ( 848 -240 128 ) ( 848 -8 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( 832 -256 0 ) ( 848 -256 0 ) ( 832 -64 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -4794,34 +4783,12 @@ brushDef
 {
 brushDef
 {
-( 576 -576 176 ) ( 576 -704 176 ) ( 448 -576 176 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( 576 -576 160 ) ( 448 -576 160 ) ( 576 -576 32 ) ( ( 0.00390625 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/walls-pk02_wall03a 0 0 0
-( 512 -592 160 ) ( 512 -592 32 ) ( 512 -720 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( 440 -704 128 ) ( 568 -704 128 ) ( 440 -576 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 448 -704 32 ) ( 448 -704 160 ) ( 576 -704 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 504 -704 32 ) ( 504 -576 32 ) ( 504 -704 160 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{
-( 576 -576 144 ) ( 576 -704 144 ) ( 448 -576 144 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( 576 -576 128 ) ( 448 -576 128 ) ( 576 -576 0 ) ( ( 0.00390625 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/walls-pk02_wall03a 0 0 0
-( 640 -576 128 ) ( 640 -576 0 ) ( 640 -704 128 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( 448 -704 128 ) ( 576 -704 128 ) ( 448 -576 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 448 -704 0 ) ( 448 -704 128 ) ( 576 -704 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 632 -712 0 ) ( 632 -584 0 ) ( 632 -712 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{
-( 576 -576 160 ) ( 576 -704 160 ) ( 448 -576 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( 576 -576 144 ) ( 448 -576 144 ) ( 576 -576 16 ) ( ( 0.00390625 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/walls-pk02_wall03a 0 0 0
-( 576 -592 144 ) ( 576 -592 16 ) ( 576 -720 144 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
-( 448 -704 128 ) ( 576 -704 128 ) ( 448 -576 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 448 -704 16 ) ( 448 -704 144 ) ( 576 -704 16 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( 568 -720 16 ) ( 568 -592 16 ) ( 568 -720 144 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 704 -576 144 ) ( 704 -704 144 ) ( 576 -576 144 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 640 -592 128 ) ( 640 -592 0 ) ( 640 -720 128 ) ( ( 0.03125 0 -0 ) ( -0 0.0625 0 ) ) phillipk2x/lights-pk02_light01b 0 0 0
+( 632 -704 0 ) ( 632 -576 0 ) ( 632 -704 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 640 -608 32 ) ( 624 -608 -96 ) ( 640 -608 -96 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 624 -672 32 ) ( 640 -672 -96 ) ( 624 -672 -96 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 640 64 128 ) ( 624 64 128 ) ( 640 -64 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -9638,7 +9605,7 @@ brushDef
 ( 0 -464 -16 ) ( -64 -464 0 ) ( 0 -464 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( 0 -464 0 ) ( -16 -448 0 ) ( -16 -448 -16 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -64 -464 -16 ) ( 0 -448 -16 ) ( -64 -448 -16 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -64 -448 0 ) ( -16 -448 -16 ) ( -16 -448 0 ) ( ( 0.0208333321 0 127.6666641235 ) ( 0 0.0625 0 ) ) phillipk2x/lights-pk02_light01b-surfacelight 0 0 0
+( -64 -448 0 ) ( -16 -448 -16 ) ( -16 -448 0 ) ( ( 0.0208333321 0 127.6666641235 ) ( 0 0.0625 0 ) ) phillipk2x/lights-pk02_light01b 0 0 0
 ( -64 -448 0 ) ( -64 -464 -16 ) ( -64 -448 -16 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
@@ -9649,7 +9616,7 @@ brushDef
 ( 0 -304 0 ) ( -64 -304 0 ) ( 0 -304 -16 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -16 -320 -16 ) ( -16 -320 0 ) ( 0 -304 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -64 -320 -16 ) ( 0 -320 -16 ) ( -64 -304 -16 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -16 -320 0 ) ( -16 -320 -16 ) ( -64 -320 0 ) ( ( 0.0208333191 0 1.3333320618 ) ( 0 0.0625 0 ) ) phillipk2x/lights-pk02_light01b-surfacelight 0 0 0
+( -16 -320 0 ) ( -16 -320 -16 ) ( -64 -320 0 ) ( ( 0.0208333191 0 1.3333320618 ) ( 0 0.0625 0 ) ) phillipk2x/lights-pk02_light01b 0 0 0
 ( -64 -320 -16 ) ( -64 -304 -16 ) ( -64 -320 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
@@ -10953,6 +10920,160 @@ brushDef
 ( 752 64 512 ) ( 752 -64 512 ) ( 1392 64 512 ) ( ( 0 -0.015625 236 ) ( 0.015625 0 243 ) ) common/caulk 0 0 0
 }
 }
+{
+brushDef
+{
+( 704 -576 144 ) ( 704 -704 144 ) ( 576 -576 144 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 704 -576 128 ) ( 576 -576 128 ) ( 704 -576 0 ) ( ( 0.00390625 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/walls-pk02_wall03a 0 0 0
+( 640 -592 128 ) ( 640 -592 0 ) ( 640 -720 128 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 632 -704 0 ) ( 632 -576 0 ) ( 632 -704 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 640 -608 -96 ) ( 624 -608 -96 ) ( 640 -608 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 640 64 128 ) ( 624 64 128 ) ( 640 -64 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 704 -576 144 ) ( 704 -704 144 ) ( 576 -576 144 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 640 -592 128 ) ( 640 -592 0 ) ( 640 -720 128 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 576 -704 0 ) ( 576 -704 128 ) ( 704 -704 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 632 -704 0 ) ( 632 -576 0 ) ( 632 -704 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 656 -672 32 ) ( 624 -672 -96 ) ( 656 -672 -96 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 640 64 128 ) ( 624 64 128 ) ( 640 -64 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 576 -576 176 ) ( 576 -704 176 ) ( 448 -576 176 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 512 -592 160 ) ( 512 -592 32 ) ( 512 -720 160 ) ( ( 0.03125 0 -0 ) ( -0 0.0625 0 ) ) phillipk2x/lights-pk02_light01b 0 0 0
+( 440 -704 128 ) ( 568 -704 128 ) ( 440 -576 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 504 -704 32 ) ( 504 -576 32 ) ( 504 -704 160 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 512 -608 64 ) ( 496 -608 -64 ) ( 512 -608 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 496 -672 64 ) ( 512 -672 -64 ) ( 496 -672 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 576 -576 176 ) ( 576 -704 176 ) ( 448 -576 176 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 576 -576 160 ) ( 448 -576 160 ) ( 576 -576 32 ) ( ( 0.00390625 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/walls-pk02_wall03a 0 0 0
+( 512 -592 160 ) ( 512 -592 32 ) ( 512 -720 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 440 -704 128 ) ( 568 -704 128 ) ( 440 -576 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 504 -704 32 ) ( 504 -576 32 ) ( 504 -704 160 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 512 -608 -64 ) ( 496 -608 -64 ) ( 512 -608 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 576 -576 176 ) ( 576 -704 176 ) ( 448 -576 176 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 512 -592 160 ) ( 512 -592 32 ) ( 512 -720 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 440 -704 128 ) ( 568 -704 128 ) ( 440 -576 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 448 -704 32 ) ( 448 -704 160 ) ( 576 -704 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 504 -704 32 ) ( 504 -576 32 ) ( 504 -704 160 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 528 -672 64 ) ( 496 -672 -64 ) ( 528 -672 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 640 -576 160 ) ( 640 -704 160 ) ( 512 -576 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 576 -592 144 ) ( 576 -592 16 ) ( 576 -720 144 ) ( ( 0.03125 0 -0 ) ( -0 0.0625 0 ) ) phillipk2x/lights-pk02_light01b 0 0 0
+( 568 -704 16 ) ( 568 -576 16 ) ( 568 -704 144 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 576 -608 48 ) ( 560 -608 -80 ) ( 576 -608 -80 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 560 -672 48 ) ( 576 -672 -80 ) ( 560 -672 -80 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 576 64 128 ) ( 560 64 128 ) ( 576 -64 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 640 -576 160 ) ( 640 -704 160 ) ( 512 -576 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 640 -576 144 ) ( 512 -576 144 ) ( 640 -576 16 ) ( ( 0.00390625 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/walls-pk02_wall03a 0 0 0
+( 576 -592 144 ) ( 576 -592 16 ) ( 576 -720 144 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 568 -704 16 ) ( 568 -576 16 ) ( 568 -704 144 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 576 -608 -80 ) ( 560 -608 -80 ) ( 576 -608 48 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 576 64 128 ) ( 560 64 128 ) ( 576 -64 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 640 -576 160 ) ( 640 -704 160 ) ( 512 -576 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 576 -592 144 ) ( 576 -592 16 ) ( 576 -720 144 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 512 -704 16 ) ( 512 -704 144 ) ( 640 -704 16 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 568 -704 16 ) ( 568 -576 16 ) ( 568 -704 144 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 592 -672 48 ) ( 560 -672 -80 ) ( 592 -672 -80 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 576 64 128 ) ( 560 64 128 ) ( 576 -64 128 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 576 -160 32 ) ( 576 -288 32 ) ( 448 -160 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 672 -256 160 ) ( 544 -256 160 ) ( 672 -256 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 576 -160 160 ) ( 576 -160 0 ) ( 576 -288 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 448 -288 0 ) ( 576 -288 0 ) ( 448 -160 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 448 -288 0 ) ( 448 -288 160 ) ( 576 -288 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 544 -288 0 ) ( 544 -160 0 ) ( 544 -288 160 ) ( ( 0.015625 0 -2.375 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 672 -384 32 ) ( 544 -384 32 ) ( 672 -256 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 576 -480 160 ) ( 576 -352 160 ) ( 576 -480 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 672 -384 160 ) ( 672 -384 0 ) ( 544 -384 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 544 -256 0 ) ( 544 -384 0 ) ( 672 -256 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 544 -256 0 ) ( 544 -256 160 ) ( 544 -384 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 544 -352 0 ) ( 672 -352 0 ) ( 544 -352 160 ) ( ( 0.015625 0 -2.375 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 576 -160 32 ) ( 576 -288 32 ) ( 448 -160 32 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.25 ) ) common/caulk 0 0 0
+( 576 -256 160 ) ( 448 -256 160 ) ( 576 -256 0 ) ( ( 0.03125 0 254 ) ( 0 0.03125 0 ) ) phillipk2x/lights-pk02_light02b-surfacelight 0 0 0
+( 544 -160 160 ) ( 544 -160 0 ) ( 544 -288 160 ) ( ( 0.015625 0 255.625 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 448 -288 0 ) ( 576 -288 0 ) ( 448 -160 0 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.75 ) ) common/caulk 0 0 0
+( 448 -272 0 ) ( 448 -272 160 ) ( 576 -272 0 ) ( ( 0.015625 0 0.25 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 480 -288 0 ) ( 480 -160 0 ) ( 480 -288 160 ) ( ( 0.015625 0 253.625 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 672 -384 32 ) ( 544 -384 32 ) ( 672 -256 32 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.25 ) ) common/caulk 0 0 0
+( 576 -384 160 ) ( 576 -256 160 ) ( 576 -384 0 ) ( ( 0.03125 0 254 ) ( 0 0.03125 0 ) ) phillipk2x/lights-pk02_light02b-surfacelight 0 0 0
+( 672 -352 160 ) ( 672 -352 0 ) ( 544 -352 160 ) ( ( 0.015625 0 255.625 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 544 -256 0 ) ( 544 -384 0 ) ( 672 -256 0 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.75 ) ) common/caulk 0 0 0
+( 560 -256 0 ) ( 560 -256 160 ) ( 560 -384 0 ) ( ( 0.015625 0 0.25 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 544 -288 0 ) ( 672 -288 0 ) ( 544 -288 160 ) ( ( 0.015625 0 253.625 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 448 -480 32 ) ( 448 -352 32 ) ( 576 -480 32 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.25 ) ) common/caulk 0 0 0
+( 448 -384 160 ) ( 576 -384 160 ) ( 448 -384 0 ) ( ( 0.03125 0 254 ) ( 0 0.03125 0 ) ) phillipk2x/lights-pk02_light02b-surfacelight 0 0 0
+( 480 -480 160 ) ( 480 -480 0 ) ( 480 -352 160 ) ( ( 0.015625 0 255.625 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 576 -352 0 ) ( 448 -352 0 ) ( 576 -480 0 ) ( ( 0.015625 0 0 ) ( 0 0.015625 255.75 ) ) common/caulk 0 0 0
+( 576 -368 0 ) ( 576 -368 160 ) ( 448 -368 0 ) ( ( 0.015625 0 0.25 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( 544 -352 0 ) ( 544 -480 0 ) ( 544 -352 160 ) ( ( 0.015625 0 253.625 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( 352 -256 32 ) ( 480 -256 32 ) ( 352 -384 32 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 448 -160 160 ) ( 448 -288 160 ) ( 448 -160 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 352 -256 160 ) ( 352 -256 0 ) ( 480 -256 160 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+( 480 -384 0 ) ( 480 -256 0 ) ( 352 -384 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 480 -384 0 ) ( 480 -384 160 ) ( 480 -256 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( 352 -384 160 ) ( 480 -384 160 ) ( 352 -384 0 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) phillipk2x/base-pk02_generic01b 0 0 0
+}
+}
 }
 {
 "classname" "func_group"
@@ -11279,7 +11400,7 @@ brushDef
 {
 "classname" "light"
 "origin" "-800.000000 -736.000000 224.000000"
-"light" "50"
+"light" "30"
 }
 {
 "classname" "weapon_nex"
@@ -12200,7 +12321,7 @@ brushDef
 {
 "classname" "light"
 "origin" "-256.000000 -64.000000 304.000000"
-"light" "100"
+"light" "30"
 }
 {
 "classname" "func_group"
@@ -12650,7 +12771,7 @@ phillipk2x/base-pk02_generic01b
 {
 "classname" "light"
 "origin" "-256.000000 -288.000000 352.000000"
-"light" "50"
+"light" "30"
 }
 {
 "classname" "func_group"
@@ -13545,7 +13666,7 @@ brushDef
 {
 "classname" "light"
 "origin" "136.000000 256.000000 304.000000"
-"light" "50"
+"light" "30"
 "_color" "1 1 1"
 }
 {
@@ -13559,31 +13680,31 @@ brushDef
 {
 "classname" "light"
 "origin" "-448.000000 -384.000000 896.000000"
-"light" "50"
+"light" "30"
 "target" "info_null4"
 }
 {
 "classname" "light"
 "origin" "-640.000000 -384.000000 896.000000"
-"light" "50"
+"light" "30"
 "target" "info_null3"
 }
 {
 "classname" "light"
 "origin" "-640.000000 -576.000000 896.000000"
-"light" "50"
+"light" "30"
 "target" "info_null2"
 }
 {
 "classname" "light"
 "origin" "-448.000000 -576.000000 896.000000"
-"light" "50"
+"light" "30"
 "target" "info_null1"
 }
 {
 "classname" "light"
 "origin" "-800.000000 -224.000000 320.000000"
-"light" "50"
+"light" "30"
 }
 {
 "classname" "misc_model"
@@ -13604,7 +13725,7 @@ brushDef
 {
 "classname" "light"
 "origin" "-128.000000 360.000000 304.000000"
-"light" "25"
+"light" "30"
 "_color" "1 1 1"
 }
 {
@@ -13612,12 +13733,14 @@ brushDef
 "origin" "-272.000000 720.000000 176.000000"
 "light" "10"
 "_color" "0.461875 0.985931 0.999634"
+"targetname" "light_bluecorridor"
 }
 {
 "classname" "light"
 "origin" "-472.000000 480.000000 176.000000"
 "light" "10"
 "_color" "0.461875 0.985931 0.999634"
+"targetname" "light_bluecorridor"
 }
 {
 "classname" "func_group"
@@ -13643,7 +13766,7 @@ trak5x/base-pipe1c
 {
 "classname" "light"
 "origin" "320.000000 384.000000 160.000000"
-"light" "50"
+"light" "30"
 }
 {
 "classname" "misc_model"
@@ -14042,7 +14165,7 @@ phillipk2x/base-pk02_generic01b
 {
 "classname" "light"
 "origin" "-320.000000 64.000000 608.000000"
-"light" "50"
+"light" "30"
 }
 {
 "classname" "misc_model"
@@ -14073,11 +14196,6 @@ phillipk2x/base-pk02_generic01b
 "targetname" "info_null4"
 }
 {
-"classname" "light"
-"origin" "-544.000000 -480.000000 896.000000"
-"light" "100"
-}
-{
 "classname" "item_armor_small"
 "origin" "160.000000 -1120.000000 64.000000"
 }
@@ -14342,7 +14460,7 @@ brushDef
 {
 "classname" "light"
 "origin" "-128.000000 216.000000 304.000000"
-"light" "25"
+"light" "30"
 "_color" "1 1 1"
 }
 {
@@ -14594,7 +14712,7 @@ brushDef
 {
 "classname" "light"
 "origin" "-256.000000 -736.000000 352.000000"
-"light" "50"
+"light" "30"
 }
 {
 "classname" "misc_model"
@@ -15547,3 +15665,137 @@ brushDef
 }
 }
 }
+{
+"classname" "light"
+"origin" "64.000000 -608.000000 352.000000"
+"light" "30"
+}
+{
+"classname" "misc_model"
+"origin" "64.000153 -608.000061 384.000061"
+"model" "models/lights/xonlight03.md3"
+"targetname" "light8"
+"angles" "0.000001 -179.999985 -90.000000"
+"modelscale" "0.500000"
+}
+{
+"classname" "light"
+"origin" "-32.000000 -800.000000 624.000000"
+"light" "30"
+}
+{
+"classname" "misc_model"
+"origin" "-31.999847 -832.000061 623.999939"
+"model" "models/lights/xonlight03.md3"
+"targetname" "light9"
+"angles" "0.000001 -179.999985 -179.999985"
+"modelscale" "0.500000"
+}
+{
+"classname" "misc_model"
+"origin" "1216.000000 -319.999969 304.000122"
+"model" "models/lights/xonlight03.md3"
+"targetname" "light10"
+"angles" "90.000000 0.000000 -90.000000"
+"modelscale" "0.500000"
+}
+{
+"classname" "light"
+"origin" "1192.000000 -320.000000 304.000000"
+"light" "30"
+"_color" "1 1 1"
+}
+{
+"classname" "light"
+"origin" "416.000000 -752.000000 256.000000"
+"light" "30"
+}
+{
+"classname" "misc_model"
+"origin" "448.000061 -751.999878 255.999878"
+"model" "models/lights/xonlight03.md3"
+"targetname" "light11"
+"angles" "-0.000017 -90.000000 -179.999985"
+"modelscale" "0.500000"
+}
+{
+"classname" "light"
+"origin" "-544.000000 -480.000000 896.000000"
+"light" "30"
+}
+{
+"classname" "light"
+"origin" "1184.000000 -112.000000 144.000000"
+"light" "10"
+"targetname" "light_stairs5"
+}
+{
+"classname" "light"
+"origin" "-32.000000 -336.000000 0.000000"
+"light" "25"
+"targetname" "light_stairs"
+}
+{
+"classname" "light"
+"origin" "592.000000 -640.000000 160.000000"
+"light" "10"
+"targetname" "light_stairs2"
+}
+{
+"classname" "light"
+"origin" "656.000000 -640.000000 144.000000"
+"light" "10"
+"targetname" "light_stairs3"
+}
+{
+"classname" "light"
+"origin" "992.000000 -112.000000 144.000000"
+"light" "10"
+"targetname" "light_stairs4"
+}
+{
+"classname" "light"
+"origin" "528.000000 -640.000000 176.000000"
+"light" "10"
+"targetname" "light_stairs1"
+}
+{
+"classname" "light"
+"origin" "-32.000000 -432.000000 0.000000"
+"light" "25"
+"targetname" "light_stairs"
+}
+{
+"classname" "light"
+"origin" "-832.000000 -768.000000 592.000000"
+"light" "30"
+}
+{
+"classname" "light"
+"origin" "-832.000000 -192.000000 592.000000"
+"light" "30"
+}
+{
+"classname" "light"
+"origin" "-256.000000 -192.000000 592.000000"
+"light" "30"
+}
+{
+"classname" "light"
+"origin" "-256.000000 -768.000000 592.000000"
+"light" "30"
+}
+{
+"classname" "misc_model"
+"origin" "384.000061 0.000031 288.000122"
+"model" "models/lights/xonlight03.md3"
+"targetname" "light10"
+"angles" "90.000000 0.000000 -90.000000"
+"modelscale" "0.500000"
+}
+{
+"classname" "light"
+"origin" "360.000000 0.000000 288.000000"
+"light" "30"
+"_color" "1 1 1"
+}