--- deliantra/server/lib/cf.pm	2008/12/28 06:59:27	1.463
+++ deliantra/server/lib/cf.pm	2009/01/08 19:23:44	1.468
@@ -23,7 +23,7 @@
 
 use 5.10.0;
 use utf8;
-use strict "vars", "subs";
+use strict qw(vars subs);
 
 use Symbol;
 use List::Util;
@@ -114,6 +114,8 @@
 our $BDB_TRICKLE_WATCHER;
 our $DB_ENV;
 
+our @EXTRA_MODULES = qw(pod mapscript);
+
 our %CFG;
 
 our $UPTIME; $UPTIME ||= time;
@@ -146,6 +148,8 @@
    $RUNTIME = <$fh> + 0.;
 }
 
+eval "sub TICK() { $TICK } 1" or die;
+
 mkdir $_
    for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
 
@@ -2386,7 +2390,7 @@
    id      => "say",
    title   => "Map",
    reply   => "say ",
-   tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
+   tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
 };
 
 our $CHAT_CHANNEL = {
@@ -2771,12 +2775,30 @@
       reply   => undef,
       tooltip => "Shows which body parts you posess and are available",
    },
+   "c/statistics" => {
+      id      => "infobox",
+      title   => "Statistics",
+      reply   => undef,
+      tooltip => "Shows your primary statistics",
+   },
    "c/skills" => {
       id      => "infobox",
       title   => "Skills",
       reply   => undef,
       tooltip => "Shows your experience per skill and item power",
    },
+   "c/resistances" => {
+      id      => "infobox",
+      title   => "Resistances",
+      reply   => undef,
+      tooltip => "Shows your resistances",
+   },
+   "c/pets" => {
+      id      => "infobox",
+      title   => "Pets",
+      reply   => undef,
+      tooltip => "Shows information abotu your pets/a specific pet",
+   },
    "c/uptime" => {
       id      => "infobox",
       title   => "Uptime",
@@ -2795,6 +2817,12 @@
       reply   => "gsay ",
       tooltip => "Messages and chat related to your party",
    },
+   "c/death" => {
+      id      => "death",
+      title   => "Death",
+      reply   => undef,
+      tooltip => "Reason for and more info about your most recent death",
+   },
    "c/say"     => $SAY_CHANNEL,
    "c/chat"    => $CHAT_CHANNEL,
 );
@@ -3030,6 +3058,7 @@
   cf::object
      contr pay_amount pay_player map x y force_find force_add destroy
      insert remove name archname title slaying race decrease split
+     value
 
   cf::object::player
      player
@@ -3045,9 +3074,9 @@
 for (
    ["cf::object"         => qw(contr pay_amount pay_player map force_find force_add x y
                                insert remove inv nrof name archname title slaying race
-                               decrease split destroy change_exp)],
+                               decrease split destroy change_exp value msg lore send_msg)],
    ["cf::object::player" => qw(player)],
-   ["cf::player"         => qw(peaceful)],
+   ["cf::player"         => qw(peaceful send_msg)],
    ["cf::map"            => qw(trigger)],
 ) {
    no strict 'refs';
@@ -3075,6 +3104,8 @@
    $qcode =~ s/"/‟/g; # not allowed in #line filenames
    $qcode =~ s/\n/\\n/g;
 
+   %vars = (_dummy => 0) unless %vars;
+
    local $_;
    local @safe::cf::_safe_eval_args = values %vars;
 
@@ -3671,7 +3702,7 @@
 
          warn "unloading cf.pm \"a bit\"";
          delete $INC{"cf.pm"};
-         delete $INC{"cf/pod.pm"};
+         delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
 
          # don't, removes xs symbols, too,
          # and global variables created in xs
@@ -3898,7 +3929,7 @@
 }
 
 # load additional modules
-use cf::pod;
+require "cf/$_.pm" for @EXTRA_MODULES;
 
 END { cf::emergency_save }