X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=inline;f=NDWeb%2FPages%2FCheck.pm;h=a0062ab3568b7a67327e171ecdf68d2cff7b67ea;hb=253b06f925b12f8b5d3528dbf932a4c9427508aa;hp=e12d438c519711d4417ed7c40e9830baecc681a6;hpb=a074bd17f5e8ba341a22bbfca1da7093b8351774;p=ndwebbie.git diff --git a/NDWeb/Pages/Check.pm b/NDWeb/Pages/Check.pm index e12d438..a0062ab 100644 --- a/NDWeb/Pages/Check.pm +++ b/NDWeb/Pages/Check.pm @@ -19,8 +19,7 @@ package NDWeb::Pages::Check; use strict; -use warnings FATAL => 'all'; -no warnings qw(uninitialized); +use warnings; use ND::Include; use CGI qw/:standard/; use NDWeb::Include; @@ -57,7 +56,7 @@ sub render_body { return $BODY; } - if ($self->isMember && param('cmd') eq 'arbiter'){ + if ($self->isMember && defined param('cmd') && param('cmd') eq 'arbiter'){ my $query = $DBH->prepare(q{SELECT count(*) AS friendlies FROM current_planet_stats WHERE x = ? AND y = ? AND (planet_status IN ('Friendly','NAP') OR relationship IN ('Friendly','NAP'))}); my ($count) = $DBH->selectrow_array($query,undef,$x,$y); @@ -79,7 +78,7 @@ sub render_body { $extra_columns = ", planet_status,hit_us, alliance,relationship"; } - my $query = $DBH->prepare(qq{Select id,coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race, + my $query = $DBH->prepare(qq{Select p.id,coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race,gov, size, size_gain, size_gain_day, score,score_gain,score_gain_day, value,value_gain,value_gain_day, @@ -88,7 +87,15 @@ sub render_body { scorerank,scorerank_gain,scorerank_gain_day, valuerank,valuerank_gain,valuerank_gain_day, xprank,xprank_gain,xprank_gain_day, - p.value - p.size*200 - coalesce(c.metal+c.crystal+c.eonium,0)/150 - coalesce(c.structures,(SELECT avg(structures) FROM covop_targets)::int)*1500 AS fleetvalue,(c.metal+c.crystal+c.eonium)/100 AS resvalue $extra_columns from current_planet_stats_full p LEFT OUTER JOIN covop_targets c ON p.id = c.planet where x = ? AND y = ? $where order by x,y,z asc}); + p.value - p.size*200 - + COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150 - + COALESCE(ss.total ,(SELECT COALESCE(avg(total),0) FROM structure_scans)::int)*1500 AS fleetvalue + ,(metal+crystal+eonium)/100 AS resvalue $extra_columns + FROM current_planet_stats_full p + LEFT OUTER JOIN planet_scans ps ON p.id = ps.planet + LEFT OUTER JOIN structure_scans ss ON p.id = ss.planet + WHERE x = ? AND y = ? $where ORDER BY x,y,z ASC + }); if (defined $z){ $query->execute($x,$y,$z); @@ -100,7 +107,6 @@ sub render_body { } my @planets; my $planet_id = undef; - my $i = 0; while (my $planet = $query->fetchrow_hashref){ $planet_id = $planet->{id}; for my $type (qw/size score value xp/){ @@ -115,12 +121,10 @@ sub render_body { } } if ($self->isMember && ($self->isOfficer || $self->isBC)){ - if ($z && $planet->{alliance} eq 'NewDawn' && not ($self->isHC || $self->isOfficer)){ + if ($z && defined $planet->{alliance} && $planet->{alliance} eq 'NewDawn' && not ($self->isHC || $self->isOfficer)){ log_message $ND::UID,"BC browsing ND planet $planet->{coords} tick $self->{TICK}"; } } - $i++; - $planet->{ODD} = $i % 2; delete $planet->{id}; push @planets,$planet; } @@ -130,82 +134,111 @@ sub render_body { $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}); + SELECT i.id,i.mission, i.name, i.tick AS landingtick,MIN(eta) AS eta + , i.amount, coords(x,y,z) AS target + FROM fleets i + LEFT OUTER JOIN (planets + NATURAL JOIN planet_stats) t ON i.target = t.id + AND t.tick = ( SELECT MAX(tick) FROM planet_stats) + WHERE i.uid = -1 + AND i.sender = ? + AND (i.tick > tick() - 14 OR i.mission = 'Full fleet') + GROUP BY i.id,x,y,z,i.mission,i.tick,i.name,i.amount,i.ingal,i.uid + ORDER BY i.tick,x,y,z + }); $query->execute($planet_id); + my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships + WHERE id = ? ORDER BY num + }); my @missions; - while (my ($mission,$landingtick,$eta,$amount,$target) = $query->fetchrow){ - push @missions,{Target => $target, Mission => $mission, LandingTick => $landingtick - , ETA => $eta, Amount => $amount}; + while (my $mission = $query->fetchrow_hashref){ + $mission->{CLASS} = $mission->{mission}; + my @ships; + $ships->execute($mission->{id}); + while (my $ship = $ships->fetchrow_hashref){ + push @ships,$ship; + } + push @ships, {ship => 'No', amount => 'ships'} if @ships == 0; + $mission->{ships} = \@ships; + push @missions,$mission; } $BODY->param(Missions => \@missions); - my @scans; - $query = $DBH->prepare(q{SELECT value,tick FROM planet_stats + $query = $DBH->prepare(q{ + SELECT i.id,i.mission, i.name, i.tick AS landingtick,MIN(eta) AS eta + , i.amount, coords(x,y,z) AS sender + FROM fleets i + LEFT OUTER JOIN (planets + NATURAL JOIN planet_stats) s ON i.sender = s.id + AND s.tick = ( SELECT MAX(tick) FROM planet_stats) + WHERE i.uid = -1 + AND i.target = ? + AND (i.tick > tick() - 14 OR i.mission = 'Full fleet') + GROUP BY i.id,x,y,z,i.mission,i.tick,i.name,i.amount,i.ingal,i.uid + ORDER BY i.tick,x,y,z + }); + $query->execute($planet_id); + my @incomings; + while (my $mission = $query->fetchrow_hashref){ + $mission->{CLASS} = $mission->{mission}; + my @ships; + $ships->execute($mission->{id}); + while (my $ship = $ships->fetchrow_hashref){ + push @ships,$ship; + } + push @ships, {ship => 'No', amount => 'ships'} if @ships == 0; + $mission->{ships} = \@ships; + push @incomings,$mission; + } + $BODY->param(Incomings => \@incomings); + + $query = $DBH->prepare(q{SELECT value,value_gain AS gain,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 |