ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.90 by elmex, Mon Jul 10 06:59:14 2006 UTC vs.
Revision 1.100 by root, Sun Jul 23 16:11:12 2006 UTC

… …
36 36
37use CFClient; 37use CFClient;
38use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol; 39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::Pod;
41use CFClient::BindingEditor; 42use CFClient::BindingEditor;
42use CFClient::MapWidget; 43use CFClient::MapWidget;
43 44
44$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 45$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE';
45 47
46$Event::DIED = sub { 48$Event::DIED = sub {
47 # TODO: display dialog box or so 49 # TODO: display dialog box or so
48 Carp::confess $_[1];#d#TODO: remove when stable 50 Carp::confess $_[1];#d#TODO: remove when stable
49 CFClient::error $_[1]; 51 CFClient::error $_[1];
… …
85our $CONSOLE; 87our $CONSOLE;
86our $METASERVER; 88our $METASERVER;
87our $LOGIN_BUTTON; 89our $LOGIN_BUTTON;
88our $QUIT_DIALOG; 90our $QUIT_DIALOG;
89our $HOST_ENTRY; 91our $HOST_ENTRY;
92our $FULLSCREEN_ENABLE;
90our $PICKUP_ENABLE; 93our $PICKUP_ENABLE;
91our $SERVER_INFO; 94our $SERVER_INFO;
92 95
93our $SETUP_DIALOG; 96our $SETUP_DIALOG;
94our $SETUP_NOTEBOOK; 97our $SETUP_NOTEBOOK;
… …
98our $PL_NOTEBOOK; 101our $PL_NOTEBOOK;
99our $PL_WINDOW; 102our $PL_WINDOW;
100 103
101our $INVENTORY_PAGE; 104our $INVENTORY_PAGE;
102our $STATS_PAGE; 105our $STATS_PAGE;
106our $SKILL_PAGE;
103our $SPELL_PAGE; 107our $SPELL_PAGE;
104 108
105our $HELP_WINDOW; 109our $HELP_WINDOW;
106our $MESSAGE_WINDOW; 110our $MESSAGE_WINDOW;
107our $FLOORBOX; 111our $FLOORBOX;
… …
127our $BIND_UPD_CB; 131our $BIND_UPD_CB;
128 132
129our $PICKUP_CFG; 133our $PICKUP_CFG;
130 134
131sub status { 135sub status {
132 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 136 $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
133} 137}
134 138
135sub debug { 139sub debug {
136 $DEBUG_STATUS->set_text ($_[0]); 140 $DEBUG_STATUS->set_text ($_[0]);
137} 141}
… …
186 $MESSAGE_WINDOW->show; 190 $MESSAGE_WINDOW->show;
187 191
188 unshift @dialog, new CFClient::UI::Label 192 unshift @dialog, new CFClient::UI::Label
189 max_w => $::WIDTH * 0.4, 193 max_w => $::WIDTH * 0.4,
190 ellipsise => 0, 194 ellipsise => 0,
191 markup => "\nOr use your keyboard:\n"; 195 markup => "\nOr use your keyboard and the text entry below:\n";
192 196
193 unshift @dialog, my $table = new CFClient::UI::Table; 197 unshift @dialog, my $table = new CFClient::UI::Table;
194 198
195 $table->add (0, 0, new CFClient::UI::Button 199 $table->add (0, 0, new CFClient::UI::Button
196 text => "Next Race", 200 text => "Next Race",
… …
213 max_w => $::WIDTH * 0.4, 217 max_w => $::WIDTH * 0.4,
214 ellipsise => 0, 218 ellipsise => 0,
215 markup => 219 markup =>
216 "<big><b>Character Creation: Race</b></big>\n\n" 220 "<big><b>Character Creation: Race</b></big>\n\n"
217 . "Look at the <b>Messages</b> window to see a description of this race " 221 . "Look at the <b>Messages</b> window to see a description of this race "
218 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
219 . "and the center of the screen to see how this race looks like " 222 . "and the center of the screen to see how this race looks like "
220 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n" 223 . "(<small>below this dialog window: you may need to move the dialog away and "
224 . "click into the display area to make it visible</small>).\n\n"
221 . "You can look at another race, or accept this race (you will come back to this race eventually, " 225 . "You can look at another race, or accept this race (you will cycle back to "
222 . "so you can take your time making this important choice." 226 . "this race eventually, so you can take your time making this important choice."
223 ; 227 ;
224 228
225 } elsif ($prompt =~ /roll new stats/) { 229 } elsif ($prompt =~ /roll new stats/) {
226 if (my $stat = delete $conn->{stat_change_with}) { 230 if (my $stat = delete $conn->{stat_change_with}) {
227 $conn->send ("reply $stat"); 231 $conn->send ("reply $stat");
… …
233 $MESSAGE_WINDOW->hide; 237 $MESSAGE_WINDOW->hide;
234 238
235 unshift @dialog, new CFClient::UI::Label 239 unshift @dialog, new CFClient::UI::Label
236 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.4,
237 ellipsise => 0, 241 ellipsise => 0,
238 markup => "\nOr use your keyboard:\n"; 242 markup => "\nOr use your keyboard and the text entry below:\n";
239 243
240 unshift @dialog, my $table = new CFClient::UI::Table; 244 unshift @dialog, my $table = new CFClient::UI::Table;
241 245
242 # left: re-roll 246 # left: re-roll
243 $table->add (0, 0, new CFClient::UI::Button 247 $table->add (0, 0, new CFClient::UI::Button
… …
249 }, 253 },
250 ); 254 );
251 255
252 # center: swap stats 256 # center: swap stats
253 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 257 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
258 expand => 1,
254 value => $_, 259 value => $_,
255 options => [ 260 options => [
256 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
257 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
258 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 263 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
283 destroy_query_dialog $conn; 288 destroy_query_dialog $conn;
284 0 289 0
285 }, 290 },
286 ); 291 );
287 292
293 unshift @dialog, my $hbox = new CFClient::UI::HBox;
294 for (
295 [Str => CS_STAT_STR],
296 [Dex => CS_STAT_DEX],
297 [Con => CS_STAT_CON],
298 [Int => CS_STAT_INT],
299 [Wis => CS_STAT_WIS],
300 [Pow => CS_STAT_POW],
301 [Cha => CS_STAT_CHA],
302 ) {
303 my ($name, $id) = @$_;
304 $hbox->add (new CFClient::UI::Label
305 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
306 align => 0,
307 expand => 1,
308 can_events => 1,
309 can_hover => 1,
310 tooltip => $CFClient::STAT_TOOLTIP{$name},
311 );
312 }
313
288 unshift @dialog, new CFClient::UI::Label 314 unshift @dialog, new CFClient::UI::Label
289 max_w => $::WIDTH * 0.4, 315 max_w => $::WIDTH * 0.4,
290 ellipsise => 0, 316 ellipsise => 0,
291 markup => 317 markup =>
292 "<big><b>Character Creation: Stats</b></big>\n\n" 318 "<big><b>Character Creation: Stats</b></big>\n\n"
293 . "Look at the <b>Stats</b> window to see your basic stats " 319 . "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
294 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n" 320 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
321 . "They will be modified later by both the race and the class you choose.\n\n"
295 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. " 322 . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
296 . "Race selection will influence those values later on."
297 ; 323 ;
298 } 324 }
299 325
300 push @dialog, my $entry = new CFClient::UI::Entry 326 push @dialog, my $entry = new CFClient::UI::Entry
301 on_changed => sub { 327 on_changed => sub {
… …
415 $mode_slider->emit (changed => $mode_slider->{range}[0]); 441 $mode_slider->emit (changed => $mode_slider->{range}[0]);
416 442
417 my $row = 1; 443 my $row = 1;
418 444
419 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 445 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
420 $table->add (1, $row++, new CFClient::UI::CheckBox 446 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
421 state => $CFG->{fullscreen}, 447 state => $CFG->{fullscreen},
422 tooltip => "Bring the client into fullscreen mode.", 448 tooltip => "Bring the client into fullscreen mode.",
423 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 449 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
424 ); 450 );
425 451
… …
641 667
642 $table 668 $table
643} 669}
644 670
645sub stats_window { 671sub stats_window {
672 my $r = new CFClient::UI::ScrolledWindow (
673 expand => 1,
674 scroll_y => 1
675 );
646 my $vb = new CFClient::UI::VBox; 676 $r->add (my $vb = new CFClient::UI::VBox);
647 677
648 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 678 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
649 can_hover => 1, can_events => 1, 679 can_hover => 1, can_events => 1,
650 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 680 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
651 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 681 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
… …
665 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 695 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
666 696
667 my $color2 = [1, 1, 0]; 697 my $color2 = [1, 1, 0];
668 698
669 for ( 699 for (
670 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 700 [0, 0, st_str => "Str", 30],
671 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 701 [0, 1, st_dex => "Dex", 30],
672 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 702 [0, 2, st_con => "Con", 30],
673 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 703 [0, 3, st_int => "Int", 30],
674 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 704 [0, 4, st_wis => "Wis", 30],
675 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 705 [0, 5, st_pow => "Pow", 30],
676 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 706 [0, 6, st_cha => "Cha", 30],
677 707
678 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 708 [2, 0, st_wc => "Wc", -120],
679 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 709 [2, 1, st_ac => "Ac", -120],
680 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 710 [2, 2, st_dam => "Dam", 120],
681 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."], 711 [2, 3, st_arm => "Arm", 120],
682 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 712 [2, 4, st_spd => "Spd", 10.54],
683 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 713 [2, 5, st_wspd => "WSp", 10.54],
684 ) { 714 ) {
685 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 715 my ($col, $row, $id, $label, $template) = @$_;
686 716
687 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 717 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
688 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 718 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
719 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
689 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 720 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
690 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 721 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
722 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
691 } 723 }
692 724
693 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 725 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
694 726
695 my $row = 0; 727 my $row = 0;
696 my $col = 0; 728 my $col = 0;
697 729
698 my %resist_names = ( 730 my %resist_names = (
731 slow => ["Slow",
699 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 732 "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
733 holyw => ["Holy Word",
700 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 734 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
735 conf => ["Confusion",
701 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 736 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
737 fire => ["Fire",
702 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 738 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
739 depl => ["Depletion",
703 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 740 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
741 magic => ["Magic",
704 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 742 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
743 drain => ["Draining",
705 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 744 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
745 acid => ["Acid",
706 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 746 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
747 pois => ["Poison",
707 pois => "<b>Poison</b> (resistance to getting poisoned)", 748 "<b>Poison</b> (resistance to getting poisoned)"],
749 para => ["Paralysation",
708 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 750 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
751 deat => ["Death",
709 deat => "<b>Death</b> (resistance against death spells)", 752 "<b>Death</b> (resistance against death spells)"],
753 phys => ["Physical",
710 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)", 754 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
755 blind => ["Blind",
711 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 756 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
757 fear => ["Fear",
712 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 758 "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
759 tund => ["Turn undead",
713 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 760 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
761 elec => ["Electricity",
714 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 762 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
763 cold => ["Cold",
715 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 764 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
765 ghit => ["Ghost hit",
716 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 766 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
717 ); 767 );
718 for (qw/slow holyw conf fire depl magic 768 for (qw/slow holyw conf fire depl magic
719 drain acid pois para deat phys 769 drain acid pois para deat phys
720 blind fear tund elec cold ghit/) 770 blind fear tund elec cold ghit/)
721 { 771 {
… …
726 template => "-100%", 776 template => "-100%",
727 align => +1, 777 align => +1,
728 valign => 0, 778 valign => 0,
729 can_events => 1, 779 can_events => 1,
730 can_hover => 1, 780 can_hover => 1,
731 tooltip => $resist_names{$_}, 781 tooltip => $resist_names{$_}->[1],
732 ); 782 );
733 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 783 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
734 font => $FONT_FIXED, 784 font => $FONT_FIXED,
735 can_hover => 1, 785 can_hover => 1,
736 can_events => 1, 786 can_events => 1,
737 path => "ui/resist/resist_$_.png", 787 path => "ui/resist/resist_$_.png",
738 tooltip => $resist_names{$_}, 788 tooltip => $resist_names{$_}->[1],
789 );
790 $tbl2->add ($col + 2, $row, new CFClient::UI::Label
791 text => $resist_names{$_}->[0],
792 font => $FONT_FIXED,
793 can_hover => 1,
794 can_events => 1,
795 tooltip => $resist_names{$_}->[1],
739 ); 796 );
740 797
741 $row++; 798 $row++;
742 if ($row % 6 == 0) { 799 if ($row % 6 == 0) {
743 $col += 2; 800 $col += 3;
744 $row = 0; 801 $row = 0;
745 } 802 }
746 } 803 }
747 804
748 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
749 $STATWIDS->{"_skill_tbl"} = $tbl3;
750
751 update_stats_window ({}); 805 #update_stats_window ({});
752 806
753 $vb 807 $r
808}
809
810sub skill_window {
811 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
812 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
813 $sw
754} 814}
755 815
756sub formsep($) { 816sub formsep($) {
757 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 817 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
758}
759
760sub update_stats_window {
761 my ($stats) = @_;
762
763 # I love text protocols...
764
765 my $hp = $stats->{+CS_STAT_HP} * 1;
766 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
767 my $sp = $stats->{+CS_STAT_SP} * 1;
768 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
769 my $fo = $stats->{+CS_STAT_FOOD} * 1;
770 my $fo_m = 999;
771 my $gr = $stats->{+CS_STAT_GRACE} * 1;
772 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
773
774 $GAUGES->{hp} ->set_value ($hp, $hp_m);
775 $GAUGES->{mana} ->set_value ($sp, $sp_m);
776 $GAUGES->{food} ->set_value ($fo, $fo_m);
777 $GAUGES->{grace} ->set_value ($gr, $gr_m);
778 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
779 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
780 my $rng = $stats->{+CS_STAT_RANGE};
781 $rng =~ s/^Range: //; # thank you so much dear server
782 $GAUGES->{range} ->set_text ("Rng: " . $rng);
783 my $title = $stats->{+CS_STAT_TITLE};
784 $title =~ s/^Player: //;
785 $STATWIDS->{title} ->set_text ("Title: " . $title);
786
787 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
788 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
789 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
790 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
791 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
792 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
793 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
794 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
795 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
796 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
797 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
798 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
799 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
800
801 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
802
803 my %tbl = (
804 phys => CS_STAT_RES_PHYS,
805 magic => CS_STAT_RES_MAG,
806 fire => CS_STAT_RES_FIRE,
807 elec => CS_STAT_RES_ELEC,
808 cold => CS_STAT_RES_COLD,
809 conf => CS_STAT_RES_CONF,
810 acid => CS_STAT_RES_ACID,
811 drain => CS_STAT_RES_DRAIN,
812 ghit => CS_STAT_RES_GHOSTHIT,
813 pois => CS_STAT_RES_POISON,
814 slow => CS_STAT_RES_SLOW,
815 para => CS_STAT_RES_PARA,
816 tund => CS_STAT_TURN_UNDEAD,
817 fear => CS_STAT_RES_FEAR,
818 depl => CS_STAT_RES_DEPLETE,
819 deat => CS_STAT_RES_DEATH,
820 holyw => CS_STAT_RES_HOLYWORD,
821 blind => CS_STAT_RES_BLIND,
822 );
823
824 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
825 my $sktbl = $STATWIDS->{_skill_tbl};
826 $sktbl->clear;
827
828 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
829 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
830 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
831
832 my @skills;
833
834 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
835 push @skills, [$i, $::CONN->{skill_info}{$i}];
836 }
837
838 my $y = 1;
839 for (sort { $a->[1] cmp $b->[1] } @skills) {
840 my ($idx, $name) = @$_;
841
842 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
843 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
844 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
845 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
846 }
847 }
848
849 $STATWIDS->{_skill_tbl_init} = 1;
850 }
851
852 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
853 if (exists $stats->{$i}) {
854 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
855 if $STATWIDS->{"sk_xp_$i"};
856 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
857 if $STATWIDS->{"sk_lvl_$i"};
858 }
859 }
860
861 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
862 for keys %tbl;
863} 818}
864 819
865my $METASERVER_ATIME; 820my $METASERVER_ATIME;
866 821
867sub update_metaserver { 822sub update_metaserver {
… …
1113sub message_window { 1068sub message_window {
1114 my $window = new CFClient::UI::FancyFrame 1069 my $window = new CFClient::UI::FancyFrame
1115 name => "message_window", 1070 name => "message_window",
1116 title => "Messages", 1071 title => "Messages",
1117 border_bg => [1, 1, 1, 1], 1072 border_bg => [1, 1, 1, 1],
1118 bg => [0, 0, 0, 0.75],
1119 x => "max", 1073 x => "max",
1120 y => 0, 1074 y => 0,
1121 force_w => $::WIDTH * 0.4, 1075 force_w => $::WIDTH * 0.4,
1122 force_h => $::HEIGHT * 0.5, 1076 force_h => $::HEIGHT * 0.5,
1123 child => (my $vbox = new CFClient::UI::VBox), 1077 child => (my $vbox = new CFClient::UI::VBox),
… …
1306sub inventory_widget { 1260sub inventory_widget {
1307 my $hb = new CFClient::UI::HBox homogeneous => 1; 1261 my $hb = new CFClient::UI::HBox homogeneous => 1;
1308 1262
1309 $hb->add (my $vb1 = new CFClient::UI::VBox); 1263 $hb->add (my $vb1 = new CFClient::UI::VBox);
1310 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1264 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1265
1266 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1267
1268 use sort 'stable';
1269
1270 $hb1->add (new CFClient::UI::Combobox
1271 value => undef,
1272 options => [
1273 [undef, "Type/Name"],
1274 [
1275 sub { sort {
1276 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1277 or $a->{type} <=> $b->{type}
1278 } @_ },
1279 "Weight/Type",
1280 ],
1281 [sub { } => "#TODO#"],
1282 ],
1283 on_changed => sub {
1284 $INV->set_sort_order ($_[1]);
1285 },
1286 );
1287 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1288 #TODO# update to weigh/maxweight
1289 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1290
1291 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1311 $vb1->add ($INV = new CFClient::UI::Inventory); 1292 $sw1->add ($INV = new CFClient::UI::Inventory);
1312 1293
1313 $hb->add (my $vb2 = new CFClient::UI::VBox); 1294 $hb->add (my $vb2 = new CFClient::UI::VBox);
1314 1295
1315 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1316 1297
1298 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1317 $vb2->add ($INVR = new CFClient::UI::Inventory); 1299 $sw2->add ($INVR = new CFClient::UI::Inventory);
1318 1300
1319 # XXX: Call after $INVR = ... because set_opencont sets the items 1301 # XXX: Call after $INVR = ... because set_opencont sets the items
1320 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1302 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1321 1303
1322 $hb 1304 $hb
… …
1344 has_close_button => 1 1326 has_close_button => 1
1345 ; 1327 ;
1346 1328
1347 my $ntb = 1329 my $ntb =
1348 $PL_NOTEBOOK = 1330 $PL_NOTEBOOK =
1349 new CFClient::UI::Notebook 1331 new CFClient::UI::Notebook expand => 1, debug => 1;
1350 expand => 1,
1351 debug => 1,
1352 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1353 ;
1354 1332
1355 $ntb->add ( 1333 $ntb->add (
1356 "Stats &amp; Skills" => $STATS_PAGE = stats_window, 1334 "Statistics (F2)" => $STATS_PAGE = stats_window,
1357 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown." 1335 "Shows statistics, where all your Stats and Resistances are shown."
1358 ); 1336 );
1359 $ntb->add ( 1337 $ntb->add (
1338 "Skills (F3)" => $SKILL_PAGE = skill_window,
1339 "Shows all your Skills."
1340 );
1341
1342 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1360 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, 1343 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1344 $ntb->add (
1345 "Spellbook (F4)" => $spellsw,
1361 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1346 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1362 ); 1347 );
1363 $ntb->add ( 1348 $ntb->add (
1364 Inventory => $INVENTORY_PAGE = inventory_widget, 1349 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1365 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1350 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1366 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1351 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1367 ); 1352 );
1368 1353
1369 $ntb->set_current_page ($INVENTORY_PAGE); 1354 $ntb->set_current_page ($INVENTORY_PAGE);
… …
1482 $refresh->(); 1467 $refresh->();
1483 1468
1484 $vb 1469 $vb
1485} 1470}
1486 1471
1472# just weirdness, pls. ignore
1473sub load_html_page {
1474 my ($viewer, $base) = @_;
1475
1476 $viewer->clear;
1477
1478 require LWP::Simple;
1479 require HTML::Parser;
1480 require URI;
1481
1482 my $page = LWP::Simple::get ($base)
1483 or return;
1484
1485 my @s = { };
1486 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1487
1488 my $parser = HTML::Parser->new (
1489 text_h => [sub {
1490 my ($text) = @_;
1491 $text =~ s/\s+/ /g;
1492 $s[-1]{text} .= CFClient::asxml $text;
1493 }, "dtext"],
1494 start_h => [sub {
1495 my ($tag, $attr) = @_;
1496 if ($passthrough{$tag}) {
1497 $s[-1]{text} .= "<$tag>";
1498 } elsif ($tag eq "h1") {
1499 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1500 } elsif ($tag eq "h2") {
1501 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1502 } elsif ($tag eq "h3") {
1503 push @s, { text => "<span size='large'>" };
1504 } elsif ($tag eq "a") {
1505 push @s, { text => "", url => $attr->{href} };
1506 } elsif ($tag eq "p") {
1507 push @s, { };
1508 } elsif ($tag eq "img") {
1509 eval {
1510 push @{$s[-1]{obj}}, new CFClient::UI::Image
1511 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1512 $s[-1]{text} .= "\x{fffc}";
1513 };
1514 }
1515 }, "tagname, attr"],
1516 end_h => [sub {
1517 my ($tag) = @_;
1518 if ($passthrough{$tag}) {
1519 $s[-1]{text} .= "</$tag>";
1520 } elsif ($tag =~ /^h\d$/) {
1521 $s[-1]{text} .= "</span>";
1522 push @s, { };
1523 } elsif ($tag eq "a") {
1524 my $S = pop @s;
1525 $s[-1]{text} .= "\x{fffc}";
1526 push @{$s[-1]{obj}}, new CFClient::UI::Label
1527 fg => [0.8, 0.8, 1],
1528 markup => "<u>$S->{text}</u>",
1529 fontsize => 0.8,
1530 can_events => 1,
1531 can_focus => 1,
1532 on_button_up => sub {
1533 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1534 },
1535 ;
1536 }
1537 }, "tagname"],
1538 );
1539
1540 $parser->parse ($page);
1541 $parser->eof;
1542
1543 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1544 for @s;
1545
1546 $viewer->set_offset (0);
1547}
1548
1487sub help_window { 1549sub help_window {
1488 my $win = new CFClient::UI::FancyFrame 1550 my $win = new CFClient::UI::FancyFrame
1489 x => 'center', 1551 x => 'center',
1490 y => 'center', 1552 y => 'center',
1491 z => 2, 1553 z => 2,
… …
1509 [manual => "Main Manual"], 1571 [manual => "Main Manual"],
1510 [skill_help => "Skill Reference"], 1572 [skill_help => "Skill Reference"],
1511 [command_help => "Command Reference"], 1573 [command_help => "Command Reference"],
1512 [dmcommand_help => "DM Commands"], 1574 [dmcommand_help => "DM Commands"],
1513 [COPYING => "License Terms"], 1575 [COPYING => "License Terms"],
1576 [test => "test (do not select)"], #d#TODO
1514 ], 1577 ],
1515 on_changed => sub { 1578 on_changed => sub {
1516 my ($self, $pod) = @_; 1579 my ($self, $pod) = @_;
1517 1580
1581 if ($pod eq "test") {#d#TODO
1582 eval {
1583 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1584 };
1585 warn "$@" if $@;
1586 return;
1587 }
1588
1518 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1589 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1519 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1590 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1591
1592 #use Data::Dumper; warn Dumper $pom;#d#
1520 1593
1521 $viewer->clear; 1594 $viewer->clear;
1522 1595
1523# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n", 1596# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1524# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1), 1597# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1525# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"), 1598# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1526# ]);#d# 1599# ]);#d#
1527 1600
1528 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1601 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1529 for @$pom; 1602 for @$pom;
1530 1603
1531 $viewer->set_offset (0); 1604 $viewer->set_offset (0);
1532 1605
1533 0 1606 0
… …
1799 1872
1800 $WANT_REFRESH = 0; 1873 $WANT_REFRESH = 0;
1801 $CAN_REFRESH = 0; 1874 $CAN_REFRESH = 0;
1802 $LAST_REFRESH = $NOW; 1875 $LAST_REFRESH = $NOW;
1803 1876
18040 && do {
1805 # some weird model-drawing code, just a joke right now
1806 use CFClient::OpenGL;
1807
1808 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1809 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1810 $demo{r} ||= do {
1811 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1812 $mod->{v} = pack "f*", @{$mod->{v}};
1813 $_ = [scalar @$_, pack "S!*", @$_]
1814 for values %{$mod->{g}};
1815 $mod
1816 };
1817
1818 my $r = $demo{r} or die;
1819
1820 glDepthMask 1;
1821 glClear GL_DEPTH_BUFFER_BIT;
1822 glEnable GL_TEXTURE_2D;
1823 glEnable GL_DEPTH_TEST;
1824 glEnable GL_CULL_FACE;
1825 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1826
1827 glMatrixMode GL_PROJECTION;
1828 glLoadIdentity;
1829 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1830 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1831 glMatrixMode GL_MODELVIEW;
1832 glLoadIdentity;
1833
1834 glPushMatrix;
1835 glTranslate 0, 0, -800;
1836 glScale 1, -1, 1;
1837 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1838 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1839 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1840 glScale 50, 50, 50;
1841
1842 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1843 while (my ($k, $v) = each %{$r->{g}}) {
1844 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1845 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1846 }
1847
1848 glPopMatrix;
1849
1850 glShadeModel GL_FLAT;
1851 glDisable GL_DEPTH_TEST;
1852 glDisable GL_TEXTURE_2D;
1853 glDepthMask 0;
1854
1855 $WANT_REFRESH++;
1856};
1857
1858 CFClient::SDL_GL_SwapBuffers; 1877 CFClient::SDL_GL_SwapBuffers;
1859} 1878}
1860 1879
1861my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1880my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1862 $NOW = time; 1881 $NOW = time;
… …
1908# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1927# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1909 }, 1928 },
1910 CFClient::SDL_KEYDOWN => sub { 1929 CFClient::SDL_KEYDOWN => sub {
1911 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1930 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1912 # alt-enter 1931 # alt-enter
1932 $FULLSCREEN_ENABLE->toggle;
1913 video_shutdown; 1933 video_shutdown;
1914 $CFG->{fullscreen} = !$CFG->{fullscreen};
1915 video_init; 1934 video_init;
1916 } else { 1935 } else {
1917 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1936 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1918 } 1937 }
1919 }, 1938 },
… …
1935$SIG{INT} = $SIG{TERM} = sub { exit }; 1954$SIG{INT} = $SIG{TERM} = sub { exit };
1936 1955
1937{ 1956{
1938 local $SIG{__DIE__} = sub { 1957 local $SIG{__DIE__} = sub {
1939 return unless defined $^S && !$^S; 1958 return unless defined $^S && !$^S;
1940 Carp::confess $_[1];#d#TODO: remove when stable 1959 Carp::confess $_[0];#d#TODO: remove when stable
1941 CFClient::fatal $_[0]; 1960 CFClient::fatal $_[0];
1942 }; 1961 };
1943 1962
1944 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1963 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1945 CFClient::UI::set_layout ($::CFG->{layout}); 1964 CFClient::UI::set_layout ($::CFG->{layout});

Diff Legend

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