1 | package CFClient::Protocol; |
1 | package CFPlus::Protocol; |
2 | |
2 | |
3 | use utf8; |
3 | use utf8; |
4 | use strict; |
4 | use strict; |
5 | |
5 | |
6 | use Crossfire::Protocol::Constants; |
6 | use Crossfire::Protocol::Constants; |
7 | |
7 | |
8 | use CFClient; |
8 | use CFPlus; |
9 | use CFClient::UI; |
9 | use CFPlus::UI; |
|
|
10 | use CFPlus::Pod; |
|
|
11 | |
|
|
12 | use Crossfire::Protocol::Base 0.95; |
10 | |
13 | |
11 | use base 'Crossfire::Protocol::Base'; |
14 | use base 'Crossfire::Protocol::Base'; |
12 | |
15 | |
13 | sub new { |
16 | sub new { |
14 | my $class = shift; |
17 | my $class = shift; |
15 | |
18 | |
16 | my $self = $class->SUPER::new (@_); |
19 | my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); |
17 | |
20 | |
18 | $self->{map_widget}->clr_commands; |
21 | $self->{map_widget}->clr_commands; |
19 | |
22 | |
20 | my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { |
23 | my @cmd_help = map { |
21 | my ($pom) = @_; |
|
|
22 | |
|
|
23 | my @cmd_help; |
|
|
24 | |
|
|
25 | for my $head2 ($pom->head1->[-2]->head2) { |
|
|
26 | $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
24 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
27 | or next; |
25 | or die "unparseable command help: $_->{kw}[0]"; |
28 | |
26 | |
29 | my $cmd = $1; |
27 | my $cmd = $1; |
30 | my @args = split /\|/, $2; |
28 | my @args = split /\|/, $2; |
31 | @args = (".*") unless @args; |
29 | @args = (".*") unless @args; |
32 | |
30 | |
|
|
31 | my (undef, @par) = CFPlus::Pod::section_of $_; |
|
|
32 | my $text = CFPlus::Pod::as_label @par; |
|
|
33 | |
33 | $_ = $_ eq ".*" ? "" : " $_" |
34 | $_ = $_ eq ".*" ? "" : " $_" |
34 | for @args; |
35 | for @args; |
35 | |
36 | |
36 | my $text = CFClient::pod_to_pango $head2->content; |
37 | map ["$cmd$_", $text], |
37 | |
|
|
38 | push @cmd_help, ["$cmd$_", $text] |
|
|
39 | for sort { (length $a) <=> (length $b) } |
38 | sort { (length $a) <=> (length $b) } |
40 | @args; |
39 | @args |
41 | } |
40 | } sort { $a->{par} <=> $b->{par} } |
|
|
41 | CFPlus::Pod::find command => "*"; |
42 | |
42 | |
43 | \@cmd_help |
|
|
44 | }; |
|
|
45 | |
|
|
46 | $self->{map_widget}->add_command (@$_) |
43 | $self->{map_widget}->add_command (@$_) |
47 | for @$cmd_help; |
44 | for @cmd_help; |
48 | |
45 | |
49 | $self->{noface} = new_from_file CFClient::Texture |
46 | $self->{noface} = new_from_file CFPlus::Texture |
50 | CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; |
47 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
48 | |
|
|
49 | { |
|
|
50 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
|
|
51 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
|
|
52 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
53 | } |
51 | |
54 | |
52 | $self->{open_container} = 0; |
55 | $self->{open_container} = 0; |
53 | |
56 | |
54 | # "global" |
57 | # "global" |
55 | $self->{tilecache} = CFClient::db_table "tilecache"; |
58 | $self->{tilecache} = CFPlus::db_table "tilecache" |
|
|
59 | or die "tilecache: unable to open database table"; |
56 | $self->{facemap} = CFClient::db_table "facemap"; |
60 | $self->{facemap} = CFPlus::db_table "facemap" |
|
|
61 | or die "facemap: unable to open database table"; |
57 | |
62 | |
58 | # per server |
63 | # per server |
59 | $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; |
64 | $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" |
|
|
65 | or die "mapcache_$self->{host}_$self->{port}: unable to open database table"; |
60 | |
66 | |
61 | $self |
67 | $self |
62 | } |
68 | } |
63 | |
69 | |
64 | sub logprint { |
70 | sub logprint { |
… | |
… | |
242 | $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); |
248 | $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); |
243 | $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); |
249 | $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); |
244 | $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); |
250 | $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); |
245 | $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); |
251 | $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); |
246 | |
252 | |
247 | $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); |
253 | $self->update_weight; |
248 | |
254 | |
249 | $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) |
255 | $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) |
250 | for keys %RES_TBL; |
256 | for keys %RES_TBL; |
251 | |
257 | |
252 | my $sktbl = $::STATWIDS->{skill_tbl}; |
258 | my $sktbl = $::STATWIDS->{skill_tbl}; |
253 | my @skills = keys %{ $self->{skill_info} }; |
259 | my @skills = keys %{ $self->{skill_info} }; |
254 | |
260 | |
255 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
261 | if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { |
256 | $sktbl->clear; |
262 | $sktbl->clear; |
257 | |
263 | |
258 | $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); |
264 | $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
259 | $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); |
265 | $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
260 | $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); |
266 | $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
261 | $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); |
267 | $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); |
262 | $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); |
268 | $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); |
263 | $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); |
269 | $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); |
264 | |
270 | |
|
|
271 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
|
|
272 | |
|
|
273 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
|
|
274 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
|
|
275 | |
265 | my ($x, $y) = (1, 0); |
276 | my ($x, $y) = (0, 1); |
266 | for ( |
277 | for ( |
267 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
278 | sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } |
268 | map [$_, $self->{skill_info}{$_}], |
279 | map [$_, $self->{skill_info}{$_}], |
269 | grep exists $stats->{$_}, |
280 | grep exists $stats->{$_}, |
270 | @skills |
281 | @skills |
271 | ) { |
282 | ) { |
272 | my ($idx, $name) = @$_; |
283 | my ($idx, $name) = @$_; |
273 | |
284 | |
|
|
285 | my $spell_cb = sub { |
|
|
286 | my ($widget, $ev) = @_; |
|
|
287 | |
|
|
288 | if ($ev->{button} == 1) { |
|
|
289 | $::CONN->user_send ("ready_skill $name"); |
|
|
290 | } elsif ($ev->{button} == 2) { |
|
|
291 | $::CONN->user_send ("use_skill $name"); |
|
|
292 | } elsif ($ev->{button} == 3) { |
|
|
293 | my $shortname = CFPlus::shorten $name, 14; |
|
|
294 | (new CFPlus::UI::Menu |
|
|
295 | items => [ |
|
|
296 | ["bind <i>ready_skill $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], |
|
|
297 | ["bind <i>use_skill $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], |
|
|
298 | ], |
|
|
299 | )->popup ($ev); |
|
|
300 | } else { |
|
|
301 | return 0; |
|
|
302 | } |
|
|
303 | |
|
|
304 | 1 |
|
|
305 | }; |
|
|
306 | |
274 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label |
307 | $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label |
275 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); |
308 | text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); |
276 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label |
309 | $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label |
277 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); |
310 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); |
278 | $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); |
311 | $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
|
|
312 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); |
279 | |
313 | |
280 | $x++ and ($x, $y) = (0, $y + 1); |
314 | $x++ and ($x, $y) = (0, $y + 1); |
281 | } |
315 | } |
282 | } |
316 | } |
283 | |
317 | |
… | |
… | |
288 | } |
322 | } |
289 | |
323 | |
290 | sub user_send { |
324 | sub user_send { |
291 | my ($self, $command) = @_; |
325 | my ($self, $command) = @_; |
292 | |
326 | |
293 | if ($self->{record}) { |
|
|
294 | push @{$self->{record}}, $command; |
327 | push @{$self->{record}}, $command |
295 | } |
328 | if $self->{record}; |
296 | |
329 | |
297 | $self->logprint ("send: ", $command); |
330 | $self->logprint ("send: ", $command); |
298 | $self->send_command ($command); |
331 | $self->send_command ($command); |
299 | ::status ($command); |
332 | ::status ($command); |
300 | } |
333 | } |
… | |
… | |
317 | } |
350 | } |
318 | |
351 | |
319 | sub feed_map1a { |
352 | sub feed_map1a { |
320 | my ($self, $data) = @_; |
353 | my ($self, $data) = @_; |
321 | |
354 | |
322 | $self->{map}->map1a_update ($data); |
355 | $self->{map}->map1a_update ($data, $self->{setup}{extmap}); |
323 | $self->{map_widget}->update; |
356 | $self->{map_widget}->update; |
324 | } |
357 | } |
325 | |
358 | |
326 | sub magicmap { |
359 | sub magicmap { |
327 | my ($self, $w, $h, $x, $y, $data) = @_; |
360 | my ($self, $w, $h, $x, $y, $data) = @_; |
… | |
… | |
497 | |
530 | |
498 | unless ($id) { |
531 | unless ($id) { |
499 | # create new id for face |
532 | # create new id for face |
500 | # I love transactions |
533 | # I love transactions |
501 | for (1..100) { |
534 | for (1..100) { |
502 | my $txn = $CFClient::DB_ENV->txn_begin; |
535 | my $txn = $CFPlus::DB_ENV->txn_begin; |
503 | my $status = $self->{facemap}->db_get (id => $id); |
536 | my $status = $self->{facemap}->db_get (id => $id); |
504 | if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { |
537 | if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { |
505 | $id = ($id || 64) + 1; |
538 | $id = ($id || 64) + 1; |
506 | if ($self->{facemap}->put (id => $id) == 0 |
539 | if ($self->{facemap}->put (id => $id) == 0 |
507 | && $self->{facemap}->put ($hash => $id) == 0) { |
540 | && $self->{facemap}->put ($hash => $id) == 0) { |
… | |
… | |
511 | } |
544 | } |
512 | } |
545 | } |
513 | $txn->txn_abort; |
546 | $txn->txn_abort; |
514 | } |
547 | } |
515 | |
548 | |
516 | CFClient::fatal "maximum number of transaction retries reached - database problems?"; |
549 | CFPlus::fatal "maximum number of transaction retries reached - database problems?"; |
517 | } |
550 | } |
518 | |
551 | |
519 | gotid: |
552 | gotid: |
520 | $face->{id} = $id; |
553 | $face->{id} = $id; |
521 | $self->{map}->set_face ($facenum => $id); |
554 | $self->{map}->set_face ($facenum => $id); |
… | |
… | |
544 | sub set_texture { |
577 | sub set_texture { |
545 | my ($self, $id, $data) = @_; |
578 | my ($self, $id, $data) = @_; |
546 | |
579 | |
547 | $self->{texture}[$id] ||= do { |
580 | $self->{texture}[$id] ||= do { |
548 | my $tex = |
581 | my $tex = |
549 | new_from_image CFClient::Texture |
582 | new_from_image CFPlus::Texture |
550 | $data, minify => 1, mipmap => 1; |
583 | $data, minify => 1, mipmap => 1; |
551 | |
584 | |
552 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
585 | $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
553 | $self->{map_widget}->update; |
586 | $self->{map_widget}->update; |
554 | |
587 | |
… | |
… | |
592 | [0.74, 0.65, 0.41], |
625 | [0.74, 0.65, 0.41], |
593 | ); |
626 | ); |
594 | |
627 | |
595 | $self->logprint ("info: ", $text); |
628 | $self->logprint ("info: ", $text); |
596 | |
629 | |
597 | my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; |
|
|
598 | |
|
|
599 | # try to create single paragraphs of multiple lines sent by the server |
630 | # try to create single paragraphs of multiple lines sent by the server |
600 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
631 | $text =~ s/(?<=\S)\n(?=\w)/ /g; |
601 | |
632 | |
602 | $text = CFClient::UI::Label::escape $text; |
633 | $text = CFPlus::asxml $text; |
603 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
634 | $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; |
604 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
635 | $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; |
605 | |
636 | |
606 | $self->{logview}->add_paragraph ($color[$color], $_) |
637 | ::message ({ fg => $color[$color], markup => $_ }) |
607 | for map "$time $_", split /\n/, $text; |
638 | for split /\n/, $text; |
608 | $self->{logview}->scroll_to_bottom; |
|
|
609 | |
639 | |
610 | $self->{statusbox}->add ($text, |
640 | $self->{statusbox}->add ($text, |
611 | group => $text, |
641 | group => $text, |
612 | fg => $color[$color], |
642 | fg => $color[$color], |
613 | timeout => $color >= 2 ? 60 : 10, |
643 | timeout => $color >= 2 ? 180 : 10, |
614 | tooltip_font => $::FONT_FIXED, |
644 | tooltip_font => $::FONT_FIXED, |
615 | ); |
645 | ); |
616 | } |
646 | } |
617 | |
647 | |
618 | sub drawextinfo { |
648 | sub drawextinfo { |
… | |
… | |
622 | } |
652 | } |
623 | |
653 | |
624 | sub spell_add { |
654 | sub spell_add { |
625 | my ($self, $spell) = @_; |
655 | my ($self, $spell) = @_; |
626 | |
656 | |
627 | # try to create single paragraphs of multiple lines sent by the server |
657 | # try to create single paragraphs out of the multiple lines sent by the server |
628 | $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; |
658 | $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; |
629 | $spell->{message} =~ s/\n+$//; |
659 | $spell->{message} =~ s/\n+$//; |
630 | $spell->{message} ||= "Server did not provide a description for this spell."; |
660 | $spell->{message} ||= "Server did not provide a description for this spell."; |
631 | |
661 | |
632 | $::SPELL_PAGE->add_spell ($spell); |
662 | $::SPELL_LIST->add_spell ($spell); |
633 | |
663 | |
634 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); |
664 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); |
635 | $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); |
665 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
636 | } |
666 | } |
637 | |
667 | |
638 | sub spell_delete { |
668 | sub spell_delete { |
639 | my ($self, $spell) = @_; |
669 | my ($self, $spell) = @_; |
640 | |
670 | |
641 | $::SPELL_PAGE->remove_spell ($spell); |
671 | $::SPELL_LIST->remove_spell ($spell); |
|
|
672 | } |
|
|
673 | |
|
|
674 | sub setup { |
|
|
675 | my ($self, $setup) = @_; |
|
|
676 | |
|
|
677 | $::MAP->resize ($self->{mapw}, $self->{maph}); |
642 | } |
678 | } |
643 | |
679 | |
644 | sub addme_success { |
680 | sub addme_success { |
645 | my ($self) = @_; |
681 | my ($self) = @_; |
646 | |
682 | |
647 | my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub { |
|
|
648 | my ($pom) = @_; |
|
|
649 | |
|
|
650 | my %skill_help; |
683 | my %skill_help; |
651 | |
684 | |
652 | for my $head2 ($pom->head1->[3]->head2) { |
685 | for my $node (CFPlus::Pod::find skill_description => "*") { |
653 | $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; |
686 | my (undef, @par) = CFPlus::Pod::section_of $node; |
654 | } |
687 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
655 | |
|
|
656 | \%skill_help |
|
|
657 | }; |
688 | }; |
658 | |
689 | |
659 | for my $skill (values %{$self->{skill_info}}) { |
690 | for my $skill (values %{$self->{skill_info}}) { |
660 | $self->{map_widget}->add_command ("ready_skill $skill", |
691 | $self->{map_widget}->add_command ("ready_skill $skill", |
661 | (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") |
692 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
662 | . $skill_help->{$skill}); |
693 | . $skill_help{$skill}); |
663 | $self->{map_widget}->add_command ("use_skill $skill", |
694 | $self->{map_widget}->add_command ("use_skill $skill", |
664 | (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") |
695 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
665 | . $skill_help->{$skill}); |
696 | . $skill_help{$skill}); |
666 | } |
697 | } |
667 | } |
698 | } |
668 | |
699 | |
669 | sub eof { |
700 | sub eof { |
670 | my ($self) = @_; |
701 | my ($self) = @_; |
… | |
… | |
694 | |
725 | |
695 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
726 | my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); |
696 | |
727 | |
697 | $self->send ("requestinfo image_sums $face $face"); |
728 | $self->send ("requestinfo image_sums $face $face"); |
698 | |
729 | |
699 | $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", |
730 | $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", |
700 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
731 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
701 | } elsif (!exists $self->{num_faces}) { |
732 | } elsif (!exists $self->{num_faces}) { |
702 | $self->send ("requestinfo image_info"); |
733 | $self->send ("requestinfo image_info"); |
703 | |
734 | |
704 | $self->{num_faces} = 0; |
735 | $self->{num_faces} = 0; |
705 | |
736 | |
706 | $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", |
737 | $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", |
707 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
738 | group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); |
708 | } |
739 | } |
709 | } |
740 | } |
710 | |
741 | |
711 | sub update_floorbox { |
742 | sub update_floorbox { |
712 | $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
743 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
713 | return unless $::CONN; |
744 | return unless $::CONN; |
714 | |
745 | |
715 | $::FLOORBOX->clear; |
746 | $::FLOORBOX->clear; |
716 | |
747 | |
717 | my $row; |
748 | my $row; |
718 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
749 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
719 | if ($row < 6) { |
750 | if ($row < 6) { |
720 | local $_->{face_widget}; # hack to force recreation of widget |
751 | local $_->{face_widget}; # hack to force recreation of widget |
721 | local $_->{desc_widget}; # hack to force recreation of widget |
752 | local $_->{desc_widget}; # hack to force recreation of widget |
722 | CFClient::Item::update_widgets $_; |
753 | CFPlus::Item::update_widgets $_; |
723 | |
754 | |
724 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
755 | $::FLOORBOX->add (0, $row, $_->{face_widget}); |
725 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
756 | $::FLOORBOX->add (1, $row, $_->{desc_widget}); |
726 | |
757 | |
727 | $row++; |
758 | $row++; |
728 | } else { |
759 | } else { |
729 | $::FLOORBOX->add (1, $row, new CFClient::UI::Button |
760 | $::FLOORBOX->add (1, $row, new CFPlus::UI::Button |
730 | text => "More...", |
761 | text => "More...", |
731 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
762 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
732 | ); |
763 | ); |
733 | last; |
764 | last; |
734 | } |
765 | } |
735 | } |
766 | } |
736 | if ($::CONN->{open_container}) { |
767 | if ($::CONN->{open_container}) { |
737 | $::FLOORBOX->add (1, $row++, new CFClient::UI::Button |
768 | $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button |
738 | text => "Close container", |
769 | text => "Close container", |
739 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
770 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
740 | ); |
771 | ); |
741 | } |
772 | } |
742 | }); |
773 | }); |
… | |
… | |
748 | my ($conn, $tag, $name) = @_; |
779 | my ($conn, $tag, $name) = @_; |
749 | $conn->{open_container} = $tag; |
780 | $conn->{open_container} = $tag; |
750 | update_floorbox; |
781 | update_floorbox; |
751 | |
782 | |
752 | $::INV_RIGHT_HB->clear (); |
783 | $::INV_RIGHT_HB->clear (); |
753 | $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); |
784 | $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
754 | |
785 | |
755 | if ($tag != 0) { # Floor isn't closable, is it? |
786 | if ($tag != 0) { # Floor isn't closable, is it? |
756 | $::INV_RIGHT_HB->add (new CFClient::UI::Button |
787 | $::INV_RIGHT_HB->add (new CFPlus::UI::Button |
757 | text => "Close container", |
788 | text => "Close container", |
758 | tooltip => "Close the currently open container (if one is open)", |
789 | tooltip => "Close the currently open container (if one is open)", |
759 | on_activate => sub { |
790 | on_activate => sub { |
760 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
791 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
761 | if $tag != 0; |
792 | if $tag != 0; |
… | |
… | |
769 | } |
800 | } |
770 | |
801 | |
771 | sub update_containers { |
802 | sub update_containers { |
772 | my ($self) = @_; |
803 | my ($self) = @_; |
773 | |
804 | |
774 | $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
805 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
775 | my $todo = delete $self->{update_container} |
806 | my $todo = delete $self->{update_container} |
776 | or return; |
807 | or return; |
777 | |
808 | |
778 | for my $tag (keys %$todo) { |
809 | for my $tag (keys %$todo) { |
779 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
810 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
… | |
… | |
816 | sub item_update { |
847 | sub item_update { |
817 | my ($self, $item) = @_; |
848 | my ($self, $item) = @_; |
818 | |
849 | |
819 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
850 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
820 | |
851 | |
821 | CFClient::Item::update_widgets $item; |
852 | CFPlus::Item::update_widgets $item; |
822 | |
853 | |
823 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
854 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
824 | set_opencont ($::CONN, 0, "Floor"); |
855 | set_opencont ($::CONN, 0, "Floor"); |
825 | |
856 | |
826 | } elsif ($item->{flags} & F_OPEN) { |
857 | } elsif ($item->{flags} & F_OPEN) { |
827 | set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); |
858 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
828 | |
859 | |
829 | } else { |
860 | } else { |
830 | $self->{update_container}{$item->{container}}++; |
861 | $self->{update_container}{$item->{container}}++; |
831 | $self->update_containers; |
862 | $self->update_containers; |
832 | } |
863 | } |
833 | } |
864 | } |
834 | |
865 | |
835 | sub player_update { |
866 | sub player_update { |
836 | my ($self, $player) = @_; |
867 | my ($self, $player) = @_; |
|
|
868 | |
|
|
869 | $self->update_weight; |
|
|
870 | } |
|
|
871 | |
|
|
872 | sub update_weight { |
|
|
873 | my ($self) = @_; |
|
|
874 | |
|
|
875 | my $weight = .001 * $self->{player}{weight}; |
|
|
876 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
|
|
877 | |
837 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); |
878 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
|
|
879 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
|
|
880 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
838 | } |
881 | } |
839 | |
882 | |
840 | sub update_server_info { |
883 | sub update_server_info { |
841 | my ($self) = @_; |
884 | my ($self) = @_; |
842 | |
885 | |
… | |
… | |
845 | $::SERVER_INFO->set_markup ( |
888 | $::SERVER_INFO->set_markup ( |
846 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
889 | "server <tt>$self->{host}:$self->{port}</tt>\n" |
847 | . "protocol version <tt>$self->{version}</tt>\n" |
890 | . "protocol version <tt>$self->{version}</tt>\n" |
848 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
891 | . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" |
849 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
892 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
|
|
893 | . "editing support $yesno[!!$self->{editor_support}]\n" |
|
|
894 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
850 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
895 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
851 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
896 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
852 | . "map size $self->{mapw}×$self->{maph}\n" |
897 | . "map size $self->{mapw}×$self->{maph}\n" |
853 | ); |
898 | ); |
|
|
899 | |
|
|
900 | ::setup_build_button ($self->{editor_support}->{builder_ui}); |
854 | } |
901 | } |
855 | |
902 | |
856 | sub logged_in { |
903 | sub logged_in { |
857 | my ($self) = @_; |
904 | my ($self) = @_; |
858 | |
905 | |
859 | $self->send_ext_req (cfplus_support => "1", sub { |
906 | $self->send_ext_req (cfplus_support => version => 1, sub { |
860 | $self->{cfplus_ext} = $_[0]; |
907 | $self->{cfplus_ext} = $_[0]{version}; |
861 | $self->update_server_info; |
908 | $self->update_server_info; |
|
|
909 | |
|
|
910 | if ($self->{cfplus_ext} >= 2) { |
|
|
911 | $self->send_ext_req ("editor_support", sub { |
|
|
912 | $self->{editor_support} = $_[0]; |
|
|
913 | $self->update_server_info; |
|
|
914 | |
|
|
915 | 0 |
|
|
916 | }); |
|
|
917 | } |
|
|
918 | |
|
|
919 | 0 |
862 | }); |
920 | }); |
863 | |
921 | |
864 | $self->update_server_info; |
922 | $self->update_server_info; |
865 | |
923 | |
866 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
924 | $self->send_command ("output-sync $::CFG->{output_sync}"); |
867 | $self->send_command ("output-count $::CFG->{output_count}"); |
925 | $self->send_command ("output-count $::CFG->{output_count}"); |
868 | $self->send_command ("pickup $::CFG->{pickup}"); |
926 | $self->send_command ("pickup $::CFG->{pickup}"); |
869 | } |
927 | } |
870 | |
928 | |
|
|
929 | sub buildat { |
|
|
930 | my ($self, $builditem, $x, $y) = @_; |
|
|
931 | |
|
|
932 | if ($self->{cfplus_ext}) { |
|
|
933 | $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); |
|
|
934 | } |
|
|
935 | } |
|
|
936 | |
871 | sub lookat { |
937 | sub lookat { |
872 | my ($self, $x, $y) = @_; |
938 | my ($self, $x, $y) = @_; |
873 | |
939 | |
874 | if ($self->{cfplus_ext}) { |
940 | if ($self->{cfplus_ext}) { |
875 | $self->send_ext_req (lookat => "$x $y", sub { |
941 | $self->send_ext_req (lookat => dx => $x, dy => $y, sub { |
876 | my %res = split /\x00/, $_[0]; |
942 | my ($msg) = @_; |
877 | |
943 | |
878 | if (exists $res{npc_dialog}) { |
944 | if (exists $msg->{npc_dialog}) { |
879 | # start npc chat dialog |
945 | # start npc chat dialog |
880 | $self->{npc_dialog} = new CFClient::NPCDialog:: |
946 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
881 | dx => $x, |
947 | dx => $x, |
882 | dy => $y, |
948 | dy => $y, |
883 | title => "$res{npc_dialog} (NPC)", |
949 | title => "$msg->{npc_dialog} (NPC)", |
884 | conn => $self, |
950 | conn => $self, |
885 | ; |
951 | ; |
886 | } |
952 | } |
887 | }); |
953 | }); |
888 | } |
954 | } |
… | |
… | |
891 | } |
957 | } |
892 | |
958 | |
893 | sub destroy { |
959 | sub destroy { |
894 | my ($self) = @_; |
960 | my ($self) = @_; |
895 | |
961 | |
896 | $self->{npc_dialog}->destroy |
962 | (delete $self->{npc_dialog})->destroy |
897 | if $self->{npc_dialog}; |
963 | if $self->{npc_dialog}; |
898 | |
964 | |
899 | $self->SUPER::destroy; |
965 | $self->SUPER::destroy; |
900 | } |
966 | } |
901 | |
967 | |
902 | package CFClient::NPCDialog; |
968 | package CFPlus::NPCDialog; |
903 | |
969 | |
904 | our @ISA = 'CFClient::UI::FancyFrame'; |
970 | our @ISA = 'CFPlus::UI::Toplevel'; |
905 | |
971 | |
906 | sub new { |
972 | sub new { |
907 | my $class = shift; |
973 | my $class = shift; |
908 | |
974 | |
909 | my $self = $class->SUPER::new ( |
975 | my $self = $class->SUPER::new ( |
… | |
… | |
912 | name => "npc_dialog", |
978 | name => "npc_dialog", |
913 | force_w => $::WIDTH * 0.7, |
979 | force_w => $::WIDTH * 0.7, |
914 | force_h => $::HEIGHT * 0.7, |
980 | force_h => $::HEIGHT * 0.7, |
915 | title => "NPC Dialog", |
981 | title => "NPC Dialog", |
916 | kw => { hi => 0, yes => 0, no => 0 }, |
982 | kw => { hi => 0, yes => 0, no => 0 }, |
|
|
983 | has_close_button => 1, |
917 | @_, |
984 | @_, |
918 | ); |
985 | ); |
919 | |
986 | |
920 | Scalar::Util::weaken (my $this = $self); |
987 | Scalar::Util::weaken (my $this = $self); |
921 | |
988 | |
|
|
989 | $self->connect (delete => sub { $this->destroy; 1 }); |
|
|
990 | |
922 | # better use a pane... |
991 | # better use a pane... |
923 | $self->add (my $hbox = new CFClient::UI::HBox); |
992 | $self->add (my $hbox = new CFPlus::UI::HBox); |
924 | $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); |
993 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
925 | |
994 | |
926 | $hbox->add (my $vbox = new CFClient::UI::VBox); |
995 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
927 | |
996 | |
928 | $vbox->add (new CFClient::UI::Label text => "Message Entry:"); |
997 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
929 | $vbox->add ($self->{entry} = new CFClient::UI::Entry |
998 | $vbox->add ($self->{entry} = new CFPlus::UI::Entry |
930 | tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" |
999 | tooltip => "#npc_message_entry", |
931 | . "Sometimes you have to tell an NPC something you cannot find out during " |
|
|
932 | . "a normal conversation (such as a password). In those cases you have to use " |
|
|
933 | . "this text entry. You can also enter responses manually instead of using the response " |
|
|
934 | . "buttons below.", |
|
|
935 | on_activate => sub { |
1000 | on_activate => sub { |
936 | my ($entry, $text) = @_; |
1001 | my ($entry, $text) = @_; |
937 | |
1002 | |
938 | return unless $text =~ /\S/; |
1003 | return unless $text =~ /\S/; |
939 | |
1004 | |
… | |
… | |
942 | |
1007 | |
943 | 0 |
1008 | 0 |
944 | }, |
1009 | }, |
945 | ); |
1010 | ); |
946 | |
1011 | |
947 | $vbox->add ($self->{options} = new CFClient::UI::VBox); |
1012 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
948 | |
1013 | |
949 | $self->{bye_button} = new CFClient::UI::Button |
1014 | $self->{bye_button} = new CFPlus::UI::Button |
950 | text => "Bye (close)", |
1015 | text => "Bye (close)", |
951 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1016 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
952 | on_activate => sub { $this->destroy; 0 }, |
1017 | on_activate => sub { $this->destroy; 1 }, |
953 | ; |
1018 | ; |
954 | |
1019 | |
955 | $self->update_options; |
1020 | $self->update_options; |
956 | |
1021 | |
957 | $self->{token} = $self->{conn}->ext_token; |
1022 | $self->{id} = $self->{conn}->send_ext_req ( |
958 | $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); |
1023 | npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, |
959 | $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); |
1024 | sub { $this && $this->feed (@_) } |
|
|
1025 | ); |
960 | |
1026 | |
961 | $self->{entry}->grab_focus; |
1027 | $self->{entry}->grab_focus; |
962 | |
1028 | |
963 | $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); |
1029 | $self->{textview}->add_paragraph ({ |
|
|
1030 | fg => [1, 1, 0, 1], |
|
|
1031 | markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n", |
|
|
1032 | }); |
964 | |
1033 | |
965 | $self->show; |
1034 | $self->show; |
966 | $self |
1035 | $self |
967 | }; |
1036 | }; |
968 | |
1037 | |
… | |
… | |
973 | |
1042 | |
974 | $self->{options}->clear; |
1043 | $self->{options}->clear; |
975 | $self->{options}->add ($self->{bye_button}); |
1044 | $self->{options}->add ($self->{bye_button}); |
976 | |
1045 | |
977 | for my $kw (sort keys %{ $self->{kw} }) { |
1046 | for my $kw (sort keys %{ $self->{kw} }) { |
978 | $self->{options}->add (new CFClient::UI::Button |
1047 | $self->{options}->add (new CFPlus::UI::Button |
979 | text => $kw, |
1048 | text => $kw, |
980 | on_activate => sub { |
1049 | on_activate => sub { |
981 | $self->send ($kw); |
1050 | $self->send ($kw); |
982 | 0 |
1051 | 0 |
983 | }, |
1052 | }, |
984 | ); |
1053 | ); |
985 | } |
1054 | } |
986 | } |
1055 | } |
987 | |
1056 | |
988 | sub feed { |
1057 | sub feed { |
989 | my ($self, $data) = @_; |
1058 | my ($self, $msg) = @_; |
990 | |
1059 | |
991 | Scalar::Util::weaken $self; |
1060 | Scalar::Util::weaken $self; |
992 | |
1061 | |
993 | my ($type, $msg) = split / /, $data, 2; |
1062 | if ($msg->{msgtype} eq "reply") { |
|
|
1063 | $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; |
|
|
1064 | $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; |
994 | |
1065 | |
995 | if ($type eq "msg") { |
1066 | my $text = "\n" . CFPlus::asxml $msg->{msg}; |
996 | my ($msg, @kw) = split /\x00/, $msg; |
|
|
997 | |
|
|
998 | utf8::decode $_ for ($msg, @kw); |
|
|
999 | |
|
|
1000 | $self->{kw}{$_} = 1 for @kw; |
|
|
1001 | |
|
|
1002 | $msg = "\n" . CFClient::UI::Label::escape $msg; |
|
|
1003 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1067 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1004 | my @link; |
1068 | my @link; |
1005 | $msg =~ s{ |
1069 | $text =~ s{ |
1006 | ($match) |
1070 | ($match) |
1007 | }{ |
1071 | }{ |
1008 | my $kw = $1; |
1072 | my $kw = $1; |
1009 | |
1073 | |
1010 | push @link, new CFClient::UI::Label |
1074 | push @link, new CFPlus::UI::Label |
1011 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1075 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1012 | can_hover => 1, |
1076 | can_hover => 1, |
1013 | can_events => 1, |
1077 | can_events => 1, |
1014 | padding_x => 0, |
1078 | padding_x => 0, |
1015 | padding_y => 0, |
1079 | padding_y => 0, |
1016 | on_button_up => sub { |
1080 | on_button_up => sub { |
1017 | $self->send ($kw); |
1081 | $self->send ($kw); |
1018 | }; |
1082 | }; |
1019 | |
1083 | |
1020 | chr 0xfffc |
1084 | "\x{fffc}" |
1021 | }giex; |
1085 | }giex; |
1022 | |
1086 | |
1023 | $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); |
1087 | $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); |
1024 | $self->{textview}->scroll_to_bottom; |
1088 | $self->{textview}->scroll_to_bottom; |
1025 | $self->update_options; |
1089 | $self->update_options; |
1026 | } else { |
1090 | } else { |
1027 | $self->destroy; |
1091 | $self->destroy; |
1028 | } |
1092 | } |
… | |
… | |
1031 | } |
1095 | } |
1032 | |
1096 | |
1033 | sub send { |
1097 | sub send { |
1034 | my ($self, $msg) = @_; |
1098 | my ($self, $msg) = @_; |
1035 | |
1099 | |
1036 | $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); |
1100 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1037 | $self->{textview}->scroll_to_bottom; |
1101 | $self->{textview}->scroll_to_bottom; |
1038 | |
1102 | |
1039 | utf8::encode $msg; |
1103 | $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); |
1040 | $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); |
|
|
1041 | } |
1104 | } |
1042 | |
1105 | |
1043 | sub destroy { |
1106 | sub destroy { |
1044 | my ($self) = @_; |
1107 | my ($self) = @_; |
1045 | |
1108 | |
1046 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1109 | #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 |
1047 | |
1110 | |
|
|
1111 | if ($self->{conn}) { |
1048 | $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; |
1112 | $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; |
1049 | delete $self->{conn}{npc_dialog}; |
1113 | delete $self->{conn}{npc_dialog}; |
1050 | $self->{conn}->disconnect_ext ($self->{token}); |
1114 | $self->{conn}->disconnect_ext ($self->{id}); |
|
|
1115 | } |
1051 | |
1116 | |
1052 | $self->SUPER::destroy; |
1117 | $self->SUPER::destroy; |
1053 | } |
1118 | } |
1054 | |
1119 | |
1055 | 1; |
1120 | 1 |
|
|
1121 | |