a couple fixes to "maze"

diff --git a/maps/maze.map b/maps/maze.map
index e559ccd1b956eea3c192913019b95202a0ebc475..de4a87a7ea7d1853a4a301ccf9dc7134aa0dabb6 100644 (file)
--- a/maps/maze.map
+++ b/maps/maze.map
@@ -12,7 +12,7 @@
 ( -256 -1536 16 ) ( -128 -1536 16 ) ( -256 -1536 0 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
 ( -256 -1792 48 ) ( -256 -1792 32 ) ( -256 -1664 48 ) exx/trim-baseboard02 0 128 0 0.25 0.25 0 0 0
 ( -144 -1664 -64 ) ( -272 -1664 -64 ) ( -144 -1792 -64 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
-( -192 -1024 0 ) ( -192 -1024 16 ) ( -320 -1024 0 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
+( -192 -1152 0 ) ( -192 -1152 16 ) ( -320 -1152 0 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
 ( -128 -1024 32 ) ( -128 -1152 32 ) ( -128 -1024 48 ) exx/trim-baseboard02 0 128 0 0.25 0.25 0 0 0
 ( -1408 64 -32 ) ( -1376 64 -32 ) ( -1408 -64 -32 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
 }
@@ -1088,7 +1088,7 @@ map_glowplant/sand
 ( -256 -1792 96 ) ( -256 -1664 96 ) ( -128 -1792 96 ) exx/panel-metal05 0 0 0 0.25 0.25 0 0 0
 ( -256 -1536 16 ) ( -128 -1536 16 ) ( -256 -1536 0 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
 ( -256 -1792 48 ) ( -256 -1792 32 ) ( -256 -1664 48 ) map_stormkeep/largebrick1a 0 128 0 0.25 0.25 0 0 0
-( -192 -1024 0 ) ( -192 -1024 16 ) ( -320 -1024 0 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
+( -192 -1152 0 ) ( -192 -1152 16 ) ( -320 -1152 0 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
 ( -128 -1024 32 ) ( -128 -1152 32 ) ( -128 -1024 48 ) map_stormkeep/largebrick1a 0 128 0 0.25 0.25 0 0 0
 ( -1408 -64 -32 ) ( -1376 64 -32 ) ( -1408 64 -32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -1305,6 +1305,7 @@ map_glowplant/sand
 ( 1024 728 260 ) ( 1056 728 260 ) ( 1024 600 260 ) exx/trim-baseboard02 0 96 0 0.25 0.25 0 0 0
 ( -64 1168 376 ) ( -64 1304 272 ) ( 64 1168 376 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 ( 3340 1248 -64 ) ( 3356 1296 -64 ) ( 3340 1248 64 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+( 3328 1056 64 ) ( 3360 1024 -64 ) ( 3328 1056 -64 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 4224 1024 388 ) ( 3712 1024 388 ) ( 4224 1152 388 ) exx/panel-metal01c 0 0 -90 0.25 0.25 0 0 0
@@ -1385,8 +1386,8 @@ map_glowplant/sand
 }
 {
 "classname" "info_player_deathmatch"
-"origin" "-838.000000 2102.000000 -28.000000"
-"angle" "-90.000000"
+"origin" "-810.000000 1798.000000 -28.000000"
+"angle" "-180.000000"
 }
 {
 "classname" "weapon_rocketlauncher"
@@ -1394,7 +1395,8 @@ map_glowplant/sand
 }
 {
 "classname" "weapon_hagar"
-"origin" "672.000000 -2080.000000 -64.000000"
+"origin" "-382.000000 1152.000000 -56.000000"
+"angle" "-90.000000"
 }
 {
 "classname" "weapon_electro"
@@ -1405,10 +1407,6 @@ map_glowplant/sand
 "origin" "768.000000 512.000000 -64.000000"
 }
 {
-"classname" "weapon_campingrifle"
-"origin" "-384.000000 896.000000 -64.000000"
-}
-{
 "classname" "weapon_grenadelauncher"
 "origin" "544.000000 -448.000000 -64.000000"
 }
@@ -1442,11 +1440,13 @@ map_glowplant/sand
 }
 {
 "classname" "item_rockets"
-"origin" "544.000000 -2080.000000 -64.000000"
+"origin" "-382.000000 1280.000000 -56.000000"
+"angle" "-90.000000"
 }
 {
 "classname" "item_rockets"
-"origin" "800.000000 -2080.000000 -64.000000"
+"origin" "-382.000000 1024.000000 -56.000000"
+"angle" "-90.000000"
 }
 {
 "classname" "weapon_uzi"
@@ -1486,39 +1486,39 @@ map_glowplant/sand
 }
 {
 "classname" "item_health_small"
-"origin" "-1152.000000 -768.000000 -64.000000"
+"origin" "-824.000000 -768.000000 -64.000000"
 }
 {
 "classname" "item_health_small"
-"origin" "-1728.000000 -768.000000 -64.000000"
+"origin" "-1400.000000 -768.000000 -64.000000"
 }
 {
 "classname" "item_health_small"
-"origin" "-1664.000000 -768.000000 -64.000000"
+"origin" "-1336.000000 -768.000000 -64.000000"
 }
 {
 "classname" "item_health_small"
-"origin" "-1600.000000 -768.000000 -64.000000"
+"origin" "-1272.000000 -768.000000 -64.000000"
 }
 {
 "classname" "item_health_small"
-"origin" "-1536.000000 -768.000000 -64.000000"
+"origin" "-1208.000000 -768.000000 -64.000000"
 }
 {
 "classname" "item_health_small"
-"origin" "-1472.000000 -768.000000 -64.000000"
+"origin" "-1144.000000 -768.000000 -64.000000"
 }
 {
 "classname" "item_health_small"
-"origin" "-1408.000000 -768.000000 -64.000000"
+"origin" "-1080.000000 -768.000000 -64.000000"
 }
 {
 "classname" "item_health_small"
-"origin" "-1344.000000 -768.000000 -64.000000"
+"origin" "-1016.000000 -768.000000 -64.000000"
 }
 {
 "classname" "item_health_small"
-"origin" "-1280.000000 -768.000000 -64.000000"
+"origin" "-952.000000 -768.000000 -64.000000"
 }
 {
 "classname" "item_armor_small"
@@ -1550,7 +1550,7 @@ map_glowplant/sand
 }
 {
 "classname" "item_health_small"
-"origin" "-1216.000000 -768.000000 -64.000000"
+"origin" "-888.000000 -768.000000 -64.000000"
 }
 {
 "classname" "item_armor_small"
@@ -1565,58 +1565,14 @@ map_glowplant/sand
 "origin" "0.000000 192.000000 -64.000000"
 }
 {
-"classname" "trigger_hurt"
-{
-( -4800 8192 2048 ) ( -4800 -8128 2048 ) ( -8128 8192 2048 ) common/trigger -0 0 0 0.25 0.25 0 0 0
-( -4864 8192 384 ) ( -8192 8192 384 ) ( -4864 8192 256 ) common/trigger 0 -0 0 0.25 0.25 0 0 0
-( -4800 8192 2048 ) ( -4800 8192 1920 ) ( -4800 -8128 2048 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -8192 -8128 256 ) ( -4864 -8128 256 ) ( -8192 8192 256 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -8192 -8192 256 ) ( -8192 -8192 384 ) ( -4864 -8192 256 ) common/trigger 0 -0 0 0.25 0.25 0 0 0
-( -8192 -8128 256 ) ( -8192 8192 256 ) ( -8192 -8128 384 ) common/trigger 0 -0 0 0.25 0.25 0 0 0
-}
-}
-{
-"classname" "trigger_hurt"
-{
-( 8192 4800 2048 ) ( -8128 4800 2048 ) ( 8192 8128 2048 ) common/trigger 0 0 -90 0.25 0.25 0 0 0
-( 4928 4736 384 ) ( 4928 8064 384 ) ( 4928 4736 256 ) common/trigger 0 0 0 -0.25 0.25 0 0 0
-( 8192 4800 2048 ) ( 8192 4800 1920 ) ( -8128 4800 2048 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -8128 8192 256 ) ( -8128 4864 256 ) ( 8192 8192 256 ) common/trigger 0 0 -90 0.25 0.25 0 0 0
-( -4800 8064 256 ) ( -4800 8064 384 ) ( -4800 4736 256 ) common/trigger -0 0 0 -0.25 0.25 0 0 0
-( -8128 8192 256 ) ( 8192 8192 256 ) ( -8128 8192 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-}
-}
-{
-"classname" "trigger_hurt"
-{
-( 8256 8192 2048 ) ( 8256 -8128 2048 ) ( 4928 8192 2048 ) common/trigger -0 0 0 0.25 0.25 0 0 0
-( 8192 8192 384 ) ( 4864 8192 384 ) ( 8192 8192 256 ) common/trigger 0 -0 0 0.25 0.25 0 0 0
-( 8192 8192 384 ) ( 8192 8192 256 ) ( 8192 -8128 384 ) common/trigger 0 -0 0 0.25 0.25 0 0 0
-( 4864 -8128 256 ) ( 8192 -8128 256 ) ( 4864 8192 256 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 4864 -8192 256 ) ( 4864 -8192 384 ) ( 8192 -8192 256 ) common/trigger 0 -0 0 0.25 0.25 0 0 0
-( 4928 -8128 1920 ) ( 4928 8192 1920 ) ( 4928 -8128 2048 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-}
-}
-{
-"classname" "trigger_hurt"
-{
-( 8192 -8256 2048 ) ( -8128 -8256 2048 ) ( 8192 -4928 2048 ) common/trigger 0 0 -90 0.25 0.25 0 0 0
-( 4928 -8320 384 ) ( 4928 -4992 384 ) ( 4928 -8320 256 ) common/trigger 0 0 0 -0.25 0.25 0 0 0
-( 8192 -8192 384 ) ( 8192 -8192 256 ) ( -8128 -8192 384 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -8128 -4864 256 ) ( -8128 -8192 256 ) ( 8192 -4864 256 ) common/trigger 0 0 -90 0.25 0.25 0 0 0
-( -4800 -4992 256 ) ( -4800 -4992 384 ) ( -4800 -8320 256 ) common/trigger -0 0 0 -0.25 0.25 0 0 0
-( -8000 -5184 1920 ) ( 8320 -5184 1920 ) ( -8000 -5184 2048 ) common/trigger -0 0 0 0.25 0.25 0 0 0
-}
-}
-{
 "classname" "info_player_deathmatch"
-"origin" "0.000000 -268.000000 -40.000000"
+"origin" "0.000000 -12.000000 -40.000000"
 "angle" "-90.000000"
 }
 {
 "classname" "info_player_deathmatch"
-"origin" "-1216.000000 108.000000 -40.000000"
-"angle" "89.999992"
+"origin" "-684.000000 1216.000000 -40.000000"
+"angle" "-179.999985"
 }
 {
 "classname" "info_player_deathmatch"
@@ -1635,12 +1591,12 @@ map_glowplant/sand
 }
 {
 "classname" "info_player_deathmatch"
-"origin" "0.000000 -2132.000000 -40.000000"
-"angle" "90.000000"
+"origin" "-1624.000000 -2132.000000 -28.000000"
+"angle" "0.000003"
 }
 {
 "classname" "info_player_deathmatch"
-"origin" "-876.000000 -2726.000000 12.000000"
+"origin" "1171.000000 -693.000000 -38.000000"
 "angle" "90.000000"
 }
 {
@@ -1660,3 +1616,74 @@ map_glowplant/sand
 "classname" "item_health_mega"
 "origin" "-636.000000 208.000000 -64.000000"
 }
+{
+"classname" "info_player_deathmatch"
+"origin" "442.000000 -2132.000000 -28.000000"
+"angle" "90.000000"
+}
+{
+"classname" "info_player_deathmatch"
+"origin" "-1216.000000 108.000000 -40.000000"
+"angle" "89.999992"
+}
+{
+"classname" "weapon_campingrifle"
+"origin" "-2.000000 -2048.000000 -56.000000"
+}
+{
+"classname" "weapon_fireball"
+"origin" "768.000000 1728.000000 -62.000000"
+}
+{
+"classname" "trigger_hurt"
+"dmg" "45"
+{
+( 14592 5632 1984 ) ( 14592 1536 1984 ) ( 4352 5632 1984 ) common/trigger -0 0 0 0.25 0.25 0 0 0
+( 14592 4864 2304 ) ( 4352 4864 2304 ) ( 14592 4864 -768 ) common/trigger -0 0 0 0.25 0.25 0 0 0
+( 8192 4864 2304 ) ( 8192 4864 -768 ) ( 8192 768 2304 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 4352 1536 -448 ) ( 14592 1536 -448 ) ( 4352 5632 -448 ) common/trigger -0 0 0 0.25 0.25 0 0 0
+( 4352 -4864 -768 ) ( 4352 -4864 2304 ) ( 14592 -4864 -768 ) common/trigger -0 0 0 0.25 0.25 0 0 0
+( 4352 1536 -768 ) ( 4352 5632 -768 ) ( 4352 1536 2304 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "trigger_hurt"
+"dmg" "45"
+{
+( 2048 -4096 1984 ) ( 2048 -8192 1984 ) ( -8192 -4096 1984 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 2048 -4864 2304 ) ( -8192 -4864 2304 ) ( 2048 -4864 -768 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 8192 -3584 2304 ) ( 8192 -3584 -768 ) ( 8192 -7680 2304 ) common/trigger -0 0 0 0.25 0.25 0 0 0
+( -8192 -8192 -448 ) ( 2048 -8192 -448 ) ( -8192 -4096 -448 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -8192 -8192 -768 ) ( -8192 -8192 2304 ) ( 2048 -8192 -768 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -8192 -8192 -768 ) ( -8192 -4096 -768 ) ( -8192 -8192 2304 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "trigger_hurt"
+"dmg" "45"
+{
+( 2048 5632 1984 ) ( 2048 1536 1984 ) ( -8192 5632 1984 ) common/trigger 0 -0 0 0.25 0.25 0 0 0
+( 2048 4864 2304 ) ( -8192 4864 2304 ) ( 2048 4864 -768 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -4352 4864 2304 ) ( -4352 4864 -768 ) ( -4352 768 2304 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -8192 1536 -448 ) ( 2048 1536 -448 ) ( -8192 5632 -448 ) common/trigger 0 -0 0 0.25 0.25 0 0 0
+( -8192 -4864 -768 ) ( -8192 -4864 2304 ) ( 2048 -4864 -768 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -8192 1536 -768 ) ( -8192 5632 -768 ) ( -8192 1536 2304 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "trigger_hurt"
+"dmg" "45"
+{
+( 2048 8960 1984 ) ( 2048 4864 1984 ) ( -8192 8960 1984 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 2048 8192 2304 ) ( -8192 8192 2304 ) ( 2048 8192 -768 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 8192 9472 2304 ) ( 8192 9472 -768 ) ( 8192 5376 2304 ) common/trigger -0 0 0 0.25 0.25 0 0 0
+( -8192 4864 -448 ) ( 2048 4864 -448 ) ( -8192 8960 -448 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -8192 4864 -768 ) ( -8192 4864 2304 ) ( 2048 4864 -768 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -8192 4864 -768 ) ( -8192 8960 -768 ) ( -8192 4864 2304 ) common/trigger -0 0 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "info_player_deathmatch"
+"origin" "-876.000000 -2726.000000 12.000000"
+"angle" "90.000000"
+}