Squashed commit of the following:

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

diff --git a/maps/glowplant.map b/maps/glowplant.map
index 462ec4b6c184a5651b8cbe6d17ec23698967693f..58063af45dcd09762092222a6fff24f2ea3f16cc 100644 (file)
--- a/maps/glowplant.map
+++ b/maps/glowplant.map
@@ -218,7 +218,7 @@
 ( -2048 1152 1216 ) ( -2048 1176 1216 ) ( -952 1176 1216 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -2048 1176 576 ) ( -2048 1152 576 ) ( -952 1152 576 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -2064 1168 1152 ) ( -2064 1168 576 ) ( -944 1168 576 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( -960 1152 1088 ) ( -960 1152 512 ) ( -2048 1152 512 ) map_glowplant/sky 0 0 0 0.25 0.25 0 0 0
+( -960 1152 1056 ) ( -960 1152 480 ) ( -2048 1152 480 ) map_glowplant/sky 0 -0 0 0.25 0.25 0 0 0
 ( -944 1152 576 ) ( -944 1152 1152 ) ( -928 1168 1152 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -2064 1168 640 ) ( -2064 1168 1216 ) ( -2048 1152 1216 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
@@ -6962,7 +6962,7 @@ map_glowplant/biolumi2_blue-lowlight
 {
 ( 448 464 64 ) ( 320 464 64 ) ( 320 448 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
 ( 368 448 192 ) ( 368 464 192 ) ( 496 464 192 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
-( 320 448 256 ) ( 448 448 256 ) ( 448 448 64 ) exx/floor-grate01 0 0 0 0.25 0.25 134217728 256 0
+( 320 448 256 ) ( 448 448 256 ) ( 448 448 64 ) exx/floor-grate01-cull 0 0 0 0.25 0.25 134217728 256 0
 ( 448 448 256 ) ( 448 464 256 ) ( 448 464 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
 ( 448 464 256 ) ( 320 464 256 ) ( 320 464 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
 ( 320 464 256 ) ( 320 448 256 ) ( 320 448 64 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
@@ -8212,7 +8212,7 @@ exx/base-metal01
 {
 ( -168 -216 -48 ) ( -168 -288 -48 ) ( -168 -288 -184 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
 ( -160 -208 -56 ) ( -168 -208 -56 ) ( -168 -208 -192 ) common/weapclip 64 0 0 0.25 0.25 134217728 5 0
-( -160 -272 -56 ) ( -160 -200 -56 ) ( -160 -200 -192 ) exx/floor-grate01 426 146 0 -0.1875 0.2187499851 134217728 256 0
+( -160 -272 -56 ) ( -160 -200 -56 ) ( -160 -200 -192 ) exx/floor-grate01-cull 426 146 0 -0.1875 0.2187499851 134217728 256 0
 ( -168 -304 -56 ) ( -160 -304 -56 ) ( -160 -304 -192 ) common/weapclip 64 0 0 0.25 0.25 134217728 5 0
 ( -168 -288 -80 ) ( -168 -216 -80 ) ( -160 -216 -80 ) common/weapclip 64 0 0 0.25 0.25 134217728 5 0
 ( -160 -216 -192 ) ( -168 -216 -192 ) ( -168 -288 -192 ) common/weapclip 64 0 0 0.25 0.25 134217728 5 0
@@ -8221,7 +8221,7 @@ exx/base-metal01
 ( -160 296 -192 ) ( -168 296 -192 ) ( -168 224 -192 ) common/weapclip 64 0 0 0.25 0.25 134217728 5 0
 ( -168 224 -80 ) ( -168 296 -80 ) ( -160 296 -80 ) common/weapclip 64 0 0 0.25 0.25 134217728 5 0
 ( -168 208 -56 ) ( -160 208 -56 ) ( -160 208 -192 ) common/weapclip 64 0 0 0.25 0.25 134217728 5 0
-( -160 240 -56 ) ( -160 312 -56 ) ( -160 312 -192 ) exx/floor-grate01 85 146 0 -0.1875 0.2187499851 134217728 256 0
+( -160 240 -56 ) ( -160 312 -56 ) ( -160 312 -192 ) exx/floor-grate01-cull 85 146 0 -0.1875 0.2187499851 134217728 256 0
 ( -160 304 -56 ) ( -168 304 -56 ) ( -168 304 -192 ) common/weapclip 64 0 0 0.25 0.25 134217728 5 0
 ( -168 296 -48 ) ( -168 224 -48 ) ( -168 224 -184 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
 }
@@ -8501,7 +8501,7 @@ exx/base-metal01
 ( 400 160 -176 ) ( 288 160 -176 ) ( 288 160 -256 ) common/weapclip 192 0 0 0.25 0.25 134217728 5 0
 ( 400 -160 -176 ) ( 400 144 -176 ) ( 400 144 -256 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
 ( 288 -160 -176 ) ( 400 -160 -176 ) ( 400 -160 -256 ) common/weapclip 192 0 0 0.25 0.25 134217728 5 0
-( 288 -160 -192 ) ( 288 144 -192 ) ( 400 144 -192 ) exx/floor-grate04 192 0 0 0.25 0.25 134217728 256 0
+( 288 -160 -192 ) ( 288 144 -192 ) ( 400 144 -192 ) exx/floor-grate04-cull 192 0 0 0.25 0.25 134217728 256 0
 ( 400 164 -196 ) ( 288 164 -196 ) ( 288 -140 -196 ) common/weapclip 192 0 0 0.25 0.25 134217728 5 0
 }
 {
@@ -11567,7 +11567,7 @@ common/clip
 ( -960 256 8 ) ( -1216 256 8 ) ( -1216 256 -160 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
 ( -960 0 8 ) ( -960 256 8 ) ( -960 256 -160 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
 ( -1216 0 8 ) ( -960 0 8 ) ( -960 0 -160 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
-( -1216 0 8 ) ( -1216 256 8 ) ( -960 256 8 ) exx/floor-grate04 0 0 0 0.25 0.25 134217728 256 0
+( -1216 0 8 ) ( -1216 256 8 ) ( -960 256 8 ) exx/floor-grate04-cull 0 0 0 0.25 0.25 134217728 256 0
 ( -948 256 0 ) ( -1204 256 0 ) ( -1204 0 0 ) common/weapclip 0 0 0 0.25 0.25 134217728 5 0
 }
 {
@@ -16359,7 +16359,7 @@ map_glowplant/sand
 ( 3 3 0 0 0 )
 (
 ( ( -1280 320 8 0 0 ) ( -1280 448 8 0 -1 ) ( -1280 576 8 0 -2 ) )
-( ( -1088 320 8 1.8027756214 0 ) ( -1088 448 40 1.8027756214 -1 ) ( -1088 576 136 1.8027756214 -2 ) )
+( ( -1088 320 8 1.8027756214 0 ) ( -1088 448 41 1.8027756214 -1 ) ( -1088 576 74 1.8027756214 -2 ) )
 ( ( -896 320 8 3.6055512428 0 ) ( -896 448 8 3.6055512428 -1 ) ( -896 576 8 3.6055512428 -2 ) )
 )
 }
@@ -16382,8 +16382,8 @@ patchDef2
 map_glowplant/sand
 ( 3 7 0 0 0 )
 (
-( ( -1664 -384 8 0 0 ) ( -1664 -256 40 0 -1 ) ( -1664 -128 40 0 -2 ) ( -1664 0 104 0 -3 ) ( -1664 128 40 0 -4 ) ( -1664 256 8 0 -5 ) ( -1664 384 8 0 -6 ) )
-( ( -1376 -384 8 2.4141509533 0 ) ( -1376 -256 8 2.4141509533 -1 ) ( -1376 -128 8 2.4141509533 -2 ) ( -1376 0 -8 2.4141509533 -3 ) ( -1376 128 24 2.4141509533 -4 ) ( -1376 256 24 2.4141509533 -5 ) ( -1376 384 8 2.4141509533 -6 ) )
+( ( -1664 -384 8 0 0 ) ( -1664 -256 40 0 -1 ) ( -1664 -128 40 0 -2 ) ( -1664 0 48 0 -3 ) ( -1664 128 40 0 -4 ) ( -1664 256 8 0 -5 ) ( -1664 384 8 0 -6 ) )
+( ( -1376 -384 8 2.4141509533 0 ) ( -1376 -256 8 2.4141509533 -1 ) ( -1376 -128 8 2.4141509533 -2 ) ( -1376 0 0 2.4141509533 -3 ) ( -1376 128 24 2.4141509533 -4 ) ( -1376 256 24 2.4141509533 -5 ) ( -1376 384 8 2.4141509533 -6 ) )
 ( ( -1280 -384 8 3.1744964123 0 ) ( -1280 -256 8 3.1744964123 -1 ) ( -1280 -128 8 3.1744964123 -2 ) ( -1280 0 8 3.1744964123 -3 ) ( -1280 128 8 3.1744964123 -4 ) ( -1280 256 8 3.1744964123 -5 ) ( -1280 384 8 3.1744964123 -6 ) )
 )
 }
@@ -22218,7 +22218,7 @@ exx/panel-metalbig04b
 }
 {
 ( 896 1008 208 ) ( 768 1008 208 ) ( 768 976 208 ) common/weapclip 0 192 0 0.25 0.25 134217728 0 0
-( 848 976 80 ) ( 848 976 64 ) ( 752 976 64 ) exx/floor-grate01 0 64 0 0.25 0.25 134217728 256 0
+( 848 976 80 ) ( 848 976 64 ) ( 752 976 64 ) exx/floor-grate01-cull 0 64 0 0.25 0.25 134217728 256 0
 ( 704 1008 272 ) ( 704 1008 -16 ) ( 704 976 -16 ) common/weapclip 64 192 0 0.25 0.25 134217728 0 0
 ( 1088 984 272 ) ( 576 984 272 ) ( 1088 984 -16 ) common/weapclip 0 192 0 0.25 0.25 134217728 0 0
 ( 576 992 192 ) ( 576 960 192 ) ( 576 960 176 ) common/weapclip 64 192 0 0.25 0.25 134217728 0 0
@@ -26155,6 +26155,38 @@ exx/trim-baseboard02
 ( -720 -192 -48 ) ( -720 -192 -24 ) ( -704 -192 -48 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -720 -384 -48 ) ( -720 384 -48 ) ( -720 -384 -24 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 384 -112 512 ) ( 384 -128 512 ) ( 64 -112 512 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 320 -112 512 ) ( 320 -112 496 ) ( 320 -128 512 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -128 504 ) ( 384 -128 504 ) ( 64 -112 504 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -128 496 ) ( 64 -128 512 ) ( 384 -128 496 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -128 496 ) ( 64 -112 496 ) ( 64 -128 512 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 272 64 -64 ) ( 288 64 -64 ) ( 272 64 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 64 -112 512 ) ( 64 -128 512 ) ( -256 -112 512 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 88 128 512 ) ( -232 128 512 ) ( 88 128 496 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 0 -112 512 ) ( 0 -112 496 ) ( 0 -128 512 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -256 -128 504 ) ( 64 -128 504 ) ( -256 -112 504 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -256 -128 496 ) ( -256 -128 512 ) ( 64 -128 496 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -256 -128 496 ) ( -256 -112 496 ) ( -256 -128 512 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 384 -112 512 ) ( 384 -128 512 ) ( 64 -112 512 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 408 128 512 ) ( 88 128 512 ) ( 408 128 496 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -128 504 ) ( 384 -128 504 ) ( 64 -112 504 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -128 496 ) ( 64 -112 496 ) ( 64 -128 512 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 272 64 64 ) ( 288 64 -64 ) ( 272 64 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 256 112 -64 ) ( 256 104 -64 ) ( 256 112 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 704 -112 512 ) ( 704 -128 512 ) ( 384 -112 512 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 728 128 512 ) ( 408 128 512 ) ( 728 128 496 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 704 -112 512 ) ( 704 -112 496 ) ( 704 -128 512 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 384 -128 504 ) ( 704 -128 504 ) ( 384 -112 504 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 384 -128 496 ) ( 384 -128 512 ) ( 704 -128 496 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 384 -128 496 ) ( 384 -112 496 ) ( 384 -128 512 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "trigger_push"
@@ -38159,3 +38191,33 @@ exx/floor-panel01
 "classname" "item_armor_medium"
 "origin" "192.000000 -384.000000 528.000000"
 }
+{
+"classname" "target_speaker"
+"origin" "-1760.000000 128.000000 928.000000"
+"noise" "sound/wind/Howling-Wind.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "640.000000 1248.000000 336.000000"
+"noise" "sound/machines/radiostatic_loop.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "240.000000 -576.000000 192.000000"
+"noise" "sound/machines/Big_machine.wav"
+}
+{
+"classname" "dom_controlpoint"
+"origin" "-1408.000000 -32.000000 48.000000"
+"message" " has captured the outside control point"
+}
+{
+"classname" "dom_controlpoint"
+"origin" "544.000000 0.000000 528.000000"
+"message" " has captured the top control point"
+}
+{
+"classname" "dom_controlpoint"
+"origin" "160.000000 960.000000 320.000000"
+"message" " has captured the side control point"
+}