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.236 by root, Mon May 22 03:28:55 2006 UTC

105our $INVR; 105our $INVR;
106our $INVR_LBL; 106our $INVR_LBL;
107our $OPENCONT; 107our $OPENCONT;
108 108
109sub status { 109sub status {
110 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]); 110 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
111} 111}
112 112
113sub debug { 113sub debug {
114 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
115 my ($w, $h) = $DEBUG_STATUS->size_request; 115 my ($w, $h) = $DEBUG_STATUS->size_request;
400 (my $hb = new CFClient::UI::HBox), 400 (my $hb = new CFClient::UI::HBox),
401 ], 401 ],
402 ); 402 );
403 403
404 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 404 $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."); 405 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', 406 $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."); 407 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', 408 $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."); 409 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', 410 $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."); 411 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 412
413 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 413 $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."); 414 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, 415 $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.)"); 416 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
417 417
418 $GAUGES = { 418 $GAUGES = {
419 exp => $exp, win => $win, range => $rng, 419 exp => $exp, win => $win, range => $rng,
420 food => $fg, mana => $mg, hp => $hg, grace => $gg 420 food => $fg, mana => $mg, hp => $hg, grace => $gg
421 }; 421 };
427 427
428sub make_stats_window { 428sub make_stats_window {
429 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 429 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
430 430
431 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 431 $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); 432 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
433 can_hover => 1, can_events => 1,
434 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); 435 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
436 can_hover => 1, can_events => 1,
437 tooltip => "The map you are currently on (if supported by the server).");
434 438
435 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 439 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
436
437 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 440 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
438 441
439 my $black = [0, 0, 0]; 442 my $black = [0, 0, 0];
440 443
441 for ( 444 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"], 445 [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"], 446 [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"], 447 [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"], 448 [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"], 449 [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"], 450 [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."], 451 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
449 452
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."], 453 [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."], 454 [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."], 455 [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."], 456 [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."], 457 [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."], 458 [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 ) { 459 ) {
457 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 460 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
458 461
459 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 462 $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); 463 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
466 469
467 my $row = 0; 470 my $row = 0;
468 my $col = 0; 471 my $col = 0;
469 472
470 my %resist_names = ( 473 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.)", 474 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.)", 475 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.)", 476 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, ...)", 477 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)", 478 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)", 479 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)", 480 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)", 481 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
479 pois => "Poison (resistance to getting poisoned)", 482 pois => "<b>Poison</b> (resistance to getting poisoned)",
480 para => "Paralysation (this resistance affects the chance you get paralysed)", 483 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
481 deat => "Death (resistance against death spells)", 484 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)", 485 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)", 486 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)", 487 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", 488 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, ...)", 489 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, ...)", 490 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)", 491 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
489 ); 492 );
490 for (qw/slow holyw conf fire depl magic 493 for (qw/slow holyw conf fire depl magic
491 drain acid pois para deat phys 494 drain acid pois para deat phys
492 blind fear tund elec cold ghit/) 495 blind fear tund elec cold ghit/)
493 { 496 {
750 753
751 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 754 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
752 }, 755 },
753 ); 756 );
754 757
758 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
759 $table->add (1, 8, new CFClient::UI::Entry
760 text => $CFG->{output_count},
761 tooltip => "Should be set to 1 unless you know what you are doing",
762 connect_changed => sub { $CFG->{output_count} = $_[1] },
763 );
764
765 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
766 $table->add (1, 9, new CFClient::UI::Entry
767 text => $CFG->{output_sync},
768 tooltip => "Should be set to 1 unless you know what you are doing",
769 connect_changed => sub { $CFG->{output_sync} = $_[1] },
770 );
771
755 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 772 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
756 expand => 1, 773 expand => 1,
757 align => 0, 774 align => 0,
758 text => "Login", 775 text => "Login",
759 connect_activate => sub { 776 connect_activate => sub {
760 $CONN ? stop_game 777 $CONN ? stop_game
767 784
768sub message_window { 785sub message_window {
769 my $window = new CFClient::UI::FancyFrame 786 my $window = new CFClient::UI::FancyFrame
770 title => "Messages", 787 title => "Messages",
771 border_bg => [1, 1, 1, 1], 788 border_bg => [1, 1, 1, 1],
772 bg => [0, 0, 0, 0.5], 789 bg => [0, 0, 0, 0.75],
773 user_w => int $::WIDTH / 3, 790 user_w => int $::WIDTH / 3,
774 user_h => int $::HEIGHT / 5, 791 user_h => int $::HEIGHT / 5,
775 child => (my $vbox = new CFClient::UI::VBox); 792 child => (my $vbox = new CFClient::UI::VBox);
776 793
777 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 794 $vbox->add ($LOGVIEW);
778 expand => 1,
779 font => $FONT_FIXED,
780 fontsize => $::CFG->{log_fontsize},
781 );
782 795
783 $vbox->add (my $input = new CFClient::UI::Entry 796 $vbox->add (my $input = new CFClient::UI::Entry
797 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
798 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
799 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
800 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
784 connect_focus_in => sub { 801 connect_focus_in => sub {
785 my ($input, $prev_focus) = @_; 802 my ($input, $prev_focus) = @_;
786 803
787 delete $input->{refocus_map}; 804 delete $input->{refocus_map};
788 805
821 838
822sub make_inventory_window { 839sub make_inventory_window {
823 my $invwin = new CFClient::UI::FancyFrame 840 my $invwin = new CFClient::UI::FancyFrame
824 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory"; 841 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
825 842
826 $invwin->add (my $hb = new CFClient::UI::HBox); 843 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
827 844
828 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 845 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
829 $vb1->add (my $lbl = new CFClient::UI::Label); 846 $vb1->add (my $lbl = new CFClient::UI::Label);
830 $lbl->set_text ("Player"); 847 $lbl->set_text ("Player");
831 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 848 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
851 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 868 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
852 $FULLSCREEN = $CFG->{fullscreen}; 869 $FULLSCREEN = $CFG->{fullscreen};
853 $FAST = $CFG->{fast}; 870 $FAST = $CFG->{fast};
854 871
855 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 872 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
856 or die "SDL_SetVideoMode failed!\n"; 873 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
857 874
858 $SDL_ACTIVE = 1; 875 $SDL_ACTIVE = 1;
859 $LAST_REFRESH = time - 0.01; 876 $LAST_REFRESH = time - 0.01;
860 877
861 CFClient::gl_init; 878 CFClient::gl_init;
882 )->show; 899 )->show;
883 900
884 CFClient::UI::FancyFrame->new ( 901 CFClient::UI::FancyFrame->new (
885 border_bg => [1, 1, 1, 192/255], 902 border_bg => [1, 1, 1, 192/255],
886 bg => [1, 1, 1, 0], 903 bg => [1, 1, 1, 0],
887 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 904 child => ($MAPMAP = new CFClient::MapWidget::MapMap
905 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
906 ),
888 )->show; 907 )->show;
889 908
890 $MAPWIDGET = new CFClient::MapWidget; 909 $MAPWIDGET = new CFClient::MapWidget;
891 $MAPWIDGET->connect (activate_console => sub { 910 $MAPWIDGET->connect (activate_console => sub {
892 my ($mapwidget, $preset) = @_; 911 my ($mapwidget, $preset) = @_;
901 } 920 }
902 }); 921 });
903 $MAPWIDGET->show; 922 $MAPWIDGET->show;
904 $MAPWIDGET->focus_in; 923 $MAPWIDGET->focus_in;
905 924
925 $LOGVIEW = new CFClient::UI::TextView
926 expand => 1,
927 font => $FONT_FIXED,
928 fontsize => $::CFG->{log_fontsize},
929 can_hover => 1,
930 can_events => 1,
931 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
932 ;
933
906 $BUTTONBAR = new CFClient::UI::HBox; 934 $BUTTONBAR = new CFClient::UI::HBox;
907 935
908 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 936 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
937 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); 938 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
939 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); 940 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
941 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
911 942
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 943 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 944
914 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 945 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
946 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); 947 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
948 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
916 949
917 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 950 $BUTTONBAR->add (new CFClient::UI::Button
951 text => "Save Config",
952 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
953 connect_activate => sub {
918 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 954 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
919 status "Configuration Saved"; 955 status "Configuration Saved";
956 },
920 }); 957 );
921 958
922 $BUTTONBAR->show; 959 $BUTTONBAR->show;
923 960
924 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 961 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
925 962
941my $bgmusic;#TODO#hack#d# 978my $bgmusic;#TODO#hack#d#
942 979
943sub audio_channel_finished { 980sub audio_channel_finished {
944 my ($channel) = @_; 981 my ($channel) = @_;
945 982
946 warn "channel $channel finished\n";#d# 983 #warn "channel $channel finished\n";#d#
947} 984}
948 985
949sub audio_music_finished { 986sub audio_music_finished {
950 return unless $CFG->{bgm_enable}; 987 return unless $CFG->{bgm_enable};
951 988
995my %animate_object; 1032my %animate_object;
996my $animate_timer; 1033my $animate_timer;
997 1034
998my $fps = 9; 1035my $fps = 9;
999 1036
1037my %demo;#d#
1038
1000sub force_refresh { 1039sub force_refresh {
1001 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1040 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1002 debug sprintf "%3.2f", $fps; 1041 debug sprintf "%3.2f", $fps;
1003 1042
1004 $CFClient::UI::ROOT->draw; 1043 $CFClient::UI::ROOT->draw;
1005 CFClient::SDL_GL_SwapBuffers;
1006 1044
1007 $WANT_REFRESH = 0; 1045 $WANT_REFRESH = 0;
1008 $CAN_REFRESH = 0; 1046 $CAN_REFRESH = 0;
1009 $LAST_REFRESH = $NOW; 1047 $LAST_REFRESH = $NOW;
1048
10490 && do {
1050 # some weird model-drawing code, just a joke right now
1051 use CFClient::OpenGL;
1052
1053 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1054 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1055 $demo{r} ||= do {
1056 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1057 $mod->{v} = pack "f*", @{$mod->{v}};
1058 $_ = [scalar @$_, pack "S!*", @$_]
1059 for values %{$mod->{g}};
1060 $mod
1061 };
1062
1063 my $r = $demo{r} or die;
1064
1065 glDepthMask 1;
1066 glClear GL_DEPTH_BUFFER_BIT;
1067 glEnable GL_TEXTURE_2D;
1068 glEnable GL_DEPTH_TEST;
1069 glEnable GL_CULL_FACE;
1070 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1071
1072 glMatrixMode GL_PROJECTION;
1073 glLoadIdentity;
1074 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1075 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1076 glMatrixMode GL_MODELVIEW;
1077 glLoadIdentity;
1078
1079 glPushMatrix;
1080 glTranslate 0, 0, -800;
1081 glScale 1, -1, 1;
1082 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1083 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1084 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1085 glScale 50, 50, 50;
1086
1087 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1088 while (my ($k, $v) = each %{$r->{g}}) {
1089 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1090 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1091 }
1092
1093 glPopMatrix;
1094
1095 glShadeModel GL_FLAT;
1096 glDisable GL_DEPTH_TEST;
1097 glDisable GL_TEXTURE_2D;
1098 glDepthMask 0;
1099
1100 $WANT_REFRESH++;
1101};
1102
1103 CFClient::SDL_GL_SwapBuffers;
1010} 1104}
1011 1105
1012my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1106my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
1013 $NOW = time; 1107 $NOW = time;
1014 1108
1036 my ($widget) = @_; 1130 my ($widget) = @_;
1037 delete $animate_object{$widget}; 1131 delete $animate_object{$widget};
1038} 1132}
1039 1133
1040@conn::ISA = Crossfire::Protocol::; 1134@conn::ISA = Crossfire::Protocol::;
1135
1136sub conn::new {
1137 my $class = shift;
1138
1139 my $self = $class->Crossfire::Protocol::new (@_);
1140
1141 $MAPWIDGET->clr_commands;
1142
1143 my $parser = new Pod::POM;
1144 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1145
1146 for my $head2 ($pod->head2) {
1147 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1148 or next;
1149
1150 my $cmd = $1;
1151 my @args = split /\|/, $2;
1152 @args = (".*") unless @args;
1153
1154 my $text = CFClient::pod_to_pango $head2->content;
1155
1156 for my $arg (@args) {
1157 $arg = $arg eq ".*" ? "" : " $arg";
1158
1159 $MAPWIDGET->add_command ("$cmd$arg", $text);
1160 }
1161 }
1162
1163 $self
1164}
1041 1165
1042sub conn::stats_update { 1166sub conn::stats_update {
1043 my ($self, $stats) = @_; 1167 my ($self, $stats) = @_;
1044 1168
1045 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) { 1169 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1110 $self->set_texture ($id => $data); 1234 $self->set_texture ($id => $data);
1111 } 1235 }
1112 } 1236 }
1113} 1237}
1114 1238
1239# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1240# (server resource,s latency, bandwidth), so this hack is warranted.
1241# the right fix is to make real tiled maps with an overview file
1242sub conn::send_mapinfo {
1243 my ($self, $data, $cb) = @_;
1244
1245 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1246 my ($wx, $wy) = ($1, $2);
1247
1248 if ($data =~ /^spatial ([1-4]+)$/) {
1249 my @dx = (0, 0, 1, 0, -1);
1250 my @dy = (0, -1, 0, 1, 0);
1251 my ($dx, $dy);
1252
1253 for (split //, $1) {
1254 $dx += $dx[$_];
1255 $dy += $dy[$_];
1256 }
1257
1258 $cb->(spatial => 15,
1259 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1260 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1261 50, 50,
1262 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1263 );
1264
1265 return;
1266 }
1267 }
1268
1269 $self->SUPER::send_mapinfo ($data, $cb);
1270}
1271
1115# this method does a "flood fill" into every tile direction 1272# this method does a "flood fill" into every tile direction
1116# it assumes that tiles are arranged in a rectangular grid, 1273# 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. 1274# 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 1275# failure to comply are harmless and result in display errors
1119# at worst. 1276# at worst.
1120sub conn::flood_fill { 1277sub conn::flood_fill {
1121 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1278 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1122 1279
1123 # the server does not allow map paths > 6 1280 # the server does not allow map paths > 6
1124 return if 7 <= length $path; 1281 return if 7 <= length $path;
1125 1282
1126 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1283 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1127 1284
1128 for ( 1285 for (
1129 [1, 0, -1], 1286 [1, 3, 0, -1],
1130 [2, 1, 0], 1287 [2, 4, 1, 0],
1131 [3, 0, 1], 1288 [3, 1, 0, 1],
1132 [4, -1, 0], 1289 [4, 2, -1, 0],
1133 ) { 1290 ) {
1134 my ($tile, $dx, $dy) = @$_; 1291 my ($tile, $tile2, $dx, $dy) = @$_;
1292
1293 next if $block & (1 << $tile);
1294 my $block = $block | (1 << $tile2);
1135 1295
1136 my $gx = $gx + $dx; 1296 my $gx = $gx + $dx;
1137 my $gy = $gy + $dy; 1297 my $gy = $gy + $dy;
1138 1298
1139 next unless $flags & (1 << ($tile - 1)); 1299 next unless $flags & (1 << ($tile - 1));
1141 1301
1142 my $neigh = $self->{neigh_map}{$hash} ||= []; 1302 my $neigh = $self->{neigh_map}{$hash} ||= [];
1143 if (my $info = $neigh->[$tile]) { 1303 if (my $info = $neigh->[$tile]) {
1144 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1304 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1145 1305
1146 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1306 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1147 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1307 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1148 1308
1149 } else { 1309 } else {
1150 $self->send_mapinfo ("spatial $path$tile", sub { 1310 $self->send_mapinfo ("spatial $path$tile", sub {
1151 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1311 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1152 1312
1153 return if $mode ne "spatial"; 1313 return if $mode ne "spatial";
1154 1314
1155 $x += $MAP->ox; 1315 $x += $MAP->ox;
1156 $y += $MAP->oy; 1316 $y += $MAP->oy;
1157 1317
1158 $self->load_map ($hash, $x, $y) 1318 $self->load_map ($hash, $x, $y)
1159 unless $self->{neigh_map}{$hash}[5]++;#d# 1319 unless $self->{neigh_map}{$hash}[5]++;#d#
1160 1320
1161 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1321 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1162 1322
1163 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1323 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1164 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1324 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1165 }); 1325 });
1166 } 1326 }
1167 } 1327 }
1168} 1328}
1181 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1341 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1182 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1342 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1183 ]; 1343 ];
1184 1344
1185 delete $self->{neigh_grid}; 1345 delete $self->{neigh_grid};
1186 $self->flood_fill (0, 0, "", $hash, $flags);
1187 1346
1188 $x += $ox; 1347 $x += $ox;
1189 $y += $oy; 1348 $y += $oy;
1190 1349
1191 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1350 $self->{map_info} = [$hash, $x, $y, $w, $h];
1192 1351
1193 my $map = $self->{map_info}[0];
1194 $map =~ s/^.*?\/([^\/]+)$/\1/; 1352 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1195 $STATWIDS->{map}->set_text ("Map: " . $map); 1353 $STATWIDS->{map}->set_text ("Map: " . $map);
1196 1354
1197 $self->load_map ($hash, $x, $y); 1355 $self->load_map ($hash, $x, $y);
1356 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1198} 1357}
1199 1358
1200sub conn::face_find { 1359sub conn::face_find {
1201 my ($self, $facenum, $face) = @_; 1360 my ($self, $facenum, $face) = @_;
1202 1361
1391} 1550}
1392 1551
1393sub conn::addme_success { 1552sub conn::addme_success {
1394 my ($self) = @_; 1553 my ($self) = @_;
1395 1554
1396 $MAPWIDGET->clr_commands; 1555 $self->send ("command output-sync $CFG->{output_sync}");
1556 $self->send ("command output-count $CFG->{output_count}");
1557
1558 my $parser = new Pod::POM;
1559 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1560
1561 my %skill_tooltip;
1562
1563 for my $head2 ($pod->head2) {
1564 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1565 }
1397 1566
1398 for my $skill (values %{$self->{skill_info}}) { 1567 for my $skill (values %{$self->{skill_info}}) {
1399 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'"); 1568 $MAPWIDGET->add_command ("ready_skill $skill",
1400 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'"); 1569 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1401 } 1570 . $skill_tooltip{$skill});
1402 1571 $MAPWIDGET->add_command ("use_skill $skill",
1403 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you"); 1572 (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"); 1573 . $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 } 1574 }
1430} 1575}
1431 1576
1432sub conn::eof { 1577sub conn::eof {
1433 $MAPWIDGET->clr_commands; 1578 $MAPWIDGET->clr_commands;
1552 Event::unloop -1; 1697 Event::unloop -1;
1553 }, 1698 },
1554 CFClient::SDL_VIDEORESIZE => sub { 1699 CFClient::SDL_VIDEORESIZE => sub {
1555 }, 1700 },
1556 CFClient::SDL_VIDEOEXPOSE => sub { 1701 CFClient::SDL_VIDEOEXPOSE => sub {
1557 $WANT_REFRESH++; 1702 CFClient::UI::full_refresh;
1558 }, 1703 },
1559 CFClient::SDL_ACTIVEEVENT => sub { 1704 CFClient::SDL_ACTIVEEVENT => sub {
1560# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1705# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1561 }, 1706 },
1562 CFClient::SDL_KEYDOWN => sub { 1707 CFClient::SDL_KEYDOWN => sub {
1598 sdl_mode => 0, 1743 sdl_mode => 0,
1599 width => 640, 1744 width => 640,
1600 height => 480, 1745 height => 480,
1601 fullscreen => 0, 1746 fullscreen => 0,
1602 fast => 0, 1747 fast => 0,
1603 map_scale => 0.5, 1748 map_scale => 1,
1604 fow_enable => 1, 1749 fow_enable => 1,
1605 fow_intensity => 0.45, 1750 fow_intensity => 0.45,
1606 fow_smooth => 0, 1751 fow_smooth => 0,
1607 gui_fontsize => 1, 1752 gui_fontsize => 1,
1608 log_fontsize => 1, 1753 log_fontsize => 1,
1613 host => "crossfire.schmorp.de", 1758 host => "crossfire.schmorp.de",
1614 say_command => 'say', 1759 say_command => 'say',
1615 audio_enable => 1, 1760 audio_enable => 1,
1616 bgm_enable => 1, 1761 bgm_enable => 1,
1617 bgm_volume => 0.25, 1762 bgm_volume => 0.25,
1763 output_sync => 1,
1764 output_count => 1,
1618 ); 1765 );
1619 1766
1620 while (my ($k, $v) = each %DEF_CFG) { 1767 while (my ($k, $v) = each %DEF_CFG) {
1621 $CFG->{$k} = $v unless exists $CFG->{$k}; 1768 $CFG->{$k} = $v unless exists $CFG->{$k};
1622 } 1769 }
1727 1874
1728Typing B<climb> will display a list of commands with I<climb> in their 1875Typing 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>. 1876name, such as I<ready_skill climbing> and I<use_skill climbing>.
1730 1877
1731You can abbreviate commands by typing only the first character of every 1878You can abbreviate commands by typing only the first character of every
1732word. For example, typing I<iwor> will likely select I<invoke word of 1879word (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> 1880a 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 1881typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1735I<use_skill levitation>. 1882will select I<cast create food>. Likewise, I<rscli> will likely select
1883I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1884
1885You can enter space and other text as arguemnt to the command. For
1886example, C<cfoo waybread> will expand to C<cast create food waybread>.
1736 1887
1737=head2 The map overview 1888=head2 The map overview
1738 1889
1739#TODO# 1890#TODO#
1740 1891

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines