--- deliantra/server/ext/commands.ext	2008/09/23 00:24:52	1.71
+++ deliantra/server/ext/commands.ext	2011/05/04 07:41:13	1.82
@@ -34,7 +34,7 @@
              . ($pl->peaceful ? " [peaceful]" : " [HOSTILE]")
              . ($ns->afk ? " [AFK]" : "")
              . ($ob->flag (cf::FLAG_WIZ) ? " [WIZ]" : "")
-             . " [" . $pl->ns->version . "]"
+             . " [" . $pl->ns->{who_version} . "]"
              . " [" . ($pl->peaceful || $privileged ? $ob->map->visible_name : $ob->region->name) . "]"
              . (sprintf " [rtt %.3fs]", $pl->ns->tcpi_rtt * 1e-6)
              . ($privileged ? " " . $pl->ns->host : "")
@@ -62,7 +62,7 @@
          } elsif (cf::player::find_active $login) {
             $pl->message ("$login is right here on this server!", cf::NDI_REPLY);
          } elsif (cf::player::exists $login
-                  and stat cf::player::path $login) {
+                  and !Coro::AIO::aio_stat cf::player::path $login) {
             my $time = (stat _)[9];
 
             $pl->message ("$login was last seen here "
@@ -80,67 +80,64 @@
 cf::register_command body => sub {
    my ($ob) = @_;
 
+   my $observe = $ob->contr->observe;
+
    # 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.\r"
      . "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";
+     . "The third column is how many slots in that location are available.\r"
+     . "The last column shows the items currently using the slot\n\n";
+
+   # first process all applied items and hash them into their slots
+   my @slot;
+
+   for my $item (grep $_->flag (cf::FLAG_APPLIED), $observe->inv) {
+      $item->slot_info ($_)
+         and push @{ $slot[$_] }, $item
+            for 0 .. cf::NUM_BODY_LOCATIONS-1;
+   }
 
-   $reply .= sprintf " %-20s %3s %5s\n", "Location", "You", "Avail";
+   $reply .= sprintf " %-20s %3s %5s %s\n", "Location", "You", "Avail", "What";
    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 .= sprintf " %-20s %3d %5d %s\n",
+                        $msg,
+                        $observe->slot_info ($_),
+                        $observe->slot_used ($_),
+                        join ", ", map $_->query_short_name, @{ $slot[$_] }
+        if $observe->slot_info ($_) || $observe->slot_used ($_);
    }
 
    $reply .= "You are not allowed to wear armor\r"
-      unless $ob->flag (cf::FLAG_USE_ARMOUR);
+      unless $observe->flag (cf::FLAG_USE_ARMOUR);
    $reply .= "You are not allowed to use weapons\r"
-      unless $ob->flag (cf::FLAG_USE_WEAPON);
+      unless $observe->flag (cf::FLAG_USE_WEAPON);
 
-   $ob->send_msg ("c/body" => $reply, cf::NDI_REPLY);
+   $ob->send_msg ("c/body" => $reply, cf::NDI_REPLY | cf::NDI_CLEAR);
 };
 
-cf::register_command mark => sub {
-   my ($pl, $arg) = @_;
-
-   if (length $arg) {
-      my $ob = $pl->find_best_object_match ($arg);
-
-      return $pl->reply (undef, "Could not find an object that matches $arg")
-         unless $ob;
-
-      $pl->contr->mark ($ob);
-      $pl->reply (undef, (sprintf "Marked item %s", $ob->name, $ob->title));
-   } else {
-      my $ob = $pl->find_marked_object;
-
-      $pl->reply (undef, $ob
-         ? (sprintf "%s %s * is marked.", $ob->name, $ob->title)
-         : "You have no marked object.");
-   }
-};
-
-for my $cmd ("run", "fire") {
-   my $oncmd = "${cmd}_on";
-   cf::register_command $cmd => sub {
-      my ($ob, $arg) = @_;
-
-      $ob->reply (undef, "Can't $cmd into a non adjacent square.")
-         if $arg < 0 or $arg >= 9;
-
-      $ob->contr->$oncmd (1);
-      $ob->move_player ($arg);
-   };
-   
-   cf::register_command "${cmd}_stop" => sub {
-      my ($ob) = @_;
-      
-      $ob->contr->$oncmd (0);
-   };
-}
+#cf::register_command mark => sub {
+#   my ($pl, $arg) = @_;
+#
+#   if (length $arg) {
+#      my $ob = $pl->find_best_object_match ($arg);
+#
+#      return $pl->reply (undef, "Could not find an object that matches $arg")
+#         unless $ob;
+#
+#      $pl->contr->mark ($ob);
+#      $pl->reply (undef, (sprintf "Marked item %s", $ob->name, $ob->title));
+#   } else {
+#      my $ob = $pl->mark;
+#
+#      $pl->reply (undef, $ob
+#         ? (sprintf "%s %s * is marked.", $ob->name, $ob->title)
+#         : "You have no marked object.");
+#   }
+#};
 
 cf::register_command mapinfo => sub {
    my ($ob) = @_;
@@ -150,9 +147,28 @@
    my $map = $observe->map
       or return;
 
-   my $msg = sprintf "%s (%s)\r%s", $map->name, $map->path, $observe->region->longname;
-   $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
+   my $msg = '';
+
+   if ($map->name ne '') {
+      $msg .= sprintf "%s [%s] ", $map->name, $map->visible_name
+   } else {
+      $msg .= sprintf "%s ", $map->visible_name
+   }
+
+   if ($map->visible_name ne $map->path) {
+      $msg .= sprintf "(%s) ", $map->path;
+   }
+
+   $msg .= sprintf "\r%s", $observe->region->longname;
+
+   $msg .= sprintf "\rplayers: %d difficulty: %d"
+                   . "\rsize: %dx%d start: %dx%d position: (%d|%d) timeout: %d",
+              (scalar $map->players),
+              $map->difficulty,
+              $map->width, $map->height,
+              $map->enter_x, $map->enter_y,
+              $ob->x, $ob->y,
+              $map->timeout
       if $ob->flag (cf::FLAG_WIZ);
 
    $ob->send_msg ("c/mapinfo" => $msg, cf::NDI_REPLY | cf::NDI_CLEAR);
@@ -229,34 +245,39 @@
 cf::register_command afk => sub {
    my ($ob, $arg) = @_;
 
-   $ob->contr->ns->afk ($ob->contr->ns->afk ? 0 : 1);
-   $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK" : "You are no longer AFK");
+   $ob->contr->ns->afk (!(length $arg ? !$arg : $ob->contr->ns->afk));
+   $ob->reply (undef, $ob->contr->ns->afk ? "You are now AFK." : "You are no longer AFK.");
 };
 
-cf::register_command sound => sub {
+cf::register_command bumpmsg => sub {
    my ($ob, $arg) = @_;
 
-   $ob->contr->ns->sound ($ob->contr->ns->sound ? 0 : 1);
-   $ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
+   $ob->contr->ns->bumpmsg (!(length $arg ? !$arg : $ob->contr->ns->bumpmsg));
+   $ob->reply (undef, $ob->contr->ns->bumpmsg ? "Bumping into walls sounds more painful now." : "Bumping into walls will now be silent.");
 };
 
 cf::register_command brace => sub {
    my ($ob, $arg) = @_;
 
-   $ob->contr->braced ($ob->contr->braced ? 0 : 1);
+   $ob->contr->braced (!(length $arg ? !$arg : $ob->contr->ns->braced));
    $ob->reply (undef, $ob->contr->braced ? "You are braced." : "Not braced.");
 };
 
+cf::register_command sound => sub {
+   my ($ob, $arg) = @_;
+
+   $ob->contr->ns->sound (!(length $arg ? !$arg : $ob->contr->ns->sound));
+   $ob->reply (undef, $ob->contr->ns->sound ? "The sounds are enabled." : "Silence is golden...");
+};
+
 cf::register_command 'output-rate' => sub {
    my ($ob, $arg) = @_;
 
    return $ob->reply (undef, sprintf "Output rate is presently %dbps.", $ob->contr->ns->max_rate / $cf::TICK)
       unless $arg > 0;
 
-   # minimum is 5k/s
-   # maximum is 100k/s, this should be configurable
-   $ob->contr->ns->max_rate ((List::Util::max 5000, List::Util::min 100000, $arg) * $cf::TICK);
-   $ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $cf::TICK);
+   $ob->contr->ns->max_rate ((cf::clamp $arg, $OUTPUT_RATE_MIN, $OUTPUT_RATE_MAX) * $TICK);
+   $ob->reply (undef, sprintf "Output rate now set to %dbps.", $ob->contr->ns->max_rate / $TICK);
 };
 
 cf::register_command 'output-count' => sub {
@@ -326,7 +347,7 @@
       $item = $ob->find_best_object_match ($from)
          or return $ob->message ("rename: could not find a matching item to rename.");
    } else {
-      $item = $ob->find_marked_object
+      $item = $ob->mark
          or return $ob->message ("rename: no from name and no marked item found to rename.");
    }
 
@@ -377,10 +398,10 @@
    $ob->send_msg ("c/uptime" => "server started $startup, uptime ${runtime}\d", cf::NDI_REPLY | cf::NDI_CLEAR);
 };
 
-my %IN_MEMORY = (
-   cf::MAP_ACTIVE => "I",
-   cf::MAP_SWAPPED   => "S",
-   cf::MAP_LOADING   => "L",
+my %MAP_STATE = (
+   cf::MAP_ACTIVE   => "A",
+   cf::MAP_INACTIVE => "I",
+   cf::MAP_SWAPPED  => "S",
 );
 
 cf::register_command maps => sub {
@@ -390,7 +411,7 @@
 
    my $format = " %2s %1s %3s %5s %.60s\n";
 
-   my $msg = "\n" . sprintf $format, "Pl", "I", "Svd", "Reset", "Name";
+   my $msg = "\n" . sprintf $format, "Pl", "S", "Svd", "Reset", "Name";
 
    for (sort keys %cf::MAP) {
       my $map = $cf::MAP{$_}
@@ -404,7 +425,7 @@
 
       $msg .= sprintf $format,
                  (scalar $map->players), 
-                 $IN_MEMORY{$map->in_memory} || "?",
+                 $MAP_STATE{$map->state} || "?",
                  $svd,
                  (int $map->reset_at - $cf::RUNTIME),
                  $map->visible_name;