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.73 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.90 by root, Wed Dec 6 00:15:12 2006 UTC

… …
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::UI; 9use CFPlus::UI;
10use CFPlus::Pod; 10use CFPlus::Pod;
11 11
12use Crossfire::Protocol::Base 0.95;
13
12use base 'Crossfire::Protocol::Base'; 14use base 'Crossfire::Protocol::Base';
13 15
14sub new { 16sub new {
15 my $class = shift; 17 my $class = shift;
16 18
17 my $self = $class->SUPER::new (@_); 19 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
18 20
19 $self->{map_widget}->clr_commands; 21 $self->{map_widget}->clr_commands;
20 22
21 my @cmd_help = map { 23 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 24 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 35 for @args;
34 36
35 map ["$cmd$_", $text], 37 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 38 sort { (length $a) <=> (length $b) }
37 @args 39 @args
40 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 41 CFPlus::Pod::find command => "*";
39 42
40 $self->{map_widget}->add_command (@$_) 43 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 44 for @cmd_help;
42 45
43 $self->{noface} = new_from_file CFPlus::Texture 46 $self->{noface} = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
45 48
49 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 }
54
46 $self->{open_container} = 0; 55 $self->{open_container} = 0;
47 56
48 # "global" 57 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache"; 58 $self->{tilecache} = CFPlus::db_table "tilecache"
59 or die "tilecache: unable to open database table";
50 $self->{facemap} = CFPlus::db_table "facemap"; 60 $self->{facemap} = CFPlus::db_table "facemap"
61 or die "facemap: unable to open database table";
51 62
52 # per server 63 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
54 66
55 $self 67 $self
56} 68}
57 69
58sub logprint { 70sub logprint {
… …
258 270
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 271 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 272
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 273 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
262 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 274 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 275
265 my ($x, $y) = (0, 1); 276 my ($x, $y) = (0, 1);
266 for ( 277 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 278 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 279 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 288 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 289 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 290 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 291 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 292 } elsif ($ev->{button} == 3) {
293 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 294 (new CFPlus::UI::Menu
283 items => [ 295 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 296 ["bind <i>ready_skill $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
285 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 297 ["bind <i>use_skill $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
286 ], 298 ],
287 )->popup ($ev); 299 )->popup ($ev);
288 } else { 300 } else {
289 return 0; 301 return 0;
290 } 302 }
… …
294 306
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 307 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 308 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 309 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 310 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 311 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
312 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
300 313
301 $x++ and ($x, $y) = (0, $y + 1); 314 $x++ and ($x, $y) = (0, $y + 1);
302 } 315 }
303 } 316 }
304 317
… …
309} 322}
310 323
311sub user_send { 324sub user_send {
312 my ($self, $command) = @_; 325 my ($self, $command) = @_;
313 326
314 if ($self->{record}) {
315 push @{$self->{record}}, $command; 327 push @{$self->{record}}, $command
316 } 328 if $self->{record};
317 329
318 $self->logprint ("send: ", $command); 330 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 331 $self->send_command ($command);
320 ::status ($command); 332 ::status ($command);
321} 333}
… …
338} 350}
339 351
340sub feed_map1a { 352sub feed_map1a {
341 my ($self, $data) = @_; 353 my ($self, $data) = @_;
342 354
343 $self->{map}->map1a_update ($data); 355 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 356 $self->{map_widget}->update;
345} 357}
346 358
347sub magicmap { 359sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 360 my ($self, $w, $h, $x, $y, $data) = @_;
… …
613 [0.74, 0.65, 0.41], 625 [0.74, 0.65, 0.41],
614 ); 626 );
615 627
616 $self->logprint ("info: ", $text); 628 $self->logprint ("info: ", $text);
617 629
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
619
620 # try to create single paragraphs of multiple lines sent by the server 630 # try to create single paragraphs of multiple lines sent by the server
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 631 $text =~ s/(?<=\S)\n(?=\w)/ /g;
622 632
623 $text = CFPlus::asxml $text; 633 $text = CFPlus::asxml $text;
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 634 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 635 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 636
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 637 ::message ({ fg => $color[$color], markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 638 for split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630 639
631 $self->{statusbox}->add ($text, 640 $self->{statusbox}->add ($text,
632 group => $text, 641 group => $text,
633 fg => $color[$color], 642 fg => $color[$color],
634 timeout => $color >= 2 ? 180 : 10, 643 timeout => $color >= 2 ? 180 : 10,
… …
648 # try to create single paragraphs out of the multiple lines sent by the server 657 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 658 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 659 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 660 $spell->{message} ||= "Server did not provide a description for this spell.";
652 661
653 $::SPELL_PAGE->add_spell ($spell); 662 $::SPELL_LIST->add_spell ($spell);
654 663
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 664 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
656 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 665 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 666}
658 667
659sub spell_delete { 668sub spell_delete {
660 my ($self, $spell) = @_; 669 my ($self, $spell) = @_;
661 670
662 $::SPELL_PAGE->remove_spell ($spell); 671 $::SPELL_LIST->remove_spell ($spell);
672}
673
674sub setup {
675 my ($self, $setup) = @_;
676
677 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 678}
664 679
665sub addme_success { 680sub addme_success {
666 my ($self) = @_; 681 my ($self) = @_;
667 682
… …
873 $::SERVER_INFO->set_markup ( 888 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 889 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 890 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 891 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 892 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
893 . "editing support $yesno[!!$self->{editor_support}]\n"
894 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 895 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 896 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 897 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 898 );
899
900 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 901}
883 902
884sub logged_in { 903sub logged_in {
885 my ($self) = @_; 904 my ($self) = @_;
886 905
887 $self->send_ext_req (cfplus_support => version => 1, sub { 906 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 907 $self->{cfplus_ext} = $_[0]{version};
889 $self->update_server_info; 908 $self->update_server_info;
890 909
910 if ($self->{cfplus_ext} >= 2) {
911 $self->send_ext_req ("editor_support", sub {
912 $self->{editor_support} = $_[0];
913 $self->update_server_info;
914
915 0
916 });
917 }
918
891 0 919 0
892 }); 920 });
893 921
894 $self->update_server_info; 922 $self->update_server_info;
895 923
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 924 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 925 $self->send_command ("output-count $::CFG->{output_count}");
898 $self->send_command ("pickup $::CFG->{pickup}"); 926 $self->send_command ("pickup $::CFG->{pickup}");
927}
928
929sub buildat {
930 my ($self, $builditem, $x, $y) = @_;
931
932 if ($self->{cfplus_ext}) {
933 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
934 }
899} 935}
900 936
901sub lookat { 937sub lookat {
902 my ($self, $x, $y) = @_; 938 my ($self, $x, $y) = @_;
903 939
… …
921} 957}
922 958
923sub destroy { 959sub destroy {
924 my ($self) = @_; 960 my ($self) = @_;
925 961
926 $self->{npc_dialog}->destroy 962 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 963 if $self->{npc_dialog};
928 964
929 $self->SUPER::destroy; 965 $self->SUPER::destroy;
930} 966}
931 967
932package CFPlus::NPCDialog; 968package CFPlus::NPCDialog;
933 969
934our @ISA = 'CFPlus::UI::FancyFrame'; 970our @ISA = 'CFPlus::UI::Toplevel';
935 971
936sub new { 972sub new {
937 my $class = shift; 973 my $class = shift;
938 974
939 my $self = $class->SUPER::new ( 975 my $self = $class->SUPER::new (
… …
1043 padding_y => 0, 1079 padding_y => 0,
1044 on_button_up => sub { 1080 on_button_up => sub {
1045 $self->send ($kw); 1081 $self->send ($kw);
1046 }; 1082 };
1047 1083
1048 chr 0xfffc 1084 "\x{fffc}"
1049 }giex; 1085 }giex;
1050 1086
1051 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1087 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1052 $self->{textview}->scroll_to_bottom; 1088 $self->{textview}->scroll_to_bottom;
1053 $self->update_options; 1089 $self->update_options;
… …
1080 1116
1081 $self->SUPER::destroy; 1117 $self->SUPER::destroy;
1082} 1118}
1083 1119
10841 11201
1121

Diff Legend

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