Give Evilspace a better song, as well as a better skybox

diff --git a/data/maps/evilspace.bsp b/data/maps/evilspace.bsp
index faf04a7f53390106dfdf8c8cb5aad12540a5208d..cf20dba1b91970043886c908f150227c6aaa23f0 100644 (file)
Binary files a/data/maps/evilspace.bsp and b/data/maps/evilspace.bsp differ

diff --git a/data/maps/evilspace.map b/data/maps/evilspace.map
index 60be7d64a32c656e17786d298048559ae64feaed..ceee1447199b2ef722542ef45e8bd1f4939490d4 100644 (file)
--- a/data/maps/evilspace.map
+++ b/data/maps/evilspace.map
@@ -154,57 +154,57 @@
 }\r
 // brush 15\r
 {\r
-( -2048 -768 896 ) ( -2048 -768 -1792 ) ( -2048 1920 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -1920 1920 896 ) ( -1920 1920 -1792 ) ( -1920 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -1920 -768 896 ) ( -1920 -768 -1792 ) ( -2048 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 1920 896 ) ( -2048 1920 -1792 ) ( -1920 1920 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 1920 -1792 ) ( -2048 -768 -1792 ) ( -1920 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 -768 896 ) ( -2048 1920 896 ) ( -1920 1920 896 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
+( -2048 -768 896 ) ( -2048 -768 -1792 ) ( -2048 1920 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -1920 1920 896 ) ( -1920 1920 -1792 ) ( -1920 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -1920 -768 896 ) ( -1920 -768 -1792 ) ( -2048 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 1920 896 ) ( -2048 1920 -1792 ) ( -1920 1920 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 1920 -1792 ) ( -2048 -768 -1792 ) ( -1920 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 -768 896 ) ( -2048 1920 896 ) ( -1920 1920 896 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
 }\r
 // brush 16\r
 {\r
-( -2048 1792 896 ) ( -2048 1792 -1792 ) ( -2048 1920 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 2048 1920 896 ) ( 2048 1920 -1792 ) ( 2048 1792 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 2048 1792 896 ) ( 2048 1792 -1792 ) ( -2048 1792 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 1920 896 ) ( -2048 1920 -1792 ) ( 2048 1920 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 1920 -1792 ) ( -2048 1792 -1792 ) ( 2048 1792 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 1792 896 ) ( -2048 1920 896 ) ( 2048 1920 896 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
+( -2048 1792 896 ) ( -2048 1792 -1792 ) ( -2048 1920 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 2048 1920 896 ) ( 2048 1920 -1792 ) ( 2048 1792 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 2048 1792 896 ) ( 2048 1792 -1792 ) ( -2048 1792 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 1920 896 ) ( -2048 1920 -1792 ) ( 2048 1920 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 1920 -1792 ) ( -2048 1792 -1792 ) ( 2048 1792 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 1792 896 ) ( -2048 1920 896 ) ( 2048 1920 896 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
 }\r
 // brush 17\r
 {\r
-( 1920 -768 896 ) ( 1920 -768 -1792 ) ( 1920 1920 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 2048 1920 896 ) ( 2048 1920 -1792 ) ( 2048 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 2048 -768 896 ) ( 2048 -768 -1792 ) ( 1920 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 1920 1920 896 ) ( 1920 1920 -1792 ) ( 2048 1920 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 1920 1920 -1792 ) ( 1920 -768 -1792 ) ( 2048 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 1920 -768 896 ) ( 1920 1920 896 ) ( 2048 1920 896 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
+( 1920 -768 896 ) ( 1920 -768 -1792 ) ( 1920 1920 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 2048 1920 896 ) ( 2048 1920 -1792 ) ( 2048 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 2048 -768 896 ) ( 2048 -768 -1792 ) ( 1920 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 1920 1920 896 ) ( 1920 1920 -1792 ) ( 2048 1920 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 1920 1920 -1792 ) ( 1920 -768 -1792 ) ( 2048 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 1920 -768 896 ) ( 1920 1920 896 ) ( 2048 1920 896 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
 }\r
 // brush 18\r
 {\r
-( -2048 -768 896 ) ( -2048 -768 -1792 ) ( -2048 -640 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 2048 -640 896 ) ( 2048 -640 -1792 ) ( 2048 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 2048 -768 896 ) ( 2048 -768 -1792 ) ( -2048 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 -640 896 ) ( -2048 -640 -1792 ) ( 2048 -640 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 -640 -1792 ) ( -2048 -768 -1792 ) ( 2048 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 -768 896 ) ( -2048 -640 896 ) ( 2048 -640 896 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
+( -2048 -768 896 ) ( -2048 -768 -1792 ) ( -2048 -640 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 2048 -640 896 ) ( 2048 -640 -1792 ) ( 2048 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 2048 -768 896 ) ( 2048 -768 -1792 ) ( -2048 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 -640 896 ) ( -2048 -640 -1792 ) ( 2048 -640 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 -640 -1792 ) ( -2048 -768 -1792 ) ( 2048 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 -768 896 ) ( -2048 -640 896 ) ( 2048 -640 896 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
 }\r
 // brush 19\r
 {\r
-( -2048 -768 896 ) ( -2048 -768 824 ) ( -2048 1920 824 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 2048 1920 896 ) ( 2048 1920 824 ) ( 2048 -768 824 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 2048 -768 896 ) ( 2048 -768 824 ) ( -2048 -768 824 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 1920 896 ) ( -2048 1920 824 ) ( 2048 1920 824 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 1920 824 ) ( -2048 -768 824 ) ( 2048 -768 824 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 -768 896 ) ( -2048 1920 896 ) ( 2048 1920 896 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
+( -2048 -768 896 ) ( -2048 -768 824 ) ( -2048 1920 824 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 2048 1920 896 ) ( 2048 1920 824 ) ( 2048 -768 824 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 2048 -768 896 ) ( 2048 -768 824 ) ( -2048 -768 824 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 1920 896 ) ( -2048 1920 824 ) ( 2048 1920 824 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 1920 824 ) ( -2048 -768 824 ) ( 2048 -768 824 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 -768 896 ) ( -2048 1920 896 ) ( 2048 1920 896 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
 }\r
 // brush 20\r
 {\r
-( -2048 -768 -1760 ) ( -2048 -768 -1792 ) ( -2048 1920 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 2048 1920 -1760 ) ( 2048 1920 -1792 ) ( 2048 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( 2048 -768 -1760 ) ( 2048 -768 -1792 ) ( -2048 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 1920 -1760 ) ( -2048 1920 -1792 ) ( 2048 1920 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 1920 -1792 ) ( -2048 -768 -1792 ) ( 2048 -768 -1792 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
-( -2048 -768 -1760 ) ( -2048 1920 -1760 ) ( 2048 1920 -1760 ) harlequin_sky/jf-nebula_sky 0 0 0 0.5 0.5 0 0 0\r
+( -2048 -768 -1760 ) ( -2048 -768 -1792 ) ( -2048 1920 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 2048 1920 -1760 ) ( 2048 1920 -1792 ) ( 2048 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( 2048 -768 -1760 ) ( 2048 -768 -1792 ) ( -2048 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 1920 -1760 ) ( -2048 1920 -1792 ) ( 2048 1920 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 1920 -1792 ) ( -2048 -768 -1792 ) ( 2048 -768 -1792 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
+( -2048 -768 -1760 ) ( -2048 1920 -1760 ) ( 2048 1920 -1760 ) skies/planets 0 0 0 0.5 0.5 0 0 0\r
 }\r
 // brush 21\r
 {\r

diff --git a/data/maps/evilspace.mapinfo b/data/maps/evilspace.mapinfo
index 214ed162c486e3eeefbede059ef1a4223232c405..55fa7f313e608155536ef09be4e41f8306946381 100644 (file)
--- a/data/maps/evilspace.mapinfo
+++ b/data/maps/evilspace.mapinfo
@@ -6,4 +6,4 @@ type dm 30 20
 type tdm 50 20 2\r
 type lms 9 20\r
 type rpg 0\r
-cdtrack ninesix\r
+cdtrack space_walk\r

diff --git a/data/maps/evilspace/lm_0000.tga b/data/maps/evilspace/lm_0000.tga
index 7803e67bc5790f5157746e606a69a2edfd757769..097675b25f38214fe076a79684bfb8d8c58362d5 100644 (file)
Binary files a/data/maps/evilspace/lm_0000.tga and b/data/maps/evilspace/lm_0000.tga differ

diff --git a/data/maps/evilspace/lm_0001.tga b/data/maps/evilspace/lm_0001.tga
index e25c4f509069c24f60ccca6b8fb0631af991f529..e4243bb17220991d67bec29f8411482276acdaa7 100644 (file)
Binary files a/data/maps/evilspace/lm_0001.tga and b/data/maps/evilspace/lm_0001.tga differ

diff --git a/data/maps/evilspace/lm_0002.tga b/data/maps/evilspace/lm_0002.tga
index d6c17b5ee72e8b06886b146ab8d79d6544ba1ab0..acff6730933c012b90904950058c695b34a9e294 100644 (file)
Binary files a/data/maps/evilspace/lm_0002.tga and b/data/maps/evilspace/lm_0002.tga differ

diff --git a/data/maps/evilspace/lm_0003.tga b/data/maps/evilspace/lm_0003.tga
index 72f9439ec7fc0527c14216af8ad0c986bc8d81bb..c6d33d20663804a78e0d88cddccb49cc5c5a40ec 100644 (file)
Binary files a/data/maps/evilspace/lm_0003.tga and b/data/maps/evilspace/lm_0003.tga differ