X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=19f7a2d128d784baefc8697a24310df0ff0d450d;hb=dc6cd8e0f865330c1dd3c89122e62f326314f96a;hp=208a8c8d6da71ab5407f939de8a13b66b5cf0fdd;hpb=8741b1f83afd43088761bfed12ecdbe7b5aba6b4;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index 208a8c8..19f7a2d 100644
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -586,14 +586,14 @@ sub parseconfirmations {
 	$missions =~ s/\s\)/)/g;
 	my $returnetare = qr/(\d+) \s+
 		Arrival:\s*(\d+)/sx;
-	my $missionetare = qr/(\d+) (\s* \+ \s* \d+)? \s+
+	my $missionetare = qr/\s* (\d+ \+ \s*)? (\d+) \s+
 		Arrival:\s*(\d+) \s+
 		\QReturn ETA:\E\s*(?:(?<eta>Instant) \s+ Cancel \s+ Order
 			| (?<eta>\d+) \s+ Ticks \s+ Recall \s+ Fleet)/sx;
 	my $etare = qr/(Galaxy:\d+Universe:\d+(?:Alliance:\d+)?
 		|$missionetare
 		|$returnetare)\s*/x;
-	my $missre = qr/((?:Fake\ )?\w+)\s*/x;
+	my $missre = qr/((?:Alliance\ Standby)|(?:(?:Fake\ )?\w+))\s*/x;
 	if ($missions =~ m/
 		Ships \s+ Cla \s+ T\s?1 \s+ T\s?2 \s+ T\s?3 \s+ Base \s+ \(i\) \s (?<name>.+?) \s+ \(i\) \s+ (?<name>.+?) \s+ \(i\) \s+ (?<name>.+?) \s+ \(i\) \s+ TOTAL \s+
 		(?<ships>.+?)
@@ -629,10 +629,16 @@ sub parseconfirmations {
 				next;
 			}
 
+			if ($missions[0] eq 'Alliance Standby'){
+				shift @missions;
+				push @slots,\%mission;
+				next;
+			}
+
 			given(shift @etas){
 				when(/$missionetare/sx){
 					$mission{tick} = $3;
-					$mission{eta} = $1 + $+{eta};
+					$mission{eta} = $2 + $+{eta};
 					$mission{back} = $3 + $mission{eta} - 1;
 					$mission{target} = shift @targets;
 					$mission{lt} = shift @lts;
@@ -645,7 +651,7 @@ sub parseconfirmations {
 					$mission{target} = shift @targets;
 					$mission{lt} = shift @lts;
 					$mission{mission} = shift @missions;
-					die 'Did you forget some at the end?' if $mission{mission} ne 'Return';
+					die "Did you forget some at the end? '$mission{mission}'" if $mission{mission} ne 'Return';
 				}
 			}
 			push @slots,\%mission;