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.177 by root, Mon Apr 24 11:45:17 2006 UTC vs.
Revision 1.194 by root, Sun Apr 30 09:21:48 2006 UTC

… …
40 40
41$Event::DIED = sub { 41$Event::DIED = sub {
42 CFClient::error $_[1]; 42 CFClient::error $_[1];
43}; 43};
44 44
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46
45our $VERSION = '0.1'; 47our $VERSION = '0.1';
46 48
47my $MAX_FPS = 60; 49my $MAX_FPS = 60;
48my $MIN_FPS = 5; # unused as of yet 50my $MIN_FPS = 5; # unused as of yet
49 51
… …
68 70
69our $FONT_PROP; 71our $FONT_PROP;
70our $FONT_FIXED; 72our $FONT_FIXED;
71 73
72our $MAP; 74our $MAP;
75our $MAPMAP;
73our $MAPWIDGET; 76our $MAPWIDGET;
74our $BUTTONBAR; 77our $BUTTONBAR;
75our $LOGVIEW; 78our $LOGVIEW;
76our $CONSOLE; 79our $CONSOLE;
77our $METASERVER; 80our $METASERVER;
… …
89 92
90our $ALT_ENTER_MESSAGE; 93our $ALT_ENTER_MESSAGE;
91our $STATUS_LINE; 94our $STATUS_LINE;
92our $DEBUG_STATUS; 95our $DEBUG_STATUS;
93 96
97our $INVWIN;
98our $INV;
99
94sub status { 100sub status {
95 $STATUS_LINE->set_text ($_[0]); 101 $STATUS_LINE->set_text ($_[0]);
96 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h}); 102 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
97} 103}
98 104
… …
110 116
111 $MAP = new CFClient::Map $mapsize, $mapsize; 117 $MAP = new CFClient::Map $mapsize, $mapsize;
112 118
113 my ($host, $port) = split /:/, $CFG->{host}; 119 my ($host, $port) = split /:/, $CFG->{host};
114 120
115 $CONN = new conn 121 $CONN = eval {
122 new conn
116 host => $host, 123 host => $host,
117 port => $port || 13327, 124 port => $port || 13327,
118 user => $CFG->{user}, 125 user => $CFG->{user},
119 pass => $CFG->{password}, 126 pass => $CFG->{password},
120 mapw => $mapsize, 127 mapw => $mapsize,
121 maph => $mapsize, 128 maph => $mapsize,
129 ;
122 ; 130 };
123 131
132 if ($CONN) {
124 status "login successful"; 133 status "login successful";
125 134
126 CFClient::lowdelay fileno $CONN->{fh}; 135 CFClient::lowdelay fileno $CONN->{fh};
136 } else {
137 status "unable to connect";
138 }
127} 139}
128 140
129sub stop_game { 141sub stop_game {
130 undef $CONN; 142 undef $CONN;
131} 143}
… …
311 audio_shutdown (); 323 audio_shutdown ();
312 audio_init (); 324 audio_init ();
313 } 325 }
314 ); 326 );
315 327
328 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
329 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
330 text => $CFG->{say_command},
331 tooltip => "This is the command that will be used if you write a line in the message window entry. "
332 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
333 ."But you could also set it to 'tell <playername>' to only chat with that user.",
334 connect_changed => sub {
335 my ($self, $value) = @_;
336 $CFG->{say_command} = $value;
337 }
338 );
339
316 $dialog 340 $dialog
317} 341}
318 342
319sub set_stats_window_fontsize { 343sub set_stats_window_fontsize {
320 for (values %{$STATWIDS}) { 344 for (values %{$STATWIDS}) {
… …
353 (my $hb = new CFClient::UI::HBox), 377 (my $hb = new CFClient::UI::HBox),
354 ], 378 ],
355 ); 379 );
356 380
357 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 381 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
358 tooltip => "Health points - depletes when you get wounded, refills when you heal or idle"); 382 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.");
359 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 383 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
360 tooltip => "Spell points - deplete when you cast wizard spells, refills when you idle"); 384 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.");
361 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 385 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
362 tooltip => "Grace points - deplete when you cast priest spells, refills when you pray"); 386 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.");
363 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 387 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
364 tooltip => "Food - depletes with time, faster when you heal or build mana, refills when you eat healthy food"); 388 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.");
365 389
366 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 390 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
367 tooltip => "Experience points and level - increases when you kill monsters or successfully use skills"); 391 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.");
368 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 392 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
369 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 393 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
370 394
371 $GAUGES = { 395 $GAUGES = {
372 exp => $exp, win => $win, range => $rng, 396 exp => $exp, win => $win, range => $rng,
… …
377 401
378 $win 402 $win
379} 403}
380 404
381sub make_stats_window { 405sub make_stats_window {
382 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats"); 406 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
383 407
384 $tgw->add (my $vb = new CFClient::UI::VBox); 408 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
385 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 409 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
386 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 410 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
387 411
388 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 412 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
389 413
390 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 414 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
391 415
392 my $black = [0, 0, 0]; 416 my $black = [0, 0, 0];
393 417
394 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 418 for (
395 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 419 [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
396 $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 420 [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"],
397 $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 421 [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"],
398 $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 422 [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"],
399 $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 423 [0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
400 $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 424 [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"],
425 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."],
401 426
402 $tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Str"); 427 [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."],
403 $tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dex"); 428 [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."],
404 $tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Con"); 429 [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."],
405 $tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Int"); 430 [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."],
406 $tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wis"); 431 [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."],
407 $tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Pow"); 432 [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."],
408 $tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Cha"); 433 ) {
434 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
409 435
410 $tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120"); 436 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
411 $tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120"); 437 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
412 $tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120"); 438 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
413 $tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120"); 439 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip);
414 $tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54"); 440 }
415 $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
416
417 $tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wc");
418 $tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Ac");
419 $tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dam");
420 $tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Arm");
421 $tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Sp");
422 $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "WSp");
423 441
424 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 442 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
425 443
426 my $row = 0; 444 my $row = 0;
427 my $col = 0; 445 my $col = 0;
428 446
429 my %resist_names = ( 447 my %resist_names = (
430 slow => "Slow", 448 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.)",
431 holyw => "Holy Word", 449 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
432 conf => "Confusion", 450 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
433 fire => "Fire", 451 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
434 depl => "Depletion", 452 depl => "Depletion (some monsters and other effects can cause stats depletion)",
435 magic => "Magic", 453 magic => "Magic (resistance to magic spells like magic missile or similar)",
436 drain => "Draining", 454 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
437 acid => "Acid", 455 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
438 pois => "Poison", 456 pois => "Poison (resistance to getting poisoned)",
439 para => "Paralysation", 457 para => "Paralysation (this resistance affects the chance you get paralysed)",
440 deat => "Death", 458 deat => "Death (resistance against death spells)",
441 phys => "Physical", 459 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
442 blind => "Blind", 460 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
443 fear => "Fear", 461 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)",
444 tund => "Turn undead", 462 tund => "Turn undead",
445 elec => "Electricity", 463 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
446 cold => "Cold", 464 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
447 ghit => "Ghost hit", 465 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
448 ); 466 );
449 for (qw/slow holyw conf fire depl magic 467 for (qw/slow holyw conf fire depl magic
450 drain acid pois para deat phys 468 drain acid pois para deat phys
451 blind fear tund elec cold ghit/) 469 blind fear tund elec cold ghit/)
452 { 470 {
453 $tbl2->add ($col, $row, 471 $tbl2->add ($col, $row,
454 $STATWIDS->{"res_$_"} = 472 $STATWIDS->{"res_$_"} =
455 new CFClient::UI::Label 473 new CFClient::UI::Label
474 font => $FONT_FIXED,
456 template => "-100%", 475 template => "-100%",
457 align => +1, 476 align => +1,
458 valign => 0, 477 valign => 0,
478 can_events => 1,
479 can_hover => 1,
459 tooltip => $resist_names{$_} 480 tooltip => $resist_names{$_},
460 ); 481 );
461 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 482 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
483 font => $FONT_FIXED,
462 can_hover => 1, 484 can_hover => 1,
463 can_events => 1, 485 can_events => 1,
464 image => "ui/resist/resist_$_.png", 486 image => "ui/resist/resist_$_.png",
465 tooltip => $resist_names{$_} 487 tooltip => $resist_names{$_},
466 ); 488 );
467 489
468 $row++; 490 $row++;
469 if ($row % 6 == 0) { 491 if ($row % 6 == 0) {
470 $col += 2; 492 $col += 2;
… …
557 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 579 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
558 580
559 $dialog 581 $dialog
560} 582}
561 583
584my $METASERVER_ATIME;
585
562sub update_metaserver { 586sub update_metaserver {
563 my ($HOST) = @_; 587 my ($HOST) = @_;
564 588
565 status "fetching metaserver list..."; 589 return if $METASERVER_ATIME > time;
590 $METASERVER_ATIME = time + 60;
591
592 my $table = $METASERVER->{table};
593 $table->clear;
594 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
566 595
567 my $buf; 596 my $buf;
568 597
569 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 598 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
599
600 unless ($fh) {
601 $label->set_text ("unable to contact metaserver: $!");
602 return;
603 }
570 604
571 Event->io (fd => $fh, poll => 'r', cb => sub { 605 Event->io (fd => $fh, poll => 'r', cb => sub {
572 my $res = sysread $fh, $buf, 8192, length $buf; 606 my $res = sysread $fh, $buf, 8192, length $buf;
573 607
574 if (!defined $res) { 608 if (!defined $res) {
575 $_[0]->w->cancel; 609 $_[0]->w->cancel;
576 status "metaserver: $!"; 610 $label->set_text ("error while retrieving server list: $!");
577 } elsif ($res == 0) { 611 } elsif ($res == 0) {
578 $_[0]->w->cancel; 612 $_[0]->w->cancel;
579 status "server list retrieved"; 613 status "server list retrieved";
580 614
581 my $table = $METASERVER->{table}; 615 utf8::decode $buf if utf8::valid $buf;
582 616
583 $table->clear; 617 $table->clear;
584 618
585 my @col = qw(Use #Users Host Uptime Version Description); 619 my @col = qw(Use #Users Host Uptime Version Description);
586 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 620 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
… …
610 $m = [$users, $host, $uptime, $version, $desc]; 644 $m = [$users, $host, $uptime, $version, $desc];
611 645
612 $y++; 646 $y++;
613 647
614 $table->add (0, $y, new CFClient::UI::VBox children => [ 648 $table->add (0, $y, new CFClient::UI::VBox children => [
615 (new CFClient::UI::Button text => " ", connect_activate => sub { 649 (new CFClient::UI::Button text => "Use", connect_activate => sub {
616 $HOST->set_text ($CFG->{host} = $host); 650 $HOST->set_text ($CFG->{host} = $host);
617 }), 651 }),
618 (new CFClient::UI::Empty expand => 1), 652 (new CFClient::UI::Empty expand => 1),
619 ]); 653 ]);
620 654
… …
679 my ($self, $value) = @_; 713 my ($self, $value) = @_;
680 $CFG->{password} = $value; 714 $CFG->{password} = $value;
681 } 715 }
682 ); 716 );
683 717
684 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
685 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
686 text => $CFG->{say_command},
687 tooltip => "This is the command that will be used if you write a line in the message window entry. "
688 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
689 ."But you could also set it to 'tell <playername>' to only chat with that user.",
690 connect_changed => sub {
691 my ($self, $value) = @_;
692 $CFG->{say_command} = $value;
693 }
694 );
695
696 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 718 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
697 $table->add (1, 7, new CFClient::UI::Slider 719 $table->add (1, 7, new CFClient::UI::Slider
698 req_w => 100, 720 req_w => 100,
699 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 721 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
700 tooltip => "This is the size of the portion of the map update the server sends you. " 722 tooltip => "This is the size of the portion of the map update the server sends you. "
… …
714} 736}
715 737
716sub message_window { 738sub message_window {
717 my $window = new CFClient::UI::FancyFrame 739 my $window = new CFClient::UI::FancyFrame
718 title => "Messages", 740 title => "Messages",
719 border_bg => [1, 1, 1, 0.5], 741 border_bg => [1, 1, 1, 1],
720 bg => [0.3, 0.3, 0.3, 0.8], 742 bg => [0, 0, 0, 0.5],
721 user_w => int $::WIDTH / 3, 743 user_w => int $::WIDTH / 3,
722 user_h => int $::HEIGHT / 5, 744 user_h => int $::HEIGHT / 5,
723 child => (my $vbox = new CFClient::UI::VBox); 745 child => (my $vbox = new CFClient::UI::VBox);
724 746
725 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 747 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
765 }; 787 };
766 788
767 $window 789 $window
768} 790}
769 791
792sub make_inventory_window {
793 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
794 $invwin->add (my $hb = new CFClient::UI::HBox);
795 $hb->add ($INV = new CFClient::UI::Inventory expand => 1);
796 $hb->add (my $rng = new CFClient::UI::Slider vertical => 1);
797 $INV->set_range ($rng);
798 $invwin
799}
800
770sub sdl_init { 801sub sdl_init {
771 CFClient::SDL_Init 802 CFClient::SDL_Init
772 and die "SDL::Init failed!\n"; 803 and die "SDL::Init failed!\n";
773} 804}
774 805
… …
805 fontsize => 0.8, 836 fontsize => 0.8,
806 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 837 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
807 $ALT_ENTER_MESSAGE->show; 838 $ALT_ENTER_MESSAGE->show;
808 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h}); 839 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
809 840
810 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 841 CFClient::UI::FancyFrame->new (
811 $MAPWIDGET->focus_in; 842 border_bg => [1, 1, 1, 192/255],
843 bg => [1, 1, 1, 0],
844 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
845 )->show;
846
847 $MAPWIDGET = new CFClient::MapWidget;
812 $MAPWIDGET->connect (activate_console => sub { 848 $MAPWIDGET->connect (activate_console => sub {
813 my ($mapwidget, $preset) = @_; 849 my ($mapwidget, $preset) = @_;
814 850
815 if ($CONSOLE) { 851 if ($CONSOLE) {
816 $CONSOLE->{input}->{auto_activated} = 1; 852 $CONSOLE->{input}->{auto_activated} = 1;
… …
819 if ($preset && $CONSOLE->{input}->get_text eq '') { 855 if ($preset && $CONSOLE->{input}->get_text eq '') {
820 $CONSOLE->{input}->set_text ($preset); 856 $CONSOLE->{input}->set_text ($preset);
821 } 857 }
822 } 858 }
823 }); 859 });
860 $MAPWIDGET->show;
861 $MAPWIDGET->focus_in;
824 862
825 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 863 $BUTTONBAR = new CFClient::UI::HBox;
826 864
827 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 865 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
828 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 866 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
829 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 867 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
830 868
831 $CFClient::UI::ROOT->add (make_gauge_window); # 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 869 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
870
832 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 871 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
872 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
833 873
834 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 874 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
835 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 875 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
836 status "Configuration Saved"; 876 status "Configuration Saved";
837 }); 877 });
878
879 $BUTTONBAR->show;
838 880
839 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 881 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
840} 882}
841 883
842sub video_shutdown { 884sub video_shutdown {
… …
1024# at worst. 1066# at worst.
1025sub conn::flood_fill { 1067sub conn::flood_fill {
1026 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1068 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1027 1069
1028 # the server does not allow map paths > 6 1070 # the server does not allow map paths > 6
1029 return if 6 <= length $path; 1071 return if 7 <= length $path;
1030 1072
1031 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1073 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1032 1074
1033 for ( 1075 for (
1034 [1, 0, -1], 1076 [1, 0, -1],
… …
1077 1119
1078 $self->flush_map; 1120 $self->flush_map;
1079 1121
1080 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1122 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1081 1123
1082 my $mapmapw = 250; 1124 my $mapmapw = $MAPMAP->{w};
1083 my $mapmaph = 250; 1125 my $mapmaph = $MAPMAP->{h};
1084 1126
1085 $self->{neigh_rect} = [ 1127 $self->{neigh_rect} = [
1086 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1128 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1087 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1129 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1088 ]; 1130 ];
… …
1287sub update_floorbox { 1329sub update_floorbox {
1288 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1330 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1289 $FLOORBOX->clear; 1331 $FLOORBOX->clear;
1290 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1332 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1291 1333
1292 my @items = values %{ $CONN->{container}{0} };
1293
1294 # we basically have to use the same sorting as everybody else 1334 # we basically have to use the same sorting as everybody else
1295 @items = sort { $a->{type} <=> $b->{type} } @items; 1335 for my $item (@{ $CONN->{container}{0} }) {
1296
1297 for my $item (reverse @items) {
1298 my $desc = $item->{nrof} < 2 1336 my $desc = $item->{nrof} < 2
1299 ? $item->{name} 1337 ? $item->{name}
1300 : "$item->{nrof} $item->{name_pl}"; 1338 : "$item->{nrof} $item->{name_pl}";
1301 # todo: animation widget, face widget, weight(?) etc. 1339 # todo: animation widget, face widget, weight(?) etc.
1302 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox 1340 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
… …
1311 if ($ev->{button} == 1) { 1349 if ($ev->{button} == 1) {
1312 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0"); 1350 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1313 } elsif ($ev->{button} == 2) { 1351 } elsif ($ev->{button} == 2) {
1314 $CONN->send ("apply $item->{tag}"); 1352 $CONN->send ("apply $item->{tag}");
1315 } elsif ($ev->{button} == 3) { 1353 } elsif ($ev->{button} == 3) {
1316 # examine, lock, mark, maybe other things 1354 CFClient::UI::Menu->new (
1317 warn "MENU not implemented yet\n"; 1355 items => [
1356 ["examine", sub { $CONN->send ("examine $item->{tag}") }],
1357 [
1358 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
1359 sub { $CONN->send ("lock $item->{tag}") },
1360 ],
1361 ["mark", sub { $CONN->send ("mark $item->{tag}") }],
1362 ["apply", sub { $CONN->send ("apply $item->{tag}") }],
1363 ],
1364 )->popup ($ev);
1318 } 1365 }
1319 1366
1320 1 1367 1
1321 }, 1368 },
1322 ); 1369 );
… …
1339 1386
1340sub conn::container_add { 1387sub conn::container_add {
1341 my ($self, $id, $items) = @_; 1388 my ($self, $id, $items) = @_;
1342 1389
1343 update_floorbox if $id == 0; 1390 update_floorbox if $id == 0;
1391 if ($self->{player}{tag} == $id) {
1392 $INV->set_items ($self->{container}{$self->{player}{tag}});
1393 }
1344 # $self-<{player}{tag} => player inv 1394 # $self-<{player}{tag} => player inv
1345 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1395 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1346} 1396}
1347 1397
1348sub conn::container_clear { 1398sub conn::container_clear {
1349 my ($self, $id) = @_; 1399 my ($self, $id) = @_;
1350 1400
1351 update_floorbox if $id == 0; 1401 update_floorbox if $id == 0;
1402 if ($self->{player}{tag} == $id) {
1403 $INV->set_items ($self->{container}{$id});
1404 }
1405
1352# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1406# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1353} 1407}
1354 1408
1355sub conn::item_delete { 1409sub conn::item_delete {
1356 my ($self, @items) = @_; 1410 my ($self, @items) = @_;
1357 1411
1358 for (@items) { 1412 for (@items) {
1359 update_floorbox if $_->{container} == 0; 1413 update_floorbox if $_->{container} == 0;
1414 if ($self->{player}{tag} == $_->{container}) {
1415 $INV->set_items ($self->{container}{$_->{container}});
1416 }
1360 } 1417 }
1361} 1418}
1362 1419
1363sub conn::item_update { 1420sub conn::item_update {
1364 my ($self, $item) = @_; 1421 my ($self, $item) = @_;
1365 1422
1366 update_floorbox if $item->{container} == 0; 1423 update_floorbox if $item->{container} == 0;
1424 if ($self->{player}{tag} == $item->{container}) {
1425 $INV->set_items ($self->{container}{$item->{container}});
1426 }
1367} 1427}
1368 1428
1369%SDL_CB = ( 1429%SDL_CB = (
1370 CFClient::SDL_QUIT => sub { 1430 CFClient::SDL_QUIT => sub {
1371 Event::unloop -1; 1431 Event::unloop -1;
… …
1395 1455
1396############################################################################# 1456#############################################################################
1397 1457
1398$SIG{INT} = $SIG{TERM} = sub { exit }; 1458$SIG{INT} = $SIG{TERM} = sub { exit };
1399 1459
1460CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1461
1400$TILECACHE = CFClient::db_table "tilecache"; 1462$TILECACHE = CFClient::db_table "tilecache";
1401$FACEMAP = CFClient::db_table "facemap"; 1463$FACEMAP = CFClient::db_table "facemap";
1402
1403CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1404 1464
1405my %DEF_CFG = ( 1465my %DEF_CFG = (
1406 sdl_mode => 0, 1466 sdl_mode => 0,
1407 width => 640, 1467 width => 640,
1408 height => 480, 1468 height => 480,
… …
1464 1524
1465Event::loop; 1525Event::loop;
1466 1526
1467END { CFClient::SDL_Quit } 1527END { CFClient::SDL_Quit }
1468 1528
1529=head1 pclient - Crossfire+ and Crossfire game client
1469 1530
1531Pclient is a Crossfire+ and Crossfire game client.
1532
1533=head2 Features
1534
1535=over 4
1536
1537=item Fullscreen Map
1538
1539PClient can uses a fullscreen map, which greatly enhances how much of the
1540game world you can see.
1541
1542=item Persistent Map Cache (Crossfire+ only)
1543
1544PClient can persistently cache all map data it received from the
1545server. This not only allows it to display an overview map, but also
1546ensures that once-explored areas will be available the next time you want
1547to explore more.
1548
1549=item Hardware acceleration
1550
1551Unlike most Crossfire clients, PClient take advantage of OpenGL hardware
1552acceleration. Most modern graphics cards have difficulties with 2D
1553acceleration, while 3D graphics is accelerated well.
1554
1555=item No arbitrary limits
1556
1557Unlike other Crossfire clients, pclient does not suffer from arbitrary
1558limits (like a fixed amount of face numbers). There are still limits, but
1559they are not arbitrarily low :)
1560
1561=back
1562
1563=head1 USAGE
1564
1565=head2 The Map
1566
1567The map is always displayed in the background, behind all other windows and UI elements.
1568
1569#TODO# middle-click scrolls
1570#
1571# keys:
1572#
1573# a apply
1574# keypad moves, kp_5 applies ranged attack to self
1575
1576Starting to type enters the I<completion mode>. In that mode, you can type
1577abbreviations or commands and have them executed as soon as they match a
1578valid command. This is best explained by a few examples:
1579
1580Typing B<climb> will display a list of commands with I<climb> in their
1581name, such as I<ready_skill climbing> and I<use_skill climbing>.
1582
1583You can abbreviate commands by typing only the first character of every
1584word. For example, typing I<iwor> will likely select I<invoke word of
1585recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1586will likely select I<ready_skill climbing> and I<usl> will give you
1587I<use_skill levitation>.
1588
1589=head2 The map overview
1590
1591#TODO#
1592
1593=head2 The Status area in the lower right corner
1594
1595#TODO#
1596
1597=head2 The I<Statistics>/I>Stats> window
1598
1599#TODO#
1600
1601=head1 FAQ
1602
1603=over 4
1604
1605=item The client is very sluggish and slow, what can I do about this?
1606
1607Most likely, you don't have accelerated OpenGL support. Try to find a
1608newer driver, or a driver from your hardware vendor, that features OpenGL
1609support.
1610
1611If this is not an option, the following Setup options reduce the load and
1612will likely make the client playable with sofwtare rendering (it will
1613still be slow, though):
1614
1615=over 4
1616
1617=item B<Video Mode> should be set as low as possible (e.g. 640x480)
1618
1619=item Enable B<Fast & Ugly> mode
1620
1621=item Disable B<Fog of War>
1622
1623=item Increase B<Map Scale>
1624
1625=back
1626
1627=back
1628
1629=head1 AUTHOR
1630
1631Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1632
1633
1634

Diff Legend

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