-super 2 fails too on the deluxemap

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

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 01a66e9f530e4e7b677b765170bdaa3310e1e3b2..34982029922b0b5e79a7a0a35ca89559bd681ee3 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -996,7 +996,7 @@
 ( 704 -224 328 ) ( 456 -224 328 ) ( 456 -224 288 ) common/clip 0 0 0 0.25 0.25 0 13 0
 ( 704 -1024 328 ) ( 704 -224 328 ) ( 704 -224 288 ) common/clip 0 0 0 0.25 0.25 0 13 0
 ( 448 -920 328 ) ( 696 -920 328 ) ( 696 -920 288 ) common/clip 0 0 0 0.25 0.25 0 13 0
 ( 704 -224 328 ) ( 456 -224 328 ) ( 456 -224 288 ) common/clip 0 0 0 0.25 0.25 0 13 0
 ( 704 -1024 328 ) ( 704 -224 328 ) ( 704 -224 288 ) common/clip 0 0 0 0.25 0.25 0 13 0
 ( 448 -920 328 ) ( 696 -920 328 ) ( 696 -920 288 ) common/clip 0 0 0 0.25 0.25 0 13 0

-( 456 -1024 296 ) ( 456 -224 296 ) ( 704 -224 296 ) common/clip 0 0 0 0.25 0.25 0 13 0
+( 456 -1024 320 ) ( 456 -224 320 ) ( 704 -224 320 ) common/clip 0 0 0 0.25 0.25 0 13 0

 ( 704 -224 288 ) ( 456 -224 288 ) ( 456 -1024 288 ) common/clip 0 0 0 0.25 0.25 0 13 0
 }
 // brush 111
 ( 704 -224 288 ) ( 456 -224 288 ) ( 456 -1024 288 ) common/clip 0 0 0 0.25 0.25 0 13 0
 }
 // brush 111


