diff options
| -rw-r--r-- | base/maps/independent/jupiter.map | 56 | ||||
| -rw-r--r-- | base/maps/independent/sections/avenger_cockpit.map | 123 | ||||
| -rw-r--r-- | base/materials/glass.shader | 4 |
3 files changed, 180 insertions, 3 deletions
diff --git a/base/maps/independent/jupiter.map b/base/maps/independent/jupiter.map index 3cf4d71..9fea5aa 100644 --- a/base/maps/independent/jupiter.map +++ b/base/maps/independent/jupiter.map @@ -980,6 +980,60 @@ colors/chrome ( -52 88 -64 ) ( -52 84 -64 ) ( -52 88 64 ) colors/grey25 0 0 0 1 1 0 0 0 ( -64 82 -64 ) ( -64 86 -64 ) ( -64 82 64 ) colors/grey25 0 0 0 1 1 0 0 0 } +// brush 99 +{ +( -160 -44 -10 ) ( -160 -44 10 ) ( -192 -44 -10 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 -44 -10 ) ( -192 -44 -10 ) ( -160 -92 -10 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 -44 -10 ) ( -160 -92 -10 ) ( -160 -44 10 ) common/caulk 0 0 0 1 1 0 0 0 +( -192 -92 10 ) ( -160 -92 10 ) ( -192 -92 -10 ) colors/grey50 0 0 0 1 1 0 0 0 +( -192 -92 10 ) ( -192 -44 10 ) ( -160 -92 10 ) colors/grey50 0 0 0 1 1 0 0 0 +( -168 -74 -64 ) ( -168 -66 -64 ) ( -168 -74 64 ) common/caulk 0 0 0 1 1 0 0 0 +} +// brush 100 +{ +( -160 -58 24 ) ( -160 -78 24 ) ( -192 -58 24 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 -58 24 ) ( -192 -58 24 ) ( -160 -58 -24 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 -58 24 ) ( -160 -58 -24 ) ( -160 -78 24 ) common/caulk 0 0 0 1 1 0 0 0 +( -192 -78 -24 ) ( -160 -78 -24 ) ( -192 -58 -24 ) colors/grey50 0 0 0 1 1 0 0 0 +( -192 -78 -24 ) ( -192 -78 24 ) ( -160 -78 -24 ) colors/grey50 0 0 0 1 1 0 0 0 +( -168 -74 -64 ) ( -168 -66 -64 ) ( -168 -74 64 ) common/caulk 0 0 0 1 1 0 0 0 +} +// brush 101 +{ +( -160 10 44 ) ( -160 -10 44 ) ( -192 10 44 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 10 44 ) ( -192 10 44 ) ( -160 10 -4 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 10 44 ) ( -160 10 -4 ) ( -160 -10 44 ) common/caulk 0 0 0 1 1 0 0 0 +( -192 -10 -4 ) ( -160 -10 -4 ) ( -192 10 -4 ) colors/grey50 0 0 0 1 1 0 0 0 +( -192 -10 -4 ) ( -192 -10 44 ) ( -160 -10 -4 ) colors/grey50 0 0 0 1 1 0 0 0 +( -192 -10 -4 ) ( -192 10 -4 ) ( -192 -10 44 ) common/caulk 0 0 0 1 1 0 0 0 +} +// brush 102 +{ +( -160 24 10 ) ( -160 24 30 ) ( -192 24 10 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 24 10 ) ( -192 24 10 ) ( -160 -24 10 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 24 10 ) ( -160 -24 10 ) ( -160 24 30 ) common/caulk 0 0 0 1 1 0 0 0 +( -192 -24 30 ) ( -160 -24 30 ) ( -192 -24 10 ) colors/grey50 0 0 0 1 1 0 0 0 +( -192 -24 30 ) ( -192 24 30 ) ( -160 -24 30 ) colors/grey50 0 0 0 1 1 0 0 0 +( -192 -24 30 ) ( -192 -24 10 ) ( -192 24 30 ) common/caulk 0 0 0 1 1 0 0 0 +} +// brush 103 +{ +( -160 78 24 ) ( -160 58 24 ) ( -192 78 24 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 78 24 ) ( -192 78 24 ) ( -160 78 -24 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 78 24 ) ( -160 78 -24 ) ( -160 58 24 ) common/caulk 0 0 0 1 1 0 0 0 +( -192 58 -24 ) ( -160 58 -24 ) ( -192 78 -24 ) colors/grey50 0 0 0 1 1 0 0 0 +( -192 58 -24 ) ( -192 58 24 ) ( -160 58 -24 ) colors/grey50 0 0 0 1 1 0 0 0 +( -168 62 -64 ) ( -168 70 -64 ) ( -168 62 64 ) common/caulk 0 0 0 1 1 0 0 0 +} +// brush 104 +{ +( -160 92 -10 ) ( -160 92 10 ) ( -192 92 -10 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 92 -10 ) ( -192 92 -10 ) ( -160 44 -10 ) colors/grey50 0 0 0 1 1 0 0 0 +( -160 92 -10 ) ( -160 44 -10 ) ( -160 92 10 ) common/caulk 0 0 0 1 1 0 0 0 +( -192 44 10 ) ( -160 44 10 ) ( -192 44 -10 ) colors/grey50 0 0 0 1 1 0 0 0 +( -192 44 10 ) ( -192 92 10 ) ( -160 44 10 ) colors/grey50 0 0 0 1 1 0 0 0 +( -168 62 -64 ) ( -168 70 -64 ) ( -168 62 64 ) common/caulk 0 0 0 1 1 0 0 0 +} } // entity 1 { @@ -1043,7 +1097,7 @@ colors/chrome // entity 9 { "classname" "misc_model" -"origin" "-168.000000 0.000000 20.000000" +"origin" "-192.000000 0.000000 20.000000" "model" "maps/independent/sections/avenger_engine" } // entity 10 diff --git a/base/maps/independent/sections/avenger_cockpit.map b/base/maps/independent/sections/avenger_cockpit.map index f5520c7..e63fc66 100644 --- a/base/maps/independent/sections/avenger_cockpit.map +++ b/base/maps/independent/sections/avenger_cockpit.map @@ -295,4 +295,127 @@ glass/plain ( -16 8 24 ) ( -16 16 16 ) ( 112 8 24 ) common/entity_second 0 0 0 1 1 0 0 0 ( -16 -24 8 ) ( -16 -16 16 ) ( 112 -24 8 ) common/entity_second 0 0 0 1 1 0 0 0 } +// brush 30 +{ +patchDef2 +{ +colors/grey50 +( 5 3 0 0 0 ) +( +( ( 49 -7.25 21.5 0 -0.18359375 ) ( 48 -7 21.5 0 -0.091796875 ) ( 47 -6.75 21.5 0 0 ) ) +( ( 49 -7.25 24.25 0.5625 -0.18359375 ) ( 48 -7 24.375 0.5625 -0.091796875 ) ( 47 -6.75 24.5 0.5625 0 ) ) +( ( 49 -0.0000004768 24.25 0.578125 -0.18359375 ) ( 48 0 24.375 0.578125 -0.091796875 ) ( 47 -0.0000004768 24.5 0.578125 0 ) ) +( ( 49 7.25 24.25 0.59375 -0.18359375 ) ( 48 7 24.375 0.59375 -0.091796875 ) ( 47 6.75 24.5 0.59375 0 ) ) +( ( 49 7.25 21.5 1.15625 -0.18359375 ) ( 48 7 21.5 1.15625 -0.091796875 ) ( 47 6.75 21.5 1.15625 0 ) ) +) +} +} +// brush 31 +{ +patchDef2 +{ +colors/grey50 +( 3 3 0 0 0 ) +( +( ( 49 -7.25 21.5 -0.265625 -0.1796875 ) ( 49 -7.25 24.25 -0.265625 -0.25 ) ( 49 -0.0000004768 24.25 -0.0000000075 -0.25 ) ) +( ( 49 0 21.5 0 -0.1796875 ) ( 49 -0.0000004768 24.25 -0.0000000075 -0.25 ) ( 49 -0.0000004768 24.25 -0.0000000075 -0.25 ) ) +( ( 49 7.25 21.5 0.265625 -0.1796875 ) ( 49 7.25 24.25 0.265625 -0.25 ) ( 49 -0.0000004768 24.25 -0.0000000075 -0.25 ) ) +) +} +} +// brush 32 +{ +patchDef2 +{ +colors/grey50 +( 3 3 0 0 0 ) +( +( ( 47 6.75 21.5 1.359375 -0.265625 ) ( 47 6.75 24.5 1.359375 -0.265625 ) ( 47 -0.0000004768 24.5 1.359375 0.0000000075 ) ) +( ( 47 0 21.5 1.359375 -0 ) ( 47 -0.0000004768 24.5 1.359375 0.0000000075 ) ( 47 -0.0000004768 24.5 1.359375 0.0000000075 ) ) +( ( 47 -6.75 21.5 1.359375 0.265625 ) ( 47 -6.75 24.5 1.359375 0.265625 ) ( 47 -0.0000004768 24.5 1.359375 0.0000000075 ) ) +) +} +} +// brush 33 +{ +patchDef2 +{ +colors/grey50 +( 3 3 0 0 0 ) +( +( ( 87 17 12 1.359375 -0.265625 ) ( 87 17 16.25 1.359375 -0.265625 ) ( 87 -0.0000004768 16.25 1.359375 0.0000000075 ) ) +( ( 87 0 12 1.359375 -0 ) ( 87 -0.0000004768 16.25 1.359375 0.0000000075 ) ( 87 -0.0000004768 16.25 1.359375 0.0000000075 ) ) +( ( 87 -17 12 1.359375 0.265625 ) ( 87 -17 16.25 1.359375 0.265625 ) ( 87 -0.0000004768 16.25 1.359375 0.0000000075 ) ) +) +} +} +// brush 34 +{ +patchDef2 +{ +colors/grey50 +( 3 3 0 0 0 ) +( +( ( 89 -17 11.5 -0.265625 -0.1796875 ) ( 89 -17 15.5 -0.265625 -0.25 ) ( 89 -0.0000004768 15.5 -0.0000000075 -0.25 ) ) +( ( 89 0 11.5 0 -0.1796875 ) ( 89 -0.0000004768 15.5 -0.0000000075 -0.25 ) ( 89 -0.0000004768 15.5 -0.0000000075 -0.25 ) ) +( ( 89 17 11.5 0.265625 -0.1796875 ) ( 89 17 15.5 0.265625 -0.25 ) ( 89 -0.0000004768 15.5 -0.0000000075 -0.25 ) ) +) +} +} +// brush 35 +{ +patchDef2 +{ +colors/grey50 +( 5 3 0 0 0 ) +( +( ( 89 -17 11.5 0 -0.18359375 ) ( 88 -17 11.75 0 -0.091796875 ) ( 87 -17 12 0 0 ) ) +( ( 89 -17 15.5 0.5625 -0.18359375 ) ( 88 -17 15.875 0.5625 -0.091796875 ) ( 87 -17 16.25 0.5625 0 ) ) +( ( 89 -0.0000004768 15.5 0.578125 -0.18359375 ) ( 88 -0.0000004768 15.875 0.578125 -0.091796875 ) ( 87 -0.0000004768 16.25 0.578125 0 ) ) +( ( 89 17 15.5 0.59375 -0.18359375 ) ( 88 17 15.875 0.59375 -0.091796875 ) ( 87 17 16.25 0.59375 0 ) ) +( ( 89 17 11.5 1.15625 -0.18359375 ) ( 88 17 11.75 1.15625 -0.091796875 ) ( 87 17 12 1.15625 0 ) ) +) +} +} +// brush 36 +{ +patchDef2 +{ +colors/grey50 +( 3 3 0 0 0 ) +( +( ( 55 8.75 20 1.359375 -0.265625 ) ( 55 8.75 23.5 1.359375 -0.265625 ) ( 55 -0.0000004768 23.5 1.359375 0.0000000075 ) ) +( ( 55 0 20 1.359375 -0 ) ( 55 -0.0000004768 23.5 1.359375 0.0000000075 ) ( 55 -0.0000004768 23.5 1.359375 0.0000000075 ) ) +( ( 55 -8.75 20 1.359375 0.265625 ) ( 55 -8.75 23.5 1.359375 0.265625 ) ( 55 -0.0000004768 23.5 1.359375 0.0000000075 ) ) +) +} +} +// brush 37 +{ +patchDef2 +{ +colors/grey50 +( 3 3 0 0 0 ) +( +( ( 57 -9.25 19.5 -0.265625 -0.1796875 ) ( 57 -9.25 23.25 -0.265625 -0.25 ) ( 57 -0.0000004768 23.25 -0.0000000075 -0.25 ) ) +( ( 57 0 19.5 0 -0.1796875 ) ( 57 -0.0000004768 23.25 -0.0000000075 -0.25 ) ( 57 -0.0000004768 23.25 -0.0000000075 -0.25 ) ) +( ( 57 9.25 19.5 0.265625 -0.1796875 ) ( 57 9.25 23.25 0.265625 -0.25 ) ( 57 -0.0000004768 23.25 -0.0000000075 -0.25 ) ) +) +} +} +// brush 38 +{ +patchDef2 +{ +colors/grey50 +( 5 3 0 0 0 ) +( +( ( 57 -9.25 19.5 0 -0.18359375 ) ( 56 -9 19.75 0 -0.091796875 ) ( 55 -8.75 20 0 0 ) ) +( ( 57 -9.25 23.25 0.5625 -0.18359375 ) ( 56 -9 23.375 0.5625 -0.091796875 ) ( 55 -8.75 23.5 0.5625 0 ) ) +( ( 57 -0.0000004768 23.25 0.578125 -0.18359375 ) ( 56 -0.0000004768 23.375 0.578125 -0.091796875 ) ( 55 -0.0000004768 23.5 0.578125 0 ) ) +( ( 57 9.25 23.25 0.59375 -0.18359375 ) ( 56 9 23.375 0.59375 -0.091796875 ) ( 55 8.75 23.5 0.59375 0 ) ) +( ( 57 9.25 19.5 1.15625 -0.18359375 ) ( 56 9 19.75 1.15625 -0.091796875 ) ( 55 8.75 20 1.15625 0 ) ) +) +} +} } diff --git a/base/materials/glass.shader b/base/materials/glass.shader index a6de032..86daedf 100644 --- a/base/materials/glass.shader +++ b/base/materials/glass.shader @@ -44,14 +44,14 @@ textures/glass/orange textures/glass/brown { qer_editorimage textures/glass/brown - color 0.5 0.25 0.00 + color 0.50 0.25 0 environment } textures/glass/purple { qer_editorimage textures/glass/purple - color 0.5 0.00 0.50 + color 1.00 0.00 1.00 environment } |