X-Git-Url: http://git.shiar.nl/wormy.git/blobdiff_plain/bcdfb41a503e9135caaffa151f770f5aa522757c..6c599c66b38654aef23387cc2d4800dc10ea74f5:/parse-wormedit

diff --git a/parse-wormedit b/parse-wormedit
index 26d6cbd..6eb7915 100755
--- a/parse-wormedit
+++ b/parse-wormedit
@@ -54,9 +54,11 @@ my @FORMAT = (
 	sprite     => ['8C',
 		line => 'B8',
 	],
-	endtype     => 's',
-	endstr      => 'Ca255',
-	enddata     => 'Ca255x256',
+	finish      => [1,
+		type    => 's',
+		message => 'Ca255',
+		code    => 'Ca255x256',
+	],
 	hiname      => 'a3',
 	levels      => ['*', # levelcount->total actually
 		id         => 'Ca22',
@@ -97,39 +99,52 @@ my @FORMAT = (
 
 sub read {
 	my ($self, $input) = @_;
-	my ($id, $subid) = (substr($input, 0, 15), ord substr($input, 15, 1));
-	my $version = $opt{version} // $MAGICID{$id}
+	my ($id, $version) = (substr($input, 0, 15), ord substr($input, 15, 1));
+	my $fileversion = $MAGICID{$id}
 		or die "File does not match any known WormEdit level header\n";
-	$subid == $version
-		or warn "Unsupported version $subid (expecting $version)\n";
-	given ($version) {
-		when (53) {
-			# current @FORMAT
+
+	if ($opt{version}) {
+		warn "Override version $version to $opt{version}\n";
+		$version = $opt{version};
+	}
+	elsif ($version != $fileversion) {
+		warn "Unexpected version $version (expecting $fileversion)\n";
+	}
+	elsif ($version == 95) {
+		# auto-detect exact variant
+		if (ord substr($input, 70, 1) ~~ [1 .. 8]) {
+			# valid sprite length instead of description byte
+			# (which is usually a letter or nul)
+			$version = 94;
 		}
-		when ($_ <= 95 and $_ > 90) {
-			ref $_ and pop @$_ for @{ $FORMAT[11] }; # only 8 moderefs
-			$FORMAT[-1]->[-1]->[0] = '32C'; # less objects
-			continue;
+		elsif (ord substr($input, 147, 1) == 0) {
+			# nul of finish type is 2 bytes later (unlike first char of message)
+			$version = 96;
 		}
-		when (95) {
+		warn "Ambiguous file version 95; guessing subversion $version\n";
+	};
+
+	$fileversion += 100 if $fileversion < 90;  # 93..95 came before 50..53
+	given ($fileversion) {
+		when (153) { } # current @FORMAT
 			$FORMAT[7] = 'Ca64'; # no reserved space after description
-			#ref $_ and $_->[-1] = 'C' for @{ $FORMAT[11] }; # only 9 moderefs
-			$FORMAT[19] = 'Ca255'; # enddata
-			splice @FORMAT, 6, 2 if $subid < 95;  # early (sub)version without description
+			$FORMAT[15]->[-1] = 'Ca255'; # enddata
+			$FORMAT[-1]->[-1]->[0] = '32C'; # less objects
+		when ($version == 96) {
+			ref $_ and $_->[-1] = 'C' for @{ $FORMAT[11] }; # 9 moderefs
 		}
-		when ($_ <= 94 and $_ > 90) {
-			splice @FORMAT, 6, 2;  # no description
+			ref $_ and pop @$_ for @{ $FORMAT[11] }; # only 8 moderefs
+			splice @FORMAT, 6, 2 if $version <= 94;  # earlier version without description
+		when (95) { }
 			splice @{ $FORMAT[7] }, 4, 2;  # no race
-			splice @FORMAT, 16, 2; # no enddata
+			splice @{ $FORMAT[13] }, 4, 2; # no enddata
 			splice @{ $FORMAT[-1] }, 1, 2; # no name
-			continue if $_ < 94;
-		}
-		when (93) {
-			splice @FORMAT, 16, 2; # no hiname
+		when (94) { }
+			splice @FORMAT, 14, 2; # no hiname
 			$FORMAT[-1]->[0] = 64; # constant amount of levels
-		}
+		when (93) { }
 		default {
-			die "Cannot parse data for Wormedit $version\n";
+			die "Cannot parse data for Wormedit $fileversion/$version\n";
 		}
 	}
 
@@ -217,7 +232,7 @@ sub read {
 			x => 'C',
 		],
 		#levels
-		#enddata
+		#finish code
 		#levels-multi
 		#hinames
 	);
@@ -310,7 +325,7 @@ sub read {
 		$data->{moderef}->{end}->{tron},        # idem for tron
 	);
 	$data->{hinames} = [ unpack '(x2a3)*', substr($data->{leveldata}, -5 * $slots) ];
-	$data->{enddata} = substr delete($data->{leveldata}), $offset, -5 * $slots; #XXX
+	$data->{finish}->{code} = substr delete($data->{leveldata}), $offset, -5 * $slots; #XXX
 	$data->{format} = '86s';
 	return $data;
 }
@@ -400,9 +415,26 @@ else {
 
 # output with user-preferred formatting
 if ($opt{raw}) {
-	require JSON::XS;
-	my $output = JSON::XS->new->ascii->canonical->pretty->allow_nonref;
-	print $output->encode($data), "\n";
+	# full data in yaml (human-readable) formatting
+	require YAML;
+	local $YAML::CompressSeries;
+	      $YAML::CompressSeries = 0;
+	my $yml = "# Wormy levelset\n" . YAML::Dump($data);
+
+	# inline format of short hashes
+	$yml =~ s{
+		^(\ *) - \n                          # array indicator
+		((?:\1\ \ [a-z0-9]{1,5}:\ *\d+\n)+)  # simple hash declaration
+		(?!\1\ )                             # no further children
+	}[
+		my ($indent, $value) = ($1, $2);
+		chop $value;
+		$value =~ s/^ +//gm;
+		$value =~ s/\n/, /g;
+		"$indent- {$value}\n";
+	]egmx;
+
+	print $yml;
 }
 else {
 	print $data->{name};
@@ -448,9 +480,11 @@ else {
 		print "\n";
 		printf("-- %-21s%4s: %s (%s)\n",
 			'(ending)',
-			defined $data->{enddata} ? length $data->{enddata} : '?',
-			defined $data->{endtype} ? $ENDTYPE[$data->{endtype}] || 'unknown' : 'code',
-			$data->{endstr} // '?',
+			defined $data->{finish}->{code}
+				? length $data->{finish}->{code} : '?',
+			defined $data->{finish}->{type}
+				? $ENDTYPE[$data->{finish}->{type}] || 'unknown' : 'code',
+			$data->{finish}->{message} // '?',
 		) if $variant eq 'single';
 	}
 }