oilrig.map

diff --git a/maps/oilrig.map.options b/maps/oilrig.map.options
index 78eb33ab31d69726a5490e7d601f417bade0b7bc..eb537634545987add40fcbc74f1765760bf0f2e3 100644 (file)
--- a/maps/oilrig.map.options
+++ b/maps/oilrig.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 1
+Version: 2

diff --git a/maps/oilrig.mapinfo b/maps/oilrig.mapinfo
index c075d70d3fb2fbc3cbf60a2326904453e063df4b..b8953bb7c2b4a9b5e07229447162114ea03d3151 100644 (file)
--- a/maps/oilrig.mapinfo
+++ b/maps/oilrig.mapinfo
@@ -1,6 +1,6 @@
 title Oilrig
 description A very large open map designed after an offshore oil rig.
-author Tronyn, Debugger, Dustin Geeraert, Garth Hendy
+author Tronyn, Debugger, SavageX, Dustin Geeraert, Garth Hendy
 cdtrack 14
 has weapons all
 gametype dm // defaults: timelimit=20 pointlimit=30 leadlimit=0

diff --git a/scripts/map_oilrig.shader b/scripts/map_oilrig.shader
new file mode 100644 (file)
index 0000000..7ff78ca
--- /dev/null
+++ b/scripts/map_oilrig.shader
@@ -0,0 +1,119 @@
+textures/map_oilrig/base_thread1_dirt
+{
+       qer_editorimage textures/map_oilrig/base_thread1_dirt.tga
+       dpoffsetmapping - 4 match8 7
+       
+       q3map_bounceScale 1.25
+
+       {
+               map textures/map_oilrig/base_thread1_dirt.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+textures/map_oilrig/panels-pk02_panels01a_dark
+{
+       qer_editorimage textures/map_oilrig/pk02_panels01a_dark
+       dpoffsetmapping - 1.01492062877264589238 match8 217.50071000000000000000
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+       q3map_bouncescale 1.25
+
+       {
+               map textures/map_oilrig/pk02_panels01a_dark     
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+textures/map_oilrig/panels-pk02_panels01b_dark
+{
+       qer_editorimage textures/map_oilrig/pk02_panels01b_dark
+       dpoffsetmapping - 1.01822981089064517345 match8 226.33825900000000000000
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+       q3map_bouncescale 1.25
+
+       {
+               map textures/map_oilrig/pk02_panels01b_dark
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+textures/map_oilrig/panels-pk02_panels01c_dark
+{
+       qer_editorimage textures/map_oilrig/pk02_panels01c_dark
+       dpoffsetmapping - 1.05568319734946414670 match8 215.00833500000000000000
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+       q3map_bouncescale 1.25
+
+       {
+               map textures/map_oilrig/pk02_panels01c_dark
+       }
+
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+textures/map_oilrig/base-crete03_dirt
+{
+       qer_editorimage textures/map_oilrig/base_crete03_dirt.tga
+       
+       q3map_bounceScale  0.5
+       dpoffsetmapping - 2 match8 65
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
+       {
+               map textures/map_oilrig/base_crete03_dirt.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+textures/map_oilrig/wall-crete03_dirt
+{
+       qer_editorimage textures/map_oilrig/wall_crete03_dirt.tga
+       
+       q3map_bounceScale  0.5
+       dpoffsetmapping - 2 match8 233
+       dpglossintensitymod  1
+       dpglossexponentmod  1
+
+
+       {
+               map textures/map_oilrig/wall_crete03_dirt.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
\ No newline at end of file

diff --git a/scripts/oilrig.shader b/scripts/oilrig.shader
deleted file mode 100644 (file)
index 3f8d39b..0000000
--- a/scripts/oilrig.shader
+++ /dev/null
@@ -1,119 +0,0 @@
-textures/oilrig/base_thread1_dirt
-{
-       qer_editorimage textures/oilrig/base_thread1_dirt.tga
-       dpoffsetmapping - 4 match8 7
-       
-       q3map_bounceScale 1.25
-
-       {
-               map textures/oilrig/base_thread1_dirt.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-
-textures/oilrig/panels-pk02_panels01a_dark
-{
-       qer_editorimage textures/oilrig/pk02_panels01a_dark
-       dpoffsetmapping - 1.01492062877264589238 match8 217.50071000000000000000
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       q3map_bouncescale 1.25
-
-       {
-               map textures/oilrig/pk02_panels01a_dark 
-       }
-
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-
-textures/oilrig/panels-pk02_panels01b_dark
-{
-       qer_editorimage textures/oilrig/pk02_panels01b_dark
-       dpoffsetmapping - 1.01822981089064517345 match8 226.33825900000000000000
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       q3map_bouncescale 1.25
-
-       {
-               map textures/oilrig/pk02_panels01b_dark
-       }
-
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-
-textures/oilrig/panels-pk02_panels01c_dark
-{
-       qer_editorimage textures/oilrig/pk02_panels01c_dark
-       dpoffsetmapping - 1.05568319734946414670 match8 215.00833500000000000000
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-       q3map_bouncescale 1.25
-
-       {
-               map textures/oilrig/pk02_panels01c_dark
-       }
-
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-
-textures/oilrig/base-crete03_dirt
-{
-       qer_editorimage textures/oilrig/base_crete03_dirt.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 2 match8 65
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
-       {
-               map textures/oilrig/base_crete03_dirt.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-
-textures/oilrig/wall-crete03_dirt
-{
-       qer_editorimage textures/oilrig/wall_crete03_dirt.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 2 match8 233
-       dpglossintensitymod  1
-       dpglossexponentmod  1
-
-
-       {
-               map textures/oilrig/wall_crete03_dirt.tga
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
\ No newline at end of file

diff --git a/textures/map_oilrig/base_crete03_dirt.tga b/textures/map_oilrig/base_crete03_dirt.tga
new file mode 100644 (file)
index 0000000..9506def
Binary files /dev/null and b/textures/map_oilrig/base_crete03_dirt.tga differ

diff --git a/textures/map_oilrig/base_crete03_dirt_norm.tga b/textures/map_oilrig/base_crete03_dirt_norm.tga
new file mode 100644 (file)
index 0000000..9b8f93e
Binary files /dev/null and b/textures/map_oilrig/base_crete03_dirt_norm.tga differ

diff --git a/textures/map_oilrig/base_thread1_dirt.tga b/textures/map_oilrig/base_thread1_dirt.tga
new file mode 100644 (file)
index 0000000..1ef346a
Binary files /dev/null and b/textures/map_oilrig/base_thread1_dirt.tga differ

diff --git a/textures/map_oilrig/base_thread1_dirt_norm.tga b/textures/map_oilrig/base_thread1_dirt_norm.tga
new file mode 100644 (file)
index 0000000..edbd1bb
Binary files /dev/null and b/textures/map_oilrig/base_thread1_dirt_norm.tga differ

diff --git a/textures/map_oilrig/pk02_panels01a_dark.tga b/textures/map_oilrig/pk02_panels01a_dark.tga
new file mode 100644 (file)
index 0000000..b391753
Binary files /dev/null and b/textures/map_oilrig/pk02_panels01a_dark.tga differ

diff --git a/textures/map_oilrig/pk02_panels01a_dark_gloss.tga b/textures/map_oilrig/pk02_panels01a_dark_gloss.tga
new file mode 100644 (file)
index 0000000..57ad800
Binary files /dev/null and b/textures/map_oilrig/pk02_panels01a_dark_gloss.tga differ

diff --git a/textures/map_oilrig/pk02_panels01a_dark_norm.tga b/textures/map_oilrig/pk02_panels01a_dark_norm.tga
new file mode 100644 (file)
index 0000000..b72a0c8
Binary files /dev/null and b/textures/map_oilrig/pk02_panels01a_dark_norm.tga differ

diff --git a/textures/map_oilrig/pk02_panels01b_dark.tga b/textures/map_oilrig/pk02_panels01b_dark.tga
new file mode 100644 (file)
index 0000000..2ee4edb
Binary files /dev/null and b/textures/map_oilrig/pk02_panels01b_dark.tga differ

diff --git a/textures/map_oilrig/pk02_panels01b_dark_gloss.tga b/textures/map_oilrig/pk02_panels01b_dark_gloss.tga
new file mode 100644 (file)
index 0000000..d6a440e
Binary files /dev/null and b/textures/map_oilrig/pk02_panels01b_dark_gloss.tga differ

diff --git a/textures/map_oilrig/pk02_panels01b_dark_norm.tga b/textures/map_oilrig/pk02_panels01b_dark_norm.tga
new file mode 100644 (file)
index 0000000..5d0aaf8
Binary files /dev/null and b/textures/map_oilrig/pk02_panels01b_dark_norm.tga differ

diff --git a/textures/map_oilrig/pk02_panels01c_dark.tga b/textures/map_oilrig/pk02_panels01c_dark.tga
new file mode 100644 (file)
index 0000000..fb36518
Binary files /dev/null and b/textures/map_oilrig/pk02_panels01c_dark.tga differ

diff --git a/textures/map_oilrig/pk02_panels01c_dark_gloss.tga b/textures/map_oilrig/pk02_panels01c_dark_gloss.tga
new file mode 100644 (file)
index 0000000..f96a620
Binary files /dev/null and b/textures/map_oilrig/pk02_panels01c_dark_gloss.tga differ

diff --git a/textures/map_oilrig/pk02_panels01c_dark_norm.tga b/textures/map_oilrig/pk02_panels01c_dark_norm.tga
new file mode 100644 (file)
index 0000000..4a4e322
Binary files /dev/null and b/textures/map_oilrig/pk02_panels01c_dark_norm.tga differ

diff --git a/textures/map_oilrig/wall_crete03_dirt.tga b/textures/map_oilrig/wall_crete03_dirt.tga
new file mode 100644 (file)
index 0000000..79cfdd2
Binary files /dev/null and b/textures/map_oilrig/wall_crete03_dirt.tga differ

diff --git a/textures/map_oilrig/wall_crete03_dirt_norm.tga b/textures/map_oilrig/wall_crete03_dirt_norm.tga
new file mode 100644 (file)
index 0000000..1d4bb5f
Binary files /dev/null and b/textures/map_oilrig/wall_crete03_dirt_norm.tga differ

diff --git a/textures/oilrig/base_crete03_dirt.tga b/textures/oilrig/base_crete03_dirt.tga
deleted file mode 100644 (file)
index 9506def..0000000
Binary files a/textures/oilrig/base_crete03_dirt.tga and /dev/null differ

diff --git a/textures/oilrig/base_crete03_dirt_norm.tga b/textures/oilrig/base_crete03_dirt_norm.tga
deleted file mode 100644 (file)
index 9b8f93e..0000000
Binary files a/textures/oilrig/base_crete03_dirt_norm.tga and /dev/null differ

diff --git a/textures/oilrig/base_thread1_dirt.tga b/textures/oilrig/base_thread1_dirt.tga
deleted file mode 100644 (file)
index 1ef346a..0000000
Binary files a/textures/oilrig/base_thread1_dirt.tga and /dev/null differ

diff --git a/textures/oilrig/base_thread1_dirt_norm.tga b/textures/oilrig/base_thread1_dirt_norm.tga
deleted file mode 100644 (file)
index edbd1bb..0000000
Binary files a/textures/oilrig/base_thread1_dirt_norm.tga and /dev/null differ

diff --git a/textures/oilrig/pk02_panels01a_dark.tga b/textures/oilrig/pk02_panels01a_dark.tga
deleted file mode 100644 (file)
index b391753..0000000
Binary files a/textures/oilrig/pk02_panels01a_dark.tga and /dev/null differ

diff --git a/textures/oilrig/pk02_panels01a_dark_gloss.tga b/textures/oilrig/pk02_panels01a_dark_gloss.tga
deleted file mode 100644 (file)
index 57ad800..0000000
Binary files a/textures/oilrig/pk02_panels01a_dark_gloss.tga and /dev/null differ

diff --git a/textures/oilrig/pk02_panels01a_dark_norm.tga b/textures/oilrig/pk02_panels01a_dark_norm.tga
deleted file mode 100644 (file)
index b72a0c8..0000000
Binary files a/textures/oilrig/pk02_panels01a_dark_norm.tga and /dev/null differ

diff --git a/textures/oilrig/pk02_panels01b_dark.tga b/textures/oilrig/pk02_panels01b_dark.tga
deleted file mode 100644 (file)
index 2ee4edb..0000000
Binary files a/textures/oilrig/pk02_panels01b_dark.tga and /dev/null differ

diff --git a/textures/oilrig/pk02_panels01b_dark_gloss.tga b/textures/oilrig/pk02_panels01b_dark_gloss.tga
deleted file mode 100644 (file)
index d6a440e..0000000
Binary files a/textures/oilrig/pk02_panels01b_dark_gloss.tga and /dev/null differ

diff --git a/textures/oilrig/pk02_panels01b_dark_norm.tga b/textures/oilrig/pk02_panels01b_dark_norm.tga
deleted file mode 100644 (file)
index 5d0aaf8..0000000
Binary files a/textures/oilrig/pk02_panels01b_dark_norm.tga and /dev/null differ

diff --git a/textures/oilrig/pk02_panels01c_dark.tga b/textures/oilrig/pk02_panels01c_dark.tga
deleted file mode 100644 (file)
index fb36518..0000000
Binary files a/textures/oilrig/pk02_panels01c_dark.tga and /dev/null differ

diff --git a/textures/oilrig/pk02_panels01c_dark_gloss.tga b/textures/oilrig/pk02_panels01c_dark_gloss.tga
deleted file mode 100644 (file)
index f96a620..0000000
Binary files a/textures/oilrig/pk02_panels01c_dark_gloss.tga and /dev/null differ

diff --git a/textures/oilrig/pk02_panels01c_dark_norm.tga b/textures/oilrig/pk02_panels01c_dark_norm.tga
deleted file mode 100644 (file)
index 4a4e322..0000000
Binary files a/textures/oilrig/pk02_panels01c_dark_norm.tga and /dev/null differ

diff --git a/textures/oilrig/wall_crete03_dirt.tga b/textures/oilrig/wall_crete03_dirt.tga
deleted file mode 100644 (file)
index 79cfdd2..0000000
Binary files a/textures/oilrig/wall_crete03_dirt.tga and /dev/null differ

diff --git a/textures/oilrig/wall_crete03_dirt_norm.tga b/textures/oilrig/wall_crete03_dirt_norm.tga
deleted file mode 100644 (file)
index 1d4bb5f..0000000
Binary files a/textures/oilrig/wall_crete03_dirt_norm.tga and /dev/null differ