my $query = $DBH->prepare(q{
SELECT coords(t.x,t.y,t.z), i.eta, i.tick, rt.id AS ndtarget, rc.launched, inc.landing_tick
FROM users u
- LEFT OUTER JOIN (SELECT * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+ LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r
JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target
AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick
- LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid
+ LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid AND i.tick = rt.tick + rc.wave - 1
LEFT OUTER JOIN (SELECT sender, eta, landing_tick FROM calls c
JOIN incomings i ON i.call = c.id) inc ON inc.sender = i.target
AND (inc.landing_tick + inc.eta) >= i.tick
$query->execute($user->{uid}) or $error .= $DBH->errstr;
my @nd_attacks;
my @other_attacks;
- my $ndi = 0;
- my $oi = 0;
while (my $intel = $query->fetchrow_hashref){
my $attack = {target => $intel->{coords}, tick => $intel->{tick}};
if ($intel->{ndtarget}){
}else{
$attack->{Other} = 'Launched at a tick that was not claimed';
}
- $attack->{ODD} = ++$ndi % 2;
push @nd_attacks, $attack;
}else{
- $attack->{ODD} = ++$oi % 2;
push @other_attacks, $attack;
}
}
$query = $DBH->prepare(q{
SELECT coords(t.x,t.y,t.z),t.alliance_id, t.alliance, i.eta, i.tick, i.ingal
FROM users u
- JOIN (SELECT * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+ JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
WHERE u.uid = $1 AND (i.mission = 'Defend' OR i.mission = 'AllyDef')
ORDER BY (i.tick - i.eta)
my @nd_def;
my @ingal_def;
my @other_def;
- $ndi = 0;
- $oi = 0;
- my $gi = 0;
while (my $intel = $query->fetchrow_hashref){
my $def = {target => $intel->{coords}.(defined $intel->{alliance} ? " ($intel->{alliance})" : ''), tick => $intel->{tick}};
if (defined $intel->{alliance_id} && $intel->{alliance_id} == 1){
- $def->{ODD} = ++$ndi % 2;
push @nd_def, $def;
}elsif($intel->{ingal}){
- $def->{ODD} = ++$gi % 2;
push @ingal_def, $def;
}else{
- $def->{ODD} = ++$oi % 2;
push @other_def, $def;
}
}
FROM users u
JOIN groupmembers gm USING (uid)
LEFT OUTER JOIN (SELECT DISTINCT ON (planet) planet,tick from scans where type = 'News' ORDER BY planet,tick DESC) n USING (planet)
- LEFT OUTER JOIN (SELECT * FROM intel WHERE amount = -1) i ON i.sender = u.planet
+ LEFT OUTER JOIN (SELECT DISTINCT name,eta,tick,sender,target,mission,ingal FROM fleets WHERE amount IS NULL) i ON i.sender = u.planet
LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
LEFT OUTER JOIN (SELECT rt.id,planet,tick FROM raids r
JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.planet = i.target
AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick
- LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid
+ LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid AND i.tick = rt.tick + rc.wave - 1
WHERE gm.gid = 2
GROUP BY u.uid,u.username,u.attack_points, u.defense_points,n.tick
ORDER BY $order DESC});
$query->execute() or $error .= $DBH->errstr;
my @members;
- my $i = 0;
while (my $intel = $query->fetchrow_hashref){
- $i++;
- $intel->{ODD} = $i % 2;
$intel->{OLD} = 'OLD' if (!defined $intel->{tick} || $self->{TICK} > $intel->{tick} + 60);
delete $intel->{tick};
push @members,$intel;