--- cf.schmorp.de/maps/perl/nimbus.ext	2006/03/18 01:33:16	1.3
+++ cf.schmorp.de/maps/perl/nimbus.ext	2006/03/31 22:47:20	1.10
@@ -41,20 +41,23 @@
 }
 
 sub skills_set($$) {
-   my ($ob, $skill) = @_;
+   my ($ob, $skills) = @_;
 
-   for (grep $_->type == cf::SKILL, $ob->inv) {
-      $_->set_exp ($skill->{$_->skill})
-         if exists $skill->{$_->skill};
+   for my $skill (grep $_->type == cf::SKILL, $ob->inv) {
+      my $name = $skill->skill;
+
+      if ($skill->stats->exp < $skills->{$name}) {
+         $skill->stats->exp ($skills->{$name});
+         $ob->player_lvl_adj ($skill);
+      }
    }
 }
 
 # called when the player will likely die (modulo explore mode)
 # but before any stats/exp is changed
 sub on_player_death {
-   my ($event) = @_;
+   my ($ob) = @_;
 
-   my $ob = $event->{who};
    my $pl = $ob->contr;
 
    # save player stats and experience to restore it later
@@ -66,35 +69,63 @@
       skill_exp  => skills_get $ob,
    };
 
-   $ob->{nimbus_save} = $save;
+   unless ($ob->{in_nimbus}) {
+      $ob->{in_nimbus} = $save;
+
+      my $path = sprintf "%s/%s/%s/%s",
+         cf::localdir, cf::playerdir, $ob->name, "nimbus";
+
+      my $nimbus = cf::map::get_map "/schmorp/nimbus";
+      $nimbus->set_path ($path);
+      $nimbus->set_unique (1);
+      
+      $pl->set_savebed ($path, 24, 12);
+
+      $ob->message ("\n");
+      $ob->message ("You start to feel dizzy.\n");
+      $ob->message ("The world around you blurs.\n");
+      $ob->message ("\n");
+   }
+
+   0
+}
+
+sub teleport {
+   my ($pl, $map, $x, $y) = @_;
 
-   my $path = sprintf "%s/%s/%s/%s",
-      cf::localdir, cf::playerdir, $ob->name, "nimbus";
+   return if $pl->ob->map->path eq $map
+          && abs ($pl->ob->x - $x) <= 1
+          && abs ($pl->ob->y - $y) <= 1;
 
-   my $nimbus = cf::map::get_map "/schmorp/nimbus";
-   $nimbus->set_path ($path);
-   $nimbus->set_unique (1);
-   
-   $pl->set_savebed ($path, 24, 12);
+   my $portal = cf::object::new "exit";
+
+   $portal->set_slaying ($map);
+   $portal->set_hp      ($x);
+   $portal->set_sp      ($y);
+
+   $portal->apply ($pl->ob);
+
+   $portal->free;
 }
 
 sub on_trigger {
-   my ($event) = @_;
-   my $options = $event->{options};
-   my $ob = $event->{activator};
+   my ($event, $porter, $ob) = @_;
+
+   my $options = $event->options;
    my $pl = $ob->contr;
    my @savebed;
 
-   warn "trigger $options $ob->{nimbus_save}\n";#d#
-   warn $ob->name;
-
-   if (my $save = delete $ob->{nimbus_save}) {
+   if (my $save = delete $ob->{in_nimbus}) {
       @savebed = @{$save->{savebed}};
 
-      if ($options eq "restore" || 1) {
+      if ($options eq "restore") {
+         $ob->message ("The gods acknowledge your success.\n");
          stats_set $ob->stats, $save->{stats};
          stats_set $pl->orig_stats, $save->{orig_stats};
+         $ob->player_lvl_adj; # update overall level
          skills_set $ob, $save->{skill_exp};
+      } else {
+         $ob->message ("The gods are disappointed with you.\n");
       }
 
    } else {
@@ -103,10 +134,20 @@
 
    $pl->set_savebed (@savebed);
 
-   # TODO: you wake up...
-   $ob->teleport (cf::map::get_map $savebed[0], $savebed[1], $savebed[2]);
+   my $map = $ob->map;
+
+   teleport $pl, @savebed;
+
+   # should make this a temporary map and let cf deal with it
+   unlink $map->path;
+   unlink $map->path . ".cfperl";
+   $map->delete_map;
+
+   $pl->play_sound_player_only (cf::SOUND_PLAYER_DIES);
 
-   # TODO: invalidate map
+   $ob->message ("You feel as if you woke up from a dream.\n");
+   $ob->message ("You have a headache.\n");
+   $ob->message ("Maybe you should have a drink.\n");
 
    1
 }