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

Diff Legend

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