X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=maps%2Fred-planet.map;h=8708d62d05f21e82b010725aece79e04fe4792a1;hp=9cd455ef1b595d81d35e76c209867f6cf5f6f859;hb=d7f020b71802d228c6132ab6dd10767ad42f0876;hpb=f2784d124b1eee18778543af7786750df30c604b

diff --git a/maps/red-planet.map b/maps/red-planet.map
index 9cd455ef..8708d62d 100644
--- a/maps/red-planet.map
+++ b/maps/red-planet.map
@@ -66407,7 +66407,7 @@ exx/trim-vert01
 "model" "models/containers/barrel01.md3"
 "_castShadows" "1"
 "angle" "45.000000"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 }
 {
 "classname" "func_group"
@@ -68384,11 +68384,11 @@ trak5x/base-pipe1b
 }
 {
 "classname" "func_wall"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 }
 {
 "classname" "func_wall"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 }
 {
 "classname" "item_flag_team1"
@@ -72726,7 +72726,7 @@ trak5x/misc-glass
 {
 "classname" "trigger_multiple"
 "target" "airlock_b2"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 {
 ( 920 656 224 ) ( 920 784 224 ) ( 1016 656 224 ) common/trigger 0 32 180 0.5 0.5 134217728 0 0
 ( 920 656 160 ) ( 1016 656 160 ) ( 920 656 64 ) common/trigger 0 0 0 -0.5 0.5 134217728 0 0
@@ -72999,7 +72999,7 @@ exx/trim-vert01
 {
 "classname" "trigger_multiple"
 "target" "airlock_a1"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 {
 ( 1688 -816 224 ) ( 1688 -688 224 ) ( 1784 -816 224 ) common/trigger 0 224 180 0.5 0.5 134217728 0 0
 ( 1688 -816 160 ) ( 1784 -816 160 ) ( 1688 -816 64 ) common/trigger 0 0 0 -0.5 0.5 134217728 0 0
@@ -73373,20 +73373,20 @@ exx/trim-vert01
 "impulse" "65"
 "targetname" "particle_3"
 "mdl" "pipe_smoke"
-"velocity" "-5 -7 -4"
+"velocity" "0 -8 -3"
 "spawnflags" "4"
 {
-( 1488 544 224 ) ( 1488 576 224 ) ( 1520 544 224 ) common/trigger 0 0 180 0.5 0.5 0 0 0
-( 1488 544 256 ) ( 1520 544 256 ) ( 1488 544 192 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
-( 1488 544 256 ) ( 1488 544 192 ) ( 1488 576 256 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
-( 1520 576 192 ) ( 1488 576 192 ) ( 1520 544 192 ) common/trigger 0 0 180 0.5 0.5 0 0 0
-( 1520 576 192 ) ( 1520 576 256 ) ( 1488 576 192 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
-( 1520 576 192 ) ( 1520 544 192 ) ( 1520 576 256 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
+( 1904 928 224 ) ( 1872 896 224 ) ( 1872 928 224 ) common/trigger 0 0 180 0.5 0.5 0 0 0
+( 1872 928 192 ) ( 1904 928 256 ) ( 1872 928 256 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
+( 1872 896 256 ) ( 1872 928 192 ) ( 1872 928 256 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
+( 1904 928 192 ) ( 1872 896 192 ) ( 1904 896 192 ) common/trigger 0 0 180 0.5 0.5 0 0 0
+( 1872 896 192 ) ( 1904 896 256 ) ( 1904 896 192 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
+( 1904 896 256 ) ( 1904 928 192 ) ( 1904 896 192 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
 }
 }
 {
 "classname" "trigger_multivibrator"
-"origin" "1504.000000 608.000000 192.000000"
+"origin" "1888.000000 864.000000 192.000000"
 "target" "particle_3"
 "wait" "5"
 }
@@ -73398,30 +73398,30 @@ exx/trim-vert01
 "velocity" "2 6 -6"
 "spawnflags" "6"
 {
-( 1392 912 224 ) ( 1392 880 224 ) ( 1360 912 224 ) common/trigger 0 64 180 0.5 0.5 0 0 0
-( 1392 912 256 ) ( 1360 912 256 ) ( 1392 912 192 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
-( 1392 912 256 ) ( 1392 912 192 ) ( 1392 880 256 ) common/trigger 192 128 0 -0.5 0.5 0 0 0
-( 1360 880 192 ) ( 1392 880 192 ) ( 1360 912 192 ) common/trigger 0 64 180 0.5 0.5 0 0 0
-( 1360 880 192 ) ( 1360 880 256 ) ( 1392 880 192 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
-( 1360 880 192 ) ( 1360 912 192 ) ( 1360 880 256 ) common/trigger 192 128 0 -0.5 0.5 0 0 0
+( 2000 -912 224 ) ( 2032 -880 224 ) ( 2032 -912 224 ) common/trigger 0 64 180 0.5 0.5 0 0 0
+( 2032 -912 192 ) ( 2000 -912 256 ) ( 2032 -912 256 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
+( 2032 -880 256 ) ( 2032 -912 192 ) ( 2032 -912 256 ) common/trigger 192 128 0 -0.5 0.5 0 0 0
+( 2000 -912 192 ) ( 2032 -880 192 ) ( 2000 -880 192 ) common/trigger 0 64 180 0.5 0.5 0 0 0
+( 2032 -880 192 ) ( 2000 -880 256 ) ( 2000 -880 192 ) common/trigger 0 128 0 -0.5 0.5 0 0 0
+( 2000 -880 256 ) ( 2000 -912 192 ) ( 2000 -880 192 ) common/trigger 192 128 0 -0.5 0.5 0 0 0
 }
 }
 {
 "classname" "trigger_multivibrator"
-"origin" "1376.000000 848.000000 192.000000"
+"origin" "2016.000000 -848.000000 192.000000"
 "target" "particle_4"
 "wait" "2"
 }
 {
 "classname" "target_speaker"
-"origin" "1376.000000 896.000000 192.000000"
+"origin" "2016.000000 -896.000000 192.000000"
 "noise" "sound/map_red_planet/steam_burst.wav"
 "targetname" "particle_4"
 "atten" "3"
 }
 {
 "classname" "target_speaker"
-"origin" "1504.000000 560.000000 192.000000"
+"origin" "1888.000000 912.000000 192.000000"
 "noise" "sound/map_red_planet/steam_fade.ogg"
 "targetname" "particle_3"
 "atten" "3"
@@ -73431,20 +73431,20 @@ exx/trim-vert01
 "classname" "func_pointparticles"
 "impulse" "50"
 "mdl" "pipe_smoke"
-"velocity" "5 -7 -4"
+"velocity" "3 5 2"
 "spawnflags" "4"
 {
-( 2000 -928 224 ) ( 2000 -896 224 ) ( 2032 -928 224 ) common/trigger 224 192 180 0.5 0.5 0 0 0
-( 2000 -928 256 ) ( 2032 -928 256 ) ( 2000 -928 192 ) common/trigger 224 128 0 -0.5 0.5 0 0 0
-( 2000 -928 256 ) ( 2000 -928 192 ) ( 2000 -896 256 ) common/trigger 64 128 0 -0.5 0.5 0 0 0
-( 2032 -896 192 ) ( 2000 -896 192 ) ( 2032 -928 192 ) common/trigger 224 192 180 0.5 0.5 0 0 0
-( 2032 -896 192 ) ( 2032 -896 256 ) ( 2000 -896 192 ) common/trigger 224 128 0 -0.5 0.5 0 0 0
-( 2032 -896 192 ) ( 2032 -928 192 ) ( 2032 -896 256 ) common/trigger 64 128 0 -0.5 0.5 0 0 0
+( 1488 544 224 ) ( 1488 576 224 ) ( 1520 544 224 ) common/trigger 224 192 180 0.5 0.5 0 0 0
+( 1488 544 256 ) ( 1520 544 256 ) ( 1488 544 192 ) common/trigger 224 128 0 -0.5 0.5 0 0 0
+( 1488 544 256 ) ( 1488 544 192 ) ( 1488 576 256 ) common/trigger 64 128 0 -0.5 0.5 0 0 0
+( 1520 576 192 ) ( 1488 576 192 ) ( 1520 544 192 ) common/trigger 224 192 180 0.5 0.5 0 0 0
+( 1520 576 192 ) ( 1520 576 256 ) ( 1488 576 192 ) common/trigger 224 128 0 -0.5 0.5 0 0 0
+( 1520 576 192 ) ( 1520 544 192 ) ( 1520 576 256 ) common/trigger 64 128 0 -0.5 0.5 0 0 0
 }
 }
 {
 "classname" "target_speaker"
-"origin" "2016.000000 -912.000000 192.000000"
+"origin" "1504.000000 560.000000 192.000000"
 "noise" "sound/map_red_planet/steam_loop.wav"
 }
 {
@@ -75114,7 +75114,7 @@ exx/trim-vert01
 {
 "classname" "trigger_multiple"
 "target" "airlock_c2"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 {
 ( 1128 -1104 608 ) ( 1128 -976 608 ) ( 1224 -1104 608 ) common/trigger 192 32 180 0.5 0.5 134217728 0 0
 ( 1128 -1104 544 ) ( 1224 -1104 544 ) ( 1128 -1104 448 ) common/trigger 192 0 0 -0.5 0.5 134217728 0 0
@@ -77408,7 +77408,7 @@ trak5x/base-pipe1c
 }
 {
 "classname" "func_wall"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 }
 {
 "classname" "light"
@@ -77645,27 +77645,27 @@ common/camera
 }
 {
 "classname" "func_wall"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 }
 {
 "classname" "func_wall"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 }
 {
 "classname" "func_wall"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 }
 {
 "classname" "func_wall"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 }
 {
 "classname" "func_wall"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 }
 {
 "classname" "func_wall"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 {
 ( -2560 -740 63 ) ( -2560 -572 63 ) ( -2532 -740 63 ) exx/floor-wrn01-red 128 192 180 0.25 0.25 134217728 0 0
 ( -2556 -740 64 ) ( -2556 -740 60 ) ( -2556 -572 64 ) common/caulk 0 192 0 -0.25 0.25 134217728 0 0
@@ -78281,7 +78281,7 @@ common/camera
 }
 {
 "classname" "func_wall"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 {
 ( 944 -944 608 ) ( 944 -1104 608 ) ( 928 -944 608 ) common/clip 0 32 0 0.5 0.5 0 0 0
 ( 944 -944 480 ) ( 928 -944 480 ) ( 944 -944 464 ) common/clip 0 0 0 0.5 0.5 0 0 0
@@ -78953,7 +78953,7 @@ exx/floor-wrn01
 }
 {
 "classname" "func_clientillusionary"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 {
 ( 912 -1132 508 ) ( 908 -1124 508 ) ( 912 -1124 508 ) common/caulk 0 224 0 0.5 0.5 134217728 0 0
 ( 912 -1108 500 ) ( 912 -1116 508 ) ( 912 -1108 508 ) common/caulk 32 0 0 0.5 0.5 134217728 0 0
@@ -79023,7 +79023,7 @@ exx/floor-wrn01
 }
 {
 "classname" "func_clientillusionary"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 {
 ( 912 -1132 508 ) ( 908 -1124 508 ) ( 912 -1124 508 ) common/caulk 0 224 0 0.5 0.5 134217728 0 0
 ( 912 -1108 500 ) ( 912 -1116 508 ) ( 912 -1108 508 ) common/caulk 32 0 0 0.5 0.5 134217728 0 0
@@ -81322,7 +81322,7 @@ trak5x/base-pipe1a
 }
 {
 "classname" "func_wall"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 {
 patchDef2
 {
@@ -103394,7 +103394,7 @@ trak5x/base-pipe1c
 }
 {
 "classname" "func_wall"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 {
 patchDef2
 {
@@ -125472,7 +125472,7 @@ trak5x/base-pipe1a
 "lodmodel1" "models/containers/crate01_lod.md3"
 "loddistance1" "450"
 "angle" "127.999382"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 }
 {
 "classname" "misc_gamemodel"
@@ -125482,7 +125482,7 @@ trak5x/base-pipe1a
 "lodmodel1" "models/containers/crate01_lod.md3"
 "loddistance1" "450"
 "angle" "-7.000615"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 }
 {
 "classname" "misc_gamemodel"
@@ -125490,7 +125490,7 @@ trak5x/base-pipe1a
 "model" "models/containers/barrel01.md3"
 "_castShadows" "1"
 "angle" "60.000000"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 }
 {
 "classname" "misc_gamemodel"
@@ -125498,11 +125498,11 @@ trak5x/base-pipe1a
 "model" "models/containers/barrel01.md3"
 "_castShadows" "1"
 "angles" "90.000000 0.000000 -179.999985"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 }
 {
 "classname" "func_wall"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 {
 ( 880 -960 493 ) ( 912 -960 493 ) ( 880 -992 493 ) common/weapclip 0 64 90 0.25 0.25 134217728 0 0
 ( 880 -960 450 ) ( 880 -992 450 ) ( 880 -960 448 ) common/weapclip 0 0 0 0.25 0.25 134217728 0 0
@@ -125566,12 +125566,14 @@ trak5x/base-pipe1a
 "classname" "onslaught_controlpoint"
 "origin" "-2960.000000 0.000000 -128.000000"
 "targetname" "r_cp1"
+"message" "Red Basement"
 }
 {
 "classname" "onslaught_controlpoint"
 "origin" "-2432.000000 0.000000 416.000000"
 "angle" "180.000000"
 "targetname" "r_cp2"
+"message" "Red Room"
 }
 {
 "classname" "onslaught_link"
@@ -125591,11 +125593,13 @@ trak5x/base-pipe1a
 "origin" "-192.000000 -1168.000000 320.000000"
 "angle" "180.000000"
 "targetname" "n_cp1"
+"message" "Center South"
 }
 {
 "classname" "onslaught_controlpoint"
 "origin" "192.000000 1168.000000 320.000000"
 "targetname" "n_cp2"
+"message" "Center North"
 }
 {
 "classname" "onslaught_link"
@@ -125623,12 +125627,14 @@ trak5x/base-pipe1a
 "origin" "2960.000000 0.000000 -128.000000"
 "targetname" "b_cp1"
 "angle" "-179.999985"
+"message" "Blue Basement"
 }
 {
 "classname" "onslaught_controlpoint"
 "origin" "2432.000000 0.000000 416.000000"
 "angle" "0.000009"
 "targetname" "b_cp2"
+"message" "Blue Room"
 }
 {
 "classname" "onslaught_link"
@@ -125659,7 +125665,7 @@ trak5x/base-pipe1a
 }
 {
 "classname" "func_wall"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 {
 ( -1504 -960 192 ) ( -1376 -928 192 ) ( -1376 -960 192 ) common/caulk 0 64 -90 0.25 -0.25 134217728 0 0
 ( -1376 -944 160 ) ( -1504 -944 208 ) ( -1376 -944 208 ) common/caulk -0 64 0 0.25 0.25 134217728 0 0
@@ -125675,7 +125681,7 @@ trak5x/base-pipe1a
 }
 {
 "classname" "func_wall"
-"gametypefilter" "-ctf,ons"
+"gametypefilter" "-ctf,ons,nexball"
 {
 ( 928 128 768 ) ( 928 128 -384 ) ( 928 -128 768 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( -1024 -256 -384 ) ( -1024 -256 768 ) ( -896 -256 -384 ) trak5x/wall-wall4c 0 64 0 0.5 0.5 134217728 0 0
@@ -125803,7 +125809,7 @@ trak5x/wall-wall4c
 }
 {
 "classname" "func_wall"
-"gametypefilter" "+ctf,ons"
+"gametypefilter" "+ctf,ons,nexball"
 {
 ( -1024 -256 -384 ) ( -1024 -256 768 ) ( -896 -256 -384 ) trak5x/wall-wall4d 0 64 0 0.5 0.5 134217728 0 0
 ( -256 -64 640 ) ( -128 64 640 ) ( -256 64 640 ) exx/base-metal04 -0 0 0 0.5 0.5 134217728 0 0
@@ -126099,3 +126105,55 @@ trak5x/base-pipe1c
 "loddistance1" "450"
 "angle" "-52.000595"
 }
+{
+"classname" "misc_gamemodel"
+"origin" "-4864.000000 0.000000 144.000000"
+"model" "models/teleporters/gianttele.md3"
+"angle" "90.000000"
+"modelscale" "1.250000"
+"gametypefilter" "+nexball"
+}
+{
+"classname" "nexball_redgoal"
+"spawnflags" "1"
+{
+( -4848 64 240 ) ( -4848 -64 240 ) ( -4880 64 240 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -4848 80 144 ) ( -4880 80 144 ) ( -4848 80 128 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -4848 64 144 ) ( -4848 64 128 ) ( -4848 -64 144 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -4880 -64 80 ) ( -4848 -64 80 ) ( -4880 64 80 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -4880 -80 128 ) ( -4880 -80 144 ) ( -4848 -80 128 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -4880 -64 128 ) ( -4880 64 128 ) ( -4880 -64 144 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 128 -32 240 ) ( 0 -80 192 ) ( 0 -32 240 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 0 32 240 ) ( 0 80 192 ) ( 128 32 240 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 0 80 128 ) ( 0 32 80 ) ( 128 80 128 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 128 -80 128 ) ( 0 -32 80 ) ( 0 -80 128 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+}
+}
+{
+"classname" "misc_gamemodel"
+"origin" "4864.000000 0.000000 144.000000"
+"model" "models/teleporters/gianttele.md3"
+"angle" "-90.000000"
+"modelscale" "1.250000"
+"gametypefilter" "+nexball"
+}
+{
+"classname" "nexball_bluegoal"
+"spawnflags" "1"
+{
+( 4880 64 240 ) ( 4848 -64 240 ) ( 4848 64 240 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 4848 80 128 ) ( 4880 80 144 ) ( 4848 80 144 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 4848 -64 144 ) ( 4848 64 128 ) ( 4848 64 144 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 4880 64 80 ) ( 4848 -64 80 ) ( 4880 -64 80 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 4848 -80 128 ) ( 4880 -80 144 ) ( 4880 -80 128 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 4880 -64 144 ) ( 4880 64 128 ) ( 4880 -64 128 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 0 -32 240 ) ( 0 -80 192 ) ( -128 -32 240 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -128 32 240 ) ( 0 80 192 ) ( 0 32 240 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( -128 80 128 ) ( 0 32 80 ) ( 0 80 128 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+( 0 -80 128 ) ( 0 -32 80 ) ( -128 -80 128 ) common/trigger 0 0 0 0.5 0.5 0 0 0
+}
+}
+{
+"classname" "nexball_basketball"
+"origin" "0.000000 0.000000 320.000000"
+}