Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2009-08-15 08:00:54 +0000
committerEvan Goers <mega@osirion.org>2009-08-15 08:00:54 +0000
commit87a81eaa38e8a67831b5212f088d9c8d75071fd0 (patch)
tree2be01cee12ee83df01f4ca2f374e00be954ccb29 /base
parent1173e5194aa8d7e973160e1f247705975630546f (diff)
Added purple, purple_bright color shaders.
Added purple glass shader. Updated interceptor with preliminary patch meshes.
Diffstat (limited to 'base')
-rw-r--r--base/maps/tsukhan/interceptor.map261
-rw-r--r--base/materials/colors.shader13
-rw-r--r--base/materials/glass.shader7
-rw-r--r--base/textures/colors/purple.tgabin0 -> 364 bytes
-rw-r--r--base/textures/glass/purple.tgabin0 -> 2514 bytes
5 files changed, 228 insertions, 53 deletions
diff --git a/base/maps/tsukhan/interceptor.map b/base/maps/tsukhan/interceptor.map
index d314366..bb68b2f 100644
--- a/base/maps/tsukhan/interceptor.map
+++ b/base/maps/tsukhan/interceptor.map
@@ -76,12 +76,12 @@
}
// brush 8
{
-( -192 -128 16 ) ( -224 -96 16 ) ( -192 128 16 ) common/entity_second 0 0 0 1 1 0 0 0
-( -192 128 -32 ) ( -224 96 16 ) ( -224 96 -32 ) common/entity_second 0 0 0 1 1 0 0 0
-( -192 128 16 ) ( -192 128 -32 ) ( -192 -128 16 ) common/caulk 0 0 0 1 1 0 0 0
-( -192 128 -16 ) ( -224 -96 -16 ) ( -192 -128 -16 ) common/entity_second 0 0 0 1 1 0 0 0
-( -192 -128 16 ) ( -224 -96 -32 ) ( -224 -96 16 ) common/entity_second 0 0 0 1 1 0 0 0
-( -224 96 -32 ) ( -224 -96 16 ) ( -224 -96 -32 ) common/entity_second 0 0 0 1 1 0 0 0
+( -192 -128 16 ) ( -224 -96 16 ) ( -192 128 16 ) common/entity_second 0 0 0 1.5 1 0 0 0
+( -192 128 -32 ) ( -224 96 16 ) ( -224 96 -32 ) common/entity_second 0 0 0 1.5 1 0 0 0
+( -192 128 16 ) ( -192 128 -32 ) ( -192 -128 16 ) common/caulk 0 0 0 1.5 1 0 0 0
+( -192 128 -16 ) ( -224 -96 -16 ) ( -192 -128 -16 ) common/entity_second 0 0 0 1.5 1 0 0 0
+( -192 -128 16 ) ( -224 -96 -32 ) ( -224 -96 16 ) common/entity_second 0 0 0 1.5 1 0 0 0
+( -224 96 -32 ) ( -224 -96 16 ) ( -224 -96 -32 ) common/entity_second 0 0 0 1.5 1 0 0 0
}
// brush 9
{
@@ -248,20 +248,20 @@
// brush 27
{
( 160 48 32 ) ( 96 32 32 ) ( 160 32 32 ) common/caulk 0 0 0 1 1 0 0 0
-( 96 -32 32 ) ( 112 -32 46 ) ( 112 -48 32 ) glass/red 0 0 0 1 1 0 0 0
+( 96 -32 32 ) ( 112 -32 46 ) ( 112 -48 32 ) glass/purple 0 0 0 1 1 0 0 0
( 152 -8 64 ) ( 160 0 -64 ) ( 152 -8 -64 ) common/caulk 0 0 0 1 1 0 0 0
( 106 -28 64 ) ( 100 -28 -64 ) ( 106 -28 -64 ) common/caulk 0 0 0 1 1 0 0 0
-( 125 64 45 ) ( 128 -64 45 ) ( 125 -64 45 ) glass/red 0 0 0 1 1 0 0 0
-( 131 -37 64 ) ( 152 -35 -64 ) ( 131 -37 -64 ) glass/red 0 0 0 1 1 0 0 0
-( 97 64 32 ) ( 112 -64 45 ) ( 97 -64 32 ) glass/red 0 0 0 1 1 0 0 0
+( 125 64 45 ) ( 128 -64 45 ) ( 125 -64 45 ) glass/purple 0 0 0 1 1 0 0 0
+( 131 -37 64 ) ( 152 -35 -64 ) ( 131 -37 -64 ) glass/purple 0 0 0 1 1 0 0 0
+( 97 64 32 ) ( 112 -64 45 ) ( 97 -64 32 ) glass/purple 0 0 0 1 1 0 0 0
}
// brush 28
{
-( 160 34.875 45 ) ( 160 8 45 ) ( 130.375 37.625 45 ) glass/red 0 0 0 1 1 0 0 0
+( 160 34.875 45 ) ( 160 8 45 ) ( 130.375 37.625 45 ) glass/purple 0 0 0 1 1 0 0 0
( 160 8 45 ) ( 160 34.875 45 ) ( 160 8 32 ) common/caulk 0 0 0 1 1 0 0 0
( 160 48 32 ) ( 96 32 32 ) ( 160 32 32 ) common/caulk 0 0 0 1 1 0 0 0
( 130.375 37.625 45 ) ( 160 8 45 ) ( 130.375 37.625 32 ) common/caulk 0 0 0 1 1 0 0 0
-( 194 31 64 ) ( 131 37 -64 ) ( 194 31 -64 ) glass/red 0 0 0 1 1 0 0 0
+( 194 31 64 ) ( 131 37 -64 ) ( 194 31 -64 ) glass/purple 0 0 0 1 1 0 0 0
}
// brush 29
{
@@ -276,10 +276,10 @@
{
( 160 34.875 45 ) ( 160 8 45 ) ( 160 8 32 ) common/caulk 0 0 0 1 1 0 0 0
( 244 64 18 ) ( 232 -64 20 ) ( 244 -64 18 ) common/caulk 0 0 0 1 1 0 0 0
-( 160 8 45 ) ( 160 34.875 45 ) ( 200 28 31.625 ) glass/red 0 0 0 1 1 0 0 0
+( 160 8 45 ) ( 160 34.875 45 ) ( 200 28 31.625 ) glass/purple 0 0 0 1 1 0 0 0
( 160 8 45 ) ( 200 28 31.625 ) ( 160 8 32 ) common/caulk 0 0 0 1 1 0 0 0
-( 194 31 64 ) ( 131 37 -64 ) ( 194 31 -64 ) glass/red 0 0 0 1 1 0 0 0
-( 199 28 64 ) ( 197 29 -64 ) ( 199 28 -64 ) glass/red 0 0 0 1 1 0 0 0
+( 194 31 64 ) ( 131 37 -64 ) ( 194 31 -64 ) glass/purple 0 0 0 1 1 0 0 0
+( 199 28 64 ) ( 197 29 -64 ) ( 199 28 -64 ) glass/purple 0 0 0 1 1 0 0 0
}
// brush 31
{
@@ -287,9 +287,9 @@
( 176 8 64 ) ( 160 0 -64 ) ( 176 8 -64 ) common/caulk 0 0 0 1 1 0 0 0
( 176 -8 -64 ) ( 160 0 -64 ) ( 176 -8 64 ) common/caulk 0 0 0 1 1 0 0 0
( 168 0 -64 ) ( 168 8 -64 ) ( 168 0 64 ) common/caulk 0 0 0 1 1 0 0 0
-( 169 64 42 ) ( 244 64 18 ) ( 169 -64 42 ) glass/red 0 0 0 1 1 0 0 0
-( 193 31 -64 ) ( 199 28 -64 ) ( 193 31 64 ) glass/red 0 0 0 1 1 0 0 0
-( 199 -28 -64 ) ( 195 -30 -64 ) ( 199 -28 64 ) glass/red 0 0 0 1 1 0 0 0
+( 169 64 42 ) ( 244 64 18 ) ( 169 -64 42 ) glass/purple 0 0 0 1 1 0 0 0
+( 193 31 -64 ) ( 199 28 -64 ) ( 193 31 64 ) glass/purple 0 0 0 1 1 0 0 0
+( 199 -28 -64 ) ( 195 -30 -64 ) ( 199 -28 64 ) glass/purple 0 0 0 1 1 0 0 0
}
// brush 32
{
@@ -1653,30 +1653,30 @@
}
// brush 180
{
-( 130.375 -37.625 45 ) ( 160 -8 45 ) ( 160 -34.875 45 ) glass/red 0 0 0 1 1 0 0 0
+( 130.375 -37.625 45 ) ( 160 -8 45 ) ( 160 -34.875 45 ) glass/purple 0 0 0 1 1 0 0 0
( 160 -8 32 ) ( 160 -34.875 45 ) ( 160 -8 45 ) common/caulk 0 0 0 1 1 0 0 0
( 160 -32 32 ) ( 96 -32 32 ) ( 160 -48 32 ) common/caulk 0 0 0 1 1 0 0 0
( 130.375 -37.625 32 ) ( 160 -8 45 ) ( 130.375 -37.625 45 ) common/caulk 0 0 0 1 1 0 0 0
-( 194 -31 -64 ) ( 131 -37 -64 ) ( 194 -31 64 ) glass/red 0 0 0 1 1 0 0 0
+( 194 -31 -64 ) ( 131 -37 -64 ) ( 194 -31 64 ) glass/purple 0 0 0 1 1 0 0 0
}
// brush 181
{
( 160 -8 32 ) ( 160 -8 45 ) ( 160 -34.875 45 ) common/caulk 0 0 0 1 1 0 0 0
( 244 64 18 ) ( 232 64 20 ) ( 244 -64 18 ) common/caulk 0 0 0 1 1 0 0 0
-( 200 -28 31.625 ) ( 160 -34.875 45 ) ( 160 -8 45 ) glass/red 0 0 0 1 1 0 0 0
+( 200 -28 31.625 ) ( 160 -34.875 45 ) ( 160 -8 45 ) glass/purple 0 0 0 1 1 0 0 0
( 160 -8 32 ) ( 200 -28 31.625 ) ( 160 -8 45 ) common/caulk 0 0 0 1 1 0 0 0
-( 194 -31 -64 ) ( 131 -37 -64 ) ( 194 -31 64 ) glass/red 0 0 0 1 1 0 0 0
-( 199 -28 -64 ) ( 197 -29 -64 ) ( 199 -28 64 ) glass/red 0 0 0 1 1 0 0 0
+( 194 -31 -64 ) ( 131 -37 -64 ) ( 194 -31 64 ) glass/purple 0 0 0 1 1 0 0 0
+( 199 -28 -64 ) ( 197 -29 -64 ) ( 199 -28 64 ) glass/purple 0 0 0 1 1 0 0 0
}
// brush 182
{
( 160 -32 32 ) ( 96 -32 32 ) ( 160 -48 32 ) common/caulk 0 0 0 1 1 0 0 0
-( 112 48 32 ) ( 112 32 46 ) ( 96 32 32 ) glass/red 0 0 0 1 1 0 0 0
+( 112 48 32 ) ( 112 32 46 ) ( 96 32 32 ) glass/purple 0 0 0 1 1 0 0 0
( 152 8 -64 ) ( 160 0 -64 ) ( 152 8 64 ) common/caulk 0 0 0 1 1 0 0 0
( 106 28 -64 ) ( 100 28 -64 ) ( 106 28 64 ) common/caulk 0 0 0 1 1 0 0 0
-( 125 64 45 ) ( 128 64 45 ) ( 125 -64 45 ) glass/red 0 0 0 1 1 0 0 0
-( 131 37 -64 ) ( 152 35 -64 ) ( 131 37 64 ) glass/red 0 0 0 1 1 0 0 0
-( 97 64 32 ) ( 112 64 45 ) ( 97 -64 32 ) glass/red 0 0 0 1 1 0 0 0
+( 125 64 45 ) ( 128 64 45 ) ( 125 -64 45 ) glass/purple 0 0 0 1 1 0 0 0
+( 131 37 -64 ) ( 152 35 -64 ) ( 131 37 64 ) glass/purple 0 0 0 1 1 0 0 0
+( 97 64 32 ) ( 112 64 45 ) ( 97 -64 32 ) glass/purple 0 0 0 1 1 0 0 0
}
// brush 183
{
@@ -1811,13 +1811,13 @@
}
// brush 198
{
-( -248 288 4 ) ( -152 288 -4 ) ( -152 288 4 ) common/entity 0 0 0 1 1 0 0 0
( -248 256 -16 ) ( -248 264 -16 ) ( -248 256 16 ) common/entity 0 0 0 1 1 0 0 0
( -176 200 -64 ) ( -184 208 -64 ) ( -176 200 64 ) common/entity 0 0 0 1 1 0 0 0
( -32 200 16 ) ( -32 288 2 ) ( 96 200 16 ) common/entity 0 0 0 1 1 0 0 0
( -32 288 -2 ) ( -32 200 -16 ) ( 96 288 -2 ) common/entity 0 0 0 1 1 0 0 0
( -168 200 64 ) ( -176 216 -64 ) ( -168 200 -64 ) common/caulk 0 0 0 1 1 0 0 0
( -64 268 -5 ) ( -64 268 -3 ) ( 64 268 -5 ) colors/grey25 0 0 0 1 1 0 0 0
+( -246 280 -64 ) ( -242 280 -64 ) ( -246 280 64 ) common/caulk 0 0 0 1 1 0 0 0
}
// brush 199
{
@@ -1885,12 +1885,11 @@
// brush 206
{
( -152 -288 4 ) ( -152 -288 -4 ) ( -248 -288 4 ) common/entity 0 0 0 1 1 0 0 0
-( -248 -256 16 ) ( -248 -264 -16 ) ( -248 -256 -16 ) common/entity 0 0 0 1 1 0 0 0
-( -176 -200 64 ) ( -184 -208 -64 ) ( -176 -200 -64 ) common/entity 0 0 0 1 1 0 0 0
( 96 -200 16 ) ( -32 -288 2 ) ( -32 -200 16 ) common/entity 0 0 0 1 1 0 0 0
( 96 -288 -2 ) ( -32 -200 -16 ) ( -32 -288 -2 ) common/entity 0 0 0 1 1 0 0 0
( -168 -200 -64 ) ( -176 -216 -64 ) ( -168 -200 64 ) common/caulk 0 0 0 1 1 0 0 0
-( 64 -268 -5 ) ( -64 -268 -3 ) ( -64 -268 -5 ) colors/grey25 0 0 0 1 1 0 0 0
+( -248 -280 -64 ) ( -240 -280 -64 ) ( -248 -280 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -232 -288 -64 ) ( -240 -280 -64 ) ( -232 -288 64 ) common/caulk 0 0 0 1 1 0 0 0
}
// brush 207
{
@@ -2274,16 +2273,16 @@
}
// brush 241
{
-( -32 -128 32 ) ( -80 -128 48 ) ( -80 128 48 ) common/entity_second 0 0 0 1 1 0 0 0
-( -32 136 -32 ) ( -80 136 48 ) ( -80 136 -48 ) common/caulk 0 0 0 1 1 0 0 0
-( -32 128 32 ) ( -32 128 -32 ) ( -32 -128 32 ) common/caulk 0 0 0 1 1 0 0 0
-( -32 -128 -32 ) ( -80 128 -48 ) ( -80 -128 -48 ) common/entity_second 0 0 0 1 1 0 0 0
-( -80 -136 -48 ) ( -80 -136 48 ) ( -32 -136 -32 ) common/caulk 0 0 0 1 1 0 0 0
-( -80 128 48 ) ( -80 -128 48 ) ( -112 128 48 ) common/entity_second 0 0 0 1 1 0 0 0
-( -80 136 -48 ) ( -160 136 -48 ) ( -160 -120 -48 ) common/entity_second 0 0 0 1 1 0 0 0
-( -192 -128 16 ) ( -192 128 -32 ) ( -192 128 16 ) common/caulk 0 0 0 1 1 0 0 0
-( -128 128 48 ) ( -192 -128 16 ) ( -192 128 16 ) common/entity_second 0 0 0 1 1 0 0 0
-( -128 64 -48 ) ( -192 64 -16 ) ( -128 -64 -48 ) common/entity_second 0 0 0 1 1 0 0 0
+( -32 -128 32 ) ( -80 -128 48 ) ( -80 128 48 ) common/entity_second 0 0 0 1.5 1 0 0 0
+( -32 136 -32 ) ( -80 136 48 ) ( -80 136 -48 ) common/caulk 0 0 0 1.5 1 0 0 0
+( -32 128 32 ) ( -32 128 -32 ) ( -32 -128 32 ) common/caulk 0 0 0 1.5 1 0 0 0
+( -32 -128 -32 ) ( -80 128 -48 ) ( -80 -128 -48 ) common/entity_second 0 0 0 1.5 1 0 0 0
+( -80 -136 -48 ) ( -80 -136 48 ) ( -32 -136 -32 ) common/caulk 0 0 0 1.5 1 0 0 0
+( -80 128 48 ) ( -80 -128 48 ) ( -112 128 48 ) common/entity_second 0 0 0 1.5 1 0 0 0
+( -80 136 -48 ) ( -160 136 -48 ) ( -160 -120 -48 ) common/entity_second 0 0 0 1.5 1 0 0 0
+( -192 -128 16 ) ( -192 128 -32 ) ( -192 128 16 ) common/caulk 0 0 0 1.5 1 0 0 0
+( -128 128 48 ) ( -192 -128 16 ) ( -192 128 16 ) common/entity_second 0 0 0 1.5 1 0 0 0
+( -128 64 -48 ) ( -192 64 -16 ) ( -128 -64 -48 ) common/entity_second 0 0 0 1.5 1 0 0 0
}
// brush 242
{
@@ -2841,6 +2840,148 @@ colors/grey25
)
}
}
+// brush 282
+{
+( -248 -256 16 ) ( -248 -264 -16 ) ( -248 -256 -16 ) common/entity 0 0 0 1 1 0 0 0
+( -176 -200 64 ) ( -184 -208 -64 ) ( -176 -200 -64 ) common/entity 0 0 0 1 1 0 0 0
+( 96 -200 16 ) ( -32 -288 2 ) ( -32 -200 16 ) common/entity 0 0 0 1 1 0 0 0
+( 96 -288 -2 ) ( -32 -200 -16 ) ( -32 -288 -2 ) common/entity 0 0 0 1 1 0 0 0
+( -168 -200 -64 ) ( -176 -216 -64 ) ( -168 -200 64 ) common/caulk 0 0 0 1 1 0 0 0
+( 64 -268 -5 ) ( -64 -268 -3 ) ( -64 -268 -5 ) colors/grey25 0 0 0 1 1 0 0 0
+( -248 -280 64 ) ( -240 -280 -64 ) ( -248 -280 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 283
+{
+( -152 -288 4 ) ( -152 -288 -4 ) ( -248 -288 4 ) colors/purple_bright 0 0 0 1 1 0 0 0
+( -248 -256 16 ) ( -248 -264 -16 ) ( -248 -256 -16 ) colors/purple_bright 0 0 0 1 1 0 0 0
+( 96 -200 16 ) ( -32 -288 2 ) ( -32 -200 16 ) colors/purple_bright 0 0 0 1 1 0 0 0
+( 96 -288 -2 ) ( -32 -200 -16 ) ( -32 -288 -2 ) colors/purple_bright 0 0 0 1 1 0 0 0
+( -248 -280 -64 ) ( -240 -280 -64 ) ( -248 -280 64 ) common/caulk 0 0 0 1 1 0 0 0
+( -232 -288 64 ) ( -240 -280 -64 ) ( -232 -288 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 284
+{
+( -248 288 4 ) ( -152 288 -4 ) ( -152 288 4 ) colors/purple_bright 0 0 0 1 1 0 0 0
+( -248 256 -16 ) ( -248 264 -16 ) ( -248 256 16 ) colors/purple_bright 0 0 0 1 1 0 0 0
+( -32 200 16 ) ( -32 288 2 ) ( 96 200 16 ) colors/purple_bright 0 0 0 1 1 0 0 0
+( -32 288 -2 ) ( -32 200 -16 ) ( 96 288 -2 ) colors/purple_bright 0 0 0 1 1 0 0 0
+( -246 280 64 ) ( -242 280 -64 ) ( -246 280 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -240 280 64 ) ( -238 282 -64 ) ( -240 280 -64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 285
+{
+( -248 288 4 ) ( -152 288 -4 ) ( -152 288 4 ) common/entity 0 0 0 1 1 0 0 0
+( -32 200 16 ) ( -32 288 2 ) ( 96 200 16 ) common/entity 0 0 0 1 1 0 0 0
+( -32 288 -2 ) ( -32 200 -16 ) ( 96 288 -2 ) common/entity 0 0 0 1 1 0 0 0
+( -168 200 64 ) ( -176 216 -64 ) ( -168 200 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -246 280 64 ) ( -242 280 -64 ) ( -246 280 -64 ) common/caulk 0 0 0 1 1 0 0 0
+( -240 280 -64 ) ( -238 282 -64 ) ( -240 280 64 ) common/caulk 0 0 0 1 1 0 0 0
+}
+// brush 286
+{
+patchDef2
+{
+common/entity_second
+( 17 3 0 0 0 )
+(
+( ( -224 96 -16 0 -2 ) ( -224 0 -16 0 -1 ) ( -224 -96 -16 0 0 ) )
+( ( -208 112 -16 0.017578125 -2 ) ( -208 0 -16 0.017578125 -1 ) ( -208 -112 -16 0.017578125 0 ) )
+( ( -192 128 -16 0.03515625 -2 ) ( -192 0 -16 0.03515625 -1 ) ( -192 -128 -16 0.03515625 0 ) )
+( ( -160 132 -32 0.052734375 -2 ) ( -160 0 -32 0.052734375 -1 ) ( -160 -132 -32 0.052734375 0 ) )
+( ( -128 136 -48 0.0703125 -2 ) ( -128 0 -48 0.0703125 -1 ) ( -128 -136 -48 0.0703125 0 ) )
+( ( -104 136 -48 0.10546875 -2 ) ( -104 0 -48 0.10546875 -1 ) ( -104 -136 -48 0.10546875 0 ) )
+( ( -80 136 -48 0.140625 -2 ) ( -80 0 -48 0.140625 -1 ) ( -80 -136 -48 0.140625 0 ) )
+( ( -56 132 -40 0.2109375 -2 ) ( -56 0 -40 0.2109375 -1 ) ( -56 -132 -40 0.2109375 0 ) )
+( ( -32 128 -32 0.28125 -2 ) ( -32 0 -32 0.28125 -1 ) ( -32 -128 -32 0.28125 0 ) )
+( ( -8 128 -32 0.421875 -2 ) ( -8 0 -32 0.421875 -1 ) ( -8 -128 -32 0.421875 0 ) )
+( ( 16 128 -32 0.5625 -2 ) ( 16 0 -32 0.5625 -1 ) ( 16 -128 -32 0.5625 0 ) )
+( ( 48 96 -32 0.84375 -2 ) ( 48 0 -32 0.84375 -1 ) ( 48 -96 -32 0.84375 0 ) )
+( ( 80 64 -32 1.125 -2 ) ( 80 0 -32 1.125 -1 ) ( 80 -64 -32 1.125 0 ) )
+( ( 120 64 -32 1.6875 -2 ) ( 120 0 -32 1.6875 -1 ) ( 120 -64 -32 1.6875 0 ) )
+( ( 160 64 -32 2.25 -2 ) ( 160 0 -32 2.25 -1 ) ( 160 -64 -32 2.25 0 ) )
+( ( 208 40 -24 3.375 -2 ) ( 208 0 -24 3.375 -1 ) ( 208 -40 -24 3.375 0 ) )
+( ( 256 16 -16 4.5 -2 ) ( 256 0 -16 4.5 -1 ) ( 256 -16 -16 4.5 0 ) )
+)
+}
+}
+// brush 287
+{
+patchDef2
+{
+common/entity_second
+( 7 7 0 0 0 )
+(
+( ( 16 128 32 0 -1 ) ( 8 128 24 0 -0.75 ) ( 0 128 16 0 -0.5 ) ( 0 128 0 0 -0.375 ) ( 0 128 -16 0 -0.25 ) ( 8 128 -24 0 -0.125 ) ( 16 128 -32 0 0 ) )
+( ( 48 96 32 0.5625 -1 ) ( 40 96 24 0.5625 -0.75 ) ( 32 96 16 0.5625 -0.5 ) ( 32 96 0 0.5625 -0.375 ) ( 32 96 -16 0.5625 -0.25 ) ( 40 96 -24 0.5625 -0.125 ) ( 48 96 -32 0.5625 0 ) )
+( ( 80 64 32 1.125 -1 ) ( 72 64 24 1.125 -0.75 ) ( 64 64 16 1.125 -0.5 ) ( 64 64 0 1.125 -0.375 ) ( 64 64 -16 1.125 -0.25 ) ( 72 64 -24 1.125 -0.125 ) ( 80 64 -32 1.125 0 ) )
+( ( 120 64 32 1.6875 -1 ) ( 120 64 24 1.6875 -0.75 ) ( 120 64 16 1.6875 -0.5 ) ( 120 64 0 1.6875 -0.375 ) ( 120 64 -16 1.6875 -0.25 ) ( 120 64 -24 1.6875 -0.125 ) ( 120 64 -32 1.6875 0 ) )
+( ( 160 64 32 2.25 -1 ) ( 160 64 24 2.25 -0.75 ) ( 160 64 16 2.25 -0.5 ) ( 160 64 0 2.25 -0.375 ) ( 160 64 -16 2.25 -0.25 ) ( 160 64 -24 2.25 -0.125 ) ( 160 64 -32 2.25 0 ) )
+( ( 208 40 24 3.375 -1 ) ( 208 40 18 3.375 -0.75 ) ( 208 40 12 3.375 -0.5 ) ( 208 40 0 3.375 -0.375 ) ( 208 40 -12 3.375 -0.25 ) ( 208 40 -18 3.375 -0.125 ) ( 208 40 -24 3.375 0 ) )
+( ( 256 16 16 4.5 -1 ) ( 256 16 12 4.5 -0.75 ) ( 256 16 8 4.5 -0.5 ) ( 256 16 0 4.5 -0.375 ) ( 256 16 -8 4.5 -0.25 ) ( 256 16 -12 4.5 -0.125 ) ( 256 16 -16 4.5 0 ) )
+)
+}
+}
+// brush 288
+{
+patchDef2
+{
+common/entity_second
+( 7 7 0 0 0 )
+(
+( ( 16 -128 -32 0 0 ) ( 8 -128 -24 0 -0.125 ) ( 0 -128 -16 0 -0.25 ) ( 0 -128 0 0 -0.375 ) ( 0 -128 16 0 -0.5 ) ( 8 -128 24 0 -0.75 ) ( 16 -128 32 0 -1 ) )
+( ( 48 -96 -32 0.5625 0 ) ( 40 -96 -24 0.5625 -0.125 ) ( 32 -96 -16 0.5625 -0.25 ) ( 32 -96 0 0.5625 -0.375 ) ( 32 -96 16 0.5625 -0.5 ) ( 40 -96 24 0.5625 -0.75 ) ( 48 -96 32 0.5625 -1 ) )
+( ( 80 -64 -32 1.125 0 ) ( 72 -64 -24 1.125 -0.125 ) ( 64 -64 -16 1.125 -0.25 ) ( 64 -64 0 1.125 -0.375 ) ( 64 -64 16 1.125 -0.5 ) ( 72 -64 24 1.125 -0.75 ) ( 80 -64 32 1.125 -1 ) )
+( ( 120 -64 -32 1.6875 0 ) ( 120 -64 -24 1.6875 -0.125 ) ( 120 -64 -16 1.6875 -0.25 ) ( 120 -64 0 1.6875 -0.375 ) ( 120 -64 16 1.6875 -0.5 ) ( 120 -64 24 1.6875 -0.75 ) ( 120 -64 32 1.6875 -1 ) )
+( ( 160 -64 -32 2.25 0 ) ( 160 -64 -24 2.25 -0.125 ) ( 160 -64 -16 2.25 -0.25 ) ( 160 -64 0 2.25 -0.375 ) ( 160 -64 16 2.25 -0.5 ) ( 160 -64 24 2.25 -0.75 ) ( 160 -64 32 2.25 -1 ) )
+( ( 208 -40 -24 3.375 0 ) ( 208 -40 -18 3.375 -0.125 ) ( 208 -40 -12 3.375 -0.25 ) ( 208 -40 0 3.375 -0.375 ) ( 208 -40 12 3.375 -0.5 ) ( 208 -40 18 3.375 -0.75 ) ( 208 -40 24 3.375 -1 ) )
+( ( 256 -16 -16 4.5 0 ) ( 256 -16 -12 4.5 -0.125 ) ( 256 -16 -8 4.5 -0.25 ) ( 256 -16 0 4.5 -0.375 ) ( 256 -16 8 4.5 -0.5 ) ( 256 -16 12 4.5 -0.75 ) ( 256 -16 16 4.5 -1 ) )
+)
+}
+}
+// brush 289
+{
+patchDef2
+{
+common/entity_second
+( 17 3 0 0 0 )
+(
+( ( -224 -96 16 0 0 ) ( -224 0 16 0 -1 ) ( -224 96 16 0 -2 ) )
+( ( -208 -112 16 0.017578125 0 ) ( -208 0 16 0.017578125 -1 ) ( -208 112 16 0.017578125 -2 ) )
+( ( -192 -128 16 0.03515625 0 ) ( -192 0 16 0.03515625 -1 ) ( -192 128 16 0.03515625 -2 ) )
+( ( -160 -132 32 0.052734375 0 ) ( -160 0 32 0.052734375 -1 ) ( -160 132 32 0.052734375 -2 ) )
+( ( -128 -136 48 0.0703125 0 ) ( -128 0 48 0.0703125 -1 ) ( -128 136 48 0.0703125 -2 ) )
+( ( -104 -136 48 0.10546875 0 ) ( -104 0 48 0.10546875 -1 ) ( -104 136 48 0.10546875 -2 ) )
+( ( -80 -136 48 0.140625 0 ) ( -80 0 48 0.140625 -1 ) ( -80 136 48 0.140625 -2 ) )
+( ( -56 -132 40 0.2109375 0 ) ( -56 0 40 0.2109375 -1 ) ( -56 132 40 0.2109375 -2 ) )
+( ( -32 -128 32 0.28125 0 ) ( -32 0 32 0.28125 -1 ) ( -32 128 32 0.28125 -2 ) )
+( ( -8 -128 32 0.421875 0 ) ( -8 0 32 0.421875 -1 ) ( -8 128 32 0.421875 -2 ) )
+( ( 16 -128 32 0.5625 0 ) ( 16 0 32 0.5625 -1 ) ( 16 128 32 0.5625 -2 ) )
+( ( 48 -96 32 0.84375 0 ) ( 48 0 32 0.84375 -1 ) ( 48 96 32 0.84375 -2 ) )
+( ( 80 -64 32 1.125 0 ) ( 80 0 32 1.125 -1 ) ( 80 64 32 1.125 -2 ) )
+( ( 120 -64 32 1.6875 0 ) ( 120 0 32 1.6875 -1 ) ( 120 64 32 1.6875 -2 ) )
+( ( 160 -64 32 2.25 0 ) ( 160 0 32 2.25 -1 ) ( 160 64 32 2.25 -2 ) )
+( ( 208 -40 24 3.375 0 ) ( 208 0 24 3.375 -1 ) ( 208 40 24 3.375 -2 ) )
+( ( 256 -16 16 4.5 0 ) ( 256 0 16 4.5 -1 ) ( 256 16 16 4.5 -2 ) )
+)
+}
+}
+// brush 290
+{
+patchDef2
+{
+common/entity_second
+( 7 3 0 0 0 )
+(
+( ( -192 -128 16 0 -0.5 ) ( -192 -128 0 0 -0.25 ) ( -192 -128 -16 0 0 ) )
+( ( -208 -112 16 0.5 -0.5 ) ( -208 -112 0 0.5 -0.25 ) ( -208 -112 -16 0.5 0 ) )
+( ( -224 -96 16 1 -0.5 ) ( -224 -96 0 1 -0.25 ) ( -224 -96 -16 1 0 ) )
+( ( -224 0 16 1.5 -0.5 ) ( -224 0 0 1.5 -0.25 ) ( -224 0 -16 1.5 0 ) )
+( ( -224 96 16 2 -0.5 ) ( -224 96 0 2 -0.25 ) ( -224 96 -16 2 0 ) )
+( ( -208 112 16 3 -0.5 ) ( -208 112 0 3 -0.25 ) ( -208 112 -16 3 0 ) )
+( ( -192 128 16 4 -0.5 ) ( -192 128 0 4 -0.25 ) ( -192 128 -16 4 0 ) )
+)
+}
+}
}
// entity 1
{
@@ -2855,22 +2996,16 @@ colors/grey25
// entity 2
{
"classname" "light"
-"origin" "-240.000000 288.000000 0.000000"
-"light" "10"
-"spawnflags" "1"
-"_color" "1.0 0.0 0.0"
-"time" "0.2"
-"offset" "0"
+"origin" "-242.000000 284.000000 0.000000"
+"light" "20"
+"_color" "0.5 0.0 0.5"
}
// entity 3
{
"classname" "light"
-"origin" "-240.000000 -288.000000 0.000000"
-"light" "10"
-"spawnflags" "1"
-"_color" "0.0 1.0 0.0"
-"time" "0.2"
-"offset" "0.5"
+"origin" "-242.000000 -284.000000 0.000000"
+"light" "20"
+"_color" "0.5 0.0 0.5"
}
// entity 4
{
@@ -3180,3 +3315,23 @@ colors/grey25
"script" "dust_trail"
"angle" "180.000000"
}
+// entity 42
+{
+"classname" "light"
+"origin" "-242.000000 284.000000 0.000000"
+"light" "30"
+"spawnflags" "1"
+"_color" "0.5 0.0 0.5"
+"time" "0.2"
+"offset" "0"
+}
+// entity 43
+{
+"classname" "light"
+"origin" "-242.000000 -284.000000 0.000000"
+"light" "30"
+"spawnflags" "1"
+"_color" "0.5 0.0 0.5"
+"time" "0.2"
+"offset" "0.5"
+}
diff --git a/base/materials/colors.shader b/base/materials/colors.shader
index 58b1924..910d4a9 100644
--- a/base/materials/colors.shader
+++ b/base/materials/colors.shader
@@ -89,6 +89,19 @@ textures/colors/blue_bright
bright
}
+textures/colors/purple
+{
+ qer_editorimage textures/colors/purple
+ color 0.50 0.00 0.50
+}
+
+textures/colors/purple_bright
+{
+ qer_editorimage textures/colors/purple
+ color 0.50 0.00 0.50
+ bright
+}
+
textures/colors/grey25
{
qer_editorimage textures/colors/grey25
diff --git a/base/materials/glass.shader b/base/materials/glass.shader
index 9e3d984..dd2cb7b 100644
--- a/base/materials/glass.shader
+++ b/base/materials/glass.shader
@@ -40,6 +40,13 @@ textures/glass/brown
environment
}
+textures/glass/purple
+{
+ qer_editorimage textures/glass/purple
+ color 0.5 0.00 0.50
+ environment
+}
+
textures/glass/dark
{
qer_editorimage textures/glass/dark
diff --git a/base/textures/colors/purple.tga b/base/textures/colors/purple.tga
new file mode 100644
index 0000000..94af8e9
--- /dev/null
+++ b/base/textures/colors/purple.tga
Binary files differ
diff --git a/base/textures/glass/purple.tga b/base/textures/glass/purple.tga
new file mode 100644
index 0000000..edea72e
--- /dev/null
+++ b/base/textures/glass/purple.tga
Binary files differ