Merge remote branch 'origin/fruitiex/stormkeepsounds'

diff --git a/maps/g-23.map b/maps/g-23.map
index e96386cad78c64d1afce9d2db4a7a8a5568ab369..b0d38ae54c0f0fd18f6e5e8bbc83aedaa6e162a8 100644 (file)
--- a/maps/g-23.map
+++ b/maps/g-23.map
@@ -11726,6 +11726,7 @@ exx/wall-metalrib01
 {
 "classname" "func_plat"
 "speed" "300"
+"sound1" "sound/machines/Elevator_Up.wav"
 {
 ( 576 -192 0 ) ( 576 -256 0 ) ( 512 -192 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( 576 -192 -32 ) ( 512 -192 -32 ) ( 576 -192 -64 ) exx/wall-bigrib02 0 0 0 0.25 0.25 134217728 0 0
@@ -11890,10 +11891,10 @@ exx/wall-metalrib01
 }
 {
 "classname" "misc_model"
-"origin" "520.000000 -1248.000000 112.000000"
+"origin" "528.000000 -1244.000000 120.000000"
 "model" "models/it/pc.md3"
-"angle" "-180.000000"
 "spawnflags" "2"
+"angles" "90.000000 0.000000 150.000000"
 }
 {
 "classname" "misc_model"
@@ -12318,7 +12319,7 @@ exx/wall-metalrib01
 {
 "classname" "target_speaker"
 "origin" "1472.000000 960.000000 176.000000"
-"noise" "sound/wind/ac_duct_wind.ogg"
+"noise" "sound/wind/ac_duct_wind.wav"
 "angle" "-179.999985"
 "atten" "1.25"
 "volume" "1"
@@ -14428,3 +14429,43 @@ exx/wall-metalrib01
 ( -392 928 64 ) ( -512 928 48 ) ( -512 928 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 }
+{
+"classname" "target_speaker"
+"origin" "664.000000 344.000000 -352.000000"
+"noise" "sound/machines/Big_machine.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-1648.000000 0.000000 -544.000000"
+"noise" "sound/supernatural/space-loop.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1536.000000 -1024.000000 240.000000"
+"noise" "sound/machines/Lights(Mono).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "832.000000 -1024.000000 240.000000"
+"noise" "sound/machines/Lights(Mono).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "320.000000 0.000000 240.000000"
+"noise" "sound/machines/Lights(Mono).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "320.000000 -1024.000000 240.000000"
+"noise" "sound/machines/Lights(Mono).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "524.000000 -1256.000000 136.000000"
+"noise" "sound/machines/Electric-Arcs2.wav"
+"volume" "0.3"
+}

diff --git a/maps/glowplant.map b/maps/glowplant.map
index 462ec4b6c184a5651b8cbe6d17ec23698967693f..1e7159b5a53b866169b19ba4879956998af927f4 100644 (file)
--- a/maps/glowplant.map
+++ b/maps/glowplant.map
@@ -218,7 +218,7 @@
 ( -2048 1152 1216 ) ( -2048 1176 1216 ) ( -952 1176 1216 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -2048 1176 576 ) ( -2048 1152 576 ) ( -952 1152 576 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -2064 1168 1152 ) ( -2064 1168 576 ) ( -944 1168 576 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( -960 1152 1088 ) ( -960 1152 512 ) ( -2048 1152 512 ) map_glowplant/sky 0 0 0 0.25 0.25 0 0 0
+( -960 1152 1056 ) ( -960 1152 480 ) ( -2048 1152 480 ) map_glowplant/sky 0 -0 0 0.25 0.25 0 0 0
 ( -944 1152 576 ) ( -944 1152 1152 ) ( -928 1168 1152 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -2064 1168 640 ) ( -2064 1168 1216 ) ( -2048 1152 1216 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
@@ -16359,7 +16359,7 @@ map_glowplant/sand
 ( 3 3 0 0 0 )
 (
 ( ( -1280 320 8 0 0 ) ( -1280 448 8 0 -1 ) ( -1280 576 8 0 -2 ) )
-( ( -1088 320 8 1.8027756214 0 ) ( -1088 448 40 1.8027756214 -1 ) ( -1088 576 136 1.8027756214 -2 ) )
+( ( -1088 320 8 1.8027756214 0 ) ( -1088 448 41 1.8027756214 -1 ) ( -1088 576 74 1.8027756214 -2 ) )
 ( ( -896 320 8 3.6055512428 0 ) ( -896 448 8 3.6055512428 -1 ) ( -896 576 8 3.6055512428 -2 ) )
 )
 }
@@ -16382,8 +16382,8 @@ patchDef2
 map_glowplant/sand
 ( 3 7 0 0 0 )
 (
-( ( -1664 -384 8 0 0 ) ( -1664 -256 40 0 -1 ) ( -1664 -128 40 0 -2 ) ( -1664 0 104 0 -3 ) ( -1664 128 40 0 -4 ) ( -1664 256 8 0 -5 ) ( -1664 384 8 0 -6 ) )
-( ( -1376 -384 8 2.4141509533 0 ) ( -1376 -256 8 2.4141509533 -1 ) ( -1376 -128 8 2.4141509533 -2 ) ( -1376 0 -8 2.4141509533 -3 ) ( -1376 128 24 2.4141509533 -4 ) ( -1376 256 24 2.4141509533 -5 ) ( -1376 384 8 2.4141509533 -6 ) )
+( ( -1664 -384 8 0 0 ) ( -1664 -256 40 0 -1 ) ( -1664 -128 40 0 -2 ) ( -1664 0 48 0 -3 ) ( -1664 128 40 0 -4 ) ( -1664 256 8 0 -5 ) ( -1664 384 8 0 -6 ) )
+( ( -1376 -384 8 2.4141509533 0 ) ( -1376 -256 8 2.4141509533 -1 ) ( -1376 -128 8 2.4141509533 -2 ) ( -1376 0 0 2.4141509533 -3 ) ( -1376 128 24 2.4141509533 -4 ) ( -1376 256 24 2.4141509533 -5 ) ( -1376 384 8 2.4141509533 -6 ) )
 ( ( -1280 -384 8 3.1744964123 0 ) ( -1280 -256 8 3.1744964123 -1 ) ( -1280 -128 8 3.1744964123 -2 ) ( -1280 0 8 3.1744964123 -3 ) ( -1280 128 8 3.1744964123 -4 ) ( -1280 256 8 3.1744964123 -5 ) ( -1280 384 8 3.1744964123 -6 ) )
 )
 }
@@ -38159,3 +38159,18 @@ exx/floor-panel01
 "classname" "item_armor_medium"
 "origin" "192.000000 -384.000000 528.000000"
 }
+{
+"classname" "target_speaker"
+"origin" "-1760.000000 128.000000 928.000000"
+"noise" "sound/wind/Howling-Wind.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "640.000000 1248.000000 336.000000"
+"noise" "sound/machines/radiostatic_loop.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "240.000000 -576.000000 192.000000"
+"noise" "sound/machines/Big_machine.wav"
+}

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index e7dfd32a35b0f5ea46930b73362a746fce8783be..efd85ca3c0502728dac87a0209c957125ae4c004 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -20206,59 +20206,59 @@ exx/trim-01
 {
 "classname" "target_speaker"
 "origin" "-1136.000000 432.000000 336.000000"
-"noise" "sounds/supernatural/space-loop.wav"
+"noise" "sound/supernatural/space-loop.wav"
 "atten" "1.5"
 }
 {
 "classname" "target_speaker"
 "origin" "32.000000 336.000000 336.000000"
-"noise" "sounds/supernatural/space-loop.wav"
+"noise" "sound/supernatural/space-loop.wav"
 "atten" "1.5"
 }
 {
 "classname" "target_speaker"
 "origin" "1200.000000 640.000000 336.000000"
-"noise" "sounds/supernatural/space-loop.wav"
+"noise" "sound/supernatural/space-loop.wav"
 "atten" "1.5"
 }
 {
 "classname" "target_speaker"
 "origin" "1184.000000 640.000000 -16.000000"
-"noise" "sounds/machines/Slime_Bubbling.wav"
+"noise" "sound/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
 }
 {
 "classname" "target_speaker"
 "origin" "-416.000000 -672.000000 -16.000000"
-"noise" "sounds/machines/Slime_Bubbling.wav"
+"noise" "sound/machines/Slime_Bubbling.wav"
 "atten" "3"
 }
 {
 "classname" "target_speaker"
 "origin" "1712.000000 -224.000000 -208.000000"
-"noise" "sounds/machines/Slime_Bubbling.wav"
+"noise" "sound/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
 }
 {
 "classname" "target_speaker"
 "origin" "-1040.000000 400.000000 -64.000000"
-"noise" "sounds/machines/Slime_Bubbling.wav"
+"noise" "sound/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
 }
 {
 "classname" "target_speaker"
 "origin" "-624.000000 32.000000 -64.000000"
-"noise" "sounds/machines/Slime_Bubbling.wav"
+"noise" "sound/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
 }
 {
 "classname" "target_speaker"
 "origin" "1344.000000 -288.000000 -208.000000"
-"noise" "sounds/machines/Slime_Bubbling.wav"
+"noise" "sound/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
 }
@@ -20923,9 +20923,8 @@ exx/trim-01
 ( -560 -800 -32 ) ( -560 -784 -160 ) ( -560 -784 -32 ) common/clip 224 0 0 0.25 0.25 0 0 0
 }
 }
-// entity 319
 {
 "classname" "target_speaker"
 "origin" "1600.000000 -1920.000000 192.000000"
-"noise" "sounds/supernatural/space-loop.wav"
+"noise" "sound/supernatural/space-loop.wav"
 }