Some more changes to Brokenworld

diff --git a/data/maps/brokenworld.bsp b/data/maps/brokenworld.bsp
index 70475f4eac6ef9e94e61fb65b869d5c4e7deaea4..566a2b362241dcc654218e77602e10133b19f8ae 100644 (file)
Binary files a/data/maps/brokenworld.bsp and b/data/maps/brokenworld.bsp differ

diff --git a/data/maps/brokenworld.map b/data/maps/brokenworld.map
index 68c014de2431db9b6a69b23163360c7ef4658c8f..7d3a193ac1213822e374d26e57ecb003d697568d 100644 (file)
--- a/data/maps/brokenworld.map
+++ b/data/maps/brokenworld.map
@@ -518,56 +518,56 @@ brokenworld/blink_red
 // brush 50\r
 {\r
 ( 6144 6144 -1792 ) ( 6144 -6144 -1792 ) ( -6144 6144 -1792 ) brokenworld/sky 0 0 0 0.5 0.5 0 0 0\r
-( 6144 6144 -1792 ) ( -6144 6144 -1792 ) ( 6144 6144 -1920 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( 6144 6144 -1792 ) ( 6144 6144 -1920 ) ( 6144 -6144 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( 6144 4864 -1792 ) ( -6144 4864 -1792 ) ( 6144 4864 -1920 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( 5376 6144 -1792 ) ( 5376 6144 -1920 ) ( 5376 -6144 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -6144 -6144 -1920 ) ( 6144 -6144 -1920 ) ( -6144 6144 -1920 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -6144 -6144 -1920 ) ( -6144 -6144 -1792 ) ( 6144 -6144 -1920 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -6144 -6144 -1920 ) ( -6144 6144 -1920 ) ( -6144 -6144 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -6144 -2816 -1920 ) ( -6144 -2816 -1792 ) ( 6144 -2816 -1920 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -5120 -6144 -1920 ) ( -5120 6144 -1920 ) ( -5120 -6144 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 }\r
 // brush 51\r
 {\r
 ( 6144 6144 1920 ) ( 6144 -6144 1920 ) ( -6144 6144 1920 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( 6144 6144 1920 ) ( -6144 6144 1920 ) ( 6144 6144 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( 6144 6144 1920 ) ( 6144 6144 1792 ) ( 6144 -6144 1920 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( 6144 4864 1920 ) ( -6144 4864 1920 ) ( 6144 4864 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( 5376 6144 1920 ) ( 5376 6144 1792 ) ( 5376 -6144 1920 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 ( -6144 -6144 1792 ) ( 6144 -6144 1792 ) ( -6144 6144 1792 ) brokenworld/sky 0 0 0 0.5 0.5 0 0 0\r
-( -6144 -6144 1792 ) ( -6144 -6144 1920 ) ( 6144 -6144 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -6144 -6144 1792 ) ( -6144 6144 1792 ) ( -6144 -6144 1920 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -6144 -2816 1792 ) ( -6144 -2816 1920 ) ( 6144 -2816 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -5120 -6144 1792 ) ( -5120 6144 1792 ) ( -5120 -6144 1920 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 }\r
 // brush 52\r
 {\r
-( -6144 6144 1792 ) ( -6144 4608 1792 ) ( -6272 6144 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -6144 6144 1536 ) ( -6272 6144 1536 ) ( -6144 6144 1408 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -6144 6144 1280 ) ( -6144 6144 1152 ) ( -6144 4608 1280 ) brokenworld/sky 0 0 0 0.5 0.5 0 0 0\r
-( -6272 4608 -1792 ) ( -6144 4608 -1792 ) ( -6272 6144 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -5760 -6144 1408 ) ( -5760 -6144 1536 ) ( -5632 -6144 1408 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -6272 4608 1408 ) ( -6272 6144 1408 ) ( -6272 4608 1536 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -5120 6144 1792 ) ( -5120 4608 1792 ) ( -5248 6144 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -5120 4864 1536 ) ( -5248 4864 1536 ) ( -5120 4864 1408 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -5120 8192 1280 ) ( -5120 8192 1152 ) ( -5120 6656 1280 ) brokenworld/sky 0 0 0 0.5 0.5 0 0 0\r
+( -5248 4608 -1792 ) ( -5120 4608 -1792 ) ( -5248 6144 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -4736 -2816 1408 ) ( -4736 -2816 1536 ) ( -4608 -2816 1408 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -5248 4608 1408 ) ( -5248 6144 1408 ) ( -5248 4608 1536 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 }\r
 // brush 53\r
 {\r
-( 6272 6144 1792 ) ( 6272 4608 1792 ) ( 6144 6144 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( 6272 6144 1536 ) ( 6144 6144 1536 ) ( 6272 6144 1408 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( 6272 6144 1536 ) ( 6272 6144 1408 ) ( 6272 4608 1536 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( 6144 4608 -1792 ) ( 6272 4608 -1792 ) ( 6144 6144 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( 6656 -6144 1408 ) ( 6656 -6144 1536 ) ( 6784 -6144 1408 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( 6144 4608 1152 ) ( 6144 6144 1152 ) ( 6144 4608 1280 ) brokenworld/sky 0 0 0 0.5 0.5 0 0 0\r
+( 5504 6144 1792 ) ( 5504 4608 1792 ) ( 5376 6144 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( 5504 4864 1536 ) ( 5376 4864 1536 ) ( 5504 4864 1408 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( 5504 5120 1536 ) ( 5504 5120 1408 ) ( 5504 3584 1536 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( 5376 4608 -1792 ) ( 5504 4608 -1792 ) ( 5376 6144 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( 5888 -2816 1408 ) ( 5888 -2816 1536 ) ( 6016 -2816 1408 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( 5376 4608 1152 ) ( 5376 6144 1152 ) ( 5376 4608 1280 ) brokenworld/sky 0 0 0 0.5 0.5 0 0 0\r
 }\r
 // brush 54\r
 {\r
-( -6144 -6144 1792 ) ( -4608 -6144 1792 ) ( -6144 -6272 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -6144 -6144 1280 ) ( -6144 -6272 1280 ) ( -6144 -6144 1152 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -6144 -6144 1536 ) ( -6144 -6144 1408 ) ( -4608 -6144 1536 ) brokenworld/sky 0 0 0 0.5 0.5 0 0 0\r
-( -4608 -6272 -1792 ) ( -4608 -6144 -1792 ) ( -6144 -6272 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( 6144 -5760 1152 ) ( 6144 -5760 1280 ) ( 6144 -5632 1152 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -4608 -6272 1408 ) ( -6144 -6272 1408 ) ( -4608 -6272 1536 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -6144 -2816 1792 ) ( -4608 -2816 1792 ) ( -6144 -2944 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -5120 -2816 1280 ) ( -5120 -2944 1280 ) ( -5120 -2816 1152 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -5888 -2816 1536 ) ( -5888 -2816 1408 ) ( -4352 -2816 1536 ) brokenworld/sky 0 0 0 0.5 0.5 0 0 0\r
+( -4608 -2944 -1792 ) ( -4608 -2816 -1792 ) ( -6144 -2944 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( 5376 -2432 1152 ) ( 5376 -2432 1280 ) ( 5376 -2304 1152 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -4608 -2944 1408 ) ( -6144 -2944 1408 ) ( -4608 -2944 1536 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
 }\r
 // brush 55\r
 {\r
-( -6144 6272 1792 ) ( -4608 6272 1792 ) ( -6144 6144 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -6144 6272 1280 ) ( -6144 6144 1280 ) ( -6144 6272 1152 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -6144 6272 1536 ) ( -6144 6272 1408 ) ( -4608 6272 1536 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -4608 6144 -1792 ) ( -4608 6272 -1792 ) ( -6144 6144 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( 6144 6656 1152 ) ( 6144 6656 1280 ) ( 6144 6784 1152 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
-( -4608 6144 1408 ) ( -6144 6144 1408 ) ( -4608 6144 1536 ) brokenworld/sky 0 0 0 0.5 0.5 0 0 0\r
+( -6144 4992 1792 ) ( -4608 4992 1792 ) ( -6144 4864 1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -5120 4992 1280 ) ( -5120 4864 1280 ) ( -5120 4992 1152 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -5888 4992 1536 ) ( -5888 4992 1408 ) ( -4352 4992 1536 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -4608 4864 -1792 ) ( -4608 4992 -1792 ) ( -6144 4864 -1792 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( 5376 5376 1152 ) ( 5376 5376 1280 ) ( 5376 5504 1152 ) common/caulk 0 0 0 0.5 0.5 0 0 0\r
+( -4608 4864 1408 ) ( -6144 4864 1408 ) ( -4608 4864 1536 ) brokenworld/sky 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
 // entity 1\r
@@ -2381,11 +2381,11 @@ evil8_base/e8_base1
 // brush 0\r
 {\r
 ( 6144 6144 -1536 ) ( 6144 -6144 -1536 ) ( -6144 6144 -1536 ) common/warpzone 0 0 0 0.5 0.5 0 0 0\r
-( 6144 6144 -1536 ) ( -6144 6144 -1536 ) ( 6144 6144 -1664 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
-( 6144 6144 -1536 ) ( 6144 6144 -1664 ) ( 6144 -6144 -1536 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 6144 4864 -1536 ) ( -6144 4864 -1536 ) ( 6144 4864 -1664 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 5376 6144 -1536 ) ( 5376 6144 -1664 ) ( 5376 -6144 -1536 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 ( -6144 -6144 -1792 ) ( 6144 -6144 -1792 ) ( -6144 6144 -1792 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
-( -6144 -6144 -1664 ) ( -6144 -6144 -1536 ) ( 6144 -6144 -1664 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
-( -6144 -6144 -1664 ) ( -6144 6144 -1664 ) ( -6144 -6144 -1536 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( -6144 -2816 -1664 ) ( -6144 -2816 -1536 ) ( 6144 -2816 -1664 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( -5120 -6144 -1664 ) ( -5120 6144 -1664 ) ( -5120 -6144 -1536 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
 // entity 173\r
@@ -2395,17 +2395,17 @@ evil8_base/e8_base1
 // brush 0\r
 {\r
 ( -6144 6144 1536 ) ( 6144 -6144 1536 ) ( 6144 6144 1536 ) common/warpzone 0 0 0 0.5 0.5 0 0 0\r
-( 6144 6144 1664 ) ( -6144 6144 1536 ) ( 6144 6144 1536 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
-( 6144 -6144 1536 ) ( 6144 6144 1664 ) ( 6144 6144 1536 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 6144 4864 1664 ) ( -6144 4864 1536 ) ( 6144 4864 1536 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 5376 -6144 1536 ) ( 5376 6144 1664 ) ( 5376 6144 1536 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 ( -6144 6144 1792 ) ( 6144 -6144 1792 ) ( -6144 -6144 1792 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
-( 6144 -6144 1664 ) ( -6144 -6144 1536 ) ( -6144 -6144 1664 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
-( -6144 -6144 1536 ) ( -6144 6144 1664 ) ( -6144 -6144 1664 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 6144 -2816 1664 ) ( -6144 -2816 1536 ) ( -6144 -2816 1664 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( -5120 -6144 1536 ) ( -5120 6144 1664 ) ( -5120 -6144 1664 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
 // entity 174\r
 {\r
 "classname" "misc_warpzone_position"\r
-"origin" "0.000000 0.000000 1536.000000"\r
+"origin" "128.000000 1024.000000 1536.000000"\r
 "target" "warpzone_1"\r
-"angles" "90.000000 180.000000 0.000000"\r
+"angles" "90.000000 0.000000 179.999985"\r
 }\r

diff --git a/data/maps/brokenworld/lm_0000.tga b/data/maps/brokenworld/lm_0000.tga
index 1d6fa83b14edacc6a1d1648a82941d21147cbae7..017c1a7ef3bf3aa401a5db0861a468759c2d9779 100644 (file)
Binary files a/data/maps/brokenworld/lm_0000.tga and b/data/maps/brokenworld/lm_0000.tga differ

diff --git a/data/maps/brokenworld/lm_0001.tga b/data/maps/brokenworld/lm_0001.tga
index 51c394e949f3ef9f8655f52057b8e7f1011c59cd..8f27e0fb2bfeba7956fa9b4b4d4eac897825d1f0 100644 (file)
Binary files a/data/maps/brokenworld/lm_0001.tga and b/data/maps/brokenworld/lm_0001.tga differ

diff --git a/data/maps/brokenworld/lm_0002.tga b/data/maps/brokenworld/lm_0002.tga
index a198207ef44d15050820e69b96600e9040ff2fad..162fd39a334ca38ed1cde97781eacf0d536dfda5 100644 (file)
Binary files a/data/maps/brokenworld/lm_0002.tga and b/data/maps/brokenworld/lm_0002.tga differ

diff --git a/data/maps/brokenworld/lm_0003.tga b/data/maps/brokenworld/lm_0003.tga
index c7b05c685042224603ae7520805eddb656f18f88..67a9d6e102e910f667eae055532e83790fcd959c 100644 (file)
Binary files a/data/maps/brokenworld/lm_0003.tga and b/data/maps/brokenworld/lm_0003.tga differ

diff --git a/data/maps/brokenworld/lm_0004.tga b/data/maps/brokenworld/lm_0004.tga
index 6e0c47a5c6308d6f9b89c86132c1d97624cd8245..7cc5a8a839dfdd7ba308087b7a643212f9b14a6d 100644 (file)
Binary files a/data/maps/brokenworld/lm_0004.tga and b/data/maps/brokenworld/lm_0004.tga differ

diff --git a/data/maps/brokenworld/lm_0005.tga b/data/maps/brokenworld/lm_0005.tga
index ceb0def58565e271d70409c9e1d64ebf6cb2f5bf..9cd254b22392d385eb3dd090dc6e934e55c4b453 100644 (file)
Binary files a/data/maps/brokenworld/lm_0005.tga and b/data/maps/brokenworld/lm_0005.tga differ

diff --git a/data/maps/brokenworld/lm_0006.tga b/data/maps/brokenworld/lm_0006.tga
index 2d50da58609a80a2cd9f23ca9b4f3a7502f3a7ed..f2564edfc3dc8c83ffc4862a990ed18ef3c1bea7 100644 (file)
Binary files a/data/maps/brokenworld/lm_0006.tga and b/data/maps/brokenworld/lm_0006.tga differ

diff --git a/data/maps/brokenworld/lm_0007.tga b/data/maps/brokenworld/lm_0007.tga
index 6f3f143b07469d6803d0f1a2902ca69bad1b4f66..a92777cfa32c8213a0e5bbe702d6a555fc5a034d 100644 (file)
Binary files a/data/maps/brokenworld/lm_0007.tga and b/data/maps/brokenworld/lm_0007.tga differ