[ViewVC] Diff of: cvs/deliantra/server/ext/commands.ext

Comparing deliantra/server/ext/commands.ext (file contents):
Revision 1.63 by root, Sun Oct 7 15:52:05 2007 UTC vs.
Revision 1.71 by root, Tue Sep 23 00:24:52 2008 UTC

 cf::register_command who => sub {
    my ($ob, $arg) = @_;
    $ob->speed_left ($ob->speed_left - 4);
-   my $CHANNEL = {
-      id      => "who",
-      title   => "Players",
-      reply   => undef,
-      tooltip => "Shows players who are currently online",
-   };
-   $ob->send_msg ($CHANNEL => (join "\n\n", who_listing $ob->may ("extended_who"), $arg), cf::NDI_DK_ORANGE | cf::NDI_REPLY | cf::NDI_CLEAR | cf::NDI_DEF);
+   $ob->send_msg ("c/who" => (join "\r", who_listing $ob->may ("extended_who"), $arg), cf::NDI_DK_ORANGE | cf::NDI_REPLY | cf::NDI_CLEAR | cf::NDI_DEF);
 };
 cf::register_command seen => sub {
    my ($pl, $args) = @_;
+   cf::async {
-   if (my ($login) = $args =~ /(\S+)/) {
+      if (my ($login) = $args =~ /(\S+)/) {
-      if ($login eq $pl->name) {
+         if ($login eq $pl->name) {
-         $pl->message ("Very funny, $login. Ha. Ha.", cf::NDI_REPLY);
+            $pl->message ("Very funny, $login. Ha. Ha.", cf::NDI_REPLY);
-      } elsif (cf::player::find_active $login) {
+         } elsif (cf::player::find_active $login) {
-         $pl->message ("$login is right here on this server!", cf::NDI_REPLY);
+            $pl->message ("$login is right here on this server!", cf::NDI_REPLY);
-      } elsif (cf::player::exists $login
+         } elsif (cf::player::exists $login
-               and stat cf::player::path $login) {
+                  and stat cf::player::path $login) {
-         my $time = (stat _)[9];
+            my $time = (stat _)[9];
-         $pl->message ("$login was last seen here "
+            $pl->message ("$login was last seen here "
-                        . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
+                           . (POSIX::strftime "%Y-%m-%d %H:%M:%S +0000", gmtime $time)
-                        . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_REPLY);
+                           . " which was " . (int +(time - $time) / 3600) . " hours ago.", cf::NDI_REPLY);
+         } else {
+            $pl->message ("No player named $login is known to me.", cf::NDI_REPLY);
+         }
       } else {
-         $pl->message ("No player named $login is known to me.", cf::NDI_REPLY);
+         $pl->message ("Usage: seen <player>", cf::NDI_REPLY);
       }
-   } else {
-      $pl->message ("Usage: seen <player>", cf::NDI_REPLY);
-   }
+   };
 };
 cf::register_command body => sub {
    my ($ob) = @_;
    # Too hard to try and make a header that lines everything up, so just
    # give a description. (comment from C++)
    my $reply =
-       "The first column is the name of the body location.\n\n"
+       "The first column is the name of the body location.\r"
-     . "The second column is how many of those locations your body has.\n\n"
+     . "The second column is how many of those locations your body has.\r"
      . "The third column is how many slots in that location are available.\n\n";
    $reply .= sprintf " %-20s %3s %5s\n", "Location", "You", "Avail";
    for (0 .. cf::NUM_BODY_LOCATIONS - 1) {
       my $msg = cf::object::slot_nonuse_name $_;
       $msg =~ s/^.*? a //;
       $reply .= sprintf " %-20s %3d %5d\n", $msg, $ob->slot_info ($_), $ob->slot_used ($_)
          if $ob->slot_info ($_) or $ob->slot_used ($_);
    }
-   $reply .= "You are not allowed to wear armor\n\n"
+   $reply .= "You are not allowed to wear armor\r"
       unless $ob->flag (cf::FLAG_USE_ARMOUR);
-   $reply .= "You are not allowed to use weapons\n\n"
+   $reply .= "You are not allowed to use weapons\r"
       unless $ob->flag (cf::FLAG_USE_WEAPON);
-   my $CHANNEL = {
-      id      => "body",
-      title   => "Body Parts",
-      reply   => undef,
-      tooltip => "Shows which body parts you posess and are available",
-   };
-   $ob->send_msg ($CHANNEL => $reply, cf::NDI_REPLY);
+   $ob->send_msg ("c/body" => $reply, cf::NDI_REPLY);
 };
 cf::register_command mark => sub {
    my ($pl, $arg) = @_;
       $ob->contr->$oncmd (0);
    };
 }
