});
my @intel;
while ($intel =~ m/(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)
- \*?\s+(.+)(?:Ter|Cat|Xan|Zik|Etd)?
- \s+(\d+)\s+(Attack|Defend)\s+(\d+)/gx){
+ \*?\s+(A|D)\s+(.+?)\s+(?:(?:Ter|Cat|Xan|Zik|Etd)\s+)?(\d+)\s+(\d+)/gx){
my $ingal = ($1 == $4 && $2 == $5) || 0;
my $lt = $tick + $10;
my $back = ($ingal ? $lt + 4 : undef);
+ my $mission = $7 eq 'A' ? 'Attack' : 'Defend';
eval {
- $addintel->execute($7,$9,$lt,$1,$2,$3,$4,$5,$6,$tick,$10,$8
+ $addintel->execute($8,$mission,$lt,$1,$2,$3,$4,$5,$6,$tick,$10,$9
,$ingal,$back, $c->user->id);
push @intel,"Added $&";
};
});
my $msg = $c->req->param('message');
- while ($msg =~ /expand\s+(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\s+([^:]*\S+)\s+(?:Ter|Cat|Xan|Zik|Etd)\s+([\d,]+)\s+(\d+)/gc
- || $msg =~ /(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)\s+\((?:Ter|Cat|Xan|Zik|Etd)\)\s+([^,]*\S+)\s+([\d,]+)\s+(\d+)\s+\(\d+\)/gc){
+ while ($msg =~ m/(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\*?\s+A\s+(.+?)\s+(Ter|Cat|Xan|Zik|Etd)\s+(\d+)\s+(\d+)/gc
+ ||$msg =~ /expand\s+(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\s+([^:]*\S+)\s+(Ter|Cat|Xan|Zik|Etd)\s+([\d,]+)\s+(\d+)/gc
+ || $msg =~ /(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)\s+\((Ter|Cat|Xan|Zik|Etd)\)\s+([^,]*\S+)\s+([\d,]+)\s+(\d+)\s+\(\d+\)/gc){
my $inc = {message => $&};
- my $amount = $8;
+ my $amount = $9;
{
$amount =~ s/,//g;
}
my $uid = $dbh->selectrow_array($user,undef,$1,$2,$3);
die '<i>No user with these coords</i>' unless $uid;
- my $call = $dbh->selectrow_array($call,undef,$uid,$9);
+ my $call = $dbh->selectrow_array($call,undef,$uid,$10);
if ($call){
my $pid = $dbh->selectrow_hashref($fleet,undef,$4,$5,$6,$amount,$7,$call);
die '<i>Duplicate</i>' if $pid;
}
- $irc->execute($c->user->id, $inc->{message});
+ my $message = "$1:$2:$3 $4:$5:$6 $7 $8 $amount $10";
+ $irc->execute($c->user->id, $message);
$inc->{status} = '<b>Added</b>';
} catch {
}else{
$m->{pid} = $c->user->planet;
}
- }elsif ($m->{target} =~ /^(\d+):(\d+):(\d+)$/) {
+ }elsif ($m->{target} ~~ /^(\d+):(\d+):(\d+)$/) {
$m->{pid} = $dbh->selectrow_array($findplanet,undef,$1,$2,$3);
unless ($m->{pid}){
$m->{warning} = "No planet at $m->{target}, try again next tick.";
$missions =~ s/\(\s/(/g;
$missions =~ s/\s\)/)/g;
my $returnetare = qr/(\d+) \s+
- Arrival:(\d+)/sx;
- my $missionetare = qr/(\d+) (\s+ \(\+\d+\))? \s+
- Arrival:(\d+) \s+
+ Arrival:\s*(\d+)/sx;
+ 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>.+?)
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;
$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;
amount => 0,
ships => []
};
- while ($match{ships}->[0] =~ m/(\w+)\s+(FI|CO|FR|DE|CR|BS)[^\d]+((?:\d+\s*){5})/g){
+ while ($match{ships}->[0] =~ m/(\w[ \w]+?)\s+(FI|CO|FR|DE|CR|BS)[^\d]+((?:\d+\s*){5})/g){
my $ship = $1;
my @amounts = split /\D+/, $3;
my $base = shift @amounts;