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.231 by root, Sun May 21 00:02:02 2006 UTC vs.
Revision 1.240 by root, Tue May 23 21:14:42 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
… …
209 } 210 }
210 ); 211 );
211 212
212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
213 $table->add (1, $row++, new CFClient::UI::Slider 214 $table->add (1, $row++, new CFClient::UI::Slider
214 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05], 215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
215 tooltip => "Enlarge or shrink the displayed map", 216 tooltip => "Enlarge or shrink the displayed map",
216 connect_changed => sub { 217 connect_changed => sub {
217 my ($self, $value) = @_; 218 my ($self, $value) = @_;
218 $CFG->{map_scale} = $value; 219 $CFG->{map_scale} = 2 ** $value;
219 } 220 }
220 ); 221 );
221 222
222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
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 {
… …
781 785
782sub message_window { 786sub message_window {
783 my $window = new CFClient::UI::FancyFrame 787 my $window = new CFClient::UI::FancyFrame
784 title => "Messages", 788 title => "Messages",
785 border_bg => [1, 1, 1, 1], 789 border_bg => [1, 1, 1, 1],
786 bg => [0, 0, 0, 0.5], 790 bg => [0, 0, 0, 0.75],
787 user_w => int $::WIDTH / 3, 791 user_w => int $::WIDTH / 3,
788 user_h => int $::HEIGHT / 5, 792 user_h => int $::HEIGHT / 5,
789 child => (my $vbox = new CFClient::UI::VBox); 793 child => (my $vbox = new CFClient::UI::VBox);
790 794
791 $vbox->add ($LOGVIEW); 795 $vbox->add ($LOGVIEW);
792 796
793 $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.",
794 connect_focus_in => sub { 802 connect_focus_in => sub {
795 my ($input, $prev_focus) = @_; 803 my ($input, $prev_focus) = @_;
796 804
797 delete $input->{refocus_map}; 805 delete $input->{refocus_map};
798 806
… …
827 }; 835 };
828 836
829 $window 837 $window
830} 838}
831 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
832sub make_inventory_window { 870sub make_inventory_window {
833 my $invwin = new CFClient::UI::FancyFrame 871 my $invwin = new CFClient::UI::FancyFrame
834 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";
835 873
836 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 874 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
837 875
838 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 876 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
839 $vb1->add (my $lbl = new CFClient::UI::Label); 877 $vb1->add (my $lbl = new CFClient::UI::Label);
… …
892 )->show; 930 )->show;
893 931
894 CFClient::UI::FancyFrame->new ( 932 CFClient::UI::FancyFrame->new (
895 border_bg => [1, 1, 1, 192/255], 933 border_bg => [1, 1, 1, 192/255],
896 bg => [1, 1, 1, 0], 934 bg => [1, 1, 1, 0],
897 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 ),
898 )->show; 938 )->show;
899 939
900 $MAPWIDGET = new CFClient::MapWidget; 940 $MAPWIDGET = new CFClient::MapWidget;
901 $MAPWIDGET->connect (activate_console => sub { 941 $MAPWIDGET->connect (activate_console => sub {
902 my ($mapwidget, $preset) = @_; 942 my ($mapwidget, $preset) = @_;
… …
912 }); 952 });
913 $MAPWIDGET->show; 953 $MAPWIDGET->show;
914 $MAPWIDGET->focus_in; 954 $MAPWIDGET->focus_in;
915 955
916 $LOGVIEW = new CFClient::UI::TextView 956 $LOGVIEW = new CFClient::UI::TextView
917 expand => 1, 957 expand => 1,
918 font => $FONT_FIXED, 958 font => $FONT_FIXED,
919 fontsize => $::CFG->{log_fontsize}, 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.",
920 ; 963 ;
921 964
922 $BUTTONBAR = new CFClient::UI::HBox; 965 $BUTTONBAR = new CFClient::UI::HBox;
923 966
924 $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.");
925 $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.");
926 $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.");
927 973
928 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
929 975
930 $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.");
931 $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 :).");
932 980
933 $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 {
934 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 985 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
935 status "Configuration Saved"; 986 status "Configuration Saved";
987 },
936 }); 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 );
937 1001
938 $BUTTONBAR->show; 1002 $BUTTONBAR->show;
939 1003
940 $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]);
941 1005
… …
974 1038
975sub audio_init { 1039sub audio_init {
976 if ($CFG->{audio_enable}) { 1040 if ($CFG->{audio_enable}) {
977 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1041 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
978 $SDL_MIXER = !CFClient::Mix_OpenAudio; 1042 $SDL_MIXER = !CFClient::Mix_OpenAudio;
1043
1044 unless ($SDL_MIXER) {
1045 status "Unable to open sound device: there will be no sound";
1046 return;
1047 }
1048
979 CFClient::Mix_AllocateChannels 8; 1049 CFClient::Mix_AllocateChannels 8;
980 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1050 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
981 1051
982 audio_music_finished; 1052 audio_music_finished;
983 1053
… …
1018sub force_refresh { 1088sub force_refresh {
1019 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1089 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1020 debug sprintf "%3.2f", $fps; 1090 debug sprintf "%3.2f", $fps;
1021 1091
1022 $CFClient::UI::ROOT->draw; 1092 $CFClient::UI::ROOT->draw;
1093
1094 $WANT_REFRESH = 0;
1095 $CAN_REFRESH = 0;
1096 $LAST_REFRESH = $NOW;
1023 1097
10240 && do { 10980 && do {
1025 # some weird model-drawing code, just a joke right now 1099 # some weird model-drawing code, just a joke right now
1026 use CFClient::OpenGL; 1100 use CFClient::OpenGL;
1027 1101
… …
1039 1113
1040 glDepthMask 1; 1114 glDepthMask 1;
1041 glClear GL_DEPTH_BUFFER_BIT; 1115 glClear GL_DEPTH_BUFFER_BIT;
1042 glEnable GL_TEXTURE_2D; 1116 glEnable GL_TEXTURE_2D;
1043 glEnable GL_DEPTH_TEST; 1117 glEnable GL_DEPTH_TEST;
1044 glDisable GL_CULL_FACE; 1118 glEnable GL_CULL_FACE;
1045 glShadeModel GL_SMOOTH; 1119 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1046 1120
1047 glMatrixMode GL_PROJECTION; 1121 glMatrixMode GL_PROJECTION;
1048 glLoadIdentity; 1122 glLoadIdentity;
1123 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1049 glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000; 1124 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1050 glMatrixMode GL_MODELVIEW; 1125 glMatrixMode GL_MODELVIEW;
1051 glLoadIdentity; 1126 glLoadIdentity;
1052 1127
1053 glPushMatrix; 1128 glPushMatrix;
1054 glTranslate $::WIDTH * 0.5, $::HEIGHT * 0.5; 1129 glTranslate 0, 0, -800;
1130 glScale 1, -1, 1;
1055 glRotate $NOW * 1000 % 36000 / 20, 0, 1, 0; 1131 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1132 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1133 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1056 glScale 50, 50, 50; 1134 glScale 50, 50, 50;
1057 1135
1058 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v}; 1136 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1059 while (my ($k, $v) = each %{$r->{g}}) { 1137 while (my ($k, $v) = each %{$r->{g}}) {
1060 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die); 1138 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1061 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1]; 1139 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1062 } 1140 }
1141
1063 glPopMatrix; 1142 glPopMatrix;
1064 1143
1065 glShadeModel GL_FLAT; 1144 glShadeModel GL_FLAT;
1066 glDisable GL_DEPTH_TEST; 1145 glDisable GL_DEPTH_TEST;
1067 glDisable GL_TEXTURE_2D; 1146 glDisable GL_TEXTURE_2D;
… …
1069 1148
1070 $WANT_REFRESH++; 1149 $WANT_REFRESH++;
1071}; 1150};
1072 1151
1073 CFClient::SDL_GL_SwapBuffers; 1152 CFClient::SDL_GL_SwapBuffers;
1074
1075 $WANT_REFRESH = 0;
1076 $CAN_REFRESH = 0;
1077 $LAST_REFRESH = $NOW;
1078} 1153}
1079 1154
1080my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1155my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
1081 $NOW = time; 1156 $NOW = time;
1082 1157
… …
1131 $arg = $arg eq ".*" ? "" : " $arg"; 1206 $arg = $arg eq ".*" ? "" : " $arg";
1132 1207
1133 $MAPWIDGET->add_command ("$cmd$arg", $text); 1208 $MAPWIDGET->add_command ("$cmd$arg", $text);
1134 } 1209 }
1135 } 1210 }
1211
1212 $self->{noface} = new_from_file CFClient::Texture
1213 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1136 1214
1137 $self 1215 $self
1138} 1216}
1139 1217
1140sub conn::stats_update { 1218sub conn::stats_update {
… …
1208 $self->set_texture ($id => $data); 1286 $self->set_texture ($id => $data);
1209 } 1287 }
1210 } 1288 }
1211} 1289}
1212 1290
1291# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1292# (server resource,s latency, bandwidth), so this hack is warranted.
1293# the right fix is to make real tiled maps with an overview file
1294sub conn::send_mapinfo {
1295 my ($self, $data, $cb) = @_;
1296
1297 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1298 my ($wx, $wy) = ($1, $2);
1299
1300 if ($data =~ /^spatial ([1-4]+)$/) {
1301 my @dx = (0, 0, 1, 0, -1);
1302 my @dy = (0, -1, 0, 1, 0);
1303 my ($dx, $dy);
1304
1305 for (split //, $1) {
1306 $dx += $dx[$_];
1307 $dy += $dy[$_];
1308 }
1309
1310 $cb->(spatial => 15,
1311 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1312 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1313 50, 50,
1314 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1315 );
1316
1317 return;
1318 }
1319 }
1320
1321 $self->SUPER::send_mapinfo ($data, $cb);
1322}
1323
1213# this method does a "flood fill" into every tile direction 1324# this method does a "flood fill" into every tile direction
1214# it assumes that tiles are arranged in a rectangular grid, 1325# it assumes that tiles are arranged in a rectangular grid,
1215# i.e. a map is the same as the left of the right map etc. 1326# i.e. a map is the same as the left of the right map etc.
1216# failure to comply are harmless and result in display errors 1327# failure to comply are harmless and result in display errors
1217# at worst. 1328# at worst.
1218sub conn::flood_fill { 1329sub conn::flood_fill {
1219 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1330 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1220 1331
1221 # the server does not allow map paths > 6 1332 # the server does not allow map paths > 6
1222 return if 7 <= length $path; 1333 return if 7 <= length $path;
1223 1334
1224 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1335 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1225 1336
1226 for ( 1337 for (
1227 [1, 0, -1], 1338 [1, 3, 0, -1],
1228 [2, 1, 0], 1339 [2, 4, 1, 0],
1229 [3, 0, 1], 1340 [3, 1, 0, 1],
1230 [4, -1, 0], 1341 [4, 2, -1, 0],
1231 ) { 1342 ) {
1232 my ($tile, $dx, $dy) = @$_; 1343 my ($tile, $tile2, $dx, $dy) = @$_;
1344
1345 next if $block & (1 << $tile);
1346 my $block = $block | (1 << $tile2);
1233 1347
1234 my $gx = $gx + $dx; 1348 my $gx = $gx + $dx;
1235 my $gy = $gy + $dy; 1349 my $gy = $gy + $dy;
1236 1350
1237 next unless $flags & (1 << ($tile - 1)); 1351 next unless $flags & (1 << ($tile - 1));
… …
1239 1353
1240 my $neigh = $self->{neigh_map}{$hash} ||= []; 1354 my $neigh = $self->{neigh_map}{$hash} ||= [];
1241 if (my $info = $neigh->[$tile]) { 1355 if (my $info = $neigh->[$tile]) {
1242 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1356 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1243 1357
1244 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1358 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1245 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1359 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1246 1360
1247 } else { 1361 } else {
1248 $self->send_mapinfo ("spatial $path$tile", sub { 1362 $self->send_mapinfo ("spatial $path$tile", sub {
1249 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1363 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1250 1364
1251 return if $mode ne "spatial"; 1365 return if $mode ne "spatial";
1252 1366
1253 $x += $MAP->ox; 1367 $x += $MAP->ox;
1254 $y += $MAP->oy; 1368 $y += $MAP->oy;
1255 1369
1256 $self->load_map ($hash, $x, $y) 1370 $self->load_map ($hash, $x, $y)
1257 unless $self->{neigh_map}{$hash}[5]++;#d# 1371 unless $self->{neigh_map}{$hash}[5]++;#d#
1258 1372
1259 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1373 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1260 1374
1261 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1375 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1262 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1376 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1263 }); 1377 });
1264 } 1378 }
1265 } 1379 }
1266} 1380}
… …
1279 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1393 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1280 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1394 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1281 ]; 1395 ];
1282 1396
1283 delete $self->{neigh_grid}; 1397 delete $self->{neigh_grid};
1284 $self->flood_fill (0, 0, "", $hash, $flags);
1285 1398
1286 $x += $ox; 1399 $x += $ox;
1287 $y += $oy; 1400 $y += $oy;
1288 1401
1289 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1402 $self->{map_info} = [$hash, $x, $y, $w, $h];
1290 1403
1291 my $map = $self->{map_info}[0];
1292 $map =~ s/^.*?\/([^\/]+)$/\1/; 1404 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1293 $STATWIDS->{map}->set_text ("Map: " . $map); 1405 $STATWIDS->{map}->set_text ("Map: " . $map);
1294 1406
1295 $self->load_map ($hash, $x, $y); 1407 $self->load_map ($hash, $x, $y);
1408 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1296} 1409}
1297 1410
1298sub conn::face_find { 1411sub conn::face_find {
1299 my ($self, $facenum, $face) = @_; 1412 my ($self, $facenum, $face) = @_;
1300 1413
… …
1302 1415
1303 my $id = $FACEMAP->get ($hash); 1416 my $id = $FACEMAP->get ($hash);
1304 1417
1305 unless ($id) { 1418 unless ($id) {
1306 # create new id for face 1419 # create new id for face
1307 # i love transactions 1420 # I love transactions
1308 for (1..100) { 1421 for (1..100) {
1309 my $txn = $CFClient::DB_ENV->txn_begin; 1422 my $txn = $CFClient::DB_ENV->txn_begin;
1310 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW); 1423 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1311 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 1424 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1312 $id++; 1425 $id = ($id || 16) + 1;
1313 if ($FACEMAP->put (id => $id) == 0 1426 if ($FACEMAP->put (id => $id) == 0
1314 && $FACEMAP->put ($hash => $id) == 0) { 1427 && $FACEMAP->put ($hash => $id) == 0) {
1315 $txn->txn_commit; 1428 $txn->txn_commit;
1316 1429
1317 goto gotid; 1430 goto gotid;
… …
1325 1438
1326gotid: 1439gotid:
1327 $face->{id} = $id; 1440 $face->{id} = $id;
1328 $MAP->set_face ($facenum => $id); 1441 $MAP->set_face ($facenum => $id);
1329 $self->{faceid}[$facenum] = $id;#d# 1442 $self->{faceid}[$facenum] = $id;#d#
1443
1330 $TILECACHE->get ($id) 1444 $TILECACHE->get ($id) || do {
1445 my $tex = $self->{noface};
1446 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1447 undef
1448 };
1331} 1449}
1332 1450
1333sub conn::face_update { 1451sub conn::face_update {
1334 my ($self, $facenum, $face) = @_; 1452 my ($self, $facenum, $face) = @_;
1335 1453
… …
1428 ); 1546 );
1429 1547
1430 $entry->focus_in; 1548 $entry->focus_in;
1431 } 1549 }
1432 1550
1433 $dialog->show; 1551 $dialog->show_centered;
1434} 1552}
1435 1553
1436sub conn::drawinfo { 1554sub conn::drawinfo {
1437 my ($self, $color, $text) = @_; 1555 my ($self, $color, $text) = @_;
1438 1556
… …
1492 my ($self) = @_; 1610 my ($self) = @_;
1493 1611
1494 $self->send ("command output-sync $CFG->{output_sync}"); 1612 $self->send ("command output-sync $CFG->{output_sync}");
1495 $self->send ("command output-count $CFG->{output_count}"); 1613 $self->send ("command output-count $CFG->{output_count}");
1496 1614
1615 my $parser = new Pod::POM;
1616 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1617
1618 my %skill_tooltip;
1619
1620 for my $head2 ($pod->head2) {
1621 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1622 }
1623
1497 for my $skill (values %{$self->{skill_info}}) { 1624 for my $skill (values %{$self->{skill_info}}) {
1498 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'"); 1625 $MAPWIDGET->add_command ("ready_skill $skill",
1499 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'"); 1626 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1627 . $skill_tooltip{$skill});
1628 $MAPWIDGET->add_command ("use_skill $skill",
1629 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1630 . $skill_tooltip{$skill});
1500 } 1631 }
1501} 1632}
1502 1633
1503sub conn::eof { 1634sub conn::eof {
1504 $MAPWIDGET->clr_commands; 1635 $MAPWIDGET->clr_commands;
… …
1623 Event::unloop -1; 1754 Event::unloop -1;
1624 }, 1755 },
1625 CFClient::SDL_VIDEORESIZE => sub { 1756 CFClient::SDL_VIDEORESIZE => sub {
1626 }, 1757 },
1627 CFClient::SDL_VIDEOEXPOSE => sub { 1758 CFClient::SDL_VIDEOEXPOSE => sub {
1628 $WANT_REFRESH++; 1759 CFClient::UI::full_refresh;
1629 }, 1760 },
1630 CFClient::SDL_ACTIVEEVENT => sub { 1761 CFClient::SDL_ACTIVEEVENT => sub {
1631# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1762# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1632 }, 1763 },
1633 CFClient::SDL_KEYDOWN => sub { 1764 CFClient::SDL_KEYDOWN => sub {

Diff Legend

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