@@ -9563,12 +9563,12 @@ exx/base/base_metal01
 }
 // brush 1055
 {
 }
 // brush 1055
 {

-( 904 1080 -32 ) ( 904 1080 0 ) ( 904 1400 -32 ) exx/trim/trim_support03 0 256 90 0.25 -0.25 134217728 0 0
-( 896 1088 -32 ) ( 904 1080 -32 ) ( 896 1408 -32 ) common/caulk -0 0 180 0.25 0.25 134217728 4 0
-( 904 1400 0 ) ( 904 1080 0 ) ( 896 1408 0 ) exx/trim/trim_vert01 -0 256 180 0.25 0.25 134217728 0 0
-( 896 928 64 ) ( 896 912 -64 ) ( 896 928 -64 ) common/caulk 0 0 0 -0.5 0.5 134217728 0 0
-( 896 1408 -64 ) ( 912 1392 -64 ) ( 896 1408 64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 896 1216 64 ) ( 928 1248 -64 ) ( 896 1216 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 904 1408 128 ) ( 904 1216 0 ) ( 904 1216 128 ) common/clip 0 256 90 0.25 -0.25 134217728 0 0
+( 896 1408 0 ) ( 904 1216 0 ) ( 904 1408 0 ) common/clip 0 0 180 0.25 0.25 134217728 4 0
+( 896 1408 128 ) ( 904 1216 128 ) ( 896 1216 128 ) common/clip 0 256 180 0.25 0.25 134217728 0 0
+( 896 928 96 ) ( 896 912 -32 ) ( 896 928 -32 ) common/clip 0 64 0 -0.5 0.5 134217728 0 0
+( 896 1408 128 ) ( 904 1408 0 ) ( 904 1408 128 ) common/clip 0 64 0 0.5 0.5 134217728 0 0
+( 896 1216 128 ) ( 904 1216 128 ) ( 904 1216 0 ) common/clip 0 64 0 0.5 0.5 134217728 0 0

 }
 // brush 1056
 {
 }
 // brush 1056
 {


@@ -10237,7 +10237,7 @@ exx/base/base_metal01
 }
 // brush 1130
 {
 }
 // brush 1130
 {

-( 2304 -2048 352 ) ( -1344 -2048 352 ) ( -1344 1152 352 ) common/clip 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

 ( 2304 1152 320 ) ( -1344 1152 352 ) ( -1344 1152 320 ) common/clip 0 0 0 0.5 0.5 0 0 0
 ( 2304 1152 352 ) ( 2304 -2048 320 ) ( 2304 -2048 352 ) common/clip 0 0 0 0.5 0.5 0 0 0
 ( 2304 -2048 320 ) ( -1344 1152 320 ) ( -1344 -2048 320 ) common/clip 0 0 0 0.5 0.5 0 0 0
 ( 2304 1152 320 ) ( -1344 1152 352 ) ( -1344 1152 320 ) common/clip 0 0 0 0.5 0.5 0 0 0
 ( 2304 1152 352 ) ( 2304 -2048 320 ) ( 2304 -2048 352 ) common/clip 0 0 0 0.5 0.5 0 0 0
 ( 2304 -2048 320 ) ( -1344 1152 320 ) ( -1344 -2048 320 ) common/clip 0 0 0 0.5 0.5 0 0 0


@@ -13055,6 +13055,15 @@ exx/floor-metal02
 ( 1536 160 -192 ) ( 1792 160 -160 ) ( 1536 160 -160 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( 1792 160 -192 ) ( 1792 -48 -160 ) ( 1792 160 -160 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
 ( 1536 160 -192 ) ( 1792 160 -160 ) ( 1536 160 -160 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( 1792 160 -192 ) ( 1792 -48 -160 ) ( 1792 160 -160 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }

+// brush 1420
+{
+( 904 1080 -32 ) ( 904 1080 0 ) ( 904 1400 -32 ) exx/trim/trim_support03 0 256 90 0.25 -0.25 134217728 0 0
+( 896 1088 -32 ) ( 904 1080 -32 ) ( 896 1408 -32 ) common/caulk -0 0 180 0.25 0.25 134217728 4 0
+( 904 1400 0 ) ( 904 1080 0 ) ( 896 1408 0 ) exx/trim/trim_vert01 -0 256 180 0.25 0.25 134217728 0 0
+( 896 928 64 ) ( 896 912 -64 ) ( 896 928 -64 ) common/caulk 0 0 0 -0.5 0.5 134217728 0 0
+( 896 1408 -64 ) ( 912 1392 -64 ) ( 896 1408 64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 896 1216 64 ) ( 928 1248 -64 ) ( 896 1216 -64 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+}

 }
 // entity 1
 {
 }
 // entity 1
 {


@@ -22862,10 +22871,10 @@ exx/trim/trim_01
 // brush 0
 {
 ( 1312 176 96 ) ( 1312 144 96 ) ( 1120 176 96 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 // brush 0
 {
 ( 1312 176 96 ) ( 1312 144 96 ) ( 1120 176 96 ) common/trigger 0 0 0 0.25 0.25 0 0 0

-( 1312 176 128 ) ( 1120 176 128 ) ( 1312 176 -32 ) warpzone/warpzone-wavy 0 0 0 0.25 0.25 0 0 0
+( 1312 176 128 ) ( 1120 176 128 ) ( 1312 176 -32 ) effects_warpzone/wavy 0 0 0 0.25 0.25 0 0 0

 ( 1280 176 128 ) ( 1280 176 -32 ) ( 1280 144 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1120 144 -32 ) ( 1312 144 -32 ) ( 1120 176 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1280 176 128 ) ( 1280 176 -32 ) ( 1280 144 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1120 144 -32 ) ( 1312 144 -32 ) ( 1120 176 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0

-( 1120 144 -32 ) ( 1120 144 128 ) ( 1312 144 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1120 128 -32 ) ( 1120 128 128 ) ( 1312 128 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0

 ( 1152 144 -32 ) ( 1152 176 -32 ) ( 1152 144 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 }
 }
 ( 1152 144 -32 ) ( 1152 176 -32 ) ( 1152 144 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 }
 }


@@ -22877,7 +22886,7 @@ exx/trim/trim_01
 // brush 0
 {
 ( -560 160 144 ) ( -528 288 144 ) ( -528 160 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 // brush 0
 {
 ( -560 160 144 ) ( -528 288 144 ) ( -528 160 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0

-( -560 160 144 ) ( -560 288 16 ) ( -560 288 144 ) warpzone/warpzone-wavy 0 0 0 0.25 0.25 0 0 0
+( -560 160 144 ) ( -560 288 16 ) ( -560 288 144 ) effects_warpzone/wavy 0 0 0 0.25 0.25 0 0 0

 ( -560 288 144 ) ( -528 288 16 ) ( -528 288 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -560 288 16 ) ( -528 160 16 ) ( -528 288 16 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -528 288 16 ) ( -528 160 144 ) ( -528 288 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -560 288 144 ) ( -528 288 16 ) ( -528 288 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -560 288 16 ) ( -528 160 16 ) ( -528 288 16 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -528 288 16 ) ( -528 160 144 ) ( -528 288 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0


@@ -22888,7 +22897,7 @@ exx/trim/trim_01
 {
 "classname" "misc_model"
 "origin" "1216.000000 177.000000 32.000000"
 {
 "classname" "misc_model"
 "origin" "1216.000000 177.000000 32.000000"

-"model" "models/warpzone/warpzone-blueedge.md3"
+"model" "models/effects_warpzone/blueedge.md3"

 "modelscale" "4.000000"
 "angle" "-90.000000"
 }
 "modelscale" "4.000000"
 "angle" "-90.000000"
 }


@@ -22896,7 +22905,7 @@ exx/trim/trim_01
 {
 "classname" "misc_model"
 "origin" "-561.000000 224.000000 80.000000"
 {
 "classname" "misc_model"
 "origin" "-561.000000 224.000000 80.000000"

-"model" "models/warpzone/warpzone-blueedge.md3"
+"model" "models/effects_warpzone/blueedge.md3"

 "modelscale" "4.000000"
 }
 // entity 265
 "modelscale" "4.000000"
 }
 // entity 265


@@ -23511,3 +23520,101 @@ exx/trim/trim_01
 ( 256 896 96 ) ( 256 928 96 ) ( 256 896 128 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 }
 }
 ( 256 896 96 ) ( 256 928 96 ) ( 256 896 128 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
 }
 }

+// entity 317
+{
+"classname" "func_group"
+// brush 0
+{
+( 56 744 128 ) ( 8 744 128 ) ( 56 768 128 ) common/clip 64 192 -90 0.25 0.25 0 0 0
+( 56 744 128 ) ( 56 768 128 ) ( 56 744 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0
+( 56 744 96 ) ( 56 744 -32 ) ( 8 744 96 ) common/clip 64 0 0 0.25 0.25 0 0 0
+( 8 768 -32 ) ( 8 744 -32 ) ( 56 768 -32 ) common/clip 64 192 -90 0.25 0.25 0 0 0
+( 8 768 0 ) ( 8 768 128 ) ( 8 744 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0
+( 8 768 -32 ) ( 56 768 -32 ) ( 8 768 96 ) common/clip 64 0 0 0.25 0.25 0 0 0
+}
+// brush 1
+{
+( 8 744 128 ) ( -16 768 128 ) ( 8 768 128 ) common/clip 64 128 -90 0.25 -0.25 0 0 0
+( -16 768 0 ) ( -16 768 128 ) ( -16 728 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0
+( -16 728 0 ) ( -16 728 128 ) ( 8 744 0 ) common/clip 128 128 0 -0.25 0.25 0 0 0
+( 8 744 -32 ) ( -16 768 -32 ) ( -16 728 -32 ) common/clip 64 128 -90 0.25 -0.25 0 0 0
+( 8 744 0 ) ( 8 768 128 ) ( 8 768 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0
+( -16 768 96 ) ( -16 768 -32 ) ( 8 768 96 ) common/clip 128 0 0 -0.25 0.25 0 0 0
+}
+// brush 2
+{
+( -16 768 128 ) ( -48 664 128 ) ( -48 768 128 ) common/clip 64 224 -90 0.25 -0.25 0 0 0
+( -48 768 128 ) ( -48 664 128 ) ( -48 664 -32 ) common/clip 64 0 0 -0.25 0.25 0 0 0
+( -16 728 128 ) ( -48 664 -32 ) ( -48 664 128 ) common/clip 32 128 0 -0.25 0.25 0 0 0
+( -48 768 -32 ) ( -48 664 -32 ) ( -16 768 -32 ) common/clip 64 224 -90 0.25 -0.25 0 0 0
+( -16 728 0 ) ( -16 728 128 ) ( -16 768 128 ) common/clip 64 128 0 -0.25 0.25 0 0 0
+( -32 768 96 ) ( -32 768 -32 ) ( -16 768 96 ) common/clip 32 0 0 -0.25 0.25 0 0 0
+}
+// brush 3
+{
+( 56 768 128 ) ( 80 768 128 ) ( 56 744 128 ) common/clip 64 128 -90 0.25 0.25 0 0 0
+( 80 728 0 ) ( 80 768 128 ) ( 80 768 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0
+( 56 744 0 ) ( 80 728 128 ) ( 80 728 0 ) common/clip 128 128 0 0.25 0.25 0 0 0
+( 80 728 -32 ) ( 80 768 -32 ) ( 56 744 -32 ) common/clip 64 128 -90 0.25 0.25 0 0 0
+( 56 768 0 ) ( 56 768 128 ) ( 56 744 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0
+( 56 768 96 ) ( 80 768 -32 ) ( 80 768 96 ) common/clip 128 0 0 0.25 0.25 0 0 0
+}
+// brush 4
+{
+( 112 768 128 ) ( 112 664 128 ) ( 80 768 128 ) common/clip 64 224 -90 0.25 0.25 0 0 0
+( 112 768 128 ) ( 112 664 -32 ) ( 112 664 128 ) common/clip 64 0 0 -0.25 0.25 0 0 0
+( 80 728 -32 ) ( 112 664 128 ) ( 112 664 -32 ) common/clip 32 128 0 -0.25 0.25 0 0 0
+( 80 728 -32 ) ( 112 664 -32 ) ( 80 768 -32 ) common/clip 64 224 -90 0.25 0.25 0 0 0
+( 80 768 128 ) ( 80 728 128 ) ( 80 728 0 ) common/clip 64 128 0 -0.25 0.25 0 0 0
+( 80 768 96 ) ( 96 768 -32 ) ( 96 768 96 ) common/clip 32 0 0 0.25 0.25 0 0 0
+}
+}
+// entity 318
+{
+"classname" "func_group"
+// brush 0
+{
+( -536 -824 -32 ) ( -536 -872 -32 ) ( -560 -824 -32 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -536 -824 -32 ) ( -560 -824 -32 ) ( -536 -824 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -536 -824 -32 ) ( -536 -824 -160 ) ( -536 -872 -32 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -560 -872 -160 ) ( -536 -872 -160 ) ( -560 -824 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -560 -872 -160 ) ( -560 -872 -32 ) ( -536 -872 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -560 -872 -160 ) ( -560 -824 -160 ) ( -560 -872 -32 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+// brush 1
+{
+( -536 -872 -32 ) ( -560 -896 -32 ) ( -560 -872 -32 ) common/clip 0 64 0 0.25 -0.25 0 0 0
+( -560 -896 -160 ) ( -560 -896 -32 ) ( -520 -896 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -520 -896 -160 ) ( -520 -896 -32 ) ( -536 -872 -160 ) common/clip 192 0 0 -0.25 0.25 0 0 0
+( -536 -872 -160 ) ( -560 -896 -160 ) ( -520 -896 -160 ) common/clip 0 64 0 0.25 -0.25 0 0 0
+( -536 -872 -160 ) ( -560 -872 -32 ) ( -560 -872 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -560 -896 -32 ) ( -560 -896 -160 ) ( -560 -872 -32 ) common/clip 192 0 0 -0.25 0.25 0 0 0
+}
+// brush 2
+{
+( -520 -896 -32 ) ( -560 -912 -32 ) ( -560 -896 -32 ) common/clip 0 160 0 0.25 -0.25 0 0 0
+( -560 -928 -160 ) ( -560 -928 -32 ) ( -480 -928 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -480 -912 -160 ) ( -480 -912 -32 ) ( -520 -896 -160 ) common/clip 224 0 0 0.25 0.25 0 0 0
+( -520 -896 -160 ) ( -560 -912 -160 ) ( -480 -912 -160 ) common/clip 0 160 0 0.25 -0.25 0 0 0
+( -520 -896 -160 ) ( -520 -896 -32 ) ( -560 -896 -32 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -560 -912 -32 ) ( -560 -912 -160 ) ( -560 -896 -32 ) common/clip 96 0 0 -0.25 0.25 0 0 0
+}
+// brush 3
+{
+( -560 -824 -32 ) ( -560 -800 -32 ) ( -536 -824 -32 ) common/clip 0 192 0 0.25 0.25 0 0 0
+( -520 -800 -160 ) ( -560 -800 -32 ) ( -560 -800 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -536 -824 -160 ) ( -520 -800 -32 ) ( -520 -800 -160 ) common/clip 64 0 0 0.25 0.25 0 0 0
+( -520 -800 -160 ) ( -560 -800 -160 ) ( -536 -824 -160 ) common/clip 0 192 0 0.25 0.25 0 0 0
+( -560 -824 -160 ) ( -560 -824 -32 ) ( -536 -824 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -560 -824 -32 ) ( -560 -800 -160 ) ( -560 -800 -32 ) common/clip 64 0 0 0.25 0.25 0 0 0
+}
+// brush 4
+{
+( -560 -800 -32 ) ( -560 -784 -32 ) ( -520 -800 -32 ) common/clip 0 32 0 0.25 0.25 0 0 0
+( -480 -768 -160 ) ( -560 -768 -32 ) ( -560 -768 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -520 -800 -160 ) ( -480 -784 -32 ) ( -480 -784 -160 ) common/clip 224 0 0 0.25 0.25 0 0 0
+( -480 -784 -160 ) ( -560 -784 -160 ) ( -520 -800 -160 ) common/clip 0 32 0 0.25 0.25 0 0 0
+( -560 -800 -32 ) ( -520 -800 -32 ) ( -520 -800 -160 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -560 -800 -32 ) ( -560 -784 -160 ) ( -560 -784 -32 ) common/clip 224 0 0 0.25 0.25 0 0 0
+}
+}