Bromine: fix a z-fight in the Crylink room + align a trim texture

diff --git a/maps/bromine.map b/maps/bromine.map
index b78a541fcdadc4f40765e5ba973d4771c115f0c9..736cd05415d6fcf93af78faba87b08700b453403 100644 (file)
--- a/maps/bromine.map
+++ b/maps/bromine.map
@@ -37077,11 +37077,11 @@ brushDef
 {
 ( -992 224 256 ) ( -992 208 256 ) ( -1128 224 256 ) ( ( 0 0.0625 5 ) ( -0.015625 0 0.5 ) ) exx/trim-psimple04 0 0 0
 ( -1152 208 192 ) ( -1016 208 192 ) ( -1152 224 192 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -920 208 -64 ) ( -912 216 -64 ) ( -920 208 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -904 216 -64 ) ( -896 208 -64 ) ( -904 216 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -896 -208 192 ) ( -896 -208 256 ) ( -896 208 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -912 232 -64 ) ( -912 248 -64 ) ( -912 232 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -912 -48 64 ) ( -904 -56 -64 ) ( -912 -48 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -912 208 -64 ) ( -904 216 -64 ) ( -912 208 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -37162,9 +37162,9 @@ brushDef
 ( -1904 456 368 ) ( -1904 472 368 ) ( -1768 456 368 ) ( ( 0 -0.0625 80 ) ( 0.015625 0 501.875 ) ) exx/trim-psimple04 0 0 0
 ( -1744 472 304 ) ( -1880 472 304 ) ( -1744 456 304 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2128 464 368 ) ( -2128 464 304 ) ( -2128 720 368 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2128 720 -64 ) ( -2120 712 -64 ) ( -2128 720 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2112 -56 48 ) ( -2112 -88 48 ) ( -2112 -56 176 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -2128 464 304 ) ( -2128 464 368 ) ( -2112 448 304 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2128 640 -64 ) ( -2120 632 -64 ) ( -2128 640 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -38393,26 +38393,6 @@ brushDef
 {
 brushDef
 {
-( -2176 1232 0 ) ( -2176 1216 0 ) ( -2192 1232 0 ) ( ( 0 -0.0625 74 ) ( 0.015625 0 479.25 ) ) exx/trim-psimple04 0 0 0
-( -2176 1232 0 ) ( -2192 1232 0 ) ( -2176 1232 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2176 1232 0 ) ( -2176 1232 -64 ) ( -2176 1216 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2192 1216 -64 ) ( -2176 1216 -64 ) ( -2192 1232 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2184 1224 0 ) ( -2184 1224 -64 ) ( -2192 1232 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{
-( -2192 1232 0 ) ( -2192 1248 0 ) ( -2048 1248 0 ) ( ( 0 -0.0625 74 ) ( 0.015625 0 479.25 ) ) exx/trim-psimple04 0 0 0
-( -2192 1248 -64 ) ( -2192 1232 -64 ) ( -2048 1248 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1776 1232 0 ) ( -1776 1232 -64 ) ( -2128 1232 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2176 1248 -64 ) ( -2176 1248 0 ) ( -2192 1232 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2176 1232 64 ) ( -2184 1240 -64 ) ( -2176 1232 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{
 ( 1112 1496 320 ) ( 1112 1384 320 ) ( 1088 1496 320 ) ( ( 0 0.0625 12 ) ( 0.015625 0 485.5 ) ) exx/trim-psimple04 0 0 0
 ( 1088 1584 320 ) ( 1088 1584 256 ) ( 1104 1568 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( 1104 1496 320 ) ( 1104 1496 256 ) ( 1104 1384 320 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -41499,18 +41479,6 @@ brushDef
 {
 brushDef
 {
-( -2000 640 368 ) ( -2000 624 368 ) ( -2112 640 368 ) ( ( -0.0625 0 27 ) ( 0 -0.015625 488.375 ) ) exx/trim-psimple04 0 0 0
-( -2000 640 368 ) ( -2112 640 368 ) ( -2000 640 304 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2112 624 304 ) ( -2000 624 304 ) ( -2112 640 304 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2112 624 304 ) ( -2112 624 368 ) ( -2000 624 304 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2112 624 304 ) ( -2112 640 304 ) ( -2112 624 368 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -1984 624 304 ) ( -1984 624 368 ) ( -2000 640 368 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-( -2000 624 64 ) ( -1992 632 -64 ) ( -2000 624 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
-}
-}
-{
-brushDef
-{
 ( -1632 1104 304 ) ( -1632 968 304 ) ( -1776 1104 304 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -1776 968 256 ) ( -1632 968 256 ) ( -1776 1104 256 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal05rust 0 0 0
 ( -1576 640 256 ) ( -1576 640 304 ) ( -1432 640 256 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -80313,6 +80281,42 @@ brushDef
 ( -2184 1448 64 ) ( -2176 1440 -64 ) ( -2184 1448 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
+{
+brushDef
+{
+( -1904 456 368 ) ( -1904 472 368 ) ( -1768 456 368 ) ( ( 0 -0.0625 80 ) ( 0.015625 0 501.875 ) ) exx/trim-psimple04 0 0 0
+( -1744 472 304 ) ( -1880 472 304 ) ( -1744 456 304 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2128 464 368 ) ( -2128 464 304 ) ( -2128 720 368 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2128 720 -64 ) ( -2120 712 -64 ) ( -2128 720 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2112 -56 48 ) ( -2112 -88 48 ) ( -2112 -56 176 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2128 640 64 ) ( -2120 632 -64 ) ( -2128 640 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2112 640 -64 ) ( -2120 632 -64 ) ( -2112 640 64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( -2000 640 368 ) ( -2000 624 368 ) ( -2112 640 368 ) ( ( -0.0625 0 27 ) ( 0 -0.015625 488.375 ) ) exx/trim-psimple04 0 0 0
+( -2000 640 368 ) ( -2112 640 368 ) ( -2000 640 304 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2112 624 304 ) ( -2000 624 304 ) ( -2112 640 304 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2112 624 304 ) ( -2112 624 368 ) ( -2000 624 304 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -1984 624 304 ) ( -1984 624 368 ) ( -2000 640 368 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2000 624 64 ) ( -1992 632 -64 ) ( -2000 624 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2128 640 64 ) ( -2120 632 -64 ) ( -2128 640 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2112 640 64 ) ( -2120 632 -64 ) ( -2112 640 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
+{
+brushDef
+{
+( -2176 1232 0 ) ( -2176 1216 0 ) ( -2192 1232 0 ) ( ( 0 -0.0625 74 ) ( 0.015625 0 479.25 ) ) exx/trim-psimple04 0 0 0
+( -2176 1232 0 ) ( -2176 1232 -64 ) ( -2176 1216 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2192 1216 -64 ) ( -2176 1216 -64 ) ( -2192 1232 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2184 1224 0 ) ( -2184 1224 -64 ) ( -2192 1232 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2176 1248 -64 ) ( -2176 1248 0 ) ( -2192 1232 0 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -2176 1232 64 ) ( -2184 1240 -64 ) ( -2176 1232 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+}
+}
 }
 {
 "classname" "trigger_warpzone"

diff --git a/maps/bromine.map.options b/maps/bromine.map.options
index 31284131ef60e3acd083db8ce9e798f016b7b263..9dbac8e3fd8d4d825fd26889ddad2f863911540d 100644 (file)
--- a/maps/bromine.map.options
+++ b/maps/bromine.map.options
@@ -3,4 +3,4 @@
 -light + -dirtscale 0.5 -bounce 6
 -minimap +
 -sRGB
-Version: 2l
+Version: 2m