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.82 by elmex, Wed Jun 28 10:37:19 2006 UTC vs.
Revision 1.99 by root, Sun Jul 23 08:58:44 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 $FULLSCREEN_ENABLE;
92our $PICKUP_ENABLE;
90our $SERVER_INFO; 93our $SERVER_INFO;
91 94
92our $SETUP_DIALOG; 95our $SETUP_DIALOG;
93our $SETUP_NOTEBOOK; 96our $SETUP_NOTEBOOK;
94our $SETUP_SERVER; 97our $SETUP_SERVER;
95our $SETUP_KEYBOARD; 98our $SETUP_KEYBOARD;
96our $SETUP_SPELLS;
97 99
100our $PL_NOTEBOOK;
98our $STATS_WINDOW; 101our $PL_WINDOW;
102
103our $INVENTORY_PAGE;
104our $STATS_PAGE;
105our $SKILL_PAGE;
106our $SPELL_PAGE;
107
108our $HELP_WINDOW;
99our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
100our $FLOORBOX; 110our $FLOORBOX;
101our $GAUGES; 111our $GAUGES;
102our $STATWIDS; 112our $STATWIDS;
103 113
… …
110 120
111our $ALT_ENTER_MESSAGE; 121our $ALT_ENTER_MESSAGE;
112our $STATUSBOX; 122our $STATUSBOX;
113our $DEBUG_STATUS; 123our $DEBUG_STATUS;
114 124
115our $INV_WINDOW;
116our $INV; 125our $INV;
117our $INVR; 126our $INVR;
118our $INV_RIGHT_HB; 127our $INV_RIGHT_HB;
119 128
120our $BIND_EDITOR; 129our $BIND_EDITOR;
… …
180 $MESSAGE_WINDOW->show; 189 $MESSAGE_WINDOW->show;
181 190
182 unshift @dialog, new CFClient::UI::Label 191 unshift @dialog, new CFClient::UI::Label
183 max_w => $::WIDTH * 0.4, 192 max_w => $::WIDTH * 0.4,
184 ellipsise => 0, 193 ellipsise => 0,
185 markup => "\nOr use your keyboard:\n"; 194 markup => "\nOr use your keyboard and the text entry below:\n";
186 195
187 unshift @dialog, my $table = new CFClient::UI::Table; 196 unshift @dialog, my $table = new CFClient::UI::Table;
188 197
189 $table->add (0, 0, new CFClient::UI::Button 198 $table->add (0, 0, new CFClient::UI::Button
190 text => "Next Race", 199 text => "Next Race",
… …
207 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
208 ellipsise => 0, 217 ellipsise => 0,
209 markup => 218 markup =>
210 "<big><b>Character Creation: Race</b></big>\n\n" 219 "<big><b>Character Creation: Race</b></big>\n\n"
211 . "Look at the <b>Messages</b> window to see a description of this race " 220 . "Look at the <b>Messages</b> window to see a description of this race "
212 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
213 . "and the center of the screen to see how this race looks like " 221 . "and the center of the screen to see how this race looks like "
214 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n" 222 . "(<small>below this dialog window: you may need to move the dialog away and "
223 . "click into the display area to make it visible</small>).\n\n"
215 . "You can look at another race, or accept this race (you will come back to this race eventually, " 224 . "You can look at another race, or accept this race (you will cycle back to "
216 . "so you can take your time making this important choice." 225 . "this race eventually, so you can take your time making this important choice."
217 ; 226 ;
218 227
219 } elsif ($prompt =~ /roll new stats/) { 228 } elsif ($prompt =~ /roll new stats/) {
220 if (my $stat = delete $conn->{stat_change_with}) { 229 if (my $stat = delete $conn->{stat_change_with}) {
221 $conn->send ("reply $stat"); 230 $conn->send ("reply $stat");
222 destroy_query_dialog $conn; 231 destroy_query_dialog $conn;
223 return; 232 return;
224 } 233 }
225 234
226 $STATS_WINDOW->show; 235 $STATS_PAGE->show;
227 $MESSAGE_WINDOW->hide; 236 $MESSAGE_WINDOW->hide;
228 237
229 unshift @dialog, new CFClient::UI::Label 238 unshift @dialog, new CFClient::UI::Label
230 max_w => $::WIDTH * 0.4, 239 max_w => $::WIDTH * 0.4,
231 ellipsise => 0, 240 ellipsise => 0,
232 markup => "\nOr use your keyboard:\n"; 241 markup => "\nOr use your keyboard and the text entry below:\n";
233 242
234 unshift @dialog, my $table = new CFClient::UI::Table; 243 unshift @dialog, my $table = new CFClient::UI::Table;
235 244
236 # left: re-roll 245 # left: re-roll
237 $table->add (0, 0, new CFClient::UI::Button 246 $table->add (0, 0, new CFClient::UI::Button
… …
243 }, 252 },
244 ); 253 );
245 254
246 # center: swap stats 255 # center: swap stats
247 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 256 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
257 expand => 1,
248 value => $_, 258 value => $_,
249 options => [ 259 options => [
250 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 260 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
251 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 261 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
252 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 262 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
271 # right: accept 281 # right: accept
272 $table->add (4, 0, new CFClient::UI::Button 282 $table->add (4, 0, new CFClient::UI::Button
273 text => "Accept", 283 text => "Accept",
274 on_activate => sub { 284 on_activate => sub {
275 $conn->send ("reply n"); 285 $conn->send ("reply n");
276 $STATS_WINDOW->hide; 286 $STATS_PAGE->hide;
277 destroy_query_dialog $conn; 287 destroy_query_dialog $conn;
278 0 288 0
279 }, 289 },
280 ); 290 );
291
292 unshift @dialog, my $hbox = new CFClient::UI::HBox;
293 for (
294 [Str => CS_STAT_STR],
295 [Dex => CS_STAT_DEX],
296 [Con => CS_STAT_CON],
297 [Int => CS_STAT_INT],
298 [Wis => CS_STAT_WIS],
299 [Pow => CS_STAT_POW],
300 [Cha => CS_STAT_CHA],
301 ) {
302 my ($name, $id) = @$_;
303 $hbox->add (new CFClient::UI::Label
304 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
305 align => 0,
306 expand => 1,
307 can_events => 1,
308 can_hover => 1,
309 tooltip => $CFClient::STAT_TOOLTIP{$name},
310 );
311 }
281 312
282 unshift @dialog, new CFClient::UI::Label 313 unshift @dialog, new CFClient::UI::Label
283 max_w => $::WIDTH * 0.4, 314 max_w => $::WIDTH * 0.4,
284 ellipsise => 0, 315 ellipsise => 0,
285 markup => 316 markup =>
286 "<big><b>Character Creation: Stats</b></big>\n\n" 317 "<big><b>Character Creation: Stats</b></big>\n\n"
287 . "Look at the <b>Stats</b> window to see your basic stats " 318 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
288 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n" 319 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
320 . "They will be modified later by both the race and the class you choose.\n\n"
289 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. " 321 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
290 . "Race selection will influence those values later on."
291 ; 322 ;
292 } 323 }
293 324
294 push @dialog, my $entry = new CFClient::UI::Entry 325 push @dialog, my $entry = new CFClient::UI::Entry
295 on_changed => sub { 326 on_changed => sub {
… …
373 404
374sub stop_game { 405sub stop_game {
375 $LOGIN_BUTTON->set_text ("Login"); 406 $LOGIN_BUTTON->set_text ("Login");
376 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 407 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
377 $SETUP_DIALOG->show; 408 $SETUP_DIALOG->show;
378 $INV_WINDOW->hide; 409 $PL_WINDOW->hide;
379 $SETUP_SPELLS->clear_spells; 410 $SPELL_PAGE->clear_spells;
380 411
381 return unless $CONN; 412 return unless $CONN;
382 413
383 status "connection closed"; 414 status "connection closed";
384 415
… …
409 $mode_slider->emit (changed => $mode_slider->{range}[0]); 440 $mode_slider->emit (changed => $mode_slider->{range}[0]);
410 441
411 my $row = 1; 442 my $row = 1;
412 443
413 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 444 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
414 $table->add (1, $row++, new CFClient::UI::CheckBox 445 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
415 state => $CFG->{fullscreen}, 446 state => $CFG->{fullscreen},
416 tooltip => "Bring the client into fullscreen mode.", 447 tooltip => "Bring the client into fullscreen mode.",
417 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 448 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
418 ); 449 );
419 450
… …
469 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 500 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.", 501 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 }, 502 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
472 ); 503 );
473 504
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"); 505 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
487 $table->add (1, $row++, new CFClient::UI::Slider 506 $table->add (1, $row++, new CFClient::UI::Slider
488 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 507 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.", 508 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
490 on_changed => sub { 509 on_changed => sub {
… …
559 ); 578 );
560 579
561 $vbox 580 $vbox
562} 581}
563 582
564sub set_stats_window_fontsize {
565 for (values %{$STATWIDS}) {
566 $_->set_fontsize ($::CFG->{stat_fontsize});
567 }
568}
569
570sub set_gauge_window_fontsize { 583sub set_gauge_window_fontsize {
571 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 584 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
572 $_->set_fontsize ($::CFG->{gauge_fontsize}); 585 $_->set_fontsize ($::CFG->{gauge_fontsize});
573 } 586 }
574} 587}
… …
653 666
654 $table 667 $table
655} 668}
656 669
657sub stats_window { 670sub stats_window {
658 my $tgw = new CFClient::UI::FancyFrame 671 my $r = new CFClient::UI::ScrolledWindow (
659 y => $HEIGHT * (2/8), 672 expand => 1,
660 x => "max", 673 scroll_y => 1
661 title => "Stats", 674 );
662 name => "stats_window", 675 $r->add (my $vb = new CFClient::UI::VBox);
663 has_close_button => 1;
664 676
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, 677 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
667 can_hover => 1, can_events => 1, 678 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."); 679 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, 680 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
670 can_hover => 1, can_events => 1, 681 can_hover => 1, can_events => 1,
… …
683 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
684 695
685 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
686 697
687 for ( 698 for (
688 [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"], 699 [0, 0, st_str => "Str", 30],
689 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 700 [0, 1, st_dex => "Dex", 30],
690 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 701 [0, 2, st_con => "Con", 30],
691 [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"], 702 [0, 3, st_int => "Int", 30],
692 [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"], 703 [0, 4, st_wis => "Wis", 30],
693 [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"], 704 [0, 5, st_pow => "Pow", 30],
694 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 705 [0, 6, st_cha => "Cha", 30],
695 706
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."], 707 [2, 0, st_wc => "Wc", -120],
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."], 708 [2, 1, st_ac => "Ac", -120],
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."], 709 [2, 2, st_dam => "Dam", 120],
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. This is the same as the physical resistance."], 710 [2, 3, st_arm => "Arm", 120],
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."], 711 [2, 4, st_spd => "Spd", 10.54],
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."], 712 [2, 5, st_wspd => "WSp", 10.54],
702 ) { 713 ) {
703 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
704 715
705 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
706 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 717 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
707 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 719 $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); 720 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
709 } 722 }
710 723
711 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
712 725
713 my $row = 0; 726 my $row = 0;
714 my $col = 0; 727 my $col = 0;
715 728
716 my %resist_names = ( 729 my %resist_names = (
730 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.)", 731 "<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.)"],
732 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.)", 733 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
734 conf => ["Confusion",
719 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 735 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
736 fire => ["Fire",
720 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 737 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
738 depl => ["Depletion",
721 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 739 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
740 magic => ["Magic",
722 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 741 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
742 drain => ["Draining",
723 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 743 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
744 acid => ["Acid",
724 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 745 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
746 pois => ["Poison",
725 pois => "<b>Poison</b> (resistance to getting poisoned)", 747 "<b>Poison</b> (resistance to getting poisoned)"],
748 para => ["Paralysation",
726 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 749 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
750 deat => ["Death",
727 deat => "<b>Death</b> (resistance against death spells)", 751 "<b>Death</b> (resistance against death spells)"],
752 phys => ["Physical",
728 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.)", 753 "<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.)"],
754 blind => ["Blind",
729 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 755 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
756 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)", 757 "<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)"],
758 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...", 759 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
760 elec => ["Electricity",
732 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 761 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
762 cold => ["Cold",
733 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 763 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
764 ghit => ["Ghost hit",
734 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 765 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
735 ); 766 );
736 for (qw/slow holyw conf fire depl magic 767 for (qw/slow holyw conf fire depl magic
737 drain acid pois para deat phys 768 drain acid pois para deat phys
738 blind fear tund elec cold ghit/) 769 blind fear tund elec cold ghit/)
739 { 770 {
… …
744 template => "-100%", 775 template => "-100%",
745 align => +1, 776 align => +1,
746 valign => 0, 777 valign => 0,
747 can_events => 1, 778 can_events => 1,
748 can_hover => 1, 779 can_hover => 1,
749 tooltip => $resist_names{$_}, 780 tooltip => $resist_names{$_}->[1],
750 ); 781 );
751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 782 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
752 font => $FONT_FIXED, 783 font => $FONT_FIXED,
753 can_hover => 1, 784 can_hover => 1,
754 can_events => 1, 785 can_events => 1,
755 path => "ui/resist/resist_$_.png", 786 path => "ui/resist/resist_$_.png",
756 tooltip => $resist_names{$_}, 787 tooltip => $resist_names{$_}->[1],
788 );
789 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
790 text => $resist_names{$_}->[0],
791 font => $FONT_FIXED,
792 can_hover => 1,
793 can_events => 1,
794 tooltip => $resist_names{$_}->[1],
757 ); 795 );
758 796
759 $row++; 797 $row++;
760 if ($row % 6 == 0) { 798 if ($row % 6 == 0) {
761 $col += 2; 799 $col += 3;
762 $row = 0; 800 $row = 0;
763 } 801 }
764 } 802 }
765 803
766 &set_stats_window_fontsize;
767 update_stats_window ({}); 804 #update_stats_window ({});
768 805
806 $r
807}
808
809sub skill_window {
810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
811 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
769 $tgw 812 $sw
770} 813}
771 814
772sub formsep($) { 815sub formsep($) {
773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
774}
775
776sub update_stats_window {
777 my ($stats) = @_;
778
779 # I love text protocols...
780
781 my $hp = $stats->{+CS_STAT_HP} * 1;
782 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
783 my $sp = $stats->{+CS_STAT_SP} * 1;
784 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
785 my $fo = $stats->{+CS_STAT_FOOD} * 1;
786 my $fo_m = 999;
787 my $gr = $stats->{+CS_STAT_GRACE} * 1;
788 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
789
790 $GAUGES->{hp} ->set_value ($hp, $hp_m);
791 $GAUGES->{mana} ->set_value ($sp, $sp_m);
792 $GAUGES->{food} ->set_value ($fo, $fo_m);
793 $GAUGES->{grace} ->set_value ($gr, $gr_m);
794 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
795 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
796 my $rng = $stats->{+CS_STAT_RANGE};
797 $rng =~ s/^Range: //; # thank you so much dear server
798 $GAUGES->{range} ->set_text ("Rng: " . $rng);
799 my $title = $stats->{+CS_STAT_TITLE};
800 $title =~ s/^Player: //;
801 $STATWIDS->{title} ->set_text ("Title: " . $title);
802
803 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
804 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
805 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
806 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
807 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
808 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
809 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
810 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
811 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
812 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
813 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
815 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
816
817 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
818
819 my %tbl = (
820 phys => CS_STAT_RES_PHYS,
821 magic => CS_STAT_RES_MAG,
822 fire => CS_STAT_RES_FIRE,
823 elec => CS_STAT_RES_ELEC,
824 cold => CS_STAT_RES_COLD,
825 conf => CS_STAT_RES_CONF,
826 acid => CS_STAT_RES_ACID,
827 drain => CS_STAT_RES_DRAIN,
828 ghit => CS_STAT_RES_GHOSTHIT,
829 pois => CS_STAT_RES_POISON,
830 slow => CS_STAT_RES_SLOW,
831 para => CS_STAT_RES_PARA,
832 tund => CS_STAT_TURN_UNDEAD,
833 fear => CS_STAT_RES_FEAR,
834 depl => CS_STAT_RES_DEPLETE,
835 deat => CS_STAT_RES_DEATH,
836 holyw => CS_STAT_RES_HOLYWORD,
837 blind => CS_STAT_RES_BLIND,
838 );
839
840 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
841 for keys %tbl;
842} 817}
843 818
844my $METASERVER_ATIME; 819my $METASERVER_ATIME;
845 820
846sub update_metaserver { 821sub update_metaserver {
… …
1092sub message_window { 1067sub message_window {
1093 my $window = new CFClient::UI::FancyFrame 1068 my $window = new CFClient::UI::FancyFrame
1094 name => "message_window", 1069 name => "message_window",
1095 title => "Messages", 1070 title => "Messages",
1096 border_bg => [1, 1, 1, 1], 1071 border_bg => [1, 1, 1, 1],
1097 bg => [0, 0, 0, 0.75],
1098 x => "max", 1072 x => "max",
1099 y => 0, 1073 y => 0,
1100 force_w => $::WIDTH * 0.4, 1074 force_w => $::WIDTH * 0.4,
1101 force_h => $::HEIGHT * 0.5, 1075 force_h => $::HEIGHT * 0.5,
1102 child => (my $vbox = new CFClient::UI::VBox), 1076 child => (my $vbox = new CFClient::UI::VBox),
… …
1188sub autopickup_setup { 1162sub autopickup_setup {
1189 my $table = new CFClient::UI::Table; 1163 my $table = new CFClient::UI::Table;
1190 1164
1191 for ( 1165 for (
1192 ["General", 0, 0, 1166 ["General", 0, 0,
1193 ["Enable autopickup" => PICKUP_NEWMODE], 1167 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1194 ["Inhibit autopickup" => PICKUP_INHIBIT], 1168 ["Inhibit autopickup" => PICKUP_INHIBIT],
1195 ["Stop before pickup" => PICKUP_STOP], 1169 ["Stop before pickup" => PICKUP_STOP],
1196 ["Debug autopickup" => PICKUP_DEBUG], 1170 ["Debug autopickup" => PICKUP_DEBUG],
1197 ], 1171 ],
1198 ["Weapons", 0, 6, 1172 ["Weapons", 0, 6,
… …
1235 for (@bits) { 1209 for (@bits) {
1236 ++$y; 1210 ++$y;
1237 1211
1238 my $mask = $_->[1]; 1212 my $mask = $_->[1];
1239 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1213 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1240 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1214 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1241 state => $CFG->{pickup} & $mask, 1215 state => $::CFG->{pickup} & $mask,
1242 on_changed => sub { 1216 on_changed => sub {
1243 my ($box, $value) = @_; 1217 my ($box, $value) = @_;
1244 1218
1245 if ($value) { 1219 if ($value) {
1246 $::CFG->{pickup} |= $mask; 1220 $::CFG->{pickup} |= $mask;
… …
1251 $::CONN->send_command ("pickup $::CFG->{pickup}") 1225 $::CONN->send_command ("pickup $::CFG->{pickup}")
1252 if defined $::CONN; 1226 if defined $::CONN;
1253 1227
1254 0 1228 0
1255 }); 1229 });
1230
1231 ${$_->[2]} = $checkbox if $_->[2];
1256 } 1232 }
1257 } 1233 }
1258 1234
1259 $table->add (2, 18, new CFClient::UI::ValSlider 1235 $table->add (2, 18, new CFClient::UI::ValSlider
1260 range => [0, 0, 16, 1, 1], 1236 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1237 template => ">= 99",
1261 to_value => sub { ">= " . 5 * $_[0] }, 1238 to_value => sub { ">= " . 5 * $_[0] },
1262 on_changed => sub { 1239 on_changed => sub {
1263 my ($slider, $value) = @_; 1240 my ($slider, $value) = @_;
1264 1241
1265 $::CFG->{pickup} &= ~0x7; 1242 $::CFG->{pickup} &= ~0xF;
1266 $::CFG->{pickup} |= int $value 1243 $::CFG->{pickup} |= int $value
1267 if $value; 1244 if $value;
1268 1; 1245 1;
1269 }); 1246 });
1247
1270 $table->add (3, 18, new CFClient::UI::Button 1248 $table->add (3, 18, new CFClient::UI::Button
1271 text => "set", 1249 text => "set",
1272 on_activate => sub { 1250 on_activate => sub {
1273 $::CONN->send_command ("pickup $::CFG->{pickup}") 1251 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN; 1252 if defined $::CONN;
… …
1276 }); 1254 });
1277 1255
1278 $table 1256 $table
1279} 1257}
1280 1258
1281sub inventory_window { 1259sub inventory_widget {
1260 my $hb = new CFClient::UI::HBox homogeneous => 1;
1261
1262 $hb->add (my $vb1 = new CFClient::UI::VBox);
1263 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1264
1265 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1266
1267 use sort 'stable';
1268
1269 $hb1->add (new CFClient::UI::Combobox
1270 value => undef,
1271 options => [
1272 [undef, "Type/Name"],
1273 [
1274 sub { sort {
1275 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1276 or $a->{type} <=> $b->{type}
1277 } @_ },
1278 "Weight/Type",
1279 ],
1280 [sub { } => "#TODO#"],
1281 ],
1282 on_changed => sub {
1283 $INV->set_sort_order ($_[1]);
1284 },
1285 );
1286 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1287 #TODO# update to weigh/maxweight
1288 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1289
1290 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1291 $sw1->add ($INV = new CFClient::UI::Inventory);
1292
1293 $hb->add (my $vb2 = new CFClient::UI::VBox);
1294
1295 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1296
1297 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1298 $sw2->add ($INVR = new CFClient::UI::Inventory);
1299
1300 # XXX: Call after $INVR = ... because set_opencont sets the items
1301 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1302
1303 $hb
1304}
1305
1306sub toggle_player_page {
1307 my ($widget) = @_;
1308
1309 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1310 $PL_WINDOW->hide;
1311 } else {
1312 $PL_NOTEBOOK->set_current_page ($widget);
1313 $PL_WINDOW->show;
1314 }
1315}
1316
1317sub player_window {
1282 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1318 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1283 x => "center", 1319 x => "center",
1284 y => "center", 1320 y => "center",
1285 force_w => $WIDTH * 9/10, 1321 force_w => $WIDTH * 9/10,
1286 force_h => $HEIGHT * 9/10, 1322 force_h => $HEIGHT * 9/10,
1287 title => "Inventory", 1323 title => "Player",
1288 name => "inventory_window", 1324 name => "playerbook",
1289 has_close_button => 1, 1325 has_close_button => 1
1290 ; 1326 ;
1291 1327
1292 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1328 my $ntb =
1329 $PL_NOTEBOOK =
1330 new CFClient::UI::Notebook expand => 1, debug => 1;
1293 1331
1294 $hb->add (my $vb1 = new CFClient::UI::VBox); 1332 $ntb->add (
1295 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1333 "Statistics (F2)" => $STATS_PAGE = stats_window,
1296 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1334 "Shows statistics, where all your Stats and Resistances are shown."
1335 );
1336 $ntb->add (
1337 "Skills (F3)" => $SKILL_PAGE = skill_window,
1338 "Shows all your Skills."
1339 );
1297 1340
1298 $hb->add (my $vb2 = new CFClient::UI::VBox); 1341 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1342 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1343 $ntb->add (
1344 "Spellbook (F4)" => $spellsw,
1345 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1346 );
1347 $ntb->add (
1348 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1349 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1350 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1351 );
1299 1352
1300 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1353 $ntb->set_current_page ($INVENTORY_PAGE);
1301 1354
1302 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1355 $plwin->add ($ntb);
1303 1356 $plwin
1304 # XXX: Call after $INVR = ... because set_opencont sets the items
1305 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1306
1307 $invwin
1308}
1309
1310sub spell_setup {
1311 new CFClient::UI::SpellList
1312} 1357}
1313 1358
1314sub update_bindings { 1359sub update_bindings {
1315 $BIND_UPD_CB->() if $BIND_UPD_CB; 1360 $BIND_UPD_CB->() if $BIND_UPD_CB;
1316} 1361}
… …
1326 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1371 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1327 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1372 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1328 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1373 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1329 1374
1330 my $lbl = join "; ", @$cmds; 1375 my $lbl = join "; ", @$cmds;
1331 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1376 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1332 $binding_list->add (my $hb = new CFClient::UI::HBox); 1377 $binding_list->add (my $hb = new CFClient::UI::HBox);
1333 $hb->add (new CFClient::UI::Button 1378 $hb->add (new CFClient::UI::Button
1334 text => "delete", 1379 text => "delete",
1335 tooltip => "Deletes the binding", 1380 tooltip => "Deletes the binding",
1336 on_activate => sub { 1381 on_activate => sub {
… …
1421 $refresh->(); 1466 $refresh->();
1422 1467
1423 $vb 1468 $vb
1424} 1469}
1425 1470
1471# just weirdness, pls. ignore
1472sub load_html_page {
1473 my ($viewer, $base) = @_;
1474
1475 $viewer->clear;
1476
1477 require LWP::Simple;
1478 require HTML::Parser;
1479 require URI;
1480
1481 my $page = LWP::Simple::get ($base)
1482 or return;
1483
1484 my @s = { };
1485 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1486
1487 my $parser = HTML::Parser->new (
1488 text_h => [sub {
1489 my ($text) = @_;
1490 $text =~ s/\s+/ /g;
1491 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1492 }, "dtext"],
1493 start_h => [sub {
1494 my ($tag, $attr) = @_;
1495 if ($passthrough{$tag}) {
1496 $s[-1]{text} .= "<$tag>";
1497 } elsif ($tag eq "h1") {
1498 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1499 } elsif ($tag eq "h2") {
1500 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1501 } elsif ($tag eq "h3") {
1502 push @s, { text => "<span size='large'>" };
1503 } elsif ($tag eq "a") {
1504 push @s, { text => "", url => $attr->{href} };
1505 } elsif ($tag eq "p") {
1506 push @s, { };
1507 } elsif ($tag eq "img") {
1508 eval {
1509 push @{$s[-1]{obj}}, new CFClient::UI::Image
1510 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1511 $s[-1]{text} .= "\x{fffc}";
1512 };
1513 }
1514 }, "tagname, attr"],
1515 end_h => [sub {
1516 my ($tag) = @_;
1517 if ($passthrough{$tag}) {
1518 $s[-1]{text} .= "</$tag>";
1519 } elsif ($tag =~ /^h\d$/) {
1520 $s[-1]{text} .= "</span>";
1521 push @s, { };
1522 } elsif ($tag eq "a") {
1523 my $S = pop @s;
1524 $s[-1]{text} .= "\x{fffc}";
1525 push @{$s[-1]{obj}}, new CFClient::UI::Label
1526 fg => [0.8, 0.8, 1],
1527 markup => "<u>$S->{text}</u>",
1528 fontsize => 0.8,
1529 can_events => 1,
1530 can_focus => 1,
1531 on_button_up => sub {
1532 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1533 },
1534 ;
1535 }
1536 }, "tagname"],
1537 );
1538
1539 $parser->parse ($page);
1540 $parser->eof;
1541
1542 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1543 for @s;
1544
1545 $viewer->set_offset (0);
1546}
1547
1426sub help_window { 1548sub help_window {
1427 my $win = new CFClient::UI::FancyFrame 1549 my $win = new CFClient::UI::FancyFrame
1428 x => 'center', 1550 x => 'center',
1429 y => 'center', 1551 y => 'center',
1430 z => 2, 1552 z => 2,
1431 name => 'doc_browser', 1553 name => 'doc_browser',
1432 force_w => int $WIDTH * 7/8, 1554 force_w => int $WIDTH * 7/8,
1433 force_h => int $HEIGHT * 7/8, 1555 force_h => int $HEIGHT * 7/8,
1434 title => "Documentation"; 1556 title => "Help Browser",
1557 has_close_button => 1;
1435 1558
1436 $win->add (my $vbox = new CFClient::UI::VBox); 1559 $win->add (my $vbox = new CFClient::UI::VBox);
1437 1560
1438 $vbox->add (my $buttons = new CFClient::UI::HBox); 1561 $vbox->add (my $buttons = new CFClient::UI::HBox);
1439 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1562 $vbox->add (my $viewer = new CFClient::UI::TextScroller
… …
1447 [manual => "Main Manual"], 1570 [manual => "Main Manual"],
1448 [skill_help => "Skill Reference"], 1571 [skill_help => "Skill Reference"],
1449 [command_help => "Command Reference"], 1572 [command_help => "Command Reference"],
1450 [dmcommand_help => "DM Commands"], 1573 [dmcommand_help => "DM Commands"],
1451 [COPYING => "License Terms"], 1574 [COPYING => "License Terms"],
1575 [test => "test (do not select)"], #d#TODO
1452 ], 1576 ],
1453 on_changed => sub { 1577 on_changed => sub {
1454 my ($self, $pod) = @_; 1578 my ($self, $pod) = @_;
1579
1580 if ($pod eq "test") {#d#TODO
1581 eval {
1582 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1583 };
1584 warn "$@" if $@;
1585 return;
1586 }
1455 1587
1456 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1588 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1457 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1589 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1458 1590
1459 $viewer->clear; 1591 $viewer->clear;
… …
1603 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1735 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1604 . "with nothing set and the recording started. After doing the actions you " 1736 . "with nothing set and the recording started. After doing the actions you "
1605 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1737 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1606 . "After pressing the combo the binding will be saved automatically and the " 1738 . "After pressing the combo the binding will be saved automatically and the "
1607 . "binding editor closes"); 1739 . "binding editor closes");
1608 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1609 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1610 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1740 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1611 "Some debuggin' options. Do not ask."); 1741 "Some debuggin' options. Do not ask.");
1612 1742
1613 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1743 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1614 1744
… …
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1748 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1619 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1749 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1620 1750
1621 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 1751 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
1622 1752
1623 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1624 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1625 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1753 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1626 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1754 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1627 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1628 1755
1629 $BUTTONBAR->add (new CFClient::UI::Button 1756 $BUTTONBAR->add (new CFClient::UI::Button
1630 text => "Save Config", 1757 text => "Save Config",
1631 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1758 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1632 on_activate => sub { 1759 on_activate => sub {
… …
1635 status "Configuration Saved"; 1762 status "Configuration Saved";
1636 0 1763 0
1637 }, 1764 },
1638 ); 1765 );
1639 1766
1640 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1767 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1641 tooltip => "View Documentation"); 1768 tooltip => "View Documentation");
1642 1769
1643 $BUTTONBAR->add (new CFClient::UI::Button 1770 $BUTTONBAR->add (new CFClient::UI::Button
1644 text => "Quit", 1771 text => "Quit",
1645 tooltip => "Terminates the program", 1772 tooltip => "Terminates the program",
… …
1851# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1978# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1852 }, 1979 },
1853 CFClient::SDL_KEYDOWN => sub { 1980 CFClient::SDL_KEYDOWN => sub {
1854 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1981 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1855 # alt-enter 1982 # alt-enter
1983 $FULLSCREEN_ENABLE->toggle;
1856 video_shutdown; 1984 video_shutdown;
1857 $CFG->{fullscreen} = !$CFG->{fullscreen};
1858 video_init; 1985 video_init;
1859 } else { 1986 } else {
1860 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1987 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1861 } 1988 }
1862 }, 1989 },
… …
1878$SIG{INT} = $SIG{TERM} = sub { exit }; 2005$SIG{INT} = $SIG{TERM} = sub { exit };
1879 2006
1880{ 2007{
1881 local $SIG{__DIE__} = sub { 2008 local $SIG{__DIE__} = sub {
1882 return unless defined $^S && !$^S; 2009 return unless defined $^S && !$^S;
1883 Carp::confess $_[1];#d#TODO: remove when stable 2010 Carp::confess $_[0];#d#TODO: remove when stable
1884 CFClient::fatal $_[0]; 2011 CFClient::fatal $_[0];
1885 }; 2012 };
1886 2013
1887 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2014 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1888 CFClient::UI::set_layout ($::CFG->{layout}); 2015 CFClient::UI::set_layout ($::CFG->{layout});

Diff Legend

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