r3882 - in trunk/Docs: . server/rcon2irc

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-22 02:32:17 -0400 (Tue, 22 Jul 2008)
New Revision: 3882

Modified:
   trunk/Docs/eventlog.txt
   trunk/Docs/server/rcon2irc/rcon2irc.pl
Log:
better team scores format


Modified: trunk/Docs/eventlog.txt
===================================================================
--- trunk/Docs/eventlog.txt	2008-07-22 06:24:03 UTC (rev 3881)
+++ trunk/Docs/eventlog.txt	2008-07-22 06:32:17 UTC (rev 3882)
@@ -41,7 +41,7 @@
    :dom:taken:<previouscolor>:<ID of player>
    :scores:<gametype>_<mapname>:<map runtime>
    :player:<frags>:<deaths>:<playtime>:<team>:<ID>:<nickname>
-   :teamscores:<team1scores>:<team2scores>:<team3scores>:<team4scores>
+   :teamscores:<team1color>:<team1score>:<team2color>:<team2score>:...
    :end
    :restart
    :gameover

Modified: trunk/Docs/server/rcon2irc/rcon2irc.pl
===================================================================
--- trunk/Docs/server/rcon2irc/rcon2irc.pl	2008-07-22 06:24:03 UTC (rev 3881)
+++ trunk/Docs/server/rcon2irc/rcon2irc.pl	2008-07-22 06:32:17 UTC (rev 3882)
@@ -1113,6 +1113,14 @@
 		return 0;
 	} ],
 
+	# scores: Nexuiz server -> IRC channel (CTF)
+	[ dp => q{:teamscores:(\d+:-?\d*(?::\d+:-?\d*)*)} => sub {
+		my ($teams) = @_;
+		return if not exists $store{scores};
+		$store{scores}{teams} = {split /:/, $teams};
+		return 0;
+	} ],
+
 	# scores: Nexuiz server -> IRC channel
 	[ dp => q{:end} => sub {
 		return if not exists $store{scores};
@@ -1131,7 +1139,14 @@
 			{
 				my $thisteam = ($t{$_->[1]} ||= {score => 0, team => $_->[1], players => []});
 				push @{$thisteam->{players}}, [$_->[0], $_->[1], $_->[2]];
-				$thisteam->{score} += $_->[0];
+				if($store{scores}{teams})
+				{
+					$thisteam->{score} = $store{scores}{teams}{$_->[1]};
+				}
+				else
+				{
+					$thisteam->{score} += $_->[0];
+				}
 			}
 
 			# sort by team score