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.178 by root, Tue Apr 25 08:39:18 2006 UTC vs.
Revision 1.198 by root, Fri May 5 19:10:16 2006 UTC

… …
70 70
71our $FONT_PROP; 71our $FONT_PROP;
72our $FONT_FIXED; 72our $FONT_FIXED;
73 73
74our $MAP; 74our $MAP;
75our $MAPMAP;
75our $MAPWIDGET; 76our $MAPWIDGET;
76our $BUTTONBAR; 77our $BUTTONBAR;
77our $LOGVIEW; 78our $LOGVIEW;
78our $CONSOLE; 79our $CONSOLE;
79our $METASERVER; 80our $METASERVER;
… …
91 92
92our $ALT_ENTER_MESSAGE; 93our $ALT_ENTER_MESSAGE;
93our $STATUS_LINE; 94our $STATUS_LINE;
94our $DEBUG_STATUS; 95our $DEBUG_STATUS;
95 96
97our $INVWIN;
98our $INV;
99
96sub status { 100sub status {
97 $STATUS_LINE->set_text ($_[0]); 101 $STATUS_LINE->set_text ($_[0]);
98 $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});
99} 103}
100 104
… …
112 116
113 $MAP = new CFClient::Map $mapsize, $mapsize; 117 $MAP = new CFClient::Map $mapsize, $mapsize;
114 118
115 my ($host, $port) = split /:/, $CFG->{host}; 119 my ($host, $port) = split /:/, $CFG->{host};
116 120
117 $CONN = new conn 121 $CONN = eval {
122 new conn
118 host => $host, 123 host => $host,
119 port => $port || 13327, 124 port => $port || 13327,
120 user => $CFG->{user}, 125 user => $CFG->{user},
121 pass => $CFG->{password}, 126 pass => $CFG->{password},
122 mapw => $mapsize, 127 mapw => $mapsize,
123 maph => $mapsize, 128 maph => $mapsize,
129 ;
124 ; 130 };
125 131
132 if ($CONN) {
126 status "login successful"; 133 status "login successful";
127 134
128 CFClient::lowdelay fileno $CONN->{fh}; 135 CFClient::lowdelay fileno $CONN->{fh};
136 } else {
137 status "unable to connect";
138 }
129} 139}
130 140
131sub stop_game { 141sub stop_game {
132 undef $CONN; 142 undef $CONN;
133} 143}
… …
313 audio_shutdown (); 323 audio_shutdown ();
314 audio_init (); 324 audio_init ();
315 } 325 }
316 ); 326 );
317 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
318 $dialog 340 $dialog
319} 341}
320 342
321sub set_stats_window_fontsize { 343sub set_stats_window_fontsize {
322 for (values %{$STATWIDS}) { 344 for (values %{$STATWIDS}) {
… …
355 (my $hb = new CFClient::UI::HBox), 377 (my $hb = new CFClient::UI::HBox),
356 ], 378 ],
357 ); 379 );
358 380
359 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 381 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
360 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.");
361 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 383 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
362 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.");
363 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 385 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
364 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.");
365 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 387 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
366 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.");
367 389
368 $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,
369 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.");
370 $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,
371 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.)");
372 394
373 $GAUGES = { 395 $GAUGES = {
374 exp => $exp, win => $win, range => $rng, 396 exp => $exp, win => $win, range => $rng,
… …
379 401
380 $win 402 $win
381} 403}
382 404
383sub make_stats_window { 405sub make_stats_window {
384 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";
385 407
386 $tgw->add (my $vb = new CFClient::UI::VBox); 408 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
387 $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);
388 $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);
389 411
390 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 412 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
391 413
392 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 414 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
393 415
394 my $black = [0, 0, 0]; 416 my $black = [0, 0, 0];
395 417
396 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 418 for (
397 $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"],
398 $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"],
399 $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"],
400 $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"],
401 $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"],
402 $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."],
403 426
404 $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."],
405 $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."],
406 $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."],
407 $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."],
408 $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."],
409 $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."],
410 $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) = @$_;
411 435
412 $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
413 $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);
414 $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
415 $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);
416 $tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54"); 440 }
417 $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
418
419 $tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wc");
420 $tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Ac");
421 $tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dam");
422 $tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Arm");
423 $tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Sp");
424 $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "WSp");
425 441
426 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 442 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
427 443
428 my $row = 0; 444 my $row = 0;
429 my $col = 0; 445 my $col = 0;
430 446
431 my %resist_names = ( 447 my %resist_names = (
432 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.)",
433 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.)",
434 conf => "Confusion", 450 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
435 fire => "Fire", 451 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
436 depl => "Depletion", 452 depl => "Depletion (some monsters and other effects can cause stats depletion)",
437 magic => "Magic", 453 magic => "Magic (resistance to magic spells like magic missile or similar)",
438 drain => "Draining", 454 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
439 acid => "Acid", 455 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
440 pois => "Poison", 456 pois => "Poison (resistance to getting poisoned)",
441 para => "Paralysation", 457 para => "Paralysation (this resistance affects the chance you get paralysed)",
442 deat => "Death", 458 deat => "Death (resistance against death spells)",
443 phys => "Physical", 459 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
444 blind => "Blind", 460 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
445 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)",
446 tund => "Turn undead", 462 tund => "Turn undead",
447 elec => "Electricity", 463 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
448 cold => "Cold", 464 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
449 ghit => "Ghost hit", 465 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
450 ); 466 );
451 for (qw/slow holyw conf fire depl magic 467 for (qw/slow holyw conf fire depl magic
452 drain acid pois para deat phys 468 drain acid pois para deat phys
453 blind fear tund elec cold ghit/) 469 blind fear tund elec cold ghit/)
454 { 470 {
455 $tbl2->add ($col, $row, 471 $tbl2->add ($col, $row,
456 $STATWIDS->{"res_$_"} = 472 $STATWIDS->{"res_$_"} =
457 new CFClient::UI::Label 473 new CFClient::UI::Label
474 font => $FONT_FIXED,
458 template => "-100%", 475 template => "-100%",
459 align => +1, 476 align => +1,
460 valign => 0, 477 valign => 0,
478 can_events => 1,
479 can_hover => 1,
461 tooltip => $resist_names{$_} 480 tooltip => $resist_names{$_},
462 ); 481 );
463 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 482 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
483 font => $FONT_FIXED,
464 can_hover => 1, 484 can_hover => 1,
465 can_events => 1, 485 can_events => 1,
466 image => "ui/resist/resist_$_.png", 486 image => "ui/resist/resist_$_.png",
467 tooltip => $resist_names{$_} 487 tooltip => $resist_names{$_},
468 ); 488 );
469 489
470 $row++; 490 $row++;
471 if ($row % 6 == 0) { 491 if ($row % 6 == 0) {
472 $col += 2; 492 $col += 2;
… …
559 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 579 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
560 580
561 $dialog 581 $dialog
562} 582}
563 583
584my $METASERVER_ATIME;
585
564sub update_metaserver { 586sub update_metaserver {
565 my ($HOST) = @_; 587 my ($HOST) = @_;
566 588
589 return if $METASERVER_ATIME > time;
590 $METASERVER_ATIME = time + 60;
591
567 my $table = $METASERVER->{table}; 592 my $table = $METASERVER->{table};
568 $table->clear; 593 $table->clear;
569 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching metaserver list..."); 594 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
570 595
571 my $buf; 596 my $buf;
572 597
573 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 598 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
574 599
… …
688 my ($self, $value) = @_; 713 my ($self, $value) = @_;
689 $CFG->{password} = $value; 714 $CFG->{password} = $value;
690 } 715 }
691 ); 716 );
692 717
693 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
694 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
695 text => $CFG->{say_command},
696 tooltip => "This is the command that will be used if you write a line in the message window entry. "
697 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
698 ."But you could also set it to 'tell <playername>' to only chat with that user.",
699 connect_changed => sub {
700 my ($self, $value) = @_;
701 $CFG->{say_command} = $value;
702 }
703 );
704
705 $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");
706 $table->add (1, 7, new CFClient::UI::Slider 719 $table->add (1, 7, new CFClient::UI::Slider
707 req_w => 100, 720 req_w => 100,
708 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 721 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
709 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. "
… …
723} 736}
724 737
725sub message_window { 738sub message_window {
726 my $window = new CFClient::UI::FancyFrame 739 my $window = new CFClient::UI::FancyFrame
727 title => "Messages", 740 title => "Messages",
728 border_bg => [1, 1, 1, 0.5], 741 border_bg => [1, 1, 1, 1],
729 bg => [0.3, 0.3, 0.3, 0.8], 742 bg => [0, 0, 0, 0.5],
730 user_w => int $::WIDTH / 3, 743 user_w => int $::WIDTH / 3,
731 user_h => int $::HEIGHT / 5, 744 user_h => int $::HEIGHT / 5,
732 child => (my $vbox = new CFClient::UI::VBox); 745 child => (my $vbox = new CFClient::UI::VBox);
733 746
734 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 747 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
774 }; 787 };
775 788
776 $window 789 $window
777} 790}
778 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
779sub sdl_init { 798sub sdl_init {
780 CFClient::SDL_Init 799 CFClient::SDL_Init
781 and die "SDL::Init failed!\n"; 800 and die "SDL::Init failed!\n";
782} 801}
783 802
784sub video_init { 803sub video_init {
785 sdl_init; 804 sdl_init;
805
806 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
786 807
787 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 808 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
788 $FULLSCREEN = $CFG->{fullscreen}; 809 $FULLSCREEN = $CFG->{fullscreen};
789 $FAST = $CFG->{fast}; 810 $FAST = $CFG->{fast};
790 811
… …
814 fontsize => 0.8, 835 fontsize => 0.8,
815 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 836 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
816 $ALT_ENTER_MESSAGE->show; 837 $ALT_ENTER_MESSAGE->show;
817 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h}); 838 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
818 839
819 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 840 CFClient::UI::FancyFrame->new (
820 $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;
821 $MAPWIDGET->connect (activate_console => sub { 847 $MAPWIDGET->connect (activate_console => sub {
822 my ($mapwidget, $preset) = @_; 848 my ($mapwidget, $preset) = @_;
823 849
824 if ($CONSOLE) { 850 if ($CONSOLE) {
825 $CONSOLE->{input}->{auto_activated} = 1; 851 $CONSOLE->{input}->{auto_activated} = 1;
… …
828 if ($preset && $CONSOLE->{input}->get_text eq '') { 854 if ($preset && $CONSOLE->{input}->get_text eq '') {
829 $CONSOLE->{input}->set_text ($preset); 855 $CONSOLE->{input}->set_text ($preset);
830 } 856 }
831 } 857 }
832 }); 858 });
859 $MAPWIDGET->show;
860 $MAPWIDGET->focus_in;
833 861
834 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 862 $BUTTONBAR = new CFClient::UI::HBox;
835 863
836 $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);
837 $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);
838 $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);
839 867
840 $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
841 $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);
842 872
843 $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 {
844 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 874 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
845 status "Configuration Saved"; 875 status "Configuration Saved";
846 }); 876 });
877
878 $BUTTONBAR->show;
847 879
848 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 880 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
849} 881}
850 882
851sub video_shutdown { 883sub video_shutdown {
… …
856} 888}
857 889
858my @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#
859my $bgmusic;#TODO#hack#d# 891my $bgmusic;#TODO#hack#d#
860 892
893sub audio_channel_finished {
894 my ($channel) = @_;
895
896 warn "channel $channel finished\n";#d#
897}
898
861sub audio_music_finished { 899sub audio_music_finished {
862 return unless $CFG->{bgm_enable}; 900 return unless $CFG->{bgm_enable};
863 901
864 # TODO: hack, do play loop and mood music 902 # TODO: hack, do play loop and mood music
865 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; 903 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
… …
868 push @bgmusic, shift @bgmusic; 906 push @bgmusic, shift @bgmusic;
869} 907}
870 908
871sub audio_init { 909sub audio_init {
872 if ($CFG->{audio_enable}) { 910 if ($CFG->{audio_enable}) {
873 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 911 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
874 $SDL_MIXER = !CFClient::Mix_OpenAudio; 912 $SDL_MIXER = !CFClient::Mix_OpenAudio;
875 CFClient::Mix_AllocateChannels 8; 913 CFClient::Mix_AllocateChannels 8;
876 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 914 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
877 915
878 audio_music_finished; 916 audio_music_finished;
… …
1033# at worst. 1071# at worst.
1034sub conn::flood_fill { 1072sub conn::flood_fill {
1035 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1073 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1036 1074
1037 # the server does not allow map paths > 6 1075 # the server does not allow map paths > 6
1038 return if 6 <= length $path; 1076 return if 7 <= length $path;
1039 1077
1040 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1078 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1041 1079
1042 for ( 1080 for (
1043 [1, 0, -1], 1081 [1, 0, -1],
… …
1086 1124
1087 $self->flush_map; 1125 $self->flush_map;
1088 1126
1089 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1127 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1090 1128
1091 my $mapmapw = 250; 1129 my $mapmapw = $MAPMAP->{w};
1092 my $mapmaph = 250; 1130 my $mapmaph = $MAPMAP->{h};
1093 1131
1094 $self->{neigh_rect} = [ 1132 $self->{neigh_rect} = [
1095 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1133 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1096 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1134 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1097 ]; 1135 ];
… …
1296sub update_floorbox { 1334sub update_floorbox {
1297 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1335 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1298 $FLOORBOX->clear; 1336 $FLOORBOX->clear;
1299 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1337 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1300 1338
1301 my @items = values %{ $CONN->{container}{0} };
1302
1303 # we basically have to use the same sorting as everybody else 1339 # we basically have to use the same sorting as everybody else
1304 @items = sort { $a->{type} <=> $b->{type} } @items; 1340 for my $item (@{ $CONN->{container}{0} }) {
1305 1341 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $item);
1306 for my $item (reverse @items) {
1307 my $desc = $item->{nrof} < 2
1308 ? $item->{name}
1309 : "$item->{nrof} $item->{name_pl}";
1310 # todo: animation widget, face widget, weight(?) etc.
1311 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1312 tooltip => (CFClient::UI::Label->escape ($desc)
1313 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1314 can_hover => 1,
1315 can_events => 1,
1316 connect_button_down => sub {
1317 my ($self, $ev, $x, $y) = @_;
1318
1319 # todo: maybe put examine on 1? but should just be a tooltip :(
1320 if ($ev->{button} == 1) {
1321 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1322 } elsif ($ev->{button} == 2) {
1323 $CONN->send ("apply $item->{tag}");
1324 } elsif ($ev->{button} == 3) {
1325 # examine, lock, mark, maybe other things
1326 warn "MENU not implemented yet\n";
1327 }
1328
1329 1
1330 },
1331 );
1332
1333 $hbox->add (new CFClient::UI::Face
1334 can_events => 0,
1335 face => $item->{face},
1336 anim => $item->{anim},
1337 animspeed => $item->{animspeed},
1338 );
1339
1340 $hbox->add (new CFClient::UI::Label
1341 can_events => 0,
1342 text => $desc,
1343 );
1344 } 1342 }
1345 }); 1343 });
1346 refresh; 1344 refresh;
1347} 1345}
1348 1346
1349sub conn::container_add { 1347sub conn::container_add {
1350 my ($self, $id, $items) = @_; 1348 my ($self, $id, $items) = @_;
1351 1349
1352 update_floorbox if $id == 0; 1350 update_floorbox if $id == 0;
1351 if ($self->{player}{tag} == $id) {
1352 $INV->set_items ($self->{container}{$self->{player}{tag}});
1353 }
1353 # $self-<{player}{tag} => player inv 1354 # $self-<{player}{tag} => player inv
1354 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1355 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1355} 1356}
1356 1357
1357sub conn::container_clear { 1358sub conn::container_clear {
1358 my ($self, $id) = @_; 1359 my ($self, $id) = @_;
1359 1360
1360 update_floorbox if $id == 0; 1361 update_floorbox if $id == 0;
1362 if ($self->{player}{tag} == $id) {
1363 $INV->set_items ($self->{container}{$id});
1364 }
1365
1361# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1366# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1362} 1367}
1363 1368
1364sub conn::item_delete { 1369sub conn::item_delete {
1365 my ($self, @items) = @_; 1370 my ($self, @items) = @_;
1366 1371
1367 for (@items) { 1372 for (@items) {
1368 update_floorbox if $_->{container} == 0; 1373 update_floorbox if $_->{container} == 0;
1374 if ($self->{player}{tag} == $_->{container}) {
1375 $INV->set_items ($self->{container}{$_->{container}});
1376 }
1369 } 1377 }
1370} 1378}
1371 1379
1372sub conn::item_update { 1380sub conn::item_update {
1373 my ($self, $item) = @_; 1381 my ($self, $item) = @_;
1374 1382
1375 update_floorbox if $item->{container} == 0; 1383 update_floorbox if $item->{container} == 0;
1384 if ($self->{player}{tag} == $item->{container}) {
1385 $INV->set_items ($self->{container}{$item->{container}});
1386 }
1376} 1387}
1377 1388
1378%SDL_CB = ( 1389%SDL_CB = (
1379 CFClient::SDL_QUIT => sub { 1390 CFClient::SDL_QUIT => sub {
1380 Event::unloop -1; 1391 Event::unloop -1;
… …
1393 video_init; 1404 video_init;
1394 } else { 1405 } else {
1395 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1406 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1396 } 1407 }
1397 }, 1408 },
1398 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1409 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1399 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1410 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1400 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1411 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1401 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1412 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1402 CFClient::SDL_USEREVENT => \&audio_music_finished, 1413 CFClient::SDL_USEREVENT => sub {
1414 if ($_[0]{code} == 1) {
1415 audio_channel_finished $_[0]{data1};
1416 } elsif ($_[0]{code} == 0) {
1417 audio_music_finished;
1418 }
1419 },
1403); 1420);
1404 1421
1405############################################################################# 1422#############################################################################
1406 1423
1407$SIG{INT} = $SIG{TERM} = sub { exit }; 1424$SIG{INT} = $SIG{TERM} = sub { exit };
1425
1426CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1408 1427
1409$TILECACHE = CFClient::db_table "tilecache"; 1428$TILECACHE = CFClient::db_table "tilecache";
1410$FACEMAP = CFClient::db_table "facemap"; 1429$FACEMAP = CFClient::db_table "facemap";
1411
1412CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1413 1430
1414my %DEF_CFG = ( 1431my %DEF_CFG = (
1415 sdl_mode => 0, 1432 sdl_mode => 0,
1416 width => 640, 1433 width => 640,
1417 height => 480, 1434 height => 480,
… …
1507limits (like a fixed amount of face numbers). There are still limits, but 1524limits (like a fixed amount of face numbers). There are still limits, but
1508they are not arbitrarily low :) 1525they are not arbitrarily low :)
1509 1526
1510=back 1527=back
1511 1528
1529=head1 USAGE
1530
1531=head2 The Map
1532
1533The map is always displayed in the background, behind all other windows and UI elements.
1534
1535#TODO# middle-click scrolls
1536#
1537# keys:
1538#
1539# a apply
1540# keypad moves, kp_5 applies ranged attack to self
1541
1542Starting to type enters the I<completion mode>. In that mode, you can type
1543abbreviations or commands and have them executed as soon as they match a
1544valid command. This is best explained by a few examples:
1545
1546Typing B<climb> will display a list of commands with I<climb> in their
1547name, such as I<ready_skill climbing> and I<use_skill climbing>.
1548
1549You can abbreviate commands by typing only the first character of every
1550word. For example, typing I<iwor> will likely select I<invoke word of
1551recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1552will likely select I<ready_skill climbing> and I<usl> will give you
1553I<use_skill levitation>.
1554
1555=head2 The map overview
1556
1557#TODO#
1558
1559=head2 The Status area in the lower right corner
1560
1561#TODO#
1562
1563=head2 The I<Statistics>/I>Stats> window
1564
1565#TODO#
1566
1512=head1 FAQ 1567=head1 FAQ
1513 1568
1514=over 4 1569=over 4
1515 1570
1516=item The client is very sluggish and slow, what can I do about this? 1571=item The client is very sluggish and slow, what can I do about this?

Diff Legend

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