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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.225 by root, Wed May 17 16:17:01 2006 UTC vs.
Revision 1.239 by elmex, Tue May 23 20:00:55 2006 UTC

82our $BUTTONBAR; 82our $BUTTONBAR;
83our $LOGVIEW; 83our $LOGVIEW;
84our $CONSOLE; 84our $CONSOLE;
85our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG;
87 88
88our $FLOORBOX; 89our $FLOORBOX;
89our $GAUGES; 90our $GAUGES;
90our $STATWIDS; 91our $STATWIDS;
91 92
105our $INVR; 106our $INVR;
106our $INVR_LBL; 107our $INVR_LBL;
107our $OPENCONT; 108our $OPENCONT;
108 109
109sub status { 110sub status {
110 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
111} 112}
112 113
113sub debug { 114sub debug {
114 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
115 my ($w, $h) = $DEBUG_STATUS->size_request; 116 my ($w, $h) = $DEBUG_STATUS->size_request;
400 (my $hb = new CFClient::UI::HBox), 401 (my $hb = new CFClient::UI::HBox),
401 ], 402 ],
402 ); 403 );
403 404
404 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 405 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
405 tooltip => "Health points. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment."); 406 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
406 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 407 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
407 tooltip => "Spell points. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana."); 408 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
408 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 409 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
409 tooltip => "Grace points - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods."); 410 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
410 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 411 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
411 tooltip => "Food. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too."); 412 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
412 413
413 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 414 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
414 tooltip => "Experience points and overall level - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100."); 415 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
415 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 416 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
416 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 417 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
417 418
418 $GAUGES = { 419 $GAUGES = {
419 exp => $exp, win => $win, range => $rng, 420 exp => $exp, win => $win, range => $rng,
420 food => $fg, mana => $mg, hp => $hg, grace => $gg 421 food => $fg, mana => $mg, hp => $hg, grace => $gg
421 }; 422 };
427 428
428sub make_stats_window { 429sub make_stats_window {
429 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 430 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
430 431
431 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 432 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
432 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 433 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
434 can_hover => 1, can_events => 1,
435 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
433 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 436 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
437 can_hover => 1, can_events => 1,
438 tooltip => "The map you are currently on (if supported by the server).");
434 439
435 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 440 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
436
437 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 441 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
438 442
439 my $black = [0, 0, 0]; 443 my $black = [0, 0, 0];
440 444
441 for ( 445 for (
442 [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 446 [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"],
443 [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"], 447 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],
444 [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"], 448 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],
445 [0, 3, st_int => "Int", 30, "Intelligence, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 449 [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"],
446 [0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 450 [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"],
447 [0, 5, st_pow => "Pow", 30, "Power, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 451 [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"],
448 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."], 452 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
449 453
450 [2, 0, st_wc => "Wc", -120, "Weapon Class, 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."], 454 [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."],
451 [2, 1, st_ac => "Ac", -120, "Armour Class, 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."], 455 [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."],
452 [2, 2, st_dam => "Dam", 120, "Damage, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 456 [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."],
453 [2, 3, st_arm => "Arm", 120, "Armour, 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."], 457 [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."],
454 [2, 4, st_spd => "Spd", 10.54, "Speed, 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."], 458 [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."],
455 [2, 5, st_wspd => "WSp", 10.54, "Weapon Speed, 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."], 459 [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."],
456 ) { 460 ) {
457 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 461 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
458 462
459 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 463 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
460 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 464 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
466 470
467 my $row = 0; 471 my $row = 0;
468 my $col = 0; 472 my $col = 0;
469 473
470 my %resist_names = ( 474 my %resist_names = (
471 slow => "Slow (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.)", 475 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.)",
472 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 476 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.)",
473 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)", 477 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",
474 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 478 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
475 depl => "Depletion (some monsters and other effects can cause stats depletion)", 479 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",
476 magic => "Magic (resistance to magic spells like magic missile or similar)", 480 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",
477 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 481 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
478 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 482 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
479 pois => "Poison (resistance to getting poisoned)", 483 pois => "<b>Poison</b> (resistance to getting poisoned)",
480 para => "Paralysation (this resistance affects the chance you get paralysed)", 484 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
481 deat => "Death (resistance against death spells)", 485 deat => "<b>Death</b> (resistance against death spells)",
482 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 486 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
483 blind => "Blind (blind resistance affects the chance of a successful blinding attack)", 487 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
484 fear => "Fear (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)", 488 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)",
485 tund => "Turn undead", 489 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
486 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)", 490 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
487 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)", 491 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
488 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 492 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
489 ); 493 );
490 for (qw/slow holyw conf fire depl magic 494 for (qw/slow holyw conf fire depl magic
491 drain acid pois para deat phys 495 drain acid pois para deat phys
492 blind fear tund elec cold ghit/) 496 blind fear tund elec cold ghit/)
493 { 497 {
750 754
751 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 755 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
752 }, 756 },
753 ); 757 );
754 758
759 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
760 $table->add (1, 8, new CFClient::UI::Entry
761 text => $CFG->{output_count},
762 tooltip => "Should be set to 1 unless you know what you are doing",
763 connect_changed => sub { $CFG->{output_count} = $_[1] },
764 );
765
766 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
767 $table->add (1, 9, new CFClient::UI::Entry
768 text => $CFG->{output_sync},
769 tooltip => "Should be set to 1 unless you know what you are doing",
770 connect_changed => sub { $CFG->{output_sync} = $_[1] },
771 );
772
755 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 773 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
756 expand => 1, 774 expand => 1,
757 align => 0, 775 align => 0,
758 text => "Login", 776 text => "Login",
759 connect_activate => sub { 777 connect_activate => sub {
760 $CONN ? stop_game 778 $CONN ? stop_game
767 785
768sub message_window { 786sub message_window {
769 my $window = new CFClient::UI::FancyFrame 787 my $window = new CFClient::UI::FancyFrame
770 title => "Messages", 788 title => "Messages",
771 border_bg => [1, 1, 1, 1], 789 border_bg => [1, 1, 1, 1],
772 bg => [0, 0, 0, 0.5], 790 bg => [0, 0, 0, 0.75],
773 user_w => int $::WIDTH / 3, 791 user_w => int $::WIDTH / 3,
774 user_h => int $::HEIGHT / 5, 792 user_h => int $::HEIGHT / 5,
775 child => (my $vbox = new CFClient::UI::VBox); 793 child => (my $vbox = new CFClient::UI::VBox);
776 794
777 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 795 $vbox->add ($LOGVIEW);
778 expand => 1,
779 font => $FONT_FIXED,
780 fontsize => $::CFG->{log_fontsize},
781 );
782 796
783 $vbox->add (my $input = new CFClient::UI::Entry 797 $vbox->add (my $input = new CFClient::UI::Entry
798 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
799 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
800 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
801 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
784 connect_focus_in => sub { 802 connect_focus_in => sub {
785 my ($input, $prev_focus) = @_; 803 my ($input, $prev_focus) = @_;
786 804
787 delete $input->{refocus_map}; 805 delete $input->{refocus_map};
788 806
817 }; 835 };
818 836
819 $window 837 $window
820} 838}
821 839
840sub open_quit_dialog {
841 unless ($QUIT_DIALOG) {
842
843 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
844
845 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
846
847 $vb->add (new CFClient::UI::Label
848 text => "You should find a savebed and apply it first!",
849 max_w => $WIDTH * 0.25
850 );
851 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
852 $hb->add (new CFClient::UI::Button
853 text => "Ok",
854 connect_activate => sub { $QUIT_DIALOG->hide },
855 expand => 1
856 );
857 $hb->add (new CFClient::UI::Button
858 text => "Quit anyway",
859 connect_activate => sub { exit 1 },
860 expand => 1
861 );
862 $hb->add (new CFClient::UI::Label "You should find a savebed and apply it first!");
863
864 $QUIT_DIALOG->show_centered;
865 } else {
866 $QUIT_DIALOG->show_centered;
867 }
868}
869
822sub make_inventory_window { 870sub make_inventory_window {
823 my $invwin = new CFClient::UI::FancyFrame 871 my $invwin = new CFClient::UI::FancyFrame
824 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory"; 872 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
825 873
826 $invwin->add (my $hb = new CFClient::UI::HBox); 874 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
827 875
828 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 876 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
829 $vb1->add (my $lbl = new CFClient::UI::Label); 877 $vb1->add (my $lbl = new CFClient::UI::Label);
830 $lbl->set_text ("Player"); 878 $lbl->set_text ("Player");
831 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 879 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
851 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 899 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
852 $FULLSCREEN = $CFG->{fullscreen}; 900 $FULLSCREEN = $CFG->{fullscreen};
853 $FAST = $CFG->{fast}; 901 $FAST = $CFG->{fast};
854 902
855 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 903 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
856 or die "SDL_SetVideoMode failed!\n"; 904 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
857 905
858 $SDL_ACTIVE = 1; 906 $SDL_ACTIVE = 1;
859 $LAST_REFRESH = time - 0.01; 907 $LAST_REFRESH = time - 0.01;
860 908
861 CFClient::gl_init; 909 CFClient::gl_init;
882 )->show; 930 )->show;
883 931
884 CFClient::UI::FancyFrame->new ( 932 CFClient::UI::FancyFrame->new (
885 border_bg => [1, 1, 1, 192/255], 933 border_bg => [1, 1, 1, 192/255],
886 bg => [1, 1, 1, 0], 934 bg => [1, 1, 1, 0],
887 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 935 child => ($MAPMAP = new CFClient::MapWidget::MapMap
936 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
937 ),
888 )->show; 938 )->show;
889 939
890 $MAPWIDGET = new CFClient::MapWidget; 940 $MAPWIDGET = new CFClient::MapWidget;
891 $MAPWIDGET->connect (activate_console => sub { 941 $MAPWIDGET->connect (activate_console => sub {
892 my ($mapwidget, $preset) = @_; 942 my ($mapwidget, $preset) = @_;
901 } 951 }
902 }); 952 });
903 $MAPWIDGET->show; 953 $MAPWIDGET->show;
904 $MAPWIDGET->focus_in; 954 $MAPWIDGET->focus_in;
905 955
956 $LOGVIEW = new CFClient::UI::TextView
957 expand => 1,
958 font => $FONT_FIXED,
959 fontsize => $::CFG->{log_fontsize},
960 can_hover => 1,
961 can_events => 1,
962 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
963 ;
964
906 $BUTTONBAR = new CFClient::UI::HBox; 965 $BUTTONBAR = new CFClient::UI::HBox;
907 966
908 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 967 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
968 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
909 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 969 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
970 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
910 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 971 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
972 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
911 973
912 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 974 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
913 975
914 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 976 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
977 tooltip => "Toggles the statistics window, where all your Stats and Resistances are beign displaye at all times.");
915 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 978 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
979 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
916 980
917 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 981 $BUTTONBAR->add (new CFClient::UI::Button
982 text => "Save Config",
983 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
984 connect_activate => sub {
918 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 985 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
919 status "Configuration Saved"; 986 status "Configuration Saved";
987 },
920 }); 988 );
989
990 $BUTTONBAR->add (new CFClient::UI::Button
991 text => "Quit",
992 tooltip => "Terminates the program",
993 connect_activate => sub {
994 if ($CONN) {
995 open_quit_dialog
996 } else {
997 exit 1
998 }
999 },
1000 );
921 1001
922 $BUTTONBAR->show; 1002 $BUTTONBAR->show;
923 1003
924 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1004 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
925 1005
941my $bgmusic;#TODO#hack#d# 1021my $bgmusic;#TODO#hack#d#
942 1022
943sub audio_channel_finished { 1023sub audio_channel_finished {
944 my ($channel) = @_; 1024 my ($channel) = @_;
945 1025
946 warn "channel $channel finished\n";#d# 1026 #warn "channel $channel finished\n";#d#
947} 1027}
948 1028
949sub audio_music_finished { 1029sub audio_music_finished {
950 return unless $CFG->{bgm_enable}; 1030 return unless $CFG->{bgm_enable};
951 1031
995my %animate_object; 1075my %animate_object;
996my $animate_timer; 1076my $animate_timer;
997 1077
998my $fps = 9; 1078my $fps = 9;
999 1079
1080my %demo;#d#
1081
1000sub force_refresh { 1082sub force_refresh {
1001 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1083 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1002 debug sprintf "%3.2f", $fps; 1084 debug sprintf "%3.2f", $fps;
1003 1085
1004 $CFClient::UI::ROOT->draw; 1086 $CFClient::UI::ROOT->draw;
1005 CFClient::SDL_GL_SwapBuffers;
1006 1087
1007 $WANT_REFRESH = 0; 1088 $WANT_REFRESH = 0;
1008 $CAN_REFRESH = 0; 1089 $CAN_REFRESH = 0;
1009 $LAST_REFRESH = $NOW; 1090 $LAST_REFRESH = $NOW;
1091
10920 && do {
1093 # some weird model-drawing code, just a joke right now
1094 use CFClient::OpenGL;
1095
1096 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1097 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1098 $demo{r} ||= do {
1099 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1100 $mod->{v} = pack "f*", @{$mod->{v}};
1101 $_ = [scalar @$_, pack "S!*", @$_]
1102 for values %{$mod->{g}};
1103 $mod
1104 };
1105
1106 my $r = $demo{r} or die;
1107
1108 glDepthMask 1;
1109 glClear GL_DEPTH_BUFFER_BIT;
1110 glEnable GL_TEXTURE_2D;
1111 glEnable GL_DEPTH_TEST;
1112 glEnable GL_CULL_FACE;
1113 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1114
1115 glMatrixMode GL_PROJECTION;
1116 glLoadIdentity;
1117 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1118 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1119 glMatrixMode GL_MODELVIEW;
1120 glLoadIdentity;
1121
1122 glPushMatrix;
1123 glTranslate 0, 0, -800;
1124 glScale 1, -1, 1;
1125 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1126 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1127 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1128 glScale 50, 50, 50;
1129
1130 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1131 while (my ($k, $v) = each %{$r->{g}}) {
1132 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1133 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1134 }
1135
1136 glPopMatrix;
1137
1138 glShadeModel GL_FLAT;
1139 glDisable GL_DEPTH_TEST;
1140 glDisable GL_TEXTURE_2D;
1141 glDepthMask 0;
1142
1143 $WANT_REFRESH++;
1144};
1145
1146 CFClient::SDL_GL_SwapBuffers;
1010} 1147}
1011 1148
1012my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1149my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
1013 $NOW = time; 1150 $NOW = time;
1014 1151
1036 my ($widget) = @_; 1173 my ($widget) = @_;
1037 delete $animate_object{$widget}; 1174 delete $animate_object{$widget};
1038} 1175}
1039 1176
1040@conn::ISA = Crossfire::Protocol::; 1177@conn::ISA = Crossfire::Protocol::;
1178
1179sub conn::new {
1180 my $class = shift;
1181
1182 my $self = $class->Crossfire::Protocol::new (@_);
1183
1184 $MAPWIDGET->clr_commands;
1185
1186 my $parser = new Pod::POM;
1187 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1188
1189 for my $head2 ($pod->head2) {
1190 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1191 or next;
1192
1193 my $cmd = $1;
1194 my @args = split /\|/, $2;
1195 @args = (".*") unless @args;
1196
1197 my $text = CFClient::pod_to_pango $head2->content;
1198
1199 for my $arg (@args) {
1200 $arg = $arg eq ".*" ? "" : " $arg";
1201
1202 $MAPWIDGET->add_command ("$cmd$arg", $text);
1203 }
1204 }
1205
1206 $self
1207}
1041 1208
1042sub conn::stats_update { 1209sub conn::stats_update {
1043 my ($self, $stats) = @_; 1210 my ($self, $stats) = @_;
1044 1211
1045 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) { 1212 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1110 $self->set_texture ($id => $data); 1277 $self->set_texture ($id => $data);
1111 } 1278 }
1112 } 1279 }
1113} 1280}
1114 1281
1282# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1283# (server resource,s latency, bandwidth), so this hack is warranted.
1284# the right fix is to make real tiled maps with an overview file
1285sub conn::send_mapinfo {
1286 my ($self, $data, $cb) = @_;
1287
1288 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1289 my ($wx, $wy) = ($1, $2);
1290
1291 if ($data =~ /^spatial ([1-4]+)$/) {
1292 my @dx = (0, 0, 1, 0, -1);
1293 my @dy = (0, -1, 0, 1, 0);
1294 my ($dx, $dy);
1295
1296 for (split //, $1) {
1297 $dx += $dx[$_];
1298 $dy += $dy[$_];
1299 }
1300
1301 $cb->(spatial => 15,
1302 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1303 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1304 50, 50,
1305 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1306 );
1307
1308 return;
1309 }
1310 }
1311
1312 $self->SUPER::send_mapinfo ($data, $cb);
1313}
1314
1115# this method does a "flood fill" into every tile direction 1315# this method does a "flood fill" into every tile direction
1116# it assumes that tiles are arranged in a rectangular grid, 1316# it assumes that tiles are arranged in a rectangular grid,
1117# i.e. a map is the same as the left of the right map etc. 1317# i.e. a map is the same as the left of the right map etc.
1118# failure to comply are harmless and result in display errors 1318# failure to comply are harmless and result in display errors
1119# at worst. 1319# at worst.
1120sub conn::flood_fill { 1320sub conn::flood_fill {
1121 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1321 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1122 1322
1123 # the server does not allow map paths > 6 1323 # the server does not allow map paths > 6
1124 return if 7 <= length $path; 1324 return if 7 <= length $path;
1125 1325
1126 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1326 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1127 1327
1128 for ( 1328 for (
1129 [1, 0, -1], 1329 [1, 3, 0, -1],
1130 [2, 1, 0], 1330 [2, 4, 1, 0],
1131 [3, 0, 1], 1331 [3, 1, 0, 1],
1132 [4, -1, 0], 1332 [4, 2, -1, 0],
1133 ) { 1333 ) {
1134 my ($tile, $dx, $dy) = @$_; 1334 my ($tile, $tile2, $dx, $dy) = @$_;
1335
1336 next if $block & (1 << $tile);
1337 my $block = $block | (1 << $tile2);
1135 1338
1136 my $gx = $gx + $dx; 1339 my $gx = $gx + $dx;
1137 my $gy = $gy + $dy; 1340 my $gy = $gy + $dy;
1138 1341
1139 next unless $flags & (1 << ($tile - 1)); 1342 next unless $flags & (1 << ($tile - 1));
1141 1344
1142 my $neigh = $self->{neigh_map}{$hash} ||= []; 1345 my $neigh = $self->{neigh_map}{$hash} ||= [];
1143 if (my $info = $neigh->[$tile]) { 1346 if (my $info = $neigh->[$tile]) {
1144 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1347 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1145 1348
1146 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1349 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1147 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1350 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1148 1351
1149 } else { 1352 } else {
1150 $self->send_mapinfo ("spatial $path$tile", sub { 1353 $self->send_mapinfo ("spatial $path$tile", sub {
1151 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1354 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1152 1355
1153 return if $mode ne "spatial"; 1356 return if $mode ne "spatial";
1154 1357
1155 $x += $MAP->ox; 1358 $x += $MAP->ox;
1156 $y += $MAP->oy; 1359 $y += $MAP->oy;
1157 1360
1158 $self->load_map ($hash, $x, $y) 1361 $self->load_map ($hash, $x, $y)
1159 unless $self->{neigh_map}{$hash}[5]++;#d# 1362 unless $self->{neigh_map}{$hash}[5]++;#d#
1160 1363
1161 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1364 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1162 1365
1163 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1366 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1164 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1367 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1165 }); 1368 });
1166 } 1369 }
1167 } 1370 }
1168} 1371}
1181 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1384 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1182 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1385 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1183 ]; 1386 ];
1184 1387
1185 delete $self->{neigh_grid}; 1388 delete $self->{neigh_grid};
1186 $self->flood_fill (0, 0, "", $hash, $flags);
1187 1389
1188 $x += $ox; 1390 $x += $ox;
1189 $y += $oy; 1391 $y += $oy;
1190 1392
1191 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1393 $self->{map_info} = [$hash, $x, $y, $w, $h];
1192 1394
1193 my $map = $self->{map_info}[0];
1194 $map =~ s/^.*?\/([^\/]+)$/\1/; 1395 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1195 $STATWIDS->{map}->set_text ("Map: " . $map); 1396 $STATWIDS->{map}->set_text ("Map: " . $map);
1196 1397
1197 $self->load_map ($hash, $x, $y); 1398 $self->load_map ($hash, $x, $y);
1399 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1198} 1400}
1199 1401
1200sub conn::face_find { 1402sub conn::face_find {
1201 my ($self, $facenum, $face) = @_; 1403 my ($self, $facenum, $face) = @_;
1202 1404
1330 ); 1532 );
1331 1533
1332 $entry->focus_in; 1534 $entry->focus_in;
1333 } 1535 }
1334 1536
1335 $dialog->show; 1537 $dialog->show_centered;
1336} 1538}
1337 1539
1338sub conn::drawinfo { 1540sub conn::drawinfo {
1339 my ($self, $color, $text) = @_; 1541 my ($self, $color, $text) = @_;
1340 1542
1391} 1593}
1392 1594
1393sub conn::addme_success { 1595sub conn::addme_success {
1394 my ($self) = @_; 1596 my ($self) = @_;
1395 1597
1396 $MAPWIDGET->clr_commands; 1598 $self->send ("command output-sync $CFG->{output_sync}");
1599 $self->send ("command output-count $CFG->{output_count}");
1600
1601 my $parser = new Pod::POM;
1602 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1603
1604 my %skill_tooltip;
1605
1606 for my $head2 ($pod->head2) {
1607 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1608 }
1397 1609
1398 for my $skill (values %{$self->{skill_info}}) { 1610 for my $skill (values %{$self->{skill_info}}) {
1399 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'"); 1611 $MAPWIDGET->add_command ("ready_skill $skill",
1400 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'"); 1612 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1401 } 1613 . $skill_tooltip{$skill});
1402 1614 $MAPWIDGET->add_command ("use_skill $skill",
1403 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you"); 1615 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1404 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players"); 1616 . $skill_tooltip{$skill});
1405 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1406 $MAPWIDGET->add_command ("killpets", "Kill your pets");
1407 $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
1408 $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
1409 $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
1410
1411 my $parser = new Pod::POM;
1412 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1413
1414 for my $head2 ($pod->head2) {
1415 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1416 or next;
1417
1418 my $cmd = $1;
1419 my @args = split /\|/, $2;
1420 @args = (".*") unless @args;
1421
1422 my $text = CFClient::pod_to_pango $head2->content;
1423
1424 for my $arg (@args) {
1425 $arg = $arg eq ".*" ? "" : " $arg";
1426
1427 $MAPWIDGET->add_command ("$cmd$arg", $text);
1428 }
1429 } 1617 }
1430} 1618}
1431 1619
1432sub conn::eof { 1620sub conn::eof {
1433 $MAPWIDGET->clr_commands; 1621 $MAPWIDGET->clr_commands;
1552 Event::unloop -1; 1740 Event::unloop -1;
1553 }, 1741 },
1554 CFClient::SDL_VIDEORESIZE => sub { 1742 CFClient::SDL_VIDEORESIZE => sub {
1555 }, 1743 },
1556 CFClient::SDL_VIDEOEXPOSE => sub { 1744 CFClient::SDL_VIDEOEXPOSE => sub {
1557 $WANT_REFRESH++; 1745 CFClient::UI::full_refresh;
1558 }, 1746 },
1559 CFClient::SDL_ACTIVEEVENT => sub { 1747 CFClient::SDL_ACTIVEEVENT => sub {
1560# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1748# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1561 }, 1749 },
1562 CFClient::SDL_KEYDOWN => sub { 1750 CFClient::SDL_KEYDOWN => sub {
1598 sdl_mode => 0, 1786 sdl_mode => 0,
1599 width => 640, 1787 width => 640,
1600 height => 480, 1788 height => 480,
1601 fullscreen => 0, 1789 fullscreen => 0,
1602 fast => 0, 1790 fast => 0,
1603 map_scale => 0.5, 1791 map_scale => 1,
1604 fow_enable => 1, 1792 fow_enable => 1,
1605 fow_intensity => 0.45, 1793 fow_intensity => 0.45,
1606 fow_smooth => 0, 1794 fow_smooth => 0,
1607 gui_fontsize => 1, 1795 gui_fontsize => 1,
1608 log_fontsize => 1, 1796 log_fontsize => 1,
1613 host => "crossfire.schmorp.de", 1801 host => "crossfire.schmorp.de",
1614 say_command => 'say', 1802 say_command => 'say',
1615 audio_enable => 1, 1803 audio_enable => 1,
1616 bgm_enable => 1, 1804 bgm_enable => 1,
1617 bgm_volume => 0.25, 1805 bgm_volume => 0.25,
1806 output_sync => 1,
1807 output_count => 1,
1618 ); 1808 );
1619 1809
1620 while (my ($k, $v) = each %DEF_CFG) { 1810 while (my ($k, $v) = each %DEF_CFG) {
1621 $CFG->{$k} = $v unless exists $CFG->{$k}; 1811 $CFG->{$k} = $v unless exists $CFG->{$k};
1622 } 1812 }
1727 1917
1728Typing B<climb> will display a list of commands with I<climb> in their 1918Typing B<climb> will display a list of commands with I<climb> in their
1729name, such as I<ready_skill climbing> and I<use_skill climbing>. 1919name, such as I<ready_skill climbing> and I<use_skill climbing>.
1730 1920
1731You can abbreviate commands by typing only the first character of every 1921You can abbreviate commands by typing only the first character of every
1732word. For example, typing I<iwor> will likely select I<invoke word of 1922word (or even characters within the word - the client will try to make
1733recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1923a good guess, as long as the characters are in order). For example,
1734will likely select I<ready_skill climbing> and I<usl> will give you 1924typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1735I<use_skill levitation>. 1925will select I<cast create food>. Likewise, I<rscli> will likely select
1926I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1927
1928You can enter space and other text as arguemnt to the command. For
1929example, C<cfoo waybread> will expand to C<cast create food waybread>.
1736 1930
1737=head2 The map overview 1931=head2 The map overview
1738 1932
1739#TODO# 1933#TODO#
1740 1934

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines