Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/maps/ships/matrix.map90
-rw-r--r--base/maps/ships/orion.map70
-rw-r--r--base/maps/ships/tensor.map46
-rw-r--r--base/maps/ships/vector.map8
-rw-r--r--base/maps/stations/alexandria.map190
-rw-r--r--base/maps/stations/regula.map252
-rw-r--r--gtkradiant/osirion.game/base/entities.def10
7 files changed, 555 insertions, 111 deletions
diff --git a/base/maps/ships/matrix.map b/base/maps/ships/matrix.map
index 2ac7e14..5257239 100644
--- a/base/maps/ships/matrix.map
+++ b/base/maps/ships/matrix.map
@@ -3958,20 +3958,12 @@
}
// entity 7
{
-"classname" "light"
-"origin" "168 184 560"
-"light" "50"
-"spawnflags" "2"
-"_color" "1 1 1"
-}
-// entity 8
-{
"classname" "target_engine"
"origin" "-512 184 208"
"angle" "180"
"radius" "50"
}
-// entity 9
+// entity 8
{
"classname" "light"
"origin" "80 240 560"
@@ -3981,7 +3973,7 @@
"time" "0.2"
"offset" ".1"
}
-// entity 10
+// entity 9
{
"classname" "light"
"origin" "-304 240 560"
@@ -3991,7 +3983,7 @@
"time" "0.2"
"offset" ".5"
}
-// entity 11
+// entity 10
{
"classname" "light"
"origin" "-112 240 560"
@@ -4001,22 +3993,14 @@
"time" "0.2"
"offset" ".3"
}
-// entity 12
-{
-"classname" "light"
-"origin" "168 184 208"
-"light" "50"
-"spawnflags" "2"
-"_color" "1 1 1"
-}
-// entity 13
+// entity 11
{
"classname" "target_engine"
"origin" "-512 -184 560"
"angle" "180"
"radius" "50"
}
-// entity 14
+// entity 12
{
"classname" "light"
"origin" "80 -240 208"
@@ -4026,7 +4010,7 @@
"time" "0.2"
"offset" "0"
}
-// entity 15
+// entity 13
{
"classname" "light"
"origin" "-304 -240 208"
@@ -4036,7 +4020,7 @@
"time" "0.2"
"offset" ".4"
}
-// entity 16
+// entity 14
{
"classname" "light"
"origin" "-112 -240 208"
@@ -4046,21 +4030,14 @@
"time" "0.2"
"offset" ".2"
}
-// entity 17
-{
-"classname" "light"
-"origin" "168 -184 560"
-"light" "50"
-"spawnflags" "2"
-}
-// entity 18
+// entity 15
{
"classname" "target_engine"
"origin" "-512 -184 208"
"angle" "180"
"radius" "50"
}
-// entity 19
+// entity 16
{
"classname" "light"
"origin" "80 -240 560"
@@ -4070,7 +4047,7 @@
"time" "0.2"
"offset" ".6"
}
-// entity 20
+// entity 17
{
"classname" "light"
"origin" "-304 -240 560"
@@ -4080,7 +4057,7 @@
"time" "0.2"
"offset" "0"
}
-// entity 21
+// entity 18
{
"classname" "light"
"origin" "-112 -240 560"
@@ -4090,14 +4067,7 @@
"time" "0.2"
"offset" ".8"
}
-// entity 22
-{
-"classname" "light"
-"origin" "168 -184 208"
-"light" "50"
-"spawnflags" "2"
-}
-// entity 23
+// entity 19
{
"classname" "light"
"origin" "-96 0 520"
@@ -4106,7 +4076,7 @@
"time" ".2"
"offset" ".7"
}
-// entity 24
+// entity 20
{
"classname" "light"
"origin" "608 0 456"
@@ -4114,7 +4084,7 @@
"spawnflags" "1"
"time" ".2"
}
-// entity 25
+// entity 21
{
"classname" "light"
"origin" "448 0 472"
@@ -4123,3 +4093,35 @@
"time" ".2"
"offset" ".4"
}
+// entity 22
+{
+"classname" "target_flare"
+"origin" "168 184 208"
+"flare" "0"
+"spawnflags" "2"
+"radius" "50"
+}
+// entity 23
+{
+"classname" "target_flare"
+"origin" "168 184 560"
+"flare" "0"
+"spawnflags" "2"
+"radius" "50"
+}
+// entity 24
+{
+"classname" "target_flare"
+"origin" "168 -184 560"
+"flare" "0"
+"spawnflags" "2"
+"radius" "50"
+}
+// entity 25
+{
+"classname" "target_flare"
+"origin" "168 -184 208"
+"flare" "0"
+"spawnflags" "2"
+"radius" "50"
+}
diff --git a/base/maps/ships/orion.map b/base/maps/ships/orion.map
index 6551d4a..509ecc5 100644
--- a/base/maps/ships/orion.map
+++ b/base/maps/ships/orion.map
@@ -642,18 +642,63 @@
( 136 16 72 ) ( 120 32 -56 ) ( 136 16 -56 ) common/entity 0 0 0 1 1
( 120 -64 24 ) ( 120 64 12 ) ( 120 64 24 ) common/caulk 0 0 0 1 1
}
+// brush 66
+{
+( 138 12 4 ) ( 138 -12 4 ) ( 136 14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 12 -6 ) ( 138 12 6 ) ( 136 14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 12 -4 ) ( 138 -12 -4 ) ( 138 -12 4 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -12 -4 ) ( 138 12 -4 ) ( 136 14 -6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 -14 -24 ) ( 136 14 -24 ) ( 136 -14 24 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 138 10 -64 ) ( 136 10 -64 ) ( 138 10 64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+}
+// brush 67
+{
+( 138 12 4 ) ( 138 -12 4 ) ( 136 14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 12 -4 ) ( 138 -12 -4 ) ( 138 -12 4 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -12 -4 ) ( 138 12 -4 ) ( 136 14 -6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 -14 -24 ) ( 136 14 -24 ) ( 136 -14 24 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 136 4 -64 ) ( 138 4 -64 ) ( 136 4 64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -4 -64 ) ( 136 -4 -64 ) ( 138 -4 64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+}
+// brush 68
+{
+( 138 12 4 ) ( 138 -12 4 ) ( 136 14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 12 -4 ) ( 138 -12 -4 ) ( 138 -12 4 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -12 -4 ) ( 138 12 -4 ) ( 136 14 -6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 -14 -24 ) ( 136 14 -24 ) ( 136 -14 24 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 138 8 64 ) ( 136 8 -64 ) ( 138 8 -64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 6 64 ) ( 138 6 -64 ) ( 136 6 -64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+}
+// brush 69
+{
+( 138 14 4 ) ( 138 -10 4 ) ( 136 16 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 14 -4 ) ( 138 -10 -4 ) ( 138 -10 4 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -10 -4 ) ( 138 14 -4 ) ( 136 16 -6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 -12 -24 ) ( 136 16 -24 ) ( 136 -12 24 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 138 -6 64 ) ( 136 -6 -64 ) ( 138 -6 -64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -8 -64 ) ( 136 -8 -64 ) ( 138 -8 64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+}
+// brush 70
+{
+( 138 12 4 ) ( 138 -12 4 ) ( 136 14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 12 -4 ) ( 138 -12 -4 ) ( 138 -12 4 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -12 -4 ) ( 138 12 -4 ) ( 136 14 -6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 138 -12 6 ) ( 138 -12 -6 ) ( 136 -14 6 ) colors/grey25 0 0 0 1 1 134217728 0 0
+( 136 -14 -24 ) ( 136 14 -24 ) ( 136 -14 24 ) common/caulk 0 0 0 1 1 134217728 0 0
+( 138 -10 64 ) ( 136 -10 -64 ) ( 138 -10 -64 ) colors/grey25 0 0 0 1 1 134217728 0 0
+}
}
// entity 1
{
"classname" "target_engine"
-"origin" "-156 -64 0"
+"origin" "-162 -64 0"
"angle" "180"
"radius" "50"
}
// entity 2
{
"classname" "target_engine"
-"origin" "-156 64 0"
+"origin" "-162 64 0"
"angle" "180"
"radius" "50"
}
@@ -661,7 +706,7 @@
{
"classname" "light"
"origin" "-16 0 52"
-"light" "20"
+"light" "10"
"spawnflags" "1"
"offset" "0.5"
"time" ".2"
@@ -669,20 +714,29 @@
// entity 4
{
"classname" "light"
-"origin" "36 88 0"
-"light" "20"
+"origin" "0 108 0"
+"light" "10"
+"_color" "1 0 0"
}
// entity 5
{
"classname" "light"
-"origin" "36 -88 0"
-"light" "20"
+"origin" "0 -108 0"
+"light" "10"
+"_color" "0 1 0"
}
// entity 6
{
"classname" "light"
"origin" "56 0 52"
-"light" "20"
+"light" "10"
"spawnflags" "1"
"time" ".2"
}
+// entity 7
+{
+"classname" "target_flare"
+"origin" "140 0 0"
+"radius" "30"
+"flare" "2"
+}
diff --git a/base/maps/ships/tensor.map b/base/maps/ships/tensor.map
index 021ea89..3fb1ae3 100644
--- a/base/maps/ships/tensor.map
+++ b/base/maps/ships/tensor.map
@@ -1831,28 +1831,12 @@
}
// entity 2
{
-"classname" "light"
-"origin" "296 176 32"
-"light" "50"
-"spawnflags" "2"
-"_color" "1 1 1"
-}
-// entity 3
-{
-"classname" "light"
-"origin" "296 -176 32"
-"light" "50"
-"spawnflags" "2"
-"_color" "1 1 1"
-}
-// entity 4
-{
"classname" "target_engine"
"origin" "-320 -176 32"
"angle" "180"
"radius" "50"
}
-// entity 5
+// entity 3
{
"classname" "light"
"origin" "-160 0 -56"
@@ -1861,7 +1845,7 @@
"time" ".1"
"offset" ".6"
}
-// entity 6
+// entity 4
{
"classname" "light"
"origin" "320 0 120"
@@ -1869,7 +1853,7 @@
"spawnflags" "1"
"time" ".1"
}
-// entity 7
+// entity 5
{
"classname" "light"
"origin" "128 0 120"
@@ -1878,7 +1862,7 @@
"time" ".1"
"offset" ".2"
}
-// entity 8
+// entity 6
{
"classname" "light"
"origin" "-64 0 120"
@@ -1887,7 +1871,7 @@
"time" ".1"
"offset" ".4"
}
-// entity 9
+// entity 7
{
"classname" "light"
"origin" "-256 0 120"
@@ -1896,7 +1880,7 @@
"time" ".1"
"offset" ".6"
}
-// entity 10
+// entity 8
{
"classname" "light"
"origin" "224 0 -56"
@@ -1905,7 +1889,7 @@
"time" ".1"
"offset" "0"
}
-// entity 11
+// entity 9
{
"classname" "light"
"origin" "32 0 -56"
@@ -1914,3 +1898,19 @@
"time" ".1"
"offset" ".3"
}
+// entity 10
+{
+"classname" "target_flare"
+"origin" "296 -176 32"
+"radius" "50"
+"spawnflags" "2"
+"flare" "0"
+}
+// entity 11
+{
+"classname" "target_flare"
+"origin" "296 176 32"
+"radius" "50"
+"spawnflags" "2"
+"flare" "0"
+}
diff --git a/base/maps/ships/vector.map b/base/maps/ships/vector.map
index b2555fa..abdfd6f 100644
--- a/base/maps/ships/vector.map
+++ b/base/maps/ships/vector.map
@@ -1283,15 +1283,15 @@
}
// entity 9
{
-"classname" "light"
+"classname" "target_flare"
"origin" "-8 72 -8"
-"light" "25"
+"radius" "25"
"spawnflags" "2"
}
// entity 10
{
-"classname" "light"
+"classname" "target_flare"
"origin" "-8 -72 -8"
-"light" "25"
+"radius" "25"
"spawnflags" "2"
}
diff --git a/base/maps/stations/alexandria.map b/base/maps/stations/alexandria.map
index 26a6b58..2c5e9b0 100644
--- a/base/maps/stations/alexandria.map
+++ b/base/maps/stations/alexandria.map
@@ -4778,24 +4778,24 @@
{
"classname" "light"
"origin" "512 544 224"
-"light" "25"
+"light" "20"
"spawnflags" "1"
"time" ".15"
}
// entity 7
{
"classname" "light"
-"origin" "-512 544 224"
-"light" "25"
+"origin" "-360 96 0"
+"light" "10"
"spawnflags" "1"
-"offset" ".75"
-"time" ".15"
+"offset" ".45"
+"time" ".10"
}
// entity 8
{
"classname" "light"
"origin" "512 544 -224"
-"light" "25"
+"light" "20"
"spawnflags" "1"
"offset" ".5"
"time" ".15"
@@ -4804,8 +4804,184 @@
{
"classname" "light"
"origin" "-512 544 -224"
-"light" "25"
+"light" "20"
"spawnflags" "1"
"offset" ".25"
"time" ".15"
}
+// entity 10
+{
+"classname" "target_flare"
+"origin" "-704 520 0"
+"angle" "90"
+"flare" "2"
+"radius" "25"
+}
+// entity 11
+{
+"classname" "target_flare"
+"origin" "-320 520 0"
+"angle" "90"
+"flare" "2"
+"radius" "25"
+}
+// entity 12
+{
+"classname" "target_flare"
+"origin" "320 520 0"
+"angle" "90"
+"flare" "2"
+"radius" "25"
+}
+// entity 13
+{
+"classname" "target_flare"
+"origin" "704 520 0"
+"angle" "90"
+"flare" "2"
+"radius" "25"
+}
+// entity 14
+{
+"classname" "light"
+"origin" "-512 544 224"
+"light" "20"
+"spawnflags" "1"
+"offset" ".75"
+"time" ".15"
+}
+// entity 15
+{
+"classname" "light"
+"origin" "664 96 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".70"
+"time" ".10"
+}
+// entity 16
+{
+"classname" "light"
+"origin" "-360 352 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".15"
+"time" ".10"
+}
+// entity 17
+{
+"classname" "light"
+"origin" "-664 96 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".45"
+"time" ".10"
+}
+// entity 18
+{
+"classname" "light"
+"origin" "-664 480 0"
+"light" "10"
+"spawnflags" "1"
+"offset" "0"
+"time" ".10"
+}
+// entity 19
+{
+"classname" "light"
+"origin" "-664 352 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".15"
+"time" ".10"
+}
+// entity 20
+{
+"classname" "light"
+"origin" "-360 480 0"
+"light" "10"
+"spawnflags" "1"
+"offset" "0"
+"time" ".10"
+}
+// entity 21
+{
+"classname" "light"
+"origin" "664 480 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".25"
+"time" ".10"
+}
+// entity 22
+{
+"classname" "light"
+"origin" "664 352 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".40"
+"time" ".10"
+}
+// entity 23
+{
+"classname" "light"
+"origin" "664 224 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".55"
+"time" ".10"
+}
+// entity 24
+{
+"classname" "light"
+"origin" "360 96 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".70"
+"time" ".10"
+}
+// entity 25
+{
+"classname" "light"
+"origin" "360 480 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".25"
+"time" ".10"
+}
+// entity 26
+{
+"classname" "light"
+"origin" "360 352 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".40"
+"time" ".10"
+}
+// entity 27
+{
+"classname" "light"
+"origin" "360 224 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".55"
+"time" ".10"
+}
+// entity 28
+{
+"classname" "light"
+"origin" "-360 224 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".30"
+"time" ".10"
+}
+// entity 29
+{
+"classname" "light"
+"origin" "-664 224 0"
+"light" "10"
+"spawnflags" "1"
+"offset" ".30"
+"time" ".10"
+}
diff --git a/base/maps/stations/regula.map b/base/maps/stations/regula.map
index d030355..86c14fa 100644
--- a/base/maps/stations/regula.map
+++ b/base/maps/stations/regula.map
@@ -172,24 +172,24 @@
}
// brush 8
{
-( 768 0 800 ) ( -256 0 800 ) ( -256 1024 800 ) common/caulk 0 0 0 1 1
-( 128 0 672 ) ( 1152 0 672 ) ( 128 1024 672 ) common/caulk 0 0 0 1 1
-( 640 896 -1248 ) ( 896 640 -1248 ) ( 896 640 288 ) common/entity 0 0 0 1 1
-( 1024 0 -1248 ) ( 1024 0 288 ) ( 1024 256 288 ) common/entity 0 0 0 1 1
-( 1024 256 288 ) ( 896 640 288 ) ( 896 640 -1248 ) common/entity 0 0 0 1 1
-( 0 1024 288 ) ( 0 1024 -1248 ) ( 256 1024 288 ) common/entity 0 0 0 1 1
-( 256 1024 288 ) ( 256 1024 -1248 ) ( 640 896 288 ) common/entity 0 0 0 1 1
-( -640 -896 -1248 ) ( -896 -640 -1248 ) ( -896 -640 288 ) common/entity 0 0 0 1 1
-( -1024 0 -1248 ) ( -1024 0 288 ) ( -1024 -256 288 ) common/entity 0 0 0 1 1
-( -1024 -256 288 ) ( -896 -640 288 ) ( -896 -640 -1248 ) common/entity 0 0 0 1 1
-( 0 -1024 288 ) ( 0 -1024 -1248 ) ( -256 -1024 288 ) common/entity 0 0 0 1 1
-( -256 -1024 288 ) ( -256 -1024 -1248 ) ( -640 -896 288 ) common/entity 0 0 0 1 1
-( -896 640 288 ) ( -896 640 -1248 ) ( -640 896 -1248 ) common/entity 0 0 0 1 1
-( -896 640 -1248 ) ( -896 640 288 ) ( -1024 256 288 ) common/entity 0 0 0 1 1
-( -640 896 288 ) ( -256 1024 -1248 ) ( -256 1024 288 ) common/entity 0 0 0 1 1
-( 896 -640 288 ) ( 896 -640 -1248 ) ( 640 -896 -1248 ) common/entity 0 0 0 1 1
-( 896 -640 -1248 ) ( 896 -640 288 ) ( 1024 -256 288 ) common/entity 0 0 0 1 1
-( 640 -896 288 ) ( 256 -1024 -1248 ) ( 256 -1024 288 ) common/entity 0 0 0 1 1
+( 128 1024 800 ) ( 1152 0 800 ) ( 128 0 800 ) common/caulk 0 0 0 1 1
+( 896 640 1184 ) ( 896 640 2720 ) ( 640 896 2720 ) common/entity 0 0 0 1 1
+( 1024 256 1184 ) ( 1024 0 1184 ) ( 1024 0 2720 ) common/entity 0 0 0 1 1
+( 896 640 2720 ) ( 896 640 1184 ) ( 1024 256 1184 ) common/entity 0 0 0 1 1
+( 256 1024 1184 ) ( 0 1024 2720 ) ( 0 1024 1184 ) common/entity 0 0 0 1 1
+( 640 896 1184 ) ( 256 1024 2720 ) ( 256 1024 1184 ) common/entity 0 0 0 1 1
+( -896 -640 1184 ) ( -896 -640 2720 ) ( -640 -896 2720 ) common/entity 0 0 0 1 1
+( -1024 -256 1184 ) ( -1024 0 1184 ) ( -1024 0 2720 ) common/entity 0 0 0 1 1
+( -896 -640 2720 ) ( -896 -640 1184 ) ( -1024 -256 1184 ) common/entity 0 0 0 1 1
+( -256 -1024 1184 ) ( 0 -1024 2720 ) ( 0 -1024 1184 ) common/entity 0 0 0 1 1
+( -640 -896 1184 ) ( -256 -1024 2720 ) ( -256 -1024 1184 ) common/entity 0 0 0 1 1
+( -640 896 2720 ) ( -896 640 2720 ) ( -896 640 1184 ) common/entity 0 0 0 1 1
+( -1024 256 1184 ) ( -896 640 1184 ) ( -896 640 2720 ) common/entity 0 0 0 1 1
+( -256 1024 1184 ) ( -256 1024 2720 ) ( -640 896 1184 ) common/entity 0 0 0 1 1
+( 640 -896 2720 ) ( 896 -640 2720 ) ( 896 -640 1184 ) common/entity 0 0 0 1 1
+( 1024 -256 1184 ) ( 896 -640 1184 ) ( 896 -640 2720 ) common/entity 0 0 0 1 1
+( 256 -1024 1184 ) ( 256 -1024 2720 ) ( 640 -896 1184 ) common/entity 0 0 0 1 1
+( 128 -64 768 ) ( 144 64 768 ) ( 128 64 768 ) common/entity 0 0 0 1 1
}
// brush 9
{
@@ -2037,12 +2037,224 @@
( -128 -128 576 ) ( -128 -128 768 ) ( 128 -128 576 ) common/clip 0 0 0 1 1
( -128 -128 576 ) ( -128 128 576 ) ( -128 -128 768 ) common/clip 0 0 0 1 1
}
+// brush 187
+{
+( 864 -608 768 ) ( 608 -864 704 ) ( 608 -864 768 ) colors/white 0 0 0 1 1 0 1 0
+( 896 -640 768 ) ( 640 -896 768 ) ( 448 -320 768 ) common/caulk 0 0 0 1 1
+( 448 -320 704 ) ( 640 -896 704 ) ( 896 -640 704 ) common/caulk 0 0 0 1 1
+( 320 -448 768 ) ( 448 -320 704 ) ( 448 -320 768 ) common/caulk 0 0 0 1 1
+( 448 -320 768 ) ( 896 -640 704 ) ( 896 -640 768 ) common/caulk 0 0 0 1 1
+( 320 -448 704 ) ( 640 -896 768 ) ( 640 -896 704 ) common/caulk 0 0 0 1 1
+}
+// brush 188
+{
+( 608 864 768 ) ( 608 864 704 ) ( 864 608 768 ) colors/white 0 0 0 1 1 0 1 0
+( 448 320 768 ) ( 640 896 768 ) ( 896 640 768 ) common/caulk 0 0 0 1 1
+( 896 640 704 ) ( 640 896 704 ) ( 448 320 704 ) common/caulk 0 0 0 1 1
+( 448 320 768 ) ( 448 320 704 ) ( 320 448 768 ) common/caulk 0 0 0 1 1
+( 896 640 768 ) ( 896 640 704 ) ( 448 320 768 ) common/caulk 0 0 0 1 1
+( 640 896 704 ) ( 640 896 768 ) ( 320 448 704 ) common/caulk 0 0 0 1 1
+}
+// brush 189
+{
+( -896 640 768 ) ( -512 128 768 ) ( -1024 256 768 ) common/caulk 0 0 0 1 1
+( -1024 256 704 ) ( -512 128 704 ) ( -896 640 704 ) common/caulk 0 0 0 1 1
+( -1024 256 768 ) ( -896 640 704 ) ( -896 640 768 ) common/entity 0 0 0 1 1
+( -896 640 768 ) ( -448 320 704 ) ( -448 320 768 ) common/entity 0 0 0 1 1
+( -512 128 704 ) ( -512 128 768 ) ( -448 320 768 ) common/caulk 0 0 0 1 1
+( -512 128 768 ) ( -512 128 704 ) ( -1024 256 768 ) common/entity 0 0 0 1 1
+}
+// brush 190
+{
+( -608 -864 768 ) ( -608 -864 704 ) ( -864 -608 768 ) colors/white 0 0 0 1 1 0 1 0
+( -448 -320 768 ) ( -640 -896 768 ) ( -896 -640 768 ) common/caulk 0 0 0 1 1
+( -896 -640 704 ) ( -640 -896 704 ) ( -448 -320 704 ) common/caulk 0 0 0 1 1
+( -448 -320 768 ) ( -448 -320 704 ) ( -320 -448 768 ) common/caulk 0 0 0 1 1
+( -896 -640 768 ) ( -896 -640 704 ) ( -448 -320 768 ) common/caulk 0 0 0 1 1
+( -640 -896 704 ) ( -640 -896 768 ) ( -320 -448 704 ) common/caulk 0 0 0 1 1
+}
+// brush 191
+{
+( -864 608 768 ) ( -608 864 704 ) ( -608 864 768 ) colors/white 0 0 0 1 1 0 1 0
+( -896 640 768 ) ( -640 896 768 ) ( -448 320 768 ) common/caulk 0 0 0 1 1
+( -448 320 704 ) ( -640 896 704 ) ( -896 640 704 ) common/caulk 0 0 0 1 1
+( -320 448 768 ) ( -448 320 704 ) ( -448 320 768 ) common/caulk 0 0 0 1 1
+( -448 320 768 ) ( -896 640 704 ) ( -896 640 768 ) common/caulk 0 0 0 1 1
+( -320 448 704 ) ( -640 896 768 ) ( -640 896 704 ) common/caulk 0 0 0 1 1
+}
+// brush 192
+{
+( 128 0 672 ) ( 1152 0 672 ) ( 128 1024 672 ) common/caulk 0 0 0 1 1
+( 640 896 -1248 ) ( 896 640 -1248 ) ( 896 640 288 ) common/entity 0 0 0 1 1
+( 1024 0 -1248 ) ( 1024 0 288 ) ( 1024 256 288 ) common/entity 0 0 0 1 1
+( 1024 256 288 ) ( 896 640 288 ) ( 896 640 -1248 ) common/entity 0 0 0 1 1
+( 0 1024 288 ) ( 0 1024 -1248 ) ( 256 1024 288 ) common/entity 0 0 0 1 1
+( 256 1024 288 ) ( 256 1024 -1248 ) ( 640 896 288 ) common/entity 0 0 0 1 1
+( -640 -896 -1248 ) ( -896 -640 -1248 ) ( -896 -640 288 ) common/entity 0 0 0 1 1
+( -1024 0 -1248 ) ( -1024 0 288 ) ( -1024 -256 288 ) common/entity 0 0 0 1 1
+( -1024 -256 288 ) ( -896 -640 288 ) ( -896 -640 -1248 ) common/entity 0 0 0 1 1
+( 0 -1024 288 ) ( 0 -1024 -1248 ) ( -256 -1024 288 ) common/entity 0 0 0 1 1
+( -256 -1024 288 ) ( -256 -1024 -1248 ) ( -640 -896 288 ) common/entity 0 0 0 1 1
+( -896 640 288 ) ( -896 640 -1248 ) ( -640 896 -1248 ) common/entity 0 0 0 1 1
+( -896 640 -1248 ) ( -896 640 288 ) ( -1024 256 288 ) common/entity 0 0 0 1 1
+( -640 896 288 ) ( -256 1024 -1248 ) ( -256 1024 288 ) common/entity 0 0 0 1 1
+( 896 -640 288 ) ( 896 -640 -1248 ) ( 640 -896 -1248 ) common/entity 0 0 0 1 1
+( 896 -640 -1248 ) ( 896 -640 288 ) ( 1024 -256 288 ) common/entity 0 0 0 1 1
+( 640 -896 288 ) ( 256 -1024 -1248 ) ( 256 -1024 288 ) common/entity 0 0 0 1 1
+( 128 64 704 ) ( 144 64 704 ) ( 128 -64 704 ) common/entity 0 0 0 1 1
+}
+// brush 193
+{
+( -1024 -256 768 ) ( -512 -128 768 ) ( -896 -640 768 ) common/caulk 0 0 0 1 1
+( -896 -640 704 ) ( -512 -128 704 ) ( -1024 -256 704 ) common/caulk 0 0 0 1 1
+( -896 -640 768 ) ( -896 -640 704 ) ( -1024 -256 768 ) common/entity 0 0 0 1 1
+( -448 -320 768 ) ( -448 -320 704 ) ( -896 -640 768 ) common/entity 0 0 0 1 1
+( -448 -320 768 ) ( -512 -128 768 ) ( -512 -128 704 ) common/caulk 0 0 0 1 1
+( -1024 -256 768 ) ( -512 -128 704 ) ( -512 -128 768 ) common/entity 0 0 0 1 1
+}
+// brush 194
+{
+( -960 0 -1248 ) ( -960 0 288 ) ( -960 -256 288 ) colors/white 0 0 0 1 1 0 1 0
+( -1024 0 768 ) ( -512 -128 768 ) ( -1024 -256 768 ) common/caulk 0 0 0 1 1
+( -1024 -256 704 ) ( -512 -128 704 ) ( -1024 0 704 ) common/caulk 0 0 0 1 1
+( -512 0 768 ) ( -512 -128 704 ) ( -512 -128 768 ) common/caulk 0 0 0 1 1
+( -1024 -256 704 ) ( -512 -128 768 ) ( -512 -128 704 ) common/caulk 0 0 0 1 1
+( -512 128 704 ) ( -512 128 768 ) ( -1024 256 704 ) common/caulk 0 0 0 1 1
+}
+// brush 195
+{
+( 1024 256 768 ) ( 512 128 768 ) ( 896 640 768 ) common/caulk 0 0 0 1 1
+( 896 640 704 ) ( 512 128 704 ) ( 1024 256 704 ) common/caulk 0 0 0 1 1
+( 896 640 768 ) ( 896 640 704 ) ( 1024 256 768 ) common/entity 0 0 0 1 1
+( 448 320 768 ) ( 448 320 704 ) ( 896 640 768 ) common/entity 0 0 0 1 1
+( 448 320 768 ) ( 512 128 768 ) ( 512 128 704 ) common/caulk 0 0 0 1 1
+( 1024 256 768 ) ( 512 128 704 ) ( 512 128 768 ) common/entity 0 0 0 1 1
+}
+// brush 196
+{
+( 960 0 -1248 ) ( 960 0 288 ) ( 960 256 288 ) colors/white 0 0 0 1 1 0 1 0
+( 1024 0 768 ) ( 512 128 768 ) ( 1024 256 768 ) common/caulk 0 0 0 1 1
+( 1024 256 704 ) ( 512 128 704 ) ( 1024 0 704 ) common/caulk 0 0 0 1 1
+( 512 0 768 ) ( 512 128 704 ) ( 512 128 768 ) common/caulk 0 0 0 1 1
+( 1024 256 704 ) ( 512 128 768 ) ( 512 128 704 ) common/caulk 0 0 0 1 1
+( 512 -128 704 ) ( 512 -128 768 ) ( 1024 -256 704 ) common/caulk 0 0 0 1 1
+}
+// brush 197
+{
+( 896 -640 768 ) ( 512 -128 768 ) ( 1024 -256 768 ) common/caulk 0 0 0 1 1
+( 1024 -256 704 ) ( 512 -128 704 ) ( 896 -640 704 ) common/caulk 0 0 0 1 1
+( 1024 -256 768 ) ( 896 -640 704 ) ( 896 -640 768 ) common/entity 0 0 0 1 1
+( 896 -640 768 ) ( 448 -320 704 ) ( 448 -320 768 ) common/entity 0 0 0 1 1
+( 512 -128 704 ) ( 512 -128 768 ) ( 448 -320 768 ) common/caulk 0 0 0 1 1
+( 512 -128 768 ) ( 512 -128 704 ) ( 1024 -256 768 ) common/entity 0 0 0 1 1
+}
+// brush 198
+{
+( 256 -1024 768 ) ( 128 -512 768 ) ( 640 -896 768 ) common/caulk 0 0 0 1 1
+( 640 -896 704 ) ( 128 -512 704 ) ( 256 -1024 704 ) common/caulk 0 0 0 1 1
+( 640 -896 768 ) ( 640 -896 704 ) ( 256 -1024 768 ) common/entity 0 0 0 1 1
+( 320 -448 768 ) ( 320 -448 704 ) ( 640 -896 768 ) common/entity 0 0 0 1 1
+( 320 -448 768 ) ( 128 -512 768 ) ( 128 -512 704 ) common/caulk 0 0 0 1 1
+( 256 -1024 768 ) ( 128 -512 704 ) ( 128 -512 768 ) common/entity 0 0 0 1 1
+}
+// brush 199
+{
+( 0 -960 -1248 ) ( 0 -960 288 ) ( 256 -960 288 ) colors/white 0 0 0 1 1 0 1 0
+( 0 -1024 768 ) ( 128 -512 768 ) ( 256 -1024 768 ) common/caulk 0 0 0 1 1
+( 256 -1024 704 ) ( 128 -512 704 ) ( 0 -1024 704 ) common/caulk 0 0 0 1 1
+( 0 -512 768 ) ( 128 -512 704 ) ( 128 -512 768 ) common/caulk 0 0 0 1 1
+( 256 -1024 704 ) ( 128 -512 768 ) ( 128 -512 704 ) common/caulk 0 0 0 1 1
+( -128 -512 704 ) ( -128 -512 768 ) ( -256 -1024 704 ) common/caulk 0 0 0 1 1
+}
+// brush 200
+{
+( -256 1024 768 ) ( -128 512 768 ) ( -640 896 768 ) common/caulk 0 0 0 1 1
+( -640 896 704 ) ( -128 512 704 ) ( -256 1024 704 ) common/caulk 0 0 0 1 1
+( -640 896 768 ) ( -640 896 704 ) ( -256 1024 768 ) common/entity 0 0 0 1 1
+( -320 448 768 ) ( -320 448 704 ) ( -640 896 768 ) common/entity 0 0 0 1 1
+( -320 448 768 ) ( -128 512 768 ) ( -128 512 704 ) common/caulk 0 0 0 1 1
+( -256 1024 768 ) ( -128 512 704 ) ( -128 512 768 ) common/entity 0 0 0 1 1
+}
+// brush 201
+{
+( -640 -896 768 ) ( -128 -512 768 ) ( -256 -1024 768 ) common/caulk 0 0 0 1 1
+( -256 -1024 704 ) ( -128 -512 704 ) ( -640 -896 704 ) common/caulk 0 0 0 1 1
+( -256 -1024 768 ) ( -640 -896 704 ) ( -640 -896 768 ) common/entity 0 0 0 1 1
+( -640 -896 768 ) ( -320 -448 704 ) ( -320 -448 768 ) common/entity 0 0 0 1 1
+( -128 -512 704 ) ( -128 -512 768 ) ( -320 -448 768 ) common/caulk 0 0 0 1 1
+( -128 -512 768 ) ( -128 -512 704 ) ( -256 -1024 768 ) common/entity 0 0 0 1 1
+}
+// brush 202
+{
+( 0 960 -1248 ) ( 0 960 288 ) ( -256 960 288 ) colors/white 0 0 0 1 1 0 1 0
+( 0 1024 768 ) ( -128 512 768 ) ( -256 1024 768 ) common/caulk 0 0 0 1 1
+( -256 1024 704 ) ( -128 512 704 ) ( 0 1024 704 ) common/caulk 0 0 0 1 1
+( 0 512 768 ) ( -128 512 704 ) ( -128 512 768 ) common/caulk 0 0 0 1 1
+( -256 1024 704 ) ( -128 512 768 ) ( -128 512 704 ) common/caulk 0 0 0 1 1
+( 128 512 704 ) ( 128 512 768 ) ( 256 1024 704 ) common/caulk 0 0 0 1 1
+}
+// brush 203
+{
+( 640 896 768 ) ( 128 512 768 ) ( 256 1024 768 ) common/caulk 0 0 0 1 1
+( 256 1024 704 ) ( 128 512 704 ) ( 640 896 704 ) common/caulk 0 0 0 1 1
+( 256 1024 768 ) ( 640 896 704 ) ( 640 896 768 ) common/entity 0 0 0 1 1
+( 640 896 768 ) ( 320 448 704 ) ( 320 448 768 ) common/entity 0 0 0 1 1
+( 128 512 704 ) ( 128 512 768 ) ( 320 448 768 ) common/caulk 0 0 0 1 1
+( 128 512 768 ) ( 128 512 704 ) ( 256 1024 768 ) common/entity 0 0 0 1 1
+}
}
// entity 1
{
"classname" "light"
-"origin" "0 0 2368"
-"light" "50"
+"origin" "0 -24 2344"
+"light" "30"
+"_color" "1 0 0"
+"spawnflags" "1"
+"time" ".20"
+"offset" ".5"
+}
+// entity 2
+{
+"classname" "light"
+"origin" "0 24 2344"
+"light" "30"
"_color" "1 0 0"
"spawnflags" "1"
+"time" ".20"
+}
+// entity 3
+{
+"classname" "light"
+"origin" "2304 0 328"
+"light" "20"
+"flare" "2"
+"spawnflags" "1"
+"time" ".15"
+"offset" ".95"
+}
+// entity 4
+{
+"classname" "light"
+"origin" "-2304 0 328"
+"light" "20"
+"flare" "2"
+"spawnflags" "1"
+"time" ".15"
+"offset" ".45"
+}
+// entity 5
+{
+"classname" "light"
+"origin" "2304 0 504"
+"light" "30"
+"spawnflags" "2"
+"flare" "2"
+}
+// entity 6
+{
+"classname" "light"
+"origin" "-2304 0 504"
+"light" "30"
+"spawnflags" "2"
+"flare" "2"
}
diff --git a/gtkradiant/osirion.game/base/entities.def b/gtkradiant/osirion.game/base/entities.def
index 4048fca..37053a4 100644
--- a/gtkradiant/osirion.game/base/entities.def
+++ b/gtkradiant/osirion.game/base/entities.def
@@ -36,18 +36,18 @@ light light radius, default is 100
frequency strobe frequency, in flashes per second
offset strobe offset, in seconds
time strobe time fraction, 0 (always off) - 1 (always on)
-flare flare number (maps to bitmaps/fx/flare??.tga), default 0
+flare flare texture number (maps to bitmaps/fx/flare??.tga), default 0
*/
/*QUAKED target_flare (1 1 1) (-8 -8 -8) (8 8 8) strobe entity
A light flare
-strobe make a strobe light (spawflag 1)
-entity light has entity color (spawflag 2)
-radius light radius, default is 100
+strobe make a strobe flare (spawflag 1)
+entity flare has entity color (spawflag 2)
+radius flare radius, default is 100
frequency strobe frequency, in flashes per second
offset strobe offset, in seconds
time strobe time fraction, 0 (always off) - 1 (always on)
-flare flare number (maps to bitmaps/fx/flare??.tga), default 0
+flare flare number texture (maps to bitmaps/fx/flare??.tga), default 0
angle direction of the flare
*/