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.61 by root, Wed Jul 19 23:00:07 2006 UTC vs.
Revision 1.69 by root, Sun Jul 30 13:16:44 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 = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub {
21 my ($pom) = @_; 22 my ($pom) = @_;
22 23
23 my @cmd_help; 24 my @cmd_help;
24 25
25 for my $head2 ($pom->head1->[-2]->head2) { 26 for my $head2 ($pom->head1->[-2]->head2) {
… …
31 @args = (".*") unless @args; 32 @args = (".*") unless @args;
32 33
33 $_ = $_ eq ".*" ? "" : " $_" 34 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 35 for @args;
35 36
36 my $text = CFClient::pod_to_pango $head2->content; 37 my $text = CFPlus::Pod::as_markup $head2->content;
37 38
38 push @cmd_help, ["$cmd$_", $text] 39 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 40 for sort { (length $a) <=> (length $b) }
40 @args; 41 @args;
41 } 42 }
… …
44 }; 45 };
45 46
46 $self->{map_widget}->add_command (@$_) 47 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help; 48 for @$cmd_help;
48 49
49 $self->{noface} = new_from_file CFClient::Texture 50 $self->{noface} = new_from_file CFPlus::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
51 52
52 $self->{open_container} = 0; 53 $self->{open_container} = 0;
53 54
54 # "global" 55 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache"; 56 $self->{tilecache} = CFPlus::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap"; 57 $self->{facemap} = CFPlus::db_table "facemap";
57 58
58 # per server 59 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 60 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";
60 61
61 $self 62 $self
62} 63}
63 64
64sub logprint { 65sub logprint {
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 243 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 244 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 245 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 246 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 247
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 248 $self->update_weight;
248 249
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 250 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 251 for keys %RES_TBL;
251 252
252 my $sktbl = $::STATWIDS->{skill_tbl}; 253 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 254 my @skills = keys %{ $self->{skill_info} };
254 255
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
256 $sktbl->clear; 257 $sktbl->clear;
257 258
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 259 $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); 260 $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); 261 $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); 262 $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); 263 $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); 264 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
264 265
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271
265 my ($x, $y) = (1, 0); 272 my ($x, $y) = (0, 1);
266 for ( 273 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 275 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_}, 276 grep exists $stats->{$_},
270 @skills 277 @skills
271 ) { 278 ) {
272 my ($idx, $name) = @$_; 279 my ($idx, $name) = @$_;
273 280
281 my $spell_cb = sub {
282 my ($widget, $ev) = @_;
283
284 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) {
289 (new CFPlus::UI::Menu
290 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
292 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
293 ],
294 )->popup ($ev);
295 } else {
296 return 0;
297 }
298
299 1
300 };
301
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 302 $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]); 303 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 304 $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); 305 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); 306 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
279 307
280 $x++ and ($x, $y) = (0, $y + 1); 308 $x++ and ($x, $y) = (0, $y + 1);
281 } 309 }
282 } 310 }
283 311
… …
497 525
498 unless ($id) { 526 unless ($id) {
499 # create new id for face 527 # create new id for face
500 # I love transactions 528 # I love transactions
501 for (1..100) { 529 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin; 530 my $txn = $CFPlus::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id); 531 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1; 533 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0 534 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) { 535 && $self->{facemap}->put ($hash => $id) == 0) {
… …
511 } 539 }
512 } 540 }
513 $txn->txn_abort; 541 $txn->txn_abort;
514 } 542 }
515 543
516 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 544 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
517 } 545 }
518 546
519gotid: 547gotid:
520 $face->{id} = $id; 548 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id); 549 $self->{map}->set_face ($facenum => $id);
… …
544sub set_texture { 572sub set_texture {
545 my ($self, $id, $data) = @_; 573 my ($self, $id, $data) = @_;
546 574
547 $self->{texture}[$id] ||= do { 575 $self->{texture}[$id] ||= do {
548 my $tex = 576 my $tex =
549 new_from_image CFClient::Texture 577 new_from_image CFPlus::Texture
550 $data, minify => 1, mipmap => 1; 578 $data, minify => 1, mipmap => 1;
551 579
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 $self->{map_widget}->update; 581 $self->{map_widget}->update;
554 582
… …
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
598 626
599 # try to create single paragraphs of multiple lines sent by the server 627 # try to create single paragraphs of multiple lines sent by the server
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 628 $text =~ s/(?<=\S)\n(?=\w)/ /g;
601 629
602 $text = CFClient::UI::Label::escape $text; 630 $text = CFPlus::asxml $text;
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
605 633
606 $self->{logview}->add_paragraph ($color[$color], $_) 634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
607 for map "$time $_", split /\n/, $text; 635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
608 $self->{logview}->scroll_to_bottom; 636 $self->{logview}->scroll_to_bottom;
609 637
610 $self->{statusbox}->add ($text, 638 $self->{statusbox}->add ($text,
611 group => $text, 639 group => $text,
612 fg => $color[$color], 640 fg => $color[$color],
… …
622} 650}
623 651
624sub spell_add { 652sub spell_add {
625 my ($self, $spell) = @_; 653 my ($self, $spell) = @_;
626 654
627 # try to create single paragraphs of multiple lines sent by the server 655 # try to create single paragraphs out of the multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 657 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 658 $spell->{message} ||= "Server did not provide a description for this spell.";
631 659
632 $::SPELL_PAGE->add_spell ($spell); 660 $::SPELL_PAGE->add_spell ($spell);
633 661
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 662 $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}); 663 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
636} 664}
637 665
638sub spell_delete { 666sub spell_delete {
639 my ($self, $spell) = @_; 667 my ($self, $spell) = @_;
640 668
… …
642} 670}
643 671
644sub addme_success { 672sub addme_success {
645 my ($self) = @_; 673 my ($self) = @_;
646 674
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub { 675 my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_; 676 my ($pom) = @_;
649 677
650 my %skill_help; 678 my %skill_help;
651 679
652 for my $head2 ($pom->head1->[3]->head2) { 680 for my $head2 ($pom->head1->[3]->head2) {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content;
654 } 682 }
655 683
656 \%skill_help 684 \%skill_help
657 }; 685 };
658 686
659 for my $skill (values %{$self->{skill_info}}) { 687 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 688 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 689 (CFPlus::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 690 . $skill_help->{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 691 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 693 . $skill_help->{$skill});
666 } 694 }
667} 695}
668 696
669sub eof { 697sub eof {
… …
694 722
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 723 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696 724
697 $self->send ("requestinfo image_sums $face $face"); 725 $self->send ("requestinfo image_sums $face $face");
698 726
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 727 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 728 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) { 729 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info"); 730 $self->send ("requestinfo image_info");
703 731
704 $self->{num_faces} = 0; 732 $self->{num_faces} = 0;
705 733
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 734 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 735 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 } 736 }
709} 737}
710 738
711sub update_floorbox { 739sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 740 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 741 return unless $::CONN;
714 742
715 $::FLOORBOX->clear; 743 $::FLOORBOX->clear;
716 744
717 my $row; 745 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 746 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
719 if ($row < 6) { 747 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 748 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 749 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 750 CFPlus::Item::update_widgets $_;
723 751
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 752 $::FLOORBOX->add (0, $row, $_->{face_widget});
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 753 $::FLOORBOX->add (1, $row, $_->{desc_widget});
726 754
727 $row++; 755 $row++;
728 } else { 756 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 757 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
730 text => "More...", 758 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 759 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 760 );
733 last; 761 last;
734 } 762 }
735 } 763 }
764 if ($::CONN->{open_container}) {
765 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
766 text => "Close container",
767 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
768 );
769 }
736 }); 770 });
737 771
738 $::WANT_REFRESH++; 772 $::WANT_REFRESH++;
739} 773}
740 774
741sub set_opencont { 775sub set_opencont {
742 my ($conn, $tag, $name) = @_; 776 my ($conn, $tag, $name) = @_;
743 $conn->{open_container} = $tag; 777 $conn->{open_container} = $tag;
778 update_floorbox;
744 779
745 $::INV_RIGHT_HB->clear (); 780 $::INV_RIGHT_HB->clear ();
746 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 781 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
747 782
748 if ($tag != 0) { # Floor isn't closable, is it? 783 if ($tag != 0) { # Floor isn't closable, is it?
749 $::INV_RIGHT_HB->add (new CFClient::UI::Button 784 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
750 text => "Close container", 785 text => "Close container",
751 tooltip => "Close the currently open container (if one is open)", 786 tooltip => "Close the currently open container (if one is open)",
752 on_activate => sub { 787 on_activate => sub {
753 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 788 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
754 if $tag != 0; 789 if $tag != 0;
… …
762} 797}
763 798
764sub update_containers { 799sub update_containers {
765 my ($self) = @_; 800 my ($self) = @_;
766 801
767 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 802 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
768 my $todo = delete $self->{update_container} 803 my $todo = delete $self->{update_container}
769 or return; 804 or return;
770 805
771 for my $tag (keys %$todo) { 806 for my $tag (keys %$todo) {
807 update_floorbox if $tag == 0 or $tag == $self->{open_container};
772 if ($tag == 0) { 808 if ($tag == 0) {
773 update_floorbox;
774 $::INVR->set_items ($self->{container}{0}) 809 $::INVR->set_items ($self->{container}{0})
775 if $tag == $self->{open_container}; 810 if $tag == $self->{open_container};
776 } elsif ($tag == $self->{player}{tag}) { 811 } elsif ($tag == $self->{player}{tag}) {
777 $::INV->set_items ($self->{container}{$tag}) 812 $::INV->set_items ($self->{container}{$tag})
778 } else { 813 } else {
… …
809sub item_update { 844sub item_update {
810 my ($self, $item) = @_; 845 my ($self, $item) = @_;
811 846
812 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 847 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
813 848
814 CFClient::Item::update_widgets $item; 849 CFPlus::Item::update_widgets $item;
815 850
816 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 851 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
817 set_opencont ($::CONN, 0, "Floor"); 852 set_opencont ($::CONN, 0, "Floor");
818 853
819 } elsif ($item->{flags} & F_OPEN) { 854 } elsif ($item->{flags} & F_OPEN) {
820 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 855 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
821 856
822 } else { 857 } else {
823 $self->{update_container}{$item->{container}}++; 858 $self->{update_container}{$item->{container}}++;
824 $self->update_containers; 859 $self->update_containers;
825 } 860 }
826} 861}
827 862
828sub player_update { 863sub player_update {
829 my ($self, $player) = @_; 864 my ($self, $player) = @_;
865
866 $self->update_weight;
867}
868
869sub update_weight {
870 my ($self) = @_;
871
872 my $weight = .001 * $self->{player}{weight};
873 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
874
830 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 875 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
876 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
877 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
831} 878}
832 879
833sub update_server_info { 880sub update_server_info {
834 my ($self) = @_; 881 my ($self) = @_;
835 882
… …
868 $self->send_ext_req (lookat => "$x $y", sub { 915 $self->send_ext_req (lookat => "$x $y", sub {
869 my %res = split /\x00/, $_[0]; 916 my %res = split /\x00/, $_[0];
870 917
871 if (exists $res{npc_dialog}) { 918 if (exists $res{npc_dialog}) {
872 # start npc chat dialog 919 # start npc chat dialog
873 $self->{npc_dialog} = new CFClient::NPCDialog:: 920 $self->{npc_dialog} = new CFPlus::NPCDialog::
874 dx => $x, 921 dx => $x,
875 dy => $y, 922 dy => $y,
876 title => "$res{npc_dialog} (NPC)", 923 title => "$res{npc_dialog} (NPC)",
877 conn => $self, 924 conn => $self,
878 ; 925 ;
… …
890 if $self->{npc_dialog}; 937 if $self->{npc_dialog};
891 938
892 $self->SUPER::destroy; 939 $self->SUPER::destroy;
893} 940}
894 941
895package CFClient::NPCDialog; 942package CFPlus::NPCDialog;
896 943
897our @ISA = 'CFClient::UI::FancyFrame'; 944our @ISA = 'CFPlus::UI::FancyFrame';
898 945
899sub new { 946sub new {
900 my $class = shift; 947 my $class = shift;
901 948
902 my $self = $class->SUPER::new ( 949 my $self = $class->SUPER::new (
… …
905 name => "npc_dialog", 952 name => "npc_dialog",
906 force_w => $::WIDTH * 0.7, 953 force_w => $::WIDTH * 0.7,
907 force_h => $::HEIGHT * 0.7, 954 force_h => $::HEIGHT * 0.7,
908 title => "NPC Dialog", 955 title => "NPC Dialog",
909 kw => { hi => 0, yes => 0, no => 0 }, 956 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1,
910 @_, 958 @_,
911 ); 959 );
912 960
913 Scalar::Util::weaken (my $this = $self); 961 Scalar::Util::weaken (my $this = $self);
914 962
963 $self->connect (delete => sub { $this->destroy; 1 });
964
915 # better use a pane... 965 # better use a pane...
916 $self->add (my $hbox = new CFClient::UI::HBox); 966 $self->add (my $hbox = new CFPlus::UI::HBox);
917 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 967 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
918 968
919 $hbox->add (my $vbox = new CFClient::UI::VBox); 969 $hbox->add (my $vbox = new CFPlus::UI::VBox);
920 970
921 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
922 $vbox->add ($self->{entry} = new CFClient::UI::Entry 972 $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" 973 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
924 . "Sometimes you have to tell an NPC something you cannot find out during " 974 . "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 " 975 . "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 " 976 . "this text entry. You can also enter responses manually instead of using the response "
927 . "buttons below.", 977 . "buttons below.",
… …
935 985
936 0 986 0
937 }, 987 },
938 ); 988 );
939 989
940 $vbox->add ($self->{options} = new CFClient::UI::VBox); 990 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
941 991
942 $self->{bye_button} = new CFClient::UI::Button 992 $self->{bye_button} = new CFPlus::UI::Button
943 text => "Bye (close)", 993 text => "Bye (close)",
944 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 994 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
945 on_activate => sub { $this->destroy; 0 }, 995 on_activate => sub { $this->destroy; 1 },
946 ; 996 ;
947 997
948 $self->update_options; 998 $self->update_options;
949 999
950 $self->{token} = $self->{conn}->ext_token; 1000 $self->{token} = $self->{conn}->ext_token;
951 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
952 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
953 1003
954 $self->{entry}->grab_focus; 1004 $self->{entry}->grab_focus;
955 1005
956 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1006 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1],
1008 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1009 });
957 1010
958 $self->show; 1011 $self->show;
959 $self 1012 $self
960}; 1013};
961 1014
… …
966 1019
967 $self->{options}->clear; 1020 $self->{options}->clear;
968 $self->{options}->add ($self->{bye_button}); 1021 $self->{options}->add ($self->{bye_button});
969 1022
970 for my $kw (sort keys %{ $self->{kw} }) { 1023 for my $kw (sort keys %{ $self->{kw} }) {
971 $self->{options}->add (new CFClient::UI::Button 1024 $self->{options}->add (new CFPlus::UI::Button
972 text => $kw, 1025 text => $kw,
973 on_activate => sub { 1026 on_activate => sub {
974 $self->send ($kw); 1027 $self->send ($kw);
975 0 1028 0
976 }, 1029 },
… …
990 1043
991 utf8::decode $_ for ($msg, @kw); 1044 utf8::decode $_ for ($msg, @kw);
992 1045
993 $self->{kw}{$_} = 1 for @kw; 1046 $self->{kw}{$_} = 1 for @kw;
994 1047
995 $msg = "\n" . CFClient::UI::Label::escape $msg; 1048 $msg = "\n" . CFPlus::UI::asxml $msg;
996 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
997 my @link; 1050 my @link;
998 $msg =~ s{ 1051 $msg =~ s{
999 ($match) 1052 ($match)
1000 }{ 1053 }{
1001 my $kw = $1; 1054 my $kw = $1;
1002 1055
1003 push @link, new CFClient::UI::Label 1056 push @link, new CFPlus::UI::Label
1004 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1057 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1005 can_hover => 1, 1058 can_hover => 1,
1006 can_events => 1, 1059 can_events => 1,
1007 padding_x => 0, 1060 padding_x => 0,
1008 padding_y => 0, 1061 padding_y => 0,
… …
1011 }; 1064 };
1012 1065
1013 chr 0xfffc 1066 chr 0xfffc
1014 }giex; 1067 }giex;
1015 1068
1016 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link });
1017 $self->{textview}->scroll_to_bottom; 1070 $self->{textview}->scroll_to_bottom;
1018 $self->update_options; 1071 $self->update_options;
1019 } else { 1072 } else {
1020 $self->destroy; 1073 $self->destroy;
1021 } 1074 }
… …
1024} 1077}
1025 1078
1026sub send { 1079sub send {
1027 my ($self, $msg) = @_; 1080 my ($self, $msg) = @_;
1028 1081
1029 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1030 $self->{textview}->scroll_to_bottom; 1083 $self->{textview}->scroll_to_bottom;
1031 1084
1032 utf8::encode $msg; 1085 utf8::encode $msg;
1033 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1034} 1087}
… …
1043 $self->{conn}->disconnect_ext ($self->{token}); 1096 $self->{conn}->disconnect_ext ($self->{token});
1044 1097
1045 $self->SUPER::destroy; 1098 $self->SUPER::destroy;
1046} 1099}
1047 1100
10481; 11011

Diff Legend

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