Further tweaks

diff --git a/maps/confusor.map b/maps/confusor.map
index f28aced1fa2934466dc3652bb315d8d58f51dba1..430c5ef99c481dcd76e035b7a96b8df788231c6b 100644 (file)
--- a/maps/confusor.map
+++ b/maps/confusor.map
@@ -2,9 +2,9 @@
 "classname" "worldspawn"
 {
 ( -64 80 464 ) ( 32 48 464 ) ( 64 80 464 ) common/caulk 0 128 -90 0.0625 -0.625 0 0 0
-( -96 96 624 ) ( -64 64 640 ) ( -64 64 624 ) common/caulk -0 93.0908813477 0 0.0625 -0.6875 0 0 0
-( -32 64 512 ) ( 32 64 528 ) ( 32 64 512 ) trak5x/floor-hex1 256 186.1817626953 180 0.25 0.34375 0 0 0
-( 64 80 640 ) ( 32 48 640 ) ( -64 80 640 ) common/caulk 128 0 0 0.625 0.0625 0 0 0
+( -96 96 560 ) ( -64 64 576 ) ( -64 64 560 ) common/caulk 0 186.1817932129 0 0.0625 -0.6875 0 0 0
+( -32 64 512 ) ( 32 64 528 ) ( 32 64 512 ) trak5x/floor-hex1 256 438.8569335938 180 0.25 0.2187499851 0 0 0
+( 64 80 576 ) ( 32 48 576 ) ( -64 80 576 ) common/caulk 128 0 0 0.625 0.0625 0 0 0
 ( 96 96 624 ) ( 64 64 624 ) ( 64 64 640 ) common/caulk 0 93.0908813477 180 0.0625 0.6875 0 0 0
 ( 80 80 480 ) ( -48 80 480 ) ( 80 80 464 ) common/caulk 128 162.9091186523 0 0.625 0.6875 0 0 0
 }
@@ -43,8 +43,8 @@
 {
 ( 80 64 464 ) ( 48 -32 464 ) ( 80 -64 464 ) common/caulk 0 128 0 -0.0625 0.625 0 0 0
 ( 96 96 624 ) ( 64 64 640 ) ( 64 64 624 ) common/caulk -0 93.0908813477 0 0.0625 -0.6875 0 0 0
-( 64 64 624 ) ( 64 0 640 ) ( 64 0 624 ) trak5x/floor-hex1 256 186.1817626953 0 0.25 -0.34375 0 0 0
-( 80 -64 640 ) ( 48 -32 640 ) ( 80 64 640 ) common/caulk -0 128 0 0.0625 0.625 0 0 0
+( 64 64 624 ) ( 64 0 640 ) ( 64 0 624 ) trak5x/floor-hex1 256 438.8569335938 0 0.25 -0.2187499851 0 0 0
+( 72 -64 576 ) ( 40 -32 576 ) ( 72 64 576 ) common/caulk 128 128 0 0.0625 0.625 0 0 0
 ( 96 -96 624 ) ( 64 -64 624 ) ( 64 -64 640 ) common/caulk 0 93.0908813477 0 0.0625 -0.6875 0 0 0
 ( 80 -80 480 ) ( 80 48 480 ) ( 80 -80 464 ) common/caulk 128 162.9091186523 0 0.625 0.6875 0 0 0
 }
