| … | |
… | |
| 11 | use DC::Pod; |
11 | use DC::Pod; |
| 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 | |
|
|
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; |
| 16 | |
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, |
| … | |
… | |
| 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 | |
| … | |
… | |
| 194 | ); |
204 | ); |
| 195 | } |
205 | } |
| 196 | |
206 | |
| 197 | # widgetset create template |
207 | # widgetset create template |
| 198 | sub ext_ws_ct { |
208 | sub ext_ws_ct { |
| 199 | my ($self, $ws, $template, $cfg) = @_; |
209 | my ($self, $ws, $type, $template, $done_cb, $cfg) = @_; |
| 200 | |
210 | |
| 201 | $template = eval <<EOF; |
211 | $done_cb ||= sub { }; |
| 202 | [ |
|
|
| 203 | Toplevel => { |
|
|
| 204 | s_id => "toplevel", |
|
|
| 205 | title => "Character Creation", |
|
|
| 206 | x => "center", |
|
|
| 207 | y => "center", |
|
|
| 208 | z => 5, |
|
|
| 209 | s_cl => [VBox => {s_cl => [ |
|
|
| 210 | Label => { |
|
|
| 211 | text => "Character Creation", |
|
|
| 212 | fontsize => 1, |
|
|
| 213 | align => 0, |
|
|
| 214 | }, |
|
|
| 215 | Label => { |
|
|
| 216 | markup => "View or Edit your character attributes below, then press <b>Finish</b> to create your character", |
|
|
| 217 | fontsize => 0.8, |
|
|
| 218 | align => 0, |
|
|
| 219 | }, |
|
|
| 220 | Notebook => { |
|
|
| 221 | s_cl => [ |
|
|
| 222 | Label => { |
|
|
| 223 | text => "hulla-hoop" |
|
|
| 224 | }, |
|
|
| 225 | Entry => { |
|
|
| 226 | s_id => "entry", |
|
|
| 227 | }, |
|
|
| 228 | ], |
|
|
| 229 | }, |
|
|
| 230 | Button => { |
|
|
| 231 | s_id => "finish", |
|
|
| 232 | title => "Finish", |
|
|
| 233 | }, |
|
|
| 234 | ]}], |
|
|
| 235 | }, |
|
|
| 236 | ] |
|
|
| 237 | EOF |
|
|
| 238 | die if $@; |
|
|
| 239 | |
212 | |
| 240 | my $parse_list; $parse_list = sub { |
213 | my $parse_list; $parse_list = sub { |
| 241 | my ($list) = @_; |
214 | my ($list) = @_; |
| 242 | my @w; |
215 | my @w; |
| 243 | |
216 | |
| … | |
… | |
| 260 | } |
233 | } |
| 261 | |
234 | |
| 262 | @w |
235 | @w |
| 263 | }; |
236 | }; |
| 264 | |
237 | |
|
|
238 | # either array reference, or face # |
|
|
239 | if ($type eq "inline") { |
|
|
240 | $done_cb->(); |
| 265 | $parse_list->($template); |
241 | $parse_list->($template); |
|
|
242 | } elsif ($type eq "face") { |
|
|
243 | my $handler; $handler = $self->register_face_handler ($template, sub { |
|
|
244 | my ($face) = @_; |
| 266 | |
245 | |
|
|
246 | undef $handler; |
|
|
247 | $done_cb->(); |
|
|
248 | $parse_list->($self->{json_coder}->decode ($face->{data})); |
|
|
249 | }); |
|
|
250 | } else { |
|
|
251 | $done_cb->(0); |
|
|
252 | } |
| 267 | } |
253 | } |
| 268 | |
254 | |
| 269 | # widgetset associate |
255 | # widgetset associate |
| 270 | sub ext_ws_a { |
256 | sub ext_ws_a { |
| 271 | my ($self, %ass) = @_; |
257 | my ($self, %ass) = @_; |
| … | |
… | |
| 299 | spell_list => $::SPELL_LIST, |
285 | spell_list => $::SPELL_LIST, |
| 300 | |
286 | |
| 301 | floorbox => $::FLOORBOX, |
287 | floorbox => $::FLOORBOX, |
| 302 | help_window => $::HELP_WINDOW, |
288 | help_window => $::HELP_WINDOW, |
| 303 | message_window => $::MESSAGE_WINDOW, |
289 | message_window => $::MESSAGE_WINDOW, |
|
|
290 | message_dist => $::MESSAGE_DIST, |
| 304 | statusbox => $::SDTATUSBOX, |
291 | statusbox => $::SDTATUSBOX, |
| 305 | |
292 | |
| 306 | inv => $::INV, |
293 | inv => $::INV, |
| 307 | invr => $::INVR, |
294 | invr => $::INVR, |
| 308 | invr_hb => $::INVR_HB, |
295 | invr_hb => $::INVR_HB, |
| … | |
… | |
| 357 | |
344 | |
| 358 | # message window |
345 | # message window |
| 359 | sub ext_channel_info { |
346 | sub ext_channel_info { |
| 360 | my ($self, $info) = @_; |
347 | my ($self, $info) = @_; |
| 361 | $self->{channels}->{$info->{id}} = $info; |
348 | $self->{channels}->{$info->{id}} = $info; |
| 362 | $::MESSAGE_WINDOW->add_channel ($info); |
349 | $::MESSAGE_DIST->add_channel ($info); |
| 363 | } |
350 | } |
| 364 | |
351 | |
| 365 | ############################################################################# |
352 | ############################################################################# |
| 366 | |
353 | |
| 367 | sub logprint { |
354 | sub logprint { |
| … | |
… | |
| 549 | $sktbl->clear; |
536 | $sktbl->clear; |
| 550 | |
537 | |
| 551 | my $sw = $self->{skillwid}{""} ||= [ |
538 | my $sw = $self->{skillwid}{""} ||= [ |
| 552 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
539 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 553 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
540 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 554 | 2, 0, (new DC::UI::Label text => "Progress", align => 0), |
541 | 2, 0, (new DC::UI::Label text => "Progress"), |
| 555 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1), |
542 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 556 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
543 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
| 557 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
544 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
| 558 | 6, 0, (new DC::UI::Label text => "Progress", align => 0), |
545 | 6, 0, (new DC::UI::Label text => "Progress"), |
| 559 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1), |
546 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
| 560 | ]; |
547 | ]; |
| 561 | |
548 | |
| 562 | my @add = @$sw; |
549 | my @add = @$sw; |
| 563 | |
550 | |
| 564 | 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>"; |
| … | |
… | |
| 603 | |
590 | |
| 604 | # progress |
591 | # progress |
| 605 | (new DC::UI::ExperienceProgress), |
592 | (new DC::UI::ExperienceProgress), |
| 606 | |
593 | |
| 607 | # label |
594 | # label |
| 608 | (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, |
| 609 | 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), |
| 610 | ]; |
597 | ]; |
| 611 | |
598 | |
| 612 | push @add, |
599 | push @add, |
| 613 | $x * 4 + 0, $y, $sw->[0], |
600 | $x * 4 + 0, $y, $sw->[0], |
| … | |
… | |
| 655 | } |
642 | } |
| 656 | |
643 | |
| 657 | sub map_scroll { |
644 | sub map_scroll { |
| 658 | my ($self, $dx, $dy) = @_; |
645 | my ($self, $dx, $dy) = @_; |
| 659 | |
646 | |
| 660 | $self->{map}->scroll ($dx, $dy); |
647 | $self->{map_widget}->scroll ($dx, $dy); |
| 661 | } |
648 | } |
| 662 | |
649 | |
| 663 | sub feed_map1a { |
650 | sub feed_map1a { |
| 664 | my ($self, $data) = @_; |
651 | my ($self, $data) = @_; |
| 665 | |
652 | |
| … | |
… | |
| 702 | } |
689 | } |
| 703 | |
690 | |
| 704 | sub flush_map { |
691 | sub flush_map { |
| 705 | my ($self) = @_; |
692 | my ($self) = @_; |
| 706 | |
693 | |
| 707 | my $map_info = delete $self->{map_info} |
694 | return unless $self->{map_info}; |
| 708 | or return; |
|
|
| 709 | |
695 | |
|
|
696 | for my $map_info (values %{ $self->{map_cache} || {} }) { |
| 710 | my ($hash, $x, $y, $w, $h) = @$map_info; |
697 | my ($hash, $rdata, $x, $y, $w, $h) = @$map_info; |
| 711 | |
698 | |
| 712 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
699 | my $data = $self->{map}->get_rect ($x, $y, $w, $h); |
| 713 | $self->{map_cache_new}{$hash} = \$data; |
700 | |
|
|
701 | if ($data ne $$rdata) { |
|
|
702 | $map_info->[1] = \$data; |
|
|
703 | my $cdata = Compress::LZF::compress $data; |
| 714 | DC::DB::put $self->{mapcache} => $hash => $data, sub { }; |
704 | DC::DB::put $self->{mapcache} => $hash => $cdata, sub { }; |
|
|
705 | } |
|
|
706 | } |
| 715 | } |
707 | } |
| 716 | |
708 | |
| 717 | sub map_clear { |
709 | sub map_clear { |
| 718 | my ($self) = @_; |
710 | my ($self) = @_; |
| 719 | |
711 | |
| 720 | $self->flush_map; |
712 | $self->flush_map; |
|
|
713 | delete $self->{map_info}; |
| 721 | delete $self->{neigh_map}; |
714 | delete $self->{neigh_map}; |
| 722 | |
715 | |
| 723 | $self->{map}->clear; |
716 | $self->{map}->clear; |
| 724 | delete $self->{map_widget}{magicmap}; |
717 | delete $self->{map_widget}{magicmap}; |
| 725 | } |
718 | } |
| … | |
… | |
| 746 | |
739 | |
| 747 | $self->bg_fetch; |
740 | $self->bg_fetch; |
| 748 | }; |
741 | }; |
| 749 | } |
742 | } |
| 750 | |
743 | |
| 751 | sub load_map($$$) { |
744 | sub load_map($$$$$$) { |
| 752 | my ($self, $hash, $x, $y) = @_; |
745 | my ($self, $hash, $x, $y, $w, $h) = @_; |
| 753 | |
746 | |
| 754 | my $gen = $self->{map_change_gen}; |
747 | my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h]; |
| 755 | |
748 | |
| 756 | my $cb = sub { |
749 | my $cb = sub { |
| 757 | return unless $gen == $self->{map_change_gen}; |
750 | $map_info->[1] = \$_[0]; |
| 758 | |
751 | |
| 759 | my ($data) = @_; |
|
|
| 760 | |
|
|
| 761 | if (defined $data) { |
|
|
| 762 | $self->{map_cache_new}{$hash} = \$data; |
|
|
| 763 | |
|
|
| 764 | my $data = Compress::LZF::decompress $data; |
|
|
| 765 | |
|
|
| 766 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
752 | my $inprogress = @{ $self->{bg_fetch} || [] }; |
| 767 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); |
753 | unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]); |
| 768 | $self->bg_fetch unless $inprogress; |
754 | $self->bg_fetch unless $inprogress; |
| 769 | } |
|
|
| 770 | }; |
755 | }; |
| 771 | |
756 | |
| 772 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
757 | if (my $map_info = $self->{map_cache_old}{$hash}) { |
| 773 | $cb->($$rdata); |
758 | $cb->(${ $map_info->[1] }); |
| 774 | } else { |
759 | } else { |
|
|
760 | my $gen = $self->{map_change_gen}; |
|
|
761 | |
| 775 | 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 | }; |
| 776 | } |
767 | } |
| 777 | } |
768 | } |
| 778 | |
769 | |
| 779 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
770 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
| 780 | # (server resource,s latency, bandwidth), so this hack is warranted. |
771 | # (server resources, latency, bandwidth), so this hack is warranted. |
| 781 | # 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 |
| 782 | sub send_mapinfo { |
773 | sub send_mapinfo { |
| 783 | my ($self, $data, $cb) = @_; |
774 | my ($self, $data, $cb) = @_; |
| 784 | |
775 | |
| 785 | 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)$%) { |
| … | |
… | |
| 810 | } |
801 | } |
| 811 | |
802 | |
| 812 | # this method does a "flood fill" into every tile direction |
803 | # this method does a "flood fill" into every tile direction |
| 813 | # it assumes that tiles are arranged in a rectangular grid, |
804 | # it assumes that tiles are arranged in a rectangular grid, |
| 814 | # 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. |
| 815 | # failure to comply are harmless and result in display errors |
806 | # failure to comply is harmless and results in display errors |
| 816 | # at worst. |
807 | # at worst. |
| 817 | sub flood_fill { |
808 | sub flood_fill { |
| 818 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
809 | my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; |
| 819 | |
810 | |
| 820 | # the server does not allow map paths > 6 |
811 | # the server does not allow map paths > 6 |
| … | |
… | |
| 856 | return if $mode ne "spatial"; |
847 | return if $mode ne "spatial"; |
| 857 | |
848 | |
| 858 | $x += $self->{map}->ox; |
849 | $x += $self->{map}->ox; |
| 859 | $y += $self->{map}->oy; |
850 | $y += $self->{map}->oy; |
| 860 | |
851 | |
| 861 | $self->load_map ($hash, $x, $y) |
852 | $self->load_map ($hash, $x, $y, $w, $h) |
| 862 | unless $self->{neigh_map}{$hash}[5]++;#d# |
853 | unless $self->{neigh_map}{$hash}[5]++;#d# |
| 863 | |
854 | |
| 864 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
855 | $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; |
| 865 | |
856 | |
| 866 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
857 | $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) |
| … | |
… | |
| 874 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
865 | my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; |
| 875 | |
866 | |
| 876 | $self->flush_map; |
867 | $self->flush_map; |
| 877 | |
868 | |
| 878 | ++$self->{map_change_gen}; |
869 | ++$self->{map_change_gen}; |
| 879 | $self->{map_cache_old} = delete $self->{map_cache_new}; |
870 | $self->{map_cache_old} = delete $self->{map_cache}; |
| 880 | |
871 | |
| 881 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
872 | my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); |
| 882 | |
873 | |
| 883 | my $mapmapw = $self->{mapmap}->{w}; |
874 | my $mapmapw = $self->{mapmap}->{w}; |
| 884 | my $mapmaph = $self->{mapmap}->{h}; |
875 | my $mapmaph = $self->{mapmap}->{h}; |
| … | |
… | |
| 896 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
887 | $self->{map_info} = [$hash, $x, $y, $w, $h]; |
| 897 | |
888 | |
| 898 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
889 | (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; |
| 899 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
890 | $::STATWIDS->{map}->set_text ("Map: " . $map); |
| 900 | |
891 | |
| 901 | $self->load_map ($hash, $x, $y); |
892 | $self->load_map ($hash, $x, $y, $w, $h); |
| 902 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
893 | $self->flood_fill (0, 0, 0, "", $hash, $flags); |
| 903 | } |
894 | } |
| 904 | |
895 | |
| 905 | sub face_find { |
896 | sub face_find { |
| 906 | my ($self, $facenum, $face, $cb) = @_; |
897 | my ($self, $facenum, $face, $cb) = @_; |
| … | |
… | |
| 1048 | 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; |
| 1049 | |
1040 | |
| 1050 | # handle some elements |
1041 | # handle some elements |
| 1051 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
1042 | s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; |
| 1052 | 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+$//; |
| 1053 | |
1046 | |
| 1054 | $_ |
1047 | $_ |
| 1055 | } |
1048 | } |
| 1056 | |
1049 | |
| 1057 | our %NAME_TO_COLOR = ( |
1050 | our %NAME_TO_COLOR = ( |
| … | |
… | |
| 1104 | |
1097 | |
| 1105 | ## 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 |
| 1106 | # no longer neecssary with TRT servers |
1099 | # no longer neecssary with TRT servers |
| 1107 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
1100 | #$text =~ s/(?<=\S)\n(?=\w)/ /g; |
| 1108 | |
1101 | |
| 1109 | for (split /\n/, $text) { |
|
|
| 1110 | ::message ({ |
1102 | ::message ({ |
| 1111 | fg => $fg, |
1103 | fg => $fg, |
| 1112 | markup => $_, |
1104 | markup => $text, |
| 1113 | type => $type, |
1105 | type => $type, |
| 1114 | extra => [@extra], |
1106 | extra => [@extra], |
| 1115 | color_flags => $color, #d# ugly, kill |
1107 | color_flags => $color, #d# ugly, kill |
| 1116 | }); |
1108 | }); |
| 1117 | |
1109 | |
| 1118 | $color &= ~NDI_CLEAR; # only clear once for multiline messages |
1110 | # $color &= ~NDI_CLEAR; # only clear once for multiline messages |
| 1119 | # actually, this is an ugly design. _we_ should control the channels, |
1111 | # # actually, this is an ugly design. _we_ should control the channels, |
| 1120 | # 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. |
| 1121 | # 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 |
| 1122 | # hacks such as color_flags, above. |
1114 | # # hacks such as color_flags, above. |
| 1123 | } |
|
|
| 1124 | |
1115 | |
| 1125 | $self->{statusbox}->add ($text, |
1116 | $self->{statusbox}->add ($text, |
| 1126 | group => $text, |
1117 | group => $text, |
| 1127 | fg => $fg, |
1118 | fg => $fg, |
| 1128 | timeout => $color >= 2 ? 180 : 10, |
1119 | timeout => $color >= 2 ? 180 : 10, |
| … | |
… | |
| 1163 | |
1154 | |
| 1164 | my %skill_help; |
1155 | my %skill_help; |
| 1165 | |
1156 | |
| 1166 | for my $node (DC::Pod::find skill_description => "*") { |
1157 | for my $node (DC::Pod::find skill_description => "*") { |
| 1167 | my (undef, @par) = DC::Pod::section_of $node; |
1158 | my (undef, @par) = DC::Pod::section_of $node; |
| 1168 | $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par; |
1159 | $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; |
| 1169 | }; |
1160 | }; |
| 1170 | |
1161 | |
| 1171 | for my $skill (values %{$self->{skill_info}}) { |
1162 | for my $skill (values %{$self->{skill_info}}) { |
| 1172 | $self->{map_widget}->add_command ("ready_skill $skill", |
1163 | $self->{map_widget}->add_command ("ready_skill $skill", |
| 1173 | (DC::asxml "Ready the skill '$skill'\n\n") |
1164 | (DC::asxml "Ready the skill '$skill'\n\n") |
| … | |
… | |
| 1193 | $::FLOORBOX->clear; |
1184 | $::FLOORBOX->clear; |
| 1194 | |
1185 | |
| 1195 | my @add; |
1186 | my @add; |
| 1196 | |
1187 | |
| 1197 | my $row; |
1188 | my $row; |
| 1198 | 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; |
| 1199 | if ($row < 6) { |
1191 | if ($row < 6) { |
| 1200 | local $_->{face_widget}; # hack to force recreation of widget |
1192 | local $_->{face_widget}; # hack to force recreation of widget |
| 1201 | local $_->{desc_widget}; # hack to force recreation of widget |
1193 | local $_->{desc_widget}; # hack to force recreation of widget |
| 1202 | DC::Item::update_widgets $_; |
1194 | DC::Item::update_widgets $_; |
| 1203 | |
1195 | |
| … | |
… | |
| 1230 | sub set_opencont { |
1222 | sub set_opencont { |
| 1231 | my ($conn, $tag, $name) = @_; |
1223 | my ($conn, $tag, $name) = @_; |
| 1232 | $conn->{open_container} = $tag; |
1224 | $conn->{open_container} = $tag; |
| 1233 | update_floorbox; |
1225 | update_floorbox; |
| 1234 | |
1226 | |
| 1235 | $::INVR_HB->clear (); |
1227 | $::INVR_HB->clear; |
| 1236 | $::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); |
| 1237 | |
1229 | |
| 1238 | if ($tag != 0) { # Floor isn't closable, is it? |
1230 | if ($tag != 0) { # Floor isn't closable, is it? |
| 1239 | $::INVR_HB->add (new DC::UI::Button |
1231 | $::INVR_HB->add (new DC::UI::Button |
| 1240 | text => "Close container", |
1232 | text => "Close container", |
| 1241 | tooltip => "Close the currently open container (if one is open)", |
1233 | tooltip => "Close the currently open container (if one is open)", |
| … | |
… | |
| 1296 | } |
1288 | } |
| 1297 | |
1289 | |
| 1298 | sub item_update { |
1290 | sub item_update { |
| 1299 | my ($self, $item) = @_; |
1291 | my ($self, $item) = @_; |
| 1300 | |
1292 | |
| 1301 | #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"; |
| 1302 | |
1294 | |
| 1303 | DC::Item::update_widgets $item; |
1295 | DC::Item::update_widgets $item; |
| 1304 | |
1296 | |
| 1305 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1297 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
| 1306 | set_opencont ($::CONN, 0, "Floor"); |
1298 | set_opencont ($::CONN, 0, "Floor"); |
| 1307 | |
1299 | |
| 1308 | } elsif ($item->{flags} & F_OPEN) { |
1300 | } elsif ($item->{flags} & F_OPEN) { |
| 1309 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
1301 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
| … | |
… | |
| 1325 | |
1317 | |
| 1326 | my $weight = .001 * $self->{player}{weight}; |
1318 | my $weight = .001 * $self->{player}{weight}; |
| 1327 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1319 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
| 1328 | |
1320 | |
| 1329 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1321 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
| 1330 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
1322 | $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit); |
| 1331 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1323 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
| 1332 | } |
1324 | } |
| 1333 | |
1325 | |
| 1334 | sub update_server_info { |
1326 | sub update_server_info { |
| 1335 | my ($self) = @_; |
1327 | my ($self) = @_; |
| … | |
… | |
| 1343 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
1335 | . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" |
| 1344 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
1336 | . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" |
| 1345 | . "editing support $yesno[!!$self->{editor_support}]\n" |
1337 | . "editing support $yesno[!!$self->{editor_support}]\n" |
| 1346 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
1338 | . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" |
| 1347 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
1339 | . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" |
| 1348 | . "cfplus support $yesno[$self->{cfplus_ext} > 0]" |
1340 | . "client support $yesno[$self->{cfplus_ext} > 0]" |
| 1349 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
1341 | . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" |
| 1350 | . "map size $self->{mapw}×$self->{maph}\n" |
1342 | . "map size $self->{mapw}×$self->{maph}\n" |
| 1351 | ); |
1343 | ); |
| 1352 | |
1344 | |
| 1353 | } |
1345 | } |
| … | |
… | |
| 1375 | |
1367 | |
| 1376 | $self->update_server_info; |
1368 | $self->update_server_info; |
| 1377 | |
1369 | |
| 1378 | $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; |
| 1379 | $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# |
| 1380 | } |
1375 | } |
| 1381 | |
1376 | |
| 1382 | sub lookat { |
1377 | sub lookat { |
| 1383 | my ($self, $x, $y) = @_; |
1378 | my ($self, $x, $y) = @_; |
| 1384 | |
1379 | |
