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

Comparing deliantra/maps/perl/schmorp-neko.ext (file contents):
Revision 1.15 by root, Sat Mar 25 04:47:56 2006 UTC vs.
Revision 1.16 by root, Fri Mar 31 22:47:20 2006 UTC

34 34
35 $pl 35 $pl
36} 36}
37 37
38sub on_move { 38sub on_move {
39 my ($data) = @_; 39 my ($event, $who) = @_;
40 40
41 if (my $pl = find_target_player $data->{who}) { 41 if (my $pl = find_target_player $who) {
42 my ($d, undef, undef, $dir, undef) = $data->{who}->rangevector ($pl); 42 my ($d, undef, undef, $dir, undef) = $who->rangevector ($pl);
43 43
44 if ($d < 1.5) { 44 if ($d < 1.5) {
45 if (grep $_->type == cf::FORCE && $_->slaying eq "schmorp-neko-gave-fish", $pl->inv) { 45 if (grep $_->type == cf::FORCE && $_->slaying eq "schmorp-neko-gave-fish", $pl->inv) {
46 # she likes us! 46 # she likes us!
47 if ($pl->{neko_next_pester} < time) { 47 if ($pl->{neko_next_pester} < time) {
64 $spell->set_last_sp (100); # fill sp 64 $spell->set_last_sp (100); # fill sp
65 $spell->set_last_grace (100); # fill gr 65 $spell->set_last_grace (100); # fill gr
66 $spell->set_attacktype (cf::AT_CONFUSION | cf::AT_POISON | cf::AT_BLIND | cf::AT_DISEASE); 66 $spell->set_attacktype (cf::AT_CONFUSION | cf::AT_POISON | cf::AT_BLIND | cf::AT_DISEASE);
67 67
68 $pl->message ("(Neko-san makes strange noises)"); 68 $pl->message ("(Neko-san makes strange noises)");
69 $pl->cast_spell ($data->{who}, $dir, $spell); 69 $pl->cast_spell ($who, $dir, $spell);
70 70
71 $spell->free; 71 $spell->free;
72 } 72 }
73 73
74 } else { 74 } else {
98 98
99 # circular movement 99 # circular movement
100 $dir = $dir % 8 + 1 unless $d > 1.5; 100 $dir = $dir % 8 + 1 unless $d > 1.5;
101 } 101 }
102 102
103 $data->{who}->move ($dir); 103 $who->move ($dir);
104 } 104 }
105 105
106 1 106 1
107} 107}
108 108
109sub on_attack { 109sub on_attack {
110 my ($data) = @_; 110 my ($event, $ob, $who) = @_;
111 111
112 $data->{activator}{neko_attack}++ 112 $who->{neko_attack}++
113 or cf::LOG cf::llevDebug, sprintf "QBERT Neko-san was attacked by %s!\n", $data->{activator}->name; 113 or cf::LOG cf::llevDebug, sprintf "QBERT Neko-san was attacked by %s!\n", $who->name;
114 114
115 $data->{activator}->message ("Meoow! (Please do not hurt me)") 115 $who->message ("Meoow! (Please do not hurt me)")
116 if !($data->{activator}{neko_attack} & 15); 116 if !($who->{neko_attack} & 15);
117 117
118 if ($data->{activator}{neko_attack} > 512) { 118 if ($who->{neko_attack} > 512) {
119 $data->{activator}{neko_attack} -= 128; 119 $who->{neko_attack} -= 128;
120 $data->{activator}->message ("Neko-san is suddenly gone!"); 120 $who->message ("Neko-san is suddenly gone!");
121 teleport $data->{activator}, "/scorn/misc/scorn_illusions", 15, 7; 121 teleport $who, "/scorn/misc/scorn_illusions", 15, 7;
122 $data->{activator}->message ("You hear strange noises all around you..."); 122 $who->message ("You hear strange noises all around you...");
123 $data->{activator}->message ("You feel dumb."); 123 $who->message ("You feel dumb.");
124 } 124 }
125 125
126 1 126 1
127} 127}
128 128
129sub on_say { 129sub on_say {
130 my ($data) = @_; 130 my ($event, $ob, $who, $msg) = @_;
131 131
132 cf::LOG cf::llevDebug, sprintf "QBERT [Neko-fon] %s: %s\n", $data->{activator}->name, $data->{message}; 132 cf::LOG cf::llevDebug, sprintf "QBERT [Neko-fon] %s: %s\n", $who->name, $msg;
133} 133}
134 134

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines