Merge branch 'master' into mirio/map_updates

diff --git a/maps/fuse.map b/maps/fuse.map
index d469c499e3f75359a7ee2886f741f127e99a19c6..00f6c44ec1cc9e3b3285f3dc995307f32e343596 100644 (file)
--- a/maps/fuse.map
+++ b/maps/fuse.map
@@ -23466,13 +23466,13 @@ brushDef
 ( 192 -520 160 ) ( 320 -520 160 ) ( 192 -512 160 ) ( ( 0.125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
 ( 200 -520 160 ) ( 200 -520 168 ) ( 316 -520 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 200 -520 168 ) ( 200 -520 160 ) ( 192 -512 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 200 64 168 ) ( 224 64 168 ) ( 200 -64 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 200 64 168 ) ( 224 64 168 ) ( 200 -64 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 }
 }
 {
 brushDef
 {
-( 200 -520 168 ) ( 200 -564 168 ) ( 188 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 200 -520 168 ) ( 200 -564 168 ) ( 188 -520 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 192 -512 168 ) ( 192 -512 160 ) ( 200 -520 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 200 -760 160 ) ( 200 -760 168 ) ( 200 -520 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 188 -564 160 ) ( 200 -564 160 ) ( 188 -520 160 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
@@ -23483,7 +23483,7 @@ brushDef
 {
 brushDef
 {
-( 280 -760 168 ) ( 280 -768 168 ) ( 200 -760 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 280 -760 168 ) ( 280 -768 168 ) ( 200 -760 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 376 -760 160 ) ( 376 -760 168 ) ( 200 -760 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 376 -760 168 ) ( 376 -760 160 ) ( 384 -768 160 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 200 -768 160 ) ( 280 -768 160 ) ( 200 -760 160 ) ( ( 0.125 0 0 ) ( 0 0.0078125 0 ) ) exx/trim-vert01 134217728 0 0
@@ -23494,7 +23494,7 @@ brushDef
 {
 brushDef
 {
-( 384 -680 168 ) ( 384 -760 168 ) ( 376 -680 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 384 -680 168 ) ( 384 -760 168 ) ( 376 -680 168 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 376 -580 168 ) ( 376 -580 160 ) ( 384 -576 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 384 -768 160 ) ( 384 -768 168 ) ( 384 -680 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 376 -760 160 ) ( 384 -760 160 ) ( 376 -680 160 ) ( ( 0.0078125 0 0 ) ( 0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
@@ -23505,7 +23505,7 @@ brushDef
 {
 brushDef
 {
-( 332 -520 168 ) ( 332 -544 168 ) ( 316 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 332 -520 168 ) ( 332 -544 168 ) ( 316 -520 168 ) ( ( 0.0078125 0 -0 ) ( -0 0.125 0 ) ) exx/trim-horz01 134217728 0 0
 ( 320 -512 160 ) ( 320 -512 168 ) ( 316 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 384 -576 160 ) ( 384 -576 168 ) ( 320 -512 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 ( 316 -544 160 ) ( 332 -544 160 ) ( 316 -520 160 ) ( ( 0.0883883461 -0.0883883461 0 ) ( 0.0055242716 0.0055242716 0 ) ) exx/trim-vert01 134217728 0 0
@@ -28341,6 +28341,61 @@ brushDef
 ( 432 -816 -64 ) ( 440 -808 -64 ) ( 432 -816 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 }
 }
+{
+brushDef
+{
+( 384 -680 384 ) ( 384 -760 384 ) ( 376 -680 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 376 -580 168 ) ( 376 -580 160 ) ( 384 -576 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 384 -768 160 ) ( 384 -768 168 ) ( 384 -680 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 376 -760 160 ) ( 384 -760 160 ) ( 376 -680 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 4 ) ) common/clip 134217728 0 0
+( 384 -768 168 ) ( 384 -768 160 ) ( 376 -760 168 ) ( ( 0.0156249981 0 0.0000000075 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 376 -580 160 ) ( 376 -580 168 ) ( 376 -760 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 280 -760 384 ) ( 280 -768 384 ) ( 200 -760 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 376 -760 320 ) ( 376 -760 328 ) ( 200 -760 328 ) ( ( 0.015625 0 0 ) ( 0 0.015625 2.5 ) ) common/clip 134217728 0 0
+( 376 -760 328 ) ( 376 -760 320 ) ( 384 -768 320 ) ( ( 0.0156249981 0 0.125 ) ( 0 0.015625 2.5 ) ) common/clip 134217728 0 0
+( 200 -768 160 ) ( 280 -768 160 ) ( 200 -760 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 192 -768 160 ) ( 192 -768 168 ) ( 280 -768 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 192 -768 328 ) ( 192 -768 320 ) ( 200 -760 320 ) ( ( 0.0156249981 0 0 ) ( 0 0.015625 2.5 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 200 -512 384 ) ( 200 -556 384 ) ( 188 -512 384 ) ( ( 0.015625 0 255.875 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 192 -512 168 ) ( 192 -512 160 ) ( 200 -520 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 200 -760 160 ) ( 200 -760 168 ) ( 200 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 188 -564 160 ) ( 200 -564 160 ) ( 188 -520 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 200 -760 168 ) ( 200 -760 160 ) ( 192 -768 168 ) ( ( 0.015625 0 0.5625 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 192 -512 160 ) ( 192 -512 168 ) ( 192 -564 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 320 -512 384 ) ( 192 -512 384 ) ( 320 -512 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 316 -520 160 ) ( 316 -520 168 ) ( 320 -512 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 192 -520 160 ) ( 320 -520 160 ) ( 192 -512 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 200 -520 160 ) ( 200 -520 168 ) ( 316 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 200 -520 168 ) ( 200 -520 160 ) ( 192 -512 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 200 64 384 ) ( 224 64 384 ) ( 200 -64 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
+{
+brushDef
+{
+( 332 -520 384 ) ( 332 -544 384 ) ( 316 -520 384 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 320 -512 160 ) ( 320 -512 168 ) ( 316 -520 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 384 -576 160 ) ( 384 -576 168 ) ( 320 -512 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 316 -544 160 ) ( 332 -544 160 ) ( 316 -520 160 ) ( ( 0.0110485433 -0.0110485433 0 ) ( 0.0110485433 0.0110485433 0 ) ) common/clip 134217728 0 0
+( 376 -580 160 ) ( 376 -580 168 ) ( 384 -576 168 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+( 376 -580 168 ) ( 376 -580 160 ) ( 316 -520 160 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/clip 134217728 0 0
+}
+}
 }
 {
 "classname" "func_group"

diff --git a/maps/fuse.map.options b/maps/fuse.map.options
index daa0b5ae8b8d45da3b6afd1f825c3544d7ad8ddb..06342c75c6769f849d61f4b1fcbe8a58fcb4c737 100644 (file)
--- a/maps/fuse.map.options
+++ b/maps/fuse.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 8
+Version: 8a

diff --git a/maps/nexballarena.map b/maps/nexballarena.map
index e727ce51f9d5bf6a8434c54a557c8cc4879d6d18..33924856c09da1cbf1081961d7205064b51b6108 100644 (file)
--- a/maps/nexballarena.map
+++ b/maps/nexballarena.map
@@ -4066,8 +4066,8 @@ trak5x/base-pipe1b
 }
 {
 ( 0 1024 0 ) ( 0 1008 -32 ) ( 0 1008 0 ) common/caulk 0 18 90 0.125 0.125 0 0 0
-( 0 1024 0 ) ( -192 1024 0 ) ( -192 1024 -32 ) common/caulk 0 146 90 0.125 0.125 0 0 0
-( -192 1024 0 ) ( -176 1008 0 ) ( -176 1008 -32 ) common/caulk 0 18 90 0.125 0.125 0 0 0
+( 32 1024 0 ) ( -160 1024 0 ) ( -160 1024 -32 ) common/caulk 256 146 90 0.125 0.125 0 0 0
+( -160 1024 0 ) ( -144 1008 0 ) ( -144 1008 -32 ) common/caulk 0 18 90 0.125 0.125 0 0 0
 ( 0 1008 0 ) ( -176 1008 -32 ) ( -176 1008 0 ) common/caulk 0 146 90 0.125 0.125 0 0 0
 ( -192 1024 0 ) ( 0 1008 0 ) ( -176 1008 0 ) ex2x/light-beam_red -64 0 0 0.25 0.25 0 0 0
 ( 0 1024 -32 ) ( -176 1008 -32 ) ( 0 1008 -32 ) common/caulk 0 146 90 0.125 0.125 0 0 0

diff --git a/maps/nexballarena.map.options b/maps/nexballarena.map.options
index 6f2029fd06fcd5621fee1bef70208483540b8913..a769c1463ad4a8b61acd7b578f570fde670f009a 100644 (file)
--- a/maps/nexballarena.map.options
+++ b/maps/nexballarena.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 1
+Version: 1a

diff --git a/maps/runningmanctf.map b/maps/runningmanctf.map
index efb2b50c998a8f9b5149fa58fb6a8847ffe117e0..7b22bfb911d8a2dbc65ecddb1b4cd51879016b8b 100644 (file)
--- a/maps/runningmanctf.map
+++ b/maps/runningmanctf.map
@@ -29291,126 +29291,6 @@ exx/base-metal03
 ( -1344 2256 64 ) ( -1344 2224 -64 ) ( -1344 2256 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1280 2256 160 ) ( -1280 2256 128 ) ( -1280 2240 160 ) exx/floor-wrn01-red 0 0 0 0.25 0.25 0 0 0
 }
-{
-( -464 888 -212 ) ( -464 856 -212 ) ( -496 888 -212 ) common/clip 32 32 0 0.25 0.25 0 0 0
-( -464 888 -252 ) ( -496 888 -252 ) ( -464 888 -260 ) common/clip 32 240 0 0.25 0.25 0 0 0
-( -464 888 -248 ) ( -464 888 -256 ) ( -464 856 -248 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -496 856 -256 ) ( -464 856 -256 ) ( -496 888 -256 ) common/clip 32 32 0 0.25 0.25 0 0 0
-( -496 856 -256 ) ( -496 856 -248 ) ( -464 856 -256 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( -496 856 -256 ) ( -496 888 -256 ) ( -496 856 -248 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -496 876 -68 ) ( -492 888 -68 ) ( -496 876 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -496 880 -68 ) ( -488 888 -68 ) ( -496 880 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -496 884 -68 ) ( -484 888 -68 ) ( -496 884 60 ) common/clip 32 240 0 0.25 0.25 0 0 0
-( -476 888 -68 ) ( -464 884 -68 ) ( -476 888 60 ) common/clip 32 240 0 0.25 0.25 0 0 0
-( -472 888 -68 ) ( -464 880 -68 ) ( -472 888 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -468 888 -68 ) ( -464 876 -68 ) ( -468 888 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -464 868 -64 ) ( -468 856 -64 ) ( -464 868 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -464 864 -64 ) ( -472 856 -64 ) ( -464 864 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -464 860 -64 ) ( -476 856 -64 ) ( -464 860 64 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( -484 856 -64 ) ( -496 860 -64 ) ( -484 856 64 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( -488 856 -64 ) ( -496 864 -64 ) ( -488 856 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -492 856 -64 ) ( -496 868 -64 ) ( -492 856 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-}
-{
-( -776 1200 -212 ) ( -776 1168 -212 ) ( -808 1200 -212 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -776 1200 -248 ) ( -808 1200 -248 ) ( -776 1200 -256 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -776 1200 -248 ) ( -776 1200 -256 ) ( -776 1168 -248 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -808 1168 -256 ) ( -776 1168 -256 ) ( -808 1200 -256 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -808 1168 -260 ) ( -808 1168 -252 ) ( -776 1168 -260 ) common/clip 0 240 0 0.25 0.25 0 0 0
-( -808 1168 -256 ) ( -808 1200 -256 ) ( -808 1168 -248 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -808 1188 -64 ) ( -804 1200 -64 ) ( -808 1188 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -808 1192 -64 ) ( -800 1200 -64 ) ( -808 1192 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -808 1196 -64 ) ( -796 1200 -64 ) ( -808 1196 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -788 1200 -64 ) ( -776 1196 -64 ) ( -788 1200 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -784 1200 -64 ) ( -776 1192 -64 ) ( -784 1200 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -780 1200 -64 ) ( -776 1188 -64 ) ( -780 1200 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -776 1180 -68 ) ( -780 1168 -68 ) ( -776 1180 60 ) common/clip 0 240 0 0.25 0.25 0 0 0
-( -776 1176 -68 ) ( -784 1168 -68 ) ( -776 1176 60 ) common/clip 0 240 0 0.25 0.25 0 0 0
-( -776 1172 -68 ) ( -788 1168 -68 ) ( -776 1172 60 ) common/clip 0 240 0 0.25 0.25 0 0 0
-( -796 1168 -68 ) ( -808 1172 -68 ) ( -796 1168 60 ) common/clip 0 240 0 0.25 0.25 0 0 0
-( -800 1168 -68 ) ( -808 1176 -68 ) ( -800 1168 60 ) common/clip 0 240 0 0.25 0.25 0 0 0
-( -804 1168 -68 ) ( -808 1180 -68 ) ( -804 1168 60 ) common/clip 0 240 0 0.25 0.25 0 0 0
-}
-{
-( -780 1160 -212 ) ( -780 1128 -212 ) ( -812 1160 -212 ) common/clip 16 96 0 0.25 0.25 0 0 0
-( -780 1160 -248 ) ( -812 1160 -248 ) ( -780 1160 -256 ) common/clip 16 0 0 0.25 0.25 0 0 0
-( -780 1160 -248 ) ( -780 1160 -256 ) ( -780 1128 -248 ) common/clip 160 0 0 0.25 0.25 0 0 0
-( -812 1128 -256 ) ( -780 1128 -256 ) ( -812 1160 -256 ) common/clip 16 96 0 0.25 0.25 0 0 0
-( -812 1128 -260 ) ( -812 1128 -252 ) ( -780 1128 -260 ) common/clip 16 240 0 0.25 0.25 0 0 0
-( -812 1128 -256 ) ( -812 1160 -256 ) ( -812 1128 -248 ) common/clip 160 0 0 0.25 0.25 0 0 0
-( -812 1148 -64 ) ( -808 1160 -64 ) ( -812 1148 64 ) common/clip 160 0 0 0.25 0.25 0 0 0
-( -812 1152 -64 ) ( -804 1160 -64 ) ( -812 1152 64 ) common/clip 160 0 0 0.25 0.25 0 0 0
-( -812 1156 -64 ) ( -800 1160 -64 ) ( -812 1156 64 ) common/clip 16 0 0 0.25 0.25 0 0 0
-( -792 1160 -64 ) ( -780 1156 -64 ) ( -792 1160 64 ) common/clip 16 0 0 0.25 0.25 0 0 0
-( -788 1160 -64 ) ( -780 1152 -64 ) ( -788 1160 64 ) common/clip 160 0 0 0.25 0.25 0 0 0
-( -784 1160 -64 ) ( -780 1148 -64 ) ( -784 1160 64 ) common/clip 160 0 0 0.25 0.25 0 0 0
-( -780 1140 -68 ) ( -784 1128 -68 ) ( -780 1140 60 ) common/clip 160 240 0 0.25 0.25 0 0 0
-( -780 1136 -68 ) ( -788 1128 -68 ) ( -780 1136 60 ) common/clip 160 240 0 0.25 0.25 0 0 0
-( -780 1132 -68 ) ( -792 1128 -68 ) ( -780 1132 60 ) common/clip 16 240 0 0.25 0.25 0 0 0
-( -800 1128 -68 ) ( -812 1132 -68 ) ( -800 1128 60 ) common/clip 16 240 0 0.25 0.25 0 0 0
-( -804 1128 -68 ) ( -812 1136 -68 ) ( -804 1128 60 ) common/clip 160 240 0 0.25 0.25 0 0 0
-( -808 1128 -68 ) ( -812 1140 -68 ) ( -808 1128 60 ) common/clip 160 240 0 0.25 0.25 0 0 0
-}
-{
-( -776 1124 -212 ) ( -776 1092 -212 ) ( -808 1124 -212 ) common/clip 0 208 0 0.25 0.25 0 0 0
-( -776 1124 -248 ) ( -808 1124 -248 ) ( -776 1124 -256 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -776 1124 -248 ) ( -776 1124 -256 ) ( -776 1092 -248 ) common/clip 48 0 0 0.25 0.25 0 0 0
-( -808 1092 -256 ) ( -776 1092 -256 ) ( -808 1124 -256 ) common/clip 0 208 0 0.25 0.25 0 0 0
-( -808 1092 -256 ) ( -808 1092 -248 ) ( -776 1092 -256 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -808 1092 -256 ) ( -808 1124 -256 ) ( -808 1092 -248 ) common/clip 48 0 0 0.25 0.25 0 0 0
-( -808 1112 -64 ) ( -804 1124 -64 ) ( -808 1112 64 ) common/clip 48 0 0 0.25 0.25 0 0 0
-( -808 1116 -64 ) ( -800 1124 -64 ) ( -808 1116 64 ) common/clip 48 0 0 0.25 0.25 0 0 0
-( -808 1120 -64 ) ( -796 1124 -64 ) ( -808 1120 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -788 1124 -68 ) ( -776 1120 -68 ) ( -788 1124 60 ) common/clip 0 240 0 0.25 0.25 0 0 0
-( -784 1124 -64 ) ( -776 1116 -64 ) ( -784 1124 64 ) common/clip 48 0 0 0.25 0.25 0 0 0
-( -780 1124 -64 ) ( -776 1112 -64 ) ( -780 1124 64 ) common/clip 48 0 0 0.25 0.25 0 0 0
-( -776 1104 -64 ) ( -780 1092 -64 ) ( -776 1104 64 ) common/clip 48 0 0 0.25 0.25 0 0 0
-( -776 1100 -64 ) ( -784 1092 -64 ) ( -776 1100 64 ) common/clip 48 0 0 0.25 0.25 0 0 0
-( -776 1096 -64 ) ( -788 1092 -64 ) ( -776 1096 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -796 1092 -64 ) ( -808 1096 -64 ) ( -796 1092 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( -800 1092 -64 ) ( -808 1100 -64 ) ( -800 1092 64 ) common/clip 48 0 0 0.25 0.25 0 0 0
-( -804 1092 -64 ) ( -808 1104 -64 ) ( -804 1092 64 ) common/clip 48 0 0 0.25 0.25 0 0 0
-}
-{
-( -540 888 -212 ) ( -540 856 -212 ) ( -572 888 -212 ) common/clip 80 32 0 0.25 0.25 0 0 0
-( -540 888 -252 ) ( -572 888 -252 ) ( -540 888 -260 ) common/clip 80 240 0 0.25 0.25 0 0 0
-( -540 888 -248 ) ( -540 888 -256 ) ( -540 856 -248 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -572 856 -256 ) ( -540 856 -256 ) ( -572 888 -256 ) common/clip 80 32 0 0.25 0.25 0 0 0
-( -572 856 -256 ) ( -572 856 -248 ) ( -540 856 -256 ) common/clip 80 0 0 0.25 0.25 0 0 0
-( -572 856 -256 ) ( -572 888 -256 ) ( -572 856 -248 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -572 876 -68 ) ( -568 888 -68 ) ( -572 876 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -572 880 -68 ) ( -564 888 -68 ) ( -572 880 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -572 884 -68 ) ( -560 888 -68 ) ( -572 884 60 ) common/clip 80 240 0 0.25 0.25 0 0 0
-( -552 888 -68 ) ( -540 884 -68 ) ( -552 888 60 ) common/clip 80 240 0 0.25 0.25 0 0 0
-( -548 888 -68 ) ( -540 880 -68 ) ( -548 888 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -544 888 -68 ) ( -540 876 -68 ) ( -544 888 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -540 868 -64 ) ( -544 856 -64 ) ( -540 868 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -540 864 -64 ) ( -548 856 -64 ) ( -540 864 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -540 860 -64 ) ( -552 856 -64 ) ( -540 860 64 ) common/clip 80 0 0 0.25 0.25 0 0 0
-( -560 856 -64 ) ( -572 860 -64 ) ( -560 856 64 ) common/clip 80 0 0 0.25 0.25 0 0 0
-( -564 856 -64 ) ( -572 864 -64 ) ( -564 856 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -568 856 -64 ) ( -572 868 -64 ) ( -568 856 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-}
-{
-( -504 888 -212 ) ( -504 856 -212 ) ( -536 888 -212 ) common/clip 192 32 0 0.25 0.25 0 0 0
-( -504 888 -252 ) ( -536 888 -252 ) ( -504 888 -260 ) common/clip 192 240 0 0.25 0.25 0 0 0
-( -504 888 -248 ) ( -504 888 -256 ) ( -504 856 -248 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -536 856 -256 ) ( -504 856 -256 ) ( -536 888 -256 ) common/clip 192 32 0 0.25 0.25 0 0 0
-( -536 856 -256 ) ( -536 856 -248 ) ( -504 856 -256 ) common/clip 192 0 0 0.25 0.25 0 0 0
-( -536 856 -256 ) ( -536 888 -256 ) ( -536 856 -248 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -536 876 -68 ) ( -532 888 -68 ) ( -536 876 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -536 880 -68 ) ( -528 888 -68 ) ( -536 880 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -536 884 -68 ) ( -524 888 -68 ) ( -536 884 60 ) common/clip 192 240 0 0.25 0.25 0 0 0
-( -516 888 -68 ) ( -504 884 -68 ) ( -516 888 60 ) common/clip 192 240 0 0.25 0.25 0 0 0
-( -512 888 -68 ) ( -504 880 -68 ) ( -512 888 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -508 888 -68 ) ( -504 876 -68 ) ( -508 888 60 ) common/clip 224 240 0 0.25 0.25 0 0 0
-( -504 868 -64 ) ( -508 856 -64 ) ( -504 868 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -504 864 -64 ) ( -512 856 -64 ) ( -504 864 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -504 860 -64 ) ( -516 856 -64 ) ( -504 860 64 ) common/clip 192 0 0 0.25 0.25 0 0 0
-( -524 856 -64 ) ( -536 860 -64 ) ( -524 856 64 ) common/clip 192 0 0 0.25 0.25 0 0 0
-( -528 856 -64 ) ( -536 864 -64 ) ( -528 856 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-( -532 856 -64 ) ( -536 868 -64 ) ( -532 856 64 ) common/clip 224 0 0 0.25 0.25 0 0 0
-}
 }
 {
 "classname" "item_health_medium"
@@ -29503,32 +29383,6 @@ exx/base-metal03
 "origin" "-960 704 -248"
 }
 {
-"classname" "onslaught_controlpoint"
-"origin" "-480.000000 1184.000000 -256.000000"
-"targetname" "middlelowcp"
-"target" "middlelowcpspawns"
-"message" "Middle Low"
-}
-{
-"classname" "onslaught_controlpoint"
-"origin" "-2144.000000 -480.000000 112.000000"
-"targetname" "middlehighcp"
-"target" "middlehighcpspawns"
-"message" "Middle High"
-}
-{
-"classname" "info_player_deathmatch"
-"origin" "-864.000000 800.000000 -296.000000"
-"targetname" "middlelowcpspawns"
-"angle" "180.000000"
-}
-{
-"classname" "info_player_deathmatch"
-"origin" "-1936.000000 -272.000000 80.000000"
-"targetname" "middlehighcpspawns"
-"gametypefilter" "-dm,arena"
-}
-{
 "classname" "target_position"
 "origin" "80.000000 -492.000000 92.000000"
 "targetname" "t2"
@@ -31225,47 +31079,6 @@ exx/base-metal03
 }
 }
 {
-"classname" "onslaught_controlpoint"
-"origin" "-80.000000 -208.000000 0.000000"
-"targetname" "redcp1"
-"message" "Big Red room"
-"angle" "-90.000000"
-}
-{
-"classname" "onslaught_link"
-"origin" "-208.000000 -304.000000 80.000000"
-"target" "middlehighcp"
-"target2" "redcp1"
-"angle" "-90.000000"
-}
-{
-"classname" "onslaught_link"
-"origin" "108.000000 -68.000000 84.000000"
-"target" "redgen1"
-"target2" "redcp1"
-"angle" "-90.000000"
-}
-{
-"classname" "onslaught_link"
-"origin" "-208.000000 -112.000000 80.000000"
-"target" "middlelowcp"
-"target2" "redcp1"
-"angle" "-90.000000"
-}
-{
-"classname" "info_player_deathmatch"
-"origin" "-352.000000 1056.000000 -232.000000"
-"targetname" "middlelowcpspawns"
-"angle" "90.000000"
-}
-{
-"classname" "info_player_deathmatch"
-"origin" "-2080.000000 -672.000000 136.000000"
-"targetname" "middlehighcpspawns"
-"angle" "-90.000000"
-"gametypefilter" "-dm,arena"
-}
-{
 "classname" "misc_model"
 "origin" "784.000244 63.999878 -384.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
@@ -34700,47 +34513,6 @@ exx/base-metal03
 }
 }
 {
-"classname" "onslaught_controlpoint"
-"origin" "-1872.000000 1584.000000 0.000000"
-"targetname" "redcp2"
-"message" "Big Red room"
-"angle" "0.000003"
-}
-{
-"classname" "onslaught_link"
-"origin" "-1968.000000 1456.000000 80.000000"
-"target" "middlehighcp"
-"target2" "redcp2"
-"angle" "0.000003"
-}
-{
-"classname" "onslaught_link"
-"origin" "-1732.000000 1772.000000 84.000000"
-"target" "redgen2"
-"target2" "redcp2"
-"angle" "0.000003"
-}
-{
-"classname" "onslaught_link"
-"origin" "-1776.000000 1456.000000 80.000000"
-"target" "middlelowcp"
-"target2" "redcp2"
-"angle" "0.000003"
-}
-{
-"classname" "info_player_deathmatch"
-"origin" "-608.000000 1312.000000 -232.000000"
-"targetname" "middlelowcpspawns"
-"angle" "-179.999985"
-}
-{
-"classname" "info_player_deathmatch"
-"origin" "-2336.000000 -416.000000 136.000000"
-"targetname" "middlehighcpspawns"
-"angle" "0.000003"
-"gametypefilter" "-dm,arena"
-}
-{
 "classname" "misc_model"
 "origin" "-1600.000244 2448.000000 -384.000000"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
@@ -36375,30 +36147,6 @@ exx/base-metal03
 "angle" "88.396439"
 }
 {
-"classname" "misc_breakablemodel"
-"origin" "-544.000000 -488.000031 0.000000"
-"model" "models/containers/barrel01.md3"
-"angle" "0.000003"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
-"count" "1"
-"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"noise" "sound/weapons/rocket_impact.ogg"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_radius" "150"
-"dmg_force" "600"
-"message" "was killed by an explosive barrel"
-"message2" "was killed with an explosive barrel by"
-"debrissolid" "0"
-"debristime" "6"
-"debristimejitter" "2"
-"debrisfadetime" "1"
-"debrisdamageforcescale" "1"
-"respawntime" "40"
-"respawntimejitter" "10"
-}
-{
 "classname" "misc_model"
 "origin" "-512.150635 -352.299103 -216.000076"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
@@ -36561,53 +36309,15 @@ effects_healpod/healpod1_d
 "origin" "784.000000 64.000000 -160.000000"
 }
 {
-"classname" "misc_breakablemodel"
-"origin" "-2152.000000 1120.000000 0.000000"
-"model" "models/containers/barrel01.md3"
-"angle" "90.000000"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
-"count" "1"
-"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"noise" "sound/weapons/rocket_impact.ogg"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_radius" "150"
-"dmg_force" "600"
-"message" "was killed by an explosive barrel"
-"message2" "was killed with an explosive barrel by"
-"debrissolid" "0"
-"debristime" "6"
-"debristimejitter" "2"
-"debrisfadetime" "1"
-"debrisdamageforcescale" "1"
-"respawntime" "40"
-"respawntimejitter" "10"
-}
-{
 "classname" "item_armor_large"
 "origin" "-2200.000000 -536.000000 128.000000"
 }
 {
-"classname" "onslaught_generator"
-"origin" "784.000000 984.000000 264.000000"
-"team" "14"
-"targetname" "redgen3"
-"angle" "-90.000000"
-}
-{
 "classname" "item_flag_team2"
 "origin" "784.000000 984.000000 312.000000"
 "angle" "-90.000000"
 }
 {
-"classname" "onslaught_generator"
-"origin" "-680.000000 2448.000000 264.000000"
-"team" "14"
-"targetname" "redgen2"
-"angle" "-179.999985"
-}
-{
 "classname" "dom_controlpoint"
 "origin" "784.000000 944.000000 296.000000"
 "message" " has captured the ^4Blue ^2base ^3control point"
@@ -36634,190 +36344,268 @@ effects_healpod/healpod1_d
 "angles" "0.52734375 -149.002075 0"
 }
 {
-"classname" "misc_breakablemodel"
-"origin" "-554.999878 870.999756 -256.000000"
-"model" "models/containers/barrel01.md3"
-"angle" "-40.469692"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
-"count" "1"
-"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"noise" "sound/weapons/rocket_impact.ogg"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_radius" "150"
-"dmg_force" "600"
-"message" "was killed by an explosive barrel"
-"message2" "was killed with an explosive barrel by"
-"debrissolid" "0"
-"debristime" "6"
-"debristimejitter" "2"
-"debrisfadetime" "1"
-"debrisdamageforcescale" "1"
-"respawntime" "40"
-"respawntimejitter" "10"
+"classname" "dom_team"
+"origin" "544.000000 -240.000000 -152.000000"
+"netname" "^4Blue Team^3"
+"model" "models/domination/dom_blue.md3"
+"message" "Blue Team has captured a control point"
+"noise" "domination/claim.wav"
+"noise1" "domination/claim.wav"
+"cnt" "13"
 }
 {
-"classname" "misc_breakablemodel"
-"origin" "-480.000000 872.000000 -256.000000"
-"model" "models/containers/barrel01.md3"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
-"count" "1"
-"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"noise" "sound/weapons/rocket_impact.ogg"
-"dmg" "25"
-"dmg_edge" "25"
-"dmg_radius" "150"
-"dmg_force" "600"
-"message" "was killed by an explosive barrel"
-"message2" "was killed with an explosive barrel by"
-"debrissolid" "0"
-"debristime" "6"
-"debristimejitter" "2"
-"debrisfadetime" "1"
-"debrisdamageforcescale" "1"
-"respawntime" "40"
-"respawntimejitter" "10"
+"classname" "dom_team"
+"origin" "544.000000 -304.000000 -152.000000"
+"cnt" "4"
+"message" "Red Team has captured a control point"
+"model" "models/domination/dom_red.md3"
+"netname" "^1Red Team^3"
+"noise" "domination/claim.wav"
+"noise1" "domination/claim.wav"
+}
+{
+"classname" "dom_team"
+"origin" "544.000000 -368.000000 -152.000000"
+"model" "models/domination/dom_unclaimed.md3"
+}
+{
+"classname" "dom_team"
+"origin" "544.000000 -272.000000 -152.000000"
+"netname" "^3Yellow Team^3"
+"model" "models/domination/dom_yellow.md3"
+"message" "Yellow Team has captured a control point"
+"noise" "domination/claim.wav"
+"noise1" "domination/claim.wav"
+"cnt" "12"
+}
+{
+"classname" "dom_team"
+"origin" "544.000000 -336.000000 -152.000000"
+"netname" "^6Pink Team^3"
+"model" "models/domination/dom_pink.md3"
+"message" "Pink Team has captured a control point"
+"noise" "domination/claim.wav"
+"noise1" "domination/claim.wav"
+"cnt" "9"
+}
+{
+"classname" "onslaught_generator"
+"origin" "784.000000 1104.000000 296.000000"
+"team" "14"
+"targetname" "redgen1"
+"angle" "-90.000000"
+}
+{
+"classname" "onslaught_controlpoint"
+"origin" "-80.000000 -208.000000 0.000000"
+"targetname" "redcp1"
+"message" "Big Red room"
+"angle" "-90.000000"
+}
+{
+"classname" "onslaught_link"
+"origin" "-208.000000 -304.000000 80.000000"
+"target" "middlehighcp"
+"target2" "redcp1"
+"angle" "-90.000000"
+}
+{
+"classname" "onslaught_link"
+"origin" "108.000000 -68.000000 84.000000"
+"target" "redgen1"
+"target2" "redcp1"
+"angle" "-90.000000"
+}
+{
+"classname" "onslaught_link"
+"origin" "-208.000000 -112.000000 80.000000"
+"target" "middlelowcp"
+"target2" "redcp1"
+"angle" "-90.000000"
+}
+{
+"classname" "onslaught_generator"
+"origin" "-560.000000 2448.000000 296.000000"
+"team" "5"
+"targetname" "redgen2"
+"angle" "0.000003"
+}
+{
+"classname" "onslaught_controlpoint"
+"origin" "-1872.000000 1584.000000 0.000000"
+"targetname" "redcp2"
+"message" "Big Red room"
+"angle" "0.000003"
+}
+{
+"classname" "onslaught_link"
+"origin" "-1968.000000 1456.000000 80.000000"
+"target" "middlehighcp"
+"target2" "redcp2"
+"angle" "0.000003"
+}
+{
+"classname" "onslaught_link"
+"origin" "-1732.000000 1772.000000 84.000000"
+"target" "redgen2"
+"target2" "redcp2"
+"angle" "0.000003"
+}
+{
+"classname" "onslaught_link"
+"origin" "-1776.000000 1456.000000 80.000000"
+"target" "middlelowcp"
+"target2" "redcp2"
+"angle" "0.000003"
+}
+{
+"classname" "onslaught_controlpoint"
+"origin" "-480.000000 1184.000000 -256.000000"
+"targetname" "middlelowcp"
+"target" "middlelowcpspawns"
+"message" "Middle Low"
+}
+{
+"classname" "onslaught_controlpoint"
+"origin" "-2144.000000 -480.000000 112.000000"
+"targetname" "middlehighcp"
+"target" "middlehighcpspawns"
+"message" "Middle High"
+}
+{
+"classname" "info_player_deathmatch"
+"origin" "-864.000000 800.000000 -296.000000"
+"targetname" "middlelowcpspawns"
+"angle" "180.000000"
+"gametypefilter" "-dm"
+}
+{
+"classname" "info_player_deathmatch"
+"origin" "-1936.000000 -272.000000 80.000000"
+"targetname" "middlehighcpspawns"
+"gametypefilter" "-dm"
+}
+{
+"classname" "info_player_deathmatch"
+"origin" "-352.000000 1056.000000 -232.000000"
+"targetname" "middlelowcpspawns"
+"angle" "90.000000"
+"gametypefilter" "-dm"
+}
+{
+"classname" "info_player_deathmatch"
+"origin" "-2080.000000 -672.000000 136.000000"
+"targetname" "middlehighcpspawns"
+"angle" "-90.000000"
+"gametypefilter" "-dm"
+}
+{
+"classname" "info_player_deathmatch"
+"origin" "-608.000000 1312.000000 -232.000000"
+"targetname" "middlelowcpspawns"
+"angle" "-179.999985"
+"gametypefilter" "-dm"
+}
+{
+"classname" "info_player_deathmatch"
+"origin" "-2336.000000 -416.000000 136.000000"
+"targetname" "middlehighcpspawns"
+"angle" "0.000003"
+"gametypefilter" "-dm"
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-520.000000 869.999939 -256.000000"
+"origin" "-544.000000 -488.000031 0.000000"
 "model" "models/containers/barrel01.md3"
-"angle" "-66.641502"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
+"modelscale" "1.200000"
 "count" "1"
 "debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"noise" "sound/weapons/rocket_impact.ogg"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "5"
+"debristimejitter" "2"
 "dmg" "25"
 "dmg_edge" "25"
-"dmg_radius" "150"
 "dmg_force" "600"
+"dmg_radius" "190"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
 "message" "was killed by an explosive barrel"
 "message2" "was killed with an explosive barrel by"
-"debrissolid" "0"
-"debristime" "6"
-"debristimejitter" "2"
-"debrisfadetime" "1"
-"debrisdamageforcescale" "1"
-"respawntime" "40"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "35"
 "respawntimejitter" "10"
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-793.000122 1109.000244 -256.000000"
+"origin" "-472.000000 872.000000 -256.000000"
 "model" "models/containers/barrel01.md3"
-"angle" "49.530289"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
+"modelscale" "1.200000"
 "count" "1"
 "debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"noise" "sound/weapons/rocket_impact.ogg"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "5"
+"debristimejitter" "2"
 "dmg" "25"
 "dmg_edge" "25"
-"dmg_radius" "150"
 "dmg_force" "600"
+"dmg_radius" "190"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
 "message" "was killed by an explosive barrel"
 "message2" "was killed with an explosive barrel by"
-"debrissolid" "0"
-"debristime" "6"
-"debristimejitter" "2"
-"debrisfadetime" "1"
-"debrisdamageforcescale" "1"
-"respawntime" "40"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "35"
 "respawntimejitter" "10"
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-792.000000 1184.000000 -256.000000"
+"origin" "-792.000000 1192.000000 -256.000000"
 "model" "models/containers/barrel01.md3"
-"angle" "90.000000"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
+"modelscale" "1.200000"
 "count" "1"
 "debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"noise" "sound/weapons/rocket_impact.ogg"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "5"
+"debristimejitter" "2"
 "dmg" "25"
 "dmg_edge" "25"
-"dmg_radius" "150"
 "dmg_force" "600"
+"dmg_radius" "190"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
 "message" "was killed by an explosive barrel"
 "message2" "was killed with an explosive barrel by"
-"debrissolid" "0"
-"debristime" "6"
-"debristimejitter" "2"
-"debrisfadetime" "1"
-"debrisdamageforcescale" "1"
-"respawntime" "40"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "35"
 "respawntimejitter" "10"
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-793.999756 1144.000244 -256.000000"
+"origin" "-2152.000000 1120.000000 0.000000"
 "model" "models/containers/barrel01.md3"
-"angle" "23.358463"
-"health" "25"
-"mdl" "TE_TEI_BIGEXPLOSION"
+"modelscale" "1.200000"
 "count" "1"
 "debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
-"noise" "sound/weapons/rocket_impact.ogg"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "5"
+"debristimejitter" "2"
 "dmg" "25"
 "dmg_edge" "25"
-"dmg_radius" "150"
 "dmg_force" "600"
+"dmg_radius" "190"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
 "message" "was killed by an explosive barrel"
 "message2" "was killed with an explosive barrel by"
-"debrissolid" "0"
-"debristime" "6"
-"debristimejitter" "2"
-"debrisfadetime" "1"
-"debrisdamageforcescale" "1"
-"respawntime" "40"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "35"
 "respawntimejitter" "10"
 }
-{
-"classname" "dom_team"
-"origin" "544.000000 -240.000000 -152.000000"
-"netname" "^4Blue Team^3"
-"model" "models/domination/dom_blue.md3"
-"message" "Blue Team has captured a control point"
-"noise" "domination/claim.wav"
-"noise1" "domination/claim.wav"
-"cnt" "13"
-}
-{
-"classname" "dom_team"
-"origin" "544.000000 -304.000000 -152.000000"
-"cnt" "4"
-"message" "Red Team has captured a control point"
-"model" "models/domination/dom_red.md3"
-"netname" "^1Red Team^3"
-"noise" "domination/claim.wav"
-"noise1" "domination/claim.wav"
-}
-{
-"classname" "dom_team"
-"origin" "544.000000 -368.000000 -152.000000"
-"model" "models/domination/dom_unclaimed.md3"
-}
-{
-"classname" "dom_team"
-"origin" "544.000000 -272.000000 -152.000000"
-"netname" "^3Yellow Team^3"
-"model" "models/domination/dom_yellow.md3"
-"message" "Yellow Team has captured a control point"
-"noise" "domination/claim.wav"
-"noise1" "domination/claim.wav"
-"cnt" "12"
-}
-{
-"classname" "dom_team"
-"origin" "544.000000 -336.000000 -152.000000"
-"netname" "^6Pink Team^3"
-"model" "models/domination/dom_pink.md3"
-"message" "Pink Team has captured a control point"
-"noise" "domination/claim.wav"
-"noise1" "domination/claim.wav"
-"cnt" "9"
-}

diff --git a/maps/runningmanctf.map.options b/maps/runningmanctf.map.options
index e3a5ed22873bdad32c9d636ad027c9c290608f70..6f9d6331d5f51e90ba5f93b1b69e71a6b0707c5f 100644 (file)
--- a/maps/runningmanctf.map.options
+++ b/maps/runningmanctf.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 10
+Version: 10a