--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/06/28 21:43:15 1.47 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/03 22:32:52 1.53 @@ -85,16 +85,92 @@ $fh->flush; } +sub _stat_numdiff { + my ($self, $old, $new) = @_; + + my $diff = $new - $old; + $diff > 0 ? "+$diff" : $diff +} + +sub _stat_skillmaskdiff { + my ($self, $old, $new) = @_; + + my $diff = $old ^ $new; + + my @diff = map + { + $diff & $_ + ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) + : () + } + sort { $a <=> $b } keys %{$self->{spell_paths}}; + + join "", @diff +} + +# all stats that are chacked against changes +my @statchange = ( + [&CS_STAT_STR => \&_stat_numdiff, "Str"], + [&CS_STAT_INT => \&_stat_numdiff, "Int"], + [&CS_STAT_WIS => \&_stat_numdiff, "Wis"], + [&CS_STAT_DEX => \&_stat_numdiff, "Dex"], + [&CS_STAT_CON => \&_stat_numdiff, "Con"], + [&CS_STAT_CHA => \&_stat_numdiff, "Cha"], + [&CS_STAT_POW => \&_stat_numdiff, "Pow"], + [&CS_STAT_WC => \&_stat_numdiff, "Wc"], + [&CS_STAT_AC => \&_stat_numdiff, "Ac"], + [&CS_STAT_DAM => \&_stat_numdiff, "Dam"], + [&CS_STAT_SPEED => \&_stat_numdiff, "Speed"], + [&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"], + [&CS_STAT_MAXHP => \&_stat_numdiff, "HP"], + [&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"], + [&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"], + [&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"], + [&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"], + [&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"], + [&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"], + [&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"], + [&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"], + [&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"], + [&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"], + [&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"], + [&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"], + [&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"], + [&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"], + [&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"], + [&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"], + [&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"], + [&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"], + [&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"], + [&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"], + [&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"], + [&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"], + [&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"], + [&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"], +); + sub stats_update { my ($self, $stats) = @_; - if (my $exp = $stats->{+CS_STAT_EXP64}) { - my $diff = $exp - $self->{prev_exp}; - $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) - if exists $self->{prev_exp} && $diff; - $self->{prev_exp} = $exp; + if (my $prev = $self->{prev_stats}) { + if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) { + $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5); + } + + if ( + my @diffs = map { + $stats->{$_->[0]} != $prev->{$_->[0]} + ? $_->[2] . $_->[1]->($self, $prev->{$_->[0]}, $stats->{$_->[0]}) : (); + } + @statchange + ) { + my $msg = "stat change: " . (join " ", @diffs); + $self->{statusbox}->add ($msg, group => $msg, fg => [0.8, 1, 0.2, 1], timeout => 10); + } } + $self->{prev_stats} = { %$stats }; + ::update_stats_window ($stats); } @@ -440,7 +516,7 @@ $spell->{message} =~ s/\n+$//; $spell->{message} ||= "Server did not provide a description for this spell."; - $::SETUP_SPELLS->add_spell ($spell); + $::SPELL_PAGE->add_spell ($spell); $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); @@ -448,7 +524,8 @@ sub spell_delete { my ($self, $spell) = @_; - $::SETUP_SPELLS->remove_spell ($spell); + + $::SPELL_PAGE->remove_spell ($spell); } sub addme_success { @@ -538,7 +615,7 @@ } else { $::FLOORBOX->add (1, $row, new CFClient::UI::Button text => "More...", - on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 }, + on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, ); last; } @@ -571,20 +648,6 @@ $::INVR->set_items ($conn->{container}{$tag}); } -sub update_container { - my ($tag) = @_; - - $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) - if $tag == $::CONN->{open_container}; -} - -sub container_add { - my ($self, $tag, $items) = @_; - - $self->{update_container}{$tag}++; - $self->update_containers; -} - sub update_containers { my ($self) = @_; @@ -592,16 +655,25 @@ for my $tag (keys %{ delete $self->{update_container} }) { if ($tag == 0) { update_floorbox; - update_container (0); + $::INVR->set_items ($self->{container}{0}) + if $tag == $self->{open_container}; } elsif ($tag == $self->{player}{tag}) { $::INV->set_items ($self->{container}{$tag}) } else { - update_container ($tag); + $::INVR->set_items ($self->{container}{$tag}) + if $tag == $self->{open_container}; } } }); } +sub container_add { + my ($self, $tag, $items) = @_; + + $self->{update_container}{$tag}++; + $self->update_containers; +} + sub container_clear { my ($self, $tag) = @_; @@ -612,7 +684,7 @@ sub item_delete { my ($self, @items) = @_; - $self->{update_container}{$_->{tag}}++ + $self->{update_container}{$_->{container}}++ for @items; $self->update_containers; @@ -623,11 +695,6 @@ #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; - if ($item->{tag} == $self->{player}{tag}) { - $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000); - return; - } - CFClient::Item::update_widgets $item; if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { @@ -650,7 +717,6 @@ sub player_update { my ($self, $player) = @_; - $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); }