Fix #99 and make the jumppad triggers universal

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

diff --git a/maps/drain.map b/maps/drain.map
index 417e7ac5c72a50d9692ed431842c119f2f556229..b1f0fd6d15a0b305d5760d225fe27df7c5566ff8 100644 (file)
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -8671,14 +8671,6 @@ trak5x/base-pipe1d
 ( 236 -70 16 ) ( 234 -68 24 ) ( 234 -68 16 ) trak5x/base-base1a 352 352 0 -0.125 0.125 134217728 0 0
 }
 {
-( 272 -56 200 ) ( 272 -96 200 ) ( 128 -56 200 ) common/clip 0 224 0 0.25 0.25 0 0 0
-( 272 -56 224 ) ( 128 -56 224 ) ( 272 -56 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 280 -48 224 ) ( 280 -48 64 ) ( 280 -88 224 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 128 -96 0 ) ( 272 -96 0 ) ( 128 -56 0 ) common/clip 0 224 0 0.25 0.25 0 0 0
-( 128 -88 64 ) ( 128 -88 224 ) ( 272 -88 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 64 -88 64 ) ( 64 -48 64 ) ( 64 -88 224 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( 128 160 8 ) ( 64 160 8 ) ( 128 160 -8 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
 ( 128 160 8 ) ( 128 160 -8 ) ( 128 -96 8 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
 ( 64 -96 -8 ) ( 128 -96 -8 ) ( 64 160 -8 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
@@ -8686,6 +8678,38 @@ trak5x/base-pipe1d
 ( 64 -96 -8 ) ( 64 160 -8 ) ( 64 -96 8 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
 ( 64 64 192 ) ( 128 64 64 ) ( 64 -64 192 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 72 -96 288 ) ( 72 -160 288 ) ( 64 -96 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 72 -32 40 ) ( 64 -32 40 ) ( 72 -32 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 66 -32 40 ) ( 66 -32 0 ) ( 66 -96 40 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -160 0 ) ( 72 -160 0 ) ( 64 -96 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -160 0 ) ( 64 -160 40 ) ( 72 -160 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -160 0 ) ( 64 -96 0 ) ( 64 -160 40 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 82 -110 288 ) ( 82 -112 288 ) ( 64 -110 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 176 -110 288 ) ( 158 -110 288 ) ( 176 -110 224 ) common/clip 136 0 0 0.25 0.25 0 0 0
+( 288 -112 288 ) ( 288 -112 224 ) ( 288 -114 288 ) common/clip 8 0 0 0.25 0.25 0 0 0
+( 60 -112 4 ) ( 78 -112 4 ) ( 60 -110 4 ) common/clip 16 0 0 0.25 0.25 0 0 0
+( 64 -112 224 ) ( 64 -112 288 ) ( 82 -112 224 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -112 224 ) ( 64 -110 224 ) ( 64 -112 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 272 -74 288 ) ( 272 -110 288 ) ( 270 -74 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 262 576 288 ) ( 260 576 288 ) ( 262 576 4 ) common/clip 40 0 0 0.25 0.25 0 0 0
+( 272 -74 288 ) ( 272 -74 4 ) ( 272 -110 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 270 -110 4 ) ( 272 -110 4 ) ( 270 -74 4 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 270 -110 4 ) ( 270 -110 288 ) ( 272 -110 4 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 270 442 4 ) ( 270 478 4 ) ( 270 442 288 ) common/clip 96 0 0 0.25 0.25 0 0 0
+}
+{
+( 338 -808 -62 ) ( 338 -848 -62 ) ( 296 -808 -62 ) phillipk1x/floors-pk01_pan_floor02a 243.8094482422 186.1826171875 0 0.1640625 0.1718750298 0 0 0
+( 338 -804 -62 ) ( 296 -804 -62 ) ( 338 -804 -64 ) phillipk1x/floors-pk01_gra_floor02 0 248 0 0.25 0.25 0 0 0
+( 338 -808 -62 ) ( 338 -808 -64 ) ( 338 -848 -62 ) phillipk1x/floors-pk01_gra_floor02 0 248 0 0.25 0.25 0 0 0
+( 296 -848 -64 ) ( 338 -848 -64 ) ( 296 -808 -64 ) phillipk1x/floors-pk01_pan_floor02a 243.8094482422 186.1826171875 0 0.1640625 0.1718750298 0 0 0
+( 296 -848 -64 ) ( 296 -848 -62 ) ( 338 -848 -64 ) phillipk1x/floors-pk01_gra_floor02 0 248 0 0.25 0.25 0 0 0
+( 296 -848 -64 ) ( 296 -808 -64 ) ( 296 -848 -62 ) phillipk1x/floors-pk01_gra_floor02 0 248 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "func_group"
@@ -9784,12 +9808,12 @@ trak5x/base-pipe1d
 "classname" "trigger_push"
 "target" "target_position1"
 {
-( 228 348 176 ) ( 228 296 176 ) ( 180 348 176 ) common/trigger 240 0 0 0.25 0.25 0 0 0
-( 248 376 132 ) ( 200 376 132 ) ( 248 376 128 ) common/trigger 160 0 0 0.25 0.25 0 0 0
-( 244 380 132 ) ( 244 380 128 ) ( 244 328 132 ) common/trigger 128 0 0 0.25 0.25 0 0 0
-( 176 296 128 ) ( 224 296 128 ) ( 176 348 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 164 292 128 ) ( 164 292 132 ) ( 212 292 128 ) common/trigger 48 0 0 0.25 0.25 0 0 0
-( 168 288 128 ) ( 168 340 128 ) ( 168 288 132 ) common/trigger 32 0 0 0.25 0.25 0 0 0
+( 249.1302947998 342.8143920898 160 ) ( 212.6830291748 305.7253875732 160 ) ( 214.8942871094 376.4580230713 160 ) common/trigger 122.3580856323 28.5217342377 -44.5000076294 0.2499998659 0.2499998659 0 0 0
+( 283.1425018311 347.8944396973 132 ) ( 248.9064941406 381.5380706787 132 ) ( 283.1425018311 347.8944396973 128 ) common/trigger 137.2804107666 245.80418396 90 8731.0458984375 0.250005424 0 0 0
+( 283.2213897705 354.6738586426 132 ) ( 283.2213897705 354.6738586426 128 ) ( 246.7741241455 317.584854126 132 ) common/trigger 43.7611083984 0 0 0.2659956217 0.25 0 0 0
+( 176.0940246582 342.1726531982 128 ) ( 210.3300323486 308.5290222168 128 ) ( 212.5412902832 379.2616577148 128 ) common/trigger 136.9316101074 29.9235534668 -44.5000076294 0.2499998659 0.2499998659 0 0 0
+( 136.3563842773 316.2305603027 128 ) ( 136.3563842773 316.2305603027 132 ) ( 170.5923919678 282.5869293213 128 ) common/trigger 23.8868045807 103.8016891479 90 8731.0458984375 0.250005424 0 0 0
+( 159.78074646 345.448928833 128 ) ( 196.228012085 382.5379333496 128 ) ( 159.78074646 345.448928833 132 ) common/trigger 192.0127716064 0 0 0.2659956217 0.25 0 0 0
 }
 }
 {
@@ -11697,7 +11721,7 @@ trak5x/base-pipe1d
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-73.953918 -188.056213 -255.521118"
+"origin" "-73.953918 -185.306213 -255.896118"
 "model" "models/containers/barrel01.md3"
 "modelscale" "1.200000"
 "count" "1"
@@ -11866,3 +11890,11 @@ trak5x/base-pipe1d
 "respawntime" "35"
 "respawntimejitter" "10"
 }
+{
+"classname" "item_shells"
+"origin" "-436.000000 -824.000000 -64.000000"
+}
+{
+"classname" "item_strength"
+"origin" "318.000000 -826.000000 -62.000000"
+}