-our $MAPINFO_CHANNEL = {
-   id      => "mapinfo",
-   title   => "Map Info",
-   reply   => undef,
-   tooltip => "Information about the map",
-};
 cf::register_command mapinfo => sub {
    my ($ob) = @_;
    my $observe = $ob->contr->observe;
    my $map = $observe->map
       or return;
-   my $msg = sprintf "%s (%s) %s", $map->name, $map->path, $observe->region->longname;
+   my $msg = sprintf "%s (%s)\r%s", $map->name, $map->path, $observe->region->longname;
-   $msg .= sprintf "\n\nplayers: %d difficulty: %d size: %d start: %dx%d timeout: %d",
+   $msg .= sprintf "\rplayers: %d difficulty: %d size: %d start: %dx%d timeout: %d",
               (scalar $map->players), $map->difficulty, $map->width, $map->height, $map->enter_x, $map->enter_y, $map->timeout
       if $ob->flag (cf::FLAG_WIZ);
-   $ob->send_msg ($MAPINFO_CHANNEL => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
+   $ob->send_msg ("c/mapinfo" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
 };
 cf::register_command whereami => sub {
    my ($ob) = @_;
    my $reg = $ob->contr->observe->region;
-   $ob->send_msg ($MAPINFO_CHANNEL => (sprintf "You are %s.\n%s", $reg->longname, $reg->msg), cf::NDI_REPLY | cf::NDI_CLEAR);
+   $ob->send_msg ("c/who" => (sprintf "You are %s.\n\n%s", $reg->longname, $reg->msg), cf::NDI_REPLY | cf::NDI_CLEAR);
 };
 cf::register_command whereabouts => sub {
    my ($ob, $arg) = @_;
    for my $pl (cf::player::list) {
       ++$count{$pl->ob->region->longname};
    }
-   my $msg = "In the world currently there are:\n\n"
+   my $msg = "T<In the world currently there are:>\n\n"
-           . join "", map "$count{$_} player(s) $_\n\n", sort keys %count;
+           . join "", map { sprintf " C<%3d >player(s) %s\r", $count{$_}, $_ } sort keys %count;
-   $ob->send_msg ($MAPINFO_CHANNEL => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
+   $ob->send_msg ("c/who" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
 };
 cf::register_command hiscore => sub {
    my ($ob, $arg) = @_;
 cf::register_command uptime => sub {
    my ($ob, $arg) = @_;
    my $startup = POSIX::strftime "%Y-%m-%d %H:%M:%S %Z", localtime $cf::UPTIME;
    my $runtime = sprintf "%.1f", (time - $cf::UPTIME) / 86400;
-   $ob->send_msg (log => "server started $startup, uptime ${runtime}\d", cf::NDI_REPLY);
+   $ob->send_msg ("c/uptime" => "server started $startup, uptime ${runtime}\d", cf::NDI_REPLY | cf::NDI_CLEAR);
 };
 my %IN_MEMORY = (
-   cf::MAP_IN_MEMORY => "I",
+   cf::MAP_ACTIVE => "I",
    cf::MAP_SWAPPED   => "S",
    cf::MAP_LOADING   => "L",
 );
 cf::register_command maps => sub {
    my ($ob, $arg) = @_;
    no re 'eval'; $arg = qr<$arg>;
-   my $format = "%2s %1s %3s %5s %.60s\n";
+   my $format = " %2s %1s %3s %5s %.60s\n";
-   $ob->send_msg ($MAPINFO_CHANNEL => (sprintf $format, "Pl", "I", "Svd", "Reset", "Name"), cf::NDI_REPLY | cf::NDI_CLEAR);
+   my $msg = "\n" . sprintf $format, "Pl", "I", "Svd", "Reset", "Name";
    for (sort keys %cf::MAP) {
       my $map = $cf::MAP{$_}
          or next;
       next if $map->{deny_list};
       my $svd = int $cf::RUNTIME - $map->{last_save};
       $svd = "++" if $svd > 99;
-      $ob->send_msg ($MAPINFO_CHANNEL =>
+      $msg .= sprintf $format,
-                  (sprintf $format,
-                   (scalar $map->players),
+                 (scalar $map->players),
-                   $IN_MEMORY{$map->in_memory} || "?",
+                 $IN_MEMORY{$map->in_memory} || "?",
-                   $svd,
+                 $svd,
-                   (int $map->reset_at - $cf::RUNTIME),
+                 (int $map->reset_at - $cf::RUNTIME),
-                   $map->visible_name)
+                 $map->visible_name;
-      );
    }
-};
+   $ob->send_msg ("c/mapinfo" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
+};

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/ext/commands.ext (file contents): Revision 1.63 by root, Sun Oct 7 15:52:05 2007 UTC vs. Revision 1.71 by root, Tue Sep 23 00:24:52 2008 UTC

Diff Legend

Comparing deliantra/server/ext/commands.ext (file contents):
Revision 1.63 by root, Sun Oct 7 15:52:05 2007 UTC vs.
Revision 1.71 by root, Tue Sep 23 00:24:52 2008 UTC