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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.188 by elmex, Tue Apr 25 13:27:00 2006 UTC vs.
Revision 1.193 by root, Sat Apr 29 16:17:10 2006 UTC

 our %AUDIO_CHUNKS; # audio files
 our $ALT_ENTER_MESSAGE;
 our $STATUS_LINE;
 our $DEBUG_STATUS;
+our $INVWIN;
+our $INV;
 sub status {
    $STATUS_LINE->set_text ($_[0]);
    $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
 }
    my $row = 0;
    my $col = 0;
    my %resist_names = (
-      slow  => "Slow",
+      slow  => "Slow (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.)",
-      holyw => "Holy Word",
+      holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
-      conf  => "Confusion",
+      conf  => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
-      fire  => "Fire",
+      fire  => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
       depl  => "Depletion (some monsters and other effects can cause stats depletion)",
-      magic => "Magic",
+      magic => "Magic (resistance to magic spells like magic missile or similar)",
       drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
-      acid  => "Acid",
+      acid  => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
-      pois  => "Poison",
+      pois  => "Poison (resistance to getting poisoned)",
-      para  => "Paralysation",
+      para  => "Paralysation (this resistance affects the chance you get paralysed)",
       deat  => "Death (resistance against death spells)",
-      phys  => "Physical",
+      phys  => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
-      blind => "Blind",
+      blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
-      fear  => "Fear",
+      fear  => "Fear (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  => "Turn undead",
-      elec  => "Electricity",
+      elec  => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
-      cold  => "Cold",
+      cold  => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
       ghit  => "Ghost hit (special attack used by ghosts and ghost-like beings)",
    );
    for (qw/slow holyw conf fire depl magic
            drain acid pois para deat phys
            blind fear tund elec cold ghit/)
    };
    $window
 }
+sub make_inventory_window {
+   my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
+   $invwin->add (my $hb = new CFClient::UI::HBox);
+   $hb->add ($INV = new CFClient::UI::Inventory expand => 1);
+   $hb->add (my $rng = new CFClient::UI::Slider vertical => 1);
+   $INV->set_range ($rng);
+   $invwin
+}
 sub sdl_init {
    CFClient::SDL_Init
       and die "SDL::Init failed!\n";
 }
    $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
    CFClient::UI::FancyFrame->new (
       border_bg => [1, 1, 1, 192/255],
       bg        => [1, 1, 1, 0],
-      child => $MAPMAP = new CFClient::MapWidget::MapMap
+      child     => ($MAPMAP = new CFClient::MapWidget::MapMap),
    )->show;
    $MAPWIDGET = new CFClient::MapWidget;
    $MAPWIDGET->connect (activate_console => sub {
       my ($mapwidget, $preset) = @_;
    $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup",   other => client_setup);
    $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup",   other => server_setup);
    $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
-   $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
+   make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
    $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
+   $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
    $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
       CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
       status "Configuration Saved";
    });
 sub update_floorbox {
    $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
       $FLOORBOX->clear;
       $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
-      my @items = values %{ $CONN->{container}{0} };
       # we basically have to use the same sorting as everybody else
-      @items = sort { $a->{type} <=> $b->{type} } @items;
+      for my $item (@{ $CONN->{container}{0} }) {
-      for my $item (reverse @items) {
          my $desc = $item->{nrof} < 2
             ? $item->{name}
             : "$item->{nrof} $item->{name_pl}";
          # todo: animation widget, face widget, weight(?) etc.
          $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
                if ($ev->{button} == 1) {
                   $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
                } elsif ($ev->{button} == 2) {
                   $CONN->send ("apply $item->{tag}");
                } elsif ($ev->{button} == 3) {
-                  # examine, lock, mark, maybe other things
+                  CFClient::UI::Menu->new (
-                  warn "MENU not implemented yet\n";
+                     items => [
+                        ["examine", sub { $CONN->send ("examine $item->{tag}") }],
+                        [
+                           $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
+                           sub { $CONN->send ("lock $item->{tag}") },
+                        ],
+                        ["mark", sub { $CONN->send ("mark $item->{tag}") }],
+                        ["apply", sub { $CONN->send ("apply $item->{tag}") }],
+                     ],
+                  )->popup ($ev);
                }
                1
             },
          );
 sub conn::container_add {
    my ($self, $id, $items) = @_;
    update_floorbox if $id == 0;
+   if ($self->{player}{tag} == $id) {
+      $INV->set_items ($self->{container}{$self->{player}{tag}});
+   }
    # $self-<{player}{tag} => player inv
    #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
 }
 sub conn::container_clear {
    my ($self, $id) = @_;
    update_floorbox if $id == 0;
+   if ($self->{player}{tag} == $id) {
+      $INV->set_items ($self->{container}{$id});
+   }
 #   use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
 }
 sub conn::item_delete {
    my ($self, @items) = @_;
    for (@items) {
       update_floorbox if $_->{container} == 0;
+      if ($self->{player}{tag} == $_->{container}) {
+         $INV->set_items ($self->{container}{$_->{container}});
+      }
    }
 }
 sub conn::item_update {
    my ($self, $item) = @_;
    update_floorbox if $item->{container} == 0;
+   if ($self->{player}{tag} == $item->{container}) {
+      $INV->set_items ($self->{container}{$item->{container}});
+   }
 }
 %SDL_CB = (
    CFClient::SDL_QUIT => sub {
       Event::unloop -1;

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.188 by elmex, Tue Apr 25 13:27:00 2006 UTC vs. Revision 1.193 by root, Sat Apr 29 16:17:10 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.188 by elmex, Tue Apr 25 13:27:00 2006 UTC vs.
Revision 1.193 by root, Sat Apr 29 16:17:10 2006 UTC