ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.78 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.94 by root, Sun Jul 16 20:04:08 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
42 43
43$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
44 46
45$Event::DIED = sub { 47$Event::DIED = sub {
46 # TODO: display dialog box or so 48 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable 49 Carp::confess $_[1];#d#TODO: remove when stable
48 CFClient::error $_[1]; 50 CFClient::error $_[1];
… …
84our $CONSOLE; 86our $CONSOLE;
85our $METASERVER; 87our $METASERVER;
86our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 89our $QUIT_DIALOG;
88our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $FULLSCREEN_ENABLE;
92our $PICKUP_ENABLE;
89our $SERVER_INFO; 93our $SERVER_INFO;
90 94
91our $SETUP_DIALOG; 95our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 97our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 98our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 99
100our $PL_NOTEBOOK;
97our $STATS_WINDOW; 101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SPELL_PAGE;
106
107our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 108our $MESSAGE_WINDOW;
99our $FLOORBOX; 109our $FLOORBOX;
100our $GAUGES; 110our $GAUGES;
101our $STATWIDS; 111our $STATWIDS;
102 112
… …
109 119
110our $ALT_ENTER_MESSAGE; 120our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 121our $STATUSBOX;
112our $DEBUG_STATUS; 122our $DEBUG_STATUS;
113 123
114our $INV_WINDOW;
115our $INV; 124our $INV;
116our $INVR; 125our $INVR;
117our $INV_RIGHT_HB; 126our $INV_RIGHT_HB;
118 127
119our $BIND_EDITOR; 128our $BIND_EDITOR;
… …
220 $conn->send ("reply $stat"); 229 $conn->send ("reply $stat");
221 destroy_query_dialog $conn; 230 destroy_query_dialog $conn;
222 return; 231 return;
223 } 232 }
224 233
225 $STATS_WINDOW->show; 234 $STATS_PAGE->show;
226 $MESSAGE_WINDOW->hide; 235 $MESSAGE_WINDOW->hide;
227 236
228 unshift @dialog, new CFClient::UI::Label 237 unshift @dialog, new CFClient::UI::Label
229 max_w => $::WIDTH * 0.4, 238 max_w => $::WIDTH * 0.4,
230 ellipsise => 0, 239 ellipsise => 0,
… …
270 # right: accept 279 # right: accept
271 $table->add (4, 0, new CFClient::UI::Button 280 $table->add (4, 0, new CFClient::UI::Button
272 text => "Accept", 281 text => "Accept",
273 on_activate => sub { 282 on_activate => sub {
274 $conn->send ("reply n"); 283 $conn->send ("reply n");
275 $STATS_WINDOW->hide; 284 $STATS_PAGE->hide;
276 destroy_query_dialog $conn; 285 destroy_query_dialog $conn;
277 0 286 0
278 }, 287 },
279 ); 288 );
280 289
… …
372 381
373sub stop_game { 382sub stop_game {
374 $LOGIN_BUTTON->set_text ("Login"); 383 $LOGIN_BUTTON->set_text ("Login");
375 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 384 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
376 $SETUP_DIALOG->show; 385 $SETUP_DIALOG->show;
377 $INV_WINDOW->hide; 386 $PL_WINDOW->hide;
378 $SETUP_SPELLS->clear_spells; 387 $SPELL_PAGE->clear_spells;
379 388
380 return unless $CONN; 389 return unless $CONN;
381 390
382 status "connection closed"; 391 status "connection closed";
383 392
… …
408 $mode_slider->emit (changed => $mode_slider->{range}[0]); 417 $mode_slider->emit (changed => $mode_slider->{range}[0]);
409 418
410 my $row = 1; 419 my $row = 1;
411 420
412 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 421 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
413 $table->add (1, $row++, new CFClient::UI::CheckBox 422 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
414 state => $CFG->{fullscreen}, 423 state => $CFG->{fullscreen},
415 tooltip => "Bring the client into fullscreen mode.", 424 tooltip => "Bring the client into fullscreen mode.",
416 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 425 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
417 ); 426 );
418 427
… …
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 477 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
469 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 478 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
470 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 479 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 ); 480 );
472 481
473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
474
475 $table->add (1, $row++, new CFClient::UI::Slider
476 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
477 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
478 on_changed => sub {
479 $CFG->{stat_fontsize} = $_[1];
480 &set_stats_window_fontsize;
481 0
482 }
483 );
484
485 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 482 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
486 $table->add (1, $row++, new CFClient::UI::Slider 483 $table->add (1, $row++, new CFClient::UI::Slider
487 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 484 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
488 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 485 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
489 on_changed => sub { 486 on_changed => sub {
… …
558 ); 555 );
559 556
560 $vbox 557 $vbox
561} 558}
562 559
563sub set_stats_window_fontsize {
564 for (values %{$STATWIDS}) {
565 $_->set_fontsize ($::CFG->{stat_fontsize});
566 }
567}
568
569sub set_gauge_window_fontsize { 560sub set_gauge_window_fontsize {
570 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 561 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
571 $_->set_fontsize ($::CFG->{gauge_fontsize}); 562 $_->set_fontsize ($::CFG->{gauge_fontsize});
572 } 563 }
573} 564}
… …
652 643
653 $table 644 $table
654} 645}
655 646
656sub stats_window { 647sub stats_window {
657 my $tgw = new CFClient::UI::FancyFrame 648 my $vb = new CFClient::UI::VBox;
658 y => $HEIGHT * (2/8),
659 x => "max",
660 title => "Stats",
661 name => "stats_window",
662 has_close_button => 1;
663 649
664 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
665 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 650 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
666 can_hover => 1, can_events => 1, 651 can_hover => 1, can_events => 1,
667 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 652 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
668 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 653 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
669 can_hover => 1, can_events => 1, 654 can_hover => 1, can_events => 1,
… …
693 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 678 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
694 679
695 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 680 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
696 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 681 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
697 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 682 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
698 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 683 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
699 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 684 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
700 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 685 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
701 ) { 686 ) {
702 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 687 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
703 688
… …
705 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 690 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
706 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 691 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
707 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 692 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
708 } 693 }
709 694
710 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 695 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
711 696
712 my $row = 0; 697 my $row = 0;
713 my $col = 0; 698 my $col = 0;
714 699
715 my %resist_names = ( 700 my %resist_names = (
701 slow => ["Slow",
716 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 702 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
703 holyw => ["Holy Word",
717 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 704 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
705 conf => ["Confusion",
718 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 706 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
707 fire => ["Fire",
719 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 708 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
709 depl => ["Depletion",
720 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 710 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
711 magic => ["Magic",
721 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 712 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
713 drain => ["Draining",
722 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 714 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
715 acid => ["Acid",
723 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 716 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
717 pois => ["Poison",
724 pois => "<b>Poison</b> (resistance to getting poisoned)", 718 "<b>Poison</b> (resistance to getting poisoned)"],
719 para => ["Paralysation",
725 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 720 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
721 deat => ["Death",
726 deat => "<b>Death</b> (resistance against death spells)", 722 "<b>Death</b> (resistance against death spells)"],
727 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 723 phys => ["Physical",
724 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
725 blind => ["Blind",
728 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 726 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
727 fear => ["Fear",
729 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 728 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
729 tund => ["Turn undead",
730 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 730 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
731 elec => ["Electricity",
731 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 732 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
733 cold => ["Cold",
732 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 734 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
735 ghit => ["Ghost hit",
733 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 736 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
734 ); 737 );
735 for (qw/slow holyw conf fire depl magic 738 for (qw/slow holyw conf fire depl magic
736 drain acid pois para deat phys 739 drain acid pois para deat phys
737 blind fear tund elec cold ghit/) 740 blind fear tund elec cold ghit/)
738 { 741 {
… …
743 template => "-100%", 746 template => "-100%",
744 align => +1, 747 align => +1,
745 valign => 0, 748 valign => 0,
746 can_events => 1, 749 can_events => 1,
747 can_hover => 1, 750 can_hover => 1,
748 tooltip => $resist_names{$_}, 751 tooltip => $resist_names{$_}->[1],
749 ); 752 );
750 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
751 font => $FONT_FIXED, 754 font => $FONT_FIXED,
752 can_hover => 1, 755 can_hover => 1,
753 can_events => 1, 756 can_events => 1,
754 path => "ui/resist/resist_$_.png", 757 path => "ui/resist/resist_$_.png",
755 tooltip => $resist_names{$_}, 758 tooltip => $resist_names{$_}->[1],
759 );
760 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
761 text => $resist_names{$_}->[0],
762 font => $FONT_FIXED,
763 can_hover => 1,
764 can_events => 1,
765 tooltip => $resist_names{$_}->[1],
756 ); 766 );
757 767
758 $row++; 768 $row++;
759 if ($row % 6 == 0) { 769 if ($row % 6 == 0) {
760 $col += 2; 770 $col += 3;
761 $row = 0; 771 $row = 0;
762 } 772 }
763 } 773 }
764 774
765 &set_stats_window_fontsize;
766 update_stats_window ({}); 775 update_stats_window ({});
767 776
768 $tgw 777 $vb
778}
779
780sub skill_window {
781 my ($self) = @_;
782 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1;
769} 783}
770 784
771sub formsep($) { 785sub formsep($) {
772 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 786 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
773} 787}
… …
807 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 821 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
808 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 822 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
809 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 823 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
810 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 824 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
811 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 825 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
812 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 826 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
813 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 827 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
814 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 828 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
815 829
816 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 830 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
817 831
… …
834 deat => CS_STAT_RES_DEATH, 848 deat => CS_STAT_RES_DEATH,
835 holyw => CS_STAT_RES_HOLYWORD, 849 holyw => CS_STAT_RES_HOLYWORD,
836 blind => CS_STAT_RES_BLIND, 850 blind => CS_STAT_RES_BLIND,
837 ); 851 );
838 852
853 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
854 my $sktbl = $STATWIDS->{_skill_tbl};
855 $sktbl->clear;
856
857 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
858 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
859 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
860
861 my @skills;
862
863 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
864 push @skills, [$i, $::CONN->{skill_info}{$i}];
865 }
866
867 my $y = 1;
868 for (sort { $a->[1] cmp $b->[1] } @skills) {
869 my ($idx, $name) = @$_;
870
871 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
872 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
873 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
874 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
875 }
876 }
877
878 $STATWIDS->{_skill_tbl_init} = 1;
879 }
880
881 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
882 if (exists $stats->{$i}) {
883 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
884 if $STATWIDS->{"sk_xp_$i"};
885 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
886 if $STATWIDS->{"sk_lvl_$i"};
887 }
888 }
889
839 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 890 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
840 for keys %tbl; 891 for keys %tbl;
841} 892}
842 893
843my $METASERVER_ATIME; 894my $METASERVER_ATIME;
844 895
845sub update_metaserver { 896sub update_metaserver {
897 my ($metaserver_dialog) = @_;
898
899 $METASERVER = $metaserver_dialog
900 if defined $metaserver_dialog;
901
846 return if $METASERVER_ATIME > time; 902 return if $METASERVER_ATIME > time;
847 $METASERVER_ATIME = time + 60; 903 $METASERVER_ATIME = time + 60;
848 904
849 my $table = $METASERVER->{table}; 905 my $table = $METASERVER->{table};
850 $table->clear; 906 $table->clear;
… …
938 } 994 }
939 }); 995 });
940} 996}
941 997
942sub metaserver_dialog { 998sub metaserver_dialog {
999 my $vbox = new CFClient::UI::VBox;
1000 my $table = new CFClient::UI::Table;
1001 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
1002
943 my $dialog = new CFClient::UI::FancyFrame 1003 my $dialog = new CFClient::UI::FancyFrame
944 title => "Server List", 1004 title => "Server List",
945 name => 'metaserver_dialog', 1005 name => 'metaserver_dialog',
946 x => 'center', 1006 x => 'center',
947 y => 'center', 1007 y => 'center',
948 z => 3, 1008 z => 3,
949 force_h => $::HEIGHT * 0.4, 1009 force_h => $::HEIGHT * 0.4,
950 child => (my $vbox = new CFClient::UI::VBox), 1010 child => $vbox,
1011 has_close_button => 1,
1012 table => $table,
951 on_visibility_change => sub { 1013 on_visibility_change => sub {
952 update_metaserver if $_[1]; 1014 update_metaserver ($_[0]) if $_[1];
953 0 1015 0
954 }, 1016 },
955 ; 1017 ;
956
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960 1018
961 $dialog 1019 $dialog
962} 1020}
963 1021
964sub server_setup { 1022sub server_setup {
… …
980 $CFG->{profile}{default}{host} = $value; 1038 $CFG->{profile}{default}{host} = $value;
981 0 1039 0
982 } 1040 }
983 ); 1041 );
984 1042
985 $METASERVER = metaserver_dialog;
986
987 $vbox->add (new CFClient::UI::Button 1043 $vbox->add (new CFClient::UI::Button
988 expand => 1, 1044 expand => 1,
989 text => "Server List", 1045 text => "Server List",
990 other => $METASERVER, 1046 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 1047 tooltip => "Show a list of available crossfire servers",
… …
1086sub message_window { 1142sub message_window {
1087 my $window = new CFClient::UI::FancyFrame 1143 my $window = new CFClient::UI::FancyFrame
1088 name => "message_window", 1144 name => "message_window",
1089 title => "Messages", 1145 title => "Messages",
1090 border_bg => [1, 1, 1, 1], 1146 border_bg => [1, 1, 1, 1],
1091 bg => [0, 0, 0, 0.75],
1092 x => "max", 1147 x => "max",
1093 y => 0, 1148 y => 0,
1094 force_w => $::WIDTH * 0.4, 1149 force_w => $::WIDTH * 0.4,
1095 force_h => $::HEIGHT * 0.5, 1150 force_h => $::HEIGHT * 0.5,
1096 child => (my $vbox = new CFClient::UI::VBox), 1151 child => (my $vbox = new CFClient::UI::VBox),
… …
1182sub autopickup_setup { 1237sub autopickup_setup {
1183 my $table = new CFClient::UI::Table; 1238 my $table = new CFClient::UI::Table;
1184 1239
1185 for ( 1240 for (
1186 ["General", 0, 0, 1241 ["General", 0, 0,
1187 ["Enable autopickup" => PICKUP_NEWMODE], 1242 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1188 ["Inhibit autopickup" => PICKUP_INHIBIT], 1243 ["Inhibit autopickup" => PICKUP_INHIBIT],
1189 ["Stop before pickup" => PICKUP_STOP], 1244 ["Stop before pickup" => PICKUP_STOP],
1190 ["Debug autopickup" => PICKUP_DEBUG], 1245 ["Debug autopickup" => PICKUP_DEBUG],
1191 ], 1246 ],
1192 ["Weapons", 0, 6, 1247 ["Weapons", 0, 6,
… …
1229 for (@bits) { 1284 for (@bits) {
1230 ++$y; 1285 ++$y;
1231 1286
1232 my $mask = $_->[1]; 1287 my $mask = $_->[1];
1233 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1288 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1234 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1289 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1235 state => $CFG->{pickup} & $mask, 1290 state => $::CFG->{pickup} & $mask,
1236 on_changed => sub { 1291 on_changed => sub {
1237 my ($box, $value) = @_; 1292 my ($box, $value) = @_;
1238 1293
1239 if ($value) { 1294 if ($value) {
1240 $::CFG->{pickup} |= $mask; 1295 $::CFG->{pickup} |= $mask;
… …
1245 $::CONN->send_command ("pickup $::CFG->{pickup}") 1300 $::CONN->send_command ("pickup $::CFG->{pickup}")
1246 if defined $::CONN; 1301 if defined $::CONN;
1247 1302
1248 0 1303 0
1249 }); 1304 });
1305
1306 ${$_->[2]} = $checkbox if $_->[2];
1250 } 1307 }
1251 } 1308 }
1252 1309
1253 $table->add (2, 18, new CFClient::UI::ValSlider 1310 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1], 1311 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1312 template => ">= 99",
1255 to_value => sub { ">= " . 5 * $_[0] }, 1313 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub { 1314 on_changed => sub {
1257 my ($slider, $value) = @_; 1315 my ($slider, $value) = @_;
1258 1316
1259 $::CFG->{pickup} &= ~0x7; 1317 $::CFG->{pickup} &= ~0xF;
1260 $::CFG->{pickup} |= int $value 1318 $::CFG->{pickup} |= int $value
1261 if $value; 1319 if $value;
1262 1; 1320 1;
1263 }); 1321 });
1322
1264 $table->add (3, 18, new CFClient::UI::Button 1323 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set", 1324 text => "set",
1266 on_activate => sub { 1325 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}") 1326 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN; 1327 if defined $::CONN;
… …
1270 }); 1329 });
1271 1330
1272 $table 1331 $table
1273} 1332}
1274 1333
1275sub inventory_window { 1334sub inventory_widget {
1335 my $hb = new CFClient::UI::HBox homogeneous => 1;
1336
1337 $hb->add (my $vb1 = new CFClient::UI::VBox);
1338 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1339 $vb1->add ($INV = new CFClient::UI::Inventory);
1340
1341 $hb->add (my $vb2 = new CFClient::UI::VBox);
1342
1343 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1344
1345 $vb2->add ($INVR = new CFClient::UI::Inventory);
1346
1347 # XXX: Call after $INVR = ... because set_opencont sets the items
1348 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1349
1350 $hb
1351}
1352
1353sub toggle_player_page {
1354 my ($widget) = @_;
1355
1356 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1357 $PL_WINDOW->hide;
1358 } else {
1359 $PL_NOTEBOOK->set_current_page ($widget);
1360 $PL_WINDOW->show;
1361 }
1362}
1363
1364sub player_window {
1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1365 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1277 x => "center", 1366 x => "center",
1278 y => "center", 1367 y => "center",
1279 force_w => $WIDTH * 9/10, 1368 force_w => $WIDTH * 9/10,
1280 force_h => $HEIGHT * 9/10, 1369 force_h => $HEIGHT * 9/10,
1281 title => "Inventory", 1370 title => "Player",
1371 name => "playerbook",
1282 has_close_button => 1, 1372 has_close_button => 1
1283 ; 1373 ;
1284 1374
1285 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1375 my $ntb =
1376 $PL_NOTEBOOK =
1377 new CFClient::UI::Notebook
1378 expand => 1,
1379 debug => 1,
1380 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1381 ;
1286 1382
1287 $hb->add (my $vb1 = new CFClient::UI::VBox); 1383 $ntb->add (
1288 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1384 "Stats" => $STATS_PAGE = stats_window,
1289 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1385 "Shows statistics, where all your Stats and Resistances are shown."
1386 );
1387 $ntb->add (
1388 "Skills" => $STATS_PAGE = skill_window,
1389 "Shows all your Skills."
1390 );
1391 $ntb->add (
1392 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1393 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1394 );
1395 $ntb->add (
1396 Inventory => $INVENTORY_PAGE = inventory_widget,
1397 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1398 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1399 );
1290 1400
1291 $hb->add (my $vb2 = new CFClient::UI::VBox); 1401 $ntb->set_current_page ($INVENTORY_PAGE);
1292 1402
1293 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1403 $plwin->add ($ntb);
1294 1404 $plwin
1295 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1296
1297 # XXX: Call after $INVR = ... because set_opencont sets the items
1298 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1299
1300 $invwin
1301}
1302
1303sub spell_setup {
1304 new CFClient::UI::SpellList
1305} 1405}
1306 1406
1307sub update_bindings { 1407sub update_bindings {
1308 $BIND_UPD_CB->() if $BIND_UPD_CB; 1408 $BIND_UPD_CB->() if $BIND_UPD_CB;
1309} 1409}
… …
1319 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1419 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1320 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1420 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1321 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1421 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1322 1422
1323 my $lbl = join "; ", @$cmds; 1423 my $lbl = join "; ", @$cmds;
1324 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1424 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1325 $binding_list->add (my $hb = new CFClient::UI::HBox); 1425 $binding_list->add (my $hb = new CFClient::UI::HBox);
1326 $hb->add (new CFClient::UI::Button 1426 $hb->add (new CFClient::UI::Button
1327 text => "delete", 1427 text => "delete",
1328 tooltip => "Deletes the binding", 1428 tooltip => "Deletes the binding",
1329 on_activate => sub { 1429 on_activate => sub {
… …
1422 y => 'center', 1522 y => 'center',
1423 z => 2, 1523 z => 2,
1424 name => 'doc_browser', 1524 name => 'doc_browser',
1425 force_w => int $WIDTH * 7/8, 1525 force_w => int $WIDTH * 7/8,
1426 force_h => int $HEIGHT * 7/8, 1526 force_h => int $HEIGHT * 7/8,
1427 title => "Documentation"; 1527 title => "Help Browser",
1528 has_close_button => 1;
1428 1529
1429 $win->add (my $vbox = new CFClient::UI::VBox); 1530 $win->add (my $vbox = new CFClient::UI::VBox);
1430 1531
1431 $vbox->add (my $buttons = new CFClient::UI::HBox); 1532 $vbox->add (my $buttons = new CFClient::UI::HBox);
1432 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1533 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1449 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1550 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1450 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1551 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1451 1552
1452 $viewer->clear; 1553 $viewer->clear;
1453 1554
1454# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc}\n", 1555# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1455# (new CFClient::UI::Image path => "x.png"), 1556# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1557# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1456# ]);#d# 1558# ]);#d#
1457 1559
1458 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1560 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1459 for @$pom; 1561 for @$pom;
1460 1562
… …
1514 z => 100, 1616 z => 100,
1515 force_x => "max", 1617 force_x => "max",
1516 force_y => 0; 1618 force_y => 0;
1517 $DEBUG_STATUS->show; 1619 $DEBUG_STATUS->show;
1518 1620
1519 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1621 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1520 1622
1521 $STATUSBOX = new CFClient::UI::Statusbox; 1623 $STATUSBOX = new CFClient::UI::Statusbox;
1522 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1624 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1523 1625
1524 (new CFClient::UI::Frame 1626 (new CFClient::UI::Frame
… …
1574 z => 2, 1676 z => 2,
1575 force_w => $::WIDTH * 0.6, 1677 force_w => $::WIDTH * 0.6,
1576 force_h => $::HEIGHT * 0.6, 1678 force_h => $::HEIGHT * 0.6,
1577 has_close_button => 1, 1679 has_close_button => 1,
1578 ; 1680 ;
1681
1682 $METASERVER = metaserver_dialog;
1579 1683
1580 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1684 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1581 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1685 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1582 1686
1583 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1687 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1593 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1697 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1594 . "with nothing set and the recording started. After doing the actions you " 1698 . "with nothing set and the recording started. After doing the actions you "
1595 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1699 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1596 . "After pressing the combo the binding will be saved automatically and the " 1700 . "After pressing the combo the binding will be saved automatically and the "
1597 . "binding editor closes"); 1701 . "binding editor closes");
1598 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1599 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1600 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1702 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1601 "Some debuggin' options. Do not ask."); 1703 "Some debuggin' options. Do not ask.");
1602 1704
1603 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1705 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1604 1706
… …
1608 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1710 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1609 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1711 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1610 1712
1611 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1713 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1612 1714
1613 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1614 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1615 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1715 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1616 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1716 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1617 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1618 1717
1619 $BUTTONBAR->add (new CFClient::UI::Button 1718 $BUTTONBAR->add (new CFClient::UI::Button
1620 text => "Save Config", 1719 text => "Save Config",
1621 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1720 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1622 on_activate => sub { 1721 on_activate => sub {
… …
1625 status "Configuration Saved"; 1724 status "Configuration Saved";
1626 0 1725 0
1627 }, 1726 },
1628 ); 1727 );
1629 1728
1630 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1729 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1631 tooltip => "View Documentation"); 1730 tooltip => "View Documentation");
1632 1731
1633 $BUTTONBAR->add (new CFClient::UI::Button 1732 $BUTTONBAR->add (new CFClient::UI::Button
1634 text => "Quit", 1733 text => "Quit",
1635 tooltip => "Terminates the program", 1734 tooltip => "Terminates the program",
… …
1841# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1940# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1842 }, 1941 },
1843 CFClient::SDL_KEYDOWN => sub { 1942 CFClient::SDL_KEYDOWN => sub {
1844 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1943 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1845 # alt-enter 1944 # alt-enter
1945 $FULLSCREEN_ENABLE->toggle;
1846 video_shutdown; 1946 video_shutdown;
1847 $CFG->{fullscreen} = !$CFG->{fullscreen};
1848 video_init; 1947 video_init;
1849 } else { 1948 } else {
1850 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1949 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1851 } 1950 }
1852 }, 1951 },

Diff Legend

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