Move trigger_counter entities inside the map, fixes a leak

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

diff --git a/maps/glowplant.map b/maps/glowplant.map
index 1509d7095de6f9a80cef7b3dc64ea0afbb38559f..bb499ae726b4fd7e9d5c9868e72edce24644c1cf 100644 (file)
--- a/maps/glowplant.map
+++ b/maps/glowplant.map
@@ -6240,61 +6240,61 @@ trak5x/base-pipe1c
 ( 128 -400 -192 ) ( 128 -400 -224 ) ( 144 -416 -224 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
 {
-( 256 -864 256 ) ( 256 -864 224 ) ( 272 -864 256 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -832 240 ) ( 256 -800 224 ) ( 272 -832 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -832 240 ) ( 256 -880 224 ) ( 272 -880 224 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
+( 256 -864 256 ) ( 256 -864 224 ) ( 272 -864 256 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -832 240 ) ( 256 -800 224 ) ( 272 -832 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -832 240 ) ( 256 -880 224 ) ( 272 -880 224 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
 ( 256 -768 288 ) ( 256 -896 288 ) ( 256 -896 208 ) exx/floor-grate01 0 0 0 0.25 0.25 134217728 256 0
-( 272 -896 320 ) ( 272 -768 320 ) ( 272 -768 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -896 320 ) ( 272 -896 320 ) ( 272 -896 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
+( 272 -896 320 ) ( 272 -768 320 ) ( 272 -768 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -896 320 ) ( 272 -896 320 ) ( 272 -896 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
 }
 {
-( 256 -768 288 ) ( 256 -816 272 ) ( 272 -768 288 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -800 224 ) ( 256 -832 240 ) ( 272 -832 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
+( 256 -768 288 ) ( 256 -816 272 ) ( 272 -768 288 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -800 224 ) ( 256 -832 240 ) ( 272 -832 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
 ( 256 -768 288 ) ( 256 -896 288 ) ( 256 -896 208 ) exx/floor-grate01 0 0 0 0.25 0.25 134217728 256 0
-( 272 -768 320 ) ( 256 -768 320 ) ( 256 -768 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 272 -896 320 ) ( 272 -768 320 ) ( 272 -768 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -896 320 ) ( 272 -896 320 ) ( 272 -896 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -896 320 ) ( 256 -768 320 ) ( 272 -768 320 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
+( 272 -768 320 ) ( 256 -768 320 ) ( 256 -768 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 272 -896 320 ) ( 272 -768 320 ) ( 272 -768 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -896 320 ) ( 272 -896 320 ) ( 272 -896 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -896 320 ) ( 256 -768 320 ) ( 272 -768 320 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
 }
 {
-( 256 -800 256 ) ( 256 -816 272 ) ( 272 -816 272 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -816 272 ) ( 256 -768 288 ) ( 272 -768 288 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -832 240 ) ( 256 -880 224 ) ( 272 -880 224 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
+( 256 -800 256 ) ( 256 -816 272 ) ( 272 -816 272 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -816 272 ) ( 256 -768 288 ) ( 272 -768 288 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -832 240 ) ( 256 -880 224 ) ( 272 -880 224 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
 ( 256 -768 288 ) ( 256 -896 288 ) ( 256 -896 208 ) exx/floor-grate01 0 0 0 0.25 0.25 134217728 256 0
-( 272 -768 320 ) ( 256 -768 320 ) ( 256 -768 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 272 -896 320 ) ( 272 -768 320 ) ( 272 -768 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
+( 272 -768 320 ) ( 256 -768 320 ) ( 256 -768 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 272 -896 320 ) ( 272 -768 320 ) ( 272 -768 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
 }
 {
-( 256 -1040 176 ) ( 256 -1056 336 ) ( 272 -1056 336 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -1088 272 ) ( 256 -1168 288 ) ( 272 -1168 288 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -1152 320 ) ( 256 -1024 320 ) ( 272 -1024 320 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 272 -1152 320 ) ( 272 -1024 320 ) ( 272 -1024 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 272 -1024 320 ) ( 256 -1024 320 ) ( 256 -1024 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1040 176 ) ( 256 -1056 336 ) ( 272 -1056 336 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1088 272 ) ( 256 -1168 288 ) ( 272 -1168 288 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1152 320 ) ( 256 -1024 320 ) ( 272 -1024 320 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 272 -1152 320 ) ( 272 -1024 320 ) ( 272 -1024 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 272 -1024 320 ) ( 256 -1024 320 ) ( 256 -1024 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
 ( 256 -1024 288 ) ( 256 -1152 288 ) ( 256 -1152 208 ) exx/floor-grate01 0 0 0 0.25 0.25 134217728 256 0
 }
 {
-( 256 -1008 216 ) ( 256 -1072 168 ) ( 272 -1008 216 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -1040 168 ) ( 256 -1056 328 ) ( 272 -1056 328 ) common/nodraw 0 -32 0 0.25 0.25 134217728 12 0
-( 256 -1168 280 ) ( 256 -1088 264 ) ( 272 -1168 280 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 272 -1152 312 ) ( 272 -1024 312 ) ( 272 -1024 232 ) common/nodraw 0 -32 0 0.25 0.25 134217728 12 0
-( 272 -1024 312 ) ( 256 -1024 312 ) ( 256 -1024 232 ) common/nodraw 0 -32 0 0.25 0.25 134217728 12 0
+( 256 -1008 216 ) ( 256 -1072 168 ) ( 272 -1008 216 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1040 168 ) ( 256 -1056 328 ) ( 272 -1056 328 ) common/weapclip 0 -32 0 0.25 0.25 134217728 12 0
+( 256 -1168 280 ) ( 256 -1088 264 ) ( 272 -1168 280 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 272 -1152 312 ) ( 272 -1024 312 ) ( 272 -1024 232 ) common/weapclip 0 -32 0 0.25 0.25 134217728 12 0
+( 272 -1024 312 ) ( 256 -1024 312 ) ( 256 -1024 232 ) common/weapclip 0 -32 0 0.25 0.25 134217728 12 0
 ( 256 -1024 280 ) ( 256 -1152 280 ) ( 256 -1152 200 ) exx/floor-grate01 0 0 0 0.25 0.25 134217728 256 0
 }
 {
-( 256 -1072 336 ) ( 256 -1136 256 ) ( 272 -1072 336 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -1088 272 ) ( 256 -1168 288 ) ( 272 -1168 288 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -1152 320 ) ( 256 -1024 320 ) ( 272 -1024 320 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -1152 320 ) ( 272 -1152 320 ) ( 272 -1152 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 272 -1152 320 ) ( 272 -1024 320 ) ( 272 -1024 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1072 336 ) ( 256 -1136 256 ) ( 272 -1072 336 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1088 272 ) ( 256 -1168 288 ) ( 272 -1168 288 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1152 320 ) ( 256 -1024 320 ) ( 272 -1024 320 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1152 320 ) ( 272 -1152 320 ) ( 272 -1152 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 272 -1152 320 ) ( 272 -1024 320 ) ( 272 -1024 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
 ( 256 -1024 288 ) ( 256 -1152 288 ) ( 256 -1152 208 ) exx/floor-grate01 0 0 0 0.25 0.25 134217728 256 0
 }
 {
-( 256 -1104 272 ) ( 256 -1104 288 ) ( 272 -1104 288 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -1136 256 ) ( 256 -1072 336 ) ( 272 -1072 336 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -1056 336 ) ( 256 -1040 176 ) ( 272 -1056 336 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -1088 272 ) ( 256 -1168 288 ) ( 272 -1168 288 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 256 -1152 320 ) ( 256 -1024 320 ) ( 272 -1024 320 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
-( 272 -1152 320 ) ( 272 -1024 320 ) ( 272 -1024 240 ) common/nodraw 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1104 272 ) ( 256 -1104 288 ) ( 272 -1104 288 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1136 256 ) ( 256 -1072 336 ) ( 272 -1072 336 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1056 336 ) ( 256 -1040 176 ) ( 272 -1056 336 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1088 272 ) ( 256 -1168 288 ) ( 272 -1168 288 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 256 -1152 320 ) ( 256 -1024 320 ) ( 272 -1024 320 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
+( 272 -1152 320 ) ( 272 -1024 320 ) ( 272 -1024 240 ) common/weapclip 0 0 0 0.25 0.25 134217728 12 0
 ( 256 -1024 288 ) ( 256 -1152 288 ) ( 256 -1152 208 ) exx/floor-grate01 0 0 0 0.25 0.25 134217728 256 0
 }
 {
@@ -44768,7 +44768,7 @@ trak5x/base-pipe1a
 "mdl" "sparks"
 "impulse" "4"
 "count" "6"
-"noise" "sound/map_drain/spark.ogg"
+"noise" "sound/machines/spark.ogg"
 "velocity" "50 -100 30"
 "spawnflags" "4"
 {