X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=maps%2Fspace-elevator.map;h=95b985869744795c09363208b7153376ded30b51;hp=2adc87e913c94fb8f527f6643ac743ad41eeabfd;hb=c74b464882489bce39669f19be3e840cd0c1ad01;hpb=f64ad4f66863c517acffa796ea6fc85e885c434f

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 2adc87e9..95b98586 100644
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -326,9 +326,9 @@
 {
 ( 192 -736 -128 ) ( -192 -736 -128 ) ( -192 -256 -128 ) trak5x/trim-trim1b 0 0 90 0.25 0.25 0 0 0
 ( -192 -736 -192 ) ( 192 -736 -192 ) ( -192 -256 -192 ) trak5x/wall-wall5a 0 0 0 0.25 0.25 0 0 0
-( 192 -736 -192 ) ( 192 -736 -128 ) ( 192 -256 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 256 -736 -192 ) ( 256 -736 -128 ) ( 256 -256 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 192 -256 64 ) ( 64 -256 -64 ) ( 192 -256 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -192 -256 -128 ) ( -192 -736 -128 ) ( -192 -736 -192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -256 -256 -128 ) ( -256 -736 -128 ) ( -256 -736 -192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -352 -64 ) ( -64 -352 -64 ) ( 64 -352 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -3708,7 +3708,7 @@ effects_beam/beam-purple
 ( 128 -3776 -144 ) ( 128 -4032 -144 ) ( -128 -3776 -144 ) trak5x/misc-glass 0 0 0 0.25 0.25 0 0 0
 ( 128 -3776 -128 ) ( -128 -3776 -128 ) ( 128 -3776 -192 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
 ( 64 -3776 -128 ) ( 64 -3776 -192 ) ( 64 -4032 -128 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( -128 -4032 -176 ) ( 128 -4032 -176 ) ( -128 -3776 -176 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -128 -4032 -176 ) ( 128 -4032 -176 ) ( -128 -3776 -176 ) trak5x/misc-glass 0 0 0 0.25 0.25 0 0 0
 ( -128 -3904 -192 ) ( -128 -3904 -128 ) ( 128 -3904 -192 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
 ( -64 -4032 -192 ) ( -64 -3776 -192 ) ( -64 -4032 -128 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
 ( -64 -3792 -64 ) ( -48 -3776 -64 ) ( -64 -3792 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
@@ -5857,7 +5857,7 @@ trak5x/base-pipe1b
 ( -256 -224 -128 ) ( -256 -224 -224 ) ( -256 -704 -128 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 0 0 0
 ( -320 -704 -224 ) ( -260 -704 -224 ) ( -320 -224 -224 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 0 0 0
 ( -288 -704 -224 ) ( -288 -224 -224 ) ( -288 -704 -128 ) trak5x/floor-floor2f 0 0 0 0.25 0.25 0 0 0
-( -256 -704 32 ) ( -288 -736 32 ) ( -256 -704 160 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 0 0 0
+( -256 -704 32 ) ( -288 -736 32 ) ( -256 -704 160 ) trak5x/floor-floor2f 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -544 -256 -320 ) ( -224 -256 -320 ) ( -224 -384 -320 ) proceduralx/wall-fruitconcrete 0 0 0 0.25 0.25 0 0 0
@@ -13391,9 +13391,9 @@ proceduralx/wall-fruitconcrete
 {
 ( -192 736 -128 ) ( 192 736 -128 ) ( 192 256 -128 ) trak5x/trim-trim1b 0 0 -90 0.25 0.25 0 0 0
 ( 192 736 -192 ) ( -192 736 -192 ) ( 192 256 -192 ) trak5x/wall-wall5a 512 -0 180 0.25 0.25 0 0 0
-( -192 736 -192 ) ( -192 736 -128 ) ( -192 256 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -256 736 -192 ) ( -256 736 -128 ) ( -256 256 -128 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -192 256 64 ) ( -64 256 -64 ) ( -192 256 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 192 256 -128 ) ( 192 736 -128 ) ( 192 736 -192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( 256 256 -128 ) ( 256 736 -128 ) ( 256 736 -192 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -64 352 -64 ) ( 64 352 -64 ) ( -64 352 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
@@ -16755,7 +16755,7 @@ proceduralx/wall-fruitconcrete
 ( -128 3776 -144 ) ( -128 4032 -144 ) ( 128 3776 -144 ) trak5x/misc-glass 128 -0 180 0.25 0.25 0 0 0
 ( -128 3776 -128 ) ( 128 3776 -128 ) ( -128 3776 -192 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
 ( -64 3776 -128 ) ( -64 3776 -192 ) ( -64 4032 -128 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( 128 4032 -176 ) ( -128 4032 -176 ) ( 128 3776 -176 ) exx/base-metal03 512 -0 180 0.25 0.25 0 0 0
+( 128 4032 -176 ) ( -128 4032 -176 ) ( 128 3776 -176 ) trak5x/misc-glass 512 -0 180 0.25 0.25 0 0 0
 ( 128 3904 -192 ) ( 128 3904 -128 ) ( -128 3904 -192 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
 ( 64 4032 -192 ) ( 64 3776 -192 ) ( 64 4032 -128 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
 ( 64 3792 -64 ) ( 48 3776 -64 ) ( 64 3792 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
@@ -18903,7 +18903,7 @@ trak5x/base-pipe1c
 ( 256 224 -128 ) ( 256 224 -224 ) ( 256 704 -128 ) proceduralx/wall-fruitconcrete 0 0 0 -0.25 0.25 0 0 0
 ( 320 704 -224 ) ( 260 704 -224 ) ( 320 224 -224 ) proceduralx/wall-fruitconcrete 1024 -0 180 0.25 0.25 0 0 0
 ( 288 704 -224 ) ( 288 224 -224 ) ( 288 704 -128 ) trak5x/floor-floor2f 0 0 0 0.25 0.25 0 0 0
-( 256 704 32 ) ( 288 736 32 ) ( 256 704 160 ) proceduralx/wall-fruitconcrete 0 0 0 -0.25 0.25 0 0 0
+( 256 704 32 ) ( 288 736 32 ) ( 256 704 160 ) trak5x/floor-floor2f 0 0 0 -0.25 0.25 0 0 0
 }
 {
 ( 544 256 -320 ) ( 224 256 -320 ) ( 224 384 -320 ) proceduralx/wall-fruitconcrete 1024 -0 180 0.25 0.25 0 0 0
@@ -27150,18 +27150,18 @@ effects_jumppad/jumppadfx1_a
 }
 {
 ( 176 192 -544 ) ( 176 -96 -544 ) ( 48 192 -544 ) proceduralx/wall-fruitconcrete_purple 576 192 0 0.25 0.25 0 0 0
-( 176 208 -544 ) ( 48 208 -544 ) ( 176 208 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 56 136 -552 ) ( 64 136 -552 ) ( 64 144 -544 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
 ( 64 200 -544 ) ( 64 200 -552 ) ( 64 -88 -544 ) proceduralx/wall-fruitconcrete_purple 800 0 0 0.25 0.25 0 0 0
-( 48 -152 -552 ) ( 176 -152 -552 ) ( 48 136 -552 ) proceduralx/wall-fruitconcrete_purple 576 992 0 0.25 0.25 0 0 0
-( 48 -208 -552 ) ( 48 -208 -544 ) ( 176 -208 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 64 136 -552 ) ( 56 136 -552 ) ( 56 -136 -552 ) proceduralx/wall-fruitconcrete_purple 576 992 0 0.25 0.25 0 0 0
+( 64 -136 -552 ) ( 56 -136 -552 ) ( 56 -144 -544 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
 ( 56 -168 -552 ) ( 56 120 -552 ) ( 56 -168 -544 ) proceduralx/wall-fruitconcrete_purple 96 0 0 0.25 0.25 0 0 0
 }
 {
 ( 56 88 -544 ) ( 56 -200 -544 ) ( -72 88 -544 ) proceduralx/wall-fruitconcrete_purple 32 800 0 0.25 0.25 0 0 0
-( 56 144 -544 ) ( -72 144 -544 ) ( 56 144 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
+( -64 136 -552 ) ( -56 136 -552 ) ( -56 144 -544 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
 ( -56 128 -544 ) ( -56 128 -552 ) ( -56 -160 -544 ) proceduralx/wall-fruitconcrete_purple 64 0 0 0.25 0.25 0 0 0
-( -72 -144 -552 ) ( 56 -144 -552 ) ( -72 144 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
-( -72 -208 -552 ) ( -72 -208 -544 ) ( 56 -208 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
+( -56 136 -552 ) ( -64 136 -552 ) ( -64 -136 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
+( -56 -136 -552 ) ( -64 -136 -552 ) ( -64 -144 -544 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
 ( -64 -144 -552 ) ( -64 144 -552 ) ( -64 -144 -544 ) proceduralx/wall-fruitconcrete_purple 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -27762,6 +27762,30 @@ effects_jumppad/jumppadfx1_a
 ( 32 -2304 64 ) ( 32 -2272 -64 ) ( 32 -2304 -64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -16 -64 -464 ) ( 16 64 -464 ) ( -16 64 -464 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 176 208 -544 ) ( 176 -80 -544 ) ( 48 208 -544 ) proceduralx/wall-fruitconcrete_purple 576 256 0 0.25 0.25 0 0 0
+( 176 208 -544 ) ( 48 208 -544 ) ( 176 208 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 64 216 -544 ) ( 64 216 -552 ) ( 64 -72 -544 ) proceduralx/wall-fruitconcrete_purple 736 0 0 0.25 0.25 0 0 0
+( 48 -80 -576 ) ( 176 -80 -576 ) ( 48 208 -576 ) proceduralx/wall-fruitconcrete_purple 576 256 0 0.25 0.25 0 0 0
+( 48 144 -552 ) ( 48 144 -544 ) ( 176 144 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 56 -80 -552 ) ( 56 208 -552 ) ( 56 -80 -544 ) proceduralx/wall-fruitconcrete_purple 768 0 0 0.25 0.25 0 0 0
+}
+{
+( 56 -144 -544 ) ( 56 -432 -544 ) ( -72 -144 -544 ) proceduralx/wall-fruitconcrete_purple 32 896 0 0.25 0.25 0 0 0
+( 56 -144 -544 ) ( -72 -144 -544 ) ( 56 -144 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
+( -56 -136 -544 ) ( -56 -136 -552 ) ( -56 -424 -544 ) proceduralx/wall-fruitconcrete_purple 96 0 0 0.25 0.25 0 0 0
+( -72 -432 -576 ) ( 56 -432 -576 ) ( -72 -144 -576 ) proceduralx/wall-fruitconcrete_purple 32 896 0 0.25 0.25 0 0 0
+( -72 -208 -552 ) ( -72 -208 -544 ) ( 56 -208 -552 ) proceduralx/wall-fruitconcrete_purple 32 0 0 0.25 0.25 0 0 0
+( -64 -432 -552 ) ( -64 -144 -552 ) ( -64 -432 -544 ) proceduralx/wall-fruitconcrete_purple 128 0 0 0.25 0.25 0 0 0
+}
+{
+( 176 -144 -544 ) ( 176 -432 -544 ) ( 48 -144 -544 ) proceduralx/wall-fruitconcrete_purple 576 896 0 0.25 0.25 0 0 0
+( 176 -144 -544 ) ( 48 -144 -544 ) ( 176 -144 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 64 -136 -544 ) ( 64 -136 -552 ) ( 64 -424 -544 ) proceduralx/wall-fruitconcrete_purple 96 0 0 0.25 0.25 0 0 0
+( 48 -432 -576 ) ( 176 -432 -576 ) ( 48 -144 -576 ) proceduralx/wall-fruitconcrete_purple 576 896 0 0.25 0.25 0 0 0
+( 48 -208 -552 ) ( 48 -208 -544 ) ( 176 -208 -552 ) proceduralx/wall-fruitconcrete_purple 576 0 0 0.25 0.25 0 0 0
+( 56 -432 -552 ) ( 56 -144 -552 ) ( 56 -432 -544 ) proceduralx/wall-fruitconcrete_purple 128 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "target_position"
@@ -28841,11 +28865,10 @@ effects_jumppad/jumppadfx1_a
 {
 "classname" "trigger_hurt"
 "message" "was lost in space"
-"dmg" "1000"
 {
 ( -2944 -5376 -1136 ) ( 2944 5376 -1136 ) ( 2944 -5376 -1136 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
 ( -2944 -5376 -1136 ) ( -2944 -5376 -3696 ) ( -2944 5376 -3696 ) common/trigger 0 64 0 0.25 0.25 134217728 0 0
-( 2944 -5376 -1272 ) ( 2944 5376 -1272 ) ( -2944 5376 -1272 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
+( 2944 -5376 -1352 ) ( 2944 5376 -1352 ) ( -2944 5376 -1352 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
 ( 2944 -5376 -1136 ) ( 2944 5376 -3696 ) ( 2944 -5376 -3696 ) common/trigger 0 64 0 0.25 0.25 134217728 0 0
 ( -2944 -5376 -1136 ) ( 2944 -5376 -3696 ) ( -2944 -5376 -3696 ) common/trigger 0 64 0 0.25 0.25 134217728 0 0
 ( 2944 5376 -1136 ) ( -2944 5376 -3696 ) ( 2944 5376 -3696 ) common/trigger 0 64 0 -0.25 0.25 134217728 0 0
@@ -30426,31 +30449,31 @@ effects_jumppad/jumppadfx1_a
 }
 {
 "classname" "misc_model"
-"origin" "0.000000 -3778.000000 576.000000"
+"origin" "0.000000 -3791.750000 576.000000"
 "model" "models/effects_warpzone/rededge.md3"
 "angle" "89.999992"
 "modelscale_vec" "1.000000 3.000000 4.000000"
 }
 {
 "classname" "misc_model"
-"origin" "0.000000 -3678.000000 -64.000000"
+"origin" "0.000000 -3664.250000 -64.000000"
 "model" "models/effects_warpzone/rededge.md3"
 "angle" "-90.000000"
 "modelscale_vec" "1.000000 3.000000 4.000000"
 }
 {
 "classname" "misc_model"
-"origin" "0.000000 3778.000000 576.000000"
+"origin" "0.000000 3791.750000 576.000000"
 "model" "models/effects_warpzone/blueedge.md3"
 "angle" "89.999992"
 "modelscale_vec" "1.000000 3.000000 4.000000"
 }
 {
 "classname" "misc_model"
-"origin" "0.000000 3678.000000 -64.000000"
+"origin" "0.000000 3664.250000 -64.000000"
 "model" "models/effects_warpzone/blueedge.md3"
 "angle" "-90.000000"
-"modelscale_vec" "1 3 4"
+"modelscale_vec" "1.000000 3.000000 4.000000"
 }
 {
 "classname" "weapon_rocketlauncher"
@@ -30489,12 +30512,6 @@ effects_jumppad/jumppadfx1_a
 "origin" "-704.000000 -3616.000000 -96.000000"
 }
 {
-"classname" "misc_teleporter_dest"
-"origin" "0.000000 0.000000 408.000000"
-"angles" "0.000001 0.000005 0.000000"
-"targetname" "misc_teleporter_dest1"
-}
-{
 "classname" "item_health_mega"
 "origin" "0.000000 2208.000000 -400.000000"
 }