From bce4a260fd2d568d21e81bf71238e2da9b5fdb38 Mon Sep 17 00:00:00 2001
From: Shiar <shiar@shiar.org>
Date: Mon, 12 Nov 2007 16:14:22 +0100
Subject: [PATCH] screp: fix apm (ignore first 1'20 correctly)

---
 screp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/screp b/screp
index 4b1f033..0b35ac0 100755
--- a/screp
+++ b/screp
@@ -10,6 +10,8 @@ GetOptions(
 	"verbose|v!" => \$SHOWWARN,
 );
 
+use constant { APM_FIRSTFRAME => 80 / .042 };
+
 {
 
 package Data::StarCraft::Replay;
@@ -486,7 +488,7 @@ my %cmdmacro = map {$_ => 1} (
 my %stats; # player => count
 for (@$map) {
 	$stats{$_->[1]}{actions}++;
-	$stats{$_->[1]}{gameactions}++ if $_->[0] > 80 / .042;
+	$stats{$_->[1]}{gameactions}++ if $_->[0] >= APM_FIRSTFRAME;
 	$stats{$_->[1]}{last} = $_->[0] if $_->[2] eq "part";
 	$stats{$_->[1]}{$cmdmacro{$_->[2]} ? "macro" : "micro"}++;
 	$stats{$_->[1]}{count}{$_->[2]}++;
@@ -501,8 +503,7 @@ for my $player (sort keys %stats) {
 		showtime($row->{last}),
 #		$row->{micro} / $row->{last} * 60 / .042 * 1.05,
 #		$row->{macro} / $row->{last} * 60 / .042 * 1.05,
-		$row->{gameactions} / $row->{last} * 60 / .042 * 1.042,
-	#	$row->{gameactions} / $map->[-1][0] * 60 / .042,
+		$row->{gameactions} / ($row->{last} - APM_FIRSTFRAME) * 60 / .042,
 	);
 
 	if (0) {
-- 
2.30.0