summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--maps/p10_factory.map132
-rw-r--r--maps/p9_reactor.map24
3 files changed, 134 insertions, 25 deletions
diff --git a/Makefile b/Makefile
index 7091542..f5c47c2 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,8 @@ PARTS := maps/p0_master.map \
maps/p6_engineering.map \
maps/p7_uncommon.map \
maps/p8_outside.map \
- maps/p9_reactor.map
+ maps/p9_reactor.map \
+ maps/p10_factory.map
WHOLE := maps/analmango
MAP ?= analmango
diff --git a/maps/p10_factory.map b/maps/p10_factory.map
index 3fb7451..3fc3f8f 100644
--- a/maps/p10_factory.map
+++ b/maps/p10_factory.map
@@ -5,20 +5,128 @@
"mapcat_prefix" "p10_"
// brush 0
{
-( 1152 232 152 ) ( 1152 216 152 ) ( 960 232 152 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 1152 232 152 ) ( 960 232 152 ) ( 1152 232 0 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 1152 232 152 ) ( 1152 232 0 ) ( 1152 216 152 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 960 216 0 ) ( 1152 216 0 ) ( 960 232 0 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 960 216 0 ) ( 960 216 152 ) ( 1152 216 0 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 960 216 0 ) ( 960 232 0 ) ( 960 216 152 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 1152 216 136 ) ( 1152 200 136 ) ( 960 216 136 ) common/discard 0 32 0 0.5 0.5 0 0 0
+( 1152 216 152 ) ( 960 216 152 ) ( 1152 216 0 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( 1136 216 152 ) ( 1136 216 0 ) ( 1136 200 152 ) common/discard 32 0 0 0.5 0.5 0 0 0
+( 960 200 16 ) ( 1152 200 16 ) ( 960 216 16 ) common/discard 0 32 0 0.5 0.5 0 0 0
+( 960 200 0 ) ( 960 200 152 ) ( 1152 200 0 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( 976 200 0 ) ( 976 216 0 ) ( 976 200 152 ) common/discard 32 0 0 0.5 0.5 0 0 0
}
// brush 1
{
-( 1640 872 -200 ) ( 1640 776 -200 ) ( 1600 872 -200 ) common/nodiscard 16 0 0 0.5 0.5 0 0 0
-( 1664 968 -200 ) ( 1624 968 -200 ) ( 1664 968 -320 ) common/nodiscard 32 0 0 0.5 0.5 0 0 0
-( 1640 872 -200 ) ( 1640 872 -320 ) ( 1640 776 -200 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 1600 776 -320 ) ( 1640 776 -320 ) ( 1600 872 -320 ) common/nodiscard 16 0 0 0.5 0.5 0 0 0
-( 1600 776 -320 ) ( 1600 776 -200 ) ( 1640 776 -320 ) common/nodiscard 16 0 0 0.5 0.5 0 0 0
-( 1624 872 -320 ) ( 1624 968 -320 ) ( 1624 872 -200 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 1640 872 -200 ) ( 1640 776 -200 ) ( 1600 872 -200 ) common/discard 16 0 0 0.5 0.5 0 0 0
+( 1664 968 -200 ) ( 1624 968 -200 ) ( 1664 968 -320 ) common/discard 32 0 0 0.5 0.5 0 0 0
+( 1640 872 -200 ) ( 1640 872 -320 ) ( 1640 776 -200 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( 1600 776 -320 ) ( 1640 776 -320 ) ( 1600 872 -320 ) common/discard 16 0 0 0.5 0.5 0 0 0
+( 1600 776 -320 ) ( 1600 776 -200 ) ( 1640 776 -320 ) common/discard 16 0 0 0.5 0.5 0 0 0
+( 1624 872 -320 ) ( 1624 968 -320 ) ( 1624 872 -200 ) common/discard 0 0 0 0.5 0.5 0 0 0
+}
+// brush 2
+{
+( 1624 776 -184 ) ( 1280 776 -184 ) ( 1280 968 -184 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1624 968 -200 ) ( 1280 968 -184 ) ( 1280 968 -200 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1624 968 -184 ) ( 1624 968 -200 ) ( 1624 776 -184 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1624 776 -200 ) ( 1280 968 -200 ) ( 1280 776 -200 ) niveus/e8_base1b 0 0 0 0.5 0.5 0 0 0
+( 1624 776 -184 ) ( 1280 776 -200 ) ( 1280 776 -184 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1560 760 64 ) ( 1560 720 -64 ) ( 1560 760 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 3
+{
+( 1624 776 -320 ) ( 1280 776 -320 ) ( 1280 968 -320 ) niveus/e8clangfloor 0 0 0 0.5 0.5 0 0 0
+( 1624 968 -336 ) ( 1280 968 -320 ) ( 1280 968 -336 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1624 968 -320 ) ( 1624 968 -336 ) ( 1624 776 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1624 776 -336 ) ( 1280 968 -336 ) ( 1280 776 -336 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1624 776 -320 ) ( 1280 776 -336 ) ( 1280 776 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1560 760 64 ) ( 1560 720 -64 ) ( 1560 760 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 4
+{
+( 1136 216 152 ) ( 1120 320 136 ) ( 1136 320 152 ) common/caulk 0 16 -90 0.5 -0.5 0 0 0
+( 1120 216 136 ) ( 1136 320 76 ) ( 1120 320 136 ) niveus/e6simpwallsupp 48 125.8666381836 0 -0.5 0.5 0 0 0
+( 1120 216 136 ) ( 1136 216 152 ) ( 1152 216 76 ) niveus/floor_trim 160.4426879883 30.2891540527 103.6999969482 0.6041898727 -0.6041898727 0 0 0
+( 1152 216 76 ) ( 1136 320 152 ) ( 1152 320 76 ) common/caulk 0 32 0 -0.5 0.5 0 0 0
+( 1152 320 76 ) ( 1136 320 152 ) ( 1120 320 136 ) common/caulk 48 32 0 -0.5 0.5 0 0 0
+( 1152 216 76 ) ( 1152 320 76 ) ( 1136 320 76 ) common/caulk 0 16 -90 0.5 -0.5 0 0 0
+}
+// brush 5
+{
+( 976 216 0 ) ( 992 320 16 ) ( 976 320 0 ) common/caulk 0 16 -90 0.5 0.5 0 0 0
+( 992 216 16 ) ( 976 320 76 ) ( 992 320 16 ) niveus/e6simpwallsupp 48 125.8666381836 0 -0.5 0.5 0 0 0
+( 992 216 16 ) ( 976 216 0 ) ( 960 216 76 ) niveus/floor_trim 95.5573120117 30.5692443848 -76.3000030518 0.6041898727 -0.6041898727 0 0 0
+( 960 216 76 ) ( 976 320 0 ) ( 960 320 76 ) common/caulk 0 48 180 0.5 0.5 0 0 0
+( 976 320 0 ) ( 992 320 16 ) ( 976 320 76 ) common/caulk 48 48 0 0.5 -0.5 0 0 0
+( 976 216 76 ) ( 960 320 76 ) ( 976 320 76 ) common/caulk 0 16 -90 0.5 0.5 0 0 0
+}
+// brush 6
+{
+( 1136 216 152 ) ( 976 320 152 ) ( 1136 320 152 ) common/caulk 0 16 -90 0.5 0.5 0 0 0
+( 1120 216 136 ) ( 1136 320 152 ) ( 1120 320 136 ) common/caulk 0 16 -90 0.5 0.5 0 0 0
+( 1136 216 152 ) ( 992 216 136 ) ( 976 216 152 ) niveus/floor_trim 188.8000488281 16.0007324219 0 0.5 0.5 0 0 0
+( 992 216 136 ) ( 1120 320 136 ) ( 992 320 136 ) niveus/e6simpwallsupp 48 45.8666992188 -90 0.5 0.5 0 0 0
+( 976 216 152 ) ( 992 320 136 ) ( 976 320 152 ) common/caulk 0 16 -90 0.5 0.5 0 0 0
+( 1136 320 152 ) ( 992 320 136 ) ( 1120 320 136 ) common/caulk 48 32 0 0.5 0.5 0 0 0
+}
+// brush 7
+{
+( 976 216 0 ) ( 1136 320 0 ) ( 976 320 0 ) common/caulk 0 16 -90 0.5 0.5 0 0 0
+( 1136 216 0 ) ( 1120 320 16 ) ( 1136 320 0 ) common/caulk 0 16 -90 0.5 0.5 0 0 0
+( 1136 216 0 ) ( 976 216 0 ) ( 992 216 16 ) niveus/floor_trim 188.8000488281 31.9995727539 0 0.5 0.5 0 0 0
+( 1120 216 16 ) ( 992 320 16 ) ( 1120 320 16 ) niveus/e6simpwallsupp 48 45.8666992188 -90 0.5 0.5 0 0 0
+( 992 216 16 ) ( 976 320 0 ) ( 992 320 16 ) common/caulk 0 16 -90 0.5 0.5 0 0 0
+( 976 320 0 ) ( 1120 320 16 ) ( 992 320 16 ) common/caulk 48 48 0 0.5 -0.5 0 0 0
+}
+// brush 8
+{
+( 1120 216 16 ) ( 1136 320 0 ) ( 1120 320 16 ) common/caulk 0 16 -90 0.5 -0.5 0 0 0
+( 1136 216 76 ) ( 1120 320 16 ) ( 1136 320 76 ) niveus/e6simpwallsupp 48 125.8666381836 0 -0.5 0.5 0 0 0
+( 1152 216 76 ) ( 1136 216 0 ) ( 1120 216 16 ) niveus/floor_trim 156.5933227539 2.7062072754 -103.6999969482 0.6041898727 0.6041898727 0 0 0
+( 1136 216 0 ) ( 1152 320 76 ) ( 1136 320 0 ) common/caulk 0 48 180 0.5 0.5 0 0 0
+( 1136 320 0 ) ( 1136 320 76 ) ( 1120 320 16 ) common/caulk 48 48 180 0.5 0.5 0 0 0
+( 1152 216 76 ) ( 1136 320 76 ) ( 1152 320 76 ) common/caulk 0 16 -90 0.5 -0.5 0 0 0
+}
+// brush 9
+{
+( 992 216 136 ) ( 976 320 152 ) ( 992 320 136 ) common/caulk 0 16 -90 0.5 0.5 0 0 0
+( 976 216 76 ) ( 992 320 136 ) ( 976 320 76 ) niveus/e6simpwallsupp 48 125.8666381836 0 -0.5 0.5 0 0 0
+( 960 216 76 ) ( 976 216 152 ) ( 992 216 136 ) niveus/floor_trim 186.1102294922 26.1521911621 76.3000030518 0.6041898727 0.6041898727 0 0 0
+( 976 216 152 ) ( 960 320 76 ) ( 976 320 152 ) common/caulk 0 32 0 -0.5 0.5 0 0 0
+( 960 320 76 ) ( 992 320 136 ) ( 976 320 152 ) common/caulk 48 32 0 0.5 0.5 0 0 0
+( 960 216 76 ) ( 976 320 76 ) ( 960 320 76 ) common/caulk 0 16 -90 0.5 0.5 0 0 0
+}
+// brush 10
+{
+( 1536 968 -200 ) ( 1544 984 -200 ) ( 1624 968 -200 ) common/caulk 0 32 0 0.5 -0.5 0 0 0
+( 1280 968 -320 ) ( 1280 968 -200 ) ( 1624 968 -320 ) niveus/e6simpwallsupp 0 0 0 0.5 0.5 0 0 0
+( 1624 984 -200 ) ( 1624 968 -320 ) ( 1624 968 -200 ) common/caulk 32 0 0 -0.5 0.5 0 0 0
+( 1624 984 -320 ) ( 1544 984 -320 ) ( 1624 968 -320 ) common/caulk 0 32 0 0.5 -0.5 0 0 0
+( 1544 984 -200 ) ( 1544 984 -320 ) ( 1624 984 -200 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1560 760 64 ) ( 1560 720 -64 ) ( 1560 760 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 11
+{
+( 1624 776 -200 ) ( 1544 760 -200 ) ( 1536 776 -200 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1624 776 -320 ) ( 1280 776 -200 ) ( 1280 776 -320 ) niveus/e6simpwallsupp 0 0 0 0.5 0.5 0 0 0
+( 1624 776 -200 ) ( 1624 776 -320 ) ( 1624 760 -200 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1624 776 -320 ) ( 1544 760 -320 ) ( 1624 760 -320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1624 760 -200 ) ( 1544 760 -320 ) ( 1544 760 -200 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1560 760 64 ) ( 1560 720 -64 ) ( 1560 760 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 12
+{
+( 1560 968 -200 ) ( 1560 776 -200 ) ( 1544 968 -200 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 1560 968 -200 ) ( 1544 968 -200 ) ( 1560 968 -320 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 1560 968 -200 ) ( 1560 968 -320 ) ( 1560 776 -200 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 1544 776 -320 ) ( 1560 776 -320 ) ( 1544 968 -320 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 1544 776 -320 ) ( 1544 776 -200 ) ( 1560 776 -320 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 1544 776 -320 ) ( 1544 968 -320 ) ( 1544 776 -200 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+}
+// brush 13
+{
+( 1136 336 136 ) ( 1136 320 136 ) ( 976 336 136 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 1136 336 152 ) ( 976 336 152 ) ( 1136 336 0 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 1136 336 152 ) ( 1136 336 0 ) ( 1136 320 152 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 976 320 16 ) ( 1136 320 16 ) ( 976 336 16 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 976 320 0 ) ( 976 320 152 ) ( 1136 320 0 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 976 320 0 ) ( 976 336 0 ) ( 976 320 152 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
}
}
diff --git a/maps/p9_reactor.map b/maps/p9_reactor.map
index a15b71c..a1fc673 100644
--- a/maps/p9_reactor.map
+++ b/maps/p9_reactor.map
@@ -6615,12 +6615,12 @@ nexus6/cement_1_gunky
}
// brush 712
{
-( 1152 232 152 ) ( 1152 216 152 ) ( 960 232 152 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 1152 232 152 ) ( 960 232 152 ) ( 1152 232 0 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 1152 232 152 ) ( 1152 232 0 ) ( 1152 216 152 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 960 216 0 ) ( 1152 216 0 ) ( 960 232 0 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 960 216 0 ) ( 960 216 152 ) ( 1152 216 0 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 960 216 0 ) ( 960 232 0 ) ( 960 216 152 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 1152 232 152 ) ( 1152 216 152 ) ( 960 232 152 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( 1152 232 152 ) ( 960 232 152 ) ( 1152 232 0 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( 1152 232 152 ) ( 1152 232 0 ) ( 1152 216 152 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( 960 216 0 ) ( 1152 216 0 ) ( 960 232 0 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( 960 216 0 ) ( 960 216 152 ) ( 1152 216 0 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( 960 216 0 ) ( 960 232 0 ) ( 960 216 152 ) common/discard 0 0 0 0.5 0.5 0 0 0
}
// brush 713
{
@@ -7278,12 +7278,12 @@ nexus6/cement_1_gunky
}
// brush 783
{
-( 1640 872 -200 ) ( 1640 776 -200 ) ( 1600 872 -200 ) common/nodiscard 16 0 0 0.5 0.5 0 0 0
-( 1664 968 -200 ) ( 1624 968 -200 ) ( 1664 968 -320 ) common/nodiscard 32 0 0 0.5 0.5 0 0 0
-( 1640 872 -200 ) ( 1640 872 -320 ) ( 1640 776 -200 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
-( 1600 776 -320 ) ( 1640 776 -320 ) ( 1600 872 -320 ) common/nodiscard 16 0 0 0.5 0.5 0 0 0
-( 1600 776 -320 ) ( 1600 776 -200 ) ( 1640 776 -320 ) common/nodiscard 16 0 0 0.5 0.5 0 0 0
-( 1624 872 -320 ) ( 1624 968 -320 ) ( 1624 872 -200 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 1640 872 -200 ) ( 1640 776 -200 ) ( 1600 872 -200 ) common/discard 16 0 0 0.5 0.5 0 0 0
+( 1664 968 -200 ) ( 1624 968 -200 ) ( 1664 968 -320 ) common/discard 32 0 0 0.5 0.5 0 0 0
+( 1640 872 -200 ) ( 1640 872 -320 ) ( 1640 776 -200 ) common/discard 0 0 0 0.5 0.5 0 0 0
+( 1600 776 -320 ) ( 1640 776 -320 ) ( 1600 872 -320 ) common/discard 16 0 0 0.5 0.5 0 0 0
+( 1600 776 -320 ) ( 1600 776 -200 ) ( 1640 776 -320 ) common/discard 16 0 0 0.5 0.5 0 0 0
+( 1624 872 -320 ) ( 1624 968 -320 ) ( 1624 872 -200 ) common/discard 0 0 0 0.5 0.5 0 0 0
}
}
// entity 1