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.89 by elmex, Sun Jul 9 21:11:48 2006 UTC vs.
Revision 1.103 by root, Mon Jul 24 08:23:28 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::Pod;
41use CFClient::BindingEditor; 42use CFClient::BindingEditor;
42use CFClient::MapWidget; 43use CFClient::MapWidget;
43 44
44$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 45$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE';
45 47
48$Event::Eval = 0;
46$Event::DIED = sub { 49$Event::DIED = sub {
47 # TODO: display dialog box or so 50 # TODO: display dialog box or so
48 Carp::confess $_[1];#d#TODO: remove when stable 51 Carp::cluck $_[1];#d#TODO: remove when stable
49 CFClient::error $_[1]; 52 CFClient::error $_[1];
50}; 53};
51 54
52#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 55$SIG{__DIE__} = sub {
56 return if CFClient::in_destruct;
57 Carp::cluck $_[0];
58 CFClient::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
53 63
54our $VERSION = '0.1'; 64our $VERSION = '0.1';
55 65
56my $MAX_FPS = 60; 66my $MAX_FPS = 60;
57my $MIN_FPS = 5; # unused as of yet 67my $MIN_FPS = 5; # unused as of yet
… …
85our $CONSOLE; 95our $CONSOLE;
86our $METASERVER; 96our $METASERVER;
87our $LOGIN_BUTTON; 97our $LOGIN_BUTTON;
88our $QUIT_DIALOG; 98our $QUIT_DIALOG;
89our $HOST_ENTRY; 99our $HOST_ENTRY;
100our $FULLSCREEN_ENABLE;
90our $PICKUP_ENABLE; 101our $PICKUP_ENABLE;
91our $SERVER_INFO; 102our $SERVER_INFO;
92 103
93our $SETUP_DIALOG; 104our $SETUP_DIALOG;
94our $SETUP_NOTEBOOK; 105our $SETUP_NOTEBOOK;
… …
98our $PL_NOTEBOOK; 109our $PL_NOTEBOOK;
99our $PL_WINDOW; 110our $PL_WINDOW;
100 111
101our $INVENTORY_PAGE; 112our $INVENTORY_PAGE;
102our $STATS_PAGE; 113our $STATS_PAGE;
114our $SKILL_PAGE;
103our $SPELL_PAGE; 115our $SPELL_PAGE;
104 116
105our $HELP_WINDOW; 117our $HELP_WINDOW;
106our $MESSAGE_WINDOW; 118our $MESSAGE_WINDOW;
107our $FLOORBOX; 119our $FLOORBOX;
… …
127our $BIND_UPD_CB; 139our $BIND_UPD_CB;
128 140
129our $PICKUP_CFG; 141our $PICKUP_CFG;
130 142
131sub status { 143sub status {
132 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 144 $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
133} 145}
134 146
135sub debug { 147sub debug {
136 $DEBUG_STATUS->set_text ($_[0]); 148 $DEBUG_STATUS->set_text ($_[0]);
137} 149}
… …
186 $MESSAGE_WINDOW->show; 198 $MESSAGE_WINDOW->show;
187 199
188 unshift @dialog, new CFClient::UI::Label 200 unshift @dialog, new CFClient::UI::Label
189 max_w => $::WIDTH * 0.4, 201 max_w => $::WIDTH * 0.4,
190 ellipsise => 0, 202 ellipsise => 0,
191 markup => "\nOr use your keyboard:\n"; 203 markup => "\nOr use your keyboard and the text entry below:\n";
192 204
193 unshift @dialog, my $table = new CFClient::UI::Table; 205 unshift @dialog, my $table = new CFClient::UI::Table;
194 206
195 $table->add (0, 0, new CFClient::UI::Button 207 $table->add (0, 0, new CFClient::UI::Button
196 text => "Next Race", 208 text => "Next Race",
… …
213 max_w => $::WIDTH * 0.4, 225 max_w => $::WIDTH * 0.4,
214 ellipsise => 0, 226 ellipsise => 0,
215 markup => 227 markup =>
216 "<big><b>Character Creation: Race</b></big>\n\n" 228 "<big><b>Character Creation: Race</b></big>\n\n"
217 . "Look at the <b>Messages</b> window to see a description of this race " 229 . "Look at the <b>Messages</b> window to see a description of this race "
218 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
219 . "and the center of the screen to see how this race looks like " 230 . "and the center of the screen to see how this race looks like "
220 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n" 231 . "(<small>below this dialog window: you may need to move the dialog away and "
232 . "click into the display area to make it visible</small>).\n\n"
221 . "You can look at another race, or accept this race (you will come back to this race eventually, " 233 . "You can look at another race, or accept this race (you will cycle back to "
222 . "so you can take your time making this important choice." 234 . "this race eventually, so you can take your time making this important choice."
223 ; 235 ;
224 236
225 } elsif ($prompt =~ /roll new stats/) { 237 } elsif ($prompt =~ /roll new stats/) {
226 if (my $stat = delete $conn->{stat_change_with}) { 238 if (my $stat = delete $conn->{stat_change_with}) {
227 $conn->send ("reply $stat"); 239 $conn->send ("reply $stat");
… …
233 $MESSAGE_WINDOW->hide; 245 $MESSAGE_WINDOW->hide;
234 246
235 unshift @dialog, new CFClient::UI::Label 247 unshift @dialog, new CFClient::UI::Label
236 max_w => $::WIDTH * 0.4, 248 max_w => $::WIDTH * 0.4,
237 ellipsise => 0, 249 ellipsise => 0,
238 markup => "\nOr use your keyboard:\n"; 250 markup => "\nOr use your keyboard and the text entry below:\n";
239 251
240 unshift @dialog, my $table = new CFClient::UI::Table; 252 unshift @dialog, my $table = new CFClient::UI::Table;
241 253
242 # left: re-roll 254 # left: re-roll
243 $table->add (0, 0, new CFClient::UI::Button 255 $table->add (0, 0, new CFClient::UI::Button
… …
248 0 260 0
249 }, 261 },
250 ); 262 );
251 263
252 # center: swap stats 264 # center: swap stats
253 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 265 my ($sw1, $sw2) = map +(new CFClient::UI::Selector
266 expand => 1,
254 value => $_, 267 value => $_,
255 options => [ 268 options => [
256 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 269 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
257 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 270 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
258 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 271 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
283 destroy_query_dialog $conn; 296 destroy_query_dialog $conn;
284 0 297 0
285 }, 298 },
286 ); 299 );
287 300
301 unshift @dialog, my $hbox = new CFClient::UI::HBox;
302 for (
303 [Str => CS_STAT_STR],
304 [Dex => CS_STAT_DEX],
305 [Con => CS_STAT_CON],
306 [Int => CS_STAT_INT],
307 [Wis => CS_STAT_WIS],
308 [Pow => CS_STAT_POW],
309 [Cha => CS_STAT_CHA],
310 ) {
311 my ($name, $id) = @$_;
312 $hbox->add (new CFClient::UI::Label
313 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
314 align => 0,
315 expand => 1,
316 can_events => 1,
317 can_hover => 1,
318 tooltip => $CFClient::STAT_TOOLTIP{$name},
319 );
320 }
321
288 unshift @dialog, new CFClient::UI::Label 322 unshift @dialog, new CFClient::UI::Label
289 max_w => $::WIDTH * 0.4, 323 max_w => $::WIDTH * 0.4,
290 ellipsise => 0, 324 ellipsise => 0,
291 markup => 325 markup =>
292 "<big><b>Character Creation: Stats</b></big>\n\n" 326 "<big><b>Character Creation: Stats</b></big>\n\n"
293 . "Look at the <b>Stats</b> window to see your basic stats " 327 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
294 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n" 328 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
329 . "They will be modified later by both the race and the class you choose.\n\n"
295 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. " 330 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
296 . "Race selection will influence those values later on."
297 ; 331 ;
298 } 332 }
299 333
300 push @dialog, my $entry = new CFClient::UI::Entry 334 push @dialog, my $entry = new CFClient::UI::Entry
301 on_changed => sub { 335 on_changed => sub {
… …
415 $mode_slider->emit (changed => $mode_slider->{range}[0]); 449 $mode_slider->emit (changed => $mode_slider->{range}[0]);
416 450
417 my $row = 1; 451 my $row = 1;
418 452
419 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 453 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
420 $table->add (1, $row++, new CFClient::UI::CheckBox 454 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
421 state => $CFG->{fullscreen}, 455 state => $CFG->{fullscreen},
422 tooltip => "Bring the client into fullscreen mode.", 456 tooltip => "Bring the client into fullscreen mode.",
423 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 457 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
424 ); 458 );
425 459
… …
641 675
642 $table 676 $table
643} 677}
644 678
645sub stats_window { 679sub stats_window {
680 my $r = new CFClient::UI::ScrolledWindow (
681 expand => 1,
682 scroll_y => 1
683 );
646 my $vb = new CFClient::UI::VBox; 684 $r->add (my $vb = new CFClient::UI::VBox);
647 685
648 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 686 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
649 can_hover => 1, can_events => 1, 687 can_hover => 1, can_events => 1,
650 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 688 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
651 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 689 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
… …
658 tooltip => "The weight of the player including all inventory items."); 696 tooltip => "The weight of the player including all inventory items.");
659 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 697 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
660 can_hover => 1, can_events => 1, 698 can_hover => 1, can_events => 1,
661 tooltip => "The weight limit: you cannot carry more than this."); 699 tooltip => "The weight limit: you cannot carry more than this.");
662 700
663
664 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 701 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
665 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 702 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
666 703
667 my $color2 = [1, 1, 0]; 704 my $color2 = [1, 1, 0];
668 705
669 for ( 706 for (
670 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 707 [0, 0, st_str => "Str", 30],
671 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 708 [0, 1, st_dex => "Dex", 30],
672 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 709 [0, 2, st_con => "Con", 30],
673 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 710 [0, 3, st_int => "Int", 30],
674 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 711 [0, 4, st_wis => "Wis", 30],
675 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 712 [0, 5, st_pow => "Pow", 30],
676 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 713 [0, 6, st_cha => "Cha", 30],
677 714
678 [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."], 715 [2, 0, st_wc => "Wc", -120],
679 [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."], 716 [2, 1, st_ac => "Ac", -120],
680 [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."], 717 [2, 2, st_dam => "Dam", 120],
681 [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."], 718 [2, 3, st_arm => "Arm", 120],
682 [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."], 719 [2, 4, st_spd => "Spd", 10.54],
683 [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."], 720 [2, 5, st_wspd => "WSp", 10.54],
684 ) { 721 ) {
685 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 722 my ($col, $row, $id, $label, $template) = @$_;
686 723
687 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 724 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
688 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 725 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
726 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
689 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 727 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
690 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 728 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
729 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
691 } 730 }
692 731
693 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 732 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
694 733
695 my $row = 0; 734 my $row = 0;
696 my $col = 0; 735 my $col = 0;
697 736
698 my %resist_names = ( 737 my %resist_names = (
738 slow => ["Slow",
699 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.)", 739 "<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.)"],
740 holyw => ["Holy Word",
700 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.)", 741 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
742 conf => ["Confusion",
701 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 743 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
744 fire => ["Fire",
702 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 745 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
746 depl => ["Depletion",
703 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 747 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
748 magic => ["Magic",
704 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 749 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
750 drain => ["Draining",
705 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 751 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
752 acid => ["Acid",
706 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 753 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
754 pois => ["Poison",
707 pois => "<b>Poison</b> (resistance to getting poisoned)", 755 "<b>Poison</b> (resistance to getting poisoned)"],
756 para => ["Paralysation",
708 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 757 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
758 deat => ["Death",
709 deat => "<b>Death</b> (resistance against death spells)", 759 "<b>Death</b> (resistance against death spells)"],
760 phys => ["Physical",
710 phys => "<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.)", 761 "<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.)"],
762 blind => ["Blind",
711 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 763 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
764 fear => ["Fear",
712 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)", 765 "<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)"],
766 tund => ["Turn undead",
713 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 767 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
768 elec => ["Electricity",
714 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 769 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
770 cold => ["Cold",
715 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 771 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
772 ghit => ["Ghost hit",
716 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 773 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
717 ); 774 );
718 for (qw/slow holyw conf fire depl magic 775 for (qw/slow holyw conf fire depl magic
719 drain acid pois para deat phys 776 drain acid pois para deat phys
720 blind fear tund elec cold ghit/) 777 blind fear tund elec cold ghit/)
721 { 778 {
… …
726 template => "-100%", 783 template => "-100%",
727 align => +1, 784 align => +1,
728 valign => 0, 785 valign => 0,
729 can_events => 1, 786 can_events => 1,
730 can_hover => 1, 787 can_hover => 1,
731 tooltip => $resist_names{$_}, 788 tooltip => $resist_names{$_}->[1],
732 ); 789 );
733 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 790 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
734 font => $FONT_FIXED, 791 font => $FONT_FIXED,
735 can_hover => 1, 792 can_hover => 1,
736 can_events => 1, 793 can_events => 1,
737 path => "ui/resist/resist_$_.png", 794 path => "ui/resist/resist_$_.png",
738 tooltip => $resist_names{$_}, 795 tooltip => $resist_names{$_}->[1],
796 );
797 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
798 text => $resist_names{$_}->[0],
799 font => $FONT_FIXED,
800 can_hover => 1,
801 can_events => 1,
802 tooltip => $resist_names{$_}->[1],
739 ); 803 );
740 804
741 $row++; 805 $row++;
742 if ($row % 6 == 0) { 806 if ($row % 6 == 0) {
743 $col += 2; 807 $col += 3;
744 $row = 0; 808 $row = 0;
745 } 809 }
746 } 810 }
747 811
748 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
749 $STATWIDS->{"_skill_tbl"} = $tbl3;
750
751 update_stats_window ({}); 812 #update_stats_window ({});
752 813
753 $vb 814 $r
815}
816
817sub skill_window {
818 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
819 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
820 $sw
754} 821}
755 822
756sub formsep($) { 823sub formsep($) {
757 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 824 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
758}
759
760sub update_stats_window {
761 my ($stats) = @_;
762
763 # I love text protocols...
764
765 my $hp = $stats->{+CS_STAT_HP} * 1;
766 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
767 my $sp = $stats->{+CS_STAT_SP} * 1;
768 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
769 my $fo = $stats->{+CS_STAT_FOOD} * 1;
770 my $fo_m = 999;
771 my $gr = $stats->{+CS_STAT_GRACE} * 1;
772 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
773
774 $GAUGES->{hp} ->set_value ($hp, $hp_m);
775 $GAUGES->{mana} ->set_value ($sp, $sp_m);
776 $GAUGES->{food} ->set_value ($fo, $fo_m);
777 $GAUGES->{grace} ->set_value ($gr, $gr_m);
778 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
779 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
780 my $rng = $stats->{+CS_STAT_RANGE};
781 $rng =~ s/^Range: //; # thank you so much dear server
782 $GAUGES->{range} ->set_text ("Rng: " . $rng);
783 my $title = $stats->{+CS_STAT_TITLE};
784 $title =~ s/^Player: //;
785 $STATWIDS->{title} ->set_text ("Title: " . $title);
786
787 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
788 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
789 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
790 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
791 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
792 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
793 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
794 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
795 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
796 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
797 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
798 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
799 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
800
801 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
802
803 my %tbl = (
804 phys => CS_STAT_RES_PHYS,
805 magic => CS_STAT_RES_MAG,
806 fire => CS_STAT_RES_FIRE,
807 elec => CS_STAT_RES_ELEC,
808 cold => CS_STAT_RES_COLD,
809 conf => CS_STAT_RES_CONF,
810 acid => CS_STAT_RES_ACID,
811 drain => CS_STAT_RES_DRAIN,
812 ghit => CS_STAT_RES_GHOSTHIT,
813 pois => CS_STAT_RES_POISON,
814 slow => CS_STAT_RES_SLOW,
815 para => CS_STAT_RES_PARA,
816 tund => CS_STAT_TURN_UNDEAD,
817 fear => CS_STAT_RES_FEAR,
818 depl => CS_STAT_RES_DEPLETE,
819 deat => CS_STAT_RES_DEATH,
820 holyw => CS_STAT_RES_HOLYWORD,
821 blind => CS_STAT_RES_BLIND,
822 );
823
824 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
825 my $sktbl = $STATWIDS->{_skill_tbl};
826 $sktbl->clear;
827
828 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
829 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
830 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
831
832 my @skills;
833
834 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
835 push @skills, [$i, $::CONN->{skill_info}{$i}];
836 }
837
838 my $y = 1;
839 for (sort { $a->[1] cmp $b->[1] } @skills) {
840 my ($idx, $name) = @$_;
841
842 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
843 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
844 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
845 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
846 }
847 }
848
849 $STATWIDS->{_skill_tbl_init} = 1;
850 }
851
852 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
853 if (exists $stats->{$i}) {
854 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
855 if $STATWIDS->{"sk_xp_$i"};
856 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
857 if $STATWIDS->{"sk_lvl_$i"};
858 }
859 }
860
861 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
862 for keys %tbl;
863} 825}
864 826
865my $METASERVER_ATIME; 827my $METASERVER_ATIME;
866 828
867sub update_metaserver { 829sub update_metaserver {
… …
1113sub message_window { 1075sub message_window {
1114 my $window = new CFClient::UI::FancyFrame 1076 my $window = new CFClient::UI::FancyFrame
1115 name => "message_window", 1077 name => "message_window",
1116 title => "Messages", 1078 title => "Messages",
1117 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1118 bg => [0, 0, 0, 0.75],
1119 x => "max", 1080 x => "max",
1120 y => 0, 1081 y => 0,
1121 force_w => $::WIDTH * 0.4, 1082 force_w => $::WIDTH * 0.4,
1122 force_h => $::HEIGHT * 0.5, 1083 force_h => $::HEIGHT * 0.5,
1123 child => (my $vbox = new CFClient::UI::VBox), 1084 child => (my $vbox = new CFClient::UI::VBox),
… …
1179 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1140 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1180 x => "center", 1141 x => "center",
1181 y => "center", 1142 y => "center",
1182 z => 50, 1143 z => 50,
1183 title => "Really Quit?", 1144 title => "Really Quit?",
1145 on_key_down => sub {
1146 my ($dialog, $ev) = @_;
1147 $ev->{sym} == 27 and $dialog->hide;
1148 }
1184 ; 1149 ;
1185 1150
1186 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1151 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1187 1152
1188 $vb->add (new CFClient::UI::Label 1153 $vb->add (new CFClient::UI::Label
… …
1202 on_activate => sub { exit }, 1167 on_activate => sub { exit },
1203 ); 1168 );
1204 } 1169 }
1205 1170
1206 $QUIT_DIALOG->show; 1171 $QUIT_DIALOG->show;
1172 $QUIT_DIALOG->grab_focus;
1207} 1173}
1208 1174
1209sub autopickup_setup { 1175sub autopickup_setup {
1210 my $table = new CFClient::UI::Table; 1176 my $table = new CFClient::UI::Table;
1211 1177
… …
1301 }); 1267 });
1302 1268
1303 $table 1269 $table
1304} 1270}
1305 1271
1272my %SORT_ORDER = (
1273 type => undef,
1274 mtime => sub { sort {
1275 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1276 or $b->{mtime} <=> $a->{mtime}
1277 or $a->{type} <=> $b->{type}
1278 } @_ },
1279 weight => sub { sort {
1280 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1281 or $a->{type} <=> $b->{type}
1282 } @_ },
1283);
1284
1306sub inventory_widget { 1285sub inventory_widget {
1307 my $hb = new CFClient::UI::HBox homogeneous => 1; 1286 my $hb = new CFClient::UI::HBox homogeneous => 1;
1308 1287
1309 $hb->add (my $vb1 = new CFClient::UI::VBox); 1288 $hb->add (my $vb1 = new CFClient::UI::VBox);
1310 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1289 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1290
1291 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1292
1293 use sort 'stable';
1294
1295 $hb1->add (new CFClient::UI::Selector
1296 value => $::CFG->{inv_sort},
1297 options => [
1298 [type => "Type/Name"],
1299 [mtime => "Recent/Normal/Locked"],
1300 [weight => "Weight/Type"],
1301 ],
1302 on_changed => sub {
1303 $::CFG->{inv_sort} = $_[1];
1304 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1305 },
1306 );
1307 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1308 #TODO# update to weigh/maxweight
1309 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1310
1311 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1311 $vb1->add ($INV = new CFClient::UI::Inventory); 1312 $sw1->add ($INV = new CFClient::UI::Inventory);
1312 1313
1313 $hb->add (my $vb2 = new CFClient::UI::VBox); 1314 $hb->add (my $vb2 = new CFClient::UI::VBox);
1314 1315
1315 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1316 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1316 1317
1318 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1317 $vb2->add ($INVR = new CFClient::UI::Inventory); 1319 $sw2->add ($INVR = new CFClient::UI::Inventory);
1318 1320
1319 # XXX: Call after $INVR = ... because set_opencont sets the items 1321 # XXX: Call after $INVR = ... because set_opencont sets the items
1320 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1322 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1321 1323
1322 $hb 1324 $hb
… …
1338 x => "center", 1340 x => "center",
1339 y => "center", 1341 y => "center",
1340 force_w => $WIDTH * 9/10, 1342 force_w => $WIDTH * 9/10,
1341 force_h => $HEIGHT * 9/10, 1343 force_h => $HEIGHT * 9/10,
1342 title => "Player", 1344 title => "Player",
1345 name => "playerbook",
1343 has_close_button => 1 1346 has_close_button => 1
1344 ; 1347 ;
1345 1348
1346 my $ntb = 1349 my $ntb =
1347 $PL_NOTEBOOK = 1350 $PL_NOTEBOOK =
1348 new CFClient::UI::Notebook 1351 new CFClient::UI::Notebook expand => 1, debug => 1;
1349 expand => 1,
1350 debug => 1,
1351 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1352 ;
1353 1352
1354 $ntb->add ( 1353 $ntb->add (
1355 "Stats &amp; Skills" => $STATS_PAGE = stats_window, 1354 "Statistics (F2)" => $STATS_PAGE = stats_window,
1356 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown." 1355 "Shows statistics, where all your Stats and Resistances are shown."
1357 ); 1356 );
1358 $ntb->add ( 1357 $ntb->add (
1358 "Skills (F3)" => $SKILL_PAGE = skill_window,
1359 "Shows all your Skills."
1360 );
1361
1362 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1359 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, 1363 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1364 $ntb->add (
1365 "Spellbook (F4)" => $spellsw,
1360 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1366 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1361 ); 1367 );
1362 $ntb->add ( 1368 $ntb->add (
1363 Inventory => $INVENTORY_PAGE = inventory_widget, 1369 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1364 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1370 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1365 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1371 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1366 ); 1372 );
1367 1373
1368 $ntb->set_current_page ($INVENTORY_PAGE); 1374 $ntb->set_current_page ($INVENTORY_PAGE);
… …
1499 $vbox->add (my $buttons = new CFClient::UI::HBox); 1505 $vbox->add (my $buttons = new CFClient::UI::HBox);
1500 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1506 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1501 expand => 1, fontsize => 0.8, padding_x => 4); 1507 expand => 1, fontsize => 0.8, padding_x => 4);
1502 1508
1503 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1509 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1504 $buttons->add (my $combo = new CFClient::UI::Combobox 1510 $buttons->add (my $combo = new CFClient::UI::Selector
1505 value => undef, 1511 value => undef,
1506 options => [ 1512 options => [
1507 [intro => "Introduction"], 1513 [intro => "Introduction"],
1508 [manual => "Main Manual"], 1514 [manual => "Main Manual"],
1509 [skill_help => "Skill Reference"], 1515 [skill_help => "Skill Reference"],
… …
1512 [COPYING => "License Terms"], 1518 [COPYING => "License Terms"],
1513 ], 1519 ],
1514 on_changed => sub { 1520 on_changed => sub {
1515 my ($self, $pod) = @_; 1521 my ($self, $pod) = @_;
1516 1522
1517 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1518 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1519
1520 $viewer->clear; 1523 $viewer->clear;
1521 1524 $viewer->add_paragraph (@{ CFClient::Pod::pod_paragraphs $pod });
1522# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1523# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1524# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1525# ]);#d#
1526
1527 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1528 for @$pom;
1529
1530 $viewer->set_offset (0); 1525 $viewer->set_offset (0);
1531 1526
1532 0 1527 0
1533 }, 1528 },
1534 on_visibility_change => sub { 1529 on_visibility_change => sub {
… …
1798 1793
1799 $WANT_REFRESH = 0; 1794 $WANT_REFRESH = 0;
1800 $CAN_REFRESH = 0; 1795 $CAN_REFRESH = 0;
1801 $LAST_REFRESH = $NOW; 1796 $LAST_REFRESH = $NOW;
1802 1797
18030 && do {
1804 # some weird model-drawing code, just a joke right now
1805 use CFClient::OpenGL;
1806
1807 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1808 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1809 $demo{r} ||= do {
1810 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1811 $mod->{v} = pack "f*", @{$mod->{v}};
1812 $_ = [scalar @$_, pack "S!*", @$_]
1813 for values %{$mod->{g}};
1814 $mod
1815 };
1816
1817 my $r = $demo{r} or die;
1818
1819 glDepthMask 1;
1820 glClear GL_DEPTH_BUFFER_BIT;
1821 glEnable GL_TEXTURE_2D;
1822 glEnable GL_DEPTH_TEST;
1823 glEnable GL_CULL_FACE;
1824 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1825
1826 glMatrixMode GL_PROJECTION;
1827 glLoadIdentity;
1828 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1829 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1830 glMatrixMode GL_MODELVIEW;
1831 glLoadIdentity;
1832
1833 glPushMatrix;
1834 glTranslate 0, 0, -800;
1835 glScale 1, -1, 1;
1836 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1837 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1838 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1839 glScale 50, 50, 50;
1840
1841 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1842 while (my ($k, $v) = each %{$r->{g}}) {
1843 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1844 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1845 }
1846
1847 glPopMatrix;
1848
1849 glShadeModel GL_FLAT;
1850 glDisable GL_DEPTH_TEST;
1851 glDisable GL_TEXTURE_2D;
1852 glDepthMask 0;
1853
1854 $WANT_REFRESH++;
1855};
1856
1857 CFClient::SDL_GL_SwapBuffers; 1798 CFClient::SDL_GL_SwapBuffers;
1858} 1799}
1859 1800
1860my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1801my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1861 $NOW = time; 1802 $NOW = time;
… …
1907# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1848# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1908 }, 1849 },
1909 CFClient::SDL_KEYDOWN => sub { 1850 CFClient::SDL_KEYDOWN => sub {
1910 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1851 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1911 # alt-enter 1852 # alt-enter
1853 $FULLSCREEN_ENABLE->toggle;
1912 video_shutdown; 1854 video_shutdown;
1913 $CFG->{fullscreen} = !$CFG->{fullscreen};
1914 video_init; 1855 video_init;
1915 } else { 1856 } else {
1916 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1857 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1917 } 1858 }
1918 }, 1859 },
… …
1932############################################################################# 1873#############################################################################
1933 1874
1934$SIG{INT} = $SIG{TERM} = sub { exit }; 1875$SIG{INT} = $SIG{TERM} = sub { exit };
1935 1876
1936{ 1877{
1937 local $SIG{__DIE__} = sub {
1938 return unless defined $^S && !$^S;
1939 Carp::confess $_[1];#d#TODO: remove when stable
1940 CFClient::fatal $_[0];
1941 };
1942
1943 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1878 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1944 CFClient::UI::set_layout ($::CFG->{layout}); 1879 CFClient::UI::set_layout ($::CFG->{layout});
1945 1880
1946 my %DEF_CFG = ( 1881 my %DEF_CFG = (
1947 sdl_mode => 0, 1882 sdl_mode => 0,
… …
1965 bgm_volume => 0.25, 1900 bgm_volume => 0.25,
1966 face_prefetch => 0, 1901 face_prefetch => 0,
1967 output_sync => 1, 1902 output_sync => 1,
1968 output_count => 1, 1903 output_count => 1,
1969 pickup => 0, 1904 pickup => 0,
1905 inv_sort => "mtime",
1970 default => "profile", # default profile 1906 default => "profile", # default profile
1971 ); 1907 );
1972 1908
1973 while (my ($k, $v) = each %DEF_CFG) { 1909 while (my ($k, $v) = each %DEF_CFG) {
1974 $CFG->{$k} = $v unless exists $CFG->{$k}; 1910 $CFG->{$k} = $v unless exists $CFG->{$k};

Diff Legend

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