--- cf.schmorp.de/maps/perl/schmorp-neko.ext	2006/02/08 06:51:16	1.5
+++ cf.schmorp.de/maps/perl/schmorp-neko.ext	2006/02/17 21:10:18	1.12
@@ -7,7 +7,7 @@
 sub teleport {
    my ($pl, $map, $x, $y) = @_;
 
-   my $portal = cf::object::new ("exit");
+   my $portal = cf::object::new "exit";
 
    $portal->set_slaying ($map);
    $portal->set_hp      ($x);
@@ -18,12 +18,89 @@
    $portal->free;
 }
 
+sub find_target_player {
+   my ($obj) = @_;
+
+   my ($time, $pl) = (time + 30, 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) = @_;
 
-   if (my $pl = $data->{who}->nearest_player) {
-      my (undef, undef, undef, $dir, undef) = $data->{who}->direction ($pl);
-      $data->{who}->move ($data->{who}, $dir);
+   if (my $pl = find_target_player $data->{who}) {
+      my ($d, undef, undef, $dir, undef) = $data->{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_next_pester} < time) {
+               $pl->{neko_next_pester} = time + 120 + rand 300;
+               $pl->message ("Purr. (Purr)");
+            }
+
+            if ($pl->{neko_next_cast} < time) {
+               $pl->{neko_next_cast} = time + 40 + rand 60;
+
+               # 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->set_hp (0);
+               $spell->set_dam ($pl->maxhp - $pl->hp); # normal hp heal
+               $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);
+
+               $pl->message ("(Neko-san makes strange noises)");
+               $pl->cast_spell ($data->{who}, $dir, $spell);
+
+               $spell->free;
+            }
+
+         } else {
+            # check for fish in his inv and steal it
+            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->insert_ob_in_ob ($pl);
+
+               # remove fish
+               $fish->remove;
+               $fish->free;
+
+               # be nice
+               $pl->message ("Meoww! (Thank you)");
+
+            } else {
+               # pester user
+               if ($pl->{neko_next_pester} < time) {
+                  $pl->{neko_next_pester} = time + 60 + rand 300;
+                  $pl->message ("Meow. (Please bring me fish)");
+               }
+            }
+         }
+
+         # circular movement
+         $dir = $dir % 8 + 1 unless $d > 1.5;
+      }
+
+      $data->{who}->move ($dir);
    }
 
    1
@@ -33,12 +110,13 @@
    my ($data) = @_;
 
    $data->{activator}{neko_attack}++
-      or cf::LOG cf::llevDebug, sprintf "QBERT Neko-san was attacked by %s!", $data->{activator}->name;
+      or cf::LOG cf::llevDebug, sprintf "QBERT Neko-san was attacked by %s!\n", $data->{activator}->name;
 
-   $data->{activator}->message ("Meoow! (You are hurting me)")
+   $data->{activator}->message ("Meoow! (Please do not hurt me)")
       if !($data->{activator}{neko_attack} & 15);
 
-   if ($data->{activator}{neko_attack} > 256) {
+   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...");
@@ -51,7 +129,7 @@
 sub on_say {
    my ($data) = @_;
 
-   cf::LOG cf::llevDebug, "QBERT [Neko-fon] $data->{message}";
+   cf::LOG cf::llevDebug, sprintf "QBERT [Neko-fon] %s: %s\n", $data->{activator}->name, $data->{message};
 
    0
 }