new map picture, fix a small bug caused by a recent bugfix, add some more trickjump...

diff --git a/maps/azalea.jpg b/maps/azalea.jpg
index 9521919f9726246bc76b84777192725f38c6396c..1a4e024ed776c0c14289f217dd8b11fcde259908 100644 (file)
Binary files a/maps/azalea.jpg and b/maps/azalea.jpg differ

diff --git a/maps/azalea.map b/maps/azalea.map
index bd1bb08d0e4e6e68bf1f2ddce5e25eb97632dfc3..de054192dbaaa0cf8f3d8d74aedfa59b60e82a6b 100644 (file)
--- a/maps/azalea.map
+++ b/maps/azalea.map
@@ -2320,20 +2320,20 @@ trak5x/misc-glass
 ( -64 32 112 ) ( -64 16 96 ) ( 64 32 112 ) exx/wall-metal01b 0 96 0 0.25 0.25 0 0 0
 }
 {
-( 1664 144 112 ) ( 1648 144 112 ) ( 1664 144 64 ) exx/wall-crete03 0 32 90 0.25 0.25 134217728 0 0
-( 1664 128 112 ) ( 1664 128 64 ) ( 1664 32 112 ) exx/wall-crete03 0 0 0 0.25 0.25 134217728 0 0
+( 1664 144 112 ) ( 1648 144 112 ) ( 1664 144 64 ) exx/wall-metal01b 0 32 90 0.25 0.25 134217728 0 0
+( 1664 128 112 ) ( 1664 128 64 ) ( 1664 32 112 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
 ( 1648 32 64 ) ( 1664 32 64 ) ( 1648 128 64 ) exx/wall-crete03 0 0 0 0.25 0.25 134217728 0 0
 ( 1648 32 64 ) ( 1648 32 112 ) ( 1664 32 64 ) exx/wall-crete03 0 0 0 0.25 0.25 134217728 0 0
-( 1648 32 64 ) ( 1648 128 64 ) ( 1648 32 112 ) exx/wall-crete03 0 0 0 0.25 0.25 134217728 0 0
-( -64 32 128 ) ( -64 128 80 ) ( 64 32 128 ) exx/wall-crete03 0 32 90 0.25 0.25 134217728 0 0
+( 1648 32 64 ) ( 1648 128 64 ) ( 1648 32 112 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( -64 32 128 ) ( -64 128 80 ) ( 64 32 128 ) exx/wall-metal01b 0 32 90 0.25 0.25 134217728 0 0
 }
 {
-( 1296 144 112 ) ( 1280 144 112 ) ( 1296 144 64 ) exx/wall-crete03 0 480 90 0.25 0.25 134217728 0 0
-( 1296 128 112 ) ( 1296 128 64 ) ( 1296 32 112 ) exx/wall-crete03 0 0 0 0.25 0.25 134217728 0 0
+( 1296 144 112 ) ( 1280 144 112 ) ( 1296 144 64 ) exx/wall-metal01b 0 480 90 0.25 0.25 134217728 0 0
+( 1296 128 112 ) ( 1296 128 64 ) ( 1296 32 112 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
 ( 1280 32 64 ) ( 1296 32 64 ) ( 1280 128 64 ) exx/wall-crete03 192 0 0 0.25 0.25 134217728 0 0
 ( 1280 32 64 ) ( 1280 32 112 ) ( 1296 32 64 ) exx/wall-crete03 192 0 0 0.25 0.25 134217728 0 0
-( 1280 32 64 ) ( 1280 128 64 ) ( 1280 32 112 ) exx/wall-crete03 0 0 0 0.25 0.25 134217728 0 0
-( -432 32 128 ) ( -432 128 80 ) ( -304 32 128 ) exx/wall-crete03 0 -32 90 0.25 0.25 134217728 0 0
+( 1280 32 64 ) ( 1280 128 64 ) ( 1280 32 112 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
+( -432 32 128 ) ( -432 128 80 ) ( -304 32 128 ) exx/wall-metal01b 0 -32 90 0.25 0.25 134217728 0 0
 }
 {
 ( 1664 32 112 ) ( 1664 16 112 ) ( 1648 32 112 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -45287,12 +45287,12 @@ effects_jumppad/jumppadfx1_a
 ( 1176 1160 -64 ) ( 1172 1164 -64 ) ( 1176 1160 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 1167.9999847412 1256.0000152588 132 ) ( 1167.9999847412 1232.0000152588 132 ) ( 1087.9999847412 1256.0000152588 132 ) common/clip 0 160 -0 0.25 0.25 0 0 0
+( 1167.9999847412 1256.0000152588 132 ) ( 1167.9999847412 1232.0000152588 132 ) ( 1087.9999847412 1256.0000152588 132 ) common/clip 0 160 0 0.25 0.25 0 0 0
 ( 1167.9999847412 1256.0000152588 136 ) ( 1087.9999847412 1256.0000152588 136 ) ( 1167.9999847412 1256.0000152588 104 ) common/clip 219.011428833 0 0 0.2628656328 0.25 0 0 0
-( 1087.9999847412 1232 64 ) ( 1167.9999847412 1232.0000152588 64 ) ( 1087.9999847412 1256.0000152588 64 ) common/clip 0 160 -0 0.25 0.25 0 0 0
+( 1087.9999847412 1232 64 ) ( 1167.9999847412 1232.0000152588 64 ) ( 1087.9999847412 1256.0000152588 64 ) common/clip 0 160 0 0.25 0.25 0 0 0
 ( 1087.9999847412 1240.0000152588 104 ) ( 1087.9999847412 1240.0000152588 136 ) ( 1168 1240.0000152588 104 ) common/clip 219.011428833 0 0 0.2628656328 0.25 0 0 0
 ( 1091.9999847412 1232.0000152588 104 ) ( 1091.9999847412 1256.0000152588 104 ) ( 1091.9999847412 1232.0000152588 136 ) common/clip 156.9478302002 0 0 0.2628656328 0.25 0 0 0
-( -768.0001525879 1244 132 ) ( -768.0001678467 1248 128 ) ( -640.0001525879 1243.9999847412 132 ) common/clip 0 160 -0 0.25 0.25 0 0 0
+( -768.0001525879 1244 132 ) ( -768.0001678467 1248 128 ) ( -640.0001525879 1243.9999847412 132 ) common/clip 0 160 0 0.25 0.25 0 0 0
 ( 1175.9999847412 1256.0000152588 -64 ) ( 1168 1248.0000152588 -64 ) ( 1175.9999847412 1256.0000152588 64 ) common/clip 195.0345916748 0 0 -0.2628656328 0.25 0 0 0
 }
 {
@@ -46513,6 +46513,17 @@ exx/base-metal03
 ( 2240 460 76 ) ( 2240 452 -52 ) ( 2240 460 -52 ) common/caulk 144 48 0 0.25 0.25 134217728 0 0
 ( 2256 444 -60 ) ( 2252 440 -60 ) ( 2256 444 68 ) exx/base-metal03 144 16 0 0.25 0.25 134217728 0 0
 }
+{
+( 3376 456 304 ) ( 3376 432 304 ) ( 3336 456 304 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 3376 464 304 ) ( 3336 464 304 ) ( 3376 464 256 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 3376 456 304 ) ( 3376 456 256 ) ( 3376 432 304 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 3336 432 256 ) ( 3376 432 256 ) ( 3336 456 256 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 3336 432 256 ) ( 3336 432 304 ) ( 3376 432 256 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 3336 432 256 ) ( 3336 456 256 ) ( 3336 432 304 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -64 440 304 ) ( -64 448 296 ) ( 64 440 304 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 3360 64 304 ) ( 3368 64 296 ) ( 3360 -64 304 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 3336 64 288 ) ( 3344 64 296 ) ( 3336 -64 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "light"

diff --git a/maps/azalea.map.options b/maps/azalea.map.options
index 99a5fc0e775302f1960b7af6e7eb7510ac94347c..ca40fcaa3d78d2edd65ae7ebb7e600e7594087d6 100644 (file)
--- a/maps/azalea.map.options
+++ b/maps/azalea.map.options
@@ -1,6 +1,6 @@
--bsp + -samplesize 4
+-bsp + -samplesize 6
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
 -sRGB
-Version: 7
+Version: 8