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.99 by root, Sun Jul 23 08:58:44 2006 UTC

… …
100our $PL_NOTEBOOK; 100our $PL_NOTEBOOK;
101our $PL_WINDOW; 101our $PL_WINDOW;
102 102
103our $INVENTORY_PAGE; 103our $INVENTORY_PAGE;
104our $STATS_PAGE; 104our $STATS_PAGE;
105our $SKILL_PAGE;
105our $SPELL_PAGE; 106our $SPELL_PAGE;
106 107
107our $HELP_WINDOW; 108our $HELP_WINDOW;
108our $MESSAGE_WINDOW; 109our $MESSAGE_WINDOW;
109our $FLOORBOX; 110our $FLOORBOX;
… …
188 $MESSAGE_WINDOW->show; 189 $MESSAGE_WINDOW->show;
189 190
190 unshift @dialog, new CFClient::UI::Label 191 unshift @dialog, new CFClient::UI::Label
191 max_w => $::WIDTH * 0.4, 192 max_w => $::WIDTH * 0.4,
192 ellipsise => 0, 193 ellipsise => 0,
193 markup => "\nOr use your keyboard:\n"; 194 markup => "\nOr use your keyboard and the text entry below:\n";
194 195
195 unshift @dialog, my $table = new CFClient::UI::Table; 196 unshift @dialog, my $table = new CFClient::UI::Table;
196 197
197 $table->add (0, 0, new CFClient::UI::Button 198 $table->add (0, 0, new CFClient::UI::Button
198 text => "Next Race", 199 text => "Next Race",
… …
215 max_w => $::WIDTH * 0.4, 216 max_w => $::WIDTH * 0.4,
216 ellipsise => 0, 217 ellipsise => 0,
217 markup => 218 markup =>
218 "<big><b>Character Creation: Race</b></big>\n\n" 219 "<big><b>Character Creation: Race</b></big>\n\n"
219 . "Look at the <b>Messages</b> window to see a description of this race " 220 . "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 " 221 . "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" 222 . "(<small>below this dialog window: you may need to move the dialog away and "
223 . "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, " 224 . "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." 225 . "this race eventually, so you can take your time making this important choice."
225 ; 226 ;
226 227
227 } elsif ($prompt =~ /roll new stats/) { 228 } elsif ($prompt =~ /roll new stats/) {
228 if (my $stat = delete $conn->{stat_change_with}) { 229 if (my $stat = delete $conn->{stat_change_with}) {
229 $conn->send ("reply $stat"); 230 $conn->send ("reply $stat");
… …
235 $MESSAGE_WINDOW->hide; 236 $MESSAGE_WINDOW->hide;
236 237
237 unshift @dialog, new CFClient::UI::Label 238 unshift @dialog, new CFClient::UI::Label
238 max_w => $::WIDTH * 0.4, 239 max_w => $::WIDTH * 0.4,
239 ellipsise => 0, 240 ellipsise => 0,
240 markup => "\nOr use your keyboard:\n"; 241 markup => "\nOr use your keyboard and the text entry below:\n";
241 242
242 unshift @dialog, my $table = new CFClient::UI::Table; 243 unshift @dialog, my $table = new CFClient::UI::Table;
243 244
244 # left: re-roll 245 # left: re-roll
245 $table->add (0, 0, new CFClient::UI::Button 246 $table->add (0, 0, new CFClient::UI::Button
… …
251 }, 252 },
252 ); 253 );
253 254
254 # center: swap stats 255 # center: swap stats
255 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 256 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
257 expand => 1,
256 value => $_, 258 value => $_,
257 options => [ 259 options => [
258 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 260 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
259 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 261 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
260 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 262 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
285 destroy_query_dialog $conn; 287 destroy_query_dialog $conn;
286 0 288 0
287 }, 289 },
288 ); 290 );
289 291
292 unshift @dialog, my $hbox = new CFClient::UI::HBox;
293 for (
294 [Str => CS_STAT_STR],
295 [Dex => CS_STAT_DEX],
296 [Con => CS_STAT_CON],
297 [Int => CS_STAT_INT],
298 [Wis => CS_STAT_WIS],
299 [Pow => CS_STAT_POW],
300 [Cha => CS_STAT_CHA],
301 ) {
302 my ($name, $id) = @$_;
303 $hbox->add (new CFClient::UI::Label
304 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
305 align => 0,
306 expand => 1,
307 can_events => 1,
308 can_hover => 1,
309 tooltip => $CFClient::STAT_TOOLTIP{$name},
310 );
311 }
312
290 unshift @dialog, new CFClient::UI::Label 313 unshift @dialog, new CFClient::UI::Label
291 max_w => $::WIDTH * 0.4, 314 max_w => $::WIDTH * 0.4,
292 ellipsise => 0, 315 ellipsise => 0,
293 markup => 316 markup =>
294 "<big><b>Character Creation: Stats</b></big>\n\n" 317 "<big><b>Character Creation: Stats</b></big>\n\n"
295 . "Look at the <b>Stats</b> window to see your basic stats " 318 . "<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" 319 . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
320 . "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. " 321 . "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 ; 322 ;
300 } 323 }
301 324
302 push @dialog, my $entry = new CFClient::UI::Entry 325 push @dialog, my $entry = new CFClient::UI::Entry
303 on_changed => sub { 326 on_changed => sub {
… …
643 666
644 $table 667 $table
645} 668}
646 669
647sub stats_window { 670sub stats_window {
671 my $r = new CFClient::UI::ScrolledWindow (
672 expand => 1,
673 scroll_y => 1
674 );
648 my $vb = new CFClient::UI::VBox; 675 $r->add (my $vb = new CFClient::UI::VBox);
649 676
650 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 677 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
651 can_hover => 1, can_events => 1, 678 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."); 679 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, 680 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", 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 {
… …
1334sub inventory_widget { 1259sub inventory_widget {
1335 my $hb = new CFClient::UI::HBox homogeneous => 1; 1260 my $hb = new CFClient::UI::HBox homogeneous => 1;
1336 1261
1337 $hb->add (my $vb1 = new CFClient::UI::VBox); 1262 $hb->add (my $vb1 = new CFClient::UI::VBox);
1338 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1263 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1264
1265 $vb1->add (my $hb1 = new CFClient::UI::HBox);
1266
1267 use sort 'stable';
1268
1269 $hb1->add (new CFClient::UI::Combobox
1270 value => undef,
1271 options => [
1272 [undef, "Type/Name"],
1273 [
1274 sub { sort {
1275 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1276 or $a->{type} <=> $b->{type}
1277 } @_ },
1278 "Weight/Type",
1279 ],
1280 [sub { } => "#TODO#"],
1281 ],
1282 on_changed => sub {
1283 $INV->set_sort_order ($_[1]);
1284 },
1285 );
1286 $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
1287 #TODO# update to weigh/maxweight
1288 $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
1289
1290 $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1339 $vb1->add ($INV = new CFClient::UI::Inventory); 1291 $sw1->add ($INV = new CFClient::UI::Inventory);
1340 1292
1341 $hb->add (my $vb2 = new CFClient::UI::VBox); 1293 $hb->add (my $vb2 = new CFClient::UI::VBox);
1342 1294
1343 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1295 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1344 1296
1297 $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1345 $vb2->add ($INVR = new CFClient::UI::Inventory); 1298 $sw2->add ($INVR = new CFClient::UI::Inventory);
1346 1299
1347 # XXX: Call after $INVR = ... because set_opencont sets the items 1300 # XXX: Call after $INVR = ... because set_opencont sets the items
1348 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1301 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1349 1302
1350 $hb 1303 $hb
… …
1372 has_close_button => 1 1325 has_close_button => 1
1373 ; 1326 ;
1374 1327
1375 my $ntb = 1328 my $ntb =
1376 $PL_NOTEBOOK = 1329 $PL_NOTEBOOK =
1377 new CFClient::UI::Notebook 1330 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 1331
1383 $ntb->add ( 1332 $ntb->add (
1384 "Stats" => $STATS_PAGE = stats_window, 1333 "Statistics (F2)" => $STATS_PAGE = stats_window,
1385 "Shows statistics, where all your Stats and Resistances are shown." 1334 "Shows statistics, where all your Stats and Resistances are shown."
1386 ); 1335 );
1387 $ntb->add ( 1336 $ntb->add (
1388 "Skills" => $STATS_PAGE = skill_window, 1337 "Skills (F3)" => $SKILL_PAGE = skill_window,
1389 "Shows all your Skills." 1338 "Shows all your Skills."
1390 ); 1339 );
1340
1341 my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1342 $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
1391 $ntb->add ( 1343 $ntb->add (
1392 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, 1344 "Spellbook (F4)" => $spellsw,
1393 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1345 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1394 ); 1346 );
1395 $ntb->add ( 1347 $ntb->add (
1396 Inventory => $INVENTORY_PAGE = inventory_widget, 1348 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1397 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1349 "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." 1350 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1399 ); 1351 );
1400 1352
1401 $ntb->set_current_page ($INVENTORY_PAGE); 1353 $ntb->set_current_page ($INVENTORY_PAGE);
… …
1514 $refresh->(); 1466 $refresh->();
1515 1467
1516 $vb 1468 $vb
1517} 1469}
1518 1470
1471# just weirdness, pls. ignore
1472sub load_html_page {
1473 my ($viewer, $base) = @_;
1474
1475 $viewer->clear;
1476
1477 require LWP::Simple;
1478 require HTML::Parser;
1479 require URI;
1480
1481 my $page = LWP::Simple::get ($base)
1482 or return;
1483
1484 my @s = { };
1485 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1486
1487 my $parser = HTML::Parser->new (
1488 text_h => [sub {
1489 my ($text) = @_;
1490 $text =~ s/\s+/ /g;
1491 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1492 }, "dtext"],
1493 start_h => [sub {
1494 my ($tag, $attr) = @_;
1495 if ($passthrough{$tag}) {
1496 $s[-1]{text} .= "<$tag>";
1497 } elsif ($tag eq "h1") {
1498 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1499 } elsif ($tag eq "h2") {
1500 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1501 } elsif ($tag eq "h3") {
1502 push @s, { text => "<span size='large'>" };
1503 } elsif ($tag eq "a") {
1504 push @s, { text => "", url => $attr->{href} };
1505 } elsif ($tag eq "p") {
1506 push @s, { };
1507 } elsif ($tag eq "img") {
1508 eval {
1509 push @{$s[-1]{obj}}, new CFClient::UI::Image
1510 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1511 $s[-1]{text} .= "\x{fffc}";
1512 };
1513 }
1514 }, "tagname, attr"],
1515 end_h => [sub {
1516 my ($tag) = @_;
1517 if ($passthrough{$tag}) {
1518 $s[-1]{text} .= "</$tag>";
1519 } elsif ($tag =~ /^h\d$/) {
1520 $s[-1]{text} .= "</span>";
1521 push @s, { };
1522 } elsif ($tag eq "a") {
1523 my $S = pop @s;
1524 $s[-1]{text} .= "\x{fffc}";
1525 push @{$s[-1]{obj}}, new CFClient::UI::Label
1526 fg => [0.8, 0.8, 1],
1527 markup => "<u>$S->{text}</u>",
1528 fontsize => 0.8,
1529 can_events => 1,
1530 can_focus => 1,
1531 on_button_up => sub {
1532 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1533 },
1534 ;
1535 }
1536 }, "tagname"],
1537 );
1538
1539 $parser->parse ($page);
1540 $parser->eof;
1541
1542 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1543 for @s;
1544
1545 $viewer->set_offset (0);
1546}
1547
1519sub help_window { 1548sub help_window {
1520 my $win = new CFClient::UI::FancyFrame 1549 my $win = new CFClient::UI::FancyFrame
1521 x => 'center', 1550 x => 'center',
1522 y => 'center', 1551 y => 'center',
1523 z => 2, 1552 z => 2,
… …
1541 [manual => "Main Manual"], 1570 [manual => "Main Manual"],
1542 [skill_help => "Skill Reference"], 1571 [skill_help => "Skill Reference"],
1543 [command_help => "Command Reference"], 1572 [command_help => "Command Reference"],
1544 [dmcommand_help => "DM Commands"], 1573 [dmcommand_help => "DM Commands"],
1545 [COPYING => "License Terms"], 1574 [COPYING => "License Terms"],
1575 [test => "test (do not select)"], #d#TODO
1546 ], 1576 ],
1547 on_changed => sub { 1577 on_changed => sub {
1548 my ($self, $pod) = @_; 1578 my ($self, $pod) = @_;
1579
1580 if ($pod eq "test") {#d#TODO
1581 eval {
1582 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1583 };
1584 warn "$@" if $@;
1585 return;
1586 }
1549 1587
1550 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1588 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1551 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1589 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1552 1590
1553 $viewer->clear; 1591 $viewer->clear;
… …
1967$SIG{INT} = $SIG{TERM} = sub { exit }; 2005$SIG{INT} = $SIG{TERM} = sub { exit };
1968 2006
1969{ 2007{
1970 local $SIG{__DIE__} = sub { 2008 local $SIG{__DIE__} = sub {
1971 return unless defined $^S && !$^S; 2009 return unless defined $^S && !$^S;
1972 Carp::confess $_[1];#d#TODO: remove when stable 2010 Carp::confess $_[0];#d#TODO: remove when stable
1973 CFClient::fatal $_[0]; 2011 CFClient::fatal $_[0];
1974 }; 2012 };
1975 2013
1976 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2014 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1977 CFClient::UI::set_layout ($::CFG->{layout}); 2015 CFClient::UI::set_layout ($::CFG->{layout});

Diff Legend

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