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

diff --git a/NDWeb/Pages/LaunchConfirmation.pm b/NDWeb/Pages/LaunchConfirmation.pm
index a7059b2e6a3fa089b42d241622b3b24e238a6eb5..eb2ff6bb5aaa2d9b2d4e45ed1d56b9c6304d7b8a 100644 (file)
--- 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};
                        }