X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FLaunchConfirmation.pm;h=eb2ff6bb5aaa2d9b2d4e45ed1d56b9c6304d7b8a;hb=2d897bb31419753af8e33b992d46ed355c1a53cd;hp=afb4b55d2ba92d94533e6a04f655aac4ac760fd2;hpb=d6c9085e748c4d61901aaea72f0e1546dcc7cdda;p=ndwebbie.git

diff --git a/NDWeb/Pages/LaunchConfirmation.pm b/NDWeb/Pages/LaunchConfirmation.pm
index afb4b55..eb2ff6b 100644
--- a/NDWeb/Pages/LaunchConfirmation.pm
+++ b/NDWeb/Pages/LaunchConfirmation.pm
@@ -17,16 +17,16 @@
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
 
-package ND::Web::Pages::LaunchCoonfirmation;
+package NDWeb::Pages::LaunchCoonfirmation;
 use strict;
 use warnings FATAL => 'all';
 use CGI qw/:standard/;
-use ND::Web::Include;
+use NDWeb::Include;
 use ND::Include;
 
-use base qw/ND::Web::XMLPage/;
+use base qw/NDWeb::XMLPage/;
 
-$ND::Web::Page::PAGES{launchConfirmation} = __PACKAGE__;
+$NDWeb::Page::PAGES{launchConfirmation} = __PACKAGE__;
 
 sub render_body {
 	my $self = shift;
@@ -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};
 			}