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.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.103 by root, Mon Apr 23 19:17:41 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 %{$arg{setup_req} || {}},
27 },
28 );
18 29
19 $self->{map_widget}->clr_commands; 30 $self->{map_widget}->clr_commands;
20 31
21 my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub { 32 my @cmd_help = map {
22 my ($pom) = @_;
23
24 my @cmd_help;
25
26 for my $head2 ($pom->head1->[-2]->head2) {
27 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 33 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 34 or die "unparseable command help: $_->{kw}[0]";
29 35
30 my $cmd = $1; 36 my $cmd = $1;
31 my @args = split /\|/, $2; 37 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 38 @args = (".*") unless @args;
33 39
40 my (undef, @par) = CFPlus::Pod::section_of $_;
41 my $text = CFPlus::Pod::as_label @par;
42
34 $_ = $_ eq ".*" ? "" : " $_" 43 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 44 for @args;
36 45
37 my $text = CFPlus::Pod::as_markup $head2->content; 46 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 47 sort { (length $a) <=> (length $b) }
41 @args; 48 @args
49 } sort { $a->{par} <=> $b->{par} }
50 CFPlus::Pod::find command => "*";
51
52 $self->connect_ext (event_capabilities => sub {
53 my ($cap) = @_;
54
55 if (my $ts = $cap->{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]);
60
61 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize};
63
64 $self->setup_req (mapsize => "${w}x${h}");
65 }
42 } 66 }
43
44 \@cmd_help
45 }; 67 });
46 68
47 $self->{map_widget}->add_command (@$_) 69 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 70 for @cmd_help;
49 71
72 {
73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
74 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
75 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
76 }
77
78 {
50 $self->{noface} = new_from_file CFPlus::Texture 79 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 80 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
81 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
82 }
52 83
53 $self->{open_container} = 0; 84 $self->{open_container} = 0;
54 85
55 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache";
57 $self->{facemap} = CFPlus::db_table "facemap";
58
59 # per server 86 # per server
60 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 88
62 $self 89 $self
63} 90}
64 91
65sub logprint { 92sub logprint {
… …
265 292
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 293 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 294
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 295 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 296 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271 297
272 my ($x, $y) = (0, 1); 298 my ($x, $y) = (0, 1);
273 for ( 299 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 300 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 301 map [$_, $self->{skill_info}{$_}],
… …
284 if ($ev->{button} == 1) { 310 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 311 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 312 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 313 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 314 } elsif ($ev->{button} == 3) {
315 my $shortname = CFPlus::shorten $name, 14;
289 (new CFPlus::UI::Menu 316 (new CFPlus::UI::Menu
290 items => [ 317 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 318 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
292 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 319 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293 ], 320 ],
294 )->popup ($ev); 321 )->popup ($ev);
295 } else { 322 } else {
296 return 0; 323 return 0;
297 } 324 }
… …
301 328
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 329 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
303 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 330 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
304 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 331 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
305 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 332 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
306 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 333 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
334 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
307 335
308 $x++ and ($x, $y) = (0, $y + 1); 336 $x++ and ($x, $y) = (0, $y + 1);
309 } 337 }
310 } 338 }
311 339
… …
313 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 341 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
314 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 342 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
315 } 343 }
316} 344}
317 345
346sub macro_send {
347 my ($self, $macro) = @_;
348
349 for my $cmd (@{ $macro->{action} }) {
350 $self->send_command ($cmd);
351 }
352}
353
318sub user_send { 354sub user_send {
319 my ($self, $command) = @_; 355 my ($self, $command) = @_;
320 356
357 $self->{record}->($command)
321 if ($self->{record}) { 358 if $self->{record};
322 push @{$self->{record}}, $command;
323 }
324 359
325 $self->logprint ("send: ", $command); 360 $self->logprint ("send: ", $command);
326 $self->send_command ($command); 361 $self->send_command ($command);
327 ::status ($command); 362 ::status ($command);
328} 363}
329 364
330sub start_record { 365sub record {
331 my ($self) = @_; 366 my ($self, $cb) = @_;
332 367
333 $self->{record} = []; 368 $self->{record} = $cb;
334}
335
336sub stop_record {
337 my ($self) = @_;
338 return delete $self->{record};
339} 369}
340 370
341sub map_scroll { 371sub map_scroll {
342 my ($self, $dx, $dy) = @_; 372 my ($self, $dx, $dy) = @_;
343 373
… …
345} 375}
346 376
347sub feed_map1a { 377sub feed_map1a {
348 my ($self, $data) = @_; 378 my ($self, $data) = @_;
349 379
350 $self->{map}->map1a_update ($data); 380 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
351 $self->{map_widget}->update; 381 $self->{map_widget}->update;
352} 382}
353 383
354sub magicmap { 384sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 385 my ($self, $w, $h, $x, $y, $data) = @_;
… …
364 or return; 394 or return;
365 395
366 my ($hash, $x, $y, $w, $h) = @$map_info; 396 my ($hash, $x, $y, $w, $h) = @$map_info;
367 397
368 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 398 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
369 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 399 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
370 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 400 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
371} 401}
372 402
373sub map_clear { 403sub map_clear {
374 my ($self) = @_; 404 my ($self) = @_;
… …
378 408
379 $self->{map}->clear; 409 $self->{map}->clear;
380 delete $self->{map_widget}{magicmap}; 410 delete $self->{map_widget}{magicmap};
381} 411}
382 412
413sub bg_fetch {
414 my ($self) = @_;
415
416 my $id;
417
418 do {
419 $id = pop @{$self->{bg_fetch}}
420 or return;
421 } while $self->{texture}[$id];
422
423 CFPlus::DB::get tilecache => $id, sub {
424 my ($data) = @_;
425
426 return unless $self->{map}; # stop when destroyed
427
428 $self->set_texture ($id => $data)
429 if defined $data;
430
431 $self->bg_fetch;
432 };
433}
383 434
384sub load_map($$$) { 435sub load_map($$$) {
385 my ($self, $hash, $x, $y) = @_; 436 my ($self, $hash, $x, $y) = @_;
386 437
387 if (defined (my $data = $self->{mapcache}->get ($hash))) { 438 my $gen = $self->{map_change_gen};
439
440 CFPlus::DB::get $self->{mapcache} => $hash, sub {
441 return unless $gen == $self->{map_change_gen};
442
443 my ($data) = @_;
444
445 if (defined $data) {
388 $data = Compress::LZF::decompress $data; 446 $data = Compress::LZF::decompress $data;
389 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 447 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
390 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
391 my $data = $self->{tilecache}->get ($id)
392 or next;
393 448
394 $self->set_texture ($id => $data); 449 my $inprogress = @{ $self->{bg_fetch} || [] };
450 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
451 $self->bg_fetch unless $inprogress;
395 } 452 }
396 } 453 };
397} 454}
398 455
399# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 456# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400# (server resource,s latency, bandwidth), so this hack is warranted. 457# (server resource,s latency, bandwidth), so this hack is warranted.
401# the right fix is to make real tiled maps with an overview file 458# the right fix is to make real tiled maps with an overview file
… …
465 522
466 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 523 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
467 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 524 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
468 525
469 } else { 526 } else {
527 my $gen = $self->{map_change_gen};
470 $self->send_mapinfo ("spatial $path$tile", sub { 528 $self->send_mapinfo ("spatial $path$tile", sub {
529 return unless $gen == $self->{map_change_gen};
530
471 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 531 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
472 532
473 return if $mode ne "spatial"; 533 return if $mode ne "spatial";
474 534
475 $x += $self->{map}->ox; 535 $x += $self->{map}->ox;
… …
489 549
490sub map_change { 550sub map_change {
491 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 551 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
492 552
493 $self->flush_map; 553 $self->flush_map;
554
555 ++$self->{map_change_gen};
494 556
495 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 557 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
496 558
497 my $mapmapw = $self->{mapmap}->{w}; 559 my $mapmapw = $self->{mapmap}->{w};
498 my $mapmaph = $self->{mapmap}->{h}; 560 my $mapmaph = $self->{mapmap}->{h};
… …
515 $self->load_map ($hash, $x, $y); 577 $self->load_map ($hash, $x, $y);
516 $self->flood_fill (0, 0, 0, "", $hash, $flags); 578 $self->flood_fill (0, 0, 0, "", $hash, $flags);
517} 579}
518 580
519sub face_find { 581sub face_find {
520 my ($self, $facenum, $face) = @_; 582 my ($self, $facenum, $face, $cb) = @_;
521 583
522 my $hash = "$face->{chksum},$face->{name}"; 584 my $hash = "$face->{chksum},$face->{name}";
523 585
524 my $id = $self->{facemap}->get ($hash); 586 my $id = CFPlus::DB::get_tile_id_sync $hash;
525 587
526 unless ($id) {
527 # create new id for face
528 # I love transactions
529 for (1..100) {
530 my $txn = $CFPlus::DB_ENV->txn_begin;
531 my $status = $self->{facemap}->db_get (id => $id);
532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
533 $id = ($id || 64) + 1;
534 if ($self->{facemap}->put (id => $id) == 0
535 && $self->{facemap}->put ($hash => $id) == 0) {
536 $txn->txn_commit;
537
538 goto gotid;
539 }
540 }
541 $txn->txn_abort;
542 }
543
544 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
545 }
546
547gotid:
548 $face->{id} = $id; 588 $face->{id} = $id;
549 $self->{map}->set_face ($facenum => $id);
550 $self->{faceid}[$facenum] = $id;#d# 589 $self->{faceid}[$facenum] = $id;
551 590
552 my $face = $self->{tilecache}->get ($id); 591 $self->{map}->set_tileid ($facenum => $id);
553 592
554 if ($face) { 593 CFPlus::DB::get tilecache => $id, $cb;
555 #$self->face_prefetch;
556 $face
557 } else {
558 my $tex = $self->{noface};
559 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
560 undef
561 };
562} 594}
563 595
564sub face_update { 596sub face_update {
565 my ($self, $facenum, $face, $changed) = @_; 597 my ($self, $facenum, $face, $changed) = @_;
566 598
567 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 599 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
600 if $changed;
568 601
569 $self->set_texture ($face->{id} => delete $face->{image}); 602 $self->set_texture ($face->{id} => delete $face->{image});
603}
604
605sub smooth_update {
606 my ($self, $facenum, $face) = @_;
607
608 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
570} 609}
571 610
572sub set_texture { 611sub set_texture {
573 my ($self, $id, $data) = @_; 612 my ($self, $id, $data) = @_;
574 613
575 $self->{texture}[$id] ||= do { 614 $self->{texture}[$id] = my $tex =
576 my $tex =
577 new_from_image CFPlus::Texture 615 new_from_image CFPlus::Texture
578 $data, minify => 1, mipmap => 1; 616 $data, minify => 1, mipmap => 1;
579 617
580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 618 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
581 $self->{map_widget}->update; 619 $self->{map_widget}->update;
582
583 $tex
584 };
585} 620}
586 621
587sub sound_play { 622sub sound_play {
588 my ($self, $x, $y, $soundnum, $type) = @_; 623 my ($self, $x, $y, $soundnum, $type) = @_;
589 624
… …
599 $LAST_QUERY = $prompt; 634 $LAST_QUERY = $prompt;
600 635
601 $self->{query}-> ($self, $flags, $prompt); 636 $self->{query}-> ($self, $flags, $prompt);
602} 637}
603 638
639our @CF_COLOR = (
640 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
641 [1.00, 1.00, 1.00],
642 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
643 [1.00, 0.00, 0.00],
644 [1.00, 0.54, 0.00],
645 [0.11, 0.56, 1.00],
646 [0.93, 0.46, 0.00],
647 [0.18, 0.54, 0.34],
648 [0.56, 0.73, 0.56],
649 [0.80, 0.80, 0.80],
650 [0.75, 0.61, 0.20],
651 [0.99, 0.77, 0.26],
652 [0.74, 0.65, 0.41],
653);
654
604sub drawinfo { 655sub drawinfo {
605 my ($self, $color, $text) = @_; 656 my ($self, $color, $text) = @_;
606 657
607 my @color = ( 658 my $fg = $CF_COLOR[$color % @CF_COLOR];
608 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
609 [1.00, 1.00, 1.00],
610 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
611 [1.00, 0.00, 0.00],
612 [1.00, 0.54, 0.00],
613 [0.11, 0.56, 1.00],
614 [0.93, 0.46, 0.00],
615 [0.18, 0.54, 0.34],
616 [0.56, 0.73, 0.56],
617 [0.80, 0.80, 0.80],
618 [0.75, 0.61, 0.20],
619 [0.99, 0.77, 0.26],
620 [0.74, 0.65, 0.41],
621 );
622 659
623 $self->logprint ("info: ", $text); 660 $self->logprint ("info: ", $text);
624 661
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
626
627 # try to create single paragraphs of multiple lines sent by the server 662 ## try to create single paragraphs of multiple lines sent by the server
663 # no longer neecssary with TRT servers
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 664 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
629 665
630 $text = CFPlus::asxml $text; 666 $text = CFPlus::asxml $text;
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 667 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 668 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 669
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 670 ::message ({ fg => $fg, markup => $_ })
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 671 for split /\n/, $text;
636 $self->{logview}->scroll_to_bottom;
637 672
638 $self->{statusbox}->add ($text, 673 $self->{statusbox}->add ($text,
639 group => $text, 674 group => $text,
640 fg => $color[$color], 675 fg => $fg,
641 timeout => $color >= 2 ? 60 : 10, 676 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 677 tooltip_font => $::FONT_FIXED,
643 ); 678 );
644} 679}
645 680
646sub drawextinfo { 681sub drawextinfo {
… …
655 # try to create single paragraphs out of the multiple lines sent by the server 690 # try to create single paragraphs out of the multiple lines sent by the server
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 691 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 692 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 693 $spell->{message} ||= "Server did not provide a description for this spell.";
659 694
660 $::SPELL_PAGE->add_spell ($spell); 695 $::SPELL_LIST->add_spell ($spell);
661 696
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 697 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 698 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 699}
665 700
666sub spell_delete { 701sub spell_delete {
667 my ($self, $spell) = @_; 702 my ($self, $spell) = @_;
668 703
669 $::SPELL_PAGE->remove_spell ($spell); 704 $::SPELL_LIST->remove_spell ($spell);
705}
706
707sub setup {
708 my ($self, $setup) = @_;
709
710 $self->{map_widget}->set_tilesize ($self->{tilesize});
711 $::MAP->resize ($self->{mapw}, $self->{maph});
670} 712}
671 713
672sub addme_success { 714sub addme_success {
673 my ($self) = @_; 715 my ($self) = @_;
674 716
675 my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676 my ($pom) = @_;
677
678 my %skill_help; 717 my %skill_help;
679 718
680 for my $head2 ($pom->head1->[3]->head2) { 719 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content; 720 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 721 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 722 };
686 723
687 for my $skill (values %{$self->{skill_info}}) { 724 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 725 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFPlus::asxml "Ready the skill '$skill'\n\n") 726 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 727 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 728 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 729 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 730 . $skill_help{$skill});
694 } 731 }
695} 732}
696 733
697sub eof { 734sub eof {
698 my ($self) = @_; 735 my ($self) = @_;
… …
885 $::SERVER_INFO->set_markup ( 922 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 923 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 924 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 925 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 926 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
927 . "editing support $yesno[!!$self->{editor_support}]\n"
928 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 929 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 930 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 931 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 932 );
933
934 ::setup_build_button ($self->{editor_support}->{builder_ui});
894} 935}
895 936
896sub logged_in { 937sub logged_in {
897 my ($self) = @_; 938 my ($self) = @_;
898 939
899 $self->send_ext_req (cfplus_support => "1", sub { 940 $self->send_ext_req (cfplus_support => version => 1, sub {
900 $self->{cfplus_ext} = $_[0]; 941 $self->{cfplus_ext} = $_[0]{version};
901 $self->update_server_info; 942 $self->update_server_info;
943
944 if ($self->{cfplus_ext} >= 2) {
945 $self->send_ext_req ("editor_support", sub {
946 $self->{editor_support} = $_[0];
947 $self->update_server_info;
948
949 0
950 });
951 }
952
953 0
902 }); 954 });
903 955
904 $self->update_server_info; 956 $self->update_server_info;
905 957
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 958 $self->send_command ("output-sync $::CFG->{output_sync}");
907 $self->send_command ("output-count $::CFG->{output_count}"); 959 $self->send_command ("output-count $::CFG->{output_count}");
960 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
908 $self->send_command ("pickup $::CFG->{pickup}"); 961 $self->send_command ("pickup $::CFG->{pickup}");
962}
963
964sub buildat {
965 my ($self, $builditem, $x, $y) = @_;
966
967 if ($self->{cfplus_ext}) {
968 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
969 }
909} 970}
910 971
911sub lookat { 972sub lookat {
912 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
913 974
914 if ($self->{cfplus_ext}) { 975 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 976 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
916 my %res = split /\x00/, $_[0]; 977 my ($msg) = @_;
917 978
918 if (exists $res{npc_dialog}) { 979 if (exists $msg->{npc_dialog}) {
919 # start npc chat dialog 980 # start npc chat dialog
920 $self->{npc_dialog} = new CFPlus::NPCDialog:: 981 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 982 dx => $x,
922 dy => $y, 983 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 984 title => "$msg->{npc_dialog} (NPC)",
924 conn => $self, 985 conn => $self,
925 ; 986 ;
926 } 987 }
927 }); 988 });
928 } 989 }
… …
931} 992}
932 993
933sub destroy { 994sub destroy {
934 my ($self) = @_; 995 my ($self) = @_;
935 996
936 $self->{npc_dialog}->destroy 997 (delete $self->{npc_dialog})->destroy
937 if $self->{npc_dialog}; 998 if $self->{npc_dialog};
938 999
939 $self->SUPER::destroy; 1000 $self->SUPER::destroy;
940} 1001}
941 1002
942package CFPlus::NPCDialog; 1003package CFPlus::NPCDialog;
943 1004
944our @ISA = 'CFPlus::UI::FancyFrame'; 1005our @ISA = 'CFPlus::UI::Toplevel';
945 1006
946sub new { 1007sub new {
947 my $class = shift; 1008 my $class = shift;
948 1009
949 my $self = $class->SUPER::new ( 1010 my $self = $class->SUPER::new (
… …
956 kw => { hi => 0, yes => 0, no => 0 }, 1017 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1, 1018 has_close_button => 1,
958 @_, 1019 @_,
959 ); 1020 );
960 1021
961 Scalar::Util::weaken (my $this = $self); 1022 CFPlus::weaken (my $this = $self);
962 1023
963 $self->connect (delete => sub { $this->destroy; 1 }); 1024 $self->connect (delete => sub { $this->destroy; 1 });
964 1025
965 # better use a pane... 1026 # better use a pane...
966 $self->add (my $hbox = new CFPlus::UI::HBox); 1027 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
968 1029
969 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1030 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 1031
971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1032 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1033 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
973 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1034 tooltip => "#npc_message_entry",
974 . "Sometimes you have to tell an NPC something you cannot find out during "
975 . "a normal conversation (such as a password). In those cases you have to use "
976 . "this text entry. You can also enter responses manually instead of using the response "
977 . "buttons below.",
978 on_activate => sub { 1035 on_activate => sub {
979 my ($entry, $text) = @_; 1036 my ($entry, $text) = @_;
980 1037
981 return unless $text =~ /\S/; 1038 return unless $text =~ /\S/;
982 1039
… …
995 on_activate => sub { $this->destroy; 1 }, 1052 on_activate => sub { $this->destroy; 1 },
996 ; 1053 ;
997 1054
998 $self->update_options; 1055 $self->update_options;
999 1056
1000 $self->{token} = $self->{conn}->ext_token; 1057 $self->{id} = $self->{conn}->send_ext_req (
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1058 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1059 sub { $this && $this->feed (@_) }
1060 );
1003 1061
1004 $self->{entry}->grab_focus; 1062 $self->{entry}->grab_focus;
1005 1063
1006 $self->{textview}->add_paragraph ({ 1064 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 1065 fg => [1, 1, 0, 1],
… …
1013}; 1071};
1014 1072
1015sub update_options { 1073sub update_options {
1016 my ($self) = @_; 1074 my ($self) = @_;
1017 1075
1018 Scalar::Util::weaken $self; 1076 CFPlus::weaken $self;
1019 1077
1020 $self->{options}->clear; 1078 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1079 $self->{options}->add ($self->{bye_button});
1022 1080
1023 for my $kw (sort keys %{ $self->{kw} }) { 1081 for my $kw (sort keys %{ $self->{kw} }) {
… …
1030 ); 1088 );
1031 } 1089 }
1032} 1090}
1033 1091
1034sub feed { 1092sub feed {
1035 my ($self, $data) = @_; 1093 my ($self, $msg) = @_;
1036 1094
1037 Scalar::Util::weaken $self; 1095 CFPlus::weaken $self;
1038 1096
1039 my ($type, $msg) = split / /, $data, 2; 1097 if ($msg->{msgtype} eq "reply") {
1098 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1099 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1040 1100
1041 if ($type eq "msg") {
1042 my ($msg, @kw) = split /\x00/, $msg;
1043
1044 utf8::decode $_ for ($msg, @kw);
1045
1046 $self->{kw}{$_} = 1 for @kw;
1047
1048 $msg = "\n" . CFPlus::UI::asxml $msg; 1101 my $text = "\n" . CFPlus::asxml $msg->{msg};
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1102 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1103 my @link;
1051 $msg =~ s{ 1104 $text =~ s{
1052 ($match) 1105 ($match)
1053 }{ 1106 }{
1054 my $kw = $1; 1107 my $kw = $1;
1055 1108
1056 push @link, new CFPlus::UI::Label 1109 push @link, new CFPlus::UI::Label
… …
1061 padding_y => 0, 1114 padding_y => 0,
1062 on_button_up => sub { 1115 on_button_up => sub {
1063 $self->send ($kw); 1116 $self->send ($kw);
1064 }; 1117 };
1065 1118
1066 chr 0xfffc 1119 "\x{fffc}"
1067 }giex; 1120 }giex;
1068 1121
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1122 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1123 $self->{textview}->scroll_to_bottom;
1071 $self->update_options; 1124 $self->update_options;
1072 } else { 1125 } else {
1073 $self->destroy; 1126 $self->destroy;
1074 } 1127 }
… …
1080 my ($self, $msg) = @_; 1133 my ($self, $msg) = @_;
1081 1134
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1135 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1136 $self->{textview}->scroll_to_bottom;
1084 1137
1085 utf8::encode $msg; 1138 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1087} 1139}
1088 1140
1089sub destroy { 1141sub destroy {
1090 my ($self) = @_; 1142 my ($self) = @_;
1091 1143
1092 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1144 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093 1145
1146 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1147 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1148 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1149 $self->{conn}->disconnect_ext ($self->{id});
1150 }
1097 1151
1098 $self->SUPER::destroy; 1152 $self->SUPER::destroy;
1099} 1153}
1100 1154
11011 11551
1156

Diff Legend

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