1 | package CFPlus::Protocol; |
1 | package DC::Protocol; |
2 | |
2 | |
3 | use utf8; |
3 | use utf8; |
4 | use strict; |
4 | use strict; |
5 | |
5 | |
6 | use Deliantra::Protocol::Constants; |
6 | use Deliantra::Protocol::Constants; |
7 | |
7 | |
8 | use CFPlus; |
8 | use DC; |
9 | use CFPlus::DB; |
9 | use DC::DB; |
10 | use CFPlus::UI; |
10 | use DC::UI; |
11 | use CFPlus::Pod; |
11 | use DC::Pod; |
12 | use CFPlus::Macro; |
12 | use DC::Macro; |
13 | use CFPlus::Item; |
13 | use DC::Item; |
14 | |
14 | |
15 | use base 'Deliantra::Protocol::Base'; |
15 | use base 'Deliantra::Protocol::Base'; |
16 | |
16 | |
17 | sub new { |
17 | sub new { |
18 | my ($class, %arg) = @_; |
18 | my ($class, %arg) = @_; |
19 | |
19 | |
20 | my $self = $class->SUPER::new (%arg, |
20 | my $self = $class->SUPER::new (%arg, |
21 | setup_req => { |
21 | setup_req => { |
22 | extmap => 1, |
22 | extmap => 1, |
23 | excmd => 1, |
23 | excmd => 1, |
24 | widget => 1, |
24 | widget => 2, |
25 | %{$arg{setup_req} || {}}, |
25 | %{$arg{setup_req} || {}}, |
26 | }, |
26 | }, |
27 | ); |
27 | ); |
28 | |
28 | |
29 | $self->{map_widget}->clr_commands; |
29 | $self->{map_widget}->clr_commands; |
… | |
… | |
34 | |
34 | |
35 | my $cmd = $1; |
35 | my $cmd = $1; |
36 | my @args = split /\|/, $2; |
36 | my @args = split /\|/, $2; |
37 | @args = (".*") unless @args; |
37 | @args = (".*") unless @args; |
38 | |
38 | |
39 | my (undef, @par) = CFPlus::Pod::section_of $_; |
39 | my (undef, @par) = DC::Pod::section_of $_; |
40 | my $text = CFPlus::Pod::as_label @par; |
40 | my $text = DC::Pod::as_label @par; |
41 | |
41 | |
42 | $_ = $_ eq ".*" ? "" : " $_" |
42 | $_ = $_ eq ".*" ? "" : " $_" |
43 | for @args; |
43 | for @args; |
44 | |
44 | |
45 | map ["$cmd$_", $text], |
45 | map ["$cmd$_", $text], |
46 | sort { (length $a) <=> (length $b) } |
46 | sort { (length $a) <=> (length $b) } |
47 | @args |
47 | @args |
48 | } sort { $a->{par} <=> $b->{par} } |
48 | } sort { $a->{par} <=> $b->{par} } |
49 | CFPlus::Pod::find command => "*"; |
49 | DC::Pod::find command => "*"; |
50 | |
50 | |
51 | $self->{json_coder} |
51 | $self->{json_coder} |
52 | ->convert_blessed |
52 | ->convert_blessed |
53 | ->filter_json_single_key_object ("\fw" => sub { |
53 | ->filter_json_single_key_object ("\fw" => sub { |
54 | $self->{widget}{$_[0]} |
54 | $self->{widget}{$_[0]} |
… | |
… | |
70 | |
70 | |
71 | $self->{map_widget}->add_command (@$_) |
71 | $self->{map_widget}->add_command (@$_) |
72 | for @cmd_help; |
72 | for @cmd_help; |
73 | |
73 | |
74 | { |
74 | { |
75 | $self->{dialogue} = my $tex = new_from_file CFPlus::Texture |
75 | $self->{dialogue} = my $tex = new_from_file DC::Texture |
76 | CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; |
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}}); |
77 | $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
78 | } |
78 | } |
79 | |
79 | |
80 | { |
80 | { |
81 | $self->{noface} = my $tex = new_from_file CFPlus::Texture |
81 | $self->{noface} = my $tex = new_from_file DC::Texture |
82 | CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; |
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}}); |
83 | $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); |
84 | } |
84 | } |
85 | |
85 | |
86 | $self->{open_container} = 0; |
86 | $self->{open_container} = 0; |
87 | |
87 | |
… | |
… | |
102 | } |
102 | } |
103 | |
103 | |
104 | sub ext_capabilities { |
104 | sub ext_capabilities { |
105 | my ($self, %cap) = @_; |
105 | my ($self, %cap) = @_; |
106 | |
106 | |
107 | #$self->send ("setup sound 0"); # we use a different protocol |
|
|
108 | $self->update_fx_want; |
107 | $self->update_fx_want; |
109 | |
108 | |
110 | $self->send_exti_req (resource => "exp_table", sub { |
109 | $self->send_exti_req (resource => "exp_table", sub { |
111 | my ($exp_table) = @_; |
110 | my ($exp_table) = @_; |
112 | |
111 | |
… | |
… | |
142 | ############################################################################# |
141 | ############################################################################# |
143 | |
142 | |
144 | sub widget_associate { |
143 | sub widget_associate { |
145 | my ($self, $ws, $id, $widget) = @_; |
144 | my ($self, $ws, $id, $widget) = @_; |
146 | |
145 | |
147 | $widget ||= new CFPlus::UI::Bin; |
146 | $widget ||= new DC::UI::Bin; |
148 | |
147 | |
149 | $widget->{s_id} = $id; |
148 | $widget->{s_id} = $id; |
150 | $self->{widget}{$id} = $widget; |
149 | $self->{widget}{$id} = $widget; |
151 | |
150 | |
152 | if ($ws) { |
151 | if ($ws) { |
… | |
… | |
188 | my ($self, $ws, $id, $class, $args) = @_; |
187 | my ($self, $ws, $id, $class, $args) = @_; |
189 | |
188 | |
190 | $self->widget_associate ( |
189 | $self->widget_associate ( |
191 | $ws, $id => scalar eval { |
190 | $ws, $id => scalar eval { |
192 | local $SIG{__DIE__}; |
191 | local $SIG{__DIE__}; |
193 | "CFPlus::UI::$class"->new (%$args) |
192 | "DC::UI::$class"->new (%$args) |
194 | } |
193 | } |
195 | ); |
194 | ); |
|
|
195 | } |
|
|
196 | |
|
|
197 | # widgetset create template |
|
|
198 | sub ext_ws_ct { |
|
|
199 | my ($self, $ws, $type, $template, $done_cb, $cfg) = @_; |
|
|
200 | |
|
|
201 | $done_cb ||= sub { }; |
|
|
202 | |
|
|
203 | my $parse_list; $parse_list = sub { |
|
|
204 | my ($list) = @_; |
|
|
205 | my @w; |
|
|
206 | |
|
|
207 | while (@$list) { |
|
|
208 | my ($class, $args) = splice @$list, 0, 2; |
|
|
209 | my $name = delete $args->{s_id}; |
|
|
210 | my $cl = delete $args->{s_cl}; |
|
|
211 | my $cfg = delete $cfg->{$name}; |
|
|
212 | my $id = delete $cfg->{id}; |
|
|
213 | my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) } |
|
|
214 | or next; |
|
|
215 | |
|
|
216 | $self->widget_associate ($ws, $id, $w) |
|
|
217 | if $id; |
|
|
218 | |
|
|
219 | $w->add ($parse_list->($cl)) |
|
|
220 | if $cl; |
|
|
221 | |
|
|
222 | push @w, $w; |
|
|
223 | } |
|
|
224 | |
|
|
225 | @w |
|
|
226 | }; |
|
|
227 | |
|
|
228 | # either array reference, or face # |
|
|
229 | if ($type eq "inline") { |
|
|
230 | $done_cb->(); |
|
|
231 | $parse_list->($template); |
|
|
232 | } elsif ($type eq "face") { |
|
|
233 | my $handler; $handler = $self->register_face_handler ($template, sub { |
|
|
234 | my ($face) = @_; |
|
|
235 | |
|
|
236 | undef $handler; |
|
|
237 | $done_cb->(); |
|
|
238 | $parse_list->($self->{json_coder}->decode ($face->{data})); |
|
|
239 | }); |
|
|
240 | } else { |
|
|
241 | $done_cb->(0); |
|
|
242 | } |
196 | } |
243 | } |
197 | |
244 | |
198 | # widgetset associate |
245 | # widgetset associate |
199 | sub ext_ws_a { |
246 | sub ext_ws_a { |
200 | my ($self, %ass) = @_; |
247 | my ($self, %ass) = @_; |
201 | |
248 | |
202 | # everything that has a name, wether conceivably useful or not |
249 | # everything that has a name, wether conceivably useful or not |
203 | my %wkw = ( |
250 | my %wkw = ( |
204 | root => $CFPlus::UI::ROOT, |
251 | root => $DC::UI::ROOT, |
205 | tooltip => $CFPlus::UI::TOOLTIP, |
252 | tooltip => $DC::UI::TOOLTIP, |
206 | |
253 | |
207 | mapwidget => $::MAPWIDGET, |
254 | mapwidget => $::MAPWIDGET, |
208 | buttonbar => $::BUTTONBAR, |
255 | buttonbar => $::BUTTONBAR, |
209 | metaserver => $::METASERVER, |
256 | metaserver => $::METASERVER, |
210 | buttonbar => $::BUTTONBAR, |
257 | buttonbar => $::BUTTONBAR, |
… | |
… | |
294 | ############################################################################# |
341 | ############################################################################# |
295 | |
342 | |
296 | sub logprint { |
343 | sub logprint { |
297 | my ($self, @a) = @_; |
344 | my ($self, @a) = @_; |
298 | |
345 | |
299 | CFPlus::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
346 | DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; |
300 | } |
347 | } |
301 | |
348 | |
302 | sub _stat_numdiff { |
349 | sub _stat_numdiff { |
303 | my ($self, $name, $old, $new) = @_; |
350 | my ($self, $name, $old, $new) = @_; |
304 | |
351 | |
… | |
… | |
476 | $self->{stat_order} = join ",", map $_->[0], @order; |
523 | $self->{stat_order} = join ",", map $_->[0], @order; |
477 | |
524 | |
478 | $sktbl->clear; |
525 | $sktbl->clear; |
479 | |
526 | |
480 | my $sw = $self->{skillwid}{""} ||= [ |
527 | my $sw = $self->{skillwid}{""} ||= [ |
481 | 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
528 | 0, 0, (new DC::UI::Label text => "Experience", align => 1), |
482 | 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
529 | 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
483 | 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
530 | 2, 0, (new DC::UI::Label text => "Progress"), |
484 | 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
531 | 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
485 | 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), |
532 | 4, 0, (new DC::UI::Label text => "Experience", align => 1), |
486 | 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), |
533 | 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), |
487 | 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), |
534 | 6, 0, (new DC::UI::Label text => "Progress"), |
488 | 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), |
535 | 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), |
489 | ]; |
536 | ]; |
490 | |
537 | |
491 | my @add = @$sw; |
538 | my @add = @$sw; |
492 | |
539 | |
493 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
540 | my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; |
… | |
… | |
505 | if ($ev->{button} == 1) { |
552 | if ($ev->{button} == 1) { |
506 | $::CONN->user_send ("ready_skill $name"); |
553 | $::CONN->user_send ("ready_skill $name"); |
507 | } elsif ($ev->{button} == 2) { |
554 | } elsif ($ev->{button} == 2) { |
508 | $::CONN->user_send ("use_skill $name"); |
555 | $::CONN->user_send ("use_skill $name"); |
509 | } elsif ($ev->{button} == 3) { |
556 | } elsif ($ev->{button} == 3) { |
510 | my $shortname = CFPlus::shorten $name, 14; |
557 | my $shortname = DC::shorten $name, 14; |
511 | (new CFPlus::UI::Menu |
558 | (new DC::UI::Menu |
512 | items => [ |
559 | items => [ |
513 | ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], |
560 | ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }], |
514 | ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], |
561 | ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }], |
515 | ], |
562 | ], |
516 | )->popup ($ev); |
563 | )->popup ($ev); |
517 | } else { |
564 | } else { |
518 | return 0; |
565 | return 0; |
519 | } |
566 | } |
… | |
… | |
521 | 1 |
568 | 1 |
522 | }; |
569 | }; |
523 | |
570 | |
524 | my $sw = $self->{skillwid}{$idx} ||= [ |
571 | my $sw = $self->{skillwid}{$idx} ||= [ |
525 | # exp |
572 | # exp |
526 | (new CFPlus::UI::Label |
573 | (new DC::UI::Label |
527 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
574 | align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), |
528 | |
575 | |
529 | # level |
576 | # level |
530 | (new CFPlus::UI::Label |
577 | (new DC::UI::Label |
531 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
578 | text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), |
532 | |
579 | |
533 | # progress |
580 | # progress |
534 | (new CFPlus::UI::ExperienceProgress), |
581 | (new DC::UI::ExperienceProgress), |
535 | |
582 | |
536 | # label |
583 | # label |
537 | (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, |
584 | (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0, |
538 | can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
585 | can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), |
539 | ]; |
586 | ]; |
540 | |
587 | |
541 | push @add, |
588 | push @add, |
542 | $x * 4 + 0, $y, $sw->[0], |
589 | $x * 4 + 0, $y, $sw->[0], |
543 | $x * 4 + 1, $y, $sw->[1], |
590 | $x * 4 + 1, $y, $sw->[1], |
… | |
… | |
638 | |
685 | |
639 | my ($hash, $x, $y, $w, $h) = @$map_info; |
686 | my ($hash, $x, $y, $w, $h) = @$map_info; |
640 | |
687 | |
641 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
688 | my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); |
642 | $self->{map_cache_new}{$hash} = \$data; |
689 | $self->{map_cache_new}{$hash} = \$data; |
643 | CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; |
690 | DC::DB::put $self->{mapcache} => $hash => $data, sub { }; |
644 | } |
691 | } |
645 | |
692 | |
646 | sub map_clear { |
693 | sub map_clear { |
647 | my ($self) = @_; |
694 | my ($self) = @_; |
648 | |
695 | |
… | |
… | |
661 | do { |
708 | do { |
662 | $tile = pop @{$self->{bg_fetch}} |
709 | $tile = pop @{$self->{bg_fetch}} |
663 | or return; |
710 | or return; |
664 | } while $self->{texture}[$tile]; |
711 | } while $self->{texture}[$tile]; |
665 | |
712 | |
666 | CFPlus::DB::get tilecache => $tile, sub { |
713 | DC::DB::get tilecache => $tile, sub { |
667 | my ($data) = @_; |
714 | my ($data) = @_; |
668 | |
715 | |
669 | return unless $self->{map}; # stop when destroyed |
716 | return unless $self->{map}; # stop when destroyed |
670 | |
717 | |
671 | if (defined $data) { |
718 | if (defined $data) { |
… | |
… | |
699 | }; |
746 | }; |
700 | |
747 | |
701 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
748 | if (my $rdata = $self->{map_cache_old}{$hash}) { |
702 | $cb->($$rdata); |
749 | $cb->($$rdata); |
703 | } else { |
750 | } else { |
704 | CFPlus::DB::get $self->{mapcache} => $hash, $cb; |
751 | DC::DB::get $self->{mapcache} => $hash, $cb; |
705 | } |
752 | } |
706 | } |
753 | } |
707 | |
754 | |
708 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
755 | # hardcode /world/world_xxx_xxx map names, the savings are enourmous, |
709 | # (server resource,s latency, bandwidth), so this hack is warranted. |
756 | # (server resource,s latency, bandwidth), so this hack is warranted. |
… | |
… | |
833 | |
880 | |
834 | sub face_find { |
881 | sub face_find { |
835 | my ($self, $facenum, $face, $cb) = @_; |
882 | my ($self, $facenum, $face, $cb) = @_; |
836 | |
883 | |
837 | if ($face->{type} == 0) { # FT_FACE |
884 | if ($face->{type} == 0) { # FT_FACE |
838 | my $id = CFPlus::DB::get_tile_id_sync $face->{name}; |
885 | my $id = DC::DB::get_tile_id_sync $face->{name}; |
839 | |
886 | |
840 | $face->{id} = $id; |
887 | $face->{id} = $id; |
841 | $self->{map}->set_tileid ($facenum => $id); |
888 | $self->{map}->set_tileid ($facenum => $id); |
842 | |
889 | |
843 | CFPlus::DB::get tilecache => $id, $cb; |
890 | DC::DB::get tilecache => $id, $cb; |
844 | |
891 | |
845 | } elsif ($face->{type} & 1) { # with metadata |
892 | } elsif ($face->{type} & 1) { # with metadata |
846 | CFPlus::DB::get res_meta => $face->{name}, $cb; |
893 | DC::DB::get res_meta => $face->{name}, $cb; |
847 | |
894 | |
848 | } else { # no metadata |
895 | } else { # no metadata |
849 | CFPlus::DB::get res_data => $face->{name}, $cb; |
896 | DC::DB::get res_data => $face->{name}, $cb; |
850 | } |
897 | } |
851 | } |
898 | } |
852 | |
899 | |
853 | sub face_update { |
900 | sub face_update { |
854 | my ($self, $facenum, $face, $changed) = @_; |
901 | my ($self, $facenum, $face, $changed) = @_; |
855 | |
902 | |
856 | if ($face->{type} == 0) { |
903 | if ($face->{type} == 0) { |
857 | # image, FT_FACE |
904 | # image, FT_FACE |
858 | CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
905 | DC::DB::put tilecache => $face->{id} => $face->{data}, sub { } |
859 | if $changed; |
906 | if $changed; |
860 | |
907 | |
861 | $self->have_tile ($face->{id}, delete $face->{data}); |
908 | $self->have_tile ($face->{id}, delete $face->{data}); |
862 | |
909 | |
863 | } elsif ($face->{type} & 1) { |
910 | } elsif ($face->{type} & 1) { |
… | |
… | |
865 | if ($changed) { # new data |
912 | if ($changed) { # new data |
866 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
913 | my ($meta, $data) = unpack "(w/a*)*", $face->{data}; |
867 | $face->{data} = $meta; |
914 | $face->{data} = $meta; |
868 | |
915 | |
869 | # rely on strict ordering here and also on later fetch |
916 | # rely on strict ordering here and also on later fetch |
870 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
917 | DC::DB::put res_data => $face->{name} => $data, sub { }; |
871 | CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; |
918 | DC::DB::put res_meta => $face->{name} => $meta, sub { }; |
872 | } |
919 | } |
873 | |
920 | |
874 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
921 | $face->{data} = $self->{json_coder}->decode ($face->{data}); |
875 | ::add_license ($face); |
922 | ::add_license ($face); |
876 | ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
923 | ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) |
877 | if $changed; |
924 | if $changed; |
878 | |
925 | |
879 | if ($face->{type} == 3) { # FT_MUSIC |
926 | if ($face->{type} == 3) { # FT_MUSIC |
880 | &::audio_music_push ($facenum); |
927 | &::audio_music_push ($facenum); |
881 | } elsif ($face->{type} == 5) { # FT_SOUND |
928 | } elsif ($face->{type} == 5) { # FT_SOUND |
882 | &::audio_sound_push ($facenum); |
929 | &::audio_sound_push ($facenum); |
883 | } |
930 | } |
884 | |
931 | |
885 | } else { |
932 | } else { |
886 | # flat resource case, FT_RSRC |
933 | # flat resource case, FT_RSRC |
887 | CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } |
934 | DC::DB::put res_data => $face->{name} => $face->{data}, sub { } |
888 | if $changed; |
935 | if $changed; |
889 | } |
936 | } |
890 | |
937 | |
891 | if (my $cbs = $self->{face_cb}{$facenum}) { |
938 | if (my $cbs = $self->{face_cb}{$facenum}) { |
892 | $_->($face, $changed) for @$cbs; |
939 | $_->($face, $changed) for @$cbs; |
… | |
… | |
903 | my ($self, $tile, $data) = @_; |
950 | my ($self, $tile, $data) = @_; |
904 | |
951 | |
905 | return unless $self->{map}; |
952 | return unless $self->{map}; |
906 | |
953 | |
907 | my $tex = $self->{texture}[$tile] ||= |
954 | my $tex = $self->{texture}[$tile] ||= |
908 | new CFPlus::Texture |
955 | new DC::Texture |
909 | tile => $tile, |
956 | tile => $tile, |
910 | image => $data, delete_image => 1, |
957 | image => $data, delete_image => 1, |
911 | minify => 1, mipmap => 1; |
958 | minify => 1, mipmap => 1; |
912 | |
959 | |
913 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
960 | if (my $cbs = delete $self->{tile_cb}{$tile}) { |
… | |
… | |
921 | my ($self, $num, $cb) = @_; |
968 | my ($self, $num, $cb) = @_; |
922 | |
969 | |
923 | push @{$self->{face_cb}{$num}}, $cb; |
970 | push @{$self->{face_cb}{$num}}, $cb; |
924 | |
971 | |
925 | defined wantarray |
972 | defined wantarray |
926 | ? CFPlus::guard { |
973 | ? DC::guard { |
927 | @{$self->{face_cb}{$num}} |
974 | @{$self->{face_cb}{$num}} |
928 | = grep $_ != $cb, |
975 | = grep $_ != $cb, |
929 | @{$self->{face_cb}{$num}}; |
976 | @{$self->{face_cb}{$num}}; |
930 | } |
977 | } |
931 | : () |
978 | : () |
… | |
… | |
1068 | $spell->{message} =~ s/\n+$//; |
1115 | $spell->{message} =~ s/\n+$//; |
1069 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1116 | $spell->{message} ||= "Server did not provide a description for this spell."; |
1070 | |
1117 | |
1071 | $::SPELL_LIST->add_spell ($spell); |
1118 | $::SPELL_LIST->add_spell ($spell); |
1072 | |
1119 | |
1073 | $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); |
1120 | $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message}); |
1074 | $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); |
1121 | $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message}); |
1075 | } |
1122 | } |
1076 | |
1123 | |
1077 | sub spell_delete { |
1124 | sub spell_delete { |
1078 | my ($self, $spell) = @_; |
1125 | my ($self, $spell) = @_; |
1079 | |
1126 | |
… | |
… | |
1090 | sub addme_success { |
1137 | sub addme_success { |
1091 | my ($self) = @_; |
1138 | my ($self) = @_; |
1092 | |
1139 | |
1093 | my %skill_help; |
1140 | my %skill_help; |
1094 | |
1141 | |
1095 | for my $node (CFPlus::Pod::find skill_description => "*") { |
1142 | for my $node (DC::Pod::find skill_description => "*") { |
1096 | my (undef, @par) = CFPlus::Pod::section_of $node; |
1143 | my (undef, @par) = DC::Pod::section_of $node; |
1097 | $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; |
1144 | $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par; |
1098 | }; |
1145 | }; |
1099 | |
1146 | |
1100 | for my $skill (values %{$self->{skill_info}}) { |
1147 | for my $skill (values %{$self->{skill_info}}) { |
1101 | $self->{map_widget}->add_command ("ready_skill $skill", |
1148 | $self->{map_widget}->add_command ("ready_skill $skill", |
1102 | (CFPlus::asxml "Ready the skill '$skill'\n\n") |
1149 | (DC::asxml "Ready the skill '$skill'\n\n") |
1103 | . $skill_help{$skill}); |
1150 | . $skill_help{$skill}); |
1104 | $self->{map_widget}->add_command ("use_skill $skill", |
1151 | $self->{map_widget}->add_command ("use_skill $skill", |
1105 | (CFPlus::asxml "Immediately use the skill '$skill'\n\n") |
1152 | (DC::asxml "Immediately use the skill '$skill'\n\n") |
1106 | . $skill_help{$skill}); |
1153 | . $skill_help{$skill}); |
1107 | } |
1154 | } |
1108 | } |
1155 | } |
1109 | |
1156 | |
1110 | sub eof { |
1157 | sub eof { |
… | |
… | |
1114 | |
1161 | |
1115 | ::stop_game (); |
1162 | ::stop_game (); |
1116 | } |
1163 | } |
1117 | |
1164 | |
1118 | sub update_floorbox { |
1165 | sub update_floorbox { |
1119 | $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1166 | $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub { |
1120 | return unless $::CONN; |
1167 | return unless $::CONN; |
1121 | |
1168 | |
1122 | $::FLOORBOX->clear; |
1169 | $::FLOORBOX->clear; |
1123 | |
1170 | |
1124 | my @add; |
1171 | my @add; |
… | |
… | |
1126 | my $row; |
1173 | my $row; |
1127 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1174 | for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { |
1128 | if ($row < 6) { |
1175 | if ($row < 6) { |
1129 | local $_->{face_widget}; # hack to force recreation of widget |
1176 | local $_->{face_widget}; # hack to force recreation of widget |
1130 | local $_->{desc_widget}; # hack to force recreation of widget |
1177 | local $_->{desc_widget}; # hack to force recreation of widget |
1131 | CFPlus::Item::update_widgets $_; |
1178 | DC::Item::update_widgets $_; |
1132 | |
1179 | |
1133 | push @add, |
1180 | push @add, |
1134 | 0, $row, $_->{face_widget}, |
1181 | 0, $row, $_->{face_widget}, |
1135 | 1, $row, $_->{desc_widget}; |
1182 | 1, $row, $_->{desc_widget}; |
1136 | |
1183 | |
1137 | $row++; |
1184 | $row++; |
1138 | } else { |
1185 | } else { |
1139 | push @add, 1, $row, new CFPlus::UI::Button |
1186 | push @add, 1, $row, new DC::UI::Button |
1140 | text => "More...", |
1187 | text => "More...", |
1141 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1188 | on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, |
1142 | ; |
1189 | ; |
1143 | last; |
1190 | last; |
1144 | } |
1191 | } |
1145 | } |
1192 | } |
1146 | if ($::CONN->{open_container}) { |
1193 | if ($::CONN->{open_container}) { |
1147 | push @add, 1, $row++, new CFPlus::UI::Button |
1194 | push @add, 1, $row++, new DC::UI::Button |
1148 | text => "Close container", |
1195 | text => "Close container", |
1149 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1196 | on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } |
1150 | ; |
1197 | ; |
1151 | } |
1198 | } |
1152 | |
1199 | |
1153 | $::FLOORBOX->add_at (@add); |
1200 | $::FLOORBOX->add_at (@add); |
1154 | }); |
1201 | }); |
1155 | |
1202 | |
1156 | $::WANT_REFRESH->start; |
1203 | $::WANT_REFRESH = 1; |
1157 | } |
1204 | } |
1158 | |
1205 | |
1159 | sub set_opencont { |
1206 | sub set_opencont { |
1160 | my ($conn, $tag, $name) = @_; |
1207 | my ($conn, $tag, $name) = @_; |
1161 | $conn->{open_container} = $tag; |
1208 | $conn->{open_container} = $tag; |
1162 | update_floorbox; |
1209 | update_floorbox; |
1163 | |
1210 | |
1164 | $::INVR_HB->clear (); |
1211 | $::INVR_HB->clear (); |
1165 | $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); |
1212 | $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); |
1166 | |
1213 | |
1167 | if ($tag != 0) { # Floor isn't closable, is it? |
1214 | if ($tag != 0) { # Floor isn't closable, is it? |
1168 | $::INVR_HB->add (new CFPlus::UI::Button |
1215 | $::INVR_HB->add (new DC::UI::Button |
1169 | text => "Close container", |
1216 | text => "Close container", |
1170 | tooltip => "Close the currently open container (if one is open)", |
1217 | tooltip => "Close the currently open container (if one is open)", |
1171 | on_activate => sub { |
1218 | on_activate => sub { |
1172 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1219 | $::CONN->send ("apply $tag") # $::CONN->{open_container}") |
1173 | if $tag != 0; |
1220 | if $tag != 0; |
… | |
… | |
1180 | } |
1227 | } |
1181 | |
1228 | |
1182 | sub update_containers { |
1229 | sub update_containers { |
1183 | my ($self) = @_; |
1230 | my ($self) = @_; |
1184 | |
1231 | |
1185 | $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1232 | $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub { |
1186 | my $todo = delete $self->{update_container} |
1233 | my $todo = delete $self->{update_container} |
1187 | or return; |
1234 | or return; |
1188 | |
1235 | |
1189 | for my $tag (keys %$todo) { |
1236 | for my $tag (keys %$todo) { |
1190 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
1237 | update_floorbox if $tag == 0 or $tag == $self->{open_container}; |
… | |
… | |
1227 | sub item_update { |
1274 | sub item_update { |
1228 | my ($self, $item) = @_; |
1275 | my ($self, $item) = @_; |
1229 | |
1276 | |
1230 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1277 | #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; |
1231 | |
1278 | |
1232 | CFPlus::Item::update_widgets $item; |
1279 | DC::Item::update_widgets $item; |
1233 | |
1280 | |
1234 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1281 | if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { |
1235 | set_opencont ($::CONN, 0, "Floor"); |
1282 | set_opencont ($::CONN, 0, "Floor"); |
1236 | |
1283 | |
1237 | } elsif ($item->{flags} & F_OPEN) { |
1284 | } elsif ($item->{flags} & F_OPEN) { |
1238 | set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); |
1285 | set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); |
1239 | |
1286 | |
1240 | } else { |
1287 | } else { |
1241 | $self->{update_container}{$item->{container}}++; |
1288 | $self->{update_container}{$item->{container}}++; |
1242 | $self->update_containers; |
1289 | $self->update_containers; |
1243 | } |
1290 | } |
… | |
… | |
1254 | |
1301 | |
1255 | my $weight = .001 * $self->{player}{weight}; |
1302 | my $weight = .001 * $self->{player}{weight}; |
1256 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1303 | my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; |
1257 | |
1304 | |
1258 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1305 | $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); |
1259 | $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); |
1306 | $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit); |
1260 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1307 | $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); |
1261 | } |
1308 | } |
1262 | |
1309 | |
1263 | sub update_server_info { |
1310 | sub update_server_info { |
1264 | my ($self) = @_; |
1311 | my ($self) = @_; |
… | |
… | |
1315 | $self->send_ext_req (lookat => $x, $y, sub { |
1362 | $self->send_ext_req (lookat => $x, $y, sub { |
1316 | my (%msg) = @_; |
1363 | my (%msg) = @_; |
1317 | |
1364 | |
1318 | if (exists $msg{npc_dialog}) { |
1365 | if (exists $msg{npc_dialog}) { |
1319 | # start npc chat dialog |
1366 | # start npc chat dialog |
1320 | $self->{npc_dialog} = new CFPlus::NPCDialog:: |
1367 | $self->{npc_dialog} = new DC::NPCDialog:: |
1321 | token => $msg{npc_dialog}, |
1368 | token => $msg{npc_dialog}, |
1322 | title => "$msg{npc_dialog}[0] (NPC)", |
1369 | title => "$msg{npc_dialog}[0] (NPC)", |
1323 | conn => $self, |
1370 | conn => $self, |
1324 | ; |
1371 | ; |
1325 | } |
1372 | } |
… | |
… | |
1338 | $self->SUPER::destroy; |
1385 | $self->SUPER::destroy; |
1339 | |
1386 | |
1340 | %$self = (); |
1387 | %$self = (); |
1341 | } |
1388 | } |
1342 | |
1389 | |
1343 | package CFPlus::NPCDialog; |
1390 | package DC::NPCDialog; |
1344 | |
1391 | |
1345 | our @ISA = 'CFPlus::UI::Toplevel'; |
1392 | our @ISA = 'DC::UI::Toplevel'; |
1346 | |
1393 | |
1347 | sub new { |
1394 | sub new { |
1348 | my $class = shift; |
1395 | my $class = shift; |
1349 | |
1396 | |
1350 | my $self = $class->SUPER::new ( |
1397 | my $self = $class->SUPER::new ( |
… | |
… | |
1357 | kw => { hi => 0, yes => 0, no => 0 }, |
1404 | kw => { hi => 0, yes => 0, no => 0 }, |
1358 | has_close_button => 1, |
1405 | has_close_button => 1, |
1359 | @_, |
1406 | @_, |
1360 | ); |
1407 | ); |
1361 | |
1408 | |
1362 | CFPlus::weaken (my $this = $self); |
1409 | DC::weaken (my $this = $self); |
1363 | |
1410 | |
1364 | $self->connect (delete => sub { $this->destroy; 1 }); |
1411 | $self->connect (delete => sub { $this->destroy; 1 }); |
1365 | |
1412 | |
1366 | # better use a pane... |
1413 | # better use a pane... |
1367 | $self->add (my $hbox = new CFPlus::UI::HBox); |
1414 | $self->add (my $hbox = new DC::UI::HBox); |
1368 | $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); |
1415 | $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1); |
1369 | |
1416 | |
1370 | $hbox->add (my $vbox = new CFPlus::UI::VBox); |
1417 | $hbox->add (my $vbox = new DC::UI::VBox); |
1371 | |
1418 | |
1372 | $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); |
1419 | $vbox->add (new DC::UI::Label text => "Message Entry:"); |
1373 | $vbox->add ($self->{entry} = new CFPlus::UI::Entry |
1420 | $vbox->add ($self->{entry} = new DC::UI::Entry |
1374 | tooltip => "#npc_message_entry", |
1421 | tooltip => "#npc_message_entry", |
1375 | on_activate => sub { |
1422 | on_activate => sub { |
1376 | my ($entry, $text) = @_; |
1423 | my ($entry, $text) = @_; |
1377 | |
1424 | |
1378 | return unless $text =~ /\S/; |
1425 | return unless $text =~ /\S/; |
… | |
… | |
1382 | |
1429 | |
1383 | 0 |
1430 | 0 |
1384 | }, |
1431 | }, |
1385 | ); |
1432 | ); |
1386 | |
1433 | |
1387 | $vbox->add ($self->{options} = new CFPlus::UI::VBox); |
1434 | $vbox->add ($self->{options} = new DC::UI::VBox); |
1388 | |
1435 | |
1389 | $self->{bye_button} = new CFPlus::UI::Button |
1436 | $self->{bye_button} = new DC::UI::Button |
1390 | text => "Bye (close)", |
1437 | text => "Bye (close)", |
1391 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1438 | tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", |
1392 | on_activate => sub { $this->destroy; 1 }, |
1439 | on_activate => sub { $this->destroy; 1 }, |
1393 | ; |
1440 | ; |
1394 | |
1441 | |
… | |
… | |
1413 | }; |
1460 | }; |
1414 | |
1461 | |
1415 | sub update_options { |
1462 | sub update_options { |
1416 | my ($self) = @_; |
1463 | my ($self) = @_; |
1417 | |
1464 | |
1418 | CFPlus::weaken $self; |
1465 | DC::weaken $self; |
1419 | |
1466 | |
1420 | $self->{options}->clear; |
1467 | $self->{options}->clear; |
1421 | $self->{options}->add ($self->{bye_button}); |
1468 | $self->{options}->add ($self->{bye_button}); |
1422 | |
1469 | |
1423 | for my $kw (sort keys %{ $self->{kw} }) { |
1470 | for my $kw (sort keys %{ $self->{kw} }) { |
1424 | $self->{options}->add (new CFPlus::UI::Button |
1471 | $self->{options}->add (new DC::UI::Button |
1425 | text => $kw, |
1472 | text => $kw, |
1426 | on_activate => sub { |
1473 | on_activate => sub { |
1427 | $self->send ($kw); |
1474 | $self->send ($kw); |
1428 | 0 |
1475 | 0 |
1429 | }, |
1476 | }, |
… | |
… | |
1432 | } |
1479 | } |
1433 | |
1480 | |
1434 | sub feed { |
1481 | sub feed { |
1435 | my ($self, $type, @arg) = @_; |
1482 | my ($self, $type, @arg) = @_; |
1436 | |
1483 | |
1437 | CFPlus::weaken $self; |
1484 | DC::weaken $self; |
1438 | |
1485 | |
1439 | if ($type eq "update") { |
1486 | if ($type eq "update") { |
1440 | my (%info) = @arg; |
1487 | my (%info) = @arg; |
1441 | |
1488 | |
1442 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1489 | $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; |
1443 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1490 | $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; |
1444 | |
1491 | |
1445 | if (exists $info{msg}) { |
1492 | if (exists $info{msg}) { |
1446 | my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; |
1493 | my $text = "\n" . DC::Protocol::sanitise_xml $info{msg}; |
1447 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1494 | my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; |
1448 | my @link; |
1495 | my @link; |
1449 | $text =~ s{ |
1496 | $text =~ s{ |
1450 | ($match) |
1497 | ($match) |
1451 | }{ |
1498 | }{ |
1452 | my $kw = $1; |
1499 | my $kw = $1; |
1453 | |
1500 | |
1454 | push @link, new CFPlus::UI::Label |
1501 | push @link, new DC::UI::Label |
1455 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1502 | markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", |
1456 | can_hover => 1, |
1503 | can_hover => 1, |
1457 | can_events => 1, |
1504 | can_events => 1, |
1458 | padding_x => 0, |
1505 | padding_x => 0, |
1459 | padding_y => 0, |
1506 | padding_y => 0, |
… | |
… | |
1477 | } |
1524 | } |
1478 | |
1525 | |
1479 | sub send { |
1526 | sub send { |
1480 | my ($self, $msg) = @_; |
1527 | my ($self, $msg) = @_; |
1481 | |
1528 | |
1482 | $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); |
1529 | $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); |
1483 | $self->{textview}->scroll_to_bottom; |
1530 | $self->{textview}->scroll_to_bottom; |
1484 | |
1531 | |
1485 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1532 | $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); |
1486 | } |
1533 | } |
1487 | |
1534 | |