From: Michael Andreen Date: Wed, 13 Dec 2006 12:19:45 +0000 (+0000) Subject: working on raids X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=e63c14e793686ca3d8a47df6866134c21a77e4b7;p=ndwebbie.git working on raids --- diff --git a/include.pl b/include.pl index 9cb4f7d..408361a 100644 --- a/include.pl +++ b/include.pl @@ -52,4 +52,35 @@ sub parseMarkup { return $text; } +sub min { + my ($x,$y) = @_; + return ($x > $y ? $y : $x); +} + +sub max { + my ($x,$y) = @_; + return ($x < $y ? $y : $x); +} + +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 +FROM raid_claims c + JOIN raid_targets t ON c.target = t.id + JOIN raids r ON t.raid = r.id + JOIN current_planet_stats p ON t.planet = p.id +WHERE c.uid = ? AND r.tick+c.wave > ? AND r.open AND not r.removed +ORDER BY r.tick+c.wave,x,y,z}); + $query->execute($ND::UID,$ND::TICK); + my @targets; + while (my $target = $query->fetchrow_hashref){ + 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}}; + } + my $template = HTML::Template->new(filename => "templates/targetlist.tmpl"); + $template->param(Targets => \@targets); + return $template->output; +} + 1; diff --git a/index.pl b/index.pl index ff0381f..061cbfa 100755 --- a/index.pl +++ b/index.pl @@ -66,12 +66,22 @@ while (my ($name,$attack,$gid) = $query->fetchrow()){ our $LOG = $DBH->prepare('INSERT INTO log (uid,text) VALUES(?,?)'); my $page = 'main'; -if (param('page') =~ /^(main|check|motd|points|covop|top100|launchConfirmation|addintel|defrequest)$/){ +if (param('page') =~ /^(main|check|motd|points|covop|top100|launchConfirmation|addintel|defrequest|raids)$/){ $page = $1; } -print header; -$ND::BODY = HTML::Template->new(filename => "templates/${page}.tmpl"); +our $XML = 0; +$XML = 1 if param('xml') and $page =~ /^(raids)$/; + +if ($XML){ + print header(-type=>'text/xml'); + $ND::TEMPLATE = HTML::Template->new(filename => "templates/xml.tmpl"); + $ND::BODY = HTML::Template->new(filename => "templates/${page}.xml.tmpl"); +}else{ + print header; + $ND::BODY = HTML::Template->new(filename => "templates/${page}.tmpl"); +} + unless (my $return = do "${page}.pl"){ print "

couldn't parse $page: $@

" if $@; @@ -79,33 +89,20 @@ unless (my $return = do "${page}.pl"){ print "

couldn't run $page

" unless $return; } -my $fleetupdate = $DBH->selectrow_array('SELECT landing_tick FROM fleets WHERE uid = ? AND fleet = 0',undef,$UID); - -$TEMPLATE->param(Tick => $TICK); -$TEMPLATE->param(isMember => (($TICK - $fleetupdate < 24) || isScanner()) && $PLANET && isMember()); -$TEMPLATE->param(isHC => isHC()); -$TEMPLATE->param(isDC => isDC()); -$TEMPLATE->param(isBC => isBC()); -$TEMPLATE->param(isAttacker => $ATTACKER && (!isMember() || ((($TICK - $fleetupdate < 24) || isScanner()) && $PLANET))); -if ($ATTACKER && (!isMember() || ((($TICK - $fleetupdate < 24) || isScanner()) && $PLANET))){ - my $query = $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 -FROM raid_claims c - JOIN raid_targets t ON c.target = t.id - JOIN raids r ON t.raid = r.id - JOIN current_planet_stats p ON t.planet = p.id -WHERE c.uid = ? AND r.tick+c.wave > ? AND r.open AND not r.removed -ORDER BY r.tick+c.wave,x,y,z}); - $query->execute($UID,$TICK); - my @targets; - while (my $target = $query->fetchrow_hashref){ - 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}}; +unless ($XML){ + my $fleetupdate = $DBH->selectrow_array('SELECT landing_tick FROM fleets WHERE uid = ? AND fleet = 0',undef,$UID); + + $TEMPLATE->param(Tick => $TICK); + $TEMPLATE->param(isMember => (($TICK - $fleetupdate < 24) || isScanner()) && $PLANET && isMember()); + $TEMPLATE->param(isHC => isHC()); + $TEMPLATE->param(isDC => isDC()); + $TEMPLATE->param(isBC => isBC()); + $TEMPLATE->param(isAttacker => $ATTACKER && (!isMember() || ((($TICK - $fleetupdate < 24) || isScanner()) && $PLANET))); + if ($ATTACKER && (!isMember() || ((($TICK - $fleetupdate < 24) || isScanner()) && $PLANET))){ + $ND::TEMPLATE->param(Targets => listTargets()); } - $ND::TEMPLATE->param(Targets => \@targets); -} +} $ND::TEMPLATE->param(BODY => $ND::BODY->output); print $TEMPLATE->output; diff --git a/raid.js b/raid.js new file mode 100644 index 0000000..5a4eb14 --- /dev/null +++ b/raid.js @@ -0,0 +1,138 @@ +function getHTTPObject() { + var xmlhttp; + /*@cc_on + @if (@_jscript_version >= 5) + try { + xmlhttp = new ActiveXObject("Msxml2.XMLHTTP"); + } catch (e) { + try { + xmlhttp = new ActiveXObject("Microsoft.XMLHTTP"); + } catch (E) { + xmlhttp = false; + } + } + @else + xmlhttp = false; + @end @*/ + + if (!xmlhttp && typeof XMLHttpRequest != 'undefined') { + try { + xmlhttp = new XMLHttpRequest(); + } catch (e) { + xmlhttp = false; + } + } + return xmlhttp; +} + +var HTTP = getHTTPObject(); +var modified = '_'; + +function claim(dataSource, target, wave,cmd){ + if(HTTP) { + var url = dataSource + '&cmd='+cmd+'&target=' + target + '&wave=' + wave; + //obj.innerHTML = "test"; + HTTP.open("GET", url,true); + HTTP.onreadystatechange = function(){ + if (HTTP.readyState == 4 && + HTTP.status == 200) { + updateClaims(dataSource,HTTP.responseXML,false); + var obj = document.getElementById("targets"); + if (obj){ + var re = new RegExp("targetlist>(.*) * +# * +# This program is free software; you can redistribute it and/or modify * +# it under the terms of the GNU General Public License as published by * +# the Free Software Foundation; either version 2 of the License, or * +# (at your option) any later version. * +# * +# This program is distributed in the hope that it will be useful, * +# but WITHOUT ANY WARRANTY; without even the implied warranty of * +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +# GNU General Public License for more details. * +# * +# You should have received a copy of the GNU General Public License * +# along with this program; if not, write to the * +# Free Software Foundation, Inc., * +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * +#**************************************************************************/ + +use strict; +use POSIX; +our $BODY; +our $DBH; +our $LOG; +our $XML; + +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); +} + +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 $noingal = ''; + my $planet; + if ($ND::PLANET){ + my $query = $DBH->prepare("SELECT value, score,x,y FROM current_planet_stats WHERE id = ?"); + $planet = $DBH->selectrow_hashref($query,undef,$ND::PLANET); + $noingal = "AND NOT (x = $planet->{x} AND y = $planet->{y})"; + } + $BODY->param(Message => parseMarkup($raid->{message})); + $BODY->param(LandingTick => parseMarkup($raid->{tick})); + my $targetquery = $DBH->prepare(qq{SELECT r.id, r.planet, size, score, value, coords(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 + LEFT OUTER JOIN covop_targets c ON p.id = c.planet +WHERE r.raid = ? + $noingal +ORDER BY size}); + $targetquery->execute($raid->{id}); + my @targets; + while (my $target = $targetquery->fetchrow_hashref){ + my %target; + $target{Id} = $target->{id}; + my $num = pow(10,length($target->{score})-2); + $target{Score} = ceil($target->{score}/$num)*$num; + $num = pow(10,length($target->{value})-2); + $target{Value} = 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{FleetValue} = floor($target->{fleetvalue}/$num)*$num; + $num = pow(10,length($target->{resvalue})-2); + $target{ResValue} = floor($target->{resvalue}/$num)*$num; + $target{comment} = parseMarkup($target->{comment}) if ($target->{comment}); + my @roids; + my $size = $target{Size}; + for (my $i = 1; $i <= $raid->{waves}; $i++){ + my $roids = floor(0.25*$size); + $size -= $roids; + my $xp; + if ($planet){ + $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}; + } + $target{Roids} = \@roids; + + push @targets,\%target; + } + $BODY->param(Targets => \@targets); + }else{#list raids if we haven't chosen one yet + my $query = $DBH->prepare(q{SELECT id,released_coords FROM raids WHERE open AND not removed AND +id IN (SELECT raid FROM raid_access NATURAL JOIN groupmembers WHERE uid = ?)}); + $query->execute($ND::UID); + my @raids; + while (my $raid = $query->fetchrow_hashref){ + push @raids,{Raid => $raid->{id}, ReleasedCoords => $raid->{released_coords}, isBC => isBC()}; + } + $BODY->param(Raids => \@raids); + + if (isBC()){ + my $query = $DBH->prepare(q{SELECT id,open FROM raids WHERE not removed AND (not open +OR id NOT IN (SELECT raid FROM raid_access NATURAL JOIN groupmembers WHERE uid = ?))}); + $query->execute($ND::UID); + my @raids; + while (my $raid = $query->fetchrow_hashref){ + push @raids,{Raid => $raid->{id}, Open => $raid->{open}}; + } + $BODY->param(ClosedRaids => \@raids); + } + } +} +1; diff --git a/templates/raids.tmpl b/templates/raids.tmpl new file mode 100644 index 0000000..9c48aa5 --- /dev/null +++ b/templates/raids.tmpl @@ -0,0 +1,70 @@ + +

+ + Edit + Close raid. + + Show coords. + + +

+ + +

Closed raids

+ +

+ Edit raid + + + Open raid. + +

+ + + + +
Message +

REMEMBER TO PASTE LAUNCH CONFIRMATION IF YOU WANT AN ATTACK POINT

+

DO NOT JOIN A WAVE UNLESS YOU HAVE PERMISSION FROM THE PERSON WHO CLAIMED IT

+

Landing tick first wave:

+

+
+ +
+

+ + +

+
+ +
Target: # + +
    +
  • Size:
    • +
  • Score:
    • +
  • Value:
    • +
  • Fleet value:
    • +
  • Resource value:
    • +
  • Race:
    • + +
  • Roids wave : ( xp)
    • +     +
+ +
Comment +

+
+ + +
+ +
+ +
+ +
+ + + diff --git a/templates/raids.xml.tmpl b/templates/raids.xml.tmpl new file mode 100644 index 0000000..95c0f27 --- /dev/null +++ b/templates/raids.xml.tmpl @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/templates/skel.tmpl b/templates/skel.tmpl index 904a93f..31c6860 100644 --- a/templates/skel.tmpl +++ b/templates/skel.tmpl @@ -35,13 +35,7 @@

  • Web raids
    • -
    - - - - -
    TargetLanding tick
    *
    -
    +

    BC menu

    diff --git a/templates/targetlist.tmpl b/templates/targetlist.tmpl new file mode 100644 index 0000000..43024ad --- /dev/null +++ b/templates/targetlist.tmpl @@ -0,0 +1,7 @@ + + + + + +
    TargetLanding tick
    *
    +     diff --git a/templates/xml.tmpl b/templates/xml.tmpl new file mode 100644 index 0000000..a3acc24 --- /dev/null +++ b/templates/xml.tmpl @@ -0,0 +1,2 @@ + +