--- cf.schmorp.de/maps/perl/schmorp-neko.ext	2006/08/27 15:39:17	1.23
+++ cf.schmorp.de/maps/perl/schmorp-neko.ext	2006/09/08 17:33:55	1.29
@@ -7,9 +7,9 @@
 
    my $portal = cf::object::new "exit";
 
-   $portal->set_slaying ($map);
-   $portal->set_hp      ($x);
-   $portal->set_sp      ($y);
+   $portal->slaying   ($map);
+   $portal->stats->hp ($x);
+   $portal->stats->sp ($y);
 
    $portal->apply ($pl);
 
@@ -33,7 +33,7 @@
    $pl
 }
 
-sub on_move {
+sub on_monster_move {
    my ($self, $enemy) = @_;
 
    if (my $pl = find_target_player $self) {
@@ -53,15 +53,15 @@
                # so heal her
                my $spell = cf::object::new "spell_heal";
 
-               $spell->set_sp (0); # makes casting work
-               $spell->set_gp (0); # on unholy/nomagic ground
+               $spell->stats->sp (0); # makes casting work
+               $spell->stats->grace (0); # on unholy/nomagic ground
 
-               $spell->set_hp (0);
-               $spell->set_dam (($pl->maxhp - $pl->hp) * 0.5); # normal hp heal
-               $spell->set_food (50); # fill food
-               $spell->set_last_sp (100); # fill sp
-               $spell->set_last_grace (100); # fill gr
-               $spell->set_attacktype (cf::AT_CONFUSION | cf::AT_POISON | cf::AT_BLIND | cf::AT_DISEASE);
+               $spell->stats->hp (0);
+               $spell->stats->dam (($pl->stats->maxhp - $pl->stats->hp) * 0.5); # normal hp heal
+               $spell->stats->food (50); # fill food
+               $spell->last_sp (100); # fill sp
+               $spell->last_grace (100); # fill gr
+               $spell->attacktype (cf::AT_CONFUSION | cf::AT_POISON | cf::AT_BLIND | cf::AT_DISEASE);
 
                $pl->message ("(Neko-san makes strange noises)");
                $pl->cast_spell ($self, $dir, $spell);
@@ -74,8 +74,8 @@
             if (my $fish = (grep $_->archetype->name eq "fishfood", $pl->inv)[0]) {
                # add force
                my $gave_fish = cf::object::new "force";
-               $gave_fish->set_slaying ("schmorp-neko-gave-fish");
-               $gave_fish->set_speed (0);
+               $gave_fish->slaying ("schmorp-neko-gave-fish");
+               $gave_fish->speed (0);
                $gave_fish->insert_ob_in_ob ($pl);
 
                # remove fish
@@ -107,33 +107,37 @@
 sub on_attack {
    my ($self, $hitter) = @_;
 
-   if ($hitter->{neko_last_attack} < time - 300) {
-      $hitter->{neko_attack} = 0;
-   }
+   if ($hitter->type == cf::PLAYER) {
+      if ($hitter->{neko_last_attack} < time - 300) {
+         $hitter->{neko_attack} = 0;
+      }
 
-   $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.");
+      $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);
+   ext::schmorp_irc::do_notice (sprintf "[Neko-fon] %s: %s\n", $pl->ob->name, $msg);
 }
 
 cf::register_attachment "Nekosan", package => __PACKAGE__;