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

Comparing deliantra/maps/perl/cfplus.ext (file contents):
Revision 1.5 by root, Tue Jul 11 15:37:31 2006 UTC vs.
Revision 1.8 by root, Sun Jul 30 19:57:13 2006 UTC

3# additional support for cfplus client 3# additional support for cfplus client
4 4
5use NPC_Dialogue; 5use NPC_Dialogue;
6 6
7cf::register_extcmd cfplus_support => sub { 7cf::register_extcmd cfplus_support => sub {
8 my ($pl, $data) = @_; 8 my ($pl, $msg) = @_;
9 9
10 my ($token, $client_version) = split / /, $data, 2; 10 # $msg->{version}
11 11
12 $pl->send ("ext $token 1"); 12 (version => 1)
13}; 13};
14 14
15my %dialog; # currently active dialogs 15my %dialog; # currently active dialogs
16 16
17my $timer = Event->timer (interval => 0.2, parked => 1, cb => sub { 17my $timer = Event->timer (interval => 0.2, parked => 1, cb => sub {
18 while (my ($token, $dialog) = each %dialog) { 18 while (my ($id, $dialog) = each %dialog) {
19 my (undef, $dx, $dy) = $dialog->{ob}->rangevector ($dialog->{npc}); 19 my (undef, $dx, $dy) = $dialog->{ob}->rangevector ($dialog->{npc});
20 next if (abs $dx) <= 2 && (abs $dy) <= 2; 20 next if (abs $dx) <= 2 && (abs $dy) <= 2;
21 21
22 $dialog->{ob}->contr->send ("ext $token out_of_range"); 22 $dialog->{ob}->contr->ext_reply ($id => msgtype => "error", msg => "out of range");
23 delete $dialog{$token}; 23 delete $dialog{$id};
24 } 24 }
25 25
26 $_[0]->w->stop unless keys %dialog; 26 $_[0]->w->stop unless keys %dialog;
27}); 27});
28 28
29sub dialog_tell { 29sub dialog_tell {
30 my ($token, $dialog, $msg) = @_; 30 my ($id, $dialog, $msg) = @_;
31 31
32 my $pl = $dialog->{ob}->contr; 32 my $pl = $dialog->{ob}->contr;
33 my ($reply, @kw) = $dialog->tell ($msg); 33 my ($reply, @kw) = $dialog->tell ($msg);
34 $reply = "..." unless $reply; 34 $reply = "..." unless $reply;
35 $pl->send ("ext $token msg " . join "\x00", $reply, @kw); 35
36 $pl->ext_reply ($id => msgtype => "reply", msg => $reply, add_topics => \@kw);
36} 37}
37 38
38# return "interesting" information about the given tile 39# return "interesting" information about the given tile
39# currently only returns the npc_dialog title when a dialog is possible 40# currently only returns the npc_dialog title when a dialog is possible
40cf::register_extcmd lookat => sub { 41cf::register_extcmd lookat => sub {
41 my ($pl, $data) = @_; 42 my ($pl, $msg) = @_;
43 my ($dx, $dy) = @$msg{qw(dx dy)};
42 44
43 my ($token, $dx, $dy) = split / /, $data;
44 my $near = (abs $dx) <= 2 && (abs $dy) <= 2; 45 my $near = (abs $dx) <= 2 && (abs $dy) <= 2;
45 46
46 my %res; 47 my %res;
47 48
48 if ($pl->cell_visible ($dx, $dy)) { 49 if ($pl->cell_visible ($dx, $dy)) {
50 $res{npc_dialog} = $ob->name 51 $res{npc_dialog} = $ob->name
51 if $near && NPC_Dialogue::has_dialogue $ob; 52 if $near && NPC_Dialogue::has_dialogue $ob;
52 } 53 }
53 } 54 }
54 55
55 $pl->send ("ext $token " . join "\x00", %res); 56 %res
56}; 57};
57 58
58cf::register_extcmd npc_dialog_begin => sub { 59cf::register_extcmd npc_dialog_begin => sub {
59 my ($pl, $data) = @_; 60 my ($pl, $msg) = @_;
60 61 my ($id, $dx, $dy) = @$msg{qw(msgid dx dy)};
61 my ($token, $dx, $dy) = split / /, $data;
62 62
63 return unless (abs $dx) <= 2 && (abs $dy) <= 2; 63 return unless (abs $dx) <= 2 && (abs $dy) <= 2;
64 return unless $pl->cell_visible ($dx, $dy); 64 return unless $pl->cell_visible ($dx, $dy);
65 65
66 for my $npc ($pl->ob->map->at ($pl->ob->x + $dx, $pl->ob->y + $dy)) { 66 for my $npc ($pl->ob->map->at ($pl->ob->x + $dx, $pl->ob->y + $dy)) {
67 if (NPC_Dialogue::has_dialogue $npc) { 67 if (NPC_Dialogue::has_dialogue $npc) {
68 $dialog{$token} = new NPC_Dialogue ob => $pl->ob, npc => $npc; 68 $dialog{$id} = new NPC_Dialogue ob => $pl->ob, npc => $npc;
69 dialog_tell $token, $dialog{$token}, "hi"; 69 dialog_tell $id, $dialog{$id}, "hi";
70 $timer->start; 70 $timer->start;
71 return; 71 return;
72 } 72 }
73 } 73 }
74 74
75 $pl->send ("ext $token error"); 75 (msgtype => "error", msg => "nothing to talk to found")
76}; 76};
77 77
78cf::register_extcmd npc_dialog_tell => sub { 78cf::register_extcmd npc_dialog_tell => sub {
79 my ($pl, $data) = @_; 79 my ($pl, $msg) = @_;
80 80
81 my ($token, $msg) = split / /, $data, 2; 81 dialog_tell $msg->{msgid}, $dialog{$msg->{msgid}}, $msg->{msg}
82 if $dialog{$msg->{msgid}};
82 83
83 dialog_tell $token, $dialog{$token}, $msg 84 ()
84 if $dialog{$token};
85}; 85};
86 86
87cf::register_extcmd npc_dialog_end => sub { 87cf::register_extcmd npc_dialog_end => sub {
88 my ($pl, $token) = @_; 88 my ($pl, $msg) = @_;
89 89
90 delete $dialog{$token}; 90 delete $dialog{$msg->{msgid}};
91
92 ()
91}; 93};
92 94
93sub on_logout { 95sub on_logout {
94 my ($pl, $host) = @_; 96 my ($pl, $host) = @_;
95 97
96 delete $dialog{$_} for grep $pl->ob == $dialog{$_}{ob}, keys %dialog; 98 delete $dialog{$_} for grep $pl->ob == $dialog{$_}{ob}, keys %dialog;
97 99
98 0 100 0
99} 101}
100 102
103sub on_unload {
104 while (my ($id, $dialog) = each %dialog) {
105 $dialog->{ob}->contr->ext_reply ($id => msgtype => "error", msg => "npc dialogue module was reloaded");
106 }
101 107
108 %dialog = ();
109
110 0
111}
112
113

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines