--- deliantra/server/ext/schmorplog.ext	2008/05/01 06:47:03	1.17
+++ deliantra/server/ext/schmorplog.ext	2010/04/11 04:52:07	1.25
@@ -1,11 +1,11 @@
-#! perl # depends=irc
+#! perl # depends=irc mandatory
 
 # statistics-package
 
 use Fcntl;
 use Coro::AIO;
 
-our $UPDATE_LOGINS = EV::idle sub {
+our $UPDATE_LOGINS = AE::idle sub {
    $_[0]->stop;
 
    cf::async {
@@ -45,14 +45,12 @@
 cf::player->attach (
    on_login => sub {
       my ($pl) = @_;
-      $pl->ob->set_ob_key_value (schmorplog_last_login => time);
+      $pl->ob->kv_set (schmorplog_last_login => time);
 
-      $pl->ob->set_ob_key_value (schmorplog_login_count =>
-         1 + $pl->ob->get_ob_key_value ("schmorplog_login_count"));
+      $pl->ob->kv_set (schmorplog_login_count =>
+         1 + $pl->ob->kv_get ("schmorplog_login_count"));
 
-      (my $client = $pl->ns->version) =~ s/\n/\\n/g;
-
-      $pl->ob->set_ob_key_value (schmorplog_client => $client);
+      $pl->ob->kv_set (schmorplog_client => $pl->ns->{who_version});
 
       ext::irc::do_notice (sprintf "%s logged in", $pl->ob->name);
 
@@ -62,7 +60,7 @@
    },
    on_logout => sub {
       my ($pl, $cleanly) = @_;
-      $pl->ob->set_ob_key_value (schmorplog_last_logout => time);
+      $pl->ob->kv_set (schmorplog_last_logout => time);
       ext::irc::do_notice (sprintf "%s left", $pl->ob->name);
 
       $UPDATE_LOGINS->start;
@@ -72,7 +70,7 @@
    on_birth => sub {
       my ($pl) = @_;
       ext::irc::do_notice (sprintf "%s was just born", $pl->ob->name);
-      $pl->ob->set_ob_key_value (schmorplog_birthdate => time);
+      $pl->ob->kv_set (schmorplog_birthdate => time);
 
       warn "BIRTH: ", $pl->ob->name, " from ", $pl->ns->host;
    },
@@ -84,20 +82,25 @@
    },
    on_death => sub {
       my ($pl) = @_;
-      ext::irc::do_notice (sprintf "%s was killed by %s", $pl->ob->name, $pl->killer_name);
+
+      my $msg = $pl->expand_cfpod (sprintf "%s was killed by %s.", $pl->ob->name, $pl->killer_name);
+      ext::irc::do_notice ($msg);
 
       ++$pl->ob->{stats_death}{$pl->killer_name};
 
-      $pl->ob->set_ob_key_value (schmorplog_death_count =>
-         1 + $pl->ob->get_ob_key_value ("schmorplog_death_count"));
+      $pl->ob->kv_set (schmorplog_death_count =>
+         1 + $pl->ob->kv_get ("schmorplog_death_count"));
+
+      $_->send_msg ("" => $msg, cf::NDI_VERBATIM)
+         for cf::player::list;
    },
    on_load => sub {
       my ($pl, $path) = @_;
-      $pl->ob->set_ob_key_value (schmorplog_last_load => time);
+      $pl->ob->kv_set (schmorplog_last_load => time);
    },
    on_save => sub {
       my ($pl, $path) = @_;
-      $pl->ob->set_ob_key_value (schmorplog_last_save => time);
+      $pl->ob->kv_set (schmorplog_last_save => time);
    },
 );
 
@@ -116,10 +119,10 @@
          my $s = $pl->ob->{stats_death}
             or return $who->reply ($npc, "$args didn't die even once.");
 
-         my $rep = "$args died a total of " . $pl->ob->get_ob_key_value ("schmorplog_death_count") . " times, among them:\n\n\n\n";
+         my $rep = "$args died a total of " . $pl->ob->kv_get ("schmorplog_death_count") . " times, among them:\n\n";
 
          for (sort { $s->{$b} <=> $s->{$a} } keys %$s) {
-            $rep .= "$s->{$_} times due to $_.\n\n";
+            $rep .= sprintf " C<%4d> time(s) due to %s.\n", $s->{$_}, $_;
          }
 
          $who->reply ($npc, $rep);
@@ -132,9 +135,9 @@
          my $s = $pl->ob->{stats_kill}
             or return $who->reply ($npc, "I don't know of I<anything> that $args has killed so far.");
 
-         my $rep = sprintf "\n\nC<%6s> %s\n\n", "#", "Name";
-         for (sort { $s->{$a} <=> $s->{$b} } keys %$s) {
-            $rep .= sprintf "C<%6s> %s\n\n", $s->{$_}, $_;
+         my $rep = sprintf "Here is a list of all the kills I know about:\n\n";
+         for (sort { $s->{$b} <=> $s->{$a} } keys %$s) {
+            $rep .= sprintf " C<%6s> %s\n", $s->{$_}, $_;
          }
 
          $who->reply ($npc, $rep);
@@ -142,8 +145,8 @@
    } elsif ($cmd eq "hi") {
       $who->reply ($npc, "Hello!\n\n"
                    . "I am a statistician, I keep statistics about all people here.\n\n"
-                   . "To know how often somebody died, ask C<deaths> I<playername>\n\n"
-                   . "To know how many kills somebody scored, ask C<kills> I<playername>");
+                   . " - To know how often somebody died, ask C<deaths> I<playername>\n"
+                   . " - To know how many kills somebody scored, ask C<kills> I<playername>");
    } else {
       $who->reply ($npc, "No idea what you want of me, how about saying 'hi' first?");
    }
@@ -151,3 +154,17 @@
    $cmd = lc $cmd;
 };
 
+# log "crash" messages, i.e. client exit reasons
+cf::register_exticmd clientlog => sub {
+   my ($ns, $msg) = @_;
+
+   my $name = $ns->pl && $ns->pl->ob ? $ns->pl->ob->name : "<unknown>";
+
+   $msg =~ y/\x0a\x20-\x7f//cd;
+   $msg =~ s/\s+$//;
+
+   warn sprintf "clientlog [%s/%s]: %s\n", $ns->host, $name, $msg;
+
+   ()
+};
+