X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=calls.pl;h=1092d395843b4d5c256593f28fce32b48a53e7a6;hb=bb3ed008868592ef478d8432b86a39c293efae2d;hp=ad7e13c449c20ed2cc8506a9e0b5831d33691c28;hpb=0261522c27d089adb08a6055c2c9e9b41459dd6e;p=ndwebbie.git

diff --git a/calls.pl b/calls.pl
index ad7e13c..1092d39 100644
--- a/calls.pl
+++ b/calls.pl
@@ -130,11 +130,12 @@ if ($call){
 		$BODY->param(Ignore => 'Open');
 	}
 	my $fleets = $DBH->prepare(q{
-SELECT id,mission,landing_tick,eta, (landing_tick+eta-1) AS back FROM fleets WHERE uid = ? AND (fleet = 0 OR (landing_tick + eta > ? AND landing_tick - eta - 11 < ? ))
+SELECT id,mission,landing_tick,eta, back FROM fleets WHERE uid = ? AND (fleet = 0 OR (back >= ? AND landing_tick - eta - 11 < ? ))
 ORDER BY fleet ASC});
 	my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE fleet = ?');
 	$fleets->execute($call->{member},$call->{landing_tick},$call->{landing_tick});
 	my @fleets;
+	my $i = 0;
 	while (my $fleet = $fleets->fetchrow_hashref){
 		if ($fleet->{back} == $call->{landing_tick}){
 			$fleet->{Fleetcatch} = 1;
@@ -142,6 +143,8 @@ ORDER BY fleet ASC});
 		$ships->execute($fleet->{id});
 		my @ships;
 		while (my $ship = $ships->fetchrow_hashref){
+			$i++;
+			$ship->{ODD} = $i % 2;
 			push @ships,$ship;
 		}
 		$fleet->{Ships} = \@ships;
@@ -157,7 +160,10 @@ WHERE i.call = ?
 ORDER BY p.x,p.y,p.z});
 	$attackers->execute($call->{id});
 	my @attackers;
+	my $i = 0;
 	while(my $attacker = $attackers->fetchrow_hashref){
+		$i++;
+		$attacker->{ODD} = $i % 2;
 		push @attackers,$attacker;
 	}
 	$BODY->param(Attackers => \@attackers);
@@ -170,6 +176,10 @@ ORDER BY p.x,p.y,p.z});
 	}elsif (param('show') eq 'uncovered'){
 		$where = 'not covered';
 	}
+	my $pointlimits = $DBH->prepare(q{SELECT value :: int FROM misc WHERE id = ?});
+	my ($minpoints) = $DBH->selectrow_array($pointlimits,undef,'DEFMIN');
+	my ($maxpoints) = $DBH->selectrow_array($pointlimits,undef,'DEFMAX');
+
 	my $query = $DBH->prepare(qq{
 SELECT c.id, coords(p.x,p.y,p.z), u.defense_points, c.landing_tick, 
 	TRIM('/' FROM concat(p2.race||' /')) AS race, TRIM('/' FROM concat(i.amount||' /')) AS amount,
@@ -190,10 +200,17 @@ ORDER BY c.landing_tick DESC
 	my @calls;
 	my $i = 0;
 	while (my $call = $query->fetchrow_hashref){
+		if ($call->{defense_points} < $minpoints){
+			$call->{DefPrio} = 'LowestPrio';
+		}elsif ($call->{defense_points} < $maxpoints){
+			$call->{DefPrio} = 'MediumPrio';
+		}else{
+			$call->{DefPrio} = 'HighestPrio';
+		}
+		$i++;
 		$call->{ODD} = $i % 2;
 		$call->{shiptype} = escapeHTML($call->{shiptype});
 		push @calls, $call;
-		$i++;
 	}
 	$BODY->param(Calls => \@calls);
 }