my $dbh = $c->model;
my $launched = 0;
- my $query = $dbh->prepare(q{SELECT r.id,released_coords AS releasedcoords,tick,waves*COUNT(DISTINCT rt.id) AS waves,
- COUNT(rc.uid) AS claims, COUNT(nullif(rc.launched,false)) AS launched,COUNT(NULLIF(rc.uid > 0,true)) AS blocked
+ my $query = $dbh->prepare(q{
+ SELECT r.id,released_coords AS releasedcoords,tick
+ ,waves*COUNT(DISTINCT rt.id) AS waves,COUNT(rc.uid) AS claims
+ ,COUNT(nullif(rc.launched,false)) AS launched
+ ,COUNT(NULLIF(rc.uid > 0 OR rc.wave > r.waves,true)) AS blocked
FROM raids r JOIN raid_targets rt ON r.id = rt.raid
LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target
WHERE open AND not removed AND r.id
$c->stash(raids => \@raids);
if ($c->check_user_roles(qw/raids_info/)){
- my $query = $dbh->prepare(q{SELECT r.id,open ,tick,waves*COUNT(DISTINCT rt.id) AS waves,
- COUNT(rc.uid) AS claims, COUNT(nullif(rc.launched,false)) AS launched ,COUNT(NULLIF(uid > 0,true)) AS blocked
+ my $query = $dbh->prepare(q{
+ SELECT r.id,open ,tick
+ ,waves*COUNT(DISTINCT rt.id) AS waves,COUNT(rc.uid) AS claims
+ ,COUNT(nullif(rc.launched,false)) AS launched
+ ,COUNT(NULLIF(uid > 0 OR rc.wave > r.waves,true)) AS blocked
FROM raids r JOIN raid_targets rt ON r.id = rt.raid
LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target
WHERE not removed AND (not open
$c->stash(closedraids => \@raids);
- $query = $dbh->prepare(q{SELECT r.id,tick,waves*COUNT(DISTINCT rt.id) AS waves,
- COUNT(rc.uid) AS claims, COUNT(nullif(rc.launched,false)) AS launched ,COUNT(NULLIF(uid > 0,true)) AS blocked
+ $query = $dbh->prepare(q{
+ SELECT r.id,tick,waves*COUNT(DISTINCT rt.id) AS waves
+ ,COUNT(rc.uid) AS claims
+ ,COUNT(nullif(rc.launched,false)) AS launched
+ ,COUNT(NULLIF(uid > 0 OR rc.wave > r.waves,true)) AS blocked
FROM raids r JOIN raid_targets rt ON r.id = rt.raid
LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target
WHERE removed
if ($planet->{x} == $target->{x}){
$target->{style} = 'incluster';
}
- $target->{scorebash} = 'bash' if ($target->{score}/$planet->{score} < 0.4);
+ $target->{scorebash} = 'bash' if ($target->{score}/$planet->{score} < 0.6);
$target->{valuebash} = 'bash' if ($target->{value}/$planet->{value} < 0.4);
#next if ($target->{score}/$planet->{score} < 0.4) && ($target->{value}/$planet->{value} < 0.4);
}
- my $unitscans = $dbh->prepare(q{
- SELECT DISTINCT ON (name) i.id,i.name, i.tick, i.amount
- FROM fleets i
- WHERE i.uid = -1
- AND i.sender = ?
- AND i.mission = 'Full fleet'
- GROUP BY i.id,i.tick,i.name,i.amount
- ORDER BY name,i.tick DESC
+ my $unitscans = $dbh->prepare(q{
+SELECT DISTINCT ON (name) fid, name, tick, amount
+FROM fleets
+WHERE planet = ?
+ AND mission = 'Full fleet'
+GROUP BY fid,tick,name,amount
+ORDER BY name,tick DESC
});
$unitscans->execute($target->{planet});
my $ships = $dbh->prepare(q{SELECT ship,amount FROM fleet_ships
- WHERE id = ? ORDER BY num
+ WHERE fid = ? ORDER BY num
});
my @missions;
while (my $mission = $unitscans->fetchrow_hashref){
my @ships;
- $ships->execute($mission->{id});
+ $ships->execute($mission->{fid});
while (my $ship = $ships->fetchrow_hashref){
push @ships,$ship;
}
}elsif ($order && $order eq 'race'){
$order .= ' ASC';
}else {
- $order .= 'p.x,p.y,p.z';
+ $order = 'p.x,p.y,p.z';
}
my $targetquery = $dbh->prepare(qq{SELECT r.id,coords(x,y,z),comment,size
- ,score,value,race,planet_status,relationship,comment,r.planet, s.scans
+ ,score,value,race,planet_status,relationship,r.planet, s.scans
+ ,COALESCE(max(rc.wave),0) AS waves
FROM raid_targets r
JOIN current_planet_stats p ON p.id = r.planet
LEFT OUTER JOIN ( SELECT planet, array_accum(s::text) AS scans
) s
GROUP BY planet
) s ON s.planet = r.planet
+ LEFT OUTER JOIN raid_claims rc ON r.id = rc.target
WHERE r.raid = ?
+ GROUP BY r.id,x,y,z,comment,size,score,value,race
+ ,planet_status,relationship,comment,r.planet, s.scans
+ ,sizerank,scorerank,xprank,valuerank
ORDER BY $order
});
my $claims = $dbh->prepare(q{ SELECT username,launched FROM raid_claims
my @targets;
while (my $target = $targetquery->fetchrow_hashref){
my @waves;
- for my $i (1 .. $raid->{waves}){
+ if ($target->{waves} < $raid->{waves}){
+ $target->{waves} = $raid->{waves}
+ }
+ for my $i (1 .. $target->{waves}){
$claims->execute($target->{id},$i);
my $claimers;
if ($claims->rows != 0){
$c->res->redirect($c->uri_for('targetlist',join ',',$c->req->param('alliances')));
}
+sub targetcalc : Local {
+ my ($self, $c, $target) = @_;
+ my $dbh = $c->model;
+
+ my $target = $dbh->selectrow_hashref(q{
+SELECT p.id,p.value,p.score,metal_roids, crystal_roids, eonium_roids, ds.total, race
+FROM raids r
+ JOIN raid_targets rt ON r.id = rt.raid
+ JOIN current_planet_stats p ON rt.planet = p.id
+ LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet
+ LEFT OUTER JOIN current_development_scans ds ON p.id = ds.planet
+WHERE rt.id = ? AND r.open AND not r.removed
+ AND r.id IN (SELECT raid FROM raid_access NATURAL JOIN groupmembers WHERE uid = ?)
+ },undef,$target,$c->user->id);
+
+ my $planet = $dbh->selectrow_hashref(q{
+SELECT score,value FROM current_planet_stats WHERE id = $1
+ },undef,$c->user->planet);
+
+ my %races = (Ter => 1, Cat => 2, Xan => 3, Zik => 4, Etd => 5);
+ my @query = (
+ "def_1_race=$races{$target->{race}}",
+ "def_structures=$target->{total}",
+ "def_metal_asteroids=$target->{metal_roids}",
+ "def_crystal_asteroids=$target->{crystal_roids}",
+ "def_eonium_asteroids=$target->{eonium_roids}",
+ #"def_planet_value_1=$target->{value}",
+ #"def_planet_score_1=$target->{score}",
+ "att_planet_value_1=$planet->{value}",
+ "att_planet_score_1=$planet->{score}",
+ );
+
+ my $fleets = $dbh->prepare(q{
+SELECT DISTINCT ON (name) name, tick, fid FROM fleets
+WHERE planet = $1 AND mission = 'Full fleet'
+ORDER BY name ASC, tick DESC
+ });
+ my $ships = $dbh->prepare(q{
+SELECT id, amount FROM fleet_ships fs JOIN ship_stats s ON s.name = fs.ship
+WHERE fid = $1
+ });
+
+ for ('def','att'){
+ my $planet = $c->user->planet;
+ $planet = $target->{id} if /^def/;
+ $fleets->execute($planet);
+ my $nrfleets = 0;
+ my $tick = 0;
+ while (my $fleet = $fleets->fetchrow_hashref){
+ $ships->execute($fleet->{fid});
+ next unless $tick < $fleet->{tick};
+ $tick = $fleet->{tick};
+ ++$nrfleets;
+ while (my $ship = $ships->fetchrow_hashref){
+ push @query, "${_}_${nrfleets}_$ship->{id}=$ship->{amount}";
+ }
+ }
+ push @query, "${_}_fleets=$nrfleets";
+ }
+ my $query = join '&', @query;
+ #$c->res->body("http://game.planetarion.com/bcalc.pl?$query");
+ $c->res->redirect("http://game.planetarion.com/bcalc.pl?$query");
+}
+
+
sub listAlliances : Private {
my ($self, $c) = @_;
my @alliances;
projects / ndwebbie.git / blobdiff