merge conflict

[xonotic/xonotic-maps.pk3dir.git] / maps / space-elevator.map

diff --git a/maps/space-elevator.map b/maps/space-elevator.map
index 4f13df6d863898f39e8b47189c774b367a57bebb..2adc87e913c94fb8f527f6643ac743ad41eeabfd 100644 (file)
--- a/maps/space-elevator.map
+++ b/maps/space-elevator.map
@@ -5,6 +5,7 @@
 "_blocksize" "2048 2048 2048"
 "message" "Space Elevator"
 "author" "FruitieX, Mirio, Cuinnton"
+"_description" "Medium sized CTF space floater"
 {
 ( 256 736 -128 ) ( 256 736 -192 ) ( 256 -736 -128 ) trak5x/floor-floor2f 0 0 0 0.25 0.25 0 0 0
 ( 192 736 -192 ) ( 192 736 -128 ) ( 192 -736 -128 ) trak5x/floor-floor2f 0 0 0 0.25 0.25 0 0 0
@@ -334,7 +335,7 @@
 ( -2944 -5376 2048 ) ( 2944 -5632 2048 ) ( -2944 -5632 2048 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( 2944 -5376 2048 ) ( -2944 -5376 -4608 ) ( 2944 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( 2944 -5632 2048 ) ( 2944 -5376 -4608 ) ( 2944 -5632 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 -5632 -4608 ) ( 2944 -5376 -4608 ) ( -2944 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 -5632 -1584 ) ( 2944 -5376 -1584 ) ( -2944 -5376 -1584 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( -2944 -5632 2048 ) ( 2944 -5632 -4608 ) ( -2944 -5632 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( -2944 -5376 2048 ) ( -2944 -5632 -4608 ) ( -2944 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 }
@@ -13399,7 +13400,7 @@ proceduralx/wall-fruitconcrete
 ( -2944 5632 2048 ) ( 2944 5376 2048 ) ( -2944 5376 2048 ) map_space-elevator/polluted_earth 256 -0 180 0.25 0.25 0 0 0
 ( -2944 5376 2048 ) ( 2944 5376 -4608 ) ( -2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
 ( -2944 5632 2048 ) ( -2944 5376 -4608 ) ( -2944 5632 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
-( 2944 5632 -4608 ) ( -2944 5376 -4608 ) ( 2944 5376 -4608 ) map_space-elevator/polluted_earth 256 -0 180 0.25 0.25 0 0 0
+( 2944 5632 -1584 ) ( -2944 5376 -1584 ) ( 2944 5376 -1584 ) map_space-elevator/polluted_earth 0 0 180 0.25 0.25 0 0 0
 ( 2944 5632 2048 ) ( -2944 5632 -4608 ) ( 2944 5632 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
 ( 2944 5376 2048 ) ( 2944 5632 -4608 ) ( 2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
 }
@@ -26188,7 +26189,7 @@ proceduralx/wall-fruitconcrete
 {
 ( -3200 -5376 2048 ) ( -2944 5376 2048 ) ( -2944 -5376 2048 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( -3200 -5376 2048 ) ( -3200 -5376 -4608 ) ( -3200 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 -5376 -4608 ) ( -2944 5376 -4608 ) ( -3200 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 -5376 -1584 ) ( -2944 5376 -1584 ) ( -3200 5376 -1584 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( -2944 -5376 2048 ) ( -2944 5376 -4608 ) ( -2944 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( -3200 -5376 2048 ) ( -2944 -5376 -4608 ) ( -3200 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( -2944 5376 2048 ) ( -3200 5376 -4608 ) ( -2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
@@ -26204,18 +26205,18 @@ proceduralx/wall-fruitconcrete
 {
 ( 2944 -5376 2048 ) ( 3200 5376 2048 ) ( 3200 -5376 2048 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( 2944 -5376 2048 ) ( 2944 -5376 -4608 ) ( 2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 3200 -5376 -4608 ) ( 3200 5376 -4608 ) ( 2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 3200 -5376 -1584 ) ( 3200 5376 -1584 ) ( 2944 5376 -1584 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( 3200 -5376 2048 ) ( 3200 5376 -4608 ) ( 3200 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( 2944 -5376 2048 ) ( 3200 -5376 -4608 ) ( 2944 -5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
 ( 3200 5376 2048 ) ( 2944 5376 -4608 ) ( 3200 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( 2944 -5376 -4608 ) ( -2944 5376 -4608 ) ( 2944 5376 -4608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 -5376 -4608 ) ( -2944 -5376 -4864 ) ( -2944 5376 -4864 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 -5376 -4864 ) ( 2944 5376 -4864 ) ( -2944 5376 -4864 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 -5376 -4608 ) ( 2944 5376 -4864 ) ( 2944 -5376 -4864 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( -2944 -5376 -4608 ) ( 2944 -5376 -4864 ) ( -2944 -5376 -4864 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
-( 2944 5376 -4608 ) ( -2944 5376 -4864 ) ( 2944 5376 -4864 ) map_space-elevator/polluted_earth 0 0 0 -0.25 0.25 0 0 0
+( 2944 -5376 -1352 ) ( -2944 5376 -1352 ) ( 2944 5376 -1352 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( -2944 -5376 -1352 ) ( -2944 -5376 -1608 ) ( -2944 5376 -1608 ) map_space-elevator/polluted_earth 0 224 0 0.25 0.25 0 0 0
+( 2944 -5376 -1608 ) ( 2944 5376 -1608 ) ( -2944 5376 -1608 ) map_space-elevator/polluted_earth 0 0 0 0.25 0.25 0 0 0
+( 2944 -5376 -1352 ) ( 2944 5376 -1608 ) ( 2944 -5376 -1608 ) map_space-elevator/polluted_earth 0 224 0 0.25 0.25 0 0 0
+( -2944 -5376 -1352 ) ( 2944 -5376 -1608 ) ( -2944 -5376 -1608 ) map_space-elevator/polluted_earth 0 224 0 0.25 0.25 0 0 0
+( 2944 5376 -1352 ) ( -2944 5376 -1608 ) ( 2944 5376 -1608 ) map_space-elevator/polluted_earth 0 224 0 -0.25 0.25 0 0 0
 }
 {
 ( 256 224 -512 ) ( 256 -256 -512 ) ( 224 224 -512 ) exx/base-metal04 0 0 0 0.25 0.25 134217728 0 0
@@ -28038,7 +28039,7 @@ effects_jumppad/jumppadfx1_a
 "angle" "90.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "704.000000 0.000000 -208.000000"
 "spawnflags" "1"
 }
@@ -28103,7 +28104,7 @@ effects_jumppad/jumppadfx1_a
 "angle" "90.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "0.000000 -3264.000000 544.000000"
 "angle" "90.000000"
 }
@@ -28122,7 +28123,7 @@ effects_jumppad/jumppadfx1_a
 "origin" "0.000000 -320.000000 160.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "0.000000 0.000000 -104.000000"
 "spawnflags" "1"
 }
@@ -28140,7 +28141,7 @@ effects_jumppad/jumppadfx1_a
 "spawnflags" "1"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "-704.000000 0.000000 -208.000000"
 "spawnflags" "1"
 }
@@ -28844,7 +28845,7 @@ effects_jumppad/jumppadfx1_a
 {
 ( -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 -3696 ) ( 2944 5376 -3696 ) ( -2944 5376 -3696 ) common/trigger 0 0 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 -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
@@ -29134,7 +29135,7 @@ effects_jumppad/jumppadfx1_a
 "angle" "-90.000000"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "0.000000 3264.000000 544.000000"
 "angle" "-90.000000"
 }