--- cf.schmorp.de/maps/perl/schmorp-neko.ext	2006/08/27 15:23:30	1.22
+++ cf.schmorp.de/maps/perl/schmorp-neko.ext	2006/08/30 08:34:21	1.26
@@ -33,9 +33,8 @@
    $pl
 }
 
-sub on_move {
+sub on_monster_move {
    my ($self, $enemy) = @_;
-   #warn "move<@_>\n";#d#
 
    if (my $pl = find_target_player $self) {
       my ($d, undef, undef, $dir, undef) = $self->rangevector ($pl);
@@ -106,36 +105,40 @@
 }
 
 sub on_attack {
-   my ($self) = @_;
-   #warn "attack<@_>\n";#d#
+   my ($self, $hitter) = @_;
 
-   if ($self->{neko_last_attack} < time - 300) {
-      $self->{neko_attack} = 0;
-   }
+   if ($hitter->type == cf::PLAYER) {
+      if ($hitter->{neko_last_attack} < time - 300) {
+         $hitter->{neko_attack} = 0;
+      }
 
-   $self->{neko_last_attack} = time;
-   $self->{neko_attack}++
-      or ext::schmorp_irc::do_notice "Neko-san was attacked by ". $self->name . "!\n";
-
-   $self->message ("Meoow! (Please do not hurt me)")
-      if !($self->{neko_attack} & 15);
-
-   if ($self->{neko_attack} > 512) {
-      $self->{neko_attack} -= 128;
-      $self->message ("Neko-san is suddenly gone!");
-      teleport $self, "/scorn/misc/scorn_illusions", 15, 7;
-      $self->message ("You hear strange noises all around you...");
-      $self->message ("You feel dumb.");
+      $hitter->{neko_last_attack} = time;
+      $hitter->{neko_attack}++
+         or ext::schmorp_irc::do_notice "Neko-san was attacked by ". $hitter->name . "!\n";
+
+      $hitter->message ("Meoow! (Please do not hurt me)")
+         if !($hitter->{neko_attack} & 15);
+
+      if ($hitter->{neko_attack} > 512) {
+         $hitter->{neko_attack} -= 128;
+         $hitter->message ("Neko-san is suddenly gone!");
+         teleport $hitter, "/scorn/misc/scorn_illusions", 15, 7;
+         $hitter->message ("You hear strange noises all around you...");
+         $hitter->message ("You feel dumb.");
+      }
+   } else {
+      $hitter->hp (-1);
+      $hitter->kill_object;
    }
 
    cf::override;
 }
 
-sub on_listen {
-   my ($event, $ob, $who, $msg) = @_;
+sub on_say {
+   my ($self, $pl, $msg) = @_;
 
-   cf::LOG cf::llevDebug, sprintf "QBERT [Neko-fon] %s: %s\n", $who->name, $msg;
-   ext::schmorp_irc::do_notice (sprintf "[Neko-fon] %s: %s\n", $who->name, $msg);
+   cf::LOG cf::llevDebug, sprintf "QBERT [Neko-fon] %s: %s\n", $pl->ob->name, $msg;
+   ext::schmorp_irc::do_notice (sprintf "[Neko-fon] %s: %s\n", $pl->ob->name, $msg);
 }
 
 cf::register_attachment "Nekosan", package => __PACKAGE__;