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.80 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.93 by root, Sat Jul 15 01:19:55 2006 UTC

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

Diff Legend

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