X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRaids.pm;h=b756d565b13191ffa59315a93ede926b408d2adb;hb=1b1eb5ca9edbf7914f749f592a959f353a0968ca;hp=83b519e845c78446263cc17c1edc23666df4151a;hpb=84d8f30ecbac4d41009e3f979526a47557f49225;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm index 83b519e..b756d56 100644 --- a/lib/NDWeb/Controller/Raids.pm +++ b/lib/NDWeb/Controller/Raids.pm @@ -6,7 +6,6 @@ use parent 'Catalyst::Controller'; use feature ':5.10'; use POSIX qw/floor pow/; -use List::Util qw/min/; use NDWeb::Include; use ND::Include; @@ -592,55 +591,98 @@ sub targetcalc : Local { my ($self, $c, $target) = @_; my $dbh = $c->model; - $target = $dbh->selectrow_hashref(q{ -SELECT p.id,p.value,p.score,metal_roids, crystal_roids, eonium_roids, ds.total, race + $c->stash(target => $dbh->selectrow_hashref(q{ +SELECT pid,metal_roids, crystal_roids, eonium_roids, ds.total 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 + LEFT OUTER JOIN current_planet_scans ps USING (pid) + LEFT OUTER JOIN current_development_scans ds USING (pid) 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); + },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 $fleets = $dbh->prepare(q{ +SELECT DISTINCT ON (name) name, tick, fid, race + ,COALESCE($2,score) AS score, COALESCE($2, value) AS value +FROM fleets LEFT OUTER JOIN current_planet_stats p USING (pid) +WHERE pid = $1 AND mission = 'Full fleet' +ORDER BY name ASC, tick DESC + }); - 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}", - ); + for ('def','att'){ + if (/^def/){ + $fleets->execute($c->stash->{target}->{pid}, 0); + }else{ + $fleets->execute($c->user->planet,undef); + } + $c->stash($_ => $fleets->fetchall_arrayref({})); + } + + $c->forward('calcredir'); +} + +sub fleetcalc : Local { + my ($self, $c, $fid) = @_; + my $dbh = $c->model; + + $c->stash(target => $dbh->selectrow_hashref(q{ +SELECT pid,metal_roids, crystal_roids, eonium_roids, ds.total +FROM launch_confirmations lc + LEFT OUTER JOIN current_planet_scans ps USING (pid) + LEFT OUTER JOIN current_development_scans ds USING (pid) +WHERE uid = $1 AND fid = $2 + },undef,$c->user->id,$fid)); my $fleets = $dbh->prepare(q{ -SELECT DISTINCT ON (name) name, tick, fid FROM fleets -WHERE planet = $1 AND mission = 'Full fleet' +SELECT DISTINCT ON (name) name, tick, fid, race + ,score AS score, value AS value +FROM fleets LEFT OUTER JOIN current_planet_stats p USING (pid) +WHERE pid = $1 AND mission = 'Full fleet' ORDER BY name ASC, tick DESC }); + + $fleets->execute($c->stash->{target}->{pid}); + $c->stash(def => $fleets->fetchall_arrayref({})); + + $fleets = $dbh->prepare(q{ +SELECT tick, fid, race ,score , value +FROM fleets f LEFT OUTER JOIN current_planet_stats p USING (pid) +WHERE fid = $1 AND pid = $2 + }); + $fleets->execute($fid, $c->user->planet); + $c->stash(att => $fleets->fetchall_arrayref({})); + + $c->forward('calcredir'); +} + +sub calcredir : Private { + my ($self, $c) = @_; + my $dbh = $c->model; + + my @query = ( + "def_structures=".($c->stash->{target}->{total} // 0), + "def_metal_asteroids=".($c->stash->{target}->{metal_roids} // 0), + "def_crystal_asteroids=".($c->stash->{target}->{crystal_roids} // 0), + "def_eonium_asteroids=".($c->stash->{target}->{eonium_roids} // 0), + ); + my $ships = $dbh->prepare(q{ SELECT id, amount FROM fleet_ships fs JOIN ship_stats s ON s.name = fs.ship WHERE fid = $1 }); + my %races = (Ter => 1, Cat => 2, Xan => 3, Zik => 4, Etd => 5); 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){ + for my $fleet (@{$c->stash->{$_}}){ $ships->execute($fleet->{fid}); next unless $tick < $fleet->{tick}; $tick = $fleet->{tick}; ++$nrfleets; + push @query, "${_}_planet_value_${nrfleets}=$fleet->{value}"; + push @query, "${_}_planet_score_${nrfleets}=$fleet->{score}"; + push @query, "${_}_${nrfleets}_race=$races{$fleet->{race}}"; while (my $ship = $ships->fetchrow_hashref){ push @query, "${_}_${nrfleets}_$ship->{id}=$ship->{amount}"; } @@ -648,10 +690,70 @@ WHERE fid = $1 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 retal : Local { + my ($self, $c) = @_; + my $dbh = $c->model; + + my $incs = $dbh->prepare(q{ +SELECT coords(x,y,z),pid,race,size,score,value,alliance + ,array_agg(i.eta) AS eta,array_agg(amount) AS amount + ,array_agg(shiptype) AS type,array_agg(fleet) AS name + ,array_agg(c.landing_tick) AS landing +FROM calls c + JOIN incomings i USING (call) + JOIN current_planet_stats p USING (pid) +WHERE c.status <> 'Covered' AND c.landing_tick BETWEEN tick() AND tick() + 6 + AND c.landing_tick + GREATEST(i.eta,7) > tick() + 10 +GROUP BY pid,race,x,y,z,size,score,value,alliance +ORDER BY size DESC + }); + $incs->execute; + $c->stash(planets => $incs->fetchall_arrayref({})); + +} + +sub postcreateretal : Local { + my ($self, $c) = @_; + my $dbh = $c->model; + + $dbh->begin_work; + my $query = $dbh->prepare(q{INSERT INTO raids (tick,waves,message) VALUES(?,?,?) RETURNING (id)}); + $query->execute($c->req->param('tick'),$c->req->param('waves') + ,html_escape $c->req->param('message')); + my $raid = $query->fetchrow_array; + $c->forward('log',[$raid,"Created retal raid landing at tick: ".$c->req->param('tick')]); + + if ($c->req->param('target')) { + my @targets = $c->req->param('target'); + + my $addtarget = $dbh->prepare(q{ +INSERT INTO raid_targets(raid,pid,comment) ( + SELECT $1,pid,array_to_string(array_agg( + fleet || ': eta=' || eta || ', amount=' || amount || ', type=' || shiptype + || ' landing=' || landing_tick || 'back=' || landing_tick + eta + ),E'\n') + FROM calls c + JOIN incomings i USING (call) + JOIN current_planet_stats p USING (pid) + WHERE c.status <> 'Covered' AND c.landing_tick BETWEEN tick() AND tick() + 6 + AND c.landing_tick + GREATEST(i.eta,7) > tick() + 10 + AND pid = ANY ($2) + GROUP BY pid + ) + }); + $addtarget->execute($raid,\@targets); + $c->forward('log',[$raid,"BC added planets (@targets) to retal_raid"]); + } + $dbh->do(q{INSERT INTO raid_access (raid,gid) VALUES(?,'M')} + ,undef,$raid); + $dbh->commit; + + $c->res->redirect($c->uri_for('edit',$raid)); +} + sub listAlliances : Private { my ($self, $c) = @_;