| 1 | package DC::Protocol; |
1 | package DC::Protocol; |
| 2 | |
2 | |
| 3 | use utf8; |
3 | use utf8; |
| 4 | use strict; |
4 | use strict; |
|
|
5 | |
|
|
6 | use Guard (); |
| 5 | |
7 | |
| 6 | use Deliantra::Protocol::Constants; |
8 | use Deliantra::Protocol::Constants; |
| 7 | |
9 | |
| 8 | use DC; |
10 | use DC; |
| 9 | use DC::DB; |
11 | use DC::DB; |
| … | |
… | |
| 11 | use DC::Pod; |
13 | use DC::Pod; |
| 12 | use DC::Macro; |
14 | use DC::Macro; |
| 13 | use DC::Item; |
15 | use DC::Item; |
| 14 | |
16 | |
| 15 | use base 'Deliantra::Protocol::Base'; |
17 | use base 'Deliantra::Protocol::Base'; |
|
|
18 | |
|
|
19 | our $TEX_DIALOGUE = new_from_resource DC::Texture |
|
|
20 | "dialogue.png", minify => 1, mipmap => 1; |
|
|
21 | |
|
|
22 | our $TEX_NOFACE = new_from_resource DC::Texture |
|
|
23 | "noface.png", minify => 1, mipmap => 1; |
|
|
24 | |
|
|
25 | our $TEX_HIDDEN = new_from_resource DC::Texture |
|
|
26 | "hidden.png", minify => 1, mipmap => 1; |
|
|
27 | |
|
|
28 | sub MIN_TEXTURE_UNUSED() { 1 }#d# |
| 16 | |
29 | |
| 17 | sub new { |
30 | sub new { |
| 18 | my ($class, %arg) = @_; |
31 | my ($class, %arg) = @_; |
| 19 | |
32 | |
| 20 | my $self = $class->SUPER::new (%arg, |
33 | my $self = $class->SUPER::new (%arg, |
| … | |
… | |
| 27 | ); |
40 | ); |
| 28 | |
41 | |
| 29 | $self->{map_widget}->clr_commands; |
42 | $self->{map_widget}->clr_commands; |
| 30 | |
43 | |
| 31 | my @cmd_help = map { |
44 | my @cmd_help = map { |
| 32 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
45 | $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
| 33 | or die "unparseable command help: $_->{kw}[0]"; |
46 | or die "unparseable command help: $_->[DC::Pod::N_KW][0]"; |
| 34 | |
47 | |
| 35 | my $cmd = $1; |
48 | my $cmd = $1; |
| 36 | my @args = split /\|/, $2; |
49 | my @args = split /\|/, $2; |
| 37 | @args = (".*") unless @args; |
50 | @args = (".*") unless @args; |
| 38 | |
51 | |
| … | |
… | |
| 43 | for @args; |
56 | for @args; |
| 44 | |
57 | |
| 45 | map ["$cmd$_", $text], |
58 | map ["$cmd$_", $text], |
| 46 | sort { (length $a) <=> (length $b) } |
59 | sort { (length $a) <=> (length $b) } |
| 47 | @args |
60 | @args |
| 48 | } sort { $a->{par} <=> $b->{par} } |
61 | } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] } |
| 49 | DC::Pod::find command => "*"; |
62 | DC::Pod::find command => "*"; |
| 50 | |
63 | |
| 51 | $self->{json_coder} |
64 | $self->{json_coder} |
| 52 | ->convert_blessed |
65 | ->convert_blessed |
| 53 | ->filter_json_single_key_object ("\fw" => sub { |
66 | ->filter_json_single_key_object ("\fw" => sub { |
| … | |
… | |
| 64 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
77 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
| 65 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
78 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
| 66 | $_->destroy |
79 | $_->destroy |
| 67 | for values %{delete $ws->{w} || {}}; |
80 | for values %{delete $ws->{w} || {}}; |
| 68 | } |
81 | } |
|
|
82 | |
|
|
83 | delete $self->{items}; |
|
|
84 | $::INV->clear; |
|
|
85 | $::INVR->clear; |
|
|
86 | $::INVR_HB->clear; |
|
|
87 | $::FLOORBOX->clear; |
| 69 | }); |
88 | }); |
| 70 | |
89 | |
| 71 | $self->{map_widget}->add_command (@$_) |
90 | $self->{map_widget}->add_command (@$_) |
| 72 | for @cmd_help; |
91 | for @cmd_help; |
| 73 | |
92 | |
| 74 | { |
93 | { |
| 75 | $self->{dialogue} = my $tex = new_from_file DC::Texture |
94 | $self->{dialogue} = my $tex = $TEX_DIALOGUE; |
| 76 | DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
|
|
| 77 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
95 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 78 | } |
96 | } |
| 79 | |
97 | |
| 80 | { |
98 | { |
| 81 | $self->{noface} = my $tex = new_from_file DC::Texture |
99 | $self->{noface} = my $tex = $TEX_NOFACE; |
| 82 | DC::find_rcfile "noface.png", minify => 1, mipmap => 1; |
|
|
| 83 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
100 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 84 | } |
101 | } |
|
|
102 | |
|
|
103 | { |
|
|
104 | $self->{hidden} = my $tex = $TEX_HIDDEN; |
|
|
105 | $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
|
|
106 | } |
|
|
107 | |
|
|
108 | # $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id |
|
|
109 | # $self->{expire_w} = EV::timer 1, 1, sub { |
|
|
110 | # my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1; |
|
|
111 | # |
|
|
112 | # for ($self->{map}->expire_textures ($self->{expire_count}, $count)) { |
|
|
113 | # warn DC::SvREFCNT $self->{texture}[$_]; |
|
|
114 | # $self->{texture}[$_]->unload; |
|
|
115 | # warn "expire texture $_\n";#d# |
|
|
116 | # } |
|
|
117 | # |
|
|
118 | # ($self->{expire_count} += $count) < @{ $self->{texture} } |
|
|
119 | # or $self->{expire_count} = DC::DB::FIRST_TILE_ID; |
|
|
120 | # warn "count is $count\n";#d# |
|
|
121 | # }; |
| 85 | |
122 | |
| 86 | $self->{open_container} = 0; |
123 | $self->{open_container} = 0; |
| 87 | |
124 | |
| 88 | # per server |
125 | # per server |
| 89 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
126 | $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; |
| … | |
… | |
| 250 | my %wkw = ( |
287 | my %wkw = ( |
| 251 | root => $DC::UI::ROOT, |
288 | root => $DC::UI::ROOT, |
| 252 | tooltip => $DC::UI::TOOLTIP, |
289 | tooltip => $DC::UI::TOOLTIP, |
| 253 | |
290 | |
| 254 | mapwidget => $::MAPWIDGET, |
291 | mapwidget => $::MAPWIDGET, |
|
|
292 | menubar => $::MENUBAR, |
|
|
293 | menupopup => $::MENUPOPUP, |
|
|
294 | pickup_enable => $::PICKUP_ENABLE, |
| 255 | buttonbar => $::BUTTONBAR, |
295 | buttonbar => $::BUTTONBAR, |
| 256 | metaserver => $::METASERVER, |
296 | metaserver => $::METASERVER, |
| 257 | buttonbar => $::BUTTONBAR, |
297 | buttonbar => $::BUTTONBAR, |
| 258 | login_button => $::LOGIN_BUTTON, |
298 | login_button => $::LOGIN_BUTTON, |
| 259 | quit_dialog => $::QUIT_DIALOG, |
299 | quit_dialog => $::QUIT_DIALOG, |
| … | |
… | |
| 276 | |
316 | |
| 277 | floorbox => $::FLOORBOX, |
317 | floorbox => $::FLOORBOX, |
| 278 | help_window => $::HELP_WINDOW, |
318 | help_window => $::HELP_WINDOW, |
| 279 | message_window => $::MESSAGE_WINDOW, |
319 | message_window => $::MESSAGE_WINDOW, |
| 280 | message_dist => $::MESSAGE_DIST, |
320 | message_dist => $::MESSAGE_DIST, |
| 281 | statusbox => $::SDTATUSBOX, |
321 | statusbox => $::STATUSBOX, |
| 282 | |
322 | |
| 283 | inv => $::INV, |
323 | inv => $::INV, |
| 284 | invr => $::INVR, |
324 | invr => $::INVR, |
| 285 | invr_hb => $::INVR_HB, |
325 | invr_hb => $::INVR_HB, |
| 286 | ); |
326 | ); |
| … | |
… | |
| 483 | |
523 | |
| 484 | $::GAUGES->{hp} ->set_value ($hp, $hp_m); |
524 | $::GAUGES->{hp} ->set_value ($hp, $hp_m); |
| 485 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
525 | $::GAUGES->{mana} ->set_value ($sp, $sp_m); |
| 486 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
526 | $::GAUGES->{food} ->set_value ($fo, $fo_m); |
| 487 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
527 | $::GAUGES->{grace} ->set_value ($gr, $gr_m); |
| 488 | $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) |
528 | $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d# |
| 489 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
529 | . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); |
| 490 | $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
530 | $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); |
| 491 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
531 | $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); |
| 492 | my $title = $stats->{+CS_STAT_TITLE}; |
532 | my $title = $stats->{+CS_STAT_TITLE}; |
| 493 | $title =~ s/^Player: //; |
533 | $title =~ s/^Player: //; |
| 494 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
534 | $::STATWIDS->{title} ->set_text ("Title: " . $title); |
| 495 | |
535 | |
| … | |
… | |
| 536 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
576 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 537 | ]; |
577 | ]; |
| 538 | |
578 | |
| 539 | my @add = @$sw; |
579 | my @add = @$sw; |
| 540 | |
580 | |
| 541 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
581 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>"; |
| 542 | |
582 | |
| 543 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
583 | my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
| 544 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
584 | my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); |
| 545 | |
585 | |
| 546 | my ($x, $y) = (0, 1); |
586 | my ($x, $y) = (0, 1); |
| … | |
… | |
| 608 | my $sw = $self->{skillwid}{$idx}; |
648 | my $sw = $self->{skillwid}{$idx}; |
| 609 | $sw->[0]->set_text (::formsep ($val->[1])); |
649 | $sw->[0]->set_text (::formsep ($val->[1])); |
| 610 | $sw->[1]->set_text ($val->[0] * 1); |
650 | $sw->[1]->set_text ($val->[0] * 1); |
| 611 | $sw->[2]->set_value (@$val); |
651 | $sw->[2]->set_value (@$val); |
| 612 | |
652 | |
| 613 | $::GAUGES->{sklprg}->set_label ("$name %d%%"); |
653 | $::GAUGES->{skillexp}->set_label ("$name %d%%"); |
| 614 | $::GAUGES->{sklprg}->set_value (@$val); |
654 | $::GAUGES->{skillexp}->set_value (@$val); |
| 615 | } |
655 | } |
| 616 | } |
656 | } |
| 617 | |
657 | |
| 618 | sub user_send { |
658 | sub user_send { |
| 619 | my ($self, $command) = @_; |
659 | my ($self, $command) = @_; |
| … | |
… | |
| 632 | } |
672 | } |
| 633 | |
673 | |
| 634 | sub map_scroll { |
674 | sub map_scroll { |
| 635 | my ($self, $dx, $dy) = @_; |
675 | my ($self, $dx, $dy) = @_; |
| 636 | |
676 | |
| 637 | $self->{map}->scroll ($dx, $dy); |
677 | $self->{map_widget}->scroll ($dx, $dy); |
| 638 | } |
678 | } |
| 639 | |
679 | |
| 640 | sub feed_map1a { |
680 | sub feed_map1a { |
| 641 | my ($self, $data) = @_; |
681 | my ($self, $data) = @_; |
| 642 | |
682 | |
| … | |
… | |
| 646 | for my $tile (@$missing) { |
686 | for my $tile (@$missing) { |
| 647 | next if $self->{delay}{$tile}; |
687 | next if $self->{delay}{$tile}; |
| 648 | |
688 | |
| 649 | $delay = 1; |
689 | $delay = 1; |
| 650 | |
690 | |
| 651 | if (my $tex = $::CONN->{texture}[$tile]) { |
691 | if (my $tex = $self->{texture}[$tile]) { |
| 652 | $tex->upload; |
692 | $tex->upload; |
| 653 | } else { |
693 | } else { |
| 654 | $self->{delay}{$tile} = 1; |
694 | $self->{delay}{$tile} = 1; |
| 655 | |
695 | |
| 656 | # we assume the face is in-flight and will eventually come |
696 | # we assume the face is in-flight and will eventually arrive |
| 657 | push @{$self->{tile_cb}{$tile}}, sub { |
697 | push @{$self->{tile_cb}{$tile}}, sub { |
| 658 | delete $self->{delay}{$tile}; |
698 | delete $self->{delay}{$tile}; |
| 659 | $_[0]->upload; |
699 | $_[0]->upload; |
| 660 | }; |
700 | }; |
| 661 | } |
701 | } |
| 662 | } |
702 | } |
| 663 | |
703 | |
| 664 | if ($delay) { |
704 | if ($delay) { |
| 665 | # delay the map drawing a tiny bit in the hope of getting the missing fetched |
705 | # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched |
| 666 | EV::once undef, 0, 0.03, sub { |
706 | EV::once undef, 0, 0.03, sub { |
| 667 | $self->{map_widget}->update |
707 | $self->{map_widget}->update |
| 668 | if $self->{map_widget}; |
708 | if $self->{map_widget}; |
| 669 | }; |
709 | }; |
| 670 | } else { |
710 | } else { |
| … | |
… | |
| 679 | } |
719 | } |
| 680 | |
720 | |
| 681 | sub flush_map { |
721 | sub flush_map { |
| 682 | my ($self) = @_; |
722 | my ($self) = @_; |
| 683 | |
723 | |
| 684 | my $map_info = delete $self->{map_info} |
724 | return unless $self->{map_info}; |
| 685 | or return; |
|
|
| 686 | |
725 | |
|
|
726 | for my $map_info (values %{ $self->{map_cache} || {} }) { |
| 687 | my ($hash, $x, $y, $w, $h) = @$map_info; |
727 | my ($hash, $rdata, $x, $y, $w, $h) = @$map_info; |
| 688 | |
728 | |
| 689 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
729 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
| 690 | $self->{map_cache_new}{$hash} = \$data; |
730 | |
|
|
731 | if ($data ne $$rdata) { |
|
|
732 | $map_info->[1] = \$data; |
|
|
733 | my $cdata = Compress::LZF::compress $data; |
| 691 | DC::DB::put $self->{mapcache} => $hash => $data, sub { }; |
734 | DC::DB::put $self->{mapcache} => $hash => $cdata, sub { }; |
|
|
735 | } |
|
|
736 | } |
| 692 | } |
737 | } |
| 693 | |
738 | |
| 694 | sub map_clear { |
739 | sub map_clear { |
| 695 | my ($self) = @_; |
740 | my ($self) = @_; |
| 696 | |
741 | |
| 697 | $self->flush_map; |
742 | $self->flush_map; |
|
|
743 | delete $self->{map_info}; |
| 698 | delete $self->{neigh_map}; |
744 | delete $self->{neigh_map}; |
| 699 | |
745 | |
| 700 | $self->{map}->clear; |
746 | $self->{map}->clear; |
| 701 | delete $self->{map_widget}{magicmap}; |
747 | delete $self->{map_widget}{magicmap}; |
| 702 | } |
748 | } |
| … | |
… | |
| 723 | |
769 | |
| 724 | $self->bg_fetch; |
770 | $self->bg_fetch; |
| 725 | }; |
771 | }; |
| 726 | } |
772 | } |
| 727 | |
773 | |
| 728 | sub load_map($$$) { |
774 | sub load_map($$$$$$) { |
| 729 | my ($self, $hash, $x, $y) = @_; |
775 | my ($self, $hash, $x, $y, $w, $h) = @_; |
| 730 | |
776 | |
| 731 | my $gen = $self->{map_change_gen}; |
777 | my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h]; |
| 732 | |
778 | |
| 733 | my $cb = sub { |
779 | my $cb = sub { |
| 734 | return unless $gen == $self->{map_change_gen}; |
780 | $map_info->[1] = \$_[0]; |
| 735 | |
781 | |
| 736 | my ($data) = @_; |
|
|
| 737 | |
|
|
| 738 | if (defined $data) { |
|
|
| 739 | $self->{map_cache_new}{$hash} = \$data; |
|
|
| 740 | |
|
|
| 741 | my $data = Compress::LZF::decompress $data; |
|
|
| 742 | |
|
|
| 743 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
782 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
| 744 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
783 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]); |
| 745 | $self->bg_fetch unless $inprogress; |
784 | $self->bg_fetch unless $inprogress; |
| 746 | } |
|
|
| 747 | }; |
785 | }; |
| 748 | |
786 | |
| 749 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
787 | if (my $map_info = $self->{map_cache_old}{$hash}) { |
| 750 | $cb->($$rdata); |
788 | $cb->(${ $map_info->[1] }); |
| 751 | } else { |
789 | } else { |
|
|
790 | my $gen = $self->{map_change_gen}; |
|
|
791 | |
| 752 | DC::DB::get $self->{mapcache} => $hash, $cb; |
792 | DC::DB::get $self->{mapcache} => $hash, sub { |
|
|
793 | return unless $gen == $self->{map_change_gen}; |
|
|
794 | return unless defined $_[0]; |
|
|
795 | $cb->(Compress::LZF::decompress $_[0]); |
|
|
796 | }; |
| 753 | } |
797 | } |
| 754 | } |
798 | } |
| 755 | |
799 | |
| 756 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
800 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
| 757 | # (server resource,s latency, bandwidth), so this hack is warranted. |
801 | # (server resources, latency, bandwidth), so this hack is warranted. |
| 758 | # the right fix is to make real tiled maps with an overview file |
802 | # the right fix is to make real tiled maps with an overview file |
| 759 | sub send_mapinfo { |
803 | sub send_mapinfo { |
| 760 | my ($self, $data, $cb) = @_; |
804 | my ($self, $data, $cb) = @_; |
| 761 | |
805 | |
| 762 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
806 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
| … | |
… | |
| 787 | } |
831 | } |
| 788 | |
832 | |
| 789 | # this method does a "flood fill" into every tile direction |
833 | # this method does a "flood fill" into every tile direction |
| 790 | # it assumes that tiles are arranged in a rectangular grid, |
834 | # it assumes that tiles are arranged in a rectangular grid, |
| 791 | # i.e. a map is the same as the left of the right map etc. |
835 | # i.e. a map is the same as the left of the right map etc. |
| 792 | # failure to comply are harmless and result in display errors |
836 | # failure to comply is harmless and results in display errors |
| 793 | # at worst. |
837 | # at worst. |
| 794 | sub flood_fill { |
838 | sub flood_fill { |
| 795 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
839 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
| 796 | |
840 | |
| 797 | # the server does not allow map paths > 6 |
841 | # the server does not allow map paths > 6 |
| … | |
… | |
| 833 | return if $mode ne "spatial"; |
877 | return if $mode ne "spatial"; |
| 834 | |
878 | |
| 835 | $x += $self->{map}->ox; |
879 | $x += $self->{map}->ox; |
| 836 | $y += $self->{map}->oy; |
880 | $y += $self->{map}->oy; |
| 837 | |
881 | |
| 838 | $self->load_map ($hash, $x, $y) |
882 | $self->load_map ($hash, $x, $y, $w, $h) |
| 839 | unless $self->{neigh_map}{$hash}[5]++;#d# |
883 | unless $self->{neigh_map}{$hash}[5]++;#d# |
| 840 | |
884 | |
| 841 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
885 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
| 842 | |
886 | |
| 843 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
887 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
| … | |
… | |
| 851 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
895 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 852 | |
896 | |
| 853 | $self->flush_map; |
897 | $self->flush_map; |
| 854 | |
898 | |
| 855 | ++$self->{map_change_gen}; |
899 | ++$self->{map_change_gen}; |
| 856 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
900 | $self->{map_cache_old} = delete $self->{map_cache}; |
| 857 | |
901 | |
| 858 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
902 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
| 859 | |
903 | |
| 860 | my $mapmapw = $self->{mapmap}->{w}; |
904 | my $mapmapw = $self->{mapmap}->{w}; |
| 861 | my $mapmaph = $self->{mapmap}->{h}; |
905 | my $mapmaph = $self->{mapmap}->{h}; |
| … | |
… | |
| 873 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
917 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
| 874 | |
918 | |
| 875 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
919 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
| 876 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
920 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
| 877 | |
921 | |
| 878 | $self->load_map ($hash, $x, $y); |
922 | $self->load_map ($hash, $x, $y, $w, $h); |
| 879 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
923 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
| 880 | } |
924 | } |
| 881 | |
925 | |
| 882 | sub face_find { |
926 | sub face_find { |
| 883 | my ($self, $facenum, $face, $cb) = @_; |
927 | my ($self, $facenum, $face, $cb) = @_; |
| … | |
… | |
| 969 | my ($self, $num, $cb) = @_; |
1013 | my ($self, $num, $cb) = @_; |
| 970 | |
1014 | |
| 971 | push @{$self->{face_cb}{$num}}, $cb; |
1015 | push @{$self->{face_cb}{$num}}, $cb; |
| 972 | |
1016 | |
| 973 | defined wantarray |
1017 | defined wantarray |
| 974 | ? DC::guard { |
1018 | ? Guard::guard { |
| 975 | @{$self->{face_cb}{$num}} |
1019 | @{$self->{face_cb}{$num}} |
| 976 | = grep $_ != $cb, |
1020 | = grep $_ != $cb, |
| 977 | @{$self->{face_cb}{$num}}; |
1021 | @{$self->{face_cb}{$num}}; |
| 978 | } |
1022 | } |
| 979 | : () |
1023 | : () |
| … | |
… | |
| 1025 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
1069 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
| 1026 | |
1070 | |
| 1027 | # handle some elements |
1071 | # handle some elements |
| 1028 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
1072 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
| 1029 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
1073 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
1074 | |
|
|
1075 | s/\s+$//; |
| 1030 | |
1076 | |
| 1031 | $_ |
1077 | $_ |
| 1032 | } |
1078 | } |
| 1033 | |
1079 | |
| 1034 | our %NAME_TO_COLOR = ( |
1080 | our %NAME_TO_COLOR = ( |
| … | |
… | |
| 1081 | |
1127 | |
| 1082 | ## try to create single paragraphs of multiple lines sent by the server |
1128 | ## try to create single paragraphs of multiple lines sent by the server |
| 1083 | # no longer neecssary with TRT servers |
1129 | # no longer neecssary with TRT servers |
| 1084 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1130 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
| 1085 | |
1131 | |
| 1086 | for (split /\n/, $text) { |
|
|
| 1087 | ::message ({ |
1132 | ::message ({ |
| 1088 | fg => $fg, |
1133 | fg => $fg, |
| 1089 | markup => $_, |
1134 | markup => $text, |
| 1090 | type => $type, |
1135 | type => $type, |
| 1091 | extra => [@extra], |
1136 | extra => [@extra], |
| 1092 | color_flags => $color, #d# ugly, kill |
1137 | color_flags => $color, #d# ugly, kill |
| 1093 | }); |
1138 | }); |
| 1094 | |
1139 | |
| 1095 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
1140 | # $color &= ~NDI_CLEAR; # only clear once for multiline messages |
| 1096 | # actually, this is an ugly design. _we_ should control the channels, |
1141 | # # actually, this is an ugly design. _we_ should control the channels, |
| 1097 | # not some random other widget, as the channels are clearly protocol-specific. |
1142 | # # not some random other widget, as the channels are clearly protocol-specific. |
| 1098 | # then we could also react to flags such as CLEAR without resorting to |
1143 | # # then we could also react to flags such as CLEAR without resorting to |
| 1099 | # hacks such as color_flags, above. |
1144 | # # hacks such as color_flags, above. |
| 1100 | } |
|
|
| 1101 | |
1145 | |
| 1102 | $self->{statusbox}->add ($text, |
1146 | $self->{statusbox}->add ($text, |
| 1103 | group => $text, |
1147 | group => $text, |
| 1104 | fg => $fg, |
1148 | fg => $fg, |
| 1105 | timeout => $color >= 2 ? 180 : 10, |
1149 | timeout => $color >= 2 ? 180 : 10, |
| … | |
… | |
| 1140 | |
1184 | |
| 1141 | my %skill_help; |
1185 | my %skill_help; |
| 1142 | |
1186 | |
| 1143 | for my $node (DC::Pod::find skill_description => "*") { |
1187 | for my $node (DC::Pod::find skill_description => "*") { |
| 1144 | my (undef, @par) = DC::Pod::section_of $node; |
1188 | my (undef, @par) = DC::Pod::section_of $node; |
| 1145 | $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par; |
1189 | $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; |
| 1146 | }; |
1190 | }; |
| 1147 | |
1191 | |
| 1148 | for my $skill (values %{$self->{skill_info}}) { |
1192 | for my $skill (values %{$self->{skill_info}}) { |
| 1149 | $self->{map_widget}->add_command ("ready_skill $skill", |
1193 | $self->{map_widget}->add_command ("ready_skill $skill", |
| 1150 | (DC::asxml "Ready the skill '$skill'\n\n") |
1194 | (DC::asxml "Ready the skill '$skill'\n\n") |
| … | |
… | |
| 1170 | $::FLOORBOX->clear; |
1214 | $::FLOORBOX->clear; |
| 1171 | |
1215 | |
| 1172 | my @add; |
1216 | my @add; |
| 1173 | |
1217 | |
| 1174 | my $row; |
1218 | my $row; |
| 1175 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1219 | for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
|
|
1220 | next if $_->{tag} & 0x80000000; |
| 1176 | if ($row < 6) { |
1221 | if ($row < 6) { |
| 1177 | local $_->{face_widget}; # hack to force recreation of widget |
1222 | local $_->{face_widget}; # hack to force recreation of widget |
| 1178 | local $_->{desc_widget}; # hack to force recreation of widget |
1223 | local $_->{desc_widget}; # hack to force recreation of widget |
| 1179 | DC::Item::update_widgets $_; |
1224 | DC::Item::update_widgets $_; |
| 1180 | |
1225 | |
| … | |
… | |
| 1207 | sub set_opencont { |
1252 | sub set_opencont { |
| 1208 | my ($conn, $tag, $name) = @_; |
1253 | my ($conn, $tag, $name) = @_; |
| 1209 | $conn->{open_container} = $tag; |
1254 | $conn->{open_container} = $tag; |
| 1210 | update_floorbox; |
1255 | update_floorbox; |
| 1211 | |
1256 | |
| 1212 | $::INVR_HB->clear (); |
1257 | $::INVR_HB->clear; |
| 1213 | $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); |
1258 | $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); |
| 1214 | |
1259 | |
| 1215 | if ($tag != 0) { # Floor isn't closable, is it? |
1260 | if ($tag != 0) { # Floor isn't closable, is it? |
| 1216 | $::INVR_HB->add (new DC::UI::Button |
1261 | $::INVR_HB->add (new DC::UI::Button |
| 1217 | text => "Close container", |
1262 | text => "Close container", |
| … | |
… | |
| 1273 | } |
1318 | } |
| 1274 | |
1319 | |
| 1275 | sub item_update { |
1320 | sub item_update { |
| 1276 | my ($self, $item) = @_; |
1321 | my ($self, $item) = @_; |
| 1277 | |
1322 | |
| 1278 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1323 | #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n"; |
| 1279 | |
1324 | |
| 1280 | DC::Item::update_widgets $item; |
1325 | DC::Item::update_widgets $item; |
| 1281 | |
1326 | |
| 1282 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1327 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
| 1283 | set_opencont ($::CONN, 0, "Floor"); |
1328 | set_opencont ($::CONN, 0, "Floor"); |
| 1284 | |
1329 | |
| 1285 | } elsif ($item->{flags} & F_OPEN) { |
1330 | } elsif ($item->{flags} & F_OPEN) { |
| 1286 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
1331 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
| … | |
… | |
| 1351 | }); |
1396 | }); |
| 1352 | |
1397 | |
| 1353 | $self->update_server_info; |
1398 | $self->update_server_info; |
| 1354 | |
1399 | |
| 1355 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1400 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
| 1356 | $self->send_command ("pickup $::CFG->{pickup}"); |
1401 | $self->send_pickup ($::CFG->{pickup}); |
|
|
1402 | |
|
|
1403 | $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]", |
|
|
1404 | DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d# |
| 1357 | } |
1405 | } |
| 1358 | |
1406 | |
| 1359 | sub lookat { |
1407 | sub lookat { |
| 1360 | my ($self, $x, $y) = @_; |
1408 | my ($self, $x, $y) = @_; |
| 1361 | |
1409 | |
| … | |
… | |
| 1525 | } |
1573 | } |
| 1526 | |
1574 | |
| 1527 | sub send { |
1575 | sub send { |
| 1528 | my ($self, $msg) = @_; |
1576 | my ($self, $msg) = @_; |
| 1529 | |
1577 | |
| 1530 | $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); |
1578 | $self->{textview}->add_paragraph ({ |
|
|
1579 | markup => |
|
|
1580 | "\n<span foreground='#ffff00'><b>" |
|
|
1581 | . (DC::asxml $msg) |
|
|
1582 | . "</b></span>" |
|
|
1583 | }); |
| 1531 | $self->{textview}->scroll_to_bottom; |
1584 | $self->{textview}->scroll_to_bottom; |
| 1532 | |
1585 | |
| 1533 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1586 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
| 1534 | } |
1587 | } |
| 1535 | |
1588 | |
