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.73 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.105 by root, Tue Apr 24 01:13:15 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 = map { 32 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 33 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 44 for @args;
34 45
35 map ["$cmd$_", $text], 46 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 47 sort { (length $a) <=> (length $b) }
37 @args 48 @args
49 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 50 CFPlus::Pod::find command => "*";
39 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 }
66 }
67 });
68
40 $self->{map_widget}->add_command (@$_) 69 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 70 for @cmd_help;
42 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 {
43 $self->{noface} = new_from_file CFPlus::Texture 79 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 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 }
45 83
46 $self->{open_container} = 0; 84 $self->{open_container} = 0;
47 85
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 86 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 88
55 $self 89 $self
56} 90}
57 91
58sub logprint { 92sub logprint {
… …
258 292
259 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>";
260 294
261 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);
262 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);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 297
265 my ($x, $y) = (0, 1); 298 my ($x, $y) = (0, 1);
266 for ( 299 for (
267 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] }
268 map [$_, $self->{skill_info}{$_}], 301 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 310 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 311 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 312 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 313 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 314 } elsif ($ev->{button} == 3) {
315 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 316 (new CFPlus::UI::Menu
283 items => [ 317 items => [
284 ["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"] }],
285 ["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"] }],
286 ], 320 ],
287 )->popup ($ev); 321 )->popup ($ev);
288 } else { 322 } else {
289 return 0; 323 return 0;
290 } 324 }
… …
294 328
295 $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
296 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);
297 $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
298 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);
299 $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);
300 335
301 $x++ and ($x, $y) = (0, $y + 1); 336 $x++ and ($x, $y) = (0, $y + 1);
302 } 337 }
303 } 338 }
304 339
… …
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 341 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 342 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 343 }
309} 344}
310 345
346sub macro_send {
347 my ($self, $macro) = @_;
348
349 for my $cmd (@{ $macro->{action} }) {
350 $self->send_command ($cmd);
351 }
352}
353
311sub user_send { 354sub user_send {
312 my ($self, $command) = @_; 355 my ($self, $command) = @_;
313 356
357 $self->{record}->($command)
314 if ($self->{record}) { 358 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 359
318 $self->logprint ("send: ", $command); 360 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 361 $self->send_command ($command);
320 ::status ($command); 362 ::status ($command);
321} 363}
322 364
323sub start_record { 365sub record {
324 my ($self) = @_; 366 my ($self, $cb) = @_;
325 367
326 $self->{record} = []; 368 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 369}
333 370
334sub map_scroll { 371sub map_scroll {
335 my ($self, $dx, $dy) = @_; 372 my ($self, $dx, $dy) = @_;
336 373
… …
338} 375}
339 376
340sub feed_map1a { 377sub feed_map1a {
341 my ($self, $data) = @_; 378 my ($self, $data) = @_;
342 379
343 $self->{map}->map1a_update ($data); 380 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 381 $self->{map_widget}->update;
345} 382}
346 383
347sub magicmap { 384sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 385 my ($self, $w, $h, $x, $y, $data) = @_;
… …
357 or return; 394 or return;
358 395
359 my ($hash, $x, $y, $w, $h) = @$map_info; 396 my ($hash, $x, $y, $w, $h) = @$map_info;
360 397
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 398 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 399 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 400 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 401}
365 402
366sub map_clear { 403sub map_clear {
367 my ($self) = @_; 404 my ($self) = @_;
… …
371 408
372 $self->{map}->clear; 409 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 410 delete $self->{map_widget}{magicmap};
374} 411}
375 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}
376 434
377sub load_map($$$) { 435sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 436 my ($self, $hash, $x, $y) = @_;
379 437
380 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) {
381 $data = Compress::LZF::decompress $data; 446 $data = Compress::LZF::decompress $data;
382 #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#
383 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
384 my $data = $self->{tilecache}->get ($id)
385 or next;
386 448
387 $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;
388 } 452 }
389 } 453 };
390} 454}
391 455
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 456# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 457# (server resource,s latency, bandwidth), so this hack is warranted.
394# 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
… …
458 522
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 523 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 524 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 525
462 } else { 526 } else {
527 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 528 $self->send_mapinfo ("spatial $path$tile", sub {
529 return unless $gen == $self->{map_change_gen};
530
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 531 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 532
466 return if $mode ne "spatial"; 533 return if $mode ne "spatial";
467 534
468 $x += $self->{map}->ox; 535 $x += $self->{map}->ox;
… …
482 549
483sub map_change { 550sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 551 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 552
486 $self->flush_map; 553 $self->flush_map;
554
555 ++$self->{map_change_gen};
487 556
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 557 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 558
490 my $mapmapw = $self->{mapmap}->{w}; 559 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 560 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 577 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 578 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 579}
511 580
512sub face_find { 581sub face_find {
513 my ($self, $facenum, $face) = @_; 582 my ($self, $facenum, $face, $cb) = @_;
514 583
515 my $hash = "$face->{chksum},$face->{name}"; 584 my $hash = "$face->{chksum},$face->{name}";
516 585
517 my $id = $self->{facemap}->get ($hash); 586 my $id = CFPlus::DB::get_tile_id_sync $hash;
518 587
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; 588 $face->{id} = $id;
542 $self->{map}->set_face ($facenum => $id);
543 $self->{faceid}[$facenum] = $id;#d# 589 $self->{faceid}[$facenum] = $id;
544 590
545 my $face = $self->{tilecache}->get ($id); 591 $self->{map}->set_tileid ($facenum => $id);
546 592
547 if ($face) { 593 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} 594}
556 595
557sub face_update { 596sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 597 my ($self, $facenum, $face, $changed) = @_;
559 598
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 599 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
600 if $changed;
561 601
562 $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});
563} 609}
564 610
565sub set_texture { 611sub set_texture {
566 my ($self, $id, $data) = @_; 612 my ($self, $id, $data) = @_;
567 613
568 $self->{texture}[$id] ||= do { 614 $self->{texture}[$id] = my $tex =
569 my $tex =
570 new_from_image CFPlus::Texture 615 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1; 616 $data, minify => 1, mipmap => 1;
572 617
573 $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}});
574 $self->{map_widget}->update; 619 $self->{map_widget}->update;
575
576 $tex
577 };
578} 620}
579 621
580sub sound_play { 622sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 623 my ($self, $x, $y, $soundnum, $type) = @_;
582 624
… …
592 $LAST_QUERY = $prompt; 634 $LAST_QUERY = $prompt;
593 635
594 $self->{query}-> ($self, $flags, $prompt); 636 $self->{query}-> ($self, $flags, $prompt);
595} 637}
596 638
597sub drawinfo { 639our %NAME_TO_COLOR = (
598 my ($self, $color, $text) = @_; 640 black => 0,
641 white => 1,
642 darkblue => 2,
643 red => 3,
644 orange => 4,
645 lightblue => 5,
646 darkorange => 6,
647 green => 7,
648 darkgreen => 8,
649 grey => 9,
650 brown => 10,
651 yellow => 11,
652 tan => 12,
653);
599 654
600 my @color = ( 655our @CF_COLOR = (
601 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 656 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
602 [1.00, 1.00, 1.00], 657 [1.00, 1.00, 1.00],
603 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 658 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
604 [1.00, 0.00, 0.00], 659 [1.00, 0.00, 0.00],
605 [1.00, 0.54, 0.00], 660 [1.00, 0.54, 0.00],
606 [0.11, 0.56, 1.00], 661 [0.11, 0.56, 1.00],
607 [0.93, 0.46, 0.00], 662 [0.93, 0.46, 0.00],
608 [0.18, 0.54, 0.34], 663 [0.18, 0.54, 0.34],
609 [0.56, 0.73, 0.56], 664 [0.56, 0.73, 0.56],
610 [0.80, 0.80, 0.80], 665 [0.80, 0.80, 0.80],
611 [0.75, 0.61, 0.20], 666 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 667 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 668 [0.74, 0.65, 0.41],
614 ); 669);
615 670
671sub msg {
672 my ($self, $color, $type, $text, @extra) = @_;
673
674 if (my $cb = $self->{cb_msg}{$type}) {
675 $_->($self, $color, $type, $text, @extra) for values %$cb;
676 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
677 $type =~ s/-/_/g;
678 $self->{$type} = $text;
679 } else {
616 $self->logprint ("info: ", $text); 680 $self->logprint ("msg: ", $text);
681 return if $color < 0; # negative color == ignore if not understood
617 682
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 683 my $fg = $CF_COLOR[$color % @CF_COLOR];
619 684
620 # try to create single paragraphs of multiple lines sent by the server 685 ## try to create single paragraphs of multiple lines sent by the server
686 # no longer neecssary with TRT servers
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 687 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 688
623 $text = CFPlus::asxml $text; 689 ::message ({ fg => $fg, markup => $_ })
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 690 for split /\n/, $text;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 691
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630
631 $self->{statusbox}->add ($text, 692 $self->{statusbox}->add ($text,
632 group => $text, 693 group => $text,
633 fg => $color[$color], 694 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 695 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 696 tooltip_font => $::FONT_FIXED,
636 ); 697 );
637} 698 }
638
639sub drawextinfo {
640 my ($self, $color, $type, $subtype, $message) = @_;
641
642 $self->drawinfo ($color, $message);
643} 699}
644 700
645sub spell_add { 701sub spell_add {
646 my ($self, $spell) = @_; 702 my ($self, $spell) = @_;
647 703
648 # try to create single paragraphs out of the multiple lines sent by the server 704 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 705 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 706 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 707 $spell->{message} ||= "Server did not provide a description for this spell.";
652 708
653 $::SPELL_PAGE->add_spell ($spell); 709 $::SPELL_LIST->add_spell ($spell);
654 710
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 711 $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}); 712 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 713}
658 714
659sub spell_delete { 715sub spell_delete {
660 my ($self, $spell) = @_; 716 my ($self, $spell) = @_;
661 717
662 $::SPELL_PAGE->remove_spell ($spell); 718 $::SPELL_LIST->remove_spell ($spell);
719}
720
721sub setup {
722 my ($self, $setup) = @_;
723
724 $self->{map_widget}->set_tilesize ($self->{tilesize});
725 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 726}
664 727
665sub addme_success { 728sub addme_success {
666 my ($self) = @_; 729 my ($self) = @_;
667 730
… …
873 $::SERVER_INFO->set_markup ( 936 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 937 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 938 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 939 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 940 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
941 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
942 . "editing support $yesno[!!$self->{editor_support}]\n"
943 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
944 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 945 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 946 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 947 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 948 );
949
950 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 951}
883 952
884sub logged_in { 953sub logged_in {
885 my ($self) = @_; 954 my ($self) = @_;
886 955
887 $self->send_ext_req (cfplus_support => version => 1, sub { 956 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 957 $self->{cfplus_ext} = $_[0]{version};
889 $self->update_server_info; 958 $self->update_server_info;
890 959
960 if ($self->{cfplus_ext} >= 2) {
961 $self->send_ext_req ("editor_support", sub {
962 $self->{editor_support} = $_[0];
963 $self->update_server_info;
964
965 0
966 });
967 }
968
891 0 969 0
892 }); 970 });
893 971
894 $self->update_server_info; 972 $self->update_server_info;
895 973
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 974 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 975 $self->send_command ("output-count $::CFG->{output_count}");
976 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 977 $self->send_command ("pickup $::CFG->{pickup}");
978}
979
980sub buildat {
981 my ($self, $builditem, $x, $y) = @_;
982
983 if ($self->{cfplus_ext}) {
984 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
985 }
899} 986}
900 987
901sub lookat { 988sub lookat {
902 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
903 990
… …
921} 1008}
922 1009
923sub destroy { 1010sub destroy {
924 my ($self) = @_; 1011 my ($self) = @_;
925 1012
926 $self->{npc_dialog}->destroy 1013 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 1014 if $self->{npc_dialog};
928 1015
929 $self->SUPER::destroy; 1016 $self->SUPER::destroy;
930} 1017}
931 1018
932package CFPlus::NPCDialog; 1019package CFPlus::NPCDialog;
933 1020
934our @ISA = 'CFPlus::UI::FancyFrame'; 1021our @ISA = 'CFPlus::UI::Toplevel';
935 1022
936sub new { 1023sub new {
937 my $class = shift; 1024 my $class = shift;
938 1025
939 my $self = $class->SUPER::new ( 1026 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1033 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1034 has_close_button => 1,
948 @_, 1035 @_,
949 ); 1036 );
950 1037
951 Scalar::Util::weaken (my $this = $self); 1038 CFPlus::weaken (my $this = $self);
952 1039
953 $self->connect (delete => sub { $this->destroy; 1 }); 1040 $self->connect (delete => sub { $this->destroy; 1 });
954 1041
955 # better use a pane... 1042 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1043 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1000}; 1087};
1001 1088
1002sub update_options { 1089sub update_options {
1003 my ($self) = @_; 1090 my ($self) = @_;
1004 1091
1005 Scalar::Util::weaken $self; 1092 CFPlus::weaken $self;
1006 1093
1007 $self->{options}->clear; 1094 $self->{options}->clear;
1008 $self->{options}->add ($self->{bye_button}); 1095 $self->{options}->add ($self->{bye_button});
1009 1096
1010 for my $kw (sort keys %{ $self->{kw} }) { 1097 for my $kw (sort keys %{ $self->{kw} }) {
… …
1019} 1106}
1020 1107
1021sub feed { 1108sub feed {
1022 my ($self, $msg) = @_; 1109 my ($self, $msg) = @_;
1023 1110
1024 Scalar::Util::weaken $self; 1111 CFPlus::weaken $self;
1025 1112
1026 if ($msg->{msgtype} eq "reply") { 1113 if ($msg->{msgtype} eq "reply") {
1027 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1114 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1028 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1115 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1029 1116
… …
1043 padding_y => 0, 1130 padding_y => 0,
1044 on_button_up => sub { 1131 on_button_up => sub {
1045 $self->send ($kw); 1132 $self->send ($kw);
1046 }; 1133 };
1047 1134
1048 chr 0xfffc 1135 "\x{fffc}"
1049 }giex; 1136 }giex;
1050 1137
1051 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1138 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1052 $self->{textview}->scroll_to_bottom; 1139 $self->{textview}->scroll_to_bottom;
1053 $self->update_options; 1140 $self->update_options;
… …
1080 1167
1081 $self->SUPER::destroy; 1168 $self->SUPER::destroy;
1082} 1169}
1083 1170
10841 11711
1172

Diff Legend

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