ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.181 by root, Wed Dec 26 19:11:13 2007 UTC vs.
Revision 1.195 by root, Thu May 8 20:19:49 2008 UTC

1package CFPlus::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Deliantra::Protocol::Constants; 6use Deliantra::Protocol::Constants;
7 7
8use CFPlus; 8use DC;
9use CFPlus::DB; 9use DC::DB;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Pod; 11use DC::Pod;
12use CFPlus::Macro; 12use DC::Macro;
13use CFPlus::Item; 13use DC::Item;
14 14
15use base 'Deliantra::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
16 16
17sub new { 17sub 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;
30 30
31 my @cmd_help = map { 31 my @cmd_help = map {
32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
33 or die "unparseable command help: $_->{kw}[0]"; 33 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
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->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_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
104sub ext_capabilities { 104sub 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
144sub widget_associate { 143sub 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
198sub 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
199sub ext_ws_a { 246sub 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,
… …
228 spell_list => $::SPELL_LIST, 275 spell_list => $::SPELL_LIST,
229 276
230 floorbox => $::FLOORBOX, 277 floorbox => $::FLOORBOX,
231 help_window => $::HELP_WINDOW, 278 help_window => $::HELP_WINDOW,
232 message_window => $::MESSAGE_WINDOW, 279 message_window => $::MESSAGE_WINDOW,
280 message_dist => $::MESSAGE_DIST,
233 statusbox => $::SDTATUSBOX, 281 statusbox => $::SDTATUSBOX,
234 282
235 inv => $::INV, 283 inv => $::INV,
236 invr => $::INVR, 284 invr => $::INVR,
237 invr_hb => $::INVR_HB, 285 invr_hb => $::INVR_HB,
… …
286 334
287# message window 335# message window
288sub ext_channel_info { 336sub ext_channel_info {
289 my ($self, $info) = @_; 337 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info; 338 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info); 339 $::MESSAGE_DIST->add_channel ($info);
292} 340}
293 341
294############################################################################# 342#############################################################################
295 343
296sub logprint { 344sub logprint {
297 my ($self, @a) = @_; 345 my ($self, @a) = @_;
298 346
299 CFPlus::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { }; 347 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
300} 348}
301 349
302sub _stat_numdiff { 350sub _stat_numdiff {
303 my ($self, $name, $old, $new) = @_; 351 my ($self, $name, $old, $new) = @_;
304 352
… …
476 $self->{stat_order} = join ",", map $_->[0], @order; 524 $self->{stat_order} = join ",", map $_->[0], @order;
477 525
478 $sktbl->clear; 526 $sktbl->clear;
479 527
480 my $sw = $self->{skillwid}{""} ||= [ 528 my $sw = $self->{skillwid}{""} ||= [
481 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 529 0, 0, (new DC::UI::Label text => "Experience", align => 1),
482 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 530 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 531 2, 0, (new DC::UI::Label text => "Progress"),
484 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 532 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
485 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 533 4, 0, (new DC::UI::Label text => "Experience", align => 1),
486 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 534 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), 535 6, 0, (new DC::UI::Label text => "Progress"),
488 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 536 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
489 ]; 537 ];
490 538
491 my @add = @$sw; 539 my @add = @$sw;
492 540
493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 541 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
… …
505 if ($ev->{button} == 1) { 553 if ($ev->{button} == 1) {
506 $::CONN->user_send ("ready_skill $name"); 554 $::CONN->user_send ("ready_skill $name");
507 } elsif ($ev->{button} == 2) { 555 } elsif ($ev->{button} == 2) {
508 $::CONN->user_send ("use_skill $name"); 556 $::CONN->user_send ("use_skill $name");
509 } elsif ($ev->{button} == 3) { 557 } elsif ($ev->{button} == 3) {
510 my $shortname = CFPlus::shorten $name, 14; 558 my $shortname = DC::shorten $name, 14;
511 (new CFPlus::UI::Menu 559 (new DC::UI::Menu
512 items => [ 560 items => [
513 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 561 ["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"] }], 562 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
515 ], 563 ],
516 )->popup ($ev); 564 )->popup ($ev);
517 } else { 565 } else {
518 return 0; 566 return 0;
519 } 567 }
… …
521 1 569 1
522 }; 570 };
523 571
524 my $sw = $self->{skillwid}{$idx} ||= [ 572 my $sw = $self->{skillwid}{$idx} ||= [
525 # exp 573 # exp
526 (new CFPlus::UI::Label 574 (new DC::UI::Label
527 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 575 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
528 576
529 # level 577 # level
530 (new CFPlus::UI::Label 578 (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), 579 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
532 580
533 # progress 581 # progress
534 (new CFPlus::UI::ExperienceProgress), 582 (new DC::UI::ExperienceProgress),
535 583
536 # label 584 # label
537 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 585 (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), 586 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ]; 587 ];
540 588
541 push @add, 589 push @add,
542 $x * 4 + 0, $y, $sw->[0], 590 $x * 4 + 0, $y, $sw->[0],
543 $x * 4 + 1, $y, $sw->[1], 591 $x * 4 + 1, $y, $sw->[1],
… …
638 686
639 my ($hash, $x, $y, $w, $h) = @$map_info; 687 my ($hash, $x, $y, $w, $h) = @$map_info;
640 688
641 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 689 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
642 $self->{map_cache_new}{$hash} = \$data; 690 $self->{map_cache_new}{$hash} = \$data;
643 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; 691 DC::DB::put $self->{mapcache} => $hash => $data, sub { };
644} 692}
645 693
646sub map_clear { 694sub map_clear {
647 my ($self) = @_; 695 my ($self) = @_;
648 696
… …
661 do { 709 do {
662 $tile = pop @{$self->{bg_fetch}} 710 $tile = pop @{$self->{bg_fetch}}
663 or return; 711 or return;
664 } while $self->{texture}[$tile]; 712 } while $self->{texture}[$tile];
665 713
666 CFPlus::DB::get tilecache => $tile, sub { 714 DC::DB::get tilecache => $tile, sub {
667 my ($data) = @_; 715 my ($data) = @_;
668 716
669 return unless $self->{map}; # stop when destroyed 717 return unless $self->{map}; # stop when destroyed
670 718
671 if (defined $data) { 719 if (defined $data) {
… …
699 }; 747 };
700 748
701 if (my $rdata = $self->{map_cache_old}{$hash}) { 749 if (my $rdata = $self->{map_cache_old}{$hash}) {
702 $cb->($$rdata); 750 $cb->($$rdata);
703 } else { 751 } else {
704 CFPlus::DB::get $self->{mapcache} => $hash, $cb; 752 DC::DB::get $self->{mapcache} => $hash, $cb;
705 } 753 }
706} 754}
707 755
708# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 756# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
709# (server resource,s latency, bandwidth), so this hack is warranted. 757# (server resource,s latency, bandwidth), so this hack is warranted.
… …
833 881
834sub face_find { 882sub face_find {
835 my ($self, $facenum, $face, $cb) = @_; 883 my ($self, $facenum, $face, $cb) = @_;
836 884
837 if ($face->{type} == 0) { # FT_FACE 885 if ($face->{type} == 0) { # FT_FACE
838 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 886 my $id = DC::DB::get_tile_id_sync $face->{name};
839 887
840 $face->{id} = $id; 888 $face->{id} = $id;
841 $self->{map}->set_tileid ($facenum => $id); 889 $self->{map}->set_tileid ($facenum => $id);
842 890
843 CFPlus::DB::get tilecache => $id, $cb; 891 DC::DB::get tilecache => $id, $cb;
844 892
845 } elsif ($face->{type} & 1) { # with metadata 893 } elsif ($face->{type} & 1) { # with metadata
846 CFPlus::DB::get res_meta => $face->{name}, $cb; 894 DC::DB::get res_meta => $face->{name}, $cb;
847 895
848 } else { # no metadata 896 } else { # no metadata
849 CFPlus::DB::get res_data => $face->{name}, $cb; 897 DC::DB::get res_data => $face->{name}, $cb;
850 } 898 }
851} 899}
852 900
853sub face_update { 901sub face_update {
854 my ($self, $facenum, $face, $changed) = @_; 902 my ($self, $facenum, $face, $changed) = @_;
855 903
856 if ($face->{type} == 0) { 904 if ($face->{type} == 0) {
857 # image, FT_FACE 905 # image, FT_FACE
858 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 906 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
859 if $changed; 907 if $changed;
860 908
861 $self->have_tile ($face->{id}, delete $face->{data}); 909 $self->have_tile ($face->{id}, delete $face->{data});
862 910
863 } elsif ($face->{type} & 1) { 911 } elsif ($face->{type} & 1) {
… …
865 if ($changed) { # new data 913 if ($changed) { # new data
866 my ($meta, $data) = unpack "(w/a*)*", $face->{data}; 914 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
867 $face->{data} = $meta; 915 $face->{data} = $meta;
868 916
869 # rely on strict ordering here and also on later fetch 917 # rely on strict ordering here and also on later fetch
870 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 918 DC::DB::put res_data => $face->{name} => $data, sub { };
871 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; 919 DC::DB::put res_meta => $face->{name} => $meta, sub { };
872 } 920 }
873 921
874 $face->{data} = $self->{json_coder}->decode ($face->{data}); 922 $face->{data} = $self->{json_coder}->decode ($face->{data});
875 ::add_license ($face); 923 ::add_license ($face);
876 ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." }) 924 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
877 if $changed; 925 if $changed;
878 926
879 if ($face->{type} == 3) { # FT_MUSIC 927 if ($face->{type} == 3) { # FT_MUSIC
880 &::audio_music_push ($facenum); 928 &::audio_music_push ($facenum);
881 } elsif ($face->{type} == 5) { # FT_SOUND 929 } elsif ($face->{type} == 5) { # FT_SOUND
882 &::audio_sound_push ($facenum); 930 &::audio_sound_push ($facenum);
883 } 931 }
884 932
885 } else { 933 } else {
886 # flat resource case, FT_RSRC 934 # flat resource case, FT_RSRC
887 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } 935 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
888 if $changed; 936 if $changed;
889 } 937 }
890 938
891 if (my $cbs = $self->{face_cb}{$facenum}) { 939 if (my $cbs = $self->{face_cb}{$facenum}) {
892 $_->($face, $changed) for @$cbs; 940 $_->($face, $changed) for @$cbs;
… …
903 my ($self, $tile, $data) = @_; 951 my ($self, $tile, $data) = @_;
904 952
905 return unless $self->{map}; 953 return unless $self->{map};
906 954
907 my $tex = $self->{texture}[$tile] ||= 955 my $tex = $self->{texture}[$tile] ||=
908 new CFPlus::Texture 956 new DC::Texture
909 tile => $tile, 957 tile => $tile,
910 image => $data, delete_image => 1, 958 image => $data, delete_image => 1,
911 minify => 1, mipmap => 1; 959 minify => 1, mipmap => 1;
912 960
913 if (my $cbs = delete $self->{tile_cb}{$tile}) { 961 if (my $cbs = delete $self->{tile_cb}{$tile}) {
… …
921 my ($self, $num, $cb) = @_; 969 my ($self, $num, $cb) = @_;
922 970
923 push @{$self->{face_cb}{$num}}, $cb; 971 push @{$self->{face_cb}{$num}}, $cb;
924 972
925 defined wantarray 973 defined wantarray
926 ? CFPlus::guard { 974 ? DC::guard {
927 @{$self->{face_cb}{$num}} 975 @{$self->{face_cb}{$num}}
928 = grep $_ != $cb, 976 = grep $_ != $cb,
929 @{$self->{face_cb}{$num}}; 977 @{$self->{face_cb}{$num}};
930 } 978 }
931 : () 979 : ()
… …
977 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1025 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
978 1026
979 # handle some elements 1027 # handle some elements
980 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1028 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
981 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1029 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1030
1031 s/\s+$//;
982 1032
983 $_ 1033 $_
984} 1034}
985 1035
986our %NAME_TO_COLOR = ( 1036our %NAME_TO_COLOR = (
… …
1068 $spell->{message} =~ s/\n+$//; 1118 $spell->{message} =~ s/\n+$//;
1069 $spell->{message} ||= "Server did not provide a description for this spell."; 1119 $spell->{message} ||= "Server did not provide a description for this spell.";
1070 1120
1071 $::SPELL_LIST->add_spell ($spell); 1121 $::SPELL_LIST->add_spell ($spell);
1072 1122
1073 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1123 $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}); 1124 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
1075} 1125}
1076 1126
1077sub spell_delete { 1127sub spell_delete {
1078 my ($self, $spell) = @_; 1128 my ($self, $spell) = @_;
1079 1129
… …
1090sub addme_success { 1140sub addme_success {
1091 my ($self) = @_; 1141 my ($self) = @_;
1092 1142
1093 my %skill_help; 1143 my %skill_help;
1094 1144
1095 for my $node (CFPlus::Pod::find skill_description => "*") { 1145 for my $node (DC::Pod::find skill_description => "*") {
1096 my (undef, @par) = CFPlus::Pod::section_of $node; 1146 my (undef, @par) = DC::Pod::section_of $node;
1097 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1147 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1098 }; 1148 };
1099 1149
1100 for my $skill (values %{$self->{skill_info}}) { 1150 for my $skill (values %{$self->{skill_info}}) {
1101 $self->{map_widget}->add_command ("ready_skill $skill", 1151 $self->{map_widget}->add_command ("ready_skill $skill",
1102 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1152 (DC::asxml "Ready the skill '$skill'\n\n")
1103 . $skill_help{$skill}); 1153 . $skill_help{$skill});
1104 $self->{map_widget}->add_command ("use_skill $skill", 1154 $self->{map_widget}->add_command ("use_skill $skill",
1105 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1155 (DC::asxml "Immediately use the skill '$skill'\n\n")
1106 . $skill_help{$skill}); 1156 . $skill_help{$skill});
1107 } 1157 }
1108} 1158}
1109 1159
1110sub eof { 1160sub eof {
… …
1114 1164
1115 ::stop_game (); 1165 ::stop_game ();
1116} 1166}
1117 1167
1118sub update_floorbox { 1168sub update_floorbox {
1119 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1169 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1120 return unless $::CONN; 1170 return unless $::CONN;
1121 1171
1122 $::FLOORBOX->clear; 1172 $::FLOORBOX->clear;
1123 1173
1124 my @add; 1174 my @add;
1125 1175
1126 my $row; 1176 my $row;
1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1177 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1178 next if $_->{tag} & 0x80000000;
1128 if ($row < 6) { 1179 if ($row < 6) {
1129 local $_->{face_widget}; # hack to force recreation of widget 1180 local $_->{face_widget}; # hack to force recreation of widget
1130 local $_->{desc_widget}; # hack to force recreation of widget 1181 local $_->{desc_widget}; # hack to force recreation of widget
1131 CFPlus::Item::update_widgets $_; 1182 DC::Item::update_widgets $_;
1132 1183
1133 push @add, 1184 push @add,
1134 0, $row, $_->{face_widget}, 1185 0, $row, $_->{face_widget},
1135 1, $row, $_->{desc_widget}; 1186 1, $row, $_->{desc_widget};
1136 1187
1137 $row++; 1188 $row++;
1138 } else { 1189 } else {
1139 push @add, 1, $row, new CFPlus::UI::Button 1190 push @add, 1, $row, new DC::UI::Button
1140 text => "More...", 1191 text => "More...",
1141 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1192 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1142 ; 1193 ;
1143 last; 1194 last;
1144 } 1195 }
1145 } 1196 }
1146 if ($::CONN->{open_container}) { 1197 if ($::CONN->{open_container}) {
1147 push @add, 1, $row++, new CFPlus::UI::Button 1198 push @add, 1, $row++, new DC::UI::Button
1148 text => "Close container", 1199 text => "Close container",
1149 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1200 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1150 ; 1201 ;
1151 } 1202 }
1152 1203
… …
1160 my ($conn, $tag, $name) = @_; 1211 my ($conn, $tag, $name) = @_;
1161 $conn->{open_container} = $tag; 1212 $conn->{open_container} = $tag;
1162 update_floorbox; 1213 update_floorbox;
1163 1214
1164 $::INVR_HB->clear (); 1215 $::INVR_HB->clear ();
1165 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1216 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1166 1217
1167 if ($tag != 0) { # Floor isn't closable, is it? 1218 if ($tag != 0) { # Floor isn't closable, is it?
1168 $::INVR_HB->add (new CFPlus::UI::Button 1219 $::INVR_HB->add (new DC::UI::Button
1169 text => "Close container", 1220 text => "Close container",
1170 tooltip => "Close the currently open container (if one is open)", 1221 tooltip => "Close the currently open container (if one is open)",
1171 on_activate => sub { 1222 on_activate => sub {
1172 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1223 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1173 if $tag != 0; 1224 if $tag != 0;
… …
1180} 1231}
1181 1232
1182sub update_containers { 1233sub update_containers {
1183 my ($self) = @_; 1234 my ($self) = @_;
1184 1235
1185 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1236 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1186 my $todo = delete $self->{update_container} 1237 my $todo = delete $self->{update_container}
1187 or return; 1238 or return;
1188 1239
1189 for my $tag (keys %$todo) { 1240 for my $tag (keys %$todo) {
1190 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1241 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1225} 1276}
1226 1277
1227sub item_update { 1278sub item_update {
1228 my ($self, $item) = @_; 1279 my ($self, $item) = @_;
1229 1280
1230 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1281 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1231 1282
1232 CFPlus::Item::update_widgets $item; 1283 DC::Item::update_widgets $item;
1233 1284
1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1285 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1235 set_opencont ($::CONN, 0, "Floor"); 1286 set_opencont ($::CONN, 0, "Floor");
1236 1287
1237 } elsif ($item->{flags} & F_OPEN) { 1288 } elsif ($item->{flags} & F_OPEN) {
1238 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1289 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1239 1290
1240 } else { 1291 } else {
1241 $self->{update_container}{$item->{container}}++; 1292 $self->{update_container}{$item->{container}}++;
1242 $self->update_containers; 1293 $self->update_containers;
1243 } 1294 }
… …
1254 1305
1255 my $weight = .001 * $self->{player}{weight}; 1306 my $weight = .001 * $self->{player}{weight};
1256 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1307 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1257 1308
1258 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1309 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1259 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1310 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1260 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1311 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1261} 1312}
1262 1313
1263sub update_server_info { 1314sub update_server_info {
1264 my ($self) = @_; 1315 my ($self) = @_;
… …
1272 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1323 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1273 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1324 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1274 . "editing support $yesno[!!$self->{editor_support}]\n" 1325 . "editing support $yesno[!!$self->{editor_support}]\n"
1275 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1326 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1276 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1327 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1328 . "client support $yesno[$self->{cfplus_ext} > 0]"
1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1329 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1279 . "map size $self->{mapw}×$self->{maph}\n" 1330 . "map size $self->{mapw}×$self->{maph}\n"
1280 ); 1331 );
1281 1332
1282} 1333}
… …
1315 $self->send_ext_req (lookat => $x, $y, sub { 1366 $self->send_ext_req (lookat => $x, $y, sub {
1316 my (%msg) = @_; 1367 my (%msg) = @_;
1317 1368
1318 if (exists $msg{npc_dialog}) { 1369 if (exists $msg{npc_dialog}) {
1319 # start npc chat dialog 1370 # start npc chat dialog
1320 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1371 $self->{npc_dialog} = new DC::NPCDialog::
1321 token => $msg{npc_dialog}, 1372 token => $msg{npc_dialog},
1322 title => "$msg{npc_dialog}[0] (NPC)", 1373 title => "$msg{npc_dialog}[0] (NPC)",
1323 conn => $self, 1374 conn => $self,
1324 ; 1375 ;
1325 } 1376 }
… …
1338 $self->SUPER::destroy; 1389 $self->SUPER::destroy;
1339 1390
1340 %$self = (); 1391 %$self = ();
1341} 1392}
1342 1393
1343package CFPlus::NPCDialog; 1394package DC::NPCDialog;
1344 1395
1345our @ISA = 'CFPlus::UI::Toplevel'; 1396our @ISA = 'DC::UI::Toplevel';
1346 1397
1347sub new { 1398sub new {
1348 my $class = shift; 1399 my $class = shift;
1349 1400
1350 my $self = $class->SUPER::new ( 1401 my $self = $class->SUPER::new (
… …
1357 kw => { hi => 0, yes => 0, no => 0 }, 1408 kw => { hi => 0, yes => 0, no => 0 },
1358 has_close_button => 1, 1409 has_close_button => 1,
1359 @_, 1410 @_,
1360 ); 1411 );
1361 1412
1362 CFPlus::weaken (my $this = $self); 1413 DC::weaken (my $this = $self);
1363 1414
1364 $self->connect (delete => sub { $this->destroy; 1 }); 1415 $self->connect (delete => sub { $this->destroy; 1 });
1365 1416
1366 # better use a pane... 1417 # better use a pane...
1367 $self->add (my $hbox = new CFPlus::UI::HBox); 1418 $self->add (my $hbox = new DC::UI::HBox);
1368 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1419 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1369 1420
1370 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1421 $hbox->add (my $vbox = new DC::UI::VBox);
1371 1422
1372 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1423 $vbox->add (new DC::UI::Label text => "Message Entry:");
1373 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1424 $vbox->add ($self->{entry} = new DC::UI::Entry
1374 tooltip => "#npc_message_entry", 1425 tooltip => "#npc_message_entry",
1375 on_activate => sub { 1426 on_activate => sub {
1376 my ($entry, $text) = @_; 1427 my ($entry, $text) = @_;
1377 1428
1378 return unless $text =~ /\S/; 1429 return unless $text =~ /\S/;
… …
1382 1433
1383 0 1434 0
1384 }, 1435 },
1385 ); 1436 );
1386 1437
1387 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1438 $vbox->add ($self->{options} = new DC::UI::VBox);
1388 1439
1389 $self->{bye_button} = new CFPlus::UI::Button 1440 $self->{bye_button} = new DC::UI::Button
1390 text => "Bye (close)", 1441 text => "Bye (close)",
1391 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1442 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1392 on_activate => sub { $this->destroy; 1 }, 1443 on_activate => sub { $this->destroy; 1 },
1393 ; 1444 ;
1394 1445
… …
1413}; 1464};
1414 1465
1415sub update_options { 1466sub update_options {
1416 my ($self) = @_; 1467 my ($self) = @_;
1417 1468
1418 CFPlus::weaken $self; 1469 DC::weaken $self;
1419 1470
1420 $self->{options}->clear; 1471 $self->{options}->clear;
1421 $self->{options}->add ($self->{bye_button}); 1472 $self->{options}->add ($self->{bye_button});
1422 1473
1423 for my $kw (sort keys %{ $self->{kw} }) { 1474 for my $kw (sort keys %{ $self->{kw} }) {
1424 $self->{options}->add (new CFPlus::UI::Button 1475 $self->{options}->add (new DC::UI::Button
1425 text => $kw, 1476 text => $kw,
1426 on_activate => sub { 1477 on_activate => sub {
1427 $self->send ($kw); 1478 $self->send ($kw);
1428 0 1479 0
1429 }, 1480 },
… …
1432} 1483}
1433 1484
1434sub feed { 1485sub feed {
1435 my ($self, $type, @arg) = @_; 1486 my ($self, $type, @arg) = @_;
1436 1487
1437 CFPlus::weaken $self; 1488 DC::weaken $self;
1438 1489
1439 if ($type eq "update") { 1490 if ($type eq "update") {
1440 my (%info) = @arg; 1491 my (%info) = @arg;
1441 1492
1442 $self->{kw}{$_} = 1 for @{$info{add_topics} || []}; 1493 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1443 $self->{kw}{$_} = 0 for @{$info{del_topics} || []}; 1494 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1444 1495
1445 if (exists $info{msg}) { 1496 if (exists $info{msg}) {
1446 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg}; 1497 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} }; 1498 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1448 my @link; 1499 my @link;
1449 $text =~ s{ 1500 $text =~ s{
1450 ($match) 1501 ($match)
1451 }{ 1502 }{
1452 my $kw = $1; 1503 my $kw = $1;
1453 1504
1454 push @link, new CFPlus::UI::Label 1505 push @link, new DC::UI::Label
1455 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1506 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1456 can_hover => 1, 1507 can_hover => 1,
1457 can_events => 1, 1508 can_events => 1,
1458 padding_x => 0, 1509 padding_x => 0,
1459 padding_y => 0, 1510 padding_y => 0,
… …
1477} 1528}
1478 1529
1479sub send { 1530sub send {
1480 my ($self, $msg) = @_; 1531 my ($self, $msg) = @_;
1481 1532
1482 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1533 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1483 $self->{textview}->scroll_to_bottom; 1534 $self->{textview}->scroll_to_bottom;
1484 1535
1485 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1536 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1486} 1537}
1487 1538

Diff Legend

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