ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.59 by root, Sun Jul 16 23:30:08 2006 UTC vs.
Revision 1.73 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines