Merge branch 'master' into fruitiex/stormkeepsounds

[xonotic/xonotic-maps.pk3dir.git] / maps / stormkeep.map

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index da2b8e83e1849f7ec1a249a72b4372fe6c1172ae..08058767e876f31300adc276cabac5647d4587f9 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -9072,36 +9072,36 @@ exx/base-metal01
 ( -384 360 320 ) ( -384 480 320 ) ( -384 480 288 ) exx/trim-psimple04 0 0 90 0.25 0.25 0 0 0
 }
 {
-( 2304 -2048 1280 ) ( -1344 -2112 1280 ) ( -1344 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( -1344 -2112 1280 ) ( -1344 -2048 -1024 ) ( -1344 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 -2048 -1024 ) ( -1344 -2048 1280 ) ( -1344 -2048 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 -2112 -1024 ) ( -1344 -2048 -1024 ) ( -1344 -2112 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 -2048 1280 ) ( 2304 -2112 -1024 ) ( 2304 -2112 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 -2112 1280 ) ( -1344 -2112 -1024 ) ( -1344 -2112 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
+( 2304 -2048 1280 ) ( -1344 -2112 1280 ) ( -1344 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( -1344 -2112 1280 ) ( -1344 -2048 -1024 ) ( -1344 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 -2048 -1024 ) ( -1344 -2048 1280 ) ( -1344 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 -2112 -1024 ) ( -1344 -2048 -1024 ) ( -1344 -2112 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 -2048 1280 ) ( 2304 -2112 -1024 ) ( 2304 -2112 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 -2112 1280 ) ( -1344 -2112 -1024 ) ( -1344 -2112 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 }
 {
-( 2304 1152 1280 ) ( 2368 -2048 1280 ) ( 2304 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2368 -2048 1280 ) ( 2304 -2048 -1024 ) ( 2304 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 1152 -1024 ) ( 2304 -2048 1280 ) ( 2304 -2048 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2368 1152 -1024 ) ( 2304 -2048 -1024 ) ( 2368 -2048 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 1152 1280 ) ( 2368 1152 320 ) ( 2368 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2368 1152 1280 ) ( 2368 -2048 -1024 ) ( 2368 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
+( 2304 1152 1280 ) ( 2368 -2048 1280 ) ( 2304 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2368 -2048 1280 ) ( 2304 -2048 -1024 ) ( 2304 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 1152 -1024 ) ( 2304 -2048 1280 ) ( 2304 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2368 1152 -1024 ) ( 2304 -2048 -1024 ) ( 2368 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 1152 1280 ) ( 2368 1152 320 ) ( 2368 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2368 1152 1280 ) ( 2368 -2048 -1024 ) ( 2368 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 }
 {
-( -1344 -2048 1280 ) ( -1408 -2048 1280 ) ( -1408 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( -1344 1152 -1024 ) ( -1408 1152 1280 ) ( -1408 1152 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( -1344 -2048 -1024 ) ( -1344 1152 1280 ) ( -1344 1152 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( -1344 -2048 -1024 ) ( -1408 1152 -1024 ) ( -1408 -2048 -1024 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( -1344 -2048 1280 ) ( -1408 -2048 -1024 ) ( -1408 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( -1408 -2048 1280 ) ( -1408 1152 -1024 ) ( -1408 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
+( -1344 -2048 1280 ) ( -1408 -2048 1280 ) ( -1408 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( -1344 1152 -1024 ) ( -1408 1152 1280 ) ( -1408 1152 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( -1344 -2048 -1024 ) ( -1344 1152 1280 ) ( -1344 1152 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( -1344 -2048 -1024 ) ( -1408 1152 -1024 ) ( -1408 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( -1344 -2048 1280 ) ( -1408 -2048 -1024 ) ( -1408 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( -1408 -2048 1280 ) ( -1408 1152 -1024 ) ( -1408 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 }
 {
-( 2304 1216 1280 ) ( -1344 1152 1280 ) ( -1344 1216 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 1216 1280 ) ( 2304 1152 320 ) ( 2304 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 1152 1280 ) ( -1344 1152 320 ) ( -1344 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 1152 320 ) ( -1344 1216 320 ) ( -1344 1152 320 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( -1344 1216 1280 ) ( -1344 1152 1280 ) ( -1344 1152 320 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 1216 320 ) ( -1344 1216 1280 ) ( -1344 1216 320 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
+( 2304 1216 1280 ) ( -1344 1152 1280 ) ( -1344 1216 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 1216 1280 ) ( 2304 1152 320 ) ( 2304 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 1152 1280 ) ( -1344 1152 320 ) ( -1344 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 1152 320 ) ( -1344 1216 320 ) ( -1344 1152 320 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( -1344 1216 1280 ) ( -1344 1152 1280 ) ( -1344 1152 320 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 1216 320 ) ( -1344 1216 1280 ) ( -1344 1216 320 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 }
 {
 ( 2272 -2048 1280 ) ( -1376 -2048 1280 ) ( -1376 1152 1280 ) common/clip 64 0 0 0.5 0.5 0 0 0
@@ -9112,12 +9112,12 @@ exx/base-metal01
 ( -1344 -2048 352 ) ( -1344 1152 320 ) ( -1344 1152 352 ) common/clip 0 0 0 0.5 0.5 0 0 0
 }
 {
-( 2304 -2048 1344 ) ( -1344 -2048 1344 ) ( -1344 1152 1344 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 1152 1280 ) ( -1344 1152 1344 ) ( -1344 1152 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 1152 1344 ) ( 2304 -2048 1280 ) ( 2304 -2048 1344 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 -2048 1280 ) ( -1344 1152 1280 ) ( -1344 -2048 1280 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( 2304 -2048 1344 ) ( -1344 -2048 1280 ) ( -1344 -2048 1344 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
-( -1344 -2048 1344 ) ( -1344 1152 1280 ) ( -1344 1152 1344 ) skies/calm_sea 0 0 0 0.5 0.5 0 0 0
+( 2304 -2048 1344 ) ( -1344 -2048 1344 ) ( -1344 1152 1344 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 1152 1280 ) ( -1344 1152 1344 ) ( -1344 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 1152 1344 ) ( 2304 -2048 1280 ) ( 2304 -2048 1344 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 -2048 1280 ) ( -1344 1152 1280 ) ( -1344 -2048 1280 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( 2304 -2048 1344 ) ( -1344 -2048 1280 ) ( -1344 -2048 1344 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
+( -1344 -2048 1344 ) ( -1344 1152 1280 ) ( -1344 1152 1344 ) skies/extragalactic_asteroids 0 0 0 0.5 0.5 0 0 0
 }
 {
 ( 448 -128 -192 ) ( 448 -1024 -192 ) ( -128 -128 -192 ) exx/floor-metal02 0 0 0 0.25 0.25 0 0 0
@@ -11314,20 +11314,20 @@ exx/floor-metal02
 ( -64 -448 -896 ) ( -64 -256 -896 ) ( 64 -448 -896 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 {
-( 2304 1088 -384 ) ( 2304 1024 -384 ) ( 1920 1088 -384 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
-( 2304 1216 1280 ) ( 1920 1216 1280 ) ( 2304 1216 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
-( 2304 1216 1280 ) ( 2304 1216 -1024 ) ( 2304 1152 1280 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
-( 1920 1152 -1024 ) ( 2304 1152 -1024 ) ( 1920 1216 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
-( 1920 1152 -1024 ) ( 1920 1152 1280 ) ( 2304 1152 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
-( 1536 1216 -1024 ) ( 1536 1280 -1024 ) ( 1536 1216 1280 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
+( 2304 1088 -384 ) ( 2304 1024 -384 ) ( 1920 1088 -384 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
+( 2304 1216 1280 ) ( 1920 1216 1280 ) ( 2304 1216 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
+( 2304 1216 1280 ) ( 2304 1216 -1024 ) ( 2304 1152 1280 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
+( 1920 1152 -1024 ) ( 2304 1152 -1024 ) ( 1920 1216 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
+( 1920 1152 -1024 ) ( 1920 1152 1280 ) ( 2304 1152 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
+( 1536 1216 -1024 ) ( 1536 1280 -1024 ) ( 1536 1216 1280 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 2304 -2048 -1024 ) ( -1344 -2048 -1024 ) ( -1344 1152 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
-( 2304 1152 -1088 ) ( -1344 1152 -1024 ) ( -1344 1152 -1088 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
-( 2304 1152 -1024 ) ( 2304 -2048 -1088 ) ( 2304 -2048 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
-( 2304 -2048 -1088 ) ( -1344 1152 -1088 ) ( -1344 -2048 -1088 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
-( 2304 -2048 -1024 ) ( -1344 -2048 -1088 ) ( -1344 -2048 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
-( -1344 -2048 -1024 ) ( -1344 1152 -1088 ) ( -1344 1152 -1024 ) skies/calm_sea 0 0 0 0.25 0.25 0 0 0
+( 2304 -2048 -1024 ) ( -1344 -2048 -1024 ) ( -1344 1152 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
+( 2304 1152 -1088 ) ( -1344 1152 -1024 ) ( -1344 1152 -1088 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
+( 2304 1152 -1024 ) ( 2304 -2048 -1088 ) ( 2304 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
+( 2304 -2048 -1088 ) ( -1344 1152 -1088 ) ( -1344 -2048 -1088 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
+( 2304 -2048 -1024 ) ( -1344 -2048 -1088 ) ( -1344 -2048 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
+( -1344 -2048 -1024 ) ( -1344 1152 -1088 ) ( -1344 1152 -1024 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 1792 72 -128 ) ( 1792 -504 -128 ) ( 1792 -504 -136 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 4 0
@@ -20206,59 +20206,59 @@ exx/trim-01
 {
 "classname" "target_speaker"
 "origin" "-1136.000000 432.000000 336.000000"
-"noise" "sound/desertfactory/windoutside_loop.wav"
+"noise" "sounds/supernatural/space-loop.wav"
 "atten" "1.5"
 }
 {
 "classname" "target_speaker"
 "origin" "32.000000 336.000000 336.000000"
-"noise" "sound/desertfactory/windoutside_loop.wav"
+"noise" "sounds/supernatural/space-loop.wav"
 "atten" "1.5"
 }
 {
 "classname" "target_speaker"
 "origin" "1200.000000 640.000000 336.000000"
-"noise" "sound/desertfactory/windoutside_loop.wav"
+"noise" "sounds/supernatural/space-loop.wav"
 "atten" "1.5"
 }
 {
 "classname" "target_speaker"
 "origin" "1184.000000 640.000000 -16.000000"
-"noise" "sound/desertfactory/machinevat_loop.wav"
+"noise" "sounds/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
 }
 {
 "classname" "target_speaker"
 "origin" "-416.000000 -672.000000 -16.000000"
-"noise" "sound/desertfactory/machinevat_loop.wav"
+"noise" "sounds/machines/Slime_Bubbling.wav"
 "atten" "3"
 }
 {
 "classname" "target_speaker"
 "origin" "1712.000000 -224.000000 -208.000000"
-"noise" "sound/desertfactory/machinevat_loop.wav"
+"noise" "sounds/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
 }
 {
 "classname" "target_speaker"
 "origin" "-1040.000000 400.000000 -64.000000"
-"noise" "sound/desertfactory/machinevat_loop.wav"
+"noise" "sounds/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
 }
 {
 "classname" "target_speaker"
 "origin" "-624.000000 32.000000 -64.000000"
-"noise" "sound/desertfactory/machinevat_loop.wav"
+"noise" "sounds/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
 }
 {
 "classname" "target_speaker"
 "origin" "1344.000000 -288.000000 -208.000000"
-"noise" "sound/desertfactory/machinevat_loop.wav"
+"noise" "sounds/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
 }
@@ -20923,3 +20923,9 @@ 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"
+}