AND (i.tick > $2 - 14 OR i.mission = 'Full fleet')
ORDER BY i.tick,x,y,z
});
- my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE id = ?');
+ my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE id = ? ORDER BY num');
$outgoings->execute($call->{planet},$call->{landing_tick});
my @fleets;
while (my $fleet = $outgoings->fetchrow_hashref){
ORDER BY i.tick,x,y,z
});
$query->execute($planet_id);
- my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships WHERE id = ?});
+ my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships
+ WHERE id = ? ORDER BY num
+ });
my @missions;
while (my $mission = $query->fetchrow_hashref){
$mission->{CLASS} = $mission->{mission};
$query = $DBH->prepare(q{SELECT f.id, coords(x,y,z) AS target, mission
, f.amount, tick, back
FROM fleets f
-JOIN fleet_ships fs USING (id)
LEFT OUTER JOIN current_planet_stats p ON f.target = p.id
WHERE f.uid = ? AND f.sender = ? AND
(back >= ? OR (tick >= tick() - 24 AND name = 'Main'))
ORDER BY x,y,z,mission,tick
});
- my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships where id = ?});
+ my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships
+ WHERe id = ? ORDER BY num
+ });
$query->execute($self->{UID},$self->{PLANET},$self->{TICK}) or warn $DBH->errstr;
my @fleets;
ORDER BY name,i.tick DESC
});
$unitscans->execute($target->{planet}) or warn $DBH->errstr;
- my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships WHERE id = ?});
+ my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships
+ WHERE id = ? ORDER BY num
+ });
my @missions;
while (my $mission = $unitscans->fetchrow_hashref){
my @ships;