Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base/maps/merchant/vector.map26
-rw-r--r--base/maps/miners/kvalsund.map112
-rw-r--r--base/maps/miners/surveyor.map32
3 files changed, 53 insertions, 117 deletions
diff --git a/base/maps/merchant/vector.map b/base/maps/merchant/vector.map
index 8b63213..af08d2f 100644
--- a/base/maps/merchant/vector.map
+++ b/base/maps/merchant/vector.map
@@ -1731,7 +1731,7 @@
( -144 48 0 ) ( -80 44 0 ) ( -144 44 0 ) common/caulk 0 0 0 1 1 0 0 0
( -132 40 -12 ) ( -132 44 -12 ) ( -136 44 0 ) common/entity 0 0 0 1 1 0 0 0
( -176 42 -12 ) ( -48 44 0 ) ( -48 42 -12 ) common/entity 0 0 0 1 1 0 0 0
-( -129.25 -64 -8 ) ( -132 64 0 ) ( -129.25 64 -8 ) common/caulk 0 0 0 1 1 0 0 0
+( -129.25 -64 -8 ) ( -132 64 0 ) ( -129.25 64 -8 ) common/entity 0 0 0 1 1 0 0 0
( -132 -64 -12 ) ( -129.25 64 -8 ) ( -132 64 -12 ) common/caulk 0 0 0 1 1 0 0 0
}
// brush 176
@@ -3752,8 +3752,8 @@
// entity 1
{
"classname" "light"
-"origin" "152.000000 0.000000 4.000000"
-"light" "15"
+"origin" "152.000000 0.000000 0.000000"
+"light" "8"
"time" "0.1"
"spawnflags" "1"
"offset" "0.3"
@@ -3761,8 +3761,8 @@
// entity 2
{
"classname" "light"
-"origin" "-56 -72 24"
-"light" "15"
+"origin" "-56.000000 -72.000000 20.000000"
+"light" "8"
"_color" "0 1 0"
"spawnflags" "1"
"time" "0.2"
@@ -3770,8 +3770,8 @@
// entity 3
{
"classname" "light"
-"origin" "-56 72 24"
-"light" "15"
+"origin" "-56.000000 72.000000 20.000000"
+"light" "8"
"_color" "1 0 0"
"spawnflags" "1"
"offset" "0.5"
@@ -3780,16 +3780,16 @@
// entity 4
{
"classname" "light"
-"origin" "-112.000000 0.000000 -4.000000"
-"light" "15"
+"origin" "-112.000000 0.000000 -2.000000"
+"light" "8"
"time" "0.1"
"spawnflags" "1"
}
// entity 5
{
"classname" "light"
-"origin" "112.000000 0.000000 48.000000"
-"light" "15"
+"origin" "112.000000 0.000000 50.000000"
+"light" "8"
"time" "0.1"
"spawnflags" "1"
"offset" "0.5"
@@ -3797,8 +3797,8 @@
// entity 6
{
"classname" "light"
-"origin" "-112.000000 0.000000 48.000000"
-"light" "15"
+"origin" "-112.000000 0.000000 50.000000"
+"light" "8"
"time" "0.1"
"spawnflags" "1"
"offset" "0.8"
diff --git a/base/maps/miners/kvalsund.map b/base/maps/miners/kvalsund.map
index 84fb690..e052c2d 100644
--- a/base/maps/miners/kvalsund.map
+++ b/base/maps/miners/kvalsund.map
@@ -682,106 +682,40 @@ common/entity
}
// brush 54
{
-( 928 2064 1024 ) ( 1088 2096 1024 ) ( 1088 2064 1024 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 1216 2096 736 ) ( 1088 2096 1024 ) ( 928 2096 736 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 1216 2064 736 ) ( 1088 2064 1024 ) ( 1088 2096 1024 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 1216 2064 736 ) ( 928 2096 736 ) ( 928 2064 736 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 928 2064 736 ) ( 1088 2064 1024 ) ( 1216 2064 736 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 928 2096 736 ) ( 928 2096 1024 ) ( 928 2064 1024 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 320 2176 1472 ) ( 320 1920 1472 ) ( 64 1920 1472 ) common/entity 0 0 0 1 1 0 0 0
+( 64 1920 1152 ) ( 320 1920 1152 ) ( 320 2176 1152 ) common/entity 0 0 0 1 1 0 0 0
+( 320 2048 1152 ) ( 320 2048 1408 ) ( 320 2176 1408 ) common/entity 0 0 0 1 1 0 0 0
+( 283 2139 1152 ) ( 283 2139 1408 ) ( 192 2230 1408 ) common/entity 0 0 0 1 1 0 0 0
+( 192 2176 1152 ) ( 192 2176 1408 ) ( 64 2176 1408 ) common/entity 0 0 0 1 1 0 0 0
+( 101 2139 1152 ) ( 101 2139 1408 ) ( 10 2048 1408 ) common/entity 0 0 0 1 1 0 0 0
+( 64 2048 1152 ) ( 64 2048 1408 ) ( 64 1920 1408 ) common/entity 0 0 0 1 1 0 0 0
+( 101 1957 1152 ) ( 101 1957 1408 ) ( 192 1866 1408 ) common/entity 0 0 0 1 1 0 0 0
+( 192 1920 1152 ) ( 192 1920 1408 ) ( 320 1920 1408 ) common/entity 0 0 0 1 1 0 0 0
+( 283 1957 1152 ) ( 283 1957 1408 ) ( 374 2048 1408 ) common/entity 0 0 0 1 1 0 0 0
}
// brush 55
{
-( 928 2064 1280 ) ( 832 2064 1152 ) ( 832 2096 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 928 2096 1280 ) ( 832 2096 1152 ) ( 1088 2096 1024 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 1088 2064 1024 ) ( 928 2064 1280 ) ( 928 2096 1280 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 928 2096 1024 ) ( 928 2064 1024 ) ( 1088 2064 1024 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 1088 2064 1024 ) ( 832 2064 1152 ) ( 928 2064 1280 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 928 2096 1024 ) ( 832 2096 1152 ) ( 832 2064 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-}
-// brush 56
-{
-( 928 2000 1024 ) ( 1088 2032 1024 ) ( 1088 2000 1024 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 1216 2032 736 ) ( 1088 2032 1024 ) ( 928 2032 736 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 1216 2000 736 ) ( 1088 2000 1024 ) ( 1088 2032 1024 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 1216 2000 736 ) ( 928 2032 736 ) ( 928 2000 736 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 928 2000 736 ) ( 1088 2000 1024 ) ( 1216 2000 736 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 928 2032 736 ) ( 928 2032 1024 ) ( 928 2000 1024 ) common/caulk 0 0 0 1 1 134217728 0 0
-}
-// brush 57
-{
-( 704 2064 1152 ) ( 800 2096 1376 ) ( 800 2064 1376 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 928 2096 1280 ) ( 800 2096 1376 ) ( 832 2096 1152 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 928 2064 1280 ) ( 800 2064 1376 ) ( 800 2096 1376 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 928 2064 1280 ) ( 928 2096 1280 ) ( 832 2064 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 704 2064 1152 ) ( 800 2064 1376 ) ( 832 2064 1152 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 832 2096 1152 ) ( 704 2096 1152 ) ( 704 2064 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-}
-// brush 58
-{
-( 928 2000 1280 ) ( 832 2000 1152 ) ( 832 2032 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 928 2032 1280 ) ( 832 2032 1152 ) ( 1088 2032 1024 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 1088 2000 1024 ) ( 928 2000 1280 ) ( 928 2032 1280 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 928 2032 1024 ) ( 928 2000 1024 ) ( 1088 2000 1024 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 1088 2000 1024 ) ( 832 2000 1152 ) ( 928 2000 1280 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 928 2032 1024 ) ( 832 2032 1152 ) ( 832 2000 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-}
-// brush 59
-{
-( 512 2064 1152 ) ( 512 2096 1408 ) ( 512 2064 1408 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 512 2096 1152 ) ( 800 2096 1376 ) ( 512 2096 1408 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 800 2096 1376 ) ( 512 2064 1408 ) ( 512 2096 1408 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 704 2064 1152 ) ( 800 2064 1376 ) ( 800 2096 1376 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 512 2064 1152 ) ( 512 2064 1408 ) ( 800 2064 1376 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 704 2064 1152 ) ( 512 2096 1152 ) ( 512 2064 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-}
-// brush 60
-{
-( 704 2000 1152 ) ( 800 2032 1376 ) ( 800 2000 1376 ) common/caulk 0 0 0 1 1 134217728 0 0
( 928 2032 1280 ) ( 800 2032 1376 ) ( 832 2032 1152 ) common/entity_dark 0 0 0 1 1 134217728 0 0
( 928 2000 1280 ) ( 800 2000 1376 ) ( 800 2032 1376 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 928 2000 1280 ) ( 928 2032 1280 ) ( 832 2000 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
( 704 2000 1152 ) ( 800 2000 1376 ) ( 832 2000 1152 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 832 2032 1152 ) ( 704 2032 1152 ) ( 704 2000 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-}
-// brush 61
-{
-( 512 2000 1152 ) ( 512 2032 1408 ) ( 512 2000 1408 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 512 2032 1152 ) ( 800 2032 1376 ) ( 512 2032 1408 ) common/entity_dark 0 0 0 1 1 134217728 0 0
( 800 2032 1376 ) ( 512 2000 1408 ) ( 512 2032 1408 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 704 2000 1152 ) ( 800 2000 1376 ) ( 800 2032 1376 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 512 2000 1152 ) ( 512 2000 1408 ) ( 800 2000 1376 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 704 2000 1152 ) ( 512 2032 1152 ) ( 512 2000 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-}
-// brush 62
-{
-( 512 2064 1408 ) ( 320 2064 1408 ) ( 320 2096 1408 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 512 2096 1152 ) ( 320 2096 1408 ) ( 320 2096 1152 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 512 2064 1152 ) ( 512 2064 1408 ) ( 512 2096 1408 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 512 2064 1152 ) ( 320 2096 1152 ) ( 320 2064 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 512 2064 1408 ) ( 320 2064 1152 ) ( 320 2064 1408 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 320 2096 1152 ) ( 320 2064 1408 ) ( 320 2064 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-}
-// brush 63
-{
( 512 2000 1408 ) ( 320 2000 1408 ) ( 320 2032 1408 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 512 2032 1152 ) ( 320 2032 1408 ) ( 320 2032 1152 ) common/entity_dark 0 0 0 1 1 134217728 0 0
-( 512 2000 1152 ) ( 512 2000 1408 ) ( 512 2032 1408 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 512 2000 1152 ) ( 320 2032 1152 ) ( 320 2000 1152 ) common/caulk 0 0 0 1 1 134217728 0 0
-( 512 2000 1408 ) ( 320 2000 1152 ) ( 320 2000 1408 ) common/entity_dark 0 0 0 1 1 134217728 0 0
( 320 2000 1408 ) ( 320 2032 1152 ) ( 320 2032 1408 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 1088 2000 1024 ) ( 928 2000 1280 ) ( 928 2032 1280 ) common/entity_dark 0 0 0 1 1 134217728 0 0
+( 1216 2000 736 ) ( 1088 2000 1024 ) ( 1088 2032 1024 ) common/entity_dark 0 0 0 1 1 134217728 0 0
+( 1216 2000 736 ) ( 832 2032 736 ) ( 832 2000 736 ) common/caulk 0 0 0 1 1 134217728 0 0
}
-// brush 64
+// brush 56
{
-( 320 2176 1472 ) ( 320 1920 1472 ) ( 64 1920 1472 ) common/entity 0 0 0 1 1 0 0 0
-( 64 1920 1152 ) ( 320 1920 1152 ) ( 320 2176 1152 ) common/entity 0 0 0 1 1 0 0 0
-( 320 2048 1152 ) ( 320 2048 1408 ) ( 320 2176 1408 ) common/entity 0 0 0 1 1 0 0 0
-( 283 2139 1152 ) ( 283 2139 1408 ) ( 192 2230 1408 ) common/entity 0 0 0 1 1 0 0 0
-( 192 2176 1152 ) ( 192 2176 1408 ) ( 64 2176 1408 ) common/entity 0 0 0 1 1 0 0 0
-( 101 2139 1152 ) ( 101 2139 1408 ) ( 10 2048 1408 ) common/entity 0 0 0 1 1 0 0 0
-( 64 2048 1152 ) ( 64 2048 1408 ) ( 64 1920 1408 ) common/entity 0 0 0 1 1 0 0 0
-( 101 1957 1152 ) ( 101 1957 1408 ) ( 192 1866 1408 ) common/entity 0 0 0 1 1 0 0 0
-( 192 1920 1152 ) ( 192 1920 1408 ) ( 320 1920 1408 ) common/entity 0 0 0 1 1 0 0 0
-( 283 1957 1152 ) ( 283 1957 1408 ) ( 374 2048 1408 ) common/entity 0 0 0 1 1 0 0 0
+( 928 2096 1280 ) ( 800 2096 1376 ) ( 832 2096 1152 ) common/entity_dark 0 0 0 1 1 134217728 0 0
+( 928 2064 1280 ) ( 800 2064 1376 ) ( 800 2096 1376 ) common/entity_dark 0 0 0 1 1 134217728 0 0
+( 704 2064 1152 ) ( 800 2064 1376 ) ( 832 2064 1152 ) common/entity_dark 0 0 0 1 1 134217728 0 0
+( 800 2096 1376 ) ( 512 2064 1408 ) ( 512 2096 1408 ) common/entity_dark 0 0 0 1 1 134217728 0 0
+( 512 2064 1408 ) ( 320 2064 1408 ) ( 320 2096 1408 ) common/entity_dark 0 0 0 1 1 134217728 0 0
+( 320 2064 1408 ) ( 320 2096 1152 ) ( 320 2096 1408 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 1088 2064 1024 ) ( 928 2064 1280 ) ( 928 2096 1280 ) common/entity_dark 0 0 0 1 1 134217728 0 0
+( 1216 2064 736 ) ( 1088 2064 1024 ) ( 1088 2096 1024 ) common/entity_dark 0 0 0 1 1 134217728 0 0
+( 1216 2064 736 ) ( 832 2096 736 ) ( 832 2064 736 ) common/caulk 0 0 0 1 1 134217728 0 0
}
}
// entity 1
diff --git a/base/maps/miners/surveyor.map b/base/maps/miners/surveyor.map
index 4b3f5af..d88ccae 100644
--- a/base/maps/miners/surveyor.map
+++ b/base/maps/miners/surveyor.map
@@ -2914,76 +2914,78 @@
// entity 7
{
"classname" "light"
-"origin" "320.000000 0.000000 -28.000000"
-"light" "32"
-}
-// entity 8
-{
-"classname" "light"
"origin" "112.000000 -174.000000 -32.500000"
"light" "8"
"_color" "1 0 0"
}
-// entity 9
+// entity 8
{
"classname" "light"
"origin" "112.000000 -174.000000 32.500000"
"light" "8"
"_color" "1 0 0"
}
-// entity 10
+// entity 9
{
"classname" "light"
"origin" "-112.000000 -174.000000 -32.500000"
"light" "8"
"_color" "1 0 0"
}
-// entity 11
+// entity 10
{
"classname" "light"
"origin" "-112.000000 -174.000000 32.500000"
"light" "8"
"_color" "1 0 0"
}
-// entity 12
+// entity 11
{
"classname" "light"
"origin" "-112.000000 174.000000 32.500000"
"light" "8"
"_color" "1 0 0"
}
-// entity 13
+// entity 12
{
"classname" "light"
"origin" "112.000000 174.000000 -32.500000"
"light" "8"
"_color" "1 0 0"
}
-// entity 14
+// entity 13
{
"classname" "light"
"origin" "-112.000000 174.000000 -32.500000"
"light" "8"
"_color" "1 0 0"
}
-// entity 15
+// entity 14
{
"classname" "light"
"origin" "112.000000 174.000000 32.500000"
"light" "8"
"_color" "1 0 0"
}
-// entity 16
+// entity 15
{
"classname" "light"
"origin" "388.500000 42.000000 134.000000"
"light" "8"
"_color" "1 0 0"
}
-// entity 17
+// entity 16
{
"classname" "light"
"origin" "295.500000 -28.000000 132.000000"
"light" "8"
"_color" "1 0 0"
}
+// entity 17
+{
+"classname" "fx_flare"
+"origin" "296.000000 0.000000 -28.000000"
+"angles" "15.000000 0.000000 0.000000"
+"radius" "40"
+"flare" "2"
+}