--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/06/28 23:39:15 1.49
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/23 16:11:12 1.65
@@ -7,11 +7,10 @@
use CFClient;
use CFClient::UI;
+use CFClient::Pod;
use base 'Crossfire::Protocol::Base';
-our %open_logs;
-
sub new {
my $class = shift;
@@ -19,7 +18,7 @@
$self->{map_widget}->clr_commands;
- my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
+ my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
my ($pom) = @_;
my @cmd_help;
@@ -35,7 +34,7 @@
$_ = $_ eq ".*" ? "" : " $_"
for @args;
- my $text = CFClient::pod_to_pango $head2->content;
+ my $text = CFClient::Pod::as_xml $head2->content;
push @cmd_help, ["$cmd$_", $text]
for sort { (length $a) <=> (length $b) }
@@ -65,37 +64,228 @@
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: $!";
- my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time);
+ $fh->autoflush (1);
+
+ $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 ($self, $name, $old, $new) = @_;
+
+ my $diff = $new - $old;
+
+ $diff = 0.01 * int $diff * 100;
+
+ 0.1 >= abs $diff ? ()
+ : $diff < 0 ? "$name$diff" : "$name+$diff"
+}
+
+sub _stat_skillmaskdiff {
+ my ($self, $name, $old, $new) = @_;
+
+ my $diff = $old ^ $new
+ or return;
+
+ 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;
+ my $prev = $self->{prev_stats} || { };
+
+ 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 = "stat change: " . (join " ", @diffs);
+ $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
}
- ::update_stats_window ($stats);
+ $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) = @_;
+
+ # 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});
+
+ $self->update_weight;
+
+ $::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) = (0, 1);
+ 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 {
@@ -345,9 +535,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});
}
@@ -398,7 +588,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],
);
@@ -410,12 +600,12 @@
# try to create single paragraphs of multiple lines sent by the server
$text =~ s/(?<=\S)\n(?=\w)/ /g;
- $text = CFClient::UI::Label::escape $text;
+ $text = CFClient::asxml $text;
$text =~ s/\[b\](.*?)\[\/b\]/\1<\/b>/g;
$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g;
$self->{logview}->add_paragraph ($color[$color], $_)
- for map "$time $_", split /\n/, $text;
+ for map "$time $_", split /\n/, $text;
$self->{logview}->scroll_to_bottom;
$self->{statusbox}->add ($text,
@@ -440,27 +630,28 @@
$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});
+ $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message});
+ $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message});
}
sub spell_delete {
my ($self, $spell) = @_;
- $::SETUP_SPELLS->remove_spell ($spell);
+
+ $::SPELL_PAGE->remove_spell ($spell);
}
sub addme_success {
my ($self) = @_;
- my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
+ my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
my ($pom) = @_;
my %skill_help;
for my $head2 ($pom->head1->[3]->head2) {
- $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;
+ $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content;
}
\%skill_help
@@ -468,10 +659,10 @@
for my $skill (values %{$self->{skill_info}}) {
$self->{map_widget}->add_command ("ready_skill $skill",
- (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
+ (CFClient::asxml "Ready the skill '$skill'\n\n")
. $skill_help->{$skill});
$self->{map_widget}->add_command ("use_skill $skill",
- (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
+ (CFClient::asxml "Immediately use the skill '$skill'\n\n")
. $skill_help->{$skill});
}
}
@@ -506,14 +697,14 @@
$self->send ("requestinfo image_sums $face $face");
- $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
+ $self->{statusbox}->add (CFClient::asxml "prefetching $todo",
group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
} elsif (!exists $self->{num_faces}) {
$self->send ("requestinfo image_info");
$self->{num_faces} = 0;
- $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
+ $self->{statusbox}->add (CFClient::asxml "starting to prefetch",
group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
}
}
@@ -521,11 +712,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
@@ -538,19 +729,26 @@
} 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;
}
}
+ 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);
@@ -575,9 +773,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}) {
@@ -618,11 +819,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)) {
@@ -634,19 +830,24 @@
} 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}})
-# }
}
}
sub player_update {
my ($self, $player) = @_;
- $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
+ $self->update_weight;
+}
+
+sub update_weight {
+ my ($self) = @_;
+
+ my $weight = .001 * $self->{player}{weight};
+ my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
+
+ $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
+ $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
+ $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
}
sub update_server_info {
@@ -726,11 +927,14 @@
force_h => $::HEIGHT * 0.7,
title => "NPC Dialog",
kw => { hi => 0, yes => 0, no => 0 },
+ has_close_button => 1,
@_,
);
Scalar::Util::weaken (my $this = $self);
+ $self->connect (delete => sub { $this->destroy; 1 });
+
# better use a pane...
$self->add (my $hbox = new CFClient::UI::HBox);
$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
@@ -761,7 +965,7 @@
$self->{bye_button} = new CFClient::UI::Button
text => "Bye (close)",
tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
- on_activate => sub { $this->destroy; 0 },
+ on_activate => sub { $this->destroy; 1 },
;
$self->update_options;
@@ -806,9 +1010,12 @@
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;
+ $msg = "\n" . CFClient::UI::asxml $msg;
my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
my @link;
$msg =~ s{
@@ -842,9 +1049,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}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg);
$self->{textview}->scroll_to_bottom;
+
+ utf8::encode $msg;
+ $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
}
sub destroy {
@@ -852,6 +1061,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});