Update creativia and crew for TG14.

3 files changed, 57 insertions, 39 deletions

diff --git a/patchlist.txt.crew b/patchlist.txt.crew
index c69136a..12b12cf 100644
--- a/patchlist.txt.crew
+++ b/patchlist.txt.crew
@@ -1,6 +1,19 @@
-crew1 crewgw Gi1/11 Gi1/12 Gi1/13 Gi1/14
-crew2 crewgw Gi1/15 Gi1/16 Gi1/17 Gi1/18
-crew3 crewgw Gi1/19 Gi1/20 Gi1/21 Gi1/22
-crew4 crewgw Gi1/23 Gi1/24 Gi1/25 Gi1/26
-crew5 crewgw Gi1/27 Gi1/28 Gi1/29 Gi1/30
-crew6 crewgw Gi1/31 Gi1/32 Gi1/33 Gi1/34
+creative1-1 creativegw Gi1/1 Gi1/2
+creative2-1 creativegw Gi1/3 Gi1/4
+creative3-1 creativegw Gi1/5 Gi1/6
+creative3-2 creativegw Gi1/7 Gi1/8
+creative4-1 creativegw Gi1/9 Gi1/10
+creative4-2 creativegw Gi1/11 Gi1/12
+creative5-1 creativegw Gi1/13 Gi1/14
+creative5-2 creativegw Gi1/15 Gi1/16
+creative6-1 creativegw Gi1/17 Gi1/18
+creative6-2 creativegw Gi1/19 Gi1/20
+creative7-1 creativegw Gi1/21 Gi1/22
+creative7-2 creativegw Gi1/23 Gi1/24
+crew1-1 crewgw Gi1/1 Gi1/2
+crew2-1 crewgw Gi1/3 Gi1/4
+crew2-2 crewgw Gi1/5 Gi1/6
+crew3-1 crewgw Gi1/7 Gi1/8
+crew3-2 crewgw Gi1/9 Gi1/10
+crew4-1 crewgw Gi1/11 Gi1/12
+crew4-2 crewgw Gi1/13 Gi1/14
diff --git a/switches.txt.crew b/switches.txt.crew
index c31afeb..2746674 100644
--- a/switches.txt.crew
+++ b/switches.txt.crew
@@ -1,6 +1,19 @@
-151.216.46.0 25 crew1 x.x.x.x
-151.216.46.128 25 crew2 x.x.x.x
-151.216.47.0 25 crew3 x.x.x.x
-151.216.47.128 25 crew4 x.x.x.x
-151.216.48.0 25 crew5 x.x.x.x
-151.216.48.128 25 crew6 x.x.x.x
+151.216.163.0 26 creative1-1
+151.216.163.64 26 creative2-1
+151.216.163.128 26 creative3-1
+151.216.163.192 26 creative3-2
+151.216.164.0 26 creative4-1
+151.216.164.64 26 creative4-2
+151.216.164.128 26 creative5-1
+151.216.164.192 26 creative5-2
+151.216.165.0 26 creative6-1
+151.216.165.64 26 creative6-2
+151.216.165.128 26 creative7-1
+151.216.165.192 26 creative7-2
+151.216.166.0 26 crew1-1
+151.216.166.64 26 crew2-1
+151.216.166.128 26 crew2-2
+151.216.166.192 26 crew3-1
+151.216.167.0 26 crew3-2
+151.216.167.64 26 crew4-1
+151.216.167.128 26 crew4-2
diff --git a/tools/make-switch-placements.pl b/tools/make-switch-placements.pl
index 7bfb889..fef1ed9 100755
--- a/tools/make-switch-placements.pl
+++ b/tools/make-switch-placements.pl
@@ -49,33 +49,25 @@ while (<STDIN>) {
 		#$yy -= 28 if $name eq "e79-1";
 		$yy -= 15 if $name eq "e81-1";
 		#$yy -= 56 if $name eq "e83-1";
-	} elsif ($name =~ /^creative(\d+)$/) {
-		my $s = $1;
-		if ($s < 3) {
-			if ($s == 1) {
-				$x = 1190;
-				$y = 278;
-			} else {
-				$x = 1180;
-				$y = 230;
-			}
-			$xx = $x+35;
-			$yy = $y+19;
-			$yy += 6;
-		} else {
-			$x = 1056;
-			$y = 296 - 22 * ($s-3);
-			if ($s <= 4) {
-				$xx = $x+100;
-			} elsif ($s <= 7) {
-				$xx = $x+70;
-			} elsif ($s <= 8) {
-				$xx = $x+55;
-			} else {
-				$xx = $x+35;
-			}
-			$yy = $y+19;
-			$yy -= 5 if $s == 3;
+	} elsif ($name =~ /^creative(\d+)-(\d+)$/) {
+		my ($s, $n) = ($1, $2);
+		$x = 973 + 52 * $n;
+		$y = int(160 + 22.2 * $s);
+		$xx = $x + 52;
+		$yy = $y + 14;
+
+		if ($s == 2 && $n == 1) {
+			$xx += 20;
+		}
+	} elsif ($name =~ /^crew(\d+)-(\d+)$/) {
+		my ($s, $n) = ($1, $2);
+		$x = 1023 + 45 * $n;
+		$y = int(329 + 20.5 * $s);
+		$xx = $x + 45;
+		$yy = $y + 14;
+
+		if ($s == 1 && $n == 1) {
+			$xx += 25;
 		}
 	} else {
 		die "Unknown switch: $name";