[ViewVC] Diff of: cvs/deliantra/maps/perl/chat.ext

Comparing deliantra/maps/perl/chat.ext (file contents):
Revision 1.27 by root, Sun Jul 30 19:56:57 2006 UTC vs.
Revision 1.40 by pippijn, Sun Dec 10 11:36:39 2006 UTC

 #! perl
+#CONVERSION: PARTIAL
 # implement a replacement for the built-in say/chat/shout/tell/reply commands
 # adds ignore/unignore functionality
 use NPC_Dialogue;
          }
       }
    }
 }
-sub on_logout {
+cf::attach_to_players
+   prio => -1000,
+   on_login => sub {
-   my ($pl, $host) = @_;
+      my ($pl) = @_;
-   clean_timeouts $pl->ob;
+      clean_timeouts $pl->ob;
-}
+   },
+;
 cf::register_command listen => 0, sub {
    my ($who, $msg) = @_;
    my $player = cf::player::find $who->name;
 cf::register_command say => 0, sub {
    my ($who, $msg) = @_;
    utf8::decode $msg;
+   return if $who->contr->invoke (cf::EVENT_PLAYER_SAY, $msg);
    if ($msg) {
       my $name = $who->name;
       utf8::encode $msg; # ->message not yet utf8-ified
       $_->ob->message ("$name says: $msg", cf::NDI_GREY | cf::NDI_UNIQUE)
          for grep $who->on_same_map_as ($_->ob), cf::player::list;
       utf8::decode $msg;
       # npcs, magic_ears etc.
-      # first find all objects and their inventories within a 5x5 square
+      # first find all objects and theirt-level inventories
-      # that have something resembling dialogue
+      # within a 5x5 square # that have something resembling
+      # dialogue or support on_say.
       my ($map, $x, $y) = ($who->map, $who->x - 2, $who->y - 2);
       for my $npc (
-         grep NPC_Dialogue::has_dialogue $_,
+         grep +($_->invoke (cf::EVENT_OBJECT_SAY, $who->contr, $msg) && return) || NPC_Dialogue::has_dialogue $_,
             map +($_, $_->inv),
                grep $_,
                   map $map->at ($x + $_ % 5, $y + (int $_ / 5)),
                      0..24
       ) {
 cf::register_command chat => 0, sub {
    my ($who, $msg) = @_;
    utf8::decode $msg;
+   return if $who->contr->invoke (cf::EVENT_PLAYER_CHAT, $msg);
    if ($msg) {
       my $name = $who->name;
       my $NOW = time;
       utf8::encode $msg; # ->message not yet utf8-ified
       cf::LOG cf::llevDebug, sprintf "QBERT [%s] %s\n", $name, $msg;
+      ext::schmorp_irc::do_notice (sprintf "[%s] %s", $name, $msg);
       $_->ob->message ("$name chats: $msg", cf::NDI_BLUE)
          for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 10 } cf::player::list;
    } else {
 cf::register_command shout => 0, sub {
    my ($who, $msg) = @_;
    utf8::decode $msg;
+   return if $who->contr->invoke (cf::EVENT_PLAYER_SHOUT, $msg);
    if ($msg) {
       my $NOW = time;
       my $name = $who->name;
       cf::LOG cf::llevDebug, sprintf "QBERT {%s} %s\n", $name, $msg;
+      ext::schmorp_irc::do_notice (sprintf "\0034{%s} %s\n", $name, $msg);
       utf8::encode $msg; # ->message not yet utf8-ified
       $_->ob->message ("$name shouts: $msg", cf::NDI_RED)
          for grep { $_->ob->{ext_ignore_shout}{$name} < $NOW && $_->listening >= 2 } cf::player::list;
    my ($who, $args) = @_;
    my ($target, $msg) = split /\s+/, $args, 2;
    utf8::decode $msg;
+   return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $target, $msg);
    my $name = $who->name;
+   if ($target =~ /irc\//) {
+      my (undef, $nick) = split /\//, $target, 2;
+      $who->message ("You tell $target: $args");
+      ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $msg);
-   if (my $other = cf::player::find $target) {
+   } elsif (my $other = cf::player::find $target) {
       if ($msg) {
          if ($target eq $name) {
             $who->message ("You are talking to yourself, you freak!", cf::NDI_UNIQUE);
          } elsif ($other->ob->{ext_ignore_tell}{$name} >= time) {
    my ($who, $args) = @_;
    my $name = $who->name;
    utf8::decode $args;
+   return if $who->contr->invoke (cf::EVENT_PLAYER_TELL, $who->{ext_last_tell}, $args);
+   if ($who->{ext_last_tell} =~ /irc\//) {
+      my (undef, $nick) = split /\//, $who->{ext_last_tell}, 2;
+      $who->message ("You tell " . $who->{ext_last_tell} . ": $args");
+      ext::schmorp_irc::do_notice (sprintf "(%s) %s: %s\n", $name, $nick, $args);
-   if (my $other = cf::player::find $who->{ext_last_tell}) {
+   } elsif (my $other = cf::player::find $who->{ext_last_tell}) {
       if ($args) {
          $other->ob->{ext_ignore_tell}{$name} >= time
             or delete $other->ob->{ext_ignore_tell}{$name};
          if ($other->ob->{ext_ignore_tell}{$name} < time) {
-            utf8::encode $msg; # ->message not yet utf8-ified
+            utf8::encode $args; # ->message not yet utf8-ified
             cf::LOG cf::llevDebug, sprintf "TELL [%s>%s] %s\n", $name, $other->ob->name, $args;
             $who->message ("You tell " . $other->ob->name . ": $args");
             $other->ob->message ("$name tells you: $args");
             $who->{ext_last_tell} = $other->ob->name;
       } else {
          $who->message ("What do you want to tell ".$other->ob->name."?", cf::NDI_UNIQUE);
       }
    } else {
-      $who->message ("Can't reply, player left. Your message: $args", cf::NDI_UNIQUE);
+      $who->message ("Can't reply, player left. Your message: $args".$who->{ext_last_tell}, cf::NDI_UNIQUE);
    }
 };
 cf::register_command ignore => 0, sub {
    my ($who, $args) = @_;

Diff Legend

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

Comparing deliantra/maps/perl/chat.ext (file contents): Revision 1.27 by root, Sun Jul 30 19:56:57 2006 UTC vs. Revision 1.40 by pippijn, Sun Dec 10 11:36:39 2006 UTC

Diff Legend

Comparing deliantra/maps/perl/chat.ext (file contents):
Revision 1.27 by root, Sun Jul 30 19:56:57 2006 UTC vs.
Revision 1.40 by pippijn, Sun Dec 10 11:36:39 2006 UTC