$claimers = join '/', @claimers;
if ($owner){
$wave{Command} = 'Unclaim';
$claimers = join '/', @claimers;
if ($owner){
$wave{Command} = 'Unclaim';
return $self->generateClaimXml($BODY,$raid,$from);
}
if ($self->{XML} && param('cmd') eq 'gettargets' ){
return $self->generateClaimXml($BODY,$raid,$from);
}
if ($self->{XML} && param('cmd') eq 'gettargets' ){
$noingal = "AND NOT (x = $planet->{x} AND y = $planet->{y})";
}
$BODY->param(Message => parseMarkup($raid->{message}));
$noingal = "AND NOT (x = $planet->{x} AND y = $planet->{y})";
}
$BODY->param(Message => parseMarkup($raid->{message}));
my $targetquery = $DBH->prepare(qq{SELECT r.id, r.planet, size, score, value, p.x,p.y,p.z, race, p.value - p.size*200 -coalesce(c.metal+c.crystal+c.eonium,0)/150 - coalesce(c.structures,(SELECT avg(structures) FROM covop_targets)::int)*1500 AS fleetvalue,(c.metal+c.crystal+c.eonium)/100 AS resvalue, comment
FROM current_planet_stats p
JOIN raid_targets r ON p.id = r.planet
my $targetquery = $DBH->prepare(qq{SELECT r.id, r.planet, size, score, value, p.x,p.y,p.z, race, p.value - p.size*200 -coalesce(c.metal+c.crystal+c.eonium,0)/150 - coalesce(c.structures,(SELECT avg(structures) FROM covop_targets)::int)*1500 AS fleetvalue,(c.metal+c.crystal+c.eonium)/100 AS resvalue, comment
FROM current_planet_stats p
JOIN raid_targets r ON p.id = r.planet
$target{comment} = parseMarkup($target->{comment}) if ($target->{comment});
my $scans = $DBH->prepare(q{SELECT DISTINCT ON (type) type, tick, scan FROM scans
$target{comment} = parseMarkup($target->{comment}) if ($target->{comment});
my $scans = $DBH->prepare(q{SELECT DISTINCT ON (type) type, tick, scan FROM scans
GROUP BY type, tick, scan ORDER BY type ,tick DESC});
$scans->execute($target->{planet});
my %scans;
GROUP BY type, tick, scan ORDER BY type ,tick DESC});
$scans->execute($target->{planet});
my %scans;
- for my $type ('Planet','Unit','Military','Surface Analysis','Technology Analysis'){
+ for my $type ('Planet','Unit','Advanced Unit','Surface Analysis','Technology Analysis'){
next unless exists $scans{$type};
my $scan = $scans{$type};
if ($self->{TICK} - $scan->{tick} > 5){
next unless exists $scans{$type};
my $scan = $scans{$type};
if ($self->{TICK} - $scan->{tick} > 5){
- $xp = max(0,floor($roids * 10 * (min(2,$target{Score}/$planet->{score}) + min(2,$target{Value}/$planet->{value})-1)));
+ $xp = pa_xp($roids,$planet->{score},$planet->{value},$target{Score},$target{Value});
}
push @roids,{Wave => $i, Roids => $roids, XP => $xp};
if ($self->{AJAX}){
}
push @roids,{Wave => $i, Roids => $roids, XP => $xp};
if ($self->{AJAX}){