Couple of Erbium fixes

diff --git a/maps/erbium.map b/maps/erbium.map
index 362deb93351bad8def85acd473258025801dee26..618e36f548c4fbd340d7b2a9745e7908f9aeba90 100644 (file)
--- a/maps/erbium.map
+++ b/maps/erbium.map
@@ -7477,7 +7477,7 @@ brushDef
 {
 brushDef
 {
-( 1464 228 496 ) ( 1464 100 496 ) ( 1320 228 496 ) ( ( 0.0078125 0 23.1136684418 ) ( 0 0.0078125 511.75 ) ) map_erbium/moss 0 0 0
+( 1464.375 228 493.375 ) ( 1464.375 100 493.375 ) ( 1320.375 228 493.375 ) ( ( 0.0078125 0 23.1136684418 ) ( 0 0.0078125 511.7470703125 ) ) map_erbium/moss 0 0 0
 ( 1340 100 480 ) ( 1484 100 480 ) ( 1340 228 480 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( 1360 -16 480 ) ( 1360 -16 712 ) ( 1504 -16 480 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/floor-wrn01 0 0 0
 ( 1276 108 480 ) ( 1276 236 480 ) ( 1276 108 712 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -10327,7 +10327,7 @@ brushDef
 brushDef
 {
 ( -320 644 524 ) ( 428 820 524 ) ( 428 644 524 ) ( ( 0.0056818184 0 508.3408813477 ) ( 0 0.0037202383 1.3244048357 ) ) exx/floor-grate01-cull 0 0 0
-( -320 820 524 ) ( 428 820 508 ) ( 428 820 524 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -320 820 524 ) ( 428 820 508 ) ( 428 820 524 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( -320 644 508 ) ( 428 644 508 ) ( 428 820 508 ) ( ( 0.0056818184 0 508.3408813477 ) ( 0 0.0037202381 1.1755952835 ) ) exx/floor-grate01-cull 0 0 0
 ( -304 644 508 ) ( 444 644 524 ) ( 444 644 508 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -304 804 -40 ) ( -304 812 -40 ) ( -304 804 88 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
@@ -10436,34 +10436,34 @@ brushDef
 {
 brushDef
 {
-( 0 348 504 ) ( -320 324 504 ) ( -320 348 504 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 0 324 480 ) ( -320 348 480 ) ( -320 324 480 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 20 348 504 ) ( -300 348 504 ) ( -300 348 480 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 0 324 504 ) ( -320 324 480 ) ( -320 324 504 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 20 344 -60 ) ( 20 336 -60 ) ( 20 344 68 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( -320 324 504 ) ( -320 348 480 ) ( -320 348 504 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 0 340 504 ) ( -320 316 504 ) ( -320 340 504 ) ( ( 0.0078125 0 0.0625 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 0 316 480 ) ( -320 340 480 ) ( -320 316 480 ) ( ( 0.0078125 0 0.0625 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 20 340 504 ) ( -300 340 504 ) ( -300 340 480 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 0 316 504 ) ( -320 316 480 ) ( -320 316 504 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 20 336 -60 ) ( 20 328 -60 ) ( 20 336 68 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( -320 316 504 ) ( -320 340 480 ) ( -320 340 504 ) ( ( 0.015625 0 255.875 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
 {
 brushDef
 {
-( 0 404 504 ) ( -320 380 504 ) ( -320 404 504 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 0 380 480 ) ( -320 404 480 ) ( -320 380 480 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 0 404 504 ) ( -320 404 504 ) ( -320 404 480 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 20 380 504 ) ( -300 380 480 ) ( -300 380 504 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
-( 20 400 -60 ) ( 20 392 -60 ) ( 20 400 68 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( -320 404 480 ) ( -320 380 504 ) ( -320 380 480 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 0 396 504 ) ( -320 372 504 ) ( -320 396 504 ) ( ( 0.0078125 0 0.0625 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 0 372 480 ) ( -320 396 480 ) ( -320 372 480 ) ( ( 0.0078125 0 0.0625 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 0 396 504 ) ( -320 396 504 ) ( -320 396 480 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 20 372 504 ) ( -300 372 480 ) ( -300 372 504 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/base-metal03 134217728 0 0
+( 20 392 -60 ) ( 20 384 -60 ) ( 20 392 68 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( -320 396 480 ) ( -320 372 504 ) ( -320 372 480 ) ( ( 0.015625 0 255.875 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
 {
 brushDef
 {
-( 0 380 504 ) ( -320 348 504 ) ( -320 380 504 ) ( ( 0.015625 0 506.5625 ) ( 0 0.0047169263 1.000000596 ) ) exx/floor-grate01-cull 134217728 0 0
-( 20 348 504 ) ( -300 348 488 ) ( -300 348 504 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 0 348 488 ) ( -320 380 488 ) ( -320 348 488 ) ( ( -0.015625 0 5.9375 ) ( 0 -0.004716659 1.0000200272 ) ) exx/floor-grate01-cull 134217728 0 0
-( 20 380 488 ) ( -300 380 504 ) ( -300 380 488 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( 20 360 -60 ) ( 20 352 -60 ) ( 20 360 68 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
-( -320 348 504 ) ( -320 380 488 ) ( -320 380 504 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 0 372 504 ) ( -320 340 504 ) ( -320 372 504 ) ( ( 0.015625 0 506.6875 ) ( 0 0.0047169263 1.000000596 ) ) exx/floor-grate01-cull 134217728 0 0
+( 20 340 504 ) ( -300 340 488 ) ( -300 340 504 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 0 340 488 ) ( -320 372 488 ) ( -320 340 488 ) ( ( -0.015625 0 5.8125 ) ( 0 -0.004716659 1.0000200272 ) ) exx/floor-grate01-cull 134217728 0 0
+( 20 372 488 ) ( -300 372 504 ) ( -300 372 488 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( 20 352 -60 ) ( 20 344 -60 ) ( 20 352 68 ) ( ( 0.015625 0 0.125 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
+( -320 340 504 ) ( -320 372 488 ) ( -320 372 504 ) ( ( 0.015625 0 255.875 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
 }
 }
 {
@@ -10496,7 +10496,7 @@ brushDef
 ( -304 712 512 ) ( -304 712 488 ) ( -304 616 512 ) ( ( 0.00390625 0 511.984375 ) ( 0 0.00390625 0.046875 ) ) trak4x/floor-tile2b 0 0 0
 ( -400 612 476 ) ( -320 612 476 ) ( -400 708 476 ) ( ( 0.00390625 -0 -0 ) ( 0 0.00390625 0 ) ) trak4x/floor-tile2b 0 0 0
 ( -396 580 476 ) ( -396 580 500 ) ( -316 580 476 ) ( ( 0.00390625 0 511.984375 ) ( 0 0.00390625 0.046875 ) ) trak4x/floor-tile2b 0 0 0
-( -390 612 476 ) ( -390 708 476 ) ( -390 612 500 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
+( -400 612.25 476 ) ( -400 708.25 476 ) ( -400 612.25 500 ) ( ( 0.015625 0 0.00390625 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
 {
@@ -15552,9 +15552,9 @@ patchDef2
 exx/base-metal03
 ( 3 3 0 0 0 )
 (
-( ( -315.7848815918 -1152 360 0 0 ) ( -464 -1012 360 0 -1.4622741938 ) ( -315.7848815918 -832 360 0 -3.168412447 ) )
-( ( -307.7732543945 -1144 360 0.1408293247 0 ) ( -445.9738464355 -1012 360 0.1408293247 -1.4622741938 ) ( -303.7674255371 -840 360 0.1408293247 -3.168412447 ) )
-( ( -295.7557983398 -1136 360 0.2536163032 0 ) ( -435.9592895508 -1012 360 0.2536163032 -1.4622741938 ) ( -291.75 -848 360 0.2536163032 -3.168412447 ) )
+( ( -315.9098815918 -1152 360 0 0 ) ( -464.125 -1012 360 0 -1.4622741938 ) ( -315.9098815918 -832 360 0 -3.168412447 ) )
+( ( -307.8982543945 -1144 360 0.1408293247 0 ) ( -446.0988464355 -1012 360 0.1408293247 -1.4622741938 ) ( -303.8924255371 -840 360 0.1408293247 -3.168412447 ) )
+( ( -295.8807983398 -1136 360 0.2536163032 0 ) ( -436.0842895508 -1012 360 0.2536163032 -1.4622741938 ) ( -291.875 -848 360 0.2536163032 -3.168412447 ) )
 )
 }
 }
@@ -18899,7 +18899,7 @@ brushDef
 ( -248 940 660 ) ( -248 908 660 ) ( -300 940 660 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -252 936 524 ) ( -304 936 524 ) ( -252 936 500 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 ( -212 932 524 ) ( -212 932 500 ) ( -212 900 524 ) ( ( 0.0166666675 0 241.3999938965 ) ( 0 0.0073529407 4.8529410362 ) ) exx/panel-metal02 0 0 0
-( -308 904 524 ) ( -256 904 524 ) ( -308 936 524 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
+( -308 904 524 ) ( -256 904 524 ) ( -308 936 524 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) exx/base-metal03 0 0 0
 ( -300 876 500 ) ( -300 876 524 ) ( -248 876 500 ) ( ( -0.0108695654 0 509.6956481934 ) ( 0 0.0073529412 4.8529410362 ) ) exx/panel-metal01c 0 0 0
 ( -320 904 500 ) ( -320 936 500 ) ( -320 904 524 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/caulk 0 0 0
 }
@@ -22067,11 +22067,11 @@ brushDef
 }
 {
 "classname" "misc_model"
-"origin" "1563.875000 188.500000 964.000000"
+"origin" "1563.875000 188.499969 964.000000"
 "model" "models/map_erbium/armor-room-terrain.ase"
 "spawnflags" "36"
 "lightmapscale" "0.2"
-"modelscale_vec" "1.000000 0.990000 1.000000"
+"modelscale_vec" "1.000000 0.990000 1.008028"
 }
 {
 "classname" "misc_model"
@@ -24043,7 +24043,7 @@ brushDef
 }
 {
 "classname" "misc_model"
-"origin" "779.999939 -804.000000 687.999939"
+"origin" "785.624939 -804.000000 687.999939"
 "model" "models/map_erbium/lamp1.ase"
 "modelscale" "0.800000"
 "angles" "44.999996 -179.999985 0.000000"

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