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

Diff Legend

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