| … | |
… | |
| 12 | use DC::Macro; |
12 | use DC::Macro; |
| 13 | use DC::Item; |
13 | use DC::Item; |
| 14 | |
14 | |
| 15 | use base 'Deliantra::Protocol::Base'; |
15 | use base 'Deliantra::Protocol::Base'; |
| 16 | |
16 | |
|
|
17 | our $TEX_DIALOGUE = new_from_resource DC::Texture |
|
|
18 | "dialogue.png", minify => 1, mipmap => 1; |
|
|
19 | |
|
|
20 | our $TEX_NOFACE = new_from_resource DC::Texture |
|
|
21 | "noface.png", minify => 1, mipmap => 1; |
|
|
22 | |
| 17 | sub new { |
23 | sub new { |
| 18 | my ($class, %arg) = @_; |
24 | my ($class, %arg) = @_; |
| 19 | |
25 | |
| 20 | my $self = $class->SUPER::new (%arg, |
26 | my $self = $class->SUPER::new (%arg, |
| 21 | setup_req => { |
27 | setup_req => { |
| 22 | extmap => 1, |
28 | extmap => 1, |
| 23 | excmd => 1, |
29 | excmd => 1, |
| 24 | widget => 1, |
30 | widget => 2, |
| 25 | %{$arg{setup_req} || {}}, |
31 | %{$arg{setup_req} || {}}, |
| 26 | }, |
32 | }, |
| 27 | ); |
33 | ); |
| 28 | |
34 | |
| 29 | $self->{map_widget}->clr_commands; |
35 | $self->{map_widget}->clr_commands; |
| 30 | |
36 | |
| 31 | my @cmd_help = map { |
37 | my @cmd_help = map { |
| 32 | $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
38 | $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x |
| 33 | or die "unparseable command help: $_->{kw}[0]"; |
39 | or die "unparseable command help: $_->[DC::Pod::N_KW][0]"; |
| 34 | |
40 | |
| 35 | my $cmd = $1; |
41 | my $cmd = $1; |
| 36 | my @args = split /\|/, $2; |
42 | my @args = split /\|/, $2; |
| 37 | @args = (".*") unless @args; |
43 | @args = (".*") unless @args; |
| 38 | |
44 | |
| … | |
… | |
| 43 | for @args; |
49 | for @args; |
| 44 | |
50 | |
| 45 | map ["$cmd$_", $text], |
51 | map ["$cmd$_", $text], |
| 46 | sort { (length $a) <=> (length $b) } |
52 | sort { (length $a) <=> (length $b) } |
| 47 | @args |
53 | @args |
| 48 | } sort { $a->{par} <=> $b->{par} } |
54 | } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] } |
| 49 | DC::Pod::find command => "*"; |
55 | DC::Pod::find command => "*"; |
| 50 | |
56 | |
| 51 | $self->{json_coder} |
57 | $self->{json_coder} |
| 52 | ->convert_blessed |
58 | ->convert_blessed |
| 53 | ->filter_json_single_key_object ("\fw" => sub { |
59 | ->filter_json_single_key_object ("\fw" => sub { |
| … | |
… | |
| 64 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
70 | $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { |
| 65 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
71 | for my $ws (values %{delete $self->{widgetset} || {}}) { |
| 66 | $_->destroy |
72 | $_->destroy |
| 67 | for values %{delete $ws->{w} || {}}; |
73 | for values %{delete $ws->{w} || {}}; |
| 68 | } |
74 | } |
|
|
75 | |
|
|
76 | delete $self->{items}; |
|
|
77 | $::INV->clear; |
|
|
78 | $::INVR->clear; |
|
|
79 | $::INVR_HB->clear; |
|
|
80 | $::FLOORBOX->clear; |
| 69 | }); |
81 | }); |
| 70 | |
82 | |
| 71 | $self->{map_widget}->add_command (@$_) |
83 | $self->{map_widget}->add_command (@$_) |
| 72 | for @cmd_help; |
84 | for @cmd_help; |
| 73 | |
85 | |
| 74 | { |
86 | { |
| 75 | $self->{dialogue} = my $tex = new_from_file DC::Texture |
87 | $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}}); |
88 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 78 | } |
89 | } |
| 79 | |
90 | |
| 80 | { |
91 | { |
| 81 | $self->{noface} = my $tex = new_from_file DC::Texture |
92 | $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}}); |
93 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
| 84 | } |
94 | } |
| 85 | |
95 | |
| 86 | $self->{open_container} = 0; |
96 | $self->{open_container} = 0; |
| 87 | |
97 | |
| … | |
… | |
| 102 | } |
112 | } |
| 103 | |
113 | |
| 104 | sub ext_capabilities { |
114 | sub ext_capabilities { |
| 105 | my ($self, %cap) = @_; |
115 | my ($self, %cap) = @_; |
| 106 | |
116 | |
| 107 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
| 108 | $self->update_fx_want; |
117 | $self->update_fx_want; |
| 109 | |
118 | |
| 110 | $self->send_exti_req (resource => "exp_table", sub { |
119 | $self->send_exti_req (resource => "exp_table", sub { |
| 111 | my ($exp_table) = @_; |
120 | my ($exp_table) = @_; |
| 112 | |
121 | |
| … | |
… | |
| 191 | $ws, $id => scalar eval { |
200 | $ws, $id => scalar eval { |
| 192 | local $SIG{__DIE__}; |
201 | local $SIG{__DIE__}; |
| 193 | "DC::UI::$class"->new (%$args) |
202 | "DC::UI::$class"->new (%$args) |
| 194 | } |
203 | } |
| 195 | ); |
204 | ); |
|
|
205 | } |
|
|
206 | |
|
|
207 | # widgetset create template |
|
|
208 | sub ext_ws_ct { |
|
|
209 | my ($self, $ws, $type, $template, $done_cb, $cfg) = @_; |
|
|
210 | |
|
|
211 | $done_cb ||= sub { }; |
|
|
212 | |
|
|
213 | my $parse_list; $parse_list = sub { |
|
|
214 | my ($list) = @_; |
|
|
215 | my @w; |
|
|
216 | |
|
|
217 | while (@$list) { |
|
|
218 | my ($class, $args) = splice @$list, 0, 2; |
|
|
219 | my $name = delete $args->{s_id}; |
|
|
220 | my $cl = delete $args->{s_cl}; |
|
|
221 | my $cfg = delete $cfg->{$name}; |
|
|
222 | my $id = delete $cfg->{id}; |
|
|
223 | my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) } |
|
|
224 | or next; |
|
|
225 | |
|
|
226 | $self->widget_associate ($ws, $id, $w) |
|
|
227 | if $id; |
|
|
228 | |
|
|
229 | $w->add ($parse_list->($cl)) |
|
|
230 | if $cl; |
|
|
231 | |
|
|
232 | push @w, $w; |
|
|
233 | } |
|
|
234 | |
|
|
235 | @w |
|
|
236 | }; |
|
|
237 | |
|
|
238 | # either array reference, or face # |
|
|
239 | if ($type eq "inline") { |
|
|
240 | $done_cb->(); |
|
|
241 | $parse_list->($template); |
|
|
242 | } elsif ($type eq "face") { |
|
|
243 | my $handler; $handler = $self->register_face_handler ($template, sub { |
|
|
244 | my ($face) = @_; |
|
|
245 | |
|
|
246 | undef $handler; |
|
|
247 | $done_cb->(); |
|
|
248 | $parse_list->($self->{json_coder}->decode ($face->{data})); |
|
|
249 | }); |
|
|
250 | } else { |
|
|
251 | $done_cb->(0); |
|
|
252 | } |
| 196 | } |
253 | } |
| 197 | |
254 | |
| 198 | # widgetset associate |
255 | # widgetset associate |
| 199 | sub ext_ws_a { |
256 | sub ext_ws_a { |
| 200 | my ($self, %ass) = @_; |
257 | my ($self, %ass) = @_; |
| … | |
… | |
| 228 | spell_list => $::SPELL_LIST, |
285 | spell_list => $::SPELL_LIST, |
| 229 | |
286 | |
| 230 | floorbox => $::FLOORBOX, |
287 | floorbox => $::FLOORBOX, |
| 231 | help_window => $::HELP_WINDOW, |
288 | help_window => $::HELP_WINDOW, |
| 232 | message_window => $::MESSAGE_WINDOW, |
289 | message_window => $::MESSAGE_WINDOW, |
|
|
290 | message_dist => $::MESSAGE_DIST, |
| 233 | statusbox => $::SDTATUSBOX, |
291 | statusbox => $::SDTATUSBOX, |
| 234 | |
292 | |
| 235 | inv => $::INV, |
293 | inv => $::INV, |
| 236 | invr => $::INVR, |
294 | invr => $::INVR, |
| 237 | invr_hb => $::INVR_HB, |
295 | invr_hb => $::INVR_HB, |
| … | |
… | |
| 286 | |
344 | |
| 287 | # message window |
345 | # message window |
| 288 | sub ext_channel_info { |
346 | sub ext_channel_info { |
| 289 | my ($self, $info) = @_; |
347 | my ($self, $info) = @_; |
| 290 | $self->{channels}->{$info->{id}} = $info; |
348 | $self->{channels}->{$info->{id}} = $info; |
| 291 | $::MESSAGE_WINDOW->add_channel ($info); |
349 | $::MESSAGE_DIST->add_channel ($info); |
| 292 | } |
350 | } |
| 293 | |
351 | |
| 294 | ############################################################################# |
352 | ############################################################################# |
| 295 | |
353 | |
| 296 | sub logprint { |
354 | sub logprint { |
| … | |
… | |
| 478 | $sktbl->clear; |
536 | $sktbl->clear; |
| 479 | |
537 | |
| 480 | my $sw = $self->{skillwid}{""} ||= [ |
538 | my $sw = $self->{skillwid}{""} ||= [ |
| 481 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
539 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 482 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
540 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 483 | 2, 0, (new DC::UI::Label text => "Progress", align => 0), |
541 | 2, 0, (new DC::UI::Label text => "Progress"), |
| 484 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1), |
542 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 485 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
543 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 486 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
544 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 487 | 6, 0, (new DC::UI::Label text => "Progress", align => 0), |
545 | 6, 0, (new DC::UI::Label text => "Progress"), |
| 488 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1), |
546 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 489 | ]; |
547 | ]; |
| 490 | |
548 | |
| 491 | my @add = @$sw; |
549 | my @add = @$sw; |
| 492 | |
550 | |
| 493 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
551 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
| … | |
… | |
| 532 | |
590 | |
| 533 | # progress |
591 | # progress |
| 534 | (new DC::UI::ExperienceProgress), |
592 | (new DC::UI::ExperienceProgress), |
| 535 | |
593 | |
| 536 | # label |
594 | # label |
| 537 | (new DC::UI::Label text => $name, on_button_down => $spell_cb, |
595 | (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0, |
| 538 | can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
596 | can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
| 539 | ]; |
597 | ]; |
| 540 | |
598 | |
| 541 | push @add, |
599 | push @add, |
| 542 | $x * 4 + 0, $y, $sw->[0], |
600 | $x * 4 + 0, $y, $sw->[0], |
| … | |
… | |
| 584 | } |
642 | } |
| 585 | |
643 | |
| 586 | sub map_scroll { |
644 | sub map_scroll { |
| 587 | my ($self, $dx, $dy) = @_; |
645 | my ($self, $dx, $dy) = @_; |
| 588 | |
646 | |
| 589 | $self->{map}->scroll ($dx, $dy); |
647 | $self->{map_widget}->scroll ($dx, $dy); |
| 590 | } |
648 | } |
| 591 | |
649 | |
| 592 | sub feed_map1a { |
650 | sub feed_map1a { |
| 593 | my ($self, $data) = @_; |
651 | my ($self, $data) = @_; |
| 594 | |
652 | |
| … | |
… | |
| 631 | } |
689 | } |
| 632 | |
690 | |
| 633 | sub flush_map { |
691 | sub flush_map { |
| 634 | my ($self) = @_; |
692 | my ($self) = @_; |
| 635 | |
693 | |
| 636 | my $map_info = delete $self->{map_info} |
694 | return unless $self->{map_info}; |
| 637 | or return; |
|
|
| 638 | |
695 | |
|
|
696 | for my $map_info (values %{ $self->{map_cache} || {} }) { |
| 639 | my ($hash, $x, $y, $w, $h) = @$map_info; |
697 | my ($hash, $rdata, $x, $y, $w, $h) = @$map_info; |
| 640 | |
698 | |
| 641 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
699 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
| 642 | $self->{map_cache_new}{$hash} = \$data; |
700 | |
|
|
701 | if ($data ne $$rdata) { |
|
|
702 | $map_info->[1] = \$data; |
|
|
703 | my $cdata = Compress::LZF::compress $data; |
| 643 | DC::DB::put $self->{mapcache} => $hash => $data, sub { }; |
704 | DC::DB::put $self->{mapcache} => $hash => $cdata, sub { }; |
|
|
705 | } |
|
|
706 | } |
| 644 | } |
707 | } |
| 645 | |
708 | |
| 646 | sub map_clear { |
709 | sub map_clear { |
| 647 | my ($self) = @_; |
710 | my ($self) = @_; |
| 648 | |
711 | |
| 649 | $self->flush_map; |
712 | $self->flush_map; |
|
|
713 | delete $self->{map_info}; |
| 650 | delete $self->{neigh_map}; |
714 | delete $self->{neigh_map}; |
| 651 | |
715 | |
| 652 | $self->{map}->clear; |
716 | $self->{map}->clear; |
| 653 | delete $self->{map_widget}{magicmap}; |
717 | delete $self->{map_widget}{magicmap}; |
| 654 | } |
718 | } |
| … | |
… | |
| 675 | |
739 | |
| 676 | $self->bg_fetch; |
740 | $self->bg_fetch; |
| 677 | }; |
741 | }; |
| 678 | } |
742 | } |
| 679 | |
743 | |
| 680 | sub load_map($$$) { |
744 | sub load_map($$$$$$) { |
| 681 | my ($self, $hash, $x, $y) = @_; |
745 | my ($self, $hash, $x, $y, $w, $h) = @_; |
| 682 | |
746 | |
| 683 | my $gen = $self->{map_change_gen}; |
747 | my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h]; |
| 684 | |
748 | |
| 685 | my $cb = sub { |
749 | my $cb = sub { |
| 686 | return unless $gen == $self->{map_change_gen}; |
750 | $map_info->[1] = \$_[0]; |
| 687 | |
751 | |
| 688 | my ($data) = @_; |
|
|
| 689 | |
|
|
| 690 | if (defined $data) { |
|
|
| 691 | $self->{map_cache_new}{$hash} = \$data; |
|
|
| 692 | |
|
|
| 693 | my $data = Compress::LZF::decompress $data; |
|
|
| 694 | |
|
|
| 695 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
752 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
| 696 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
753 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]); |
| 697 | $self->bg_fetch unless $inprogress; |
754 | $self->bg_fetch unless $inprogress; |
| 698 | } |
|
|
| 699 | }; |
755 | }; |
| 700 | |
756 | |
| 701 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
757 | if (my $map_info = $self->{map_cache_old}{$hash}) { |
| 702 | $cb->($$rdata); |
758 | $cb->(${ $map_info->[1] }); |
| 703 | } else { |
759 | } else { |
|
|
760 | my $gen = $self->{map_change_gen}; |
|
|
761 | |
| 704 | DC::DB::get $self->{mapcache} => $hash, $cb; |
762 | DC::DB::get $self->{mapcache} => $hash, sub { |
|
|
763 | return unless $gen == $self->{map_change_gen}; |
|
|
764 | return unless defined $_[0]; |
|
|
765 | $cb->(Compress::LZF::decompress $_[0]); |
|
|
766 | }; |
| 705 | } |
767 | } |
| 706 | } |
768 | } |
| 707 | |
769 | |
| 708 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
770 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
| 709 | # (server resource,s latency, bandwidth), so this hack is warranted. |
771 | # (server resources, latency, bandwidth), so this hack is warranted. |
| 710 | # the right fix is to make real tiled maps with an overview file |
772 | # the right fix is to make real tiled maps with an overview file |
| 711 | sub send_mapinfo { |
773 | sub send_mapinfo { |
| 712 | my ($self, $data, $cb) = @_; |
774 | my ($self, $data, $cb) = @_; |
| 713 | |
775 | |
| 714 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
776 | if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { |
| … | |
… | |
| 739 | } |
801 | } |
| 740 | |
802 | |
| 741 | # this method does a "flood fill" into every tile direction |
803 | # this method does a "flood fill" into every tile direction |
| 742 | # it assumes that tiles are arranged in a rectangular grid, |
804 | # it assumes that tiles are arranged in a rectangular grid, |
| 743 | # i.e. a map is the same as the left of the right map etc. |
805 | # i.e. a map is the same as the left of the right map etc. |
| 744 | # failure to comply are harmless and result in display errors |
806 | # failure to comply is harmless and results in display errors |
| 745 | # at worst. |
807 | # at worst. |
| 746 | sub flood_fill { |
808 | sub flood_fill { |
| 747 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
809 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
| 748 | |
810 | |
| 749 | # the server does not allow map paths > 6 |
811 | # the server does not allow map paths > 6 |
| … | |
… | |
| 785 | return if $mode ne "spatial"; |
847 | return if $mode ne "spatial"; |
| 786 | |
848 | |
| 787 | $x += $self->{map}->ox; |
849 | $x += $self->{map}->ox; |
| 788 | $y += $self->{map}->oy; |
850 | $y += $self->{map}->oy; |
| 789 | |
851 | |
| 790 | $self->load_map ($hash, $x, $y) |
852 | $self->load_map ($hash, $x, $y, $w, $h) |
| 791 | unless $self->{neigh_map}{$hash}[5]++;#d# |
853 | unless $self->{neigh_map}{$hash}[5]++;#d# |
| 792 | |
854 | |
| 793 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
855 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
| 794 | |
856 | |
| 795 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
857 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
| … | |
… | |
| 803 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
865 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 804 | |
866 | |
| 805 | $self->flush_map; |
867 | $self->flush_map; |
| 806 | |
868 | |
| 807 | ++$self->{map_change_gen}; |
869 | ++$self->{map_change_gen}; |
| 808 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
870 | $self->{map_cache_old} = delete $self->{map_cache}; |
| 809 | |
871 | |
| 810 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
872 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
| 811 | |
873 | |
| 812 | my $mapmapw = $self->{mapmap}->{w}; |
874 | my $mapmapw = $self->{mapmap}->{w}; |
| 813 | my $mapmaph = $self->{mapmap}->{h}; |
875 | my $mapmaph = $self->{mapmap}->{h}; |
| … | |
… | |
| 825 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
887 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
| 826 | |
888 | |
| 827 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
889 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
| 828 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
890 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
| 829 | |
891 | |
| 830 | $self->load_map ($hash, $x, $y); |
892 | $self->load_map ($hash, $x, $y, $w, $h); |
| 831 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
893 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
| 832 | } |
894 | } |
| 833 | |
895 | |
| 834 | sub face_find { |
896 | sub face_find { |
| 835 | my ($self, $facenum, $face, $cb) = @_; |
897 | my ($self, $facenum, $face, $cb) = @_; |
| … | |
… | |
| 977 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
1039 | s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g; |
| 978 | |
1040 | |
| 979 | # handle some elements |
1041 | # handle some elements |
| 980 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
1042 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
| 981 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
1043 | s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; |
|
|
1044 | |
|
|
1045 | s/\s+$//; |
| 982 | |
1046 | |
| 983 | $_ |
1047 | $_ |
| 984 | } |
1048 | } |
| 985 | |
1049 | |
| 986 | our %NAME_TO_COLOR = ( |
1050 | our %NAME_TO_COLOR = ( |
| … | |
… | |
| 1033 | |
1097 | |
| 1034 | ## try to create single paragraphs of multiple lines sent by the server |
1098 | ## try to create single paragraphs of multiple lines sent by the server |
| 1035 | # no longer neecssary with TRT servers |
1099 | # no longer neecssary with TRT servers |
| 1036 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1100 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
| 1037 | |
1101 | |
| 1038 | for (split /\n/, $text) { |
|
|
| 1039 | ::message ({ |
1102 | ::message ({ |
| 1040 | fg => $fg, |
1103 | fg => $fg, |
| 1041 | markup => $_, |
1104 | markup => $text, |
| 1042 | type => $type, |
1105 | type => $type, |
| 1043 | extra => [@extra], |
1106 | extra => [@extra], |
| 1044 | color_flags => $color, #d# ugly, kill |
1107 | color_flags => $color, #d# ugly, kill |
| 1045 | }); |
1108 | }); |
| 1046 | |
1109 | |
| 1047 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
1110 | # $color &= ~NDI_CLEAR; # only clear once for multiline messages |
| 1048 | # actually, this is an ugly design. _we_ should control the channels, |
1111 | # # actually, this is an ugly design. _we_ should control the channels, |
| 1049 | # not some random other widget, as the channels are clearly protocol-specific. |
1112 | # # not some random other widget, as the channels are clearly protocol-specific. |
| 1050 | # then we could also react to flags such as CLEAR without resorting to |
1113 | # # then we could also react to flags such as CLEAR without resorting to |
| 1051 | # hacks such as color_flags, above. |
1114 | # # hacks such as color_flags, above. |
| 1052 | } |
|
|
| 1053 | |
1115 | |
| 1054 | $self->{statusbox}->add ($text, |
1116 | $self->{statusbox}->add ($text, |
| 1055 | group => $text, |
1117 | group => $text, |
| 1056 | fg => $fg, |
1118 | fg => $fg, |
| 1057 | timeout => $color >= 2 ? 180 : 10, |
1119 | timeout => $color >= 2 ? 180 : 10, |
| … | |
… | |
| 1092 | |
1154 | |
| 1093 | my %skill_help; |
1155 | my %skill_help; |
| 1094 | |
1156 | |
| 1095 | for my $node (DC::Pod::find skill_description => "*") { |
1157 | for my $node (DC::Pod::find skill_description => "*") { |
| 1096 | my (undef, @par) = DC::Pod::section_of $node; |
1158 | my (undef, @par) = DC::Pod::section_of $node; |
| 1097 | $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par; |
1159 | $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; |
| 1098 | }; |
1160 | }; |
| 1099 | |
1161 | |
| 1100 | for my $skill (values %{$self->{skill_info}}) { |
1162 | for my $skill (values %{$self->{skill_info}}) { |
| 1101 | $self->{map_widget}->add_command ("ready_skill $skill", |
1163 | $self->{map_widget}->add_command ("ready_skill $skill", |
| 1102 | (DC::asxml "Ready the skill '$skill'\n\n") |
1164 | (DC::asxml "Ready the skill '$skill'\n\n") |
| … | |
… | |
| 1122 | $::FLOORBOX->clear; |
1184 | $::FLOORBOX->clear; |
| 1123 | |
1185 | |
| 1124 | my @add; |
1186 | my @add; |
| 1125 | |
1187 | |
| 1126 | my $row; |
1188 | my $row; |
| 1127 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1189 | for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
|
|
1190 | next if $_->{tag} & 0x80000000; |
| 1128 | if ($row < 6) { |
1191 | if ($row < 6) { |
| 1129 | local $_->{face_widget}; # hack to force recreation of widget |
1192 | local $_->{face_widget}; # hack to force recreation of widget |
| 1130 | local $_->{desc_widget}; # hack to force recreation of widget |
1193 | local $_->{desc_widget}; # hack to force recreation of widget |
| 1131 | DC::Item::update_widgets $_; |
1194 | DC::Item::update_widgets $_; |
| 1132 | |
1195 | |
| … | |
… | |
| 1159 | sub set_opencont { |
1222 | sub set_opencont { |
| 1160 | my ($conn, $tag, $name) = @_; |
1223 | my ($conn, $tag, $name) = @_; |
| 1161 | $conn->{open_container} = $tag; |
1224 | $conn->{open_container} = $tag; |
| 1162 | update_floorbox; |
1225 | update_floorbox; |
| 1163 | |
1226 | |
| 1164 | $::INVR_HB->clear (); |
1227 | $::INVR_HB->clear; |
| 1165 | $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name); |
1228 | $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); |
| 1166 | |
1229 | |
| 1167 | if ($tag != 0) { # Floor isn't closable, is it? |
1230 | if ($tag != 0) { # Floor isn't closable, is it? |
| 1168 | $::INVR_HB->add (new DC::UI::Button |
1231 | $::INVR_HB->add (new DC::UI::Button |
| 1169 | text => "Close container", |
1232 | text => "Close container", |
| 1170 | tooltip => "Close the currently open container (if one is open)", |
1233 | tooltip => "Close the currently open container (if one is open)", |
| … | |
… | |
| 1225 | } |
1288 | } |
| 1226 | |
1289 | |
| 1227 | sub item_update { |
1290 | sub item_update { |
| 1228 | my ($self, $item) = @_; |
1291 | my ($self, $item) = @_; |
| 1229 | |
1292 | |
| 1230 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1293 | #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n"; |
| 1231 | |
1294 | |
| 1232 | DC::Item::update_widgets $item; |
1295 | DC::Item::update_widgets $item; |
| 1233 | |
1296 | |
| 1234 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1297 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
| 1235 | set_opencont ($::CONN, 0, "Floor"); |
1298 | set_opencont ($::CONN, 0, "Floor"); |
| 1236 | |
1299 | |
| 1237 | } elsif ($item->{flags} & F_OPEN) { |
1300 | } elsif ($item->{flags} & F_OPEN) { |
| 1238 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
1301 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
| … | |
… | |
| 1254 | |
1317 | |
| 1255 | my $weight = .001 * $self->{player}{weight}; |
1318 | my $weight = .001 * $self->{player}{weight}; |
| 1256 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1319 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
| 1257 | |
1320 | |
| 1258 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1321 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
| 1259 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
1322 | $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit); |
| 1260 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1323 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
| 1261 | } |
1324 | } |
| 1262 | |
1325 | |
| 1263 | sub update_server_info { |
1326 | sub update_server_info { |
| 1264 | my ($self) = @_; |
1327 | my ($self) = @_; |
| … | |
… | |
| 1272 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1335 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
| 1273 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
1336 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
| 1274 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1337 | . "editing support $yesno[!!$self->{editor_support}]\n" |
| 1275 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1338 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
| 1276 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
1339 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
| 1277 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1340 | . "client support $yesno[$self->{cfplus_ext} > 0]" |
| 1278 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1341 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
| 1279 | . "map size $self->{mapw}×$self->{maph}\n" |
1342 | . "map size $self->{mapw}×$self->{maph}\n" |
| 1280 | ); |
1343 | ); |
| 1281 | |
1344 | |
| 1282 | } |
1345 | } |
| … | |
… | |
| 1304 | |
1367 | |
| 1305 | $self->update_server_info; |
1368 | $self->update_server_info; |
| 1306 | |
1369 | |
| 1307 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
1370 | $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; |
| 1308 | $self->send_command ("pickup $::CFG->{pickup}"); |
1371 | $self->send_command ("pickup $::CFG->{pickup}"); |
|
|
1372 | |
|
|
1373 | $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]", |
|
|
1374 | DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d# |
| 1309 | } |
1375 | } |
| 1310 | |
1376 | |
| 1311 | sub lookat { |
1377 | sub lookat { |
| 1312 | my ($self, $x, $y) = @_; |
1378 | my ($self, $x, $y) = @_; |
| 1313 | |
1379 | |
