From: Michael Andreen Date: Wed, 13 Dec 2006 18:36:07 +0000 (+0000) Subject: most of the raids stuff implemented X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=8d1ec9372fa9786009022fca3503ef3c79974f3e;p=ndwebbie.git most of the raids stuff implemented --- diff --git a/index.pl b/index.pl index a78dff3..e1067c4 100755 --- a/index.pl +++ b/index.pl @@ -31,12 +31,9 @@ my $cgi = new CGI; chdir $ENV{'DOCUMENT_ROOT'}; our $DBH = undef; -our $UID = undef; -our $PLANET = undef; -our $TEMPLATE = undef; -our $TICK = undef; +our $USER = $ENV{'REMOTE_USER'}; -$ND::TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl'); +our $TEMPLATE = HTML::Template->new(filename => 'templates/skel.tmpl'); for my $file ("db.pl","include.pl"){ unless (my $return = do $file){ @@ -46,10 +43,10 @@ for my $file ("db.pl","include.pl"){ } } -($UID,$PLANET) = $DBH->selectrow_array('SELECT uid,planet FROM users WHERE username = ?' +our ($UID,$PLANET) = $DBH->selectrow_array('SELECT uid,planet FROM users WHERE username = ?' ,undef,$ENV{'REMOTE_USER'}); -($TICK) = $DBH->selectrow_array('SELECT tick()',undef); +our ($TICK) = $DBH->selectrow_array('SELECT tick()',undef); my $query = $DBH->prepare('SELECT groupname,attack,gid from groupmembers NATURAL JOIN groups WHERE uid = ?'); @@ -112,6 +109,7 @@ print $output; $DBH->disconnect; $DBH = undef; $UID = undef; +$USER = undef; $PLANET = undef; $TEMPLATE = undef; $TICK = undef; diff --git a/nd.css b/nd.css index ae9f729..1d1d9ac 100644 --- a/nd.css +++ b/nd.css @@ -71,19 +71,19 @@ td.Attack{ color: black; } -a.unclaim{ +a.Unclaim{ color: green; } -input.unclaim{ +input.Unclaim{ background: green; } -a.claim{ +a.Claim{ color: blue; } -a.join{ +a.Join{ color: #00AAAA; } -input.join{ +input.Join{ background: #00AAAA; } diff --git a/raid.js b/raid.js index 5a4eb14..31e2774 100644 --- a/raid.js +++ b/raid.js @@ -86,9 +86,9 @@ function updateClaims(dataSource,xmldoc,timestamp){ obj.innerHTML = ''; var waves = targets[i].getElementsByTagName("wave");; for (var j = 0; j < waves.length; j++){ - var command = waves[j].firstChild.nextSibling; - var claimers = command.nextSibling; - var joinable = claimers.nextSibling; + var command = waves[j].getElementsByTagName("command")[0]; + var claimers = waves[j].getElementsByTagName("claimers")[0]; + var joinable = waves[j].getElementsByTagName("joinable")[0]; var wave = waves[j].attributes.getNamedItem("id").nodeValue; command = command.firstChild.nodeValue; if(claimers.firstChild){ @@ -112,7 +112,7 @@ function updateClaims(dataSource,xmldoc,timestamp){ }*/ obj.appendChild(b); } - if (command == 'unclaim'){ + if (command == 'Unclaim'){ var b = document.createElement("input"); b.type = 'button'; b.value = 'J'; diff --git a/raids.pl b/raids.pl index 6c43f9e..535a1bb 100644 --- a/raids.pl +++ b/raids.pl @@ -24,17 +24,147 @@ 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+)$/){ 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); } +if (param('target') =~ /^(\d+)$/ && param('wave') =~ /^(\d+)$/){ + 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 = ?"); + my $result = $DBH->selectrow_array($findtarget,undef,$ND::UID,$target); + if ($result != $target){ + die("You don't have access to that target"); + } + + $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); + 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."); + } + } + } + if (param('cmd') eq 'Join'){ + my $claims = $DBH->prepare(qq{SELECT username FROM raid_claims + NATURAL JOIN users WHERE target = ? AND wave = ? AND + joinable = TRUE}); + $claims->execute($target,$wave); + 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."); + } + } + } + if (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){ + $DBH->do(q{UPDATE raid_claims SET joinable = ? WHERE target = ? AND wave = ?},undef,$1,$target,$wave) + } + } + 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."); + } + } + $DBH->commit; + if ($XML && $raid){ + generateClaimXml($raid,undef,$target); + } +} +if ($XML && $raid && param('cmd') eq 'update' ){ + my $from; + if (param('from') =~ /^[-\d\ \:\.]+$/){ + $from = param('from'); + } + generateClaimXml($raid,$from); +} + unless ($XML){ $ND::TEMPLATE->param(TITLE => 'Raids'); $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); my $noingal = ''; my $planet; if ($ND::PLANET){ @@ -68,6 +198,7 @@ ORDER BY size}); $target{ResValue} = floor($target->{resvalue}/$num)*$num; $target{comment} = parseMarkup($target->{comment}) if ($target->{comment}); my @roids; + my @claims; my $size = $target{Size}; for (my $i = 1; $i <= $raid->{waves}; $i++){ my $roids = floor(0.25*$size); @@ -77,8 +208,11 @@ 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}; + push @claims,{Wave => $i, Target => $target{Id}, Command => 'Claim' + , Owner => 1, Raid => $raid->{id}, Joinable => 1}; } $target{Roids} = \@roids; + $target{Claims} = \@claims; push @targets,\%target; } diff --git a/templates/raids.tmpl b/templates/raids.tmpl index 74489f3..cf6d148 100644 --- a/templates/raids.tmpl +++ b/templates/raids.tmpl @@ -33,9 +33,9 @@

+ onclick = "update('index.pl?page=raids&xml=1&raid=')"/> + onclick = "listTargets('index.pl?page=raids&xml=1&raid=')"/>

@@ -69,11 +69,18 @@

+ wave () + NJ

+ + + diff --git a/templates/raids.xml.tmpl b/templates/raids.xml.tmpl index 95c0f27..bf67668 100644 --- a/templates/raids.xml.tmpl +++ b/templates/raids.xml.tmpl @@ -1,9 +1,7 @@ - - - + @@ -12,9 +10,9 @@ - + diff --git a/templates/targetlist.tmpl b/templates/targetlist.tmpl index 43024ad..0fc20ec 100644 --- a/templates/targetlist.tmpl +++ b/templates/targetlist.tmpl @@ -1,7 +1 @@ - - - - - -
TargetLanding tick
*
- +
TargetLanding tick
*