ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/maps/perl/nimbus.ext
(Generate patch)

Comparing deliantra/maps/perl/nimbus.ext (file contents):
Revision 1.4 by root, Mon Mar 20 22:49:26 2006 UTC vs.
Revision 1.5 by root, Mon Mar 20 23:28:56 2006 UTC

43} 43}
44 44
45sub skills_set($$) { 45sub skills_set($$) {
46 my ($ob, $skill) = @_; 46 my ($ob, $skill) = @_;
47 47
48 for (grep $_->type == cf::SKILL, $ob->inv) { 48 my $cur = skills_get $ob;
49 $_->set_exp ($skill->{$_->skill}) 49
50 if exists $skill->{$_->skill}; 50 while (my ($name, $exp) = each %$skill) {
51 if ($cur->{$name} < $exp) {
52 length $name
53 ? $ob->change_skill ($exp - $cur->{$name}, $name)
54 : $ob->change_skill ($exp - $cur->{$name});
55 }
51 } 56 }
52} 57}
53 58
54# called when the player will likely die (modulo explore mode) 59# called when the player will likely die (modulo explore mode)
55# but before any stats/exp is changed 60# but before any stats/exp is changed
66 orig_stats => stats_get $pl->orig_stats, 71 orig_stats => stats_get $pl->orig_stats,
67 savebed => [$pl->get_savebed], 72 savebed => [$pl->get_savebed],
68 skill_exp => skills_get $ob, 73 skill_exp => skills_get $ob,
69 }; 74 };
70 75
71 $ob->{nimbus_save} ||= $save; 76 $ob->{in_nimbus} ||= $save;
72 77
73 my $path = sprintf "%s/%s/%s/%s", 78 my $path = sprintf "%s/%s/%s/%s",
74 cf::localdir, cf::playerdir, $ob->name, "nimbus"; 79 cf::localdir, cf::playerdir, $ob->name, "nimbus";
75 80
76 my $nimbus = cf::map::get_map "/schmorp/nimbus"; 81 my $nimbus = cf::map::get_map "/schmorp/nimbus";
77 $nimbus->set_path ($path); 82 $nimbus->set_path ($path);
78 $nimbus->set_unique (1); 83 $nimbus->set_unique (1);
79 84
80 $pl->set_savebed ($path, 24, 12); 85 $pl->set_savebed ($path, 24, 12);
86
87 $pl->message ("\n");
88 $pl->message ("You start to feel dizzy.\n");
89 $pl->message ("The world around you blurs.\n");
90 $pl->message ("\n");
81 91
82 0 92 0
83} 93}
84 94
85sub on_trigger { 95sub on_trigger {
90 my @savebed; 100 my @savebed;
91 101
92 warn "trigger $options $ob->{nimbus_save}\n";#d# 102 warn "trigger $options $ob->{nimbus_save}\n";#d#
93 warn $ob->name; 103 warn $ob->name;
94 104
95 if (my $save = delete $ob->{nimbus_save}) { 105 if (my $save = delete $ob->{in_nimbus}) {
96 @savebed = @{$save->{savebed}}; 106 @savebed = @{$save->{savebed}};
97 107
98 if ($options eq "restore" || 1) { 108 if ($options eq "restore" || 1) {
99 stats_set $ob->stats, $save->{stats}; 109 stats_set $ob->stats, $save->{stats};
100 stats_set $pl->orig_stats, $save->{orig_stats}; 110 stats_set $pl->orig_stats, $save->{orig_stats};
105 @savebed = ("/scorn/taverns/inn", 10, 5); 115 @savebed = ("/scorn/taverns/inn", 10, 5);
106 } 116 }
107 117
108 $pl->set_savebed (@savebed); 118 $pl->set_savebed (@savebed);
109 119
110 # TODO: you wake up... 120 my $map = $ob->map;
121
111 $ob->teleport (cf::map::get_map $savebed[0], $savebed[1], $savebed[2]); 122 $ob->teleport (cf::map::get_map $savebed[0], $savebed[1], $savebed[2]);
112 123
113 # TODO: invalidate map 124 $map->delete_map;
125
126 $pl->message ("You feel as if you woke up from a dream.\n");
127 $pl->message ("You have a headache.\n");
128 $pl->message ("Maybe you should have a drink.\n");
114 129
115 1 130 1
116} 131}
117 132

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines