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

Diff Legend

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