X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=check.pl;fp=check.pl;h=da2444af513fd6e0c12868f784cf87814c547bd0;hb=ab3994fef5289f5763813c67503538e872c80955;hp=ec73c68f74936bccc5a1781c31b6cb17d0411baf;hpb=82693b38e749aba03cee1f9067e589ed2edec139;p=ndwebbie.git diff --git a/check.pl b/check.pl index ec73c68..da2444a 100644 --- a/check.pl +++ b/check.pl @@ -59,8 +59,10 @@ if (defined $z){ $query->execute($x,$y); } my @planets; +my $planet_id = undef; while (my ($id,$coords,$planet,$race,$size,$score,$value,$xp,$sizerank,$scorerank,$valuerank,$xprank ,$fleetvalue,$resvalue,$planet_status,$hit_us,$alliance,$relationship,$nick) = $query->fetchrow){ + $planet_id = $id; my %planet = (Coords => $coords, Planet => $planet, Race => $race, Size => "$size ($sizerank)" , Score => "$score ($scorerank)", Value => "$value ($valuerank)", XP => "$xp ($xprank)" , FleetValue => "$fleetvalue ($resvalue)"); @@ -76,4 +78,84 @@ while (my ($id,$coords,$planet,$race,$size,$score,$value,$xp,$sizerank,$scoreran } $BODY->param(Planets => \@planets); +if ($planet_id){ + $BODY->param(OnePlanet => 1); + + my $query = $DBH->prepare(q{ +SELECT i.mission, i.tick AS landingtick,MIN(eta) AS eta, i.amount, coords(p.x,p.y,p.z) AS target +FROM intel i + JOIN (planets + NATURAL JOIN planet_stats) p ON i.target = p.id + JOIN (planets + NATURAL JOIN planet_stats) p2 ON i.sender = p2.id +WHERE p.tick = ( SELECT max(tick) FROM planet_stats) AND i.tick > $TICK AND i.uid = -1 + AND p2.tick = p.tick AND p2.id = ? +GROUP BY p.x,p.y,p.z,p2.x,p2.y,p2.z,i.mission,i.tick,i.amount,i.ingal,i.uid +ORDER BY p.x,p.y,p.z}); + $query->execute($planet_id); + my @missions; + while (my ($mission,$landingtick,$eta,$amount,$target) = $query->fetchrow){ + push @missions,{Target => $target, Mission => $mission, LandingTick => $landingtick + , ETA => $eta, Amount => $amount}; + } + $BODY->param(Missions => \@missions); + + my @scans; + my $query = $DBH->prepare(q{SELECT value,tick FROM planet_stats + WHERE id = ? AND tick > tick() - 24}); + my $scan = q{ +
Value the last 24 ticks
+Tick | Value | Difference |
---|---|---|
$tick | $value | $diff |
Previous Coords
+Tick | Value | Difference |
---|---|---|
$tick | $x:$y:$z |