From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 22 Dec 2019 13:32:45 +0000 (+0200)
Subject: Include map assets
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31610985c0cc95cd7e6501567e277885fbe3d1ce;p=xonotic%2Fxonotic-maps.pk3dir.git

Include map assets
---

diff --git a/maps/red-planet.map b/maps/red-planet.map
index a7148ad2..330084d9 100644
--- a/maps/red-planet.map
+++ b/maps/red-planet.map
@@ -63310,14 +63310,14 @@ exx/trim-vert01
 {
 "classname" "target_speaker"
 "origin" "-1376.000000 -896.000000 192.000000"
-"noise" "sound/map_red_planet/steam_burst.wav"
+"noise" "sound/map_red-planet/steam_burst.wav"
 "targetname" "particle_2"
 "atten" "3"
 }
 {
 "classname" "target_speaker"
 "origin" "-1504.000000 -560.000000 192.000000"
-"noise" "sound/map_red_planet/steam_fade.ogg"
+"noise" "sound/map_red-planet/steam_fade.ogg"
 "targetname" "particle_1"
 "atten" "3"
 "angle" "0.000003"
@@ -63340,7 +63340,7 @@ exx/trim-vert01
 {
 "classname" "target_speaker"
 "origin" "-2016.000000 912.000000 192.000000"
-"noise" "sound/map_red_planet/steam_loop.wav"
+"noise" "sound/map_red-planet/steam_loop.wav"
 }
 {
 "classname" "light"
@@ -71671,14 +71671,14 @@ exx/trim-vert01
 {
 "classname" "target_speaker"
 "origin" "2016.000000 -896.000000 192.000000"
-"noise" "sound/map_red_planet/steam_burst.wav"
+"noise" "sound/map_red-planet/steam_burst.wav"
 "targetname" "particle_4"
 "atten" "3"
 }
 {
 "classname" "target_speaker"
 "origin" "1888.000000 912.000000 192.000000"
-"noise" "sound/map_red_planet/steam_fade.ogg"
+"noise" "sound/map_red-planet/steam_fade.ogg"
 "targetname" "particle_3"
 "atten" "3"
 "angle" "0.000003"
@@ -71701,7 +71701,7 @@ exx/trim-vert01
 {
 "classname" "target_speaker"
 "origin" "1504.000000 560.000000 192.000000"
-"noise" "sound/map_red_planet/steam_loop.wav"
+"noise" "sound/map_red-planet/steam_loop.wav"
 }
 {
 "classname" "item_cells"
diff --git a/maps/red-planet.map.options b/maps/red-planet.map.options
index ef946807..00a54a45 100644
--- a/maps/red-planet.map.options
+++ b/maps/red-planet.map.options
@@ -1,6 +1,6 @@
--bsp +
--vis +
+-bsp + -metaadequatescore 99999 -metamaxbboxdistance 16 -np 0.1
 -light + -bounce 8 -dirty -dirtscale 2 -bouncescale 1.15 -exposure 150 -areascale 1.25 -pointscale 1.4
+-vis +
 -minimap +
 -sRGB
-Version: 7
+Version: 8
diff --git a/scripts/map_red-planet.shader b/scripts/map_red-planet.shader
new file mode 100644
index 00000000..20105913
--- /dev/null
+++ b/scripts/map_red-planet.shader
@@ -0,0 +1,59 @@
+textures/map_red-planet/env1
+{
+	qer_editorimage textures/map_red-planet/env1.tga
+	surfaceparm trans
+	cull disable
+	qer_trans 0.5
+	{
+		map textures/map_red-planet/env1.tga
+		blendfunc GL_ONE GL_ONE
+		//rgbGen vertex
+		tcgen environment
+		//tcmod scale 4 4
+	}
+	/*{
+		map $lightmap
+		rgbGen identity
+		tcgen lightmap
+	}*/
+}
+
+textures/map_red-planet/env2
+{
+	qer_editorimage textures/map_red-planet/env2.tga
+	surfaceparm trans
+	cull disable
+	qer_trans 0.5
+	{
+		map textures/map_red-planet/env2.tga
+		blendfunc GL_ONE GL_ONE
+		//rgbGen vertex
+		tcgen environment
+		//tcmod scale 4 4
+	}
+	/*{
+		map $lightmap
+		rgbGen identity
+		tcgen lightmap
+	}*/
+}
+
+textures/map_red-planet/env3
+{
+	qer_editorimage textures/map_red-planet/env3.tga
+	surfaceparm trans
+	cull disable
+	qer_trans 0.5
+	{
+		map textures/map_red-planet/env3.tga
+		blendfunc GL_ONE GL_ONE
+		//rgbGen vertex
+		tcgen environment
+		//tcmod scale 4 4
+	}
+	/*{
+		map $lightmap
+		rgbGen identity
+		tcgen lightmap
+	}*/
+}
diff --git a/sound/map_red-planet/steam_burst.wav b/sound/map_red-planet/steam_burst.wav
new file mode 100644
index 00000000..a8b331ac
Binary files /dev/null and b/sound/map_red-planet/steam_burst.wav differ
diff --git a/sound/map_red-planet/steam_fade.ogg b/sound/map_red-planet/steam_fade.ogg
new file mode 100644
index 00000000..aa6f3442
Binary files /dev/null and b/sound/map_red-planet/steam_fade.ogg differ
diff --git a/sound/map_red-planet/steam_loop.wav b/sound/map_red-planet/steam_loop.wav
new file mode 100644
index 00000000..f37e1fab
Binary files /dev/null and b/sound/map_red-planet/steam_loop.wav differ
diff --git a/textures/map_red-planet/env1.tga b/textures/map_red-planet/env1.tga
new file mode 100644
index 00000000..bc23504c
Binary files /dev/null and b/textures/map_red-planet/env1.tga differ
diff --git a/textures/map_red-planet/env2.tga b/textures/map_red-planet/env2.tga
new file mode 100644
index 00000000..64e84427
Binary files /dev/null and b/textures/map_red-planet/env2.tga differ
diff --git a/textures/map_red-planet/env3.tga b/textures/map_red-planet/env3.tga
new file mode 100644
index 00000000..24f6e73b
Binary files /dev/null and b/textures/map_red-planet/env3.tga differ