Push v5

diff --git a/maps/warfare.jpg b/maps/warfare.jpg
new file mode 100644 (file)
index 0000000..efad6f4
Binary files /dev/null and b/maps/warfare.jpg differ

diff --git a/maps/warfare.map b/maps/warfare.map
index 16a4cbe368653f63a9e0f5c4b4b1fc37564fdb1b..d65b5c6acec6de1e028e93e15ee04c2ef6f6eda0 100644 (file)
--- a/maps/warfare.map
+++ b/maps/warfare.map
@@ -1,7 +1,7 @@
 {
 "classname" "worldspawn"
 "_floodlight" "178 209 255 1024 16"
-"fog" "1 0 0.5 0.8 0.06"
+"fog" "1 0 0.5 0.8 0.1"
 {
 ( -192 -968 56 ) ( -192 -1144 64 ) ( -192 -968 64 ) common/caulk 0 192 0 0.25 0.25 0 0 0
 ( -192 -1144 64 ) ( -208 -1144 56 ) ( -208 -1144 64 ) common/caulk 192 192 0 0.25 0.25 0 0 0
@@ -2620,15 +2620,8 @@ exx/base-metal04
 ( 992 -1024 392 ) ( 992 -776 392 ) ( 992 -1024 656 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 832 -808 624 ) ( 992 -1024 592 ) ( 832 -1024 624 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 992 -808 592 ) ( 992 -1024 576 ) ( 992 -1024 592 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 992 -808 576 ) ( 832 -1024 608 ) ( 992 -1024 576 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 992 -1024 576 ) ( 832 -1024 624 ) ( 992 -1024 592 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 832 -1024 -64 ) ( 992 -808 -64 ) ( 832 -1024 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( 672 -1120 656 ) ( 672 -1216 656 ) ( 456 -1120 656 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 672 -1080 656 ) ( 456 -1080 656 ) ( 672 -1080 640 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 672 -1024 656 ) ( 456 -1024 656 ) ( 672 -1024 640 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 672 -1120 656 ) ( 672 -1120 640 ) ( 672 -1216 656 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 456 -1216 640 ) ( 672 -1216 640 ) ( 456 -1120 640 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 456 -1216 640 ) ( 456 -1216 656 ) ( 672 -1216 640 ) common/clip 0 0 0 0.25 0.25 0 0 0
@@ -2643,13 +2636,6 @@ exx/base-metal04
 ( 672 -1216 640 ) ( 672 -1120 640 ) ( 672 -1216 656 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 832 -1024 624 ) ( 832 -808 592 ) ( 992 -808 592 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 992 -808 576 ) ( 832 -808 592 ) ( 832 -808 576 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 992 -808 576 ) ( 832 -808 576 ) ( 832 -1024 608 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 832 -808 576 ) ( 832 -808 592 ) ( 832 -1024 608 ) common/clip 0 96 0 0.25 0.25 0 0 0
-( 832 -1024 64 ) ( 992 -808 -64 ) ( 832 -1024 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( 1016 -768 384 ) ( 1016 -784 384 ) ( 1000 -768 384 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 1016 -768 480 ) ( 1000 -768 480 ) ( 1016 -768 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 1016 -768 480 ) ( 1016 -768 320 ) ( 1016 -784 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
@@ -9364,21 +9350,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.3872070312 169.7788085938 -20 0.1787843555 0.1780000031 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
 ( -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.5434570312 20 0.1787835211 0.1787800044 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 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.3559570312 19.9999980927 0.1787841767 0.1780000031 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 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
@@ -19545,7 +19531,7 @@ exx/base-metal04
 ( -624 176 640 ) ( -624 208 640 ) ( -560 208 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -676 136 512 ) ( -676 136 640 ) ( -672 128 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -384 128 520 ) ( -672 128 520 ) ( -672 128 640 ) exx/wall-panels08b 256 0 0 0.25 0.25 0 0 0
-( -992 128 520 ) ( -704 128 520 ) ( -712 136 512 ) exx/wall-panels08b -128 0 0 0.25 0.25 0 0 0
+( -992 128 520 ) ( -704 128 520 ) ( -712 136 512 ) exx/wall-panels08b 768 -32 180 0.25 0.25 0 0 0
 ( -576 128 512 ) ( -576 128 640 ) ( -584 136 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -676 136 640 ) ( -676 136 512 ) ( -584 136 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -20243,7 +20229,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.6665039062 -90 0.375 0.375 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
 ( -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
 }
@@ -20307,7 +20293,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.6665039062 -90 0.375 0.375 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
 ( -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
 }
@@ -29621,7 +29607,7 @@ exx/base-metal07rust
 ( -676 136 640 ) ( -676 128 640 ) ( -704 136 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -708 104 640 ) ( -708 104 512 ) ( -676 136 512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -672 128 512 ) ( -672 128 640 ) ( -676 136 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -736 64 520 ) ( -672 128 520 ) ( -740 72 512 ) exx/wall-panels08b -128 0 0 0.25 0.25 0 0 0
+( -736 64 520 ) ( -672 128 520 ) ( -740 72 512 ) exx/wall-panels08b -312 264 225 0.25 0.25 0 0 0
 ( -672 128 520 ) ( -736 64 520 ) ( -736 64 640 ) exx/wall-panels08b 256 0 0 0.25 0.25 0 0 0
 ( -740 72 512 ) ( -740 72 640 ) ( -736 64 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -29677,7 +29663,7 @@ exx/base-metal07rust
 ( -892 72 640 ) ( -892 64 640 ) ( -984 72 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -984 72 640 ) ( -984 72 512 ) ( -740 72 512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -736 64 512 ) ( -736 64 640 ) ( -740 72 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -832 64 520 ) ( -736 64 520 ) ( -740 72 512 ) exx/wall-panels08b -128 0 0 0.25 0.25 0 0 0
+( -832 64 520 ) ( -736 64 520 ) ( -740 72 512 ) exx/wall-panels08b 256 224 180 0.25 0.25 0 0 0
 ( -744 64 520 ) ( -840 64 520 ) ( -840 64 640 ) exx/wall-panels08b 256 0 0 0.25 0.25 0 0 0
 ( -984 72 512 ) ( -984 72 640 ) ( -992 64 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -30319,6 +30305,20 @@ exx/base-metal07rust
 ( -984 -576 736 ) ( -984 -576 832 ) ( -768 -576 736 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -984 -616 736 ) ( -984 72 736 ) ( -984 -616 832 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 752 -1024 640 ) ( 752 -888 640 ) ( 992 -1024 592 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 992 -888 632 ) ( 992 -888 576 ) ( 992 -1024 632 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 752 -888 624 ) ( 752 -1024 624 ) ( 992 -1024 576 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 928 -1024 576 ) ( 928 -1024 632 ) ( 1016 -1024 576 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 752 -1024 -64 ) ( 992 -808 -64 ) ( 752 -1024 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 752 -1024 640 ) ( 752 -808 592 ) ( 992 -808 592 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 992 -808 576 ) ( 752 -808 592 ) ( 752 -808 576 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 992 -808 576 ) ( 752 -808 576 ) ( 752 -1024 624 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 752 -808 576 ) ( 752 -808 592 ) ( 752 -1024 624 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 752 -1024 64 ) ( 992 -808 -64 ) ( 752 -1024 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -32056,8 +32056,8 @@ exx/base-metal05rust
 }
 {
 "classname" "info_autoscreenshot"
-"origin" "40.000000 -1152.000000 568.000000"
-"angles" "4 40 0"
+"origin" "-352.795746 436.263397 546.231445"
+"angles" "13.5955811 -42.791748 0"
 }
 {
 "classname" "info_location"
@@ -32287,13 +32287,6 @@ exx/base-metal05rust
 }
 {
 "classname" "misc_model"
-"origin" "-771.000000 -83.000000 479.000000"
-"model" "models/map_warfare/small_rocks.md3"
-"modelscale" "6.000000"
-"spawnflags" "4"
-}
-{
-"classname" "misc_model"
 "origin" "-835.000000 -212.000015 469.000000"
 "model" "models/map_warfare/small_rocks.md3"
 "modelscale" "6.000000"
@@ -32356,3 +32349,76 @@ exx/base-metal05rust
 "spawnflags" "4"
 "angle" "0.000010"
 }
+{
+"classname" "misc_model"
+"origin" "-771.000000 -83.000000 479.000000"
+"model" "models/map_warfare/small_rocks.md3"
+"modelscale" "6.000000"
+"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" "misc_gamemodel"
+"origin" "435.049530 749.831360 122.260620"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "11.806162 119.315575 10.049067"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "-715.604431 -540.102966 477.999847"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "5.093612 -21.180624 1.177875"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "-797.990234 -165.049042 476.308502"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "-0.589641 14.992217 9.155036"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "-781.094238 13.795942 475.191956"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.500000"
+"angles" "-6.289028 137.856934 1.316799"
+}
+{
+"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"
+"origin" "649.648193 -1338.152832 352.140930"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.800000"
+"angles" "-19.621141 -165.325974 -31.031652"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "1180.248657 -817.675537 292.009247"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.800000"
+"angles" "5.276835 47.410706 15.626326"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "76.4626083 -1187.55554 541.621399"
+"angles" "4.22424316 45.2526855 0"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "561.64978 153.942505 247.010666"
+"angles" "13.9910889 -157.664795 0"
+}

diff --git a/maps/warfare.map.options b/maps/warfare.map.options
index af1a0c662958cbc88a3dfc92d15b661eda974e45..bddb4beac6824d485ba44ab8cac23d6b5307fe66 100644 (file)
--- a/maps/warfare.map.options
+++ b/maps/warfare.map.options
@@ -2,4 +2,4 @@
 -light + -dirtscale 2
 -vis +
 -minimap +
-Version: 5
+Version: 5a

diff --git a/maps/warfare.mapinfo b/maps/warfare.mapinfo
index eaab26948858bdb6d379a55f3e15d9dfff31d90e..66e56ac1568c27220081f269dff871e1265c65ff 100644 (file)
--- a/maps/warfare.mapinfo
+++ b/maps/warfare.mapinfo
@@ -1,12 +1,12 @@
 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 6
+cdtrack 15
 has weapons
 gametype dm
 gametype tdm
 gametype lms
 gametype ca
-gametype arena
 gametype ka
 gametype kh
+gametype ft
\ No newline at end of file

diff --git a/maps/warfare.tga b/maps/warfare.tga
deleted file mode 100644 (file)
index f4ae7d4..0000000
Binary files a/maps/warfare.tga and /dev/null differ

diff --git a/models/map_warfare/cactus.obj b/models/map_warfare/cactus.obj
new file mode 100644 (file)
index 0000000..e199edf
--- /dev/null
+++ b/models/map_warfare/cactus.obj
@@ -0,0 +1,142 @@
+# Blender v2.73 (sub 0) OBJ File: 'cactus.blend'
+# www.blender.org
+mtllib cactus.mtl
+o cactus
+v 19.085739 5.110699 -2.949004
+v -5.512141 -26.468672 37.003799
+v 29.707653 -7.882494 33.361408
+v -16.117107 -13.480960 0.706455
+v -1.575582 13.747293 0.494490
+v -4.851045 14.561426 20.138269
+v -13.003407 32.627453 18.039320
+v -9.727944 31.813322 -1.604459
+v 33.203377 25.678381 -2.503455
+v 37.829163 34.577923 16.925365
+v 18.190397 30.646912 0.178879
+v 22.816183 39.546459 19.607698
+v 16.484373 28.886663 19.003220
+v 25.375000 15.559649 19.098349
+v 31.843750 21.754089 -0.848371
+v 22.953123 35.096474 -0.940697
+v 12.104558 -24.730234 2.334942
+v 26.001091 -23.833870 39.839581
+v 28.575338 11.043333 -4.592098
+v 42.457596 11.925487 32.894470
+v -13.203126 15.703124 -0.265625
+v -5.000000 7.218750 15.781250
+v 8.796874 21.578125 16.328125
+v 0.593749 30.078125 0.265625
+v 3.953125 -8.577681 38.737053
+v -15.828126 22.791595 33.517822
+v -15.125001 17.076189 -3.487200
+v 4.656250 -14.290104 1.716696
+v 13.390625 -0.265624 3.078125
+v 7.203125 -11.453123 18.375000
+v 18.890627 -26.374998 12.218750
+v 25.093750 -15.187497 -3.078125
+v -28.742695 0.826409 2.928154
+v -20.820820 -6.267339 46.365654
+v 23.179180 -4.986087 38.553154
+v 15.257305 2.107661 -4.884346
+v -10.812501 26.745564 57.032795
+v -22.765623 -31.066936 52.314045
+v -2.906249 -30.613810 -3.467207
+v 9.031249 27.183064 1.220293
+v -6.546875 8.078125 1.187500
+v 12.671876 -12.718747 -1.187500
+v 24.359375 -4.781249 23.484375
+v 5.125000 16.015625 25.890625
+v -25.695856 -11.193280 -0.964899
+v -10.445857 10.666096 -0.871149
+v -37.602108 -1.443281 29.206976
+v -22.352106 20.431717 29.285101
+v -17.562498 -28.008595 -0.853206
+v -15.921873 -33.362995 18.259783
+v 2.187501 -25.130697 19.009340
+v 0.562501 -19.778961 -0.119043
+v 21.229013 24.843954 -2.022451
+v 23.905201 18.689999 18.788559
+v 35.709736 31.568211 -0.588485
+v 38.385921 25.414253 20.222525
+v 27.000000 -2.718749 -0.140625
+v -18.859375 6.359374 55.937500
+v 24.968750 0.031251 58.953125
+v -16.812500 3.593749 -3.156250
+v -1.917571 -34.008881 -2.946323
+v 7.176375 -32.755955 23.642645
+v -10.570800 -11.546679 28.709949
+v -19.668840 -12.775060 2.102143
+v -11.058794 -6.477149 -0.792998
+v -28.449112 6.894641 -0.973670
+v -15.005794 -9.497542 26.637657
+v -32.410961 3.872027 26.446720
+vt 0.000000 0.074400
+vt 1.000000 0.074400
+vt 1.000000 0.985460
+vt 0.000000 0.985460
+vn -0.897600 -0.420400 -0.132300
+vn -0.207800 -0.869600 0.447800
+vn 0.759400 0.509500 0.404500
+vn -0.842600 0.446300 0.301500
+vn -0.592400 0.546600 0.591800
+vn -0.848900 -0.524500 0.064900
+vn 0.747500 0.354600 0.561700
+vn -0.000100 0.986900 0.161200
+vn 0.920200 -0.216900 0.325900
+vn -0.612100 -0.621500 0.488900
+vn 0.730300 -0.510700 0.453700
+vn -0.406400 0.870300 0.278000
+vn -0.425700 0.851400 0.306500
+vn 0.145300 0.988500 -0.041200
+vn -0.705700 -0.654500 0.271500
+vn 0.598800 0.782000 0.172700
+vn -0.392300 0.823700 0.409400
+vn 0.759600 0.509000 0.404900
+vn -0.592400 0.546700 0.591800
+vn -0.848900 -0.524600 0.064800
+vn 0.747700 0.353800 0.561900
+vn 0.920400 -0.216500 0.325500
+vn -0.611200 -0.621900 0.489600
+vn 0.730100 -0.511300 0.453300
+vn -0.407000 0.869900 0.278600
+vn 0.145500 0.988500 -0.041000
+vn -0.705000 -0.654900 0.272000
+vn 0.599300 0.781700 0.172300
+vn -0.392400 0.823600 0.409500
+g cactus_cactus_textures/map_warfare/cactus
+usemtl textures/map_warfare/cactus
+s off
+f 8/1/1 5/2/1 6/3/1
+f 10/4/2 12/3/2 11/2/2
+f 13/4/3 14/3/3 15/2/3
+f 18/4/4 20/3/4 19/2/4
+f 21/2/5 22/3/5 23/4/5
+f 25/4/6 26/3/6 27/2/6
+f 32/1/7 29/2/7 30/3/7
+f 36/1/8 33/2/8 34/3/8
+f 37/4/9 38/3/9 39/2/9
+f 44/4/10 41/1/10 42/2/10
+f 46/2/11 48/3/11 47/4/11
+f 51/3/12 52/2/12 49/1/12
+f 54/4/13 56/3/13 55/2/13
+f 57/1/14 60/2/14 58/3/14
+f 63/3/15 64/2/15 61/1/15
+f 66/2/16 68/3/16 67/4/16
+f 4/2/17 2/3/17 3/4/17
+f 7/4/1 8/1/1 6/3/1
+f 9/1/2 10/4/2 11/2/2
+f 16/1/18 13/4/18 15/2/18
+f 17/1/4 18/4/4 19/2/4
+f 24/1/19 21/2/19 23/4/19
+f 28/1/20 25/4/20 27/2/20
+f 31/4/21 32/1/21 30/3/21
+f 35/4/8 36/1/8 34/3/8
+f 40/1/22 37/4/22 39/2/22
+f 43/3/23 44/4/23 42/2/23
+f 45/1/24 46/2/24 47/4/24
+f 50/4/25 51/3/25 49/1/25
+f 53/1/13 54/4/13 55/2/13
+f 59/4/26 57/1/26 58/3/26
+f 62/4/27 63/3/27 61/1/27
+f 65/1/28 66/2/28 67/4/28
+f 1/1/29 4/2/29 3/4/29

diff --git a/scripts/map_warfare.shader b/scripts/map_warfare.shader
index 254bb77d2549554fc8d4d5cf9e10a36227824c40..492d3d23e4175147c12b066db06481b230dcd55f 100644 (file)
--- a/scripts/map_warfare.shader
+++ b/scripts/map_warfare.shader
@@ -3,12 +3,14 @@ textures/map_warfare/rocktosoil
        qer_editorimage textures/map_warfare/rocktosoil
        
        dpoffsetmapping - 2 match8 168
+       dpglossintensitymod 2
+       dpglossexponentmod 4
        
-       q3map_bouncescale  0.75
+       q3map_bouncescale 0.75
        q3map_lightmapsampleoffset 8
        q3map_nonplanar
        q3map_shadeangle 90
-    q3map_alphamod dotproduct2 ( 0 0 1 )
+       q3map_alphamod dotproduct2 ( 0 0 1 )
        {
                map textures/phillipk2x/natural/pk02_rock01
        }
@@ -44,13 +46,14 @@ textures/map_warfare/floor_panel
        qer_alphafunc qequal 0.5
     
     dpoffsetmapping - 2 match8 172
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 3
+       dpglossexponentmod 4
        
        surfaceparm metalsteps
        surfaceparm trans
+       surfaceparm nonsolid
        
-       q3map_bouncescale  0.75
+       q3map_bouncescale 0.75
 
     polygonoffset
        {
@@ -80,3 +83,26 @@ textures/map_warfare/sky
        skyparms env/exosystem/exosystem - -
 }
 
+textures/map_warfare/cactus
+{
+       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
+       }
+}
+

diff --git a/textures/map_warfare/cactus.tga b/textures/map_warfare/cactus.tga
new file mode 100644 (file)
index 0000000..6899a09
Binary files /dev/null and b/textures/map_warfare/cactus.tga differ

diff --git a/textures/map_warfare/cactus_gloss.tga b/textures/map_warfare/cactus_gloss.tga
new file mode 100644 (file)
index 0000000..46bd4b8
Binary files /dev/null and b/textures/map_warfare/cactus_gloss.tga differ

diff --git a/textures/map_warfare/cactus_norm.tga b/textures/map_warfare/cactus_norm.tga
new file mode 100644 (file)
index 0000000..ba93499
Binary files /dev/null and b/textures/map_warfare/cactus_norm.tga differ