1 | package CFPlus::Protocol; |
1 | package DC::Protocol; |
2 | |
2 | |
3 | use utf8; |
3 | use common::sense; |
4 | use strict; |
|
|
5 | |
4 | |
|
|
5 | use Guard (); |
|
|
6 | |
6 | use Crossfire::Protocol::Constants; |
7 | use Deliantra::Protocol::Constants; |
7 | |
8 | |
8 | use CFPlus; |
9 | use DC; |
|
|
10 | use DC::DB; |
9 | use CFPlus::UI; |
11 | use DC::UI; |
10 | use CFPlus::Pod; |
12 | use DC::Pod; |
|
|
13 | use DC::Macro; |
|
|
14 | use DC::Item; |
11 | |
15 | |
12 | use base 'Crossfire::Protocol::Base'; |
16 | use base 'Deliantra::Protocol::Base'; |
|
|
17 | |
|
|
18 | our $TEX_DIALOGUE = new_from_resource DC::Texture |
|
|
19 | "dialogue.png", minify => 1, mipmap => 1; |
|
|
20 | |
|
|
21 | our $TEX_NOFACE = new_from_resource DC::Texture |
|
|
22 | "noface.png", minify => 1, mipmap => 1, wrap => 1; |
|
|
23 | |
|
|
24 | sub MIN_TEXTURE_UNUSED() { 1 }#d# |
13 | |
25 | |
14 | sub new { |
26 | sub new { |
15 | my $class = shift; |
27 | my ($class, %arg) = @_; |
16 | |
28 | |
17 | my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); |
29 | my $self = $class->SUPER::new (%arg, |
|
|
30 | setup_req => { |
|
|
31 | extmap => 1, |
|
|
32 | widget => 2, |
|
|
33 | %{$arg{setup_req} || {}}, |
|
|
34 | }, |
|
|
35 | ); |
|
|
36 | |
|
|
37 | $self->update_fx_want; |
|
|
38 | |
|
|
39 | my $exp_guard = $self->addme_guard; |
|
|
40 | my $skl_guard = $self->addme_guard; |
|
|
41 | my $spl_guard = $self->addme_guard; |
|
|
42 | $self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub { |
|
|
43 | my ($exp, $skl, $spl) = @_; |
|
|
44 | |
|
|
45 | $self->register_face_handler ($exp, sub { |
|
|
46 | my ($face) = @_; |
|
|
47 | |
|
|
48 | undef $exp_guard; |
|
|
49 | $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); |
|
|
50 | $_->() for values %{ $self->{on_exp_update} }; |
|
|
51 | }); |
|
|
52 | |
|
|
53 | $self->register_face_handler ($skl, sub { |
|
|
54 | my ($face) = @_; |
|
|
55 | |
|
|
56 | undef $skl_guard; |
|
|
57 | my $info = $self->{json_coder}->decode (delete $face->{data}); |
|
|
58 | $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info }; |
|
|
59 | }); |
|
|
60 | |
|
|
61 | $self->register_face_handler ($spl, sub { |
|
|
62 | my ($face) = @_; |
|
|
63 | |
|
|
64 | undef $spl_guard; |
|
|
65 | my $info = $self->{json_coder}->decode (delete $face->{data}); |
|
|
66 | $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info }; |
|
|
67 | }); |
|
|
68 | |
|
|
69 | () |
|
|
70 | }); |
18 | |
71 | |
19 | $self->{map_widget}->clr_commands; |
72 | $self->{map_widget}->clr_commands; |
20 | |
73 | |
21 | my @cmd_help = map { |
74 | my @cmd_help = map { |
22 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
75 | $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
23 | or die "unparseable command help: $_->{kw}[0]"; |
76 | or die "unparseable command help: $_->[DC::Pod::N_KW][0]"; |
24 | |
77 | |
25 | my $cmd = $1; |
78 | my $cmd = $1; |
26 | my @args = split /\|/, $2; |
79 | my @args = split /\|/, $2; |
27 | @args = (".*") unless @args; |
80 | @args = (".*") unless @args; |
28 | |
81 | |
29 | my (undef, @par) = CFPlus::Pod::section_of $_; |
82 | my (undef, @par) = DC::Pod::section_of $_; |
30 | my $text = CFPlus::Pod::as_label @par; |
83 | my $text = DC::Pod::as_label @par; |
31 | |
84 | |
32 | $_ = $_ eq ".*" ? "" : " $_" |
85 | $_ = $_ eq ".*" ? "" : " $_" |
33 | for @args; |
86 | for @args; |
34 | |
87 | |
35 | map ["$cmd$_", $text], |
88 | map ["$cmd$_", $text], |
36 | sort { (length $a) <=> (length $b) } |
89 | sort { (length $a) <=> (length $b) } |
37 | @args |
90 | @args |
38 | } sort { $a->{par} <=> $b->{par} } |
91 | } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] } |
39 | CFPlus::Pod::find command => "*"; |
92 | DC::Pod::find command => "*"; |
40 | |
93 | |
|
|
94 | $self->{json_coder} |
|
|
95 | ->convert_blessed |
|
|
96 | ->filter_json_single_key_object ("\fw" => sub { |
|
|
97 | $self->{widget}{$_[0]} |
|
|
98 | }) |
|
|
99 | ->filter_json_single_key_object ("\fc" => sub { |
|
|
100 | my ($id) = @_; |
|
|
101 | sub { |
|
|
102 | $self->send_exti_msg (w_e => $id, @_); |
|
|
103 | } |
|
|
104 | }); |
|
|
105 | |
|
|
106 | # destroy widgets on logout |
|
|
107 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
|
|
108 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
|
|
109 | $_->destroy |
|
|
110 | for values %{delete $ws->{w} || {}}; |
|
|
111 | } |
|
|
112 | |
|
|
113 | delete $self->{items}; |
|
|
114 | $::INV->clear; |
|
|
115 | $::INVR->clear; |
|
|
116 | $::INVR_HB->clear; |
|
|
117 | $::FLOORBOX->clear; |
|
|
118 | }); |
|
|
119 | |
41 | $self->{map_widget}->add_command (@$_) |
120 | $self->{map_widget}->add_command (@$_) |
42 | for @cmd_help; |
121 | for @cmd_help; |
43 | |
|
|
44 | $self->{noface} = new_from_file CFPlus::Texture |
|
|
45 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
46 | |
122 | |
47 | { |
123 | { |
48 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
124 | $self->{dialogue} = my $tex = $TEX_DIALOGUE; |
49 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
|
|
50 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
125 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
51 | } |
126 | } |
52 | |
127 | |
|
|
128 | { |
|
|
129 | $self->{noface} = my $tex = $TEX_NOFACE; |
|
|
130 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
131 | } |
|
|
132 | |
|
|
133 | # $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id |
|
|
134 | # $self->{expire_w} = AE::timer 1, 1, sub { |
|
|
135 | # my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1; |
|
|
136 | # |
|
|
137 | # for ($self->{map}->expire_textures ($self->{expire_count}, $count)) { |
|
|
138 | # warn DC::SvREFCNT $self->{texture}[$_]; |
|
|
139 | # $self->{texture}[$_]->unload; |
|
|
140 | # warn "expire texture $_\n";#d# |
|
|
141 | # } |
|
|
142 | # |
|
|
143 | # ($self->{expire_count} += $count) < @{ $self->{texture} } |
|
|
144 | # or $self->{expire_count} = DC::DB::FIRST_TILE_ID; |
|
|
145 | # warn "count is $count\n";#d# |
|
|
146 | # }; |
|
|
147 | |
53 | $self->{open_container} = 0; |
148 | $self->{open_container} = 0; |
54 | |
149 | |
55 | # "global" |
|
|
56 | $self->{tilecache} = CFPlus::db_table "tilecache" |
|
|
57 | or die "tilecache: unable to open database table"; |
|
|
58 | $self->{facemap} = CFPlus::db_table "facemap" |
|
|
59 | or die "facemap: unable to open database table"; |
|
|
60 | |
|
|
61 | # per server |
150 | # per server |
62 | $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" |
151 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
63 | or die "mapcache_$self->{host}_$self->{port}: unable to open database table"; |
|
|
64 | |
152 | |
65 | $self |
153 | $self |
66 | } |
154 | } |
|
|
155 | |
|
|
156 | sub update_fx_want { |
|
|
157 | my ($self) = @_; |
|
|
158 | |
|
|
159 | $self->send_exti_msg (fx_want => { |
|
|
160 | 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC |
|
|
161 | 5 => !!$::CFG->{audio_enable}, # FT_SOUND |
|
|
162 | 6 => 1, # FT_RSRC |
|
|
163 | }); |
|
|
164 | } |
|
|
165 | |
|
|
166 | sub ext_capabilities { |
|
|
167 | my ($self, %cap) = @_; |
|
|
168 | |
|
|
169 | if (my $ts = $cap{tileset}) { |
|
|
170 | if (my ($default) = grep $_->[2] & 1, @$ts) { |
|
|
171 | $self->{tileset} = $default; |
|
|
172 | $self->{tilesize} = $default->[3]; |
|
|
173 | $self->setup_req (tileset => $default->[0]); |
|
|
174 | |
|
|
175 | my $w = int $self->{mapw} * 32 / $self->{tilesize}; |
|
|
176 | my $h = int $self->{maph} * 32 / $self->{tilesize}; |
|
|
177 | |
|
|
178 | $self->setup_req (mapsize => "${w}x${h}"); |
|
|
179 | } |
|
|
180 | } |
|
|
181 | } |
|
|
182 | |
|
|
183 | sub ext_ambient_music { |
|
|
184 | my ($self, $songs) = @_; |
|
|
185 | &::audio_music_set_ambient ($songs); |
|
|
186 | } |
|
|
187 | |
|
|
188 | ############################################################################# |
|
|
189 | |
|
|
190 | sub widget_associate { |
|
|
191 | my ($self, $ws, $id, $widget) = @_; |
|
|
192 | |
|
|
193 | $widget ||= new DC::UI::Bin; |
|
|
194 | |
|
|
195 | $widget->{s_id} = $id; |
|
|
196 | $self->{widget}{$id} = $widget; |
|
|
197 | |
|
|
198 | if ($ws) { |
|
|
199 | $widget->{s_ws} = $ws; |
|
|
200 | $self->{widgetset}{$ws}{w}{$id} = $widget; |
|
|
201 | } |
|
|
202 | |
|
|
203 | $widget->connect (on_destroy => sub { |
|
|
204 | my ($widget) = @_; |
|
|
205 | |
|
|
206 | delete $self->{widget}{$widget->{s_id}}; |
|
|
207 | delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} |
|
|
208 | if exists $widget->{s_ws}; |
|
|
209 | }); |
|
|
210 | } |
|
|
211 | |
|
|
212 | # widgetset new |
|
|
213 | sub ext_ws_n { |
|
|
214 | my ($self, $id) = @_; |
|
|
215 | |
|
|
216 | $self->{widgetset}{$id} = { |
|
|
217 | w => {}, |
|
|
218 | }; |
|
|
219 | } |
|
|
220 | |
|
|
221 | # widgetset destroy |
|
|
222 | sub ext_ws_d { |
|
|
223 | my ($self, $id) = @_; |
|
|
224 | |
|
|
225 | my $ws = delete $self->{widgetset}{$id} |
|
|
226 | or return; |
|
|
227 | |
|
|
228 | $_->destroy |
|
|
229 | for values %{$ws->{w}}; |
|
|
230 | } |
|
|
231 | |
|
|
232 | # widgetset create |
|
|
233 | sub ext_ws_c { |
|
|
234 | my ($self, $ws, $id, $class, $args) = @_; |
|
|
235 | |
|
|
236 | $self->widget_associate ( |
|
|
237 | $ws, $id => scalar eval { |
|
|
238 | local $SIG{__DIE__}; |
|
|
239 | "DC::UI::$class"->new (%$args) |
|
|
240 | } |
|
|
241 | ); |
|
|
242 | } |
|
|
243 | |
|
|
244 | # widgetset create template |
|
|
245 | sub ext_ws_ct { |
|
|
246 | my ($self, $ws, $type, $template, $done_cb, $cfg) = @_; |
|
|
247 | |
|
|
248 | $done_cb ||= sub { }; |
|
|
249 | |
|
|
250 | my $parse_list; $parse_list = sub { |
|
|
251 | my ($list) = @_; |
|
|
252 | my @w; |
|
|
253 | |
|
|
254 | while (@$list) { |
|
|
255 | my ($class, $args) = splice @$list, 0, 2; |
|
|
256 | my $name = delete $args->{s_id}; |
|
|
257 | my $cl = delete $args->{s_cl}; |
|
|
258 | my $cfg = delete $cfg->{$name}; |
|
|
259 | my $id = delete $cfg->{id}; |
|
|
260 | my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) } |
|
|
261 | or next; |
|
|
262 | |
|
|
263 | $self->widget_associate ($ws, $id, $w) |
|
|
264 | if $id; |
|
|
265 | |
|
|
266 | $w->add ($parse_list->($cl)) |
|
|
267 | if $cl; |
|
|
268 | |
|
|
269 | push @w, $w; |
|
|
270 | } |
|
|
271 | |
|
|
272 | @w |
|
|
273 | }; |
|
|
274 | |
|
|
275 | # either array reference, or face # |
|
|
276 | if ($type eq "inline") { |
|
|
277 | $done_cb->(); |
|
|
278 | $parse_list->($template); |
|
|
279 | } elsif ($type eq "face") { |
|
|
280 | my $handler; $handler = $self->register_face_handler ($template, sub { |
|
|
281 | my ($face) = @_; |
|
|
282 | |
|
|
283 | undef $handler; |
|
|
284 | $done_cb->(); |
|
|
285 | $parse_list->($self->{json_coder}->decode ($face->{data})); |
|
|
286 | }); |
|
|
287 | } else { |
|
|
288 | $done_cb->(0); |
|
|
289 | } |
|
|
290 | } |
|
|
291 | |
|
|
292 | # widgetset associate |
|
|
293 | sub ext_ws_a { |
|
|
294 | my ($self, %ass) = @_; |
|
|
295 | |
|
|
296 | # everything that has a name, wether conceivably useful or not |
|
|
297 | my %wkw = ( |
|
|
298 | root => $DC::UI::ROOT, |
|
|
299 | tooltip => $DC::UI::TOOLTIP, |
|
|
300 | |
|
|
301 | mapwidget => $::MAPWIDGET, |
|
|
302 | menubar => $::MENUBAR, |
|
|
303 | menupopup => $::MENUPOPUP, |
|
|
304 | pickup_enable => $::PICKUP_ENABLE, |
|
|
305 | buttonbar => $::BUTTONBAR, |
|
|
306 | metaserver => $::METASERVER, |
|
|
307 | buttonbar => $::BUTTONBAR, |
|
|
308 | login_button => $::LOGIN_BUTTON, |
|
|
309 | quit_dialog => $::QUIT_DIALOG, |
|
|
310 | host_entry => $::HOST_ENTRY, |
|
|
311 | metaserver => $::METASERVER, |
|
|
312 | server_info => $::SERVER_INFO, |
|
|
313 | |
|
|
314 | setup_dialog => $::SETUP_DIALOG, |
|
|
315 | setup_notebook => $::SETUP_NOTEBOOK, |
|
|
316 | setup_server => $::SETUP_SERVER, |
|
|
317 | setup_keyboard => $::SETUP_KEYBOARD, |
|
|
318 | |
|
|
319 | pl_notebook => $::PL_NOTEBOOK, |
|
|
320 | pl_window => $::PL_WINDOW, |
|
|
321 | inventory_page => $::INVENTORY_PAGE, |
|
|
322 | stats_page => $::STATS_PAGE, |
|
|
323 | skill_page => $::SKILL_PAGE, |
|
|
324 | spell_page => $::SPELL_PAGE, |
|
|
325 | spell_list => $::SPELL_LIST, |
|
|
326 | |
|
|
327 | floorbox => $::FLOORBOX, |
|
|
328 | help_window => $::HELP_WINDOW, |
|
|
329 | message_window => $::MESSAGE_WINDOW, |
|
|
330 | message_dist => $::MESSAGE_DIST, |
|
|
331 | statusbox => $::STATUSBOX, |
|
|
332 | |
|
|
333 | inv => $::INV, |
|
|
334 | invr => $::INVR, |
|
|
335 | invr_hb => $::INVR_HB, |
|
|
336 | ); |
|
|
337 | |
|
|
338 | while (my ($id, $name) = each %ass) { |
|
|
339 | $self->widget_associate (undef, $id => $wkw{$name}); |
|
|
340 | } |
|
|
341 | } |
|
|
342 | |
|
|
343 | # widget call |
|
|
344 | sub ext_w_c { |
|
|
345 | my ($self, $id, $rcb, $method, @args) = @_; |
|
|
346 | |
|
|
347 | my $w = $self->{widget}{$id} |
|
|
348 | or return; |
|
|
349 | |
|
|
350 | if ($rcb) { |
|
|
351 | $rcb->($w->$method (@args)); |
|
|
352 | } else { |
|
|
353 | $w->$method (@args); |
|
|
354 | } |
|
|
355 | } |
|
|
356 | |
|
|
357 | # widget set |
|
|
358 | sub ext_w_s { |
|
|
359 | my ($self, $id, $attr) = @_; |
|
|
360 | |
|
|
361 | my $w = $self->{widget}{$id} |
|
|
362 | or return; |
|
|
363 | |
|
|
364 | for (my $i = 0; $i < $#$attr; $i += 2) { |
|
|
365 | my ($member, $value) = @$attr[$i, $i+1]; |
|
|
366 | if (defined $value) { |
|
|
367 | $w->{$member} = $value; |
|
|
368 | } else { |
|
|
369 | delete $w->{$member}; |
|
|
370 | } |
|
|
371 | $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible}; |
|
|
372 | } |
|
|
373 | } |
|
|
374 | |
|
|
375 | # widget get |
|
|
376 | sub ext_w_g { |
|
|
377 | my ($self, $id, $rid, @attr) = @_; |
|
|
378 | |
|
|
379 | my $w = $self->{widget}{$id} |
|
|
380 | or return; |
|
|
381 | |
|
|
382 | $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr); |
|
|
383 | } |
|
|
384 | |
|
|
385 | # message window |
|
|
386 | sub ext_channel_info { |
|
|
387 | my ($self, $info) = @_; |
|
|
388 | $self->{channels}->{$info->{id}} = $info; |
|
|
389 | $::MESSAGE_DIST->add_channel ($info); |
|
|
390 | } |
|
|
391 | |
|
|
392 | ############################################################################# |
67 | |
393 | |
68 | sub logprint { |
394 | sub logprint { |
69 | my ($self, @a) = @_; |
395 | my ($self, @a) = @_; |
70 | |
396 | |
71 | $self->{log_fh} ||= do { |
397 | DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
72 | my $path = "$Crossfire::VARDIR/log.$self->{host}"; |
|
|
73 | |
|
|
74 | open my $fh, ">>:utf8", $path |
|
|
75 | or die "Couldn't open logfile $path: $!"; |
|
|
76 | |
|
|
77 | $fh->autoflush (1); |
|
|
78 | |
|
|
79 | $fh; |
|
|
80 | }; |
|
|
81 | |
|
|
82 | my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; |
|
|
83 | |
|
|
84 | my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", |
|
|
85 | $year + 1900, $mon + 1, $mday, $hour, $min, $sec; |
|
|
86 | |
|
|
87 | print {$self->{log_fh}} "$ts ", @a, "\n"; |
|
|
88 | } |
398 | } |
89 | |
399 | |
90 | sub _stat_numdiff { |
400 | sub _stat_numdiff { |
91 | my ($self, $name, $old, $new) = @_; |
401 | my ($self, $name, $old, $new) = @_; |
92 | |
402 | |
… | |
… | |
110 | ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) |
420 | ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) |
111 | : () |
421 | : () |
112 | } |
422 | } |
113 | sort { $a <=> $b } keys %{$self->{spell_paths}}; |
423 | sort { $a <=> $b } keys %{$self->{spell_paths}}; |
114 | |
424 | |
115 | join "", @diff |
425 | "\u$name: " . (join ", ", @diff) |
116 | } |
426 | } |
117 | |
427 | |
118 | # all stats that are chacked against changes |
428 | # all stats that are chacked against changes |
119 | my @statchange = ( |
429 | my @statchange = ( |
120 | [&CS_STAT_STR => \&_stat_numdiff, "Str"], |
430 | [&CS_STAT_STR => \&_stat_numdiff, "Str"], |
… | |
… | |
163 | |
473 | |
164 | if (my @diffs = |
474 | if (my @diffs = |
165 | ( |
475 | ( |
166 | ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), |
476 | ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), |
167 | map { |
477 | map { |
168 | $stats->{$_} && $prev->{$_} |
478 | $stats->{$_} && $prev->{$_} |
169 | && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () |
479 | && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () |
170 | } sort { $a <=> $b } keys %{$self->{skill_info}} |
480 | } sort { $a <=> $b } keys %{$self->{skill_info}} |
171 | ) |
481 | ) |
172 | ) { |
482 | ) { |
173 | my $msg = join " ", @diffs; |
483 | my $msg = join " ", @diffs; |
… | |
… | |
175 | } |
485 | } |
176 | |
486 | |
177 | if ( |
487 | if ( |
178 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
488 | my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange |
179 | ) { |
489 | ) { |
180 | my $msg = "<b>stat change</b>: " . (join " ", @diffs); |
490 | my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs); |
181 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); |
491 | $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); |
182 | } |
492 | } |
183 | |
493 | |
184 | $self->update_stats_window ($stats, $prev); |
494 | $self->update_stats_window ($stats, $prev); |
185 | |
495 | |
186 | $self->{prev_stats} = { %$stats }; |
496 | $self->{prev_stats} = { %$stats }; |
… | |
… | |
223 | |
533 | |
224 | $::GAUGES->{hp} ->set_value ($hp, $hp_m); |
534 | $::GAUGES->{hp} ->set_value ($hp, $hp_m); |
225 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
535 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
226 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
536 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
227 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
537 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
228 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
538 | $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d# |
229 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
539 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
230 | my $rng = $stats->{+CS_STAT_RANGE}; |
540 | $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
231 | $rng =~ s/^Range: //; # thank you so much dear server |
541 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
232 | $::GAUGES->{range} ->set_text ("Rng: " . $rng); |
|
|
233 | my $title = $stats->{+CS_STAT_TITLE}; |
542 | my $title = $stats->{+CS_STAT_TITLE}; |
234 | $title =~ s/^Player: //; |
543 | $title =~ s/^Player: //; |
235 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
544 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
236 | |
545 | |
237 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
546 | $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); |
… | |
… | |
248 | $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); |
557 | $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); |
249 | $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); |
558 | $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); |
250 | |
559 | |
251 | $self->update_weight; |
560 | $self->update_weight; |
252 | |
561 | |
253 | $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) |
562 | $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}}) |
254 | for keys %RES_TBL; |
563 | for keys %RES_TBL; |
255 | |
564 | |
256 | my $sktbl = $::STATWIDS->{skill_tbl}; |
565 | my $sktbl = $::STATWIDS->{skill_tbl}; |
257 | my @skills = keys %{ $self->{skill_info} }; |
566 | my @skills = keys %{ $self->{skill_info} }; |
258 | |
567 | |
259 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
568 | my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
569 | map [$_, $self->{skill_info}{$_}], |
|
|
570 | grep exists $stats->{$_}, |
|
|
571 | @skills; |
|
|
572 | |
|
|
573 | if ($self->{stat_order} ne join ",", map $_->[0], @order) { |
|
|
574 | $self->{stat_order} = join ",", map $_->[0], @order; |
|
|
575 | |
260 | $sktbl->clear; |
576 | $sktbl->clear; |
261 | |
577 | |
|
|
578 | my $sw = $self->{skillwid}{""} ||= [ |
262 | $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
579 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
263 | $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
580 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
264 | $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
581 | 2, 0, (new DC::UI::Label text => "Progress"), |
|
|
582 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
265 | $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
583 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
266 | $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
584 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
267 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
585 | 6, 0, (new DC::UI::Label text => "Progress"), |
|
|
586 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
|
|
587 | ]; |
268 | |
588 | |
|
|
589 | my @add = @$sw; |
|
|
590 | |
269 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
591 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>"; |
270 | |
592 | |
271 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
593 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
272 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
594 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
273 | |
595 | |
274 | my ($x, $y) = (0, 1); |
596 | my ($x, $y) = (0, 1); |
275 | for ( |
597 | for (@order) { |
276 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
|
|
277 | map [$_, $self->{skill_info}{$_}], |
|
|
278 | grep exists $stats->{$_}, |
|
|
279 | @skills |
|
|
280 | ) { |
|
|
281 | my ($idx, $name) = @$_; |
598 | my ($idx, $name) = @$_; |
282 | |
599 | |
283 | my $spell_cb = sub { |
600 | my $spell_cb = sub { |
284 | my ($widget, $ev) = @_; |
601 | my ($widget, $ev) = @_; |
285 | |
602 | |
286 | if ($ev->{button} == 1) { |
603 | if ($ev->{button} == 1) { |
287 | $::CONN->user_send ("ready_skill $name"); |
604 | $::CONN->user_send ("ready_skill $name"); |
288 | } elsif ($ev->{button} == 2) { |
605 | } elsif ($ev->{button} == 2) { |
289 | $::CONN->user_send ("use_skill $name"); |
606 | $::CONN->user_send ("use_skill $name"); |
290 | } elsif ($ev->{button} == 3) { |
607 | } elsif ($ev->{button} == 3) { |
|
|
608 | my $shortname = DC::shorten $name, 14; |
291 | (new CFPlus::UI::Menu |
609 | (new DC::UI::Menu |
292 | items => [ |
610 | items => [ |
293 | ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], |
611 | ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }], |
294 | ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], |
612 | ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }], |
295 | ], |
613 | ], |
296 | )->popup ($ev); |
614 | )->popup ($ev); |
297 | } else { |
615 | } else { |
298 | return 0; |
616 | return 0; |
299 | } |
617 | } |
300 | |
618 | |
301 | 1 |
619 | 1 |
302 | }; |
620 | }; |
303 | |
621 | |
304 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
622 | my $sw = $self->{skillwid}{$idx} ||= [ |
|
|
623 | # exp |
|
|
624 | (new DC::UI::Label |
305 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); |
625 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
306 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
626 | |
|
|
627 | # level |
|
|
628 | (new DC::UI::Label |
307 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); |
629 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
|
|
630 | |
|
|
631 | # progress |
|
|
632 | (new DC::UI::ExperienceProgress), |
|
|
633 | |
|
|
634 | # label |
308 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
635 | (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0, |
309 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
636 | can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
|
|
637 | ]; |
|
|
638 | |
|
|
639 | push @add, |
|
|
640 | $x * 4 + 0, $y, $sw->[0], |
|
|
641 | $x * 4 + 1, $y, $sw->[1], |
|
|
642 | $x * 4 + 2, $y, $sw->[2], |
|
|
643 | $x * 4 + 3, $y, $sw->[3], |
|
|
644 | ; |
310 | |
645 | |
311 | $x++ and ($x, $y) = (0, $y + 1); |
646 | $x++ and ($x, $y) = (0, $y + 1); |
312 | } |
647 | } |
313 | } |
|
|
314 | |
648 | |
315 | for (grep exists $stats->{$_}, @skills) { |
649 | $sktbl->add_at (@add); |
316 | $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); |
650 | } |
317 | $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); |
651 | |
|
|
652 | for (@order) { |
|
|
653 | my ($idx, $name) = @$_; |
|
|
654 | my $val = $stats->{$idx}; |
|
|
655 | |
|
|
656 | next if $prev->{$idx}[1] eq $val->[1]; |
|
|
657 | |
|
|
658 | my $sw = $self->{skillwid}{$idx}; |
|
|
659 | $sw->[0]->set_text (::formsep ($val->[1])); |
|
|
660 | $sw->[1]->set_text ($val->[0] * 1); |
|
|
661 | $sw->[2]->set_value (@$val); |
|
|
662 | |
|
|
663 | $::GAUGES->{skillexp}->set_label ("$name %d%%"); |
|
|
664 | $::GAUGES->{skillexp}->set_value (@$val); |
318 | } |
665 | } |
319 | } |
666 | } |
320 | |
667 | |
321 | sub user_send { |
668 | sub user_send { |
322 | my ($self, $command) = @_; |
669 | my ($self, $command) = @_; |
323 | |
670 | |
|
|
671 | $self->{record}->($command) |
324 | if ($self->{record}) { |
672 | if $self->{record}; |
325 | push @{$self->{record}}, $command; |
|
|
326 | } |
|
|
327 | |
673 | |
328 | $self->logprint ("send: ", $command); |
674 | $self->logprint ("send: ", $command); |
329 | $self->send_command ($command); |
675 | $self->send_command ($command); |
330 | ::status ($command); |
|
|
331 | } |
676 | } |
332 | |
677 | |
333 | sub start_record { |
678 | sub record { |
334 | my ($self) = @_; |
679 | my ($self, $cb) = @_; |
335 | |
680 | |
336 | $self->{record} = []; |
681 | $self->{record} = $cb; |
337 | } |
|
|
338 | |
|
|
339 | sub stop_record { |
|
|
340 | my ($self) = @_; |
|
|
341 | return delete $self->{record}; |
|
|
342 | } |
682 | } |
343 | |
683 | |
344 | sub map_scroll { |
684 | sub map_scroll { |
345 | my ($self, $dx, $dy) = @_; |
685 | my ($self, $dx, $dy) = @_; |
346 | |
686 | |
347 | $self->{map}->scroll ($dx, $dy); |
687 | $self->{map_widget}->scroll ($dx, $dy); |
348 | } |
688 | } |
349 | |
689 | |
350 | sub feed_map1a { |
690 | sub feed_map1a { |
351 | my ($self, $data) = @_; |
691 | my ($self, $data) = @_; |
352 | |
692 | |
353 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
693 | my $missing = $self->{map}->map1a_update ($data); |
|
|
694 | my $delay; |
|
|
695 | |
|
|
696 | for my $tile (@$missing) { |
|
|
697 | next if $self->{delay}{$tile}; |
|
|
698 | |
|
|
699 | $delay = 1; |
|
|
700 | |
|
|
701 | if (my $tex = $self->{texture}[$tile]) { |
|
|
702 | $tex->upload; |
|
|
703 | } else { |
|
|
704 | $self->{delay}{$tile} = 1; |
|
|
705 | |
|
|
706 | # we assume the face is in-flight and will eventually arrive |
|
|
707 | push @{$self->{tile_cb}{$tile}}, sub { |
|
|
708 | delete $self->{delay}{$tile}; |
|
|
709 | $_[0]->upload; |
|
|
710 | }; |
|
|
711 | } |
|
|
712 | } |
|
|
713 | |
|
|
714 | if ($delay) { |
|
|
715 | # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched |
|
|
716 | EV::once undef, 0, 0.03, sub { |
|
|
717 | $self->{map_widget}->update |
|
|
718 | if $self->{map_widget}; |
|
|
719 | }; |
|
|
720 | } else { |
354 | $self->{map_widget}->update; |
721 | $self->{map_widget}->update; |
|
|
722 | } |
355 | } |
723 | } |
356 | |
724 | |
357 | sub magicmap { |
725 | sub magicmap { |
358 | my ($self, $w, $h, $x, $y, $data) = @_; |
726 | my ($self, $w, $h, $x, $y, $data) = @_; |
359 | |
727 | |
… | |
… | |
361 | } |
729 | } |
362 | |
730 | |
363 | sub flush_map { |
731 | sub flush_map { |
364 | my ($self) = @_; |
732 | my ($self) = @_; |
365 | |
733 | |
366 | my $map_info = delete $self->{map_info} |
734 | return unless $self->{map_info}; |
367 | or return; |
|
|
368 | |
735 | |
|
|
736 | for my $map_info (values %{ $self->{map_cache} || {} }) { |
369 | my ($hash, $x, $y, $w, $h) = @$map_info; |
737 | my ($hash, $rdata, $x, $y, $w, $h) = @$map_info; |
370 | |
738 | |
371 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
739 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
372 | $self->{mapcache}->put ($hash => Compress::LZF::compress $data); |
740 | |
373 | #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# |
741 | if ($data ne $$rdata) { |
|
|
742 | $map_info->[1] = \$data; |
|
|
743 | my $cdata = Compress::LZF::compress $data; |
|
|
744 | DC::DB::put $self->{mapcache} => $hash => $cdata, sub { }; |
|
|
745 | } |
|
|
746 | } |
374 | } |
747 | } |
375 | |
748 | |
376 | sub map_clear { |
749 | sub map_clear { |
377 | my ($self) = @_; |
750 | my ($self) = @_; |
378 | |
751 | |
379 | $self->flush_map; |
752 | $self->flush_map; |
|
|
753 | delete $self->{map_info}; |
380 | delete $self->{neigh_map}; |
754 | delete $self->{neigh_map}; |
381 | |
755 | |
382 | $self->{map}->clear; |
756 | $self->{map}->clear; |
383 | delete $self->{map_widget}{magicmap}; |
757 | delete $self->{map_widget}{magicmap}; |
384 | } |
758 | } |
385 | |
759 | |
|
|
760 | sub bg_fetch { |
|
|
761 | my ($self) = @_; |
386 | |
762 | |
|
|
763 | my $tile; |
|
|
764 | |
|
|
765 | do { |
|
|
766 | $tile = pop @{$self->{bg_fetch}} |
|
|
767 | or return; |
|
|
768 | } while $self->{texture}[$tile]; |
|
|
769 | |
|
|
770 | DC::DB::get tilecache => $tile, sub { |
|
|
771 | my ($data) = @_; |
|
|
772 | |
|
|
773 | return unless $self->{map}; # stop when destroyed |
|
|
774 | |
|
|
775 | if (defined $data) { |
|
|
776 | $self->have_tile ($tile, $data); |
|
|
777 | $self->{texture}[$tile]->upload; |
|
|
778 | } |
|
|
779 | |
|
|
780 | $self->bg_fetch; |
|
|
781 | }; |
|
|
782 | } |
|
|
783 | |
387 | sub load_map($$$) { |
784 | sub load_map($$$$$$) { |
388 | my ($self, $hash, $x, $y) = @_; |
785 | my ($self, $hash, $x, $y, $w, $h) = @_; |
389 | |
786 | |
390 | if (defined (my $data = $self->{mapcache}->get ($hash))) { |
787 | my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h]; |
391 | $data = Compress::LZF::decompress $data; |
|
|
392 | #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# |
|
|
393 | for my $id ($self->{map}->set_rect ($x, $y, $data)) { |
|
|
394 | my $data = $self->{tilecache}->get ($id) |
|
|
395 | or next; |
|
|
396 | |
788 | |
397 | $self->set_texture ($id => $data); |
789 | my $cb = sub { |
|
|
790 | $map_info->[1] = \$_[0]; |
|
|
791 | |
|
|
792 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
|
|
793 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]); |
|
|
794 | $self->bg_fetch unless $inprogress; |
|
|
795 | }; |
|
|
796 | |
|
|
797 | if (my $map_info = $self->{map_cache_old}{$hash}) { |
|
|
798 | $cb->(${ $map_info->[1] }); |
|
|
799 | } else { |
|
|
800 | my $gen = $self->{map_change_gen}; |
|
|
801 | |
|
|
802 | DC::DB::get $self->{mapcache} => $hash, sub { |
|
|
803 | return unless $gen == $self->{map_change_gen}; |
|
|
804 | return unless defined $_[0]; |
|
|
805 | $cb->(Compress::LZF::decompress $_[0]); |
398 | } |
806 | }; |
399 | } |
807 | } |
400 | } |
808 | } |
401 | |
809 | |
402 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
810 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
403 | # (server resource,s latency, bandwidth), so this hack is warranted. |
811 | # (server resources, latency, bandwidth), so this hack is warranted. |
404 | # the right fix is to make real tiled maps with an overview file |
812 | # the right fix is to make real tiled maps with an overview file |
405 | sub send_mapinfo { |
813 | sub send_mapinfo { |
406 | my ($self, $data, $cb) = @_; |
814 | my ($self, $data, $cb) = @_; |
407 | |
815 | |
408 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
816 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
… | |
… | |
433 | } |
841 | } |
434 | |
842 | |
435 | # this method does a "flood fill" into every tile direction |
843 | # this method does a "flood fill" into every tile direction |
436 | # it assumes that tiles are arranged in a rectangular grid, |
844 | # it assumes that tiles are arranged in a rectangular grid, |
437 | # i.e. a map is the same as the left of the right map etc. |
845 | # i.e. a map is the same as the left of the right map etc. |
438 | # failure to comply are harmless and result in display errors |
846 | # failure to comply is harmless and results in display errors |
439 | # at worst. |
847 | # at worst. |
440 | sub flood_fill { |
848 | sub flood_fill { |
441 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
849 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
442 | |
850 | |
443 | # the server does not allow map paths > 6 |
851 | # the server does not allow map paths > 6 |
… | |
… | |
468 | |
876 | |
469 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
877 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
470 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
878 | if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; |
471 | |
879 | |
472 | } else { |
880 | } else { |
|
|
881 | my $gen = $self->{map_change_gen}; |
473 | $self->send_mapinfo ("spatial $path$tile", sub { |
882 | $self->send_mapinfo ("spatial $path$tile", sub { |
|
|
883 | return unless $gen == $self->{map_change_gen}; |
|
|
884 | |
474 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
885 | my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; |
475 | |
886 | |
476 | return if $mode ne "spatial"; |
887 | return if $mode ne "spatial"; |
477 | |
888 | |
478 | $x += $self->{map}->ox; |
889 | $x += $self->{map}->ox; |
479 | $y += $self->{map}->oy; |
890 | $y += $self->{map}->oy; |
480 | |
891 | |
481 | $self->load_map ($hash, $x, $y) |
892 | $self->load_map ($hash, $x, $y, $w, $h) |
482 | unless $self->{neigh_map}{$hash}[5]++;#d# |
893 | unless $self->{neigh_map}{$hash}[5]++;#d# |
483 | |
894 | |
484 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
895 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
485 | |
896 | |
486 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
897 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
… | |
… | |
492 | |
903 | |
493 | sub map_change { |
904 | sub map_change { |
494 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
905 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
495 | |
906 | |
496 | $self->flush_map; |
907 | $self->flush_map; |
|
|
908 | |
|
|
909 | ++$self->{map_change_gen}; |
|
|
910 | $self->{map_cache_old} = delete $self->{map_cache}; |
497 | |
911 | |
498 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
912 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
499 | |
913 | |
500 | my $mapmapw = $self->{mapmap}->{w}; |
914 | my $mapmapw = $self->{mapmap}->{w}; |
501 | my $mapmaph = $self->{mapmap}->{h}; |
915 | my $mapmaph = $self->{mapmap}->{h}; |
… | |
… | |
513 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
927 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
514 | |
928 | |
515 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
929 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
516 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
930 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
517 | |
931 | |
518 | $self->load_map ($hash, $x, $y); |
932 | $self->load_map ($hash, $x, $y, $w, $h); |
519 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
933 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
520 | } |
934 | } |
521 | |
935 | |
522 | sub face_find { |
936 | sub face_find { |
523 | my ($self, $facenum, $face) = @_; |
937 | my ($self, $facenum, $face, $cb) = @_; |
524 | |
938 | |
525 | my $hash = "$face->{chksum},$face->{name}"; |
939 | if ($face->{type} == 0) { # FT_FACE |
|
|
940 | my $id = DC::DB::get_tile_id_sync $face->{name}; |
526 | |
941 | |
527 | my $id = $self->{facemap}->get ($hash); |
|
|
528 | |
|
|
529 | unless ($id) { |
|
|
530 | # create new id for face |
|
|
531 | # I love transactions |
|
|
532 | for (1..100) { |
|
|
533 | my $txn = $CFPlus::DB_ENV->txn_begin; |
|
|
534 | my $status = $self->{facemap}->db_get (id => $id); |
|
|
535 | if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { |
|
|
536 | $id = ($id || 64) + 1; |
|
|
537 | if ($self->{facemap}->put (id => $id) == 0 |
|
|
538 | && $self->{facemap}->put ($hash => $id) == 0) { |
|
|
539 | $txn->txn_commit; |
|
|
540 | |
|
|
541 | goto gotid; |
|
|
542 | } |
|
|
543 | } |
|
|
544 | $txn->txn_abort; |
|
|
545 | } |
|
|
546 | |
|
|
547 | CFPlus::fatal "maximum number of transaction retries reached - database problems?"; |
|
|
548 | } |
|
|
549 | |
|
|
550 | gotid: |
|
|
551 | $face->{id} = $id; |
942 | $face->{id} = $id; |
552 | $self->{map}->set_face ($facenum => $id); |
943 | $self->{map}->set_tileid ($facenum => $id); |
553 | $self->{faceid}[$facenum] = $id;#d# |
|
|
554 | |
944 | |
555 | my $face = $self->{tilecache}->get ($id); |
945 | DC::DB::get tilecache => $id, $cb; |
556 | |
946 | |
557 | if ($face) { |
947 | } elsif ($face->{type} & 1) { # with metadata |
558 | #$self->face_prefetch; |
948 | DC::DB::get res_meta => $face->{name}, $cb; |
559 | $face |
949 | |
560 | } else { |
950 | } else { # no metadata |
561 | my $tex = $self->{noface}; |
951 | DC::DB::get res_data => $face->{name}, $cb; |
562 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
563 | undef |
|
|
564 | }; |
952 | } |
565 | } |
953 | } |
566 | |
954 | |
567 | sub face_update { |
955 | sub face_update { |
568 | my ($self, $facenum, $face, $changed) = @_; |
956 | my ($self, $facenum, $face, $changed) = @_; |
569 | |
957 | |
570 | $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; |
958 | if ($face->{type} == 0) { |
|
|
959 | # image, FT_FACE |
|
|
960 | DC::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
|
|
961 | if $changed; |
571 | |
962 | |
572 | $self->set_texture ($face->{id} => delete $face->{image}); |
963 | $self->have_tile ($face->{id}, delete $face->{data}); |
573 | } |
|
|
574 | |
964 | |
575 | sub set_texture { |
965 | } elsif ($face->{type} & 1) { |
|
|
966 | # split metadata case, FT_MUSIC, FT_SOUND |
|
|
967 | if ($changed) { # new data |
|
|
968 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
|
|
969 | $face->{data} = $meta; |
|
|
970 | |
|
|
971 | # rely on strict ordering here and also on later fetch |
|
|
972 | DC::DB::put res_data => $face->{name} => $data, sub { }; |
|
|
973 | DC::DB::put res_meta => $face->{name} => $meta, sub { }; |
|
|
974 | } |
|
|
975 | |
|
|
976 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
|
|
977 | ::add_license ($face); |
|
|
978 | ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
|
|
979 | if $changed; |
|
|
980 | |
|
|
981 | if ($face->{type} == 3) { # FT_MUSIC |
|
|
982 | &::audio_music_push ($facenum); |
|
|
983 | } elsif ($face->{type} == 5) { # FT_SOUND |
|
|
984 | &::audio_sound_push ($facenum); |
|
|
985 | } |
|
|
986 | |
|
|
987 | } else { |
|
|
988 | # flat resource case, FT_RSRC |
|
|
989 | DC::DB::put res_data => $face->{name} => $face->{data}, sub { } |
|
|
990 | if $changed; |
|
|
991 | } |
|
|
992 | |
|
|
993 | if (my $cbs = $self->{face_cb}{$facenum}) { |
|
|
994 | $_->($face, $changed) for @$cbs; |
|
|
995 | } |
|
|
996 | } |
|
|
997 | |
|
|
998 | sub smooth_update { |
|
|
999 | my ($self, $facenum, $face) = @_; |
|
|
1000 | |
|
|
1001 | $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); |
|
|
1002 | } |
|
|
1003 | |
|
|
1004 | sub have_tile { |
576 | my ($self, $id, $data) = @_; |
1005 | my ($self, $tile, $data) = @_; |
577 | |
1006 | |
578 | $self->{texture}[$id] ||= do { |
1007 | return unless $self->{map}; |
579 | my $tex = |
|
|
580 | new_from_image CFPlus::Texture |
|
|
581 | $data, minify => 1, mipmap => 1; |
|
|
582 | |
1008 | |
583 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
1009 | my $tex = $self->{texture}[$tile] ||= |
584 | $self->{map_widget}->update; |
1010 | new DC::Texture |
|
|
1011 | tile => $tile, |
|
|
1012 | image => $data, delete_image => 1, |
|
|
1013 | minify => 1; |
585 | |
1014 | |
586 | $tex |
1015 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
|
|
1016 | $_->($tex) for @$cbs; |
587 | }; |
1017 | } |
|
|
1018 | } |
|
|
1019 | |
|
|
1020 | # call in non-void context registers a temporary |
|
|
1021 | # hook with handle, otherwise its permanent |
|
|
1022 | sub on_face_change { |
|
|
1023 | my ($self, $num, $cb) = @_; |
|
|
1024 | |
|
|
1025 | push @{$self->{face_cb}{$num}}, $cb; |
|
|
1026 | |
|
|
1027 | defined wantarray |
|
|
1028 | ? Guard::guard { |
|
|
1029 | @{$self->{face_cb}{$num}} |
|
|
1030 | = grep $_ != $cb, |
|
|
1031 | @{$self->{face_cb}{$num}}; |
|
|
1032 | } |
|
|
1033 | : () |
|
|
1034 | } |
|
|
1035 | |
|
|
1036 | # call in non-void context registers a temporary |
|
|
1037 | # hook with handle, otherwise its permanent |
|
|
1038 | sub register_face_handler { |
|
|
1039 | my ($self, $num, $cb) = @_; |
|
|
1040 | |
|
|
1041 | return unless $num; |
|
|
1042 | |
|
|
1043 | # invoke if available right now |
|
|
1044 | $cb->($self->{face}[$num], 0) |
|
|
1045 | unless exists $self->{face}[$num]{loading}; |
|
|
1046 | |
|
|
1047 | # future changes |
|
|
1048 | $self->on_face_change ($num => $cb) |
588 | } |
1049 | } |
589 | |
1050 | |
590 | sub sound_play { |
1051 | sub sound_play { |
591 | my ($self, $x, $y, $soundnum, $type) = @_; |
1052 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
592 | |
1053 | |
593 | $self->{sound_play}->($x, $y, $soundnum, $type); |
1054 | &::audio_sound_play ($face, $dx, $dy, $vol) |
|
|
1055 | unless $type & 1; # odd types are silent for future expansion |
594 | } |
1056 | } |
595 | |
1057 | |
596 | my $LAST_QUERY; # server is stupid, stupid, stupid |
1058 | my $LAST_QUERY; # server is stupid, stupid, stupid |
597 | |
1059 | |
598 | sub query { |
1060 | sub query { |
599 | my ($self, $flags, $prompt) = @_; |
1061 | my ($self, $flags, $prompt) = @_; |
600 | |
1062 | |
601 | $prompt = $LAST_QUERY unless length $prompt; |
1063 | $prompt = $LAST_QUERY unless length $prompt; |
602 | $LAST_QUERY = $prompt; |
1064 | $LAST_QUERY = $prompt; |
603 | |
1065 | |
604 | $self->{query}-> ($self, $flags, $prompt); |
1066 | $self->{query}->($self, $flags, $prompt); |
605 | } |
1067 | } |
606 | |
1068 | |
607 | sub drawinfo { |
1069 | sub sanitise_xml($) { |
608 | my ($self, $color, $text) = @_; |
1070 | local $_ = shift; |
609 | |
1071 | |
610 | my @color = ( |
1072 | # we now weed out all tags we do not support |
|
|
1073 | s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>) |
|
|
1074 | }{ |
|
|
1075 | "<" |
|
|
1076 | }gex; |
|
|
1077 | |
|
|
1078 | # now all entities |
|
|
1079 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
|
|
1080 | |
|
|
1081 | # handle some elements |
|
|
1082 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
|
|
1083 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
1084 | |
|
|
1085 | s/\s+$//; |
|
|
1086 | |
|
|
1087 | $_ |
|
|
1088 | } |
|
|
1089 | |
|
|
1090 | our %NAME_TO_COLOR = ( |
|
|
1091 | black => 0, |
|
|
1092 | white => 1, |
|
|
1093 | darkblue => 2, |
|
|
1094 | red => 3, |
|
|
1095 | orange => 4, |
|
|
1096 | lightblue => 5, |
|
|
1097 | darkorange => 6, |
|
|
1098 | green => 7, |
|
|
1099 | darkgreen => 8, |
|
|
1100 | grey => 9, |
|
|
1101 | brown => 10, |
|
|
1102 | yellow => 11, |
|
|
1103 | tan => 12, |
|
|
1104 | ); |
|
|
1105 | |
|
|
1106 | our @CF_COLOR = ( |
611 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
1107 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
612 | [1.00, 1.00, 1.00], |
1108 | [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], |
613 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] |
1109 | [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55], |
614 | [1.00, 0.00, 0.00], |
1110 | [1.00, 0.00, 0.00], |
615 | [1.00, 0.54, 0.00], |
1111 | [1.00, 0.54, 0.00], |
616 | [0.11, 0.56, 1.00], |
1112 | [0.11, 0.56, 1.00], |
617 | [0.93, 0.46, 0.00], |
1113 | [0.93, 0.46, 0.00], |
618 | [0.18, 0.54, 0.34], |
1114 | [0.18, 0.54, 0.34], |
619 | [0.56, 0.73, 0.56], |
1115 | [0.56, 0.73, 0.56], |
620 | [0.80, 0.80, 0.80], |
1116 | [0.80, 0.80, 0.80], |
621 | [0.75, 0.61, 0.20], |
1117 | [0.75, 0.61, 0.20], |
622 | [0.99, 0.77, 0.26], |
1118 | [0.99, 0.77, 0.26], |
623 | [0.74, 0.65, 0.41], |
1119 | [0.74, 0.65, 0.41], |
624 | ); |
1120 | ); |
625 | |
1121 | |
|
|
1122 | sub msg { |
|
|
1123 | my ($self, $color, $type, $text, @extra) = @_; |
|
|
1124 | |
|
|
1125 | $text = sanitise_xml $text; |
|
|
1126 | |
|
|
1127 | if (my $cb = $self->{cb_msg}{$type}) { |
|
|
1128 | $_->($self, $color, $type, $text, @extra) for values %$cb; |
|
|
1129 | } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { |
|
|
1130 | $type =~ s/-/_/g; |
|
|
1131 | $self->{$type} = $text; |
|
|
1132 | } else { |
626 | $self->logprint ("info: ", $text); |
1133 | $self->logprint ("msg: ", $text); |
|
|
1134 | return if $color < 0; # negative color == ignore if not understood |
627 | |
1135 | |
628 | # try to create single paragraphs of multiple lines sent by the server |
1136 | my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; |
629 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
|
|
630 | |
1137 | |
631 | $text = CFPlus::asxml $text; |
1138 | ::message ({ |
632 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
1139 | fg => $fg, |
633 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
1140 | markup => $text, |
|
|
1141 | type => $type, |
|
|
1142 | extra => [@extra], |
|
|
1143 | color_flags => $color, #d# ugly, kill |
|
|
1144 | }); |
634 | |
1145 | |
635 | ::message ({ fg => $color[$color], markup => $_ }) |
1146 | # $color &= ~NDI_CLEAR; # only clear once for multiline messages |
636 | for split /\n/, $text; |
1147 | # # actually, this is an ugly design. _we_ should control the channels, |
|
|
1148 | # # not some random other widget, as the channels are clearly protocol-specific. |
|
|
1149 | # # then we could also react to flags such as CLEAR without resorting to |
|
|
1150 | # # hacks such as color_flags, above. |
637 | |
1151 | |
638 | $self->{statusbox}->add ($text, |
1152 | $self->{statusbox}->add ($text, |
639 | group => $text, |
1153 | group => $text, |
640 | fg => $color[$color], |
1154 | fg => $fg, |
641 | timeout => $color >= 2 ? 180 : 10, |
1155 | timeout => $color >= 2 ? 180 : 10, |
642 | tooltip_font => $::FONT_FIXED, |
1156 | tooltip_font => $::FONT_FIXED, |
643 | ); |
1157 | ) if $type eq "info"; |
644 | } |
1158 | } |
645 | |
|
|
646 | sub drawextinfo { |
|
|
647 | my ($self, $color, $type, $subtype, $message) = @_; |
|
|
648 | |
|
|
649 | $self->drawinfo ($color, $message); |
|
|
650 | } |
1159 | } |
651 | |
1160 | |
652 | sub spell_add { |
1161 | sub spell_add { |
653 | my ($self, $spell) = @_; |
1162 | my ($self, $spell) = @_; |
654 | |
1163 | |
655 | # try to create single paragraphs out of the multiple lines sent by the server |
1164 | # try to create single paragraphs out of the multiple lines sent by the server |
656 | $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; |
1165 | $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; |
657 | $spell->{message} =~ s/\n+$//; |
1166 | $spell->{message} =~ s/\n+$//; |
658 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1167 | $spell->{message} ||= "Server did not provide a description for this spell."; |
659 | |
1168 | |
660 | $::SPELL_PAGE->add_spell ($spell); |
1169 | $::SPELL_LIST->add_spell ($spell); |
661 | |
1170 | |
662 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); |
1171 | $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message}); |
663 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
1172 | $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message}); |
664 | } |
1173 | } |
665 | |
1174 | |
666 | sub spell_delete { |
1175 | sub spell_delete { |
667 | my ($self, $spell) = @_; |
1176 | my ($self, $spell) = @_; |
668 | |
1177 | |
669 | $::SPELL_PAGE->remove_spell ($spell); |
1178 | $::SPELL_LIST->remove_spell ($spell); |
|
|
1179 | } |
|
|
1180 | |
|
|
1181 | sub setup { |
|
|
1182 | my ($self, $setup) = @_; |
|
|
1183 | |
|
|
1184 | $self->{map_widget}->set_tilesize ($self->{tilesize}); |
|
|
1185 | $::MAP->resize ($self->{mapw}, $self->{maph}); |
670 | } |
1186 | } |
671 | |
1187 | |
672 | sub addme_success { |
1188 | sub addme_success { |
673 | my ($self) = @_; |
1189 | my ($self) = @_; |
674 | |
1190 | |
675 | my %skill_help; |
1191 | my %skill_help; |
676 | |
1192 | |
677 | for my $node (CFPlus::Pod::find skill_description => "*") { |
1193 | for my $node (DC::Pod::find skill_description => "*") { |
678 | my (undef, @par) = CFPlus::Pod::section_of $node; |
1194 | my (undef, @par) = DC::Pod::section_of $node; |
679 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
1195 | $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; |
680 | }; |
1196 | }; |
681 | |
1197 | |
682 | for my $skill (values %{$self->{skill_info}}) { |
1198 | for my $skill (values %{$self->{skill_info}}) { |
683 | $self->{map_widget}->add_command ("ready_skill $skill", |
1199 | $self->{map_widget}->add_command ("ready_skill $skill", |
684 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
1200 | (DC::asxml "Ready the skill '$skill'\n\n") |
685 | . $skill_help{$skill}); |
1201 | . $skill_help{$skill}); |
686 | $self->{map_widget}->add_command ("use_skill $skill", |
1202 | $self->{map_widget}->add_command ("use_skill $skill", |
687 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
1203 | (DC::asxml "Immediately use the skill '$skill'\n\n") |
688 | . $skill_help{$skill}); |
1204 | . $skill_help{$skill}); |
689 | } |
1205 | } |
690 | } |
1206 | } |
691 | |
1207 | |
692 | sub eof { |
1208 | sub eof { |
… | |
… | |
695 | $self->{map_widget}->clr_commands; |
1211 | $self->{map_widget}->clr_commands; |
696 | |
1212 | |
697 | ::stop_game (); |
1213 | ::stop_game (); |
698 | } |
1214 | } |
699 | |
1215 | |
700 | sub image_info { |
|
|
701 | my ($self, $numfaces) = @_; |
|
|
702 | |
|
|
703 | $self->{num_faces} = $numfaces; |
|
|
704 | $self->{face_prefetch} = [1 .. $numfaces]; |
|
|
705 | $self->face_prefetch; |
|
|
706 | } |
|
|
707 | |
|
|
708 | sub face_prefetch { |
|
|
709 | my ($self) = @_; |
|
|
710 | |
|
|
711 | return unless $::CFG->{face_prefetch}; |
|
|
712 | |
|
|
713 | if ($self->{num_faces}) { |
|
|
714 | return if @{ $self->{send_queue} || [] }; |
|
|
715 | my $todo = @{ $self->{face_prefetch} } |
|
|
716 | or return; |
|
|
717 | |
|
|
718 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
|
|
719 | |
|
|
720 | $self->send ("requestinfo image_sums $face $face"); |
|
|
721 | |
|
|
722 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
|
|
723 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
724 | } elsif (!exists $self->{num_faces}) { |
|
|
725 | $self->send ("requestinfo image_info"); |
|
|
726 | |
|
|
727 | $self->{num_faces} = 0; |
|
|
728 | |
|
|
729 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
|
|
730 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
|
|
731 | } |
|
|
732 | } |
|
|
733 | |
|
|
734 | sub update_floorbox { |
1216 | sub update_floorbox { |
735 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1217 | $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
736 | return unless $::CONN; |
1218 | return unless $::CONN; |
737 | |
1219 | |
738 | $::FLOORBOX->clear; |
1220 | $::FLOORBOX->clear; |
739 | |
1221 | |
|
|
1222 | my @add; |
|
|
1223 | |
740 | my $row; |
1224 | my $row; |
741 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1225 | for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
|
|
1226 | next if $_->{tag} & 0x80000000; |
742 | if ($row < 6) { |
1227 | if ($row < 6) { |
743 | local $_->{face_widget}; # hack to force recreation of widget |
1228 | local $_->{face_widget}; # hack to force recreation of widget |
744 | local $_->{desc_widget}; # hack to force recreation of widget |
1229 | local $_->{desc_widget}; # hack to force recreation of widget |
745 | CFPlus::Item::update_widgets $_; |
1230 | DC::Item::update_widgets $_; |
746 | |
1231 | |
|
|
1232 | push @add, |
747 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
1233 | 0, $row, $_->{face_widget}, |
748 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
1234 | 1, $row, $_->{desc_widget}; |
749 | |
1235 | |
750 | $row++; |
1236 | $row++; |
751 | } else { |
1237 | } else { |
752 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
1238 | push @add, 1, $row, new DC::UI::Button |
753 | text => "More...", |
1239 | text => "More...", |
754 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1240 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
755 | ); |
1241 | ; |
756 | last; |
1242 | last; |
757 | } |
1243 | } |
758 | } |
1244 | } |
759 | if ($::CONN->{open_container}) { |
1245 | if ($::CONN->{open_container}) { |
760 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
1246 | push @add, 1, $row++, new DC::UI::Button |
761 | text => "Close container", |
1247 | text => "Close container", |
762 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1248 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
763 | ); |
1249 | ; |
764 | } |
1250 | } |
|
|
1251 | |
|
|
1252 | $::FLOORBOX->add_at (@add); |
765 | }); |
1253 | }); |
766 | |
1254 | |
767 | $::WANT_REFRESH++; |
1255 | $::WANT_REFRESH = 1; |
768 | } |
1256 | } |
769 | |
1257 | |
770 | sub set_opencont { |
1258 | sub set_opencont { |
771 | my ($conn, $tag, $name) = @_; |
1259 | my ($conn, $tag, $name) = @_; |
772 | $conn->{open_container} = $tag; |
1260 | $conn->{open_container} = $tag; |
773 | update_floorbox; |
1261 | update_floorbox; |
774 | |
1262 | |
775 | $::INV_RIGHT_HB->clear (); |
1263 | $::INVR_HB->clear; |
776 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1264 | $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); |
777 | |
1265 | |
778 | if ($tag != 0) { # Floor isn't closable, is it? |
1266 | if ($tag != 0) { # Floor isn't closable, is it? |
779 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
1267 | $::INVR_HB->add (new DC::UI::Button |
780 | text => "Close container", |
1268 | text => "Close container", |
781 | tooltip => "Close the currently open container (if one is open)", |
1269 | tooltip => "Close the currently open container (if one is open)", |
782 | on_activate => sub { |
1270 | on_activate => sub { |
783 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1271 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
784 | if $tag != 0; |
1272 | if $tag != 0; |
785 | #if $CONN->{open_container} != 0; |
|
|
786 | 0 |
1273 | 0 |
787 | }, |
1274 | }, |
788 | ); |
1275 | ); |
789 | } |
1276 | } |
790 | |
1277 | |
… | |
… | |
792 | } |
1279 | } |
793 | |
1280 | |
794 | sub update_containers { |
1281 | sub update_containers { |
795 | my ($self) = @_; |
1282 | my ($self) = @_; |
796 | |
1283 | |
797 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1284 | $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
798 | my $todo = delete $self->{update_container} |
1285 | my $todo = delete $self->{update_container} |
799 | or return; |
1286 | or return; |
800 | |
1287 | |
801 | for my $tag (keys %$todo) { |
1288 | for my $tag (keys %$todo) { |
802 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
1289 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
… | |
… | |
837 | } |
1324 | } |
838 | |
1325 | |
839 | sub item_update { |
1326 | sub item_update { |
840 | my ($self, $item) = @_; |
1327 | my ($self, $item) = @_; |
841 | |
1328 | |
842 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1329 | #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n"; |
843 | |
1330 | |
844 | CFPlus::Item::update_widgets $item; |
1331 | DC::Item::update_widgets $item; |
845 | |
1332 | |
846 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1333 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
847 | set_opencont ($::CONN, 0, "Floor"); |
1334 | set_opencont ($::CONN, 0, "Floor"); |
848 | |
1335 | |
849 | } elsif ($item->{flags} & F_OPEN) { |
1336 | } elsif ($item->{flags} & F_OPEN) { |
850 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
1337 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
851 | |
1338 | |
852 | } else { |
1339 | } else { |
853 | $self->{update_container}{$item->{container}}++; |
1340 | $self->{update_container}{$item->{container}}++; |
854 | $self->update_containers; |
1341 | $self->update_containers; |
855 | } |
1342 | } |
… | |
… | |
866 | |
1353 | |
867 | my $weight = .001 * $self->{player}{weight}; |
1354 | my $weight = .001 * $self->{player}{weight}; |
868 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1355 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
869 | |
1356 | |
870 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1357 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
871 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
1358 | $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit); |
872 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1359 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
873 | } |
1360 | } |
874 | |
1361 | |
875 | sub update_server_info { |
1362 | sub update_server_info { |
876 | my ($self) = @_; |
1363 | my ($self) = @_; |
877 | |
1364 | |
878 | my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); |
1365 | my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); |
879 | |
1366 | |
|
|
1367 | my $version = JSON::XS->new->encode ($self->{s_version}); |
|
|
1368 | |
880 | $::SERVER_INFO->set_markup ( |
1369 | $::SERVER_INFO->set_markup ( |
881 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
1370 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
882 | . "protocol version <tt>$self->{version}</tt>\n" |
1371 | . "protocol version <tt>$version</tt>\n" |
883 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
|
|
884 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
885 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1372 | . "editing support $yesno[!!$self->{editor_support}]\n" |
886 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
|
|
887 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1373 | . "client support $yesno[$self->{cfplus_ext} > 0]" |
888 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1374 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
889 | . "map size $self->{mapw}×$self->{maph}\n" |
1375 | . "map size $self->{mapw}×$self->{maph}\n" |
890 | ); |
1376 | ); |
|
|
1377 | |
891 | } |
1378 | } |
892 | |
1379 | |
893 | sub logged_in { |
1380 | sub logged_in { |
894 | my ($self) = @_; |
1381 | my ($self) = @_; |
895 | |
1382 | |
896 | $self->send_ext_req (cfplus_support => version => 1, sub { |
1383 | $self->send_ext_req (cfplus_support => version => 2, sub { |
|
|
1384 | my (%msg) = @_; |
|
|
1385 | |
897 | $self->{cfplus_ext} = $_[0]{version}; |
1386 | $self->{cfplus_ext} = $msg{version}; |
898 | $self->update_server_info; |
1387 | $self->update_server_info; |
899 | |
1388 | |
900 | if ($self->{cfplus_ext} >= 2) { |
1389 | if ($self->{cfplus_ext} >= 2) { |
901 | $self->send_ext_req ("editor_support", sub { |
1390 | $self->send_ext_req ("editor_support", sub { |
902 | $self->{editor_support} = $_[0]; |
1391 | $self->{editor_support} = { @_ }; |
903 | $self->update_server_info; |
1392 | $self->update_server_info; |
904 | |
1393 | |
905 | 0 |
1394 | 0 |
906 | }); |
1395 | }); |
907 | } |
1396 | } |
… | |
… | |
909 | 0 |
1398 | 0 |
910 | }); |
1399 | }); |
911 | |
1400 | |
912 | $self->update_server_info; |
1401 | $self->update_server_info; |
913 | |
1402 | |
914 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
1403 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
915 | $self->send_command ("output-count $::CFG->{output_count}"); |
|
|
916 | $self->send_command ("pickup $::CFG->{pickup}"); |
1404 | $self->send_pickup ($::CFG->{pickup}); |
917 | } |
1405 | } |
918 | |
1406 | |
919 | sub lookat { |
1407 | sub lookat { |
920 | my ($self, $x, $y) = @_; |
1408 | my ($self, $x, $y) = @_; |
921 | |
1409 | |
922 | if ($self->{cfplus_ext}) { |
1410 | if ($self->{cfplus_ext}) { |
923 | $self->send_ext_req (lookat => dx => $x, dy => $y, sub { |
1411 | $self->send_ext_req (lookat => $x, $y, sub { |
924 | my ($msg) = @_; |
1412 | my (%msg) = @_; |
925 | |
1413 | |
926 | if (exists $msg->{npc_dialog}) { |
1414 | if (exists $msg{npc_dialog}) { |
927 | # start npc chat dialog |
1415 | # start npc chat dialog |
928 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1416 | $self->{w}{npc_dialog} = new DC::NPCDialog:: |
929 | dx => $x, |
1417 | token => $msg{npc_dialog}, |
930 | dy => $y, |
|
|
931 | title => "$msg->{npc_dialog} (NPC)", |
1418 | title => "$msg{npc_dialog}[0] (NPC)", |
932 | conn => $self, |
1419 | conn => $self, |
933 | ; |
1420 | ; |
934 | } |
1421 | } |
935 | }); |
1422 | }); |
936 | } |
1423 | } |
… | |
… | |
939 | } |
1426 | } |
940 | |
1427 | |
941 | sub destroy { |
1428 | sub destroy { |
942 | my ($self) = @_; |
1429 | my ($self) = @_; |
943 | |
1430 | |
944 | (delete $self->{npc_dialog})->destroy |
1431 | $_->destroy |
945 | if $self->{npc_dialog}; |
1432 | for values %{ $self->{w} }; |
946 | |
1433 | |
947 | $self->SUPER::destroy; |
1434 | $self->SUPER::destroy; |
948 | } |
|
|
949 | |
1435 | |
|
|
1436 | %$self = (); |
|
|
1437 | } |
|
|
1438 | |
950 | package CFPlus::NPCDialog; |
1439 | package DC::NPCDialog; |
951 | |
1440 | |
952 | our @ISA = 'CFPlus::UI::Toplevel'; |
1441 | our @ISA = 'DC::UI::Toplevel'; |
953 | |
1442 | |
954 | sub new { |
1443 | sub new { |
955 | my $class = shift; |
1444 | my $class = shift; |
956 | |
1445 | |
957 | my $self = $class->SUPER::new ( |
1446 | my $self = $class->SUPER::new ( |
… | |
… | |
964 | kw => { hi => 0, yes => 0, no => 0 }, |
1453 | kw => { hi => 0, yes => 0, no => 0 }, |
965 | has_close_button => 1, |
1454 | has_close_button => 1, |
966 | @_, |
1455 | @_, |
967 | ); |
1456 | ); |
968 | |
1457 | |
969 | Scalar::Util::weaken (my $this = $self); |
1458 | DC::weaken (my $this = $self); |
970 | |
1459 | |
971 | $self->connect (delete => sub { $this->destroy; 1 }); |
1460 | $self->connect (delete => sub { $this->destroy; 1 }); |
972 | |
1461 | |
973 | # better use a pane... |
1462 | # better use a pane... |
974 | $self->add (my $hbox = new CFPlus::UI::HBox); |
1463 | $self->add (my $hbox = new DC::UI::HBox); |
975 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
1464 | $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1); |
976 | |
1465 | |
977 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
1466 | $hbox->add (my $vbox = new DC::UI::VBox); |
978 | |
1467 | |
979 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
1468 | $vbox->add (new DC::UI::Label text => "Message Entry:"); |
980 | $vbox->add ($self->{entry} = new CFPlus::UI::Entry |
1469 | $vbox->add ($self->{entry} = new DC::UI::Entry |
981 | tooltip => "#npc_message_entry", |
1470 | tooltip => "#npc_message_entry", |
982 | on_activate => sub { |
1471 | on_activate => sub { |
983 | my ($entry, $text) = @_; |
1472 | my ($entry, $text) = @_; |
984 | |
1473 | |
985 | return unless $text =~ /\S/; |
1474 | return unless $text =~ /\S/; |
… | |
… | |
989 | |
1478 | |
990 | 0 |
1479 | 0 |
991 | }, |
1480 | }, |
992 | ); |
1481 | ); |
993 | |
1482 | |
994 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
1483 | $vbox->add ($self->{options} = new DC::UI::VBox); |
995 | |
1484 | |
996 | $self->{bye_button} = new CFPlus::UI::Button |
1485 | $self->{bye_button} = new DC::UI::Button |
997 | text => "Bye (close)", |
1486 | text => "Bye (close)", |
998 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1487 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
999 | on_activate => sub { $this->destroy; 1 }, |
1488 | on_activate => sub { $this->destroy; 1 }, |
1000 | ; |
1489 | ; |
1001 | |
1490 | |
1002 | $self->update_options; |
1491 | $self->update_options; |
1003 | |
1492 | |
1004 | $self->{id} = $self->{conn}->send_ext_req ( |
1493 | $self->{id} = "npc-channel-" . $self->{conn}->token; |
1005 | npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, |
1494 | $self->{conn}->connect_ext ($self->{id} => sub { |
1006 | sub { $this && $this->feed (@_) } |
1495 | $this->feed (@_) if $this; |
1007 | ); |
1496 | }); |
|
|
1497 | |
|
|
1498 | $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token}); |
1008 | |
1499 | |
1009 | $self->{entry}->grab_focus; |
1500 | $self->{entry}->grab_focus; |
1010 | |
1501 | |
1011 | $self->{textview}->add_paragraph ({ |
1502 | $self->{textview}->add_paragraph ({ |
1012 | fg => [1, 1, 0, 1], |
1503 | fg => [1, 1, 0, 1], |
… | |
… | |
1018 | }; |
1509 | }; |
1019 | |
1510 | |
1020 | sub update_options { |
1511 | sub update_options { |
1021 | my ($self) = @_; |
1512 | my ($self) = @_; |
1022 | |
1513 | |
1023 | Scalar::Util::weaken $self; |
1514 | DC::weaken $self; |
1024 | |
1515 | |
1025 | $self->{options}->clear; |
1516 | $self->{options}->clear; |
1026 | $self->{options}->add ($self->{bye_button}); |
1517 | $self->{options}->add ($self->{bye_button}); |
1027 | |
1518 | |
1028 | for my $kw (sort keys %{ $self->{kw} }) { |
1519 | for my $kw (sort keys %{ $self->{kw} }) { |
1029 | $self->{options}->add (new CFPlus::UI::Button |
1520 | $self->{options}->add (new DC::UI::Button |
1030 | text => $kw, |
1521 | text => $kw, |
1031 | on_activate => sub { |
1522 | on_activate => sub { |
1032 | $self->send ($kw); |
1523 | $self->send ($kw); |
1033 | 0 |
1524 | 0 |
1034 | }, |
1525 | }, |
1035 | ); |
1526 | ); |
1036 | } |
1527 | } |
1037 | } |
1528 | } |
1038 | |
1529 | |
1039 | sub feed { |
1530 | sub feed { |
1040 | my ($self, $msg) = @_; |
1531 | my ($self, $type, @arg) = @_; |
1041 | |
1532 | |
1042 | Scalar::Util::weaken $self; |
1533 | DC::weaken $self; |
1043 | |
1534 | |
1044 | if ($msg->{msgtype} eq "reply") { |
1535 | if ($type eq "update") { |
|
|
1536 | my (%info) = @arg; |
|
|
1537 | |
1045 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
1538 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1046 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
1539 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1047 | |
|
|
1048 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
|
|
1049 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1050 | my @link; |
|
|
1051 | $text =~ s{ |
|
|
1052 | ($match) |
|
|
1053 | }{ |
|
|
1054 | my $kw = $1; |
|
|
1055 | |
|
|
1056 | push @link, new CFPlus::UI::Label |
|
|
1057 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1058 | can_hover => 1, |
|
|
1059 | can_events => 1, |
|
|
1060 | padding_x => 0, |
|
|
1061 | padding_y => 0, |
|
|
1062 | on_button_up => sub { |
|
|
1063 | $self->send ($kw); |
|
|
1064 | }; |
|
|
1065 | |
|
|
1066 | "\x{fffc}" |
|
|
1067 | }giex; |
|
|
1068 | |
1540 | |
|
|
1541 | if (exists $info{msg}) { |
|
|
1542 | my $text = "\n" . DC::Protocol::sanitise_xml $info{msg}; |
|
|
1543 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
|
|
1544 | my @link; |
|
|
1545 | $text =~ s{ |
|
|
1546 | ($match) |
|
|
1547 | }{ |
|
|
1548 | my $kw = $1; |
|
|
1549 | |
|
|
1550 | push @link, new DC::UI::Label |
|
|
1551 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
|
|
1552 | can_hover => 1, |
|
|
1553 | can_events => 1, |
|
|
1554 | padding_x => 0, |
|
|
1555 | padding_y => 0, |
|
|
1556 | on_button_up => sub { |
|
|
1557 | $self->send ($kw); |
|
|
1558 | }; |
|
|
1559 | |
|
|
1560 | "\x{fffc}" |
|
|
1561 | }giex; |
|
|
1562 | |
1069 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1563 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1070 | $self->{textview}->scroll_to_bottom; |
1564 | $self->{textview}->scroll_to_bottom; |
|
|
1565 | } |
|
|
1566 | |
1071 | $self->update_options; |
1567 | $self->update_options; |
1072 | } else { |
1568 | } else { |
1073 | $self->destroy; |
1569 | $self->destroy; |
1074 | } |
1570 | } |
1075 | |
1571 | |
… | |
… | |
1077 | } |
1573 | } |
1078 | |
1574 | |
1079 | sub send { |
1575 | sub send { |
1080 | my ($self, $msg) = @_; |
1576 | my ($self, $msg) = @_; |
1081 | |
1577 | |
1082 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1578 | $self->{textview}->add_paragraph ({ |
|
|
1579 | markup => |
|
|
1580 | "\n<span foreground='#ffff00'><b>" |
|
|
1581 | . (DC::asxml $msg) |
|
|
1582 | . "</b></span>" |
|
|
1583 | }); |
1083 | $self->{textview}->scroll_to_bottom; |
1584 | $self->{textview}->scroll_to_bottom; |
1084 | |
1585 | |
1085 | $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); |
1586 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1086 | } |
1587 | } |
1087 | |
1588 | |
1088 | sub destroy { |
1589 | sub destroy { |
1089 | my ($self) = @_; |
1590 | my ($self) = @_; |
1090 | |
1591 | |
1091 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1592 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1092 | |
1593 | |
1093 | if ($self->{conn}) { |
1594 | if ($self->{conn}) { |
1094 | $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; |
1595 | $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; |
1095 | delete $self->{conn}{npc_dialog}; |
1596 | delete $self->{conn}{w}{npc_dialog}; |
1096 | $self->{conn}->disconnect_ext ($self->{id}); |
1597 | $self->{conn}->disconnect_ext ($self->{id}); |
1097 | } |
1598 | } |
1098 | |
1599 | |
1099 | $self->SUPER::destroy; |
1600 | $self->SUPER::destroy; |
1100 | } |
1601 | } |