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.77 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.93 by root, Sat Jul 15 01:19:55 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 $PICKUP_ENABLE;
89our $SERVER_INFO; 92our $SERVER_INFO;
90 93
91our $SETUP_DIALOG; 94our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK; 95our $SETUP_NOTEBOOK;
93our $SETUP_SERVER; 96our $SETUP_SERVER;
94our $SETUP_KEYBOARD; 97our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96 98
99our $PL_NOTEBOOK;
97our $STATS_WINDOW; 100our $PL_WINDOW;
101
102our $INVENTORY_PAGE;
103our $STATS_PAGE;
104our $SPELL_PAGE;
105
106our $HELP_WINDOW;
98our $MESSAGE_WINDOW; 107our $MESSAGE_WINDOW;
99our $FLOORBOX; 108our $FLOORBOX;
100our $GAUGES; 109our $GAUGES;
101our $STATWIDS; 110our $STATWIDS;
102 111
… …
109 118
110our $ALT_ENTER_MESSAGE; 119our $ALT_ENTER_MESSAGE;
111our $STATUSBOX; 120our $STATUSBOX;
112our $DEBUG_STATUS; 121our $DEBUG_STATUS;
113 122
114our $INV_WINDOW;
115our $INV; 123our $INV;
116our $INVR; 124our $INVR;
117our $INV_RIGHT_HB; 125our $INV_RIGHT_HB;
118 126
119our $BIND_EDITOR; 127our $BIND_EDITOR;
… …
220 $conn->send ("reply $stat"); 228 $conn->send ("reply $stat");
221 destroy_query_dialog $conn; 229 destroy_query_dialog $conn;
222 return; 230 return;
223 } 231 }
224 232
225 $STATS_WINDOW->show; 233 $STATS_PAGE->show;
226 $MESSAGE_WINDOW->hide; 234 $MESSAGE_WINDOW->hide;
227 235
228 unshift @dialog, new CFClient::UI::Label 236 unshift @dialog, new CFClient::UI::Label
229 max_w => $::WIDTH * 0.4, 237 max_w => $::WIDTH * 0.4,
230 ellipsise => 0, 238 ellipsise => 0,
… …
270 # right: accept 278 # right: accept
271 $table->add (4, 0, new CFClient::UI::Button 279 $table->add (4, 0, new CFClient::UI::Button
272 text => "Accept", 280 text => "Accept",
273 on_activate => sub { 281 on_activate => sub {
274 $conn->send ("reply n"); 282 $conn->send ("reply n");
275 $STATS_WINDOW->hide; 283 $STATS_PAGE->hide;
276 destroy_query_dialog $conn; 284 destroy_query_dialog $conn;
277 0 285 0
278 }, 286 },
279 ); 287 );
280 288
… …
372 380
373sub stop_game { 381sub stop_game {
374 $LOGIN_BUTTON->set_text ("Login"); 382 $LOGIN_BUTTON->set_text ("Login");
375 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 383 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
376 $SETUP_DIALOG->show; 384 $SETUP_DIALOG->show;
377 $INV_WINDOW->hide; 385 $PL_WINDOW->hide;
378 $SETUP_SPELLS->clear_spells; 386 $SPELL_PAGE->clear_spells;
379 387
380 return unless $CONN; 388 return unless $CONN;
381 389
382 status "connection closed"; 390 status "connection closed";
383 391
… …
468 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 476 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.", 477 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 }, 478 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
471 ); 479 );
472 480
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"); 481 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
486 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFClient::UI::Slider
487 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 483 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.", 484 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
489 on_changed => sub { 485 on_changed => sub {
… …
558 ); 554 );
559 555
560 $vbox 556 $vbox
561} 557}
562 558
563sub set_stats_window_fontsize {
564 for (values %{$STATWIDS}) {
565 $_->set_fontsize ($::CFG->{stat_fontsize});
566 }
567}
568
569sub set_gauge_window_fontsize { 559sub set_gauge_window_fontsize {
570 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 560 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
571 $_->set_fontsize ($::CFG->{gauge_fontsize}); 561 $_->set_fontsize ($::CFG->{gauge_fontsize});
572 } 562 }
573} 563}
… …
652 642
653 $table 643 $table
654} 644}
655 645
656sub stats_window { 646sub stats_window {
657 my $tgw = new CFClient::UI::FancyFrame 647 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 648
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, 649 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
666 can_hover => 1, can_events => 1, 650 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."); 651 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, 652 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
669 can_hover => 1, can_events => 1, 653 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."], 677 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
694 678
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."], 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."],
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."], 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."],
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."], 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."],
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."], 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."],
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."], 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."],
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."], 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."],
701 ) { 685 ) {
702 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 686 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
703 687
… …
705 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);
706 $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
707 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);
708 } 692 }
709 693
710 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 694 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
711 695
712 my $row = 0; 696 my $row = 0;
713 my $col = 0; 697 my $col = 0;
714 698
715 my %resist_names = ( 699 my %resist_names = (
700 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.)", 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",
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.)", 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",
718 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",
719 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",
720 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",
721 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",
722 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",
723 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",
724 pois => "<b>Poison</b> (resistance to getting poisoned)", 717 "<b>Poison</b> (resistance to getting poisoned)"],
718 para => ["Paralysation",
725 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",
726 deat => "<b>Death</b> (resistance against death spells)", 721 "<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)", 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",
728 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",
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)", 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",
730 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",
731 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",
732 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",
733 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)"],
734 ); 736 );
735 for (qw/slow holyw conf fire depl magic 737 for (qw/slow holyw conf fire depl magic
736 drain acid pois para deat phys 738 drain acid pois para deat phys
737 blind fear tund elec cold ghit/) 739 blind fear tund elec cold ghit/)
738 { 740 {
… …
743 template => "-100%", 745 template => "-100%",
744 align => +1, 746 align => +1,
745 valign => 0, 747 valign => 0,
746 can_events => 1, 748 can_events => 1,
747 can_hover => 1, 749 can_hover => 1,
748 tooltip => $resist_names{$_}, 750 tooltip => $resist_names{$_}->[1],
749 ); 751 );
750 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 752 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
751 font => $FONT_FIXED, 753 font => $FONT_FIXED,
752 can_hover => 1, 754 can_hover => 1,
753 can_events => 1, 755 can_events => 1,
754 image => "ui/resist/resist_$_.png", 756 path => "ui/resist/resist_$_.png",
755 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],
756 ); 765 );
757 766
758 $row++; 767 $row++;
759 if ($row % 6 == 0) { 768 if ($row % 6 == 0) {
760 $col += 2; 769 $col += 3;
761 $row = 0; 770 $row = 0;
762 } 771 }
763 } 772 }
764 773
765 &set_stats_window_fontsize;
766 update_stats_window ({}); 774 update_stats_window ({});
767 775
768 $tgw 776 $vb
777}
778
779sub skill_window {
780 my ($self) = @_;
781 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1;
769} 782}
770 783
771sub formsep($) { 784sub formsep($) {
772 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 785 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
773} 786}
… …
807 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 820 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
808 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 821 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
809 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 822 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
810 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 823 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
811 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 824 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
812 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 825 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
813 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 826 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
814 $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});
815 828
816 $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);
817 830
… …
834 deat => CS_STAT_RES_DEATH, 847 deat => CS_STAT_RES_DEATH,
835 holyw => CS_STAT_RES_HOLYWORD, 848 holyw => CS_STAT_RES_HOLYWORD,
836 blind => CS_STAT_RES_BLIND, 849 blind => CS_STAT_RES_BLIND,
837 ); 850 );
838 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
839 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 889 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
840 for keys %tbl; 890 for keys %tbl;
841} 891}
842 892
843my $METASERVER_ATIME; 893my $METASERVER_ATIME;
844 894
845sub update_metaserver { 895sub update_metaserver {
896 my ($metaserver_dialog) = @_;
897
898 $METASERVER = $metaserver_dialog
899 if defined $metaserver_dialog;
900
846 return if $METASERVER_ATIME > time; 901 return if $METASERVER_ATIME > time;
847 $METASERVER_ATIME = time + 60; 902 $METASERVER_ATIME = time + 60;
848 903
849 my $table = $METASERVER->{table}; 904 my $table = $METASERVER->{table};
850 $table->clear; 905 $table->clear;
… …
938 } 993 }
939 }); 994 });
940} 995}
941 996
942sub 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
943 my $dialog = new CFClient::UI::FancyFrame 1002 my $dialog = new CFClient::UI::FancyFrame
944 title => "Server List", 1003 title => "Server List",
945 name => 'metaserver_dialog', 1004 name => 'metaserver_dialog',
946 x => 'center', 1005 x => 'center',
947 y => 'center', 1006 y => 'center',
948 z => 3, 1007 z => 3,
949 force_h => $::HEIGHT * 0.4, 1008 force_h => $::HEIGHT * 0.4,
950 child => (my $vbox = new CFClient::UI::VBox), 1009 child => $vbox,
1010 has_close_button => 1,
1011 table => $table,
951 on_visibility_change => sub { 1012 on_visibility_change => sub {
952 update_metaserver if $_[1]; 1013 update_metaserver ($_[0]) if $_[1];
953 0 1014 0
954 }, 1015 },
955 ; 1016 ;
956
957 $dialog->{table} = new CFClient::UI::Table;
958
959 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
960 1017
961 $dialog 1018 $dialog
962} 1019}
963 1020
964sub server_setup { 1021sub server_setup {
… …
980 $CFG->{profile}{default}{host} = $value; 1037 $CFG->{profile}{default}{host} = $value;
981 0 1038 0
982 } 1039 }
983 ); 1040 );
984 1041
985 $METASERVER = metaserver_dialog;
986
987 $vbox->add (new CFClient::UI::Button 1042 $vbox->add (new CFClient::UI::Button
988 expand => 1, 1043 expand => 1,
989 text => "Server List", 1044 text => "Server List",
990 other => $METASERVER, 1045 other => $METASERVER,
991 tooltip => "Show a list of available crossfire servers", 1046 tooltip => "Show a list of available crossfire servers",
… …
1086sub message_window { 1141sub message_window {
1087 my $window = new CFClient::UI::FancyFrame 1142 my $window = new CFClient::UI::FancyFrame
1088 name => "message_window", 1143 name => "message_window",
1089 title => "Messages", 1144 title => "Messages",
1090 border_bg => [1, 1, 1, 1], 1145 border_bg => [1, 1, 1, 1],
1091 bg => [0, 0, 0, 0.75],
1092 x => "max", 1146 x => "max",
1093 y => 0, 1147 y => 0,
1094 force_w => $::WIDTH * 0.4, 1148 force_w => $::WIDTH * 0.4,
1095 force_h => $::HEIGHT * 0.5, 1149 force_h => $::HEIGHT * 0.5,
1096 child => (my $vbox = new CFClient::UI::VBox), 1150 child => (my $vbox = new CFClient::UI::VBox),
… …
1182sub autopickup_setup { 1236sub autopickup_setup {
1183 my $table = new CFClient::UI::Table; 1237 my $table = new CFClient::UI::Table;
1184 1238
1185 for ( 1239 for (
1186 ["General", 0, 0, 1240 ["General", 0, 0,
1187 ["Enable autopickup" => PICKUP_NEWMODE], 1241 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1188 ["Inhibit autopickup" => PICKUP_INHIBIT], 1242 ["Inhibit autopickup" => PICKUP_INHIBIT],
1189 ["Stop before pickup" => PICKUP_STOP], 1243 ["Stop before pickup" => PICKUP_STOP],
1190 ["Debug autopickup" => PICKUP_DEBUG], 1244 ["Debug autopickup" => PICKUP_DEBUG],
1191 ], 1245 ],
1192 ["Weapons", 0, 6, 1246 ["Weapons", 0, 6,
… …
1229 for (@bits) { 1283 for (@bits) {
1230 ++$y; 1284 ++$y;
1231 1285
1232 my $mask = $_->[1]; 1286 my $mask = $_->[1];
1233 $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);
1234 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1288 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1235 state => $CFG->{pickup} & $mask, 1289 state => $::CFG->{pickup} & $mask,
1236 on_changed => sub { 1290 on_changed => sub {
1237 my ($box, $value) = @_; 1291 my ($box, $value) = @_;
1238 1292
1239 if ($value) { 1293 if ($value) {
1240 $::CFG->{pickup} |= $mask; 1294 $::CFG->{pickup} |= $mask;
… …
1245 $::CONN->send_command ("pickup $::CFG->{pickup}") 1299 $::CONN->send_command ("pickup $::CFG->{pickup}")
1246 if defined $::CONN; 1300 if defined $::CONN;
1247 1301
1248 0 1302 0
1249 }); 1303 });
1304
1305 ${$_->[2]} = $checkbox if $_->[2];
1250 } 1306 }
1251 } 1307 }
1252 1308
1253 $table->add (2, 18, new CFClient::UI::ValSlider 1309 $table->add (2, 18, new CFClient::UI::ValSlider
1254 range => [0, 0, 16, 1, 1], 1310 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1311 template => ">= 99",
1255 to_value => sub { ">= " . 5 * $_[0] }, 1312 to_value => sub { ">= " . 5 * $_[0] },
1256 on_changed => sub { 1313 on_changed => sub {
1257 my ($slider, $value) = @_; 1314 my ($slider, $value) = @_;
1258 1315
1259 $::CFG->{pickup} &= ~0x7; 1316 $::CFG->{pickup} &= ~0xF;
1260 $::CFG->{pickup} |= int $value 1317 $::CFG->{pickup} |= int $value
1261 if $value; 1318 if $value;
1262 1; 1319 1;
1263 }); 1320 });
1321
1264 $table->add (3, 18, new CFClient::UI::Button 1322 $table->add (3, 18, new CFClient::UI::Button
1265 text => "set", 1323 text => "set",
1266 on_activate => sub { 1324 on_activate => sub {
1267 $::CONN->send_command ("pickup $::CFG->{pickup}") 1325 $::CONN->send_command ("pickup $::CFG->{pickup}")
1268 if defined $::CONN; 1326 if defined $::CONN;
… …
1270 }); 1328 });
1271 1329
1272 $table 1330 $table
1273} 1331}
1274 1332
1275sub 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 {
1276 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1364 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1277 x => "center", 1365 x => "center",
1278 y => "center", 1366 y => "center",
1279 force_w => $WIDTH * 9/10, 1367 force_w => $WIDTH * 9/10,
1280 force_h => $HEIGHT * 9/10, 1368 force_h => $HEIGHT * 9/10,
1281 title => "Inventory", 1369 title => "Player",
1370 name => "playerbook",
1282 has_close_button => 1, 1371 has_close_button => 1
1283 ; 1372 ;
1284 1373
1285 $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 ;
1286 1381
1287 $hb->add (my $vb1 = new CFClient::UI::VBox); 1382 $ntb->add (
1288 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1383 "Stats" => $STATS_PAGE = stats_window,
1289 $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 );
1290 1399
1291 $hb->add (my $vb2 = new CFClient::UI::VBox); 1400 $ntb->set_current_page ($INVENTORY_PAGE);
1292 1401
1293 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1402 $plwin->add ($ntb);
1294 1403 $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} 1404}
1306 1405
1307sub update_bindings { 1406sub update_bindings {
1308 $BIND_UPD_CB->() if $BIND_UPD_CB; 1407 $BIND_UPD_CB->() if $BIND_UPD_CB;
1309} 1408}
… …
1319 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1418 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1320 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1419 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1321 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1420 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1322 1421
1323 my $lbl = join "; ", @$cmds; 1422 my $lbl = join "; ", @$cmds;
1324 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1423 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1325 $binding_list->add (my $hb = new CFClient::UI::HBox); 1424 $binding_list->add (my $hb = new CFClient::UI::HBox);
1326 $hb->add (new CFClient::UI::Button 1425 $hb->add (new CFClient::UI::Button
1327 text => "delete", 1426 text => "delete",
1328 tooltip => "Deletes the binding", 1427 tooltip => "Deletes the binding",
1329 on_activate => sub { 1428 on_activate => sub {
… …
1422 y => 'center', 1521 y => 'center',
1423 z => 2, 1522 z => 2,
1424 name => 'doc_browser', 1523 name => 'doc_browser',
1425 force_w => int $WIDTH * 7/8, 1524 force_w => int $WIDTH * 7/8,
1426 force_h => int $HEIGHT * 7/8, 1525 force_h => int $HEIGHT * 7/8,
1427 title => "Documentation"; 1526 title => "Help Browser",
1527 has_close_button => 1;
1428 1528
1429 $win->add (my $vbox = new CFClient::UI::VBox); 1529 $win->add (my $vbox = new CFClient::UI::VBox);
1430 1530
1431 $vbox->add (my $buttons = new CFClient::UI::HBox); 1531 $vbox->add (my $buttons = new CFClient::UI::HBox);
1432 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1532 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1435 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1535 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1436 $buttons->add (my $combo = new CFClient::UI::Combobox 1536 $buttons->add (my $combo = new CFClient::UI::Combobox
1437 value => undef, 1537 value => undef,
1438 options => [ 1538 options => [
1439 [intro => "Introduction"], 1539 [intro => "Introduction"],
1440 [manual => "Manual"], 1540 [manual => "Main Manual"],
1441 [skill_help => "Skills"], 1541 [skill_help => "Skill Reference"],
1442 [command_help => "Commands"], 1542 [command_help => "Command Reference"],
1443 [dmcommand_help => "DM Commands"], 1543 [dmcommand_help => "DM Commands"],
1444 [COPYING => "License Terms"], 1544 [COPYING => "License Terms"],
1445 ], 1545 ],
1446 on_changed => sub { 1546 on_changed => sub {
1447 my ($self, $pod) = @_; 1547 my ($self, $pod) = @_;
1448 1548
1449 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1549 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1450 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1550 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1451 1551
1452 $viewer->clear; 1552 $viewer->clear;
1553
1554# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1555# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1556# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1557# ]);#d#
1453 1558
1454 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1559 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1455 for @$pom; 1560 for @$pom;
1456 1561
1457 $viewer->set_offset (0); 1562 $viewer->set_offset (0);
1563
1458 0 1564 0
1459 }, 1565 },
1460 on_visibility_change => sub { 1566 on_visibility_change => sub {
1461 my ($self, $visible) = @_; 1567 my ($self, $visible) = @_;
1462 return unless $visible; 1568 return unless $visible;
… …
1509 z => 100, 1615 z => 100,
1510 force_x => "max", 1616 force_x => "max",
1511 force_y => 0; 1617 force_y => 0;
1512 $DEBUG_STATUS->show; 1618 $DEBUG_STATUS->show;
1513 1619
1514 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1620 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1515 1621
1516 $STATUSBOX = new CFClient::UI::Statusbox; 1622 $STATUSBOX = new CFClient::UI::Statusbox;
1517 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1623 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1518 1624
1519 (new CFClient::UI::Frame 1625 (new CFClient::UI::Frame
… …
1569 z => 2, 1675 z => 2,
1570 force_w => $::WIDTH * 0.6, 1676 force_w => $::WIDTH * 0.6,
1571 force_h => $::HEIGHT * 0.6, 1677 force_h => $::HEIGHT * 0.6,
1572 has_close_button => 1, 1678 has_close_button => 1,
1573 ; 1679 ;
1680
1681 $METASERVER = metaserver_dialog;
1574 1682
1575 $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,
1576 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1684 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1577 1685
1578 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1686 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
… …
1588 . "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 "
1589 . "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 "
1590 . "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. "
1591 . "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 "
1592 . "binding editor closes"); 1700 . "binding editor closes");
1593 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1594 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1595 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1701 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1596 "Some debuggin' options. Do not ask."); 1702 "Some debuggin' options. Do not ask.");
1597 1703
1598 $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
1599 1705
… …
1603 $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,
1604 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.");
1605 1711
1606 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
1607 1713
1608 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1609 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1610 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1714 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1611 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.");
1612 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1613 1716
1614 $BUTTONBAR->add (new CFClient::UI::Button 1717 $BUTTONBAR->add (new CFClient::UI::Button
1615 text => "Save Config", 1718 text => "Save Config",
1616 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.",
1617 on_activate => sub { 1720 on_activate => sub {
… …
1620 status "Configuration Saved"; 1723 status "Configuration Saved";
1621 0 1724 0
1622 }, 1725 },
1623 ); 1726 );
1624 1727
1625 $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,
1626 tooltip => "View Documentation"); 1729 tooltip => "View Documentation");
1627 1730
1628 $BUTTONBAR->add (new CFClient::UI::Button 1731 $BUTTONBAR->add (new CFClient::UI::Button
1629 text => "Quit", 1732 text => "Quit",
1630 tooltip => "Terminates the program", 1733 tooltip => "Terminates the program",

Diff Legend

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