X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRaids.pm;h=1b1335274ee3fd004daf9f236f97aa9b668cf0a1;hp=d7125f771b5094402b456b53a471e8ae87e49a92;hb=612f5232bc9d8966b209da8f04cf0fb5619f867e;hpb=b6d8351387cf06b88e362a458aad1e0982e575dd

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index d7125f7..1b13352 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;
 
@@ -107,7 +106,6 @@ sub view : Local {
 	$c->forward('findRaid');
 	$raid = $c->stash->{raid};
 
-	$c->stash(raid => $raid->{id});
 	my $planet;
 	if ($c->user->planet){
 		my $query = $dbh->prepare(q{SELECT value, score,x,y FROM current_planet_stats WHERE pid = ?});
@@ -160,8 +158,11 @@ ORDER BY name,tick DESC
 			WHERE fid = ? ORDER BY num
 		});
 		my @missions;
+		my $tick = 0;
 		while (my $mission = $unitscans->fetchrow_hashref){
 			my @ships;
+			last if $mission->{tick} <= $tick;
+			$tick = $mission->{tick};
 			$ships->execute($mission->{fid});
 			while (my $ship = $ships->fetchrow_hashref){
 				push @ships,$ship;
@@ -189,9 +190,9 @@ ORDER BY name,tick DESC
 		$target->{claims} = \@claims;
 
 		my $num = pow(10,length($target->{score})-2);
-		$target->{score} = "Hidden"; #ceil($target->{score}/$num)*$num;
+		$target->{score} = "Hidden" unless $raid->{released_coords}; #ceil($target->{score}/$num)*$num;
 		$num = pow(10,length($target->{value})-2);
-		$target->{value} = "Hidden"; #ceil($target->{value}/$num)*$num;
+		$target->{value} = "Hidden" unless $raid->{released_coords}; #ceil($target->{value}/$num)*$num;
 		$num = pow(10,length($target->{size})-2);
 		$target->{size} = floor($target->{size}/$num)*$num;
 		$num = pow(10,length($target->{fleetvalue})-2);
@@ -223,7 +224,12 @@ sub edit : Local {
 
 	$c->stash(errors => $c->flash->{errors});
 
-	my $groups = $dbh->prepare(q{SELECT g.gid,g.groupname,raid FROM groups g LEFT OUTER JOIN (SELECT gid,raid FROM raid_access WHERE raid = ?) AS ra ON g.gid = ra.gid WHERE g.attack});
+	my $groups = $dbh->prepare(q{
+SELECT g.gid,g.groupname,raid
+FROM groups g
+	LEFT OUTER JOIN (SELECT gid,raid FROM raid_access WHERE raid = ?) AS ra USING (gid)
+WHERE gid IN (SELECT gid FROM group_roles WHERE role = 'attack_menu')
+		});
 	$groups->execute($raid ? $raid->{id} : undef);
 
 	my @addgroups;
@@ -312,24 +318,19 @@ sub postraidupdate : Local {
 
 	$c->forward('log',[$raid, 'BC updated raid']);
 
-	my $groups = $dbh->prepare(q{SELECT gid,groupname FROM groups WHERE attack});
-	my $delgroup = $dbh->prepare(q{DELETE FROM raid_access WHERE raid = ? AND gid = ?});
-	my $addgroup = $dbh->prepare(q{INSERT INTO raid_access (raid,gid) VALUES(?,?)});
+	my $delgroups = $dbh->prepare(q{DELETE FROM raid_access WHERE raid = $1 AND gid = ANY($2)});
+	my $addgroups = $dbh->prepare(q{INSERT INTO raid_access (raid,gid) VALUES($1,unnest($2::text[]))});
 
-	$groups->execute();
-	while (my $group = $groups->fetchrow_hashref){
-		my $query;
-		next unless defined $c->req->param($group->{gid});
-		my $command = $c->req->param($group->{gid});
-		if ( $command eq 'remove'){
-			$query = $delgroup;
-		}elsif($command eq 'add'){
-			$query = $addgroup;
-		}
-		if ($query){
-			$query->execute($raid,$group->{gid});
-			$c->forward('log',[$raid, "BC '$command' access for $group->{gid} ($group->{groupname})"]);
-		}
+	if ($c->req->param('add_group')){
+		my @groups = $c->req->param('add_group');
+		warn "GROUPS!!!!: @groups";
+		$addgroups->execute($raid,\@groups);
+		$c->forward('log',[$raid, "BC added access to groups: @groups"]);
+	}
+	if ($c->req->param('remove_group')){
+		my @groups = $c->req->param('remove_group');
+		$delgroups->execute($raid,\@groups);
+		$c->forward('log',[$raid, "BC removed access for groups: @groups"]);
 	}
 	$dbh->commit;
 
@@ -535,7 +536,7 @@ sub postcreate : Local {
 		$addtarget->execute($raid,\@targets,\@gals,$c->req->param('sizelimit'));
 		$c->forward('log',[$raid,"BC added planets (@targets) and the gals for (@gals)"]);
 	}
-	$dbh->do(q{INSERT INTO raid_access (raid,gid) VALUES(?,2)}
+	$dbh->do(q{INSERT INTO raid_access (raid,gid) VALUES(?,'M')}
 		,undef,$raid);
 	$dbh->commit;
 
@@ -592,55 +593,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
+SELECT id, amount FROM fleet_ships fs JOIN ship_stats s USING (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 +692,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) = @_;