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.220 by root, Wed May 17 00:28:46 2006 UTC vs.
Revision 1.236 by root, Mon May 22 03:28:55 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
… …
100our $DEBUG_STATUS; 101our $DEBUG_STATUS;
101 102
102our $INVWIN; 103our $INVWIN;
103our $INV; 104our $INV;
104our $INVR; 105our $INVR;
106our $INVR_LBL;
105our $OPENCONT; 107our $OPENCONT;
106 108
107sub status { 109sub status {
108 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]); 110 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
109} 111}
110 112
111sub debug { 113sub debug {
112 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
113 my ($w, $h) = $DEBUG_STATUS->size_request; 115 my ($w, $h) = $DEBUG_STATUS->size_request;
… …
134 maph => $mapsize, 136 maph => $mapsize,
135 ; 137 ;
136 }; 138 };
137 139
138 if ($CONN) { 140 if ($CONN) {
141 CFClient::lowdelay fileno $CONN->{fh};
142
139 $LOGIN_BUTTON->set_text ("Logout"); 143 $LOGIN_BUTTON->set_text ("Logout");
140
141 status "login successful"; 144 status "login successful";
142 145
143 CFClient::lowdelay fileno $CONN->{fh}; 146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
144 } else { 149 } else {
145 status "unable to connect"; 150 status "unable to connect";
146 stop_game(); 151 stop_game();
147 } 152 }
148} 153}
… …
152 157
153 status "connection closed"; 158 status "connection closed";
154 $LOGIN_BUTTON->set_text ("Login"); 159 $LOGIN_BUTTON->set_text ("Login");
155 $CONN->destroy; 160 $CONN->destroy;
156 $CONN = 0; # false, does not autovivify 161 $CONN = 0; # false, does not autovivify
162
163 $BUTTONBAR->{children}[1]->emit ("activate")
164 unless $BUTTONBAR->{children}[1]->{state};
157 165
158 undef $MAPCACHE; 166 undef $MAPCACHE;
159 undef $MAP; 167 undef $MAP;
160} 168}
161 169
… …
392 (my $hb = new CFClient::UI::HBox), 400 (my $hb = new CFClient::UI::HBox),
393 ], 401 ],
394 ); 402 );
395 403
396 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 404 $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."); 405 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
398 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 406 $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."); 407 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
400 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 408 $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."); 409 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
402 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 410 $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."); 411 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
404 412
405 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 413 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
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."); 414 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
407 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 415 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
408 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 416 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
409 417
410 $GAUGES = { 418 $GAUGES = {
411 exp => $exp, win => $win, range => $rng, 419 exp => $exp, win => $win, range => $rng,
412 food => $fg, mana => $mg, hp => $hg, grace => $gg 420 food => $fg, mana => $mg, hp => $hg, grace => $gg
413 }; 421 };
… …
419 427
420sub make_stats_window { 428sub make_stats_window {
421 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats"; 429 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
422 430
423 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 431 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
424 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 432 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
433 can_hover => 1, can_events => 1,
434 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
425 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 435 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
436 can_hover => 1, can_events => 1,
437 tooltip => "The map you are currently on (if supported by the server).");
426 438
427 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 439 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
428
429 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 440 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
430 441
431 my $black = [0, 0, 0]; 442 my $black = [0, 0, 0];
432 443
433 for ( 444 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"], 445 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
435 [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"], 446 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],
436 [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"], 447 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],
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"], 448 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],
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"], 449 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
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"], 450 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],
440 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."], 451 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
441 452
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."], 453 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
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."], 454 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
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."], 455 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
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."], 456 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."],
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."], 457 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
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."], 458 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
448 ) { 459 ) {
449 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 460 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
450 461
451 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 462 $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); 463 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
… …
458 469
459 my $row = 0; 470 my $row = 0;
460 my $col = 0; 471 my $col = 0;
461 472
462 my %resist_names = ( 473 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.)", 474 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
464 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 475 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
465 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)", 476 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",
466 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 477 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
467 depl => "Depletion (some monsters and other effects can cause stats depletion)", 478 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",
468 magic => "Magic (resistance to magic spells like magic missile or similar)", 479 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",
469 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 480 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
470 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 481 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
471 pois => "Poison (resistance to getting poisoned)", 482 pois => "<b>Poison</b> (resistance to getting poisoned)",
472 para => "Paralysation (this resistance affects the chance you get paralysed)", 483 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
473 deat => "Death (resistance against death spells)", 484 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)", 485 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)", 486 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)", 487 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
477 tund => "Turn undead", 488 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
478 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)", 489 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
479 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)", 490 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
480 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 491 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
481 ); 492 );
482 for (qw/slow holyw conf fire depl magic 493 for (qw/slow holyw conf fire depl magic
483 drain acid pois para deat phys 494 drain acid pois para deat phys
484 blind fear tund elec cold ghit/) 495 blind fear tund elec cold ghit/)
485 { 496 {
… …
665 $HOST->set_text ($CFG->{host} = $host); 676 $HOST->set_text ($CFG->{host} = $host);
666 }), 677 }),
667 (new CFClient::UI::Empty expand => 1), 678 (new CFClient::UI::Empty expand => 1),
668 ]); 679 ]);
669 680
670 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 681 $table->add ($_ + 1, $y, new CFClient::UI::Label
682 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
671 for 0 .. $#$m; 683 for 0 .. $#$m;
672 } 684 }
673 } 685 }
674 }); 686 });
675} 687}
… …
741 753
742 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 754 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
743 }, 755 },
744 ); 756 );
745 757
758 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
759 $table->add (1, 8, new CFClient::UI::Entry
760 text => $CFG->{output_count},
761 tooltip => "Should be set to 1 unless you know what you are doing",
762 connect_changed => sub { $CFG->{output_count} = $_[1] },
763 );
764
765 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
766 $table->add (1, 9, new CFClient::UI::Entry
767 text => $CFG->{output_sync},
768 tooltip => "Should be set to 1 unless you know what you are doing",
769 connect_changed => sub { $CFG->{output_sync} = $_[1] },
770 );
771
746 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button 772 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
747 expand => 1, 773 expand => 1,
748 align => 0, 774 align => 0,
749 text => "Login", 775 text => "Login",
750 connect_activate => sub { 776 connect_activate => sub {
751 $CONN ? stop_game 777 $CONN ? stop_game
… …
758 784
759sub message_window { 785sub message_window {
760 my $window = new CFClient::UI::FancyFrame 786 my $window = new CFClient::UI::FancyFrame
761 title => "Messages", 787 title => "Messages",
762 border_bg => [1, 1, 1, 1], 788 border_bg => [1, 1, 1, 1],
763 bg => [0, 0, 0, 0.5], 789 bg => [0, 0, 0, 0.75],
764 user_w => int $::WIDTH / 3, 790 user_w => int $::WIDTH / 3,
765 user_h => int $::HEIGHT / 5, 791 user_h => int $::HEIGHT / 5,
766 child => (my $vbox = new CFClient::UI::VBox); 792 child => (my $vbox = new CFClient::UI::VBox);
767 793
768 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 794 $vbox->add ($LOGVIEW);
769 expand => 1,
770 font => $FONT_FIXED,
771 fontsize => $::CFG->{log_fontsize},
772 );
773 795
774 $vbox->add (my $input = new CFClient::UI::Entry 796 $vbox->add (my $input = new CFClient::UI::Entry
797 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
798 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
799 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
800 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
775 connect_focus_in => sub { 801 connect_focus_in => sub {
776 my ($input, $prev_focus) = @_; 802 my ($input, $prev_focus) = @_;
777 803
778 delete $input->{refocus_map}; 804 delete $input->{refocus_map};
779 805
… …
812 838
813sub make_inventory_window { 839sub make_inventory_window {
814 my $invwin = new CFClient::UI::FancyFrame 840 my $invwin = new CFClient::UI::FancyFrame
815 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory"; 841 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
816 842
817 $invwin->add (my $hb = new CFClient::UI::HBox); 843 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
844
845 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
846 $vb1->add (my $lbl = new CFClient::UI::Label);
847 $lbl->set_text ("Player");
818 $hb->add ($INV = new CFClient::UI::Inventory expand => 1); 848 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
849
850 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
851 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
852 $INVR_LBL->set_text ("Floor");
819 $hb->add ($INVR = new CFClient::UI::Inventory expand => 1); 853 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
820 854
821 $invwin 855 $invwin
822} 856}
823 857
824sub sdl_init { 858sub sdl_init {
… …
834 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 868 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
835 $FULLSCREEN = $CFG->{fullscreen}; 869 $FULLSCREEN = $CFG->{fullscreen};
836 $FAST = $CFG->{fast}; 870 $FAST = $CFG->{fast};
837 871
838 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 872 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
839 or die "SDL_SetVideoMode failed!\n"; 873 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
840 874
841 $SDL_ACTIVE = 1; 875 $SDL_ACTIVE = 1;
842 $LAST_REFRESH = time - 0.01; 876 $LAST_REFRESH = time - 0.01;
843 877
844 CFClient::gl_init; 878 CFClient::gl_init;
… …
865 )->show; 899 )->show;
866 900
867 CFClient::UI::FancyFrame->new ( 901 CFClient::UI::FancyFrame->new (
868 border_bg => [1, 1, 1, 192/255], 902 border_bg => [1, 1, 1, 192/255],
869 bg => [1, 1, 1, 0], 903 bg => [1, 1, 1, 0],
870 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 904 child => ($MAPMAP = new CFClient::MapWidget::MapMap
905 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
906 ),
871 )->show; 907 )->show;
872 908
873 $MAPWIDGET = new CFClient::MapWidget; 909 $MAPWIDGET = new CFClient::MapWidget;
874 $MAPWIDGET->connect (activate_console => sub { 910 $MAPWIDGET->connect (activate_console => sub {
875 my ($mapwidget, $preset) = @_; 911 my ($mapwidget, $preset) = @_;
… …
884 } 920 }
885 }); 921 });
886 $MAPWIDGET->show; 922 $MAPWIDGET->show;
887 $MAPWIDGET->focus_in; 923 $MAPWIDGET->focus_in;
888 924
925 $LOGVIEW = new CFClient::UI::TextView
926 expand => 1,
927 font => $FONT_FIXED,
928 fontsize => $::CFG->{log_fontsize},
929 can_hover => 1,
930 can_events => 1,
931 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
932 ;
933
889 $BUTTONBAR = new CFClient::UI::HBox; 934 $BUTTONBAR = new CFClient::UI::HBox;
890 935
891 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 936 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
937 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
892 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 938 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
939 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
893 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 940 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
941 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
894 942
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 943 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
896 944
897 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 945 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
946 tooltip => "Toggles the statistics window, where all your Stats and Resistances are beign displaye at all times.");
898 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 947 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
948 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
899 949
900 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 950 $BUTTONBAR->add (new CFClient::UI::Button
951 text => "Save Config",
952 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
953 connect_activate => sub {
901 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 954 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
902 status "Configuration Saved"; 955 status "Configuration Saved";
956 },
903 }); 957 );
904 958
905 $BUTTONBAR->show; 959 $BUTTONBAR->show;
906 960
907 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 961 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
908 962
… …
924my $bgmusic;#TODO#hack#d# 978my $bgmusic;#TODO#hack#d#
925 979
926sub audio_channel_finished { 980sub audio_channel_finished {
927 my ($channel) = @_; 981 my ($channel) = @_;
928 982
929 warn "channel $channel finished\n";#d# 983 #warn "channel $channel finished\n";#d#
930} 984}
931 985
932sub audio_music_finished { 986sub audio_music_finished {
933 return unless $CFG->{bgm_enable}; 987 return unless $CFG->{bgm_enable};
934 988
… …
978my %animate_object; 1032my %animate_object;
979my $animate_timer; 1033my $animate_timer;
980 1034
981my $fps = 9; 1035my $fps = 9;
982 1036
1037my %demo;#d#
1038
983sub force_refresh { 1039sub force_refresh {
984 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1040 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
985 debug sprintf "%3.2f", $fps; 1041 debug sprintf "%3.2f", $fps;
986 1042
987 $CFClient::UI::ROOT->draw; 1043 $CFClient::UI::ROOT->draw;
988 CFClient::SDL_GL_SwapBuffers;
989 1044
990 $WANT_REFRESH = 0; 1045 $WANT_REFRESH = 0;
991 $CAN_REFRESH = 0; 1046 $CAN_REFRESH = 0;
992 $LAST_REFRESH = $NOW; 1047 $LAST_REFRESH = $NOW;
1048
10490 && do {
1050 # some weird model-drawing code, just a joke right now
1051 use CFClient::OpenGL;
1052
1053 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1054 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1055 $demo{r} ||= do {
1056 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1057 $mod->{v} = pack "f*", @{$mod->{v}};
1058 $_ = [scalar @$_, pack "S!*", @$_]
1059 for values %{$mod->{g}};
1060 $mod
1061 };
1062
1063 my $r = $demo{r} or die;
1064
1065 glDepthMask 1;
1066 glClear GL_DEPTH_BUFFER_BIT;
1067 glEnable GL_TEXTURE_2D;
1068 glEnable GL_DEPTH_TEST;
1069 glEnable GL_CULL_FACE;
1070 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1071
1072 glMatrixMode GL_PROJECTION;
1073 glLoadIdentity;
1074 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1075 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1076 glMatrixMode GL_MODELVIEW;
1077 glLoadIdentity;
1078
1079 glPushMatrix;
1080 glTranslate 0, 0, -800;
1081 glScale 1, -1, 1;
1082 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1083 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1084 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1085 glScale 50, 50, 50;
1086
1087 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1088 while (my ($k, $v) = each %{$r->{g}}) {
1089 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1090 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1091 }
1092
1093 glPopMatrix;
1094
1095 glShadeModel GL_FLAT;
1096 glDisable GL_DEPTH_TEST;
1097 glDisable GL_TEXTURE_2D;
1098 glDepthMask 0;
1099
1100 $WANT_REFRESH++;
1101};
1102
1103 CFClient::SDL_GL_SwapBuffers;
993} 1104}
994 1105
995my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1106my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
996 $NOW = time; 1107 $NOW = time;
997 1108
… …
1020 delete $animate_object{$widget}; 1131 delete $animate_object{$widget};
1021} 1132}
1022 1133
1023@conn::ISA = Crossfire::Protocol::; 1134@conn::ISA = Crossfire::Protocol::;
1024 1135
1136sub conn::new {
1137 my $class = shift;
1138
1139 my $self = $class->Crossfire::Protocol::new (@_);
1140
1141 $MAPWIDGET->clr_commands;
1142
1143 my $parser = new Pod::POM;
1144 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1145
1146 for my $head2 ($pod->head2) {
1147 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1148 or next;
1149
1150 my $cmd = $1;
1151 my @args = split /\|/, $2;
1152 @args = (".*") unless @args;
1153
1154 my $text = CFClient::pod_to_pango $head2->content;
1155
1156 for my $arg (@args) {
1157 $arg = $arg eq ".*" ? "" : " $arg";
1158
1159 $MAPWIDGET->add_command ("$cmd$arg", $text);
1160 }
1161 }
1162
1163 $self
1164}
1165
1025sub conn::stats_update { 1166sub conn::stats_update {
1026 my ($self, $stats) = @_; 1167 my ($self, $stats) = @_;
1168
1169 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1170 my $diff = $exp - $self->{prev_exp};
1171 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1172 if exists $self->{prev_exp} && $diff;
1173 $self->{prev_exp} = $exp;
1174 }
1027 1175
1028 update_stats_window ($stats); 1176 update_stats_window ($stats);
1029} 1177}
1030 1178
1031sub conn::user_send { 1179sub conn::user_send {
… …
1086 $self->set_texture ($id => $data); 1234 $self->set_texture ($id => $data);
1087 } 1235 }
1088 } 1236 }
1089} 1237}
1090 1238
1239# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1240# (server resource,s latency, bandwidth), so this hack is warranted.
1241# the right fix is to make real tiled maps with an overview file
1242sub conn::send_mapinfo {
1243 my ($self, $data, $cb) = @_;
1244
1245 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1246 my ($wx, $wy) = ($1, $2);
1247
1248 if ($data =~ /^spatial ([1-4]+)$/) {
1249 my @dx = (0, 0, 1, 0, -1);
1250 my @dy = (0, -1, 0, 1, 0);
1251 my ($dx, $dy);
1252
1253 for (split //, $1) {
1254 $dx += $dx[$_];
1255 $dy += $dy[$_];
1256 }
1257
1258 $cb->(spatial => 15,
1259 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1260 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1261 50, 50,
1262 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1263 );
1264
1265 return;
1266 }
1267 }
1268
1269 $self->SUPER::send_mapinfo ($data, $cb);
1270}
1271
1091# this method does a "flood fill" into every tile direction 1272# this method does a "flood fill" into every tile direction
1092# it assumes that tiles are arranged in a rectangular grid, 1273# 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. 1274# 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 1275# failure to comply are harmless and result in display errors
1095# at worst. 1276# at worst.
1096sub conn::flood_fill { 1277sub conn::flood_fill {
1097 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1278 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1098 1279
1099 # the server does not allow map paths > 6 1280 # the server does not allow map paths > 6
1100 return if 7 <= length $path; 1281 return if 7 <= length $path;
1101 1282
1102 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1283 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1103 1284
1104 for ( 1285 for (
1105 [1, 0, -1], 1286 [1, 3, 0, -1],
1106 [2, 1, 0], 1287 [2, 4, 1, 0],
1107 [3, 0, 1], 1288 [3, 1, 0, 1],
1108 [4, -1, 0], 1289 [4, 2, -1, 0],
1109 ) { 1290 ) {
1110 my ($tile, $dx, $dy) = @$_; 1291 my ($tile, $tile2, $dx, $dy) = @$_;
1292
1293 next if $block & (1 << $tile);
1294 my $block = $block | (1 << $tile2);
1111 1295
1112 my $gx = $gx + $dx; 1296 my $gx = $gx + $dx;
1113 my $gy = $gy + $dy; 1297 my $gy = $gy + $dy;
1114 1298
1115 next unless $flags & (1 << ($tile - 1)); 1299 next unless $flags & (1 << ($tile - 1));
… …
1117 1301
1118 my $neigh = $self->{neigh_map}{$hash} ||= []; 1302 my $neigh = $self->{neigh_map}{$hash} ||= [];
1119 if (my $info = $neigh->[$tile]) { 1303 if (my $info = $neigh->[$tile]) {
1120 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1304 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1121 1305
1122 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1306 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1123 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1307 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1124 1308
1125 } else { 1309 } else {
1126 $self->send_mapinfo ("spatial $path$tile", sub { 1310 $self->send_mapinfo ("spatial $path$tile", sub {
1127 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1311 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1128 1312
1129 return if $mode ne "spatial"; 1313 return if $mode ne "spatial";
1130 1314
1131 $x += $MAP->ox; 1315 $x += $MAP->ox;
1132 $y += $MAP->oy; 1316 $y += $MAP->oy;
1133 1317
1134 $self->load_map ($hash, $x, $y) 1318 $self->load_map ($hash, $x, $y)
1135 unless $self->{neigh_map}{$hash}[5]++;#d# 1319 unless $self->{neigh_map}{$hash}[5]++;#d#
1136 1320
1137 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1321 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1138 1322
1139 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1323 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1140 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1324 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1141 }); 1325 });
1142 } 1326 }
1143 } 1327 }
1144} 1328}
… …
1157 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1341 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1158 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1342 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1159 ]; 1343 ];
1160 1344
1161 delete $self->{neigh_grid}; 1345 delete $self->{neigh_grid};
1162 $self->flood_fill (0, 0, "", $hash, $flags);
1163 1346
1164 $x += $ox; 1347 $x += $ox;
1165 $y += $oy; 1348 $y += $oy;
1166 1349
1167 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1350 $self->{map_info} = [$hash, $x, $y, $w, $h];
1168 1351
1169 my $map = $self->{map_info}[0];
1170 $map =~ s/^.*?\/([^\/]+)$/\1/; 1352 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1171 $STATWIDS->{map}->set_text ("Map: " . $map); 1353 $STATWIDS->{map}->set_text ("Map: " . $map);
1172 1354
1173 $self->load_map ($hash, $x, $y); 1355 $self->load_map ($hash, $x, $y);
1356 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1174} 1357}
1175 1358
1176sub conn::face_find { 1359sub conn::face_find {
1177 my ($self, $facenum, $face) = @_; 1360 my ($self, $facenum, $face) = @_;
1178 1361
… …
1356sub conn::spell_add { 1539sub conn::spell_add {
1357 my ($self, $spell) = @_; 1540 my ($self, $spell) = @_;
1358 1541
1359 # TODO 1542 # TODO
1360 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1543 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1361 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1544 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1362 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1545 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1363} 1546}
1364 1547
1365sub conn::spell_delete { 1548sub conn::spell_delete {
1366 my ($self, $spell) = @_; 1549 my ($self, $spell) = @_;
1367} 1550}
1368 1551
1369sub conn::addme_success { 1552sub conn::addme_success {
1370 my ($self) = @_; 1553 my ($self) = @_;
1371 1554
1372 $MAPWIDGET->clr_commands; 1555 $self->send ("command output-sync $CFG->{output_sync}");
1556 $self->send ("command output-count $CFG->{output_count}");
1557
1558 my $parser = new Pod::POM;
1559 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1560
1561 my %skill_tooltip;
1562
1563 for my $head2 ($pod->head2) {
1564 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1565 }
1373 1566
1374 for my $skill (values %{$self->{skill_info}}) { 1567 for my $skill (values %{$self->{skill_info}}) {
1375 $MAPWIDGET->add_command ("ready_\\skill $skill", "Ready the skill '$skill'"); 1568 $MAPWIDGET->add_command ("ready_skill $skill",
1376 $MAPWIDGET->add_command ("use_\\skill $skill", "Immediately use the skill '$skill'"); 1569 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1570 . $skill_tooltip{$skill});
1571 $MAPWIDGET->add_command ("use_skill $skill",
1572 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1573 . $skill_tooltip{$skill});
1377 } 1574 }
1378
1379 $MAPWIDGET->add_command ("pet\\mode defend", "Tell pets to stay close to you and defend you");
1380 $MAPWIDGET->add_command ("pet\\mode arena", "Same as petmode sad, but also attack other players");
1381 $MAPWIDGET->add_command ("pet\\mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1382 $MAPWIDGET->add_command ("kill\\pets", "Kill your pets");
1383 $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
1384 $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
1385 $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
1386
1387 # TODO: add documentation on these
1388 for (qw(
1389 afk
1390 apply
1391 applymode
1392 body
1393 bowmode
1394 brace
1395 build
1396 disarm
1397 dm
1398 dmhide
1399 drop
1400 dropall
1401 examine
1402 get
1403 gsay
1404 help
1405 hiscore
1406 inventory
1407 invoke
1408 killpets
1409 listen
1410 logs
1411 mapinfo
1412 maps
1413 mark
1414 motd
1415 output-count
1416 output-sync
1417 party
1418 peaceful
1419 petmode
1420 pickup
1421 players
1422 prepare
1423 quests
1424 rename
1425 resistances
1426 rotateshoottype
1427 save
1428 say
1429 search
1430 search-items
1431 showpets
1432 skills
1433 sound
1434 take
1435 throw
1436 time
1437 title
1438 usekeys
1439 version
1440 weather
1441 whereabouts
1442 whereami
1443 who
1444 wimpy
1445 )) {
1446 $MAPWIDGET->add_command ($_, "$_: no help available (yet)");
1447 }
1448
1449 #TODO: add " and ' "aliases" etc.
1450} 1575}
1451 1576
1452sub conn::eof { 1577sub conn::eof {
1453 $MAPWIDGET->clr_commands; 1578 $MAPWIDGET->clr_commands;
1454 1579
… …
1477} 1602}
1478 1603
1479sub conn::container_add { 1604sub conn::container_add {
1480 my ($self, $tag, $items) = @_; 1605 my ($self, $tag, $items) = @_;
1481 1606
1607 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1608
1482 if ($tag == 0) { 1609 if ($tag == 0) {
1483 update_floorbox; 1610 update_floorbox;
1611 $OPENCONT = 0;
1612 $INVR_LBL->set_text ("Floor");
1484 $INVR->set_items ($self->{container}{0}); 1613 $INVR->set_items ($self->{container}{0});
1485 $OPENCONT = 0;
1486 } elsif ($tag == $self->{player}{tag}) { 1614 } elsif ($tag == $self->{player}{tag}) {
1615 $INVR_LBL->set_text ("Player");
1487 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1616 $INV->set_items ($self->{container}{$self->{player}{tag}})
1488 } else { 1617 } else {
1489 $OPENCONT = $tag; 1618 $OPENCONT = $tag;
1619 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1490 $INVR->set_items ($self->{container}{$tag}); 1620 $INVR->set_items ($self->{container}{$tag});
1491 } 1621 }
1492 1622
1493 # $self-<{player}{tag} => player inv 1623 # $self-<{player}{tag} => player inv
1494 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1624 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1495} 1625}
1496 1626
1497sub conn::container_clear { 1627sub conn::container_clear {
1498 my ($self, $tag) = @_; 1628 my ($self, $tag) = @_;
1499 1629
1630 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1631
1500 if ($tag == 0) { 1632 if ($tag == 0) {
1501 update_floorbox; 1633 update_floorbox;
1634 $OPENCONT = 0;
1635 $INVR_LBL->set_text ("Floor");
1502 $INVR->set_items ($self->{container}{0}); 1636 $INVR->set_items ($self->{container}{0});
1503 $OPENCONT = 0;
1504 } elsif ($tag == $self->{player}{tag}) { 1637 } elsif ($tag == $self->{player}{tag}) {
1638 $INVR_LBL->set_text ("Player");
1505 $INV->set_items ($self->{container}{$tag}) 1639 $INV->set_items ($self->{container}{$tag})
1506 } else { 1640 } else {
1641 $OPENCONT = $tag;
1642 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1507 $INVR->set_items ($self->{container}{$tag}); 1643 $INVR->set_items ($self->{container}{$tag});
1508 $OPENCONT = $tag;
1509 } 1644 }
1510 1645
1511# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1646# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1512} 1647}
1513 1648
1514sub conn::item_delete { 1649sub conn::item_delete {
1515 my ($self, @items) = @_; 1650 my ($self, @items) = @_;
1516 1651
1517 for (@items) { 1652 for (@items) {
1653 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1654
1518 if ($_->{container} == 0) { 1655 if ($_->{container} == 0) {
1519 update_floorbox; 1656 update_floorbox;
1657 $OPENCONT = 0;
1658 $INVR_LBL->set_text ("Floor");
1520 $INVR->set_items ($self->{container}{0}); 1659 $INVR->set_items ($self->{container}{0});
1521 } elsif ($_->{container} == $self->{player}{tag}) { 1660 } elsif ($_->{container} == $self->{player}{tag}) {
1661 $INVR_LBL->set_text ("Player");
1522 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1662 $INV->set_items ($self->{container}{$self->{player}{tag}})
1523 } else { 1663 } else {
1664 $OPENCONT = $_->{container};
1665 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1524 $INVR->set_items ($self->{container}{0}); 1666 $INVR->set_items ($self->{container}{$_->{container}});
1525 } 1667 }
1526 } 1668 }
1527} 1669}
1528 1670
1529sub conn::item_update { 1671sub conn::item_update {
1530 my ($self, $item) = @_; 1672 my ($self, $item) = @_;
1531 1673
1532 if ($item->{container} == 0) { 1674 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1533 update_floorbox; 1675
1676 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1677 $OPENCONT = 0;
1678 $INVR_LBL->set_text ("Floor");
1534 $INVR->set_items ($self->{container}{0}); 1679 $INVR->set_items ($self->{container}{0});
1680
1681 $item->{widget}->update_item
1682 if $item->{widget};
1683 } else {
1684 if ($item->{container} == 0) {
1685 update_floorbox;
1686 $OPENCONT = 0;
1687 $INVR_LBL->set_text ("Floor");
1688 $INVR->set_items ($self->{container}{0});
1535 } elsif ($item->{container} == $self->{player}{tag}) { 1689 } elsif ($item->{container} == $self->{player}{tag}) {
1536 $INV->set_items ($self->{container}{$item->{container}}) 1690 $INV->set_items ($self->{container}{$item->{container}})
1691 }
1537 } 1692 }
1538} 1693}
1539 1694
1540%SDL_CB = ( 1695%SDL_CB = (
1541 CFClient::SDL_QUIT => sub { 1696 CFClient::SDL_QUIT => sub {
1542 Event::unloop -1; 1697 Event::unloop -1;
1543 }, 1698 },
1544 CFClient::SDL_VIDEORESIZE => sub { 1699 CFClient::SDL_VIDEORESIZE => sub {
1545 }, 1700 },
1546 CFClient::SDL_VIDEOEXPOSE => sub { 1701 CFClient::SDL_VIDEOEXPOSE => sub {
1547 $WANT_REFRESH++; 1702 CFClient::UI::full_refresh;
1548 }, 1703 },
1549 CFClient::SDL_ACTIVEEVENT => sub { 1704 CFClient::SDL_ACTIVEEVENT => sub {
1550# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1705# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1551 }, 1706 },
1552 CFClient::SDL_KEYDOWN => sub { 1707 CFClient::SDL_KEYDOWN => sub {
… …
1588 sdl_mode => 0, 1743 sdl_mode => 0,
1589 width => 640, 1744 width => 640,
1590 height => 480, 1745 height => 480,
1591 fullscreen => 0, 1746 fullscreen => 0,
1592 fast => 0, 1747 fast => 0,
1593 map_scale => 0.5, 1748 map_scale => 1,
1594 fow_enable => 1, 1749 fow_enable => 1,
1595 fow_intensity => 0.45, 1750 fow_intensity => 0.45,
1596 fow_smooth => 0, 1751 fow_smooth => 0,
1597 gui_fontsize => 1, 1752 gui_fontsize => 1,
1598 log_fontsize => 1, 1753 log_fontsize => 1,
… …
1603 host => "crossfire.schmorp.de", 1758 host => "crossfire.schmorp.de",
1604 say_command => 'say', 1759 say_command => 'say',
1605 audio_enable => 1, 1760 audio_enable => 1,
1606 bgm_enable => 1, 1761 bgm_enable => 1,
1607 bgm_volume => 0.25, 1762 bgm_volume => 0.25,
1763 output_sync => 1,
1764 output_count => 1,
1608 ); 1765 );
1609 1766
1610 while (my ($k, $v) = each %DEF_CFG) { 1767 while (my ($k, $v) = each %DEF_CFG) {
1611 $CFG->{$k} = $v unless exists $CFG->{$k}; 1768 $CFG->{$k} = $v unless exists $CFG->{$k};
1612 } 1769 }
… …
1717 1874
1718Typing B<climb> will display a list of commands with I<climb> in their 1875Typing B<climb> will display a list of commands with I<climb> in their
1719name, such as I<ready_skill climbing> and I<use_skill climbing>. 1876name, such as I<ready_skill climbing> and I<use_skill climbing>.
1720 1877
1721You can abbreviate commands by typing only the first character of every 1878You can abbreviate commands by typing only the first character of every
1722word. For example, typing I<iwor> will likely select I<invoke word of 1879word (or even characters within the word - the client will try to make
1723recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1880a good guess, as long as the characters are in order). For example,
1724will likely select I<ready_skill climbing> and I<usl> will give you 1881typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1725I<use_skill levitation>. 1882will select I<cast create food>. Likewise, I<rscli> will likely select
1883I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1884
1885You can enter space and other text as arguemnt to the command. For
1886example, C<cfoo waybread> will expand to C<cast create food waybread>.
1726 1887
1727=head2 The map overview 1888=head2 The map overview
1728 1889
1729#TODO# 1890#TODO#
1730 1891

Diff Legend

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