From c363ddc7d6c27d188e0a97087cabd07f96ffd1f1 Mon Sep 17 00:00:00 2001
From: Evan Goers <mega@osirion.org>
Date: Sat, 20 Nov 2010 10:08:31 +0000
Subject: Added Mining Surveyor. Corrected Merchant lights for new scaling.
 Re-made generic and glass envmaps.

---
 base/maps/merchant/scalar.map | 98 +++++++++++++++++++++----------------------
 1 file changed, 48 insertions(+), 50 deletions(-)

(limited to 'base/maps/merchant/scalar.map')

diff --git a/base/maps/merchant/scalar.map b/base/maps/merchant/scalar.map
index 628ff91..be81178 100644
--- a/base/maps/merchant/scalar.map
+++ b/base/maps/merchant/scalar.map
@@ -1808,52 +1808,43 @@
 // entity 1
 {
 "classname" "fx_flare"
-"origin" "-218.000000 -72.000000 -24.000000"
-"angle" "180.000000"
+"origin" "-214.000000 -72.000000 -24.000000"
 "spawnflags" "4"
-"radius" "25"
+"radius" "18"
 "flare" "1"
+"angles" "20 180 0"
 }
 // entity 2
 {
 "classname" "fx_flare"
-"origin" "-218.000000 72.000000 -24.000000"
-"angle" "180.000000"
+"origin" "-214.000000 72.000000 -24.000000"
 "spawnflags" "4"
-"radius" "25"
+"radius" "18"
 "flare" "1"
+"angles" "20 180 0"
 }
 // entity 3
 {
 "classname" "light"
-"origin" "-64.000000 72.000000 -24.000000"
-"light" "10"
-"flare" "4"
-"radius" "30"
-}
-// entity 4
-{
-"classname" "light"
 "origin" "-64.000000 -72.000000 -24.000000"
-"light" "10"
+"light" "16"
 "flare" "4"
-"radius" "30"
 }
-// entity 5
+// entity 4
 {
 "classname" "fx_particles"
 "origin" "-224.000000 -72.000000 -24.000000"
 "angle" "180.000000"
 "script" "engine_trail"
 }
-// entity 6
+// entity 5
 {
 "classname" "fx_particles"
 "origin" "-224.000000 72.000000 -24.000000"
 "angle" "180.000000"
 "script" "engine_trail"
 }
-// entity 7
+// entity 6
 {
 "classname" "fx_particles"
 "origin" "-272.000000 0.000000 16.000000"
@@ -1861,7 +1852,7 @@
 "script" "engine_trail"
 "spawnflags" "2"
 }
-// entity 8
+// entity 7
 {
 "classname" "fx_particles"
 "origin" "-216.000000 -72.000000 -24.000000"
@@ -1869,14 +1860,14 @@
 "script" "engine_exhaust"
 "scale" "0.5"
 }
-// entity 9
+// entity 8
 {
 "classname" "fx_particles"
 "origin" "-272.000000 0.000000 16.000000"
 "angle" "180.000000"
 "script" "engine_exhaust"
 }
-// entity 10
+// entity 9
 {
 "classname" "fx_particles"
 "origin" "-216.000000 72.000000 -24.000000"
@@ -1884,7 +1875,7 @@
 "script" "engine_exhaust"
 "scale" "0.5"
 }
-// entity 11
+// entity 10
 {
 "classname" "light"
 "origin" "104.000000 0.000000 -24.000000"
@@ -1893,7 +1884,7 @@
 "spawnflags" "1"
 "offset" "0.3"
 }
-// entity 12
+// entity 11
 {
 "classname" "light"
 "origin" "0.000000 -66.000000 16.000000"
@@ -1902,7 +1893,7 @@
 "spawnflags" "1"
 "time" "0.2"
 }
-// entity 13
+// entity 12
 {
 "classname" "light"
 "origin" "0.000000 66.000000 16.000000"
@@ -1912,7 +1903,7 @@
 "offset" "0.5"
 "time" "0.2"
 }
-// entity 14
+// entity 13
 {
 "classname" "light"
 "origin" "-176.000000 0.000000 -32.000000"
@@ -1920,7 +1911,7 @@
 "time" "0.1"
 "spawnflags" "1"
 }
-// entity 15
+// entity 14
 {
 "classname" "light"
 "origin" "0.000000 0.000000 56.000000"
@@ -1929,7 +1920,7 @@
 "spawnflags" "1"
 "offset" "0.5"
 }
-// entity 16
+// entity 15
 {
 "classname" "light"
 "origin" "-128.000000 0.000000 56.000000"
@@ -1938,7 +1929,7 @@
 "spawnflags" "1"
 "offset" "0.8"
 }
-// entity 17
+// entity 16
 {
 "classname" "light"
 "origin" "-128.000000 -66.000000 16.000000"
@@ -1947,7 +1938,7 @@
 "spawnflags" "1"
 "time" "0.2"
 }
-// entity 18
+// entity 17
 {
 "classname" "light"
 "origin" "-128.000000 66.000000 16.000000"
@@ -1957,73 +1948,80 @@
 "offset" "0.5"
 "time" "0.2"
 }
-// entity 19
+// entity 18
 {
 "classname" "light"
 "origin" "-300.000000 -8.000000 16.000000"
-"light" "32"
+"light" "20"
 "spawnflags" "4"
 }
-// entity 20
+// entity 19
 {
 "classname" "light"
 "origin" "-292.000000 0.000000 16.000000"
-"light" "40"
+"light" "28"
 "spawnflags" "4"
 }
-// entity 21
+// entity 20
 {
 "classname" "light"
 "origin" "-272.000000 -16.000000 16.000000"
-"light" "48"
+"light" "36"
 "spawnflags" "4"
 }
-// entity 22
+// entity 21
 {
 "classname" "light"
 "origin" "-272.000000 16.000000 16.000000"
-"light" "48"
+"light" "36"
 "spawnflags" "4"
 }
-// entity 23
+// entity 22
 {
 "classname" "light"
 "origin" "-288.000000 -12.000000 16.000000"
-"light" "40"
+"light" "28"
 "spawnflags" "4"
 }
-// entity 24
+// entity 23
 {
 "classname" "light"
 "origin" "-288.000000 12.000000 16.000000"
-"light" "40"
+"light" "28"
 "spawnflags" "4"
 }
-// entity 25
+// entity 24
 {
 "classname" "light"
 "origin" "-300.000000 8.000000 16.000000"
-"light" "32"
+"light" "20"
 "spawnflags" "4"
 }
-// entity 26
+// entity 25
 {
 "classname" "light"
 "origin" "-308.000000 0.000000 16.000000"
-"light" "24"
+"light" "12"
 "spawnflags" "4"
 }
-// entity 27
+// entity 26
 {
 "classname" "light"
 "origin" "-224.000000 -72.000000 -24.000000"
-"light" "24"
+"light" "16"
 "spawnflags" "4"
 }
-// entity 28
+// entity 27
 {
 "classname" "light"
 "origin" "-224.000000 72.000000 -24.000000"
-"light" "24"
+"light" "16"
 "spawnflags" "4"
 }
+// entity 28
+{
+"classname" "light"
+"origin" "-64.000000 72.000000 -24.000000"
+"light" "16"
+"flare" "4"
+}
-- 
cgit v1.2.3