Stub of p7.

4 files changed, 129 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index c58ca69..dcc4f2a 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,8 @@ PARTS := maps/p0_master.map \
          maps/p3_dretchpwner.map \
          maps/p4_thepress.map \
          maps/p5_euclid.map \
-         maps/p6_engineering.map
+         maps/p6_engineering.map \
+         maps/p7_nsa.map
 WHOLE := maps/analmango
 
 MAP ?= analmango
diff --git a/maps/p5_euclid.map b/maps/p5_euclid.map
index cb01188..d6fecfd 100644
--- a/maps/p5_euclid.map
+++ b/maps/p5_euclid.map
@@ -876,12 +876,12 @@
 }
 // brush 95
 {
-( -920 496 -448 ) ( -1064 304 -448 ) ( -933.375 496 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -933.375 496 -448 ) ( -1064 304 -448 ) ( -1064 304 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -920 496 -640 ) ( -1064 304 -640 ) ( -1048 304 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -920 496 -448 ) ( -1048 304 -640 ) ( -1048 304 -448 ) analmango/euclid_wall 213.3333129883 341.3332519531 0 0.375 0.375 0 0 0
-( -933.375 496 -448 ) ( -933.375 496 -640 ) ( -920 496 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -1048 304 -448 ) ( -1064 304 -640 ) ( -1064 304 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1048 304 -448 ) ( -1056 312 -448 ) ( -920 496 -448 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( -933.375 496 -448 ) ( -1056 312 -448 ) ( -1056 312 -640 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( -920 496 -640 ) ( -1056 312 -640 ) ( -1048 304 -640 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( -920 496 -448 ) ( -1048 304 -640 ) ( -1048 304 -448 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( -933.375 496 -448 ) ( -933.375 496 -640 ) ( -920 496 -448 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( -1048 304 -448 ) ( -1056 312 -640 ) ( -1056 312 -448 ) common/discard 0 0 0 0.5 0.5 0 0 0
 }
 // brush 96
 {
diff --git a/maps/p6_engineering.map b/maps/p6_engineering.map
index 111054a..a8ab361 100644
--- a/maps/p6_engineering.map
+++ b/maps/p6_engineering.map
@@ -2,7 +2,7 @@
 // entity 0
 {
 "classname" "worldspawn"
-"mapcat_prefix" "p2_"
+"mapcat_prefix" "p6_"
 // brush 0
 {
 ( 240 -288 -64 ) ( 240 -368 -64 ) ( 80 -368 -64 ) niveus/flr03r2_a 0 32 0 0.5 0.5 0 0 0
diff --git a/maps/p7_nsa.map b/maps/p7_nsa.map
new file mode 100644
index 0000000..8fd139d
--- /dev/null
+++ b/maps/p7_nsa.map
@@ -0,0 +1,120 @@
+
+// entity 0
+{
+"classname" "worldspawn"
+"mapcat_prefix" "p7_"
+// brush 0
+{
+( -920 112 -448 ) ( -1064 304 -448 ) ( -1048 304 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -933.375 112 -448 ) ( -1064 304 -640 ) ( -1064 304 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -920 112 -640 ) ( -1064 304 -640 ) ( -933.375 112 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1048 304 -448 ) ( -1048 304 -640 ) ( -920 112 -448 ) analmango/euclid_wall 213.3333129883 341.3332519531 0 0.375 0.375 0 0 0
+( -920 112 -448 ) ( -933.375 112 -640 ) ( -933.375 112 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1048 304 -640 ) ( -1064 304 -448 ) ( -1064 304 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 1
+{
+( -728 512 -448 ) ( -728 496 -448 ) ( -920 512 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -728 512 -448 ) ( -920 512 -448 ) ( -728 512 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -728 512 -448 ) ( -728 512 -640 ) ( -728 496 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -920 496 -640 ) ( -728 496 -640 ) ( -920 512 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -920 496 -640 ) ( -920 496 -448 ) ( -728 496 -640 ) analmango/euclid_wall 405.3334960938 341.3332519531 0 0.375 0.375 0 0 0
+( -920 496 -640 ) ( -920 512 -640 ) ( -920 496 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 2
+{
+( -1048 304 -448 ) ( -1056 312 -448 ) ( -920 496 -448 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( -933.375 496 -448 ) ( -1056 312 -448 ) ( -1056 312 -640 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( -920 496 -640 ) ( -1056 312 -640 ) ( -1048 304 -640 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( -920 496 -448 ) ( -1048 304 -640 ) ( -1048 304 -448 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( -933.375 496 -448 ) ( -933.375 496 -640 ) ( -920 496 -448 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( -1048 304 -448 ) ( -1056 312 -640 ) ( -1056 312 -448 ) common/discard 0 0 0 0.5 0.5 0 0 0
+}
+// brush 3
+{
+( -1048 304 -448 ) ( -1144 384 -448 ) ( -1144 400 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1144 384 -448 ) ( -1144 400 -640 ) ( -1144 400 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1048 304 -640 ) ( -1144 400 -448 ) ( -1144 400 -640 ) niveus/base_wall 0 0 0 0.5 0.5 0 0 0
+( -1048 304 -640 ) ( -1144 400 -640 ) ( -1144 384 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1064 304 -640 ) ( -1064 304 -448 ) ( -1048 304 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1064 304 -448 ) ( -1144 384 -640 ) ( -1144 384 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 4
+{
+( -1000 576 -448 ) ( -1408 576 -448 ) ( -1408 592 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1000 592 -640 ) ( -1408 592 -448 ) ( -1408 592 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1000 592 -448 ) ( -1000 576 -640 ) ( -1000 576 -448 ) common/caulk -0 0 0 0.5 0.5 0 0 0
+( -1000 576 -640 ) ( -1408 592 -640 ) ( -1408 576 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1000 576 -448 ) ( -1408 576 -640 ) ( -1408 576 -448 ) niveus/base_wall 0 0 0 0.5 0.5 0 0 0
+( -1408 592 -640 ) ( -1408 576 -448 ) ( -1408 576 -640 ) common/caulk -0 0 0 0.5 0.5 0 0 0
+}
+// brush 5
+{
+( -1144 384 -448 ) ( -1408 384 -448 ) ( -1408 400 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1144 400 -640 ) ( -1408 400 -448 ) ( -1408 400 -640 ) niveus/base_wall 0 0 0 0.5 0.5 0 0 0
+( -1144 384 -640 ) ( -1144 400 -448 ) ( -1144 400 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1144 384 -640 ) ( -1408 400 -640 ) ( -1408 384 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1144 384 -448 ) ( -1408 384 -640 ) ( -1408 384 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1408 384 -448 ) ( -1408 400 -640 ) ( -1408 400 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 6
+{
+( -920 496 -448 ) ( -1024 600 -448 ) ( -920 512 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -920 512 -640 ) ( -1008 600 -448 ) ( -1008 600 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -920 512 -448 ) ( -920 512 -640 ) ( -920 496 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -920 512 -640 ) ( -1024 600 -640 ) ( -920 496 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -920 496 -448 ) ( -1024 600 -640 ) ( -1024 600 -448 ) niveus/base_wall 0 0 0 0.5 0.5 0 0 0
+( -1000 576 -448 ) ( -1000 576 -640 ) ( -1000 592 -448 ) common/caulk -0 0 0 0.5 0.5 0 0 0
+}
+// brush 7
+{
+( -1408 576 -448 ) ( -1408 400 -448 ) ( -1424 576 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1408 576 -448 ) ( -1424 576 -448 ) ( -1408 576 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1408 576 -448 ) ( -1408 576 -640 ) ( -1408 400 -448 ) niveus/cable 0 0 0 0.5 0.5 0 0 0
+( -1424 400 -640 ) ( -1408 400 -640 ) ( -1424 576 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1424 400 -640 ) ( -1424 400 -448 ) ( -1408 400 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1424 400 -640 ) ( -1424 576 -640 ) ( -1424 400 -448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 8
+{
+( -1408 400 -448 ) ( -1144 400 -448 ) ( -1408 576 -448 ) niveus/base_wall 0 0 0 0.5 0.5 0 0 0
+( -1000 576 -432 ) ( -1408 576 -448 ) ( -1000 576 -448 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
+( -1144 400 -448 ) ( -1144 400 -432 ) ( -1000 576 -448 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
+( -1408 576 -432 ) ( -1144 400 -432 ) ( -1408 400 -432 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1144 400 -432 ) ( -1144 400 -448 ) ( -1408 400 -448 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
+( -1408 400 -448 ) ( -1408 576 -432 ) ( -1408 400 -432 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
+}
+// brush 9
+{
+( -1144 400 -448 ) ( -1048 304 -448 ) ( -1000 576 -448 ) niveus/base_wall 0 0 0 0.5 0.5 0 0 0
+( -1000 576 -432 ) ( -1000 576 -448 ) ( -920 496 -432 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
+( -1048 304 -448 ) ( -1048 304 -432 ) ( -920 496 -448 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
+( -1000 576 -432 ) ( -1048 304 -432 ) ( -1144 400 -432 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1048 304 -432 ) ( -1048 304 -448 ) ( -1144 400 -448 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
+( -1000 576 -448 ) ( -1000 576 -432 ) ( -1144 400 -448 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
+}
+// brush 10
+{
+( -1000 576 -640 ) ( -1048 304 -640 ) ( -1144 400 -640 ) niveus/base_flat_dark 0 0 0 0.5 0.5 0 0 0
+( -920 496 -656 ) ( -1000 576 -640 ) ( -1000 576 -656 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -920 496 -640 ) ( -1048 304 -656 ) ( -1048 304 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1144 400 -656 ) ( -1048 304 -656 ) ( -1000 576 -656 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1144 400 -640 ) ( -1048 304 -640 ) ( -1048 304 -656 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1144 400 -640 ) ( -1000 576 -656 ) ( -1000 576 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 11
+{
+( -1408 576 -640 ) ( -1144 400 -640 ) ( -1408 400 -640 ) niveus/base_flat_dark 0 0 0 0.5 0.5 0 0 0
+( -1000 576 -640 ) ( -1408 576 -640 ) ( -1000 576 -656 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1000 576 -640 ) ( -1144 400 -656 ) ( -1144 400 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1408 400 -656 ) ( -1144 400 -656 ) ( -1408 576 -656 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1408 400 -640 ) ( -1144 400 -640 ) ( -1144 400 -656 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1408 400 -656 ) ( -1408 576 -656 ) ( -1408 400 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+}
+// entity 1
+{
+"classname" "light"
+"origin" "-1184.000000 504.000000 -544.000000"
+"light" "100"
+}