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.208 by root, Sun Jan 11 03:19:47 2009 UTC vs.
Revision 1.224 by root, Wed Nov 7 00:25:46 2012 UTC

1package DC::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict; 4
5use Guard ();
5 6
6use Deliantra::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use DC; 9use DC;
9use DC::DB; 10use DC::DB;
… …
13use DC::Item; 14use DC::Item;
14 15
15use base 'Deliantra::Protocol::Base'; 16use base 'Deliantra::Protocol::Base';
16 17
17our $TEX_DIALOGUE = new_from_resource DC::Texture 18our $TEX_DIALOGUE = new_from_resource DC::Texture
18 "dialogue.png", minify => 1, mipmap => 1; 19 "dialogue.png", minify => 1, mipmap => 1;
19 20
20our $TEX_NOFACE = new_from_resource DC::Texture 21our $TEX_NOFACE = new_from_resource DC::Texture
21 "noface.png", minify => 1, mipmap => 1; 22 "noface.png", minify => 1, mipmap => 1, wrap => 1;
22
23our $TEX_HIDDEN = new_from_resource DC::Texture
24 "hidden.png", minify => 1, mipmap => 1;
25 23
26sub MIN_TEXTURE_UNUSED() { 1 }#d# 24sub MIN_TEXTURE_UNUSED() { 1 }#d#
27 25
28sub new { 26sub new {
29 my ($class, %arg) = @_; 27 my ($class, %arg) = @_;
30 28
31 my $self = $class->SUPER::new (%arg, 29 my $self = $class->SUPER::new (%arg,
32 setup_req => { 30 setup_req => {
33 extmap => 1, 31 extmap => 1,
34 excmd => 1,
35 widget => 2, 32 widget => 2,
36 %{$arg{setup_req} || {}}, 33 %{$arg{setup_req} || {}},
37 }, 34 },
38 ); 35 );
36
37 $self->update_fx_want;
38
39 my $exp_guard = $self->addme_guard;
40 my $skl_guard = $self->addme_guard;
41 my $spl_guard = $self->addme_guard;
42 $self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub {
43 my ($exp, $skl, $spl) = @_;
44
45 $self->register_face_handler ($exp, sub {
46 my ($face) = @_;
47
48 undef $exp_guard;
49 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
50 $_->() for values %{ $self->{on_exp_update} };
51 });
52
53 $self->register_face_handler ($skl, sub {
54 my ($face) = @_;
55
56 undef $skl_guard;
57 my $info = $self->{json_coder}->decode (delete $face->{data});
58 $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
59 });
60
61 $self->register_face_handler ($spl, sub {
62 my ($face) = @_;
63
64 undef $spl_guard;
65 my $info = $self->{json_coder}->decode (delete $face->{data});
66 $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info };
67 });
68
69 ()
70 });
39 71
40 $self->{map_widget}->clr_commands; 72 $self->{map_widget}->clr_commands;
41 73
42 my @cmd_help = map { 74 my @cmd_help = map {
43 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 75 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
96 { 128 {
97 $self->{noface} = my $tex = $TEX_NOFACE; 129 $self->{noface} = my $tex = $TEX_NOFACE;
98 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 130 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
99 } 131 }
100 132
101 {
102 $self->{hidden} = my $tex = $TEX_HIDDEN;
103 $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}});
104 }
105
106# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id 133# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
107# $self->{expire_w} = EV::timer 1, 1, sub { 134# $self->{expire_w} = AE::timer 1, 1, sub {
108# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1; 135# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
109# 136#
110# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) { 137# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
111# warn DC::SvREFCNT $self->{texture}[$_]; 138# warn DC::SvREFCNT $self->{texture}[$_];
112# $self->{texture}[$_]->unload; 139# $self->{texture}[$_]->unload;
… …
137} 164}
138 165
139sub ext_capabilities { 166sub ext_capabilities {
140 my ($self, %cap) = @_; 167 my ($self, %cap) = @_;
141 168
142 $self->update_fx_want;
143
144 $self->send_exti_req (resource => "exp_table", sub {
145 my ($exp_table) = @_;
146
147 $self->register_face_handler ($exp_table, sub {
148 my ($face) = @_;
149
150 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
151 $_->() for values %{ $self->{on_exp_update} || {} };
152 });
153
154 ()
155 });
156
157 if (my $ts = $cap{tileset}) { 169 if (my $ts = $cap{tileset}) {
158 if (my ($default) = grep $_->[2] & 1, @$ts) { 170 if (my ($default) = grep $_->[2] & 1, @$ts) {
159 $self->{tileset} = $default; 171 $self->{tileset} = $default;
160 $self->{tilesize} = $default->[3]; 172 $self->{tilesize} = $default->[3];
161 $self->setup_req (tileset => $default->[0]); 173 $self->setup_req (tileset => $default->[0]);
… …
287 tooltip => $DC::UI::TOOLTIP, 299 tooltip => $DC::UI::TOOLTIP,
288 300
289 mapwidget => $::MAPWIDGET, 301 mapwidget => $::MAPWIDGET,
290 menubar => $::MENUBAR, 302 menubar => $::MENUBAR,
291 menupopup => $::MENUPOPUP, 303 menupopup => $::MENUPOPUP,
304 pickup_enable => $::PICKUP_ENABLE,
292 buttonbar => $::BUTTONBAR, 305 buttonbar => $::BUTTONBAR,
293 metaserver => $::METASERVER, 306 metaserver => $::METASERVER,
294 buttonbar => $::BUTTONBAR, 307 buttonbar => $::BUTTONBAR,
295 login_button => $::LOGIN_BUTTON, 308 login_button => $::LOGIN_BUTTON,
296 quit_dialog => $::QUIT_DIALOG, 309 quit_dialog => $::QUIT_DIALOG,
… …
407 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 420 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
408 : () 421 : ()
409 } 422 }
410 sort { $a <=> $b } keys %{$self->{spell_paths}}; 423 sort { $a <=> $b } keys %{$self->{spell_paths}};
411 424
412 join "", @diff 425 "\u$name: " . (join ", ", @diff)
413} 426}
414 427
415# all stats that are chacked against changes 428# all stats that are chacked against changes
416my @statchange = ( 429my @statchange = (
417 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 430 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
460 473
461 if (my @diffs = 474 if (my @diffs =
462 ( 475 (
463 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), 476 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
464 map { 477 map {
465 $stats->{$_} && $prev->{$_} 478 $stats->{$_} && $prev->{$_}
466 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 479 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
467 } sort { $a <=> $b } keys %{$self->{skill_info}} 480 } sort { $a <=> $b } keys %{$self->{skill_info}}
468 ) 481 )
469 ) { 482 ) {
470 my $msg = join " ", @diffs; 483 my $msg = join " ", @diffs;
… …
472 } 485 }
473 486
474 if ( 487 if (
475 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 488 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
476 ) { 489 ) {
477 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 490 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
478 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); 491 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
479 } 492 }
480 493
481 $self->update_stats_window ($stats, $prev); 494 $self->update_stats_window ($stats, $prev);
482 495
… …
520 533
521 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 534 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
522 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 535 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
523 $::GAUGES->{food} ->set_value ($fo, $fo_m); 536 $::GAUGES->{food} ->set_value ($fo, $fo_m);
524 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 537 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
525 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 538 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
526 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 539 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
527 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); 540 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
528 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 541 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
529 my $title = $stats->{+CS_STAT_TITLE}; 542 my $title = $stats->{+CS_STAT_TITLE};
530 $title =~ s/^Player: //; 543 $title =~ s/^Player: //;
531 $::STATWIDS->{title} ->set_text ("Title: " . $title); 544 $::STATWIDS->{title} ->set_text ("Title: " . $title);
532 545
… …
544 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 557 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
545 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 558 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
546 559
547 $self->update_weight; 560 $self->update_weight;
548 561
549 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 562 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
550 for keys %RES_TBL; 563 for keys %RES_TBL;
551 564
552 my $sktbl = $::STATWIDS->{skill_tbl}; 565 my $sktbl = $::STATWIDS->{skill_tbl};
553 my @skills = keys %{ $self->{skill_info} }; 566 my @skills = keys %{ $self->{skill_info} };
554 567
… …
645 my $sw = $self->{skillwid}{$idx}; 658 my $sw = $self->{skillwid}{$idx};
646 $sw->[0]->set_text (::formsep ($val->[1])); 659 $sw->[0]->set_text (::formsep ($val->[1]));
647 $sw->[1]->set_text ($val->[0] * 1); 660 $sw->[1]->set_text ($val->[0] * 1);
648 $sw->[2]->set_value (@$val); 661 $sw->[2]->set_value (@$val);
649 662
650 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 663 $::GAUGES->{skillexp}->set_label ("$name %d%%");
651 $::GAUGES->{sklprg}->set_value (@$val); 664 $::GAUGES->{skillexp}->set_value (@$val);
652 } 665 }
653} 666}
654 667
655sub user_send { 668sub user_send {
656 my ($self, $command) = @_; 669 my ($self, $command) = @_;
… …
675} 688}
676 689
677sub feed_map1a { 690sub feed_map1a {
678 my ($self, $data) = @_; 691 my ($self, $data) = @_;
679 692
680 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 693 my $missing = $self->{map}->map1a_update ($data);
681 my $delay; 694 my $delay;
682 695
683 for my $tile (@$missing) { 696 for my $tile (@$missing) {
684 next if $self->{delay}{$tile}; 697 next if $self->{delay}{$tile};
685 698
… …
995 1008
996 my $tex = $self->{texture}[$tile] ||= 1009 my $tex = $self->{texture}[$tile] ||=
997 new DC::Texture 1010 new DC::Texture
998 tile => $tile, 1011 tile => $tile,
999 image => $data, delete_image => 1, 1012 image => $data, delete_image => 1,
1000 minify => 1, mipmap => 1; 1013 minify => 1;
1001 1014
1002 if (my $cbs = delete $self->{tile_cb}{$tile}) { 1015 if (my $cbs = delete $self->{tile_cb}{$tile}) {
1003 $_->($tex) for @$cbs; 1016 $_->($tex) for @$cbs;
1004 } 1017 }
1005} 1018}
… …
1010 my ($self, $num, $cb) = @_; 1023 my ($self, $num, $cb) = @_;
1011 1024
1012 push @{$self->{face_cb}{$num}}, $cb; 1025 push @{$self->{face_cb}{$num}}, $cb;
1013 1026
1014 defined wantarray 1027 defined wantarray
1015 ? DC::guard { 1028 ? Guard::guard {
1016 @{$self->{face_cb}{$num}} 1029 @{$self->{face_cb}{$num}}
1017 = grep $_ != $cb, 1030 = grep $_ != $cb,
1018 @{$self->{face_cb}{$num}}; 1031 @{$self->{face_cb}{$num}};
1019 } 1032 }
1020 : () 1033 : ()
… …
1048 my ($self, $flags, $prompt) = @_; 1061 my ($self, $flags, $prompt) = @_;
1049 1062
1050 $prompt = $LAST_QUERY unless length $prompt; 1063 $prompt = $LAST_QUERY unless length $prompt;
1051 $LAST_QUERY = $prompt; 1064 $LAST_QUERY = $prompt;
1052 1065
1053 $self->{query}-> ($self, $flags, $prompt); 1066 $self->{query}->($self, $flags, $prompt);
1054} 1067}
1055 1068
1056sub sanitise_xml($) { 1069sub sanitise_xml($) {
1057 local $_ = shift; 1070 local $_ = shift;
1058 1071
… …
1090 tan => 12, 1103 tan => 12,
1091); 1104);
1092 1105
1093our @CF_COLOR = ( 1106our @CF_COLOR = (
1094 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 1107 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1095 [1.00, 1.00, 1.00], 1108 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1096 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 1109 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55],
1097 [1.00, 0.00, 0.00], 1110 [1.00, 0.00, 0.00],
1098 [1.00, 0.54, 0.00], 1111 [1.00, 0.54, 0.00],
1099 [0.11, 0.56, 1.00], 1112 [0.11, 0.56, 1.00],
1100 [0.93, 0.46, 0.00], 1113 [0.93, 0.46, 0.00],
1101 [0.18, 0.54, 0.34], 1114 [0.18, 0.54, 0.34],
… …
1119 } else { 1132 } else {
1120 $self->logprint ("msg: ", $text); 1133 $self->logprint ("msg: ", $text);
1121 return if $color < 0; # negative color == ignore if not understood 1134 return if $color < 0; # negative color == ignore if not understood
1122 1135
1123 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; 1136 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1124
1125 ## try to create single paragraphs of multiple lines sent by the server
1126 # no longer neecssary with TRT servers
1127 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1128 1137
1129 ::message ({ 1138 ::message ({
1130 fg => $fg, 1139 fg => $fg,
1131 markup => $text, 1140 markup => $text,
1132 type => $type, 1141 type => $type,
… …
1353sub update_server_info { 1362sub update_server_info {
1354 my ($self) = @_; 1363 my ($self) = @_;
1355 1364
1356 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1365 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1357 1366
1367 my $version = JSON::XS->new->encode ($self->{s_version});
1368
1358 $::SERVER_INFO->set_markup ( 1369 $::SERVER_INFO->set_markup (
1359 "server <tt>$self->{host}:$self->{port}</tt>\n" 1370 "server <tt>$self->{host}:$self->{port}</tt>\n"
1360 . "protocol version <tt>$self->{version}</tt>\n" 1371 . "protocol version <tt>$version</tt>\n"
1361 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1362 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1363 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1364 . "editing support $yesno[!!$self->{editor_support}]\n" 1372 . "editing support $yesno[!!$self->{editor_support}]\n"
1365 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1366 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1367 . "client support $yesno[$self->{cfplus_ext} > 0]" 1373 . "client support $yesno[$self->{cfplus_ext} > 0]"
1368 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1374 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1369 . "map size $self->{mapw}×$self->{maph}\n" 1375 . "map size $self->{mapw}×$self->{maph}\n"
1370 ); 1376 );
1371 1377
… …
1393 }); 1399 });
1394 1400
1395 $self->update_server_info; 1401 $self->update_server_info;
1396 1402
1397 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1403 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1398 $self->send_command ("pickup $::CFG->{pickup}"); 1404 $self->send_pickup ($::CFG->{pickup});
1399
1400 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1401 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1402} 1405}
1403 1406
1404sub lookat { 1407sub lookat {
1405 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1406 1409
… …
1408 $self->send_ext_req (lookat => $x, $y, sub { 1411 $self->send_ext_req (lookat => $x, $y, sub {
1409 my (%msg) = @_; 1412 my (%msg) = @_;
1410 1413
1411 if (exists $msg{npc_dialog}) { 1414 if (exists $msg{npc_dialog}) {
1412 # start npc chat dialog 1415 # start npc chat dialog
1413 $self->{npc_dialog} = new DC::NPCDialog:: 1416 $self->{w}{npc_dialog} = new DC::NPCDialog::
1414 token => $msg{npc_dialog}, 1417 token => $msg{npc_dialog},
1415 title => "$msg{npc_dialog}[0] (NPC)", 1418 title => "$msg{npc_dialog}[0] (NPC)",
1416 conn => $self, 1419 conn => $self,
1417 ; 1420 ;
1418 } 1421 }
… …
1423} 1426}
1424 1427
1425sub destroy { 1428sub destroy {
1426 my ($self) = @_; 1429 my ($self) = @_;
1427 1430
1428 (delete $self->{npc_dialog})->destroy 1431 $_->destroy
1429 if $self->{npc_dialog}; 1432 for values %{ $self->{w} };
1430 1433
1431 $self->SUPER::destroy; 1434 $self->SUPER::destroy;
1432 1435
1433 %$self = (); 1436 %$self = ();
1434} 1437}
… …
1588 1591
1589 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1592 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1590 1593
1591 if ($self->{conn}) { 1594 if ($self->{conn}) {
1592 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; 1595 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1593 delete $self->{conn}{npc_dialog}; 1596 delete $self->{conn}{w}{npc_dialog};
1594 $self->{conn}->disconnect_ext ($self->{id}); 1597 $self->{conn}->disconnect_ext ($self->{id});
1595 } 1598 }
1596 1599
1597 $self->SUPER::destroy; 1600 $self->SUPER::destroy;
1598} 1601}

Diff Legend

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