Merge branch 'maddin/textures-common' into 'master'

Maddin/textures common

This branch contains the following fixes and improvements:
* It adds the previously missing textures `common/botclip` and `common/noimpact`.
* All common-textures have been recreated with a uniform look and font (using Xolonium).
* Extremely reduced file sizes. Factor is about 5 in average.
* No compression ugliness visible anymore.
* 3 completely new base-shaders which will be useful for mappers blocking out their maps (so you can focus on the structure and do actual texturing later).
* Fixing typo in `common/antiportal` and `common/nodrawnonsolid`.
* Every texture now has a clear name matching the shader.

Here is a preview of the new textures:
![preview](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/5ebe217097a0c01e65223c3161acc024/preview.png)

See merge request !47

diff --git a/maps/dance.map.options b/maps/dance.map.options
index f45ea47063278b45281663b518f78cba7ed69eaf..c48c877b6103dc3a4d630a6cbeb4a753b2833258 100644 (file)
--- a/maps/dance.map.options
+++ b/maps/dance.map.options
@@ -1,6 +1,6 @@
--bsp + -samplesize 6
--light + -bounce 8 -dirtscale 2
+-bsp + -samplesize 4
 -vis +
+-light + -bounce 8 -dirtscale 2 -gamma 0.7
 -minimap +
 -sRGB
-Version: 5c
+Version: 5d

diff --git a/maps/drain.map.options b/maps/drain.map.options
index 99cd15628239a044324d150670ffa1f8219d57dd..6480c33d8073db89541f3ca2c83897b1be9a8822 100644 (file)
--- a/maps/drain.map.options
+++ b/maps/drain.map.options
@@ -1,7 +1,7 @@
 -scale 1:1.3
 -bsp + -samplesize 6
--light + -dirtscale 2 -bounce 8  -areascale 1.25 -pointscale 1.3 -randomsamples -samples 128
 -vis +
+-light + -gamma 0.75 -dirtscale 2 -bounce 8  -areascale 1.25 -pointscale 1.3 -randomsamples -samples 128
 -minimap +
 -sRGB
-Version: 13f
\ No newline at end of file
+Version: 13g

