--- deliantra/Deliantra-Client/bin/cfplus 2006/07/16 20:04:08 1.94 +++ deliantra/Deliantra-Client/bin/cfplus 2006/07/16 23:30:08 1.95 @@ -102,6 +102,7 @@ our $INVENTORY_PAGE; our $STATS_PAGE; +our $SKILL_PAGE; our $SPELL_PAGE; our $HELP_WINDOW; @@ -772,125 +773,19 @@ } } - update_stats_window ({}); + #update_stats_window ({}); $vb } sub skill_window { - my ($self) = @_; - $STATWIDS->{"_skill_tbl"} = new CFClient::UI::Table expand => 1; + $STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1] } sub formsep($) { scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 } -sub update_stats_window { - my ($stats) = @_; - - # I love text protocols... - - my $hp = $stats->{+CS_STAT_HP} * 1; - my $hp_m = $stats->{+CS_STAT_MAXHP} * 1; - my $sp = $stats->{+CS_STAT_SP} * 1; - my $sp_m = $stats->{+CS_STAT_MAXSP} * 1; - my $fo = $stats->{+CS_STAT_FOOD} * 1; - my $fo_m = 999; - my $gr = $stats->{+CS_STAT_GRACE} * 1; - my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1; - - $GAUGES->{hp} ->set_value ($hp, $hp_m); - $GAUGES->{mana} ->set_value ($sp, $sp_m); - $GAUGES->{food} ->set_value ($fo, $fo_m); - $GAUGES->{grace} ->set_value ($gr, $gr_m); - $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64}) - . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); - my $rng = $stats->{+CS_STAT_RANGE}; - $rng =~ s/^Range: //; # thank you so much dear server - $GAUGES->{range} ->set_text ("Rng: " . $rng); - my $title = $stats->{+CS_STAT_TITLE}; - $title =~ s/^Player: //; - $STATWIDS->{title} ->set_text ("Title: " . $title); - - $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); - $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX}); - $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON}); - $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT}); - $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS}); - $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); - $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); - $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); - $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); - $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); - $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); - $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); - $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); - - $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); - - my %tbl = ( - phys => CS_STAT_RES_PHYS, - magic => CS_STAT_RES_MAG, - fire => CS_STAT_RES_FIRE, - elec => CS_STAT_RES_ELEC, - cold => CS_STAT_RES_COLD, - conf => CS_STAT_RES_CONF, - acid => CS_STAT_RES_ACID, - drain => CS_STAT_RES_DRAIN, - ghit => CS_STAT_RES_GHOSTHIT, - pois => CS_STAT_RES_POISON, - slow => CS_STAT_RES_SLOW, - para => CS_STAT_RES_PARA, - tund => CS_STAT_TURN_UNDEAD, - fear => CS_STAT_RES_FEAR, - depl => CS_STAT_RES_DEPLETE, - deat => CS_STAT_RES_DEATH, - holyw => CS_STAT_RES_HOLYWORD, - blind => CS_STAT_RES_BLIND, - ); - - if ($::CONN && !$STATWIDS->{_skill_tbl_init}) { - my $sktbl = $STATWIDS->{_skill_tbl}; - $sktbl->clear; - - $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1); - $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1); - $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname"); - - my @skills; - - for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) { - push @skills, [$i, $::CONN->{skill_info}{$i}]; - } - - my $y = 1; - for (sort { $a->[1] cmp $b->[1] } @skills) { - my ($idx, $name) = @$_; - - unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) { - $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1); - $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1); - $sktbl->add (2, $y++, new CFClient::UI::Label text => $name); - } - } - - $STATWIDS->{_skill_tbl_init} = 1; - } - - for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) { - if (exists $stats->{$i}) { - $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1]) - if $STATWIDS->{"sk_xp_$i"}; - $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0]) - if $STATWIDS->{"sk_lvl_$i"}; - } - } - - $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) - for keys %tbl; -} - my $METASERVER_ATIME; sub update_metaserver { @@ -1381,19 +1276,19 @@ ; $ntb->add ( - "Stats" => $STATS_PAGE = stats_window, + "Statistics (F2)" => $STATS_PAGE = stats_window, "Shows statistics, where all your Stats and Resistances are shown." ); $ntb->add ( - "Skills" => $STATS_PAGE = skill_window, + "Skills (F3)" => $SKILL_PAGE = skill_window, "Shows all your Skills." ); $ntb->add ( - Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, + "Spellbook (F4)" => $SPELL_PAGE = new CFClient::UI::SpellList, "Displays all spells you have and lets you edit keyboard shortcuts for them." ); $ntb->add ( - Inventory => $INVENTORY_PAGE = inventory_widget, + "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, "Toggles the inventory window, where you can manage your loot (or treasures :). " . "You can also hit the Tab-key to show/hide the Inventory." ); @@ -1969,7 +1864,7 @@ { local $SIG{__DIE__} = sub { return unless defined $^S && !$^S; - Carp::confess $_[1];#d#TODO: remove when stable + Carp::confess $_[0];#d#TODO: remove when stable CFClient::fatal $_[0]; };