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.72 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.102 by root, Wed Apr 18 18:16:16 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 %{$arg{setup_req} || {}},
26 },
27 );
18 28
19 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
20 30
21 my @cmd_help = map { 31 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 43 for @args;
34 44
35 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
37 @args 47 @args
48 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 49 CFPlus::Pod::find command => "*";
39 50
51 $self->connect_ext (event_capabilities => sub {
52 my ($cap) = @_;
53
54 if (my $ts = $cap->{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]);
59
60 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize};
62
63 $self->setup_req (mapsize => "${w}x${h}");
64 }
65 }
66 });
67
40 $self->{map_widget}->add_command (@$_) 68 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 69 for @cmd_help;
42 70
71 {
72 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
73 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
74 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
75 }
76
77 {
43 $self->{noface} = new_from_file CFPlus::Texture 78 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 79 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
80 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
81 }
45 82
46 $self->{open_container} = 0; 83 $self->{open_container} = 0;
47 84
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 85 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 86 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 87
55 $self 88 $self
56} 89}
57 90
58sub logprint { 91sub logprint {
… …
258 291
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 292 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 293
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 294 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
262 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 295 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 296
265 my ($x, $y) = (0, 1); 297 my ($x, $y) = (0, 1);
266 for ( 298 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 299 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 300 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 309 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 310 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 311 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 312 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 313 } elsif ($ev->{button} == 3) {
314 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 315 (new CFPlus::UI::Menu
283 items => [ 316 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 317 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
285 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 318 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286 ], 319 ],
287 )->popup ($ev); 320 )->popup ($ev);
288 } else { 321 } else {
289 return 0; 322 return 0;
290 } 323 }
… …
294 327
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 328 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 329 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 330 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 331 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 332 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
333 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
300 334
301 $x++ and ($x, $y) = (0, $y + 1); 335 $x++ and ($x, $y) = (0, $y + 1);
302 } 336 }
303 } 337 }
304 338
… …
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 342 }
309} 343}
310 344
345sub macro_send {
346 my ($self, $macro) = @_;
347
348 for my $cmd (@{ $macro->{action} }) {
349 $self->send_command ($cmd);
350 }
351}
352
311sub user_send { 353sub user_send {
312 my ($self, $command) = @_; 354 my ($self, $command) = @_;
313 355
356 $self->{record}->($command)
314 if ($self->{record}) { 357 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 358
318 $self->logprint ("send: ", $command); 359 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 360 $self->send_command ($command);
320 ::status ($command); 361 ::status ($command);
321} 362}
322 363
323sub start_record { 364sub record {
324 my ($self) = @_; 365 my ($self, $cb) = @_;
325 366
326 $self->{record} = []; 367 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 368}
333 369
334sub map_scroll { 370sub map_scroll {
335 my ($self, $dx, $dy) = @_; 371 my ($self, $dx, $dy) = @_;
336 372
… …
338} 374}
339 375
340sub feed_map1a { 376sub feed_map1a {
341 my ($self, $data) = @_; 377 my ($self, $data) = @_;
342 378
343 $self->{map}->map1a_update ($data); 379 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 380 $self->{map_widget}->update;
345} 381}
346 382
347sub magicmap { 383sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 384 my ($self, $w, $h, $x, $y, $data) = @_;
… …
357 or return; 393 or return;
358 394
359 my ($hash, $x, $y, $w, $h) = @$map_info; 395 my ($hash, $x, $y, $w, $h) = @$map_info;
360 396
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 397 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 398 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 399 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 400}
365 401
366sub map_clear { 402sub map_clear {
367 my ($self) = @_; 403 my ($self) = @_;
… …
371 407
372 $self->{map}->clear; 408 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 409 delete $self->{map_widget}{magicmap};
374} 410}
375 411
412sub bg_fetch {
413 my ($self) = @_;
414
415 my $id;
416
417 do {
418 $id = pop @{$self->{bg_fetch}}
419 or return;
420 } while $self->{texture}[$id];
421
422 CFPlus::DB::get tilecache => $id, sub {
423 my ($data) = @_;
424
425 return unless $self->{map}; # stop when destroyed
426
427 $self->set_texture ($id => $data)
428 if defined $data;
429
430 $self->bg_fetch;
431 };
432}
376 433
377sub load_map($$$) { 434sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 435 my ($self, $hash, $x, $y) = @_;
379 436
380 if (defined (my $data = $self->{mapcache}->get ($hash))) { 437 my $gen = $self->{map_change_gen};
438
439 CFPlus::DB::get $self->{mapcache} => $hash, sub {
440 return unless $gen == $self->{map_change_gen};
441
442 my ($data) = @_;
443
444 if (defined $data) {
381 $data = Compress::LZF::decompress $data; 445 $data = Compress::LZF::decompress $data;
382 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 446 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
383 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
384 my $data = $self->{tilecache}->get ($id)
385 or next;
386 447
387 $self->set_texture ($id => $data); 448 my $inprogress = @{ $self->{bg_fetch} || [] };
449 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
450 $self->bg_fetch unless $inprogress;
388 } 451 }
389 } 452 };
390} 453}
391 454
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 455# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 456# (server resource,s latency, bandwidth), so this hack is warranted.
394# the right fix is to make real tiled maps with an overview file 457# the right fix is to make real tiled maps with an overview file
… …
458 521
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 522 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 523 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 524
462 } else { 525 } else {
526 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 527 $self->send_mapinfo ("spatial $path$tile", sub {
528 return unless $gen == $self->{map_change_gen};
529
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 530 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 531
466 return if $mode ne "spatial"; 532 return if $mode ne "spatial";
467 533
468 $x += $self->{map}->ox; 534 $x += $self->{map}->ox;
… …
482 548
483sub map_change { 549sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 550 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 551
486 $self->flush_map; 552 $self->flush_map;
553
554 ++$self->{map_change_gen};
487 555
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 556 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 557
490 my $mapmapw = $self->{mapmap}->{w}; 558 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 559 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 576 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 577 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 578}
511 579
512sub face_find { 580sub face_find {
513 my ($self, $facenum, $face) = @_; 581 my ($self, $facenum, $face, $cb) = @_;
514 582
515 my $hash = "$face->{chksum},$face->{name}"; 583 my $hash = "$face->{chksum},$face->{name}";
516 584
517 my $id = $self->{facemap}->get ($hash); 585 my $id = CFPlus::DB::get_tile_id_sync $hash;
518 586
519 unless ($id) {
520 # create new id for face
521 # I love transactions
522 for (1..100) {
523 my $txn = $CFPlus::DB_ENV->txn_begin;
524 my $status = $self->{facemap}->db_get (id => $id);
525 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
526 $id = ($id || 64) + 1;
527 if ($self->{facemap}->put (id => $id) == 0
528 && $self->{facemap}->put ($hash => $id) == 0) {
529 $txn->txn_commit;
530
531 goto gotid;
532 }
533 }
534 $txn->txn_abort;
535 }
536
537 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
538 }
539
540gotid:
541 $face->{id} = $id; 587 $face->{id} = $id;
542 $self->{map}->set_face ($facenum => $id);
543 $self->{faceid}[$facenum] = $id;#d# 588 $self->{faceid}[$facenum] = $id;
544 589
545 my $face = $self->{tilecache}->get ($id); 590 $self->{map}->set_tileid ($facenum => $id);
546 591
547 if ($face) { 592 CFPlus::DB::get tilecache => $id, $cb;
548 #$self->face_prefetch;
549 $face
550 } else {
551 my $tex = $self->{noface};
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 undef
554 };
555} 593}
556 594
557sub face_update { 595sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 596 my ($self, $facenum, $face, $changed) = @_;
559 597
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 598 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
599 if $changed;
561 600
562 $self->set_texture ($face->{id} => delete $face->{image}); 601 $self->set_texture ($face->{id} => delete $face->{image});
602}
603
604sub smooth_update {
605 my ($self, $facenum, $face) = @_;
606
607 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
563} 608}
564 609
565sub set_texture { 610sub set_texture {
566 my ($self, $id, $data) = @_; 611 my ($self, $id, $data) = @_;
567 612
568 $self->{texture}[$id] ||= do { 613 $self->{texture}[$id] = my $tex =
569 my $tex =
570 new_from_image CFPlus::Texture 614 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1; 615 $data, minify => 1, mipmap => 1;
572 616
573 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
574 $self->{map_widget}->update; 618 $self->{map_widget}->update;
575
576 $tex
577 };
578} 619}
579 620
580sub sound_play { 621sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 622 my ($self, $x, $y, $soundnum, $type) = @_;
582 623
… …
611 [0.75, 0.61, 0.20], 652 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 653 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 654 [0.74, 0.65, 0.41],
614 ); 655 );
615 656
657 my $fg = $color[$color % @color];
658
616 $self->logprint ("info: ", $text); 659 $self->logprint ("info: ", $text);
617 660
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
619
620 # try to create single paragraphs of multiple lines sent by the server 661 ## try to create single paragraphs of multiple lines sent by the server
662 # no longer neecssary with TRT servers
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 663 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 664
623 $text = CFPlus::asxml $text; 665 $text = CFPlus::asxml $text;
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 666 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 667 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 668
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 669 ::message ({ fg => $fg, markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 670 for split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630 671
631 $self->{statusbox}->add ($text, 672 $self->{statusbox}->add ($text,
632 group => $text, 673 group => $text,
633 fg => $color[$color], 674 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 675 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 676 tooltip_font => $::FONT_FIXED,
636 ); 677 );
637} 678}
638 679
… …
648 # try to create single paragraphs out of the multiple lines sent by the server 689 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 690 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 691 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 692 $spell->{message} ||= "Server did not provide a description for this spell.";
652 693
653 $::SPELL_PAGE->add_spell ($spell); 694 $::SPELL_LIST->add_spell ($spell);
654 695
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 696 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
656 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 697 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 698}
658 699
659sub spell_delete { 700sub spell_delete {
660 my ($self, $spell) = @_; 701 my ($self, $spell) = @_;
661 702
662 $::SPELL_PAGE->remove_spell ($spell); 703 $::SPELL_LIST->remove_spell ($spell);
704}
705
706sub setup {
707 my ($self, $setup) = @_;
708
709 $self->{map_widget}->set_tilesize ($self->{tilesize});
710 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 711}
664 712
665sub addme_success { 713sub addme_success {
666 my ($self) = @_; 714 my ($self) = @_;
667 715
… …
873 $::SERVER_INFO->set_markup ( 921 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 922 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 923 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 924 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 925 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
926 . "editing support $yesno[!!$self->{editor_support}]\n"
927 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 928 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 929 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 930 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 931 );
932
933 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 934}
883 935
884sub logged_in { 936sub logged_in {
885 my ($self) = @_; 937 my ($self) = @_;
886 938
887 $self->send_ext_req (cfplus_support => version => 1, sub { 939 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 940 $self->{cfplus_ext} = $_[0]{version};
889 $self->update_server_info; 941 $self->update_server_info;
890 942
943 if ($self->{cfplus_ext} >= 2) {
944 $self->send_ext_req ("editor_support", sub {
945 $self->{editor_support} = $_[0];
946 $self->update_server_info;
947
948 0
949 });
950 }
951
891 0 952 0
892 }); 953 });
893 954
894 $self->update_server_info; 955 $self->update_server_info;
895 956
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 957 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 958 $self->send_command ("output-count $::CFG->{output_count}");
959 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 960 $self->send_command ("pickup $::CFG->{pickup}");
961}
962
963sub buildat {
964 my ($self, $builditem, $x, $y) = @_;
965
966 if ($self->{cfplus_ext}) {
967 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
968 }
899} 969}
900 970
901sub lookat { 971sub lookat {
902 my ($self, $x, $y) = @_; 972 my ($self, $x, $y) = @_;
903 973
… …
921} 991}
922 992
923sub destroy { 993sub destroy {
924 my ($self) = @_; 994 my ($self) = @_;
925 995
926 $self->{npc_dialog}->destroy 996 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 997 if $self->{npc_dialog};
928 998
929 $self->SUPER::destroy; 999 $self->SUPER::destroy;
930} 1000}
931 1001
932package CFPlus::NPCDialog; 1002package CFPlus::NPCDialog;
933 1003
934our @ISA = 'CFPlus::UI::FancyFrame'; 1004our @ISA = 'CFPlus::UI::Toplevel';
935 1005
936sub new { 1006sub new {
937 my $class = shift; 1007 my $class = shift;
938 1008
939 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1016 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1017 has_close_button => 1,
948 @_, 1018 @_,
949 ); 1019 );
950 1020
951 Scalar::Util::weaken (my $this = $self); 1021 CFPlus::weaken (my $this = $self);
952 1022
953 $self->connect (delete => sub { $this->destroy; 1 }); 1023 $self->connect (delete => sub { $this->destroy; 1 });
954 1024
955 # better use a pane... 1025 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1026 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
958 1028
959 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1029 $hbox->add (my $vbox = new CFPlus::UI::VBox);
960 1030
961 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1031 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
962 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1032 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
963 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1033 tooltip => "#npc_message_entry",
964 . "Sometimes you have to tell an NPC something you cannot find out during "
965 . "a normal conversation (such as a password). In those cases you have to use "
966 . "this text entry. You can also enter responses manually instead of using the response "
967 . "buttons below.",
968 on_activate => sub { 1034 on_activate => sub {
969 my ($entry, $text) = @_; 1035 my ($entry, $text) = @_;
970 1036
971 return unless $text =~ /\S/; 1037 return unless $text =~ /\S/;
972 1038
… …
1004}; 1070};
1005 1071
1006sub update_options { 1072sub update_options {
1007 my ($self) = @_; 1073 my ($self) = @_;
1008 1074
1009 Scalar::Util::weaken $self; 1075 CFPlus::weaken $self;
1010 1076
1011 $self->{options}->clear; 1077 $self->{options}->clear;
1012 $self->{options}->add ($self->{bye_button}); 1078 $self->{options}->add ($self->{bye_button});
1013 1079
1014 for my $kw (sort keys %{ $self->{kw} }) { 1080 for my $kw (sort keys %{ $self->{kw} }) {
… …
1023} 1089}
1024 1090
1025sub feed { 1091sub feed {
1026 my ($self, $msg) = @_; 1092 my ($self, $msg) = @_;
1027 1093
1028 Scalar::Util::weaken $self; 1094 CFPlus::weaken $self;
1029 1095
1030 if ($msg->{msgtype} eq "reply") { 1096 if ($msg->{msgtype} eq "reply") {
1031 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1097 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1032 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1098 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1033 1099
… …
1047 padding_y => 0, 1113 padding_y => 0,
1048 on_button_up => sub { 1114 on_button_up => sub {
1049 $self->send ($kw); 1115 $self->send ($kw);
1050 }; 1116 };
1051 1117
1052 chr 0xfffc 1118 "\x{fffc}"
1053 }giex; 1119 }giex;
1054 1120
1055 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1121 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1056 $self->{textview}->scroll_to_bottom; 1122 $self->{textview}->scroll_to_bottom;
1057 $self->update_options; 1123 $self->update_options;
… …
1084 1150
1085 $self->SUPER::destroy; 1151 $self->SUPER::destroy;
1086} 1152}
1087 1153
10881 11541
1155

Diff Legend

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