X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=include.pl;h=0bf16a8c3510283014b5f2f0346f9087f7e77f3d;hb=870325485adff6e11c7d43fd9a3146f943ab735b;hp=c5a5acf39417f6d525837f284a0c837eea5a62f2;hpb=fae2bc23805ceb29510c1c8124ddb9179a6cc0af;p=ndwebbie.git diff --git a/include.pl b/include.pl index c5a5acf..0bf16a8 100644 --- a/include.pl +++ b/include.pl @@ -67,7 +67,7 @@ sub max { } sub listTargets { - my $query = $ND::DBH->prepare(qq{SELECT t.id, r.id AS raid, r.tick+c.wave-1 AS landingtick, released_coords, coords(x,y,z),c.launched,c.wave + my $query = $ND::DBH->prepare(qq{SELECT t.id, r.id AS raid, r.tick+c.wave-1 AS landingtick, released_coords, coords(x,y,z),c.launched,c.wave,c.joinable FROM raid_claims c JOIN raid_targets t ON c.target = t.id JOIN raids r ON t.raid = r.id @@ -80,7 +80,9 @@ ORDER BY r.tick+c.wave,x,y,z}); my $coords = "Target $target->{id}"; $coords = $target->{coords} if $target->{released_coords}; push @targets,{Coords => $coords, Launched => $target->{launched}, Raid => $target->{raid} - , Target => $target->{id}, Tick => $target->{landingtick}, Wave => $target->{wave}, AJAX => $ND::AJAX}; + , Target => $target->{id}, Tick => $target->{landingtick}, Wave => $target->{wave} + , AJAX => $ND::AJAX, JoinName => $target->{joinable} ? 'N' : 'J' + , Joinable => $target->{joinable} ? 'FALSE' : 'TRUE'}; } my $template = HTML::Template->new(filename => "templates/targetlist.tmpl"); $template->param(Targets => \@targets);