--- cf.schmorp.de/maps/perl/nimbus.ext	2006/03/20 23:28:56	1.5
+++ cf.schmorp.de/maps/perl/nimbus.ext	2006/03/28 16:08:19	1.8
@@ -5,7 +5,7 @@
 my @STATS = qw(
    Str Dex Con Wis Cha Int Pow
    wc ac hp maxhp sp maxsp grace maxgrace
-   food dam luck
+   exp food dam luck
 );
 
 sub stats_get($) {
@@ -34,8 +34,6 @@
    my ($ob) = @_;
 
    +{
-      "" => $ob->stats->exp,
-
       map +($_->skill => $_->stats->exp),
          grep $_->type == cf::SKILL,
             $ob->inv
@@ -43,15 +41,14 @@
 }
 
 sub skills_set($$) {
-   my ($ob, $skill) = @_;
+   my ($ob, $skills) = @_;
 
-   my $cur = skills_get $ob;
+   for my $skill (grep $_->type == cf::SKILL, $ob->inv) {
+      my $name = $skill->skill;
 
-   while (my ($name, $exp) = each %$skill) {
-      if ($cur->{$name} < $exp) {
-         length $name
-            ? $ob->change_skill ($exp - $cur->{$name}, $name)
-            : $ob->change_skill ($exp - $cur->{$name});
+      if ($skill->stats->exp < $skills->{$name}) {
+         $skill->stats->exp ($skills->{$name});
+         $ob->player_lvl_adj ($skill);
       }
    }
 }
@@ -59,9 +56,8 @@
 # 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
@@ -84,14 +80,32 @@
    
    $pl->set_savebed ($path, 24, 12);
 
-   $pl->message ("\n");
-   $pl->message ("You start to feel dizzy.\n");
-   $pl->message ("The world around you blurs.\n");
-   $pl->message ("\n");
+   $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) = @_;
+
+   return if $pl->ob->map->path eq $map
+          && abs ($pl->ob->x - $x) <= 1
+          && abs ($pl->ob->y - $y) <= 1;
+
+   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};
@@ -99,16 +113,17 @@
    my $pl = $ob->contr;
    my @savebed;
 
-   warn "trigger $options $ob->{nimbus_save}\n";#d#
-   warn $ob->name;
-
    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 {
@@ -119,13 +134,18 @@
 
    my $map = $ob->map;
 
-   $ob->teleport (cf::map::get_map $savebed[0], $savebed[1], $savebed[2]);
+   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->message ("You feel as if you woke up from a dream.\n");
-   $pl->message ("You have a headache.\n");
-   $pl->message ("Maybe you should have a drink.\n");
+   $pl->play_sound_player_only (cf::SOUND_PLAYER_DIES);
+
+   $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
 }