--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/07/03 22:04:25	1.52
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/07/22 12:18:02	1.62
@@ -10,8 +10,6 @@
 
 use base 'Crossfire::Protocol::Base';
 
-our %open_logs;
-
 sub new {
    my $class = shift;
 
@@ -65,46 +63,50 @@
 
 sub logprint {
    my ($self, @a) = @_;
-   my $filename = "$Crossfire::VARDIR/log.$self->{host}";
 
-   my $fh = $open_logs{$filename};
-   unless ($fh) {
-      # FIXME: handle this more gracefully?
-      open $fh, ">>", $filename
-         or die "Couldn't open logfile: log.$self->{host}: $!";
+   $self->{log_fh} ||= do {
+      my $path = "$Crossfire::VARDIR/log.$self->{host}";
 
-      $open_logs{$filename} = $fh;
-   }
+      open my $fh, ">>:utf8", $path
+         or die "Couldn't open logfile $path: $!";
+
+      $fh->autoflush (1);
 
-   my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time);
+      $fh;
+   };
+
+   my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
 
    my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
                $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
 
-   print $fh "$ts ", @a, "\n";
-   $fh->flush;
+   print {$self->{log_fh}} "$ts ", @a, "\n";
 }
 
 sub _stat_numdiff {
-   my ($old, $new) = @_;
+   my ($self, $name, $old, $new) = @_;
 
    my $diff = $new - $old;
-   $diff > 0 ? "+$diff" : $diff
+
+   $diff = 0.01 * int $diff * 100;
+
+   0.1 >= abs $diff ? ()
+      : $diff < 0 ? "$name$diff" : "$name+$diff"
 }
 
 sub _stat_skillmaskdiff {
-   my ($old, $new) = @_;
-
-   my @diff;
+   my ($self, $name, $old, $new) = @_;
 
-   my $changed = $old ^ $new;
+   my $diff = $old ^ $new
+      or return;
 
-   my @diff = map {
-                 $changed & (1<<$_)
-                    ?  (($new & (1<<$_) ? "+" : "-") . "skill$_")
-                    : ()
-              }
-              0 .. 31; # TODO
+   my @diff = map
+                 {
+                    $diff & $_
+                       ?  (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
+                       : ()
+                 }
+              sort { $a <=> $b } keys %{$self->{spell_paths}};
 
    join "", @diff
 }
@@ -153,26 +155,136 @@
 sub stats_update {
    my ($self, $stats) = @_;
 
-   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);
-      }
+   my $prev = $self->{prev_stats} || { };
 
-      if (
-         my @diffs = map {
-                        $stats->{$_->[0]} != $prev->{$_->[0]}
-                           ? $_->[2] . $_->[1]->($prev->{$_->[0]}, $stats->{$_->[0]}) : ();
-                     }
-                     @statchange
-      ) {
-         my $msg = "<b>stat change</b>: " . (join " ", @diffs);
-         $self->{statusbox}->add ($msg, group => $msg, fg => [0.8, 1, 0.2, 1], timeout => 10);
-      }
+   if (my @diffs =
+          (
+             ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
+             map {
+                $stats->{$_} && $prev->{$_} 
+                   && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
+             } sort { $a <=> $b } keys %{$self->{skill_info}}
+          )
+   ) {
+      my $msg = join " ", @diffs;
+      $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
+   }
+
+   if (
+      my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
+   ) {
+      my $msg = "<b>stat change</b>: " . (join " ", @diffs);
+      $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
    }
 
+   $self->update_stats_window ($stats, $prev);
+
    $self->{prev_stats} = { %$stats };
