X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRaids.pm;h=d13b6704895b533fddf03e6ae9e6298c7dc6e2ae;hb=4f142aefe97e62d8510e8f4c69e18cdad8766d13;hp=98b3a39e8012033296983490f3d7af9152565eb1;hpb=27f93c2b1d0e6c9c8a073b18ed508cf68ded6003;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm index 98b3a39..d13b670 100644 --- a/lib/NDWeb/Controller/Raids.pm +++ b/lib/NDWeb/Controller/Raids.pm @@ -110,9 +110,9 @@ sub view : Local { , p.x,p.y,p.z, race , p.value - p.size*200 - COALESCE(ps.metal+ps.crystal+ps.eonium,0)/150 - - COALESCE(ss.total ,(SELECT + COALESCE(ds.total ,(SELECT COALESCE(avg(total),0) FROM - structure_scans)::int)*1500 AS fleetvalue + current_development_scans)::int)*1500 AS fleetvalue ,(metal+crystal+eonium)/100 AS resvalue, comment , hidden, light, medium, heavy, metal, crystal, eonium ,metal_roids, crystal_roids, eonium_roids @@ -121,8 +121,7 @@ sub view : Local { FROM current_planet_stats p JOIN raid_targets r ON p.id = r.planet LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet - LEFT OUTER JOIN current_structure_scans ss ON p.id = ss.planet - LEFT OUTER JOIN current_tech_scans ts ON p.id = ts.planet + LEFT OUTER JOIN current_development_scans ds ON p.id = ds.planet WHERE r.raid = $1 AND NOT COALESCE(p.x = $2 AND p.y = $3,False) ORDER BY size}); @@ -138,23 +137,22 @@ sub view : Local { #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; } @@ -193,7 +191,7 @@ sub view : Local { $target->{resvalue} = floor($target->{resvalue}/$num)*$num; } $target->{comment} = parseMarkup($target->{comment}) if ($target->{comment}); - $target->{hidden} = int($target->{hidden} / 100); + $target->{hidden} = int($target->{hidden} / 100) if $target->{hidden}; push @targets,$target; } @@ -235,10 +233,11 @@ sub edit : Local { }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 AS planetstatus,relationship,comment,r.planet, s.scans + 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 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 @@ -434,7 +433,7 @@ sub open : Local { $c->forward('log',[$raid, "BC opened raid"]); $c->model->commit; - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub close : Local { @@ -446,7 +445,7 @@ sub close : Local { $c->forward('log',[$raid, "BC closed raid"]); $c->model->commit; - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub remove : Local { @@ -458,7 +457,7 @@ sub remove : Local { $c->forward('log',[$raid, "BC removed raid"]); $c->model->commit; - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub showcoords : Local { @@ -470,7 +469,7 @@ sub showcoords : Local { $c->forward('log',[$raid, "BC released coords"]); $c->model->commit; - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub hidecoords : Local { @@ -482,7 +481,7 @@ sub hidecoords : Local { $c->forward('log',[$raid, "BC hid coords"]); $c->model->commit; - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub create : Local { @@ -573,6 +572,71 @@ sub posttargetalliances : Local { $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;