--- cf.schmorp.de/maps/perl/schmorp-neko.ext	2006/02/17 19:39:11	1.11
+++ cf.schmorp.de/maps/perl/schmorp-neko.ext	2006/03/31 22:47:20	1.16
@@ -18,35 +18,58 @@
    $portal->free;
 }
 
+sub find_target_player {
+   my ($obj) = @_;
+
+   my ($time, $pl) = (time + 120, undef);
+
+   for (map $_->ob, cf::player::list) {
+      next unless $obj->on_same_map_as ($_);
+
+      my $ptime = List::Util::max $_->{neko_next_pester}, $_->{neko_next_cast};
+
+      ($time, $pl) = ($ptime, $_)
+         if $time > $ptime;
+   }
+
+   $pl
+}
+
 sub on_move {
-   my ($data) = @_;
+   my ($event, $who) = @_;
 
-   if (my $pl = $data->{who}->nearest_player) {
-      my ($d, undef, undef, $dir, undef) = $data->{who}->rangevector ($pl);
+   if (my $pl = find_target_player $who) {
+      my ($d, undef, undef, $dir, undef) = $who->rangevector ($pl);
 
       if ($d < 1.5) {
          if (grep $_->type == cf::FORCE && $_->slaying eq "schmorp-neko-gave-fish", $pl->inv) {
             # she likes us!
-            if ($pl->{neko_fish} < time) {
-               $pl->{neko_fish} = time + 120 + rand 300;
+            if ($pl->{neko_next_pester} < time) {
+               $pl->{neko_next_pester} = time + 120 + rand 300;
                $pl->message ("Purr. (Purr)");
             }
 
-            # so heal her
-            my $spell = cf::object::new "spell_heal";
+            if ($pl->{neko_next_cast} < time) {
+               $pl->{neko_next_cast} = time + 40 + rand 60;
 
-            $spell->set_hp (0);
-            $spell->set_dam (0); # normal hp heal (none to avoid message)
-            $spell->set_food (999); # fill food
-            $spell->set_last_sp (9999); # fill sp
-            $spell->set_last_grace (9999); # fill gr
-            $spell->set_attacktype (cf::AT_CONFUSION | cf::AT_POISON | cf::AT_BLIND | cf::AT_DISEASE);
+               # so heal her
+               my $spell = cf::object::new "spell_heal";
 
-            if ($data->{who}->cast_spell ($data->{who}, $dir, $spell)) {
-               $pl->message ("... (Neko-san makes strange noises)");
-            }
+               $spell->set_sp (0); # makes casting work
+               $spell->set_gp (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->free;
+               $pl->message ("(Neko-san makes strange noises)");
+               $pl->cast_spell ($who, $dir, $spell);
+
+               $spell->free;
+            }
 
          } else {
             # check for fish in his inv and steal it
@@ -66,8 +89,8 @@
 
             } else {
                # pester user
-               if ($pl->{neko_fish} < time) {
-                  $pl->{neko_fish} = time + 60 + rand 300;
+               if ($pl->{neko_next_pester} < time) {
+                  $pl->{neko_next_pester} = time + 60 + rand 300;
                   $pl->message ("Meow. (Please bring me fish)");
                }
             }
@@ -77,37 +100,35 @@
          $dir = $dir % 8 + 1 unless $d > 1.5;
       }
 
-      $data->{who}->move ($dir);
+      $who->move ($dir);
    }
 
    1
 }
 
 sub on_attack {
-   my ($data) = @_;
+   my ($event, $ob, $who) = @_;
 
-   $data->{activator}{neko_attack}++
-      or cf::LOG cf::llevDebug, sprintf "QBERT Neko-san was attacked by %s!\n", $data->{activator}->name;
+   $who->{neko_attack}++
+      or cf::LOG cf::llevDebug, sprintf "QBERT Neko-san was attacked by %s!\n", $who->name;
 
-   $data->{activator}->message ("Meoow! (Please do not hurt me)")
-      if !($data->{activator}{neko_attack} & 15);
+   $who->message ("Meoow! (Please do not hurt me)")
+      if !($who->{neko_attack} & 15);
 
-   if ($data->{activator}{neko_attack} > 512) {
-      $data->{activator}{neko_attack} -= 128;
-      $data->{activator}->message ("Neko-san is suddenly gone!");
-      teleport $data->{activator}, "/scorn/misc/scorn_illusions", 15, 7;
-      $data->{activator}->message ("You hear strange noises all around you...");
-      $data->{activator}->message ("You feel dumb.");
+   if ($who->{neko_attack} > 512) {
+      $who->{neko_attack} -= 128;
+      $who->message ("Neko-san is suddenly gone!");
+      teleport $who, "/scorn/misc/scorn_illusions", 15, 7;
+      $who->message ("You hear strange noises all around you...");
+      $who->message ("You feel dumb.");
    }
 
    1
 }
 
 sub on_say {
-   my ($data) = @_;
-
-   cf::LOG cf::llevDebug, sprintf "QBERT [Neko-fon] %s: %s\n", $data->{activator}->name, $data->{message};
+   my ($event, $ob, $who, $msg) = @_;
 
-   0
+   cf::LOG cf::llevDebug, sprintf "QBERT [Neko-fon] %s: %s\n", $who->name, $msg;
 }