diff --git a/maps/implosion.map b/maps/implosion.map
index e8caf7d8c7791cf7bca49d278af20c1ee1602c67..41de7971025a9dd35065aeb1c03234fb8c23cd58 100644 (file)
--- a/maps/implosion.map
+++ b/maps/implosion.map
@@ -61083,14 +61083,6 @@ trak5x/light-light2b-surfacelight
 ( -428 -1992 0 ) ( -428 -1968 0 ) ( -428 -1992 8 ) trak5x/base-base1b 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( 1552 4488 -1468 ) ( 1552 -6264 -1468 ) ( -1520 4488 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( 1536 292 -1468 ) ( -1536 292 -1468 ) ( 1536 292 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( 6136 4380 -1468 ) ( 6136 4380 -1532 ) ( 6136 -6372 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1520 -6264 -1532 ) ( 1552 -6264 -1532 ) ( -1520 4488 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1516 -6220 -1532 ) ( -1516 -6220 -1468 ) ( 1556 -6220 -1532 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-( -1544 -6256 -1532 ) ( -1544 4496 -1532 ) ( -1544 -6256 -1468 ) common/weapclip 0 0 0 0.5 0.5 0 0 0
-}
-{
 ( 2064 -2688 384 ) ( 2064 -3144 384 ) ( 1984 -2688 384 ) trak5x/floor-tile4e 64 240 0 0.5 0.5 0 0 0
 ( 2064 -2720 384 ) ( 1984 -2720 384 ) ( 2064 -2720 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 2400 -2680 384 ) ( 2400 -2680 320 ) ( 2400 -3136 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0

diff --git a/maps/implosion.map.options b/maps/implosion.map.options
index bf3ed8fdde6b19caa72cbbf6393d9678ded9131a..fc867f009cc78fda89bc24c3455d2a0e00cbff9e 100644 (file)
--- a/maps/implosion.map.options
+++ b/maps/implosion.map.options
@@ -3,4 +3,4 @@
 -vis + 
 -minimap +
 -sRGB
-Version: 2b
+Version: 2c

diff --git a/maps/space-elevator.map.options b/maps/space-elevator.map.options
index b719e51dd686a30299bfc5b79ffe75501dd78b5b..6bd94e2ca657505f99c903653ac49abcf2599324 100644 (file)
--- a/maps/space-elevator.map.options
+++ b/maps/space-elevator.map.options
@@ -1,6 +1,6 @@
 -bsp +
--light + -bounce 8
 -vis +
+-light + -bounce 8
 -minimap +
 -sRGB
-Version: 6a
+Version: 6b

diff --git a/maps/warfare.map b/maps/warfare.map
index e26083f7be6d704f0fa69bd81ba0c8f9088c0855..8931609251644dda04240432de5fd854ceda07a7 100644 (file)
--- a/maps/warfare.map
+++ b/maps/warfare.map
@@ -1,8 +1,8 @@
 {
 "classname" "worldspawn"
 "_floodlight" "178 209 255 1024 16"
-"fog" "1 0 0.5 0.8 0.1"
-"_description" "Medium sized map with a central area. Well suited and optimized for duel matches"
+"fog" "1 0 0.5 0.8 0.12"
+"_description" "Medium sized map with a central area. Well suited and optimized for duel matches."
 "message" "Warfare"
 "author" "Maddin, Tymo"
 {
@@ -9353,21 +9353,21 @@ trak5x/base-pipe1b
 }
 {
 ( -376 -1128 200 ) ( -376 -1128 88 ) ( -364 -1140 88 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( -376 -1128 200 ) ( -400 -1152 200 ) ( -388 -1164 168 ) exx/trim-psimple04 39.3872070313 169.7788085938 -20 0.1787843555 0.1780000031 134217728 0 0
+( -376 -1128 200 ) ( -400 -1152 200 ) ( -388 -1164 168 ) exx/trim-psimple04 39.3872070312 169.7788085938 -20 0.1787843555 0.1780000031 134217728 0 0
 ( -400 -1152 200 ) ( -376 -1128 200 ) ( -388 -1164 200 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -400 -1152 88 ) ( -400 -1152 200 ) ( -388 -1164 88 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -388 -1164 352 ) ( -364 -1140 352 ) ( -388 -1164 224 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( -364 -1140 200 ) ( -376 -1128 200 ) ( -376 -1128 88 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( -388 -1164 120 ) ( -400 -1152 88 ) ( -376 -1128 88 ) exx/trim-psimple04 0.4609375 27.5434570313 20 0.1787835211 0.1787800044 134217728 0 0
+( -388 -1164 120 ) ( -400 -1152 88 ) ( -376 -1128 88 ) exx/trim-psimple04 0.4609375 27.5434570312 20 0.1787835211 0.1787800044 134217728 0 0
 ( -388 -1164 88 ) ( -376 -1128 88 ) ( -400 -1152 88 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -388 -1164 200 ) ( -400 -1152 88 ) ( -400 -1152 200 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -388 -1164 64 ) ( -364 -1140 -64 ) ( -388 -1164 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( -500 -1004 88 ) ( -488 -1016 88 ) ( -488 -1016 200 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( -524 -1028 168 ) ( -512 -1040 200 ) ( -488 -1016 200 ) exx/trim-psimple04 91.650390625 423.3559570313 19.9999980927 0.1787841767 0.1780000031 134217728 0 0
+( -524 -1028 168 ) ( -512 -1040 200 ) ( -488 -1016 200 ) exx/trim-psimple04 91.650390625 423.3559570312 19.9999980927 0.1787841767 0.1780000031 134217728 0 0
 ( -524 -1028 200 ) ( -488 -1016 200 ) ( -512 -1040 200 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -524 -1028 88 ) ( -512 -1040 200 ) ( -512 -1040 88 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -524 -1028 224 ) ( -500 -1004 352 ) ( -524 -1028 352 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
@@ -20232,7 +20232,7 @@ exx/base-metal04
 ( -680 200 360 ) ( -728 200 360 ) ( -680 200 408 ) common/caulk 32 128 -90 0.25 0.25 0 0 0
 ( -680 204 408 ) ( -680 204 360 ) ( -680 192 360 ) common/caulk 32 256 -90 0.25 -0.25 0 0 0
 ( -680 200 360 ) ( -680 216 360 ) ( -728 200 360 ) common/caulk 128 0 -0 0.25 -0.25 0 0 0
-( -680 204 360 ) ( -680 204 408 ) ( -728 204 408 ) trak5x/light-light2a 64 105.6665039063 -90 0.375 0.375 0 0 0
+( -680 204 360 ) ( -680 204 408 ) ( -728 204 408 ) trak5x/light-light2a 64 105.6665039062 -90 0.375 0.375 0 0 0
 ( -728 204 360 ) ( -728 204 408 ) ( -728 192 408 ) common/caulk 32 256 -90 0.25 -0.25 0 0 0
 ( -728 216 408 ) ( -680 216 408 ) ( -728 200 408 ) common/caulk 128 0 -0 0.25 -0.25 0 0 0
 }
@@ -20296,7 +20296,7 @@ exx/base-metal04
 ( -680 200 520 ) ( -728 200 520 ) ( -680 200 568 ) common/caulk 160 128 -90 0.25 0.25 0 0 0
 ( -680 204 568 ) ( -680 204 520 ) ( -680 192 520 ) common/caulk 160 0 -90 0.25 -0.25 0 0 0
 ( -680 200 520 ) ( -680 216 520 ) ( -728 200 520 ) common/caulk 128 0 0 0.25 -0.25 0 0 0
-( -680 204 520 ) ( -680 204 568 ) ( -728 204 568 ) trak5x/light-light2a 106.6666870117 105.6665039063 -90 0.375 0.375 0 0 0
+( -680 204 520 ) ( -680 204 568 ) ( -728 204 568 ) trak5x/light-light2a 106.6666870117 105.6665039062 -90 0.375 0.375 0 0 0
 ( -728 204 520 ) ( -728 204 568 ) ( -728 192 568 ) common/caulk 160 0 -90 0.25 -0.25 0 0 0
 ( -728 216 568 ) ( -680 216 568 ) ( -728 200 568 ) common/caulk 128 0 0 0.25 -0.25 0 0 0
 }
@@ -30147,20 +30147,20 @@ exx/base-metal07rust
 ( -152 -16 64 ) ( -144 -16 -64 ) ( -152 -16 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( -64 183.9999847412 -32 ) ( 8 183.9999847412 -32 ) ( -64 256 -32 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( -64 160 56 ) ( -64 160 -32 ) ( -64 256 -32 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( 32 256 -32 ) ( 32 256 104 ) ( -64 256 80 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( -64 184 56 ) ( -64 256 80 ) ( 8 256 104 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( -64 160 -32 ) ( -64 160 56 ) ( 32 256 112 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
+( -64 183.9999847412 -32 ) ( 8 183.9999847412 -32 ) ( -64 256 -32 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( -64 160 56 ) ( -64 160 -32 ) ( -64 256 -32 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( 32 256 -32 ) ( 32 256 104 ) ( -64 256 80 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( -64 184 56 ) ( -64 256 80 ) ( 8 256 104 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( -64 160 -32 ) ( -64 160 56 ) ( 32 256 112 ) common/botclip 0 0 0 0.5 0.5 0 0 0
 }
 {
-( -216 448 160 ) ( -216 408 160 ) ( -256 448 160 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -216 448 160 ) ( -256 448 160 ) ( -216 448 80 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -192 448 160 ) ( -192 448 80 ) ( -192 408 160 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -256 408 80 ) ( -216 408 80 ) ( -256 448 80 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -256 384 80 ) ( -256 384 160 ) ( -216 384 80 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -256 408 80 ) ( -256 448 80 ) ( -256 408 160 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -192 440 -64 ) ( -200 432 -64 ) ( -192 440 64 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
+( -216 448 160 ) ( -216 408 160 ) ( -256 448 160 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -216 448 160 ) ( -256 448 160 ) ( -216 448 80 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -192 448 160 ) ( -192 448 80 ) ( -192 408 160 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -256 408 80 ) ( -216 408 80 ) ( -256 448 80 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -256 384 80 ) ( -256 384 160 ) ( -216 384 80 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -256 408 80 ) ( -256 448 80 ) ( -256 408 160 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -192 440 -64 ) ( -200 432 -64 ) ( -192 440 64 ) common/botclip 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -272 128 320 ) ( -272 224 320 ) ( -240 224 320 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
@@ -32060,7 +32060,7 @@ exx/base-metal05rust
 {
 "classname" "info_autoscreenshot"
 "origin" "-352.795746 436.263397 546.231445"
-"angles" "13.5955811 -42.791748 0"
+"angles" "14 -43 0"
 }
 {
 "classname" "info_location"
@@ -32186,9 +32186,11 @@ exx/base-metal05rust
 }
 {
 "classname" "misc_model"
-"origin" "-26.000000 133.000000 -20.000000"
+"origin" "-507.999939 -1143.000000 57.999908"
 "model" "models/map_warfare/boulder_1.md3"
 "modelscale" "0.700000"
+"spawnflags" "4"
+"angles" "-5.922283 -8.308860 17.080246"
 }
 {
 "classname" "misc_model"
@@ -32246,10 +32248,11 @@ exx/base-metal05rust
 }
 {
 "classname" "misc_model"
-"origin" "-157.000000 -215.000000 -12.000000"
+"origin" "-315.000000 -1219.000122 76.000015"
 "model" "models/map_warfare/small_rocks.md3"
 "modelscale" "7.000000"
 "spawnflags" "4"
+"angles" "4.682997 0.236063 2.888983"
 }
 {
 "classname" "misc_model"
@@ -32360,72 +32363,126 @@ exx/base-metal05rust
 "spawnflags" "4"
 }
 {
-"classname" "misc_gamemodel"
-"origin" "45.117275 203.765335 -15.592969"
-"model" "models/map_warfare/cactus.obj"
-"modelscale" "1.700000"
-"angles" "-6.765636 118.298286 13.803299"
+"classname" "info_autoscreenshot"
+"origin" "76.4626083 -1187.55554 541.621399"
+"angles" "4 45 0"
 }
 {
-"classname" "misc_gamemodel"
-"origin" "435.049530 749.831360 122.260620"
+"classname" "item_shells"
+"origin" "792.000000 632.000000 352.000000"
+}
+{
+"classname" "misc_model"
+"origin" "45.117275 203.765335 -15.592969"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.700000"
-"angles" "11.806162 119.315575 10.049067"
+"angles" "-6.765636 118.298286 13.803299"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "misc_gamemodel"
+"classname" "misc_model"
 "origin" "-715.604431 -540.102966 477.999847"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.700000"
 "angles" "5.093612 -21.180624 1.177875"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "misc_gamemodel"
+"classname" "misc_model"
 "origin" "-797.990234 -165.049042 476.308502"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.700000"
 "angles" "-0.589641 14.992217 9.155036"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "misc_gamemodel"
+"classname" "misc_model"
 "origin" "-781.094238 13.795942 475.191956"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.500000"
 "angles" "-6.289028 137.856934 1.316799"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "misc_gamemodel"
-"origin" "420.221466 -821.656311 472.003845"
-"model" "models/map_warfare/cactus.obj"
-"modelscale" "1.700000"
-"angles" "4.660039 50.702106 2.371722"
-}
-{
-"classname" "misc_gamemodel"
+"classname" "misc_model"
 "origin" "649.648193 -1338.152832 352.140930"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.800000"
 "angles" "-19.621141 -165.325974 -31.031652"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "misc_gamemodel"
+"classname" "misc_model"
 "origin" "1180.248657 -817.675537 292.009247"
 "model" "models/map_warfare/cactus.obj"
 "modelscale" "1.800000"
 "angles" "5.276835 47.410706 15.626326"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "info_autoscreenshot"
-"origin" "76.4626083 -1187.55554 541.621399"
-"angles" "4.22424316 45.2526855 0"
+"classname" "misc_model"
+"origin" "435.049530 749.831360 122.260620"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "11.806162 119.315575 10.049067"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "info_autoscreenshot"
-"origin" "561.64978 153.942505 247.010666"
-"angles" "13.9910889 -157.664795 0"
+"classname" "misc_model"
+"origin" "420.221466 -821.656311 472.003845"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "4.660039 50.702106 2.371722"
+"spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
-"classname" "item_shells"
-"origin" "792.000000 632.000000 352.000000"
+"classname" "misc_model"
+"origin" "1423.000000 591.000061 130.000092"
+"model" "models/map_warfare/cactus.obj"
+"spawnflags" "4"
+"angles" "12.074849 5.873147 -9.703994"
+"modelscale_vec" "1.000000 1.000000 1.300000"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "-432.000000 -1180.000122 75.000008"
+"model" "models/map_warfare/cactus.obj"
+"spawnflags" "4"
+"angles" "2.804623 95.043098 -9.026549"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "-26.000000 133.000000 -20.000000"
+"model" "models/map_warfare/boulder_1.md3"
+"modelscale" "0.700000"
+"spawnflags" "4"
+}
+{
+"classname" "misc_model"
+"origin" "-585.000000 -950.000000 69.000000"
+"model" "models/map_warfare/boulder_1.md3"
+"modelscale" "0.700000"
+"spawnflags" "4"
+}
+{
+"classname" "misc_model"
+"origin" "-157.000000 -215.000000 -12.000000"
+"model" "models/map_warfare/small_rocks.md3"
+"modelscale" "7.000000"
+"spawnflags" "4"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "616.000000 168.000000 256.000000"
+"angles" "5 205 0"
 }

diff --git a/maps/warfare.map.options b/maps/warfare.map.options
index 6c2dedd2bee522b255ed1bf4135f2885d855a556..7c7591da6e3dc6842950d5cef26813d8a53b2de3 100644 (file)
--- a/maps/warfare.map.options
+++ b/maps/warfare.map.options
@@ -1,6 +1,6 @@
 -bsp +
--light + -dirtscale 2 -bounce 8
+-light + -dirtscale 2 -bounce 3 -bouncescale 4
 -vis +
 -minimap +
 -sRGB
-Version: 6e
+Version: 7
\ No newline at end of file

diff --git a/maps/warfare.mapinfo b/maps/warfare.mapinfo
index 5c7f82dd7f7594c920db4cf22369e72c6f4bbcbb..a8b4714ce83688f1389d97713880eebd1afea534 100644 (file)
--- a/maps/warfare.mapinfo
+++ b/maps/warfare.mapinfo
@@ -1,5 +1,5 @@
 title Warfare
-description Medium sized map with a central area. Well suited and optimized for duel matches
+description Medium sized map with a central area. Well suited and optimized for duel matches.
 author Maddin, Tymo
 cdtrack 15
 has weapons

diff --git a/scripts/map_space-elevator.shader b/scripts/map_space-elevator.shader
index 64c9d23c3e3460fc0a57230975b8456f34a82cc8..6b76821c3c8a06142ba933d48841e01cd8a19192 100644 (file)
--- a/scripts/map_space-elevator.shader
+++ b/scripts/map_space-elevator.shader
@@ -96,13 +96,12 @@ textures/map_space-elevator/polluted_earth
        surfaceparm nolightmap
        surfaceparm nomarks
        q3map_globaltexture
-       q3map_surfacelight 20
+       q3map_surfacelight 5
        surfaceparm sky
 
         nopicmip
         nomipmaps
-
-       q3map_sunExt 1 0.9 0.9 250 320 20
-       q3map_skylight 05 4
+       q3map_sunExt 1 0.9 0.9 120 320 30
+       q3map_skylight 100 4
        skyparms env/polluted_earth/polluted_earth - -
 }

diff --git a/scripts/map_warfare.shader b/scripts/map_warfare.shader
index 492d3d23e4175147c12b066db06481b230dcd55f..bf16eba4f08deeeb5b4bb68b941f7f31875d13c8 100644 (file)
--- a/scripts/map_warfare.shader
+++ b/scripts/map_warfare.shader
@@ -1,108 +1,112 @@
 textures/map_warfare/rocktosoil
 {
-       qer_editorimage textures/map_warfare/rocktosoil
-       
-       dpoffsetmapping - 2 match8 168
-       dpglossintensitymod 2
-       dpglossexponentmod 4
-       
-       q3map_bouncescale 0.75
-       q3map_lightmapsampleoffset 8
-       q3map_nonplanar
-       q3map_shadeangle 90
-       q3map_alphamod dotproduct2 ( 0 0 1 )
-       {
-               map textures/phillipk2x/natural/pk02_rock01
-       }
-       {
-               map textures/phillipk2x/natural/pk02_sand01
-               blendfunc blend
-               alphagen vertex
-       }
-       {
-               map $lightmap
-               blendfunc GL_DST_COLOR GL_ZERO
-       }
+    qer_editorimage textures/map_warfare/rocktosoil
+
+    dpoffsetmapping - 2 match8 168
+    dpglossintensitymod 3
+    dpglossexponentmod 4
+
+    q3map_lightmapsampleoffset 8
+    q3map_nonplanar
+    q3map_shadeangle 90
+    q3map_alphamod dotproduct2 ( 0 0 1 )
+    {
+        map textures/phillipk2x/natural/pk02_rock01
+    }
+    {
+        map textures/phillipk2x/natural/pk02_sand01
+        blendfunc blend
+        alphagen vertex
+    }
+    {
+        map $lightmap
+        rgbgen identity
+        tcgen lightmap
+        blendfunc filter
+    }
 }
 
 textures/map_warfare/env
 {
-       qer_editorimage textures/map_warfare/env.tga
-       qer_trans 0.5
-       
-       surfaceparm trans
-       
-       cull none
-       {
-               map textures/map_warfare/env.tga
-               blendfunc add
-               tcgen environment
-       }
+    qer_editorimage textures/map_warfare/env
+    qer_trans 0.5
+
+    surfaceparm trans
+    {
+        map textures/map_warfare/env
+        blendfunc add
+        tcgen environment
+    }
 }
 
 textures/map_warfare/floor_panel
 {
-       qer_editorimage textures/map_warfare/floor_panel
-       qer_alphafunc qequal 0.5
-    
+    qer_editorimage textures/map_warfare/floor_panel
+    qer_alphafunc qequal 0.5
+
     dpoffsetmapping - 2 match8 172
-       dpglossintensitymod 3
-       dpglossexponentmod 4
-       
-       surfaceparm metalsteps
-       surfaceparm trans
-       surfaceparm nonsolid
-       
-       q3map_bouncescale 0.75
+    dpglossintensitymod 3
+    dpglossexponentmod 4
+
+    surfaceparm metalsteps
+    surfaceparm trans
+    surfaceparm nonsolid
+
+    q3map_bouncescale 0.75
 
     polygonoffset
-       {
-               map textures/map_warfare/floor_panel
-               alphaFunc GT0
-       }
-       {
-               map $lightmap
-               blendfunc filter
-       }
+    {
+        map textures/map_warfare/floor_panel
+        alphafunc GT0
+    }
+    {
+        map $lightmap
+        rgbgen identity
+        tcgen lightmap
+        blendfunc filter
+    }
 }
 
 textures/map_warfare/sky
 {
-       qer_editorimage textures/skies/exosystem
-       
-       surfaceparm noimpact
-       surfaceparm nolightmap
-       surfaceparm nodlight
-       surfaceparm nomarks
-       surfaceparm sky
-
-       q3map_sunext 1 1 1 350 60 42 3 16
-       q3map_lightmapfilterradius 0 8
-       q3map_skylight 400 4
-
-       skyparms env/exosystem/exosystem - -
+    qer_editorimage textures/skies/exosystem
+
+    surfaceparm noimpact
+    surfaceparm nolightmap
+    surfaceparm nodlight
+    surfaceparm nomarks
+    surfaceparm sky
+
+    q3map_sunext 1 1 1 350 60 42 3 16
+    q3map_lightmapfilterradius 0 8
+    q3map_skylight 400 4
+
+    skyparms env/exosystem/exosystem - -
 }
 
 textures/map_warfare/cactus
 {
-       qer_editorimage textures/map_warfare/cactus
-       qer_alphafunc qequal 0.5
-    
+    qer_editorimage textures/map_warfare/cactus
+    qer_alphafunc qequal 0.5
+
     dpoffsetmapping - 2 match8 68
-       dpglossintensitymod 2
-       dpglossexponentmod 4
-       
-       surfaceparm trans
-       surfaceparm nonsolid
-       
-       cull none
-       {
-               map textures/map_warfare/cactus
-               alphaFunc GT0
-       }
-       {
-               map $lightmap
-               blendfunc filter
-       }
+    dpglossintensitymod 3
+    dpglossexponentmod 4
+
+    surfaceparm trans
+    surfaceparm alphashadow
+    surfaceparm nonsolid
+
+    cull none
+    {
+        map textures/map_warfare/cactus
+        alphafunc GT0
+    }
+    {
+        map $lightmap
+        rgbgen identity
+        tcgen lightmap
+        blendfunc filter
+    }
 }