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.12 by root, Sun Oct 1 18:18:34 2006 UTC

2 2
3# additional support for cfplus client 3# additional support for cfplus client
4 4
5use NPC_Dialogue; 5use NPC_Dialogue;
6 6
7=head1 CF+ protocol extensions
8
9This module implements protocol extensions for use by the CF+ client, but
10can be used by other clients as well. It uses the C<extcmd> mechanism
11exclusively.
12
13=over 4
14
15=item ... = extcmd cfplus_support { version => $client_version }
16
17Registers the client the the server. the client should send the highest
18version of the protocol it supports itself, and the server returns the
19highest version of the protocol it supports in the C<version> key itself.
20
21=cut
22
7cf::register_extcmd cfplus_support => sub { 23cf::register_extcmd cfplus_support => sub {
8 my ($pl, $data) = @_; 24 my ($pl, $msg) = @_;
9 25
10 my ($token, $client_version) = split / /, $data, 2; 26 # $msg->{version}
11 27
12 $pl->send ("ext $token 1"); 28 (version => 2)
13}; 29};
14 30
15my %dialog; # currently active dialogs 31my %dialog; # currently active dialogs
16 32
17my $timer = Event->timer (interval => 0.2, parked => 1, cb => sub { 33my $timer = Event->timer (interval => 0.2, parked => 1, cb => sub {
18 while (my ($token, $dialog) = each %dialog) { 34 while (my ($id, $dialog) = each %dialog) {
19 my (undef, $dx, $dy) = $dialog->{ob}->rangevector ($dialog->{npc}); 35 my (undef, $dx, $dy) = $dialog->{ob}->rangevector ($dialog->{npc});
20 next if (abs $dx) <= 2 && (abs $dy) <= 2; 36 next if (abs $dx) <= 2 && (abs $dy) <= 2;
21 37
22 $dialog->{ob}->contr->send ("ext $token out_of_range"); 38 $dialog->{ob}->contr->ext_reply ($id => msgtype => "error", msg => "out of range");
23 delete $dialog{$token}; 39 delete $dialog{$id};
24 } 40 }
25 41
26 $_[0]->w->stop unless keys %dialog; 42 $_[0]->w->stop unless keys %dialog;
27}); 43});
28 44
29sub dialog_tell { 45sub dialog_tell {
30 my ($token, $dialog, $msg) = @_; 46 my ($id, $dialog, $msg) = @_;
31 47
32 my $pl = $dialog->{ob}->contr; 48 my $pl = $dialog->{ob}->contr;
33 my ($reply, @kw) = $dialog->tell ($msg); 49 my ($reply, @kw) = $dialog->tell ($msg);
34 $reply = "..." unless $reply; 50 $reply = "..." unless $reply;
35 $pl->send ("ext $token msg " . join "\x00", $reply, @kw); 51
52 $pl->ext_reply ($id => msgtype => "reply", msg => $reply, add_topics => \@kw);
36} 53}
37 54
55=item ... = extcmd lookat { dx => $dx, dy => $dy }
56
57"Looks at" the mapspace displaced (dx|dy) relative to the player
38# return "interesting" information about the given tile 58and returns "interesting" information about it.
39# currently only returns the npc_dialog title when a dialog is possible 59
60Keys it can return include:
61
62 npc_dialog => $name
63 There is an npc or other object that can "talk" to the player.
64
65=cut
66
40cf::register_extcmd lookat => sub { 67cf::register_extcmd lookat => sub {
41 my ($pl, $data) = @_; 68 my ($pl, $msg) = @_;
69 my ($dx, $dy) = @$msg{qw(dx dy)};
42 70
43 my ($token, $dx, $dy) = split / /, $data;
44 my $near = (abs $dx) <= 2 && (abs $dy) <= 2; 71 my $near = (abs $dx) <= 2 && (abs $dy) <= 2;
45 72
46 my %res; 73 my %res;
47 74
48 if ($pl->cell_visible ($dx, $dy)) { 75 if ($pl->cell_visible ($dx, $dy)) {
50 $res{npc_dialog} = $ob->name 77 $res{npc_dialog} = $ob->name
51 if $near && NPC_Dialogue::has_dialogue $ob; 78 if $near && NPC_Dialogue::has_dialogue $ob;
52 } 79 }
53 } 80 }
54 81
55 $pl->send ("ext $token " . join "\x00", %res); 82 %res
56}; 83};
84
85=item ... = extcmd npc_dialog_begin { msgid => $id, dx => $dx, dy => $dy }
86
87Tries to start a dialogue with the mapspace specified by $dx and $dy (see
88C<extcmd lookat>). The $msgid will be used as a handle for all future
89messages related to this dialog interaction.
90
91It either replies with an error reply or starts a dialog by telling
92the npc "hi" and returning a reply strcuture as with C<extcmd
93npc_dialog_tell>.
94
95=cut
57 96
58cf::register_extcmd npc_dialog_begin => sub { 97cf::register_extcmd npc_dialog_begin => sub {
59 my ($pl, $data) = @_; 98 my ($pl, $msg) = @_;
60 99 my ($id, $dx, $dy) = @$msg{qw(msgid dx dy)};
61 my ($token, $dx, $dy) = split / /, $data;
62 100
63 return unless (abs $dx) <= 2 && (abs $dy) <= 2; 101 return unless (abs $dx) <= 2 && (abs $dy) <= 2;
64 return unless $pl->cell_visible ($dx, $dy); 102 return unless $pl->cell_visible ($dx, $dy);
65 103
66 for my $npc ($pl->ob->map->at ($pl->ob->x + $dx, $pl->ob->y + $dy)) { 104 for my $npc ($pl->ob->map->at ($pl->ob->x + $dx, $pl->ob->y + $dy)) {
67 if (NPC_Dialogue::has_dialogue $npc) { 105 if (NPC_Dialogue::has_dialogue $npc) {
68 $dialog{$token} = new NPC_Dialogue ob => $pl->ob, npc => $npc; 106 $dialog{$id} = new NPC_Dialogue ob => $pl->ob, npc => $npc;
69 dialog_tell $token, $dialog{$token}, "hi"; 107 dialog_tell $id, $dialog{$id}, "hi";
70 $timer->start; 108 $timer->start;
71 return; 109 return;
72 } 110 }
73 } 111 }
74 112
75 $pl->send ("ext $token error"); 113 (msgtype => "error", msg => "nothing to talk to found")
76}; 114};
115
116=item ... = extcmd npc_dialog_tell { msgid => $id, msg => $text }
117
118Tells the NPC the given $text message and returns a reply structure which
119can have the following keys:
120
121 msgtype => "reply"
122 msg => $reply_text,
123 add_topics => [additional topic strings]
124 del_topics => [invalidated topic strings]
125
126=cut
77 127
78cf::register_extcmd npc_dialog_tell => sub { 128cf::register_extcmd npc_dialog_tell => sub {
79 my ($pl, $data) = @_; 129 my ($pl, $msg) = @_;
80 130
81 my ($token, $msg) = split / /, $data, 2; 131 dialog_tell $msg->{msgid}, $dialog{$msg->{msgid}}, $msg->{msg}
132 if $dialog{$msg->{msgid}};
82 133
83 dialog_tell $token, $dialog{$token}, $msg 134 ()
84 if $dialog{$token};
85}; 135};
136
137=item extcmd npc_dialog_end { msgid => $id }
138
139Finishes the dialog, invalidating the handle.
140
141=cut
86 142
87cf::register_extcmd npc_dialog_end => sub { 143cf::register_extcmd npc_dialog_end => sub {
88 my ($pl, $token) = @_;
89
90 delete $dialog{$token};
91};
92
93sub on_logout {
94 my ($pl, $host) = @_; 144 my ($pl, $msg) = @_;
95 145
146 delete $dialog{$msg->{msgid}};
147
148 ()
149};
150
151cf::attach_to_players
152 on_logout => sub {
153 my ($pl) = @_;
154
96 delete $dialog{$_} for grep $pl->ob == $dialog{$_}{ob}, keys %dialog; 155 delete $dialog{$_} for grep $pl->ob == $dialog{$_}{ob}, keys %dialog;
156 },
157;
97 158
159=item ... = extcmd editor_support
160
161Returns the value required by clients that have an editor to download and
162upload maps from/to the server.
163
164 cvs_root => the (http) url where the cvs root for downloading is located
165 upload => the (http) url where clients can upload maps
166 server => the hostname:port of the test server the maps can be tested on
167
168If those values are not supplied or empty strings, the server does not
169support downloading, uploading, testing, respectively.
170
171The upload script expects the following values in a multipart form upload:
172
173 client: a descriptive string describing the editor and version used to upload
174 path: absolute server-side map path beginning with /
175 map: the map file itself
176 mapdir: the cvs root url originally used to download the map
177 revision: cvs-revision originally used to download the map
178 comment: a comment supplied by the user that documents the changes
179 cf_login: crossfire server login
180 cf_password: crossfire server password, optionally used for authentication purposes
181
182=cut
183
184cf::register_extcmd editor_support => sub {
185 my ($pl, $msg) = @_;
186
98 0 187 (
188 cvs_root => $cf::CFG{editor_cvs_root},
189 upload => $cf::CFG{editor_upload},
190 server => $cf::CFG{editor_server},
191 )
192};
193
194sub unload {
195 while (my ($id, $dialog) = each %dialog) {
196 $dialog->{ob}->contr->ext_reply ($id => msgtype => "error", msg => "npc dialogue module was reloaded");
197 }
198
199 %dialog = ();
99} 200}
100 201
202=back
101 203
204=cut
205

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines