my $target = param('target');
my $wave = param('wave');
- my $findtarget = $DBH->prepare("SELECT rt.id FROM raid_targets rt NATURAL JOIN raid_access ra NATURAL JOIN groupmembers where uid = ? AND id = ?");
+ $DBH->begin_work;
+ my $findtarget = $DBH->prepare(q{SELECT rt.id FROM raid_targets rt
+ NATURAL JOIN raid_access ra NATURAL JOIN groupmembers
+ WHERE uid = ? AND id = ?
+ FOR UPDATE
+ });
my $result = $DBH->selectrow_array($findtarget,undef,$ND::UID,$target);
if ($result != $target){
+ $DBH->rollback;
return $self->noAccess;
}
- $DBH->begin_work;
if (param('cmd') eq 'Claim'){
my $claims = $DBH->prepare(qq{SELECT username FROM raid_claims NATURAL JOIN users WHERE target = ? AND wave = ?});
$claims->execute($target,$wave);
COALESCE(avg(total),0) FROM
structure_scans)::int)*1500 AS fleetvalue
,(metal+crystal+eonium)/100 AS resvalue, comment
+ , hidden, light, medium, heavy
FROM current_planet_stats p
JOIN raid_targets r ON p.id = r.planet
LEFT OUTER JOIN planet_scans ps ON p.id = ps.planet
ORDER BY size});
$targetquery->execute($raid->{id});
my @targets;
+ my %production = (0 => 'None', 35 => 'Light', 65 => 'Medium', 100 => 'High');
while (my $target = $targetquery->fetchrow_hashref){
my %target;
if ($planet){
$target{Id} = $target->{id};
$target{Race} = $target->{race};
my $num = pow(10,length($target->{score})-2);
- $target{Score} = ceil($target->{score}/$num)*$num;
+ $target{Score} = "Hidden"; #ceil($target->{score}/$num)*$num;
$num = pow(10,length($target->{value})-2);
- $target{Value} = ceil($target->{value}/$num)*$num;
+ $target{Value} = "Hidden"; #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);
$target{ResValue} = floor($target->{resvalue}/$num)*$num;
}
$target{comment} = parseMarkup($target->{comment}) if ($target->{comment});
+
+ $target{Hidden} = int($target->{hidden} / 100);
+ $target{Light} = $production{$target->{light}};
+ $target{Medium} = $production{$target->{medium}};
+ $target{Heavy} = $production{$target->{heavy}};
my $unitscans = $DBH->prepare(q{
SELECT DISTINCT ON (name) i.id,i.name, i.tick, i.amount
$size -= $roids;
my $xp = 0;
if ($planet){
- $xp = pa_xp($roids,$planet->{score},$planet->{value},$target{Score},$target{Value});
+ $xp = pa_xp($roids,$planet->{score},$planet->{value},$target->{score},$target->{value});
}
push @roids,{Wave => $i, Roids => $roids, XP => $xp};
if ($self->{AJAX}){