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.53 by root, Mon Jul 3 22:32:52 2006 UTC vs.
Revision 1.78 by elmex, Mon Aug 14 14:35:31 2006 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFClient::UI; 9use CFPlus::UI;
10use CFPlus::Pod;
10 11
11use base 'Crossfire::Protocol::Base'; 12use base 'Crossfire::Protocol::Base';
12
13our %open_logs;
14 13
15sub new { 14sub new {
16 my $class = shift; 15 my $class = shift;
17 16
18 my $self = $class->SUPER::new (@_); 17 my $self = $class->SUPER::new (@_);
19 18
20 $self->{map_widget}->clr_commands; 19 $self->{map_widget}->clr_commands;
21 20
22 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 21 my @cmd_help = map {
23 my ($pom) = @_;
24
25 my @cmd_help;
26
27 for my $head2 ($pom->head1->[-2]->head2) {
28 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
29 or next; 23 or die "unparseable command help: $_->{kw}[0]";
30 24
31 my $cmd = $1; 25 my $cmd = $1;
32 my @args = split /\|/, $2; 26 my @args = split /\|/, $2;
33 @args = (".*") unless @args; 27 @args = (".*") unless @args;
34 28
29 my (undef, @par) = CFPlus::Pod::section_of $_;
30 my $text = CFPlus::Pod::as_label @par;
31
35 $_ = $_ eq ".*" ? "" : " $_" 32 $_ = $_ eq ".*" ? "" : " $_"
36 for @args; 33 for @args;
37 34
38 my $text = CFClient::pod_to_pango $head2->content; 35 map ["$cmd$_", $text],
39
40 push @cmd_help, ["$cmd$_", $text]
41 for sort { (length $a) <=> (length $b) } 36 sort { (length $a) <=> (length $b) }
42 @args; 37 @args
43 } 38 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*";
44 40
45 \@cmd_help
46 };
47
48 $self->{map_widget}->add_command (@$_) 41 $self->{map_widget}->add_command (@$_)
49 for @$cmd_help; 42 for @cmd_help;
50 43
51 $self->{noface} = new_from_file CFClient::Texture 44 $self->{noface} = new_from_file CFPlus::Texture
52 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
53 46
54 $self->{open_container} = 0; 47 $self->{open_container} = 0;
55 48
56 # "global" 49 # "global"
57 $self->{tilecache} = CFClient::db_table "tilecache"; 50 $self->{tilecache} = CFPlus::db_table "tilecache";
58 $self->{facemap} = CFClient::db_table "facemap"; 51 $self->{facemap} = CFPlus::db_table "facemap";
59 52
60 # per server 53 # per server
61 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 54 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";
62 55
63 $self 56 $self
64} 57}
65 58
66sub logprint { 59sub logprint {
67 my ($self, @a) = @_; 60 my ($self, @a) = @_;
61
62 return;
63 $self->{log_fh} ||= do {
68 my $filename = "$Crossfire::VARDIR/log.$self->{host}"; 64 my $path = "$Crossfire::VARDIR/log.$self->{host}";
69 65
70 my $fh = $open_logs{$filename}; 66 open my $fh, ">>:utf8", $path
71 unless ($fh) {
72 # FIXME: handle this more gracefully?
73 open $fh, ">>", $filename
74 or die "Couldn't open logfile: log.$self->{host}: $!"; 67 or die "Couldn't open logfile $path: $!";
75 68
76 $open_logs{$filename} = $fh; 69 $fh->autoflush (1);
70
71 $fh;
77 } 72 };
78 73
79 my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time); 74 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80 75
81 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", 76 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82 $year + 1900, $mon + 1, $mday, $hour, $min, $sec; 77 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83 78
84 print $fh "$ts ", @a, "\n"; 79 print {$self->{log_fh}} "$ts ", @a, "\n";
85 $fh->flush;
86} 80}
87 81
88sub _stat_numdiff { 82sub _stat_numdiff {
89 my ($self, $old, $new) = @_; 83 my ($self, $name, $old, $new) = @_;
90 84
91 my $diff = $new - $old; 85 my $diff = $new - $old;
92 $diff > 0 ? "+$diff" : $diff 86
87 $diff = 0.01 * int $diff * 100;
88
89 0.1 >= abs $diff ? ()
90 : $diff < 0 ? "$name$diff" : "$name+$diff"
93} 91}
94 92
95sub _stat_skillmaskdiff { 93sub _stat_skillmaskdiff {
96 my ($self, $old, $new) = @_; 94 my ($self, $name, $old, $new) = @_;
97 95
98 my $diff = $old ^ $new; 96 my $diff = $old ^ $new
97 or return;
99 98
100 my @diff = map 99 my @diff = map
101 { 100 {
102 $diff & $_ 101 $diff & $_
103 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 102 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
… …
150); 149);
151 150
152sub stats_update { 151sub stats_update {
153 my ($self, $stats) = @_; 152 my ($self, $stats) = @_;
154 153
155 if (my $prev = $self->{prev_stats}) { 154 my $prev = $self->{prev_stats} || { };
156 if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) { 155
156 if (my @diffs =
157 (
158 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
159 map {
160 $stats->{$_} && $prev->{$_}
161 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
162 } sort { $a <=> $b } keys %{$self->{skill_info}}
163 )
164 ) {
165 my $msg = join " ", @diffs;
157 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5); 166 $self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
167 }
168
169 if (
170 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
171 ) {
172 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
173 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
174 }
175
176 $self->update_stats_window ($stats, $prev);
177
178 $self->{prev_stats} = { %$stats };
179}
180
181my %RES_TBL = (
182 phys => CS_STAT_RES_PHYS,
183 magic => CS_STAT_RES_MAG,
184 fire => CS_STAT_RES_FIRE,
185 elec => CS_STAT_RES_ELEC,
186 cold => CS_STAT_RES_COLD,
187 conf => CS_STAT_RES_CONF,
188 acid => CS_STAT_RES_ACID,
189 drain => CS_STAT_RES_DRAIN,
190 ghit => CS_STAT_RES_GHOSTHIT,
191 pois => CS_STAT_RES_POISON,
192 slow => CS_STAT_RES_SLOW,
193 para => CS_STAT_RES_PARA,
194 tund => CS_STAT_TURN_UNDEAD,
195 fear => CS_STAT_RES_FEAR,
196 depl => CS_STAT_RES_DEPLETE,
197 deat => CS_STAT_RES_DEATH,
198 holyw => CS_STAT_RES_HOLYWORD,
199 blind => CS_STAT_RES_BLIND,
200);
201
202sub update_stats_window {
203 my ($self, $stats, $prev) = @_;
204
205 # I love text protocols...
206
207 my $hp = $stats->{+CS_STAT_HP} * 1;
208 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
209 my $sp = $stats->{+CS_STAT_SP} * 1;
210 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
211 my $fo = $stats->{+CS_STAT_FOOD} * 1;
212 my $fo_m = 999;
213 my $gr = $stats->{+CS_STAT_GRACE} * 1;
214 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
215
216 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
217 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
218 $::GAUGES->{food} ->set_value ($fo, $fo_m);
219 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
220 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
221 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
222 my $rng = $stats->{+CS_STAT_RANGE};
223 $rng =~ s/^Range: //; # thank you so much dear server
224 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
225 my $title = $stats->{+CS_STAT_TITLE};
226 $title =~ s/^Player: //;
227 $::STATWIDS->{title} ->set_text ("Title: " . $title);
228
229 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
230 $::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
231 $::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
232 $::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
233 $::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
234 $::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
235 $::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
236 $::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
237 $::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
238 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
239 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
240 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
241 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
242
243 $self->update_weight;
244
245 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
246 for keys %RES_TBL;
247
248 my $sktbl = $::STATWIDS->{skill_tbl};
249 my @skills = keys %{ $self->{skill_info} };
250
251 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
252 $sktbl->clear;
253
254 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
255 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
256 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
257 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
258 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
259 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
260
261 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
262
263 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
265
266 my ($x, $y) = (0, 1);
267 for (
268 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
269 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_},
271 @skills
272 ) {
273 my ($idx, $name) = @$_;
274
275 my $spell_cb = sub {
276 my ($widget, $ev) = @_;
277
278 if ($ev->{button} == 1) {
279 $::CONN->user_send ("ready_skill $name");
280 } elsif ($ev->{button} == 2) {
281 $::CONN->user_send ("use_skill $name");
282 } elsif ($ev->{button} == 3) {
283 (new CFPlus::UI::Menu
284 items => [
285 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
286 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
287 ],
288 )->popup ($ev);
289 } else {
290 return 0;
291 }
292
293 1
294 };
295
296 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
297 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
298 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
299 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
300 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
301 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
302
303 $x++ and ($x, $y) = (0, $y + 1);
158 } 304 }
159
160 if (
161 my @diffs = map {
162 $stats->{$_->[0]} != $prev->{$_->[0]}
163 ? $_->[2] . $_->[1]->($self, $prev->{$_->[0]}, $stats->{$_->[0]}) : ();
164 }
165 @statchange
166 ) {
167 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
168 $self->{statusbox}->add ($msg, group => $msg, fg => [0.8, 1, 0.2, 1], timeout => 10);
169 }
170 } 305 }
171 306
172 $self->{prev_stats} = { %$stats }; 307 for (grep exists $stats->{$_}, @skills) {
173 308 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
174 ::update_stats_window ($stats); 309 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
310 }
175} 311}
176 312
177sub user_send { 313sub user_send {
178 my ($self, $command) = @_; 314 my ($self, $command) = @_;
179 315
… …
384 520
385 unless ($id) { 521 unless ($id) {
386 # create new id for face 522 # create new id for face
387 # I love transactions 523 # I love transactions
388 for (1..100) { 524 for (1..100) {
389 my $txn = $CFClient::DB_ENV->txn_begin; 525 my $txn = $CFPlus::DB_ENV->txn_begin;
390 my $status = $self->{facemap}->db_get (id => $id); 526 my $status = $self->{facemap}->db_get (id => $id);
391 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 527 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
392 $id = ($id || 64) + 1; 528 $id = ($id || 64) + 1;
393 if ($self->{facemap}->put (id => $id) == 0 529 if ($self->{facemap}->put (id => $id) == 0
394 && $self->{facemap}->put ($hash => $id) == 0) { 530 && $self->{facemap}->put ($hash => $id) == 0) {
… …
398 } 534 }
399 } 535 }
400 $txn->txn_abort; 536 $txn->txn_abort;
401 } 537 }
402 538
403 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 539 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
404 } 540 }
405 541
406gotid: 542gotid:
407 $face->{id} = $id; 543 $face->{id} = $id;
408 $self->{map}->set_face ($facenum => $id); 544 $self->{map}->set_face ($facenum => $id);
… …
419 undef 555 undef
420 }; 556 };
421} 557}
422 558
423sub face_update { 559sub face_update {
424 my ($self, $facenum, $face) = @_; 560 my ($self, $facenum, $face, $changed) = @_;
425 561
426 $self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes 562 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
427 563
428 $self->set_texture ($face->{id} => delete $face->{image}); 564 $self->set_texture ($face->{id} => delete $face->{image});
429} 565}
430 566
431sub set_texture { 567sub set_texture {
432 my ($self, $id, $data) = @_; 568 my ($self, $id, $data) = @_;
433 569
434 $self->{texture}[$id] ||= do { 570 $self->{texture}[$id] ||= do {
435 my $tex = 571 my $tex =
436 new_from_image CFClient::Texture 572 new_from_image CFPlus::Texture
437 $data, minify => 1, mipmap => 1; 573 $data, minify => 1, mipmap => 1;
438 574
439 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 575 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
440 $self->{map_widget}->update; 576 $self->{map_widget}->update;
441 577
… …
472 [0.11, 0.56, 1.00], 608 [0.11, 0.56, 1.00],
473 [0.93, 0.46, 0.00], 609 [0.93, 0.46, 0.00],
474 [0.18, 0.54, 0.34], 610 [0.18, 0.54, 0.34],
475 [0.56, 0.73, 0.56], 611 [0.56, 0.73, 0.56],
476 [0.80, 0.80, 0.80], 612 [0.80, 0.80, 0.80],
477 [0.55, 0.41, 0.13], 613 [0.75, 0.61, 0.20],
478 [0.99, 0.77, 0.26], 614 [0.99, 0.77, 0.26],
479 [0.74, 0.65, 0.41], 615 [0.74, 0.65, 0.41],
480 ); 616 );
481 617
482 $self->logprint ("info: ", $text); 618 $self->logprint ("info: ", $text);
… …
484 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 620 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
485 621
486 # try to create single paragraphs of multiple lines sent by the server 622 # try to create single paragraphs of multiple lines sent by the server
487 $text =~ s/(?<=\S)\n(?=\w)/ /g; 623 $text =~ s/(?<=\S)\n(?=\w)/ /g;
488 624
489 $text = CFClient::UI::Label::escape $text; 625 $text = CFPlus::asxml $text;
490 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 626 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
491 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 627 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
492 628
493 $self->{logview}->add_paragraph ($color[$color], $_) 629 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
494 for map "$time $_", split /\n/, $text; 630 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
495 $self->{logview}->scroll_to_bottom; 631 $self->{logview}->scroll_to_bottom;
496 632
497 $self->{statusbox}->add ($text, 633 $self->{statusbox}->add ($text,
498 group => $text, 634 group => $text,
499 fg => $color[$color], 635 fg => $color[$color],
500 timeout => $color >= 2 ? 60 : 10, 636 timeout => $color >= 2 ? 180 : 10,
501 tooltip_font => $::FONT_FIXED, 637 tooltip_font => $::FONT_FIXED,
502 ); 638 );
503} 639}
504 640
505sub drawextinfo { 641sub drawextinfo {
… …
509} 645}
510 646
511sub spell_add { 647sub spell_add {
512 my ($self, $spell) = @_; 648 my ($self, $spell) = @_;
513 649
514 # try to create single paragraphs of multiple lines sent by the server 650 # try to create single paragraphs out of the multiple lines sent by the server
515 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 651 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
516 $spell->{message} =~ s/\n+$//; 652 $spell->{message} =~ s/\n+$//;
517 $spell->{message} ||= "Server did not provide a description for this spell."; 653 $spell->{message} ||= "Server did not provide a description for this spell.";
518 654
519 $::SPELL_PAGE->add_spell ($spell); 655 $::SPELL_PAGE->add_spell ($spell);
520 656
521 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 657 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
522 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 658 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
523} 659}
524 660
525sub spell_delete { 661sub spell_delete {
526 my ($self, $spell) = @_; 662 my ($self, $spell) = @_;
527 663
… …
529} 665}
530 666
531sub addme_success { 667sub addme_success {
532 my ($self) = @_; 668 my ($self) = @_;
533 669
534 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
535 my ($pom) = @_;
536
537 my %skill_help; 670 my %skill_help;
538 671
539 for my $head2 ($pom->head1->[3]->head2) { 672 for my $node (CFPlus::Pod::find skill_description => "*") {
540 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 673 my (undef, @par) = CFPlus::Pod::section_of $node;
541 } 674 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
542
543 \%skill_help
544 }; 675 };
545 676
546 for my $skill (values %{$self->{skill_info}}) { 677 for my $skill (values %{$self->{skill_info}}) {
547 $self->{map_widget}->add_command ("ready_skill $skill", 678 $self->{map_widget}->add_command ("ready_skill $skill",
548 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 679 (CFPlus::asxml "Ready the skill '$skill'\n\n")
549 . $skill_help->{$skill}); 680 . $skill_help{$skill});
550 $self->{map_widget}->add_command ("use_skill $skill", 681 $self->{map_widget}->add_command ("use_skill $skill",
551 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 682 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
552 . $skill_help->{$skill}); 683 . $skill_help{$skill});
553 } 684 }
554} 685}
555 686
556sub eof { 687sub eof {
557 my ($self) = @_; 688 my ($self) = @_;
… …
581 712
582 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 713 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
583 714
584 $self->send ("requestinfo image_sums $face $face"); 715 $self->send ("requestinfo image_sums $face $face");
585 716
586 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 717 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
587 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 718 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
588 } elsif (!exists $self->{num_faces}) { 719 } elsif (!exists $self->{num_faces}) {
589 $self->send ("requestinfo image_info"); 720 $self->send ("requestinfo image_info");
590 721
591 $self->{num_faces} = 0; 722 $self->{num_faces} = 0;
592 723
593 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 724 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
594 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 725 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
595 } 726 }
596} 727}
597 728
598sub update_floorbox { 729sub update_floorbox {
599 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 730 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
600 return unless $::CONN; 731 return unless $::CONN;
601 732
602 $::FLOORBOX->clear; 733 $::FLOORBOX->clear;
603 734
604 my $row; 735 my $row;
605 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 736 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
606 if ($row < 6) { 737 if ($row < 6) {
607 local $_->{face_widget}; # hack to force recreation of widget 738 local $_->{face_widget}; # hack to force recreation of widget
608 local $_->{desc_widget}; # hack to force recreation of widget 739 local $_->{desc_widget}; # hack to force recreation of widget
609 CFClient::Item::update_widgets $_; 740 CFPlus::Item::update_widgets $_;
610 741
611 $::FLOORBOX->add (0, $row, $_->{face_widget}); 742 $::FLOORBOX->add (0, $row, $_->{face_widget});
612 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 743 $::FLOORBOX->add (1, $row, $_->{desc_widget});
613 744
614 $row++; 745 $row++;
615 } else { 746 } else {
616 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 747 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
617 text => "More...", 748 text => "More...",
618 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 749 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
619 ); 750 );
620 last; 751 last;
621 } 752 }
622 } 753 }
754 if ($::CONN->{open_container}) {
755 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
756 text => "Close container",
757 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
758 );
759 }
623 }); 760 });
624 761
625 $::WANT_REFRESH++; 762 $::WANT_REFRESH++;
626} 763}
627 764
628sub set_opencont { 765sub set_opencont {
629 my ($conn, $tag, $name) = @_; 766 my ($conn, $tag, $name) = @_;
630 $conn->{open_container} = $tag; 767 $conn->{open_container} = $tag;
768 update_floorbox;
631 769
632 $::INV_RIGHT_HB->clear (); 770 $::INV_RIGHT_HB->clear ();
633 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 771 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
634 772
635 if ($tag != 0) { # Floor isn't closable, is it? 773 if ($tag != 0) { # Floor isn't closable, is it?
636 $::INV_RIGHT_HB->add (new CFClient::UI::Button 774 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
637 text => "Close container", 775 text => "Close container",
638 tooltip => "Close the currently open container (if one is open)", 776 tooltip => "Close the currently open container (if one is open)",
639 on_activate => sub { 777 on_activate => sub {
640 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 778 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
641 if $tag != 0; 779 if $tag != 0;
… …
649} 787}
650 788
651sub update_containers { 789sub update_containers {
652 my ($self) = @_; 790 my ($self) = @_;
653 791
654 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 792 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
655 for my $tag (keys %{ delete $self->{update_container} }) { 793 my $todo = delete $self->{update_container}
794 or return;
795
796 for my $tag (keys %$todo) {
797 update_floorbox if $tag == 0 or $tag == $self->{open_container};
656 if ($tag == 0) { 798 if ($tag == 0) {
657 update_floorbox;
658 $::INVR->set_items ($self->{container}{0}) 799 $::INVR->set_items ($self->{container}{0})
659 if $tag == $self->{open_container}; 800 if $tag == $self->{open_container};
660 } elsif ($tag == $self->{player}{tag}) { 801 } elsif ($tag == $self->{player}{tag}) {
661 $::INV->set_items ($self->{container}{$tag}) 802 $::INV->set_items ($self->{container}{$tag})
662 } else { 803 } else {
… …
693sub item_update { 834sub item_update {
694 my ($self, $item) = @_; 835 my ($self, $item) = @_;
695 836
696 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 837 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
697 838
698 CFClient::Item::update_widgets $item; 839 CFPlus::Item::update_widgets $item;
699 840
700 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 841 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
701 set_opencont ($::CONN, 0, "Floor"); 842 set_opencont ($::CONN, 0, "Floor");
702 843
703 } elsif ($item->{flags} & F_OPEN) { 844 } elsif ($item->{flags} & F_OPEN) {
704 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 845 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
705 846
706 } else { 847 } else {
707 $self->{update_container}{$item->{container}}++; 848 $self->{update_container}{$item->{container}}++;
708 $self->update_containers; 849 $self->update_containers;
709# if ($item->{container} == 0) {
710# update_floorbox;
711# update_container (0);
712# } elsif ($item->{container} == $self->{player}{tag}) {
713# $::INV->set_items ($self->{container}{$item->{container}})
714# }
715 } 850 }
716} 851}
717 852
718sub player_update { 853sub player_update {
719 my ($self, $player) = @_; 854 my ($self, $player) = @_;
855
856 $self->update_weight;
857}
858
859sub update_weight {
860 my ($self) = @_;
861
862 my $weight = .001 * $self->{player}{weight};
863 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
864
720 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 865 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
866 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
867 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
721} 868}
722 869
723sub update_server_info { 870sub update_server_info {
724 my ($self) = @_; 871 my ($self) = @_;
725 872
… …
737} 884}
738 885
739sub logged_in { 886sub logged_in {
740 my ($self) = @_; 887 my ($self) = @_;
741 888
742 $self->send_ext_req (cfplus_support => "1", sub { 889 $self->send_ext_req (cfplus_support => version => 1, sub {
743 $self->{cfplus_ext} = $_[0]; 890 $self->{cfplus_ext} = $_[0]{version};
744 $self->update_server_info; 891 $self->update_server_info;
892
893 0
745 }); 894 });
746 895
747 $self->update_server_info; 896 $self->update_server_info;
748 897
749 $self->send_command ("output-sync $::CFG->{output_sync}"); 898 $self->send_command ("output-sync $::CFG->{output_sync}");
… …
753 902
754sub lookat { 903sub lookat {
755 my ($self, $x, $y) = @_; 904 my ($self, $x, $y) = @_;
756 905
757 if ($self->{cfplus_ext}) { 906 if ($self->{cfplus_ext}) {
758 $self->send_ext_req (lookat => "$x $y", sub { 907 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
759 my %res = split /\x00/, $_[0]; 908 my ($msg) = @_;
760 909
761 if (exists $res{npc_dialog}) { 910 if (exists $msg->{npc_dialog}) {
762 # start npc chat dialog 911 # start npc chat dialog
763 $self->{npc_dialog} = new CFClient::NPCDialog:: 912 $self->{npc_dialog} = new CFPlus::NPCDialog::
764 dx => $x, 913 dx => $x,
765 dy => $y, 914 dy => $y,
766 title => "$res{npc_dialog} (NPC)", 915 title => "$msg->{npc_dialog} (NPC)",
767 conn => $self, 916 conn => $self,
768 ; 917 ;
769 } 918 }
770 }); 919 });
771 } 920 }
… …
780 if $self->{npc_dialog}; 929 if $self->{npc_dialog};
781 930
782 $self->SUPER::destroy; 931 $self->SUPER::destroy;
783} 932}
784 933
785package CFClient::NPCDialog; 934package CFPlus::NPCDialog;
786 935
787our @ISA = 'CFClient::UI::FancyFrame'; 936our @ISA = 'CFPlus::UI::Toplevel';
788 937
789sub new { 938sub new {
790 my $class = shift; 939 my $class = shift;
791 940
792 my $self = $class->SUPER::new ( 941 my $self = $class->SUPER::new (
… …
795 name => "npc_dialog", 944 name => "npc_dialog",
796 force_w => $::WIDTH * 0.7, 945 force_w => $::WIDTH * 0.7,
797 force_h => $::HEIGHT * 0.7, 946 force_h => $::HEIGHT * 0.7,
798 title => "NPC Dialog", 947 title => "NPC Dialog",
799 kw => { hi => 0, yes => 0, no => 0 }, 948 kw => { hi => 0, yes => 0, no => 0 },
949 has_close_button => 1,
800 @_, 950 @_,
801 ); 951 );
802 952
803 Scalar::Util::weaken (my $this = $self); 953 Scalar::Util::weaken (my $this = $self);
804 954
955 $self->connect (delete => sub { $this->destroy; 1 });
956
805 # better use a pane... 957 # better use a pane...
806 $self->add (my $hbox = new CFClient::UI::HBox); 958 $self->add (my $hbox = new CFPlus::UI::HBox);
807 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 959 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
808 960
809 $hbox->add (my $vbox = new CFClient::UI::VBox); 961 $hbox->add (my $vbox = new CFPlus::UI::VBox);
810 962
811 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 963 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
812 $vbox->add ($self->{entry} = new CFClient::UI::Entry 964 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
813 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 965 tooltip => "#npc_message_entry",
814 . "Sometimes you have to tell an NPC something you cannot find out during "
815 . "a normal conversation (such as a password). In those cases you have to use "
816 . "this text entry. You can also enter responses manually instead of using the response "
817 . "buttons below.",
818 on_activate => sub { 966 on_activate => sub {
819 my ($entry, $text) = @_; 967 my ($entry, $text) = @_;
820 968
821 return unless $text =~ /\S/; 969 return unless $text =~ /\S/;
822 970
… …
825 973
826 0 974 0
827 }, 975 },
828 ); 976 );
829 977
830 $vbox->add ($self->{options} = new CFClient::UI::VBox); 978 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
831 979
832 $self->{bye_button} = new CFClient::UI::Button 980 $self->{bye_button} = new CFPlus::UI::Button
833 text => "Bye (close)", 981 text => "Bye (close)",
834 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 982 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
835 on_activate => sub { $this->destroy; 0 }, 983 on_activate => sub { $this->destroy; 1 },
836 ; 984 ;
837 985
838 $self->update_options; 986 $self->update_options;
839 987
840 $self->{token} = $self->{conn}->ext_token; 988 $self->{id} = $self->{conn}->send_ext_req (
841 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 989 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
842 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 990 sub { $this && $this->feed (@_) }
991 );
843 992
844 $self->{entry}->grab_focus; 993 $self->{entry}->grab_focus;
845 994
846 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 995 $self->{textview}->add_paragraph ({
996 fg => [1, 1, 0, 1],
997 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
998 });
847 999
848 $self->show; 1000 $self->show;
849 $self 1001 $self
850}; 1002};
851 1003
… …
856 1008
857 $self->{options}->clear; 1009 $self->{options}->clear;
858 $self->{options}->add ($self->{bye_button}); 1010 $self->{options}->add ($self->{bye_button});
859 1011
860 for my $kw (sort keys %{ $self->{kw} }) { 1012 for my $kw (sort keys %{ $self->{kw} }) {
861 $self->{options}->add (new CFClient::UI::Button 1013 $self->{options}->add (new CFPlus::UI::Button
862 text => $kw, 1014 text => $kw,
863 on_activate => sub { 1015 on_activate => sub {
864 $self->send ($kw); 1016 $self->send ($kw);
865 0 1017 0
866 }, 1018 },
867 ); 1019 );
868 } 1020 }
869} 1021}
870 1022
871sub feed { 1023sub feed {
872 my ($self, $data) = @_; 1024 my ($self, $msg) = @_;
873 1025
874 Scalar::Util::weaken $self; 1026 Scalar::Util::weaken $self;
875 1027
876 my ($type, $msg) = split / /, $data, 2; 1028 if ($msg->{msgtype} eq "reply") {
1029 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1030 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
877 1031
878 if ($type eq "msg") { 1032 my $text = "\n" . CFPlus::asxml $msg->{msg};
879 my ($msg, @kw) = split /\x00/, $msg;
880 $self->{kw}{$_} = 1 for @kw;
881
882 $msg = "\n" . CFClient::UI::Label::escape $msg;
883 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1033 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
884 my @link; 1034 my @link;
885 $msg =~ s{ 1035 $text =~ s{
886 ($match) 1036 ($match)
887 }{ 1037 }{
888 my $kw = $1; 1038 my $kw = $1;
889 1039
890 push @link, new CFClient::UI::Label 1040 push @link, new CFPlus::UI::Label
891 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1041 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
892 can_hover => 1, 1042 can_hover => 1,
893 can_events => 1, 1043 can_events => 1,
894 padding_x => 0, 1044 padding_x => 0,
895 padding_y => 0, 1045 padding_y => 0,
896 on_button_up => sub { 1046 on_button_up => sub {
897 $self->send ($kw); 1047 $self->send ($kw);
898 }; 1048 };
899 1049
900 chr 0xfffc 1050 "\x{fffc}"
901 }giex; 1051 }giex;
902 1052
903 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1053 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
904 $self->{textview}->scroll_to_bottom; 1054 $self->{textview}->scroll_to_bottom;
905 $self->update_options; 1055 $self->update_options;
906 } else { 1056 } else {
907 $self->destroy; 1057 $self->destroy;
908 } 1058 }
… …
911} 1061}
912 1062
913sub send { 1063sub send {
914 my ($self, $msg) = @_; 1064 my ($self, $msg) = @_;
915 1065
916 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1066 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
917 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
918 $self->{textview}->scroll_to_bottom; 1067 $self->{textview}->scroll_to_bottom;
1068
1069 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
919} 1070}
920 1071
921sub destroy { 1072sub destroy {
922 my ($self) = @_; 1073 my ($self) = @_;
923 1074
924 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1075 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
925 1076
1077 if ($self->{conn}) {
1078 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
926 delete $self->{conn}{npc_dialog}; 1079 delete $self->{conn}{npc_dialog};
927 $self->{conn}->disconnect_ext ($self->{token}); 1080 $self->{conn}->disconnect_ext ($self->{id});
1081 }
928 1082
929 $self->SUPER::destroy; 1083 $self->SUPER::destroy;
930} 1084}
931 1085
9321; 10861

Diff Legend

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