From 171b749a27a4c4e1540b8dd59e5b1e48a07ad7d2 Mon Sep 17 00:00:00 2001
From: Evan Goers <mega@osirion.org>
Date: Wed, 17 Apr 2013 19:59:18 +0000
Subject: Updated lasers.
---
base/materials/detail.shader | 8 +++++
base/models/weapons/laser/laser1.map | 15 +++++++-
base/models/weapons/laser/laser2.map | 67 +++++++++++++++++++++---------------
3 files changed, 62 insertions(+), 28 deletions(-)
diff --git a/base/materials/detail.shader b/base/materials/detail.shader
index 8154b82..10241dc 100644
--- a/base/materials/detail.shader
+++ b/base/materials/detail.shader
@@ -22,6 +22,14 @@ textures/detail/warn_16_entitysecond
entitySecond
}
+textures/detail/warn_16_decal
+{
+ qer_editorimage textures/detail/warn_16
+ texture textures/detail/warn_16_trans
+ color 1.00 1.00 1.00
+ decal
+}
+
textures/detail/warn_16_decal_entity
{
qer_editorimage textures/detail/warn_16
diff --git a/base/models/weapons/laser/laser1.map b/base/models/weapons/laser/laser1.map
index dcf35f7..8aba0dd 100644
--- a/base/models/weapons/laser/laser1.map
+++ b/base/models/weapons/laser/laser1.map
@@ -97,7 +97,7 @@ colors/grey25
{
patchDef2
{
-detail/warn_16_decal_entity
+detail/warn_16_decal
( 9 3 0 0 0 )
(
( ( 40 8 24 0 0 ) ( 44 8 24 0 -0.5 ) ( 48 8 24 0 -1 ) )
@@ -291,4 +291,17 @@ colors/grey25
( -64 76 -6 ) ( -64 75 -7 ) ( 64 76 -6 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( -64 58 -12 ) ( -64 57 -11 ) ( 64 58 -12 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
+// brush 17
+{
+patchDef2
+{
+detail/warn_square_decal
+( 3 3 0 0 0 )
+(
+( ( 88 40 -16 0 0 ) ( 88 40 0 0 0.5 ) ( 88 40 16 0 1 ) )
+( ( 104 40 -16 0.5 0 ) ( 104 40 0 0.5 0.5 ) ( 104 40 16 0.5 1 ) )
+( ( 120 40 -16 1 0 ) ( 120 40 0 1 0.5 ) ( 120 40 16 1 1 ) )
+)
+}
+}
}
diff --git a/base/models/weapons/laser/laser2.map b/base/models/weapons/laser/laser2.map
index b5a867f..0dce1d7 100644
--- a/base/models/weapons/laser/laser2.map
+++ b/base/models/weapons/laser/laser2.map
@@ -97,7 +97,7 @@ colors/grey25
{
patchDef2
{
-detail/warn_16_decal_entity
+detail/warn_16_decal
( 9 3 0 0 0 )
(
( ( 40 8 24 0 0 ) ( 44 8 24 0 -0.5 ) ( 48 8 24 0 -1 ) )
@@ -116,7 +116,7 @@ detail/warn_16_decal_entity
{
patchDef2
{
-colors/blue
+colors/red
( 9 3 0 0 0 )
(
( ( 12 8 24 0 0 ) ( 32 8 24 0 -0.75 ) ( 52 8 24 0 -1.5 ) )
@@ -295,7 +295,7 @@ colors/grey25
{
patchDef2
{
-colors/blue
+colors/red
( 9 3 0 0 0 )
(
( ( 108 52 24 0 0 ) ( 108 52 24 0 -0.75 ) ( 108 52 28 0 -1.5 ) )
@@ -314,7 +314,7 @@ colors/blue
{
patchDef2
{
-colors/blue
+colors/red
( 9 3 0 0 0 )
(
( ( 108 52 28 0 0 ) ( 108 52 32 0 -0.125 ) ( 116 52 32 0 -0.4045085013 ) )
@@ -333,7 +333,7 @@ colors/blue
{
patchDef2
{
-colors/blue
+colors/red
( 9 3 0 0 0 )
(
( ( 92 60 28 0 0 ) ( 92 60 32 0 -0.125 ) ( 100 60 32 0 -0.4045085013 ) )
@@ -352,7 +352,7 @@ colors/blue
{
patchDef2
{
-colors/blue
+colors/red
( 9 3 0 0 0 )
(
( ( 92 60 24 0 0 ) ( 92 60 24 0 -0.75 ) ( 92 60 28 0 -1.5 ) )
@@ -369,35 +369,35 @@ colors/blue
}
// brush 21
{
-( 100 92 24 ) ( 92 92 24 ) ( 100 92 -24 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( 100 92 24 ) ( 100 92 -24 ) ( 100 76 24 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( 92 76 -24 ) ( 92 92 -24 ) ( 92 76 24 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -88 76 20 ) ( -88 80 20 ) ( 40 76 20 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -88 80 20 ) ( -88 84 16 ) ( 40 80 20 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -88 92 -16 ) ( -88 88 -20 ) ( 40 92 -16 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -88 88 -20 ) ( -88 80 -20 ) ( 40 88 -20 ) colors/blue 0 0 0 0.5 0.5 0 0 0
+( 100 92 24 ) ( 92 92 24 ) ( 100 92 -24 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( 100 92 24 ) ( 100 92 -24 ) ( 100 76 24 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( 92 76 -24 ) ( 92 92 -24 ) ( 92 76 24 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -88 76 20 ) ( -88 80 20 ) ( 40 76 20 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -88 80 20 ) ( -88 84 16 ) ( 40 80 20 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -88 92 -16 ) ( -88 88 -20 ) ( 40 92 -16 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -88 88 -20 ) ( -88 80 -20 ) ( 40 88 -20 ) colors/red 0 0 0 0.5 0.5 0 0 0
( -88 84 -20 ) ( -88 76 20 ) ( 40 84 -20 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
// brush 22
{
-( 124 92 24 ) ( 116 92 24 ) ( 124 92 -24 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( 124 92 24 ) ( 124 92 -24 ) ( 124 76 24 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( 116 76 -24 ) ( 116 92 -24 ) ( 116 76 24 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -64 76 20 ) ( -64 80 20 ) ( 64 76 20 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -64 80 20 ) ( -64 84 16 ) ( 64 80 20 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -64 92 -16 ) ( -64 88 -20 ) ( 64 92 -16 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -64 88 -20 ) ( -64 80 -20 ) ( 64 88 -20 ) colors/blue 0 0 0 0.5 0.5 0 0 0
+( 124 92 24 ) ( 116 92 24 ) ( 124 92 -24 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( 124 92 24 ) ( 124 92 -24 ) ( 124 76 24 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( 116 76 -24 ) ( 116 92 -24 ) ( 116 76 24 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -64 76 20 ) ( -64 80 20 ) ( 64 76 20 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -64 80 20 ) ( -64 84 16 ) ( 64 80 20 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -64 92 -16 ) ( -64 88 -20 ) ( 64 92 -16 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -64 88 -20 ) ( -64 80 -20 ) ( 64 88 -20 ) colors/red 0 0 0 0.5 0.5 0 0 0
( -64 84 -20 ) ( -64 76 20 ) ( 64 84 -20 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
// brush 23
{
-( 112 92 24 ) ( 104 92 24 ) ( 112 92 -24 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( 112 92 24 ) ( 112 92 -24 ) ( 112 76 24 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( 104 76 -24 ) ( 104 92 -24 ) ( 104 76 24 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -76 76 20 ) ( -76 80 20 ) ( 52 76 20 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -76 80 20 ) ( -76 84 16 ) ( 52 80 20 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -76 92 -16 ) ( -76 88 -20 ) ( 52 92 -16 ) colors/blue 0 0 0 0.5 0.5 0 0 0
-( -76 88 -20 ) ( -76 80 -20 ) ( 52 88 -20 ) colors/blue 0 0 0 0.5 0.5 0 0 0
+( 112 92 24 ) ( 104 92 24 ) ( 112 92 -24 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( 112 92 24 ) ( 112 92 -24 ) ( 112 76 24 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( 104 76 -24 ) ( 104 92 -24 ) ( 104 76 24 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -76 76 20 ) ( -76 80 20 ) ( 52 76 20 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -76 80 20 ) ( -76 84 16 ) ( 52 80 20 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -76 92 -16 ) ( -76 88 -20 ) ( 52 92 -16 ) colors/red 0 0 0 0.5 0.5 0 0 0
+( -76 88 -20 ) ( -76 80 -20 ) ( 52 88 -20 ) colors/red 0 0 0 0.5 0.5 0 0 0
( -76 84 -20 ) ( -76 76 20 ) ( 52 84 -20 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
// brush 24
@@ -409,4 +409,17 @@ colors/blue
( -64 68 12 ) ( -64 72 12 ) ( 64 68 12 ) colors/grey25 0 0 0 0.5 0.5 0 0 0
( -64 76 4 ) ( -64 72 4 ) ( 64 76 4 ) colors/grey25 0 0 0 0.5 0.5 0 0 0
}
+// brush 25
+{
+patchDef2
+{
+detail/warn_square_decal
+( 3 3 0 0 0 )
+(
+( ( 88 40 -16 0 0 ) ( 88 40 0 0 0.5 ) ( 88 40 16 0 1 ) )
+( ( 104 40 -16 0.5 0 ) ( 104 40 0 0.5 0.5 ) ( 104 40 16 0.5 1 ) )
+( ( 120 40 -16 1 0 ) ( 120 40 0 1 0.5 ) ( 120 40 16 1 1 ) )
+)
+}
+}
}
--
cgit v1.2.3