[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.79 by root, Fri Jun 23 23:54:31 2006 UTC vs.
Revision 1.83 by elmex, Wed Jun 28 18:48:48 2006 UTC

 use CFClient;
 use CFClient::OpenGL ();
 use CFClient::Protocol;
 use CFClient::UI;
+use CFClient::BindingEditor;
 use CFClient::MapWidget;
 $SIG{QUIT} = sub { Carp::cluck "QUIT" };
 $Event::DIED = sub {
       [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
       [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."],
       [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."],
       [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."],
-      [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."],
+      [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."],
       [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."],
       [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."],
    ) {
       my ($col, $row, $id, $label, $template, $tooltip) = @$_;
       drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
       acid  => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
       pois  => "<b>Poison</b> (resistance to getting poisoned)",
       para  => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
       deat  => "<b>Death</b> (resistance against death spells)",
-      phys  => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
+      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.)",
       blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
       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)",
       tund  => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
       elec  => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
       cold  => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
    $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_ARMOUR});
+   $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 $METASERVER_ATIME;
 sub update_metaserver {
+   my ($metaserver_dialog) = @_;
+   $METASERVER = $metaserver_dialog
+      if defined $metaserver_dialog;
    return if $METASERVER_ATIME > time;
    $METASERVER_ATIME = time + 60;
    my $table = $METASERVER->{table};
    $table->clear;
       }
    });
 }
 sub metaserver_dialog {
+   my $vbox  = new CFClient::UI::VBox;
+   my $table = new CFClient::UI::Table;
+   $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
    my $dialog = new CFClient::UI::FancyFrame
       title   => "Server List",
       name    => 'metaserver_dialog',
       x       => 'center',
       y       => 'center',
       z       => 3,
       force_h => $::HEIGHT * 0.4,
-      child   => (my $vbox = new CFClient::UI::VBox),
+      child   => $vbox,
+      has_close_button => 1,
+      table   => $table,
       on_visibility_change => sub {
-         update_metaserver if $_[1];
+         update_metaserver ($_[0]) if $_[1];
          0
       },
    ;
-   $dialog->{table} = new CFClient::UI::Table;
-   $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
    $dialog
 }
 sub server_setup {
                my ($self, $value) = @_;
                $CFG->{profile}{default}{host} = $value;
                0
             }
       );
-      $METASERVER = metaserver_dialog;
       $vbox->add (new CFClient::UI::Button
          expand  => 1,
          text    => "Server List",
          other   => $METASERVER,
          ++$y;
          my $mask = $_->[1];
          $table->add ($x  , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
          $table->add ($x+1, $y, new CFClient::UI::CheckBox
-            state => $CFG->{pickup} & $mask,
+            state => $::CFG->{pickup} & $mask,
             on_changed => sub {
                my ($box, $value) = @_;
                if ($value) {
                   $::CFG->{pickup} |= $mask;
             });
       }
    }
    $table->add (2, 18, new CFClient::UI::ValSlider
-      range => [0, 0, 16, 1, 1],
+      range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
+      template => ">= 99",
       to_value => sub { ">= " . 5 * $_[0] },
       on_changed => sub {
          my ($slider, $value) = @_;
-         $::CFG->{pickup} &= ~0x7;
+         $::CFG->{pickup} &= ~0xF;
          $::CFG->{pickup} |= int $value
             if $value;
          1;
       });
    $table->add (3, 18, new CFClient::UI::Button
       text => "set",
       on_activate => sub {
          $::CONN->send_command ("pickup $::CFG->{pickup}")
             if defined $::CONN;
       x       => "center",
       y       => "center",
       force_w => $WIDTH  * 9/10,
       force_h => $HEIGHT * 9/10,
       title   => "Inventory",
+      name    => "inventory_window",
       has_close_button => 1,
    ;
    $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
          z       => 100,
          force_x => "max",
          force_y => 0;
       $DEBUG_STATUS->show;
-      $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
+      $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
       $STATUSBOX = new CFClient::UI::Statusbox;
       $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
       (new CFClient::UI::Frame
          z       => 2,
          force_w => $::WIDTH  * 0.6,
          force_h => $::HEIGHT * 0.6,
          has_close_button => 1,
       ;
+      $METASERVER = metaserver_dialog;
       $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
          filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
       $SETUP_NOTEBOOK->add (Server   => $SETUP_SERVER = server_setup,

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.79 by root, Fri Jun 23 23:54:31 2006 UTC vs. Revision 1.83 by elmex, Wed Jun 28 18:48:48 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.79 by root, Fri Jun 23 23:54:31 2006 UTC vs.
Revision 1.83 by elmex, Wed Jun 28 18:48:48 2006 UTC