Work on caulk area behind MH, fix MA

diff --git a/maps/erbium.map b/maps/erbium.map
index 3b03193221bcb641e0dba2561b069a07d329016a..c0b6dfa21a3364dc433528ab2a5a92b1e9869ac7 100644 (file)
--- a/maps/erbium.map
+++ b/maps/erbium.map
@@ -6725,7 +6725,7 @@ brushDef
 {
 ( -384 -776 500 ) ( -460 -776 500 ) ( -384 -776 520 ) ( ( -0.0078125 0 254.125 ) ( 0 0.0078125 0 ) ) common/caulk 0 0 0
 ( -460 -304 500 ) ( -460 -776 500 ) ( -264 -304 500 ) ( ( -0.0052083335 0 505.5 ) ( 0 0.0052083335 510.75 ) ) map_erbium/metal-tiles 0 0 0
-( -372 -800 520 ) ( -460 -800 520 ) ( -460 -420 520 ) ( ( 0.0052083335 0 511.2917175293 ) ( 0 -0.0052083335 510.75 ) ) map_erbium/metal-tiles 0 0 0
+( -372 -800 520 ) ( -460 -800 520 ) ( -460 -420 520 ) ( ( 0.0052083335 -0 -0.7082812786 ) ( -0 -0.0052083335 0.75 ) ) map_erbium/metal-tiles 0 0 0
 ( -264 -304 500 ) ( -264 -656 500 ) ( -264 -304 520 ) ( ( -0.0078125 0 1.0625 ) ( 0 0.0078125 0 ) ) common/caulk 0 0 0
 ( -460 -776 500 ) ( -460 -304 500 ) ( -460 -776 520 ) ( ( -0.0078125 0 254.9375 ) ( 0 0.0078125 0 ) ) common/caulk 0 0 0
 ( -264 -656 500 ) ( -384 -776 500 ) ( -264 -656 520 ) ( ( -0.0078124958 0 255.4254760742 ) ( 0 0.0078125 0 ) ) common/caulk 0 0 0
@@ -14184,7 +14184,7 @@ brushDef
 ( -760 -952 740 ) ( -768 -824 740 ) ( -760 -824 740 ) ( ( -0.0075757573 0 503.0908813477 ) ( 0 0.0416666679 25.3333206177 ) ) exx/trim-baseboard02 134217728 0 0
 ( -608 -824 732 ) ( -608 -824 748 ) ( -608 -952 732 ) ( ( -0.0035714286 0 2.8727295399 ) ( 0 0.03125 27.5 ) ) exx/trim-baseboard02 134217728 0 0
 ( -584 -952 724 ) ( -584 -824 732 ) ( -584 -824 724 ) ( ( 0.0035714286 0 2.8727295399 ) ( 0 -0.03125 104.75 ) ) exx/trim-baseboard02 134217728 0 0
-( -584 -1104 -64 ) ( -588 -1104 -64 ) ( -584 -1104 64 ) ( ( 0 0.0075757573 0.7878843546 ) ( 0.0416666679 0 25.3333206177 ) ) exx/trim-baseboard02 134217728 0 0
+( -584.125 -1092 -64 ) ( -588.125 -1092 -64 ) ( -584.125 -1092 64 ) ( ( 0 0.0075757573 0.7878843546 ) ( 0.0416666679 0 25.3385295868 ) ) exx/trim-baseboard02 134217728 0 0
 ( -604 -776 -64 ) ( -600 -776 -64 ) ( -604 -776 64 ) ( ( 0.015625 0 7.625 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
@@ -14685,8 +14685,8 @@ brushDef
 ( -480 -788 -236 ) ( -488 -788 -236 ) ( -480 -788 -108 ) ( ( 0.005892491 -0 -0.0166601539 ) ( 0 0.0044642859 0.5 ) ) map_erbium/black-tiles 0 0 0
 ( -432 -632 -108 ) ( -432 -624 -236 ) ( -432 -632 -236 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 254.65625 ) ) common/caulk 0 0 0
 ( -516 -584 -236 ) ( -508 -584 -236 ) ( -516 -584 -108 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 254.65625 ) ) common/caulk 0 0 0
-( -884 -660 -236 ) ( -884 -648 -236 ) ( -884 -660 -108 ) ( ( 0.0078125 0 255.9375 ) ( 0 0.0078125 254.65625 ) ) common/caulk 0 0 0
 ( -432 64 280 ) ( -436 64 280 ) ( -432 -64 280 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) NULL 0 0 0
+( -504 -632 -64 ) ( -504 -624 -64 ) ( -504 -632 64 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) NULL 0 0 0
 }
 }
 {
@@ -15018,7 +15018,7 @@ brushDef
 ( -516 -1244 740 ) ( -644 -1252 740 ) ( -644 -1244 740 ) ( ( 0 0.0075757573 2.2121162415 ) ( 0.0416666679 0 45.4999885559 ) ) exx/trim-baseboard02 134217728 0 0
 ( -644 -1092 732 ) ( -644 -1092 748 ) ( -516 -1092 732 ) ( ( -0.0035714286 0 509.6298522949 ) ( 0 0.03125 27.5 ) ) exx/trim-baseboard02 134217728 0 0
 ( -516 -1068 724 ) ( -644 -1068 732 ) ( -644 -1068 724 ) ( ( 0.0035714286 0 509.6298522949 ) ( 0 -0.03125 104.75 ) ) exx/trim-baseboard02 134217728 0 0
-( -364 -1068 -64 ) ( -364 -1072 -64 ) ( -364 -1068 64 ) ( ( 0 0.0075757573 0.7878843546 ) ( 0.0416666679 0 45.4999885559 ) ) exx/trim-baseboard02 134217728 0 0
+( -376 -1068 -64 ) ( -376 -1072 -64 ) ( -376 -1068 64 ) ( ( 0 0.0075757573 0.7878843546 ) ( 0.0416666679 0 45.4999885559 ) ) exx/trim-baseboard02 134217728 0 0
 ( -584 -1092 -64 ) ( -584 -1088 -64 ) ( -584 -1092 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
@@ -15026,11 +15026,11 @@ brushDef
 brushDef
 {
 ( -436 -628 884 ) ( -460 -1096 884 ) ( -436 -1096 884 ) ( ( 0.0075757573 0 510.9393005371 ) ( 0 0.0416666679 25.9999694824 ) ) exx/trim-baseboard02 134217728 0 0
-( -460 -628 908 ) ( -460 -1096 908 ) ( -460 -1096 884 ) ( ( -0.015625 0 10.6875 ) ( 0 -0.015625 229.875 ) ) common/caulk 134217728 0 0
+( -460 -628 908 ) ( -460 -1096 908 ) ( -460 -1096 884 ) ( ( -0.0078125 0 5.34375 ) ( 0 -0.03125 459.75 ) ) exx/trim-baseboard02 134217728 0 0
 ( -456 -852 872 ) ( -456 -852 896 ) ( -432 -852 896 ) ( ( 0.0075757573 0 511.6059570313 ) ( 0 0.0416666679 29.3333034515 ) ) exx/trim-baseboard02 134217728 0 0
 ( -436 -628 908 ) ( -436 -1096 908 ) ( -460 -1096 908 ) ( ( -0.0075757573 0 504.6363220215 ) ( 0 -0.0416666679 25.9999694824 ) ) exx/trim-baseboard02 134217728 0 0
 ( -436 -628 908 ) ( -436 -1096 884 ) ( -436 -1096 908 ) ( ( 0.0035714286 0 510.1298828125 ) ( 0 0.03125 27.5 ) ) exx/trim-baseboard02 134217728 0 0
-( -460 -628 884 ) ( -436 -628 908 ) ( -460 -628 908 ) ( ( 0.015625 0 255 ) ( 0 0.015625 2.625 ) ) common/caulk 134217728 0 0
+( -460 -628 884 ) ( -436 -628 908 ) ( -460 -628 908 ) ( ( 0.0078125 0 127.5 ) ( 0 0.03125 5.25 ) ) exx/trim-baseboard02 134217728 0 0
 }
 }
 {
@@ -15361,11 +15361,11 @@ brushDef
 brushDef
 {
 ( -424 -848 740 ) ( -400 -848 740 ) ( -424 -788 740 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) common/caulk 134217728 0 0
-( -520 -848 740 ) ( -520 -788 740 ) ( -520 -848 764 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) common/caulk 134217728 0 0
+( -520 -848 740 ) ( -520 -788 740 ) ( -520 -848 764 ) ( ( 0.0043859896 0 -0.8771874905 ) ( -0 0.0083335117 0.1666601598 ) ) exx/panel-metal01c 134217728 0 0
 ( -520 -940 740 ) ( -368 -940 884 ) ( -400 -940 740 ) ( ( 0.00390625 -0 -0 ) ( 0 0.00390625 0 ) ) exx/floor-clang01 134217728 0 0
 ( -520 -1068 884 ) ( -368 -664 884 ) ( -368 -1068 884 ) ( ( 0.0078125 0 508.125 ) ( 0 0.0078124963 497.9683227539 ) ) exx/base-metal01 134217728 0 0
 ( -512 -712 740 ) ( -360 -712 884 ) ( -512 -712 884 ) ( ( 0.0078125 0 0.0625 ) ( 0 0.0078125 0 ) ) common/caulk 134217728 0 0
-( -400 64 748 ) ( -400 64 744 ) ( -400 -64 748 ) ( ( 0.0043859649 0 4.1228175163 ) ( 0 0.0083333338 7.1666665077 ) ) exx/panel-metal01c 134217728 0 0
+( -400 64 748 ) ( -400 64 744 ) ( -400 -64 748 ) ( ( 0.0043859896 0 -0.8771874905 ) ( -0 0.0083335117 0.1666601598 ) ) exx/panel-metal01c 134217728 0 0
 ( -424 64 884 ) ( -420 64 880 ) ( -424 -64 884 ) ( ( 0.0078125 0 508.125 ) ( 0 0.0078124963 497.9683227539 ) ) exx/base-metal01 134217728 0 0
 }
 }
@@ -15702,11 +15702,11 @@ exx/panel-metal03
 brushDef
 {
 ( -368 -852 912 ) ( -368 -916 912 ) ( -520 -852 912 ) ( ( 0.0078125 0 508.125 ) ( 0 0.0078124963 497.9683227539 ) ) exx/base-metal01 134217728 0 0
-( -368 -852 912 ) ( -520 -852 912 ) ( -368 -852 884 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( -368 -852 912 ) ( -520 -852 912 ) ( -368 -852 884 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 134217728 0 0
 ( -436 -844 912 ) ( -436 -844 884 ) ( -436 -908 912 ) ( ( 0.0078125 0 508.125 ) ( 0 0.0078124963 497.9683227539 ) ) exx/base-metal01 134217728 0 0
-( -520 -916 884 ) ( -368 -916 884 ) ( -520 -852 884 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( -520 -916 884 ) ( -368 -916 884 ) ( -520 -852 884 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal01 134217728 0 0
 ( -520 -916 884 ) ( -520 -916 912 ) ( -368 -916 884 ) ( ( 0.0078125 0 508.125 ) ( 0 0.0078124963 497.9683227539 ) ) exx/base-metal01 134217728 0 0
-( -552 -924 884 ) ( -552 -860 884 ) ( -552 -924 912 ) ( ( 0.015625 0 255.875 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( -552 -924 884 ) ( -552 -860 884 ) ( -552 -924 912 ) ( ( 0.0078125 0 127.9375 ) ( 0 0.0078125 0 ) ) exx/base-metal01 134217728 0 0
 }
 }
 {
@@ -20778,13 +20778,35 @@ brushDef
 brushDef
 {
 ( -304 64 48 ) ( -312 64 48 ) ( -304 -64 48 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0.03125 ) ) common/caulk 0 0 0
-( -480 -788 -236 ) ( -488 -788 -236 ) ( -480 -788 -108 ) ( ( 0.0040106885 -0 -0.9985351563 ) ( 0 0.0062500001 0.9250000119 ) ) map_erbium/con-tiled 0 0 0
+( -480 -788 -236 ) ( -488 -788 -236 ) ( -480 -788 -108 ) ( ( 0.0040106885 0 -0.9985351563 ) ( -0 0.0062500001 0.9250000119 ) ) map_erbium/con-tiled 0 0 0
 ( -432 -632 -108 ) ( -432 -624 -236 ) ( -432 -632 -236 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 254.65625 ) ) common/caulk 0 0 0
 ( -516 -584 -236 ) ( -508 -584 -236 ) ( -516 -584 -108 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 254.65625 ) ) common/caulk 0 0 0
 ( -884 -660 -236 ) ( -884 -648 -236 ) ( -884 -660 -108 ) ( ( 0.0078125 0 255.9375 ) ( 0 0.0078125 254.65625 ) ) common/caulk 0 0 0
 ( -432 -64 256 ) ( -436 64 256 ) ( -432 64 256 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) NULL 0 0 0
 }
 }
+{
+brushDef
+{
+( -516 -604 1096 ) ( -456 -256 1096 ) ( -264 -352 1096 ) ( ( 0.0052083335 0 511.2083740234 ) ( 0 -0.0052083335 0.75 ) ) map_erbium/metal-tiles 0 0 0
+( -480 -788 -236 ) ( -488 -788 -236 ) ( -480 -788 -108 ) ( ( 0.0040106885 0 -0.9985351563 ) ( -0 0.0062500001 0.9250000119 ) ) map_erbium/con-tiled 0 0 0
+( -516 -632 -236 ) ( -508 -632 -236 ) ( -516 -632 -108 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 254.65625 ) ) common/caulk 0 0 0
+( -884 -660 -236 ) ( -884 -648 -236 ) ( -884 -660 -108 ) ( ( 0.0078125 0 255.9375 ) ( 0 0.0078125 254.65625 ) ) common/caulk 0 0 0
+( -504 -632 64 ) ( -504 -624 -64 ) ( -504 -632 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) skies/calm_sea 0 0 0
+( -64 -792 336 ) ( -64 -800 336 ) ( 64 -792 336 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) NULL 0 0 0
+}
+}
+{
+brushDef
+{
+( -480 -788 -236 ) ( -488 -788 -236 ) ( -480 -788 -108 ) ( ( 0.005892491 -0 -0.0166601539 ) ( 0 0.0044642859 0.5 ) ) map_erbium/black-tiles 0 0 0
+( -516 -584 -236 ) ( -508 -584 -236 ) ( -516 -584 -108 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 254.65625 ) ) common/caulk 0 0 0
+( -884 -660 -236 ) ( -884 -648 -236 ) ( -884 -660 -108 ) ( ( 0.0078125 0 255.9375 ) ( 0 0.0078125 254.65625 ) ) common/caulk 0 0 0
+( -432 64 280 ) ( -436 64 280 ) ( -432 -64 280 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) NULL 0 0 0
+( -504 -632 64 ) ( -504 -624 -64 ) ( -504 -632 -64 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) NULL 0 0 0
+( 64 -792 336 ) ( -64 -800 336 ) ( -64 -792 336 ) ( ( 0.0625 0 -0 ) ( -0 0.0625 0 ) ) NULL 0 0 0
+}
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -21026,7 +21048,8 @@ brushDef
 }
 {
 "classname" "item_armor_large"
-"origin" "1688.000000 192.000000 528.000000"
+"origin" "1688.000000 192.000000 496.000000"
+"spawnflags" "1"
 }
 {
 "classname" "misc_model"

diff --git a/maps/erbium.map.options b/maps/erbium.map.options
index 93cfdce5080bc79426ffaef2c22ebad04e34a444..e108d6394067d82cb925e345c1d92bca86bdbf31 100644 (file)
--- a/maps/erbium.map.options
+++ b/maps/erbium.map.options
@@ -2,4 +2,4 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 2
\ No newline at end of file
+Version: 2a
\ No newline at end of file