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.37 by root, Thu Jun 15 15:47:36 2006 UTC vs.
Revision 1.57 by root, Tue Jul 11 15:30:23 2006 UTC

… …
83 83
84 print $fh "$ts ", @a, "\n"; 84 print $fh "$ts ", @a, "\n";
85 $fh->flush; 85 $fh->flush;
86} 86}
87 87
88sub _stat_numdiff {
89 my ($self, $name, $old, $new) = @_;
88 90
91 my $diff = $new - $old;
92
93 $diff = 0.01 * int $diff * 100;
94
95 0.1 >= abs $diff ? ()
96 : $diff < 0 ? "$name$diff" : "$name+$diff"
97}
98
99sub _stat_skillmaskdiff {
100 my ($self, $name, $old, $new) = @_;
101
102 my $diff = $old ^ $new
103 or return;
104
105 my @diff = map
106 {
107 $diff & $_
108 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
109 : ()
110 }
111 sort { $a <=> $b } keys %{$self->{spell_paths}};
112
113 join "", @diff
114}
115
116# all stats that are chacked against changes
117my @statchange = (
118 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
119 [&CS_STAT_INT => \&_stat_numdiff, "Int"],
120 [&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
121 [&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
122 [&CS_STAT_CON => \&_stat_numdiff, "Con"],
123 [&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
124 [&CS_STAT_POW => \&_stat_numdiff, "Pow"],
125 [&CS_STAT_WC => \&_stat_numdiff, "Wc"],
126 [&CS_STAT_AC => \&_stat_numdiff, "Ac"],
127 [&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
128 [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
129 [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
130 [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
131 [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
132 [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
133 [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
134 [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
135 [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
136 [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
137 [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
138 [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
139 [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
140 [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
141 [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
142 [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
143 [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
144 [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
145 [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
146 [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
147 [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
148 [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
149 [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
150 [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
151 [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
152 [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
153 [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
154 [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
155);
89 156
90sub stats_update { 157sub stats_update {
91 my ($self, $stats) = @_; 158 my ($self, $stats) = @_;
92 159
93 if (my $exp = $stats->{+CS_STAT_EXP64}) { 160 if (my $prev = $self->{prev_stats}) {
94 my $diff = $exp - $self->{prev_exp}; 161 if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) {
95 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 162 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
96 if exists $self->{prev_exp} && $diff; 163 }
97 $self->{prev_exp} = $exp; 164
165 if (
166 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
167 ) {
168 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
169 $self->{statusbox}->add ($msg, group => $msg, fg => [0.8, 1, 0.2, 1], timeout => 10);
170 }
98 } 171 }
172
173 $self->{prev_stats} = { %$stats };
99 174
100 ::update_stats_window ($stats); 175 ::update_stats_window ($stats);
101} 176}
102 177
103sub user_send { 178sub user_send {
… …
107 push @{$self->{record}}, $command; 182 push @{$self->{record}}, $command;
108 } 183 }
109 184
110 $self->logprint ("send: ", $command); 185 $self->logprint ("send: ", $command);
111 $self->send_command ($command); 186 $self->send_command ($command);
112 ::status $command; 187 ::status ($command);
113} 188}
114 189
115sub start_record { 190sub start_record {
116 my ($self) = @_; 191 my ($self) = @_;
117 192
… …
347} 422}
348 423
349sub face_update { 424sub face_update {
350 my ($self, $facenum, $face) = @_; 425 my ($self, $facenum, $face) = @_;
351 426
352 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 427 $self->{tilecache}->put ($face->{id} => $face->{image})
428 if $self->{tilecache}->get ($face->{id}) ne $face->{image};
353 429
354 $self->set_texture ($face->{id} => delete $face->{image}); 430 $self->set_texture ($face->{id} => delete $face->{image});
355} 431}
356 432
357sub set_texture { 433sub set_texture {
… …
414 490
415 $text = CFClient::UI::Label::escape $text; 491 $text = CFClient::UI::Label::escape $text;
416 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 492 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
417 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 493 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
418 494
419 $self->{logview}->add_paragraph ($color[$color], 495 $self->{logview}->add_paragraph ($color[$color], $_)
420 join "\n", map "$time $_", split /\n/, $text); 496 for map "$time $_", split /\n/, $text;
497 $self->{logview}->scroll_to_bottom;
421 498
422 $self->{statusbox}->add ($text, 499 $self->{statusbox}->add ($text,
423 group => $text, 500 group => $text,
424 fg => $color[$color], 501 fg => $color[$color],
425 timeout => $color >= 2 ? 60 : 10, 502 timeout => $color >= 2 ? 60 : 10,
… …
439 # try to create single paragraphs of multiple lines sent by the server 516 # try to create single paragraphs of multiple lines sent by the server
440 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 517 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
441 $spell->{message} =~ s/\n+$//; 518 $spell->{message} =~ s/\n+$//;
442 $spell->{message} ||= "Server did not provide a description for this spell."; 519 $spell->{message} ||= "Server did not provide a description for this spell.";
443 520
444 $::SETUP_SPELLS->add_spell ($spell); 521 $::SPELL_PAGE->add_spell ($spell);
445 522
446 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 523 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
447 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 524 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
448} 525}
449 526
450sub spell_delete { 527sub spell_delete {
451 my ($self, $spell) = @_; 528 my ($self, $spell) = @_;
529
452 $::SETUP_SPELLS->remove_spell ($spell); 530 $::SPELL_PAGE->remove_spell ($spell);
453} 531}
454 532
455sub addme_success { 533sub addme_success {
456 my ($self) = @_; 534 my ($self) = @_;
457 535
… …
524 return unless $::CONN; 602 return unless $::CONN;
525 603
526 $::FLOORBOX->clear; 604 $::FLOORBOX->clear;
527 605
528 my $row; 606 my $row;
529 for (@{ $::CONN->{container}{0} }) { 607 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
530 if ($row < 6) { 608 if ($row < 6) {
531 local $_->{face_widget}; # hack to force recreation of widget 609 local $_->{face_widget}; # hack to force recreation of widget
532 local $_->{desc_widget}; # hack to force recreation of widget 610 local $_->{desc_widget}; # hack to force recreation of widget
533 CFClient::Item::update_widgets $_; 611 CFClient::Item::update_widgets $_;
534 612
… …
537 615
538 $row++; 616 $row++;
539 } else { 617 } else {
540 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 618 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
541 text => "More...", 619 text => "More...",
542 on_activate => sub { $::INV_WINDOW->toggle_visibility }, 620 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
543 ); 621 );
544 last; 622 last;
545 } 623 }
546 } 624 }
547 }); 625 });
… …
562 tooltip => "Close the currently open container (if one is open)", 640 tooltip => "Close the currently open container (if one is open)",
563 on_activate => sub { 641 on_activate => sub {
564 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 642 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
565 if $tag != 0; 643 if $tag != 0;
566 #if $CONN->{open_container} != 0; 644 #if $CONN->{open_container} != 0;
645 0
567 }, 646 },
568 ); 647 );
569 } 648 }
570 649
571 $::INVR->set_items ($conn->{container}{$tag}); 650 $::INVR->set_items ($conn->{container}{$tag});
572} 651}
573 652
574sub update_container { 653sub update_containers {
575 my ($tag) = @_; 654 my ($self) = @_;
576 655
577 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 656 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
657 my $todo = delete $self->{update_container}
658 or return;
659
660 for my $tag (keys %$todo) {
661 if ($tag == 0) {
662 update_floorbox;
663 $::INVR->set_items ($self->{container}{0})
578 if $tag == $::CONN->{open_container}; 664 if $tag == $self->{open_container};
665 } elsif ($tag == $self->{player}{tag}) {
666 $::INV->set_items ($self->{container}{$tag})
667 } else {
668 $::INVR->set_items ($self->{container}{$tag})
669 if $tag == $self->{open_container};
670 }
671 }
672 });
579} 673}
580 674
581sub container_add { 675sub container_add {
582 my ($self, $tag, $items) = @_; 676 my ($self, $tag, $items) = @_;
583 677
584 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 678 $self->{update_container}{$tag}++;
585 679 $self->update_containers;
586 if ($tag == 0) {
587 update_floorbox;
588 update_container (0);
589 } elsif ($tag == $self->{player}{tag}) {
590 $::INV->set_items ($self->{container}{$self->{player}{tag}})
591 } else {
592 update_container ($tag);
593 }
594
595 # $self-<{player}{tag} => player inv
596 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
597} 680}
598 681
599sub container_clear { 682sub container_clear {
600 my ($self, $tag) = @_; 683 my ($self, $tag) = @_;
601 684
602 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 685 $self->{update_container}{$tag}++;
603 686 $self->update_containers;
604 if ($tag == 0) {
605 update_floorbox;
606 update_container (0);
607 } elsif ($tag == $self->{player}{tag}) {
608 $::INV->set_items ($self->{container}{$tag})
609 } else {
610 update_container ($tag);
611 }
612
613# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
614} 687}
615 688
616sub item_delete { 689sub item_delete {
617 my ($self, @items) = @_; 690 my ($self, @items) = @_;
618 691
692 $self->{update_container}{$_->{container}}++
619 for (@items) { 693 for @items;
620 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
621
622 if ($_->{container} == 0) {
623 update_floorbox;
624 update_container ($_->{tag});
625 } elsif ($_->{container} == $self->{player}{tag}) {
626 $::INV->set_items ($self->{container}{$self->{player}{tag}})
627 } else {
628 update_container ($_->{container});
629 }
630 } 694
695 $self->update_containers;
631} 696}
632 697
633sub item_update { 698sub item_update {
634 my ($self, $item) = @_; 699 my ($self, $item) = @_;
635 700
636 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 701 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
637 702
638 if ($item->{tag} == $self->{player}{tag}) {
639 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
640 return;
641 }
642
643 CFClient::Item::update_widgets $item; 703 CFClient::Item::update_widgets $item;
644 704
645 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 705 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646 set_opencont ($::CONN, 0, "Floor"); 706 set_opencont ($::CONN, 0, "Floor");
647 707
648 } elsif ($item->{flags} & F_OPEN) { 708 } elsif ($item->{flags} & F_OPEN) {
649 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 709 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
710
650 } else { 711 } else {
651 if ($item->{container} == 0) { 712 $self->{update_container}{$item->{container}}++;
652 update_floorbox;
653 update_container (0); 713 $self->update_containers;
654 } elsif ($item->{container} == $self->{player}{tag}) {
655 $::INV->set_items ($self->{container}{$item->{container}})
656 }
657 } 714 }
658} 715}
659 716
660sub player_update { 717sub player_update {
661 my ($self, $player) = @_; 718 my ($self, $player) = @_;
662
663 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 719 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
664} 720}
665 721
666sub update_server_info { 722sub update_server_info {
667 my ($self) = @_; 723 my ($self) = @_;
… …
763 819
764 return unless $text =~ /\S/; 820 return unless $text =~ /\S/;
765 821
766 $entry->set_text (""); 822 $entry->set_text ("");
767 $this->send ($text); 823 $this->send ($text);
824
825 0
768 }, 826 },
769 ); 827 );
770 828
771 $vbox->add ($self->{options} = new CFClient::UI::VBox); 829 $vbox->add ($self->{options} = new CFClient::UI::VBox);
772 830
773 $self->{close_button} = new CFClient::UI::Button 831 $self->{bye_button} = new CFClient::UI::Button
774 text => "Bye (close)", 832 text => "Bye (close)",
775 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 833 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
776 on_activate => sub { $this->destroy }, 834 on_activate => sub { $this->destroy; 0 },
777 ; 835 ;
778 836
779 $self->update_options; 837 $self->update_options;
780 838
781 $self->{token} = $self->{conn}->ext_token; 839 $self->{token} = $self->{conn}->ext_token;
782 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 840 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
783 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 841 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
784 842
785 $self->{entry}->focus_in; 843 $self->{entry}->grab_focus;
786 844
787 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 845 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
788 846
789 $self->show; 847 $self->show;
790 $self 848 $self
… …
794 my ($self) = @_; 852 my ($self) = @_;
795 853
796 Scalar::Util::weaken $self; 854 Scalar::Util::weaken $self;
797 855
798 $self->{options}->clear; 856 $self->{options}->clear;
799 $self->{options}->add ($self->{close_button}); 857 $self->{options}->add ($self->{bye_button});
800 858
801 for my $kw (sort keys %{ $self->{kw} }) { 859 for my $kw (sort keys %{ $self->{kw} }) {
802 $self->{options}->add (new CFClient::UI::Button 860 $self->{options}->add (new CFClient::UI::Button
803 text => $kw, 861 text => $kw,
804 on_activate => sub { 862 on_activate => sub {
805 $self->send ($kw); 863 $self->send ($kw);
864 0
806 }, 865 },
807 ); 866 );
808 } 867 }
809} 868}
810 869
811sub feed { 870sub feed {
812 my ($self, $data) = @_; 871 my ($self, $data) = @_;
872
873 Scalar::Util::weaken $self;
813 874
814 my ($type, $msg) = split / /, $data, 2; 875 my ($type, $msg) = split / /, $data, 2;
815 876
816 if ($type eq "msg") { 877 if ($type eq "msg") {
817 my ($msg, @kw) = split /\x00/, $msg; 878 my ($msg, @kw) = split /\x00/, $msg;
818 $self->{kw}{$_} = 1 for @kw; 879 $self->{kw}{$_} = 1 for @kw;
819 880
820 $msg = CFClient::UI::Label::escape $msg; 881 $msg = "\n" . CFClient::UI::Label::escape $msg;
821 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 882 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
822 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 883 my @link;
884 $msg =~ s{
885 ($match)
886 }{
887 my $kw = $1;
888
889 push @link, new CFClient::UI::Label
890 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
891 can_hover => 1,
892 can_events => 1,
893 padding_x => 0,
894 padding_y => 0,
895 on_button_up => sub {
896 $self->send ($kw);
897 };
898
899 chr 0xfffc
900 }giex;
823 901
824 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 902 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
903 $self->{textview}->scroll_to_bottom;
825 $self->update_options; 904 $self->update_options;
826 } else { 905 } else {
827 $self->destroy; 906 $self->destroy;
828 } 907 }
829 908
… …
833sub send { 912sub send {
834 my ($self, $msg) = @_; 913 my ($self, $msg) = @_;
835 914
836 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 915 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
837 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 916 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
917 $self->{textview}->scroll_to_bottom;
838} 918}
839 919
840sub destroy { 920sub destroy {
841 my ($self) = @_; 921 my ($self) = @_;
842 922
843 #Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1 923 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
844 924
925 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
845 delete $self->{conn}{npc_dialog}; 926 delete $self->{conn}{npc_dialog};
846 $self->{conn}->disconnect_ext ($self->{token}); 927 $self->{conn}->disconnect_ext ($self->{token});
847 928
848 $self->SUPER::destroy; 929 $self->SUPER::destroy;
849} 930}

Diff Legend

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