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.218 by elmex, Mon May 15 21:17:17 2006 UTC vs.
Revision 1.238 by elmex, Tue May 23 18:10:52 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6# do things only needed for single-binary version (par)
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache) { 8 if (%PAR::LibCache) {
8 @INC = grep ref, @INC; # weed out all paths except pars loader refs 9 @INC = grep ref, @INC; # weed out all paths except pars loader refs
9 10
10 while (my ($filename, $zip) = each %PAR::LibCache) { 11 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
13 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
14 unless -e "$ENV{PAR_TEMP}/$1"; 15 unless -e "$ENV{PAR_TEMP}/$1";
15 } 16 }
16 } 17 }
17 18
19 # TODO: pango-rc file, anybody?
20
18 unshift @INC, $ENV{PAR_TEMP}; 21 unshift @INC, $ENV{PAR_TEMP};
19
20 if ($^O eq "MSWin32") {
21 $ENV{GTK_RC_FILES} = "$ENV{PAR_TEMP}/share/themes/MS-Windows/gtk-2.0/gtkrc";
22 }
23 } 22 }
24} 23}
25 24
26# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
27unshift @INC, $ENV{PAR_TEMP}; 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
30use Event; 31use Event;
31 32
32use Crossfire; 33use Crossfire;
33use Crossfire::Protocol; 34use Crossfire::Protocol;
34 35
… …
81our $BUTTONBAR; 82our $BUTTONBAR;
82our $LOGVIEW; 83our $LOGVIEW;
83our $CONSOLE; 84our $CONSOLE;
84our $METASERVER; 85our $METASERVER;
85our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG;
86 88
87our $FLOORBOX; 89our $FLOORBOX;
88our $GAUGES; 90our $GAUGES;
89our $STATWIDS; 91our $STATWIDS;
90 92
… …
100our $DEBUG_STATUS; 102our $DEBUG_STATUS;
101 103
102our $INVWIN; 104our $INVWIN;
103our $INV; 105our $INV;
104our $INVR; 106our $INVR;
107our $INVR_LBL;
105our $OPENCONT; 108our $OPENCONT;
106 109
107sub status { 110sub status {
108 $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]);
109} 112}
110 113
111sub debug { 114sub debug {
112 $DEBUG_STATUS->set_text ($_[0]); 115 $DEBUG_STATUS->set_text ($_[0]);
113 my ($w, $h) = $DEBUG_STATUS->size_request; 116 my ($w, $h) = $DEBUG_STATUS->size_request;
… …
134 maph => $mapsize, 137 maph => $mapsize,
135 ; 138 ;
136 }; 139 };
137 140
138 if ($CONN) { 141 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh};
143
139 $LOGIN_BUTTON->set_text ("Logout"); 144 $LOGIN_BUTTON->set_text ("Logout");
140
141 status "login successful"; 145 status "login successful";
142 146
143 CFClient::lowdelay fileno $CONN->{fh}; 147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
144 } else { 150 } else {
145 status "unable to connect"; 151 status "unable to connect";
146 stop_game(); 152 stop_game();
147 } 153 }
148} 154}
… …
152 158
153 status "connection closed"; 159 status "connection closed";
154 $LOGIN_BUTTON->set_text ("Login"); 160 $LOGIN_BUTTON->set_text ("Login");
155 $CONN->destroy; 161 $CONN->destroy;
156 $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};
157 166
158 undef $MAPCACHE; 167 undef $MAPCACHE;
159 undef $MAP; 168 undef $MAP;
160} 169}
161 170
… …
392 (my $hb = new CFClient::UI::HBox), 401 (my $hb = new CFClient::UI::HBox),
393 ], 402 ],
394 ); 403 );
395 404
396 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 405 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
397 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.");
398 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 407 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
399 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.");
400 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 409 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
401 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.");
402 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 411 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
403 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.");
404 413
405 $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,
406 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.");
407 $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,
408 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.)");
409 418
410 $GAUGES = { 419 $GAUGES = {
411 exp => $exp, win => $win, range => $rng, 420 exp => $exp, win => $win, range => $rng,
412 food => $fg, mana => $mg, hp => $hg, grace => $gg 421 food => $fg, mana => $mg, hp => $hg, grace => $gg
413 }; 422 };
… …
419 428
420sub make_stats_window { 429sub make_stats_window {
421 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";
422 431
423 $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);
424 $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.");
425 $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).");
426 439
427 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 440 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
428
429 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 441 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
430 442
431 my $black = [0, 0, 0]; 443 my $black = [0, 0, 0];
432 444
433 for ( 445 for (
434 [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"],
435 [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"],
436 [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"],
437 [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"],
438 [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"],
439 [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"],
440 [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."],
441 453
442 [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."],
443 [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."],
444 [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."],
445 [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."],
446 [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."],
447 [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."],
448 ) { 460 ) {
449 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 461 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
450 462
451 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 463 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
452 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);
… …
458 470
459 my $row = 0; 471 my $row = 0;
460 my $col = 0; 472 my $col = 0;
461 473
462 my %resist_names = ( 474 my %resist_names = (
463 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.)",
464 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.)",
465 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.)",
466 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, ...)",
467 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)",
468 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)",
469 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)",
470 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)",
471 pois => "Poison (resistance to getting poisoned)", 483 pois => "<b>Poison</b> (resistance to getting poisoned)",
472 para => "Paralysation (this resistance affects the chance you get paralysed)", 484 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
473 deat => "Death (resistance against death spells)", 485 deat => "<b>Death</b> (resistance against death spells)",
474 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)",
475 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)",
476 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)",
477 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...",
478 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, ...)",
479 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, ...)",
480 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)",
481 ); 493 );
482 for (qw/slow holyw conf fire depl magic 494 for (qw/slow holyw conf fire depl magic
483 drain acid pois para deat phys 495 drain acid pois para deat phys
484 blind fear tund elec cold ghit/) 496 blind fear tund elec cold ghit/)
485 { 497 {
… …
665 $HOST->set_text ($CFG->{host} = $host); 677 $HOST->set_text ($CFG->{host} = $host);
666 }), 678 }),
667 (new CFClient::UI::Empty expand => 1), 679 (new CFClient::UI::Empty expand => 1),
668 ]); 680 ]);
669 681
670 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 682 $table->add ($_ + 1, $y, new CFClient::UI::Label
683 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
671 for 0 .. $#$m; 684 for 0 .. $#$m;
672 } 685 }
673 } 686 }
674 }); 687 });
675} 688}
… …
741 754
742 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 755 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
743 }, 756 },
744 ); 757 );
745 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
746 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 773 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
747 expand => 1, 774 expand => 1,
748 align => 0, 775 align => 0,
749 text => "Login", 776 text => "Login",
750 connect_activate => sub { 777 connect_activate => sub {
751 $CONN ? stop_game 778 $CONN ? stop_game
… …
758 785
759sub message_window { 786sub message_window {
760 my $window = new CFClient::UI::FancyFrame 787 my $window = new CFClient::UI::FancyFrame
761 title => "Messages", 788 title => "Messages",
762 border_bg => [1, 1, 1, 1], 789 border_bg => [1, 1, 1, 1],
763 bg => [0, 0, 0, 0.5], 790 bg => [0, 0, 0, 0.75],
764 user_w => int $::WIDTH / 3, 791 user_w => int $::WIDTH / 3,
765 user_h => int $::HEIGHT / 5, 792 user_h => int $::HEIGHT / 5,
766 child => (my $vbox = new CFClient::UI::VBox); 793 child => (my $vbox = new CFClient::UI::VBox);
767 794
768 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 795 $vbox->add ($LOGVIEW);
769 expand => 1,
770 font => $FONT_FIXED,
771 fontsize => $::CFG->{log_fontsize},
772 );
773 796
774 $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.",
775 connect_focus_in => sub { 802 connect_focus_in => sub {
776 my ($input, $prev_focus) = @_; 803 my ($input, $prev_focus) = @_;
777 804
778 delete $input->{refocus_map}; 805 delete $input->{refocus_map};
779 806
… …
808 }; 835 };
809 836
810 $window 837 $window
811} 838}
812 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
813sub make_inventory_window { 870sub make_inventory_window {
814 my $invwin = new CFClient::UI::FancyFrame 871 my $invwin = new CFClient::UI::FancyFrame
815 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory"; 872 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
816 873
817 $invwin->add (my $hb = new CFClient::UI::HBox); 874 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
875
876 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
877 $vb1->add (my $lbl = new CFClient::UI::Label);
878 $lbl->set_text ("Player");
818 $hb->add ($INV = new CFClient::UI::Inventory expand => 1); 879 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
880
881 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
882 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
883 $INVR_LBL->set_text ("Floor");
819 $hb->add ($INVR = new CFClient::UI::Inventory expand => 1); 884 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
820 885
821 $invwin 886 $invwin
822} 887}
823 888
824sub sdl_init { 889sub sdl_init {
… …
834 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 899 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
835 $FULLSCREEN = $CFG->{fullscreen}; 900 $FULLSCREEN = $CFG->{fullscreen};
836 $FAST = $CFG->{fast}; 901 $FAST = $CFG->{fast};
837 902
838 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 903 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
839 or die "SDL_SetVideoMode failed!\n"; 904 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
840 905
841 $SDL_ACTIVE = 1; 906 $SDL_ACTIVE = 1;
842 $LAST_REFRESH = time - 0.01; 907 $LAST_REFRESH = time - 0.01;
843 908
844 CFClient::gl_init; 909 CFClient::gl_init;
… …
865 )->show; 930 )->show;
866 931
867 CFClient::UI::FancyFrame->new ( 932 CFClient::UI::FancyFrame->new (
868 border_bg => [1, 1, 1, 192/255], 933 border_bg => [1, 1, 1, 192/255],
869 bg => [1, 1, 1, 0], 934 bg => [1, 1, 1, 0],
870 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 ),
871 )->show; 938 )->show;
872 939
873 $MAPWIDGET = new CFClient::MapWidget; 940 $MAPWIDGET = new CFClient::MapWidget;
874 $MAPWIDGET->connect (activate_console => sub { 941 $MAPWIDGET->connect (activate_console => sub {
875 my ($mapwidget, $preset) = @_; 942 my ($mapwidget, $preset) = @_;
… …
884 } 951 }
885 }); 952 });
886 $MAPWIDGET->show; 953 $MAPWIDGET->show;
887 $MAPWIDGET->focus_in; 954 $MAPWIDGET->focus_in;
888 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
889 $BUTTONBAR = new CFClient::UI::HBox; 965 $BUTTONBAR = new CFClient::UI::HBox;
890 966
891 $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.");
892 $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.");
893 $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.");
894 973
895 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
896 975
897 $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.");
898 $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 :).");
899 980
900 $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 {
901 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 985 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
902 status "Configuration Saved"; 986 status "Configuration Saved";
987 },
903 }); 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 );
904 1001
905 $BUTTONBAR->show; 1002 $BUTTONBAR->show;
906 1003
907 $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]);
908 1005
… …
924my $bgmusic;#TODO#hack#d# 1021my $bgmusic;#TODO#hack#d#
925 1022
926sub audio_channel_finished { 1023sub audio_channel_finished {
927 my ($channel) = @_; 1024 my ($channel) = @_;
928 1025
929 warn "channel $channel finished\n";#d# 1026 #warn "channel $channel finished\n";#d#
930} 1027}
931 1028
932sub audio_music_finished { 1029sub audio_music_finished {
933 return unless $CFG->{bgm_enable}; 1030 return unless $CFG->{bgm_enable};
934 1031
… …
978my %animate_object; 1075my %animate_object;
979my $animate_timer; 1076my $animate_timer;
980 1077
981my $fps = 9; 1078my $fps = 9;
982 1079
1080my %demo;#d#
1081
983sub force_refresh { 1082sub force_refresh {
984 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1083 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
985 debug sprintf "%3.2f", $fps; 1084 debug sprintf "%3.2f", $fps;
986 1085
987 $CFClient::UI::ROOT->draw; 1086 $CFClient::UI::ROOT->draw;
988 CFClient::SDL_GL_SwapBuffers;
989 1087
990 $WANT_REFRESH = 0; 1088 $WANT_REFRESH = 0;
991 $CAN_REFRESH = 0; 1089 $CAN_REFRESH = 0;
992 $LAST_REFRESH = $NOW; 1090 $LAST_REFRESH = $NOW;
1091
10920 && do {
1093 # some weird model-drawing code, just a joke right now
1094 use CFClient::OpenGL;
1095
1096 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1097 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1098 $demo{r} ||= do {
1099 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1100 $mod->{v} = pack "f*", @{$mod->{v}};
1101 $_ = [scalar @$_, pack "S!*", @$_]
1102 for values %{$mod->{g}};
1103 $mod
1104 };
1105
1106 my $r = $demo{r} or die;
1107
1108 glDepthMask 1;
1109 glClear GL_DEPTH_BUFFER_BIT;
1110 glEnable GL_TEXTURE_2D;
1111 glEnable GL_DEPTH_TEST;
1112 glEnable GL_CULL_FACE;
1113 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1114
1115 glMatrixMode GL_PROJECTION;
1116 glLoadIdentity;
1117 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1118 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1119 glMatrixMode GL_MODELVIEW;
1120 glLoadIdentity;
1121
1122 glPushMatrix;
1123 glTranslate 0, 0, -800;
1124 glScale 1, -1, 1;
1125 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1126 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1127 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1128 glScale 50, 50, 50;
1129
1130 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1131 while (my ($k, $v) = each %{$r->{g}}) {
1132 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1133 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1134 }
1135
1136 glPopMatrix;
1137
1138 glShadeModel GL_FLAT;
1139 glDisable GL_DEPTH_TEST;
1140 glDisable GL_TEXTURE_2D;
1141 glDepthMask 0;
1142
1143 $WANT_REFRESH++;
1144};
1145
1146 CFClient::SDL_GL_SwapBuffers;
993} 1147}
994 1148
995my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1149my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
996 $NOW = time; 1150 $NOW = time;
997 1151
… …
1020 delete $animate_object{$widget}; 1174 delete $animate_object{$widget};
1021} 1175}
1022 1176
1023@conn::ISA = Crossfire::Protocol::; 1177@conn::ISA = Crossfire::Protocol::;
1024 1178
1179sub conn::new {
1180 my $class = shift;
1181
1182 my $self = $class->Crossfire::Protocol::new (@_);
1183
1184 $MAPWIDGET->clr_commands;
1185
1186 my $parser = new Pod::POM;
1187 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1188
1189 for my $head2 ($pod->head2) {
1190 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1191 or next;
1192
1193 my $cmd = $1;
1194 my @args = split /\|/, $2;
1195 @args = (".*") unless @args;
1196
1197 my $text = CFClient::pod_to_pango $head2->content;
1198
1199 for my $arg (@args) {
1200 $arg = $arg eq ".*" ? "" : " $arg";
1201
1202 $MAPWIDGET->add_command ("$cmd$arg", $text);
1203 }
1204 }
1205
1206 $self
1207}
1208
1025sub conn::stats_update { 1209sub conn::stats_update {
1026 my ($self, $stats) = @_; 1210 my ($self, $stats) = @_;
1211
1212 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1213 my $diff = $exp - $self->{prev_exp};
1214 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1215 if exists $self->{prev_exp} && $diff;
1216 $self->{prev_exp} = $exp;
1217 }
1027 1218
1028 update_stats_window ($stats); 1219 update_stats_window ($stats);
1029} 1220}
1030 1221
1031sub conn::user_send { 1222sub conn::user_send {
… …
1086 $self->set_texture ($id => $data); 1277 $self->set_texture ($id => $data);
1087 } 1278 }
1088 } 1279 }
1089} 1280}
1090 1281
1282# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1283# (server resource,s latency, bandwidth), so this hack is warranted.
1284# the right fix is to make real tiled maps with an overview file
1285sub conn::send_mapinfo {
1286 my ($self, $data, $cb) = @_;
1287
1288 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1289 my ($wx, $wy) = ($1, $2);
1290
1291 if ($data =~ /^spatial ([1-4]+)$/) {
1292 my @dx = (0, 0, 1, 0, -1);
1293 my @dy = (0, -1, 0, 1, 0);
1294 my ($dx, $dy);
1295
1296 for (split //, $1) {
1297 $dx += $dx[$_];
1298 $dy += $dy[$_];
1299 }
1300
1301 $cb->(spatial => 15,
1302 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1303 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1304 50, 50,
1305 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1306 );
1307
1308 return;
1309 }
1310 }
1311
1312 $self->SUPER::send_mapinfo ($data, $cb);
1313}
1314
1091# this method does a "flood fill" into every tile direction 1315# this method does a "flood fill" into every tile direction
1092# it assumes that tiles are arranged in a rectangular grid, 1316# it assumes that tiles are arranged in a rectangular grid,
1093# i.e. a map is the same as the left of the right map etc. 1317# i.e. a map is the same as the left of the right map etc.
1094# failure to comply are harmless and result in display errors 1318# failure to comply are harmless and result in display errors
1095# at worst. 1319# at worst.
1096sub conn::flood_fill { 1320sub conn::flood_fill {
1097 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1321 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1098 1322
1099 # the server does not allow map paths > 6 1323 # the server does not allow map paths > 6
1100 return if 7 <= length $path; 1324 return if 7 <= length $path;
1101 1325
1102 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1326 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1103 1327
1104 for ( 1328 for (
1105 [1, 0, -1], 1329 [1, 3, 0, -1],
1106 [2, 1, 0], 1330 [2, 4, 1, 0],
1107 [3, 0, 1], 1331 [3, 1, 0, 1],
1108 [4, -1, 0], 1332 [4, 2, -1, 0],
1109 ) { 1333 ) {
1110 my ($tile, $dx, $dy) = @$_; 1334 my ($tile, $tile2, $dx, $dy) = @$_;
1335
1336 next if $block & (1 << $tile);
1337 my $block = $block | (1 << $tile2);
1111 1338
1112 my $gx = $gx + $dx; 1339 my $gx = $gx + $dx;
1113 my $gy = $gy + $dy; 1340 my $gy = $gy + $dy;
1114 1341
1115 next unless $flags & (1 << ($tile - 1)); 1342 next unless $flags & (1 << ($tile - 1));
… …
1117 1344
1118 my $neigh = $self->{neigh_map}{$hash} ||= []; 1345 my $neigh = $self->{neigh_map}{$hash} ||= [];
1119 if (my $info = $neigh->[$tile]) { 1346 if (my $info = $neigh->[$tile]) {
1120 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1347 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1121 1348
1122 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1349 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1123 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1350 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1124 1351
1125 } else { 1352 } else {
1126 $self->send_mapinfo ("spatial $path$tile", sub { 1353 $self->send_mapinfo ("spatial $path$tile", sub {
1127 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1354 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1128 1355
1129 return if $mode ne "spatial"; 1356 return if $mode ne "spatial";
1130 1357
1131 $x += $MAP->ox; 1358 $x += $MAP->ox;
1132 $y += $MAP->oy; 1359 $y += $MAP->oy;
1133 1360
1134 $self->load_map ($hash, $x, $y) 1361 $self->load_map ($hash, $x, $y)
1135 unless $self->{neigh_map}{$hash}[5]++;#d# 1362 unless $self->{neigh_map}{$hash}[5]++;#d#
1136 1363
1137 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1364 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1138 1365
1139 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1366 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1140 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1367 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1141 }); 1368 });
1142 } 1369 }
1143 } 1370 }
1144} 1371}
… …
1157 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1384 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1158 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1385 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1159 ]; 1386 ];
1160 1387
1161 delete $self->{neigh_grid}; 1388 delete $self->{neigh_grid};
1162 $self->flood_fill (0, 0, "", $hash, $flags);
1163 1389
1164 $x += $ox; 1390 $x += $ox;
1165 $y += $oy; 1391 $y += $oy;
1166 1392
1167 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1393 $self->{map_info} = [$hash, $x, $y, $w, $h];
1168 1394
1169 my $map = $self->{map_info}[0];
1170 $map =~ s/^.*?\/([^\/]+)$/\1/; 1395 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1171 $STATWIDS->{map}->set_text ("Map: " . $map); 1396 $STATWIDS->{map}->set_text ("Map: " . $map);
1172 1397
1173 $self->load_map ($hash, $x, $y); 1398 $self->load_map ($hash, $x, $y);
1399 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1174} 1400}
1175 1401
1176sub conn::face_find { 1402sub conn::face_find {
1177 my ($self, $facenum, $face) = @_; 1403 my ($self, $facenum, $face) = @_;
1178 1404
… …
1306 ); 1532 );
1307 1533
1308 $entry->focus_in; 1534 $entry->focus_in;
1309 } 1535 }
1310 1536
1311 $dialog->show; 1537 $dialog->show_centered;
1312} 1538}
1313 1539
1314sub conn::drawinfo { 1540sub conn::drawinfo {
1315 my ($self, $color, $text) = @_; 1541 my ($self, $color, $text) = @_;
1316 1542
… …
1330 [0.74, 0.65, 0.41], 1556 [0.74, 0.65, 0.41],
1331 ); 1557 );
1332 1558
1333 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1559 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1334 1560
1335 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g; 1561 $text = CFClient::UI::Label::escape $text;
1336 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1562 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1337 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1563 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1338 1564
1339 $LOGVIEW->add_paragraph ($color[$color], 1565 $LOGVIEW->add_paragraph ($color[$color],
1340 join "\n", map "$time $_", split /\n/, $text); 1566 join "\n", map "$time $_", split /\n/, $text);
… …
1356sub conn::spell_add { 1582sub conn::spell_add {
1357 my ($self, $spell) = @_; 1583 my ($self, $spell) = @_;
1358 1584
1359 # TODO 1585 # TODO
1360 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1586 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1361 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1587 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1362 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1588 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1363} 1589}
1364 1590
1365sub conn::spell_delete { 1591sub conn::spell_delete {
1366 my ($self, $spell) = @_; 1592 my ($self, $spell) = @_;
1367} 1593}
1368 1594
1369sub conn::addme_success { 1595sub conn::addme_success {
1370 my ($self) = @_; 1596 my ($self) = @_;
1371 1597
1598 $self->send ("command output-sync $CFG->{output_sync}");
1599 $self->send ("command output-count $CFG->{output_count}");
1600
1601 my $parser = new Pod::POM;
1602 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1603
1604 my %skill_tooltip;
1605
1606 for my $head2 ($pod->head2) {
1607 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1608 }
1609
1372 for my $skill (values %{$self->{skill_info}}) { 1610 for my $skill (values %{$self->{skill_info}}) {
1373 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1611 $MAPWIDGET->add_command ("ready_skill $skill",
1374 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1612 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1613 . $skill_tooltip{$skill});
1614 $MAPWIDGET->add_command ("use_skill $skill",
1615 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1616 . $skill_tooltip{$skill});
1375 } 1617 }
1376
1377 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1378 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1379 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1380 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1381} 1618}
1382 1619
1383sub conn::eof { 1620sub conn::eof {
1621 $MAPWIDGET->clr_commands;
1622
1384 stop_game; 1623 stop_game;
1385} 1624}
1386 1625
1387sub update_floorbox { 1626sub update_floorbox {
1388 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1627 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
… …
1406} 1645}
1407 1646
1408sub conn::container_add { 1647sub conn::container_add {
1409 my ($self, $tag, $items) = @_; 1648 my ($self, $tag, $items) = @_;
1410 1649
1650 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1651
1411 if ($tag == 0) { 1652 if ($tag == 0) {
1412 update_floorbox; 1653 update_floorbox;
1654 $OPENCONT = 0;
1655 $INVR_LBL->set_text ("Floor");
1413 $INVR->set_items ($self->{container}{0}); 1656 $INVR->set_items ($self->{container}{0});
1414 $OPENCONT = 0;
1415 } elsif ($tag == $self->{player}{tag}) { 1657 } elsif ($tag == $self->{player}{tag}) {
1658 $INVR_LBL->set_text ("Player");
1416 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1659 $INV->set_items ($self->{container}{$self->{player}{tag}})
1417 } else { 1660 } else {
1418 $OPENCONT = $tag; 1661 $OPENCONT = $tag;
1662 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1419 $INVR->set_items ($self->{container}{$tag}); 1663 $INVR->set_items ($self->{container}{$tag});
1420 } 1664 }
1421 1665
1422 # $self-<{player}{tag} => player inv 1666 # $self-<{player}{tag} => player inv
1423 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1667 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1424} 1668}
1425 1669
1426sub conn::container_clear { 1670sub conn::container_clear {
1427 my ($self, $tag) = @_; 1671 my ($self, $tag) = @_;
1428 1672
1673 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1674
1429 if ($tag == 0) { 1675 if ($tag == 0) {
1430 update_floorbox; 1676 update_floorbox;
1677 $OPENCONT = 0;
1678 $INVR_LBL->set_text ("Floor");
1431 $INVR->set_items ($self->{container}{0}); 1679 $INVR->set_items ($self->{container}{0});
1432 $OPENCONT = 0;
1433 } elsif ($tag == $self->{player}{tag}) { 1680 } elsif ($tag == $self->{player}{tag}) {
1681 $INVR_LBL->set_text ("Player");
1434 $INV->set_items ($self->{container}{$tag}) 1682 $INV->set_items ($self->{container}{$tag})
1435 } else { 1683 } else {
1684 $OPENCONT = $tag;
1685 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1436 $INVR->set_items ($self->{container}{$tag}); 1686 $INVR->set_items ($self->{container}{$tag});
1437 $OPENCONT = $tag;
1438 } 1687 }
1439 1688
1440# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1689# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1441} 1690}
1442 1691
1443sub conn::item_delete { 1692sub conn::item_delete {
1444 my ($self, @items) = @_; 1693 my ($self, @items) = @_;
1445 1694
1446 for (@items) { 1695 for (@items) {
1696 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1697
1447 if ($_->{container} == 0) { 1698 if ($_->{container} == 0) {
1448 update_floorbox; 1699 update_floorbox;
1700 $OPENCONT = 0;
1701 $INVR_LBL->set_text ("Floor");
1449 $INVR->set_items ($self->{container}{0}); 1702 $INVR->set_items ($self->{container}{0});
1450 } elsif ($_->{container} == $self->{player}{tag}) { 1703 } elsif ($_->{container} == $self->{player}{tag}) {
1704 $INVR_LBL->set_text ("Player");
1451 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1705 $INV->set_items ($self->{container}{$self->{player}{tag}})
1452 } else { 1706 } else {
1707 $OPENCONT = $_->{container};
1708 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1453 $INVR->set_items ($self->{container}{0}); 1709 $INVR->set_items ($self->{container}{$_->{container}});
1454 } 1710 }
1455 } 1711 }
1456} 1712}
1457 1713
1458sub conn::item_update { 1714sub conn::item_update {
1459 my ($self, $item) = @_; 1715 my ($self, $item) = @_;
1460 1716
1461 if ($item->{container} == 0) { 1717 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1462 update_floorbox; 1718
1719 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1720 $OPENCONT = 0;
1721 $INVR_LBL->set_text ("Floor");
1463 $INVR->set_items ($self->{container}{0}); 1722 $INVR->set_items ($self->{container}{0});
1723
1724 $item->{widget}->update_item
1725 if $item->{widget};
1726 } else {
1727 if ($item->{container} == 0) {
1728 update_floorbox;
1729 $OPENCONT = 0;
1730 $INVR_LBL->set_text ("Floor");
1731 $INVR->set_items ($self->{container}{0});
1464 } elsif ($item->{container} == $self->{player}{tag}) { 1732 } elsif ($item->{container} == $self->{player}{tag}) {
1465 $INV->set_items ($self->{container}{$item->{container}}) 1733 $INV->set_items ($self->{container}{$item->{container}})
1734 }
1466 } 1735 }
1467} 1736}
1468 1737
1469%SDL_CB = ( 1738%SDL_CB = (
1470 CFClient::SDL_QUIT => sub { 1739 CFClient::SDL_QUIT => sub {
1471 Event::unloop -1; 1740 Event::unloop -1;
1472 }, 1741 },
1473 CFClient::SDL_VIDEORESIZE => sub { 1742 CFClient::SDL_VIDEORESIZE => sub {
1474 }, 1743 },
1475 CFClient::SDL_VIDEOEXPOSE => sub { 1744 CFClient::SDL_VIDEOEXPOSE => sub {
1476 $WANT_REFRESH++; 1745 CFClient::UI::full_refresh;
1477 }, 1746 },
1478 CFClient::SDL_ACTIVEEVENT => sub { 1747 CFClient::SDL_ACTIVEEVENT => sub {
1479# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1748# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1480 }, 1749 },
1481 CFClient::SDL_KEYDOWN => sub { 1750 CFClient::SDL_KEYDOWN => sub {
… …
1517 sdl_mode => 0, 1786 sdl_mode => 0,
1518 width => 640, 1787 width => 640,
1519 height => 480, 1788 height => 480,
1520 fullscreen => 0, 1789 fullscreen => 0,
1521 fast => 0, 1790 fast => 0,
1522 map_scale => 0.5, 1791 map_scale => 1,
1523 fow_enable => 1, 1792 fow_enable => 1,
1524 fow_intensity => 0.45, 1793 fow_intensity => 0.45,
1525 fow_smooth => 0, 1794 fow_smooth => 0,
1526 gui_fontsize => 1, 1795 gui_fontsize => 1,
1527 log_fontsize => 1, 1796 log_fontsize => 1,
… …
1532 host => "crossfire.schmorp.de", 1801 host => "crossfire.schmorp.de",
1533 say_command => 'say', 1802 say_command => 'say',
1534 audio_enable => 1, 1803 audio_enable => 1,
1535 bgm_enable => 1, 1804 bgm_enable => 1,
1536 bgm_volume => 0.25, 1805 bgm_volume => 0.25,
1806 output_sync => 1,
1807 output_count => 1,
1537 ); 1808 );
1538 1809
1539 while (my ($k, $v) = each %DEF_CFG) { 1810 while (my ($k, $v) = each %DEF_CFG) {
1540 $CFG->{$k} = $v unless exists $CFG->{$k}; 1811 $CFG->{$k} = $v unless exists $CFG->{$k};
1541 } 1812 }
… …
1570 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1841 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1571 1842
1572 $FONT_PROP->make_default; 1843 $FONT_PROP->make_default;
1573 } 1844 }
1574 1845
1846# compare mono (ft) vs. rgba (cairo)
1847# ft - 1.8s, cairo 3s, even in alpha-only mode
1848# for my $rgba (0..1) {
1849# my $t1 = Time::HiRes::time;
1850# for (1..1000) {
1851# my $layout = CFClient::Layout->new ($rgba);
1852# $layout->set_text ("hallo" x 100);
1853# $layout->render;
1854# }
1855# my $t2 = Time::HiRes::time;
1856# warn $t2-$t1;
1857# }
1858
1575 video_init; 1859 video_init;
1576 audio_init; 1860 audio_init;
1577} 1861}
1578 1862
1579Event::loop; 1863Event::loop;
… …
1633 1917
1634Typing B<climb> will display a list of commands with I<climb> in their 1918Typing B<climb> will display a list of commands with I<climb> in their
1635name, such as I<ready_skill climbing> and I<use_skill climbing>. 1919name, such as I<ready_skill climbing> and I<use_skill climbing>.
1636 1920
1637You can abbreviate commands by typing only the first character of every 1921You can abbreviate commands by typing only the first character of every
1638word. For example, typing I<iwor> will likely select I<invoke word of 1922word (or even characters within the word - the client will try to make
1639recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1923a good guess, as long as the characters are in order). For example,
1640will likely select I<ready_skill climbing> and I<usl> will give you 1924typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1641I<use_skill levitation>. 1925will select I<cast create food>. Likewise, I<rscli> will likely select
1926I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1927
1928You can enter space and other text as arguemnt to the command. For
1929example, C<cfoo waybread> will expand to C<cast create food waybread>.
1642 1930
1643=head2 The map overview 1931=head2 The map overview
1644 1932
1645#TODO# 1933#TODO#
1646 1934

Diff Legend

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