Added humming sounds for lights, and location system. Also, proper mapimage. Merge...

diff --git a/maps/lightspeed.map b/maps/lightspeed.map
index da6cc9416f7cd8e288a715ac06ad5f169a1a7073..5428ac222b17506ea7ef218f6840f53dbcc070f4 100644 (file)
--- a/maps/lightspeed.map
+++ b/maps/lightspeed.map
@@ -9895,15 +9895,15 @@ patchDef2
 terrain01x/ground-drylake01
 ( 9 9 0 0 0 )
 (
-( ( -112 0 62 0 0 ) ( -112 14 62 0 -0.21875 ) ( -112 28 62 0 -0.4375 ) ( -112 42 62 0 -0.65625 ) ( -112 56 62 0 -0.875 ) ( -112 70 62 0 -1.09375 ) ( -112 84 62 0 -1.3125 ) ( -112 98 62 0 -1.53125 ) ( -112 112 62 0 -1.75 ) )
-( ( -84 0 62 0.4375 0 ) ( -60 17 65 0.4375 -0.21875 ) ( -60 31 65 0.4375 -0.4375 ) ( -92 42 66 0.4375 -0.65625 ) ( -92 56 66 0.4375 -0.875 ) ( -84 70 62 0.4375 -1.09375 ) ( -84 84 62 0.4375 -1.3125 ) ( -84 98 62 0.4375 -1.53125 ) ( -84 112 62 0.4375 -1.75 ) )
-( ( -56 0 62 0.875 0 ) ( -51 17 65 0.875 -0.21875 ) ( -51 31 65 0.875 -0.4375 ) ( -80 42 66 0.875 -0.65625 ) ( -80 56 66 0.875 -0.875 ) ( -56 70 64 0.875 -1.09375 ) ( -56 84 64 0.875 -1.3125 ) ( -56 98 62 0.875 -1.53125 ) ( -56 112 62 0.875 -1.75 ) )
-( ( -28 0 62 1.3125 0 ) ( -28 14 62 1.3125 -0.21875 ) ( -28 28 62 1.3125 -0.4375 ) ( -28 42 62 1.3125 -0.65625 ) ( -28 56 62 1.3125 -0.875 ) ( -39 70 64 1.3125 -1.09375 ) ( -39 84 64 1.3125 -1.3125 ) ( -28 98 62 1.3125 -1.53125 ) ( -28 112 62 1.3125 -1.75 ) )
-( ( 0 0 62 1.75 0 ) ( 0 14 62 1.75 -0.21875 ) ( 0 28 62 1.75 -0.4375 ) ( 0 41 67 1.75 -0.65625 ) ( 0 56 62 1.75 -0.875 ) ( 0 70 62 1.75 -1.09375 ) ( -5 87 66 1.75 -1.3125 ) ( -5 101 66 1.75 -1.53125 ) ( 0 112 62 1.75 -1.75 ) )
-( ( 28 0 62 2.1875 0 ) ( 28 14 62 2.1875 -0.21875 ) ( 28 28 62 2.1875 -0.4375 ) ( 28 42 62 2.1875 -0.65625 ) ( 28 56 62 2.1875 -0.875 ) ( 28 70 62 2.1875 -1.09375 ) ( 10 87 66 2.1875 -1.3125 ) ( 10 101 66 2.1875 -1.53125 ) ( 28 112 62 2.1875 -1.75 ) )
-( ( 56 0 62 2.625 0 ) ( 56 14 62 2.625 -0.21875 ) ( 59 32 65 2.625 -0.4375 ) ( 59 40 65 2.625 -0.65625 ) ( 56 56 62 2.625 -0.875 ) ( 48 71 64 2.625 -1.09375 ) ( 48 85 64 2.625 -1.3125 ) ( 56 98 62 2.625 -1.53125 ) ( 56 112 62 2.625 -1.75 ) )
-( ( 84 0 62 3.0625 0 ) ( 84 14 62 3.0625 -0.21875 ) ( 70 32 65 3.0625 -0.4375 ) ( 70 40 65 3.0625 -0.65625 ) ( 84 56 62 3.0625 -0.875 ) ( 61 74 64 3.0625 -1.09375 ) ( 61 88 64 3.0625 -1.3125 ) ( 84 98 62 3.0625 -1.53125 ) ( 84 112 62 3.0625 -1.75 ) )
-( ( 112 0 62 3.5 0 ) ( 112 14 62 3.5 -0.21875 ) ( 112 28 62 3.5 -0.4375 ) ( 112 42 62 3.5 -0.65625 ) ( 112 56 62 3.5 -0.875 ) ( 112 70 62 3.5 -1.09375 ) ( 112 84 62 3.5 -1.3125 ) ( 112 98 62 3.5 -1.53125 ) ( 112 112 62 3.5 -1.75 ) )
+( ( -112 0 62 0 0 ) ( -112 14 62 0 -0.0546875 ) ( -112 28 62 0 -0.109375 ) ( -112 42 62 0 -0.1640625 ) ( -112 56 62 0 -0.21875 ) ( -112 70 62 0 -0.2734375 ) ( -112 84 62 0 -0.328125 ) ( -112 98 62 0 -0.3828125 ) ( -112 112 62 0 -0.4375 ) )
+( ( -84 0 62 0.203799963 0 ) ( -60 17 65 0.203799963 -0.0546875 ) ( -60 31 65 0.203799963 -0.109375 ) ( -92 42 66 0.203799963 -0.1640625 ) ( -92 56 66 0.203799963 -0.21875 ) ( -84 70 62 0.203799963 -0.2734375 ) ( -84 84 62 0.203799963 -0.328125 ) ( -84 98 62 0.203799963 -0.3828125 ) ( -84 112 62 0.203799963 -0.4375 ) )
+( ( -56 0 62 0.3134536147 0 ) ( -51 17 65 0.3134536147 -0.0546875 ) ( -51 31 65 0.3134536147 -0.109375 ) ( -80 42 66 0.3134536147 -0.1640625 ) ( -80 56 66 0.3134536147 -0.21875 ) ( -56 70 64 0.3134536147 -0.2734375 ) ( -56 84 64 0.3134536147 -0.328125 ) ( -56 98 62 0.3134536147 -0.3828125 ) ( -56 112 62 0.3134536147 -0.4375 ) )
+( ( -28 0 62 0.5171787143 0 ) ( -28 14 62 0.5171787143 -0.0546875 ) ( -28 28 62 0.5171787143 -0.109375 ) ( -28 42 62 0.5171787143 -0.1640625 ) ( -28 56 62 0.5171787143 -0.21875 ) ( -39 70 64 0.5171787143 -0.2734375 ) ( -39 84 64 0.5171787143 -0.328125 ) ( -28 98 62 0.5171787143 -0.3828125 ) ( -28 112 62 0.5171787143 -0.4375 ) )
+( ( 0 0 62 0.6697226167 0 ) ( 0 14 62 0.6697226167 -0.0546875 ) ( 0 28 62 0.6697226167 -0.109375 ) ( 0 41 67 0.6697226167 -0.1640625 ) ( 0 56 62 0.6697226167 -0.21875 ) ( 0 70 62 0.6697226167 -0.2734375 ) ( -5 87 66 0.6697226167 -0.328125 ) ( -5 101 66 0.6697226167 -0.3828125 ) ( 0 112 62 0.6697226167 -0.4375 ) )
+( ( 28 0 62 0.7808964849 0 ) ( 28 14 62 0.7808964849 -0.0546875 ) ( 28 28 62 0.7808964849 -0.109375 ) ( 28 42 62 0.7808964849 -0.1640625 ) ( 28 56 62 0.7808964849 -0.21875 ) ( 28 70 62 0.7808964849 -0.2734375 ) ( 10 87 66 0.7808964849 -0.328125 ) ( 10 101 66 0.7808964849 -0.3828125 ) ( 28 112 62 0.7808964849 -0.4375 ) )
+( ( 56 0 62 0.9616423249 0 ) ( 56 14 62 0.9616423249 -0.0546875 ) ( 59 32 65 0.9616423249 -0.109375 ) ( 59 40 65 0.9616423249 -0.1640625 ) ( 56 56 62 0.9616423249 -0.21875 ) ( 48 71 64 0.9616423249 -0.2734375 ) ( 48 85 64 0.9616423249 -0.328125 ) ( 56 98 62 0.9616423249 -0.3828125 ) ( 56 112 62 0.9616423249 -0.4375 ) )
+( ( 84 0 62 1.0710173845 0 ) ( 84 14 62 1.0710173845 -0.0546875 ) ( 70 32 65 1.0710173845 -0.109375 ) ( 70 40 65 1.0710173845 -0.1640625 ) ( 84 56 62 1.0710173845 -0.21875 ) ( 61 74 64 1.0710173845 -0.2734375 ) ( 61 88 64 1.0710173845 -0.328125 ) ( 84 98 62 1.0710173845 -0.3828125 ) ( 84 112 62 1.0710173845 -0.4375 ) )
+( ( 112 0 62 1.2710005045 0 ) ( 112 14 62 1.2710005045 -0.0546875 ) ( 112 28 62 1.2710005045 -0.109375 ) ( 112 42 62 1.2710005045 -0.1640625 ) ( 112 56 62 1.2710005045 -0.21875 ) ( 112 70 62 1.2710005045 -0.2734375 ) ( 112 84 62 1.2710005045 -0.328125 ) ( 112 98 62 1.2710005045 -0.3828125 ) ( 112 112 62 1.2710005045 -0.4375 ) )
 )
 }
 }