+}
+
+my %RES_TBL = (
+   phys  => CS_STAT_RES_PHYS,
+   magic => CS_STAT_RES_MAG,
+   fire  => CS_STAT_RES_FIRE,
+   elec  => CS_STAT_RES_ELEC,
+   cold  => CS_STAT_RES_COLD,
+   conf  => CS_STAT_RES_CONF,
+   acid  => CS_STAT_RES_ACID,
+   drain => CS_STAT_RES_DRAIN,
+   ghit  => CS_STAT_RES_GHOSTHIT,
+   pois  => CS_STAT_RES_POISON,
+   slow  => CS_STAT_RES_SLOW,
+   para  => CS_STAT_RES_PARA,
+   tund  => CS_STAT_TURN_UNDEAD,
+   fear  => CS_STAT_RES_FEAR,
+   depl  => CS_STAT_RES_DEPLETE,
+   deat  => CS_STAT_RES_DEATH,
+   holyw => CS_STAT_RES_HOLYWORD,
+   blind => CS_STAT_RES_BLIND,
+);
+
+sub update_stats_window {
+   my ($self, $stats, $prev) = @_;
 
-   ::update_stats_window ($stats);
+   # I love text protocols...
+
+   my $hp   = $stats->{+CS_STAT_HP} * 1;
+   my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
+   my $sp   = $stats->{+CS_STAT_SP} * 1;
+   my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
+   my $fo   = $stats->{+CS_STAT_FOOD} * 1;
+   my $fo_m = 999;
+   my $gr   = $stats->{+CS_STAT_GRACE} * 1;
+   my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
+
+   $::GAUGES->{hp}      ->set_value ($hp, $hp_m);
+   $::GAUGES->{mana}    ->set_value ($sp, $sp_m);
+   $::GAUGES->{food}    ->set_value ($fo, $fo_m);
+   $::GAUGES->{grace}   ->set_value ($gr, $gr_m);
+   $::GAUGES->{exp}     ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
+                                    . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
+   my $rng = $stats->{+CS_STAT_RANGE};
+   $rng =~ s/^Range: //;    # thank you so much dear server
+   $::GAUGES->{range}   ->set_text ("Rng: " . $rng);
+   my $title = $stats->{+CS_STAT_TITLE};
+   $title =~ s/^Player: //;
+   $::STATWIDS->{title} ->set_text ("Title: " . $title);
+
+   $::STATWIDS->{st_str} ->set_text (sprintf "%d"  , $stats->{+CS_STAT_STR});
+   $::STATWIDS->{st_dex} ->set_text (sprintf "%d"  , $stats->{+CS_STAT_DEX});
+   $::STATWIDS->{st_con} ->set_text (sprintf "%d"  , $stats->{+CS_STAT_CON});
+   $::STATWIDS->{st_int} ->set_text (sprintf "%d"  , $stats->{+CS_STAT_INT});
+   $::STATWIDS->{st_wis} ->set_text (sprintf "%d"  , $stats->{+CS_STAT_WIS});
+   $::STATWIDS->{st_pow} ->set_text (sprintf "%d"  , $stats->{+CS_STAT_POW});
+   $::STATWIDS->{st_cha} ->set_text (sprintf "%d"  , $stats->{+CS_STAT_CHA});
+   $::STATWIDS->{st_wc}  ->set_text (sprintf "%d"  , $stats->{+CS_STAT_WC});
+   $::STATWIDS->{st_ac}  ->set_text (sprintf "%d"  , $stats->{+CS_STAT_AC});
+   $::STATWIDS->{st_dam} ->set_text (sprintf "%d"  , $stats->{+CS_STAT_DAM});
+   $::STATWIDS->{st_arm} ->set_text (sprintf "%d"  , $stats->{+CS_STAT_RES_PHYS});
+   $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
+   $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
+ 
+   $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
+
+   $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
+      for keys %RES_TBL;
+
+   my $sktbl = $::STATWIDS->{skill_tbl};
+   my @skills = keys %{ $self->{skill_info} };
+
+   if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
+      $sktbl->clear;
+
+      $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1);
+      $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
+      $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1);
+      $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1);
+      $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
+      $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1);
+
+      my ($x, $y) = (1, 0);
+      for (
+         sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
+         map [$_, $self->{skill_info}{$_}],
+         grep exists $stats->{$_},
+           @skills
+      ) {
+         my ($idx, $name) = @$_;
+
+         $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label
+            text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]);
+         $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label
+            text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4);
+         $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name);
+
+         $x++ and ($x, $y) = (0, $y + 1);
+      }
+   }
+
+   for (grep exists $stats->{$_}, @skills) {
+      $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
+      $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
+   }
 }
 
 sub user_send {
@@ -422,9 +534,9 @@
 }
 
 sub face_update {
-   my ($self, $facenum, $face) = @_;
+   my ($self, $facenum, $face, $changed) = @_;
 
-   $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
+   $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
 
    $self->set_texture ($face->{id} => delete $face->{image});
 }
@@ -475,7 +587,7 @@
       [0.18, 0.54, 0.34],
       [0.56, 0.73, 0.56],
       [0.80, 0.80, 0.80],
-      [0.55, 0.41, 0.13],
+      [0.75, 0.61, 0.20],
       [0.99, 0.77, 0.26],
       [0.74, 0.65, 0.41],
    );
@@ -599,11 +711,11 @@
 sub update_floorbox {
    $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
       return unless $::CONN;
-         
+
       $::FLOORBOX->clear;
 
       my $row;
-      for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
+      for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
          if ($row < 6) {
             local $_->{face_widget}; # hack to force recreation of widget
             local $_->{desc_widget}; # hack to force recreation of widget
@@ -621,14 +733,21 @@
             last;
          }
       }
+      if ($::CONN->{open_container}) {
+         $::FLOORBOX->add (1, $row++, new CFClient::UI::Button
+            text        => "Close container",
+            on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
+         );
+      }
    });
-   
+
    $::WANT_REFRESH++;
 }
 
 sub set_opencont {
    my ($conn, $tag, $name) = @_;
    $conn->{open_container} = $tag;
+   update_floorbox;
 
    $::INV_RIGHT_HB->clear ();
    $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
@@ -653,9 +772,12 @@
    my ($self) = @_;
 
    $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
-      for my $tag (keys %{ delete $self->{update_container} }) {
+      my $todo = delete $self->{update_container}
+         or return;
+
+      for my $tag (keys %$todo) {
+         update_floorbox if $tag == 0 or $tag == $self->{open_container};
          if ($tag == 0) {
-            update_floorbox;
             $::INVR->set_items ($self->{container}{0})
                if $tag == $self->{open_container};
          } elsif ($tag == $self->{player}{tag}) {
@@ -707,12 +829,6 @@
    } else {
       $self->{update_container}{$item->{container}}++;
       $self->update_containers;
-#      if ($item->{container} == 0) {
-#         update_floorbox;
-#         update_container (0);
-#      } elsif ($item->{container} == $self->{player}{tag}) {
-#         $::INV->set_items ($self->{container}{$item->{container}})
-#      }
    }
 }
 
@@ -878,6 +994,9 @@
 
    if ($type eq "msg") {
       my ($msg, @kw) = split /\x00/, $msg;
+
+      utf8::decode $_ for ($msg, @kw);
+      
       $self->{kw}{$_} = 1 for @kw;
 
       $msg = "\n" . CFClient::UI::Label::escape $msg;
@@ -914,9 +1033,11 @@
 sub send {
    my ($self, $msg) = @_;
 
-   $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
    $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
    $self->{textview}->scroll_to_bottom;
+
+   utf8::encode $msg;
+   $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
 }
 
 sub destroy {
@@ -924,6 +1045,7 @@
 
    #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
 
+   $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
    delete $self->{conn}{npc_dialog};
    $self->{conn}->disconnect_ext ($self->{token});