X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fparseplanets.pl;h=bf5f2dc75c38998c87e642f5ec6bca2361a72232;hb=3dc80cedd5deba53a4082992de317fbc3acf805c;hp=518a887201661cc63a413332e9662e05ff7720e4;hpb=36a13cae169413fc04fbf704d94a2ad797336e6e;p=ndwebbie.git

diff --git a/scripts/parseplanets.pl b/scripts/parseplanets.pl
index 518a887..bf5f2dc 100755
--- a/scripts/parseplanets.pl
+++ b/scripts/parseplanets.pl
@@ -44,11 +44,11 @@ $dumps->execute($tick);
 if (@_ = $dumps->fetchrow){
 	$_ = $_[0];
 	$hour = (gmtime($_[1]))[2];
-	my $planetid = $dbh->prepare(q{SELECT find_planet_id($1,$2,$3)});
-	while (m/(\d+)\t(\d+)\t(\d+)\t\"(.*)\"\t\"(.*)\"\t(Ter|Cat|Zik|Xan|Etd)\t(\d+)\t(\d+)\t(\d+)\t(\d+)/g){
-		$planetid->execute($5,$4,$6);
+	my $planetid = $dbh->prepare(q{SELECT find_planet_id($1,$2,$3,$4)});
+	while (m/(\w+)\t(\d+)\t(\d+)\t(\d+)\t\"(.*)\"\t\"(.*)\"\t(\w+)\t(\d+)\t(\d+)\t(\d+)\t(\d+)/g){
+		$planetid->execute($1,$6,$5,$7);
 		my @id = $planetid->fetchrow;
-		push @planets,[$tick,$id[0],$1,$2,$3,$7,$8,$9,$10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
+		push @planets,[$tick,$id[0],$2,$3,$4,$8,$9,$10,$11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
 	}
 }