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.50 by elmex, Sun Jul 2 16:25:19 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 {
… …
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 {
… …
438 # 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
439 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 517 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440 $spell->{message} =~ s/\n+$//; 518 $spell->{message} =~ s/\n+$//;
441 $spell->{message} ||= "Server did not provide a description for this spell."; 519 $spell->{message} ||= "Server did not provide a description for this spell.";
442 520
443 $::SETUP_SPELLS->add_spell ($spell); 521 $::SPELL_PAGE->add_spell ($spell);
444 522
445 $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});
446 $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});
447} 525}
448 526
449sub spell_delete { 527sub spell_delete {
450 my ($self, $spell) = @_; 528 my ($self, $spell) = @_;
529
451 $::SETUP_SPELLS->remove_spell ($spell); 530 $::SPELL_PAGE->remove_spell ($spell);
452} 531}
453 532
454sub addme_success { 533sub addme_success {
455 my ($self) = @_; 534 my ($self) = @_;
456 535
… …
536 615
537 $row++; 616 $row++;
538 } else { 617 } else {
539 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 618 $::FLOORBOX->add (1, $row, new CFClient::UI::Button
540 text => "More...", 619 text => "More...",
541 on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 }, 620 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542 ); 621 );
543 last; 622 last;
544 } 623 }
545 } 624 }
546 }); 625 });
… …
573 652
574sub update_containers { 653sub update_containers {
575 my ($self) = @_; 654 my ($self) = @_;
576 655
577 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 656 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
578 for my $tag (keys %{ delete $self->{update_container} }) { 657 my $todo = delete $self->{update_container}
658 or return;
659
660 for my $tag (keys %$todo) {
579 if ($tag == 0) { 661 if ($tag == 0) {
580 update_floorbox; 662 update_floorbox;
581 $::INVR->set_items ($self->{container}{0}) 663 $::INVR->set_items ($self->{container}{0})
582 if $tag == $self->{open_container}; 664 if $tag == $self->{open_container};
583 } elsif ($tag == $self->{player}{tag}) { 665 } elsif ($tag == $self->{player}{tag}) {
… …
627 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 709 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
628 710
629 } else { 711 } else {
630 $self->{update_container}{$item->{container}}++; 712 $self->{update_container}{$item->{container}}++;
631 $self->update_containers; 713 $self->update_containers;
632# if ($item->{container} == 0) {
633# update_floorbox;
634# update_container (0);
635# } elsif ($item->{container} == $self->{player}{tag}) {
636# $::INV->set_items ($self->{container}{$item->{container}})
637# }
638 } 714 }
639} 715}
640 716
641sub player_update { 717sub player_update {
642 my ($self, $player) = @_; 718 my ($self, $player) = @_;
… …
844sub destroy { 920sub destroy {
845 my ($self) = @_; 921 my ($self) = @_;
846 922
847 #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
848 924
925 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
849 delete $self->{conn}{npc_dialog}; 926 delete $self->{conn}{npc_dialog};
850 $self->{conn}->disconnect_ext ($self->{token}); 927 $self->{conn}->disconnect_ext ($self->{token});
851 928
852 $self->SUPER::destroy; 929 $self->SUPER::destroy;
853} 930}

Diff Legend

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