@@ -59,26 +59,26 @@
 {
 ( 64 -80 464 ) ( -32 -48 464 ) ( -64 -80 464 ) common/caulk 0 128 90 0.0625 -0.625 0 0 0
 ( 96 -96 624 ) ( 64 -64 640 ) ( 64 -64 624 ) common/caulk -0 93.0908813477 180 0.0625 0.6875 0 0 0
-( 48 -64 512 ) ( -16 -64 528 ) ( -16 -64 512 ) trak5x/floor-hex1 256 186.1817626953 0 0.25 -0.34375 0 0 0
-( -64 -80 640 ) ( -32 -48 640 ) ( 64 -80 640 ) common/caulk 128 -0 0 0.625 0.0625 0 0 0
-( -96 -96 624 ) ( -64 -64 624 ) ( -64 -64 640 ) common/caulk 0 93.0908813477 0 0.0625 -0.6875 0 0 0
+( 48 -64 512 ) ( -16 -64 528 ) ( -16 -64 512 ) trak5x/floor-hex1 256 438.8569335938 0 0.25 -0.2187499851 0 0 0
+( -64 -80 576 ) ( -32 -48 576 ) ( 64 -80 576 ) common/caulk 128 0 0 0.625 0.0625 0 0 0
+( -96 -96 560 ) ( -64 -64 560 ) ( -64 -64 576 ) common/caulk 0 186.1817932129 0 0.0625 -0.6875 0 0 0
 ( -80 -80 480 ) ( 48 -80 480 ) ( -80 -80 464 ) common/caulk 128 162.9091186523 0 0.625 0.6875 0 0 0
 }
 {
 ( -80 -64 464 ) ( -48 32 464 ) ( -80 64 464 ) common/caulk 0 128 0 0.0625 -0.625 0 0 0
-( -96 -96 624 ) ( -64 -64 640 ) ( -64 -64 624 ) common/caulk -0 93.0908813477 180 0.0625 0.6875 0 0 0
-( -64 -48 624 ) ( -64 16 640 ) ( -64 16 624 ) trak5x/floor-hex1 256 186.1817626953 180 0.25 0.34375 0 0 0
-( -80 64 640 ) ( -48 32 640 ) ( -80 -64 640 ) common/caulk 0 128 0 0.0625 0.625 0 0 0
-( -96 96 624 ) ( -64 64 624 ) ( -64 64 640 ) common/caulk 0 93.0908813477 180 0.0625 0.6875 0 0 0
+( -96 -96 560 ) ( -64 -64 576 ) ( -64 -64 560 ) common/caulk 0 186.1817932129 180 0.0625 0.6875 0 0 0
+( -64 -48 560 ) ( -64 16 576 ) ( -64 16 560 ) trak5x/floor-hex1 256 438.8569335938 180 0.25 0.2187499851 0 0 0
+( -80 64 576 ) ( -48 32 576 ) ( -80 -64 576 ) common/caulk 0 128 0 0.0625 0.625 0 0 0
+( -96 96 560 ) ( -64 64 560 ) ( -64 64 576 ) common/caulk 0 186.1817932129 180 0.0625 0.6875 0 0 0
 ( -80 80 480 ) ( -80 -48 480 ) ( -80 80 464 ) common/caulk 128 162.9091186523 0 0.625 0.6875 0 0 0
 }
 {
-( 64 -64 640 ) ( 64 64 640 ) ( -64 -64 640 ) trak5x/floor-floor2d 0 0 0 0.25 -0.25 0 0 0
-( 64 -64 640 ) ( -64 -64 640 ) ( 64 -64 656 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 64 -64 640 ) ( 64 -64 656 ) ( 64 64 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -64 64 656 ) ( 64 64 656 ) ( -64 -64 656 ) common/caulk -0 0 0 0.25 0.25 0 0 0
-( -64 64 656 ) ( -64 64 640 ) ( 64 64 656 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -64 32 656 ) ( -64 -96 656 ) ( -64 32 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 64 -64 576 ) ( 64 64 576 ) ( -64 -64 576 ) trak5x/floor-floor2d 0 0 0 0.25 -0.25 0 0 0
+( 64 -64 576 ) ( -64 -64 576 ) ( 64 -64 592 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
+( 64 -64 576 ) ( 64 -64 592 ) ( 64 64 576 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
+( -64 64 592 ) ( 64 64 592 ) ( -64 -64 592 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -64 64 592 ) ( -64 64 576 ) ( 64 64 592 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
+( -64 32 592 ) ( -64 -96 592 ) ( -64 32 576 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
 }
 {
 ( -64 -256 128 ) ( -256 -256 128 ) ( -64 -192 128 ) trak5x/floor-floor2e 0 0 -90 0.25 0.25 0 0 0
@@ -1133,8 +1133,8 @@
 {
 "classname" "func_door"
 "angle" "315"
-"lip" "60"
-"speed" "200"
+"lip" "80"
+"speed" "250"
 "health" "10"
 "targetname" "door_down"
 {
@@ -1148,8 +1148,8 @@
 {
 "classname" "func_door"
 "angle" "135"
-"lip" "60"
-"speed" "200"
+"lip" "80"
+"speed" "250"
 "health" "10"
 "targetname" "door_down"
 {
@@ -1205,10 +1205,10 @@
 "classname" "trigger_warpzone"
 "targetname" "trigger_warpzone1"
 {
-( 64 -64 496 ) ( 64 64 496 ) ( -64 -64 496 ) common/warpzone 0 0 0 0.25 -0.25 0 0 0
+( 72 -64 498 ) ( 72 64 498 ) ( -56 -64 498 ) common/warpzone 224 0 0 0.25 -0.25 0 0 0
 ( 64 -64 512 ) ( -64 -64 512 ) ( 64 -64 528 ) common/trigger 0 64 0 0.25 -0.25 0 0 0
 ( 64 -64 512 ) ( 64 -64 528 ) ( 64 64 512 ) common/trigger 0 64 180 0.25 0.25 0 0 0
-( -64 64 640 ) ( 64 64 640 ) ( -64 -64 640 ) common/trigger 0 0 0 0.25 -0.25 0 0 0
+( -64 64 576 ) ( 64 64 576 ) ( -64 -64 576 ) common/trigger 0 0 0 0.25 -0.25 0 0 0
 ( -64 64 528 ) ( -64 64 512 ) ( 64 64 528 ) common/trigger 0 64 0 0.25 -0.25 0 0 0
 ( -64 32 528 ) ( -64 -96 528 ) ( -64 32 512 ) common/trigger 128 64 180 0.25 0.25 0 0 0
 }
@@ -1217,7 +1217,7 @@
 "classname" "trigger_warpzone"
 "target" "trigger_warpzone1"
 {
-( 64 64 -48 ) ( 64 -64 -48 ) ( -64 64 -48 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
+( 64 64 -50 ) ( 64 -64 -50 ) ( -64 64 -50 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
 ( 64 64 -64 ) ( -64 64 -64 ) ( 64 64 -80 ) common/trigger 0 64 0 0.25 0.25 0 0 0
 ( 64 64 -64 ) ( 64 64 -80 ) ( 64 -64 -64 ) common/trigger 0 64 0 0.25 0.25 0 0 0
 ( -64 -64 -128 ) ( 64 -64 -128 ) ( -64 64 -128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
@@ -1257,7 +1257,7 @@
 {
 "classname" "trigger_push"
 "target" "target_position1"
-"height" "130"
+"height" "115"
 {
 ( 512 -384 160 ) ( 512 -512 160 ) ( 384 -384 160 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 496 -416 160 ) ( 368 -416 160 ) ( 496 -416 128 ) common/trigger 64 0 0 0.25 0.25 0 0 0