Added Mining Surveyor.

Corrected Merchant lights for new scaling.
Re-made generic and glass envmaps.

1 files changed, 122 insertions, 98 deletions

diff --git a/base/maps/merchant/matrix.map b/base/maps/merchant/matrix.map
index a8ce400..4602369 100644
--- a/base/maps/merchant/matrix.map
+++ b/base/maps/merchant/matrix.map
@@ -1913,7 +1913,7 @@
 ( -480 -160 -152 ) ( -480 -160 -200 ) ( -480 -208 -152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 -200 ) ( -480 -208 -200 ) ( -552 -160 -200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 -200 ) ( -552 -208 -152 ) ( -480 -208 -200 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 -224 -200 ) ( -488 -176 -200 ) ( -488 -224 -152 ) common/engine 0 0 0 1 1 0 0 0
+( -488 -224 -200 ) ( -488 -176 -200 ) ( -488 -224 -152 ) colors/black_bright 0 0 0 1 1 0 0 0
 }
 // brush 178
 {
@@ -1922,7 +1922,7 @@
 ( -480 -160 200 ) ( -480 -160 152 ) ( -480 -208 200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 152 ) ( -480 -208 152 ) ( -552 -160 152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 -208 152 ) ( -552 -208 200 ) ( -480 -208 152 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 -224 152 ) ( -488 -176 152 ) ( -488 -224 200 ) common/engine 0 0 0 1 1 0 0 0
+( -488 -224 152 ) ( -488 -176 152 ) ( -488 -224 200 ) colors/black_bright 0 0 0 1 1 0 0 0
 }
 // brush 179
 {
@@ -1931,7 +1931,7 @@
 ( -480 208 200 ) ( -480 208 152 ) ( -480 160 200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 152 ) ( -480 160 152 ) ( -552 208 152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 152 ) ( -552 160 200 ) ( -480 160 152 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 144 152 ) ( -488 192 152 ) ( -488 144 200 ) common/engine 0 0 0 1 1 0 0 0
+( -488 144 152 ) ( -488 192 152 ) ( -488 144 200 ) colors/black_bright 0 0 0 1 1 0 0 0
 }
 // brush 180
 {
@@ -1940,7 +1940,7 @@
 ( -480 208 -152 ) ( -480 208 -200 ) ( -480 160 -152 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 -200 ) ( -480 160 -200 ) ( -552 208 -200 ) common/caulk 0 0 0 1 1 0 0 0
 ( -552 160 -200 ) ( -552 160 -152 ) ( -480 160 -200 ) common/caulk 0 0 0 1 1 0 0 0
-( -488 144 -200 ) ( -488 192 -200 ) ( -488 144 -152 ) common/engine 0 0 0 1 1 0 0 0
+( -488 144 -200 ) ( -488 192 -200 ) ( -488 144 -152 ) colors/black_bright 0 0 0 1 1 0 0 0
 }
 // brush 181
 {
@@ -4307,159 +4307,86 @@
 {
 "classname" "fx_flare"
 "origin" "168.000000 184.000000 -176.000000"
-"flare" "0"
 "spawnflags" "2"
-"radius" "50"
+"radius" "32"
 }
 // entity 17
 {
 "classname" "fx_flare"
 "origin" "168.000000 184.000000 176.000000"
-"flare" "0"
 "spawnflags" "2"
-"radius" "50"
+"radius" "32"
 }
 // entity 18
 {
 "classname" "fx_flare"
 "origin" "168.000000 -184.000000 176.000000"
-"flare" "0"
 "spawnflags" "2"
-"radius" "50"
+"radius" "32"
 }
 // entity 19
 {
 "classname" "fx_flare"
 "origin" "168.000000 -184.000000 -176.000000"
-"flare" "0"
 "spawnflags" "2"
-"radius" "50"
+"radius" "32"
 }
 // entity 20
 {
 "classname" "fx_flare"
-"origin" "-496.000000 184.000000 176.000000"
+"origin" "-496.000000 -184.000000 -176.000000"
 "angle" "-179.999985"
 "spawnflags" "4"
 "flare" "1"
-"radius" "40"
+"radius" "32"
 }
 // entity 21
 {
 "classname" "fx_flare"
-"origin" "-496.000000 184.000000 -176.000000"
+"origin" "-568.000000 80.000000 0.000000"
 "angle" "-179.999985"
 "spawnflags" "4"
+"radius" "56"
 "flare" "1"
-"radius" "40"
 }
 // entity 22
 {
 "classname" "fx_flare"
-"origin" "-496.000000 -184.000000 -176.000000"
+"origin" "-568.000000 -80.000000 0.000000"
 "angle" "-179.999985"
 "spawnflags" "4"
+"radius" "56"
 "flare" "1"
-"radius" "40"
 }
 // entity 23
 {
-"classname" "fx_flare"
-"origin" "-496.000000 -184.000000 176.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"flare" "1"
-"radius" "40"
-}
-// entity 24
-{
-"classname" "fx_flare"
-"origin" "-576.000000 80.000000 0.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"radius" "80"
-"flare" "1"
-}
-// entity 25
-{
-"classname" "fx_flare"
-"origin" "-576.000000 -80.000000 0.000000"
-"angle" "-179.999985"
-"spawnflags" "4"
-"radius" "80"
-"flare" "1"
-}
-// entity 26
-{
 "classname" "fx_particles"
-"origin" "-544.000000 184.000000 -176.000000"
-"angle" "-179.999985"
-"script" "engine_trail"
-}
-// entity 27
-{
-"classname" "fx_particles"
-"origin" "-544.000000 184.000000 176.000000"
-"angle" "-179.999985"
-"script" "engine_trail"
-}
-// entity 28
-{
-"classname" "fx_particles"
-"origin" "-544.000000 -184.000000 176.000000"
+"origin" "-544.000000 -184.000000 -176.000000"
 "angle" "-179.999985"
 "script" "engine_trail"
 }
-// entity 29
+// entity 24
 {
 "classname" "fx_particles"
 "origin" "-704.000000 80.000000 0.000000"
 "angle" "-179.999985"
 "script" "engine_exhaust"
 }
-// entity 30
-{
-"classname" "fx_particles"
-"origin" "-544.000000 -184.000000 -176.000000"
-"angle" "-179.999985"
-"script" "engine_trail"
-}
-// entity 31
+// entity 25
 {
 "classname" "fx_particles"
 "origin" "-704.000000 -80.000000 0.000000"
 "angle" "-179.999985"
 "script" "engine_exhaust"
 }
-// entity 32
+// entity 26
 {
 "classname" "light"
 "origin" "-560.000000 -184.000000 -176.000000"
 "spawnflags" "4"
-"flare" "4"
-}
-// entity 33
-{
-"classname" "light"
-"origin" "-560.000000 -184.000000 176.000000"
-"spawnflags" "4"
-"flare" "4"
-}
-// entity 34
-{
-"classname" "light"
-"origin" "-560.000000 184.000000 176.000000"
-"spawnflags" "4"
-"flare" "4"
+"light" "28"
 }
-// entity 35
-{
-"classname" "light"
-"origin" "-560.000000 184.000000 -176.000000"
-"spawnflags" "4"
-"flare" "4"
-}
-// entity 36
+// entity 27
 {
 "classname" "func_group"
 // brush 0
@@ -4696,7 +4623,7 @@
 ( 64 160 -124 ) ( 128 -160 -124 ) ( 128 160 -124 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 }
-// entity 37
+// entity 28
 {
 "classname" "func_group"
 // brush 0
@@ -4951,7 +4878,7 @@
 ( -268 -66 148 ) ( -276 62 148 ) ( -268 62 148 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 38
+// entity 29
 {
 "classname" "func_group"
 // brush 0
@@ -5206,7 +5133,7 @@
 ( -76 -66 148 ) ( -84 62 148 ) ( -76 62 148 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 39
+// entity 30
 {
 "classname" "func_group"
 // brush 0
@@ -5461,7 +5388,7 @@
 ( 116 -66 148 ) ( 108 62 148 ) ( 116 62 148 ) common/caulk 0 0 0 1 1 0 0 0
 }
 }
-// entity 40
+// entity 31
 {
 "classname" "func_group"
 // brush 0
@@ -5698,7 +5625,7 @@
 ( -128 160 -124 ) ( -64 -160 -124 ) ( -64 160 -124 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 }
-// entity 41
+// entity 32
 {
 "classname" "func_group"
 // brush 0
@@ -5935,3 +5862,100 @@
 ( -320 160 -124 ) ( -256 -160 -124 ) ( -256 160 -124 ) colors/grey75 0 0 0 1 1 0 0 0
 }
 }
+// entity 33
+{
+"classname" "light"
+"origin" "-544.000000 -184.000000 -176.000000"
+"light" "32"
+"spawnflags" "4"
+}
+// entity 34
+{
+"classname" "light"
+"origin" "-544.000000 -184.000000 176.000000"
+"light" "32"
+"spawnflags" "4"
+}
+// entity 35
+{
+"classname" "light"
+"origin" "-560.000000 -184.000000 176.000000"
+"spawnflags" "4"
+"light" "28"
+}
+// entity 36
+{
+"classname" "fx_flare"
+"origin" "-496.000000 -184.000000 176.000000"
+"angle" "-179.999985"
+"spawnflags" "4"
+"flare" "1"
+"radius" "32"
+}
+// entity 37
+{
+"classname" "fx_particles"
+"origin" "-544.000000 -184.000000 176.000000"
+"angle" "-179.999985"
+"script" "engine_trail"
+}
+// entity 38
+{
+"classname" "light"
+"origin" "-544.000000 184.000000 176.000000"
+"light" "32"
+"spawnflags" "4"
+}
+// entity 39
+{
+"classname" "light"
+"origin" "-560.000000 184.000000 176.000000"
+"spawnflags" "4"
+"light" "28"
+}
+// entity 40
+{
+"classname" "fx_flare"
+"origin" "-496.000000 184.000000 176.000000"
+"angle" "-179.999985"
+"spawnflags" "4"
+"flare" "1"
+"radius" "32"
+}
+// entity 41
+{
+"classname" "fx_particles"
+"origin" "-544.000000 184.000000 176.000000"
+"angle" "-179.999985"
+"script" "engine_trail"
+}
+// entity 42
+{
+"classname" "light"
+"origin" "-544.000000 184.000000 -176.000000"
+"light" "32"
+"spawnflags" "4"
+}
+// entity 43
+{
+"classname" "light"
+"origin" "-560.000000 184.000000 -176.000000"
+"spawnflags" "4"
+"light" "28"
+}
+// entity 44
+{
+"classname" "fx_flare"
+"origin" "-496.000000 184.000000 -176.000000"
+"angle" "-179.999985"
+"spawnflags" "4"
+"flare" "1"
+"radius" "32"
+}
+// entity 45
+{
+"classname" "fx_particles"
+"origin" "-544.000000 184.000000 -176.000000"
+"angle" "-179.999985"
+"script" "engine_trail"
+}