@@ -10816,14 +10816,6 @@ trak5x/base-pipe1d
 ( 173.3517608643 241.2340240479 486 ) ( 174.0588684082 241.9411315918 486 ) ( 173.3517608643 241.2340240479 998 ) common/nodrawnonsolid 187.4515991211 152 0 0.3535533845 0.25 0 0 0
 }
 {
-( 160 -368 608 ) ( 160 -712 608 ) ( -160 -712 608 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 160 -368 608 ) ( -144 -368 608 ) ( 160 -368 576 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 160 -368 608 ) ( 160 -712 576 ) ( 160 -712 608 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 160 -368 576 ) ( -160 -712 576 ) ( 160 -712 576 ) facility114x/floor-floor02 256 420.1025390625 0 0.625 0.609375 0 0 0
-( -160 -368 576 ) ( -160 -712 608 ) ( -160 -712 576 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -64 -680 64 ) ( -32 -680 -64 ) ( -64 -680 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( 1152 -744 608 ) ( 1152 -832 608 ) ( 1024 -744 608 ) common/caulk 0 128 0 0.25 0.25 0 0 0
 ( 1184 -192 608 ) ( 1056 -192 608 ) ( 1184 -192 576 ) common/caulk 128 0 0 0.25 0.25 0 0 0
 ( 1344 -728 608 ) ( 1344 -728 576 ) ( 1344 -816 608 ) common/caulk 64 0 0 0.25 0.25 0 0 0
@@ -11848,6 +11840,14 @@ terrain01x/ground-drylake01
 ( -746 -160 80 ) ( -746 -152 128 ) ( -760 -160 128 ) common/clip 0 64 0 0.25 -0.25 0 0 0
 ( -760 -160 128 ) ( -746 -152 128 ) ( -746 -160 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 160 -368 608 ) ( 160 -712 608 ) ( -160 -712 608 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 160 -368 608 ) ( -144 -368 608 ) ( 160 -368 576 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 160 -368 608 ) ( 160 -712 576 ) ( 160 -712 608 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 160 -368 576 ) ( -160 -712 576 ) ( 160 -712 576 ) facility114x/floor-floor02 256 420.1025390625 0 0.625 0.609375 0 0 0
+( -160 -368 576 ) ( -160 -712 608 ) ( -160 -712 576 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -64 -680 64 ) ( -32 -680 -64 ) ( -64 -680 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "item_health_mega"
@@ -16379,18 +16379,18 @@ ex2x/light-1
 }
 {
 "classname" "light"
-"origin" "0.000000 520.000000 544.000000"
+"origin" "0.000000 524.000000 544.000000"
 "light" "700"
 "target" "target_position5"
 }
 {
 "classname" "light"
-"origin" "0.000000 520.000000 560.000000"
+"origin" "0.000000 524.000000 560.000000"
 "light" "10"
 }
 {
 "classname" "target_position"
-"origin" "0.000000 520.000000 416.000000"
+"origin" "0.000000 524.000000 416.000000"
 "targetname" "target_position5"
 }
 {
@@ -18193,7 +18193,7 @@ facility114x/misc-tube
 }
 {
 "classname" "light"
-"origin" "0.000000 520.000000 440.000000"
+"origin" "0.000000 524.000000 440.000000"
 "light" "250"
 }
 {
@@ -18501,3 +18501,216 @@ facility114x/misc-tube
 "target" "target_spawn13"
 "targetname" "trigger_delay6"
 }
+{
+"classname" "target_speaker"
+"origin" "1184.000000 528.000000 528.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+"angle" "-179.999985"
+}
+{
+"classname" "target_speaker"
+"origin" "0.000000 128.000000 272.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "0.000000 -128.000000 272.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "752.000000 0.000000 272.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "-752.000000 0.000000 272.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "1184.000000 -352.000000 528.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+"angle" "-179.999985"
+}
+{
+"classname" "target_speaker"
+"origin" "1184.000000 -832.000000 528.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+"angle" "-179.999985"
+}
+{
+"classname" "target_speaker"
+"origin" "592.000000 -1184.000000 528.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+"angle" "-179.999985"
+}
+{
+"classname" "target_speaker"
+"origin" "0.000000 -524.000000 528.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+"angle" "-179.999985"
+}
+{
+"classname" "target_speaker"
+"origin" "-1184.000000 -528.000000 528.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "-1184.000000 832.000000 528.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "-1184.000000 352.000000 528.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "-592.000000 1184.000000 528.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "0.000000 524.000000 528.000000"
+"noise" "sound/machines/Flourescent-Loop(Stereo).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "-1672.000000 -528.000000 376.000000"
+"noise" "sound/machines/portal_idle.wav"
+"volume" "0.5"
+"angle" "-179.999985"
+}
+{
+"classname" "target_speaker"
+"origin" "-1184.000000 -904.000000 120.000000"
+"noise" "sound/machines/portal_idle.wav"
+"volume" "0.5"
+"angle" "-179.999985"
+}
+{
+"classname" "target_speaker"
+"origin" "1184.000000 904.000000 120.000000"
+"noise" "sound/machines/portal_idle.wav"
+"volume" "0.5"
+}
+{
+"classname" "target_speaker"
+"origin" "1672.000000 528.000000 376.000000"
+"noise" "sound/machines/portal_idle.wav"
+"volume" "0.5"
+}
+{
+"classname" "info_location"
+"origin" "0.000000 0.000000 400.000000"
+"netname" "^2Bridge ^7"
+}
+{
+"classname" "info_location"
+"origin" "-1184.000000 -576.000000 128.000000"
+"netname" "^1RED Base^7"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-1184.000000 576.000000 312.000000"
+"netname" "^1RED Jumppad^7"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-752.000000 0.000000 128.000000"
+"netname" "^1RED Hallway^7"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "0.000000 0.000000 128.000000"
+"netname" "^2Arena ^7"
+}
+{
+"classname" "info_location"
+"origin" "-1184.000000 0.000000 128.000000"
+"netname" "^1RED Crossroad^7"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "0.000000 524.000000 432.000000"
+"netname" "^1RED Bridge^7"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-1184.000000 1184.000000 432.000000"
+"netname" "^1RED Armour^7"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "-592.000000 1184.000000 432.000000"
+"netname" "^1RED Upper Hallway^7"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "0.000000 1184.000000 432.000000"
+"netname" "^1RED Corner^7"
+"angle" "-179.999985"
+}
+{
+"classname" "info_location"
+"origin" "752.000000 0.000000 128.000000"
+"netname" "^4BLUE Hallway^7"
+}
+{
+"classname" "info_location"
+"origin" "1184.000000 0.000000 128.000000"
+"netname" "^4BLUE Crossroad^7"
+}
+{
+"classname" "info_location"
+"origin" "1184.000000 -1184.000000 432.000000"
+"netname" "^4BLUE Armour^7"
+}
+{
+"classname" "info_location"
+"origin" "1184.000000 -576.000000 312.000000"
+"netname" "^4BLUE Jumppad^7"
+}
+{
+"classname" "info_location"
+"origin" "592.000000 -1184.000000 432.000000"
+"netname" "^4BLUE Upper Hallway^7"
+}
+{
+"classname" "info_location"
+"origin" "1184.000000 576.000000 128.000000"
+"netname" "^4BLUE Base^7"
+}
+{
+"classname" "info_location"
+"origin" "0.000000 -524.000000 432.000000"
+"netname" "^4BLUE Bridge^7"
+}
+{
+"classname" "info_location"
+"origin" "0.000000 -1184.000000 432.000000"
+"netname" "^4BLUE Corner^7"
+}