X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FLaunchConfirmation.pm;h=581ad7b71c2498a1d9ce2f2f803215ff8a9c87ae;hb=95365cc1a5b8827230e5213bf4dd3377949af7f0;hp=92217db36443a0bf2aaed9ec0ace2af5b82b0bbf;hpb=b38002a1035bbdf3da505db7eccb2d706138da68;p=ndwebbie.git diff --git a/NDWeb/Pages/LaunchConfirmation.pm b/NDWeb/Pages/LaunchConfirmation.pm index 92217db..581ad7b 100644 --- a/NDWeb/Pages/LaunchConfirmation.pm +++ b/NDWeb/Pages/LaunchConfirmation.pm @@ -67,7 +67,7 @@ sub render_body { $DBH->begin_work; while ($missions =~ m/([^\n]+)\s+(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+) \s+\((?:(\d+)\+)?(\d+)\).*?(?:\d+hrs\s+)?\d+mins?\s+ - (Attack|Defend|Return|Fake Attack|Fake Defend) + (Attack|Defend|Return|Fake\ Attack|Fake\ Defend) (.*?) (?:Launching\ in\ tick\ (\d+),\ arrival\ in\ tick\ (\d+) |ETA:\ \d+,\ Return\ ETA:\ (\d+) @@ -108,7 +108,7 @@ sub render_body { my $ships = $11; my @ships; my $amount = 0; - while ($ships =~ m/((?:\w+ )*\w+)\s+\w+\s+(?:(?:\w+|-)\s+){3}(?: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|Structure Killer)\s+(\d+)/g){ $amount += $2; push @ships,{Ship => $1, Amount => $2}; }