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.94 by root, Sun Jul 16 20:04:08 2006 UTC vs.
Revision 1.102 by root, Mon Jul 24 04:24:43 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" };
45$SIG{PIPE} = 'IGNORE'; 46$SIG{PIPE} = 'IGNORE';
… …
100our $PL_NOTEBOOK; 101our $PL_NOTEBOOK;
101our $PL_WINDOW; 102our $PL_WINDOW;
102 103
103our $INVENTORY_PAGE; 104our $INVENTORY_PAGE;
104our $STATS_PAGE; 105our $STATS_PAGE;
106our $SKILL_PAGE;
105our $SPELL_PAGE; 107our $SPELL_PAGE;
106 108
107our $HELP_WINDOW; 109our $HELP_WINDOW;
108our $MESSAGE_WINDOW; 110our $MESSAGE_WINDOW;
109our $FLOORBOX; 111our $FLOORBOX;
… …
129our $BIND_UPD_CB; 131our $BIND_UPD_CB;
130 132
131our $PICKUP_CFG; 133our $PICKUP_CFG;
132 134
133sub status { 135sub status {
134 $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]);
135} 137}
136 138
137sub debug { 139sub debug {
138 $DEBUG_STATUS->set_text ($_[0]); 140 $DEBUG_STATUS->set_text ($_[0]);
139} 141}
… …
188 $MESSAGE_WINDOW->show; 190 $MESSAGE_WINDOW->show;
189 191
190 unshift @dialog, new CFClient::UI::Label 192 unshift @dialog, new CFClient::UI::Label
191 max_w => $::WIDTH * 0.4, 193 max_w => $::WIDTH * 0.4,
192 ellipsise => 0, 194 ellipsise => 0,
193 markup => "\nOr use your keyboard:\n"; 195 markup => "\nOr use your keyboard and the text entry below:\n";
194 196
195 unshift @dialog, my $table = new CFClient::UI::Table; 197 unshift @dialog, my $table = new CFClient::UI::Table;
196 198
197 $table->add (0, 0, new CFClient::UI::Button 199 $table->add (0, 0, new CFClient::UI::Button
198 text => "Next Race", 200 text => "Next Race",
… …
215 max_w => $::WIDTH * 0.4, 217 max_w => $::WIDTH * 0.4,
216 ellipsise => 0, 218 ellipsise => 0,
217 markup => 219 markup =>
218 "<big><b>Character Creation: Race</b></big>\n\n" 220 "<big><b>Character Creation: Race</b></big>\n\n"
219 . "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 "
220 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
221 . "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 "
222 . "(<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"
223 . "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 "
224 . "so you can take your time making this important choice." 226 . "this race eventually, so you can take your time making this important choice."
225 ; 227 ;
226 228
227 } elsif ($prompt =~ /roll new stats/) { 229 } elsif ($prompt =~ /roll new stats/) {
228 if (my $stat = delete $conn->{stat_change_with}) { 230 if (my $stat = delete $conn->{stat_change_with}) {
229 $conn->send ("reply $stat"); 231 $conn->send ("reply $stat");
… …
235 $MESSAGE_WINDOW->hide; 237 $MESSAGE_WINDOW->hide;
236 238
237 unshift @dialog, new CFClient::UI::Label 239 unshift @dialog, new CFClient::UI::Label
238 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.4,
239 ellipsise => 0, 241 ellipsise => 0,
240 markup => "\nOr use your keyboard:\n"; 242 markup => "\nOr use your keyboard and the text entry below:\n";
241 243
242 unshift @dialog, my $table = new CFClient::UI::Table; 244 unshift @dialog, my $table = new CFClient::UI::Table;
243 245
244 # left: re-roll 246 # left: re-roll
245 $table->add (0, 0, new CFClient::UI::Button 247 $table->add (0, 0, new CFClient::UI::Button
… …
250 0 252 0
251 }, 253 },
252 ); 254 );
253 255
254 # center: swap stats 256 # center: swap stats
255 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 257 my ($sw1, $sw2) = map +(new CFClient::UI::Selector
258 expand => 1,
256 value => $_, 259 value => $_,
257 options => [ 260 options => [
258 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 261 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
259 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 262 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
260 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 263 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
285 destroy_query_dialog $conn; 288 destroy_query_dialog $conn;
286 0 289 0
287 }, 290 },
288 ); 291 );
289 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
290 unshift @dialog, new CFClient::UI::Label 314 unshift @dialog, new CFClient::UI::Label
291 max_w => $::WIDTH * 0.4, 315 max_w => $::WIDTH * 0.4,
292 ellipsise => 0, 316 ellipsise => 0,
293 markup => 317 markup =>
294 "<big><b>Character Creation: Stats</b></big>\n\n" 318 "<big><b>Character Creation: Stats</b></big>\n\n"
295 . "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"
296 . "(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"
297 . "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"
298 . "Race selection will influence those values later on."
299 ; 323 ;
300 } 324 }
301 325
302 push @dialog, my $entry = new CFClient::UI::Entry 326 push @dialog, my $entry = new CFClient::UI::Entry
303 on_changed => sub { 327 on_changed => sub {
… …
643 667
644 $table 668 $table
645} 669}
646 670
647sub stats_window { 671sub stats_window {
672 my $r = new CFClient::UI::ScrolledWindow (
673 expand => 1,
674 scroll_y => 1
675 );
648 my $vb = new CFClient::UI::VBox; 676 $r->add (my $vb = new CFClient::UI::VBox);
649 677
650 $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,
651 can_hover => 1, can_events => 1, 679 can_hover => 1, can_events => 1,
652 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.");
653 $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,
… …
660 tooltip => "The weight of the player including all inventory items."); 688 tooltip => "The weight of the player including all inventory items.");
661 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 689 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
662 can_hover => 1, can_events => 1, 690 can_hover => 1, can_events => 1,
663 tooltip => "The weight limit: you cannot carry more than this."); 691 tooltip => "The weight limit: you cannot carry more than this.");
664 692
665
666 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 693 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
667 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 694 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
668 695
669 my $color2 = [1, 1, 0]; 696 my $color2 = [1, 1, 0];
670 697
671 for ( 698 for (
672 [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"], 699 [0, 0, st_str => "Str", 30],
673 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 700 [0, 1, st_dex => "Dex", 30],
674 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 701 [0, 2, st_con => "Con", 30],
675 [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"], 702 [0, 3, st_int => "Int", 30],
676 [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"], 703 [0, 4, st_wis => "Wis", 30],
677 [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"], 704 [0, 5, st_pow => "Pow", 30],
678 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 705 [0, 6, st_cha => "Cha", 30],
679 706
680 [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."], 707 [2, 0, st_wc => "Wc", -120],
681 [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."], 708 [2, 1, st_ac => "Ac", -120],
682 [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."], 709 [2, 2, st_dam => "Dam", 120],
683 [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."], 710 [2, 3, st_arm => "Arm", 120],
684 [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."], 711 [2, 4, st_spd => "Spd", 10.54],
685 [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."], 712 [2, 5, st_wspd => "WSp", 10.54],
686 ) { 713 ) {
687 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 714 my ($col, $row, $id, $label, $template) = @$_;
688 715
689 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 716 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
690 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 717 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718 align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
691 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 719 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
692 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 720 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721 align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
693 } 722 }
694 723
695 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 724 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
696 725
697 my $row = 0; 726 my $row = 0;
… …
770 $col += 3; 799 $col += 3;
771 $row = 0; 800 $row = 0;
772 } 801 }
773 } 802 }
774 803
775 update_stats_window ({}); 804 #update_stats_window ({});
776 805
777 $vb 806 $r
778} 807}
779 808
780sub skill_window { 809sub skill_window {
781 my ($self) = @_; 810 my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
782 $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1; 811 $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
812 $sw
783} 813}
784 814
785sub formsep($) { 815sub formsep($) {
786 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 816 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
787}
788
789sub update_stats_window {
790 my ($stats) = @_;
791
792 # I love text protocols...
793
794 my $hp = $stats->{+CS_STAT_HP} * 1;
795 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
796 my $sp = $stats->{+CS_STAT_SP} * 1;
797 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
798 my $fo = $stats->{+CS_STAT_FOOD} * 1;
799 my $fo_m = 999;
800 my $gr = $stats->{+CS_STAT_GRACE} * 1;
801 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
802
803 $GAUGES->{hp} ->set_value ($hp, $hp_m);
804 $GAUGES->{mana} ->set_value ($sp, $sp_m);
805 $GAUGES->{food} ->set_value ($fo, $fo_m);
806 $GAUGES->{grace} ->set_value ($gr, $gr_m);
807 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
808 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
809 my $rng = $stats->{+CS_STAT_RANGE};
810 $rng =~ s/^Range: //; # thank you so much dear server
811 $GAUGES->{range} ->set_text ("Rng: " . $rng);
812 my $title = $stats->{+CS_STAT_TITLE};
813 $title =~ s/^Player: //;
814 $STATWIDS->{title} ->set_text ("Title: " . $title);
815
816 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
817 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
818 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
819 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
820 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
821 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
822 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
823 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
824 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
825 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
826 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
827 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
828 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
829
830 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
831
832 my %tbl = (
833 phys => CS_STAT_RES_PHYS,
834 magic => CS_STAT_RES_MAG,
835 fire => CS_STAT_RES_FIRE,
836 elec => CS_STAT_RES_ELEC,
837 cold => CS_STAT_RES_COLD,
838 conf => CS_STAT_RES_CONF,
839 acid => CS_STAT_RES_ACID,
840 drain => CS_STAT_RES_DRAIN,
841 ghit => CS_STAT_RES_GHOSTHIT,
842 pois => CS_STAT_RES_POISON,
843 slow => CS_STAT_RES_SLOW,
844 para => CS_STAT_RES_PARA,
845 tund => CS_STAT_TURN_UNDEAD,
846 fear => CS_STAT_RES_FEAR,
847 depl => CS_STAT_RES_DEPLETE,
848 deat => CS_STAT_RES_DEATH,
849 holyw => CS_STAT_RES_HOLYWORD,
850 blind => CS_STAT_RES_BLIND,
851 );
852
853 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
854 my $sktbl = $STATWIDS->{_skill_tbl};
855 $sktbl->clear;
856
857 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
858 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
859 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
860
861 my @skills;
862
863 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
864 push @skills, [$i, $::CONN->{skill_info}{$i}];
865 }
866
867 my $y = 1;
868 for (sort { $a->[1] cmp $b->[1] } @skills) {
869 my ($idx, $name) = @$_;
870
871 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
872 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
873 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
874 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
875 }
876 }
877
878 $STATWIDS->{_skill_tbl_init} = 1;
879 }
880
881 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
882 if (exists $stats->{$i}) {
883 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
884 if $STATWIDS->{"sk_xp_$i"};
885 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
886 if $STATWIDS->{"sk_lvl_$i"};
887 }
888 }
889
890 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
891 for keys %tbl;
892} 817}
893 818
894my $METASERVER_ATIME; 819my $METASERVER_ATIME;
895 820
896sub update_metaserver { 821sub update_metaserver {
… …
1207 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1132 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1208 x => "center", 1133 x => "center",
1209 y => "center", 1134 y => "center",
1210 z => 50, 1135 z => 50,
1211 title => "Really Quit?", 1136 title => "Really Quit?",
1137 on_key_down => sub {
1138 my ($dialog, $ev) = @_;
1139 $ev->{sym} == 27 and $dialog->hide;
1140 }
1212 ; 1141 ;
1213 1142
1214 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1143 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1215 1144
1216 $vb->add (new CFClient::UI::Label 1145 $vb->add (new CFClient::UI::Label
… …
1230 on_activate => sub { exit }, 1159 on_activate => sub { exit },
1231 ); 1160 );
1232 } 1161 }
1233 1162
1234 $QUIT_DIALOG->show; 1163 $QUIT_DIALOG->show;
1164 $QUIT_DIALOG->grab_focus;
1235} 1165}
1236 1166
1237sub autopickup_setup { 1167sub autopickup_setup {
1238 my $table = new CFClient::UI::Table; 1168 my $table = new CFClient::UI::Table;
1239 1169
… …
1329 }); 1259 });
1330 1260
1331 $table 1261 $table
1332} 1262}
1333 1263
1264my %SORT_ORDER = (
1265 type => undef,
1266 mtime => sub { sort {
1267 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1268 or $b->{mtime} <=> $a->{mtime}
1269 or $a->{type} <=> $b->{type}
1270 } @_ },
1271 weight => sub { sort {
1272 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1273 or $a->{type} <=> $b->{type}
1274 } @_ },
1275);
1276
1334sub inventory_widget { 1277sub inventory_widget {
1335 my $hb = new CFClient::UI::HBox homogeneous => 1; 1278 my $hb = new CFClient::UI::HBox homogeneous => 1;
1336 1279
1337 $hb->add (my $vb1 = new CFClient::UI::VBox); 1280 $hb->add (my $vb1 = new CFClient::UI::VBox);
1338 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1281 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1282
1283 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1284
1285 use sort 'stable';
1286
1287 $hb1->add (new CFClient::UI::Selector
1288 value => $::CFG->{inv_sort},
1289 options => [
1290 [type => "Type/Name"],
1291 [mtime => "Recent/Normal/Locked"],
1292 [weight => "Weight/Type"],
1293 ],
1294 on_changed => sub {
1295 $::CFG->{inv_sort} = $_[1];
1296 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1297 },
1298 );
1299 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1300 #TODO# update to weigh/maxweight
1301 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1302
1303 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1339 $vb1->add ($INV = new CFClient::UI::Inventory); 1304 $sw1->add ($INV = new CFClient::UI::Inventory);
1340 1305
1341 $hb->add (my $vb2 = new CFClient::UI::VBox); 1306 $hb->add (my $vb2 = new CFClient::UI::VBox);
1342 1307
1343 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1308 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1344 1309
1310 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1345 $vb2->add ($INVR = new CFClient::UI::Inventory); 1311 $sw2->add ($INVR = new CFClient::UI::Inventory);
1346 1312
1347 # XXX: Call after $INVR = ... because set_opencont sets the items 1313 # XXX: Call after $INVR = ... because set_opencont sets the items
1348 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1314 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1349 1315
1350 $hb 1316 $hb
… …
1372 has_close_button => 1 1338 has_close_button => 1
1373 ; 1339 ;
1374 1340
1375 my $ntb = 1341 my $ntb =
1376 $PL_NOTEBOOK = 1342 $PL_NOTEBOOK =
1377 new CFClient::UI::Notebook 1343 new CFClient::UI::Notebook expand => 1, debug => 1;
1378 expand => 1,
1379 debug => 1,
1380 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1381 ;
1382 1344
1383 $ntb->add ( 1345 $ntb->add (
1384 "Stats" => $STATS_PAGE = stats_window, 1346 "Statistics (F2)" => $STATS_PAGE = stats_window,
1385 "Shows statistics, where all your Stats and Resistances are shown." 1347 "Shows statistics, where all your Stats and Resistances are shown."
1386 ); 1348 );
1387 $ntb->add ( 1349 $ntb->add (
1388 "Skills" => $STATS_PAGE = skill_window, 1350 "Skills (F3)" => $SKILL_PAGE = skill_window,
1389 "Shows all your Skills." 1351 "Shows all your Skills."
1390 ); 1352 );
1353
1354 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1355 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1391 $ntb->add ( 1356 $ntb->add (
1392 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, 1357 "Spellbook (F4)" => $spellsw,
1393 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1358 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1394 ); 1359 );
1395 $ntb->add ( 1360 $ntb->add (
1396 Inventory => $INVENTORY_PAGE = inventory_widget, 1361 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1397 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1362 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1398 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1363 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1399 ); 1364 );
1400 1365
1401 $ntb->set_current_page ($INVENTORY_PAGE); 1366 $ntb->set_current_page ($INVENTORY_PAGE);
… …
1514 $refresh->(); 1479 $refresh->();
1515 1480
1516 $vb 1481 $vb
1517} 1482}
1518 1483
1484# just weirdness, pls. ignore
1485sub load_html_page {
1486 my ($viewer, $base) = @_;
1487
1488 $viewer->clear;
1489
1490 require LWP::Simple;
1491 require HTML::Parser;
1492 require URI;
1493
1494 my $page = LWP::Simple::get ($base)
1495 or return;
1496
1497 my @s = { };
1498 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1499
1500 my $parser = HTML::Parser->new (
1501 text_h => [sub {
1502 my ($text) = @_;
1503 $text =~ s/\s+/ /g;
1504 $s[-1]{text} .= CFClient::asxml $text;
1505 }, "dtext"],
1506 start_h => [sub {
1507 my ($tag, $attr) = @_;
1508 if ($passthrough{$tag}) {
1509 $s[-1]{text} .= "<$tag>";
1510 } elsif ($tag eq "h1") {
1511 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1512 } elsif ($tag eq "h2") {
1513 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1514 } elsif ($tag eq "h3") {
1515 push @s, { text => "<span size='large'>" };
1516 } elsif ($tag eq "a") {
1517 push @s, { text => "", url => $attr->{href} };
1518 } elsif ($tag eq "p") {
1519 push @s, { };
1520 } elsif ($tag eq "img") {
1521 eval {
1522 push @{$s[-1]{obj}}, new CFClient::UI::Image
1523 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1524 $s[-1]{text} .= "\x{fffc}";
1525 };
1526 }
1527 }, "tagname, attr"],
1528 end_h => [sub {
1529 my ($tag) = @_;
1530 if ($passthrough{$tag}) {
1531 $s[-1]{text} .= "</$tag>";
1532 } elsif ($tag =~ /^h\d$/) {
1533 $s[-1]{text} .= "</span>";
1534 push @s, { };
1535 } elsif ($tag eq "a") {
1536 my $S = pop @s;
1537 $s[-1]{text} .= "\x{fffc}";
1538 push @{$s[-1]{obj}}, new CFClient::UI::Label
1539 fg => [0.8, 0.8, 1],
1540 markup => "<u>$S->{text}</u>",
1541 fontsize => 0.8,
1542 can_events => 1,
1543 can_focus => 1,
1544 on_button_up => sub {
1545 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1546 },
1547 ;
1548 }
1549 }, "tagname"],
1550 );
1551
1552 $parser->parse ($page);
1553 $parser->eof;
1554
1555 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1556 for @s;
1557
1558 $viewer->set_offset (0);
1559}
1560
1519sub help_window { 1561sub help_window {
1520 my $win = new CFClient::UI::FancyFrame 1562 my $win = new CFClient::UI::FancyFrame
1521 x => 'center', 1563 x => 'center',
1522 y => 'center', 1564 y => 'center',
1523 z => 2, 1565 z => 2,
… …
1532 $vbox->add (my $buttons = new CFClient::UI::HBox); 1574 $vbox->add (my $buttons = new CFClient::UI::HBox);
1533 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1575 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1534 expand => 1, fontsize => 0.8, padding_x => 4); 1576 expand => 1, fontsize => 0.8, padding_x => 4);
1535 1577
1536 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1578 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1537 $buttons->add (my $combo = new CFClient::UI::Combobox 1579 $buttons->add (my $combo = new CFClient::UI::Selector
1538 value => undef, 1580 value => undef,
1539 options => [ 1581 options => [
1540 [intro => "Introduction"], 1582 [intro => "Introduction"],
1541 [manual => "Main Manual"], 1583 [manual => "Main Manual"],
1542 [skill_help => "Skill Reference"], 1584 [skill_help => "Skill Reference"],
1543 [command_help => "Command Reference"], 1585 [command_help => "Command Reference"],
1544 [dmcommand_help => "DM Commands"], 1586 [dmcommand_help => "DM Commands"],
1545 [COPYING => "License Terms"], 1587 [COPYING => "License Terms"],
1588 [test => "test (do not select)"], #d#TODO
1546 ], 1589 ],
1547 on_changed => sub { 1590 on_changed => sub {
1548 my ($self, $pod) = @_; 1591 my ($self, $pod) = @_;
1549 1592
1593 if ($pod eq "test") {#d#TODO
1594 eval {
1595 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1596 };
1597 warn "$@" if $@;
1598 return;
1599 }
1600
1550 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1601 my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1551 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1602 doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1603
1604 #use Data::Dumper; warn Dumper $pom;#d#
1552 1605
1553 $viewer->clear; 1606 $viewer->clear;
1554 1607
1555# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n", 1608# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1556# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1), 1609# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1557# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"), 1610# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1558# ]);#d# 1611# ]);#d#
1559 1612
1560 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1613 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1561 for @$pom; 1614 for @$pom;
1562 1615
1563 $viewer->set_offset (0); 1616 $viewer->set_offset (0);
1564 1617
1565 0 1618 0
… …
1831 1884
1832 $WANT_REFRESH = 0; 1885 $WANT_REFRESH = 0;
1833 $CAN_REFRESH = 0; 1886 $CAN_REFRESH = 0;
1834 $LAST_REFRESH = $NOW; 1887 $LAST_REFRESH = $NOW;
1835 1888
18360 && do {
1837 # some weird model-drawing code, just a joke right now
1838 use CFClient::OpenGL;
1839
1840 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1841 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1842 $demo{r} ||= do {
1843 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1844 $mod->{v} = pack "f*", @{$mod->{v}};
1845 $_ = [scalar @$_, pack "S!*", @$_]
1846 for values %{$mod->{g}};
1847 $mod
1848 };
1849
1850 my $r = $demo{r} or die;
1851
1852 glDepthMask 1;
1853 glClear GL_DEPTH_BUFFER_BIT;
1854 glEnable GL_TEXTURE_2D;
1855 glEnable GL_DEPTH_TEST;
1856 glEnable GL_CULL_FACE;
1857 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1858
1859 glMatrixMode GL_PROJECTION;
1860 glLoadIdentity;
1861 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1862 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1863 glMatrixMode GL_MODELVIEW;
1864 glLoadIdentity;
1865
1866 glPushMatrix;
1867 glTranslate 0, 0, -800;
1868 glScale 1, -1, 1;
1869 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1870 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1871 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1872 glScale 50, 50, 50;
1873
1874 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1875 while (my ($k, $v) = each %{$r->{g}}) {
1876 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1877 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1878 }
1879
1880 glPopMatrix;
1881
1882 glShadeModel GL_FLAT;
1883 glDisable GL_DEPTH_TEST;
1884 glDisable GL_TEXTURE_2D;
1885 glDepthMask 0;
1886
1887 $WANT_REFRESH++;
1888};
1889
1890 CFClient::SDL_GL_SwapBuffers; 1889 CFClient::SDL_GL_SwapBuffers;
1891} 1890}
1892 1891
1893my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 1892my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1894 $NOW = time; 1893 $NOW = time;
… …
1967$SIG{INT} = $SIG{TERM} = sub { exit }; 1966$SIG{INT} = $SIG{TERM} = sub { exit };
1968 1967
1969{ 1968{
1970 local $SIG{__DIE__} = sub { 1969 local $SIG{__DIE__} = sub {
1971 return unless defined $^S && !$^S; 1970 return unless defined $^S && !$^S;
1972 Carp::confess $_[1];#d#TODO: remove when stable 1971 Carp::confess $_[0];#d#TODO: remove when stable
1973 CFClient::fatal $_[0]; 1972 CFClient::fatal $_[0];
1974 }; 1973 };
1975 1974
1976 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1975 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1977 CFClient::UI::set_layout ($::CFG->{layout}); 1976 CFClient::UI::set_layout ($::CFG->{layout});
… …
1998 bgm_volume => 0.25, 1997 bgm_volume => 0.25,
1999 face_prefetch => 0, 1998 face_prefetch => 0,
2000 output_sync => 1, 1999 output_sync => 1,
2001 output_count => 1, 2000 output_count => 1,
2002 pickup => 0, 2001 pickup => 0,
2002 inv_sort => "mtime",
2003 default => "profile", # default profile 2003 default => "profile", # default profile
2004 ); 2004 );
2005 2005
2006 while (my ($k, $v) = each %DEF_CFG) { 2006 while (my ($k, $v) = each %DEF_CFG) {
2007 $CFG->{$k} = $v unless exists $CFG->{$k}; 2007 $CFG->{$k} = $v unless exists $CFG->{$k};

Diff Legend

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