adapted textures follow the texture naming convention now

[xonotic/xonotic-maps.pk3dir.git] / maps / g-23.map

diff --git a/maps/g-23.map b/maps/g-23.map
index ce6a9a94a615836ab6a6e9b47409dac57f067506..ba2fc0ee43f81fe8a155e35d545a8265358d1a79 100644 (file)
--- a/maps/g-23.map
+++ b/maps/g-23.map
@@ -1937,12 +1937,12 @@ exx/base-metal03
 ( 704 1344 32 ) ( 704 704 32 ) ( 640 768 32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -52.426864624 289.0081939697 -420 ) ( -143.4293518066 198.9940032959 -420 ) ( -142.441116333 380.0106048584 -420 ) exx/panel-q201e 104.1297149658 201.3624267578 44.6871986389 0.2500004768 0.2500001192 134217728 0 0
+( -52.426864624 289.0081787109 -420 ) ( -143.4293518066 198.9940032959 -420 ) ( -142.441116333 380.0106201172 -420 ) exx/panel-q201e 104.1297149658 201.3624267578 44.6871986389 0.2500004768 0.2500001192 134217728 0 0
 ( -97.9281311035 244.0011138916 -260 ) ( -187.9422454834 335.0036010742 -260 ) ( -97.9281311035 244.0011138916 -548 ) exx/panel-q201e 163.1962890625 112 0 0.1777392626 0.25 134217728 0 0
