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.186 by root, Thu Dec 27 19:35:09 2007 UTC vs.
Revision 1.192 by root, Thu Mar 27 20:42:23 2008 UTC

… …
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
… …
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 DC::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 {
… …
275 spell_list => $::SPELL_LIST, 275 spell_list => $::SPELL_LIST,
276 276
277 floorbox => $::FLOORBOX, 277 floorbox => $::FLOORBOX,
278 help_window => $::HELP_WINDOW, 278 help_window => $::HELP_WINDOW,
279 message_window => $::MESSAGE_WINDOW, 279 message_window => $::MESSAGE_WINDOW,
280 message_dist => $::MESSAGE_DIST,
280 statusbox => $::SDTATUSBOX, 281 statusbox => $::SDTATUSBOX,
281 282
282 inv => $::INV, 283 inv => $::INV,
283 invr => $::INVR, 284 invr => $::INVR,
284 invr_hb => $::INVR_HB, 285 invr_hb => $::INVR_HB,
… …
333 334
334# message window 335# message window
335sub ext_channel_info { 336sub ext_channel_info {
336 my ($self, $info) = @_; 337 my ($self, $info) = @_;
337 $self->{channels}->{$info->{id}} = $info; 338 $self->{channels}->{$info->{id}} = $info;
338 $::MESSAGE_WINDOW->add_channel ($info); 339 $::MESSAGE_DIST->add_channel ($info);
339} 340}
340 341
341############################################################################# 342#############################################################################
342 343
343sub logprint { 344sub logprint {
… …
525 $sktbl->clear; 526 $sktbl->clear;
526 527
527 my $sw = $self->{skillwid}{""} ||= [ 528 my $sw = $self->{skillwid}{""} ||= [
528 0, 0, (new DC::UI::Label text => "Experience", align => 1), 529 0, 0, (new DC::UI::Label text => "Experience", align => 1),
529 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), 530 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
530 2, 0, (new DC::UI::Label text => "Progress", align => 0), 531 2, 0, (new DC::UI::Label text => "Progress"),
531 3, 0, (new DC::UI::Label text => "Skill", expand => 1), 532 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
532 4, 0, (new DC::UI::Label text => "Experience", align => 1), 533 4, 0, (new DC::UI::Label text => "Experience", align => 1),
533 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), 534 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
534 6, 0, (new DC::UI::Label text => "Progress", align => 0), 535 6, 0, (new DC::UI::Label text => "Progress"),
535 7, 0, (new DC::UI::Label text => "Skill", expand => 1), 536 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
536 ]; 537 ];
537 538
538 my @add = @$sw; 539 my @add = @$sw;
539 540
540 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>";
… …
579 580
580 # progress 581 # progress
581 (new DC::UI::ExperienceProgress), 582 (new DC::UI::ExperienceProgress),
582 583
583 # label 584 # label
584 (new DC::UI::Label text => $name, on_button_down => $spell_cb, 585 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
585 can_events => 1, can_hover => 1, tooltip => (DC::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),
586 ]; 587 ];
587 588
588 push @add, 589 push @add,
589 $x * 4 + 0, $y, $sw->[0], 590 $x * 4 + 0, $y, $sw->[0],
… …
1139 1140
1140 my %skill_help; 1141 my %skill_help;
1141 1142
1142 for my $node (DC::Pod::find skill_description => "*") { 1143 for my $node (DC::Pod::find skill_description => "*") {
1143 my (undef, @par) = DC::Pod::section_of $node; 1144 my (undef, @par) = DC::Pod::section_of $node;
1144 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par; 1145 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1145 }; 1146 };
1146 1147
1147 for my $skill (values %{$self->{skill_info}}) { 1148 for my $skill (values %{$self->{skill_info}}) {
1148 $self->{map_widget}->add_command ("ready_skill $skill", 1149 $self->{map_widget}->add_command ("ready_skill $skill",
1149 (DC::asxml "Ready the skill '$skill'\n\n") 1150 (DC::asxml "Ready the skill '$skill'\n\n")
… …
1207 my ($conn, $tag, $name) = @_; 1208 my ($conn, $tag, $name) = @_;
1208 $conn->{open_container} = $tag; 1209 $conn->{open_container} = $tag;
1209 update_floorbox; 1210 update_floorbox;
1210 1211
1211 $::INVR_HB->clear (); 1212 $::INVR_HB->clear ();
1212 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name); 1213 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1213 1214
1214 if ($tag != 0) { # Floor isn't closable, is it? 1215 if ($tag != 0) { # Floor isn't closable, is it?
1215 $::INVR_HB->add (new DC::UI::Button 1216 $::INVR_HB->add (new DC::UI::Button
1216 text => "Close container", 1217 text => "Close container",
1217 tooltip => "Close the currently open container (if one is open)", 1218 tooltip => "Close the currently open container (if one is open)",
… …
1301 1302
1302 my $weight = .001 * $self->{player}{weight}; 1303 my $weight = .001 * $self->{player}{weight};
1303 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1304 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1304 1305
1305 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1306 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1306 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1307 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1307 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1308 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1308} 1309}
1309 1310
1310sub update_server_info { 1311sub update_server_info {
1311 my ($self) = @_; 1312 my ($self) = @_;
… …
1319 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1320 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1320 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1321 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1321 . "editing support $yesno[!!$self->{editor_support}]\n" 1322 . "editing support $yesno[!!$self->{editor_support}]\n"
1322 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1323 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1323 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1324 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1324 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1325 . "client support $yesno[$self->{cfplus_ext} > 0]"
1325 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1326 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1326 . "map size $self->{mapw}×$self->{maph}\n" 1327 . "map size $self->{mapw}×$self->{maph}\n"
1327 ); 1328 );
1328 1329
1329} 1330}

Diff Legend

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