From: cbrutail Date: Wed, 4 Jan 2012 15:32:12 +0000 (+0100) Subject: Finally managed to get all sounds working. Some fixes here and there happened too. X-Git-Tag: xonotic-v0.6.0~5^2~24 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4b834a8f1dc20bf639d3e434a768918f9ff6c1f6;p=xonotic%2Fxonotic-maps.pk3dir.git Finally managed to get all sounds working. Some fixes here and there happened too. --- diff --git a/maps/darkzone.map b/maps/darkzone.map index 9e408734..13a54eb4 100644 --- a/maps/darkzone.map +++ b/maps/darkzone.map @@ -3585,16 +3585,16 @@ exx/floor-simplines } { ( -368 128 -384 ) ( -384 128 -384 ) ( -384 48 -384 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -384 48 -192 ) ( -384 128 -192 ) ( -368 128 -192 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -384 48 -208 ) ( -384 128 -208 ) ( -368 128 -208 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -384 16 -192 ) ( -368 16 -192 ) ( -368 16 -384 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -368 16 -192 ) ( -368 96 -192 ) ( -368 96 -384 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -368 128 -192 ) ( -384 128 -192 ) ( -384 128 -384 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -368 112 -192 ) ( -384 112 -192 ) ( -384 112 -384 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -384 128 -192 ) ( -384 48 -192 ) ( -384 48 -384 ) exx/floor-tile03 1 122.0000305176 0 0.2199999988 0.2300000042 0 0 0 } { ( -368 -176 -384 ) ( -376 -176 -384 ) ( -376 -256 -384 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -376 -256 -192 ) ( -376 -176 -192 ) ( -368 -176 -192 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -376 -256 -192 ) ( -368 -256 -192 ) ( -368 -256 -384 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -376 -256 -208 ) ( -376 -176 -208 ) ( -368 -176 -208 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -376 -240 -196 ) ( -368 -240 -196 ) ( -368 -240 -388 ) common/caulk 0 248 0 0.5 0.5 0 0 0 ( -368 -256 -192 ) ( -368 -176 -192 ) ( -368 -176 -384 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -368 -144 -192 ) ( -376 -144 -192 ) ( -376 -144 -384 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -384 -176 -192 ) ( -384 -256 -192 ) ( -384 -256 -384 ) exx/floor-tile03 70 126.0000305176 0 0.2199999988 0.2300000042 0 0 0 @@ -3618,7 +3618,7 @@ exx/floor-simplines ( -144 -128 -320 ) ( -128 -112 -320 ) ( -144 -128 -64 ) exx/base-metal06rust 0 0 0 0.25 0.25 0 0 0 ( -128 -128 -88 ) ( -128 0 -88 ) ( -128 0 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -144 -128 -88 ) ( -128 -128 -88 ) ( -128 -128 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -144 -128 -64 ) ( -144 0 -64 ) ( -128 0 -64 ) exx/floor-clang01b 0 0 0 0.5 0.5 0 0 0 +( -144 -128 -64 ) ( -144 0 -64 ) ( -128 0 -64 ) exx/floor-clang01b 0 0 0 0.25 0.25 0 0 0 ( -128 0 -320 ) ( -144 0 -320 ) ( -144 -128 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0 } { @@ -13647,14 +13647,14 @@ common/clip ( -320 -448 448 ) ( -320 -448 -104 ) ( -320 -320 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -192 -448 448 ) ( -192 -448 -104 ) ( -320 -448 -104 ) common/caulk 224 0 -180 0.5 -0.5 0 0 0 ( -320 -320 448 ) ( -320 -320 -104 ) ( -192 -448 -104 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0 -( -72 -320 448 ) ( -56 -320 448 ) ( -72 -448 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -228 64 240 ) ( -224 64 240 ) ( -228 -64 240 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { ( -320 192 448 ) ( -192 320 -104 ) ( -320 192 -104 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0 ( -320 192 448 ) ( -320 192 -104 ) ( -320 320 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -192 320 448 ) ( -320 320 -104 ) ( -192 320 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( -320 320 -104 ) ( -320 192 -104 ) ( -192 320 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -72 320 448 ) ( -56 320 448 ) ( -72 192 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -228 64 240 ) ( -224 64 240 ) ( -228 -64 240 ) common/caulk 0 0 0 0.25 0.25 0 0 0 } { ( 448 320 248 ) ( 320 320 248 ) ( 448 192 248 ) common/caulk 240 15 -90 0.5 0.5 0 0 0 @@ -18716,12 +18716,12 @@ trak5x/base-pipe1b ( 1216 928 208 ) ( 1184 96 208 ) ( 1216 96 208 ) exx/floor-rnd01 0 0 0 0.25 0.25 0 0 0 } { -( 1112 656 224 ) ( 1128 672 224 ) ( 1128 672 208 ) exx/base-metal06rust 0 0 90 0.125 -0.125 0 0 0 -( 1096 656 224 ) ( 1112 656 224 ) ( 1112 656 208 ) exx/base-metal06rust 192 0 0 -0.25 0.25 0 0 0 -( 1080 672 224 ) ( 1096 656 224 ) ( 1096 656 208 ) exx/base-metal06rust 192 0 0 -0.25 0.25 0 0 0 -( 1080 672 224 ) ( 1128 672 208 ) ( 1128 672 224 ) common/caulk 192 0 0 -0.25 0.25 0 0 0 -( 1080 672 224 ) ( 1128 672 224 ) ( 1096 656 224 ) exx/floor-metal02 192 320 180 0.25 0.25 0 0 0 -( 1096 656 208 ) ( 1128 672 208 ) ( 1080 672 208 ) exx/floor-rnd01 256 184 180 0.25 0.25 0 0 0 +( 1112 656 224 ) ( 1128 672 224 ) ( 1128 672 208 ) exx/base-metal06rust 0 0 90 0.125 -0.125 134217728 0 0 +( 1096 656 224 ) ( 1112 656 224 ) ( 1112 656 208 ) exx/base-metal06rust 192 0 0 -0.25 0.25 134217728 0 0 +( 1080 672 224 ) ( 1096 656 224 ) ( 1096 656 208 ) exx/base-metal06rust 192 0 0 -0.25 0.25 134217728 0 0 +( 1080 672 224 ) ( 1128 672 208 ) ( 1128 672 224 ) common/caulk 192 0 0 -0.25 0.25 134217728 0 0 +( 1080 672 224 ) ( 1128 672 224 ) ( 1096 656 224 ) exx/floor-metal02 192 320 180 0.25 0.25 134217728 0 0 +( 1096 656 208 ) ( 1128 672 208 ) ( 1080 672 208 ) exx/floor-rnd01 256 184 180 0.25 0.25 134217728 0 0 } { ( 1072 112 224 ) ( 1072 512 208 ) ( 1072 512 224 ) common/caulk 256 0 90 0.125 0.125 0 0 0 @@ -18732,36 +18732,36 @@ trak5x/base-pipe1b ( 1072 112 208 ) ( 1168 512 208 ) ( 1072 512 208 ) exx/floor-rnd01 256 184 180 0.25 0.25 0 0 0 } { -( 1168 672 209 ) ( 1168 512 212 ) ( 1168 672 212 ) common/caulk 128 128 -90 0.125 -0.125 0 0 0 -( 1072 672 209 ) ( 1168 672 212 ) ( 1072 672 212 ) common/caulk 192 64 180 0.25 0.25 0 0 0 -( 1072 512 209 ) ( 1072 672 212 ) ( 1072 512 212 ) common/caulk 256 64 -0 0.25 -0.25 0 0 0 -( 1168 512 209 ) ( 1072 512 212 ) ( 1168 512 212 ) common/caulk 192 64 180 0.25 0.25 0 0 0 +( 1168 672 209 ) ( 1168 512 212 ) ( 1168 672 212 ) common/nodraw 128 128 -90 0.125 -0.125 0 0 0 +( 1072 672 209 ) ( 1168 672 212 ) ( 1072 672 212 ) common/nodraw 192 64 180 0.25 0.25 0 0 0 +( 1072 512 209 ) ( 1072 672 212 ) ( 1072 512 212 ) common/nodraw 256 64 -0 0.25 -0.25 0 0 0 +( 1168 512 209 ) ( 1072 512 212 ) ( 1168 512 212 ) common/nodraw 192 64 180 0.25 0.25 0 0 0 ( 1072 672 209 ) ( 1168 512 209 ) ( 1168 672 209 ) exx/floor-grate01-cull 224 408 0 -0.200000003 0.200000003 0 0 0 -( 1168 512 212 ) ( 1072 512 212 ) ( 1072 672 212 ) common/caulk 0 192 0 -0.25 0.25 0 0 0 +( 1168 512 212 ) ( 1072 512 212 ) ( 1072 672 212 ) common/nodraw 0 192 0 -0.25 0.25 0 0 0 } { -( 1168 672 224 ) ( 1168 656 208 ) ( 1168 656 224 ) common/caulk 256 0 90 0.125 -0.125 0 0 0 -( 1168 656 224 ) ( 1160 656 208 ) ( 1160 656 224 ) exx/base-metal06rust 192 0 0 -0.25 0.25 0 0 0 -( 1144 672 224 ) ( 1160 656 224 ) ( 1160 656 208 ) exx/base-metal06rust 192 0 0 -0.25 0.25 0 0 0 -( 1168 672 224 ) ( 1144 672 224 ) ( 1144 672 208 ) common/caulk 192 0 0 -0.25 0.25 0 0 0 -( 1168 656 224 ) ( 1160 656 224 ) ( 1168 672 224 ) exx/floor-metal02 448 320 180 0.25 0.25 0 0 0 -( 1168 672 208 ) ( 1160 656 208 ) ( 1168 656 208 ) exx/floor-rnd01 256 184 180 0.25 0.25 0 0 0 +( 1168 672 224 ) ( 1168 656 208 ) ( 1168 656 224 ) common/caulk 256 0 90 0.125 -0.125 134217728 0 0 +( 1168 656 224 ) ( 1160 656 208 ) ( 1160 656 224 ) exx/base-metal06rust 192 0 0 -0.25 0.25 134217728 0 0 +( 1144 672 224 ) ( 1160 656 224 ) ( 1160 656 208 ) exx/base-metal06rust 192 0 0 -0.25 0.25 134217728 0 0 +( 1168 672 224 ) ( 1144 672 224 ) ( 1144 672 208 ) common/caulk 192 0 0 -0.25 0.25 134217728 0 0 +( 1168 656 224 ) ( 1160 656 224 ) ( 1168 672 224 ) exx/floor-metal02 448 320 180 0.25 0.25 134217728 0 0 +( 1168 672 208 ) ( 1160 656 208 ) ( 1168 656 208 ) exx/floor-rnd01 256 184 180 0.25 0.25 134217728 0 0 } { -( 1128 528 224 ) ( 1112 512 224 ) ( 1112 512 208 ) exx/base-metal06rust 0 0 90 0.125 0.125 0 0 0 -( 1144 528 224 ) ( 1128 528 224 ) ( 1128 528 208 ) exx/base-metal06rust 192 0 0 0.25 0.25 0 0 0 -( 1160 512 224 ) ( 1144 528 224 ) ( 1144 528 208 ) exx/base-metal06rust 64 0 0 0.25 0.25 0 0 0 -( 1160 512 224 ) ( 1112 512 208 ) ( 1112 512 224 ) common/caulk 192 0 0 0.25 0.25 0 0 0 -( 1160 512 224 ) ( 1112 512 224 ) ( 1144 528 224 ) exx/floor-metal02 448 448 0 0.25 0.25 0 0 0 -( 1144 528 208 ) ( 1112 512 208 ) ( 1160 512 208 ) exx/floor-rnd01 256 184 180 0.25 0.25 0 0 0 +( 1128 528 224 ) ( 1112 512 224 ) ( 1112 512 208 ) exx/base-metal06rust 0 0 90 0.125 0.125 134217728 0 0 +( 1144 528 224 ) ( 1128 528 224 ) ( 1128 528 208 ) exx/base-metal06rust 192 0 0 0.25 0.25 134217728 0 0 +( 1160 512 224 ) ( 1144 528 224 ) ( 1144 528 208 ) exx/base-metal06rust 64 0 0 0.25 0.25 134217728 0 0 +( 1160 512 224 ) ( 1112 512 208 ) ( 1112 512 224 ) common/caulk 192 0 0 0.25 0.25 134217728 0 0 +( 1160 512 224 ) ( 1112 512 224 ) ( 1144 528 224 ) exx/floor-metal02 448 448 0 0.25 0.25 134217728 0 0 +( 1144 528 208 ) ( 1112 512 208 ) ( 1160 512 208 ) exx/floor-rnd01 256 184 180 0.25 0.25 134217728 0 0 } { -( 1072 512 224 ) ( 1072 528 208 ) ( 1072 528 224 ) common/caulk 0 0 90 0.125 0.125 0 0 0 -( 1072 528 224 ) ( 1080 528 208 ) ( 1080 528 224 ) exx/base-metal06rust 192 0 0 0.25 0.25 0 0 0 -( 1096 512 224 ) ( 1080 528 224 ) ( 1080 528 208 ) exx/base-metal06rust 64 0 0 0.25 0.25 0 0 0 -( 1072 512 224 ) ( 1096 512 224 ) ( 1096 512 208 ) common/caulk 192 0 0 0.25 0.25 0 0 0 -( 1072 528 224 ) ( 1080 528 224 ) ( 1072 512 224 ) exx/floor-metal02 192 448 0 0.25 0.25 0 0 0 -( 1072 512 208 ) ( 1080 528 208 ) ( 1072 528 208 ) exx/floor-rnd01 256 184 180 0.25 0.25 0 0 0 +( 1072 512 224 ) ( 1072 528 208 ) ( 1072 528 224 ) common/caulk 0 0 90 0.125 0.125 134217728 0 0 +( 1072 528 224 ) ( 1080 528 208 ) ( 1080 528 224 ) exx/base-metal06rust 192 0 0 0.25 0.25 134217728 0 0 +( 1096 512 224 ) ( 1080 528 224 ) ( 1080 528 208 ) exx/base-metal06rust 64 0 0 0.25 0.25 134217728 0 0 +( 1072 512 224 ) ( 1096 512 224 ) ( 1096 512 208 ) common/caulk 192 0 0 0.25 0.25 134217728 0 0 +( 1072 528 224 ) ( 1080 528 224 ) ( 1072 512 224 ) exx/floor-metal02 192 448 0 0.25 0.25 134217728 0 0 +( 1072 512 208 ) ( 1080 528 208 ) ( 1072 528 208 ) exx/floor-rnd01 256 184 180 0.25 0.25 134217728 0 0 } { ( 1168 680 224 ) ( 1168 912 208 ) ( 1168 912 224 ) common/caulk 256 -0 90 0.125 0.125 0 0 0 @@ -18844,24 +18844,12 @@ trak5x/base-pipe1b ( 128 -552 24 ) ( 128 -672 32 ) ( 128 -672 24 ) common/caulk 160 0 0 0.25 0.25 0 0 0 } { -( 1072 672 223 ) ( 1072 512 220 ) ( 1072 672 220 ) common/caulk 0 128 90 0.125 0.125 0 0 0 -( 1168 672 223 ) ( 1072 672 220 ) ( 1168 672 220 ) common/caulk 192 0 0 0.25 0.25 0 0 0 -( 1168 512 223 ) ( 1168 672 220 ) ( 1168 512 220 ) common/caulk 0 0 0 0.25 0.25 0 0 0 -( 1072 512 223 ) ( 1168 512 220 ) ( 1072 512 220 ) common/caulk 192 0 0 0.25 0.25 0 0 0 +( 1072 672 223 ) ( 1072 512 220 ) ( 1072 672 220 ) common/nodraw 0 128 90 0.125 0.125 0 0 0 +( 1168 672 223 ) ( 1072 672 220 ) ( 1168 672 220 ) common/nodraw 192 0 0 0.25 0.25 0 0 0 +( 1168 512 223 ) ( 1168 672 220 ) ( 1168 512 220 ) common/nodraw 0 0 0 0.25 0.25 0 0 0 +( 1072 512 223 ) ( 1168 512 220 ) ( 1072 512 220 ) common/nodraw 192 0 0 0.25 0.25 0 0 0 ( 1168 672 223 ) ( 1072 512 223 ) ( 1072 672 223 ) exx/floor-grate01-cull 288 -104 0 0.200000003 0.200000003 0 0 0 -( 1072 512 220 ) ( 1168 512 220 ) ( 1168 672 220 ) common/caulk 0 448 0 0.25 0.25 0 0 0 -} -{ -patchDef2 -{ -effects_lightning/lightning1_b -( 3 3 0 0 0 ) -( -( ( 1112 512 215.875 0 0 ) ( 1112 584 215.875 1.9999998808 0 ) ( 1112 656 215.875 3.9999997616 0 ) ) -( ( 1104 512 215.875 0 -0.4999999702 ) ( 1104 584 215.875 1.9999998808 -0.4999999702 ) ( 1104 656 215.875 3.9999997616 -0.4999999702 ) ) -( ( 1096 512 215.875 0 -0.9999999404 ) ( 1096 584 215.875 1.9999998808 -0.9999999404 ) ( 1096 656 215.875 3.9999997616 -0.9999999404 ) ) -) -} +( 1072 512 220 ) ( 1168 512 220 ) ( 1168 672 220 ) common/nodraw 0 448 0 0.25 0.25 0 0 0 } { patchDef2 @@ -18869,9 +18857,9 @@ patchDef2 effects_lightning/lightning1_b ( 3 3 0 0 0 ) ( -( ( 1096 512 216 0 0 ) ( 1096 584 216 7.9999995232 0 ) ( 1096 656 216 15.9999990463 0 ) ) -( ( 1104 512 216 0 -0.4999999702 ) ( 1104 584 216 7.9999995232 -0.4999999702 ) ( 1104 656 216 15.9999990463 -0.4999999702 ) ) -( ( 1112 512 216 0 -0.9999999404 ) ( 1112 584 216 7.9999995232 -0.9999999404 ) ( 1112 656 216 15.9999990463 -0.9999999404 ) ) +( ( 1096 512 216 0 0 ) ( 1096 584 216 -2 0 ) ( 1096 656 216 -4 0 ) ) +( ( 1104 512 216 0 0.5 ) ( 1104 584 216 -2 0.5 ) ( 1104 656 216 -4 0.5 ) ) +( ( 1112 512 216 0 1 ) ( 1112 584 216 -2 1 ) ( 1112 656 216 -4 1 ) ) ) } } @@ -18881,21 +18869,9 @@ patchDef2 effects_lightning/lightning1_c ( 3 3 0 0 0 ) ( -( ( 1144 528 215.875 0 0 ) ( 1144 600 215.875 1.9999998808 0 ) ( 1144 672 215.875 3.9999997616 0 ) ) -( ( 1136 528 215.875 0 -0.4999999702 ) ( 1136 600 215.875 1.9999998808 -0.4999999702 ) ( 1136 672 215.875 3.9999997616 -0.4999999702 ) ) -( ( 1128 528 215.875 0 -0.9999999404 ) ( 1128 600 215.875 1.9999998808 -0.9999999404 ) ( 1128 672 215.875 3.9999997616 -0.9999999404 ) ) -) -} -} -{ -patchDef2 -{ -effects_lightning/lightning1_c -( 3 3 0 0 0 ) -( -( ( 1128 528 216 0 0 ) ( 1128 600 216 1.9999998808 0 ) ( 1128 672 216 3.9999997616 0 ) ) -( ( 1136 528 216 0 -0.4999999702 ) ( 1136 600 216 1.9999998808 -0.4999999702 ) ( 1136 672 216 3.9999997616 -0.4999999702 ) ) -( ( 1144 528 216 0 -0.9999999404 ) ( 1144 600 216 1.9999998808 -0.9999999404 ) ( 1144 672 216 3.9999997616 -0.9999999404 ) ) +( ( 1128 528 216 0 0 ) ( 1128 600 216 -2 0 ) ( 1128 672 216 -4 0 ) ) +( ( 1136 528 216 0 0.5 ) ( 1136 600 216 -2 0.5 ) ( 1136 672 216 -4 0.5 ) ) +( ( 1144 528 216 0 1 ) ( 1144 600 216 -2 1 ) ( 1144 672 216 -4 1 ) ) ) } } @@ -23143,6 +23119,20 @@ trak6x/trim-trim3b ( 256 304 -8 ) ( 256 320 -8 ) ( 256 304 -4 ) common/clip 0 0 0 0.25 0.25 0 0 0 ( -64 304 24 ) ( -64 320 32 ) ( 64 304 24 ) common/clip 0 0 0 0.25 0.25 0 0 0 } +{ +( -320 -448 448 ) ( -320 -448 -104 ) ( -320 -320 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -192 -448 448 ) ( -192 -448 -104 ) ( -320 -448 -104 ) common/caulk 224 0 -180 0.5 -0.5 0 0 0 +( -320 -320 448 ) ( -320 -320 -104 ) ( -192 -448 -104 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0 +( -72 -320 448 ) ( -56 -320 448 ) ( -72 -448 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -228 -64 256 ) ( -216 64 256 ) ( -228 64 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} +{ +( -320 192 448 ) ( -192 320 -104 ) ( -320 192 -104 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0 +( -320 192 448 ) ( -320 192 -104 ) ( -320 320 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -192 320 448 ) ( -320 320 -104 ) ( -192 320 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -72 320 448 ) ( -56 320 448 ) ( -72 192 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -220 -64 256 ) ( -208 64 256 ) ( -220 64 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0 +} } { "classname" "func_door_secret" @@ -23685,7 +23675,7 @@ trak5x/trim-trim1a { "classname" "light" "light" "250" -"origin" "832 456 328" +"origin" "832.000000 456.000000 324.000000" } { "classname" "light" @@ -24241,7 +24231,7 @@ exx/trim-baseboard02 } { "classname" "info_player_deathmatch" -"origin" "-160.000000 -48.000000 -288.000000" +"origin" "-184.000000 -64.000000 -288.000000" "angle" "-179.999985" } { @@ -29845,6 +29835,7 @@ exx/wall-metalrib01 "classname" "func_rotating" "targetname" "func_rotating1" "spawnflags" "8" +"speed" "-100" { ( 292 -440 -4 ) ( 292 -416 -4 ) ( 300 -440 -4 ) common/origin 64 0 180 0.25 0.25 0 0 0 ( 292 -456 0 ) ( 300 -456 0 ) ( 292 -456 -16 ) common/origin 64 0 0 -0.25 0.25 0 0 0 @@ -30166,17 +30157,19 @@ exx/wall-metalrib01 "classname" "target_speaker" "origin" "296.000000 -440.000000 48.000000" "noise" "sound/machines/Gas_Generator.wav" -"volume" "0.5" +"volume" "0.70" } { "classname" "target_speaker" -"origin" "296.000000 312.000000 48.000000" +"origin" "920.000000 250.000000 280.000000" "noise" "sound/machines/Gas_Generator.wav" "volume" "0.5" } { "classname" "target_speaker" -"origin" "-96.000000 -488.000000 352.000000" +"origin" "224.000000 352.000000 352.000000" +"noise" "sound/machines/pumps_looped.ogg" +"volume" "0.5" } { "classname" "target_speaker" @@ -30184,3 +30177,674 @@ exx/wall-metalrib01 "volume" "0.25" "noise" "sound/machines/Electric-Arcs1.wav" } +{ +"classname" "target_speaker" +"origin" "-96.000000 352.000000 352.000000" +"noise" "sound/machines/pumps_looped.ogg" +"volume" "0.5" +} +{ +"classname" "target_speaker" +"origin" "224.000000 -480.000000 352.000000" +"noise" "sound/machines/pumps_looped.ogg" +"volume" "0.5" +} +{ +"classname" "target_speaker" +"origin" "-96.000000 -480.000000 352.000000" +"noise" "sound/machines/pumps_looped.ogg" +"volume" "0.5" +} +{ +"classname" "target_speaker" +"origin" "-960.000000 -1200.000000 432.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-800.000000 -448.000000 152.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-544.000000 -64.000000 368.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-544.000000 -224.000000 368.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-544.000000 -416.000000 368.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-720.000000 -592.000000 432.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-960.000000 -592.000000 432.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-1136.000000 -768.000000 432.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-1136.000000 -1024.000000 432.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-464.000000 -704.000000 432.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-464.000000 -1024.000000 432.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-640.000000 -1200.000000 432.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-416.000000 -64.000000 368.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "512.000000 -64.000000 368.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "768.000000 -64.000000 352.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "1120.000000 -64.000000 336.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "976.000000 1408.000000 352.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "462.000000 1140.000000 240.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "64.000000 800.000000 164.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "64.000000 608.000000 164.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-240.000000 -368.000000 -48.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-648.000000 -64.000000 192.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "64.000000 -736.000000 152.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-128.000000 -736.000000 160.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "832.000000 460.000000 324.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +} +{ +"classname" "target_speaker" +"origin" "-416.000000 -224.000000 -368.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "2" +} +{ +"classname" "target_speaker" +"origin" "800.000000 -168.000000 96.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +"atten" "3" +} +{ +"classname" "target_speaker" +"origin" "1192.000000 160.000000 96.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +"atten" "3" +} +{ +"classname" "target_speaker" +"origin" "1192.000000 352.000000 96.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +"atten" "3" +} +{ +"classname" "target_speaker" +"origin" "1192.000000 672.000000 96.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +"atten" "3" +} +{ +"classname" "target_speaker" +"origin" "1192.000000 864.000000 96.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +"atten" "3" +} +{ +"classname" "target_speaker" +"origin" "896.000000 1192.000000 96.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +"atten" "3" +} +{ +"classname" "target_speaker" +"origin" "704.000000 1192.000000 96.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +"atten" "3" +} +{ +"classname" "target_speaker" +"origin" "64.000000 328.000000 352.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +"atten" "3" +} +{ +"classname" "target_speaker" +"origin" "-400.000000 -64.000000 184.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-528.000000 -64.000000 184.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-1000.000000 -248.000000 512.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +} +{ +"classname" "target_speaker" +"origin" "-416.000000 96.000000 -368.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "2" +} +{ +"classname" "target_speaker" +"origin" "-768.000000 -800.000000 136.000000" +"noise" "sound/machines/portal_idle.wav" +"volume" "0.10" +"angle" "-90.000000" +} +{ +"classname" "target_speaker" +"origin" "-832.000000 -800.000000 136.000000" +"noise" "sound/machines/portal_idle.wav" +"volume" "0.10" +"angle" "-90.000000" +} +{ +"classname" "target_speaker" +"origin" "-1000.000000 288.000000 436.000000" +"noise" "sound/machines/portal_idle.wav" +"volume" "0.10" +} +{ +"classname" "target_speaker" +"origin" "-1000.000000 224.000000 436.000000" +"noise" "sound/machines/portal_idle.wav" +"volume" "0.10" +} +{ +"classname" "target_speaker" +"origin" "-784.000000 -64.000000 -308.000000" +"noise" "sound/machines/portal_idle.wav" +"volume" "0.10" +"angle" "-90.000000" +} +{ +"classname" "target_speaker" +"origin" "32.000000 -64.000000 44.000000" +"noise" "sound/machines/portal_idle.wav" +"volume" "0.10" +"angle" "-90.000000" +} +{ +"classname" "target_speaker" +"origin" "-352.000000 -736.000000 160.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "1088.000000 240.000000 352.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "1408.000000 976.000000 352.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "1408.000000 1136.000000 352.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "1408.000000 1296.000000 352.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "1296.000000 1408.000000 352.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "1136.000000 1408.000000 352.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "296.000000 312.000000 48.000000" +"noise" "sound/machines/Gas_Generator.wav" +"volume" "0.70" +} +{ +"classname" "target_speaker" +"origin" "80.000000 784.000000 48.000000" +"noise" "sound/lava/lavahiss2.ogg" +"targetname" "lavahiss6" +"angle" "0.000010" +"volume" "0.30" +} +{ +"classname" "trigger_multivibrator" +"origin" "144.000000 768.000000 48.000000" +"target" "lavahiss5" +"spawnflags" "1" +"wait" "40" +"target2" "lavahiss6" +"target_random" "1" +"angle" "0.000010" +} +{ +"classname" "target_speaker" +"origin" "80.000000 752.000000 48.000000" +"noise" "sound/lava/lavahiss1.ogg" +"targetname" "lavahiss5" +"angle" "0.000010" +"volume" "0.30" +} +{ +"classname" "target_speaker" +"origin" "-582.000000 -80.000000 -376.000000" +"noise" "sound/lava/lavahiss2.ogg" +"targetname" "lavahiss8" +"angle" "179.999985" +"volume" "0.30" +} +{ +"classname" "trigger_multivibrator" +"origin" "-646.000000 -64.000000 -376.000000" +"target" "lavahiss7" +"spawnflags" "1" +"wait" "25" +"target2" "lavahiss8" +"target_random" "1" +"angle" "179.999985" +} +{ +"classname" "target_speaker" +"origin" "-582.000000 -48.000000 -376.000000" +"noise" "sound/lava/lavahiss1.ogg" +"targetname" "lavahiss7" +"angle" "179.999985" +"volume" "0.30" +} +{ +"classname" "target_speaker" +"origin" "-776.000000 -464.000000 32.000000" +"noise" "sound/lava/lavahiss2.ogg" +"targetname" "lavahiss2" +"angle" "-179.999985" +"volume" "0.30" +} +{ +"classname" "trigger_multivibrator" +"origin" "-840.000000 -448.000000 32.000000" +"target" "lavahiss1" +"spawnflags" "1" +"wait" "45" +"target2" "lavahiss2" +"target_random" "1" +"angle" "-179.999985" +} +{ +"classname" "target_speaker" +"origin" "-776.000000 -432.000000 32.000000" +"noise" "sound/lava/lavahiss1.ogg" +"targetname" "lavahiss1" +"angle" "-179.999985" +"volume" "0.30" +} +{ +"classname" "target_speaker" +"origin" "-152.000000 -418.000000 16.000000" +"noise" "sound/lava/lavahiss2.ogg" +"targetname" "lavahiss10" +"angle" "89.999992" +"volume" "0.30" +} +{ +"classname" "trigger_multivibrator" +"origin" "-136.000000 -354.000000 16.000000" +"target" "lavahiss9" +"spawnflags" "1" +"wait" "45" +"target2" "lavahiss10" +"target_random" "1" +"angle" "89.999992" +} +{ +"classname" "target_speaker" +"origin" "-120.000000 -418.000000 16.000000" +"noise" "sound/lava/lavahiss1.ogg" +"targetname" "lavahiss9" +"angle" "89.999992" +"volume" "0.30" +} +{ +"classname" "target_speaker" +"origin" "386.000000 168.000000 16.000000" +"noise" "sound/lava/lavahiss2.ogg" +"targetname" "lavahiss12" +"angle" "179.999985" +"volume" "0.30" +} +{ +"classname" "trigger_multivibrator" +"origin" "322.000000 184.000000 16.000000" +"target" "lavahiss11" +"spawnflags" "1" +"wait" "40" +"target2" "lavahiss12" +"target_random" "1" +"angle" "179.999985" +} +{ +"classname" "target_speaker" +"origin" "386.000000 200.000000 16.000000" +"noise" "sound/lava/lavahiss1.ogg" +"targetname" "lavahiss11" +"angle" "179.999985" +"volume" "0.30" +} +{ +"classname" "target_speaker" +"origin" "1090.000000 -88.000000 48.000000" +"noise" "sound/lava/lavahiss2.ogg" +"targetname" "lavahiss14" +"angle" "179.999985" +"volume" "0.30" +} +{ +"classname" "trigger_multivibrator" +"origin" "1026.000000 -72.000000 48.000000" +"target" "lavahiss13" +"spawnflags" "1" +"wait" "40" +"target2" "lavahiss14" +"target_random" "1" +"angle" "179.999985" +} +{ +"classname" "target_speaker" +"origin" "1090.000000 -56.000000 48.000000" +"noise" "sound/lava/lavahiss1.ogg" +"targetname" "lavahiss13" +"angle" "179.999985" +"volume" "0.30" +} +{ +"classname" "target_speaker" +"origin" "834.000000 816.000000 48.000000" +"noise" "sound/lava/lavahiss2.ogg" +"targetname" "lavahiss16" +"angle" "179.999985" +"volume" "0.30" +} +{ +"classname" "trigger_multivibrator" +"origin" "770.000000 832.000000 48.000000" +"target" "lavahiss15" +"spawnflags" "1" +"wait" "50" +"target2" "lavahiss16" +"target_random" "1" +"angle" "179.999985" +} +{ +"classname" "target_speaker" +"origin" "834.000000 848.000000 48.000000" +"noise" "sound/lava/lavahiss1.ogg" +"targetname" "lavahiss15" +"angle" "179.999985" +"volume" "0.30" +} +{ +"classname" "trigger_multivibrator" +"origin" "-104.000000 210.000000 16.000000" +"target" "lavahiss17" +"spawnflags" "1" +"wait" "30" +"target2" "lavahiss18" +"target_random" "1" +"angle" "-90.000000" +} +{ +"classname" "target_speaker" +"origin" "-88.000000 274.000000 16.000000" +"noise" "sound/lava/lavahiss2.ogg" +"targetname" "lavahiss18" +"angle" "-90.000000" +"volume" "0.30" +} +{ +"classname" "target_speaker" +"origin" "-120.000000 274.000000 16.000000" +"noise" "sound/lava/lavahiss1.ogg" +"targetname" "lavahiss17" +"angle" "-90.000000" +"volume" "0.30" +} +{ +"classname" "target_speaker" +"origin" "-152.000000 -818.000000 32.000000" +"noise" "sound/lava/lavahiss2.ogg" +"targetname" "lavahiss20" +"angle" "89.999992" +"volume" "0.30" +} +{ +"classname" "trigger_multivibrator" +"origin" "-136.000000 -754.000000 32.000000" +"target" "lavahiss19" +"spawnflags" "1" +"wait" "45" +"target2" "lavahiss20" +"target_random" "1" +"angle" "89.999992" +} +{ +"classname" "target_speaker" +"origin" "-120.000000 -818.000000 32.000000" +"noise" "sound/lava/lavahiss1.ogg" +"targetname" "lavahiss19" +"angle" "89.999992" +"volume" "0.30" +} +{ +"classname" "target_speaker" +"origin" "96.000000 -64.000000 44.000000" +"noise" "sound/machines/portal_idle.wav" +"volume" "0.10" +"angle" "-90.000000" +} +{ +"classname" "target_speaker" +"origin" "386.000000 -376.000000 16.000000" +"noise" "sound/lava/lavahiss2.ogg" +"targetname" "lavahiss4" +"angle" "179.999985" +"volume" "0.30" +} +{ +"classname" "trigger_multivibrator" +"origin" "322.000000 -360.000000 16.000000" +"target" "lavahiss3" +"spawnflags" "1" +"wait" "25" +"target2" "lavahiss4" +"target_random" "1" +"angle" "179.999985" +} +{ +"classname" "target_speaker" +"origin" "386.000000 -344.000000 16.000000" +"noise" "sound/lava/lavahiss1.ogg" +"targetname" "lavahiss3" +"angle" "179.999985" +"volume" "0.30" +} +{ +"classname" "target_speaker" +"origin" "64.000000 -544.000000 156.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "288.000000 800.000000 164.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "400.000000 768.000000 372.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "1134.000000 1140.000000 240.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "608.000000 -168.000000 96.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +"atten" "3" +} +{ +"classname" "target_speaker" +"origin" "64.000000 -456.000000 352.000000" +"noise" "sound/machines/fluorescent_mono_looped.ogg" +"volume" "9.5" +"atten" "3" +} +{ +"classname" "target_speaker" +"origin" "64.000000 416.000000 164.000000" +"volume" "9.5" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "-240.000000 240.000000 -48.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "368.000000 240.000000 -48.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} +{ +"classname" "target_speaker" +"origin" "368.000000 -368.000000 -48.000000" +"volume" "2" +"noise" "sound/machines/light_mono_looped.ogg" +} diff --git a/sound/lava/lavahiss1.ogg b/sound/lava/lavahiss1.ogg new file mode 100644 index 00000000..f3a9a07d Binary files /dev/null and b/sound/lava/lavahiss1.ogg differ diff --git a/sound/lava/lavahiss2.ogg b/sound/lava/lavahiss2.ogg new file mode 100644 index 00000000..9fcab868 Binary files /dev/null and b/sound/lava/lavahiss2.ogg differ diff --git a/sound/machines/Flourescent-Loop(Mono).wav b/sound/machines/Flourescent-Loop(Mono).wav deleted file mode 100644 index 6078ac52..00000000 Binary files a/sound/machines/Flourescent-Loop(Mono).wav and /dev/null differ diff --git a/sound/machines/Flourescent-Loop(Stereo).wav b/sound/machines/Flourescent-Loop(Stereo).wav deleted file mode 100644 index ea11fdbd..00000000 Binary files a/sound/machines/Flourescent-Loop(Stereo).wav and /dev/null differ diff --git a/sound/machines/Lights(Mono).wav b/sound/machines/Lights(Mono).wav deleted file mode 100644 index 8af57d6d..00000000 Binary files a/sound/machines/Lights(Mono).wav and /dev/null differ diff --git a/sound/machines/Lights(Stereo).wav b/sound/machines/Lights(Stereo).wav deleted file mode 100644 index 7e4f8186..00000000 Binary files a/sound/machines/Lights(Stereo).wav and /dev/null differ diff --git a/sound/machines/fluorescent_mono_looped.ogg b/sound/machines/fluorescent_mono_looped.ogg new file mode 100644 index 00000000..2f99aa50 Binary files /dev/null and b/sound/machines/fluorescent_mono_looped.ogg differ diff --git a/sound/machines/fluorescent_stereo_looped.ogg b/sound/machines/fluorescent_stereo_looped.ogg new file mode 100644 index 00000000..0d3a3805 Binary files /dev/null and b/sound/machines/fluorescent_stereo_looped.ogg differ diff --git a/sound/machines/light_mono_looped.ogg b/sound/machines/light_mono_looped.ogg new file mode 100644 index 00000000..6f364020 Binary files /dev/null and b/sound/machines/light_mono_looped.ogg differ diff --git a/sound/machines/light_stereo_looped.ogg b/sound/machines/light_stereo_looped.ogg new file mode 100644 index 00000000..cf86ca46 Binary files /dev/null and b/sound/machines/light_stereo_looped.ogg differ