-( -91.7463531494 340.1353607178 -260 ) ( -91.7463531494 340.1353607178 -548 ) ( -182.7487945557 250.12109375 -260 ) exx/panel-q201e 36.1849365234 112 0 0.177739203 0.25 134217728 0 0
-( -227.8176422119 284.3087768555 -484 ) ( -137.8034057617 193.306350708 -484 ) ( -136.8151855469 374.3230438232 -484 ) exx/panel-q201e 104.129699707 201.3624267578 44.6871986389 0.250000447 0.2500001192 134217728 0 0
-( -233.443572998 289.9964447021 -548 ) ( -233.443572998 289.9964447021 -260 ) ( -143.4293518066 198.9940032959 -548 ) exx/panel-q201e 160.4155273438 112 0 0.1777391434 0.25 134217728 0 0
-( -233.443572998 289.9964447021 -548 ) ( -142.441116333 380.0106048584 -548 ) ( -233.443572998 289.9964447021 -260 ) exx/panel-q201e 33.4028320312 112 0 0.177739501 0.25 134217728 0 0
+( -91.7463531494 340.1353759766 -260 ) ( -91.7463531494 340.1353759766 -548 ) ( -182.7487945557 250.12109375 -260 ) exx/panel-q201e 36.1849365234 112 0 0.177739203 0.25 134217728 0 0
+( -227.8176422119 284.3087768555 -484 ) ( -137.8034057617 193.306350708 -484 ) ( -136.8151855469 374.323059082 -484 ) exx/panel-q201e 104.129699707 201.3624267578 44.6871986389 0.250000447 0.2500001192 134217728 0 0
+( -233.443572998 289.9964599609 -548 ) ( -233.443572998 289.9964599609 -260 ) ( -143.4293518066 198.9940032959 -548 ) exx/panel-q201e 160.4155273438 112 0 0.1777391434 0.25 134217728 0 0
+( -233.443572998 289.9964599609 -548 ) ( -142.441116333 380.0106201172 -548 ) ( -233.443572998 289.9964599609 -260 ) exx/panel-q201e 33.4028320312 112 0 0.177739501 0.25 134217728 0 0
 }
 {
 ( 768 184 -448 ) ( 520 328 -448 ) ( 768 328 -448 ) exx/floor-crete01 256 0 -90 0.25 0.25 0 0 0
@@ -14979,19 +14979,19 @@ map_g-23/conveyor_belt
 {
 "classname" "target_speaker"
 "origin" "1536.000000 -1024.000000 240.000000"
-"noise" "sound/machines/Lights(Mono).wav"
+"noise" "sound/machines/light_mono_looped.ogg"
 "volume" "0.6"
 }
 {
 "classname" "target_speaker"
 "origin" "320.000000 0.000000 304.000000"
-"noise" "sound/machines/Lights(Mono).wav"
+"noise" "sound/machines/light_mono_looped.ogg"
 "volume" "0.6"
 }
 {
 "classname" "target_speaker"
 "origin" "320.000000 -1024.000000 240.000000"
-"noise" "sound/machines/Lights(Mono).wav"
+"noise" "sound/machines/light_mono_looped.ogg"
 "volume" "0.6"
 }
 {
@@ -15028,7 +15028,7 @@ map_g-23/conveyor_belt
 {
 "classname" "target_speaker"
 "origin" "1088.000000 -1008.000000 240.000000"
-"noise" "sound/machines/Lights(Mono).wav"
+"noise" "sound/machines/light_mono_looped.ogg"
 "volume" "0.6"
 }
 {
@@ -15059,7 +15059,7 @@ map_g-23/conveyor_belt
 {
 "classname" "target_speaker"
 "origin" "768.000000 -1008.000000 240.000000"
-"noise" "sound/machines/Lights(Mono).wav"
+"noise" "sound/machines/light_mono_looped.ogg"
 "volume" "0.6"
 }
 {
@@ -15081,7 +15081,7 @@ map_g-23/conveyor_belt
 "_color" "1 0.151965 0"
 }
 {
-"classname" "weapon_hlac"
+"classname" "weapon_crylink"
 "origin" "-864.000000 -704.000000 -256.000000"
 }
 {
@@ -15092,59 +15092,10 @@ map_g-23/conveyor_belt
 "classname" "trigger_impulse"
 }
 {
-"classname" "func_conveyor"
-"spawnflags" "1"
-"speed" "64"
-"angle" "270"
-{
-( -320 -448 -432 ) ( -192 -512 -432 ) ( -320 -512 -432 ) common/trigger 0 152 0 0.25 0.25 0 0 0
-( -192 -448 -434 ) ( -320 -448 -434 ) ( -192 -448 -466 ) common/trigger 0 184 0 0.25 0.25 0 0 0
-( -192 -448 -432 ) ( -192 -512 -448 ) ( -192 -512 -432 ) common/trigger 104 192 0 0.25 0.25 0 0 0
-( -192 -448 -448 ) ( -320 -512 -448 ) ( -192 -512 -448 ) common/trigger 0 152 0 0.25 0.25 0 0 0
-( -320 -952 -408 ) ( -192 -952 -424 ) ( -320 -952 -424 ) common/trigger 240 32 0 0.25 0.25 0 0 0
-( -320 -448 -448 ) ( -320 -512 -432 ) ( -320 -512 -448 ) common/trigger 104 192 0 0.25 0.25 0 0 0
-}
-{
-( -192 -294 -464 ) ( -192 -368 -464 ) ( -320 -294 -464 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -192 -294 -466 ) ( -320 -294 -466 ) ( -192 -294 -498 ) common/trigger 0 56 0 0.25 0.25 0 0 0
-( -192 -294 -464 ) ( -192 -294 -496 ) ( -192 -368 -464 ) common/trigger 0 64 0 0.25 0.25 0 0 0
-( -320 -368 -480 ) ( -192 -368 -480 ) ( -320 -294 -480 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -316 -384 -496 ) ( -316 -384 -464 ) ( -188 -384 -496 ) common/trigger 240 64 0 0.25 0.25 0 0 0
-( -320 -368 -496 ) ( -320 -294 -496 ) ( -320 -368 -464 ) common/trigger 0 64 0 0.25 0.25 0 0 0
-}
-{
-( -320 -384 -464 ) ( -192 -448 -432 ) ( -320 -448 -432 ) common/trigger 0 152 0 0.25 0.25 0 0 0
-( -192 -384 -466 ) ( -320 -384 -466 ) ( -192 -384 -498 ) common/trigger 0 56 0 0.25 0.25 0 0 0
-( -192 -384 -464 ) ( -192 -448 -448 ) ( -192 -448 -432 ) common/trigger 104 64 0 0.25 0.25 0 0 0
-( -192 -384 -480 ) ( -320 -448 -448 ) ( -192 -448 -448 ) common/trigger 0 152 0 0.25 0.25 0 0 0
-( -320 -448 -432 ) ( -192 -448 -448 ) ( -320 -448 -448 ) common/trigger 240 64 0 0.25 0.25 0 0 0
-( -320 -384 -480 ) ( -320 -448 -432 ) ( -320 -448 -448 ) common/trigger 104 64 0 0.25 0.25 0 0 0
-}
-}
-{
-"classname" "func_conveyor"
-"spawnflags" "1"
-"speed" "64"
-"angle" "180"
-{
-( -752 -976 -432 ) ( -752 -1024 -432 ) ( -824 -976 -432 ) common/trigger 0 192 0 0.25 0.25 0 0 0
-( -752 -976 -432 ) ( -824 -976 -432 ) ( -752 -976 -480 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 46 -1016 -432 ) ( 46 -1016 -480 ) ( 46 -1064 -432 ) common/trigger 224 0 0 0.25 0.25 0 0 0
-( -816 -1024 -448 ) ( -744 -1024 -448 ) ( -816 -976 -448 ) common/trigger 224 192 0 0.25 0.25 0 0 0
-( -824 -1072 -480 ) ( -824 -1072 -432 ) ( -752 -1072 -480 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -824 -1024 -480 ) ( -824 -976 -480 ) ( -824 -1024 -432 ) common/trigger 64 0 0 0.25 0.25 0 0 0
-}
-}
-{
-"classname" "func_door"
-"sounds" "sound/machines/Elevator_Up.wav"
+"classname" "func_plat"
+"sound1" "sound/machines/Elevator_Up.wav"
 "speed" "300"
 "lip" "32"
-"spawnflags" "1"
-"wait" "5"
-"message" "was crushed by the elevator."
-"message2" "was crushed by # at the elevator."
-"targetname" "func_door1"
 {
 ( 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
@@ -15221,15 +15172,51 @@ map_g-23/conveyor_belt
 }
 }
 {
-"classname" "trigger_multiple"
-"target" "func_door1"
+"classname" "trigger_conveyor"
+"spawnflags" "1"
+"speed" "64"
+"angle" "270"
+{
+( -320 -448 -432 ) ( -192 -512 -432 ) ( -320 -512 -432 ) common/trigger 0 152 0 0.25 0.25 0 0 0
+( -192 -448 -434 ) ( -320 -448 -434 ) ( -192 -448 -466 ) common/trigger 0 184 0 0.25 0.25 0 0 0
+( -192 -448 -432 ) ( -192 -512 -448 ) ( -192 -512 -432 ) common/trigger 104 192 0 0.25 0.25 0 0 0
+( -192 -448 -448 ) ( -320 -512 -448 ) ( -192 -512 -448 ) common/trigger 0 152 0 0.25 0.25 0 0 0
+( -328 -960 -408 ) ( -200 -960 -424 ) ( -328 -960 -424 ) common/trigger 16 32 0 0.25 0.25 0 0 0
+( -320 -448 -448 ) ( -320 -512 -432 ) ( -320 -512 -448 ) common/trigger 104 192 0 0.25 0.25 0 0 0
+}
+{
+( -192 -294 -464 ) ( -192 -368 -464 ) ( -320 -294 -464 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -192 -294 -466 ) ( -320 -294 -466 ) ( -192 -294 -498 ) common/trigger 0 56 0 0.25 0.25 0 0 0
+( -192 -294 -464 ) ( -192 -294 -496 ) ( -192 -368 -464 ) common/trigger 0 64 0 0.25 0.25 0 0 0
+( -320 -368 -480 ) ( -192 -368 -480 ) ( -320 -294 -480 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -316 -384 -496 ) ( -316 -384 -464 ) ( -188 -384 -496 ) common/trigger 240 64 0 0.25 0.25 0 0 0
+( -320 -368 -496 ) ( -320 -294 -496 ) ( -320 -368 -464 ) common/trigger 0 64 0 0.25 0.25 0 0 0
+}
+{
+( -320 -384 -464 ) ( -192 -448 -432 ) ( -320 -448 -432 ) common/trigger 0 152 0 0.25 0.25 0 0 0
+( -192 -384 -466 ) ( -320 -384 -466 ) ( -192 -384 -498 ) common/trigger 0 56 0 0.25 0.25 0 0 0
+( -192 -384 -464 ) ( -192 -448 -448 ) ( -192 -448 -432 ) common/trigger 104 64 0 0.25 0.25 0 0 0
+( -192 -384 -480 ) ( -320 -448 -448 ) ( -192 -448 -448 ) common/trigger 0 152 0 0.25 0.25 0 0 0
+( -320 -448 -432 ) ( -192 -448 -448 ) ( -320 -448 -448 ) common/trigger 240 64 0 0.25 0.25 0 0 0
+( -320 -384 -480 ) ( -320 -448 -432 ) ( -320 -448 -448 ) common/trigger 104 64 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "trigger_conveyor"
+"spawnflags" "1"
+"speed" "64"
+"angle" "180"
 {
-( 704 -192 -416 ) ( 704 -384 -416 ) ( 512 -192 -416 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 704 -192 -400 ) ( 512 -192 -400 ) ( 704 -192 -432 ) common/trigger 0 64 0 0.25 0.25 0 0 0
-( 704 -192 -400 ) ( 704 -192 -432 ) ( 704 -384 -400 ) common/trigger 0 64 0 0.25 0.25 0 0 0
-( 512 -384 -432 ) ( 704 -384 -432 ) ( 512 -192 -432 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 512 -384 -432 ) ( 512 -384 -400 ) ( 704 -384 -432 ) common/trigger 0 64 0 0.25 0.25 0 0 0
-( 512 -384 -432 ) ( 512 -192 -432 ) ( 512 -384 -400 ) common/trigger 0 64 0 0.25 0.25 0 0 0
-( 512 -224 -496 ) ( 544 -192 -496 ) ( 512 -224 -368 ) common/trigger 0 64 0 0.25 0.25 0 0 0
+( -752 -976 -432 ) ( -752 -1024 -432 ) ( -824 -976 -432 ) common/trigger 0 192 0 0.25 0.25 0 0 0
+( -752 -960 -432 ) ( -824 -960 -432 ) ( -752 -960 -480 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 46 -1016 -432 ) ( 46 -1016 -480 ) ( 46 -1064 -432 ) common/trigger 224 0 0 0.25 0.25 0 0 0
+( -816 -1024 -448 ) ( -744 -1024 -448 ) ( -816 -976 -448 ) common/trigger 224 192 0 0.25 0.25 0 0 0
+( -824 -1072 -480 ) ( -824 -1072 -432 ) ( -752 -1072 -480 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -824 -1024 -480 ) ( -824 -976 -480 ) ( -824 -1024 -432 ) common/trigger 64 0 0 0.25 0.25 0 0 0
 }
 }
+{
+"classname" "info_autoscreenshot"
+"origin" "-1600.000000 296.000000 152.000000"
+"angles" "16.757401 -22.815008 0.000000"
+}