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.224 by root, Wed May 17 15:18:57 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
… …
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;
… …
136 maph => $mapsize, 137 maph => $mapsize,
137 ; 138 ;
138 }; 139 };
139 140
140 if ($CONN) { 141 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh};
143
141 $LOGIN_BUTTON->set_text ("Logout"); 144 $LOGIN_BUTTON->set_text ("Logout");
142
143 status "login successful"; 145 status "login successful";
144 146
145 CFClient::lowdelay fileno $CONN->{fh}; 147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
146 } else { 150 } else {
147 status "unable to connect"; 151 status "unable to connect";
148 stop_game(); 152 stop_game();
149 } 153 }
150} 154}
… …
154 158
155 status "connection closed"; 159 status "connection closed";
156 $LOGIN_BUTTON->set_text ("Login"); 160 $LOGIN_BUTTON->set_text ("Login");
157 $CONN->destroy; 161 $CONN->destroy;
158 $CONN = 0; # false, does not autovivify 162 $CONN = 0; # false, does not autovivify
163
164 $BUTTONBAR->{children}[1]->emit ("activate")
165 unless $BUTTONBAR->{children}[1]->{state};
159 166
160 undef $MAPCACHE; 167 undef $MAPCACHE;
161 undef $MAP; 168 undef $MAP;
162} 169}
163 170
… …
203 } 210 }
204 ); 211 );
205 212
206 $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");
207 $table->add (1, $row++, new CFClient::UI::Slider 214 $table->add (1, $row++, new CFClient::UI::Slider
208 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05], 215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
209 tooltip => "Enlarge or shrink the displayed map", 216 tooltip => "Enlarge or shrink the displayed map",
210 connect_changed => sub { 217 connect_changed => sub {
211 my ($self, $value) = @_; 218 my ($self, $value) = @_;
212 $CFG->{map_scale} = $value; 219 $CFG->{map_scale} = 2 ** $value;
213 } 220 }
214 ); 221 );
215 222
216 $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");
217 $table->add (1, $row++, new CFClient::UI::CheckBox 224 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
394 (my $hb = new CFClient::UI::HBox), 401 (my $hb = new CFClient::UI::HBox),
395 ], 402 ],
396 ); 403 );
397 404
398 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 405 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
399 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.");
400 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 407 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
401 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.");
402 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 409 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
403 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.");
404 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 411 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
405 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.");
406 413
407 $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,
408 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.");
409 $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,
410 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.)");
411 418
412 $GAUGES = { 419 $GAUGES = {
413 exp => $exp, win => $win, range => $rng, 420 exp => $exp, win => $win, range => $rng,
414 food => $fg, mana => $mg, hp => $hg, grace => $gg 421 food => $fg, mana => $mg, hp => $hg, grace => $gg
415 }; 422 };
… …
421 428
422sub make_stats_window { 429sub make_stats_window {
423 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";
424 431
425 $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);
426 $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.");
427 $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).");
428 439
429 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 440 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
430
431 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 441 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
432 442
433 my $black = [0, 0, 0]; 443 my $black = [0, 0, 0];
434 444
435 for ( 445 for (
436 [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"],
437 [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"],
438 [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"],
439 [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"],
440 [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"],
441 [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"],
442 [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."],
443 453
444 [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."],
445 [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."],
446 [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."],
447 [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."],
448 [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."],
449 [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."],
450 ) { 460 ) {
451 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 461 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
452 462
453 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 463 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
454 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);
… …
460 470
461 my $row = 0; 471 my $row = 0;
462 my $col = 0; 472 my $col = 0;
463 473
464 my %resist_names = ( 474 my %resist_names = (
465 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.)",
466 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.)",
467 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.)",
468 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, ...)",
469 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)",
470 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)",
471 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)",
472 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)",
473 pois => "Poison (resistance to getting poisoned)", 483 pois => "<b>Poison</b> (resistance to getting poisoned)",
474 para => "Paralysation (this resistance affects the chance you get paralysed)", 484 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
475 deat => "Death (resistance against death spells)", 485 deat => "<b>Death</b> (resistance against death spells)",
476 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)",
477 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)",
478 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)",
479 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...",
480 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, ...)",
481 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, ...)",
482 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)",
483 ); 493 );
484 for (qw/slow holyw conf fire depl magic 494 for (qw/slow holyw conf fire depl magic
485 drain acid pois para deat phys 495 drain acid pois para deat phys
486 blind fear tund elec cold ghit/) 496 blind fear tund elec cold ghit/)
487 { 497 {
… …
744 754
745 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 755 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
746 }, 756 },
747 ); 757 );
748 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
749 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 773 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
750 expand => 1, 774 expand => 1,
751 align => 0, 775 align => 0,
752 text => "Login", 776 text => "Login",
753 connect_activate => sub { 777 connect_activate => sub {
754 $CONN ? stop_game 778 $CONN ? stop_game
… …
761 785
762sub message_window { 786sub message_window {
763 my $window = new CFClient::UI::FancyFrame 787 my $window = new CFClient::UI::FancyFrame
764 title => "Messages", 788 title => "Messages",
765 border_bg => [1, 1, 1, 1], 789 border_bg => [1, 1, 1, 1],
766 bg => [0, 0, 0, 0.5], 790 bg => [0, 0, 0, 0.75],
767 user_w => int $::WIDTH / 3, 791 user_w => int $::WIDTH / 3,
768 user_h => int $::HEIGHT / 5, 792 user_h => int $::HEIGHT / 5,
769 child => (my $vbox = new CFClient::UI::VBox); 793 child => (my $vbox = new CFClient::UI::VBox);
770 794
771 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 795 $vbox->add ($LOGVIEW);
772 expand => 1,
773 font => $FONT_FIXED,
774 fontsize => $::CFG->{log_fontsize},
775 );
776 796
777 $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.",
778 connect_focus_in => sub { 802 connect_focus_in => sub {
779 my ($input, $prev_focus) = @_; 803 my ($input, $prev_focus) = @_;
780 804
781 delete $input->{refocus_map}; 805 delete $input->{refocus_map};
782 806
… …
811 }; 835 };
812 836
813 $window 837 $window
814} 838}
815 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
816sub make_inventory_window { 870sub make_inventory_window {
817 my $invwin = new CFClient::UI::FancyFrame 871 my $invwin = new CFClient::UI::FancyFrame
818 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";
819 873
820 $invwin->add (my $hb = new CFClient::UI::HBox); 874 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
821 875
822 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 876 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
823 $vb1->add (my $lbl = new CFClient::UI::Label); 877 $vb1->add (my $lbl = new CFClient::UI::Label);
824 $lbl->set_text ("Player"); 878 $lbl->set_text ("Player");
825 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 879 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
… …
845 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 899 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
846 $FULLSCREEN = $CFG->{fullscreen}; 900 $FULLSCREEN = $CFG->{fullscreen};
847 $FAST = $CFG->{fast}; 901 $FAST = $CFG->{fast};
848 902
849 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 903 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
850 or die "SDL_SetVideoMode failed!\n"; 904 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
851 905
852 $SDL_ACTIVE = 1; 906 $SDL_ACTIVE = 1;
853 $LAST_REFRESH = time - 0.01; 907 $LAST_REFRESH = time - 0.01;
854 908
855 CFClient::gl_init; 909 CFClient::gl_init;
… …
876 )->show; 930 )->show;
877 931
878 CFClient::UI::FancyFrame->new ( 932 CFClient::UI::FancyFrame->new (
879 border_bg => [1, 1, 1, 192/255], 933 border_bg => [1, 1, 1, 192/255],
880 bg => [1, 1, 1, 0], 934 bg => [1, 1, 1, 0],
881 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 ),
882 )->show; 938 )->show;
883 939
884 $MAPWIDGET = new CFClient::MapWidget; 940 $MAPWIDGET = new CFClient::MapWidget;
885 $MAPWIDGET->connect (activate_console => sub { 941 $MAPWIDGET->connect (activate_console => sub {
886 my ($mapwidget, $preset) = @_; 942 my ($mapwidget, $preset) = @_;
… …
895 } 951 }
896 }); 952 });
897 $MAPWIDGET->show; 953 $MAPWIDGET->show;
898 $MAPWIDGET->focus_in; 954 $MAPWIDGET->focus_in;
899 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
900 $BUTTONBAR = new CFClient::UI::HBox; 965 $BUTTONBAR = new CFClient::UI::HBox;
901 966
902 $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.");
903 $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.");
904 $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.");
905 973
906 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
907 975
908 $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.");
909 $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 :).");
910 980
911 $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 {
912 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 985 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
913 status "Configuration Saved"; 986 status "Configuration Saved";
987 },
914 }); 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 );
915 1001
916 $BUTTONBAR->show; 1002 $BUTTONBAR->show;
917 1003
918 $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]);
919 1005
… …
935my $bgmusic;#TODO#hack#d# 1021my $bgmusic;#TODO#hack#d#
936 1022
937sub audio_channel_finished { 1023sub audio_channel_finished {
938 my ($channel) = @_; 1024 my ($channel) = @_;
939 1025
940 warn "channel $channel finished\n";#d# 1026 #warn "channel $channel finished\n";#d#
941} 1027}
942 1028
943sub audio_music_finished { 1029sub audio_music_finished {
944 return unless $CFG->{bgm_enable}; 1030 return unless $CFG->{bgm_enable};
945 1031
… …
952 1038
953sub audio_init { 1039sub audio_init {
954 if ($CFG->{audio_enable}) { 1040 if ($CFG->{audio_enable}) {
955 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 1041 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
956 $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
957 CFClient::Mix_AllocateChannels 8; 1049 CFClient::Mix_AllocateChannels 8;
958 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 1050 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
959 1051
960 audio_music_finished; 1052 audio_music_finished;
961 1053
… …
989my %animate_object; 1081my %animate_object;
990my $animate_timer; 1082my $animate_timer;
991 1083
992my $fps = 9; 1084my $fps = 9;
993 1085
1086my %demo;#d#
1087
994sub force_refresh { 1088sub force_refresh {
995 $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;
996 debug sprintf "%3.2f", $fps; 1090 debug sprintf "%3.2f", $fps;
997 1091
998 $CFClient::UI::ROOT->draw; 1092 $CFClient::UI::ROOT->draw;
999 CFClient::SDL_GL_SwapBuffers;
1000 1093
1001 $WANT_REFRESH = 0; 1094 $WANT_REFRESH = 0;
1002 $CAN_REFRESH = 0; 1095 $CAN_REFRESH = 0;
1003 $LAST_REFRESH = $NOW; 1096 $LAST_REFRESH = $NOW;
1097
10980 && do {
1099 # some weird model-drawing code, just a joke right now
1100 use CFClient::OpenGL;
1101
1102 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1103 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1104 $demo{r} ||= do {
1105 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1106 $mod->{v} = pack "f*", @{$mod->{v}};
1107 $_ = [scalar @$_, pack "S!*", @$_]
1108 for values %{$mod->{g}};
1109 $mod
1110 };
1111
1112 my $r = $demo{r} or die;
1113
1114 glDepthMask 1;
1115 glClear GL_DEPTH_BUFFER_BIT;
1116 glEnable GL_TEXTURE_2D;
1117 glEnable GL_DEPTH_TEST;
1118 glEnable GL_CULL_FACE;
1119 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1120
1121 glMatrixMode GL_PROJECTION;
1122 glLoadIdentity;
1123 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1124 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1125 glMatrixMode GL_MODELVIEW;
1126 glLoadIdentity;
1127
1128 glPushMatrix;
1129 glTranslate 0, 0, -800;
1130 glScale 1, -1, 1;
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;
1134 glScale 50, 50, 50;
1135
1136 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1137 while (my ($k, $v) = each %{$r->{g}}) {
1138 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1139 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1140 }
1141
1142 glPopMatrix;
1143
1144 glShadeModel GL_FLAT;
1145 glDisable GL_DEPTH_TEST;
1146 glDisable GL_TEXTURE_2D;
1147 glDepthMask 0;
1148
1149 $WANT_REFRESH++;
1150};
1151
1152 CFClient::SDL_GL_SwapBuffers;
1004} 1153}
1005 1154
1006my $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 {
1007 $NOW = time; 1156 $NOW = time;
1008 1157
… …
1030 my ($widget) = @_; 1179 my ($widget) = @_;
1031 delete $animate_object{$widget}; 1180 delete $animate_object{$widget};
1032} 1181}
1033 1182
1034@conn::ISA = Crossfire::Protocol::; 1183@conn::ISA = Crossfire::Protocol::;
1184
1185sub conn::new {
1186 my $class = shift;
1187
1188 my $self = $class->Crossfire::Protocol::new (@_);
1189
1190 $MAPWIDGET->clr_commands;
1191
1192 my $parser = new Pod::POM;
1193 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1194
1195 for my $head2 ($pod->head2) {
1196 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1197 or next;
1198
1199 my $cmd = $1;
1200 my @args = split /\|/, $2;
1201 @args = (".*") unless @args;
1202
1203 my $text = CFClient::pod_to_pango $head2->content;
1204
1205 for my $arg (@args) {
1206 $arg = $arg eq ".*" ? "" : " $arg";
1207
1208 $MAPWIDGET->add_command ("$cmd$arg", $text);
1209 }
1210 }
1211
1212 $self->{noface} = new_from_file CFClient::Texture
1213 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1214
1215 $self
1216}
1035 1217
1036sub conn::stats_update { 1218sub conn::stats_update {
1037 my ($self, $stats) = @_; 1219 my ($self, $stats) = @_;
1038 1220
1039 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) { 1221 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
… …
1104 $self->set_texture ($id => $data); 1286 $self->set_texture ($id => $data);
1105 } 1287 }
1106 } 1288 }
1107} 1289}
1108 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
1109# this method does a "flood fill" into every tile direction 1324# this method does a "flood fill" into every tile direction
1110# it assumes that tiles are arranged in a rectangular grid, 1325# it assumes that tiles are arranged in a rectangular grid,
1111# 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.
1112# failure to comply are harmless and result in display errors 1327# failure to comply are harmless and result in display errors
1113# at worst. 1328# at worst.
1114sub conn::flood_fill { 1329sub conn::flood_fill {
1115 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1330 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1116 1331
1117 # the server does not allow map paths > 6 1332 # the server does not allow map paths > 6
1118 return if 7 <= length $path; 1333 return if 7 <= length $path;
1119 1334
1120 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1335 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1121 1336
1122 for ( 1337 for (
1123 [1, 0, -1], 1338 [1, 3, 0, -1],
1124 [2, 1, 0], 1339 [2, 4, 1, 0],
1125 [3, 0, 1], 1340 [3, 1, 0, 1],
1126 [4, -1, 0], 1341 [4, 2, -1, 0],
1127 ) { 1342 ) {
1128 my ($tile, $dx, $dy) = @$_; 1343 my ($tile, $tile2, $dx, $dy) = @$_;
1344
1345 next if $block & (1 << $tile);
1346 my $block = $block | (1 << $tile2);
1129 1347
1130 my $gx = $gx + $dx; 1348 my $gx = $gx + $dx;
1131 my $gy = $gy + $dy; 1349 my $gy = $gy + $dy;
1132 1350
1133 next unless $flags & (1 << ($tile - 1)); 1351 next unless $flags & (1 << ($tile - 1));
… …
1135 1353
1136 my $neigh = $self->{neigh_map}{$hash} ||= []; 1354 my $neigh = $self->{neigh_map}{$hash} ||= [];
1137 if (my $info = $neigh->[$tile]) { 1355 if (my $info = $neigh->[$tile]) {
1138 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1356 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1139 1357
1140 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1358 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1141 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1359 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1142 1360
1143 } else { 1361 } else {
1144 $self->send_mapinfo ("spatial $path$tile", sub { 1362 $self->send_mapinfo ("spatial $path$tile", sub {
1145 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1363 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1146 1364
1147 return if $mode ne "spatial"; 1365 return if $mode ne "spatial";
1148 1366
1149 $x += $MAP->ox; 1367 $x += $MAP->ox;
1150 $y += $MAP->oy; 1368 $y += $MAP->oy;
1151 1369
1152 $self->load_map ($hash, $x, $y) 1370 $self->load_map ($hash, $x, $y)
1153 unless $self->{neigh_map}{$hash}[5]++;#d# 1371 unless $self->{neigh_map}{$hash}[5]++;#d#
1154 1372
1155 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1373 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1156 1374
1157 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1375 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1158 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1376 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1159 }); 1377 });
1160 } 1378 }
1161 } 1379 }
1162} 1380}
… …
1175 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1393 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1176 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1394 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1177 ]; 1395 ];
1178 1396
1179 delete $self->{neigh_grid}; 1397 delete $self->{neigh_grid};
1180 $self->flood_fill (0, 0, "", $hash, $flags);
1181 1398
1182 $x += $ox; 1399 $x += $ox;
1183 $y += $oy; 1400 $y += $oy;
1184 1401
1185 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1402 $self->{map_info} = [$hash, $x, $y, $w, $h];
1186 1403
1187 my $map = $self->{map_info}[0];
1188 $map =~ s/^.*?\/([^\/]+)$/\1/; 1404 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1189 $STATWIDS->{map}->set_text ("Map: " . $map); 1405 $STATWIDS->{map}->set_text ("Map: " . $map);
1190 1406
1191 $self->load_map ($hash, $x, $y); 1407 $self->load_map ($hash, $x, $y);
1408 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1192} 1409}
1193 1410
1194sub conn::face_find { 1411sub conn::face_find {
1195 my ($self, $facenum, $face) = @_; 1412 my ($self, $facenum, $face) = @_;
1196 1413
… …
1198 1415
1199 my $id = $FACEMAP->get ($hash); 1416 my $id = $FACEMAP->get ($hash);
1200 1417
1201 unless ($id) { 1418 unless ($id) {
1202 # create new id for face 1419 # create new id for face
1203 # i love transactions 1420 # I love transactions
1204 for (1..100) { 1421 for (1..100) {
1205 my $txn = $CFClient::DB_ENV->txn_begin; 1422 my $txn = $CFClient::DB_ENV->txn_begin;
1206 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW); 1423 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1207 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 1424 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1208 $id++; 1425 $id = ($id || 16) + 1;
1209 if ($FACEMAP->put (id => $id) == 0 1426 if ($FACEMAP->put (id => $id) == 0
1210 && $FACEMAP->put ($hash => $id) == 0) { 1427 && $FACEMAP->put ($hash => $id) == 0) {
1211 $txn->txn_commit; 1428 $txn->txn_commit;
1212 1429
1213 goto gotid; 1430 goto gotid;
… …
1221 1438
1222gotid: 1439gotid:
1223 $face->{id} = $id; 1440 $face->{id} = $id;
1224 $MAP->set_face ($facenum => $id); 1441 $MAP->set_face ($facenum => $id);
1225 $self->{faceid}[$facenum] = $id;#d# 1442 $self->{faceid}[$facenum] = $id;#d#
1443
1226 $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 };
1227} 1449}
1228 1450
1229sub conn::face_update { 1451sub conn::face_update {
1230 my ($self, $facenum, $face) = @_; 1452 my ($self, $facenum, $face) = @_;
1231 1453
… …
1324 ); 1546 );
1325 1547
1326 $entry->focus_in; 1548 $entry->focus_in;
1327 } 1549 }
1328 1550
1329 $dialog->show; 1551 $dialog->show_centered;
1330} 1552}
1331 1553
1332sub conn::drawinfo { 1554sub conn::drawinfo {
1333 my ($self, $color, $text) = @_; 1555 my ($self, $color, $text) = @_;
1334 1556
… …
1385} 1607}
1386 1608
1387sub conn::addme_success { 1609sub conn::addme_success {
1388 my ($self) = @_; 1610 my ($self) = @_;
1389 1611
1390 $MAPWIDGET->clr_commands; 1612 $self->send ("command output-sync $CFG->{output_sync}");
1613 $self->send ("command output-count $CFG->{output_count}");
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 }
1391 1623
1392 for my $skill (values %{$self->{skill_info}}) { 1624 for my $skill (values %{$self->{skill_info}}) {
1393 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'"); 1625 $MAPWIDGET->add_command ("ready_skill $skill",
1394 $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")
1395 } 1627 . $skill_tooltip{$skill});
1396 1628 $MAPWIDGET->add_command ("use_skill $skill",
1397 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you"); 1629 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1398 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players"); 1630 . $skill_tooltip{$skill});
1399 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1400 $MAPWIDGET->add_command ("killpets", "Kill your pets");
1401 $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
1402 $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
1403 $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
1404
1405 my $parser = new Pod::POM;
1406 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1407
1408 for my $head2 ($pod->head2) {
1409 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1410 or next;
1411
1412 my $cmd = $1;
1413 my @args = split /\|/, $2;
1414 @args = (".*") unless @args;
1415
1416 my $text = CFClient::pod_to_pango $head2;
1417
1418 for my $arg (@args) {
1419 $arg = $arg eq ".*" ? "" : " $arg";
1420
1421 $MAPWIDGET->add_command ("$cmd$arg", $text);
1422 }
1423 } 1631 }
1424} 1632}
1425 1633
1426sub conn::eof { 1634sub conn::eof {
1427 $MAPWIDGET->clr_commands; 1635 $MAPWIDGET->clr_commands;
… …
1546 Event::unloop -1; 1754 Event::unloop -1;
1547 }, 1755 },
1548 CFClient::SDL_VIDEORESIZE => sub { 1756 CFClient::SDL_VIDEORESIZE => sub {
1549 }, 1757 },
1550 CFClient::SDL_VIDEOEXPOSE => sub { 1758 CFClient::SDL_VIDEOEXPOSE => sub {
1551 $WANT_REFRESH++; 1759 CFClient::UI::full_refresh;
1552 }, 1760 },
1553 CFClient::SDL_ACTIVEEVENT => sub { 1761 CFClient::SDL_ACTIVEEVENT => sub {
1554# 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#
1555 }, 1763 },
1556 CFClient::SDL_KEYDOWN => sub { 1764 CFClient::SDL_KEYDOWN => sub {
… …
1592 sdl_mode => 0, 1800 sdl_mode => 0,
1593 width => 640, 1801 width => 640,
1594 height => 480, 1802 height => 480,
1595 fullscreen => 0, 1803 fullscreen => 0,
1596 fast => 0, 1804 fast => 0,
1597 map_scale => 0.5, 1805 map_scale => 1,
1598 fow_enable => 1, 1806 fow_enable => 1,
1599 fow_intensity => 0.45, 1807 fow_intensity => 0.45,
1600 fow_smooth => 0, 1808 fow_smooth => 0,
1601 gui_fontsize => 1, 1809 gui_fontsize => 1,
1602 log_fontsize => 1, 1810 log_fontsize => 1,
… …
1607 host => "crossfire.schmorp.de", 1815 host => "crossfire.schmorp.de",
1608 say_command => 'say', 1816 say_command => 'say',
1609 audio_enable => 1, 1817 audio_enable => 1,
1610 bgm_enable => 1, 1818 bgm_enable => 1,
1611 bgm_volume => 0.25, 1819 bgm_volume => 0.25,
1820 output_sync => 1,
1821 output_count => 1,
1612 ); 1822 );
1613 1823
1614 while (my ($k, $v) = each %DEF_CFG) { 1824 while (my ($k, $v) = each %DEF_CFG) {
1615 $CFG->{$k} = $v unless exists $CFG->{$k}; 1825 $CFG->{$k} = $v unless exists $CFG->{$k};
1616 } 1826 }
… …
1721 1931
1722Typing B<climb> will display a list of commands with I<climb> in their 1932Typing B<climb> will display a list of commands with I<climb> in their
1723name, such as I<ready_skill climbing> and I<use_skill climbing>. 1933name, such as I<ready_skill climbing> and I<use_skill climbing>.
1724 1934
1725You can abbreviate commands by typing only the first character of every 1935You can abbreviate commands by typing only the first character of every
1726word. For example, typing I<iwor> will likely select I<invoke word of 1936word (or even characters within the word - the client will try to make
1727recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1937a good guess, as long as the characters are in order). For example,
1728will likely select I<ready_skill climbing> and I<usl> will give you 1938typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1729I<use_skill levitation>. 1939will select I<cast create food>. Likewise, I<rscli> will likely select
1940I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1941
1942You can enter space and other text as arguemnt to the command. For
1943example, C<cfoo waybread> will expand to C<cast create food waybread>.
1730 1944
1731=head2 The map overview 1945=head2 The map overview
1732 1946
1733#TODO# 1947#TODO#
1734 1948

Diff Legend

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