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

Diff Legend

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