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.176 by root, Mon Apr 24 10:19:40 2006 UTC vs.
Revision 1.197 by root, Fri May 5 19:05:47 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::UI; 38use CFClient::UI;
39use CFClient::MapWidget; 39use CFClient::MapWidget;
40 40
41$SIG{__DIE__} = sub { CFClient::fatal "$_[0]"; exit 1 }; 41$Event::DIED = sub {
42 CFClient::error $_[1];
43};
44
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
42 46
43our $VERSION = '0.1'; 47our $VERSION = '0.1';
44 48
45my $MAX_FPS = 60; 49my $MAX_FPS = 60;
46my $MIN_FPS = 5; # unused as of yet 50my $MIN_FPS = 5; # unused as of yet
… …
66 70
67our $FONT_PROP; 71our $FONT_PROP;
68our $FONT_FIXED; 72our $FONT_FIXED;
69 73
70our $MAP; 74our $MAP;
75our $MAPMAP;
71our $MAPWIDGET; 76our $MAPWIDGET;
72our $BUTTONBAR; 77our $BUTTONBAR;
73our $LOGVIEW; 78our $LOGVIEW;
74our $CONSOLE; 79our $CONSOLE;
75our $METASERVER; 80our $METASERVER;
… …
87 92
88our $ALT_ENTER_MESSAGE; 93our $ALT_ENTER_MESSAGE;
89our $STATUS_LINE; 94our $STATUS_LINE;
90our $DEBUG_STATUS; 95our $DEBUG_STATUS;
91 96
97our $INVWIN;
98our $INV;
99
92sub status { 100sub status {
93 $STATUS_LINE->set_text ($_[0]); 101 $STATUS_LINE->set_text ($_[0]);
94 $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});
95} 103}
96 104
… …
108 116
109 $MAP = new CFClient::Map $mapsize, $mapsize; 117 $MAP = new CFClient::Map $mapsize, $mapsize;
110 118
111 my ($host, $port) = split /:/, $CFG->{host}; 119 my ($host, $port) = split /:/, $CFG->{host};
112 120
113 $CONN = new conn 121 $CONN = eval {
122 new conn
114 host => $host, 123 host => $host,
115 port => $port || 13327, 124 port => $port || 13327,
116 user => $CFG->{user}, 125 user => $CFG->{user},
117 pass => $CFG->{password}, 126 pass => $CFG->{password},
118 mapw => $mapsize, 127 mapw => $mapsize,
119 maph => $mapsize, 128 maph => $mapsize,
129 ;
120 ; 130 };
121 131
132 if ($CONN) {
122 status "login successful"; 133 status "login successful";
123 134
124 CFClient::lowdelay fileno $CONN->{fh}; 135 CFClient::lowdelay fileno $CONN->{fh};
136 } else {
137 status "unable to connect";
138 }
125} 139}
126 140
127sub stop_game { 141sub stop_game {
128 undef $CONN; 142 undef $CONN;
129} 143}
… …
309 audio_shutdown (); 323 audio_shutdown ();
310 audio_init (); 324 audio_init ();
311 } 325 }
312 ); 326 );
313 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
314 $dialog 340 $dialog
315} 341}
316 342
317sub set_stats_window_fontsize { 343sub set_stats_window_fontsize {
318 for (values %{$STATWIDS}) { 344 for (values %{$STATWIDS}) {
… …
351 (my $hb = new CFClient::UI::HBox), 377 (my $hb = new CFClient::UI::HBox),
352 ], 378 ],
353 ); 379 );
354 380
355 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 381 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
356 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.");
357 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 383 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
358 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.");
359 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 385 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
360 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.");
361 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 387 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
362 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.");
363 389
364 $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,
365 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.");
366 $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,
367 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.)");
368 394
369 $GAUGES = { 395 $GAUGES = {
370 exp => $exp, win => $win, range => $rng, 396 exp => $exp, win => $win, range => $rng,
… …
375 401
376 $win 402 $win
377} 403}
378 404
379sub make_stats_window { 405sub make_stats_window {
380 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";
381 407
382 $tgw->add (my $vb = new CFClient::UI::VBox); 408 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
383 $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);
384 $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);
385 411
386 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 412 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
387 413
388 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 414 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
389 415
390 my $black = [0, 0, 0]; 416 my $black = [0, 0, 0];
391 417
392 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 418 for (
393 $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"],
394 $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"],
395 $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"],
396 $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"],
397 $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"],
398 $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."],
399 426
400 $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."],
401 $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."],
402 $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."],
403 $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."],
404 $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."],
405 $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."],
406 $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) = @$_;
407 435
408 $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
409 $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);
410 $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
411 $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);
412 $tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54"); 440 }
413 $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
414
415 $tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wc");
416 $tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Ac");
417 $tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dam");
418 $tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Arm");
419 $tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Sp");
420 $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "WSp");
421 441
422 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 442 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
423 443
424 my $row = 0; 444 my $row = 0;
425 my $col = 0; 445 my $col = 0;
426 446
427 my %resist_names = ( 447 my %resist_names = (
428 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.)",
429 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.)",
430 conf => "Confusion", 450 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
431 fire => "Fire", 451 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
432 depl => "Depletion", 452 depl => "Depletion (some monsters and other effects can cause stats depletion)",
433 magic => "Magic", 453 magic => "Magic (resistance to magic spells like magic missile or similar)",
434 drain => "Draining", 454 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
435 acid => "Acid", 455 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
436 pois => "Poison", 456 pois => "Poison (resistance to getting poisoned)",
437 para => "Paralysation", 457 para => "Paralysation (this resistance affects the chance you get paralysed)",
438 deat => "Death", 458 deat => "Death (resistance against death spells)",
439 phys => "Physical", 459 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
440 blind => "Blind", 460 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
441 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)",
442 tund => "Turn undead", 462 tund => "Turn undead",
443 elec => "Electricity", 463 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
444 cold => "Cold", 464 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
445 ghit => "Ghost hit", 465 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
446 ); 466 );
447 for (qw/slow holyw conf fire depl magic 467 for (qw/slow holyw conf fire depl magic
448 drain acid pois para deat phys 468 drain acid pois para deat phys
449 blind fear tund elec cold ghit/) 469 blind fear tund elec cold ghit/)
450 { 470 {
451 $tbl2->add ($col, $row, 471 $tbl2->add ($col, $row,
452 $STATWIDS->{"res_$_"} = 472 $STATWIDS->{"res_$_"} =
453 new CFClient::UI::Label 473 new CFClient::UI::Label
474 font => $FONT_FIXED,
454 template => "-100%", 475 template => "-100%",
455 align => +1, 476 align => +1,
456 valign => 0, 477 valign => 0,
478 can_events => 1,
479 can_hover => 1,
457 tooltip => $resist_names{$_} 480 tooltip => $resist_names{$_},
458 ); 481 );
459 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 482 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
483 font => $FONT_FIXED,
460 can_hover => 1, 484 can_hover => 1,
461 can_events => 1, 485 can_events => 1,
462 image => "ui/resist/resist_$_.png", 486 image => "ui/resist/resist_$_.png",
463 tooltip => $resist_names{$_} 487 tooltip => $resist_names{$_},
464 ); 488 );
465 489
466 $row++; 490 $row++;
467 if ($row % 6 == 0) { 491 if ($row % 6 == 0) {
468 $col += 2; 492 $col += 2;
… …
555 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 579 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
556 580
557 $dialog 581 $dialog
558} 582}
559 583
584my $METASERVER_ATIME;
585
560sub update_metaserver { 586sub update_metaserver {
561 my ($HOST) = @_; 587 my ($HOST) = @_;
562 588
563 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...");
564 595
565 my $buf; 596 my $buf;
566 597
567 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 }
568 604
569 Event->io (fd => $fh, poll => 'r', cb => sub { 605 Event->io (fd => $fh, poll => 'r', cb => sub {
570 my $res = sysread $fh, $buf, 8192, length $buf; 606 my $res = sysread $fh, $buf, 8192, length $buf;
571 607
572 if (!defined $res) { 608 if (!defined $res) {
573 $_[0]->w->cancel; 609 $_[0]->w->cancel;
574 status "metaserver: $!"; 610 $label->set_text ("error while retrieving server list: $!");
575 } elsif ($res == 0) { 611 } elsif ($res == 0) {
576 $_[0]->w->cancel; 612 $_[0]->w->cancel;
577 status "server list retrieved"; 613 status "server list retrieved";
578 614
579 my $table = $METASERVER->{table}; 615 utf8::decode $buf if utf8::valid $buf;
580 616
581 $table->clear; 617 $table->clear;
582 618
583 my @col = qw(Use #Users Host Uptime Version Description); 619 my @col = qw(Use #Users Host Uptime Version Description);
584 $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[$_])
… …
608 $m = [$users, $host, $uptime, $version, $desc]; 644 $m = [$users, $host, $uptime, $version, $desc];
609 645
610 $y++; 646 $y++;
611 647
612 $table->add (0, $y, new CFClient::UI::VBox children => [ 648 $table->add (0, $y, new CFClient::UI::VBox children => [
613 (new CFClient::UI::Button text => " ", connect_activate => sub { 649 (new CFClient::UI::Button text => "Use", connect_activate => sub {
614 $HOST->set_text ($CFG->{host} = $host); 650 $HOST->set_text ($CFG->{host} = $host);
615 }), 651 }),
616 (new CFClient::UI::Empty expand => 1), 652 (new CFClient::UI::Empty expand => 1),
617 ]); 653 ]);
618 654
… …
677 my ($self, $value) = @_; 713 my ($self, $value) = @_;
678 $CFG->{password} = $value; 714 $CFG->{password} = $value;
679 } 715 }
680 ); 716 );
681 717
682 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
683 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
684 text => $CFG->{say_command},
685 tooltip => "This is the command that will be used if you write a line in the message window entry. "
686 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
687 ."But you could also set it to 'tell <playername>' to only chat with that user.",
688 connect_changed => sub {
689 my ($self, $value) = @_;
690 $CFG->{say_command} = $value;
691 }
692 );
693
694 $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");
695 $table->add (1, 7, new CFClient::UI::Slider 719 $table->add (1, 7, new CFClient::UI::Slider
696 req_w => 100, 720 req_w => 100,
697 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 721 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
698 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. "
… …
712} 736}
713 737
714sub message_window { 738sub message_window {
715 my $window = new CFClient::UI::FancyFrame 739 my $window = new CFClient::UI::FancyFrame
716 title => "Messages", 740 title => "Messages",
717 border_bg => [1, 1, 1, 0.5], 741 border_bg => [1, 1, 1, 1],
718 bg => [0.3, 0.3, 0.3, 0.8], 742 bg => [0, 0, 0, 0.5],
719 user_w => int $::WIDTH / 3, 743 user_w => int $::WIDTH / 3,
720 user_h => int $::HEIGHT / 5, 744 user_h => int $::HEIGHT / 5,
721 child => (my $vbox = new CFClient::UI::VBox); 745 child => (my $vbox = new CFClient::UI::VBox);
722 746
723 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 747 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
763 }; 787 };
764 788
765 $window 789 $window
766} 790}
767 791
792sub make_inventory_window {
793 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
794 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1);
795 $invwin
796}
797
768sub sdl_init { 798sub sdl_init {
769 CFClient::SDL_Init 799 CFClient::SDL_Init
770 and die "SDL::Init failed!\n"; 800 and die "SDL::Init failed!\n";
771} 801}
772 802
773sub video_init { 803sub video_init {
774 sdl_init; 804 sdl_init;
805
806 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
775 807
776 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 808 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
777 $FULLSCREEN = $CFG->{fullscreen}; 809 $FULLSCREEN = $CFG->{fullscreen};
778 $FAST = $CFG->{fast}; 810 $FAST = $CFG->{fast};
779 811
… …
803 fontsize => 0.8, 835 fontsize => 0.8,
804 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 836 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
805 $ALT_ENTER_MESSAGE->show; 837 $ALT_ENTER_MESSAGE->show;
806 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h}); 838 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
807 839
808 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 840 CFClient::UI::FancyFrame->new (
809 $MAPWIDGET->focus_in; 841 border_bg => [1, 1, 1, 192/255],
842 bg => [1, 1, 1, 0],
843 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
844 )->show;
845
846 $MAPWIDGET = new CFClient::MapWidget;
810 $MAPWIDGET->connect (activate_console => sub { 847 $MAPWIDGET->connect (activate_console => sub {
811 my ($mapwidget, $preset) = @_; 848 my ($mapwidget, $preset) = @_;
812 849
813 if ($CONSOLE) { 850 if ($CONSOLE) {
814 $CONSOLE->{input}->{auto_activated} = 1; 851 $CONSOLE->{input}->{auto_activated} = 1;
… …
817 if ($preset && $CONSOLE->{input}->get_text eq '') { 854 if ($preset && $CONSOLE->{input}->get_text eq '') {
818 $CONSOLE->{input}->set_text ($preset); 855 $CONSOLE->{input}->set_text ($preset);
819 } 856 }
820 } 857 }
821 }); 858 });
859 $MAPWIDGET->show;
860 $MAPWIDGET->focus_in;
822 861
823 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 862 $BUTTONBAR = new CFClient::UI::HBox;
824 863
825 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 864 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
826 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 865 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
827 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 866 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
828 867
829 $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 868 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
869
830 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 870 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
871 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
831 872
832 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 873 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
833 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 874 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
834 status "Configuration Saved"; 875 status "Configuration Saved";
835 }); 876 });
836 877
878 $BUTTONBAR->show;
879
837 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 880 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
838} 881}
839 882
840sub video_shutdown { 883sub video_shutdown {
841 $CFClient::UI::ROOT->{children} = []; 884 $CFClient::UI::ROOT->{children} = [];
885 undef $CFClient::UI::GRAB;
886 undef $CFClient::UI::HOVER;
842 undef $SDL_ACTIVE; 887 undef $SDL_ACTIVE;
843} 888}
844 889
845my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 890my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
846my $bgmusic;#TODO#hack#d# 891my $bgmusic;#TODO#hack#d#
… …
855 push @bgmusic, shift @bgmusic; 900 push @bgmusic, shift @bgmusic;
856} 901}
857 902
858sub audio_init { 903sub audio_init {
859 if ($CFG->{audio_enable}) { 904 if ($CFG->{audio_enable}) {
860 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 905 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
861 $SDL_MIXER = !CFClient::Mix_OpenAudio; 906 $SDL_MIXER = !CFClient::Mix_OpenAudio;
862 CFClient::Mix_AllocateChannels 8; 907 CFClient::Mix_AllocateChannels 8;
863 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 908 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
864 909
865 audio_music_finished; 910 audio_music_finished;
… …
1020# at worst. 1065# at worst.
1021sub conn::flood_fill { 1066sub conn::flood_fill {
1022 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1067 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1023 1068
1024 # the server does not allow map paths > 6 1069 # the server does not allow map paths > 6
1025 return if 6 <= length $path; 1070 return if 7 <= length $path;
1026 1071
1027 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1072 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1028 1073
1029 for ( 1074 for (
1030 [1, 0, -1], 1075 [1, 0, -1],
… …
1073 1118
1074 $self->flush_map; 1119 $self->flush_map;
1075 1120
1076 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1121 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1077 1122
1078 my $mapmapw = 250; 1123 my $mapmapw = $MAPMAP->{w};
1079 my $mapmaph = 250; 1124 my $mapmaph = $MAPMAP->{h};
1080 1125
1081 $self->{neigh_rect} = [ 1126 $self->{neigh_rect} = [
1082 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1127 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1083 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1128 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1084 ]; 1129 ];
… …
1283sub update_floorbox { 1328sub update_floorbox {
1284 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1329 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1285 $FLOORBOX->clear; 1330 $FLOORBOX->clear;
1286 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1331 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1287 1332
1288 my @items = values %{ $CONN->{container}{0} };
1289
1290 # we basically have to use the same sorting as everybody else 1333 # we basically have to use the same sorting as everybody else
1291 @items = sort { $a->{type} <=> $b->{type} } @items; 1334 for my $item (@{ $CONN->{container}{0} }) {
1292 1335 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item);
1293 for my $item (reverse @items) {
1294 my $desc = $item->{nrof} < 2
1295 ? $item->{name}
1296 : "$item->{nrof} $item->{name_pl}";
1297 # todo: animation widget, face widget, weight(?) etc.
1298 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1299 tooltip => (CFClient::UI::Label->escape ($desc)
1300 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1301 can_hover => 1,
1302 can_events => 1,
1303 connect_button_down => sub {
1304 my ($self, $ev, $x, $y) = @_;
1305
1306 # todo: maybe put examine on 1? but should just be a tooltip :(
1307 if ($ev->{button} == 1) {
1308 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1309 } elsif ($ev->{button} == 2) {
1310 $CONN->send ("apply $item->{tag}");
1311 } elsif ($ev->{button} == 3) {
1312 # examine, lock, mark, maybe other things
1313 warn "MENU not implemented yet\n";
1314 }
1315
1316 1
1317 },
1318 );
1319
1320 $hbox->add (new CFClient::UI::Face
1321 can_events => 0,
1322 face => $item->{face},
1323 anim => $item->{anim},
1324 animspeed => $item->{animspeed},
1325 );
1326
1327 $hbox->add (new CFClient::UI::Label
1328 can_events => 0,
1329 text => $desc,
1330 );
1331 } 1336 }
1332 }); 1337 });
1333 refresh; 1338 refresh;
1334} 1339}
1335 1340
1336sub conn::container_add { 1341sub conn::container_add {
1337 my ($self, $id, $items) = @_; 1342 my ($self, $id, $items) = @_;
1338 1343
1339 update_floorbox if $id == 0; 1344 update_floorbox if $id == 0;
1345 if ($self->{player}{tag} == $id) {
1346 $INV->set_items ($self->{container}{$self->{player}{tag}});
1347 }
1340 # $self-<{player}{tag} => player inv 1348 # $self-<{player}{tag} => player inv
1341 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1349 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1342} 1350}
1343 1351
1344sub conn::container_clear { 1352sub conn::container_clear {
1345 my ($self, $id) = @_; 1353 my ($self, $id) = @_;
1346 1354
1347 update_floorbox if $id == 0; 1355 update_floorbox if $id == 0;
1356 if ($self->{player}{tag} == $id) {
1357 $INV->set_items ($self->{container}{$id});
1358 }
1359
1348# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1360# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1349} 1361}
1350 1362
1351sub conn::item_delete { 1363sub conn::item_delete {
1352 my ($self, @items) = @_; 1364 my ($self, @items) = @_;
1353 1365
1354 for (@items) { 1366 for (@items) {
1355 update_floorbox if $_->{container} == 0; 1367 update_floorbox if $_->{container} == 0;
1368 if ($self->{player}{tag} == $_->{container}) {
1369 $INV->set_items ($self->{container}{$_->{container}});
1370 }
1356 } 1371 }
1357} 1372}
1358 1373
1359sub conn::item_update { 1374sub conn::item_update {
1360 my ($self, $item) = @_; 1375 my ($self, $item) = @_;
1361 1376
1362 update_floorbox if $item->{container} == 0; 1377 update_floorbox if $item->{container} == 0;
1378 if ($self->{player}{tag} == $item->{container}) {
1379 $INV->set_items ($self->{container}{$item->{container}});
1380 }
1363} 1381}
1364 1382
1365%SDL_CB = ( 1383%SDL_CB = (
1366 CFClient::SDL_QUIT => sub { 1384 CFClient::SDL_QUIT => sub {
1367 Event::unloop -1; 1385 Event::unloop -1;
… …
1391 1409
1392############################################################################# 1410#############################################################################
1393 1411
1394$SIG{INT} = $SIG{TERM} = sub { exit }; 1412$SIG{INT} = $SIG{TERM} = sub { exit };
1395 1413
1414CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1415
1396$TILECACHE = CFClient::db_table "tilecache"; 1416$TILECACHE = CFClient::db_table "tilecache";
1397$FACEMAP = CFClient::db_table "facemap"; 1417$FACEMAP = CFClient::db_table "facemap";
1398
1399CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1400 1418
1401my %DEF_CFG = ( 1419my %DEF_CFG = (
1402 sdl_mode => 0, 1420 sdl_mode => 0,
1403 width => 640, 1421 width => 640,
1404 height => 480, 1422 height => 480,
… …
1460 1478
1461Event::loop; 1479Event::loop;
1462 1480
1463END { CFClient::SDL_Quit } 1481END { CFClient::SDL_Quit }
1464 1482
1483=head1 pclient - Crossfire+ and Crossfire game client
1465 1484
1485Pclient is a Crossfire+ and Crossfire game client.
1486
1487=head2 Features
1488
1489=over 4
1490
1491=item Fullscreen Map
1492
1493PClient can uses a fullscreen map, which greatly enhances how much of the
1494game world you can see.
1495
1496=item Persistent Map Cache (Crossfire+ only)
1497
1498PClient can persistently cache all map data it received from the
1499server. This not only allows it to display an overview map, but also
1500ensures that once-explored areas will be available the next time you want
1501to explore more.
1502
1503=item Hardware acceleration
1504
1505Unlike most Crossfire clients, PClient take advantage of OpenGL hardware
1506acceleration. Most modern graphics cards have difficulties with 2D
1507acceleration, while 3D graphics is accelerated well.
1508
1509=item No arbitrary limits
1510
1511Unlike other Crossfire clients, pclient does not suffer from arbitrary
1512limits (like a fixed amount of face numbers). There are still limits, but
1513they are not arbitrarily low :)
1514
1515=back
1516
1517=head1 USAGE
1518
1519=head2 The Map
1520
1521The map is always displayed in the background, behind all other windows and UI elements.
1522
1523#TODO# middle-click scrolls
1524#
1525# keys:
1526#
1527# a apply
1528# keypad moves, kp_5 applies ranged attack to self
1529
1530Starting to type enters the I<completion mode>. In that mode, you can type
1531abbreviations or commands and have them executed as soon as they match a
1532valid command. This is best explained by a few examples:
1533
1534Typing B<climb> will display a list of commands with I<climb> in their
1535name, such as I<ready_skill climbing> and I<use_skill climbing>.
1536
1537You can abbreviate commands by typing only the first character of every
1538word. For example, typing I<iwor> will likely select I<invoke word of
1539recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1540will likely select I<ready_skill climbing> and I<usl> will give you
1541I<use_skill levitation>.
1542
1543=head2 The map overview
1544
1545#TODO#
1546
1547=head2 The Status area in the lower right corner
1548
1549#TODO#
1550
1551=head2 The I<Statistics>/I>Stats> window
1552
1553#TODO#
1554
1555=head1 FAQ
1556
1557=over 4
1558
1559=item The client is very sluggish and slow, what can I do about this?
1560
1561Most likely, you don't have accelerated OpenGL support. Try to find a
1562newer driver, or a driver from your hardware vendor, that features OpenGL
1563support.
1564
1565If this is not an option, the following Setup options reduce the load and
1566will likely make the client playable with sofwtare rendering (it will
1567still be slow, though):
1568
1569=over 4
1570
1571=item B<Video Mode> should be set as low as possible (e.g. 640x480)
1572
1573=item Enable B<Fast & Ugly> mode
1574
1575=item Disable B<Fog of War>
1576
1577=item Increase B<Map Scale>
1578
1579=back
1580
1581=back
1582
1583=head1 AUTHOR
1584
1585Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1586
1587
1588

Diff Legend

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