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.39 by root, Mon Jun 19 06:50:45 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) = @_;
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);
156
88sub stats_update { 157sub stats_update {
89 my ($self, $stats) = @_; 158 my ($self, $stats) = @_;
90 159
91 if (my $exp = $stats->{+CS_STAT_EXP64}) { 160 if (my $prev = $self->{prev_stats}) {
92 my $diff = $exp - $self->{prev_exp}; 161 if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) {
93 $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);
94 if exists $self->{prev_exp} && $diff; 163 }
95 $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 }
96 } 171 }
172
173 $self->{prev_stats} = { %$stats };
97 174
98 ::update_stats_window ($stats); 175 ::update_stats_window ($stats);
99} 176}
100 177
101sub user_send { 178sub user_send {
… …
105 push @{$self->{record}}, $command; 182 push @{$self->{record}}, $command;
106 } 183 }
107 184
108 $self->logprint ("send: ", $command); 185 $self->logprint ("send: ", $command);
109 $self->send_command ($command); 186 $self->send_command ($command);
110 ::status $command; 187 ::status ($command);
111} 188}
112 189
113sub start_record { 190sub start_record {
114 my ($self) = @_; 191 my ($self) = @_;
115 192
… …
345} 422}
346 423
347sub face_update { 424sub face_update {
348 my ($self, $facenum, $face) = @_; 425 my ($self, $facenum, $face) = @_;
349 426
350 $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};
351 429
352 $self->set_texture ($face->{id} => delete $face->{image}); 430 $self->set_texture ($face->{id} => delete $face->{image});
353} 431}
354 432
355sub set_texture { 433sub set_texture {
… …
412 490
413 $text = CFClient::UI::Label::escape $text; 491 $text = CFClient::UI::Label::escape $text;
414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 492 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 493 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
416 494
417 $self->{logview}->add_paragraph ($color[$color], 495 $self->{logview}->add_paragraph ($color[$color], $_)
418 join "\n", map "$time $_", split /\n/, $text); 496 for map "$time $_", split /\n/, $text;
497 $self->{logview}->scroll_to_bottom;
419 498
420 $self->{statusbox}->add ($text, 499 $self->{statusbox}->add ($text,
421 group => $text, 500 group => $text,
422 fg => $color[$color], 501 fg => $color[$color],
423 timeout => $color >= 2 ? 60 : 10, 502 timeout => $color >= 2 ? 60 : 10,
… …
437 # 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
438 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 517 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
439 $spell->{message} =~ s/\n+$//; 518 $spell->{message} =~ s/\n+$//;
440 $spell->{message} ||= "Server did not provide a description for this spell."; 519 $spell->{message} ||= "Server did not provide a description for this spell.";
441 520
442 $::SETUP_SPELLS->add_spell ($spell); 521 $::SPELL_PAGE->add_spell ($spell);
443 522
444 $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});
445 $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});
446} 525}
447 526
448sub spell_delete { 527sub spell_delete {
449 my ($self, $spell) = @_; 528 my ($self, $spell) = @_;
529
450 $::SETUP_SPELLS->remove_spell ($spell); 530 $::SPELL_PAGE->remove_spell ($spell);
451} 531}
452 532
453sub addme_success { 533sub addme_success {
454 my ($self) = @_; 534 my ($self) = @_;
455 535
… …
522 return unless $::CONN; 602 return unless $::CONN;
523 603
524 $::FLOORBOX->clear; 604 $::FLOORBOX->clear;
525 605
526 my $row; 606 my $row;
527 for (@{ $::CONN->{container}{0} }) { 607 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
528 if ($row < 6) { 608 if ($row < 6) {
529 local $_->{face_widget}; # hack to force recreation of widget 609 local $_->{face_widget}; # hack to force recreation of widget
530 local $_->{desc_widget}; # hack to force recreation of widget 610 local $_->{desc_widget}; # hack to force recreation of widget
531 CFClient::Item::update_widgets $_; 611 CFClient::Item::update_widgets $_;
532 612
… …
535 615
536 $row++; 616 $row++;
537 } else { 617 } else {
538 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 618 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
539 text => "More...", 619 text => "More...",
540 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 }, 620 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
541 ); 621 );
542 last; 622 last;
543 } 623 }
544 } 624 }
545 }); 625 });
… …
568 } 648 }
569 649
570 $::INVR->set_items ($conn->{container}{$tag}); 650 $::INVR->set_items ($conn->{container}{$tag});
571} 651}
572 652
573sub update_container { 653sub update_containers {
574 my ($tag) = @_; 654 my ($self) = @_;
575 655
576 $::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})
577 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 });
578} 673}
579 674
580sub container_add { 675sub container_add {
581 my ($self, $tag, $items) = @_; 676 my ($self, $tag, $items) = @_;
582 677
583 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 678 $self->{update_container}{$tag}++;
584 679 $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} 680}
597 681
598sub container_clear { 682sub container_clear {
599 my ($self, $tag) = @_; 683 my ($self, $tag) = @_;
600 684
601 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 685 $self->{update_container}{$tag}++;
602 686 $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} 687}
614 688
615sub item_delete { 689sub item_delete {
616 my ($self, @items) = @_; 690 my ($self, @items) = @_;
617 691
692 $self->{update_container}{$_->{container}}++
618 for (@items) { 693 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 } 694
695 $self->update_containers;
630} 696}
631 697
632sub item_update { 698sub item_update {
633 my ($self, $item) = @_; 699 my ($self, $item) = @_;
634 700
635 #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";
636 702
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; 703 CFClient::Item::update_widgets $item;
643 704
644 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 705 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
645 set_opencont ($::CONN, 0, "Floor"); 706 set_opencont ($::CONN, 0, "Floor");
646 707
647 } elsif ($item->{flags} & F_OPEN) { 708 } elsif ($item->{flags} & F_OPEN) {
648 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 709 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
710
649 } else { 711 } else {
650 if ($item->{container} == 0) { 712 $self->{update_container}{$item->{container}}++;
651 update_floorbox;
652 update_container (0); 713 $self->update_containers;
653 } elsif ($item->{container} == $self->{player}{tag}) {
654 $::INV->set_items ($self->{container}{$item->{container}})
655 }
656 } 714 }
657} 715}
658 716
659sub player_update { 717sub player_update {
660 my ($self, $player) = @_; 718 my ($self, $player) = @_;
661
662 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 719 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
663} 720}
664 721
665sub update_server_info { 722sub update_server_info {
666 my ($self) = @_; 723 my ($self) = @_;
… …
811} 868}
812 869
813sub feed { 870sub feed {
814 my ($self, $data) = @_; 871 my ($self, $data) = @_;
815 872
873 Scalar::Util::weaken $self;
874
816 my ($type, $msg) = split / /, $data, 2; 875 my ($type, $msg) = split / /, $data, 2;
817 876
818 if ($type eq "msg") { 877 if ($type eq "msg") {
819 my ($msg, @kw) = split /\x00/, $msg; 878 my ($msg, @kw) = split /\x00/, $msg;
820 $self->{kw}{$_} = 1 for @kw; 879 $self->{kw}{$_} = 1 for @kw;
821 880
822 $msg = CFClient::UI::Label::escape $msg; 881 $msg = "\n" . CFClient::UI::Label::escape $msg;
823 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} };
824 $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;
825 901
826 $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;
827 $self->update_options; 904 $self->update_options;
828 } else { 905 } else {
829 $self->destroy; 906 $self->destroy;
830 } 907 }
831 908
… …
835sub send { 912sub send {
836 my ($self, $msg) = @_; 913 my ($self, $msg) = @_;
837 914
838 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 915 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
839 $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;
840} 918}
841 919
842sub destroy { 920sub destroy {
843 my ($self) = @_; 921 my ($self) = @_;
844 922
845 #Carp::cluck "debug\n";#d# #todo# enable: destroy 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
846 924
925 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
847 delete $self->{conn}{npc_dialog}; 926 delete $self->{conn}{npc_dialog};
848 $self->{conn}->disconnect_ext ($self->{token}); 927 $self->{conn}->disconnect_ext ($self->{token});
849 928
850 $self->SUPER::destroy; 929 $self->SUPER::destroy;
851} 930}

Diff Legend

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