X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;ds=inline;f=raids.pl;h=a3cb3cc59170588c523a5d0c69960acaa7810c31;hb=77e873677329b64c68bf3e3dc84f229eeafb1c83;hp=afbf62d20d8d7e3b5ef19c5478646391f964ef92;hpb=d0c7c398c7c8f53a2847b36871d540b48055b0c5;p=ndwebbie.git
diff --git a/raids.pl b/raids.pl
index afbf62d..a3cb3cc 100644
--- a/raids.pl
+++ b/raids.pl
@@ -18,87 +18,20 @@
#**************************************************************************/
use strict;
+use warnings FATAL => 'all';
+use ND::Include;
use POSIX;
our $BODY;
our $DBH;
-our $LOG;
our $XML;
-
-sub generateClaimXml {
- my ($raid, $from, $target) = @_;
-
- my ($timestamp) = $DBH->selectrow_array("SELECT MAX(modified)::timestamp AS modified FROM raid_targets");
- $BODY->param(Timestamp => $timestamp);
- if ($target){
- $target = "r.id = $target";
- $_ = listTargets();
- chop;
- $BODY->param(TargetList => $_);
- }else{
- $target = "r.raid = $raid->{id}";
- }
-
- if ($from){
- $from = "AND modified > '$from'";
- }
- my $targets = $DBH->prepare(qq{SELECT r.id,r.planet FROM raid_targets r WHERE $target $from});
- $targets->execute;
- my $claims = $DBH->prepare(qq{ SELECT username,joinable,launched FROM raid_claims
- NATURAL JOIN users WHERE target = ? AND wave = ?});
- my @targets;
- while (my $target = $targets->fetchrow_hashref){
- my %target;
- $target{Id} = $target->{id};
- $target{Coords} = $target->{id};
- my @waves;
- for (my $i = 1; $i <= $raid->{waves}; $i++){
- my %wave;
- $wave{Id} = $i;
- $claims->execute($target->{id},$i);
- my $joinable = 0;
- my $claimers;
- if ($claims->rows != 0){
- my $owner = 0;
- my @claimers;
- while (my $claim = $claims->fetchrow_hashref){
- $owner = 1 if ($ND::USER eq $claim->{username});
- $joinable = 1 if ($claim->{joinable});
- $claim->{username} .= '*' if ($claim->{launched});
- push @claimers,$claim->{username};
- }
- $claimers = join '/', @claimers;
- if ($owner){
- $wave{Command} = 'Unclaim';
- if ($raid->{released_coords}){
- $target{Coords} = $DBH->selectrow_array('SELECT coords(x,y,z) FROM current_planet_stats WHERE id = ?',undef,$target->{planet});
- }
- }elsif ($joinable){
- $wave{Command} = 'Join';
- }else{
- $wave{Command} = 'none';
- }
- }else{
- #if (!isset($planet) || ($target->value/$planet->value > 0.4 || $target->score/$planet->score > 0.4))
- $wave{Command} = 'Claim';
- }
- $wave{Claimers} = $claimers;
- $wave{Joinable} = $joinable;
- push @waves,\%wave;
- }
- $target{Waves} = \@waves;
- push @targets,\%target;
- }
- $BODY->param(Targets => \@targets);
-}
-
my $raid;
-if (param('raid') =~ /^(\d+)$/){
+if (defined param('raid')){
my $query = $DBH->prepare(q{SELECT id,tick,waves,message,released_coords FROM raids WHERE id = ? AND open AND not removed AND id IN (SELECT raid FROM raid_access NATURAL JOIN groupmembers WHERE uid = ?)});
- $raid = $DBH->selectrow_hashref($query,undef,$1,$ND::UID);
+ $raid = $DBH->selectrow_hashref($query,undef,param('raid'),$ND::UID);
}
-if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
+if (defined param('cmd') && defined param('target') && defined param('wave') && param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
my $target = param('target');
my $wave = param('wave');
@@ -115,7 +48,7 @@ if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
if ($claims->rows == 0){
my $query = $DBH->prepare(q{INSERT INTO raid_claims (target,uid,wave) VALUES(?,?,?)});
if($query->execute($target,$ND::UID,$wave)){
- $LOG->execute($ND::UID,"Claimed target $target wave $wave.");
+ log_message $ND::UID,"Claimed target $target wave $wave.";
}
}
}
@@ -127,11 +60,11 @@ if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
if ($claims->rows != 0){
my $query = $DBH->prepare(q{INSERT INTO raid_claims (target,uid,wave,joinable) VALUES(?,?,?,TRUE)});
if($query->execute($target,$ND::UID,$wave)){
- $LOG->execute($ND::UID,"Joined target $target wave $wave.");
+ log_message $ND::UID,"Joined target $target wave $wave.";
}
}
}
- if (param('joinable') =~ /(TRUE|FALSE)/){
+ if (param('cmd') eq 'set' && defined param('joinable') && param('joinable') =~ /(TRUE|FALSE)/){
my $claims = $DBH->prepare(qq{SELECT username FROM raid_claims NATURAL JOIN users WHERE target = ? AND wave = ? AND uid = ?});
$claims->execute($target,$wave,$ND::UID);
if ($claims->rows != 0){
@@ -141,7 +74,7 @@ if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){
if (param('cmd') eq 'Unclaim'){
my $query = $DBH->prepare(qq{DELETE FROM raid_claims WHERE target = ? AND uid = ? AND wave = ?});
if ($query->execute($target,$ND::UID,$wave)){
- $LOG->execute($ND::UID,"Unclaimed target $target wave $wave.");
+ log_message $ND::UID,"Unclaimed target $target wave $wave.";
}
}
$DBH->commit;
@@ -158,18 +91,15 @@ if ($XML && $raid && param('cmd') eq 'update' ){
}
if ($XML && param('cmd') eq 'gettargets' ){
$_ = listTargets();
- chop;
$BODY->param(TargetList => $_);
}
unless ($XML){
$ND::TEMPLATE->param(TITLE => 'Raids');
- $ND::TEMPLATE->param(HEADER => '');
+ #$ND::TEMPLATE->param(HEADER => '');
if ($raid){#We have a raid, so list all targets
$BODY->param(Raid => $raid->{id});
- my $ajax = 1;
- #$ajax = 0 if ($ENV{HTTP_USER_AGENT} =~ /MSIE/);
- $BODY->param(Ajax => $ajax);
+ $BODY->param(Ajax => $ND::AJAX);
my $noingal = '';
my $planet;
if ($ND::PLANET){
@@ -192,7 +122,7 @@ ORDER BY size});
my %target;
$target{Id} = $target->{id};
$target{Race} = $target->{race};
- $target{Ajax} = $ajax;
+ $target{Ajax} = $ND::AJAX;
my $num = pow(10,length($target->{score})-2);
$target{Score} = ceil($target->{score}/$num)*$num;
$num = pow(10,length($target->{value})-2);
@@ -201,8 +131,10 @@ ORDER BY size});
$target{Size} = floor($target->{size}/$num)*$num;
$num = pow(10,length($target->{fleetvalue})-2);
$target{FleetValue} = floor($target->{fleetvalue}/$num)*$num;
- $num = pow(10,length($target->{resvalue})-2);
- $target{ResValue} = floor($target->{resvalue}/$num)*$num;
+ if (defined $target->{resvalue}){
+ $num = pow(10,length($target->{resvalue})-2);
+ $target{ResValue} = floor($target->{resvalue}/$num)*$num;
+ }
$target{comment} = parseMarkup($target->{comment}) if ($target->{comment});
my $scans = $DBH->prepare(q{SELECT DISTINCT ON (type) type, tick, scan FROM scans
@@ -240,7 +172,7 @@ ORDER BY size});
$xp = max(0,floor($roids * 10 * (min(2,$target{Score}/$planet->{score}) + min(2,$target{Value}/$planet->{value})-1)));
}
push @roids,{Wave => $i, Roids => $roids, XP => $xp};
- if ($ajax){
+ if ($ND::AJAX){
push @claims,{Wave => $i, Target => $target{Id}}
}else{
push @claims,{Wave => $i, Target => $target{Id}, Command => 'Claim'