diff --git a/cli/generateNavmesh.php b/cli/generateNavmesh.php index f0765d2..52c27b1 100644 --- a/cli/generateNavmesh.php +++ b/cli/generateNavmesh.php @@ -12,7 +12,7 @@ ///// $game = new Game(); -$game->loadMap($map); +$planeCount = $game->loadMap($map); $tileSize = $game->getWorld()::GRENADE_NAVIGATION_MESH_TILE_SIZE; $colliderHeight = $game->getWorld()::GRENADE_NAVIGATION_MESH_OBJECT_HEIGHT; @@ -37,7 +37,8 @@ $path = $map->getNavigationMeshPath($map->generateNavigationMeshKey($tileSize, $colliderHeight)); file_put_contents($path, $pathFinder->getNavigationMesh()->serialize()); printf( - "Navmesh (Nodes: %d; Edges: %d) generated to '%s'%s", + "Navmesh (Planes: %d, Nodes: %d; Edges: %d) generated to '%s'%s", + $planeCount, $pathFinder->getGraph()->getNodesCount(), $pathFinder->getGraph()->getEdgeCount(), $path, diff --git a/cli/server.php b/cli/server.php index 3ff7ab2..4b4b741 100644 --- a/cli/server.php +++ b/cli/server.php @@ -15,6 +15,7 @@ $debug = in_array('--debug', $argv); $bindAddress = "udp://0.0.0.0:$port"; $map = Maps\DefaultMap::class; +ini_set('memory_limit', '1G'); ///// $settings = new ServerSetting($playersMax); // must be first for correctly setting the global tickRate (Util::$TICK_RATE) @@ -24,6 +25,7 @@ $game = ($debug ? GameFactory::createDebug() : GameFactory::createDefaultCompetitive()); $game->loadMap(new $map); +$game->getWorld()->regenerateNavigationMeshes(); $logger->info("Starting server on '{$bindAddress}', waiting maximum of '{$settings->warmupWaitSec}' sec for '{$playersMax}' player" . ($playersMax > 1 ? 's' : '') . " to connect."); $net = new ClueSocket($bindAddress); diff --git a/composer.json b/composer.json index 8b8b056..4f6e44a 100644 --- a/composer.json +++ b/composer.json @@ -1,13 +1,13 @@ { "scripts": { - "post-install-cmd": "@php -d memory_limit=200M cli/generateNavmesh.php", + "post-install-cmd": "@php -d memory_limit=300M cli/generateNavmesh.php", "stan": "@php vendor/bin/phpstan --memory-limit=300M analyze", "unit": "@php vendor/bin/phpunit -d memory_limit=200M", "infection": "@php -d memory_limit=300M vendor/bin/infection --show-mutations --threads=max --min-covered-msi=100", - "dev": "php cli/server.php 1 8080 --debug & php cli/udp-ws-bridge.php", - "dev2": "php cli/server.php 2 8080 --debug & php cli/udp-ws-bridge.php & php cli/udp-ws-bridge.php 8082", - "dev2c": "php cli/server.php 2 8080 --debug & php cli/udp-ws-bridge.php & sleep 2 && php cli/client.php acode 8080", - "dev3c": "php cli/server.php 3 8080 --debug & php cli/udp-ws-bridge.php & sleep 1 ; php cli/client.php acode 8080 & php cli/client.php acode 8080", + "dev": "php cli/server.php 1 8080 --debug & sleep 1 && php cli/udp-ws-bridge.php", + "dev2": "php cli/server.php 2 8080 --debug & sleep 1 && php cli/udp-ws-bridge.php & php cli/udp-ws-bridge.php 8082", + "dev2c": "php cli/server.php 2 8080 --debug & sleep 1 && php cli/udp-ws-bridge.php & php cli/client.php acode 8080", + "dev3c": "php cli/server.php 3 8080 --debug & sleep 1 && php cli/udp-ws-bridge.php & php cli/client.php acode 8080 & php cli/client.php acode 8080", "coverage": [ "@putenv XDEBUG_MODE=coverage", "@unit --coverage-text=www/coverage/coverage.txt --only-summary-for-coverage-text --coverage-html www/coverage --coverage-xml=www/coverage/coverage-xml --log-junit=www/coverage/junit.xml", diff --git a/server/src/Core/Game.php b/server/src/Core/Game.php index 2d2c2c0..db212fc 100644 --- a/server/src/Core/Game.php +++ b/server/src/Core/Game.php @@ -215,10 +215,10 @@ public function playersCanBuy(): bool return ($this->isPaused() || $this->tick <= $this->roundStartTickId + $this->buyTimeTickCount); } - public function loadMap(Map $map): void + public function loadMap(Map $map): int { $this->bomb->setMaxBlastDistance($map->getBombMaxBlastDistance()); - $this->world->loadMap($map); + return $this->world->loadMap($map); } public function getWorld(): World diff --git a/server/src/Core/PathFinder.php b/server/src/Core/PathFinder.php index ae458ea..24f994d 100644 --- a/server/src/Core/PathFinder.php +++ b/server/src/Core/PathFinder.php @@ -172,7 +172,7 @@ public function buildNavigationMesh(Point $start, int $objectHeight, int $maxNod $startPoint = $start->clone(); $this->convertToNavMeshNode($startPoint); if (!$this->world->findFloorSquare($startPoint, 1)) { - throw new GameException('No floor on start point'); // @codeCoverageIgnore + throw new GameException('No floor on start: ' . $start); // @codeCoverageIgnore } /** @var SplQueue $queue */ diff --git a/server/src/Core/PlaneBuilder.php b/server/src/Core/PlaneBuilder.php index cb77431..f3f87ae 100644 --- a/server/src/Core/PlaneBuilder.php +++ b/server/src/Core/PlaneBuilder.php @@ -22,6 +22,7 @@ public function create(Point $a, Point $b, Point $c, ?Point $d = null, ?float $j /** @return list */ public function fromTriangle(Point $a, Point $b, Point $c, float $voxelSizeDotThreshold): array { + $this->voxels = []; $voxelSize = (int)$voxelSizeDotThreshold; $voxelThreshold = max(1, intval(str_replace('0.', '', abs($voxelSizeDotThreshold - $voxelSize)))); // @phpstan-ignore argument.type if ($voxelSize > 0) { @@ -39,6 +40,7 @@ public function fromTriangle(Point $a, Point $b, Point $c, float $voxelSizeDotTh $planes[] = (new Wall($voxelPoint->clone()->addX($voxelSize), false, $voxelSize, $voxelSize))->setNormal($this->voxelNormal[0], $this->voxelNormal[1]); $planes[] = (new Floor($voxelPoint->clone()->addY($voxelSize), $voxelSize, $voxelSize))->setNormal($this->voxelNormal[0], $this->voxelNormal[1]); } + $this->voxels = []; return $planes; } @@ -300,7 +302,6 @@ private function voxelizeTriangle(Point $a, Point $b, Point $c, int $voxelSize, ($u[0] * $v[1]) - ($u[1] * $v[0]), )); - $this->voxels = []; $this->voxelizeLine($a, $b); $this->voxelizeLine($b, $c); $this->voxelizeLine($c, $a); @@ -333,27 +334,24 @@ private function voxelizeTriangle(Point $a, Point $b, Point $c, int $voxelSize, ); $data = []; - for ($y = $bbMin->y; $y <= $bbMax->y; $y++) { - for ($x = $bbMin->x; $x <= $bbMax->x; $x++) { - for ($z = $bbMin->z; $z <= $bbMax->z; $z++) { - if (!isset($this->voxels["$x,$y,$z"])) { - continue; - } + foreach ($this->voxels as $voxel) { + if ($matchTriangleSize && ($voxel->x > $bbMax->x || $voxel->y > $bbMax->y || $voxel->z > $bbMax->z)) { + continue; + } - $key = implode(',', [ - (int)ceil(($x - $bbMin->x) / $voxelSize), - (int)ceil(($y - $bbMin->y) / $voxelSize), - (int)ceil(($z - $bbMin->z) / $voxelSize), - ]); - if (!isset($data[$key])) { - $data[$key] = 0; - } - $data[$key]++; - } + $key = implode(',', [ + (int) ceil(($voxel->x - $bbMin->x) / $voxelSize), + (int) ceil(($voxel->y - $bbMin->y) / $voxelSize), + (int) ceil(($voxel->z - $bbMin->z) / $voxelSize), + ]); + if (!isset($data[$key])) { + $data[$key] = 0; } + $data[$key]++; } $startPoints = []; + $halfHeight = (int)round($voxelSize / 2); foreach ($data as $key => $hits) { if ($hits < $voxelThreshold) { continue; @@ -362,7 +360,7 @@ private function voxelizeTriangle(Point $a, Point $b, Point $c, int $voxelSize, $sizeIncrements = explode(',', $key); $startPoints[] = $bbMin->clone()->addPart( $voxelSize * (int)$sizeIncrements[0], - $voxelSize * (int)$sizeIncrements[1], + $voxelSize * (int)$sizeIncrements[1] - $halfHeight, $voxelSize * (int)$sizeIncrements[2], ); } diff --git a/server/src/Core/World.php b/server/src/Core/World.php index ba9c2f7..9f30271 100644 --- a/server/src/Core/World.php +++ b/server/src/Core/World.php @@ -66,20 +66,24 @@ public function roundReset(): void } } - public function loadMap(Map $map): void + public function loadMap(Map $map): int { + $planeCount = 0; $this->roundReset(); $this->map = $map; $this->walls = []; foreach ($map->getWalls() as $wall) { $this->addWall($wall); + $planeCount++; } $this->floors = []; foreach ($map->getFloors() as $floor) { $this->addFloor($floor); + $planeCount++; } + return $planeCount; } public function regenerateNavigationMeshes(): void diff --git a/server/src/Map/DefaultMap.php b/server/src/Map/DefaultMap.php index bb98578..d392075 100644 --- a/server/src/Map/DefaultMap.php +++ b/server/src/Map/DefaultMap.php @@ -37,148 +37,154 @@ public function __construct() // a long to a side $add( - new Point(11521, 835, 11158), - new Point(12539, 835, 11158), - new Point(12539, 1098, 12109), - new Point(11521, 1098, 12109), + new Point(11512, 815, 11049), + new Point(12539, 815, 11049), + new Point(12539, 1070, 11978), + new Point(11512, 1070, 11978), ); $add( - new Point(11521, 1192, 12566), - new Point(12539, 1192, 12566), - new Point(12539, 1192, 13386), - new Point(11521, 1192, 13386), + new Point(11512, 1187, 12535), + new Point(12539, 1187, 12535), + new Point(12539, 1187, 13386), + new Point(11512, 1187, 13386), ); $add( - new Point(11333, 835, 7887), - new Point(12609, 835, 7887), - new Point(12609, 835, 11158), - new Point(11333, 835, 11158), + new Point(11333, 815, 7887), + new Point(12609, 815, 7887), + new Point(12609, 815, 11158), + new Point(11333, 815, 11158), ); $add( - new Point(11521, 1098, 12109), - new Point(12539, 1098, 12109), - new Point(12539, 1192, 12566), - new Point(11521, 1192, 12566), + new Point(11512, 1070, 11978), + new Point(12539, 1070, 11978), + new Point(12539, 1187, 12535), + new Point(11512, 1187, 12535), ); $add( - new Point(11333, 835, 7887), - new Point(11333, 835, 11158), + new Point(11333, 815, 7887), + new Point(11333, 815, 11158), new Point(11333, 814, 11158), new Point(11333, 814, 7887), ); // a long walls $add( - new Point(11436, 1688, 10202), - new Point(10296, 1688, 10202), - new Point(10296, 787, 10202), - new Point(11436, 787, 10202), + new Point(11432, 1688, 10188), + new Point(10296, 1688, 10188), + new Point(10296, 642, 10188), + new Point(11432, 642, 10188), ); $add( - new Point(11436, 1688, 10202), - new Point(11436, 787, 10202), - new Point(11436, 787, 9611), - new Point(11436, 1688, 9611), + new Point(11432, 1688, 10188), + new Point(11432, 642, 10188), + new Point(11432, 642, 9612), + new Point(11432, 1688, 9612), ); $add( - new Point(11436, 1688, 9611), - new Point(11436, 787, 9611), - new Point(11388, 787, 9611), - new Point(11388, 1688, 9611), + new Point(11432, 1688, 9612), + new Point(11432, 642, 9612), + new Point(11384, 642, 9612), + new Point(11384, 1688, 9612), ); $add( - new Point(11388, 1688, 9611), - new Point(11388, 787, 9611), - new Point(11388, 787, 8762), - new Point(11388, 1688, 8762), + new Point(11384, 1688, 9612), + new Point(11384, 642, 9612), + new Point(11384, 642, 8749), + new Point(11384, 1688, 8749), ); $add( - new Point(11388, 1688, 8762), - new Point(11388, 787, 8762), - new Point(11458, 787, 8762), - new Point(11458, 1688, 8762), + new Point(11384, 1688, 8749), + new Point(11384, 642, 8749), + new Point(11456, 642, 8749), + new Point(11456, 1688, 8749), ); $add( - new Point(11458, 1688, 8762), - new Point(11458, 787, 8762), - new Point(11458, 787, 7774), - new Point(11458, 1688, 7774), + new Point(11456, 1688, 8749), + new Point(11456, 642, 8749), + new Point(11456, 642, 7789), + new Point(11456, 1688, 7789), ); $add( - new Point(11458, 1528, 7774), - new Point(11458, 787, 7774), - new Point(9499, 787, 7774), - new Point(9499, 1528, 7774), + new Point(11456, 1528, 7789), + new Point(11456, 642, 7789), + new Point(9609, 642, 7789), + new Point(9609, 1528, 7789), ); $add( - new Point(10381, 1775, 10295), - new Point(9234, 1775, 10295), - new Point(9234, 392, 10295), - new Point(10381, 392, 10295), + new Point(10376, 1763, 10284), + new Point(9225, 1763, 10284), + new Point(9225, 392, 10284), + new Point(10376, 392, 10284), ); $add( - new Point(10381, 1775, 10295), - new Point(10381, 392, 10295), - new Point(10381, 392, 10186), - new Point(10381, 1775, 10186), + new Point(10376, 1763, 10284), + new Point(10376, 392, 10284), + new Point(10376, 392, 10186), + new Point(10376, 1763, 10186), + ); + $add( + new Point(9609, 1528, 7789), + new Point(9609, 642, 7789), + new Point(9609, 642, 7837), + new Point(9609, 1528, 7837), ); // long doors $add( new Point(9913, 823, 6222), new Point(9913, 1480, 6222), - new Point(9704, 1480, 6222), - new Point(9704, 823, 6222), + new Point(9705, 1480, 6222), + new Point(9705, 823, 6222), ); $add( - new Point(9704, 823, 6222), - new Point(9704, 1480, 6222), - new Point(9704, 1480, 5916), - new Point(9704, 823, 5916), + new Point(9705, 823, 6222), + new Point(9705, 1480, 6222), + new Point(9705, 1480, 5918), + new Point(9705, 823, 5918), ); $add( - new Point(9704, 823, 5916), - new Point(9704, 1480, 5916), - new Point(10006, 1480, 5916), - new Point(10006, 823, 5916), + new Point(9705, 823, 5918), + new Point(9705, 1480, 5918), + new Point(10006, 1480, 5918), + new Point(10006, 823, 5918), ); $add( - new Point(9910, 1480, 6454), - new Point(9277, 1480, 6454), - new Point(9277, 1280, 6454), - new Point(9910, 1280, 6454), + new Point(9910, 1480, 6446), + new Point(9277, 1480, 6446), + new Point(9277, 1280, 6446), + new Point(9910, 1280, 6446), ); $add( - new Point(9415, 1480, 6454), - new Point(9222, 1480, 6454), - new Point(9222, 823, 6454), - new Point(9415, 823, 6454), + new Point(9415, 1480, 6446), + new Point(9222, 1480, 6446), + new Point(9222, 823, 6446), + new Point(9415, 823, 6446), ); $add( - new Point(9266, 799, 5016), - new Point(9266, 799, 7509), - new Point(9266, 1481, 7509), - new Point(9266, 1481, 5016), + new Point(9225, 799, 5016), + new Point(9225, 799, 7405), + new Point(9225, 1481, 7405), + new Point(9225, 1481, 5016), ); $add( - new Point(9266, 799, 5016), - new Point(9266, 1481, 5016), + new Point(9225, 799, 5016), + new Point(9225, 1481, 5016), new Point(9346, 1481, 5016), new Point(9346, 799, 5016), ); $add( - new Point(9659, 832, 7834), - new Point(9246, 832, 7426), - new Point(9246, 1514, 7426), - new Point(9659, 1514, 7834), + new Point(9609, 764, 7837), + new Point(9225, 764, 7405), + new Point(9225, 1635, 7405), + new Point(9609, 1635, 7837), ); // long walls $add( - new Point(12466, 1924, 13336), - new Point(10691, 1924, 13336), - new Point(10691, 1139, 13336), - new Point(12466, 1139, 13336), + new Point(12466, 1924, 13306), + new Point(10691, 1924, 13306), + new Point(10691, 1139, 13306), + new Point(12466, 1139, 13306), ); $add( new Point(13084, 1614, 9518), @@ -187,16 +193,16 @@ public function __construct() new Point(13084, 611, 9518), ); $add( - new Point(12478, 826, 10980), - new Point(12478, 1620, 10980), - new Point(13056, 1620, 10980), - new Point(13056, 826, 10980), + new Point(12487, 826, 10980), + new Point(12487, 1620, 10980), + new Point(13063, 1620, 10980), + new Point(13063, 826, 10980), ); $add( - new Point(12379, 1121, 12454), - new Point(12379, 1849, 12454), - new Point(12545, 1849, 12454), - new Point(12545, 1121, 12454), + new Point(12384, 1121, 12467), + new Point(12384, 1849, 12467), + new Point(12545, 1849, 12467), + new Point(12545, 1121, 12467), ); $add( new Point(12901, 871, 9474), @@ -211,22 +217,22 @@ public function __construct() new Point(13079, 1637, 9676), ); $add( - new Point(13056, 826, 9666), - new Point(13056, 826, 10980), - new Point(13056, 1620, 10980), - new Point(13056, 1620, 9666), + new Point(13063, 826, 9666), + new Point(13063, 826, 10980), + new Point(13063, 1620, 10980), + new Point(13063, 1620, 9666), ); $add( - new Point(12478, 826, 10980), - new Point(12478, 826, 12483), - new Point(12478, 1620, 12483), - new Point(12478, 1620, 10980), + new Point(12487, 826, 10980), + new Point(12487, 826, 11939), + new Point(12487, 1620, 11939), + new Point(12487, 1620, 10980), ); $add( - new Point(12379, 1121, 12454), - new Point(12379, 1121, 13367), - new Point(12379, 1849, 13367), - new Point(12379, 1849, 12454), + new Point(12384, 1121, 12467), + new Point(12384, 1121, 13367), + new Point(12384, 1849, 13367), + new Point(12384, 1849, 12467), ); $add( new Point(12523, 611, 9518), @@ -234,6 +240,18 @@ public function __construct() new Point(12523, 1614, 8321), new Point(12523, 611, 8321), ); + $add( + new Point(12487, 1620, 11939), + new Point(12487, 826, 11939), + new Point(12535, 826, 11939), + new Point(12535, 1620, 11939), + ); + $add( + new Point(12535, 1620, 11939), + new Point(12535, 826, 11939), + new Point(12535, 826, 12483), + new Point(12535, 1620, 12483), + ); } // Map - A Short @@ -241,212 +259,206 @@ public function __construct() // a short main floor $add( - new Point(8842, 1095, 9504), - new Point(8442, 1095, 9504), - new Point(8442, 811, 9084), - new Point(8842, 811, 9084), - ); - $add( - new Point(9298, 818, 9592), - new Point(6966, 818, 9592), - new Point(6966, 818, 6403), - new Point(9298, 818, 6403), + new Point(8842, 1091, 9516), + new Point(8442, 1091, 9516), + new Point(8442, 804, 9084), + new Point(8842, 804, 9084), ); $add( - new Point(6966, 818, 6403), - new Point(6966, 818, 9592), - new Point(6966, 406, 9592), - new Point(6966, 406, 6403), + new Point(9298, 804, 9592), + new Point(6966, 804, 9592), + new Point(6966, 804, 6403), + new Point(9298, 804, 6403), ); // a short main floor.001 $add( - new Point(8890, 1022, 9444), - new Point(8890, 1022, 9384), - new Point(8890, 812, 9384), - new Point(8890, 812, 9444), + new Point(8889, 1022, 9444), + new Point(8889, 1022, 9384), + new Point(8889, 801, 9384), + new Point(8889, 801, 9444), ); $add( - new Point(8890, 994, 9384), - new Point(8890, 994, 9324), - new Point(8890, 812, 9324), - new Point(8890, 812, 9384), + new Point(8889, 994, 9384), + new Point(8889, 994, 9324), + new Point(8889, 801, 9324), + new Point(8889, 801, 9384), ); $add( - new Point(8890, 964, 9324), - new Point(8890, 964, 9264), - new Point(8890, 812, 9264), - new Point(8890, 812, 9324), + new Point(8889, 964, 9324), + new Point(8889, 964, 9264), + new Point(8889, 801, 9264), + new Point(8889, 801, 9324), ); $add( - new Point(8890, 934, 9264), - new Point(8890, 934, 9204), - new Point(8890, 812, 9204), - new Point(8890, 812, 9264), + new Point(8889, 934, 9264), + new Point(8889, 934, 9204), + new Point(8889, 801, 9204), + new Point(8889, 801, 9264), ); $add( - new Point(8890, 901, 9204), - new Point(8890, 901, 9136), - new Point(8890, 812, 9136), - new Point(8890, 812, 9204), + new Point(8889, 899, 9204), + new Point(8889, 899, 9133), + new Point(8889, 801, 9133), + new Point(8889, 801, 9204), ); $add( - new Point(8890, 1054, 9504), - new Point(8890, 1054, 9444), - new Point(8890, 812, 9444), - new Point(8890, 812, 9504), + new Point(8889, 1054, 9504), + new Point(8889, 1054, 9444), + new Point(8889, 801, 9444), + new Point(8889, 801, 9504), ); $add( - new Point(8890, 934, 9204), - new Point(8890, 934, 9264), + new Point(8889, 934, 9204), + new Point(8889, 934, 9264), new Point(8841, 934, 9264), new Point(8841, 934, 9204), ); $add( - new Point(8890, 1022, 9384), - new Point(8890, 1022, 9444), + new Point(8889, 1022, 9384), + new Point(8889, 1022, 9444), new Point(8841, 1022, 9444), new Point(8841, 1022, 9384), ); $add( - new Point(8890, 994, 9324), - new Point(8890, 994, 9384), + new Point(8889, 994, 9324), + new Point(8889, 994, 9384), new Point(8841, 994, 9384), new Point(8841, 994, 9324), ); $add( - new Point(8890, 1054, 9444), - new Point(8890, 1054, 9504), + new Point(8889, 1054, 9444), + new Point(8889, 1054, 9504), new Point(8841, 1054, 9504), new Point(8841, 1054, 9444), ); $add( - new Point(8890, 901, 9136), - new Point(8890, 901, 9204), - new Point(8841, 901, 9204), - new Point(8841, 901, 9136), + new Point(8889, 899, 9133), + new Point(8889, 899, 9204), + new Point(8841, 899, 9204), + new Point(8841, 899, 9133), ); $add( - new Point(8890, 964, 9264), - new Point(8890, 964, 9324), + new Point(8889, 964, 9264), + new Point(8889, 964, 9324), new Point(8841, 964, 9324), new Point(8841, 964, 9264), ); $add( new Point(8841, 1054, 9444), new Point(8841, 1054, 9504), - new Point(8841, 812, 9504), - new Point(8841, 812, 9444), + new Point(8841, 801, 9504), + new Point(8841, 801, 9444), ); $add( new Point(8841, 934, 9204), new Point(8841, 934, 9264), - new Point(8841, 812, 9264), - new Point(8841, 812, 9204), + new Point(8841, 801, 9264), + new Point(8841, 801, 9204), ); $add( new Point(8841, 994, 9324), new Point(8841, 994, 9384), - new Point(8841, 812, 9384), - new Point(8841, 812, 9324), + new Point(8841, 801, 9384), + new Point(8841, 801, 9324), ); $add( new Point(8841, 1022, 9384), new Point(8841, 1022, 9444), - new Point(8841, 812, 9444), - new Point(8841, 812, 9384), + new Point(8841, 801, 9444), + new Point(8841, 801, 9384), ); $add( - new Point(8841, 901, 9136), - new Point(8841, 901, 9204), - new Point(8841, 812, 9204), - new Point(8841, 812, 9136), + new Point(8841, 899, 9133), + new Point(8841, 899, 9204), + new Point(8841, 801, 9204), + new Point(8841, 801, 9133), ); $add( new Point(8841, 964, 9264), new Point(8841, 964, 9324), - new Point(8841, 812, 9324), - new Point(8841, 812, 9264), + new Point(8841, 801, 9324), + new Point(8841, 801, 9264), ); $add( - new Point(8841, 901, 9136), - new Point(8841, 812, 9136), - new Point(8890, 812, 9136), - new Point(8890, 901, 9136), + new Point(8841, 899, 9133), + new Point(8841, 801, 9133), + new Point(8889, 801, 9133), + new Point(8889, 899, 9133), ); $add( new Point(8841, 934, 9204), - new Point(8841, 812, 9204), - new Point(8890, 812, 9204), - new Point(8890, 934, 9204), + new Point(8841, 801, 9204), + new Point(8889, 801, 9204), + new Point(8889, 934, 9204), ); $add( new Point(8841, 964, 9264), - new Point(8841, 812, 9264), - new Point(8890, 812, 9264), - new Point(8890, 964, 9264), + new Point(8841, 801, 9264), + new Point(8889, 801, 9264), + new Point(8889, 964, 9264), ); $add( new Point(8841, 994, 9324), - new Point(8841, 812, 9324), - new Point(8890, 812, 9324), - new Point(8890, 994, 9324), + new Point(8841, 801, 9324), + new Point(8889, 801, 9324), + new Point(8889, 994, 9324), ); $add( new Point(8841, 1022, 9384), - new Point(8841, 812, 9384), - new Point(8890, 812, 9384), - new Point(8890, 1022, 9384), + new Point(8841, 801, 9384), + new Point(8889, 801, 9384), + new Point(8889, 1022, 9384), ); $add( new Point(8841, 1054, 9444), - new Point(8841, 812, 9444), - new Point(8890, 812, 9444), - new Point(8890, 1054, 9444), + new Point(8841, 801, 9444), + new Point(8889, 801, 9444), + new Point(8889, 1054, 9444), ); // short walls $add( - new Point(8467, 772, 8941), - new Point(8467, 772, 10032), - new Point(8467, 1689, 10032), - new Point(8467, 1689, 8941), + new Point(8457, 772, 8941), + new Point(8457, 772, 10032), + new Point(8457, 1689, 10032), + new Point(8457, 1689, 8941), ); $add( - new Point(8467, 772, 8941), - new Point(8467, 1689, 8941), - new Point(8264, 1689, 8745), - new Point(8264, 772, 8745), + new Point(8457, 772, 8941), + new Point(8457, 1689, 8941), + new Point(8265, 1689, 8749), + new Point(8265, 772, 8749), ); $add( - new Point(8264, 772, 8745), - new Point(8264, 1689, 8745), - new Point(8070, 1689, 8745), - new Point(8070, 772, 8745), + new Point(8265, 772, 8749), + new Point(8265, 1689, 8749), + new Point(8073, 1689, 8749), + new Point(8073, 772, 8749), ); $add( - new Point(8070, 772, 8745), - new Point(8070, 1689, 8745), - new Point(7877, 1689, 8940), - new Point(7877, 772, 8940), + new Point(8073, 772, 8749), + new Point(8073, 1689, 8749), + new Point(7882, 1689, 8941), + new Point(7882, 772, 8941), ); $add( - new Point(7877, 772, 8940), - new Point(7877, 1689, 8940), - new Point(7305, 1689, 8940), - new Point(7305, 772, 8940), + new Point(7882, 772, 8941), + new Point(7882, 1689, 8941), + new Point(7306, 1689, 8941), + new Point(7306, 772, 8941), ); $add( - new Point(7305, 772, 8940), - new Point(7305, 1689, 8940), - new Point(7118, 1689, 8748), - new Point(7118, 772, 8748), + new Point(7306, 772, 8941), + new Point(7306, 1689, 8941), + new Point(7114, 1689, 8749), + new Point(7114, 772, 8749), ); $add( - new Point(7118, 772, 8748), - new Point(7118, 1689, 8748), - new Point(6925, 1689, 8748), - new Point(6925, 772, 8748), + new Point(7114, 772, 8749), + new Point(7114, 1689, 8749), + new Point(6925, 1689, 8749), + new Point(6925, 772, 8749), ); } @@ -455,328 +467,304 @@ public function __construct() // a boundary.001 $add( - new Point(10812, 1192, 11389), - new Point(10755, 1192, 11389), - new Point(10755, 1192, 11047), - new Point(10812, 1192, 11047), + new Point(10808, 1187, 11387), + new Point(10760, 1187, 11387), + new Point(10760, 1187, 11052), + new Point(10808, 1187, 11052), ); $add( - new Point(10812, 1192, 11389), - new Point(10812, 1192, 11047), - new Point(10812, 1084, 11047), - new Point(10812, 1084, 11389), + new Point(10808, 1187, 11387), + new Point(10808, 1187, 11052), + new Point(10808, 1084, 11052), + new Point(10808, 1084, 11387), ); $add( - new Point(10755, 1192, 11047), - new Point(10755, 1192, 11389), - new Point(10755, 818, 11389), - new Point(10755, 818, 11047), + new Point(10760, 1187, 11052), + new Point(10760, 1187, 11387), + new Point(10760, 818, 11387), + new Point(10760, 818, 11052), ); // a boundary.002 $add( - new Point(10792, 1192, 11392), - new Point(9277, 1192, 11392), - new Point(9277, 1192, 11336), - new Point(10792, 1192, 11336), + new Point(10792, 1187, 11387), + new Point(9277, 1187, 11387), + new Point(9277, 1187, 11339), + new Point(10792, 1187, 11339), ); $add( - new Point(9277, 1192, 11392), - new Point(10792, 1192, 11392), - new Point(10792, 1066, 11392), - new Point(9277, 1066, 11392), + new Point(9277, 1187, 11387), + new Point(10792, 1187, 11387), + new Point(10792, 1066, 11387), + new Point(9277, 1066, 11387), ); $add( - new Point(10792, 1192, 11336), - new Point(9277, 1192, 11336), - new Point(9277, 522, 11336), - new Point(10792, 522, 11336), + new Point(10792, 1187, 11339), + new Point(9277, 1187, 11339), + new Point(9277, 522, 11339), + new Point(10792, 522, 11339), ); // a boundary.003 $add( - new Point(11529, 1192, 11103), - new Point(10755, 1192, 11103), - new Point(10755, 1192, 11047), - new Point(11529, 1192, 11047), + new Point(11528, 1187, 11100), + new Point(10760, 1187, 11100), + new Point(10760, 1187, 11052), + new Point(11528, 1187, 11052), ); $add( - new Point(10755, 1192, 11103), - new Point(11529, 1192, 11103), - new Point(11529, 1100, 11103), - new Point(10767, 1100, 11103), + new Point(10760, 1187, 11100), + new Point(11528, 1187, 11100), + new Point(11528, 1100, 11103), + new Point(10760, 1100, 11103), ); $add( - new Point(11529, 1192, 11047), - new Point(10755, 1192, 11047), - new Point(10755, 797, 11047), - new Point(11529, 797, 11047), + new Point(11528, 1187, 11052), + new Point(10760, 1187, 11052), + new Point(10760, 797, 11052), + new Point(11528, 797, 11052), ); // a car $add( - new Point(13071, 1105, 9490), - new Point(13071, 1105, 11007), - new Point(12456, 813, 11007), - new Point(12456, 813, 9490), + new Point(12497, 908, 8063), + new Point(12200, 806, 8063), + new Point(12487, 791, 7692), + null, + ); + $add( + new Point(12200, 806, 9502), + new Point(13071, 1105, 9502), + new Point(13071, 1105, 11263), + new Point(12200, 806, 11263), + ); + $add( + new Point(12636, 954, 8063), + new Point(12631, 954, 9502), + new Point(12200, 806, 9502), + new Point(12200, 806, 8063), ); // a corner barrels $add( - new Point(8874, 1214, 12457), - new Point(8874, 1214, 12243), - new Point(8520, 1214, 12243), - new Point(8520, 1214, 12457), + new Point(8872, 1216, 12469), + new Point(8872, 1216, 12254), + new Point(8484, 1216, 12254), + new Point(8484, 1216, 12469), ); $add( - new Point(8520, 1214, 12243), - new Point(8874, 1214, 12243), - new Point(8874, 1100, 12243), - new Point(8520, 1100, 12243), + new Point(8484, 1216, 12254), + new Point(8872, 1216, 12254), + new Point(8872, 1100, 12254), + new Point(8484, 1100, 12254), ); $add( - new Point(8874, 1214, 12243), - new Point(8874, 1214, 12457), - new Point(8874, 1100, 12457), - new Point(8874, 1100, 12243), + new Point(8872, 1216, 12254), + new Point(8872, 1216, 12469), + new Point(8872, 1100, 12469), + new Point(8872, 1100, 12254), ); // a side $add( - new Point(10792, 1105, 12493), - new Point(10792, 1105, 11072), - new Point(11499, 1105, 11072), - new Point(11499, 1105, 12493), + new Point(10792, 1091, 12541), + new Point(10792, 1091, 11072), + new Point(11499, 1091, 11072), + new Point(11499, 1091, 12541), ); $add( - new Point(8421, 1105, 11348), - new Point(10792, 1105, 11348), - new Point(10792, 1105, 12643), - new Point(8421, 1105, 12643), + new Point(8421, 1091, 11348), + new Point(10792, 1091, 11348), + new Point(10792, 1091, 12643), + new Point(8421, 1091, 12643), ); $add( - new Point(9298, 1105, 9493), - new Point(9298, 1105, 11594), - new Point(8421, 1105, 11594), - new Point(8421, 1105, 9493), + new Point(9298, 1091, 9516), + new Point(9298, 1091, 11387), + new Point(8421, 1091, 11387), + new Point(8421, 1091, 9516), ); $add( - new Point(9298, 1105, 9493), - new Point(8421, 1105, 9493), - new Point(8421, 813, 9493), - new Point(9298, 813, 9493), + new Point(9298, 1091, 9516), + new Point(8421, 1091, 9516), + new Point(8421, 785, 9516), + new Point(9298, 785, 9516), ); // a side wall $add( - new Point(11529, 1192, 12535), - new Point(11479, 1192, 12535), - new Point(11479, 1192, 11047), - new Point(11529, 1192, 11047), - ); - $add( - new Point(11529, 1192, 12535), - new Point(11529, 1192, 11047), - new Point(11529, 813, 11047), - new Point(11529, 813, 12535), + new Point(11528, 1187, 12535), + new Point(11480, 1187, 12535), + new Point(11480, 1187, 11052), + new Point(11528, 1187, 11052), ); $add( - new Point(11479, 1192, 11047), - new Point(11479, 1192, 12535), - new Point(11479, 817, 12535), - new Point(11479, 817, 11047), + new Point(11528, 1187, 12535), + new Point(11528, 1187, 11052), + new Point(11528, 813, 11052), + new Point(11528, 813, 12535), ); $add( - new Point(11529, 1192, 12535), - new Point(11529, 813, 12535), - new Point(10733, 813, 12535), - new Point(10733, 1192, 12535), + new Point(11480, 1187, 11052), + new Point(11480, 1187, 12535), + new Point(11480, 817, 12535), + new Point(11480, 817, 11052), ); $add( - new Point(11529, 1192, 12535), - new Point(10733, 1192, 12535), - new Point(10733, 1192, 13393), - new Point(11529, 1192, 13393), - ); - $add( - new Point(11529, 1192, 12535), - new Point(11529, 1192, 13393), - new Point(11529, 1129, 13393), - new Point(11529, 1129, 12535), + new Point(11528, 1187, 12535), + new Point(10733, 1187, 12535), + new Point(10733, 1187, 13393), + new Point(11528, 1187, 13393), ); // a site to short walls $add( - new Point(10768, 1048, 12386), - new Point(10768, 1048, 13388), - new Point(10768, 1721, 13388), - new Point(10768, 1721, 12386), + new Point(10760, 1048, 12395), + new Point(10760, 1048, 13388), + new Point(10760, 1721, 13388), + new Point(10760, 1721, 12395), ); $add( - new Point(10768, 1048, 12386), - new Point(10768, 1721, 12386), - new Point(9847, 1721, 12386), - new Point(9847, 1048, 12386), + new Point(10760, 1048, 12395), + new Point(10760, 1721, 12395), + new Point(9849, 1721, 12395), + new Point(9849, 1048, 12395), ); $add( - new Point(9847, 1048, 12386), - new Point(9847, 1721, 12386), - new Point(9847, 1721, 12295), - new Point(9847, 1048, 12295), + new Point(9849, 1048, 12395), + new Point(9849, 1721, 12395), + new Point(9849, 1721, 12293), + new Point(9849, 1048, 12293), ); $add( - new Point(9847, 1048, 12295), - new Point(9847, 1721, 12295), - new Point(9452, 1721, 12295), - new Point(9452, 1048, 12295), + new Point(9849, 1048, 12293), + new Point(9849, 1721, 12293), + new Point(9453, 1721, 12293), + new Point(9453, 1048, 12293), ); $add( - new Point(9452, 1048, 12295), - new Point(9452, 1721, 12295), - new Point(9452, 1721, 12533), - new Point(9452, 1048, 12533), + new Point(9453, 1048, 12293), + new Point(9453, 1721, 12293), + new Point(9453, 1721, 12539), + new Point(9453, 1048, 12539), ); $add( - new Point(9452, 1048, 12533), - new Point(9452, 1721, 12533), - new Point(9324, 1721, 12533), - new Point(9324, 1048, 12533), + new Point(9453, 1048, 12539), + new Point(9453, 1721, 12539), + new Point(9321, 1721, 12539), + new Point(9321, 1048, 12539), ); $add( - new Point(9324, 1048, 12533), - new Point(9324, 1721, 12533), - new Point(9324, 1721, 12483), - new Point(9324, 1048, 12483), + new Point(9321, 1048, 12539), + new Point(9321, 1721, 12539), + new Point(9321, 1721, 12491), + new Point(9321, 1048, 12491), ); $add( - new Point(9324, 1048, 12483), - new Point(9324, 1721, 12483), - new Point(8471, 1721, 12483), - new Point(8471, 1048, 12483), + new Point(9321, 1048, 12491), + new Point(9321, 1721, 12491), + new Point(8457, 1721, 12491), + new Point(8457, 1048, 12491), ); $add( - new Point(8471, 1048, 12483), - new Point(8471, 1721, 12483), - new Point(8471, 1721, 12310), - new Point(8471, 1048, 12310), + new Point(8457, 1048, 12491), + new Point(8457, 1721, 12491), + new Point(8457, 1721, 12323), + new Point(8457, 1048, 12323), ); $add( - new Point(8471, 1048, 12310), - new Point(8471, 1721, 12310), - new Point(8554, 1721, 12235), - new Point(8554, 1048, 12235), + new Point(8457, 1048, 12323), + new Point(8457, 1721, 12323), + new Point(8553, 1721, 12227), + new Point(8553, 1048, 12227), ); $add( - new Point(8554, 1048, 12235), - new Point(8554, 1721, 12235), - new Point(8554, 1721, 12030), - new Point(8554, 1048, 12030), + new Point(8553, 1048, 12227), + new Point(8553, 1721, 12227), + new Point(8553, 1721, 12035), + new Point(8553, 1048, 12035), ); $add( - new Point(8554, 1048, 12030), - new Point(8554, 1721, 12030), - new Point(8463, 1721, 11940), - new Point(8463, 1048, 11940), + new Point(8553, 1048, 12035), + new Point(8553, 1721, 12035), + new Point(8457, 1721, 11939), + new Point(8457, 1048, 11939), ); $add( - new Point(8463, 1048, 11940), - new Point(8463, 1721, 11940), - new Point(8463, 1721, 10335), - new Point(8463, 1048, 10335), + new Point(8457, 1048, 11939), + new Point(8457, 1721, 11939), + new Point(8457, 1721, 10332), + new Point(8457, 1048, 10332), ); $add( - new Point(8463, 1048, 10335), - new Point(8463, 1721, 10335), - new Point(8555, 1721, 10237), - new Point(8555, 1048, 10237), + new Point(8457, 1048, 10332), + new Point(8457, 1721, 10332), + new Point(8553, 1721, 10236), + new Point(8553, 1048, 10236), ); $add( - new Point(8555, 1048, 10237), - new Point(8555, 1721, 10237), - new Point(8555, 1721, 10046), - new Point(8555, 1048, 10046), + new Point(8553, 1048, 10236), + new Point(8553, 1721, 10236), + new Point(8553, 1721, 10044), + new Point(8553, 1048, 10044), ); $add( - new Point(8555, 1048, 10046), - new Point(8555, 1721, 10046), - new Point(8450, 1721, 9940), - new Point(8450, 1048, 9940), + new Point(8553, 1048, 10044), + new Point(8553, 1721, 10044), + new Point(8450, 1721, 9941), + new Point(8450, 1048, 9941), ); // Goose $add( - new Point(11534, 1103, 12418), - new Point(11497, 1188, 12547), - new Point(10759, 1188, 12547), - new Point(10722, 1103, 12418), + new Point(11534, 1091, 12418), + new Point(11497, 1187, 12535), + new Point(10759, 1187, 12535), + new Point(10722, 1091, 12418), ); // short boost wall $add( - new Point(9329, 872, 10382), - new Point(9329, 872, 10968), - new Point(9329, 1190, 10968), - new Point(9329, 1190, 10382), - ); - $add( - new Point(9329, 833, 10968), - new Point(9329, 833, 11344), - new Point(9329, 1190, 11344), - new Point(9329, 1190, 10968), + new Point(9321, 872, 10382), + new Point(9321, 872, 10968), + new Point(9321, 1187, 10968), + new Point(9321, 1187, 10382), ); $add( - new Point(9329, 809, 10281), - new Point(9329, 809, 10382), - new Point(9329, 1190, 10382), - new Point(9329, 1190, 10281), + new Point(9321, 833, 10968), + new Point(9321, 833, 11344), + new Point(9321, 1187, 11344), + new Point(9321, 1187, 10968), ); $add( - new Point(9897, 739, 11047), - new Point(9329, 739, 11047), - new Point(9329, 739, 11399), - new Point(9897, 739, 11399), + new Point(9321, 809, 10281), + new Point(9321, 809, 10382), + new Point(9321, 1187, 10382), + new Point(9321, 1187, 10281), ); $add( - new Point(9329, 436, 11047), - new Point(9329, 739, 11047), - new Point(9897, 739, 11047), - new Point(9897, 436, 11047), + new Point(9685, 732, 11052), + new Point(9321, 732, 11052), + new Point(9321, 732, 11399), + new Point(9685, 732, 11399), ); $add( - new Point(9897, 739, 11047), - new Point(9897, 739, 11399), - new Point(9897, 626, 11399), - new Point(9897, 626, 11047), + new Point(9321, 436, 11052), + new Point(9321, 732, 11052), + new Point(9685, 732, 11052), + new Point(9685, 436, 11052), ); $add( - new Point(9329, 833, 11344), - new Point(9329, 833, 11047), - new Point(9329, 436, 11047), - new Point(9329, 436, 11344), + new Point(9321, 1187, 10281), + new Point(9321, 1187, 11391), + new Point(9273, 1187, 11391), + new Point(9273, 1187, 10281), ); $add( - new Point(9329, 436, 11047), - new Point(9329, 833, 11047), - new Point(9302, 833, 11047), - new Point(9302, 436, 11047), - ); - $add( - new Point(9302, 436, 11047), - new Point(9302, 833, 11047), - new Point(9302, 833, 11079), - new Point(9302, 436, 11079), - ); - $add( - new Point(9329, 1190, 10281), - new Point(9329, 1190, 11391), - new Point(9272, 1190, 11391), - new Point(9272, 1190, 10281), - ); - $add( - new Point(9272, 1190, 10281), - new Point(9272, 1190, 11391), - new Point(9272, 1102, 11391), - new Point(9272, 1102, 10281), + new Point(9273, 1187, 10281), + new Point(9273, 1187, 11391), + new Point(9273, 1091, 11391), + new Point(9273, 1091, 10281), ); } @@ -785,212 +773,218 @@ public function __construct() // b back plat floor $add( - new Point(2458, 909, 13575), - new Point(1348, 909, 13575), - new Point(1348, 909, 11437), - new Point(2458, 909, 11437), + new Point(2460, 899, 13575), + new Point(1348, 899, 13575), + new Point(1348, 899, 11459), + new Point(2460, 899, 11459), ); $add( - new Point(2458, 909, 13575), - new Point(2458, 909, 11437), - new Point(2458, 996, 11437), - new Point(2458, 996, 13575), + new Point(2460, 899, 13575), + new Point(2460, 899, 11459), + new Point(2460, 995, 11437), + new Point(2460, 995, 13575), ); $add( - new Point(2458, 996, 13575), - new Point(2458, 996, 11437), - new Point(2509, 996, 11437), - new Point(2509, 996, 13575), + new Point(2460, 995, 13575), + new Point(2460, 995, 11437), + new Point(2508, 995, 11437), + new Point(2508, 995, 13575), ); $add( - new Point(2509, 996, 13575), - new Point(2509, 996, 11437), - new Point(2509, 808, 11437), - new Point(2509, 808, 13575), + new Point(2508, 995, 13575), + new Point(2508, 995, 11437), + new Point(2508, 808, 11437), + new Point(2508, 808, 13575), ); $add( - new Point(2458, 909, 11437), - new Point(1348, 909, 11437), - new Point(1348, 797, 11437), - new Point(2458, 797, 11437), + new Point(2460, 899, 11459), + new Point(1348, 899, 11459), + new Point(1348, 797, 11459), + new Point(2458, 797, 11459), ); // b back plat walls $add( - new Point(1732, 909, 13256), - new Point(2060, 909, 13256), - new Point(2060, 1455, 13256), - new Point(1732, 1455, 13256), + new Point(1741, 909, 13258), + new Point(2060, 909, 13258), + new Point(2060, 1455, 13258), + new Point(1741, 1455, 13258), ); $add( - new Point(1732, 909, 13256), - new Point(1732, 1455, 13256), - new Point(1732, 1455, 13421), - new Point(1732, 909, 13421), + new Point(1741, 909, 13258), + new Point(1741, 1455, 13258), + new Point(1741, 1455, 13448), + new Point(1741, 909, 13448), ); $add( - new Point(1732, 909, 13421), - new Point(1732, 1455, 13421), - new Point(1338, 1455, 13421), - new Point(1338, 909, 13421), + new Point(1741, 909, 13448), + new Point(1741, 1455, 13448), + new Point(1338, 1455, 13448), + new Point(1338, 909, 13448), ); // b boxes $add( - new Point(4268, 1025, 10579), - new Point(4268, 1025, 10299), - new Point(4547, 1025, 10299), - new Point(4547, 1025, 10579), + new Point(4268, 971, 10572), + new Point(4268, 971, 10267), + new Point(4574, 971, 10267), + new Point(4574, 971, 10572), + ); + $add( + new Point(4268, 971, 10267), + new Point(4268, 971, 10572), + new Point(4268, 695, 10572), + new Point(4268, 695, 10267), ); $add( - new Point(4268, 1025, 10299), - new Point(4268, 1025, 10579), - new Point(4268, 695, 10579), - new Point(4268, 695, 10299), + new Point(4268, 971, 10572), + new Point(4574, 971, 10572), + new Point(4574, 695, 10572), + new Point(4268, 695, 10572), ); $add( - new Point(4268, 1025, 10579), - new Point(4547, 1025, 10579), - new Point(4547, 695, 10579), - new Point(4268, 695, 10579), + new Point(4574, 971, 10572), + new Point(4574, 971, 10267), + new Point(4574, 695, 10267), + new Point(4574, 695, 10572), ); $add( - new Point(4547, 1025, 10579), - new Point(4547, 1025, 10299), - new Point(4547, 695, 10299), - new Point(4547, 695, 10579), + new Point(4268, 1071, 10572), + new Point(4268, 1071, 10267), + new Point(4304, 1071, 10267), + new Point(4304, 1071, 10572), ); $add( - new Point(4268, 1025, 10579), - new Point(4268, 1025, 10299), - new Point(4307, 1069, 10299), - new Point(4307, 1069, 10579), + new Point(4304, 1071, 10572), + new Point(4304, 1071, 10267), + new Point(4575, 971, 10267), + new Point(4575, 971, 10572), ); $add( - new Point(4307, 1069, 10579), - new Point(4307, 1069, 10299), - new Point(4411, 1021, 10299), - new Point(4411, 1021, 10579), + new Point(4268, 1071, 10267), + new Point(4268, 1071, 10572), + new Point(4268, 971, 10572), + new Point(4268, 971, 10267), ); // b boxes bottom $add( - new Point(3989, 949, 10434), - new Point(3989, 949, 10278), - new Point(4264, 949, 10278), - new Point(4264, 949, 10434), + new Point(4068, 947, 10428), + new Point(4068, 947, 10278), + new Point(4264, 947, 10278), + new Point(4264, 947, 10428), ); $add( - new Point(3989, 949, 10278), - new Point(3989, 949, 10434), - new Point(3989, 823, 10434), - new Point(3989, 823, 10278), + new Point(4068, 947, 10278), + new Point(4068, 947, 10428), + new Point(4068, 803, 10428), + new Point(4068, 803, 10278), ); $add( - new Point(3989, 949, 10434), - new Point(4264, 949, 10434), - new Point(4264, 823, 10434), - new Point(3989, 823, 10434), + new Point(4068, 947, 10428), + new Point(4264, 947, 10428), + new Point(4264, 803, 10428), + new Point(4068, 803, 10428), ); $add( - new Point(4264, 949, 10434), - new Point(4264, 949, 10278), - new Point(4264, 823, 10278), - new Point(4264, 823, 10434), + new Point(4264, 947, 10428), + new Point(4264, 947, 10278), + new Point(4264, 803, 10278), + new Point(4264, 803, 10428), ); $add( - new Point(4264, 949, 10278), - new Point(3989, 949, 10278), - new Point(3989, 823, 10278), - new Point(4264, 823, 10278), + new Point(4264, 947, 10278), + new Point(4068, 947, 10278), + new Point(4068, 803, 10278), + new Point(4264, 803, 10278), ); // b plat walls $add( - new Point(1307, 811, 11429), - new Point(1745, 811, 11429), - new Point(1745, 997, 11429), - new Point(1307, 997, 11429), + new Point(1307, 802, 11435), + new Point(1741, 802, 11435), + new Point(1741, 995, 11435), + new Point(1307, 995, 11435), ); $add( - new Point(1745, 997, 11429), - new Point(1745, 811, 11429), - new Point(1745, 811, 11485), - new Point(1745, 997, 11485), + new Point(1741, 995, 11435), + new Point(1741, 802, 11435), + new Point(1741, 802, 11483), + new Point(1741, 995, 11483), ); $add( - new Point(1745, 997, 11485), - new Point(1745, 811, 11485), - new Point(1307, 811, 11485), - new Point(1307, 997, 11485), + new Point(1741, 995, 11483), + new Point(1741, 802, 11483), + new Point(1307, 802, 11483), + new Point(1307, 995, 11483), ); $add( - new Point(1745, 997, 11485), - new Point(1307, 997, 11485), - new Point(1307, 997, 11429), - new Point(1745, 997, 11429), + new Point(1741, 995, 11483), + new Point(1307, 995, 11483), + new Point(1307, 995, 11435), + new Point(1741, 995, 11435), ); $add( - new Point(2510, 811, 11490), - new Point(2120, 811, 11490), - new Point(2120, 997, 11490), - new Point(2510, 997, 11490), + new Point(2508, 805, 11483), + new Point(2125, 805, 11483), + new Point(2125, 995, 11483), + new Point(2508, 995, 11483), ); $add( - new Point(2120, 997, 11490), - new Point(2120, 811, 11490), - new Point(2120, 811, 11434), - new Point(2120, 997, 11434), + new Point(2125, 995, 11483), + new Point(2125, 805, 11483), + new Point(2125, 805, 11435), + new Point(2125, 995, 11435), ); $add( - new Point(2120, 997, 11434), - new Point(2120, 811, 11434), - new Point(2510, 811, 11434), - new Point(2510, 997, 11434), + new Point(2125, 995, 11435), + new Point(2125, 805, 11435), + new Point(2508, 805, 11435), + new Point(2508, 995, 11435), ); $add( - new Point(2120, 997, 11434), - new Point(2510, 997, 11434), - new Point(2510, 997, 11490), - new Point(2120, 997, 11490), + new Point(2125, 995, 11435), + new Point(2508, 995, 11435), + new Point(2508, 995, 11483), + new Point(2125, 995, 11483), ); // b side entry from ct $add( - new Point(3656, 1480, 11051), - new Point(3656, 1480, 12009), - new Point(3656, 811, 12009), - new Point(3656, 811, 11051), + new Point(3660, 1480, 11052), + new Point(3660, 1480, 12009), + new Point(3660, 811, 12009), + new Point(3660, 811, 11052), ); $add( - new Point(3656, 811, 12009), - new Point(3656, 1480, 12009), - new Point(3853, 1480, 12009), - new Point(3853, 811, 12009), + new Point(3660, 811, 12009), + new Point(3660, 1480, 12009), + new Point(3852, 1480, 12009), + new Point(3852, 811, 12009), ); $add( - new Point(3853, 811, 12009), - new Point(3853, 1480, 12009), - new Point(3853, 1480, 11049), - new Point(3853, 811, 11049), + new Point(3852, 811, 12009), + new Point(3852, 1480, 12009), + new Point(3852, 1480, 11049), + new Point(3852, 811, 11049), ); $add( - new Point(3656, 1480, 11051), - new Point(3656, 811, 11051), - new Point(3856, 811, 11051), - new Point(3856, 1480, 11051), + new Point(3660, 1480, 11052), + new Point(3660, 811, 11052), + new Point(3856, 811, 11052), + new Point(3856, 1480, 11052), ); $add( - new Point(3656, 1480, 11075), - new Point(3656, 1340, 11075), - new Point(3656, 1340, 10468), - new Point(3656, 1480, 10468), + new Point(3660, 1480, 11075), + new Point(3660, 1340, 11075), + new Point(3660, 1340, 10468), + new Point(3660, 1480, 10468), ); $add( - new Point(3853, 1340, 11074), - new Point(3853, 1480, 11074), - new Point(3853, 1480, 10456), - new Point(3853, 1340, 10456), + new Point(3852, 1340, 11074), + new Point(3852, 1480, 11074), + new Point(3852, 1480, 10456), + new Point(3852, 1340, 10456), ); // b side main floor @@ -1003,116 +997,116 @@ public function __construct() // b side walls $add( - new Point(1552, 1477, 9520), - new Point(1552, 801, 9520), - new Point(1166, 801, 9520), - new Point(1166, 1477, 9520), + new Point(1549, 1477, 9516), + new Point(1549, 801, 9516), + new Point(1165, 801, 9516), + new Point(1165, 1477, 9516), ); $add( - new Point(1166, 1477, 9520), - new Point(1166, 801, 9520), - new Point(1166, 801, 10377), - new Point(1166, 1477, 10377), + new Point(1165, 1477, 9516), + new Point(1165, 801, 9516), + new Point(1165, 801, 10380), + new Point(1165, 1477, 10380), ); $add( - new Point(1166, 1477, 10377), - new Point(1166, 801, 10377), - new Point(1262, 801, 10377), - new Point(1262, 1477, 10377), + new Point(1165, 1477, 10380), + new Point(1165, 801, 10380), + new Point(1261, 801, 10380), + new Point(1261, 1477, 10380), ); $add( - new Point(1262, 1477, 10377), - new Point(1262, 801, 10377), - new Point(1262, 801, 10476), - new Point(1262, 1477, 10476), + new Point(1261, 1477, 10380), + new Point(1261, 801, 10380), + new Point(1261, 801, 10476), + new Point(1261, 1477, 10476), ); $add( - new Point(1262, 1477, 10476), - new Point(1262, 801, 10476), - new Point(1214, 801, 10476), - new Point(1214, 1477, 10476), + new Point(1261, 1477, 10476), + new Point(1261, 801, 10476), + new Point(1213, 801, 10476), + new Point(1213, 1477, 10476), ); $add( - new Point(1214, 1477, 10476), - new Point(1214, 801, 10476), - new Point(1214, 801, 11049), - new Point(1214, 1477, 11049), + new Point(1213, 1477, 10476), + new Point(1213, 801, 10476), + new Point(1213, 801, 11052), + new Point(1213, 1477, 11052), ); $add( - new Point(1214, 1477, 11049), - new Point(1214, 801, 11049), - new Point(1263, 801, 11049), - new Point(1263, 1477, 11049), + new Point(1213, 1477, 11052), + new Point(1213, 801, 11052), + new Point(1261, 801, 11052), + new Point(1261, 1477, 11052), ); $add( - new Point(1263, 1477, 11049), - new Point(1263, 801, 11049), - new Point(1263, 801, 11148), - new Point(1263, 1477, 11148), + new Point(1261, 1477, 11052), + new Point(1261, 801, 11052), + new Point(1261, 801, 11148), + new Point(1261, 1477, 11148), ); $add( - new Point(1263, 1477, 11148), - new Point(1263, 801, 11148), - new Point(1166, 801, 11148), - new Point(1166, 1477, 11148), + new Point(1261, 1477, 11148), + new Point(1261, 801, 11148), + new Point(1165, 801, 11148), + new Point(1165, 1477, 11148), ); $add( - new Point(1166, 1477, 11148), - new Point(1166, 801, 11148), - new Point(1166, 801, 11435), - new Point(1166, 1477, 11435), + new Point(1165, 1477, 11148), + new Point(1165, 801, 11148), + new Point(1165, 801, 11435), + new Point(1165, 1477, 11435), ); $add( - new Point(1166, 1477, 11435), - new Point(1166, 801, 11435), - new Point(1360, 801, 11435), - new Point(1360, 1477, 11435), + new Point(1165, 1477, 11435), + new Point(1165, 801, 11435), + new Point(1357, 801, 11435), + new Point(1357, 1477, 11435), ); $add( - new Point(1360, 1477, 11435), - new Point(1360, 801, 11435), - new Point(1360, 801, 13967), - new Point(1360, 1477, 13967), + new Point(1357, 1477, 11435), + new Point(1357, 801, 11435), + new Point(1357, 801, 13967), + new Point(1357, 1477, 13967), ); $add( - new Point(1360, 1477, 13967), - new Point(1360, 801, 13967), - new Point(2027, 801, 13967), - new Point(2027, 1477, 13967), + new Point(1357, 1477, 13967), + new Point(1357, 801, 13967), + new Point(2029, 801, 13967), + new Point(2029, 1477, 13967), ); $add( - new Point(2027, 1477, 13967), - new Point(2027, 801, 13967), - new Point(2027, 801, 13015), - new Point(2027, 1477, 13015), + new Point(2029, 1477, 13967), + new Point(2029, 801, 13967), + new Point(2029, 801, 13019), + new Point(2029, 1477, 13019), ); $add( - new Point(2027, 1477, 13015), - new Point(2027, 801, 13015), - new Point(2265, 801, 12775), - new Point(2265, 1477, 12775), + new Point(2029, 1477, 13019), + new Point(2029, 801, 13019), + new Point(2269, 801, 12779), + new Point(2269, 1477, 12779), ); $add( - new Point(2265, 1477, 12775), - new Point(2265, 801, 12775), - new Point(3179, 801, 12775), - new Point(3179, 1477, 12775), + new Point(2269, 1477, 12779), + new Point(2269, 801, 12779), + new Point(3180, 801, 12779), + new Point(3180, 1477, 12779), ); $add( - new Point(3179, 1477, 12775), - new Point(3179, 801, 12775), - new Point(3653, 801, 12481), - new Point(3653, 1477, 12481), + new Point(3180, 1477, 12779), + new Point(3180, 801, 12779), + new Point(3660, 801, 12491), + new Point(3660, 1477, 12491), ); $add( - new Point(3653, 1477, 12481), - new Point(3653, 801, 12481), - new Point(3653, 801, 12247), - new Point(3653, 1477, 12247), + new Point(3660, 1477, 12491), + new Point(3660, 801, 12491), + new Point(3660, 801, 12217), + new Point(3660, 1477, 12217), ); $add( - new Point(3901, 1477, 12247), - new Point(3901, 801, 12247), + new Point(3901, 1477, 12217), + new Point(3901, 801, 12217), new Point(4159, 801, 12133), new Point(4159, 1477, 12133), ); @@ -1129,114 +1123,114 @@ public function __construct() new Point(4410, 1477, 12022), ); $add( - new Point(3653, 1477, 12247), - new Point(3653, 801, 12247), - new Point(3901, 801, 12247), - new Point(3901, 1477, 12247), + new Point(3660, 1477, 12217), + new Point(3660, 801, 12217), + new Point(3901, 801, 12217), + new Point(3901, 1477, 12217), ); // b walls $add( - new Point(2365, 1477, 9520), - new Point(2365, 801, 9520), - new Point(1918, 801, 9520), - new Point(1918, 1477, 9520), + new Point(2364, 1477, 9516), + new Point(2364, 801, 9516), + new Point(1933, 801, 9516), + new Point(1933, 1477, 9516), ); $add( - new Point(2365, 801, 9520), - new Point(2365, 1477, 9520), - new Point(2514, 1477, 9378), - new Point(2514, 801, 9378), + new Point(2364, 801, 9516), + new Point(2364, 1477, 9516), + new Point(2508, 1477, 9372), + new Point(2508, 801, 9372), ); $add( - new Point(2514, 801, 9378), - new Point(2514, 1477, 9378), - new Point(2514, 1477, 8990), - new Point(2514, 801, 8990), + new Point(2508, 801, 9372), + new Point(2508, 1477, 9372), + new Point(2508, 1477, 8989), + new Point(2508, 801, 8989), ); $add( - new Point(2514, 801, 8990), - new Point(2514, 1477, 8990), - new Point(2888, 1477, 8990), - new Point(2888, 801, 8990), + new Point(2508, 801, 8989), + new Point(2508, 1477, 8989), + new Point(2892, 1477, 8989), + new Point(2892, 801, 8989), ); $add( - new Point(2888, 801, 8990), - new Point(2888, 1477, 8990), - new Point(2888, 1477, 9136), - new Point(2888, 801, 9136), + new Point(2892, 801, 8989), + new Point(2892, 1477, 8989), + new Point(2892, 1477, 9133), + new Point(2892, 801, 9133), ); $add( - new Point(2888, 801, 9136), - new Point(2888, 1477, 9136), - new Point(3465, 1477, 9710), - new Point(3465, 801, 9710), + new Point(2892, 801, 9133), + new Point(2892, 1477, 9133), + new Point(3468, 1477, 9708), + new Point(3468, 801, 9708), ); $add( - new Point(3465, 801, 9710), - new Point(3465, 1477, 9710), - new Point(3563, 1477, 9710), - new Point(3563, 801, 9710), + new Point(3468, 801, 9708), + new Point(3468, 1477, 9708), + new Point(3564, 1477, 9708), + new Point(3564, 801, 9708), ); $add( - new Point(3563, 801, 9710), - new Point(3563, 1477, 9710), - new Point(3563, 1477, 10382), - new Point(3563, 801, 10382), + new Point(3564, 801, 9708), + new Point(3564, 1477, 9708), + new Point(3564, 1477, 10380), + new Point(3564, 801, 10380), ); $add( - new Point(3563, 801, 10382), - new Point(3563, 1477, 10382), - new Point(3659, 1477, 10382), - new Point(3659, 801, 10382), + new Point(3564, 801, 10380), + new Point(3564, 1477, 10380), + new Point(3660, 1477, 10380), + new Point(3660, 801, 10380), ); $add( - new Point(3659, 801, 10382), - new Point(3659, 1477, 10382), - new Point(3659, 1477, 10479), - new Point(3659, 801, 10479), + new Point(3660, 801, 10380), + new Point(3660, 1477, 10380), + new Point(3660, 1477, 10476), + new Point(3660, 801, 10476), ); $add( - new Point(3659, 801, 10479), - new Point(3659, 1477, 10479), - new Point(3852, 1477, 10479), - new Point(3852, 801, 10479), + new Point(3660, 801, 10476), + new Point(3660, 1477, 10476), + new Point(3852, 1477, 10476), + new Point(3852, 801, 10476), ); $add( - new Point(3852, 801, 10479), - new Point(3852, 1477, 10479), - new Point(3852, 1477, 10382), - new Point(3852, 801, 10382), + new Point(3852, 801, 10476), + new Point(3852, 1477, 10476), + new Point(3852, 1477, 10380), + new Point(3852, 801, 10380), ); $add( - new Point(3852, 801, 10382), - new Point(3852, 1477, 10382), - new Point(3998, 1477, 10382), - new Point(3998, 801, 10382), + new Point(3852, 801, 10380), + new Point(3852, 1477, 10380), + new Point(3996, 1477, 10380), + new Point(3996, 801, 10380), ); $add( - new Point(3998, 801, 10382), - new Point(3998, 1477, 10382), - new Point(3998, 1477, 10289), - new Point(3998, 801, 10289), + new Point(3996, 801, 10380), + new Point(3996, 1477, 10380), + new Point(3996, 1477, 10284), + new Point(3996, 801, 10284), ); $add( - new Point(3998, 801, 10289), - new Point(3998, 1477, 10289), - new Point(4569, 1477, 10289), - new Point(4569, 801, 10289), + new Point(3996, 801, 10284), + new Point(3996, 1477, 10284), + new Point(4571, 1477, 10284), + new Point(4571, 801, 10284), ); $add( - new Point(4569, 801, 10289), - new Point(4569, 1477, 10289), - new Point(4569, 1477, 10381), - new Point(4569, 801, 10381), + new Point(4571, 801, 10284), + new Point(4571, 1477, 10284), + new Point(4571, 1477, 10381), + new Point(4571, 801, 10381), ); $add( - new Point(1960, 1477, 9520), - new Point(1960, 1317, 9520), - new Point(1513, 1317, 9520), - new Point(1513, 1477, 9520), + new Point(1960, 1477, 9516), + new Point(1960, 1317, 9516), + new Point(1513, 1317, 9516), + new Point(1513, 1477, 9516), ); // b window access @@ -1260,7 +1254,7 @@ public function __construct() ); $add( new Point(4288, 805, 11532), - new Point(4579, 700, 11872), + new Point(4447, 807, 11872), new Point(4317, 917, 11909), null, ); @@ -1972,6 +1966,16 @@ public function __construct() penetrable: false, navmesh: false, ); + + // topmidboundary + $add( + new Point(6538, 1517, 4725), + new Point(6538, 1517, 2992), + new Point(6154, 1517, 2992), + new Point(6154, 1517, 4725), + penetrable: false, + navmesh: false, + ); } // Map - CT spawn @@ -1979,20 +1983,8 @@ public function __construct() // ct spawn main floor $add( - new Point(4240, 818, 11948), - new Point(4240, 818, 10239), - new Point(4573, 705, 10239), - new Point(4573, 705, 11948), - ); - $add( - new Point(4573, 705, 11948), - new Point(4573, 705, 10239), - new Point(5277, 542, 10239), - new Point(5277, 542, 11948), - ); - $add( - new Point(5277, 542, 11948), - new Point(5277, 542, 10239), + new Point(5387, 425, 11948), + new Point(5387, 425, 10239), new Point(5954, 440, 10239), new Point(5954, 440, 11948), ); @@ -2003,22 +1995,22 @@ public function __construct() new Point(6966, 440, 8680), ); $add( - new Point(9374, 440, 11324), + new Point(9374, 440, 11353), new Point(9374, 440, 10163), - new Point(10210, 760, 10163), - new Point(10210, 760, 11324), + new Point(10210, 698, 10163), + new Point(10210, 698, 11353), ); $add( - new Point(10210, 760, 11324), - new Point(10210, 760, 10163), + new Point(10210, 698, 11353), + new Point(10210, 698, 10163), new Point(10649, 820, 10163), - new Point(10649, 820, 11324), + new Point(10649, 820, 11353), ); $add( - new Point(10649, 820, 11324), + new Point(10649, 820, 11353), new Point(10649, 820, 10163), new Point(11355, 820, 10163), - new Point(11355, 820, 11324), + new Point(11355, 820, 11353), ); $add( new Point(5750, 440, 11948), @@ -2026,237 +2018,299 @@ public function __construct() new Point(9374, 440, 10013), new Point(9374, 440, 11948), ); + $add( + new Point(4240, 818, 10239), + new Point(5387, 425, 10239), + new Point(5387, 425, 11948), + new Point(4240, 818, 11948), + ); + $add( + new Point(11355, 820, 11353), + new Point(11355, 820, 10163), + new Point(11355, 805, 10163), + new Point(11355, 805, 11353), + ); // ct to b side walls $add( - new Point(9222, 994, 11712), - new Point(9222, 994, 11051), - new Point(9222, 436, 11051), - new Point(9222, 436, 11712), + new Point(9225, 994, 11723), + new Point(9225, 994, 11052), + new Point(9225, 405, 11052), + new Point(9225, 405, 11723), ); $add( - new Point(9222, 994, 11712), - new Point(9222, 436, 11712), - new Point(7884, 436, 11712), - new Point(7884, 994, 11712), + new Point(9225, 994, 11723), + new Point(9225, 405, 11723), + new Point(7882, 405, 11723), + new Point(7882, 994, 11723), ); $add( - new Point(7884, 994, 11712), - new Point(7884, 436, 11712), - new Point(7884, 436, 11323), - new Point(7884, 994, 11323), + new Point(7882, 994, 11723), + new Point(7882, 405, 11723), + new Point(7882, 405, 11339), + new Point(7882, 994, 11339), ); $add( - new Point(7884, 994, 11323), - new Point(7884, 436, 11323), - new Point(7595, 436, 11051), - new Point(7595, 994, 11051), + new Point(7882, 994, 11339), + new Point(7882, 405, 11339), + new Point(7594, 405, 11052), + new Point(7594, 994, 11052), ); $add( - new Point(7595, 994, 11051), - new Point(7595, 436, 11051), - new Point(6922, 436, 11051), - new Point(6922, 994, 11051), + new Point(7594, 994, 11052), + new Point(7594, 405, 11052), + new Point(6922, 405, 11052), + new Point(6922, 994, 11052), ); $add( - new Point(6922, 1803, 11051), - new Point(6922, 436, 11051), - new Point(6720, 436, 11242), - new Point(6720, 1803, 11242), + new Point(6922, 1803, 11052), + new Point(6922, 405, 11052), + new Point(6730, 405, 11243), + new Point(6730, 1803, 11243), ); $add( - new Point(6720, 1803, 11242), - new Point(6720, 436, 11242), - new Point(6720, 436, 11427), - new Point(6720, 1803, 11427), + new Point(6730, 1803, 11243), + new Point(6730, 405, 11243), + new Point(6730, 405, 11427), + new Point(6730, 1803, 11427), ); $add( - new Point(6720, 1803, 11427), - new Point(6720, 436, 11427), - new Point(6048, 436, 11427), + new Point(6730, 1803, 11427), + new Point(6730, 405, 11427), + new Point(6048, 405, 11427), new Point(6048, 1803, 11427), ); $add( new Point(6048, 1803, 11427), - new Point(6048, 436, 11427), - new Point(5861, 436, 11511), + new Point(6048, 405, 11427), + new Point(5861, 405, 11511), new Point(5861, 1803, 11511), ); $add( new Point(5861, 1803, 11511), - new Point(5861, 436, 11511), - new Point(5861, 436, 11579), + new Point(5861, 405, 11511), + new Point(5861, 405, 11579), new Point(5861, 1803, 11579), ); $add( new Point(5861, 1803, 11579), - new Point(5861, 436, 11579), - new Point(5657, 436, 11731), + new Point(5861, 405, 11579), + new Point(5657, 405, 11731), new Point(5657, 1803, 11731), ); $add( new Point(5657, 1803, 11731), - new Point(5657, 436, 11731), - new Point(5383, 436, 11731), + new Point(5657, 405, 11731), + new Point(5383, 405, 11731), new Point(5383, 1803, 11731), ); $add( new Point(5383, 1803, 11731), - new Point(5383, 436, 11731), - new Point(5078, 436, 11865), + new Point(5383, 405, 11731), + new Point(5078, 405, 11865), new Point(5078, 1803, 11865), ); $add( new Point(5078, 1803, 11865), - new Point(5078, 436, 11865), - new Point(4372, 436, 11865), + new Point(5078, 405, 11865), + new Point(4372, 405, 11865), new Point(4372, 1803, 11865), ); $add( new Point(4372, 1803, 11865), - new Point(4372, 436, 11865), - new Point(4372, 436, 12301), + new Point(4372, 405, 11865), + new Point(4372, 405, 12301), new Point(4372, 1803, 12301), ); $add( new Point(4372, 1803, 12301), - new Point(4372, 436, 12301), - new Point(3671, 436, 12301), + new Point(4372, 405, 12301), + new Point(3671, 405, 12301), new Point(3671, 1803, 12301), ); $add( new Point(3671, 1803, 12301), - new Point(3671, 436, 12301), - new Point(3671, 436, 13268), + new Point(3671, 405, 12301), + new Point(3671, 405, 13268), new Point(3671, 1803, 13268), ); $add( - new Point(7014, 812, 11175), - new Point(7014, 1666, 11175), - new Point(7014, 1666, 10881), - new Point(7014, 812, 10881), + new Point(7018, 812, 11175), + new Point(7018, 1666, 11175), + new Point(7018, 1666, 10881), + new Point(7018, 812, 10881), ); $add( - new Point(7014, 884, 10881), - new Point(7014, 884, 10097), - new Point(6918, 884, 10097), - new Point(6918, 884, 10881), + new Point(7018, 884, 10881), + new Point(7018, 884, 10097), + new Point(6922, 884, 10097), + new Point(6922, 884, 10881), ); $add( - new Point(6918, 884, 10881), - new Point(6918, 884, 10097), - new Point(6918, 1094, 10097), - new Point(6918, 1094, 10881), + new Point(6922, 884, 10881), + new Point(6922, 884, 10097), + new Point(6922, 1091, 10097), + new Point(6922, 1091, 10881), ); $add( - new Point(7014, 884, 10097), - new Point(7014, 1666, 10097), + new Point(7018, 884, 10097), + new Point(7018, 1666, 10097), new Point(6912, 1666, 10097), new Point(6912, 884, 10097), ); $add( - new Point(7014, 1666, 10097), - new Point(7014, 884, 10097), - new Point(7014, 884, 10881), - new Point(7014, 1666, 10881), + new Point(7018, 1666, 10097), + new Point(7018, 884, 10097), + new Point(7018, 884, 10881), + new Point(7018, 1666, 10881), ); $add( - new Point(6918, 884, 10881), - new Point(6918, 1094, 10881), - new Point(6918, 1094, 11107), - new Point(6918, 884, 11107), + new Point(6922, 884, 10881), + new Point(6922, 1091, 10881), + new Point(6922, 1091, 11107), + new Point(6922, 884, 11107), ); $add( - new Point(6918, 1094, 11107), - new Point(6918, 1094, 10881), - new Point(7046, 1094, 10881), - new Point(7046, 1094, 11107), + new Point(6922, 1091, 11107), + new Point(6922, 1091, 10881), + new Point(7046, 1091, 10881), + new Point(7046, 1091, 11107), ); $add( - new Point(6918, 1094, 10881), - new Point(6918, 1094, 10097), - new Point(7046, 1094, 10097), - new Point(7046, 1094, 10881), + new Point(6922, 1091, 10881), + new Point(6922, 1091, 10097), + new Point(7046, 1091, 10097), + new Point(7046, 1091, 10881), ); $add( - new Point(6922, 436, 11051), - new Point(6922, 1803, 11051), - new Point(7036, 1803, 11051), - new Point(7036, 436, 11051), + new Point(6922, 405, 11052), + new Point(6922, 1803, 11052), + new Point(7036, 1803, 11052), + new Point(7036, 405, 11052), ); $add( - new Point(9222, 436, 11051), - new Point(9222, 994, 11051), - new Point(9316, 994, 11051), - new Point(9316, 436, 11051), + new Point(9225, 405, 11052), + new Point(9225, 994, 11052), + new Point(9321, 994, 11052), + new Point(9321, 405, 11052), + ); + $add( + new Point(9321, 405, 11052), + new Point(9321, 994, 11052), + new Point(9321, 994, 11339), + new Point(9321, 405, 11339), ); // mid to b walls $add( - new Point(4569, 312, 10381), - new Point(4569, 1477, 10381), - new Point(4961, 1477, 10381), - new Point(4961, 312, 10381), + new Point(4571, 312, 10380), + new Point(4571, 1477, 10380), + new Point(4955, 1477, 10380), + new Point(4955, 312, 10380), + ); + $add( + new Point(4955, 312, 10380), + new Point(4955, 1477, 10380), + new Point(4955, 1477, 10284), + new Point(4955, 312, 10284), + ); + $add( + new Point(4955, 312, 10284), + new Point(4955, 1477, 10284), + new Point(5531, 1477, 10284), + new Point(5531, 312, 10284), + ); + $add( + new Point(5531, 312, 10284), + new Point(5531, 1477, 10284), + new Point(5531, 1477, 10380), + new Point(5531, 312, 10380), + ); + $add( + new Point(5531, 312, 10380), + new Point(5531, 1477, 10380), + new Point(5915, 1477, 10380), + new Point(5915, 312, 10380), + ); + $add( + new Point(5915, 312, 10380), + new Point(5915, 1477, 10380), + new Point(5915, 1477, 9996), + new Point(5915, 312, 9996), ); $add( - new Point(4961, 312, 10381), - new Point(4961, 1477, 10381), - new Point(4961, 1477, 10298), - new Point(4961, 312, 10298), + new Point(5915, 312, 9996), + new Point(5915, 1477, 9996), + new Point(5819, 1477, 9996), + new Point(5819, 312, 9996), ); $add( - new Point(4961, 312, 10298), - new Point(4961, 1477, 10298), - new Point(5528, 1477, 10298), - new Point(5528, 312, 10298), + new Point(5819, 312, 9996), + new Point(5819, 1477, 9996), + new Point(5819, 1477, 9420), + new Point(5819, 312, 9420), ); $add( - new Point(5528, 312, 10298), - new Point(5528, 1477, 10298), - new Point(5528, 1477, 10383), - new Point(5528, 312, 10383), + new Point(5819, 312, 9420), + new Point(5819, 1477, 9420), + new Point(5915, 1477, 9420), + new Point(5915, 312, 9420), ); $add( - new Point(5528, 312, 10383), - new Point(5528, 1477, 10383), - new Point(5924, 1477, 10383), - new Point(5924, 312, 10383), + new Point(5915, 312, 9420), + new Point(5915, 1477, 9420), + new Point(5915, 1477, 9037), + new Point(5915, 312, 9037), ); $add( - new Point(5924, 312, 10383), - new Point(5924, 1477, 10383), - new Point(5924, 1477, 9990), - new Point(5924, 312, 9990), + new Point(5915, 312, 9037), + new Point(5915, 1477, 9037), + new Point(5772, 1477, 9037), + new Point(5772, 312, 9037), + ); + + // mountains mud + $add( + new Point(7089, 422, 11012), + new Point(5705, 422, 11012), + new Point(5750, 666, 11765), + new Point(7134, 666, 11765), + ); + $add( + new Point(5459, 548, 11339), + new Point(5545, 537, 11801), + new Point(4247, 769, 11037), + null, ); $add( - new Point(5924, 312, 9990), - new Point(5924, 1477, 9990), - new Point(5823, 1477, 9990), - new Point(5823, 312, 9990), + new Point(5545, 537, 11801), + new Point(4246, 900, 11900), + new Point(4247, 769, 11037), + null, ); $add( - new Point(5823, 312, 9990), - new Point(5823, 1477, 9990), - new Point(5823, 1477, 9422), - new Point(5823, 312, 9422), + new Point(4247, 769, 11037), + new Point(5459, 407, 11037), + new Point(5459, 548, 11339), + null, ); $add( - new Point(5823, 312, 9422), - new Point(5823, 1477, 9422), - new Point(5918, 1477, 9422), - new Point(5918, 312, 9422), + new Point(5705, 422, 11012), + new Point(5459, 548, 11339), + new Point(5459, 407, 11037), + null, ); $add( - new Point(5918, 312, 9422), - new Point(5918, 1477, 9422), - new Point(5918, 1477, 9043), - new Point(5918, 312, 9043), + new Point(5750, 666, 11765), + new Point(5459, 548, 11339), + new Point(5705, 422, 11012), + null, ); $add( - new Point(5918, 312, 9043), - new Point(5918, 1477, 9043), - new Point(5692, 1477, 9043), - new Point(5692, 312, 9043), + new Point(5750, 666, 11765), + new Point(5545, 537, 11801), + new Point(5459, 548, 11339), + null, ); } @@ -2267,12 +2321,12 @@ public function __construct() $add( new Point(4628, 464, 7918), new Point(3996, 464, 7918), - new Point(3996, 654, 7592), - new Point(4628, 654, 7592), + new Point(3996, 654, 7598), + new Point(4628, 654, 7598), ); $add( - new Point(4628, 654, 7592), - new Point(3996, 654, 7592), + new Point(4628, 654, 7598), + new Point(3996, 654, 7598), new Point(3996, 654, 7132), new Point(4628, 654, 7132), ); @@ -2283,212 +2337,208 @@ public function __construct() new Point(3858, 894, 7214), ); $add( - new Point(4048, 464, 8079), - new Point(4048, 464, 8744), - new Point(4048, 949, 8744), - new Point(4048, 949, 8079), + new Point(4044, 423, 8077), + new Point(4044, 423, 8749), + new Point(4044, 947, 8749), + new Point(4044, 947, 8077), ); $add( - new Point(4048, 464, 8079), - new Point(4048, 949, 8079), - new Point(4238, 949, 8079), - new Point(4238, 464, 8079), + new Point(4044, 423, 8077), + new Point(4044, 947, 8077), + new Point(4238, 947, 8077), + new Point(4238, 423, 8077), ); $add( - new Point(4238, 464, 8079), - new Point(4238, 949, 8079), - new Point(4238, 949, 7597), - new Point(4238, 464, 7599), + new Point(4238, 423, 8077), + new Point(4238, 947, 8077), + new Point(4238, 947, 7598), + new Point(4238, 423, 7598), ); $add( - new Point(4238, 949, 7597), - new Point(4238, 949, 8079), - new Point(3879, 949, 8079), - new Point(3879, 949, 7597), + new Point(4238, 947, 7598), + new Point(4238, 947, 8077), + new Point(3879, 947, 8077), + new Point(3879, 947, 7598), ); $add( - new Point(3879, 949, 7597), - new Point(3879, 949, 8079), - new Point(3879, 857, 8079), - new Point(3879, 857, 7597), + new Point(3879, 947, 7598), + new Point(3879, 947, 8077), + new Point(3879, 857, 8077), + new Point(3879, 857, 7598), ); $add( - new Point(4238, 949, 7597), - new Point(3879, 949, 7597), - new Point(3879, 648, 7597), - new Point(4238, 648, 7597), + new Point(4238, 947, 7598), + new Point(3879, 947, 7598), + new Point(3879, 648, 7598), + new Point(4238, 648, 7598), ); $add( - new Point(4048, 949, 8744), - new Point(4048, 464, 8744), - new Point(6056, 464, 8744), - new Point(6056, 949, 8744), + new Point(4044, 947, 8749), + new Point(4044, 423, 8749), + new Point(6059, 423, 8749), + new Point(6059, 947, 8749), ); $add( - new Point(6056, 949, 8744), - new Point(6056, 464, 8744), - new Point(6056, 464, 8605), - new Point(6056, 949, 8605), + new Point(6059, 947, 8749), + new Point(6059, 423, 8749), + new Point(6059, 423, 8605), + new Point(6059, 947, 8605), ); $add( - new Point(6056, 949, 8605), - new Point(6056, 464, 8605), - new Point(6159, 464, 8605), - new Point(6159, 949, 8605), + new Point(6059, 947, 8605), + new Point(6059, 423, 8605), + new Point(6154, 423, 8605), + new Point(6154, 947, 8605), ); $add( - new Point(6159, 949, 8605), - new Point(6159, 464, 8605), - new Point(6159, 464, 9140), - new Point(6159, 949, 9140), + new Point(6154, 947, 8605), + new Point(6154, 423, 8605), + new Point(6154, 423, 9133), + new Point(6154, 947, 9133), ); $add( - new Point(6159, 949, 9140), - new Point(6159, 464, 9140), - new Point(5906, 464, 9140), - new Point(5906, 949, 9140), + new Point(6154, 947, 9133), + new Point(6154, 423, 9133), + new Point(5906, 423, 9133), + new Point(5906, 947, 9133), ); $add( - new Point(4628, 472, 7753), - new Point(4628, 472, 8871), - new Point(3996, 472, 8871), - new Point(3996, 472, 7753), + new Point(6059, 439, 8077), + new Point(4619, 439, 8077), + new Point(4619, 1020, 8077), + new Point(6059, 1020, 8077), ); $add( - new Point(6057, 472, 8080), - new Point(6057, 472, 8871), - new Point(4628, 472, 8871), - new Point(4628, 472, 8080), + new Point(6059, 439, 8077), + new Point(6059, 1020, 8077), + new Point(6059, 1020, 8221), + new Point(6059, 439, 8221), ); $add( - new Point(6057, 472, 8080), - new Point(4628, 472, 8080), - new Point(4628, 1020, 8080), - new Point(6057, 1020, 8080), + new Point(6059, 439, 8221), + new Point(6059, 1020, 8221), + new Point(6154, 1020, 8221), + new Point(6154, 439, 8221), ); $add( - new Point(6057, 472, 8080), - new Point(6057, 1020, 8080), - new Point(6057, 1020, 8240), - new Point(6057, 472, 8240), + new Point(4185, 756, 7614), + new Point(4185, 756, 7214), + new Point(4238, 649, 7214), + new Point(4238, 649, 7614), ); $add( - new Point(6057, 472, 8240), - new Point(6057, 1020, 8240), - new Point(6162, 1020, 8240), - new Point(6162, 472, 8240), + new Point(4246, 620, 7650), + new Point(4147, 774, 7077), + new Point(4681, 656, 7576), + null, ); + + // lower tunnel floor $add( - new Point(6057, 472, 8871), - new Point(6057, 472, 8080), - new Point(6057, 387, 8080), - new Point(6057, 387, 8871), + new Point(4628, 472, 7753), + new Point(4628, 472, 8871), + new Point(3996, 472, 8871), + new Point(3996, 472, 7753), ); $add( - new Point(4628, 1020, 8080), - new Point(4628, 472, 8080), - new Point(4628, 472, 8032), - new Point(4628, 1020, 8032), + new Point(6058, 472, 8063), + new Point(6058, 472, 8858), + new Point(4628, 472, 8858), + new Point(4628, 472, 8063), ); $add( - new Point(4185, 756, 7614), - new Point(4185, 756, 7214), - new Point(4237, 649, 7214), - new Point(4237, 649, 7614), + new Point(6058, 472, 8858), + new Point(6058, 472, 8063), + new Point(6058, 387, 8066), + new Point(6058, 387, 8858), ); // lower tunnel stairs wall $add( - new Point(4616, 1697, 8066), - new Point(4616, 406, 8066), - new Point(4616, 406, 7515), - new Point(4616, 1697, 7515), + new Point(4619, 1697, 8077), + new Point(4619, 406, 8077), + new Point(4619, 406, 7645), + new Point(4619, 1697, 7645), ); $add( - new Point(4363, 1697, 7227), - new Point(4363, 406, 7227), - new Point(3827, 406, 7227), - new Point(3827, 1697, 7227), + new Point(4331, 1697, 7262), + new Point(4331, 406, 7262), + new Point(4188, 406, 7214), + new Point(4188, 1697, 7214), ); $add( - new Point(4616, 406, 8066), - new Point(4616, 1697, 8066), - new Point(4652, 1697, 8066), - new Point(4652, 406, 8066), + new Point(4475, 1697, 7357), + new Point(4475, 406, 7357), + new Point(4331, 406, 7262), + new Point(4331, 1697, 7262), ); $add( - new Point(4476, 1697, 7286), - new Point(4476, 406, 7286), - new Point(4363, 406, 7227), - new Point(4363, 1697, 7227), + new Point(4571, 1697, 7501), + new Point(4571, 406, 7501), + new Point(4475, 406, 7357), + new Point(4475, 1697, 7357), ); $add( - new Point(4595, 1697, 7421), - new Point(4595, 406, 7421), - new Point(4476, 406, 7286), - new Point(4476, 1697, 7286), + new Point(4619, 406, 7645), + new Point(4571, 406, 7501), + new Point(4571, 1697, 7501), + new Point(4619, 1697, 7645), ); $add( - new Point(4616, 406, 7515), - new Point(4595, 406, 7421), - new Point(4595, 1697, 7421), - new Point(4616, 1697, 7515), - ); - $add( - new Point(3827, 1697, 7227), - new Point(3827, 406, 7227), - new Point(3827, 406, 7178), - new Point(3827, 1697, 7178), + new Point(4188, 1697, 7214), + new Point(4188, 406, 7214), + new Point(3827, 406, 7214), + new Point(3827, 1697, 7214), ); // lower tunnel to mid $add( - new Point(6162, 464, 7486), - new Point(6162, 1144, 7486), - new Point(6060, 1144, 7486), - new Point(6060, 464, 7486), + new Point(6162, 464, 7501), + new Point(6162, 1144, 7501), + new Point(6059, 1144, 7501), + new Point(6059, 464, 7501), ); $add( - new Point(6060, 464, 7486), - new Point(6060, 1353, 7486), - new Point(6060, 1353, 6767), - new Point(6060, 464, 6767), + new Point(6059, 464, 7501), + new Point(6059, 1353, 7501), + new Point(6059, 1353, 6767), + new Point(6059, 464, 6767), ); $add( - new Point(6162, 464, 8240), - new Point(6162, 913, 8240), - new Point(6162, 913, 7486), - new Point(6162, 464, 7486), + new Point(6154, 464, 8240), + new Point(6154, 913, 8240), + new Point(6154, 913, 7501), + new Point(6154, 464, 7501), ); $add( - new Point(6162, 913, 7486), - new Point(6162, 913, 8240), - new Point(6162, 1144, 8240), - new Point(6162, 1144, 7486), + new Point(6154, 913, 7501), + new Point(6154, 913, 8240), + new Point(6154, 1144, 8240), + new Point(6154, 1144, 7501), ); $add( - new Point(6162, 1144, 8240), - new Point(6162, 913, 8240), - new Point(6162, 913, 9136), - new Point(6162, 1144, 9136), + new Point(6154, 1144, 8240), + new Point(6154, 913, 8240), + new Point(6154, 913, 9136), + new Point(6154, 1144, 9136), ); $add( - new Point(6162, 1144, 8935), - new Point(6749, 1144, 8935), - new Point(6749, 1144, 9134), - new Point(6162, 1144, 9134), + new Point(6162, 1144, 8941), + new Point(6749, 1144, 8941), + new Point(6749, 1144, 9133), + new Point(6162, 1144, 9133), ); $add( - new Point(6162, 1144, 8240), - new Point(6162, 1144, 9136), + new Point(6154, 1144, 8240), + new Point(6154, 1144, 9136), new Point(5824, 1144, 9136), new Point(5824, 1144, 8240), ); $add( - new Point(6162, 1144, 7486), - new Point(6162, 1144, 8240), + new Point(6154, 1144, 7501), + new Point(6154, 1144, 8240), new Point(5824, 1144, 8240), - new Point(5824, 1144, 7486), + new Point(5824, 1144, 7501), ); $add( new Point(5824, 1144, 8240), @@ -2497,42 +2547,48 @@ public function __construct() new Point(5824, 1574, 8240), ); $add( - new Point(5824, 1144, 7486), + new Point(5824, 1144, 7501), new Point(5824, 1144, 8240), new Point(5824, 1574, 8240), - new Point(5824, 1574, 7486), + new Point(5824, 1574, 7501), ); $add( - new Point(6162, 1144, 8935), - new Point(6162, 962, 8935), - new Point(6749, 962, 8935), - new Point(6749, 1144, 8935), + new Point(6162, 1144, 8941), + new Point(6162, 962, 8941), + new Point(6749, 962, 8941), + new Point(6749, 1144, 8941), ); $add( - new Point(6162, 1144, 9134), - new Point(6749, 1144, 9134), - new Point(6749, 946, 9134), - new Point(6162, 946, 9134), + new Point(6162, 1144, 9133), + new Point(6749, 1144, 9133), + new Point(6749, 946, 9133), + new Point(6162, 946, 9133), ); $add( - new Point(6162, 1144, 9134), - new Point(6162, 946, 9134), - new Point(5865, 946, 9134), - new Point(5865, 1144, 9134), + new Point(6162, 1144, 9133), + new Point(6162, 946, 9133), + new Point(5865, 946, 9133), + new Point(5865, 1144, 9133), ); $add( - new Point(5824, 1144, 7486), - new Point(5824, 1574, 7486), + new Point(5824, 1144, 7501), + new Point(5824, 1574, 7501), new Point(5824, 1574, 6718), new Point(5824, 1144, 6718), ); + $add( + new Point(6059, 1353, 7501), + new Point(6059, 464, 7501), + new Point(5824, 464, 7501), + new Point(5824, 1353, 7501), + ); // lower tunnel to upper $add( - new Point(3887, 946, 7597), - new Point(3887, 946, 7802), - new Point(3813, 885, 7802), - new Point(3813, 885, 7597), + new Point(3887, 947, 7597), + new Point(3887, 947, 7802), + new Point(3813, 898, 7802), + new Point(3813, 898, 7597), ); } @@ -2541,394 +2597,376 @@ public function __construct() // mid main floor $add( - new Point(6983, 464, 9039), - new Point(6011, 464, 9039), - new Point(6011, 464, 7796), - new Point(6983, 464, 7796), - ); - $add( - new Point(6983, 818, 6387), - new Point(6983, 485, 7845), - new Point(6027, 485, 7845), - new Point(6027, 818, 6387), + new Point(6983, 444, 9039), + new Point(6011, 444, 9039), + new Point(6011, 444, 7796), + new Point(6983, 444, 7796), ); $add( - new Point(6027, 485, 7845), - new Point(6983, 485, 7845), - new Point(6983, 402, 7845), - new Point(6027, 402, 7845), + new Point(6950, 813, 6447), + new Point(6950, 444, 7937), + new Point(6027, 444, 7937), + new Point(6027, 813, 6447), ); $add( - new Point(6011, 464, 9039), - new Point(6983, 464, 9039), + new Point(6011, 444, 9039), + new Point(6983, 444, 9039), new Point(6983, 391, 9039), new Point(6011, 391, 9039), ); // mid walls $add( - new Point(9247, 415, 10295), - new Point(9247, 995, 10295), - new Point(7971, 995, 10295), - new Point(7971, 415, 10295), + new Point(9247, 415, 10284), + new Point(9247, 995, 10284), + new Point(7978, 995, 10284), + new Point(7978, 415, 10284), ); $add( - new Point(7971, 415, 10295), - new Point(7971, 995, 10295), - new Point(7680, 995, 10105), - new Point(7680, 415, 10105), + new Point(7978, 415, 10284), + new Point(7978, 995, 10284), + new Point(7690, 995, 10092), + new Point(7690, 415, 10092), ); $add( - new Point(7680, 415, 10105), - new Point(7680, 995, 10105), - new Point(6917, 995, 10105), - new Point(6917, 415, 10105), + new Point(7690, 415, 10092), + new Point(7690, 995, 10092), + new Point(6917, 995, 10092), + new Point(6917, 415, 10092), ); $add( - new Point(6724, 415, 9904), - new Point(6724, 1866, 9904), - new Point(6724, 1866, 9711), - new Point(6724, 415, 9711), + new Point(6730, 415, 9900), + new Point(6730, 1866, 9900), + new Point(6730, 1866, 9708), + new Point(6730, 415, 9708), ); $add( new Point(6917, 415, 10105), new Point(6917, 1866, 10105), - new Point(6724, 1866, 9904), - new Point(6724, 415, 9904), + new Point(6730, 1866, 9900), + new Point(6730, 415, 9900), ); $add( - new Point(6724, 415, 9711), - new Point(6724, 1866, 9711), - new Point(6916, 1866, 9513), - new Point(6916, 415, 9513), + new Point(6730, 415, 9708), + new Point(6730, 1866, 9708), + new Point(6922, 1866, 9516), + new Point(6922, 415, 9516), ); $add( - new Point(6916, 415, 9513), - new Point(6916, 1866, 9513), - new Point(6916, 1866, 9318), - new Point(6916, 415, 9318), + new Point(6922, 415, 9516), + new Point(6922, 1866, 9516), + new Point(6922, 1866, 9318), + new Point(6922, 415, 9318), ); $add( - new Point(6916, 415, 9318), - new Point(6916, 1866, 9318), - new Point(6725, 1866, 9135), - new Point(6725, 415, 9135), + new Point(6922, 415, 9318), + new Point(6922, 1866, 9318), + new Point(6730, 1866, 9133), + new Point(6730, 415, 9133), ); $add( - new Point(6725, 415, 9135), - new Point(6725, 1866, 9135), - new Point(6725, 1866, 8934), - new Point(6725, 415, 8934), + new Point(6730, 415, 9133), + new Point(6730, 1866, 9133), + new Point(6730, 1866, 8941), + new Point(6730, 415, 8941), ); $add( - new Point(6725, 415, 8934), - new Point(6725, 1866, 8934), - new Point(6933, 1866, 8735), - new Point(6933, 415, 8735), + new Point(6730, 415, 8941), + new Point(6730, 1866, 8941), + new Point(6922, 1866, 8749), + new Point(6922, 415, 8749), ); $add( - new Point(6920, 440, 8746), - new Point(6920, 899, 8746), - new Point(6920, 899, 6445), - new Point(6920, 440, 6445), + new Point(6922, 440, 8771), + new Point(6922, 899, 8771), + new Point(6922, 899, 6445), + new Point(6922, 440, 6445), ); $add( - new Point(6920, 899, 6445), - new Point(6920, 899, 8746), - new Point(6970, 899, 8746), + new Point(6922, 899, 6445), + new Point(6922, 899, 8771), + new Point(6970, 899, 8771), new Point(6970, 899, 6445), ); $add( - new Point(6920, 440, 6445), - new Point(6920, 899, 6445), - new Point(6969, 899, 6445), - new Point(6969, 440, 6445), + new Point(6922, 440, 6445), + new Point(6922, 899, 6445), + new Point(6970, 899, 6445), + new Point(6970, 440, 6445), ); $add( new Point(6970, 899, 6445), - new Point(6970, 899, 8746), - new Point(6970, 799, 8746), + new Point(6970, 899, 8771), + new Point(6970, 799, 8771), new Point(6970, 799, 6445), ); $add( - new Point(6933, 415, 8735), - new Point(6933, 1866, 8735), + new Point(6922, 415, 8749), + new Point(6922, 1866, 8749), new Point(6933, 1866, 8755), new Point(6933, 415, 8755), ); // short to top mid walls $add( - new Point(9218, 769, 8191), - new Point(9218, 769, 10301), - new Point(9218, 1775, 10301), - new Point(9218, 1775, 8191), + new Point(9225, 769, 8173), + new Point(9225, 769, 10284), + new Point(9225, 1775, 10284), + new Point(9225, 1775, 8173), ); $add( - new Point(9218, 769, 8191), - new Point(9218, 1775, 8191), - new Point(7582, 1775, 8191), - new Point(7582, 769, 8191), + new Point(9225, 769, 8173), + new Point(9225, 1775, 8173), + new Point(7594, 1775, 8173), + new Point(7594, 769, 8173), ); $add( - new Point(7582, 769, 8191), - new Point(7582, 1775, 8191), - new Point(7302, 1775, 7887), - new Point(7302, 769, 7887), + new Point(7594, 769, 8173), + new Point(7594, 1775, 8173), + new Point(7306, 1775, 7885), + new Point(7306, 769, 7885), ); $add( - new Point(7302, 769, 7887), - new Point(7302, 1775, 7887), - new Point(7302, 1775, 5863), - new Point(7302, 769, 5863), + new Point(7306, 769, 7885), + new Point(7306, 1775, 7885), + new Point(7306, 1775, 5870), + new Point(7306, 769, 5870), ); $add( - new Point(7302, 769, 5863), - new Point(7302, 1775, 5863), - new Point(7594, 1775, 5581), - new Point(7594, 769, 5581), + new Point(7306, 769, 5870), + new Point(7306, 1775, 5870), + new Point(7594, 1775, 5582), + new Point(7594, 769, 5582), ); $add( - new Point(7594, 769, 5581), - new Point(7594, 1775, 5581), - new Point(8840, 1775, 5581), - new Point(8840, 769, 5581), + new Point(7594, 769, 5582), + new Point(7594, 1775, 5582), + new Point(8841, 1775, 5582), + new Point(8841, 769, 5582), ); $add( - new Point(8840, 769, 5581), - new Point(8840, 1775, 5581), - new Point(8840, 1775, 5101), - new Point(8840, 769, 5101), + new Point(8841, 769, 5582), + new Point(8841, 1775, 5582), + new Point(8841, 1775, 5103), + new Point(8841, 769, 5103), ); $add( - new Point(8840, 769, 5101), - new Point(8840, 1775, 5101), - new Point(9032, 1775, 4906), - new Point(9032, 769, 4906), + new Point(8841, 769, 5103), + new Point(8841, 1775, 5103), + new Point(9033, 1775, 4911), + new Point(9033, 769, 4911), ); $add( - new Point(9032, 769, 4906), - new Point(9032, 1775, 4906), - new Point(9321, 1775, 4906), - new Point(9321, 769, 4906), + new Point(9033, 769, 4911), + new Point(9033, 1775, 4911), + new Point(9321, 1775, 4911), + new Point(9321, 769, 4911), ); $add( - new Point(9321, 769, 4906), - new Point(9321, 1775, 4906), + new Point(9321, 769, 4911), + new Point(9321, 1775, 4911), new Point(9321, 1775, 5019), new Point(9321, 769, 5019), ); - $add( - new Point(9218, 1775, 10301), - new Point(9218, 769, 10301), - new Point(9270, 769, 10301), - new Point(9270, 1775, 10301), - ); - $add( - new Point(9270, 1775, 10301), - new Point(9270, 769, 10301), - new Point(9270, 769, 10267), - new Point(9270, 1775, 10267), - ); // top mid main floor $add( - new Point(5481, 835, 2262), - new Point(10025, 835, 2262), - new Point(10025, 835, 6403), - new Point(5481, 835, 6403), + new Point(5481, 824, 2262), + new Point(10025, 824, 2262), + new Point(10025, 824, 6403), + new Point(5481, 824, 6403), ); $add( - new Point(5481, 835, 6403), - new Point(10025, 835, 6403), - new Point(10025, 766, 6403), - new Point(5481, 766, 6403), + new Point(5481, 824, 6403), + new Point(10025, 824, 6403), + new Point(10025, 804, 6501), + new Point(5481, 804, 6501), ); // top mid walls $add( - new Point(6157, 726, 2235), - new Point(6157, 726, 4725), - new Point(6157, 1778, 4725), - new Point(6157, 1778, 2235), + new Point(6154, 726, 2224), + new Point(6154, 726, 4719), + new Point(6154, 1778, 4719), + new Point(6154, 1778, 2224), ); $add( - new Point(6157, 1778, 4725), - new Point(6157, 726, 4725), - new Point(5728, 726, 4725), - new Point(5728, 1778, 4725), + new Point(6154, 1778, 4719), + new Point(6154, 726, 4719), + new Point(5771, 726, 4719), + new Point(5771, 1778, 4719), ); $add( - new Point(5728, 1778, 4725), - new Point(5728, 726, 4725), - new Point(5503, 726, 5141), - new Point(5503, 1778, 5141), + new Point(5771, 1778, 4719), + new Point(5771, 726, 4719), + new Point(5579, 726, 4911), + new Point(5579, 1778, 4911), ); $add( - new Point(5503, 1778, 5141), - new Point(5503, 726, 5141), - new Point(5503, 726, 5673), - new Point(5503, 1778, 5673), + new Point(5579, 1778, 4911), + new Point(5579, 726, 4911), + new Point(5510, 726, 4911), + new Point(5510, 1778, 4911), ); $add( - new Point(5503, 1778, 5673), - new Point(5503, 726, 5673), - new Point(5583, 726, 5673), - new Point(5583, 1778, 5673), + new Point(5510, 1778, 5678), + new Point(5510, 726, 5678), + new Point(5579, 726, 5678), + new Point(5579, 1778, 5678), ); $add( - new Point(5583, 1778, 5673), - new Point(5583, 726, 5673), - new Point(5775, 726, 5867), - new Point(5775, 1778, 5867), + new Point(5579, 1778, 5678), + new Point(5579, 726, 5678), + new Point(5771, 726, 5870), + new Point(5771, 1778, 5870), ); $add( - new Point(5775, 1778, 5867), - new Point(5775, 726, 5867), - new Point(5775, 726, 6060), - new Point(5775, 1778, 6060), + new Point(5771, 1778, 5870), + new Point(5771, 726, 5870), + new Point(5771, 726, 6062), + new Point(5771, 1778, 6062), ); $add( - new Point(5775, 1778, 6060), - new Point(5775, 726, 6060), - new Point(6061, 726, 6060), - new Point(6061, 1778, 6060), + new Point(5771, 1778, 6062), + new Point(5771, 726, 6062), + new Point(6059, 726, 6062), + new Point(6059, 1778, 6062), ); $add( - new Point(6061, 1778, 6060), - new Point(6061, 726, 6060), - new Point(6061, 726, 6298), - new Point(6061, 1778, 6298), + new Point(6059, 1778, 6062), + new Point(6059, 726, 6062), + new Point(6059, 726, 6302), + new Point(6059, 1778, 6302), ); $add( - new Point(6061, 1778, 6298), - new Point(6061, 726, 6298), - new Point(6162, 726, 6298), - new Point(6162, 1778, 6298), + new Point(6059, 1778, 6302), + new Point(6059, 726, 6302), + new Point(6154, 726, 6302), + new Point(6154, 1778, 6302), ); $add( - new Point(6162, 1778, 6298), - new Point(6162, 726, 6298), - new Point(6162, 726, 6784), - new Point(6162, 1778, 6784), + new Point(6154, 1778, 6302), + new Point(6154, 726, 6302), + new Point(6154, 726, 6782), + new Point(6154, 1778, 6782), ); $add( - new Point(6162, 1778, 6784), - new Point(6162, 726, 6784), - new Point(5635, 726, 6784), - new Point(5635, 1778, 6784), + new Point(6154, 1778, 6782), + new Point(6154, 726, 6782), + new Point(5635, 726, 6782), + new Point(5635, 1778, 6782), ); $add( - new Point(6157, 726, 2235), - new Point(6157, 1778, 2235), - new Point(6106, 1778, 2235), - new Point(6106, 726, 2235), + new Point(5510, 1778, 4911), + new Point(5510, 726, 4911), + new Point(5510, 726, 5678), + new Point(5510, 1778, 5678), ); // top mid walls.001 $add( - new Point(8081, 786, 2989), - new Point(8081, 786, 4725), - new Point(8081, 1620, 4725), - new Point(8081, 1620, 2989), + new Point(8073, 786, 2992), + new Point(8073, 786, 4719), + new Point(8073, 1620, 4719), + new Point(8073, 1620, 2992), ); $add( - new Point(8081, 1620, 4725), - new Point(8081, 786, 4725), - new Point(7785, 786, 5014), - new Point(7785, 1620, 5014), + new Point(8073, 1620, 4719), + new Point(8073, 786, 4719), + new Point(7786, 786, 5007), + new Point(7786, 1620, 5007), ); $add( - new Point(7785, 1620, 5014), - new Point(7785, 786, 5014), - new Point(6820, 786, 5014), - new Point(6820, 1620, 5014), + new Point(7786, 1620, 5007), + new Point(7786, 786, 5007), + new Point(6820, 786, 5007), + new Point(6820, 1620, 5007), ); $add( - new Point(6820, 1620, 5014), - new Point(6820, 786, 5014), - new Point(6531, 786, 4725), - new Point(6531, 1620, 4725), + new Point(6820, 1620, 5007), + new Point(6820, 786, 5007), + new Point(6538, 786, 4725), + new Point(6538, 1620, 4725), ); $add( - new Point(6531, 1620, 4725), - new Point(6531, 786, 4725), - new Point(6531, 786, 2983), - new Point(6531, 1620, 2983), + new Point(6538, 1620, 2992), + new Point(6538, 786, 2992), + new Point(6826, 786, 2704), + new Point(6826, 1620, 2704), ); $add( - new Point(6531, 1620, 2983), - new Point(6531, 786, 2983), - new Point(6831, 786, 2696), - new Point(6831, 1620, 2696), + new Point(6826, 1620, 2704), + new Point(6826, 786, 2704), + new Point(7786, 786, 2704), + new Point(7786, 1620, 2704), ); $add( - new Point(6831, 1620, 2696), - new Point(6831, 786, 2696), - new Point(7781, 786, 2696), - new Point(7781, 1620, 2696), + new Point(7786, 1620, 2704), + new Point(7786, 786, 2704), + new Point(8073, 786, 2992), + new Point(8073, 1620, 2992), ); $add( - new Point(7781, 1620, 2696), - new Point(7781, 786, 2696), - new Point(8084, 786, 2990), - new Point(8084, 1620, 2990), + new Point(6538, 1620, 2992), + new Point(6538, 786, 2992), + new Point(6538, 786, 4725), + new Point(6538, 1620, 4725), ); $add( - new Point(6531, 1620, 4725), - new Point(6531, 1620, 2983), - new Point(6108, 1620, 2983), - new Point(6108, 1620, 4725), + new Point(6538, 1620, 4725), + new Point(6538, 1517, 4725), + new Point(6154, 1517, 4725), + new Point(6154, 1620, 4725), ); $add( - new Point(6108, 1620, 2983), - new Point(6531, 1620, 2983), - new Point(6531, 1510, 2983), - new Point(6108, 1510, 2983), - ); - $add( - new Point(6531, 1620, 4725), - new Point(6108, 1620, 4725), - new Point(6108, 1510, 4725), - new Point(6531, 1510, 4725), + new Point(6538, 1517, 2992), + new Point(6538, 1620, 2992), + new Point(6154, 1620, 2992), + new Point(6154, 1517, 2992), ); // xBox $add( - new Point(6620, 593, 8508), - new Point(6620, 593, 8554), - new Point(6693, 593, 8554), - new Point(6693, 593, 8508), + new Point(6620, 581, 8508), + new Point(6620, 581, 8554), + new Point(6693, 581, 8554), + new Point(6693, 581, 8508), + ); + $add( + new Point(6634, 720, 8269), + new Point(6634, 720, 8557), + new Point(6927, 720, 8557), + new Point(6927, 720, 8269), ); $add( - new Point(6631, 440, 8561), - new Point(6631, 720, 8561), - new Point(6631, 720, 8262), - new Point(6631, 440, 8262), + new Point(6646, 581, 8253), + new Point(6646, 581, 8300), + new Point(6930, 581, 8300), + new Point(6930, 581, 8253), ); $add( - new Point(6631, 440, 8262), - new Point(6631, 720, 8262), - new Point(6931, 720, 8262), - new Point(6931, 440, 8262), + new Point(6634, 720, 8269), + new Point(6927, 720, 8269), + new Point(6927, 425, 8269), + new Point(6634, 425, 8269), ); $add( - new Point(6631, 720, 8561), - new Point(6631, 440, 8561), - new Point(6961, 440, 8561), - new Point(6961, 720, 8561), + new Point(6634, 720, 8557), + new Point(6634, 720, 8269), + new Point(6634, 425, 8269), + new Point(6634, 425, 8557), ); $add( - new Point(6631, 720, 8262), - new Point(6631, 720, 8561), - new Point(6955, 720, 8561), - new Point(6955, 720, 8262), + new Point(6927, 720, 8557), + new Point(6634, 720, 8557), + new Point(6634, 425, 8557), + new Point(6927, 425, 8557), ); $add( - new Point(6646, 593, 8253), - new Point(6646, 593, 8300), - new Point(6930, 593, 8300), - new Point(6930, 593, 8253), + new Point(6927, 720, 8269), + new Point(6927, 720, 8557), + new Point(6927, 425, 8557), + new Point(6927, 425, 8269), ); } @@ -2937,170 +2975,176 @@ public function __construct() // outside tunnels bumps $add( - new Point(2325, 906, 5787), - new Point(1479, 906, 5787), - new Point(1479, 906, 5677), - new Point(2325, 906, 5677), + new Point(2335, 899, 5787), + new Point(2335, 899, 5678), + new Point(1464, 899, 5678), + new Point(1464, 899, 5787), ); $add( - new Point(2325, 906, 5677), - new Point(1479, 906, 5677), - new Point(1479, 808, 5677), - new Point(2325, 808, 5677), + new Point(3774, 899, 5787), + new Point(3774, 899, 5678), + new Point(3062, 899, 5678), + new Point(3062, 899, 5787), ); $add( - new Point(2325, 906, 5787), - new Point(2325, 906, 5677), - new Point(2325, 814, 5677), - new Point(2325, 814, 5787), + new Point(3062, 899, 5787), + new Point(3062, 899, 5678), + new Point(3062, 799, 5678), + new Point(3062, 799, 5787), ); $add( - new Point(3774, 906, 5787), - new Point(3083, 906, 5787), - new Point(3083, 906, 5677), - new Point(3774, 906, 5677), + new Point(1464, 899, 5678), + new Point(2335, 899, 5678), + new Point(2335, 799, 5678), + new Point(1464, 799, 5678), ); $add( - new Point(3774, 906, 5677), - new Point(3083, 906, 5677), - new Point(3083, 808, 5677), - new Point(3774, 808, 5677), + new Point(2335, 899, 5678), + new Point(2335, 899, 5787), + new Point(2335, 799, 5787), + new Point(2335, 799, 5678), ); $add( - new Point(3083, 906, 5677), - new Point(3083, 906, 5787), - new Point(3083, 803, 5787), - new Point(3083, 803, 5677), + new Point(3062, 899, 5678), + new Point(3774, 899, 5678), + new Point(3774, 799, 5678), + new Point(3062, 799, 5678), + ); + $add( + new Point(3774, 899, 5787), + new Point(3062, 899, 5787), + new Point(3062, 799, 5787), + new Point(3774, 799, 5787), ); // outside tunnels walls $add( - new Point(1481, 794, 5959), - new Point(1481, 1691, 5959), - new Point(1481, 1691, 5011), - new Point(1481, 794, 5011), + new Point(1477, 794, 5966), + new Point(1477, 1691, 5966), + new Point(1477, 1691, 5007), + new Point(1477, 794, 5007), ); $add( - new Point(1481, 1691, 5959), - new Point(1481, 794, 5959), - new Point(1742, 794, 5959), - new Point(1742, 1691, 5959), + new Point(1477, 1691, 5966), + new Point(1477, 794, 5966), + new Point(1741, 794, 5966), + new Point(1741, 1691, 5966), ); $add( - new Point(1742, 1691, 5959), - new Point(1742, 794, 5959), - new Point(1938, 794, 6162), - new Point(1938, 1691, 6162), + new Point(1741, 1691, 5966), + new Point(1741, 794, 5966), + new Point(1933, 794, 6158), + new Point(1933, 1691, 6158), ); $add( - new Point(1938, 1691, 6162), - new Point(1938, 794, 6162), - new Point(1938, 794, 6265), - new Point(1938, 1691, 6265), + new Point(1933, 1691, 6158), + new Point(1933, 794, 6158), + new Point(1933, 794, 6265), + new Point(1933, 1691, 6265), ); $add( - new Point(1481, 794, 5011), - new Point(1481, 1691, 5011), - new Point(1599, 1691, 5011), - new Point(1599, 794, 5011), + new Point(1477, 794, 5007), + new Point(1477, 1691, 5007), + new Point(1597, 1691, 5007), + new Point(1597, 794, 5007), ); $add( - new Point(1599, 794, 5011), - new Point(1599, 1691, 5011), - new Point(1599, 1691, 4501), - new Point(1599, 794, 4501), + new Point(1597, 794, 5007), + new Point(1597, 1691, 5007), + new Point(1597, 1691, 4503), + new Point(1597, 794, 4503), ); $add( - new Point(1599, 794, 4501), - new Point(1599, 1691, 4501), - new Point(1555, 1691, 4501), - new Point(1555, 794, 4501), + new Point(1597, 794, 4503), + new Point(1597, 1691, 4503), + new Point(1549, 1691, 4503), + new Point(1549, 794, 4503), ); $add( - new Point(1555, 794, 4501), - new Point(1555, 1691, 4501), - new Point(1555, 1691, 3754), - new Point(1555, 794, 3754), + new Point(1549, 794, 4503), + new Point(1549, 1691, 4503), + new Point(1549, 1691, 3759), + new Point(1549, 794, 3759), ); $add( - new Point(1555, 794, 3754), - new Point(1555, 1691, 3754), - new Point(1455, 1691, 3754), - new Point(1455, 794, 3754), + new Point(1549, 794, 3759), + new Point(1549, 1691, 3759), + new Point(1453, 1691, 3759), + new Point(1453, 794, 3759), ); $add( - new Point(1455, 794, 3754), - new Point(1455, 1691, 3754), - new Point(1455, 1691, 2075), - new Point(1455, 794, 2075), + new Point(1453, 794, 3759), + new Point(1453, 1691, 3759), + new Point(1453, 1691, 2080), + new Point(1453, 794, 2080), ); // outside tunnels walls.001 $add( - new Point(3946, 800, 4532), - new Point(3946, 800, 5579), - new Point(3946, 2173, 5579), - new Point(3946, 2173, 4532), + new Point(3948, 800, 4527), + new Point(3948, 800, 5582), + new Point(3948, 1763, 5582), + new Point(3948, 1763, 4527), ); $add( - new Point(3946, 800, 4532), - new Point(3946, 2173, 4532), - new Point(3754, 2173, 4532), - new Point(3754, 800, 4532), + new Point(3948, 800, 4527), + new Point(3948, 1763, 4527), + new Point(3756, 1763, 4527), + new Point(3756, 800, 4527), ); $add( - new Point(3754, 800, 4532), - new Point(3754, 2173, 4532), - new Point(3754, 2173, 4149), - new Point(3754, 800, 4149), + new Point(3756, 800, 4527), + new Point(3756, 1763, 4527), + new Point(3756, 1763, 4143), + new Point(3756, 800, 4143), ); $add( - new Point(3754, 800, 4149), - new Point(3754, 2173, 4149), - new Point(3654, 2173, 4149), - new Point(3654, 800, 4149), + new Point(3756, 800, 4143), + new Point(3756, 1763, 4143), + new Point(3660, 1763, 4143), + new Point(3660, 800, 4143), ); $add( - new Point(3654, 800, 4149), - new Point(3654, 2173, 4149), - new Point(3475, 2173, 3980), - new Point(3475, 800, 3980), + new Point(3660, 800, 4143), + new Point(3660, 1763, 4143), + new Point(3468, 1763, 3951), + new Point(3468, 800, 3951), ); $add( - new Point(3475, 800, 3980), - new Point(3475, 2173, 3980), - new Point(3475, 2173, 3717), - new Point(3475, 800, 3717), + new Point(3468, 800, 3951), + new Point(3468, 1763, 3951), + new Point(3468, 1763, 3717), + new Point(3468, 800, 3717), ); $add( - new Point(3946, 2173, 5579), - new Point(3946, 800, 5579), - new Point(3752, 800, 5579), - new Point(3752, 2173, 5579), + new Point(3948, 1763, 5582), + new Point(3948, 800, 5582), + new Point(3756, 800, 5582), + new Point(3756, 1763, 5582), ); $add( - new Point(3752, 2173, 5579), - new Point(3752, 800, 5579), - new Point(3752, 800, 5960), - new Point(3752, 2173, 5960), + new Point(3756, 1763, 5582), + new Point(3756, 800, 5582), + new Point(3756, 800, 5966), + new Point(3756, 1763, 5966), ); $add( - new Point(3752, 2173, 5960), - new Point(3752, 800, 5960), - new Point(3663, 800, 5960), - new Point(3663, 2173, 5960), + new Point(3756, 1763, 5966), + new Point(3756, 800, 5966), + new Point(3660, 800, 5966), + new Point(3660, 1763, 5966), ); $add( - new Point(3663, 2173, 5960), - new Point(3663, 800, 5960), - new Point(3465, 800, 6154), - new Point(3465, 2173, 6154), + new Point(3660, 1763, 5966), + new Point(3660, 800, 5966), + new Point(3468, 800, 6158), + new Point(3468, 1763, 6158), ); $add( - new Point(3465, 2173, 6154), - new Point(3465, 800, 6154), - new Point(3465, 800, 6275), - new Point(3465, 2173, 6275), + new Point(3468, 1763, 6158), + new Point(3468, 800, 6158), + new Point(3468, 800, 6275), + new Point(3468, 1763, 6275), ); } @@ -3109,232 +3153,256 @@ public function __construct() // lower pit walls $add( - new Point(12484, 197, 4583), - new Point(12484, 197, 6638), - new Point(12484, 1044, 6638), - new Point(12484, 1044, 4583), + new Point(12487, 197, 4583), + new Point(12487, 197, 6606), + new Point(12487, 1043, 6606), + new Point(12487, 1043, 4583), ); $add( - new Point(12484, 1044, 6638), - new Point(12484, 197, 6638), - new Point(12583, 197, 6638), - new Point(12583, 1044, 6638), + new Point(12487, 1043, 6606), + new Point(12487, 197, 6606), + new Point(12583, 197, 6606), + new Point(12583, 1043, 6606), ); $add( - new Point(12484, 1044, 4583), - new Point(12484, 1044, 6638), - new Point(12583, 1044, 6638), - new Point(12583, 1044, 4583), + new Point(12487, 1043, 4583), + new Point(12487, 1043, 6606), + new Point(12583, 1043, 6606), + new Point(12583, 1043, 4583), ); $add( - new Point(12583, 1044, 4583), - new Point(12583, 1044, 6638), - new Point(12583, 950, 6638), + new Point(12583, 1043, 4583), + new Point(12583, 1043, 6606), + new Point(12583, 950, 6606), new Point(12583, 950, 4583), ); $add( - new Point(12633, 925, 4635), - new Point(11444, 925, 4635), - new Point(11444, 219, 4635), - new Point(12633, 219, 4635), + new Point(12633, 925, 4623), + new Point(11444, 925, 4623), + new Point(11444, 219, 4623), + new Point(12633, 219, 4623), ); $add( - new Point(12558, 1044, 5164), - new Point(11431, 1044, 5164), - new Point(11431, 800, 5164), - new Point(12558, 800, 5164), + new Point(12558, 1043, 5151), + new Point(11432, 1043, 5151), + new Point(11432, 800, 5151), + new Point(12558, 800, 5151), ); $add( - new Point(11431, 1044, 5164), - new Point(12558, 1044, 5164), - new Point(12558, 1044, 5104), - new Point(11431, 1044, 5104), + new Point(11432, 800, 5151), + new Point(11432, 1043, 5151), + new Point(11432, 1043, 5091), + new Point(11432, 800, 5091), ); $add( - new Point(11431, 800, 5164), - new Point(11431, 1044, 5164), - new Point(11431, 1044, 5073), - new Point(11431, 800, 5073), + new Point(12583, 1043, 7061), + new Point(12487, 1043, 7061), + new Point(12487, 1043, 8365), + new Point(12583, 1043, 8365), ); $add( - new Point(12585, 1048, 7052), - new Point(12585, 1048, 7231), - new Point(12484, 1048, 7231), - new Point(12484, 1048, 7052), + new Point(12487, 1043, 8365), + new Point(12487, 1043, 7061), + new Point(12487, 791, 7061), + new Point(12487, 791, 8365), ); $add( - new Point(12484, 1048, 7052), - new Point(12484, 1048, 7231), - new Point(12484, 819, 7231), - new Point(12484, 819, 7052), + new Point(12583, 1043, 7061), + new Point(12583, 1043, 8365), + new Point(12583, 791, 8365), + new Point(12583, 791, 7061), ); $add( - new Point(12585, 1048, 7052), - new Point(12484, 1048, 7052), - new Point(12484, 826, 7052), - new Point(12585, 826, 7052), + new Point(12487, 1043, 7061), + new Point(12583, 1043, 7061), + new Point(12583, 791, 7061), + new Point(12487, 791, 7061), + ); + $add( + new Point(11432, 1043, 5151), + new Point(12558, 1043, 5151), + new Point(12558, 1043, 5091), + new Point(11432, 1043, 5091), + ); + $add( + new Point(12583, 791, 8365), + new Point(12583, 1043, 8365), + new Point(12487, 1043, 8365), + new Point(12487, 791, 8365), ); // lower pit walls.001 $add( - new Point(11429, 797, 4389), - new Point(11429, 797, 6444), - new Point(11429, 902, 6444), - new Point(11429, 902, 4389), + new Point(11432, 797, 4588), + new Point(11432, 797, 6445), + new Point(11432, 899, 6446), + new Point(11432, 899, 4588), ); $add( - new Point(11429, 902, 4389), - new Point(11429, 902, 6444), - new Point(11534, 902, 6444), - new Point(11534, 902, 4389), + new Point(11432, 899, 4588), + new Point(11432, 899, 6446), + new Point(11528, 899, 6446), + new Point(11528, 899, 4588), ); $add( - new Point(11534, 902, 6444), - new Point(11429, 902, 6444), - new Point(11429, 824, 6444), - new Point(11534, 824, 6444), + new Point(11528, 899, 6446), + new Point(11432, 899, 6446), + new Point(11432, 792, 6446), + new Point(11528, 792, 6446), ); $add( - new Point(11534, 902, 4389), - new Point(11534, 902, 6444), - new Point(11534, 256, 6444), - new Point(11534, 256, 4389), + new Point(11528, 899, 4588), + new Point(11528, 899, 6446), + new Point(11528, 203, 6445), + new Point(11528, 203, 4588), ); // pit main floor $add( - new Point(9207, 835, 4697), - new Point(11509, 835, 4697), - new Point(11509, 835, 6430), - new Point(9207, 835, 6430), + new Point(9207, 815, 4697), + new Point(11509, 815, 4697), + new Point(11509, 815, 6430), + new Point(9207, 815, 6430), ); $add( - new Point(11509, 835, 7887), - new Point(11509, 835, 6430), - new Point(12547, 835, 6430), - new Point(12547, 835, 7887), + new Point(11509, 815, 7887), + new Point(11509, 815, 6430), + new Point(12547, 815, 6430), + new Point(12547, 815, 7887), ); $add( - new Point(9207, 835, 6430), - new Point(11509, 835, 6430), - new Point(11509, 835, 7887), - new Point(9207, 835, 7887), + new Point(9207, 815, 6430), + new Point(11509, 815, 6430), + new Point(11509, 815, 7887), + new Point(9207, 815, 7887), ); $add( - new Point(12547, 1015, 7422), - new Point(12547, 1015, 4966), - new Point(13132, 1015, 4966), - new Point(13132, 1015, 7422), + new Point(12583, 995, 7422), + new Point(12583, 995, 4966), + new Point(13079, 995, 4966), + new Point(13079, 995, 7422), ); $add( - new Point(12547, 835, 6437), - new Point(11509, 835, 6437), - new Point(11509, 289, 4797), - new Point(12547, 289, 4797), + new Point(12547, 815, 6430), + new Point(11509, 815, 6430), + new Point(11509, 289, 4818), + new Point(12547, 289, 4818), ); $add( - new Point(12547, 289, 4797), - new Point(11509, 289, 4797), + new Point(12547, 289, 4818), + new Point(11509, 289, 4818), new Point(11509, 289, 4567), new Point(12547, 289, 4567), ); // pit walls $add( - new Point(11481, 1562, 4733), - new Point(10548, 1562, 4733), - new Point(10548, 831, 4733), - new Point(11481, 831, 4733), + new Point(11481, 1562, 4719), + new Point(10548, 1562, 4719), + new Point(10548, 771, 4719), + new Point(11481, 771, 4719), ); $add( - new Point(10576, 799, 4628), - new Point(10576, 799, 6305), - new Point(10576, 1481, 6305), - new Point(10576, 1481, 4628), + new Point(10568, 799, 4628), + new Point(10568, 799, 6302), + new Point(10568, 1481, 6302), + new Point(10568, 1481, 4628), ); $add( new Point(10781, 1487, 4935), - new Point(10781, 831, 4935), - new Point(10781, 831, 4699), + new Point(10781, 786, 4935), + new Point(10781, 786, 4699), new Point(10781, 1487, 4699), ); $add( new Point(10781, 1487, 4935), new Point(10548, 1487, 4935), - new Point(10548, 831, 4935), - new Point(10781, 831, 4935), + new Point(10548, 786, 4935), + new Point(10781, 786, 4935), + ); + $add( + new Point(10568, 1481, 6302), + new Point(10568, 799, 6302), + new Point(10424, 799, 6446), + new Point(10424, 1481, 6446), + ); + $add( + new Point(12971, 1638, 5103), + new Point(12295, 1638, 5103), + new Point(12295, 932, 5103), + new Point(12971, 932, 5103), ); $add( - new Point(10576, 1481, 6305), - new Point(10576, 799, 6305), - new Point(10404, 799, 6453), - new Point(10404, 1481, 6453), + new Point(12511, 754, 7214), + new Point(12511, 2143, 7214), + new Point(13099, 2143, 7214), + new Point(13099, 754, 7214), ); $add( - new Point(12971, 1638, 5109), - new Point(11428, 1638, 5109), - new Point(11428, 932, 5109), - new Point(12971, 932, 5109), + new Point(12967, 1764, 5678), + new Point(12967, 1002, 5678), + new Point(13076, 1002, 5678), + new Point(13076, 1764, 5678), ); $add( - new Point(12506, 754, 7212), - new Point(12506, 2143, 7212), - new Point(13099, 2143, 7212), - new Point(13099, 754, 7212), + new Point(12967, 1002, 5103), + new Point(12967, 1002, 5678), + new Point(12967, 1764, 5678), + new Point(12967, 1764, 5103), ); $add( - new Point(12956, 1764, 5685), - new Point(12956, 1002, 5685), - new Point(13076, 1002, 5685), - new Point(13076, 1764, 5685), + new Point(13063, 993, 5671), + new Point(13063, 993, 7226), + new Point(13063, 1755, 7226), + new Point(13063, 1755, 5671), ); $add( - new Point(12956, 1002, 5103), - new Point(12956, 1002, 5685), - new Point(12956, 1764, 5685), - new Point(12956, 1764, 5103), + new Point(13063, 1744, 6495), + new Point(13063, 1744, 7226), + new Point(13063, 2093, 7226), + new Point(13063, 2093, 6495), ); $add( - new Point(13055, 993, 5671), - new Point(13055, 993, 7226), - new Point(13055, 1755, 7226), - new Point(13055, 1755, 5671), + new Point(11432, 773, 4430), + new Point(11432, 773, 5091), + new Point(11432, 1811, 5091), + new Point(11432, 1811, 4430), ); $add( - new Point(13055, 1744, 6495), - new Point(13055, 1744, 7226), - new Point(13055, 2093, 7226), - new Point(13055, 2093, 6495), + new Point(12511, 754, 7214), + new Point(12511, 754, 8365), + new Point(12511, 2143, 8365), + new Point(12511, 2143, 7214), ); $add( - new Point(11430, 879, 4430), - new Point(11430, 879, 5108), - new Point(11430, 1811, 5108), - new Point(11430, 1811, 4430), + new Point(12511, 2143, 8365), + new Point(12511, 754, 8365), + new Point(12604, 754, 8365), + new Point(12604, 2143, 8365), ); $add( - new Point(12506, 754, 7212), - new Point(12506, 754, 8386), - new Point(12506, 2143, 8386), - new Point(12506, 2143, 7212), + new Point(10424, 1481, 6446), + new Point(10424, 799, 6446), + new Point(9897, 799, 6446), + new Point(9897, 1481, 6446), ); $add( - new Point(12506, 2143, 8386), - new Point(12506, 754, 8386), - new Point(12604, 754, 8386), - new Point(12604, 2143, 8386), + new Point(9897, 1481, 6446), + new Point(9897, 799, 6446), + new Point(9897, 799, 6172), + new Point(9897, 1481, 6172), ); $add( - new Point(10404, 1481, 6453), - new Point(10404, 799, 6453), - new Point(9896, 799, 6453), - new Point(9896, 1481, 6453), + new Point(12295, 932, 5103), + new Point(12295, 1638, 5103), + new Point(12295, 1638, 5091), + new Point(12295, 932, 5091), ); $add( - new Point(9896, 1481, 6453), - new Point(9896, 799, 6453), - new Point(9896, 799, 6172), - new Point(9896, 1481, 6172), + new Point(12295, 932, 5091), + new Point(12295, 1811, 5091), + new Point(11432, 1811, 5091), + new Point(11432, 932, 5091), ); } @@ -3343,444 +3411,402 @@ public function __construct() // blue box $add( - new Point(9988, 1190, 7403), - new Point(10382, 1190, 7403), - new Point(10382, 812, 7403), - new Point(9988, 812, 7403), + new Point(9992, 1187, 7405), + new Point(10376, 1187, 7405), + new Point(10376, 801, 7405), + new Point(9992, 801, 7405), ); $add( - new Point(10382, 1190, 7403), - new Point(10382, 1190, 7780), - new Point(10382, 812, 7780), - new Point(10382, 812, 7403), + new Point(10376, 1187, 7405), + new Point(10376, 1187, 7794), + new Point(10376, 801, 7794), + new Point(10376, 801, 7405), ); $add( - new Point(9988, 1190, 7780), - new Point(9988, 1190, 7403), - new Point(9988, 812, 7403), - new Point(9988, 812, 7780), + new Point(9992, 1187, 7794), + new Point(9992, 1187, 7405), + new Point(9992, 801, 7405), + new Point(9992, 801, 7794), ); $add( - new Point(10382, 1190, 7780), - new Point(10382, 1190, 7403), - new Point(9988, 1190, 7403), - new Point(9988, 1190, 7780), + new Point(10376, 1187, 7794), + new Point(10376, 1187, 7405), + new Point(9992, 1187, 7405), + new Point(9992, 1187, 7794), ); $add( - new Point(10590, 979, 7789), - new Point(10590, 979, 7581), - new Point(10374, 979, 7581), - new Point(10374, 979, 7789), + new Point(10590, 975, 7799), + new Point(10590, 975, 7581), + new Point(10374, 975, 7581), + new Point(10374, 975, 7799), ); $add( - new Point(10374, 979, 7581), - new Point(10590, 979, 7581), - new Point(10590, 819, 7581), - new Point(10374, 819, 7581), + new Point(10374, 975, 7581), + new Point(10590, 975, 7581), + new Point(10590, 801, 7581), + new Point(10374, 801, 7581), ); $add( - new Point(10590, 979, 7581), - new Point(10590, 979, 7789), - new Point(10590, 819, 7789), - new Point(10590, 819, 7581), + new Point(10590, 975, 7581), + new Point(10590, 975, 7799), + new Point(10590, 801, 7799), + new Point(10590, 801, 7581), ); // box $add( - new Point(13068, 1188, 7018), - new Point(12871, 1188, 7018), - new Point(12871, 1188, 7215), - new Point(13068, 1188, 7215), + new Point(13068, 1187, 7022), + new Point(12871, 1187, 7022), + new Point(12871, 1187, 7215), + new Point(13068, 1187, 7215), ); $add( - new Point(12871, 1188, 7215), - new Point(12871, 1188, 7018), - new Point(12871, 1009, 7018), - new Point(12871, 1009, 7215), + new Point(12871, 1187, 7215), + new Point(12871, 1187, 7022), + new Point(12871, 970, 7022), + new Point(12871, 970, 7215), ); $add( - new Point(12871, 1188, 7018), - new Point(13068, 1188, 7018), - new Point(13068, 1009, 7018), - new Point(12871, 1009, 7018), + new Point(12871, 1187, 7022), + new Point(13068, 1187, 7022), + new Point(13068, 970, 7022), + new Point(12871, 970, 7022), ); // box.001 $add( - new Point(9529, 931, 11352), - new Point(9529, 931, 11129), - new Point(9315, 931, 11129), - new Point(9315, 931, 11352), + new Point(9529, 923, 11352), + new Point(9529, 923, 11129), + new Point(9315, 923, 11129), + new Point(9315, 923, 11352), ); $add( - new Point(9315, 931, 11129), - new Point(9529, 931, 11129), + new Point(9315, 923, 11129), + new Point(9529, 923, 11129), new Point(9529, 713, 11129), new Point(9315, 713, 11129), ); $add( - new Point(9529, 931, 11129), - new Point(9529, 931, 11352), + new Point(9529, 923, 11129), + new Point(9529, 923, 11352), new Point(9529, 713, 11352), new Point(9529, 713, 11129), ); // box.002 $add( - new Point(10905, 1285, 11630), - new Point(10905, 1285, 11435), - new Point(10709, 1285, 11435), - new Point(10709, 1285, 11630), + new Point(10903, 1284, 11629), + new Point(10903, 1284, 11435), + new Point(10711, 1284, 11435), + new Point(10711, 1284, 11629), ); $add( - new Point(10709, 1285, 11435), - new Point(10905, 1285, 11435), - new Point(10905, 1068, 11435), - new Point(10709, 1068, 11435), + new Point(10711, 1284, 11435), + new Point(10903, 1284, 11435), + new Point(10903, 1068, 11435), + new Point(10711, 1068, 11435), ); $add( - new Point(10905, 1285, 11435), - new Point(10905, 1285, 11630), - new Point(10905, 1068, 11630), - new Point(10905, 1068, 11435), + new Point(10903, 1284, 11435), + new Point(10903, 1284, 11629), + new Point(10903, 1068, 11629), + new Point(10903, 1068, 11435), ); $add( - new Point(10709, 1285, 11435), - new Point(10709, 1068, 11435), - new Point(10709, 1068, 11680), - new Point(10709, 1285, 11680), + new Point(10711, 1284, 11435), + new Point(10711, 1068, 11435), + new Point(10712, 1068, 11679), + new Point(10712, 1284, 11679), ); $add( - new Point(10709, 1285, 11680), - new Point(10709, 1068, 11680), + new Point(10712, 1284, 11679), + new Point(10712, 1068, 11679), new Point(10764, 1068, 11867), - new Point(10764, 1285, 11867), + new Point(10764, 1284, 11867), ); $add( - new Point(10764, 1285, 11867), + new Point(10764, 1284, 11867), new Point(10764, 1068, 11867), new Point(10953, 1068, 11815), - new Point(10953, 1285, 11815), + new Point(10953, 1284, 11815), ); $add( - new Point(10953, 1285, 11815), + new Point(10953, 1284, 11815), new Point(10953, 1068, 11815), - new Point(10902, 1068, 11628), - new Point(10902, 1285, 11628), + new Point(10903, 1068, 11629), + new Point(10903, 1284, 11629), ); $add( - new Point(10915, 1285, 11678), - new Point(10753, 1285, 11678), - new Point(10753, 1285, 11823), - new Point(10915, 1285, 11823), + new Point(10913, 1284, 11678), + new Point(10753, 1284, 11678), + new Point(10753, 1284, 11823), + new Point(10913, 1284, 11823), ); // box.003 $add( - new Point(9898, 806, 11047), - new Point(9898, 806, 11399), - new Point(9898, 721, 11399), - new Point(9898, 721, 11047), + new Point(9897, 804, 11399), + new Point(9608, 804, 11399), + new Point(9608, 804, 11052), + new Point(9897, 804, 11052), ); $add( - new Point(9898, 806, 11399), - new Point(9898, 806, 11047), - new Point(9608, 806, 11047), - new Point(9608, 806, 11399), + new Point(9897, 804, 11052), + new Point(9608, 804, 11052), + new Point(9608, 497, 11052), + new Point(9897, 497, 11052), ); $add( - new Point(9608, 806, 11399), - new Point(9608, 806, 11047), - new Point(9608, 731, 11047), - new Point(9608, 731, 11399), + new Point(9608, 804, 11052), + new Point(9608, 804, 11399), + new Point(9608, 497, 11399), + new Point(9608, 497, 11052), ); $add( - new Point(9608, 806, 11047), - new Point(9898, 806, 11047), - new Point(9898, 732, 11047), - new Point(9608, 732, 11047), + new Point(9897, 804, 11399), + new Point(9897, 804, 11052), + new Point(9897, 497, 11052), + new Point(9897, 497, 11399), ); // box.004 $add( - new Point(11482, 1285, 11773), - new Point(11482, 1285, 11578), - new Point(11286, 1285, 11578), - new Point(11286, 1285, 11773), + new Point(11480, 1283, 11771), + new Point(11288, 1283, 11771), + new Point(11288, 1283, 11579), + new Point(11480, 1283, 11579), ); $add( - new Point(11286, 1285, 11578), - new Point(11482, 1285, 11578), - new Point(11482, 1068, 11578), - new Point(11286, 1068, 11578), + new Point(11480, 1283, 11579), + new Point(11288, 1283, 11579), + new Point(11288, 1084, 11579), + new Point(11480, 1084, 11579), ); $add( - new Point(11482, 1285, 11578), - new Point(11482, 1285, 11773), - new Point(11482, 1068, 11773), - new Point(11482, 1068, 11578), + new Point(11480, 1283, 11771), + new Point(11480, 1283, 11579), + new Point(11480, 1084, 11579), + new Point(11480, 1084, 11771), ); $add( - new Point(11482, 1285, 11773), - new Point(11286, 1285, 11773), - new Point(11286, 1060, 11773), - new Point(11482, 1060, 11773), + new Point(11288, 1283, 11771), + new Point(11480, 1283, 11771), + new Point(11480, 1084, 11771), + new Point(11288, 1084, 11771), ); $add( - new Point(11286, 1285, 11773), - new Point(11286, 1285, 11578), - new Point(11286, 1060, 11578), - new Point(11286, 1060, 11773), + new Point(11288, 1283, 11579), + new Point(11288, 1283, 11771), + new Point(11288, 1084, 11771), + new Point(11288, 1084, 11579), ); // box.005 $add( - new Point(7256, 805, 10285), - new Point(7256, 434, 10285), - new Point(7256, 434, 10034), - new Point(7256, 805, 10034), - ); - $add( - new Point(7450, 805, 10285), - new Point(7450, 434, 10285), - new Point(7256, 434, 10285), - new Point(7256, 805, 10285), + new Point(7258, 805, 10284), + new Point(7258, 394, 10284), + new Point(7258, 394, 10072), + new Point(7258, 805, 10072), ); $add( - new Point(7256, 434, 10285), - new Point(7450, 434, 10285), - new Point(7450, 434, 10034), - new Point(7256, 434, 10034), + new Point(7450, 805, 10284), + new Point(7450, 394, 10284), + new Point(7258, 394, 10284), + new Point(7258, 805, 10284), ); $add( - new Point(7450, 805, 10285), - new Point(7256, 805, 10285), - new Point(7256, 805, 10034), - new Point(7450, 805, 10034), + new Point(7450, 805, 10284), + new Point(7258, 805, 10284), + new Point(7258, 805, 10072), + new Point(7450, 805, 10072), ); $add( - new Point(7450, 434, 10285), - new Point(7450, 805, 10285), - new Point(7450, 805, 10034), - new Point(7450, 434, 10034), + new Point(7450, 394, 10284), + new Point(7450, 805, 10284), + new Point(7450, 805, 10072), + new Point(7450, 394, 10072), ); // box.006 $add( - new Point(7211, 908, 10854), - new Point(7211, 701, 10854), - new Point(7211, 701, 11061), - new Point(7211, 908, 11061), - ); - $add( - new Point(7015, 908, 10854), - new Point(7015, 701, 10854), - new Point(7211, 701, 10854), - new Point(7211, 908, 10854), + new Point(7018, 899, 10860), + new Point(7018, 899, 11061), + new Point(7210, 899, 11061), + new Point(7210, 899, 10860), ); $add( - new Point(7211, 701, 10854), - new Point(7015, 701, 10854), - new Point(7015, 701, 11061), - new Point(7211, 701, 11061), + new Point(7210, 899, 10860), + new Point(7210, 899, 11061), + new Point(7210, 705, 11061), + new Point(7210, 705, 10860), ); $add( - new Point(7015, 908, 10854), - new Point(7211, 908, 10854), - new Point(7211, 908, 11061), - new Point(7015, 908, 11061), + new Point(7018, 899, 10860), + new Point(7210, 899, 10860), + new Point(7210, 705, 10860), + new Point(7018, 705, 10860), ); $add( - new Point(7015, 701, 10854), - new Point(7015, 908, 10854), - new Point(7015, 908, 11061), - new Point(7015, 701, 11061), + new Point(7018, 899, 11061), + new Point(7018, 899, 10860), + new Point(7018, 705, 10860), + new Point(7018, 705, 11061), ); // box.007 $add( - new Point(7307, 708, 10764), - new Point(7307, 430, 10764), - new Point(7307, 430, 11089), - new Point(7307, 708, 11089), + new Point(7018, 708, 10764), + new Point(7306, 708, 10764), + new Point(7306, 413, 10764), + new Point(7018, 413, 10764), ); $add( - new Point(7014, 708, 10764), - new Point(7014, 430, 10764), - new Point(7307, 430, 10764), - new Point(7307, 708, 10764), + new Point(7306, 708, 10764), + new Point(7306, 708, 11070), + new Point(7306, 413, 11070), + new Point(7306, 413, 10764), ); $add( - new Point(7307, 430, 10764), - new Point(7014, 430, 10764), - new Point(7014, 430, 11089), - new Point(7307, 430, 11089), + new Point(7018, 708, 11070), + new Point(7018, 708, 10764), + new Point(7018, 413, 10764), + new Point(7018, 413, 11070), ); $add( - new Point(7014, 708, 10764), - new Point(7307, 708, 10764), - new Point(7307, 708, 11089), - new Point(7014, 708, 11089), - ); - $add( - new Point(7014, 430, 10764), - new Point(7014, 708, 10764), - new Point(7014, 708, 11089), - new Point(7014, 430, 11089), + new Point(7018, 708, 10764), + new Point(7018, 708, 11070), + new Point(7306, 708, 11070), + new Point(7306, 708, 10764), ); // box.008 $add( - new Point(5309, 853, 8293), - new Point(5309, 853, 8082), - new Point(5087, 853, 8082), - new Point(5087, 853, 8293), - ); - $add( - new Point(5087, 853, 8082), - new Point(5309, 853, 8082), - new Point(5309, 470, 8082), - new Point(5087, 470, 8082), + new Point(5293, 852, 8295), + new Point(5090, 852, 8295), + new Point(5090, 852, 8077), + new Point(5293, 852, 8077), ); $add( - new Point(5309, 853, 8082), - new Point(5309, 853, 8293), - new Point(5309, 470, 8293), - new Point(5309, 470, 8082), + new Point(5293, 852, 8295), + new Point(5293, 852, 8077), + new Point(5293, 462, 8077), + new Point(5293, 462, 8295), ); $add( - new Point(5309, 853, 8293), - new Point(5087, 853, 8293), - new Point(5087, 456, 8293), - new Point(5309, 456, 8293), + new Point(5090, 852, 8295), + new Point(5293, 852, 8295), + new Point(5293, 462, 8295), + new Point(5090, 462, 8295), ); $add( - new Point(5087, 853, 8293), - new Point(5087, 853, 8082), - new Point(5087, 456, 8082), - new Point(5087, 456, 8293), + new Point(5090, 852, 8077), + new Point(5090, 852, 8295), + new Point(5090, 462, 8295), + new Point(5090, 462, 8077), ); // box.009 $add( - new Point(2318, 1191, 9715), - new Point(2318, 801, 9715), - new Point(2123, 801, 9715), - new Point(2123, 1191, 9715), + new Point(2125, 1187, 9708), + new Point(2125, 1187, 9507), + new Point(2125, 801, 9507), + new Point(2125, 801, 9708), ); $add( - new Point(2123, 1191, 9715), - new Point(2123, 801, 9715), - new Point(2123, 801, 9515), - new Point(2123, 1191, 9515), + new Point(2317, 1187, 9708), + new Point(2317, 1187, 9507), + new Point(2125, 1187, 9507), + new Point(2125, 1187, 9708), ); $add( - new Point(2318, 801, 9715), - new Point(2318, 1191, 9715), - new Point(2318, 1191, 9488), - new Point(2318, 801, 9488), + new Point(2317, 1187, 9708), + new Point(2125, 1187, 9708), + new Point(2125, 801, 9708), + new Point(2317, 801, 9708), ); $add( - new Point(2318, 1191, 9715), - new Point(2123, 1191, 9715), - new Point(2123, 1191, 9507), - new Point(2318, 1191, 9507), + new Point(2317, 1187, 9507), + new Point(2317, 1187, 9708), + new Point(2317, 801, 9708), + new Point(2317, 801, 9507), ); // box.010 $add( - new Point(1642, 1073, 12610), - new Point(1411, 1073, 12610), - new Point(1411, 1073, 12828), - new Point(1642, 1073, 12828), + new Point(1634, 1073, 12610), + new Point(1634, 1073, 12824), + new Point(1420, 1073, 12824), + new Point(1420, 1073, 12610), ); $add( - new Point(1411, 1073, 12610), - new Point(1642, 1073, 12610), - new Point(1642, 869, 12610), - new Point(1411, 869, 12610), + new Point(1420, 1073, 12824), + new Point(1634, 1073, 12824), + new Point(1634, 897, 12824), + new Point(1420, 897, 12824), ); $add( - new Point(1411, 1073, 12828), - new Point(1411, 1073, 12610), - new Point(1411, 895, 12610), - new Point(1411, 895, 12828), + new Point(1634, 1073, 12824), + new Point(1634, 1073, 12610), + new Point(1634, 897, 12610), + new Point(1634, 897, 12824), ); $add( - new Point(1642, 1073, 12828), - new Point(1411, 1073, 12828), - new Point(1411, 907, 12828), - new Point(1642, 907, 12828), + new Point(1420, 1073, 12610), + new Point(1420, 1073, 12824), + new Point(1420, 897, 12824), + new Point(1420, 897, 12610), ); $add( - new Point(1642, 1073, 12610), - new Point(1642, 1073, 12828), - new Point(1642, 869, 12828), - new Point(1642, 869, 12610), + new Point(1634, 1073, 12610), + new Point(1420, 1073, 12610), + new Point(1420, 897, 12610), + new Point(1634, 897, 12610), ); // box.011 $add( - new Point(1593, 1074, 11500), - new Point(1362, 1074, 11500), - new Point(1362, 1074, 11718), - new Point(1593, 1074, 11718), + new Point(1583, 1073, 11501), + new Point(1583, 1073, 11715), + new Point(1362, 1073, 11715), + new Point(1362, 1073, 11501), ); $add( - new Point(1362, 1074, 11500), - new Point(1593, 1074, 11500), - new Point(1593, 906, 11500), - new Point(1362, 906, 11500), + new Point(1362, 1073, 11715), + new Point(1583, 1073, 11715), + new Point(1583, 895, 11715), + new Point(1362, 895, 11715), ); $add( - new Point(1362, 906, 11500), - new Point(1593, 906, 11500), - new Point(1593, 904, 11470), - new Point(1362, 904, 11470), + new Point(1583, 1073, 11715), + new Point(1583, 1073, 11501), + new Point(1583, 895, 11501), + new Point(1583, 895, 11715), ); $add( - new Point(1593, 1074, 11718), - new Point(1362, 1074, 11718), - new Point(1362, 907, 11718), - new Point(1593, 907, 11718), - ); - $add( - new Point(1593, 1074, 11500), - new Point(1593, 1074, 11718), - new Point(1593, 869, 11718), - new Point(1593, 869, 11500), + new Point(1583, 1073, 11501), + new Point(1362, 1073, 11501), + new Point(1362, 895, 11501), + new Point(1583, 895, 11501), ); // box.012 $add( - new Point(4518, 641, 8748), - new Point(4518, 641, 8524), - new Point(4042, 641, 8524), - new Point(4042, 641, 8748), + new Point(4518, 641, 8749), + new Point(4044, 641, 8749), + new Point(4044, 641, 8506), + new Point(4518, 641, 8506), ); $add( - new Point(4042, 641, 8524), - new Point(4518, 641, 8524), - new Point(4518, 449, 8524), - new Point(4042, 449, 8524), + new Point(4518, 641, 8749), + new Point(4518, 641, 8506), + new Point(4518, 461, 8506), + new Point(4518, 461, 8749), ); $add( - new Point(4518, 641, 8524), - new Point(4518, 641, 8748), - new Point(4518, 449, 8748), - new Point(4518, 449, 8524), - ); - $add( - new Point(4518, 641, 8748), - new Point(4042, 641, 8748), - new Point(4042, 442, 8748), - new Point(4518, 442, 8748), - ); - $add( - new Point(4042, 641, 8748), - new Point(4042, 641, 8524), - new Point(4042, 442, 8524), - new Point(4042, 442, 8748), + new Point(4518, 641, 8506), + new Point(4044, 641, 8506), + new Point(4044, 461, 8506), + new Point(4518, 461, 8506), ); // door @@ -3791,520 +3817,654 @@ public function __construct() new Point(6737, 431, 9057), ); $add( - new Point(6731, 962, 9011), - new Point(6468, 962, 9135), - new Point(6468, 431, 9135), - new Point(6731, 431, 9011), + new Point(6731, 962, 9021), + new Point(6468, 962, 9145), + new Point(6468, 431, 9145), + new Point(6731, 431, 9021), ); // door.001 $add( - new Point(6409, 962, 8900), - new Point(6147, 962, 9024), - new Point(6147, 431, 9024), - new Point(6409, 431, 8900), + new Point(6409, 962, 8904), + new Point(6147, 962, 9025), + new Point(6147, 431, 9025), + new Point(6409, 431, 8904), ); $add( - new Point(6419, 965, 8928), - new Point(6157, 965, 9052), - new Point(6157, 431, 9052), - new Point(6419, 431, 8928), + new Point(6419, 965, 8927), + new Point(6154, 965, 9052), + new Point(6154, 431, 9052), + new Point(6419, 431, 8927), ); // door.002 $add( new Point(9575, 1299, 6455), new Point(9312, 1299, 6330), - new Point(9312, 822, 6330), - new Point(9575, 822, 6455), + new Point(9312, 808, 6330), + new Point(9575, 808, 6455), ); $add( - new Point(9575, 1299, 6485), - new Point(9312, 1299, 6361), - new Point(9312, 822, 6361), - new Point(9575, 822, 6485), + new Point(9575, 1299, 6483), + new Point(9312, 1299, 6359), + new Point(9312, 807, 6359), + new Point(9575, 807, 6483), ); // door.003 $add( - new Point(9900, 1299, 6367), + new Point(9900, 1299, 6364), new Point(9637, 1299, 6243), - new Point(9637, 822, 6243), - new Point(9900, 822, 6367), + new Point(9637, 808, 6243), + new Point(9900, 808, 6364), ); $add( - new Point(9900, 1299, 6337), - new Point(9637, 1299, 6213), - new Point(9637, 822, 6213), - new Point(9900, 822, 6337), + new Point(9900, 1299, 6336), + new Point(9642, 1299, 6216), + new Point(9642, 804, 6216), + new Point(9900, 804, 6336), ); // door.004 $add( - new Point(9900, 1354, 5008), - new Point(9643, 1354, 4872), - new Point(9643, 822, 4872), - new Point(9900, 822, 5008), + new Point(9900, 1354, 4993), + new Point(9643, 1354, 4873), + new Point(9643, 822, 4873), + new Point(9900, 822, 4993), ); $add( - new Point(9898, 1356, 5038), - new Point(9642, 1356, 4902), - new Point(9642, 822, 4902), - new Point(9898, 822, 5038), + new Point(9898, 1356, 5019), + new Point(9632, 1356, 4896), + new Point(9632, 822, 4896), + new Point(9898, 822, 5019), ); // door.005 $add( - new Point(3863, 1343, 10788), - new Point(3742, 1343, 11054), - new Point(3742, 811, 11054), - new Point(3863, 811, 10788), + new Point(3866, 1343, 10788), + new Point(3742, 1343, 11052), + new Point(3742, 811, 11052), + new Point(3866, 811, 10788), ); $add( - new Point(3891, 1345, 10797), + new Point(3889, 1345, 10797), new Point(3768, 1345, 11056), new Point(3768, 811, 11056), - new Point(3891, 811, 10797), + new Point(3889, 811, 10797), ); // door.006 $add( - new Point(3770, 1345, 10482), - new Point(3647, 1345, 10741), - new Point(3647, 811, 10741), - new Point(3770, 811, 10482), + new Point(3769, 1345, 10474), + new Point(3645, 1345, 10741), + new Point(3645, 811, 10741), + new Point(3769, 811, 10474), ); $add( new Point(3741, 1343, 10464), - new Point(3620, 1343, 10730), - new Point(3620, 811, 10730), + new Point(3623, 1343, 10730), + new Point(3623, 811, 10730), new Point(3741, 811, 10464), ); // door.007 $add( - new Point(9575, 1356, 5145), - new Point(9319, 1356, 5008), - new Point(9319, 822, 5008), - new Point(9575, 822, 5145), + new Point(9578, 1356, 5141), + new Point(9321, 1356, 5023), + new Point(9321, 822, 5023), + new Point(9578, 822, 5141), ); $add( - new Point(9586, 1354, 5112), - new Point(9329, 1354, 4976), - new Point(9329, 822, 4976), - new Point(9586, 822, 5112), + new Point(9586, 1354, 5117), + new Point(9319, 1354, 4992), + new Point(9319, 810, 4992), + new Point(9586, 810, 5117), ); - // prop.004 + // magic door $add( - new Point(6931, 2296, 6044), - new Point(6931, 811, 6044), - new Point(7023, 811, 6044), - new Point(7023, 2296, 6044), + new Point(10846, 808, 7754), + new Point(10846, 1248, 7754), + new Point(10876, 1248, 7754), + new Point(10876, 808, 7754), ); $add( - new Point(7023, 2296, 6044), - new Point(7023, 811, 6044), - new Point(7023, 811, 5989), - new Point(7023, 2296, 5989), + new Point(10846, 972, 7712), + new Point(10846, 972, 7754), + new Point(10876, 972, 7754), + new Point(10876, 972, 7712), ); $add( - new Point(6931, 811, 6044), - new Point(6931, 2296, 6044), - new Point(6931, 2296, 5989), - new Point(6931, 811, 5989), + new Point(10876, 972, 7754), + new Point(10876, 808, 7754), + new Point(10876, 808, 7712), + new Point(10876, 972, 7712), ); $add( - new Point(7023, 2296, 5989), - new Point(7023, 811, 5989), - new Point(6938, 811, 5989), - new Point(6938, 2296, 5989), + new Point(10876, 876, 7712), + new Point(10876, 808, 7712), + new Point(10876, 808, 7653), + new Point(10876, 876, 7653), + ); + $add( + new Point(11107, 972, 7754), + new Point(11107, 972, 7712), + new Point(11073, 972, 7712), + new Point(11073, 972, 7754), + ); + $add( + new Point(10846, 808, 7653), + new Point(10846, 876, 7653), + new Point(10876, 876, 7653), + new Point(10876, 808, 7653), + ); + $add( + new Point(10876, 1248, 7799), + new Point(10876, 808, 7799), + new Point(10876, 808, 7754), + new Point(10876, 1248, 7754), + ); + $add( + new Point(11107, 876, 7653), + new Point(11107, 808, 7653), + new Point(11073, 808, 7653), + new Point(11073, 876, 7653), + ); + $add( + new Point(10846, 876, 7653), + new Point(10846, 876, 7712), + new Point(10876, 876, 7712), + new Point(10876, 876, 7653), + ); + $add( + new Point(10846, 808, 7712), + new Point(10846, 972, 7712), + new Point(10876, 972, 7712), + new Point(10876, 808, 7712), + ); + $add( + new Point(11073, 1248, 7799), + new Point(11073, 1248, 7754), + new Point(11073, 808, 7754), + new Point(11073, 808, 7799), + ); + $add( + new Point(11073, 808, 7754), + new Point(11073, 972, 7754), + new Point(11073, 972, 7712), + new Point(11073, 808, 7712), + ); + $add( + new Point(11073, 808, 7712), + new Point(11073, 876, 7712), + new Point(11073, 876, 7653), + new Point(11073, 808, 7653), + ); + $add( + new Point(11107, 972, 7712), + new Point(11107, 808, 7712), + new Point(11073, 808, 7712), + new Point(11073, 972, 7712), + ); + $add( + new Point(11107, 876, 7712), + new Point(11107, 876, 7653), + new Point(11073, 876, 7653), + new Point(11073, 876, 7712), + ); + $add( + new Point(11107, 1248, 7754), + new Point(11107, 808, 7754), + new Point(11073, 808, 7754), + new Point(11073, 1248, 7754), + ); + $add( + new Point(10846, 876, 7712), + new Point(10846, 876, 7653), + new Point(10846, 808, 7653), + new Point(10846, 808, 7712), + ); + $add( + new Point(11107, 1248, 7754), + new Point(11107, 1248, 7799), + new Point(11107, 808, 7799), + new Point(11107, 808, 7754), + ); + $add( + new Point(10846, 1248, 7799), + new Point(10846, 1248, 7754), + new Point(10846, 808, 7754), + new Point(10846, 808, 7799), + ); + $add( + new Point(11107, 972, 7712), + new Point(11107, 972, 7754), + new Point(11107, 808, 7754), + new Point(11107, 808, 7712), + ); + $add( + new Point(11107, 876, 7653), + new Point(11107, 876, 7712), + new Point(11107, 808, 7712), + new Point(11107, 808, 7653), + ); + $add( + new Point(10846, 972, 7754), + new Point(10846, 972, 7712), + new Point(10846, 808, 7712), + new Point(10846, 808, 7754), + ); + $add( + new Point(10846, 1248, 7799), + new Point(10846, 1248, 7754), + new Point(11107, 1248, 7754), + new Point(11107, 1248, 7799), ); - // prop.005 + // prop.001 + $add( + new Point(3398, 2309, 5555), + new Point(3398, 824, 5555), + new Point(3490, 824, 5555), + new Point(3490, 2309, 5555), + ); + $add( + new Point(3490, 2309, 5555), + new Point(3490, 824, 5555), + new Point(3490, 824, 5500), + new Point(3490, 2309, 5500), + ); $add( - new Point(3378, 2299, 5541), - new Point(3378, 814, 5541), - new Point(3470, 814, 5541), - new Point(3470, 2299, 5541), + new Point(3398, 824, 5555), + new Point(3398, 2309, 5555), + new Point(3398, 2309, 5500), + new Point(3398, 824, 5500), ); $add( - new Point(3470, 2299, 5541), - new Point(3470, 814, 5541), - new Point(3470, 814, 5486), - new Point(3470, 2299, 5486), + new Point(3490, 2309, 5500), + new Point(3490, 824, 5500), + new Point(3398, 824, 5500), + new Point(3398, 2309, 5500), ); + + // prop.002 $add( - new Point(3378, 814, 5541), - new Point(3378, 2299, 5541), - new Point(3378, 2299, 5486), - new Point(3378, 814, 5486), + new Point(1965, 2291, 5564), + new Point(1965, 806, 5564), + new Point(2057, 806, 5564), + new Point(2057, 2291, 5564), ); $add( - new Point(3470, 2299, 5486), - new Point(3470, 814, 5486), - new Point(3385, 814, 5486), - new Point(3385, 2299, 5486), + new Point(2057, 2291, 5564), + new Point(2057, 806, 5564), + new Point(2057, 806, 5509), + new Point(2057, 2291, 5509), + ); + $add( + new Point(1965, 806, 5564), + new Point(1965, 2291, 5564), + new Point(1965, 2291, 5509), + new Point(1965, 806, 5509), + ); + $add( + new Point(2057, 2291, 5509), + new Point(2057, 806, 5509), + new Point(1965, 806, 5509), + new Point(1965, 2291, 5509), ); - // prop.006 + // prop.003 $add( - new Point(1947, 2299, 5542), - new Point(1947, 814, 5542), - new Point(2039, 814, 5542), - new Point(2039, 2299, 5542), + new Point(8948, 2299, 3162), + new Point(8948, 814, 3162), + new Point(9040, 814, 3162), + new Point(9040, 2299, 3162), ); $add( - new Point(2039, 2299, 5542), - new Point(2039, 814, 5542), - new Point(2039, 814, 5487), - new Point(2039, 2299, 5487), + new Point(9040, 2299, 3162), + new Point(9040, 814, 3162), + new Point(9040, 814, 3107), + new Point(9040, 2299, 3107), ); $add( - new Point(1947, 814, 5542), - new Point(1947, 2299, 5542), - new Point(1947, 2299, 5487), - new Point(1947, 814, 5487), + new Point(8948, 814, 3162), + new Point(8948, 2299, 3162), + new Point(8948, 2299, 3107), + new Point(8948, 814, 3107), ); $add( - new Point(2039, 2299, 5487), - new Point(2039, 814, 5487), - new Point(1955, 814, 5487), - new Point(1955, 2299, 5487), + new Point(9040, 2299, 3107), + new Point(9040, 814, 3107), + new Point(8948, 814, 3107), + new Point(8948, 2299, 3107), ); - // prop.007 + // prop.004 $add( - new Point(4860, 2192, 11482), - new Point(4860, 707, 11482), - new Point(4951, 707, 11482), - new Point(4951, 2192, 11482), + new Point(6931, 2296, 6044), + new Point(6931, 811, 6044), + new Point(7023, 811, 6044), + new Point(7023, 2296, 6044), ); $add( - new Point(4951, 2192, 11482), - new Point(4951, 707, 11482), - new Point(4951, 707, 11427), - new Point(4951, 2192, 11427), + new Point(7023, 2296, 6044), + new Point(7023, 811, 6044), + new Point(7023, 811, 5989), + new Point(7023, 2296, 5989), ); $add( - new Point(4860, 707, 11482), - new Point(4860, 2192, 11482), - new Point(4860, 2192, 11427), - new Point(4860, 707, 11427), + new Point(6931, 811, 6044), + new Point(6931, 2296, 6044), + new Point(6931, 2296, 5989), + new Point(6931, 811, 5989), ); $add( - new Point(4951, 2192, 11427), - new Point(4951, 707, 11427), - new Point(4867, 707, 11427), - new Point(4867, 2192, 11427), + new Point(7023, 2296, 5989), + new Point(7023, 811, 5989), + new Point(6931, 811, 5989), + new Point(6931, 2296, 5989), ); - // prop.008 + // prop.005 $add( - new Point(8941, 2255, 3158), - new Point(8941, 770, 3158), - new Point(9033, 770, 3158), - new Point(9033, 2255, 3158), + new Point(4856, 2052, 11488), + new Point(4856, 567, 11488), + new Point(4948, 567, 11488), + new Point(4948, 2052, 11488), ); $add( - new Point(9033, 2255, 3158), - new Point(9033, 770, 3158), - new Point(9033, 770, 3103), - new Point(9033, 2255, 3103), + new Point(4948, 2052, 11488), + new Point(4948, 567, 11488), + new Point(4948, 567, 11433), + new Point(4948, 2052, 11433), ); $add( - new Point(8941, 770, 3158), - new Point(8941, 2255, 3158), - new Point(8941, 2255, 3103), - new Point(8941, 770, 3103), + new Point(4856, 567, 11488), + new Point(4856, 2052, 11488), + new Point(4856, 2052, 11433), + new Point(4856, 567, 11433), ); $add( - new Point(9033, 2255, 3103), - new Point(9033, 770, 3103), - new Point(8949, 770, 3103), - new Point(8949, 2255, 3103), + new Point(4948, 2052, 11433), + new Point(4948, 567, 11433), + new Point(4856, 567, 11433), + new Point(4856, 2052, 11433), ); // prop.009 $add( - new Point(9242, 1211, 11973), - new Point(9242, 1076, 11973), - new Point(9304, 1076, 11973), - new Point(9304, 1211, 11973), + new Point(9242, 1204, 11973), + new Point(9304, 1204, 11973), + new Point(9304, 1089, 11973), + new Point(9242, 1089, 11973), ); $add( - new Point(9304, 1211, 11973), - new Point(9304, 1076, 11973), - new Point(9304, 1076, 11911), - new Point(9304, 1211, 11911), + new Point(9304, 1204, 11973), + new Point(9304, 1204, 11910), + new Point(9304, 1089, 11910), + new Point(9304, 1089, 11973), ); $add( - new Point(9242, 1076, 11973), - new Point(9242, 1211, 11973), - new Point(9242, 1211, 11911), - new Point(9242, 1076, 11911), + new Point(9242, 1204, 11910), + new Point(9242, 1204, 11973), + new Point(9242, 1089, 11973), + new Point(9242, 1089, 11910), ); $add( - new Point(9304, 1211, 11911), - new Point(9304, 1076, 11911), - new Point(9247, 1076, 11911), - new Point(9247, 1211, 11911), + new Point(9242, 1204, 11973), + new Point(9242, 1204, 11910), + new Point(9304, 1204, 11910), + new Point(9304, 1204, 11973), ); $add( - new Point(9242, 1211, 11973), - new Point(9304, 1211, 11973), - new Point(9304, 1211, 11910), - new Point(9242, 1211, 11910), + new Point(9304, 1204, 11910), + new Point(9242, 1204, 11910), + new Point(9242, 1089, 11910), + new Point(9304, 1089, 11910), ); // prop.010 $add( - new Point(9315, 1211, 11850), - new Point(9315, 1076, 11850), - new Point(9377, 1076, 11850), - new Point(9377, 1211, 11850), + new Point(9315, 1204, 11850), + new Point(9315, 1204, 11788), + new Point(9377, 1204, 11788), + new Point(9377, 1204, 11850), ); $add( - new Point(9377, 1211, 11850), - new Point(9377, 1076, 11850), - new Point(9377, 1076, 11789), - new Point(9377, 1211, 11789), + new Point(9315, 1204, 11788), + new Point(9315, 1204, 11850), + new Point(9315, 1089, 11850), + new Point(9315, 1089, 11788), ); $add( - new Point(9315, 1076, 11850), - new Point(9315, 1211, 11850), - new Point(9315, 1211, 11789), - new Point(9315, 1076, 11789), + new Point(9315, 1204, 11850), + new Point(9377, 1204, 11850), + new Point(9377, 1089, 11850), + new Point(9315, 1089, 11850), ); $add( - new Point(9377, 1211, 11789), - new Point(9377, 1076, 11789), - new Point(9320, 1076, 11789), - new Point(9320, 1211, 11789), + new Point(9377, 1204, 11850), + new Point(9377, 1204, 11788), + new Point(9377, 1089, 11788), + new Point(9377, 1089, 11850), ); $add( - new Point(9315, 1211, 11850), - new Point(9377, 1211, 11850), - new Point(9377, 1211, 11788), - new Point(9315, 1211, 11788), + new Point(9377, 1204, 11788), + new Point(9315, 1204, 11788), + new Point(9315, 1089, 11788), + new Point(9377, 1089, 11788), ); // prop.011 $add( - new Point(10246, 1234, 12376), - new Point(10246, 1099, 12376), - new Point(10308, 1099, 12376), - new Point(10308, 1234, 12376), + new Point(10240, 1227, 12384), + new Point(10240, 1227, 12305), + new Point(10318, 1227, 12305), + new Point(10318, 1227, 12384), ); $add( - new Point(10308, 1234, 12376), - new Point(10308, 1099, 12376), - new Point(10308, 1099, 12314), - new Point(10308, 1234, 12314), + new Point(10318, 1227, 12305), + new Point(10240, 1227, 12305), + new Point(10240, 1088, 12305), + new Point(10318, 1088, 12305), ); $add( - new Point(10246, 1099, 12376), - new Point(10246, 1234, 12376), - new Point(10246, 1234, 12314), - new Point(10246, 1099, 12314), + new Point(10240, 1227, 12305), + new Point(10240, 1227, 12384), + new Point(10240, 1088, 12384), + new Point(10240, 1088, 12305), ); $add( - new Point(10308, 1234, 12314), - new Point(10308, 1099, 12314), - new Point(10251, 1099, 12314), - new Point(10251, 1234, 12314), + new Point(10240, 1227, 12384), + new Point(10318, 1227, 12384), + new Point(10318, 1088, 12384), + new Point(10240, 1088, 12384), ); $add( - new Point(10246, 1234, 12376), - new Point(10308, 1234, 12376), - new Point(10308, 1234, 12313), - new Point(10246, 1234, 12313), + new Point(10318, 1227, 12384), + new Point(10318, 1227, 12305), + new Point(10318, 1088, 12305), + new Point(10318, 1088, 12384), ); // prop.012 $add( - new Point(9860, 1211, 11465), - new Point(9860, 1076, 11465), - new Point(9923, 1076, 11465), - new Point(9923, 1211, 11465), + new Point(9865, 1203, 11467), + new Point(9927, 1203, 11467), + new Point(9927, 1089, 11467), + new Point(9865, 1089, 11467), ); $add( - new Point(9923, 1211, 11465), - new Point(9923, 1076, 11465), - new Point(9923, 1076, 11403), - new Point(9923, 1211, 11403), + new Point(9927, 1203, 11467), + new Point(9927, 1203, 11404), + new Point(9927, 1089, 11404), + new Point(9927, 1089, 11467), ); $add( - new Point(9860, 1076, 11465), - new Point(9860, 1211, 11465), - new Point(9860, 1211, 11403), - new Point(9860, 1076, 11403), + new Point(9865, 1203, 11404), + new Point(9865, 1203, 11467), + new Point(9865, 1089, 11467), + new Point(9865, 1089, 11404), ); $add( - new Point(9923, 1211, 11403), - new Point(9923, 1076, 11403), - new Point(9866, 1076, 11403), - new Point(9866, 1211, 11403), + new Point(9865, 1203, 11467), + new Point(9865, 1203, 11404), + new Point(9927, 1203, 11404), + new Point(9927, 1203, 11467), ); $add( - new Point(9860, 1211, 11465), - new Point(9923, 1211, 11465), - new Point(9923, 1211, 11402), - new Point(9860, 1211, 11402), + new Point(9927, 1203, 11404), + new Point(9865, 1203, 11404), + new Point(9865, 1089, 11404), + new Point(9927, 1089, 11404), ); // prop.013 $add( - new Point(9989, 1211, 11465), - new Point(9989, 1076, 11465), - new Point(10051, 1076, 11465), - new Point(10051, 1211, 11465), + new Point(9986, 1206, 11466), + new Point(9986, 1206, 11403), + new Point(10048, 1206, 11403), + new Point(10048, 1206, 11466), ); $add( - new Point(10051, 1211, 11465), - new Point(10051, 1076, 11465), - new Point(10051, 1076, 11403), - new Point(10051, 1211, 11403), + new Point(9986, 1206, 11403), + new Point(9986, 1206, 11466), + new Point(9986, 1088, 11466), + new Point(9986, 1088, 11403), ); $add( - new Point(9989, 1076, 11465), - new Point(9989, 1211, 11465), - new Point(9989, 1211, 11403), - new Point(9989, 1076, 11403), + new Point(9986, 1206, 11466), + new Point(10048, 1206, 11466), + new Point(10048, 1088, 11466), + new Point(9986, 1088, 11466), ); $add( - new Point(10051, 1211, 11403), - new Point(10051, 1076, 11403), - new Point(9994, 1076, 11403), - new Point(9994, 1211, 11403), + new Point(10048, 1206, 11466), + new Point(10048, 1206, 11403), + new Point(10048, 1088, 11403), + new Point(10048, 1088, 11466), ); $add( - new Point(9989, 1211, 11465), - new Point(10051, 1211, 11465), - new Point(10051, 1211, 11402), - new Point(9989, 1211, 11402), + new Point(10048, 1206, 11403), + new Point(9986, 1206, 11403), + new Point(9986, 1088, 11403), + new Point(10048, 1088, 11403), ); // prop.015 $add( - new Point(10294, 1234, 12279), - new Point(10294, 1099, 12279), - new Point(10357, 1099, 12279), - new Point(10357, 1234, 12279), + new Point(10295, 1227, 12276), + new Point(10355, 1227, 12276), + new Point(10355, 1086, 12276), + new Point(10295, 1086, 12276), ); $add( - new Point(10357, 1234, 12279), - new Point(10357, 1099, 12279), - new Point(10357, 1099, 12218), - new Point(10357, 1234, 12218), + new Point(10355, 1227, 12276), + new Point(10355, 1227, 12216), + new Point(10355, 1086, 12216), + new Point(10355, 1086, 12276), ); $add( - new Point(10294, 1099, 12279), - new Point(10294, 1234, 12279), - new Point(10294, 1234, 12218), - new Point(10294, 1099, 12218), + new Point(10295, 1227, 12216), + new Point(10295, 1227, 12276), + new Point(10295, 1086, 12276), + new Point(10295, 1086, 12216), ); $add( - new Point(10357, 1234, 12218), - new Point(10357, 1099, 12218), - new Point(10300, 1099, 12218), - new Point(10300, 1234, 12218), + new Point(10295, 1227, 12276), + new Point(10295, 1227, 12216), + new Point(10355, 1227, 12216), + new Point(10355, 1227, 12276), ); $add( - new Point(10294, 1234, 12279), - new Point(10357, 1234, 12279), - new Point(10357, 1234, 12217), - new Point(10294, 1234, 12217), + new Point(10355, 1227, 12216), + new Point(10295, 1227, 12216), + new Point(10295, 1086, 12216), + new Point(10355, 1086, 12216), ); // prop.016 $add( - new Point(10090, 1168, 12373), - new Point(10090, 1034, 12373), - new Point(10230, 1034, 12373), - new Point(10230, 1168, 12373), + new Point(10230, 1168, 12303), + new Point(10091, 1168, 12303), + new Point(10091, 1088, 12303), + new Point(10230, 1088, 12303), ); $add( - new Point(10230, 1168, 12373), - new Point(10230, 1034, 12373), - new Point(10230, 1034, 12312), - new Point(10230, 1168, 12312), + new Point(10091, 1168, 12381), + new Point(10230, 1168, 12381), + new Point(10230, 1088, 12381), + new Point(10091, 1088, 12381), ); $add( - new Point(10090, 1034, 12373), - new Point(10090, 1168, 12373), - new Point(10090, 1168, 12312), - new Point(10090, 1034, 12312), + new Point(10230, 1168, 12381), + new Point(10230, 1168, 12303), + new Point(10230, 1088, 12303), + new Point(10230, 1088, 12381), ); $add( - new Point(10230, 1168, 12312), - new Point(10230, 1034, 12312), - new Point(10102, 1034, 12312), - new Point(10102, 1168, 12312), + new Point(10091, 1168, 12381), + new Point(10091, 1168, 12303), + new Point(10230, 1168, 12303), + new Point(10230, 1168, 12381), ); $add( - new Point(10090, 1168, 12373), - new Point(10230, 1168, 12373), - new Point(10230, 1168, 12311), - new Point(10090, 1168, 12311), + new Point(10091, 1168, 12303), + new Point(10091, 1168, 12381), + new Point(10091, 1088, 12381), + new Point(10091, 1088, 12303), ); // prop.017 $add( - new Point(11226, 1234, 11341), - new Point(11226, 1099, 11341), - new Point(11288, 1099, 11341), - new Point(11288, 1234, 11341), + new Point(11228, 1228, 11341), + new Point(11228, 1228, 11280), + new Point(11288, 1228, 11280), + new Point(11288, 1228, 11341), ); $add( - new Point(11288, 1234, 11341), - new Point(11288, 1099, 11341), - new Point(11288, 1099, 11279), - new Point(11288, 1234, 11279), + new Point(11228, 1228, 11280), + new Point(11228, 1228, 11341), + new Point(11228, 1089, 11341), + new Point(11228, 1089, 11280), ); $add( - new Point(11226, 1099, 11341), - new Point(11226, 1234, 11341), - new Point(11226, 1234, 11279), - new Point(11226, 1099, 11279), + new Point(11228, 1228, 11341), + new Point(11288, 1228, 11341), + new Point(11288, 1089, 11341), + new Point(11228, 1089, 11341), ); $add( - new Point(11288, 1234, 11279), - new Point(11288, 1099, 11279), - new Point(11231, 1099, 11279), - new Point(11231, 1234, 11279), + new Point(11288, 1228, 11341), + new Point(11288, 1228, 11280), + new Point(11288, 1089, 11280), + new Point(11288, 1089, 11341), ); $add( - new Point(11226, 1234, 11341), - new Point(11288, 1234, 11341), - new Point(11288, 1234, 11278), - new Point(11226, 1234, 11278), + new Point(11288, 1228, 11280), + new Point(11228, 1228, 11280), + new Point(11228, 1089, 11280), + new Point(11288, 1089, 11280), ); // prop.018 $add( new Point(11659, 1337, 12622), new Point(11597, 1337, 12622), - new Point(11597, 1181, 12622), - new Point(11659, 1181, 12622), + new Point(11597, 1189, 12622), + new Point(11659, 1189, 12622), ); $add( new Point(11597, 1337, 12685), new Point(11659, 1337, 12685), - new Point(11659, 1181, 12685), - new Point(11597, 1181, 12685), + new Point(11659, 1189, 12685), + new Point(11597, 1189, 12685), ); $add( new Point(11659, 1337, 12685), new Point(11659, 1337, 12622), - new Point(11659, 1181, 12622), - new Point(11659, 1181, 12685), - ); - $add( - new Point(11597, 1181, 12685), - new Point(11659, 1181, 12685), - new Point(11659, 1181, 12622), - new Point(11597, 1181, 12622), + new Point(11659, 1189, 12622), + new Point(11659, 1189, 12685), ); $add( new Point(11597, 1337, 12685), @@ -4315,28 +4475,28 @@ public function __construct() $add( new Point(11597, 1337, 12622), new Point(11597, 1337, 12685), - new Point(11597, 1181, 12685), - new Point(11597, 1181, 12622), + new Point(11597, 1189, 12685), + new Point(11597, 1189, 12622), ); // prop.019 $add( new Point(11727, 1337, 12699), new Point(11789, 1337, 12699), - new Point(11789, 1179, 12699), - new Point(11727, 1179, 12699), + new Point(11789, 1190, 12699), + new Point(11727, 1190, 12699), ); $add( new Point(11789, 1337, 12699), new Point(11789, 1337, 12637), - new Point(11789, 1179, 12637), - new Point(11789, 1179, 12699), + new Point(11789, 1190, 12637), + new Point(11789, 1190, 12699), ); $add( new Point(11727, 1337, 12637), new Point(11727, 1337, 12699), - new Point(11727, 1179, 12699), - new Point(11727, 1179, 12637), + new Point(11727, 1190, 12699), + new Point(11727, 1190, 12637), ); $add( new Point(11727, 1337, 12699), @@ -4347,282 +4507,282 @@ public function __construct() $add( new Point(11789, 1337, 12637), new Point(11727, 1337, 12637), - new Point(11727, 1179, 12637), - new Point(11789, 1179, 12637), + new Point(11727, 1190, 12637), + new Point(11789, 1190, 12637), ); // prop.020 $add( - new Point(11466, 885, 8006), - new Point(11466, 750, 8006), - new Point(11528, 750, 8006), - new Point(11528, 885, 8006), + new Point(11528, 885, 7870), + new Point(11466, 885, 7870), + new Point(11466, 806, 7870), + new Point(11528, 806, 7870), + ); + $add( + new Point(11466, 885, 8005), + new Point(11528, 885, 8005), + new Point(11528, 806, 8005), + new Point(11466, 806, 8005), ); $add( - new Point(11528, 885, 8006), - new Point(11528, 750, 8006), - new Point(11528, 750, 7870), + new Point(11528, 885, 8005), new Point(11528, 885, 7870), + new Point(11528, 806, 7870), + new Point(11528, 806, 8005), ); $add( - new Point(11466, 750, 8006), - new Point(11466, 885, 8006), + new Point(11466, 885, 8005), new Point(11466, 885, 7870), - new Point(11466, 750, 7870), - ); - $add( new Point(11528, 885, 7870), - new Point(11528, 750, 7870), - new Point(11471, 750, 7870), - new Point(11471, 885, 7870), + new Point(11528, 885, 8005), ); $add( - new Point(11466, 885, 8006), - new Point(11528, 885, 8006), - new Point(11528, 885, 7867), - new Point(11466, 885, 7867), + new Point(11466, 885, 7870), + new Point(11466, 885, 8005), + new Point(11466, 806, 8005), + new Point(11466, 806, 7870), ); // prop.021 $add( - new Point(10001, 952, 6732), - new Point(10001, 817, 6732), - new Point(10063, 817, 6732), - new Point(10063, 952, 6732), + new Point(10000, 942, 6732), + new Point(10062, 942, 6732), + new Point(10062, 802, 6732), + new Point(10000, 802, 6732), ); $add( - new Point(10063, 952, 6732), - new Point(10063, 817, 6732), - new Point(10063, 817, 6671), - new Point(10063, 952, 6671), + new Point(10062, 942, 6732), + new Point(10062, 942, 6670), + new Point(10062, 802, 6670), + new Point(10062, 802, 6732), ); $add( - new Point(10001, 817, 6732), - new Point(10001, 952, 6732), - new Point(10001, 952, 6671), - new Point(10001, 817, 6671), + new Point(10000, 942, 6670), + new Point(10000, 942, 6732), + new Point(10000, 802, 6732), + new Point(10000, 802, 6670), ); $add( - new Point(10063, 952, 6671), - new Point(10063, 817, 6671), - new Point(10006, 817, 6671), - new Point(10006, 952, 6671), + new Point(10000, 942, 6732), + new Point(10000, 942, 6670), + new Point(10062, 942, 6670), + new Point(10062, 942, 6732), ); $add( - new Point(10001, 952, 6732), - new Point(10063, 952, 6732), - new Point(10063, 952, 6670), - new Point(10001, 952, 6670), + new Point(10062, 942, 6670), + new Point(10000, 942, 6670), + new Point(10000, 802, 6670), + new Point(10062, 802, 6670), ); // prop.022 $add( - new Point(10140, 952, 6564), - new Point(10140, 817, 6564), - new Point(10202, 817, 6564), - new Point(10202, 952, 6564), + new Point(10200, 942, 6500), + new Point(10138, 942, 6500), + new Point(10138, 800, 6500), + new Point(10200, 800, 6500), ); $add( - new Point(10202, 952, 6564), - new Point(10202, 817, 6564), - new Point(10202, 817, 6503), - new Point(10202, 952, 6503), + new Point(10138, 942, 6563), + new Point(10200, 942, 6563), + new Point(10200, 800, 6563), + new Point(10138, 800, 6563), ); $add( - new Point(10140, 817, 6564), - new Point(10140, 952, 6564), - new Point(10140, 952, 6503), - new Point(10140, 817, 6503), + new Point(10200, 942, 6563), + new Point(10200, 942, 6500), + new Point(10200, 800, 6500), + new Point(10200, 800, 6563), ); $add( - new Point(10202, 952, 6503), - new Point(10202, 817, 6503), - new Point(10145, 817, 6503), - new Point(10145, 952, 6503), + new Point(10138, 942, 6563), + new Point(10138, 942, 6500), + new Point(10200, 942, 6500), + new Point(10200, 942, 6563), ); $add( - new Point(10140, 952, 6564), - new Point(10202, 952, 6564), - new Point(10202, 952, 6502), - new Point(10140, 952, 6502), + new Point(10138, 942, 6500), + new Point(10138, 942, 6563), + new Point(10138, 800, 6563), + new Point(10138, 800, 6500), ); // prop.023 $add( - new Point(1556, 1343, 2158), - new Point(1556, 1209, 2158), - new Point(1618, 1209, 2158), - new Point(1618, 1343, 2158), + new Point(1618, 1342, 2095), + new Point(1556, 1342, 2095), + new Point(1556, 1203, 2095), + new Point(1618, 1203, 2095), ); $add( - new Point(1618, 1343, 2158), - new Point(1618, 1209, 2158), - new Point(1618, 1209, 2096), - new Point(1618, 1343, 2096), + new Point(1556, 1342, 2158), + new Point(1618, 1342, 2158), + new Point(1618, 1203, 2158), + new Point(1556, 1203, 2158), ); $add( - new Point(1556, 1209, 2158), - new Point(1556, 1343, 2158), - new Point(1556, 1343, 2096), - new Point(1556, 1209, 2096), + new Point(1618, 1342, 2158), + new Point(1618, 1342, 2095), + new Point(1618, 1203, 2095), + new Point(1618, 1203, 2158), ); $add( - new Point(1618, 1343, 2096), - new Point(1618, 1209, 2096), - new Point(1561, 1209, 2096), - new Point(1561, 1343, 2096), + new Point(1556, 1342, 2158), + new Point(1556, 1342, 2095), + new Point(1618, 1342, 2095), + new Point(1618, 1342, 2158), ); $add( - new Point(1556, 1343, 2158), - new Point(1618, 1343, 2158), - new Point(1618, 1343, 2095), - new Point(1556, 1343, 2095), + new Point(1556, 1342, 2095), + new Point(1556, 1342, 2158), + new Point(1556, 1203, 2158), + new Point(1556, 1203, 2095), ); // prop.024 $add( - new Point(2004, 1196, 2554), - new Point(2004, 1062, 2554), - new Point(2094, 1062, 2554), - new Point(2094, 1196, 2554), + new Point(2018, 1205, 2555), + new Point(2086, 1205, 2555), + new Point(2086, 1205, 2413), + new Point(2018, 1205, 2413), ); $add( - new Point(2094, 1196, 2554), - new Point(2094, 1062, 2554), - new Point(2094, 1062, 2410), - new Point(2094, 1196, 2410), + new Point(2018, 1205, 2555), + new Point(2018, 1205, 2413), + new Point(2018, 1103, 2413), + new Point(2018, 1103, 2555), ); $add( - new Point(2004, 1062, 2554), - new Point(2004, 1196, 2554), - new Point(2004, 1196, 2410), - new Point(2004, 1062, 2410), + new Point(2086, 1205, 2555), + new Point(2018, 1205, 2555), + new Point(2018, 1103, 2555), + new Point(2086, 1103, 2555), ); $add( - new Point(2094, 1196, 2410), - new Point(2094, 1062, 2410), - new Point(2012, 1062, 2410), - new Point(2012, 1196, 2410), + new Point(2086, 1205, 2413), + new Point(2086, 1205, 2555), + new Point(2086, 1103, 2555), + new Point(2086, 1103, 2413), ); $add( - new Point(2004, 1196, 2554), - new Point(2094, 1196, 2554), - new Point(2094, 1196, 2408), - new Point(2004, 1196, 2408), + new Point(2018, 1205, 2413), + new Point(2086, 1205, 2413), + new Point(2086, 1103, 2413), + new Point(2018, 1103, 2413), ); // prop.025 $add( - new Point(3009, 1328, 3580), - new Point(3009, 1193, 3580), - new Point(3071, 1193, 3580), - new Point(3071, 1328, 3580), + new Point(3070, 1328, 3518), + new Point(3010, 1328, 3518), + new Point(3010, 1188, 3518), + new Point(3070, 1188, 3518), ); $add( - new Point(3071, 1328, 3580), - new Point(3071, 1193, 3580), - new Point(3071, 1193, 3518), - new Point(3071, 1328, 3518), + new Point(3010, 1328, 3579), + new Point(3070, 1328, 3579), + new Point(3070, 1188, 3579), + new Point(3010, 1188, 3579), ); $add( - new Point(3009, 1193, 3580), - new Point(3009, 1328, 3580), - new Point(3009, 1328, 3518), - new Point(3009, 1193, 3518), + new Point(3070, 1328, 3579), + new Point(3070, 1328, 3518), + new Point(3070, 1188, 3518), + new Point(3070, 1188, 3579), ); $add( - new Point(3071, 1328, 3518), - new Point(3071, 1193, 3518), - new Point(3014, 1193, 3518), - new Point(3014, 1328, 3518), + new Point(3010, 1328, 3579), + new Point(3010, 1328, 3518), + new Point(3070, 1328, 3518), + new Point(3070, 1328, 3579), ); $add( - new Point(3009, 1328, 3580), - new Point(3071, 1328, 3580), - new Point(3071, 1328, 3517), - new Point(3009, 1328, 3517), + new Point(3010, 1328, 3518), + new Point(3010, 1328, 3579), + new Point(3010, 1188, 3579), + new Point(3010, 1188, 3518), ); // prop.026 $add( - new Point(2906, 1328, 3652), - new Point(2906, 1193, 3652), - new Point(2968, 1193, 3652), - new Point(2968, 1328, 3652), + new Point(2968, 1327, 3589), + new Point(2906, 1327, 3589), + new Point(2906, 1186, 3589), + new Point(2968, 1186, 3589), ); $add( - new Point(2968, 1328, 3652), - new Point(2968, 1193, 3652), - new Point(2968, 1193, 3590), - new Point(2968, 1328, 3590), + new Point(2906, 1327, 3652), + new Point(2968, 1327, 3652), + new Point(2968, 1186, 3652), + new Point(2906, 1186, 3652), ); $add( - new Point(2906, 1193, 3652), - new Point(2906, 1328, 3652), - new Point(2906, 1328, 3590), - new Point(2906, 1193, 3590), + new Point(2968, 1327, 3652), + new Point(2968, 1327, 3589), + new Point(2968, 1186, 3589), + new Point(2968, 1186, 3652), ); $add( - new Point(2968, 1328, 3590), - new Point(2968, 1193, 3590), - new Point(2911, 1193, 3590), - new Point(2911, 1328, 3590), + new Point(2906, 1327, 3652), + new Point(2906, 1327, 3589), + new Point(2968, 1327, 3589), + new Point(2968, 1327, 3652), ); $add( - new Point(2906, 1328, 3652), - new Point(2968, 1328, 3652), - new Point(2968, 1328, 3589), - new Point(2906, 1328, 3589), + new Point(2906, 1327, 3589), + new Point(2906, 1327, 3652), + new Point(2906, 1186, 3652), + new Point(2906, 1186, 3589), ); // prop.027 $add( - new Point(2258, 1006, 5680), - new Point(1714, 1006, 5680), - new Point(1714, 880, 5680), - new Point(2258, 880, 5680), + new Point(2260, 1004, 5678), + new Point(1709, 1004, 5678), + new Point(1709, 880, 5678), + new Point(2260, 880, 5678), ); $add( - new Point(1714, 1006, 5840), - new Point(2258, 1006, 5840), - new Point(2258, 880, 5840), - new Point(1714, 880, 5840), + new Point(1709, 1004, 5840), + new Point(2260, 1004, 5840), + new Point(2260, 880, 5840), + new Point(1709, 880, 5840), ); $add( - new Point(2258, 1006, 5840), - new Point(2258, 1006, 5680), - new Point(2258, 880, 5680), - new Point(2258, 880, 5840), + new Point(2260, 1004, 5840), + new Point(2260, 1004, 5678), + new Point(2260, 880, 5678), + new Point(2260, 880, 5840), ); $add( - new Point(1876, 996, 5910), + new Point(1876, 995, 5910), new Point(1876, 890, 5910), new Point(1978, 890, 5910), - new Point(1978, 996, 5910), + new Point(1978, 995, 5910), ); $add( - new Point(1714, 1006, 5840), - new Point(1714, 1006, 5680), - new Point(2258, 1006, 5680), - new Point(2258, 1006, 5840), + new Point(1709, 1004, 5840), + new Point(1709, 1004, 5678), + new Point(2260, 1004, 5678), + new Point(2260, 1004, 5840), ); $add( - new Point(1714, 1006, 5680), - new Point(1714, 1006, 5840), - new Point(1714, 880, 5840), - new Point(1714, 880, 5680), + new Point(1709, 1004, 5678), + new Point(1709, 1004, 5840), + new Point(1709, 880, 5840), + new Point(1709, 880, 5678), ); $add( - new Point(1876, 996, 5823), - new Point(1978, 996, 5823), + new Point(1876, 995, 5823), + new Point(1978, 995, 5823), new Point(1978, 890, 5823), new Point(1876, 890, 5823), ); $add( - new Point(1876, 996, 5910), - new Point(1978, 996, 5910), - new Point(1978, 996, 5823), - new Point(1876, 996, 5823), + new Point(1876, 995, 5910), + new Point(1978, 995, 5910), + new Point(1978, 995, 5823), + new Point(1876, 995, 5823), ); $add( new Point(1978, 890, 5910), @@ -4632,397 +4792,385 @@ public function __construct() ); $add( new Point(1876, 890, 5910), - new Point(1876, 996, 5910), - new Point(1876, 996, 5823), + new Point(1876, 995, 5910), + new Point(1876, 995, 5823), new Point(1876, 890, 5823), ); $add( - new Point(1978, 996, 5910), + new Point(1978, 995, 5910), new Point(1978, 890, 5910), new Point(1978, 890, 5823), - new Point(1978, 996, 5823), + new Point(1978, 995, 5823), ); // prop.028 $add( - new Point(1717, 1092, 5851), - new Point(1717, 958, 5851), - new Point(1815, 958, 5851), - new Point(1815, 1092, 5851), + new Point(1815, 1091, 5766), + new Point(1717, 1091, 5766), + new Point(1717, 981, 5766), + new Point(1815, 981, 5766), ); $add( - new Point(1815, 1092, 5851), - new Point(1815, 958, 5851), - new Point(1815, 958, 5767), - new Point(1815, 1092, 5767), + new Point(1717, 1091, 5851), + new Point(1815, 1091, 5851), + new Point(1815, 981, 5851), + new Point(1717, 981, 5851), ); $add( - new Point(1717, 958, 5851), - new Point(1717, 1092, 5851), - new Point(1717, 1092, 5767), - new Point(1717, 958, 5767), + new Point(1815, 1091, 5851), + new Point(1815, 1091, 5766), + new Point(1815, 981, 5766), + new Point(1815, 981, 5851), ); $add( - new Point(1815, 1092, 5767), - new Point(1815, 958, 5767), - new Point(1725, 958, 5767), - new Point(1725, 1092, 5767), + new Point(1717, 1091, 5851), + new Point(1717, 1091, 5766), + new Point(1815, 1091, 5766), + new Point(1815, 1091, 5851), ); $add( - new Point(1717, 1092, 5851), - new Point(1815, 1092, 5851), - new Point(1815, 1092, 5766), - new Point(1717, 1092, 5766), + new Point(1717, 1091, 5766), + new Point(1717, 1091, 5851), + new Point(1717, 981, 5851), + new Point(1717, 981, 5766), ); // prop.029 $add( - new Point(3009, 1024, 6250), - new Point(3009, 756, 6250), - new Point(3283, 756, 6250), - new Point(3283, 1024, 6250), - ); - $add( - new Point(3283, 1024, 6250), - new Point(3283, 756, 6250), - new Point(3283, 756, 6084), - new Point(3283, 1024, 6084), + new Point(3020, 1024, 6087), + new Point(3020, 1024, 6250), + new Point(3020, 896, 6250), + new Point(3020, 896, 6087), ); $add( - new Point(3009, 756, 6250), - new Point(3009, 1024, 6250), - new Point(3009, 1024, 6084), - new Point(3009, 756, 6084), + new Point(3195, 1024, 6087), + new Point(3020, 1024, 6087), + new Point(3020, 896, 6087), + new Point(3195, 896, 6087), ); $add( - new Point(3283, 1024, 6084), - new Point(3283, 756, 6084), - new Point(3013, 756, 6084), - new Point(3013, 1024, 6084), + new Point(3020, 1024, 6250), + new Point(3020, 1024, 6087), + new Point(3195, 1024, 6087), + new Point(3195, 1024, 6250), ); $add( - new Point(3009, 1024, 6250), - new Point(3283, 1024, 6250), - new Point(3283, 1024, 6081), - new Point(3009, 1024, 6081), + new Point(3195, 1024, 6250), + new Point(3195, 1024, 6087), + new Point(3195, 896, 6087), + new Point(3195, 896, 6250), ); // prop.030 $add( - new Point(2129, 1037, 12084), - new Point(2129, 902, 12084), - new Point(2191, 902, 12084), - new Point(2191, 1037, 12084), + new Point(2129, 1036, 12085), + new Point(2191, 1036, 12085), + new Point(2191, 896, 12085), + new Point(2129, 896, 12085), ); $add( - new Point(2191, 1037, 12084), - new Point(2191, 902, 12084), - new Point(2191, 902, 12023), - new Point(2191, 1037, 12023), + new Point(2191, 1036, 12085), + new Point(2191, 1036, 12022), + new Point(2191, 896, 12022), + new Point(2191, 896, 12085), ); $add( - new Point(2129, 902, 12084), - new Point(2129, 1037, 12084), - new Point(2129, 1037, 12023), - new Point(2129, 902, 12023), + new Point(2129, 1036, 12022), + new Point(2129, 1036, 12085), + new Point(2129, 896, 12085), + new Point(2129, 896, 12022), ); $add( - new Point(2191, 1037, 12023), - new Point(2191, 902, 12023), - new Point(2134, 902, 12023), - new Point(2134, 1037, 12023), + new Point(2129, 1036, 12085), + new Point(2129, 1036, 12022), + new Point(2191, 1036, 12022), + new Point(2191, 1036, 12085), ); $add( - new Point(2129, 1037, 12084), - new Point(2191, 1037, 12084), - new Point(2191, 1037, 12022), - new Point(2129, 1037, 12022), + new Point(2191, 1036, 12022), + new Point(2129, 1036, 12022), + new Point(2129, 896, 12022), + new Point(2191, 896, 12022), ); // prop.031 $add( - new Point(2210, 1037, 12168), - new Point(2210, 902, 12168), - new Point(2272, 902, 12168), - new Point(2272, 1037, 12168), + new Point(2210, 1036, 12105), + new Point(2210, 1036, 12168), + new Point(2210, 896, 12168), + new Point(2210, 896, 12105), ); $add( - new Point(2272, 1037, 12168), - new Point(2272, 902, 12168), - new Point(2272, 902, 12106), - new Point(2272, 1037, 12106), + new Point(2272, 1036, 12105), + new Point(2210, 1036, 12105), + new Point(2210, 896, 12105), + new Point(2272, 896, 12105), ); $add( - new Point(2210, 902, 12168), - new Point(2210, 1037, 12168), - new Point(2210, 1037, 12106), - new Point(2210, 902, 12106), + new Point(2210, 1036, 12168), + new Point(2272, 1036, 12168), + new Point(2272, 896, 12168), + new Point(2210, 896, 12168), ); $add( - new Point(2272, 1037, 12106), - new Point(2272, 902, 12106), - new Point(2215, 902, 12106), - new Point(2215, 1037, 12106), + new Point(2210, 1036, 12168), + new Point(2210, 1036, 12105), + new Point(2272, 1036, 12105), + new Point(2272, 1036, 12168), ); $add( - new Point(2210, 1037, 12168), - new Point(2272, 1037, 12168), - new Point(2272, 1037, 12105), - new Point(2210, 1037, 12105), + new Point(2272, 1036, 12168), + new Point(2272, 1036, 12105), + new Point(2272, 896, 12105), + new Point(2272, 896, 12168), ); // prop.032 $add( - new Point(2340, 1037, 12519), - new Point(2340, 902, 12519), - new Point(2402, 902, 12519), - new Point(2402, 1037, 12519), + new Point(2339, 1036, 12455), + new Point(2339, 1036, 12517), + new Point(2339, 897, 12517), + new Point(2339, 897, 12455), ); $add( - new Point(2402, 1037, 12519), - new Point(2402, 902, 12519), - new Point(2402, 902, 12457), - new Point(2402, 1037, 12457), + new Point(2401, 1036, 12455), + new Point(2339, 1036, 12455), + new Point(2339, 897, 12455), + new Point(2401, 897, 12455), ); $add( - new Point(2340, 902, 12519), - new Point(2340, 1037, 12519), - new Point(2340, 1037, 12457), - new Point(2340, 902, 12457), + new Point(2339, 1036, 12517), + new Point(2401, 1036, 12517), + new Point(2401, 897, 12517), + new Point(2339, 897, 12517), ); $add( - new Point(2402, 1037, 12457), - new Point(2402, 902, 12457), - new Point(2345, 902, 12457), - new Point(2345, 1037, 12457), + new Point(2339, 1036, 12517), + new Point(2339, 1036, 12455), + new Point(2401, 1036, 12455), + new Point(2401, 1036, 12517), ); $add( - new Point(2340, 1037, 12519), - new Point(2402, 1037, 12519), - new Point(2402, 1037, 12456), - new Point(2340, 1037, 12456), + new Point(2401, 1036, 12517), + new Point(2401, 1036, 12455), + new Point(2401, 897, 12455), + new Point(2401, 897, 12517), ); // prop.033 $add( - new Point(3581, 947, 11303), - new Point(3581, 813, 11303), - new Point(3643, 813, 11303), - new Point(3643, 947, 11303), + new Point(3643, 945, 11241), + new Point(3581, 945, 11241), + new Point(3581, 804, 11241), + new Point(3643, 804, 11241), ); $add( - new Point(3643, 947, 11303), - new Point(3643, 813, 11303), - new Point(3643, 813, 11242), - new Point(3643, 947, 11242), + new Point(3581, 945, 11303), + new Point(3643, 945, 11303), + new Point(3643, 804, 11303), + new Point(3581, 804, 11303), ); $add( - new Point(3581, 813, 11303), - new Point(3581, 947, 11303), - new Point(3581, 947, 11242), - new Point(3581, 813, 11242), + new Point(3643, 945, 11303), + new Point(3643, 945, 11241), + new Point(3643, 804, 11241), + new Point(3643, 804, 11303), ); $add( - new Point(3643, 947, 11242), - new Point(3643, 813, 11242), - new Point(3586, 813, 11242), - new Point(3586, 947, 11242), + new Point(3581, 945, 11303), + new Point(3581, 945, 11241), + new Point(3643, 945, 11241), + new Point(3643, 945, 11303), ); $add( - new Point(3581, 947, 11303), - new Point(3643, 947, 11303), - new Point(3643, 947, 11241), - new Point(3581, 947, 11241), + new Point(3581, 945, 11241), + new Point(3581, 945, 11303), + new Point(3581, 804, 11303), + new Point(3581, 804, 11241), ); // prop.034 $add( - new Point(3573, 947, 11193), - new Point(3573, 813, 11193), - new Point(3635, 813, 11193), - new Point(3635, 947, 11193), + new Point(3574, 946, 11129), + new Point(3574, 946, 11192), + new Point(3574, 804, 11192), + new Point(3574, 804, 11129), ); $add( - new Point(3635, 947, 11193), - new Point(3635, 813, 11193), - new Point(3635, 813, 11131), - new Point(3635, 947, 11131), + new Point(3636, 946, 11129), + new Point(3574, 946, 11129), + new Point(3574, 804, 11129), + new Point(3636, 804, 11129), ); $add( - new Point(3573, 813, 11193), - new Point(3573, 947, 11193), - new Point(3573, 947, 11131), - new Point(3573, 813, 11131), + new Point(3574, 946, 11192), + new Point(3636, 946, 11192), + new Point(3636, 804, 11192), + new Point(3574, 804, 11192), ); $add( - new Point(3635, 947, 11131), - new Point(3635, 813, 11131), - new Point(3578, 813, 11131), - new Point(3578, 947, 11131), + new Point(3574, 946, 11192), + new Point(3574, 946, 11129), + new Point(3636, 946, 11129), + new Point(3636, 946, 11192), ); $add( - new Point(3573, 947, 11193), - new Point(3635, 947, 11193), - new Point(3635, 947, 11130), - new Point(3573, 947, 11130), + new Point(3636, 946, 11192), + new Point(3636, 946, 11129), + new Point(3636, 804, 11129), + new Point(3636, 804, 11192), ); // prop.035 $add( - new Point(2124, 1092, 11436), - new Point(2124, 1092, 11147), - new Point(2416, 1092, 11147), - new Point(2416, 1092, 11436), + new Point(2125, 1091, 11435), + new Point(2125, 1091, 11148), + new Point(2412, 1091, 11148), + new Point(2412, 1091, 11435), ); $add( - new Point(2124, 1092, 11147), - new Point(2124, 1092, 11436), - new Point(2124, 808, 11436), - new Point(2124, 808, 11147), + new Point(2125, 1091, 11148), + new Point(2125, 1091, 11435), + new Point(2125, 808, 11435), + new Point(2125, 808, 11148), ); $add( - new Point(2124, 1092, 11436), - new Point(2416, 1092, 11436), - new Point(2416, 808, 11436), - new Point(2124, 808, 11436), + new Point(2125, 1091, 11435), + new Point(2412, 1091, 11435), + new Point(2412, 808, 11435), + new Point(2125, 808, 11435), ); $add( - new Point(2416, 1092, 11436), - new Point(2416, 1092, 11147), - new Point(2416, 808, 11147), - new Point(2416, 808, 11436), + new Point(2412, 1091, 11435), + new Point(2412, 1091, 11148), + new Point(2412, 808, 11148), + new Point(2412, 808, 11435), ); $add( - new Point(2416, 1092, 11147), - new Point(2124, 1092, 11147), - new Point(2124, 808, 11147), - new Point(2416, 808, 11147), + new Point(2412, 1091, 11148), + new Point(2125, 1091, 11148), + new Point(2125, 808, 11148), + new Point(2412, 808, 11148), ); // prop.036 $add( - new Point(2703, 1188, 11899), - new Point(2703, 1188, 11674), - new Point(2899, 1188, 11674), - new Point(2899, 1188, 11899), + new Point(2703, 1187, 11867), + new Point(2703, 1187, 11674), + new Point(2897, 1187, 11674), + new Point(2897, 1187, 11867), ); $add( - new Point(2703, 1188, 11674), - new Point(2703, 1188, 11899), - new Point(2703, 814, 11899), + new Point(2703, 1187, 11674), + new Point(2703, 1187, 11867), + new Point(2703, 814, 11867), new Point(2703, 814, 11674), ); $add( - new Point(2703, 1188, 11899), - new Point(2899, 1188, 11899), - new Point(2899, 814, 11899), - new Point(2703, 814, 11899), + new Point(2703, 1187, 11867), + new Point(2897, 1187, 11867), + new Point(2897, 814, 11867), + new Point(2703, 814, 11867), ); $add( - new Point(2899, 1188, 11899), - new Point(2899, 1188, 11674), - new Point(2899, 814, 11674), - new Point(2899, 814, 11899), + new Point(2897, 1187, 11867), + new Point(2897, 1187, 11674), + new Point(2897, 814, 11674), + new Point(2897, 814, 11867), ); $add( - new Point(2899, 1188, 11674), - new Point(2703, 1188, 11674), + new Point(2897, 1187, 11674), + new Point(2703, 1187, 11674), new Point(2703, 814, 11674), - new Point(2899, 814, 11674), + new Point(2897, 814, 11674), ); // prop.037 $add( - new Point(3449, 1145, 12306), - new Point(3449, 1145, 11901), - new Point(3851, 1145, 11901), - new Point(3851, 1145, 12306), + new Point(3462, 1139, 12305), + new Point(3462, 1139, 11901), + new Point(3851, 1139, 11901), + new Point(3851, 1139, 12305), ); $add( - new Point(3449, 1145, 11901), - new Point(3449, 1145, 12306), - new Point(3449, 814, 12306), - new Point(3449, 814, 11901), + new Point(3462, 1139, 11901), + new Point(3462, 1139, 12305), + new Point(3462, 814, 12305), + new Point(3462, 814, 11901), ); $add( - new Point(3449, 1145, 12306), - new Point(3851, 1145, 12306), - new Point(3851, 814, 12306), - new Point(3449, 814, 12306), + new Point(3462, 1139, 12305), + new Point(3851, 1139, 12305), + new Point(3851, 814, 12305), + new Point(3462, 814, 12305), ); $add( - new Point(3851, 1145, 12306), - new Point(3851, 1145, 11901), + new Point(3851, 1139, 12305), + new Point(3851, 1139, 11901), new Point(3851, 814, 11901), - new Point(3851, 814, 12306), + new Point(3851, 814, 12305), ); $add( - new Point(3851, 1145, 11901), - new Point(3449, 1145, 11901), - new Point(3449, 814, 11901), + new Point(3851, 1139, 11901), + new Point(3462, 1139, 11901), + new Point(3462, 814, 11901), new Point(3851, 814, 11901), ); // prop.038 $add( - new Point(3311, 1093, 12071), - new Point(3311, 1093, 11924), - new Point(3501, 1093, 11924), - new Point(3501, 1093, 12071), - ); - $add( - new Point(3311, 1093, 11924), - new Point(3311, 1093, 12071), - new Point(3311, 923, 12071), - new Point(3311, 923, 11924), + new Point(3312, 1091, 12071), + new Point(3312, 1091, 11927), + new Point(3477, 1091, 11927), + new Point(3477, 1091, 12071), ); $add( - new Point(3311, 1093, 12071), - new Point(3501, 1093, 12071), - new Point(3501, 923, 12071), - new Point(3311, 923, 12071), + new Point(3312, 1091, 11927), + new Point(3312, 1091, 12071), + new Point(3312, 923, 12071), + new Point(3312, 923, 11927), ); $add( - new Point(3501, 1093, 12071), - new Point(3501, 1093, 11924), - new Point(3501, 923, 11924), - new Point(3501, 923, 12071), + new Point(3312, 1091, 12071), + new Point(3477, 1091, 12071), + new Point(3477, 923, 12071), + new Point(3312, 923, 12071), ); $add( - new Point(3501, 1093, 11924), - new Point(3311, 1093, 11924), - new Point(3311, 923, 11924), - new Point(3501, 923, 11924), + new Point(3477, 1091, 11927), + new Point(3312, 1091, 11927), + new Point(3312, 923, 11927), + new Point(3477, 923, 11927), ); // prop.039 $add( - new Point(3244, 949, 12127), - new Point(3244, 949, 11910), - new Point(3456, 949, 11910), - new Point(3456, 949, 12127), + new Point(3244, 947, 12127), + new Point(3244, 947, 11910), + new Point(3456, 947, 11910), + new Point(3456, 947, 12127), ); $add( - new Point(3244, 949, 11910), - new Point(3244, 949, 12127), + new Point(3244, 947, 11910), + new Point(3244, 947, 12127), new Point(3244, 779, 12127), new Point(3244, 779, 11910), ); $add( - new Point(3244, 949, 12127), - new Point(3456, 949, 12127), + new Point(3244, 947, 12127), + new Point(3456, 947, 12127), new Point(3456, 779, 12127), new Point(3244, 779, 12127), ); $add( - new Point(3456, 949, 12127), - new Point(3456, 949, 11910), + new Point(3456, 947, 12127), + new Point(3456, 947, 11910), new Point(3456, 779, 11910), new Point(3456, 779, 12127), ); $add( - new Point(3456, 949, 11910), - new Point(3244, 949, 11910), + new Point(3456, 947, 11910), + new Point(3244, 947, 11910), new Point(3244, 779, 11910), new Point(3456, 779, 11910), ); @@ -5052,217 +5200,201 @@ public function __construct() new Point(2802, 813, 12359), new Point(3003, 813, 12275), ); - - // prop.041 $add( - new Point(2858, 984, 12493), - new Point(2858, 984, 12343), - new Point(3030, 984, 12343), - new Point(3030, 984, 12493), + new Point(2865, 983, 12488), + new Point(2865, 983, 12344), + new Point(3030, 983, 12344), + new Point(3030, 983, 12488), ); // prop.042 $add( - new Point(2734, 981, 9271), - new Point(2873, 981, 9409), - new Point(2873, 815, 9409), - new Point(2734, 815, 9271), + new Point(2736, 995, 9268), + new Point(2872, 995, 9404), + new Point(2872, 805, 9404), + new Point(2736, 805, 9268), ); $add( - new Point(2873, 981, 9409), - new Point(3012, 981, 9269), - new Point(3012, 815, 9269), - new Point(2873, 815, 9409), + new Point(2872, 995, 9404), + new Point(3008, 995, 9268), + new Point(3008, 805, 9268), + new Point(2872, 805, 9404), ); $add( - new Point(3012, 981, 9269), - new Point(2872, 981, 9132), - new Point(2872, 815, 9132), - new Point(3012, 815, 9269), + new Point(2872, 995, 9133), + new Point(2736, 995, 9268), + new Point(2736, 805, 9268), + new Point(2872, 805, 9133), ); $add( - new Point(2872, 981, 9132), - new Point(2734, 981, 9271), - new Point(2734, 815, 9271), - new Point(2872, 815, 9132), - ); - - // prop.043 - $add( - new Point(2809, 996, 9327), - new Point(2809, 996, 9199), - new Point(2945, 996, 9199), - new Point(2945, 996, 9327), + new Point(2809, 995, 9327), + new Point(2809, 995, 9199), + new Point(2945, 995, 9199), + new Point(2945, 995, 9327), ); // prop.044 $add( - new Point(2636, 911, 9569), - new Point(3160, 911, 9877), - new Point(3160, 821, 9877), - new Point(2636, 821, 9569), + new Point(2655, 911, 9578), + new Point(3153, 911, 9858), + new Point(3153, 821, 9858), + new Point(2655, 821, 9578), ); $add( - new Point(3160, 911, 9877), - new Point(3283, 911, 9654), - new Point(3283, 821, 9654), - new Point(3160, 821, 9877), + new Point(3153, 911, 9858), + new Point(3266, 911, 9649), + new Point(3266, 821, 9649), + new Point(3153, 821, 9858), ); $add( - new Point(3283, 911, 9654), - new Point(2747, 911, 9362), - new Point(2747, 821, 9362), - new Point(3283, 821, 9654), + new Point(3266, 911, 9649), + new Point(2760, 911, 9382), + new Point(2760, 821, 9382), + new Point(3266, 821, 9649), ); $add( - new Point(2747, 911, 9362), - new Point(2636, 911, 9569), - new Point(2636, 821, 9569), - new Point(2747, 821, 9362), + new Point(2760, 911, 9382), + new Point(2655, 911, 9578), + new Point(2655, 821, 9578), + new Point(2760, 821, 9382), ); - - // prop.045 $add( - new Point(2871, 980, 9679), - new Point(3010, 980, 9679), - new Point(3010, 980, 9549), - new Point(2871, 980, 9549), + new Point(2871, 977, 9679), + new Point(3010, 977, 9679), + new Point(3010, 977, 9549), + new Point(2871, 977, 9549), ); $add( - new Point(2871, 980, 9679), - new Point(2871, 980, 9549), + new Point(2871, 977, 9679), + new Point(2871, 977, 9549), new Point(2871, 877, 9549), new Point(2871, 877, 9679), ); $add( - new Point(3010, 980, 9679), - new Point(2871, 980, 9679), + new Point(3010, 977, 9679), + new Point(2871, 977, 9679), new Point(2871, 877, 9679), new Point(3010, 877, 9679), ); $add( - new Point(3010, 980, 9549), - new Point(3010, 980, 9679), + new Point(3010, 977, 9549), + new Point(3010, 977, 9679), new Point(3010, 877, 9679), new Point(3010, 877, 9549), ); $add( - new Point(2871, 980, 9549), - new Point(3010, 980, 9549), + new Point(2871, 977, 9549), + new Point(3010, 977, 9549), new Point(3010, 877, 9549), new Point(2871, 877, 9549), ); - - // prop.046 $add( - new Point(3035, 919, 9780), - new Point(3035, 919, 9625), - new Point(3201, 919, 9625), - new Point(3201, 919, 9780), + new Point(3035, 911, 9780), + new Point(3035, 911, 9625), + new Point(3201, 911, 9625), + new Point(3201, 911, 9780), ); - - // prop.047 $add( - new Point(2717, 912, 9592), - new Point(2717, 912, 9456), - new Point(2862, 912, 9456), - new Point(2862, 912, 9592), + new Point(2717, 911, 9592), + new Point(2717, 911, 9456), + new Point(2862, 911, 9456), + new Point(2862, 911, 9592), ); // prop.050 $add( - new Point(4993, 736, 11803), - new Point(5216, 736, 11803), - new Point(5216, 736, 11608), - new Point(4993, 736, 11608), + new Point(4993, 731, 11810), + new Point(5207, 731, 11810), + new Point(5207, 731, 11608), + new Point(4993, 731, 11608), ); $add( - new Point(5216, 736, 11608), - new Point(5216, 736, 11803), - new Point(5216, 524, 11803), - new Point(5216, 524, 11608), + new Point(5207, 731, 11608), + new Point(5207, 731, 11810), + new Point(5207, 524, 11810), + new Point(5207, 524, 11608), ); $add( - new Point(4993, 736, 11608), - new Point(5216, 736, 11608), - new Point(5216, 524, 11608), + new Point(4993, 731, 11608), + new Point(5207, 731, 11608), + new Point(5207, 524, 11608), new Point(4993, 524, 11608), ); $add( - new Point(4993, 736, 11803), - new Point(4993, 736, 11608), + new Point(4993, 731, 11810), + new Point(4993, 731, 11608), new Point(4993, 524, 11608), - new Point(4993, 524, 11803), + new Point(4993, 524, 11810), ); $add( - new Point(5216, 736, 11803), - new Point(4993, 736, 11803), - new Point(4993, 524, 11803), - new Point(5216, 524, 11803), + new Point(5207, 731, 11810), + new Point(4993, 731, 11810), + new Point(4993, 524, 11810), + new Point(5207, 524, 11810), ); // prop.051 $add( - new Point(5029, 720, 11546), - new Point(5203, 720, 11546), - new Point(5203, 720, 11394), - new Point(5029, 720, 11394), + new Point(4990, 719, 11605), + new Point(5229, 719, 11605), + new Point(5229, 719, 11359), + new Point(4990, 719, 11359), ); $add( - new Point(5203, 720, 11546), - new Point(5029, 720, 11546), - new Point(5029, 507, 11546), - new Point(5203, 507, 11546), + new Point(5229, 719, 11605), + new Point(4990, 719, 11605), + new Point(4990, 507, 11605), + new Point(5229, 507, 11605), ); $add( - new Point(5203, 720, 11394), - new Point(5203, 720, 11546), - new Point(5203, 507, 11546), - new Point(5203, 507, 11394), + new Point(5229, 719, 11359), + new Point(5229, 719, 11605), + new Point(5229, 507, 11605), + new Point(5229, 507, 11359), ); $add( - new Point(5029, 720, 11394), - new Point(5203, 720, 11394), - new Point(5203, 507, 11394), - new Point(5029, 507, 11394), + new Point(4990, 719, 11359), + new Point(5229, 719, 11359), + new Point(5229, 507, 11359), + new Point(4990, 507, 11359), ); $add( - new Point(5029, 720, 11546), - new Point(5029, 720, 11394), - new Point(5029, 507, 11394), - new Point(5029, 507, 11546), + new Point(4990, 719, 11605), + new Point(4990, 719, 11359), + new Point(4990, 507, 11359), + new Point(4990, 507, 11605), ); // prop.052 $add( - new Point(4728, 831, 11732), - new Point(4951, 831, 11732), - new Point(4951, 831, 11537), - new Point(4728, 831, 11537), + new Point(4747, 827, 11741), + new Point(4951, 827, 11741), + new Point(4951, 827, 11537), + new Point(4747, 827, 11537), ); $add( - new Point(4951, 831, 11732), - new Point(4728, 831, 11732), - new Point(4728, 717, 11732), - new Point(4951, 717, 11732), + new Point(4951, 827, 11741), + new Point(4747, 827, 11741), + new Point(4747, 717, 11741), + new Point(4951, 717, 11741), ); $add( - new Point(4951, 831, 11537), - new Point(4951, 831, 11732), - new Point(4951, 717, 11732), + new Point(4951, 827, 11537), + new Point(4951, 827, 11741), + new Point(4951, 717, 11741), new Point(4951, 717, 11537), ); $add( - new Point(4728, 831, 11537), - new Point(4951, 831, 11537), + new Point(4747, 827, 11537), + new Point(4951, 827, 11537), new Point(4951, 717, 11537), - new Point(4728, 717, 11537), + new Point(4747, 717, 11537), ); $add( - new Point(4728, 831, 11732), - new Point(4728, 831, 11537), - new Point(4728, 717, 11537), - new Point(4728, 717, 11732), + new Point(4747, 827, 11741), + new Point(4747, 827, 11537), + new Point(4747, 717, 11537), + new Point(4747, 717, 11741), ); // prop.055 @@ -5299,180 +5431,174 @@ public function __construct() // prop.056 $add( - new Point(2411, 1400, 7117), - new Point(2411, 1400, 7216), - new Point(2411, 905, 7216), - new Point(2411, 905, 7117), + new Point(2413, 1386, 7118), + new Point(2413, 1386, 7214), + new Point(2413, 891, 7214), + new Point(2413, 891, 7118), ); $add( - new Point(2411, 1400, 7216), - new Point(2510, 1400, 7216), - new Point(2510, 905, 7216), - new Point(2411, 905, 7216), + new Point(2413, 1386, 7214), + new Point(2509, 1386, 7214), + new Point(2509, 891, 7214), + new Point(2413, 891, 7214), ); $add( - new Point(2510, 1400, 7216), - new Point(2510, 1400, 7117), - new Point(2510, 905, 7117), - new Point(2510, 905, 7216), + new Point(2509, 1386, 7214), + new Point(2509, 1386, 7118), + new Point(2509, 891, 7118), + new Point(2509, 891, 7214), ); $add( - new Point(2510, 1400, 7117), - new Point(2411, 1400, 7117), - new Point(2411, 905, 7117), - new Point(2510, 905, 7117), + new Point(2509, 1386, 7118), + new Point(2413, 1386, 7118), + new Point(2413, 891, 7118), + new Point(2509, 891, 7118), ); // prop.057 $add( - new Point(2411, 1400, 7981), - new Point(2411, 1400, 8081), - new Point(2411, 905, 8081), - new Point(2411, 905, 7981), + new Point(2412, 1387, 7981), + new Point(2412, 1387, 8077), + new Point(2412, 892, 8077), + new Point(2412, 892, 7981), ); $add( - new Point(2411, 1400, 8081), - new Point(2510, 1400, 8081), - new Point(2510, 905, 8081), - new Point(2411, 905, 8081), + new Point(2412, 1387, 8077), + new Point(2508, 1387, 8077), + new Point(2508, 892, 8077), + new Point(2412, 892, 8077), ); $add( - new Point(2510, 1400, 8081), - new Point(2510, 1400, 7981), - new Point(2510, 905, 7981), - new Point(2510, 905, 8081), + new Point(2508, 1387, 8077), + new Point(2508, 1387, 7981), + new Point(2508, 892, 7981), + new Point(2508, 892, 8077), ); $add( - new Point(2510, 1400, 7981), - new Point(2411, 1400, 7981), - new Point(2411, 905, 7981), - new Point(2510, 905, 7981), + new Point(2508, 1387, 7981), + new Point(2412, 1387, 7981), + new Point(2412, 892, 7981), + new Point(2508, 892, 7981), ); // prop.058 $add( - new Point(3584, 1074, 7991), - new Point(3584, 1074, 7766), - new Point(3859, 1074, 7766), - new Point(3859, 1074, 7991), - ); - $add( - new Point(3584, 1074, 7766), - new Point(3584, 1074, 7991), - new Point(3584, 892, 7991), - new Point(3584, 892, 7766), + new Point(3615, 1073, 7991), + new Point(3615, 1073, 7768), + new Point(3859, 1073, 7768), + new Point(3859, 1073, 7991), ); $add( - new Point(3584, 1074, 7991), - new Point(3859, 1074, 7991), - new Point(3859, 892, 7991), - new Point(3584, 892, 7991), + new Point(3615, 1073, 7768), + new Point(3615, 1073, 7991), + new Point(3615, 892, 7991), + new Point(3615, 892, 7768), ); $add( - new Point(3859, 1074, 7991), - new Point(3859, 1074, 7766), - new Point(3859, 892, 7766), + new Point(3859, 1073, 7991), + new Point(3859, 1073, 7768), + new Point(3859, 892, 7768), new Point(3859, 892, 7991), ); $add( - new Point(3859, 1074, 7766), - new Point(3584, 1074, 7766), - new Point(3584, 892, 7766), - new Point(3859, 892, 7766), + new Point(3859, 1073, 7768), + new Point(3615, 1073, 7768), + new Point(3615, 892, 7768), + new Point(3859, 892, 7768), ); // prop.059 $add( - new Point(3851, 1123, 7991), - new Point(3851, 1123, 7766), - new Point(4055, 1123, 7766), - new Point(4055, 1123, 7991), + new Point(3843, 1121, 7991), + new Point(3843, 1121, 7771), + new Point(4055, 1121, 7771), + new Point(4055, 1121, 7991), ); $add( - new Point(3851, 1123, 7766), - new Point(3851, 1123, 7991), - new Point(3851, 940, 7991), - new Point(3851, 940, 7766), + new Point(3843, 1121, 7771), + new Point(3843, 1121, 7991), + new Point(3843, 940, 7991), + new Point(3843, 940, 7771), ); $add( - new Point(3851, 1123, 7991), - new Point(4055, 1123, 7991), + new Point(3843, 1121, 7991), + new Point(4055, 1121, 7991), new Point(4055, 940, 7991), - new Point(3851, 940, 7991), + new Point(3843, 940, 7991), ); $add( - new Point(4055, 1123, 7991), - new Point(4055, 1123, 7766), - new Point(4055, 940, 7766), + new Point(4055, 1121, 7991), + new Point(4055, 1121, 7771), + new Point(4055, 940, 7771), new Point(4055, 940, 7991), ); $add( - new Point(4055, 1123, 7766), - new Point(3851, 1123, 7766), - new Point(3851, 940, 7766), - new Point(4055, 940, 7766), + new Point(4055, 1121, 7771), + new Point(3843, 1121, 7771), + new Point(3843, 940, 7771), + new Point(4055, 940, 7771), ); // prop.060 $add( - new Point(4073, 1082, 7807), - new Point(4073, 1082, 7726), - new Point(4159, 1082, 7726), - new Point(4159, 1082, 7807), + new Point(4073, 1084, 7807), + new Point(4073, 1084, 7726), + new Point(4159, 1084, 7726), + new Point(4159, 1084, 7807), ); $add( - new Point(4073, 1082, 7726), - new Point(4073, 1082, 7807), + new Point(4073, 1084, 7726), + new Point(4073, 1084, 7807), new Point(4073, 946, 7807), new Point(4073, 946, 7726), ); $add( - new Point(4073, 1082, 7807), - new Point(4159, 1082, 7807), + new Point(4073, 1084, 7807), + new Point(4159, 1084, 7807), new Point(4159, 946, 7807), new Point(4073, 946, 7807), ); $add( - new Point(4159, 1082, 7807), - new Point(4159, 1082, 7726), + new Point(4159, 1084, 7807), + new Point(4159, 1084, 7726), new Point(4159, 946, 7726), new Point(4159, 946, 7807), ); $add( - new Point(4159, 1082, 7726), - new Point(4073, 1082, 7726), + new Point(4159, 1084, 7726), + new Point(4073, 1084, 7726), new Point(4073, 946, 7726), new Point(4159, 946, 7726), ); // prop.061 $add( - new Point(2326, 1036, 8038), - new Point(2326, 1036, 7956), - new Point(2412, 1036, 7956), - new Point(2412, 1036, 8038), + new Point(2326, 1035, 8038), + new Point(2326, 1035, 7956), + new Point(2412, 1035, 7956), + new Point(2412, 1035, 8038), ); $add( - new Point(2326, 1036, 7956), - new Point(2326, 1036, 8038), + new Point(2326, 1035, 7956), + new Point(2326, 1035, 8038), new Point(2326, 899, 8038), new Point(2326, 899, 7956), ); $add( - new Point(2326, 1036, 8038), - new Point(2412, 1036, 8038), + new Point(2326, 1035, 8038), + new Point(2412, 1035, 8038), new Point(2412, 899, 8038), new Point(2326, 899, 8038), ); $add( - new Point(2412, 1036, 8038), - new Point(2412, 1036, 7956), + new Point(2412, 1035, 8038), + new Point(2412, 1035, 7956), new Point(2412, 899, 7956), new Point(2412, 899, 8038), ); $add( - new Point(2412, 1036, 7956), - new Point(2326, 1036, 7956), + new Point(2412, 1035, 7956), + new Point(2326, 1035, 7956), new Point(2326, 899, 7956), new Point(2412, 899, 7956), ); @@ -5511,98 +5637,98 @@ public function __construct() // prop.063 $add( - new Point(3171, 1095, 3690), - new Point(3171, 1095, 4353), - new Point(3473, 1095, 4353), - new Point(3473, 1095, 3690), + new Point(3171, 1091, 3690), + new Point(3171, 1091, 4353), + new Point(3473, 1091, 4353), + new Point(3473, 1091, 3690), ); $add( - new Point(3171, 1095, 4353), - new Point(3171, 1095, 3690), - new Point(3171, 830, 3690), - new Point(3171, 830, 4353), + new Point(3171, 1091, 4353), + new Point(3171, 1091, 3690), + new Point(3171, 804, 3690), + new Point(3171, 804, 4353), ); $add( - new Point(3171, 1095, 3690), - new Point(3473, 1095, 3690), - new Point(3473, 830, 3690), - new Point(3171, 830, 3690), + new Point(3171, 1091, 3690), + new Point(3473, 1091, 3690), + new Point(3473, 804, 3690), + new Point(3171, 804, 3690), ); $add( - new Point(3473, 1095, 3690), - new Point(3473, 1095, 4353), - new Point(3473, 830, 4353), - new Point(3473, 830, 3690), + new Point(3473, 1091, 3690), + new Point(3473, 1091, 4353), + new Point(3473, 804, 4353), + new Point(3473, 804, 3690), ); $add( - new Point(3473, 1095, 4353), - new Point(3171, 1095, 4353), - new Point(3171, 830, 4353), - new Point(3473, 830, 4353), + new Point(3473, 1091, 4353), + new Point(3171, 1091, 4353), + new Point(3171, 804, 4353), + new Point(3473, 804, 4353), ); // prop.064 $add( - new Point(2373, 1370, 3225), - new Point(2373, 1370, 3705), - new Point(2603, 1370, 3705), - new Point(2603, 1370, 3225), + new Point(2373, 1367, 3225), + new Point(2373, 1367, 3705), + new Point(2603, 1367, 3705), + new Point(2603, 1367, 3225), ); $add( - new Point(2373, 1370, 3705), - new Point(2373, 1370, 3225), + new Point(2373, 1367, 3705), + new Point(2373, 1367, 3225), new Point(2373, 1203, 3225), new Point(2373, 1203, 3705), ); $add( - new Point(2373, 1370, 3225), - new Point(2603, 1370, 3225), + new Point(2373, 1367, 3225), + new Point(2603, 1367, 3225), new Point(2603, 1203, 3225), new Point(2373, 1203, 3225), ); $add( - new Point(2603, 1370, 3225), - new Point(2603, 1370, 3705), + new Point(2603, 1367, 3225), + new Point(2603, 1367, 3705), new Point(2603, 1203, 3705), new Point(2603, 1203, 3225), ); $add( - new Point(2603, 1370, 3705), - new Point(2373, 1370, 3705), + new Point(2603, 1367, 3705), + new Point(2373, 1367, 3705), new Point(2373, 1203, 3705), new Point(2603, 1203, 3705), ); // prop.065 $add( - new Point(2597, 1370, 3455), - new Point(2597, 1370, 3702), - new Point(2856, 1370, 3702), - new Point(2856, 1370, 3455), + new Point(2597, 1367, 3455), + new Point(2597, 1367, 3687), + new Point(2856, 1367, 3687), + new Point(2856, 1367, 3455), ); $add( - new Point(2597, 1370, 3702), - new Point(2597, 1370, 3455), + new Point(2597, 1367, 3687), + new Point(2597, 1367, 3455), new Point(2597, 1203, 3455), - new Point(2597, 1203, 3702), + new Point(2597, 1203, 3687), ); $add( - new Point(2597, 1370, 3455), - new Point(2856, 1370, 3455), + new Point(2597, 1367, 3455), + new Point(2856, 1367, 3455), new Point(2856, 1203, 3455), new Point(2597, 1203, 3455), ); $add( - new Point(2856, 1370, 3455), - new Point(2856, 1370, 3702), - new Point(2856, 1203, 3702), + new Point(2856, 1367, 3455), + new Point(2856, 1367, 3687), + new Point(2856, 1203, 3687), new Point(2856, 1203, 3455), ); $add( - new Point(2856, 1370, 3702), - new Point(2597, 1370, 3702), - new Point(2597, 1203, 3702), - new Point(2856, 1203, 3702), + new Point(2856, 1367, 3687), + new Point(2597, 1367, 3687), + new Point(2597, 1203, 3687), + new Point(2856, 1203, 3687), ); // prop.066 @@ -5639,98 +5765,74 @@ public function __construct() // prop.067 $add( - new Point(6156, 997, 3566), - new Point(6156, 997, 3952), - new Point(6348, 997, 3952), - new Point(6348, 997, 3566), + new Point(6156, 995, 3567), + new Point(6156, 995, 3951), + new Point(6346, 995, 3951), + new Point(6346, 995, 3567), ); $add( - new Point(6156, 997, 3952), - new Point(6156, 997, 3566), - new Point(6156, 816, 3566), - new Point(6156, 816, 3952), + new Point(6156, 995, 3567), + new Point(6346, 995, 3567), + new Point(6346, 816, 3567), + new Point(6156, 816, 3567), ); $add( - new Point(6156, 997, 3566), - new Point(6348, 997, 3566), - new Point(6348, 816, 3566), - new Point(6156, 816, 3566), + new Point(6346, 995, 3567), + new Point(6346, 995, 3951), + new Point(6346, 816, 3951), + new Point(6346, 816, 3567), ); $add( - new Point(6348, 997, 3566), - new Point(6348, 997, 3952), - new Point(6348, 816, 3952), - new Point(6348, 816, 3566), - ); - $add( - new Point(6348, 997, 3952), - new Point(6156, 997, 3952), - new Point(6156, 816, 3952), - new Point(6348, 816, 3952), + new Point(6346, 995, 3951), + new Point(6156, 995, 3951), + new Point(6156, 816, 3951), + new Point(6346, 816, 3951), ); // prop.068 $add( - new Point(6156, 1189, 3711), - new Point(6156, 1189, 3904), - new Point(6348, 1189, 3904), - new Point(6348, 1189, 3711), + new Point(6156, 1187, 3711), + new Point(6156, 1187, 3903), + new Point(6346, 1187, 3903), + new Point(6346, 1187, 3711), ); $add( - new Point(6156, 1189, 3904), - new Point(6156, 1189, 3711), + new Point(6156, 1187, 3711), + new Point(6346, 1187, 3711), + new Point(6346, 979, 3711), new Point(6156, 979, 3711), - new Point(6156, 979, 3904), ); $add( - new Point(6156, 1189, 3711), - new Point(6348, 1189, 3711), - new Point(6348, 979, 3711), - new Point(6156, 979, 3711), + new Point(6346, 1187, 3711), + new Point(6346, 1187, 3903), + new Point(6346, 979, 3903), + new Point(6346, 979, 3711), ); $add( - new Point(6348, 1189, 3711), - new Point(6348, 1189, 3904), - new Point(6348, 979, 3904), - new Point(6348, 979, 3711), - ); - $add( - new Point(6348, 1189, 3904), - new Point(6156, 1189, 3904), - new Point(6156, 979, 3904), - new Point(6348, 979, 3904), + new Point(6346, 1187, 3903), + new Point(6156, 1187, 3903), + new Point(6156, 979, 3903), + new Point(6346, 979, 3903), ); // prop.069 $add( - new Point(8909, 1093, 8189), - new Point(8909, 1093, 8468), - new Point(9194, 1093, 8468), - new Point(9194, 1093, 8189), - ); - $add( - new Point(8909, 1093, 8468), - new Point(8909, 1093, 8189), - new Point(8909, 789, 8189), - new Point(8909, 789, 8468), + new Point(8913, 1091, 8167), + new Point(8913, 1091, 8461), + new Point(9194, 1091, 8461), + new Point(9194, 1091, 8167), ); $add( - new Point(8909, 1093, 8189), - new Point(9194, 1093, 8189), - new Point(9194, 789, 8189), - new Point(8909, 789, 8189), + new Point(8913, 1091, 8461), + new Point(8913, 1091, 8167), + new Point(8913, 789, 8167), + new Point(8913, 789, 8461), ); $add( - new Point(9194, 1093, 8189), - new Point(9194, 1093, 8468), - new Point(9194, 789, 8468), - new Point(9194, 789, 8189), - ); - $add( - new Point(9194, 1093, 8468), - new Point(8909, 1093, 8468), - new Point(8909, 789, 8468), - new Point(9194, 789, 8468), + new Point(9194, 1091, 8461), + new Point(8913, 1091, 8461), + new Point(8913, 789, 8461), + new Point(9194, 789, 8461), ); // prop.070 @@ -5767,135 +5869,117 @@ public function __construct() // prop.071 $add( - new Point(11719, 1029, 11409), - new Point(11719, 1029, 11207), - new Point(11719, 833, 11207), - new Point(11719, 833, 11409), + new Point(11720, 1029, 11409), + new Point(11720, 1029, 11207), + new Point(11720, 833, 11207), + new Point(11720, 833, 11409), ); $add( - new Point(11719, 1029, 11207), + new Point(11720, 1029, 11207), new Point(11508, 1029, 11207), new Point(11508, 833, 11207), - new Point(11719, 833, 11207), + new Point(11720, 833, 11207), ); $add( new Point(11508, 1029, 11409), - new Point(11719, 1029, 11409), - new Point(11719, 833, 11409), + new Point(11720, 1029, 11409), + new Point(11720, 833, 11409), new Point(11508, 833, 11409), ); $add( - new Point(11719, 1029, 11207), - new Point(11719, 1029, 11409), + new Point(11720, 1029, 11207), + new Point(11720, 1029, 11409), new Point(11508, 1029, 11409), new Point(11508, 1029, 11207), ); $add( - new Point(11719, 1029, 11409), + new Point(11720, 1029, 11409), new Point(11508, 1029, 11409), - new Point(11508, 1080, 11409), - new Point(11719, 1080, 11409), + new Point(11508, 1084, 11409), + new Point(11719, 1084, 11409), ); $add( - new Point(11719, 1080, 11409), - new Point(11508, 1080, 11409), - new Point(11508, 1024, 11217), - new Point(11719, 1024, 11217), + new Point(11719, 1084, 11409), + new Point(11508, 1084, 11409), + new Point(11508, 1033, 11217), + new Point(11719, 1033, 11217), ); // prop.072 $add( - new Point(8082, 1003, 3637), - new Point(8082, 1003, 4126), - new Point(8341, 1003, 4126), - new Point(8341, 1003, 3637), + new Point(8069, 995, 3637), + new Point(8069, 995, 4126), + new Point(8341, 995, 4126), + new Point(8341, 995, 3637), ); $add( - new Point(8082, 1003, 4126), - new Point(8082, 1003, 3637), - new Point(8082, 836, 3637), - new Point(8082, 836, 4126), - ); - $add( - new Point(8082, 1003, 3637), - new Point(8341, 1003, 3637), + new Point(8069, 995, 3637), + new Point(8341, 995, 3637), new Point(8341, 836, 3637), - new Point(8082, 836, 3637), + new Point(8069, 836, 3637), ); $add( - new Point(8341, 1003, 3637), - new Point(8341, 1003, 4126), + new Point(8341, 995, 3637), + new Point(8341, 995, 4126), new Point(8341, 836, 4126), new Point(8341, 836, 3637), ); $add( - new Point(8341, 1003, 4126), - new Point(8082, 1003, 4126), - new Point(8082, 836, 4126), + new Point(8341, 995, 4126), + new Point(8069, 995, 4126), + new Point(8069, 836, 4126), new Point(8341, 836, 4126), ); // prop.073 $add( - new Point(8082, 1202, 3877), - new Point(8082, 1202, 4111), - new Point(8326, 1202, 4111), - new Point(8326, 1202, 3877), + new Point(8066, 1199, 3877), + new Point(8066, 1199, 4126), + new Point(8326, 1199, 4126), + new Point(8326, 1199, 3877), ); $add( - new Point(8082, 1202, 4111), - new Point(8082, 1202, 3877), - new Point(8082, 988, 3877), - new Point(8082, 988, 4111), - ); - $add( - new Point(8082, 1202, 3877), - new Point(8326, 1202, 3877), + new Point(8066, 1199, 3877), + new Point(8326, 1199, 3877), new Point(8326, 988, 3877), - new Point(8082, 988, 3877), + new Point(8066, 988, 3877), ); $add( - new Point(8326, 1202, 3877), - new Point(8326, 1202, 4111), - new Point(8326, 988, 4111), + new Point(8326, 1199, 3877), + new Point(8326, 1199, 4126), + new Point(8326, 988, 4126), new Point(8326, 988, 3877), ); $add( - new Point(8326, 1202, 4111), - new Point(8082, 1202, 4111), - new Point(8082, 988, 4111), - new Point(8326, 988, 4111), + new Point(8326, 1199, 4126), + new Point(8066, 1199, 4126), + new Point(8066, 988, 4126), + new Point(8326, 988, 4126), ); // prop.074 $add( - new Point(8077, 929, 3072), - new Point(8077, 929, 3649), - new Point(8336, 929, 3649), - new Point(8336, 929, 3072), - ); - $add( - new Point(8077, 929, 3649), - new Point(8077, 929, 3072), - new Point(8077, 829, 3072), - new Point(8077, 829, 3649), + new Point(8067, 932, 3076), + new Point(8067, 932, 3649), + new Point(8336, 932, 3649), + new Point(8336, 932, 3076), ); $add( - new Point(8077, 929, 3072), - new Point(8336, 929, 3072), - new Point(8336, 829, 3072), - new Point(8077, 829, 3072), + new Point(8067, 932, 3076), + new Point(8336, 932, 3076), + new Point(8336, 829, 3076), + new Point(8067, 829, 3076), ); $add( - new Point(8336, 929, 3072), - new Point(8336, 929, 3649), + new Point(8336, 932, 3076), + new Point(8336, 932, 3649), new Point(8336, 829, 3649), - new Point(8336, 829, 3072), + new Point(8336, 829, 3076), ); $add( - new Point(8336, 929, 3649), - new Point(8077, 929, 3649), - new Point(8077, 829, 3649), + new Point(8336, 932, 3649), + new Point(8067, 932, 3649), + new Point(8067, 829, 3649), new Point(8336, 829, 3649), ); @@ -5903,172 +5987,160 @@ public function __construct() $add( new Point(8074, 999, 3229), new Point(8074, 999, 3410), - new Point(8337, 999, 3410), - new Point(8337, 999, 3229), - ); - $add( - new Point(8074, 999, 3410), - new Point(8074, 999, 3229), - new Point(8074, 820, 3229), - new Point(8074, 820, 3410), + new Point(8336, 999, 3410), + new Point(8336, 999, 3229), ); $add( new Point(8074, 999, 3229), - new Point(8337, 999, 3229), - new Point(8337, 820, 3229), + new Point(8336, 999, 3229), + new Point(8336, 820, 3229), new Point(8074, 820, 3229), ); $add( - new Point(8337, 999, 3229), - new Point(8337, 999, 3410), - new Point(8337, 820, 3410), - new Point(8337, 820, 3229), + new Point(8336, 999, 3229), + new Point(8336, 999, 3410), + new Point(8336, 820, 3410), + new Point(8336, 820, 3229), ); $add( - new Point(8337, 999, 3410), + new Point(8336, 999, 3410), new Point(8074, 999, 3410), new Point(8074, 820, 3410), - new Point(8337, 820, 3410), + new Point(8336, 820, 3410), ); // prop.076 $add( - new Point(9757, 932, 3785), - new Point(9633, 932, 4232), - new Point(9633, 833, 4232), - new Point(9757, 833, 3785), + new Point(9762, 935, 3800), + new Point(9643, 935, 4229), + new Point(9643, 813, 4229), + new Point(9762, 813, 3800), ); $add( - new Point(9633, 932, 4232), - new Point(9855, 932, 4292), - new Point(9855, 833, 4292), - new Point(9633, 833, 4232), + new Point(9643, 935, 4229), + new Point(9851, 935, 4281), + new Point(9851, 813, 4281), + new Point(9643, 813, 4229), ); $add( - new Point(9855, 932, 4292), - new Point(9964, 932, 3839), - new Point(9964, 833, 3839), - new Point(9855, 833, 4292), + new Point(9851, 935, 4281), + new Point(9956, 935, 3850), + new Point(9956, 813, 3850), + new Point(9851, 813, 4281), ); $add( - new Point(9964, 932, 3839), - new Point(9757, 932, 3785), - new Point(9757, 833, 3785), - new Point(9964, 833, 3839), + new Point(9956, 935, 3850), + new Point(9762, 935, 3800), + new Point(9762, 813, 3800), + new Point(9956, 813, 3850), ); - - // prop.077 $add( - new Point(7580, 709, 11052), - new Point(7786, 709, 11258), - new Point(7786, 435, 11258), - new Point(7580, 435, 11052), + new Point(9708, 935, 4238), + new Point(9708, 935, 4123), + new Point(9830, 935, 4123), + new Point(9830, 935, 4238), ); $add( - new Point(7786, 709, 11258), - new Point(7994, 709, 11052), - new Point(7994, 435, 11052), - new Point(7786, 435, 11258), + new Point(9736, 981, 4085), + new Point(9913, 981, 4085), + new Point(9913, 981, 3887), + new Point(9736, 981, 3887), ); $add( - new Point(7994, 709, 11052), - new Point(7785, 709, 10845), - new Point(7785, 435, 10845), - new Point(7994, 435, 11052), + new Point(9736, 981, 3887), + new Point(9913, 981, 3887), + new Point(9913, 893, 3887), + new Point(9736, 893, 3887), ); $add( - new Point(7785, 709, 10845), - new Point(7580, 709, 11052), - new Point(7580, 435, 11052), - new Point(7785, 435, 10845), + new Point(9736, 981, 4085), + new Point(9736, 981, 3887), + new Point(9736, 893, 3887), + new Point(9736, 893, 4085), ); - - // prop.078 $add( - new Point(9708, 935, 4238), - new Point(9708, 935, 4123), - new Point(9830, 935, 4123), - new Point(9830, 935, 4238), + new Point(9913, 981, 4085), + new Point(9736, 981, 4085), + new Point(9736, 893, 4085), + new Point(9913, 893, 4085), ); - - // prop.079 $add( - new Point(9729, 988, 4085), - new Point(9940, 988, 4085), - new Point(9940, 988, 3887), - new Point(9729, 988, 3887), + new Point(9913, 981, 3887), + new Point(9913, 981, 4085), + new Point(9913, 893, 4085), + new Point(9913, 893, 3887), ); + + // prop.077 $add( - new Point(9729, 988, 3887), - new Point(9940, 988, 3887), - new Point(9940, 893, 3887), - new Point(9729, 893, 3887), + new Point(7580, 708, 11054), + new Point(7784, 708, 11258), + new Point(7784, 411, 11258), + new Point(7580, 411, 11054), ); $add( - new Point(9729, 988, 4085), - new Point(9729, 988, 3887), - new Point(9729, 893, 3887), - new Point(9729, 893, 4085), + new Point(7784, 708, 11258), + new Point(7989, 708, 11052), + new Point(7989, 411, 11052), + new Point(7784, 411, 11258), ); $add( - new Point(9940, 988, 4085), - new Point(9729, 988, 4085), - new Point(9729, 893, 4085), - new Point(9940, 893, 4085), + new Point(7989, 708, 11052), + new Point(7786, 708, 10848), + new Point(7786, 411, 10848), + new Point(7989, 411, 11052), ); $add( - new Point(9940, 988, 3887), - new Point(9940, 988, 4085), - new Point(9940, 893, 4085), - new Point(9940, 893, 3887), + new Point(7786, 708, 10848), + new Point(7580, 708, 11054), + new Point(7580, 411, 11054), + new Point(7786, 411, 10848), ); - - // prop.080 $add( - new Point(7671, 710, 11159), - new Point(7671, 710, 10962), - new Point(7882, 710, 10962), - new Point(7882, 710, 11159), + new Point(7671, 708, 11159), + new Point(7671, 708, 10962), + new Point(7882, 708, 10962), + new Point(7882, 708, 11159), ); // stairs $add( - new Point(12605, 1012, 7153), - new Point(12838, 1012, 7153), - new Point(12805, 1047, 7218), - new Point(12637, 1047, 7218), + new Point(12605, 995, 7153), + new Point(12838, 995, 7153), + new Point(12805, 1043, 7218), + new Point(12637, 1043, 7218), ); // stairs.001 $add( - new Point(12922, 1012, 5489), - new Point(12922, 1012, 5257), - new Point(12963, 1029, 5289), - new Point(12963, 1029, 5457), + new Point(12922, 992, 5495), + new Point(12922, 992, 5262), + new Point(12963, 1040, 5295), + new Point(12963, 1040, 5463), ); // stairs.002 $add( - new Point(12557, 1019, 6642), - new Point(12557, 1019, 7038), - new Point(12397, 837, 7112), - new Point(12397, 837, 6569), + new Point(12583, 995, 6633), + new Point(12583, 995, 7029), + new Point(12397, 797, 7082), + new Point(12397, 797, 6580), ); // stairs.003 $add( - new Point(2138, 909, 11441), - new Point(1740, 909, 11441), - new Point(1685, 807, 11312), - new Point(2193, 807, 11312), + new Point(2138, 899, 11461), + new Point(1740, 899, 11461), + new Point(1685, 806, 11312), + new Point(2193, 806, 11312), ); // stairs.005 $add( - new Point(3044, 902, 5763), - new Point(2355, 902, 5763), - new Point(2319, 811, 5667), - new Point(3081, 811, 5667), + new Point(3065, 899, 5774), + new Point(2334, 899, 5774), + new Point(2308, 803, 5667), + new Point(3091, 803, 5667), ); } @@ -6077,86 +6149,86 @@ public function __construct() // spawn to long doors walls $add( - new Point(9989, 1603, 3003), - new Point(8838, 1603, 3003), - new Point(8838, 769, 3003), - new Point(9989, 769, 3003), + new Point(9992, 1603, 2992), + new Point(8841, 1603, 2992), + new Point(8841, 769, 2992), + new Point(9992, 769, 2992), ); $add( - new Point(9989, 1603, 3003), - new Point(9989, 769, 3003), - new Point(9989, 769, 4909), - new Point(9989, 1603, 4909), + new Point(9992, 1603, 2992), + new Point(9992, 769, 2992), + new Point(9992, 769, 4911), + new Point(9992, 1603, 4911), ); $add( - new Point(9989, 1603, 4909), - new Point(9989, 769, 4909), - new Point(9843, 769, 4909), - new Point(9843, 1603, 4909), + new Point(9992, 1603, 4911), + new Point(9992, 769, 4911), + new Point(9897, 769, 4911), + new Point(9897, 1603, 4911), ); $add( - new Point(8838, 769, 3003), - new Point(8838, 1603, 3003), - new Point(8838, 1603, 1473), - new Point(8838, 769, 1473), + new Point(8841, 769, 2992), + new Point(8841, 1603, 2992), + new Point(8841, 1603, 1457), + new Point(8841, 769, 1457), ); $add( - new Point(8838, 769, 1473), - new Point(8838, 1603, 1473), - new Point(7485, 1603, 1473), - new Point(7485, 769, 1473), + new Point(8841, 769, 1457), + new Point(8841, 1603, 1457), + new Point(7498, 1603, 1457), + new Point(7498, 769, 1457), ); $add( - new Point(7485, 769, 1473), - new Point(7485, 1603, 1473), - new Point(7293, 1603, 1259), - new Point(7293, 769, 1259), + new Point(7498, 769, 1457), + new Point(7498, 1603, 1457), + new Point(7306, 1603, 1265), + new Point(7306, 769, 1265), ); $add( - new Point(7293, 769, 1259), - new Point(7293, 1603, 1259), - new Point(7293, 1603, 1075), - new Point(7293, 769, 1075), + new Point(7306, 769, 1265), + new Point(7306, 1603, 1265), + new Point(7306, 1603, 1075), + new Point(7306, 769, 1075), ); $add( - new Point(9989, 769, 4909), - new Point(9989, 1603, 4909), - new Point(9989, 1603, 6023), - new Point(9989, 769, 6023), + new Point(9897, 1603, 4911), + new Point(9897, 769, 4911), + new Point(9897, 769, 5006), + new Point(9897, 1603, 5006), ); $add( - new Point(9843, 1603, 4909), - new Point(9843, 769, 4909), - new Point(9843, 769, 5006), - new Point(9843, 1603, 5006), - ); - $add( - new Point(9843, 1603, 5006), - new Point(9843, 769, 5006), + new Point(9897, 1603, 5006), + new Point(9897, 769, 5006), new Point(10002, 769, 5006), new Point(10002, 1603, 5006), ); + $add( + new Point(9992, 769, 4911), + new Point(9992, 1603, 4911), + new Point(9989, 1603, 6023), + new Point(9989, 769, 6023), + ); // spawn wall $add( - new Point(7351, 1975, 1108), - new Point(1812, 1975, 1108), - new Point(1812, 911, 1108), - new Point(7351, 911, 1108), + new Point(7351, 1975, 1097), + new Point(1812, 1975, 1097), + new Point(1812, 911, 1097), + new Point(7351, 911, 1097), ); // t awp stairs $add( - new Point(7270, 987, 2320), - new Point(7341, 987, 2320), - new Point(7341, 987, 2225), - new Point(7270, 987, 2225), + new Point(7270, 996, 2320), + new Point(7341, 996, 2320), + new Point(7341, 996, 2224), + new Point(7270, 996, 2224), ); $add( new Point(7411, 952, 2320), new Point(7482, 952, 2320), - new Point(7482, 952, 2225), - new Point(7411, 952, 2225), + new Point(7482, 952, 2224), + new Point(7411, 952, 2224), ); $add( new Point(7482, 812, 2320), @@ -6165,21 +6237,21 @@ public function __construct() new Point(7411, 812, 2320), ); $add( - new Point(7693, 812, 2320), - new Point(7693, 901, 2320), + new Point(7690, 812, 2320), + new Point(7690, 901, 2320), new Point(7622, 901, 2320), new Point(7622, 812, 2320), ); $add( - new Point(6355, 1238, 2225), + new Point(6355, 1238, 2224), new Point(6355, 1238, 2320), new Point(6355, 1190, 2320), - new Point(6355, 1190, 2225), + new Point(6355, 1190, 2224), ); $add( new Point(7270, 812, 2320), - new Point(7270, 1005, 2320), - new Point(7200, 1005, 2320), + new Point(7270, 1009, 2320), + new Point(7200, 1009, 2320), new Point(7200, 812, 2320), ); $add( @@ -6221,44 +6293,44 @@ public function __construct() $add( new Point(7482, 938, 2320), new Point(7552, 938, 2320), - new Point(7552, 938, 2225), - new Point(7482, 938, 2225), + new Point(7552, 938, 2224), + new Point(7482, 938, 2224), ); $add( new Point(7059, 1051, 2320), new Point(7129, 1051, 2320), - new Point(7129, 1051, 2225), - new Point(7059, 1051, 2225), + new Point(7129, 1051, 2224), + new Point(7059, 1051, 2224), ); $add( new Point(7622, 901, 2320), - new Point(7693, 901, 2320), - new Point(7693, 901, 2225), - new Point(7622, 901, 2225), + new Point(7690, 901, 2320), + new Point(7690, 901, 2224), + new Point(7622, 901, 2224), ); $add( - new Point(6918, 1089, 2320), - new Point(6989, 1089, 2320), - new Point(6989, 1089, 2225), - new Point(6918, 1089, 2225), + new Point(6918, 1088, 2320), + new Point(6989, 1088, 2320), + new Point(6989, 1088, 2224), + new Point(6918, 1088, 2224), ); $add( - new Point(7341, 969, 2320), - new Point(7411, 969, 2320), - new Point(7411, 969, 2225), - new Point(7341, 969, 2225), + new Point(7341, 973, 2320), + new Point(7411, 973, 2320), + new Point(7411, 973, 2224), + new Point(7341, 973, 2224), ); $add( new Point(6989, 812, 2320), - new Point(6989, 1089, 2320), - new Point(6918, 1089, 2320), + new Point(6989, 1088, 2320), + new Point(6918, 1088, 2320), new Point(6918, 812, 2320), ); $add( new Point(7552, 921, 2320), new Point(7622, 921, 2320), - new Point(7622, 921, 2225), - new Point(7552, 921, 2225), + new Point(7622, 921, 2224), + new Point(7552, 921, 2224), ); $add( new Point(6707, 812, 2320), @@ -6269,164 +6341,164 @@ public function __construct() $add( new Point(6214, 1256, 2320), new Point(6284, 1256, 2320), - new Point(6284, 1256, 2225), - new Point(6214, 1256, 2225), + new Point(6284, 1256, 2224), + new Point(6214, 1256, 2224), ); $add( - new Point(7200, 1005, 2320), - new Point(7270, 1005, 2320), - new Point(7270, 1005, 2225), - new Point(7200, 1005, 2225), + new Point(7200, 1009, 2320), + new Point(7270, 1009, 2320), + new Point(7270, 1009, 2224), + new Point(7200, 1009, 2224), ); $add( - new Point(7059, 1051, 2225), - new Point(7129, 1051, 2225), - new Point(7129, 896, 2225), - new Point(7059, 896, 2225), + new Point(7059, 1051, 2224), + new Point(7129, 1051, 2224), + new Point(7129, 896, 2224), + new Point(7059, 896, 2224), ); $add( - new Point(7341, 969, 2225), - new Point(7411, 969, 2225), - new Point(7411, 824, 2225), - new Point(7341, 824, 2225), + new Point(7341, 973, 2224), + new Point(7411, 973, 2224), + new Point(7411, 824, 2224), + new Point(7341, 824, 2224), ); $add( - new Point(6707, 1153, 2225), + new Point(6707, 1153, 2224), new Point(6707, 1153, 2320), new Point(6707, 1066, 2320), - new Point(6707, 1066, 2225), + new Point(6707, 1066, 2224), ); $add( - new Point(7482, 938, 2225), - new Point(7552, 938, 2225), - new Point(7552, 783, 2225), - new Point(7482, 783, 2225), + new Point(7482, 938, 2224), + new Point(7552, 938, 2224), + new Point(7552, 783, 2224), + new Point(7482, 783, 2224), ); $add( - new Point(6214, 1256, 2225), - new Point(6284, 1256, 2225), - new Point(6284, 1113, 2225), - new Point(6214, 1113, 2225), + new Point(6214, 1256, 2224), + new Point(6284, 1256, 2224), + new Point(6284, 1113, 2224), + new Point(6214, 1113, 2224), ); $add( - new Point(7200, 1005, 2225), - new Point(7270, 1005, 2225), - new Point(7270, 864, 2225), - new Point(7200, 864, 2225), + new Point(7200, 1009, 2224), + new Point(7270, 1009, 2224), + new Point(7270, 864, 2224), + new Point(7200, 864, 2224), ); $add( - new Point(7552, 921, 2225), - new Point(7622, 921, 2225), - new Point(7622, 766, 2225), - new Point(7552, 766, 2225), + new Point(7552, 921, 2224), + new Point(7622, 921, 2224), + new Point(7622, 766, 2224), + new Point(7552, 766, 2224), ); $add( - new Point(7411, 952, 2225), - new Point(7482, 952, 2225), - new Point(7482, 797, 2225), - new Point(7411, 797, 2225), + new Point(7411, 952, 2224), + new Point(7482, 952, 2224), + new Point(7482, 797, 2224), + new Point(7411, 797, 2224), ); $add( - new Point(6918, 1089, 2225), - new Point(6989, 1089, 2225), - new Point(6989, 934, 2225), - new Point(6918, 934, 2225), + new Point(6918, 1088, 2224), + new Point(6989, 1088, 2224), + new Point(6989, 934, 2224), + new Point(6918, 934, 2224), ); $add( - new Point(7622, 901, 2225), - new Point(7693, 901, 2225), - new Point(7693, 746, 2225), - new Point(7622, 746, 2225), + new Point(7622, 901, 2224), + new Point(7690, 901, 2224), + new Point(7690, 746, 2224), + new Point(7622, 746, 2224), ); $add( - new Point(6989, 1089, 2225), - new Point(6989, 1089, 2320), + new Point(6989, 1088, 2224), + new Point(6989, 1088, 2320), new Point(6989, 988, 2320), - new Point(6989, 988, 2225), + new Point(6989, 988, 2224), ); $add( - new Point(6636, 1153, 2225), - new Point(6707, 1153, 2225), - new Point(6707, 1012, 2225), - new Point(6636, 1012, 2225), + new Point(6636, 1153, 2224), + new Point(6707, 1153, 2224), + new Point(6707, 1012, 2224), + new Point(6636, 1012, 2224), ); $add( - new Point(7129, 1051, 2225), + new Point(7129, 1051, 2224), new Point(7129, 1051, 2320), new Point(7129, 950, 2320), - new Point(7129, 950, 2225), + new Point(7129, 950, 2224), ); $add( - new Point(7411, 969, 2225), - new Point(7411, 969, 2320), + new Point(7411, 973, 2224), + new Point(7411, 973, 2320), new Point(7411, 878, 2320), - new Point(7411, 878, 2225), + new Point(7411, 878, 2224), ); $add( - new Point(7693, 901, 2225), - new Point(7693, 901, 2320), - new Point(7693, 800, 2320), - new Point(7693, 800, 2225), + new Point(7690, 901, 2224), + new Point(7690, 901, 2320), + new Point(7690, 800, 2320), + new Point(7690, 800, 2224), ); $add( - new Point(6848, 1123, 2225), + new Point(6848, 1123, 2224), new Point(6848, 1123, 2320), new Point(6848, 1022, 2320), - new Point(6848, 1022, 2225), + new Point(6848, 1022, 2224), ); $add( - new Point(6284, 1256, 2225), + new Point(6284, 1256, 2224), new Point(6284, 1256, 2320), new Point(6284, 1168, 2320), - new Point(6284, 1168, 2225), + new Point(6284, 1168, 2224), ); $add( - new Point(7482, 952, 2225), + new Point(7482, 952, 2224), new Point(7482, 952, 2320), new Point(7482, 851, 2320), - new Point(7482, 851, 2225), + new Point(7482, 851, 2224), ); $add( - new Point(7622, 921, 2225), + new Point(7622, 921, 2224), new Point(7622, 921, 2320), new Point(7622, 820, 2320), - new Point(7622, 820, 2225), + new Point(7622, 820, 2224), ); $add( - new Point(7270, 1005, 2225), - new Point(7270, 1005, 2320), + new Point(7270, 1009, 2224), + new Point(7270, 1009, 2320), new Point(7270, 918, 2320), - new Point(7270, 918, 2225), + new Point(7270, 918, 2224), ); $add( - new Point(7552, 938, 2225), + new Point(7552, 938, 2224), new Point(7552, 938, 2320), new Point(7552, 837, 2320), - new Point(7552, 837, 2225), + new Point(7552, 837, 2224), ); $add( - new Point(6707, 1141, 2225), - new Point(6777, 1141, 2225), - new Point(6777, 975, 2225), - new Point(6707, 975, 2225), + new Point(6707, 1141, 2224), + new Point(6777, 1141, 2224), + new Point(6777, 975, 2224), + new Point(6707, 975, 2224), ); $add( new Point(6707, 1141, 2320), new Point(6777, 1141, 2320), - new Point(6777, 1141, 2225), - new Point(6707, 1141, 2225), + new Point(6777, 1141, 2224), + new Point(6707, 1141, 2224), ); $add( new Point(6777, 1123, 2320), new Point(6848, 1123, 2320), - new Point(6848, 1123, 2225), - new Point(6777, 1123, 2225), + new Point(6848, 1123, 2224), + new Point(6777, 1123, 2224), ); $add( - new Point(6777, 1123, 2225), - new Point(6848, 1123, 2225), - new Point(6848, 975, 2225), - new Point(6777, 975, 2225), + new Point(6777, 1123, 2224), + new Point(6848, 1123, 2224), + new Point(6848, 975, 2224), + new Point(6777, 975, 2224), ); $add( new Point(6848, 812, 2320), @@ -6435,15 +6507,15 @@ public function __construct() new Point(6777, 812, 2320), ); $add( - new Point(7270, 987, 2225), - new Point(7341, 987, 2225), - new Point(7341, 862, 2225), - new Point(7270, 862, 2225), + new Point(7270, 996, 2224), + new Point(7341, 996, 2224), + new Point(7341, 862, 2224), + new Point(7270, 862, 2224), ); $add( new Point(7341, 812, 2320), - new Point(7341, 987, 2320), - new Point(7270, 987, 2320), + new Point(7341, 996, 2320), + new Point(7270, 996, 2320), new Point(7270, 812, 2320), ); $add( @@ -6453,46 +6525,46 @@ public function __construct() new Point(7059, 812, 2320), ); $add( - new Point(6566, 1167, 2225), - new Point(6636, 1167, 2225), - new Point(6636, 1012, 2225), - new Point(6566, 1012, 2225), + new Point(6566, 1167, 2224), + new Point(6636, 1167, 2224), + new Point(6636, 1012, 2224), + new Point(6566, 1012, 2224), ); $add( new Point(6566, 1167, 2320), new Point(6636, 1167, 2320), - new Point(6636, 1167, 2225), - new Point(6566, 1167, 2225), + new Point(6636, 1167, 2224), + new Point(6566, 1167, 2224), ); $add( - new Point(6425, 1203, 2225), - new Point(6495, 1203, 2225), - new Point(6495, 1048, 2225), - new Point(6425, 1048, 2225), + new Point(6425, 1203, 2224), + new Point(6495, 1203, 2224), + new Point(6495, 1048, 2224), + new Point(6425, 1048, 2224), ); $add( new Point(6425, 1203, 2320), new Point(6495, 1203, 2320), - new Point(6495, 1203, 2225), - new Point(6425, 1203, 2225), + new Point(6495, 1203, 2224), + new Point(6425, 1203, 2224), ); $add( new Point(6636, 1153, 2320), new Point(6707, 1153, 2320), - new Point(6707, 1153, 2225), - new Point(6636, 1153, 2225), + new Point(6707, 1153, 2224), + new Point(6636, 1153, 2224), ); $add( - new Point(6284, 1238, 2225), - new Point(6355, 1238, 2225), - new Point(6355, 1083, 2225), - new Point(6284, 1083, 2225), + new Point(6284, 1238, 2224), + new Point(6355, 1238, 2224), + new Point(6355, 1083, 2224), + new Point(6284, 1083, 2224), ); $add( new Point(6284, 1238, 2320), new Point(6355, 1238, 2320), - new Point(6355, 1238, 2225), - new Point(6284, 1238, 2225), + new Point(6355, 1238, 2224), + new Point(6284, 1238, 2224), ); $add( new Point(6284, 812, 2320), @@ -6507,16 +6579,16 @@ public function __construct() new Point(6144, 812, 2320), ); $add( - new Point(6144, 1269, 2225), - new Point(6214, 1269, 2225), - new Point(6214, 1113, 2225), - new Point(6144, 1113, 2225), + new Point(6144, 1269, 2224), + new Point(6214, 1269, 2224), + new Point(6214, 1113, 2224), + new Point(6144, 1113, 2224), ); $add( new Point(6144, 1269, 2320), new Point(6214, 1269, 2320), - new Point(6214, 1269, 2225), - new Point(6144, 1269, 2225), + new Point(6214, 1269, 2224), + new Point(6144, 1269, 2224), ); $add( new Point(6425, 812, 2320), @@ -6525,40 +6597,40 @@ public function __construct() new Point(6355, 812, 2320), ); $add( - new Point(6425, 1222, 2225), + new Point(6425, 1222, 2224), new Point(6425, 1222, 2320), new Point(6425, 1122, 2320), - new Point(6425, 1122, 2225), + new Point(6425, 1122, 2224), ); $add( - new Point(6355, 1222, 2225), - new Point(6425, 1222, 2225), - new Point(6425, 1083, 2225), - new Point(6355, 1083, 2225), + new Point(6355, 1222, 2224), + new Point(6425, 1222, 2224), + new Point(6425, 1083, 2224), + new Point(6355, 1083, 2224), ); $add( new Point(6355, 1222, 2320), new Point(6425, 1222, 2320), - new Point(6425, 1222, 2225), - new Point(6355, 1222, 2225), + new Point(6425, 1222, 2224), + new Point(6355, 1222, 2224), ); $add( new Point(6495, 1185, 2320), new Point(6566, 1185, 2320), - new Point(6566, 1185, 2225), - new Point(6495, 1185, 2225), + new Point(6566, 1185, 2224), + new Point(6495, 1185, 2224), ); $add( - new Point(6495, 1185, 2225), - new Point(6566, 1185, 2225), - new Point(6566, 1048, 2225), - new Point(6495, 1048, 2225), + new Point(6495, 1185, 2224), + new Point(6566, 1185, 2224), + new Point(6566, 1048, 2224), + new Point(6495, 1048, 2224), ); $add( - new Point(6566, 1185, 2225), + new Point(6566, 1185, 2224), new Point(6566, 1185, 2320), new Point(6566, 1102, 2320), - new Point(6566, 1102, 2225), + new Point(6566, 1102, 2224), ); $add( new Point(6566, 812, 2320), @@ -6575,14 +6647,14 @@ public function __construct() $add( new Point(6848, 1104, 2320), new Point(6918, 1104, 2320), - new Point(6918, 1104, 2225), - new Point(6848, 1104, 2225), + new Point(6918, 1104, 2224), + new Point(6848, 1104, 2224), ); $add( - new Point(6848, 1104, 2225), - new Point(6918, 1104, 2225), - new Point(6918, 934, 2225), - new Point(6848, 934, 2225), + new Point(6848, 1104, 2224), + new Point(6918, 1104, 2224), + new Point(6918, 934, 2224), + new Point(6848, 934, 2224), ); $add( new Point(7059, 812, 2320), @@ -6591,206 +6663,232 @@ public function __construct() new Point(6989, 812, 2320), ); $add( - new Point(6989, 1069, 2225), - new Point(7059, 1069, 2225), - new Point(7059, 896, 2225), - new Point(6989, 896, 2225), + new Point(6989, 1069, 2224), + new Point(7059, 1069, 2224), + new Point(7059, 896, 2224), + new Point(6989, 896, 2224), ); $add( new Point(6989, 1069, 2320), new Point(7059, 1069, 2320), - new Point(7059, 1069, 2225), - new Point(6989, 1069, 2225), + new Point(7059, 1069, 2224), + new Point(6989, 1069, 2224), ); $add( - new Point(6495, 1203, 2225), + new Point(6495, 1203, 2224), new Point(6495, 1203, 2320), new Point(6495, 1154, 2320), - new Point(6495, 1154, 2225), + new Point(6495, 1154, 2224), ); $add( - new Point(6636, 1167, 2225), + new Point(6636, 1167, 2224), new Point(6636, 1167, 2320), new Point(6636, 1118, 2320), - new Point(6636, 1118, 2225), + new Point(6636, 1118, 2224), ); $add( new Point(7411, 812, 2320), - new Point(7411, 969, 2320), - new Point(7341, 969, 2320), + new Point(7411, 973, 2320), + new Point(7341, 973, 2320), new Point(7341, 812, 2320), ); $add( new Point(7200, 812, 2320), - new Point(7200, 1025, 2320), - new Point(7129, 1025, 2320), + new Point(7200, 1028, 2320), + new Point(7129, 1028, 2320), new Point(7129, 812, 2320), ); $add( - new Point(7129, 1025, 2320), - new Point(7200, 1025, 2320), - new Point(7200, 1025, 2225), - new Point(7129, 1025, 2225), + new Point(7129, 1028, 2320), + new Point(7200, 1028, 2320), + new Point(7200, 1028, 2224), + new Point(7129, 1028, 2224), ); $add( - new Point(7129, 1025, 2225), - new Point(7200, 1025, 2225), - new Point(7200, 864, 2225), - new Point(7129, 864, 2225), + new Point(7129, 1028, 2224), + new Point(7200, 1028, 2224), + new Point(7200, 864, 2224), + new Point(7129, 864, 2224), ); $add( - new Point(7341, 987, 2225), - new Point(7341, 987, 2320), + new Point(7341, 996, 2224), + new Point(7341, 996, 2320), new Point(7341, 938, 2320), - new Point(7341, 938, 2225), + new Point(7341, 938, 2224), ); $add( - new Point(6918, 1104, 2225), + new Point(6918, 1104, 2224), new Point(6918, 1104, 2320), new Point(6918, 1058, 2320), - new Point(6918, 1058, 2225), + new Point(6918, 1058, 2224), ); $add( - new Point(6777, 1141, 2225), + new Point(6777, 1141, 2224), new Point(6777, 1141, 2320), new Point(6777, 1093, 2320), - new Point(6777, 1093, 2225), + new Point(6777, 1093, 2224), ); $add( - new Point(7059, 1069, 2225), + new Point(7059, 1069, 2224), new Point(7059, 1069, 2320), new Point(7059, 1020, 2320), - new Point(7059, 1020, 2225), + new Point(7059, 1020, 2224), ); $add( - new Point(7200, 1025, 2225), - new Point(7200, 1025, 2320), + new Point(7200, 1028, 2224), + new Point(7200, 1028, 2320), new Point(7200, 976, 2320), - new Point(7200, 976, 2225), + new Point(7200, 976, 2224), ); $add( - new Point(6214, 1269, 2225), + new Point(6214, 1269, 2224), new Point(6214, 1269, 2320), new Point(6214, 1220, 2320), - new Point(6214, 1220, 2225), + new Point(6214, 1220, 2224), + ); + + // t floor mud + $add( + new Point(6144, 1294, 1099), + new Point(1063, 1294, 1099), + new Point(1021, 1198, 1465), + new Point(6159, 1198, 1465), + ); + $add( + new Point(6154, 1198, 1465), + new Point(7615, 838, 1627), + new Point(7306, 1038, 1099), + null, + ); + $add( + new Point(6154, 1198, 1465), + new Point(7306, 1038, 1099), + new Point(6141, 1294, 1099), + null, + ); + $add( + new Point(7496, 834, 1627), + new Point(7483, 896, 1457), + new Point(8828, 896, 1457), + new Point(8841, 834, 1627), ); // t ramp $add( - new Point(2315, 806, 2221), - new Point(2315, 1290, 2221), - new Point(2315, 1290, 3775), - new Point(2315, 806, 3775), + new Point(2317, 806, 2224), + new Point(2317, 1283, 2224), + new Point(2317, 1283, 3759), + new Point(2317, 806, 3759), ); $add( - new Point(2315, 806, 3775), - new Point(2315, 1290, 3775), - new Point(3526, 1290, 3775), - new Point(3526, 806, 3775), + new Point(2317, 806, 3759), + new Point(2317, 1283, 3759), + new Point(3526, 1283, 3759), + new Point(3526, 806, 3759), ); $add( - new Point(3526, 1290, 3775), - new Point(2315, 1290, 3775), - new Point(2315, 1290, 3706), - new Point(3526, 1290, 3706), + new Point(3526, 1283, 3759), + new Point(2317, 1283, 3759), + new Point(2317, 1283, 3711), + new Point(3526, 1283, 3711), ); $add( - new Point(2315, 1290, 3775), - new Point(2315, 1290, 2221), - new Point(2367, 1290, 2221), - new Point(2367, 1290, 3775), + new Point(2317, 1283, 3759), + new Point(2317, 1283, 2224), + new Point(2364, 1283, 2224), + new Point(2364, 1283, 3759), ); $add( - new Point(2315, 1290, 2221), - new Point(2315, 806, 2221), - new Point(2369, 806, 2221), - new Point(2369, 1290, 2221), + new Point(2317, 1283, 2224), + new Point(2317, 806, 2224), + new Point(2369, 806, 2224), + new Point(2364, 1283, 2224), ); $add( - new Point(2369, 1290, 2221), - new Point(2369, 806, 2221), - new Point(2369, 806, 3715), - new Point(2369, 1290, 3715), + new Point(2364, 1283, 3759), + new Point(2364, 1283, 2224), + new Point(2364, 1170, 2224), + new Point(2364, 1170, 3759), ); $add( - new Point(2369, 1290, 3715), - new Point(2369, 806, 3715), - new Point(3480, 806, 3715), - new Point(3480, 1290, 3715), + new Point(3526, 1283, 3711), + new Point(2317, 1283, 3711), + new Point(2317, 1170, 3711), + new Point(3526, 1170, 3711), ); // t spawn walls $add( - new Point(6152, 1928, 2223), - new Point(5008, 1928, 2223), - new Point(5008, 1209, 2223), - new Point(6152, 1209, 2223), + new Point(6154, 1911, 2224), + new Point(5003, 1911, 2224), + new Point(5003, 1192, 2224), + new Point(6154, 1192, 2224), ); $add( - new Point(5008, 1209, 2223), - new Point(5008, 1928, 2223), - new Point(5008, 1928, 1997), - new Point(5008, 1209, 1997), + new Point(5003, 1192, 2224), + new Point(5003, 1911, 2224), + new Point(5003, 1911, 2032), + new Point(5003, 1192, 2032), ); $add( - new Point(5008, 1209, 1997), - new Point(5008, 1928, 1997), - new Point(4807, 1928, 1997), - new Point(4807, 1209, 1997), + new Point(5003, 1192, 2032), + new Point(5003, 1911, 2032), + new Point(4811, 1911, 2032), + new Point(4811, 1192, 2032), ); $add( - new Point(4807, 1209, 1997), - new Point(4807, 1928, 1997), - new Point(4807, 1928, 3661), - new Point(4807, 1209, 3661), + new Point(4811, 1192, 2032), + new Point(4811, 1911, 2032), + new Point(4811, 1911, 3663), + new Point(4811, 1192, 3663), ); $add( - new Point(4807, 1209, 3661), - new Point(4807, 1928, 3661), - new Point(4238, 1928, 3661), - new Point(4238, 1209, 3661), + new Point(4811, 1192, 3663), + new Point(4811, 1911, 3663), + new Point(4235, 1911, 3663), + new Point(4235, 1192, 3663), ); $add( - new Point(4238, 1209, 3661), - new Point(4238, 1928, 3661), - new Point(4238, 1928, 3567), - new Point(4238, 1209, 3567), + new Point(4235, 1192, 3663), + new Point(4235, 1911, 3663), + new Point(4235, 1911, 3567), + new Point(4235, 1192, 3567), ); $add( - new Point(4238, 1209, 3567), - new Point(4238, 1928, 3567), - new Point(4044, 1928, 3369), - new Point(4044, 1209, 3369), + new Point(4235, 1192, 3567), + new Point(4235, 1911, 3567), + new Point(4044, 1911, 3376), + new Point(4044, 1192, 3376), ); $add( - new Point(4044, 1209, 3369), - new Point(4044, 1928, 3369), - new Point(3660, 1928, 3369), - new Point(3660, 1209, 3369), + new Point(4044, 1192, 3376), + new Point(4044, 1911, 3376), + new Point(3660, 1911, 3376), + new Point(3660, 1192, 3376), ); $add( - new Point(3660, 1209, 3369), - new Point(3660, 1928, 3369), - new Point(3460, 1928, 3561), - new Point(3460, 1209, 3561), + new Point(3660, 1192, 3376), + new Point(3660, 1911, 3376), + new Point(3468, 1911, 3567), + new Point(3468, 1192, 3567), ); $add( - new Point(3460, 1209, 3561), - new Point(3460, 1928, 3561), - new Point(3460, 1928, 3750), - new Point(3460, 1209, 3750), + new Point(3468, 1192, 3567), + new Point(3468, 1911, 3567), + new Point(3468, 1911, 3750), + new Point(3468, 1192, 3750), ); $add( - new Point(6152, 1928, 2223), - new Point(6152, 1209, 2223), - new Point(6152, 1209, 2294), - new Point(6152, 1928, 2294), + new Point(6154, 1911, 2224), + new Point(6154, 1192, 2224), + new Point(6154, 1192, 2294), + new Point(6154, 1911, 2294), ); $add( - new Point(3460, 1209, 3750), - new Point(3460, 1928, 3750), - new Point(3510, 1928, 3750), - new Point(3510, 1209, 3750), + new Point(3468, 1192, 3750), + new Point(3468, 1911, 3750), + new Point(3510, 1911, 3750), + new Point(3510, 1192, 3750), ); // t spawn walls.001 @@ -6845,135 +6943,129 @@ public function __construct() // t spawn walls.002 $add( - new Point(4239, 1917, 1222), - new Point(3361, 1917, 1222), - new Point(3361, 1226, 1222), - new Point(4239, 1226, 1222), + new Point(4235, 1917, 1217), + new Point(3372, 1917, 1217), + new Point(3372, 1226, 1217), + new Point(4235, 1226, 1217), ); $add( - new Point(4239, 1917, 1222), - new Point(4239, 1226, 1222), - new Point(4239, 1226, 1063), - new Point(4239, 1917, 1063), + new Point(4235, 1917, 1217), + new Point(4235, 1226, 1217), + new Point(4235, 1226, 1063), + new Point(4235, 1917, 1063), ); $add( - new Point(3361, 1226, 1222), - new Point(3361, 1917, 1222), - new Point(3361, 1917, 1072), - new Point(3361, 1226, 1072), + new Point(3372, 1226, 1217), + new Point(3372, 1917, 1217), + new Point(3372, 1917, 1072), + new Point(3372, 1226, 1072), ); // t spawn walls.003 $add( - new Point(1158, 1079, 1315), - new Point(1158, 1975, 1315), - new Point(1158, 1975, 1404), - new Point(1158, 1079, 1404), - ); - $add( - new Point(1158, 1079, 2073), - new Point(1158, 1975, 2073), - new Point(1464, 1975, 2073), - new Point(1464, 1079, 2073), + new Point(1165, 1079, 1313), + new Point(1165, 1975, 1313), + new Point(1165, 1975, 1409), + new Point(1165, 1079, 1409), ); $add( - new Point(1158, 1975, 1315), - new Point(1158, 1079, 1315), - new Point(1675, 1079, 1315), - new Point(1675, 1975, 1315), + new Point(1165, 1079, 2080), + new Point(1165, 1975, 2080), + new Point(1453, 1975, 2080), + new Point(1453, 1079, 2080), ); $add( - new Point(1675, 1975, 1315), - new Point(1675, 1079, 1315), - new Point(1675, 1079, 1149), - new Point(1675, 1975, 1149), + new Point(1165, 1975, 1313), + new Point(1165, 1079, 1313), + new Point(1669, 1079, 1313), + new Point(1669, 1975, 1313), ); $add( - new Point(1675, 1975, 1149), - new Point(1675, 1079, 1149), - new Point(2298, 1079, 1149), - new Point(2298, 1975, 1149), + new Point(1669, 1975, 1313), + new Point(1669, 1079, 1313), + new Point(1669, 1079, 1145), + new Point(1669, 1975, 1145), ); $add( - new Point(2298, 1975, 1149), - new Point(2298, 1079, 1149), - new Point(2298, 1079, 1084), - new Point(2298, 1975, 1084), + new Point(1669, 1975, 1145), + new Point(1669, 1079, 1145), + new Point(2293, 1079, 1145), + new Point(2293, 1975, 1145), ); $add( - new Point(1464, 1079, 2073), - new Point(1464, 1975, 2073), - new Point(1464, 1975, 2080), - new Point(1464, 1079, 2080), + new Point(2293, 1975, 1145), + new Point(2293, 1079, 1145), + new Point(2293, 1079, 1084), + new Point(2293, 1975, 1084), ); $add( - new Point(1464, 1079, 2080), - new Point(1464, 1975, 2080), - new Point(1449, 1975, 2080), - new Point(1449, 1079, 2080), + new Point(1165, 1079, 1409), + new Point(1165, 1975, 1409), + new Point(1069, 1975, 1409), + new Point(1069, 1079, 1409), ); $add( - new Point(1158, 1079, 1404), - new Point(1158, 1975, 1404), - new Point(1072, 1975, 1404), - new Point(1072, 1079, 1404), + new Point(1165, 1079, 1984), + new Point(1165, 1975, 1984), + new Point(1165, 1975, 2080), + new Point(1165, 1079, 2080), ); $add( - new Point(1158, 1079, 1987), - new Point(1158, 1975, 1987), - new Point(1158, 1975, 2073), - new Point(1158, 1079, 2073), + new Point(1069, 1079, 1409), + new Point(1069, 1975, 1409), + new Point(1069, 1975, 1984), + new Point(1069, 1079, 1984), ); $add( - new Point(1072, 1079, 1404), - new Point(1072, 1975, 1404), - new Point(1072, 1975, 1987), - new Point(1072, 1079, 1987), - ); - $add( - new Point(1158, 1975, 1987), - new Point(1158, 1079, 1987), - new Point(1072, 1079, 1987), - new Point(1072, 1975, 1987), + new Point(1165, 1975, 1984), + new Point(1165, 1079, 1984), + new Point(1069, 1079, 1984), + new Point(1069, 1975, 1984), ); // t-spawn main floor $add( - new Point(6178, 1196, 2283), - new Point(6178, 1196, 1022), - new Point(7686, 853, 1022), - new Point(7686, 853, 2283), + new Point(6178, 1198, 2283), + new Point(6178, 1198, 1022), + new Point(7686, 834, 1022), + new Point(7686, 834, 2283), ); $add( - new Point(7686, 853, 2283), - new Point(7686, 853, 1022), - new Point(8915, 853, 1022), - new Point(8915, 853, 2283), + new Point(7686, 834, 2283), + new Point(7686, 834, 1022), + new Point(8915, 834, 1022), + new Point(8915, 834, 2283), ); $add( - new Point(1146, 1196, 2283), + new Point(1044, 1196, 2283), new Point(2374, 1196, 2283), new Point(2374, 808, 3826), - new Point(1146, 808, 3826), + new Point(1044, 808, 3826), ); $add( - new Point(2315, 1196, 2283), - new Point(4860, 1196, 2283), - new Point(4860, 1196, 3698), - new Point(2315, 1196, 3698), + new Point(2315, 1193, 2283), + new Point(4860, 1193, 2283), + new Point(4860, 1193, 3711), + new Point(2315, 1193, 3711), ); $add( - new Point(6178, 1196, 2283), - new Point(1146, 1196, 2283), - new Point(1146, 1196, 1022), - new Point(6178, 1196, 1022), + new Point(6178, 1198, 2283), + new Point(1044, 1198, 2283), + new Point(1044, 1198, 1022), + new Point(6178, 1198, 1022), ); $add( - new Point(7686, 853, 2283), - new Point(8915, 853, 2283), + new Point(7686, 834, 2283), + new Point(8915, 834, 2283), new Point(8837, 808, 2283), new Point(7686, 808, 2283), ); + $add( + new Point(1044, 1198, 2283), + new Point(6178, 1198, 2283), + new Point(6178, 1178, 2283), + new Point(1044, 1178, 2283), + ); } // Map - Upper Tunnel @@ -6981,190 +7073,190 @@ public function __construct() // upper tunnel main floor $add( - new Point(3858, 905, 5760), - new Point(3858, 905, 8687), - new Point(1031, 905, 8687), - new Point(1031, 905, 5760), + new Point(3858, 899, 5774), + new Point(3858, 899, 8687), + new Point(1031, 899, 8687), + new Point(1031, 899, 5774), ); $add( - new Point(3955, 816, 6291), - new Point(1477, 816, 6291), - new Point(1477, 816, 3726), - new Point(3955, 816, 3726), + new Point(3955, 824, 5829), + new Point(1477, 824, 5829), + new Point(1477, 824, 3726), + new Point(3955, 824, 3726), ); $add( - new Point(1551, 905, 8564), - new Point(1936, 905, 8564), - new Point(1936, 905, 9484), - new Point(1551, 905, 9484), + new Point(1551, 899, 8564), + new Point(1936, 899, 8564), + new Point(1936, 899, 9484), + new Point(1551, 899, 9484), ); $add( - new Point(3858, 905, 8687), - new Point(3858, 905, 5760), - new Point(3858, 193, 5760), - new Point(3858, 193, 8687), + new Point(3858, 899, 8687), + new Point(3858, 899, 5774), + new Point(3858, 406, 5760), + new Point(3858, 406, 8687), ); $add( - new Point(3858, 905, 5760), - new Point(1031, 905, 5760), - new Point(1031, 753, 5760), - new Point(3858, 753, 5760), + new Point(3858, 899, 5774), + new Point(1031, 899, 5774), + new Point(1031, 753, 5774), + new Point(3858, 753, 5774), ); // upper tunnel main floor.001 $add( - new Point(1551, 905, 9484), - new Point(1936, 905, 9484), - new Point(1989, 812, 9588), - new Point(1499, 812, 9588), + new Point(1551, 899, 9484), + new Point(1936, 899, 9484), + new Point(1989, 818, 9588), + new Point(1499, 818, 9588), ); // upper tunnel walls $add( - new Point(1918, 1445, 8359), - new Point(1918, 1445, 9520), - new Point(1918, 886, 9520), - new Point(1918, 886, 8359), + new Point(1933, 1445, 8365), + new Point(1933, 1445, 9516), + new Point(1933, 886, 9516), + new Point(1933, 886, 8365), ); $add( - new Point(1918, 1445, 8359), - new Point(1918, 886, 8359), - new Point(2699, 886, 8359), - new Point(2699, 1445, 8359), + new Point(1933, 1445, 8365), + new Point(1933, 886, 8365), + new Point(2700, 886, 8365), + new Point(2700, 1445, 8365), ); $add( - new Point(2699, 1445, 8359), - new Point(2699, 886, 8359), - new Point(2699, 886, 8133), - new Point(2699, 1445, 8133), + new Point(2700, 1445, 8365), + new Point(2700, 886, 8365), + new Point(2700, 886, 8173), + new Point(2700, 1445, 8173), ); $add( - new Point(2699, 1445, 8133), - new Point(2699, 886, 8133), - new Point(2747, 886, 8040), - new Point(2747, 1445, 8040), + new Point(2700, 1445, 8173), + new Point(2700, 886, 8173), + new Point(2727, 886, 8077), + new Point(2727, 1445, 8077), ); $add( - new Point(2747, 1445, 8040), - new Point(2747, 886, 8040), - new Point(2805, 886, 7998), - new Point(2805, 1445, 7998), + new Point(2727, 1445, 8077), + new Point(2727, 886, 8077), + new Point(2796, 886, 8008), + new Point(2796, 1445, 8008), ); $add( - new Point(2805, 1445, 7998), - new Point(2805, 886, 7998), - new Point(2890, 886, 7977), - new Point(2890, 1445, 7977), + new Point(2796, 1445, 8008), + new Point(2796, 886, 8008), + new Point(2890, 886, 7981), + new Point(2890, 1445, 7981), ); $add( - new Point(2890, 1445, 7977), - new Point(2890, 886, 7977), - new Point(4616, 886, 7977), - new Point(4616, 1445, 7977), + new Point(2890, 1445, 7981), + new Point(2890, 886, 7981), + new Point(4616, 886, 7981), + new Point(4616, 1445, 7981), ); // upper tunnel walls.001 $add( - new Point(2877, 1477, 6249), - new Point(2877, 889, 6249), - new Point(3500, 889, 6249), - new Point(3500, 1477, 6249), + new Point(2892, 1477, 6254), + new Point(2892, 889, 6254), + new Point(3500, 889, 6254), + new Point(3500, 1477, 6254), ); $add( - new Point(2506, 1477, 6249), - new Point(2506, 1317, 6249), - new Point(2897, 1317, 6249), - new Point(2897, 1477, 6249), + new Point(2506, 1477, 6254), + new Point(2506, 1317, 6254), + new Point(2897, 1317, 6254), + new Point(2897, 1477, 6254), ); $add( - new Point(1918, 1477, 6249), - new Point(1918, 859, 6249), - new Point(2520, 859, 6249), - new Point(2520, 1477, 6249), + new Point(1918, 1477, 6254), + new Point(1918, 859, 6254), + new Point(2508, 859, 6254), + new Point(2508, 1477, 6254), ); $add( - new Point(2520, 1477, 6249), - new Point(2520, 859, 6249), - new Point(2520, 859, 7032), - new Point(2520, 1477, 7032), + new Point(2508, 1477, 6254), + new Point(2508, 859, 6254), + new Point(2508, 859, 7022), + new Point(2508, 1477, 7022), ); $add( - new Point(2877, 889, 6249), - new Point(2877, 1477, 6249), - new Point(2877, 1477, 7031), - new Point(2877, 889, 7031), + new Point(2892, 889, 6254), + new Point(2892, 1477, 6254), + new Point(2892, 1477, 7022), + new Point(2892, 889, 7022), ); $add( - new Point(2897, 1317, 6249), - new Point(2506, 1317, 6249), + new Point(2897, 1317, 6254), + new Point(2506, 1317, 6254), new Point(2506, 1317, 7032), new Point(2897, 1317, 7032), ); $add( - new Point(2877, 889, 7031), - new Point(2877, 1477, 7031), - new Point(3080, 1477, 7031), - new Point(3080, 889, 7031), + new Point(2892, 889, 7022), + new Point(2892, 1477, 7022), + new Point(3084, 1477, 7022), + new Point(3084, 889, 7022), ); $add( - new Point(3080, 889, 7031), - new Point(3080, 1477, 7031), - new Point(3080, 1477, 7223), - new Point(3080, 889, 7223), + new Point(3084, 889, 7022), + new Point(3084, 1477, 7022), + new Point(3084, 1477, 7214), + new Point(3084, 889, 7214), ); $add( - new Point(3080, 889, 7223), - new Point(3080, 1477, 7223), - new Point(3856, 1477, 7223), - new Point(3856, 889, 7223), + new Point(3084, 889, 7214), + new Point(3084, 1477, 7214), + new Point(3856, 1477, 7214), + new Point(3856, 889, 7214), ); $add( - new Point(2520, 1477, 7032), - new Point(2520, 859, 7032), - new Point(2316, 859, 7032), - new Point(2316, 1477, 7032), + new Point(2508, 1477, 7022), + new Point(2508, 859, 7022), + new Point(2317, 859, 7022), + new Point(2317, 1477, 7022), ); $add( - new Point(2316, 1477, 7032), - new Point(2316, 859, 7032), - new Point(2296, 859, 7118), - new Point(2296, 1477, 7118), + new Point(2317, 1477, 7022), + new Point(2317, 859, 7022), + new Point(2293, 859, 7118), + new Point(2293, 1477, 7118), ); $add( - new Point(2296, 1477, 7118), - new Point(2296, 859, 7118), - new Point(2225, 859, 7189), - new Point(2225, 1477, 7189), + new Point(2293, 1477, 7118), + new Point(2293, 859, 7118), + new Point(2221, 859, 7190), + new Point(2221, 1477, 7190), ); $add( - new Point(2225, 1477, 7189), - new Point(2225, 859, 7189), - new Point(2127, 859, 7215), - new Point(2127, 1477, 7215), + new Point(2221, 1477, 7190), + new Point(2221, 859, 7190), + new Point(2127, 859, 7214), + new Point(2127, 1477, 7214), ); $add( - new Point(2127, 1477, 7215), - new Point(2127, 859, 7215), - new Point(1071, 859, 7215), - new Point(1071, 1477, 7215), + new Point(2127, 1477, 7214), + new Point(2127, 859, 7214), + new Point(1069, 859, 7214), + new Point(1069, 1477, 7214), ); $add( - new Point(1071, 1477, 7215), - new Point(1071, 859, 7215), - new Point(1071, 859, 7978), - new Point(1071, 1477, 7978), + new Point(1069, 1477, 7214), + new Point(1069, 859, 7214), + new Point(1069, 859, 7981), + new Point(1069, 1477, 7981), ); $add( - new Point(1071, 1477, 7978), - new Point(1071, 859, 7978), - new Point(1552, 859, 7978), - new Point(1552, 1477, 7978), + new Point(1069, 1477, 7981), + new Point(1069, 859, 7981), + new Point(1549, 859, 7981), + new Point(1549, 1477, 7981), ); $add( - new Point(1552, 1477, 7978), - new Point(1552, 859, 7978), - new Point(1552, 859, 9520), - new Point(1552, 1477, 9520), + new Point(1549, 1477, 7981), + new Point(1549, 859, 7981), + new Point(1549, 859, 9516), + new Point(1549, 1477, 9516), ); } @@ -7177,16 +7269,16 @@ public function __construct() // Spawn - Attackers if (true) { - $this->spawnPositionAttacker[] = new Point(5631, 1196, 1775); - $this->spawnPositionAttacker[] = new Point(5356, 1196, 1947); - $this->spawnPositionAttacker[] = new Point(5947, 1196, 2021); - $this->spawnPositionAttacker[] = new Point(5984, 1196, 1666); - $this->spawnPositionAttacker[] = new Point(5621, 1196, 1467); - $this->spawnPositionAttacker[] = new Point(5159, 1196, 1540); - $this->spawnPositionAttacker[] = new Point(3853, 1196, 2112); - $this->spawnPositionAttacker[] = new Point(4478, 1196, 1593); - $this->spawnPositionAttacker[] = new Point(4332, 1196, 2032); - $this->spawnPositionAttacker[] = new Point(3755, 1196, 1538); + $this->spawnPositionAttacker[] = new Point(4498, 1198, 1775); + $this->spawnPositionAttacker[] = new Point(5356, 1198, 1947); + $this->spawnPositionAttacker[] = new Point(5947, 1198, 2021); + $this->spawnPositionAttacker[] = new Point(5984, 1198, 1666); + $this->spawnPositionAttacker[] = new Point(5621, 1198, 1467); + $this->spawnPositionAttacker[] = new Point(5159, 1198, 1540); + $this->spawnPositionAttacker[] = new Point(3853, 1198, 2112); + $this->spawnPositionAttacker[] = new Point(4478, 1198, 1593); + $this->spawnPositionAttacker[] = new Point(4332, 1198, 2032); + $this->spawnPositionAttacker[] = new Point(3755, 1198, 1538); } // Spawn - Defenders diff --git a/test/og/Unit/PlaneBuilderTest.php b/test/og/Unit/PlaneBuilderTest.php index deef5cb..fd1742c 100644 --- a/test/og/Unit/PlaneBuilderTest.php +++ b/test/og/Unit/PlaneBuilderTest.php @@ -119,8 +119,8 @@ public function testTriangleBoundary(): void max($boundaryMax->z, $plane->getEnd()->z), ); } - $this->assertPositionSame(new Point(2, 1, 0), $boundaryMin); - $this->assertPositionSame(new Point(12, 11, 22), $boundaryMax); + $this->assertPositionSame(new Point(2, 1 - 1, 0), $boundaryMin); + $this->assertPositionSame(new Point(12, 11 - 1, 22), $boundaryMax); } public function testTriangleBoundaryNegative(): void @@ -149,8 +149,8 @@ public function testTriangleBoundaryNegative(): void max($boundaryMax->z, $plane->getEnd()->z), ); } - $this->assertPositionSame(new Point(2, 1, -1), $boundaryMin); - $this->assertPositionSame(new Point(13, 12, 23), $boundaryMax); + $this->assertPositionSame(new Point(2, 1 - 1, -1), $boundaryMin); + $this->assertPositionSame(new Point(13, 12 - 1, 23), $boundaryMax); } public function testAABBWallX(): void diff --git a/www/assets/js/Game.js b/www/assets/js/Game.js index 307d5d7..62a08f3 100644 --- a/www/assets/js/Game.js +++ b/www/assets/js/Game.js @@ -1,5 +1,4 @@ import * as THREE from 'three' // fixme try remove from game, maybe only allow import Vec3... -import * as BufferGeometryUtils from 'three/addons/utils/BufferGeometryUtils.js' // todo remove import {EventProcessor} from "./EventProcessor.js" import {Player} from "./Player.js" import {InventorySlot, SoundType} from "./Enums.js" @@ -327,11 +326,7 @@ export class Game { spawnFlame(point, height, fireId, partId) { const size = this.#volumetrics[fireId]['size'] height = Utils.lerp(height, Utils.randomInt(16, 26), Math.min(Math.sqrt(Object.keys(this.#volumetrics[fireId]).length) / Utils.randomInt(7, 9), 1)) - const flame = this.#world.spawnFlame(size, height) - this.#volumetrics[fireId][partId] = flame - flame.position.set(point.x, point.y + (height / 2), -1 * point.z) - flame.rotation.x = Utils.randomInt(-10, 10) / 100 - flame.rotateOnWorldAxis(new THREE.Vector3(0, 1, 0), Math.random() * 6.28) + this.#volumetrics[fireId][partId] = this.#world.spawnFlame(point, size, height) } destroyFlame(fireId, flameId) { @@ -341,50 +336,19 @@ export class Game { } smokeStart(smokeId, position, size, maxTimeMs, maxPartCount) { - this.#volumetrics[smokeId] = {} - this.#volumetrics[smokeId]['size'] = size - this.#volumetrics[smokeId]['count'] = maxPartCount - this.#volumetrics[smokeId]['geometries'] = [] + this.#volumetrics[smokeId] = {'mesh': this.#world.initSmoke(smokeId, size, maxPartCount)} } spawnSmoke(point, height, smokeId, partId) { - const size = this.#volumetrics[smokeId]['size'] - const offset = Math.max(2, Math.ceil(size / 4)); - const geo = new THREE.CylinderGeometry(size - Utils.randomInt(0, offset), size, height - Utils.randomInt(0, offset), Utils.randomInt(5, 22)) - geo.translate(point.x, point.y + (geo.parameters.height / 2), -point.z) - this.#volumetrics[smokeId]['geometries'].push(geo) - - const len = this.#volumetrics[smokeId]['geometries'].length - if (len % 10 !== 0 && len < this.#volumetrics[smokeId]['count']) { - return - } - - let geometry = BufferGeometryUtils.mergeGeometries(this.#volumetrics[smokeId]['geometries']) - geometry = BufferGeometryUtils.mergeVertices(geometry, offset) - geometry.computeBoundingBox() - let mesh = this.#volumetrics[smokeId]['mesh'] - if (mesh) { - this.#world.destroyObject(mesh) - } - - mesh = this.#world.spawnSmoke(geometry) - this.#volumetrics[smokeId]['mesh'] = mesh - if (len === this.#volumetrics[smokeId]['count']) { - this.#volumetrics[smokeId]['range'] = Math.ceil(mesh.geometry.getIndex().count / 50) - mesh.geometry.setDrawRange(0, mesh.geometry.getIndex().count) - } + this.#world.spawnSmoke(point, height, smokeId) } smokeFade(smokeId) { - const range = this.#volumetrics[smokeId]['range'] - const mesh = this.#volumetrics[smokeId]['mesh'] - - const intervalId = setInterval(function() { - const newRange = mesh.geometry.drawRange.count - range - if (newRange <= 0) { + const game = this + const intervalId = setInterval(function () { + if (game.#world.fadeSmoke(smokeId)) { clearInterval(intervalId) } - mesh.geometry.setDrawRange(0, newRange) }, 50) this.#roundIntervalIds.push(intervalId) } @@ -673,7 +637,7 @@ export class Game { this.#world.getCamera().getObjectByName('pov-item').visible = isNotScopedIn this.#world.updateCameraZoom(Utils.scopeLevelToZoom(scopeLevel)) if (this.meIsAlive()) { - this.#pointer.pointerSpeed = (isNotScopedIn ? this.#setting.getSensitivity() : this.#setting.getInScopeSensitivity()) + this.#pointer.pointerSpeed = (isNotScopedIn ? this.#setting.getSensitivity() : this.#setting.getInScopeSensitivity() / scopeLevel) } } } diff --git a/www/assets/js/ModelRepository.js b/www/assets/js/ModelRepository.js index 4012c92..53671fe 100644 --- a/www/assets/js/ModelRepository.js +++ b/www/assets/js/ModelRepository.js @@ -121,7 +121,7 @@ export class ModelRepository { return model.clone() } - init(mapName, renderer, scene) { + init(scene, renderer, mapName = null) { const ktx2Loader = new KTX2Loader() ktx2Loader.setTranscoderPath('assets/threejs/libs/basis/') ktx2Loader.detectSupport(renderer) @@ -129,7 +129,7 @@ export class ModelRepository { const self = this const promises = [] - promises.push(this.#loadMap(mapName).then((model) => scene.add(model))) + mapName && promises.push(this.#loadMap(mapName).then((model) => scene.add(model))) promises.push(this.#loadModel('./resources/model/player.glb').then((model) => { model.scene.traverse(function (object) { @@ -254,7 +254,6 @@ export class ModelRepository { this.#materials.smoke = new THREE.MeshStandardMaterial({ // todo better material with cool displacement map etc. color: 0x798aa0, map: texture, - blending: THREE.AdditiveBlending, side: THREE.FrontSide, }) diff --git a/www/assets/js/SoundRepository.js b/www/assets/js/SoundRepository.js index a84c4c2..f0e72bf 100644 --- a/www/assets/js/SoundRepository.js +++ b/www/assets/js/SoundRepository.js @@ -32,13 +32,13 @@ export class SoundRepository { if (type === SoundType.PLAYER_STEP) { if (playerId === playerSpectateId) { if (tickId > this.#lastSpectatorMoveSoundTick + Utils.msToTick(400)) { - this.#lastSpectatorMoveSoundTick = tickId + this.#lastSpectatorMoveSoundTick = tickId + Utils.msToTick(Utils.randomInt(-30, 30)) return '422990__dkiller2204__sfxrunground1.wav' } return null } if (tickId > this.#lastOtherPlayerMoveSoundTick + Utils.msToTick(300)) { - this.#lastOtherPlayerMoveSoundTick = tickId + this.#lastOtherPlayerMoveSoundTick = tickId + Utils.msToTick(Utils.randomInt(-30, 30)) return '221626__moodpie__body-impact.wav' } return null diff --git a/www/assets/js/World.js b/www/assets/js/World.js index 4ec8c72..75ee72f 100644 --- a/www/assets/js/World.js +++ b/www/assets/js/World.js @@ -2,7 +2,8 @@ import * as THREE from 'three' import * as Enum from "./Enums.js" import {RGBELoader} from "three/addons/loaders/RGBELoader.js" import {ModelRepository} from "./ModelRepository.js" -import {Utils} from "./Utils.js"; +import {Utils} from "./Utils.js" +import * as BufferGeometryUtils from 'three/addons/utils/BufferGeometryUtils.js' export class World { #scene @@ -14,6 +15,7 @@ export class World { #raycaster #decals = [] #cache = {} + #smokes = {} volume = 30 constructor() { @@ -80,7 +82,7 @@ export class World { this.volume = setting.getMasterVolume() const anisotropy = Math.min(setting.getAnisotropicFiltering(), renderer.capabilities.getMaxAnisotropy()) - return this.#modelRepository.init(mapName, renderer, scene).then(() => { + return this.#modelRepository.init(scene, renderer, mapName).then(() => { scene.traverse(function (object) { if (object.isMesh && object.material.map) { object.material.map.anisotropy = anisotropy @@ -180,10 +182,10 @@ export class World { this.#cache[index] = loadCallback() } - return this.#cache[index]; + return this.#cache[index] } - spawnFlame(size, height) { + spawnFlame(position, size, height) { const coneDetail = Utils.randomInt(5, 7) const lightnessValue = Utils.randomInt(30, 80) const geometry = this.loadCache(`flame-geo-c-${coneDetail}`, () => new THREE.ConeGeometry(1, 1, coneDetail)) @@ -196,20 +198,65 @@ export class World { mesh.castShadow = false mesh.receiveShadow = true + mesh.position.set(position.x, position.y + (height / 2), -1 * position.z) + mesh.rotation.x = Utils.randomInt(-10, 10) / 100 + mesh.rotateOnWorldAxis(new THREE.Vector3(0, 1, 0), Math.random() * 6.28) + this.#scene.add(mesh) return mesh } - spawnSmoke(geometry) { - const mesh = new THREE.Mesh(geometry, this.#modelRepository.getSmokeMaterial()) + initSmoke(smokeId, size, maxPartCount) { + const mesh = new THREE.Mesh(new THREE.BufferGeometry(), this.#modelRepository.getSmokeMaterial()) this.#scene.add(mesh) + + this.#smokes[smokeId] = {} + this.#smokes[smokeId]['size'] = size + this.#smokes[smokeId]['count'] = maxPartCount + this.#smokes[smokeId]['geometries'] = [] + this.#smokes[smokeId]['mesh'] = mesh + return mesh } + spawnSmoke(position, height, smokeId) { + const size = this.#smokes[smokeId]['size'] + const offset = Math.max(2, Math.ceil(size / 4)) + const geo = new THREE.CylinderGeometry(size - Utils.randomInt(0, offset), size, height - Utils.randomInt(0, offset), Utils.randomInt(5, 22)) + geo.translate(position.x, position.y + (geo.parameters.height / 2), -position.z) + this.#smokes[smokeId]['geometries'].push(geo) + + let len = this.#smokes[smokeId]['geometries'].length + if (len % 10 !== 0 && len < this.#smokes[smokeId]['count']) { + return + } + + let geometry = BufferGeometryUtils.mergeGeometries(this.#smokes[smokeId]['geometries']) + geometry.computeBoundingBox() + + this.#smokes[smokeId]['range'] = Math.ceil(geometry.getIndex().count / 50) + geometry.setDrawRange(0, geometry.getIndex().count) + + const mesh = this.#smokes[smokeId]['mesh'] + mesh.geometry = geometry + } + + fadeSmoke(smokeId) { + const mesh = this.#smokes[smokeId]['mesh'] + const newRange = mesh.geometry.drawRange.count - this.#smokes[smokeId]['range'] + mesh.geometry.setDrawRange(0, newRange) + + if (newRange <= 0) { + delete this.#smokes[smokeId] + return true + } + return false + } + bulletWallHit(origin, hitPosition, item) { const rayHit = new THREE.Vector3(hitPosition.x, hitPosition.y, -hitPosition.z) const rayDirection = rayHit.clone().sub(new THREE.Vector3(origin.x, origin.y, -origin.z)).normalize() - rayHit.addScaledVector(rayDirection, -50); // offset a bit back to give raycaster more space to match server-client geometry + rayHit.addScaledVector(rayDirection, -50) // offset a bit back to give raycaster more space to match server-client geometry this.#raycaster.near = 1 this.#raycaster.far = 100 diff --git a/www/playerGenerator.php b/www/playerGenerator.php index 62c6041..2c7655e 100644 --- a/www/playerGenerator.php +++ b/www/playerGenerator.php @@ -141,7 +141,7 @@ function animate() { animate() const modelRepository = new ModelRepository() - await modelRepository.loadAll() + await modelRepository.init(scene, renderer) const player = modelRepository.getPlayer(1, true) if (opacityPlayer < 1) { player.traverse((o) => {