From: Michael Andreen <harv@ruin.nu>
Date: Mon, 5 Nov 2007 16:21:56 +0000 (+0100)
Subject: Merge branch 'master' of ruin.nu:git/ndwebbie
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=a69c2f7e01e81ec5bb85f8d374e892562ec3c00a;hp=0137d173ee6789515800a610f13b0d49d23a82c1;p=ndwebbie.git

Merge branch 'master' of ruin.nu:git/ndwebbie
---

diff --git a/NDWeb/Pages/LaunchConfirmation.pm b/NDWeb/Pages/LaunchConfirmation.pm
index a7059b2..eb2ff6b 100644
--- a/NDWeb/Pages/LaunchConfirmation.pm
+++ b/NDWeb/Pages/LaunchConfirmation.pm
@@ -99,7 +99,7 @@ sub render_body {
 			$mission{Back} = $tick+$eta-1;
 			my $ships = $10;
 			my @ships;
-			while ($ships =~ m/((?:\w+ )*\w+)\s+\w+\s+\w+\s+(?:Steal|Normal|Emp|Normal\s+Cloaked|Pod|Struc)\s+(\d+)/g){
+			while ($ships =~ m/((?:\w+ )*\w+)\s+\w+\s+(?:(?:\w+|-)\s+){3}(?:Steal|Normal|Emp|Normal\s+Cloaked|Pod|Struc)\s+(\d+)/g){
 				$addships->execute($fleet,$1,$2) or $ND::ERROR .= p $DBH->errstr;
 				push @ships,{Ship => $1, Amount => $2};
 			}