From 2d797a21f9832b13d317a494cc925f2b394c3516 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Tue, 22 Jul 2008 06:32:17 +0000
Subject: [PATCH] better team scores format

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3882 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 Docs/eventlog.txt                |  2 +-
 Docs/server/rcon2irc/rcon2irc.pl | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Docs/eventlog.txt b/Docs/eventlog.txt
index 7565aecb0..bd925d502 100644
--- a/Docs/eventlog.txt
+++ b/Docs/eventlog.txt
@@ -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
diff --git a/Docs/server/rcon2irc/rcon2irc.pl b/Docs/server/rcon2irc/rcon2irc.pl
index 10fe5ae77..3a7917490 100755
--- a/Docs/server/rcon2irc/rcon2irc.pl
+++ b/Docs/server/rcon2irc/rcon2irc.pl
@@ -1113,6 +1113,14 @@ sub irc_joinstage($)
 		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 @@ sub irc_joinstage($)
 			{
 				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
-- 
2.39.2